3 files changed, 6 insertions, 3 deletions

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