diff --git a/gnu/usr.bin/groff/eqn/Makefile b/gnu/usr.bin/groff/eqn/Makefile
index aba129e875a9..795fcca5bbe6 100644
--- a/gnu/usr.bin/groff/eqn/Makefile
+++ b/gnu/usr.bin/groff/eqn/Makefile
@@ -4,7 +4,6 @@ PROG=		eqn
 SRCS=		eqn.cc eqn.tab.h main.cc lex.cc \
 		box.cc limit.cc list.cc over.cc text.cc \
 		script.cc mark.cc other.cc delim.cc sqrt.cc pile.cc special.cc
-CFLAGS+=	-I.
 DPADD=		${LIBGROFF}
 LDADD=		${LIBGROFF}
 MAN1=		eqn.1 neqn.1
@@ -21,5 +20,7 @@ eqn.tab.h: eqn.cc
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
 
+INCLUDES+=	-I${DIST_DIR} -I.
+
 neqn: ${DIST_DIR}/neqn.sh
 	sed -e 's/@g@/${g}/g' ${.ALLSRC} > ${.TARGET}
diff --git a/gnu/usr.bin/groff/pic/Makefile b/gnu/usr.bin/groff/pic/Makefile
index de800547ed8e..bb799a3fbcee 100644
--- a/gnu/usr.bin/groff/pic/Makefile
+++ b/gnu/usr.bin/groff/pic/Makefile
@@ -3,7 +3,6 @@
 PROG=		pic
 SRCS=		lex.cc main.cc object.cc pic.cc pic.tab.h \
 		common.cc troff.cc tex.cc
-CFLAGS+=	-I.
 DPADD=		${LIBGROFF} ${LIBM}
 LDADD=		${LIBGROFF} -lm
 CLEANFILES=	${MAN1} pic.cc pic.tab.h y.tab.c y.tab.h
@@ -12,3 +11,5 @@ pic.tab.h: pic.cc
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
+
+INCLUDES+=	-I${DIST_DIR} -I.
diff --git a/gnu/usr.bin/groff/refer/Makefile b/gnu/usr.bin/groff/refer/Makefile
index 4573443a7adf..b25f726e8677 100644
--- a/gnu/usr.bin/groff/refer/Makefile
+++ b/gnu/usr.bin/groff/refer/Makefile
@@ -2,10 +2,11 @@
 
 PROG=		refer
 SRCS=		command.cc label.cc ref.cc refer.cc token.cc
-CFLAGS+=	-I${.CURDIR}/../include
 DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM}
 LDADD=		${LIBBIB} ${LIBGROFF} -lm
 CLEANFILES=	label.cc label.tab.h ${MAN1} y.tab.c y.tab.h
 
 .include "../Makefile.cfg"
 .include <bsd.prog.mk>
+
+INCLUDES+=	-I${DIST_DIR} -I${.CURDIR}/../include
diff --git a/lib/libipsec/Makefile b/lib/libipsec/Makefile
index 52510f787fc8..7512517afd4d 100644
--- a/lib/libipsec/Makefile
+++ b/lib/libipsec/Makefile
@@ -29,7 +29,7 @@
 LIB=	ipsec
 SHLIB_MAJOR= 1
 SHLIB_MINOR= 0
-CFLAGS+=-I${.OBJDIR}
+CFLAGS+=-I${.CURDIR} -I.
 CFLAGS+=-DIPSEC_DEBUG -DIPSEC
 .if !defined(NOINET6)
 CFLAGS+=-DINET6
diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile
index 09ef0e22fafc..89d230d1a9b6 100644
--- a/libexec/ftpd/Makefile
+++ b/libexec/ftpd/Makefile
@@ -7,6 +7,7 @@ SRCS=	ftpd.c ftpcmd.y logwtmp.c popen.c skey-stuff.c
 
 CFLAGS+=-DSETPROCTITLE -DSKEY -DLOGIN_CAP -DVIRTUAL_HOSTING -Wall
 CFLAGS+=-DINET6
+CFLAGS+=-I${.CURDIR}
 YFLAGS=
 
 LDADD=	-lskey -lmd -lcrypt -lutil
diff --git a/sbin/setkey/Makefile b/sbin/setkey/Makefile
index 8feb0a66e6b5..3caf739cb1a6 100644
--- a/sbin/setkey/Makefile
+++ b/sbin/setkey/Makefile
@@ -29,7 +29,7 @@
 PROG=	setkey
 SRCS=	setkey.c parse.y token.l
 CFLAGS+=-g
-CFLAGS+=-I${.CURDIR}/../../lib/libipsec
+CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../lib/libipsec
 DPADD=	${LIBL} ${LIBY}
 LDADD=	-ll -ly
 CLEANFILES+=	y.tab.c y.tab.h key_test.o keytest
diff --git a/usr.bin/mklocale/Makefile b/usr.bin/mklocale/Makefile
index 3bad52495a53..022d41e92523 100644
--- a/usr.bin/mklocale/Makefile
+++ b/usr.bin/mklocale/Makefile
@@ -3,7 +3,7 @@
 
 PROG=	mklocale
 SRCS=	yacc.y lex.l y.tab.h
-CFLAGS+=-I.
+CFLAGS+= -I${.CURDIR}
 MAN1=	mklocale.1
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/xlint/lint1/Makefile b/usr.bin/xlint/lint1/Makefile
index fef8dae73801..ea6c656a8e62 100644
--- a/usr.bin/xlint/lint1/Makefile
+++ b/usr.bin/xlint/lint1/Makefile
@@ -7,7 +7,7 @@ SRCS=	cgram.y scan.l mem1.c mem.c err.c main1.c decl.c tree.c func.c \
 NOMAN=
 LDADD+=	-ll
 DPADD+=	${LIBL}
-CFLAGS+=-I.
+CFLAGS+= -I${.CURDIR} -I.
 LINTFLAGS=-aehpz
 
 BINDIR=	/usr/libexec
diff --git a/usr.sbin/atm/scspd/Makefile b/usr.sbin/atm/scspd/Makefile
index edea7487e298..63eab5004ed8 100644
--- a/usr.sbin/atm/scspd/Makefile
+++ b/usr.sbin/atm/scspd/Makefile
@@ -35,7 +35,7 @@ SRCS=	scspd.c scsp_cafsm.c scsp_config.c scsp_config_lex.c \
 	scsp_timer.c
 MAN8=	scspd.8
 
-CFLAGS+=	-I${.CURDIR}/../../../sys -I${.OBJDIR}
+CFLAGS+=	-I${.CURDIR}/../../../sys -I${.CURDIR} -I${.OBJDIR}
 LDADD+=		-latm -lmd
 DPADD+=		${LIBATM} ${LIBMD}
 
diff --git a/usr.sbin/i4b/isdnd/Makefile b/usr.sbin/i4b/isdnd/Makefile
index 5c05b85fccaf..74b5d5f3b533 100644
--- a/usr.sbin/i4b/isdnd/Makefile
+++ b/usr.sbin/i4b/isdnd/Makefile
@@ -7,7 +7,8 @@ SRCS	=	rc_parse.y rc_scan.l main.c rc_config.c log.c curses.c	\
 		exec.c dial.c monitor.c pcause.c controller.c alias.c	\
 		y.tab.h holiday.c
 
-COPTS	+=	-I${.CURDIR}/../isdnmonitor -I${.CURDIR}/../isdntel -I${.OBJDIR}
+COPTS	+=	-I${.CURDIR}/../isdnmonitor -I${.CURDIR}/../isdntel
+COPTS	+=	-I${.CURDIR} -I${.OBJDIR}
 
 # compile debug support
 COPTS	+=	-DDEBUG
diff --git a/usr.sbin/kbdcontrol/Makefile b/usr.sbin/kbdcontrol/Makefile
index a2ff5b17c58c..9873d9aacecd 100644
--- a/usr.sbin/kbdcontrol/Makefile
+++ b/usr.sbin/kbdcontrol/Makefile
@@ -2,6 +2,7 @@
 
 PROG=	kbdcontrol
 SRCS=	kbdcontrol.c lex.l
+CFLAGS+= -I${.CURDIR}
 MAN1=	kbdcontrol.1
 MAN5=	kbdmap.5
 MLINKS= kbdmap.5 keymap.5
diff --git a/usr.sbin/named/Makefile.inc b/usr.sbin/named/Makefile.inc
index bd9211e8291c..cbebbcbb393a 100644
--- a/usr.sbin/named/Makefile.inc
+++ b/usr.sbin/named/Makefile.inc
@@ -16,7 +16,8 @@ DESTRUN=	/var/run
 DESTSBIN=	/usr/sbin
 DESTHELP=	/usr/share/misc
 
-CFLAGS+=	-I${BIND_DIR}/port/freebsd/include
+CFLAGS+=	-I${BIND_DIR}/port/freebsd/include \
+		-I${.CURDIR}/../../contrib/bind/bin/named
 
 # This is mostly for named and named-xfer
 .if defined(USE_LIBBIND)
diff --git a/usr.sbin/nslookup/Makefile b/usr.sbin/nslookup/Makefile
index c3a51a46625c..c9b31f2cb31d 100644
--- a/usr.sbin/nslookup/Makefile
+++ b/usr.sbin/nslookup/Makefile
@@ -11,6 +11,7 @@ SRCS=	main.c getinfo.c debug.c send.c skip.c list.c subr.c commands.l
 MAN8=	nslookup.8
 
 CFLAGS+=-D_PATH_HELPFILE=\"${DESTHELP}/nslookup.help\"
+CFLAGS+=-I${.CURDIR}/../../contrib/bind/bin/nslookup
 LDADD+=	-ll -ledit -ltermcap
 DPADD+=	${LIBL} ${LIBEDIT} ${LIBTERMCAP}
 
diff --git a/usr.sbin/rrenumd/Makefile b/usr.sbin/rrenumd/Makefile
index 42a0195e9ead..c4596562e8fe 100644
--- a/usr.sbin/rrenumd/Makefile
+++ b/usr.sbin/rrenumd/Makefile
@@ -17,7 +17,7 @@ PROG=	rrenumd
 SRCS=	rrenumd.c  parser.y lexer.l
 YFLAGS+=	-d
 
-CFLAGS+= -DINET6 -DIPSEC -I${.OBJDIR}
+CFLAGS+= -DINET6 -DIPSEC -I${.CURDIR} -I${.OBJDIR}
 LDADD=	-lipsec -lcompat -ll -ly
 DPADD=	${LIBIPSEC} ${LIBCOMPAT} ${LIBL} ${LIBY}
 
diff --git a/usr.sbin/setkey/Makefile b/usr.sbin/setkey/Makefile
index 8feb0a66e6b5..3caf739cb1a6 100644
--- a/usr.sbin/setkey/Makefile
+++ b/usr.sbin/setkey/Makefile
@@ -29,7 +29,7 @@
 PROG=	setkey
 SRCS=	setkey.c parse.y token.l
 CFLAGS+=-g
-CFLAGS+=-I${.CURDIR}/../../lib/libipsec
+CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../lib/libipsec
 DPADD=	${LIBL} ${LIBY}
 LDADD=	-ll -ly
 CLEANFILES+=	y.tab.c y.tab.h key_test.o keytest