51 files changed, 92 insertions, 105 deletions
diff --git a/sys/conf/files b/sys/conf/files
index 569849b..e9aeef3 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -270,19 +270,19 @@ cddl/contrib/opensolaris/uts/common/zmod/zmod.c				optional zfs compile-with "${
 cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/zmod/zutil.c			optional zfs compile-with "${ZFS_C}"
 contrib/altq/altq/altq_cbq.c	optional altq \
-	compile-with "${NORMAL_C} -I$S/contrib/pf"
+	compile-with "${NORMAL_C}"
 contrib/altq/altq/altq_cdnr.c	optional altq
 contrib/altq/altq/altq_hfsc.c	optional altq \
-	compile-with "${NORMAL_C} -I$S/contrib/pf"
+	compile-with "${NORMAL_C}"
 contrib/altq/altq/altq_priq.c	optional altq \
-	compile-with "${NORMAL_C} -I$S/contrib/pf"
+	compile-with "${NORMAL_C}"
 contrib/altq/altq/altq_red.c	optional altq \
-	compile-with "${NORMAL_C} -I$S/contrib/pf"
+	compile-with "${NORMAL_C}"
 contrib/altq/altq/altq_rio.c	optional altq \
-	compile-with "${NORMAL_C} -I$S/contrib/pf"
+	compile-with "${NORMAL_C}"
 contrib/altq/altq/altq_rmclass.c optional altq
 contrib/altq/altq/altq_subr.c	optional altq \
-	compile-with "${NORMAL_C} -I$S/contrib/pf"
+	compile-with "${NORMAL_C}"
 contrib/dev/acpica/components/debugger/dbcmds.c		optional acpi acpi_debug
 contrib/dev/acpica/components/debugger/dbdisply.c	optional acpi acpi_debug
 contrib/dev/acpica/components/debugger/dbexec.c		optional acpi acpi_debug
@@ -513,27 +513,6 @@ contrib/ngatm/netnatm/sig/sig_unimsgcpy.c optional ngatm_uni \
 	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
 contrib/ngatm/netnatm/sig/sig_verify.c optional ngatm_uni \
 	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
-contrib/pf/net/if_pflog.c	optional pflog pf inet \
-	compile-with "${NORMAL_C} -I$S/contrib/pf"
-contrib/pf/net/if_pfsync.c	optional pfsync pf inet \
-	compile-with "${NORMAL_C} -I$S/contrib/pf"
-contrib/pf/net/pf.c		optional pf inet \
-	compile-with "${NORMAL_C} -I$S/contrib/pf"
-contrib/pf/net/pf_if.c		optional pf inet \
-	compile-with "${NORMAL_C} -I$S/contrib/pf"
-contrib/pf/net/pf_ioctl.c	optional pf inet \
-	compile-with "${NORMAL_C} -I$S/contrib/pf"
-contrib/pf/net/pf_lb.c		optional pf inet \
-	compile-with "${NORMAL_C} -I$S/contrib/pf"
-contrib/pf/net/pf_norm.c	optional pf inet \
-	compile-with "${NORMAL_C} -I$S/contrib/pf"
-contrib/pf/net/pf_osfp.c	optional pf inet \
-	compile-with "${NORMAL_C} -I$S/contrib/pf"
-contrib/pf/net/pf_ruleset.c	optional pf inet \
-	compile-with "${NORMAL_C} -I$S/contrib/pf"
-contrib/pf/net/pf_table.c	optional pf inet \
-	compile-with "${NORMAL_C} -I$S/contrib/pf"
-contrib/pf/netinet/in4_cksum.c	optional pf inet
 crypto/blowfish/bf_ecb.c	optional ipsec 
 crypto/blowfish/bf_skey.c	optional crypto | ipsec 
 crypto/camellia/camellia.c	optional crypto | ipsec 
@@ -2881,8 +2860,7 @@ net/if_edsc.c			optional edsc
 net/if_ef.c			optional ef
 net/if_enc.c			optional enc ipsec inet | enc ipsec inet6
 net/if_epair.c			optional epair
-net/if_ethersubr.c		optional ether \
-	compile-with "${NORMAL_C} -I$S/contrib/pf"
+net/if_ethersubr.c		optional ether
 net/if_faith.c			optional faith
 net/if_fddisubr.c		optional fddi
 net/if_fwsubr.c			optional fwip
@@ -3061,30 +3039,12 @@ netinet/ip_id.c			optional inet
 netinet/in_mcast.c		optional inet
 netinet/in_pcb.c		optional inet | inet6
 netinet/in_pcbgroup.c		optional inet pcbgroup | inet6 pcbgroup
-netinet/in_proto.c		optional inet | inet6 \
-	compile-with "${NORMAL_C} -I$S/contrib/pf"
+netinet/in_proto.c		optional inet | inet6
 netinet/in_rmx.c		optional inet
 netinet/ip_divert.c		optional inet ipdivert ipfirewall
-netinet/ipfw/dn_heap.c		optional inet dummynet
-netinet/ipfw/dn_sched_fifo.c	optional inet dummynet
-netinet/ipfw/dn_sched_prio.c	optional inet dummynet
-netinet/ipfw/dn_sched_qfq.c	optional inet dummynet 
-netinet/ipfw/dn_sched_rr.c	optional inet dummynet
-netinet/ipfw/dn_sched_wf2q.c	optional inet dummynet 
-netinet/ipfw/ip_dummynet.c	optional inet dummynet
-netinet/ipfw/ip_dn_io.c		optional inet dummynet
-netinet/ipfw/ip_dn_glue.c	optional inet dummynet
 netinet/ip_ecn.c		optional inet | inet6
 netinet/ip_encap.c		optional inet | inet6
 netinet/ip_fastfwd.c		optional inet
-netinet/ipfw/ip_fw2.c		optional inet ipfirewall \
-	compile-with "${NORMAL_C} -I$S/contrib/pf"
-netinet/ipfw/ip_fw_dynamic.c	optional inet ipfirewall
-netinet/ipfw/ip_fw_log.c	optional inet ipfirewall
-netinet/ipfw/ip_fw_pfil.c	optional inet ipfirewall
-netinet/ipfw/ip_fw_sockopt.c	optional inet ipfirewall
-netinet/ipfw/ip_fw_table.c	optional inet ipfirewall
-netinet/ipfw/ip_fw_nat.c	optional inet ipfirewall_nat
 netinet/ip_icmp.c		optional inet | inet6
 netinet/ip_input.c		optional inet
 netinet/ip_ipsec.c		optional inet ipsec
@@ -3192,6 +3152,33 @@ netncp/ncp_nls.c		optional ncp
 netncp/ncp_rq.c			optional ncp
 netncp/ncp_sock.c		optional ncp
 netncp/ncp_subr.c		optional ncp
+netpfil/ipfw/dn_heap.c		optional inet dummynet
+netpfil/ipfw/dn_sched_fifo.c	optional inet dummynet
+netpfil/ipfw/dn_sched_prio.c	optional inet dummynet
+netpfil/ipfw/dn_sched_qfq.c	optional inet dummynet 
+netpfil/ipfw/dn_sched_rr.c	optional inet dummynet
+netpfil/ipfw/dn_sched_wf2q.c	optional inet dummynet 
+netpfil/ipfw/ip_dummynet.c	optional inet dummynet
+netpfil/ipfw/ip_dn_io.c		optional inet dummynet
+netpfil/ipfw/ip_dn_glue.c	optional inet dummynet
+netpfil/ipfw/ip_fw2.c		optional inet ipfirewall
+netpfil/ipfw/ip_fw_dynamic.c	optional inet ipfirewall
+netpfil/ipfw/ip_fw_log.c	optional inet ipfirewall
+netpfil/ipfw/ip_fw_pfil.c	optional inet ipfirewall
+netpfil/ipfw/ip_fw_sockopt.c	optional inet ipfirewall
+netpfil/ipfw/ip_fw_table.c	optional inet ipfirewall
+netpfil/ipfw/ip_fw_nat.c	optional inet ipfirewall_nat
+netpfil/pf/if_pflog.c		optional pflog pf inet
+netpfil/pf/if_pfsync.c		optional pfsync pf inet
+netpfil/pf/pf.c			optional pf inet
+netpfil/pf/pf_if.c		optional pf inet
+netpfil/pf/pf_ioctl.c		optional pf inet
+netpfil/pf/pf_lb.c		optional pf inet
+netpfil/pf/pf_norm.c		optional pf inet
+netpfil/pf/pf_osfp.c		optional pf inet
+netpfil/pf/pf_ruleset.c		optional pf inet
+netpfil/pf/pf_table.c		optional pf inet
+netpfil/pf/in4_cksum.c		optional pf inet
 netsmb/smb_conn.c		optional netsmb
 netsmb/smb_crypt.c		optional netsmb
 netsmb/smb_dev.c		optional netsmb
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index fbf686a..64980fe 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -64,9 +64,6 @@ INCLUDES+= -I$S/contrib/altq
 # ... and the same for ipfilter
 INCLUDES+= -I$S/contrib/ipfilter
 
-# ... and the same for pf
-INCLUDES+= -I$S/contrib/pf
-
 # ... and the same for ath
 INCLUDES+= -I$S/dev/ath -I$S/dev/ath/ath_hal
 
diff --git a/sys/modules/dummynet/Makefile b/sys/modules/dummynet/Makefile
index dd96e0e..dfddbce 100644
--- a/sys/modules/dummynet/Makefile
+++ b/sys/modules/dummynet/Makefile
@@ -2,7 +2,7 @@
 
 .include <bsd.own.mk>
 
-.PATH:  ${.CURDIR}/../../netinet/ipfw
+.PATH:  ${.CURDIR}/../../netpfil/ipfw
 KMOD=   dummynet
 SRCS=   ip_dummynet.c
 SRCS+= ip_dn_glue.c ip_dn_io.c
diff --git a/sys/modules/ipfw/Makefile b/sys/modules/ipfw/Makefile
index 575a6ce..48f9ce1 100644
--- a/sys/modules/ipfw/Makefile
+++ b/sys/modules/ipfw/Makefile
@@ -2,7 +2,7 @@
 
 .include <bsd.own.mk>
 
-.PATH: ${.CURDIR}/../../netinet/ipfw
+.PATH: ${.CURDIR}/../../netpfil/ipfw
 
 KMOD=	ipfw
 SRCS=	ip_fw2.c ip_fw_pfil.c
@@ -11,7 +11,6 @@ SRCS+=	ip_fw_sockopt.c ip_fw_table.c
 SRCS+=	opt_inet.h opt_inet6.h opt_ipdivert.h opt_ipfw.h opt_ipsec.h
 
 CFLAGS+= -DIPFIREWALL
-CFLAGS+= -I${.CURDIR}/../../contrib/pf
 #
 #If you want it verbose
 #CFLAGS+= -DIPFIREWALL_VERBOSE
diff --git a/sys/modules/ipfw_nat/Makefile b/sys/modules/ipfw_nat/Makefile
index 1c957ab..e4638a6 100644
--- a/sys/modules/ipfw_nat/Makefile
+++ b/sys/modules/ipfw_nat/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../netinet/ipfw
+.PATH: ${.CURDIR}/../../netpfil/ipfw
 
 KMOD=   ipfw_nat
 SRCS=   ip_fw_nat.c
diff --git a/sys/modules/pf/Makefile b/sys/modules/pf/Makefile
index 2f941e1..9dc6c0d 100644
--- a/sys/modules/pf/Makefile
+++ b/sys/modules/pf/Makefile
@@ -2,8 +2,7 @@
 
 .include <bsd.own.mk>
 
-.PATH: ${.CURDIR}/../../contrib/pf/net
-.PATH: ${.CURDIR}/../../contrib/pf/netinet
+.PATH: ${.CURDIR}/../../netpfil/pf
 
 KMOD=	pf
 SRCS=	pf.c pf_if.c pf_lb.c pf_osfp.c pf_ioctl.c pf_norm.c pf_table.c \
@@ -11,8 +10,6 @@ SRCS=	pf.c pf_if.c pf_lb.c pf_osfp.c pf_ioctl.c pf_norm.c pf_table.c \
 	bus_if.h device_if.h \
 	opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h opt_global.h
 
-CFLAGS+= -I${.CURDIR}/../../contrib/pf
-
 .if !defined(KERNBUILDDIR)
 .if ${MK_INET_SUPPORT} != "no"
 opt_inet.h:
diff --git a/sys/modules/pflog/Makefile b/sys/modules/pflog/Makefile
index 0e8339e..70a5234 100644
--- a/sys/modules/pflog/Makefile
+++ b/sys/modules/pflog/Makefile
@@ -2,13 +2,11 @@
 
 .include <bsd.own.mk>
 
-.PATH: ${.CURDIR}/../../contrib/pf/net
+.PATH: ${.CURDIR}/../../netpfil/pf
 
 KMOD=	pflog
 SRCS=	if_pflog.c \
 	opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h
-
-CFLAGS+= -I${.CURDIR}/../../contrib/pf
 SRCS+=	bus_if.h device_if.h
 
 .if defined(KERNBUILDDIR)
diff --git a/sys/modules/pfsync/Makefile b/sys/modules/pfsync/Makefile
index 8c9bb1b..92c6edb 100644
--- a/sys/modules/pfsync/Makefile
+++ b/sys/modules/pfsync/Makefile
@@ -2,13 +2,11 @@
 
 .include <bsd.own.mk>
 
-.PATH: ${.CURDIR}/../../contrib/pf/net
+.PATH: ${.CURDIR}/../../netpfil/pf
 
 KMOD=	pfsync
 SRCS=	if_pfsync.c \
 	opt_pf.h opt_inet.h opt_inet6.h
-
-CFLAGS+= -I${.CURDIR}/../../contrib/pf
 SRCS+=	bus_if.h device_if.h
 
 .if defined(KERNBUILDDIR)
diff --git a/sys/contrib/pf/net/if_pflog.h b/sys/net/if_pflog.h
index 0faeb7d..0faeb7d 100644
--- a/sys/contrib/pf/net/if_pflog.h
+++ b/sys/net/if_pflog.h
diff --git a/sys/contrib/pf/net/if_pfsync.h b/sys/net/if_pfsync.h
index 5e71dd8..5e71dd8 100644
--- a/sys/contrib/pf/net/if_pfsync.h
+++ b/sys/net/if_pfsync.h
diff --git a/sys/contrib/pf/net/pf_mtag.h b/sys/net/pf_mtag.h
index baff00a..baff00a 100644
--- a/sys/contrib/pf/net/pf_mtag.h
+++ b/sys/net/pf_mtag.h
diff --git a/sys/contrib/pf/net/pfvar.h b/sys/net/pfvar.h
index ca4e449..ca4e449 100644
--- a/sys/contrib/pf/net/pfvar.h
+++ b/sys/net/pfvar.h
diff --git a/sys/netgraph/ng_ipfw.c b/sys/netgraph/ng_ipfw.c
index fe8ea89..907b5cb 100644
--- a/sys/netgraph/ng_ipfw.c
+++ b/sys/netgraph/ng_ipfw.c
@@ -48,11 +48,12 @@
 #include <netinet/in_var.h>
 #include <netinet/ip_var.h>
 #include <netinet/ip_fw.h>
-#include <netinet/ipfw/ip_fw_private.h>
 #include <netinet/ip.h>
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
 
+#include <netpfil/ipfw/ip_fw_private.h>
+
 #include <netgraph/ng_message.h>
 #include <netgraph/ng_parse.h>
 #include <netgraph/ng_ipfw.h>
diff --git a/sys/netinet/ipfw/dn_heap.c b/sys/netpfil/ipfw/dn_heap.c
index 3bdfd9d..1d58511 100644
--- a/sys/netinet/ipfw/dn_heap.c
+++ b/sys/netpfil/ipfw/dn_heap.c
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
-#include <netinet/ipfw/dn_heap.h>
+#include <netpfil/ipfw/dn_heap.h>
 #ifndef log
 #define log(x, arg...)
 #endif
diff --git a/sys/netinet/ipfw/dn_heap.h b/sys/netpfil/ipfw/dn_heap.h
index c95473a..c95473a 100644
--- a/sys/netinet/ipfw/dn_heap.h
+++ b/sys/netpfil/ipfw/dn_heap.h
diff --git a/sys/netinet/ipfw/dn_sched.h b/sys/netpfil/ipfw/dn_sched.h
index ab823fe..ab823fe 100644
--- a/sys/netinet/ipfw/dn_sched.h
+++ b/sys/netpfil/ipfw/dn_sched.h
diff --git a/sys/netinet/ipfw/dn_sched_fifo.c b/sys/netpfil/ipfw/dn_sched_fifo.c
index 0bb3800..e2aa608 100644
--- a/sys/netinet/ipfw/dn_sched_fifo.c
+++ b/sys/netpfil/ipfw/dn_sched_fifo.c
@@ -40,9 +40,9 @@
 #include <netinet/ip_var.h>		/* ipfw_rule_ref */
 #include <netinet/ip_fw.h>	/* flow_id */
 #include <netinet/ip_dummynet.h>
-#include <netinet/ipfw/dn_heap.h>
-#include <netinet/ipfw/ip_dn_private.h>
-#include <netinet/ipfw/dn_sched.h>
+#include <netpfil/ipfw/dn_heap.h>
+#include <netpfil/ipfw/ip_dn_private.h>
+#include <netpfil/ipfw/dn_sched.h>
 #else
 #include <dn_test.h>
 #endif
diff --git a/sys/netinet/ipfw/dn_sched_prio.c b/sys/netpfil/ipfw/dn_sched_prio.c
index 28f6006..b779515 100644
--- a/sys/netinet/ipfw/dn_sched_prio.c
+++ b/sys/netpfil/ipfw/dn_sched_prio.c
@@ -39,9 +39,9 @@
 #include <netinet/ip_var.h>		/* ipfw_rule_ref */
 #include <netinet/ip_fw.h>	/* flow_id */
 #include <netinet/ip_dummynet.h>
-#include <netinet/ipfw/dn_heap.h>
-#include <netinet/ipfw/ip_dn_private.h>
-#include <netinet/ipfw/dn_sched.h>
+#include <netpfil/ipfw/dn_heap.h>
+#include <netpfil/ipfw/ip_dn_private.h>
+#include <netpfil/ipfw/dn_sched.h>
 #else
 #include <dn_test.h>
 #endif
diff --git a/sys/netinet/ipfw/dn_sched_qfq.c b/sys/netpfil/ipfw/dn_sched_qfq.c
index be7fba3..5bbff8a 100644
--- a/sys/netinet/ipfw/dn_sched_qfq.c
+++ b/sys/netpfil/ipfw/dn_sched_qfq.c
@@ -40,9 +40,9 @@
 #include <netinet/ip_var.h>		/* ipfw_rule_ref */
 #include <netinet/ip_fw.h>	/* flow_id */
 #include <netinet/ip_dummynet.h>
-#include <netinet/ipfw/dn_heap.h>
-#include <netinet/ipfw/ip_dn_private.h>
-#include <netinet/ipfw/dn_sched.h>
+#include <netpfil/ipfw/dn_heap.h>
+#include <netpfil/ipfw/ip_dn_private.h>
+#include <netpfil/ipfw/dn_sched.h>
 #else
 #include <dn_test.h>
 #endif
diff --git a/sys/netinet/ipfw/dn_sched_rr.c b/sys/netpfil/ipfw/dn_sched_rr.c
index 1bbd800..dd608d7 100644
--- a/sys/netinet/ipfw/dn_sched_rr.c
+++ b/sys/netpfil/ipfw/dn_sched_rr.c
@@ -40,9 +40,9 @@
 #include <netinet/ip_var.h>		/* ipfw_rule_ref */
 #include <netinet/ip_fw.h>	/* flow_id */
 #include <netinet/ip_dummynet.h>
-#include <netinet/ipfw/dn_heap.h>
-#include <netinet/ipfw/ip_dn_private.h>
-#include <netinet/ipfw/dn_sched.h>
+#include <netpfil/ipfw/dn_heap.h>
+#include <netpfil/ipfw/ip_dn_private.h>
+#include <netpfil/ipfw/dn_sched.h>
 #else
 #include <dn_test.h>
 #endif
diff --git a/sys/netinet/ipfw/dn_sched_wf2q.c b/sys/netpfil/ipfw/dn_sched_wf2q.c
index 7f16719..a91c1ce 100644
--- a/sys/netinet/ipfw/dn_sched_wf2q.c
+++ b/sys/netpfil/ipfw/dn_sched_wf2q.c
@@ -41,9 +41,9 @@
 #include <netinet/ip_var.h>		/* ipfw_rule_ref */
 #include <netinet/ip_fw.h>	/* flow_id */
 #include <netinet/ip_dummynet.h>
-#include <netinet/ipfw/dn_heap.h>
-#include <netinet/ipfw/ip_dn_private.h>
-#include <netinet/ipfw/dn_sched.h>
+#include <netpfil/ipfw/dn_heap.h>
+#include <netpfil/ipfw/ip_dn_private.h>
+#include <netpfil/ipfw/dn_sched.h>
 #else
 #include <dn_test.h>
 #endif
diff --git a/sys/netinet/ipfw/dummynet.txt b/sys/netpfil/ipfw/dummynet.txt
index e8c9725..e8c9725 100644
--- a/sys/netinet/ipfw/dummynet.txt
+++ b/sys/netpfil/ipfw/dummynet.txt
diff --git a/sys/netinet/ipfw/ip_dn_glue.c b/sys/netpfil/ipfw/ip_dn_glue.c
index 9fc6b23..2e4f460 100644
--- a/sys/netinet/ipfw/ip_dn_glue.c
+++ b/sys/netpfil/ipfw/ip_dn_glue.c
@@ -50,11 +50,12 @@
 #include <netinet/in.h>
 #include <netinet/ip_var.h>	/* ip_output(), IP_FORWARDING */
 #include <netinet/ip_fw.h>
-#include <netinet/ipfw/ip_fw_private.h>
-#include <netinet/ipfw/dn_heap.h>
 #include <netinet/ip_dummynet.h>
-#include <netinet/ipfw/ip_dn_private.h>
-#include <netinet/ipfw/dn_sched.h>
+
+#include <netpfil/ipfw/ip_fw_private.h>
+#include <netpfil/ipfw/dn_heap.h>
+#include <netpfil/ipfw/ip_dn_private.h>
+#include <netpfil/ipfw/dn_sched.h>
 
 /* FREEBSD7.2 ip_dummynet.h r191715*/
 
diff --git a/sys/netinet/ipfw/ip_dn_io.c b/sys/netpfil/ipfw/ip_dn_io.c
index becd85e..2047b74 100644
--- a/sys/netinet/ipfw/ip_dn_io.c
+++ b/sys/netpfil/ipfw/ip_dn_io.c
@@ -54,17 +54,16 @@ __FBSDID("$FreeBSD$");
 #include <netinet/ip.h>		/* ip_len, ip_off */
 #include <netinet/ip_var.h>	/* ip_output(), IP_FORWARDING */
 #include <netinet/ip_fw.h>
-#include <netinet/ipfw/ip_fw_private.h>
-#include <netinet/ipfw/dn_heap.h>
 #include <netinet/ip_dummynet.h>
-#include <netinet/ipfw/ip_dn_private.h>
-#include <netinet/ipfw/dn_sched.h>
-
 #include <netinet/if_ether.h> /* various ether_* routines */
-
 #include <netinet/ip6.h>       /* for ip6_input, ip6_output prototypes */
 #include <netinet6/ip6_var.h>
 
+#include <netpfil/ipfw/ip_fw_private.h>
+#include <netpfil/ipfw/dn_heap.h>
+#include <netpfil/ipfw/ip_dn_private.h>
+#include <netpfil/ipfw/dn_sched.h>
+
 /*
  * We keep a private variable for the simulation time, but we could
  * probably use an existing one ("softticks" in sys/kern/kern_timeout.c)
diff --git a/sys/netinet/ipfw/ip_dn_private.h b/sys/netpfil/ipfw/ip_dn_private.h
index 159ddc9..159ddc9 100644
--- a/sys/netinet/ipfw/ip_dn_private.h
+++ b/sys/netpfil/ipfw/ip_dn_private.h
diff --git a/sys/netinet/ipfw/ip_dummynet.c b/sys/netpfil/ipfw/ip_dummynet.c
index e1c7a08..509aeb7 100644
--- a/sys/netinet/ipfw/ip_dummynet.c
+++ b/sys/netpfil/ipfw/ip_dummynet.c
@@ -52,11 +52,12 @@ __FBSDID("$FreeBSD$");
 #include <netinet/in.h>
 #include <netinet/ip_var.h>	/* ip_output(), IP_FORWARDING */
 #include <netinet/ip_fw.h>
-#include <netinet/ipfw/ip_fw_private.h>
-#include <netinet/ipfw/dn_heap.h>
 #include <netinet/ip_dummynet.h>
-#include <netinet/ipfw/ip_dn_private.h>
-#include <netinet/ipfw/dn_sched.h>
+
+#include <netpfil/ipfw/ip_fw_private.h>
+#include <netpfil/ipfw/dn_heap.h>
+#include <netpfil/ipfw/ip_dn_private.h>
+#include <netpfil/ipfw/dn_sched.h>
 
 /* which objects to copy */
 #define DN_C_LINK 	0x01
diff --git a/sys/netinet/ipfw/ip_fw2.c b/sys/netpfil/ipfw/ip_fw2.c
index 0dfab1f..e43a0ef 100644
--- a/sys/netinet/ipfw/ip_fw2.c
+++ b/sys/netpfil/ipfw/ip_fw2.c
@@ -70,7 +70,6 @@ __FBSDID("$FreeBSD$");
 #include <netinet/ip_var.h>
 #include <netinet/ip_icmp.h>
 #include <netinet/ip_fw.h>
-#include <netinet/ipfw/ip_fw_private.h>
 #include <netinet/ip_carp.h>
 #include <netinet/pim.h>
 #include <netinet/tcp_var.h>
@@ -86,6 +85,8 @@ __FBSDID("$FreeBSD$");
 #include <netinet6/ip6_var.h>
 #endif
 
+#include <netpfil/ipfw/ip_fw_private.h>
+
 #include <machine/in_cksum.h>	/* XXX for in_cksum */
 
 #ifdef MAC
diff --git a/sys/netinet/ipfw/ip_fw_dynamic.c b/sys/netpfil/ipfw/ip_fw_dynamic.c
index edf7639..28d2d51 100644
--- a/sys/netinet/ipfw/ip_fw_dynamic.c
+++ b/sys/netpfil/ipfw/ip_fw_dynamic.c
@@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$");
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>	/* ip_defttl */
 #include <netinet/ip_fw.h>
-#include <netinet/ipfw/ip_fw_private.h>
 #include <netinet/tcp_var.h>
 #include <netinet/udp.h>
 
@@ -67,6 +66,8 @@ __FBSDID("$FreeBSD$");
 #include <netinet6/ip6_var.h>
 #endif
 
+#include <netpfil/ipfw/ip_fw_private.h>
+
 #include <machine/in_cksum.h>	/* XXX for in_cksum */
 
 #ifdef MAC
diff --git a/sys/netinet/ipfw/ip_fw_log.c b/sys/netpfil/ipfw/ip_fw_log.c
index c0f8fcd..3cbb5fa 100644
--- a/sys/netinet/ipfw/ip_fw_log.c
+++ b/sys/netpfil/ipfw/ip_fw_log.c
@@ -58,7 +58,6 @@ __FBSDID("$FreeBSD$");
 #include <netinet/ip_icmp.h>
 #include <netinet/ip_var.h>
 #include <netinet/ip_fw.h>
-#include <netinet/ipfw/ip_fw_private.h>
 #include <netinet/tcp_var.h>
 #include <netinet/udp.h>
 
@@ -68,6 +67,8 @@ __FBSDID("$FreeBSD$");
 #include <netinet6/in6_var.h>	/* ip6_sprintf() */
 #endif
 
+#include <netpfil/ipfw/ip_fw_private.h>
+
 #ifdef MAC
 #include <security/mac/mac_framework.h>
 #endif
diff --git a/sys/netinet/ipfw/ip_fw_nat.c b/sys/netpfil/ipfw/ip_fw_nat.c
index dbeb254..6318633 100644
--- a/sys/netinet/ipfw/ip_fw_nat.c
+++ b/sys/netpfil/ipfw/ip_fw_nat.c
@@ -46,10 +46,11 @@ __FBSDID("$FreeBSD$");
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/ip_fw.h>
-#include <netinet/ipfw/ip_fw_private.h>
 #include <netinet/tcp.h>
 #include <netinet/udp.h>
 
+#include <netpfil/ipfw/ip_fw_private.h>
+
 #include <machine/in_cksum.h>	/* XXX for in_cksum */
 
 static VNET_DEFINE(eventhandler_tag, ifaddr_event_tag);
diff --git a/sys/netinet/ipfw/ip_fw_pfil.c b/sys/netpfil/ipfw/ip_fw_pfil.c
index 8d429e7..4ab9316 100644
--- a/sys/netinet/ipfw/ip_fw_pfil.c
+++ b/sys/netpfil/ipfw/ip_fw_pfil.c
@@ -60,9 +60,11 @@ __FBSDID("$FreeBSD$");
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
 #endif
-#include <netinet/ipfw/ip_fw_private.h>
+
 #include <netgraph/ng_ipfw.h>
 
+#include <netpfil/ipfw/ip_fw_private.h>
+
 #include <machine/in_cksum.h>
 
 static VNET_DEFINE(int, fw_enable) = 1;
diff --git a/sys/netinet/ipfw/ip_fw_private.h b/sys/netpfil/ipfw/ip_fw_private.h
index fb13a72..fb13a72 100644
--- a/sys/netinet/ipfw/ip_fw_private.h
+++ b/sys/netpfil/ipfw/ip_fw_private.h
diff --git a/sys/netinet/ipfw/ip_fw_sockopt.c b/sys/netpfil/ipfw/ip_fw_sockopt.c
index 2a5f4e7..a412eb0 100644
--- a/sys/netinet/ipfw/ip_fw_sockopt.c
+++ b/sys/netpfil/ipfw/ip_fw_sockopt.c
@@ -60,7 +60,8 @@ __FBSDID("$FreeBSD$");
 #include <netinet/in.h>
 #include <netinet/ip_var.h> /* hooks */
 #include <netinet/ip_fw.h>
-#include <netinet/ipfw/ip_fw_private.h>
+
+#include <netpfil/ipfw/ip_fw_private.h>
 
 #ifdef MAC
 #include <security/mac/mac_framework.h>
diff --git a/sys/netinet/ipfw/ip_fw_table.c b/sys/netpfil/ipfw/ip_fw_table.c
index 68a6220..a22fff9 100644
--- a/sys/netinet/ipfw/ip_fw_table.c
+++ b/sys/netpfil/ipfw/ip_fw_table.c
@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/lock.h>
 #include <sys/rwlock.h>
 #include <sys/socket.h>
+#include <sys/queue.h>
 #include <net/if.h>	/* ip_fw.h requires IFNAMSIZ */
 #include <net/radix.h>
 #include <net/route.h>
@@ -61,8 +62,8 @@ __FBSDID("$FreeBSD$");
 #include <netinet/in.h>
 #include <netinet/ip_var.h>	/* struct ipfw_rule_ref */
 #include <netinet/ip_fw.h>
-#include <sys/queue.h> /* LIST_HEAD */
-#include <netinet/ipfw/ip_fw_private.h>
+
+#include <netpfil/ipfw/ip_fw_private.h>
 
 #ifdef MAC
 #include <security/mac/mac_framework.h>
diff --git a/sys/netinet/ipfw/test/Makefile b/sys/netpfil/ipfw/test/Makefile
index c556a4b..c556a4b 100644
--- a/sys/netinet/ipfw/test/Makefile
+++ b/sys/netpfil/ipfw/test/Makefile
diff --git a/sys/netinet/ipfw/test/dn_test.h b/sys/netpfil/ipfw/test/dn_test.h
index 4e079bc..4e079bc 100644
--- a/sys/netinet/ipfw/test/dn_test.h
+++ b/sys/netpfil/ipfw/test/dn_test.h
diff --git a/sys/netinet/ipfw/test/main.c b/sys/netpfil/ipfw/test/main.c
index be9fdf5..be9fdf5 100644
--- a/sys/netinet/ipfw/test/main.c
+++ b/sys/netpfil/ipfw/test/main.c
diff --git a/sys/netinet/ipfw/test/mylist.h b/sys/netpfil/ipfw/test/mylist.h
index 6247f32..6247f32 100644
--- a/sys/netinet/ipfw/test/mylist.h
+++ b/sys/netpfil/ipfw/test/mylist.h
diff --git a/sys/netinet/ipfw/test/test_dn_heap.c b/sys/netpfil/ipfw/test/test_dn_heap.c
index d460cf2..d460cf2 100644
--- a/sys/netinet/ipfw/test/test_dn_heap.c
+++ b/sys/netpfil/ipfw/test/test_dn_heap.c
diff --git a/sys/netinet/ipfw/test/test_dn_sched.c b/sys/netpfil/ipfw/test/test_dn_sched.c
index ee46c95..ee46c95 100644
--- a/sys/netinet/ipfw/test/test_dn_sched.c
+++ b/sys/netpfil/ipfw/test/test_dn_sched.c
diff --git a/sys/contrib/pf/net/if_pflog.c b/sys/netpfil/pf/if_pflog.c
index 20feea2..20feea2 100644
--- a/sys/contrib/pf/net/if_pflog.c
+++ b/sys/netpfil/pf/if_pflog.c
diff --git a/sys/contrib/pf/net/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c
index 28af641..28af641 100644
--- a/sys/contrib/pf/net/if_pfsync.c
+++ b/sys/netpfil/pf/if_pfsync.c
diff --git a/sys/contrib/pf/netinet/in4_cksum.c b/sys/netpfil/pf/in4_cksum.c
index bf25baf..bf25baf 100644
--- a/sys/contrib/pf/netinet/in4_cksum.c
+++ b/sys/netpfil/pf/in4_cksum.c
diff --git a/sys/contrib/pf/net/pf.c b/sys/netpfil/pf/pf.c
index b66d6dd..a61b87b 100644
--- a/sys/contrib/pf/net/pf.c
+++ b/sys/netpfil/pf/pf.c
@@ -79,7 +79,6 @@ __FBSDID("$FreeBSD$");
 #include <netinet/ip_icmp.h>
 #include <netinet/icmp_var.h>
 #include <netinet/ip_var.h>
-#include <netinet/ipfw/ip_fw_private.h> /* XXX: only for DIR_IN/DIR_OUT */
 #include <netinet/tcp.h>
 #include <netinet/tcp_fsm.h>
 #include <netinet/tcp_seq.h>
@@ -88,6 +87,8 @@ __FBSDID("$FreeBSD$");
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>
 
+#include <netpfil/ipfw/ip_fw_private.h> /* XXX: only for DIR_IN/DIR_OUT */
+
 #ifdef INET6
 #include <netinet/ip6.h>
 #include <netinet/icmp6.h>
diff --git a/sys/contrib/pf/net/pf_if.c b/sys/netpfil/pf/pf_if.c
index c010b65..c010b65 100644
--- a/sys/contrib/pf/net/pf_if.c
+++ b/sys/netpfil/pf/pf_if.c
diff --git a/sys/contrib/pf/net/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c
index 032f051..032f051 100644
--- a/sys/contrib/pf/net/pf_ioctl.c
+++ b/sys/netpfil/pf/pf_ioctl.c
diff --git a/sys/contrib/pf/net/pf_lb.c b/sys/netpfil/pf/pf_lb.c
index 5b47852..5b47852 100644
--- a/sys/contrib/pf/net/pf_lb.c
+++ b/sys/netpfil/pf/pf_lb.c
diff --git a/sys/contrib/pf/net/pf_norm.c b/sys/netpfil/pf/pf_norm.c
index 9063fe8..9063fe8 100644
--- a/sys/contrib/pf/net/pf_norm.c
+++ b/sys/netpfil/pf/pf_norm.c
diff --git a/sys/contrib/pf/net/pf_osfp.c b/sys/netpfil/pf/pf_osfp.c
index 29d4a40..29d4a40 100644
--- a/sys/contrib/pf/net/pf_osfp.c
+++ b/sys/netpfil/pf/pf_osfp.c
diff --git a/sys/contrib/pf/net/pf_ruleset.c b/sys/netpfil/pf/pf_ruleset.c
index 77652a6..77652a6 100644
--- a/sys/contrib/pf/net/pf_ruleset.c
+++ b/sys/netpfil/pf/pf_ruleset.c
diff --git a/sys/contrib/pf/net/pf_table.c b/sys/netpfil/pf/pf_table.c
index fa88045..fa88045 100644
--- a/sys/contrib/pf/net/pf_table.c
+++ b/sys/netpfil/pf/pf_table.c