diff --git a/sys/conf/files b/sys/conf/files
index c39e861efe37..06d5ab462927 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,7 +1,15 @@
-#	$NetBSD: files,v 1.564 2002/10/10 22:17:59 thorpej Exp $
+#	$NetBSD: files,v 1.565 2002/10/10 22:45:45 thorpej Exp $
 
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
+#
+# device classes
+#
+devclass disk
+devclass tape
+devclass ifnet
+devclass tty
+
 # options understood by the machine-independent part of the kernel
 # (note, these are case-sensitive)
 #
@@ -69,12 +77,11 @@ defflag	opt_compat_netbsd.h	COMPAT_09 COMPAT_10 COMPAT_11 COMPAT_12
 #
 include "netatalk/files.netatalk"
 include "netccitt/files.netccitt"
+include "netinet/files.netinet"
+include "netinet/files.ipfilter"
+include "netinet6/files.netinet6"
+include "netinet6/files.netipsec"
 
-defflag	opt_tcp_debug.h		TCP_DEBUG
-defparam opt_tcp_debug.h	TCP_NDEBUG
-defflag	opt_inet.h		INET INET6 INET6_MD_CKSUM
-defflag	opt_ipsec.h		IPSEC IPSEC_ESP
-defparam opt_inet_conf.h	SUBNETSARELOCAL HOSTZEROBROADCAST
 defflag	opt_ns.h		NS NSIP		# NS network stack,
 						# XNS tunneled over IP
 defflag	opt_iso.h		ISO TPIP	# ISO network stack
@@ -83,7 +90,6 @@ defflag				IPX		# IPX network stack
 defflag				EON		# ISO clnp over IP
 defflag				NATM		# "native" ATM protocols
 defflag				PFIL_HOOKS	# pfil(9)
-defflag				IPFILTER_LOG	# logging of ip packets
 defflag	opt_ppp.h		PPP_DEFLATE PPP_BSDCOMP PPP_FILTER
 						# Include deflate or bsd
 						# compression, enable pppd
@@ -92,13 +98,6 @@ defflag	opt_ppp.h		PPP_DEFLATE PPP_BSDCOMP PPP_FILTER
 # networking options
 #
 defflag				GATEWAY
-defflag				MROUTING
-defflag				TCP_COMPAT_42
-
-defparam opt_tcp_space.h	TCP_RECVSPACE TCP_SENDSPACE
-
-defflag	opt_inet_csum.h		INET_CSUM_COUNTERS TCP_CSUM_COUNTERS
-				UDP_CSUM_COUNTERS
 
 defparam			SB_MAX
 
@@ -120,7 +119,6 @@ defparam opt_bufcache.h		BUFCACHE BUFPAGES
 #
 defflag				USERCONF
 
-
 #
 # Not entirely MI, but present on multiple arch's
 #
@@ -151,13 +149,6 @@ defparam opt_md.h		MEMORY_DISK_SERVER MEMORY_DISK_ROOT_SIZE
 #
 defflag	opt_perfctrs.h		PERFCTRS
 
-# device classes
-#
-devclass disk
-devclass tape
-devclass ifnet
-devclass tty
-
 # generic attributes
 #
 define	audiobus	{ }
@@ -909,7 +900,6 @@ defpseudo vlan:		ifnet, ether
 defpseudo bridge:	ifnet, ether
 defpseudo bpfilter:	ifnet, bpf_filter
 defpseudo strip:	ifnet
-defpseudo ipfilter:	ifnet
 defpseudo gre:		ifnet
 defpseudo gif:		ifnet
 defpseudo faith:	ifnet
@@ -1146,70 +1136,13 @@ file	net/route.c
 file	net/rtsock.c
 file	net/slcompress.c		sl | ppp | strip | irip
 file	net/zlib.c			(ppp & ppp_deflate) | ipsec
-file	netinet/fil.c			ipfilter
 file	netinet/if_arp.c		arp | netatalk		needs-flag
 file	netinet/if_atm.c		atm
-file	netinet/igmp.c			inet
-file	netinet/in.c			inet
 file	netinet/in_gif.c		gif & inet
-file	netinet/in_pcb.c		inet
-file	netinet/in_proto.c		inet
-file	netinet/ip_auth.c		ipfilter		needs-flag
 file	netinet/ip_ecn.c		ipsec | gif | stf
 file	netinet/ip_encap.c		inet | inet6
-file	netinet/ip_fil.c		ipfilter
-file	netinet/ip_flow.c		inet & gateway
-file	netinet/ip_frag.c		ipfilter
 file	netinet/ip_gre.c		inet & gre
-file	netinet/ip_icmp.c		inet
-file	netinet/ip_input.c		inet
-file	netinet/ip_log.c		ipfilter & ipfilter_log
-file	netinet/ip_mroute.c		inet & mrouting
-file	netinet/ip_nat.c		ipfilter
-file	netinet/ip_output.c		inet
-file	netinet/ip_proxy.c		ipfilter
-file	netinet/ip_state.c		ipfilter
-file	netinet/raw_ip.c		inet
-file	netinet/tcp_debug.c		inet | inet6
-file	netinet/tcp_input.c		inet | inet6
-file	netinet/tcp_output.c		inet | inet6
-file	netinet/tcp_subr.c		inet | inet6
-file	netinet/tcp_timer.c		inet | inet6
-file	netinet/tcp_usrreq.c		inet | inet6
-file	netinet/udp_usrreq.c		inet | inet6
-file	netinet6/ah_core.c		ipsec
-file	netinet6/ah_input.c		ipsec
-file	netinet6/ah_output.c		ipsec
-file	netinet6/dest6.c		inet6
-file	netinet6/esp_core.c		ipsec & ipsec_esp
-file	netinet6/esp_output.c		ipsec & ipsec_esp
-file	netinet6/esp_input.c		ipsec & ipsec_esp
-file	netinet6/esp_rijndael.c		ipsec & ipsec_esp
-file	netinet6/frag6.c		inet6
-file	netinet6/icmp6.c		inet6
-file	netinet6/in6.c			inet6
-file	netinet6/in6_cksum.c		inet6 & !inet6_md_cksum
 file	netinet6/in6_gif.c		gif & inet6
-file	netinet6/in6_ifattach.c		inet6
-file	netinet6/in6_pcb.c		inet6
-file	netinet6/in6_proto.c		inet6
-file	netinet6/in6_src.c		inet6
-file	netinet6/ip6_forward.c		inet6
-file	netinet6/ip6_input.c		inet6
-file	netinet6/ip6_mroute.c		inet6
-file	netinet6/ip6_output.c		inet6
-file	netinet6/ipcomp_core.c		ipsec
-file	netinet6/ipcomp_input.c		ipsec
-file	netinet6/ipcomp_output.c	ipsec
-file	netinet6/ipsec.c		ipsec
-file	netinet6/mld6.c			inet6
-file	netinet6/nd6.c			inet6
-file	netinet6/nd6_nbr.c		inet6
-file	netinet6/nd6_rtr.c		inet6
-file	netinet6/raw_ip6.c		inet6
-file	netinet6/route6.c		inet6
-file	netinet6/udp6_output.c		inet6
-file	netinet6/udp6_usrreq.c		inet6
 file	netiso/clnp_debug.c		iso
 file	netiso/clnp_er.c		iso
 file	netiso/clnp_frag.c		iso
@@ -1244,10 +1177,6 @@ file	netiso/tp_subr2.c		iso | tpip
 file	netiso/tp_timer.c		iso | tpip
 file	netiso/tp_trace.c		iso | tpip
 file	netiso/tp_usrreq.c		iso | tpip
-file	netkey/key.c			ipsec
-file	netkey/key_debug.c		ipsec
-file	netkey/keydb.c			ipsec
-file	netkey/keysock.c		ipsec
 file	netnatm/natm.c			natm
 file	netnatm/natm_pcb.c		natm
 file	netnatm/natm_proto.c		natm
diff --git a/sys/netinet/files.ipfilter b/sys/netinet/files.ipfilter
new file mode 100644
index 000000000000..83abea752f47
--- /dev/null
+++ b/sys/netinet/files.ipfilter
@@ -0,0 +1,14 @@
+#	$NetBSD: files.ipfilter,v 1.1 2002/10/10 22:45:46 thorpej Exp $
+
+defflag		IPFILTER_LOG		# logging of ip packets
+
+defpseudo ipfilter: ifnet		# XXX not really an ifnet
+
+file	netinet/fil.c		ipfilter
+file	netinet/ip_auth.c	ipfilter
+file	netinet/ip_fil.c	ipfilter
+file	netinet/ip_frag.c	ipfilter
+file	netinet/ip_log.c	ipfilter & ipfilter_log
+file	netinet/ip_nat.c	ipfilter
+file	netinet/ip_proxy.c	ipfilter
+file	netinet/ip_state.c	ipfilter
diff --git a/sys/netinet/files.netinet b/sys/netinet/files.netinet
new file mode 100644
index 000000000000..42700c2a87ce
--- /dev/null
+++ b/sys/netinet/files.netinet
@@ -0,0 +1,34 @@
+#	$NetBSD: files.netinet,v 1.1 2002/10/10 22:45:46 thorpej Exp $
+
+defflag opt_tcp_debug.h		TCP_DEBUG
+defparam opt_tcp_debug.h	TCP_NDEBUG
+defflag opt_inet.h		INET INET6 INET6_MD_CKSUM
+defparam opt_inet_conf.h	SUBNETSARELOCAL HOSTZEROBROADCAST
+
+defflag				MROUTING
+defflag				TCP_COMPAT_42
+
+defparam opt_tcp_space.h	TCP_RECVSPACE TCP_SENDSPACE
+
+defflag opt_inet_csum.h		INET_CSUM_COUNTERS TCP_CSUM_COUNTERS
+				UDP_CSUM_COUNTERS
+
+file	netinet/igmp.c		inet
+file	netinet/in.c		inet
+file	netinet/in_pcb.c	inet
+file	netinet/in_proto.c	inet
+file	netinet/ip_flow.c	inet & gateway
+file	netinet/ip_icmp.c	inet
+file	netinet/ip_input.c	inet
+file	netinet/ip_mroute.c	inet & mrouting
+file	netinet/ip_output.c	inet
+file	netinet/raw_ip.c	inet
+
+file	netinet/tcp_debug.c	inet | inet6
+file	netinet/tcp_input.c	inet | inet6
+file	netinet/tcp_output.c	inet | inet6
+file	netinet/tcp_subr.c	inet | inet6
+file	netinet/tcp_timer.c	inet | inet6
+file	netinet/tcp_usrreq.c	inet | inet6
+
+file	netinet/udp_usrreq.c	inet | inet6
diff --git a/sys/netinet6/files.netinet6 b/sys/netinet6/files.netinet6
new file mode 100644
index 000000000000..aef8924907c4
--- /dev/null
+++ b/sys/netinet6/files.netinet6
@@ -0,0 +1,26 @@
+#	$NetBSD: files.netinet6,v 1.1 2002/10/10 22:45:46 thorpej Exp $
+
+# NOTE: netinet/files.netinet must be included before this one!
+
+file	netinet6/dest6.c		inet6
+file	netinet6/frag6.c		inet6
+file	netinet6/icmp6.c		inet6
+file	netinet6/in6.c			inet6
+file	netinet6/in6_cksum.c		inet6 & !inet6_md_cksum
+file	netinet6/in6_ifattach.c		inet6
+file	netinet6/in6_pcb.c		inet6
+file	netinet6/in6_proto.c		inet6
+file	netinet6/in6_src.c		inet6
+file	netinet6/ip6_forward.c		inet6
+file	netinet6/ip6_input.c		inet6
+file	netinet6/ip6_mroute.c		inet6
+file	netinet6/ip6_output.c		inet6
+file	netinet6/mld6.c			inet6
+file	netinet6/nd6.c			inet6
+file	netinet6/nd6_nbr.c		inet6
+file	netinet6/nd6_rtr.c		inet6
+file	netinet6/raw_ip6.c		inet6
+file	netinet6/route6.c		inet6
+
+file	netinet6/udp6_output.c		inet6
+file	netinet6/udp6_usrreq.c		inet6
diff --git a/sys/netinet6/files.netipsec b/sys/netinet6/files.netipsec
new file mode 100644
index 000000000000..b0abe94d5d2b
--- /dev/null
+++ b/sys/netinet6/files.netipsec
@@ -0,0 +1,23 @@
+#	$NetBSD: files.netipsec,v 1.1 2002/10/10 22:45:46 thorpej Exp $
+
+defflag opt_ipsec.h		IPSEC IPSEC_ESP
+
+file	netinet6/ah_core.c		ipsec
+file	netinet6/ah_input.c		ipsec
+file	netinet6/ah_output.c		ipsec
+
+file	netinet6/esp_core.c		ipsec & ipsec_esp
+file	netinet6/esp_output.c		ipsec & ipsec_esp
+file	netinet6/esp_input.c		ipsec & ipsec_esp
+file	netinet6/esp_rijndael.c		ipsec & ipsec_esp
+
+file	netinet6/ipcomp_core.c		ipsec
+file	netinet6/ipcomp_input.c		ipsec
+file	netinet6/ipcomp_output.c	ipsec
+
+file	netinet6/ipsec.c		ipsec
+
+file	netkey/key.c			ipsec
+file	netkey/key_debug.c		ipsec
+file	netkey/keydb.c			ipsec
+file	netkey/keysock.c		ipsec