diff --git a/gnu/usr.bin/binutils/gdbreplay/Makefile b/gnu/usr.bin/binutils/gdbreplay/Makefile
index 43ae9dca1543..a7b6f512a2ef 100644
--- a/gnu/usr.bin/binutils/gdbreplay/Makefile
+++ b/gnu/usr.bin/binutils/gdbreplay/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.13.2.1 1997/02/02 20:46:32 joerg Exp $
+#	$Id: Makefile,v 1.1.1.1 1997/04/25 22:25:22 pst Exp $
 
 GDBDIR=	${.CURDIR}/../../../../contrib/gdb
 .PATH:	${GDBDIR}/gdb/gdbserver
@@ -11,7 +11,7 @@ NOMAN=	yes
 
 SRCS=	gdbreplay.c
 
-CFLAGS+=-I${.CURDIR}/../gdb -I${.CURDIR}/../bfd -I${GDBDIR}/gdb -I${GDBDIR}/bfd
+CFLAGS+=-I${.CURDIR}/../gdb -I${.CURDIR}/../bfd
 CFLAGS+=-DNO_MMALLOC
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/gdbserver/Makefile b/gnu/usr.bin/binutils/gdbserver/Makefile
index acac9e05ce38..73abac881616 100644
--- a/gnu/usr.bin/binutils/gdbserver/Makefile
+++ b/gnu/usr.bin/binutils/gdbserver/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.13.2.1 1997/02/02 20:46:32 joerg Exp $
+#	$Id: Makefile,v 1.1.1.1 1997/04/25 22:25:50 pst Exp $
 
 GDBDIR=	${.CURDIR}/../../../../contrib/gdb
 .PATH:	${GDBDIR}/gdb/gdbserver
@@ -11,7 +11,7 @@ BINDIR=	/usr/bin
 SRCS=	remote-utils.c utils.c server.c
 SRCS+=	low-fbsd.c
 
-CFLAGS+=-I${.CURDIR}/../gdb -I${.CURDIR}/../bfd -I${GDBDIR}/gdb -I${GDBDIR}/bfd
+CFLAGS+=-I${.CURDIR}/../gdb -I${.CURDIR}/../bfd
 CFLAGS+=-DNO_MMALLOC
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/gdb/Makefile b/gnu/usr.bin/gdb/Makefile
index 990f9dacd630..000bb74c3553 100644
--- a/gnu/usr.bin/gdb/Makefile
+++ b/gnu/usr.bin/gdb/Makefile
@@ -1,3 +1,3 @@
-SUBDIR= bfd libiberty gdb doc
+SUBDIR= bfd libiberty gdb doc gdbreplay gdbserver
 
 .include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/gdb/Makefile.inc b/gnu/usr.bin/gdb/Makefile.inc
index 9a318452122f..2056d9b8f9cc 100644
--- a/gnu/usr.bin/gdb/Makefile.inc
+++ b/gnu/usr.bin/gdb/Makefile.inc
@@ -1,6 +1,6 @@
 # bsd.lib.mk causes this file to be loaded multiple times.
-.if !defined(BEEN_HERE)
-BEEN_HERE=1	
+.if !defined(GDB_MAKEFILE_INC_BEEN_HERE)
+GDB_MAKEFILE_INC_BEEN_HERE=yes
 
 # this may be defined in other places
 .if !defined(GDBDIR)
diff --git a/gnu/usr.bin/gdb/gdbreplay/Makefile b/gnu/usr.bin/gdb/gdbreplay/Makefile
index 43ae9dca1543..a7b6f512a2ef 100644
--- a/gnu/usr.bin/gdb/gdbreplay/Makefile
+++ b/gnu/usr.bin/gdb/gdbreplay/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.13.2.1 1997/02/02 20:46:32 joerg Exp $
+#	$Id: Makefile,v 1.1.1.1 1997/04/25 22:25:22 pst Exp $
 
 GDBDIR=	${.CURDIR}/../../../../contrib/gdb
 .PATH:	${GDBDIR}/gdb/gdbserver
@@ -11,7 +11,7 @@ NOMAN=	yes
 
 SRCS=	gdbreplay.c
 
-CFLAGS+=-I${.CURDIR}/../gdb -I${.CURDIR}/../bfd -I${GDBDIR}/gdb -I${GDBDIR}/bfd
+CFLAGS+=-I${.CURDIR}/../gdb -I${.CURDIR}/../bfd
 CFLAGS+=-DNO_MMALLOC
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/gdb/gdbserver/Makefile b/gnu/usr.bin/gdb/gdbserver/Makefile
index acac9e05ce38..73abac881616 100644
--- a/gnu/usr.bin/gdb/gdbserver/Makefile
+++ b/gnu/usr.bin/gdb/gdbserver/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.13.2.1 1997/02/02 20:46:32 joerg Exp $
+#	$Id: Makefile,v 1.1.1.1 1997/04/25 22:25:50 pst Exp $
 
 GDBDIR=	${.CURDIR}/../../../../contrib/gdb
 .PATH:	${GDBDIR}/gdb/gdbserver
@@ -11,7 +11,7 @@ BINDIR=	/usr/bin
 SRCS=	remote-utils.c utils.c server.c
 SRCS+=	low-fbsd.c
 
-CFLAGS+=-I${.CURDIR}/../gdb -I${.CURDIR}/../bfd -I${GDBDIR}/gdb -I${GDBDIR}/bfd
+CFLAGS+=-I${.CURDIR}/../gdb -I${.CURDIR}/../bfd
 CFLAGS+=-DNO_MMALLOC
 
 .include <bsd.prog.mk>