8 files changed, 31 insertions, 13 deletions
diff --git a/include/Makefile b/include/Makefile
index c08032c..61f21fb 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -112,10 +112,10 @@ copies:
 		${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 $i/*.h \
 		${DESTDIR}/usr/include/$i
 .endfor
-.if exists(${.CURDIR}/../sys/${MACHINE_ARCH}/include)
-	cd ${.CURDIR}/../sys/${MACHINE_ARCH}/include; \
+.if exists(${.CURDIR}/../sys/contrib/ipfilter/netinet)
+	cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \
 		${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
-		${DESTDIR}/usr/include/machine
+		${DESTDIR}/usr/include/netinet
 .endif
 .for i in ${SFILES}
 	ln -sf ../sys/$i ${DESTDIR}/usr/include/machine/$i
diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha
index 3d14ccf..6fc5507 100644
--- a/sys/conf/Makefile.alpha
+++ b/sys/conf/Makefile.alpha
@@ -48,6 +48,11 @@ INCLUDES+= -I$S/../include
 .else
 INCLUDES+= -I/usr/include
 .endif
+
+# This hack lets us use the ipfilter code without spamming a new
+# include path into 100+ source files.
+INCLUDES+= -I$S/contrib/ipfilter
+
 COPTS=	${INCLUDES} ${IDENT} -D_KERNEL -include opt_global.h
 CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
 
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index da55b6c..07e03cf 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -53,6 +53,9 @@ INCLUDES+= -I/usr/include
 # include path into 100+ source files.
 INCLUDES+= -I$S/contrib/dev/acpica
 
+# ... and the same for ipfilter
+INCLUDES+= -I$S/contrib/ipfilter
+
 COPTS=	${INCLUDES} ${IDENT} -D_KERNEL -include opt_global.h
 CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
 
diff --git a/sys/conf/Makefile.ia64 b/sys/conf/Makefile.ia64
index c147769..1942107 100644
--- a/sys/conf/Makefile.ia64
+++ b/sys/conf/Makefile.ia64
@@ -63,6 +63,9 @@ INCLUDES+= -I/usr/include
 # include path into 100+ source files.
 INCLUDES+= -I$S/contrib/dev/acpica
 
+# ... and the same for ipfilter
+INCLUDES+= -I$S/contrib/ipfilter
+
 COPTS=	${INCLUDES} ${IDENT} -D_KERNEL -include opt_global.h
 CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
 
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index db604ae..004e50f 100644
--- a/sys/conf/Makefile.pc98
+++ b/sys/conf/Makefile.pc98
@@ -55,6 +55,9 @@ INCLUDES+= -I/usr/include
 # include path into 100+ source files.
 INCLUDES+= -I$S/contrib/dev/acpica
 
+# ... and the same for ipfilter
+INCLUDES+= -I$S/contrib/ipfilter
+
 COPTS=	${INCLUDES} ${IDENT} -D_KERNEL -include opt_global.h
 CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
 
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index da55b6c..07e03cf 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -53,6 +53,9 @@ INCLUDES+= -I/usr/include
 # include path into 100+ source files.
 INCLUDES+= -I$S/contrib/dev/acpica
 
+# ... and the same for ipfilter
+INCLUDES+= -I$S/contrib/ipfilter
+
 COPTS=	${INCLUDES} ${IDENT} -D_KERNEL -include opt_global.h
 CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
 
diff --git a/sys/conf/files b/sys/conf/files
index 61e61cd..c5e929c 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -153,6 +153,15 @@ contrib/dev/acpica/utinit.c	 optional acpica
 contrib/dev/acpica/utmisc.c	 optional acpica
 contrib/dev/acpica/utobject.c	 optional acpica
 contrib/dev/acpica/utxface.c	 optional acpica
+contrib/ipfilter/netinet/fil.c		optional ipfilter inet
+contrib/ipfilter/netinet/ip_auth.c	optional ipfilter inet
+contrib/ipfilter/netinet/ip_fil.c	optional ipfilter inet
+contrib/ipfilter/netinet/ip_frag.c	optional ipfilter inet
+contrib/ipfilter/netinet/ip_log.c	optional ipfilter inet
+contrib/ipfilter/netinet/ip_nat.c	optional ipfilter inet
+contrib/ipfilter/netinet/ip_proxy.c	optional ipfilter inet
+contrib/ipfilter/netinet/ip_state.c	optional ipfilter inet
+contrib/ipfilter/netinet/mlfk_ipl.c	optional ipfilter inet
 crypto/blowfish/bf_cbc.c	optional ipsec ipsec_esp
 crypto/blowfish/bf_cbc_m.c	optional ipsec ipsec_esp
 crypto/blowfish/bf_enc.c	optional ipsec ipsec_esp
@@ -1031,7 +1040,6 @@ netgraph/ng_vjc.c	optional netgraph_vjc
 net/slcompress.c	optional netgraph_vjc
 netinet/accf_data.c		optional accept_filter_data
 netinet/accf_http.c		optional accept_filter_http
-netinet/fil.c		optional ipfilter inet
 netinet/if_atm.c	optional atm
 netinet/if_ether.c	optional ether
 netinet/igmp.c		optional inet
@@ -1042,26 +1050,18 @@ netinet/ip_id.c		optional inet
 netinet/in_pcb.c	optional inet
 netinet/in_proto.c	optional inet
 netinet/in_rmx.c	optional inet
-netinet/ip_auth.c	optional ipfilter inet
 netinet/ip_divert.c	optional ipdivert
 netinet/ip_dummynet.c	optional dummynet
 netinet/ip_ecn.c	optional inet
 netinet/ip_ecn.c	optional inet6
 netinet/ip_encap.c	optional inet
 netinet/ip_encap.c	optional inet6
-netinet/ip_fil.c	optional ipfilter inet
 netinet/ip_flow.c	optional inet
-netinet/ip_frag.c	optional ipfilter inet
 netinet/ip_fw.c		optional ipfirewall
 netinet/ip_icmp.c	optional inet
 netinet/ip_input.c	optional inet
-netinet/ip_log.c	optional ipfilter inet
 netinet/ip_mroute.c	optional inet
-netinet/ip_nat.c	optional ipfilter inet
 netinet/ip_output.c	optional inet
-netinet/ip_proxy.c	optional ipfilter inet
-netinet/ip_state.c	optional ipfilter inet
-netinet/mlfk_ipl.c	optional ipfilter inet
 netinet/raw_ip.c	optional inet
 netinet/tcp_debug.c	optional tcpdebug
 netinet/tcp_input.c	optional inet
diff --git a/sys/modules/ipfilter/Makefile b/sys/modules/ipfilter/Makefile
index fd6d8b4..b7526b9 100644
--- a/sys/modules/ipfilter/Makefile
+++ b/sys/modules/ipfilter/Makefile
@@ -1,12 +1,13 @@
 # $FreeBSD$ 
 
-.PATH: ${.CURDIR}/../../netinet
+.PATH: ${.CURDIR}/../../contrib/ipfilter/netinet
 
 KMOD=	ipl
 SRCS=	mlfk_ipl.c ip_nat.c ip_frag.c ip_state.c ip_proxy.c ip_auth.c \
 	ip_log.c ip_fil.c fil.c
 NOMAN=
 
+CFLAGS+=  -I${.CURDIR}/../../contrib/ipfilter
 CFLAGS+= -DIPFILTER=1 -DIPFILTER_LKM -DIPFILTER_LOG
 #
 # If you don't want log functionality remove -DIPFILTER_LOG