diff --git a/sbin/ipf/Makefile b/sbin/ipf/Makefile
index 530950ef831b..dd00cc62f08e 100644
--- a/sbin/ipf/Makefile
+++ b/sbin/ipf/Makefile
@@ -5,7 +5,7 @@
 PROG=	ipf
 MAN=	ipf.4 ipf.5 ipf.8
 SRCS=	ipf.c parse.c opt.c facpri.c common.c
-CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -I${.CURDIR}/../../contrib/ipfilter
+CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -I- -I${.CURDIR}/../../sys/netinet -I${.CURDIR}/../../contrib/ipfilter
 
 MAINTAINER=	guido@freebsd.org
 
diff --git a/sbin/ipfstat/Makefile b/sbin/ipfstat/Makefile
index fd6a5ffb8269..ed4d62e0b1c0 100644
--- a/sbin/ipfstat/Makefile
+++ b/sbin/ipfstat/Makefile
@@ -5,7 +5,7 @@
 PROG=	ipfstat
 MAN=	ipfstat.8
 SRCS=	fils.c parse.c opt.c kmem.c facpri.c common.c
-CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -DSTATETOP -I${.CURDIR}/../../contrib/ipfilter
+CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -DSTATETOP -I- -I${.CURDIR}/../../sys/netinet -I${.CURDIR}/../../sys -I${.CURDIR}/../../contrib/ipfilter
 
 DPADD= ${NCURSES}
 LDADD= -lncurses
diff --git a/sbin/ipnat/Makefile b/sbin/ipnat/Makefile
index 2fe7781972ac..6d3644d03a09 100644
--- a/sbin/ipnat/Makefile
+++ b/sbin/ipnat/Makefile
@@ -6,7 +6,7 @@ PROG=	ipnat
 MAN=	ipnat.1 ipnat.4 ipnat.5
 MLINKS=	ipnat.5 ipnat.conf.5
 SRCS=	ipnat.c kmem.c natparse.c common.c
-CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -I${.CURDIR}/../../contrib/ipfilter
+CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -I- -I${.CURDIR}/../../sys/netinet -I${.CURDIR}/../../sys -I${.CURDIR}/../../contrib/ipfilter
 
 MAINTAINER=	guido@freebsd.org
 
diff --git a/usr.sbin/ipftest/Makefile b/usr.sbin/ipftest/Makefile
index 14cce7273dbd..728baa088bec 100644
--- a/usr.sbin/ipftest/Makefile
+++ b/usr.sbin/ipftest/Makefile
@@ -9,7 +9,7 @@ SRCS=	opt_ipfilter.h \
 	ipft_tx.c misc.c ip_frag.c ip_state.c ip_nat.c ip_proxy.c \
 	ip_auth.c ipft_hx.c ip_fil.c natparse.c facpri.c common.c
 
-CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -I. -I${.CURDIR}/../../contrib/ipfilter
+CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -I- -I${.OBJDIR} -I${.CURDIR}/../../sys/netinet -I${.CURDIR}/../../sys -I${.CURDIR}/../../contrib/ipfilter
 
 CLEANFILES+=	opt_ipfilter.h
 
diff --git a/usr.sbin/ipresend/Makefile b/usr.sbin/ipresend/Makefile
index 949be189c222..180faad577bf 100644
--- a/usr.sbin/ipresend/Makefile
+++ b/usr.sbin/ipresend/Makefile
@@ -8,6 +8,7 @@ SRCS=	ipresend.c ip.c resend.c opt.c ipft_ef.c ipft_hx.c ipft_sn.c ipft_td.c ipf
 
 CFLAGS+=-DDOSOCKET -DIPL_NAME=\"/dev/ipl\" \
 	-DUSE_INET6 \
+	-I- -I${.CURDIR}/../../sys/netinet \
 	-I${.CURDIR}/../../contrib/ipfilter/ipsend \
 	-I${.CURDIR}/../../contrib/ipfilter
 
diff --git a/usr.sbin/ipsend/Makefile b/usr.sbin/ipsend/Makefile
index 04a99f49cc1a..dc35972fce22 100644
--- a/usr.sbin/ipsend/Makefile
+++ b/usr.sbin/ipsend/Makefile
@@ -11,7 +11,7 @@ MAN=	ipsend.1 ipsend.5
 
 CFLAGS+=-DDOSOCKET -DIPL_NAME=\"/dev/ipl\" \
 	-DUSE_INET6 \
-	-I. \
+	-I- -I. -I${.CURDIR}/../../sys/netinet \
 	-I${.CURDIR}/../../contrib/ipfilter/ipsend \
 	-I${.CURDIR}/../../contrib/ipfilter/iplang \
 	-I${.CURDIR}/../../contrib/ipfilter
diff --git a/usr.sbin/iptest/Makefile b/usr.sbin/iptest/Makefile
index 45ece631e638..6639fa9ea81a 100644
--- a/usr.sbin/iptest/Makefile
+++ b/usr.sbin/iptest/Makefile
@@ -8,6 +8,7 @@ SRCS=	iptest.c iptests.c ip.c sbpf.c 44arp.c sock.c
 
 CFLAGS+=-DDOSOCKET -DIPL_NAME=\"/dev/ipl\" \
 	-DUSE_INET6 \
+	-I- -I${.CURDIR}/../../sys/netinet \
 	-I${.CURDIR}/../../contrib/ipfilter/ipsend \
 	-I${.CURDIR}/../../contrib/ipfilter