diff --git a/lib/libcom_err/Makefile b/lib/libcom_err/Makefile
index 2b1a9c509e5..a09601c3efb 100644
--- a/lib/libcom_err/Makefile
+++ b/lib/libcom_err/Makefile
@@ -1,8 +1,7 @@
-#	$Id: Makefile,v 1.2 1995/08/06 12:23:28 bde Exp $
+#	$Id: Makefile,v 1.3 1996/08/30 01:45:45 peter Exp $
 
 LIB=	com_err
 SRCS=	com_err.c error_message.c et_name.c init_et.c
-CFLAGS+=	-I.
 MAN3=	com_err.3
 
 SUBDIR=	doc
diff --git a/libexec/xtend/Makefile b/libexec/xtend/Makefile
index 75fedeff421..a01ed65c95b 100644
--- a/libexec/xtend/Makefile
+++ b/libexec/xtend/Makefile
@@ -1,11 +1,11 @@
 # Makefile for xtend (Stark) 10/30/93
-# $Id$
+# $Id: Makefile,v 1.2 1995/04/18 01:53:56 jkh Exp $
 
 BINMODE=	555
 
 PROG=	xtend
 SRCS=	xtend.c status.c packet.c user.c
-CFLAGS+=-I. -DXTENUNAME=\"xten\" -DXTENGNAME=\"xten\"
+CFLAGS+= -DXTENUNAME=\"xten\" -DXTENGNAME=\"xten\"
 LDADD+= -lutil
 
 MAN8=	xtend.8
diff --git a/usr.bin/tn3270/tools/mkastods/Makefile b/usr.bin/tn3270/tools/mkastods/Makefile
index a2d36a1c21f..f7c6608680e 100644
--- a/usr.bin/tn3270/tools/mkastods/Makefile
+++ b/usr.bin/tn3270/tools/mkastods/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	mkastods
 SRCS=	mkastods.c asc_ebc.c ebc_disp.c
-CFLAGS+=-I${.CURDIR}/.. -I.
+CFLAGS+=-I${.CURDIR}/..
 NOMAN=	noman
 .PATH:	${.CURDIR}/../../api
 
diff --git a/usr.bin/tn3270/tools/mkastosc/Makefile b/usr.bin/tn3270/tools/mkastosc/Makefile
index a6268f53d38..c06d0755bd0 100644
--- a/usr.bin/tn3270/tools/mkastosc/Makefile
+++ b/usr.bin/tn3270/tools/mkastosc/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	mkastosc
 SRCS=	mkastosc.c dohits.c asc_ebc.c ebc_disp.c
-CFLAGS+=-I${.CURDIR}/../mkhits -I${.CURDIR}/.. -I.
+CFLAGS+=-I${.CURDIR}/../mkhits -I${.CURDIR}/..
 NOMAN=	noman
 .PATH:	${.CURDIR}/../mkhits ${.CURDIR}/../../api
 
diff --git a/usr.bin/tn3270/tools/mkdctype/Makefile b/usr.bin/tn3270/tools/mkdctype/Makefile
index 818bb52627d..363eb01ffdb 100644
--- a/usr.bin/tn3270/tools/mkdctype/Makefile
+++ b/usr.bin/tn3270/tools/mkdctype/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	mkdctype
 SRCS=	mkdctype.c ebc_disp.c ectype.c
-CFLAGS+=-I${.CURDIR}/.. -I.
+CFLAGS+=-I${.CURDIR}/..
 NOMAN=	noman
 .PATH:	${.CURDIR}/../../api
 
diff --git a/usr.bin/tn3270/tools/mkdstoas/Makefile b/usr.bin/tn3270/tools/mkdstoas/Makefile
index b2abeb3a678..53ecd705e44 100644
--- a/usr.bin/tn3270/tools/mkdstoas/Makefile
+++ b/usr.bin/tn3270/tools/mkdstoas/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	mkdstoas
 SRCS=	mkdstoas.c asc_ebc.c ebc_disp.c
-CFLAGS+=-I${.CURDIR}/.. -I.
+CFLAGS+=-I${.CURDIR}/..
 NOMAN=	noman
 .PATH:	${.CURDIR}/../../api
 
diff --git a/usr.bin/tn3270/tools/mkhits/Makefile b/usr.bin/tn3270/tools/mkhits/Makefile
index c7c8802e5e9..169e6c41945 100644
--- a/usr.bin/tn3270/tools/mkhits/Makefile
+++ b/usr.bin/tn3270/tools/mkhits/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	mkhits
 SRCS=	mkhits.c dohits.c asc_ebc.c ebc_disp.c
-CFLAGS+=-I${.CURDIR}/.. -I.
+CFLAGS+=-I${.CURDIR}/..
 NOMAN=	noman
 .PATH:	${.CURDIR}/../../api
 
diff --git a/usr.sbin/named/Makefile.inc b/usr.sbin/named/Makefile.inc
index 864ef396033..a5622bf2a31 100644
--- a/usr.sbin/named/Makefile.inc
+++ b/usr.sbin/named/Makefile.inc
@@ -1,5 +1,5 @@
 # From: Id: Makefile.inc,v 8.4 1996/03/03 17:42:43 vixie Exp
-# $Id$
+# $Id: Makefile.inc,v 1.1 1996/08/29 21:36:53 peter Exp $
 
 .ifndef (Mk.Inc)
 Mk.Inc?=defined
@@ -17,7 +17,7 @@ DESTSBIN=	/usr/sbin
 IOT=		ABRT
 
 CONFIG?=	-DUSE_OPTIONS_H
-INCLUDE?=	-I. -I${BIND_DIR} -I${BIND_DIR}/include
+INCLUDE?=	-I${BIND_DIR} -I${BIND_DIR}/include
 CFLAGS+=	${INCLUDE} ${CONFIG}
 
 BINGRP=		bin
diff --git a/usr.sbin/pccard/pccardc/Makefile b/usr.sbin/pccard/pccardc/Makefile
index 7eaa9b85064..75eed6bed4a 100644
--- a/usr.sbin/pccard/pccardc/Makefile
+++ b/usr.sbin/pccard/pccardc/Makefile
@@ -1,14 +1,14 @@
 #
 #	pccardc Makefile
 #
-#	$Id: Makefile,v 1.1 1995/08/24 09:02:45 phk Exp $
+#	$Id: Makefile,v 1.2 1996/04/09 23:31:51 nate Exp $
 #
 PROG=	pccardc
 NOMAN=	noman
 SRCS=	pccardc.c dumpcis.c readcis.c printcis.c enabler.c pccardmem.c \
 	rdmap.c rdreg.c wrattr.c wrreg.c 
 
-CFLAGS+=	-I. -I${.CURDIR}/../pccardd
+CFLAGS+=	-I${.CURDIR}/../pccardd
 
 .include <bsd.prog.mk>
 .PATH:	${.CURDIR}/../pccardd
diff --git a/usr.sbin/tzsetup/Makefile b/usr.sbin/tzsetup/Makefile
index 8e08dbb8893..001c2579710 100644
--- a/usr.sbin/tzsetup/Makefile
+++ b/usr.sbin/tzsetup/Makefile
@@ -1,9 +1,9 @@
-#	$Id: Makefile,v 1.2 1996/01/23 21:06:25 wosch Exp $
+#	$Id: Makefile,v 1.3 1996/01/24 00:11:57 wosch Exp $
 
 PROG=	tzsetup
 MAN8=	tzsetup.8
 SRCS=	main.c tzmenu.c menus.c
-CFLAGS+=	-I. -I${.CURDIR}
+CFLAGS+=	-I${.CURDIR}
 CLEANFILES+=	menus.c
 LDADD+=	-ldialog -lncurses -lmytinfo
 DPADD+=	${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO}