! 
! Rather than using hidden includes (with cicular depencies)
! directly include only the header files needed.
! 
! Before it was like (with '<' meaning included by):
! 
! vnet.h < vinet.h < in.h < vinet.h < ... (it stopped but to give you the idea)
!        < if_var.h
! 
! vinet6.h < ip6.h
! 
! The 4th file, vipsec.h is still included from ipsec.h and could
! actually be merged.
! 
! This leaves us with 14 modules depending on vnet.h and thus
!  opt_route.h because of MRT.
! 
Index: sys/nfsclient/nfs_vnops.c
===================================================================
--- sys/nfsclient/nfs_vnops.c	(revision 185561)
+++ sys/nfsclient/nfs_vnops.c	(working copy)
@@ -83,6 +83,7 @@
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netinet/in_var.h>
+#include <netinet/vinet.h>
 
 /* Defs */
 #define	TRUE	1
Index: sys/nfsclient/bootp_subr.c
===================================================================
--- sys/nfsclient/bootp_subr.c	(revision 185561)
+++ sys/nfsclient/bootp_subr.c	(working copy)
@@ -65,6 +65,7 @@
 #include <netinet/in.h>
 #include <net/if_types.h>
 #include <net/if_dl.h>
+#include <net/vnet.h>
 
 #include <rpc/rpcclnt.h>
 
Index: sys/nfsclient/nfs_diskless.c
===================================================================
--- sys/nfsclient/nfs_diskless.c	(revision 185561)
+++ sys/nfsclient/nfs_diskless.c	(working copy)
@@ -50,6 +50,8 @@
 #include <net/if_types.h>
 #include <net/if_var.h>
 #include <net/ethernet.h>
+#include <net/vnet.h>
+
 #include <netinet/in.h>
 #include <rpc/rpcclnt.h>
 #include <nfs/rpcv2.h>
Index: sys/kern/kern_uuid.c
===================================================================
--- sys/kern/kern_uuid.c	(revision 185561)
+++ sys/kern/kern_uuid.c	(working copy)
@@ -42,6 +42,7 @@
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
+#include <net/vnet.h>
 
 /*
  * See also:
Index: sys/kern/kern_poll.c
===================================================================
--- sys/kern/kern_poll.c	(revision 185561)
+++ sys/kern/kern_poll.c	(working copy)
@@ -40,6 +40,7 @@
 
 #include <net/if.h>			/* for IFF_* flags		*/
 #include <net/netisr.h>			/* for NETISR_POLL		*/
+#include <net/vnet.h>
 
 #include <sys/proc.h>
 #include <sys/resourcevar.h>
Index: sys/netinet/tcp_input.c
===================================================================
--- sys/netinet/tcp_input.c	(revision 185561)
+++ sys/netinet/tcp_input.c	(working copy)
@@ -87,7 +87,12 @@
 #ifdef TCPDEBUG
 #include <netinet/tcp_debug.h>
 #endif /* TCPDEBUG */
+#include <netinet/vinet.h>
 
+#ifdef INET6
+#include <netinet6/vinet6.h>
+#endif
+
 #ifdef IPSEC
 #include <netipsec/ipsec.h>
 #include <netipsec/ipsec6.h>
Index: sys/netinet/in.c
===================================================================
--- sys/netinet/in.c	(revision 185561)
+++ sys/netinet/in.c	(working copy)
@@ -53,6 +53,7 @@
 #include <netinet/in_var.h>
 #include <netinet/in_pcb.h>
 #include <netinet/ip_var.h>
+#include <netinet/vinet.h>
 
 static int in_mask2len(struct in_addr *);
 static void in_len2mask(struct in_addr *, int);
Index: sys/netinet/in.h
===================================================================
--- sys/netinet/in.h	(revision 185561)
+++ sys/netinet/in.h	(working copy)
@@ -743,8 +743,4 @@
 #undef __KAME_NETINET_IN_H_INCLUDED_
 #endif
 
-#ifdef _KERNEL
-#include <netinet/vinet.h>
-#endif
-
 #endif /* !_NETINET_IN_H_*/
Index: sys/netinet/ip_carp.c
===================================================================
--- sys/netinet/ip_carp.c	(revision 185561)
+++ sys/netinet/ip_carp.c	(working copy)
@@ -74,6 +74,7 @@
 #include <netinet/ip_var.h>
 #include <netinet/if_ether.h>
 #include <machine/in_cksum.h>
+#include <netinet/vinet.h>
 #endif
 
 #ifdef INET6
@@ -82,6 +83,7 @@
 #include <netinet6/ip6_var.h>
 #include <netinet6/scope6_var.h>
 #include <netinet6/nd6.h>
+#include <netinet6/vinet6.h>
 #endif
 
 #include <crypto/sha1.h>
Index: sys/netinet/tcp_subr.c
===================================================================
--- sys/netinet/tcp_subr.c	(revision 185561)
+++ sys/netinet/tcp_subr.c	(working copy)
@@ -94,7 +94,9 @@
 #ifdef TCPDEBUG
 #include <netinet/tcp_debug.h>
 #endif
+#include <netinet/vinet.h>
 #include <netinet6/ip6protosw.h>
+#include <netinet6/vinet6.h>
 
 #ifdef IPSEC
 #include <netipsec/ipsec.h>
Index: sys/netinet/raw_ip.c
===================================================================
--- sys/netinet/raw_ip.c	(revision 185561)
+++ sys/netinet/raw_ip.c	(working copy)
@@ -58,6 +58,7 @@
 
 #include <net/if.h>
 #include <net/route.h>
+#include <net/vnet.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
@@ -69,6 +70,7 @@
 
 #include <netinet/ip_fw.h>
 #include <netinet/ip_dummynet.h>
+#include <netinet/vinet.h>
 
 #ifdef IPSEC
 #include <netipsec/ipsec.h>
Index: sys/netinet/tcp_reass.c
===================================================================
--- sys/netinet/tcp_reass.c	(revision 185561)
+++ sys/netinet/tcp_reass.c	(working copy)
@@ -73,6 +73,7 @@
 #ifdef TCPDEBUG
 #include <netinet/tcp_debug.h>
 #endif /* TCPDEBUG */
+#include <netinet/vinet.h>
 
 #ifdef VIMAGE_GLOBALS
 static int tcp_reass_maxseg;
Index: sys/netinet/ip_divert.c
===================================================================
--- sys/netinet/ip_divert.c	(revision 185561)
+++ sys/netinet/ip_divert.c	(working copy)
@@ -74,6 +74,7 @@
 #include <netinet/ip_divert.h>
 #include <netinet/ip_var.h>
 #include <netinet/ip_fw.h>
+#include <netinet/vinet.h>
 
 #include <security/mac/mac_framework.h>
 
Index: sys/netinet/tcp_timer.c
===================================================================
--- sys/netinet/tcp_timer.c	(revision 185561)
+++ sys/netinet/tcp_timer.c	(working copy)
@@ -47,6 +47,7 @@
 #include <sys/systm.h>
 #include <sys/vimage.h>
 
+#include <net/if.h>
 #include <net/route.h>
 
 #include <netinet/in.h>
@@ -64,6 +65,7 @@
 #ifdef TCPDEBUG
 #include <netinet/tcp_debug.h>
 #endif
+#include <netinet/vinet.h>
 
 int	tcp_keepinit;
 SYSCTL_PROC(_net_inet_tcp, TCPCTL_KEEPINIT, keepinit, CTLTYPE_INT|CTLFLAG_RW,
Index: sys/netinet/tcp_sack.c
===================================================================
--- sys/netinet/tcp_sack.c	(revision 185561)
+++ sys/netinet/tcp_sack.c	(working copy)
@@ -119,6 +119,7 @@
 #ifdef TCPDEBUG
 #include <netinet/tcp_debug.h>
 #endif /* TCPDEBUG */
+#include <netinet/vinet.h>
 
 #include <machine/in_cksum.h>
 
Index: sys/netinet/in_pcb.c
===================================================================
--- sys/netinet/in_pcb.c	(revision 185561)
+++ sys/netinet/in_pcb.c	(working copy)
@@ -71,9 +71,11 @@
 #include <netinet/tcp_var.h>
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>
+#include <netinet/vinet.h>
 #ifdef INET6
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
+#include <netinet6/vinet6.h>
 #endif /* INET6 */
 
 
Index: sys/netinet/in_mcast.c
===================================================================
--- sys/netinet/in_mcast.c	(revision 185561)
+++ sys/netinet/in_mcast.c	(working copy)
@@ -53,6 +53,7 @@
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/route.h>
+#include <net/vnet.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
@@ -60,6 +61,7 @@
 #include <netinet/in_var.h>
 #include <netinet/ip_var.h>
 #include <netinet/igmp_var.h>
+#include <netinet/vinet.h>
 
 #ifndef __SOCKUNION_DECLARED
 union sockunion {
Index: sys/netinet/tcp_output.c
===================================================================
--- sys/netinet/tcp_output.c	(revision 185561)
+++ sys/netinet/tcp_output.c	(working copy)
@@ -51,6 +51,7 @@
 #include <sys/sysctl.h>
 #include <sys/vimage.h>
 
+#include <net/if.h>
 #include <net/route.h>
 
 #include <netinet/in.h>
@@ -74,6 +75,7 @@
 #ifdef TCPDEBUG
 #include <netinet/tcp_debug.h>
 #endif
+#include <netinet/vinet.h>
 
 #ifdef IPSEC
 #include <netipsec/ipsec.h>
Index: sys/netinet/tcp_hostcache.c
===================================================================
--- sys/netinet/tcp_hostcache.c	(revision 185561)
+++ sys/netinet/tcp_hostcache.c	(working copy)
@@ -92,6 +92,8 @@
 #endif
 #include <netinet/tcp.h>
 #include <netinet/tcp_var.h>
+#include <netinet/tcp_hostcache.h>
+#include <netinet/vinet.h>
 #ifdef INET6
 #include <netinet6/tcp6_var.h>
 #endif
Index: sys/netinet/ip_output.c
===================================================================
--- sys/netinet/ip_output.c	(revision 185561)
+++ sys/netinet/ip_output.c	(working copy)
@@ -59,6 +59,7 @@
 #ifdef RADIX_MPATH
 #include <net/radix_mpath.h>
 #endif
+#include <net/vnet.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
@@ -67,6 +68,7 @@
 #include <netinet/in_var.h>
 #include <netinet/ip_var.h>
 #include <netinet/ip_options.h>
+#include <netinet/vinet.h>
 
 #ifdef IPSEC
 #include <netinet/ip_ipsec.h>
Index: sys/netinet/ip_ipsec.c
===================================================================
--- sys/netinet/ip_ipsec.c	(revision 185561)
+++ sys/netinet/ip_ipsec.c	(working copy)
@@ -55,6 +55,7 @@
 #include <netinet/ip_var.h>
 #include <netinet/ip_options.h>
 #include <netinet/ip_ipsec.h>
+#include <netinet/vinet.h>
 
 #include <machine/in_cksum.h>
 
Index: sys/netinet/tcp_syncache.c
===================================================================
--- sys/netinet/tcp_syncache.c	(revision 185561)
+++ sys/netinet/tcp_syncache.c	(working copy)
@@ -85,6 +85,7 @@
 #ifdef INET6
 #include <netinet6/tcp6_var.h>
 #endif
+#include <netinet/vinet.h>
 
 #ifdef IPSEC
 #include <netipsec/ipsec.h>
Index: sys/netinet/ip_input.c
===================================================================
--- sys/netinet/ip_input.c	(revision 185561)
+++ sys/netinet/ip_input.c	(working copy)
@@ -60,6 +60,7 @@
 #include <net/if_dl.h>
 #include <net/route.h>
 #include <net/netisr.h>
+#include <net/vnet.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
@@ -70,6 +71,7 @@
 #include <netinet/ip_icmp.h>
 #include <netinet/ip_options.h>
 #include <machine/in_cksum.h>
+#include <netinet/vinet.h>
 #ifdef DEV_CARP
 #include <netinet/ip_carp.h>
 #endif
Index: sys/netinet/tcp_usrreq.c
===================================================================
--- sys/netinet/tcp_usrreq.c	(revision 185561)
+++ sys/netinet/tcp_usrreq.c	(working copy)
@@ -87,6 +87,7 @@
 #include <netinet/tcp_debug.h>
 #endif
 #include <netinet/tcp_offload.h>
+#include <netinet/vinet.h>
 
 /*
  * TCP protocol interface to socket abstraction.
Index: sys/netinet/in_gif.c
===================================================================
--- sys/netinet/in_gif.c	(revision 185561)
+++ sys/netinet/in_gif.c	(working copy)
@@ -59,6 +59,7 @@
 #include <netinet/in_var.h>
 #include <netinet/ip_encap.h>
 #include <netinet/ip_ecn.h>
+#include <netinet/vinet.h>
 
 #ifdef INET6
 #include <netinet/ip6.h>
Index: sys/netinet/ip_mroute.c
===================================================================
--- sys/netinet/ip_mroute.c	(revision 185561)
+++ sys/netinet/ip_mroute.c	(working copy)
@@ -96,6 +96,8 @@
 #include <netinet/pim.h>
 #include <netinet/pim_var.h>
 #include <netinet/udp.h>
+#include <netinet/vinet.h>
+
 #ifdef INET6
 #include <netinet/ip6.h>
 #include <netinet6/in6_var.h>
Index: sys/netinet/ip6.h
===================================================================
--- sys/netinet/ip6.h	(revision 185561)
+++ sys/netinet/ip6.h	(working copy)
@@ -347,8 +347,6 @@
 	}								\
 } while (/*CONSTCOND*/ 0)
 
-#include <netinet6/vinet6.h>
-
 #endif /*_KERNEL*/
 
 #endif /* not _NETINET_IP6_H_ */
Index: sys/netinet/sctp_os_bsd.h
===================================================================
--- sys/netinet/sctp_os_bsd.h	(revision 185561)
+++ sys/netinet/sctp_os_bsd.h	(working copy)
@@ -77,8 +77,8 @@
 #include <netinet/ip_var.h>
 #include <netinet/ip_icmp.h>
 #include <netinet/icmp_var.h>
+#include <netinet/vinet.h>
 
-
 #ifdef IPSEC
 #include <netipsec/ipsec.h>
 #include <netipsec/key.h>
Index: sys/netinet/ip_icmp.c
===================================================================
--- sys/netinet/ip_icmp.c	(revision 185561)
+++ sys/netinet/ip_icmp.c	(working copy)
@@ -61,6 +61,7 @@
 #include <netinet/tcp_var.h>
 #include <netinet/tcpip.h>
 #include <netinet/icmp_var.h>
+#include <netinet/vinet.h>
 
 #ifdef IPSEC
 #include <netipsec/ipsec.h>
Index: sys/netinet/tcp_offload.c
===================================================================
--- sys/netinet/tcp_offload.c	(revision 185561)
+++ sys/netinet/tcp_offload.c	(working copy)
@@ -50,6 +50,7 @@
 #include <netinet/tcp_var.h>
 #include <netinet/tcp_offload.h>
 #include <netinet/toedev.h>
+#include <netinet/vinet.h>
 
 uint32_t toedev_registration_count;
 
Index: sys/netinet/ip_options.c
===================================================================
--- sys/netinet/ip_options.c	(revision 185561)
+++ sys/netinet/ip_options.c	(working copy)
@@ -63,6 +63,7 @@
 #include <netinet/ip_options.h>
 #include <netinet/ip_icmp.h>
 #include <machine/in_cksum.h>
+#include <netinet/vinet.h>
 
 #include <sys/socketvar.h>
 
Index: sys/netinet/ip_id.c
===================================================================
--- sys/netinet/ip_id.c	(revision 185561)
+++ sys/netinet/ip_id.c	(working copy)
@@ -104,6 +104,7 @@
 
 MTX_SYSINIT(ip_id_mtx, &ip_id_mtx, "ip_id_mtx", MTX_DEF);
 
+SYSCTL_DECL(_net_inet_ip);
 SYSCTL_PROC(_net_inet_ip, OID_AUTO, random_id_period, CTLTYPE_INT|CTLFLAG_RW,
     &array_size, 0, sysctl_ip_id_change, "IU", "IP ID Array size");
 SYSCTL_INT(_net_inet_ip, OID_AUTO, random_id_collisions, CTLFLAG_RD,
Index: sys/netinet/if_ether.c
===================================================================
--- sys/netinet/if_ether.c	(revision 185561)
+++ sys/netinet/if_ether.c	(working copy)
@@ -61,10 +61,12 @@
 #include <net/netisr.h>
 #include <net/if_llc.h>
 #include <net/ethernet.h>
+#include <net/vnet.h>
 
 #include <netinet/in.h>
 #include <netinet/in_var.h>
 #include <netinet/if_ether.h>
+#include <netinet/vinet.h>
 
 #include <net/if_arc.h>
 #include <net/iso88025.h>
Index: sys/netinet/ip_fw2.c
===================================================================
--- sys/netinet/ip_fw2.c	(revision 185561)
+++ sys/netinet/ip_fw2.c	(working copy)
@@ -69,6 +69,7 @@
 #include <net/radix.h>
 #include <net/route.h>
 #include <net/pf_mtag.h>
+#include <net/vnet.h>
 
 #define	IPFW_INTERNAL	/* Access to protected data structures in ip_fw.h. */
 
@@ -91,6 +92,8 @@
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>
 #include <netinet/sctp.h>
+#include <netinet/vinet.h>
+
 #include <netgraph/ng_ipfw.h>
 
 #include <altq/if_altq.h>
Index: sys/netinet/ip_fastfwd.c
===================================================================
--- sys/netinet/ip_fastfwd.c	(revision 185561)
+++ sys/netinet/ip_fastfwd.c	(working copy)
@@ -103,6 +103,7 @@
 #include <netinet/ip_var.h>
 #include <netinet/ip_icmp.h>
 #include <netinet/ip_options.h>
+#include <netinet/vinet.h>
 
 #include <machine/in_cksum.h>
 
Index: sys/netinet/tcp_timewait.c
===================================================================
--- sys/netinet/tcp_timewait.c	(revision 185561)
+++ sys/netinet/tcp_timewait.c	(working copy)
@@ -88,6 +88,7 @@
 #include <netinet/tcp_debug.h>
 #endif
 #include <netinet6/ip6protosw.h>
+#include <netinet/vinet.h>
 
 #include <machine/in_cksum.h>
 
Index: sys/netinet/udp_usrreq.c
===================================================================
--- sys/netinet/udp_usrreq.c	(revision 185561)
+++ sys/netinet/udp_usrreq.c	(working copy)
@@ -81,6 +81,7 @@
 #endif
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>
+#include <netinet/vinet.h>
 
 #ifdef IPSEC
 #include <netipsec/ipsec.h>
Index: sys/netinet/vinet.h
===================================================================
--- sys/netinet/vinet.h	(revision 185561)
+++ sys/netinet/vinet.h	(working copy)
@@ -37,8 +37,6 @@
 #include <sys/sysctl.h>
 #include <sys/md5.h>
 
-#include <net/vnet.h>
-
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/in_var.h>
Index: sys/netinet/igmp.c
===================================================================
--- sys/netinet/igmp.c	(revision 185561)
+++ sys/netinet/igmp.c	(working copy)
@@ -61,6 +61,7 @@
 
 #include <net/if.h>
 #include <net/route.h>
+#include <net/vnet.h>
 
 #include <netinet/in.h>
 #include <netinet/in_var.h>
@@ -70,6 +71,7 @@
 #include <netinet/ip_options.h>
 #include <netinet/igmp.h>
 #include <netinet/igmp_var.h>
+#include <netinet/vinet.h>
 
 #include <machine/in_cksum.h>
 
Index: sys/netinet/in_rmx.c
===================================================================
--- sys/netinet/in_rmx.c	(revision 185561)
+++ sys/netinet/in_rmx.c	(working copy)
@@ -55,9 +55,12 @@
 
 #include <net/if.h>
 #include <net/route.h>
+#include <net/vnet.h>
+
 #include <netinet/in.h>
 #include <netinet/in_var.h>
 #include <netinet/ip_var.h>
+#include <netinet/vinet.h>
 
 extern int	in_inithead(void **head, int off);
 
Index: sys/netgraph/atm/ng_atm.c
===================================================================
--- sys/netgraph/atm/ng_atm.c	(revision 185561)
+++ sys/netgraph/atm/ng_atm.c	(working copy)
@@ -54,6 +54,7 @@
 #include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_atm.h>
+#include <net/vnet.h>
 
 #include <netgraph/ng_message.h>
 #include <netgraph/netgraph.h>
Index: sys/netgraph/ng_eiface.c
===================================================================
--- sys/netgraph/ng_eiface.c	(revision 185561)
+++ sys/netgraph/ng_eiface.c	(working copy)
@@ -43,6 +43,7 @@
 #include <net/if.h>
 #include <net/if_types.h>
 #include <net/netisr.h>
+#include <net/route.h>
 
 #include <netgraph/ng_message.h>
 #include <netgraph/netgraph.h>
Index: sys/netgraph/ng_ether.c
===================================================================
--- sys/netgraph/ng_ether.c	(revision 185561)
+++ sys/netgraph/ng_ether.c	(working copy)
@@ -63,6 +63,7 @@
 #include <net/if_var.h>
 #include <net/ethernet.h>
 #include <net/if_bridgevar.h>
+#include <net/vnet.h>
 
 #include <netgraph/ng_message.h>
 #include <netgraph/netgraph.h>
Index: sys/netgraph/ng_gif.c
===================================================================
--- sys/netgraph/ng_gif.c	(revision 185561)
+++ sys/netgraph/ng_gif.c	(working copy)
@@ -84,6 +84,7 @@
 #include <net/if_types.h>
 #include <net/if_var.h>
 #include <net/if_gif.h>
+#include <net/vnet.h>
 
 #include <netgraph/ng_message.h>
 #include <netgraph/netgraph.h>
Index: sys/modules/if_vlan/Makefile
===================================================================
--- sys/modules/if_vlan/Makefile	(revision 185561)
+++ sys/modules/if_vlan/Makefile	(working copy)
@@ -4,6 +4,6 @@
 
 KMOD=	if_vlan
 SRCS=	if_vlan.c
-SRCS+=	opt_inet.h opt_vlan.h
+SRCS+=	opt_inet.h opt_vlan.h opt_route.h
 
 .include <bsd.kmod.mk>
Index: sys/modules/linprocfs/Makefile
===================================================================
--- sys/modules/linprocfs/Makefile	(revision 185561)
+++ sys/modules/linprocfs/Makefile	(working copy)
@@ -5,7 +5,8 @@
 KMOD=	linprocfs
 SRCS=	vnode_if.h \
 	linprocfs.c \
-	opt_compat.h
+	opt_compat.h \
+	opt_route.h
 
 .if ${MACHINE_ARCH} == "amd64"
 CFLAGS+=-DCOMPAT_LINUX32
Index: sys/modules/netgraph/atm/atm/Makefile
===================================================================
--- sys/modules/netgraph/atm/atm/Makefile	(revision 185561)
+++ sys/modules/netgraph/atm/atm/Makefile	(working copy)
@@ -5,7 +5,7 @@
 .PATH: ${.CURDIR}/../../../../netgraph/atm
 
 KMOD=	ng_atm
-SRCS=	ng_atm.c
+SRCS=	ng_atm.c opt_route.h
 # CFLAGS+= -DNGATM_DEBUG
 
 .include <bsd.kmod.mk>
Index: sys/modules/netgraph/gif/Makefile
===================================================================
--- sys/modules/netgraph/gif/Makefile	(revision 185561)
+++ sys/modules/netgraph/gif/Makefile	(working copy)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 KMOD=	ng_gif
-SRCS= 	ng_gif.c opt_inet.h opt_inet6.h
+SRCS= 	ng_gif.c opt_inet.h opt_inet6.h opt_route.h
 
 .if !defined(KERNBUILDDIR)
 opt_inet.h:
Index: sys/modules/netgraph/ether/Makefile
===================================================================
--- sys/modules/netgraph/ether/Makefile	(revision 185561)
+++ sys/modules/netgraph/ether/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
 KMOD=	ng_ether
-SRCS= 	ng_ether.c
+SRCS= 	ng_ether.c opt_route.h
 
 .include <bsd.kmod.mk>
Index: sys/modules/ath_rate_onoe/Makefile
===================================================================
--- sys/modules/ath_rate_onoe/Makefile	(revision 185561)
+++ sys/modules/ath_rate_onoe/Makefile	(working copy)
@@ -33,7 +33,7 @@
 
 KMOD=	ath_rate
 SRCS=	onoe.c
-SRCS+=	device_if.h bus_if.h pci_if.h opt_inet.h opt_route.h opt_ah.h opt_wlan.h
+SRCS+=	device_if.h bus_if.h pci_if.h opt_inet.h opt_ah.h opt_wlan.h
 
 CFLAGS+=  -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal
 
Index: sys/modules/pf/Makefile
===================================================================
--- sys/modules/pf/Makefile	(revision 185561)
+++ sys/modules/pf/Makefile	(working copy)
@@ -9,7 +9,7 @@
 SRCS = 	pf.c pf_if.c pf_subr.c pf_osfp.c pf_ioctl.c pf_norm.c pf_table.c \
 	pf_ruleset.c \
 	in4_cksum.c \
-	opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h opt_mac.h
+	opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h opt_mac.h opt_route.h
 
 CFLAGS+=  -I${.CURDIR}/../../contrib/pf
 
Index: sys/modules/ae/Makefile
===================================================================
--- sys/modules/ae/Makefile	(revision 185561)
+++ sys/modules/ae/Makefile	(working copy)
@@ -3,6 +3,6 @@
 .PATH: ${.CURDIR}/../../dev/ae
 
 KMOD=	if_ae
-SRCS=	if_ae.c device_if.h bus_if.h pci_if.h miibus_if.h opt_route.h
+SRCS=	if_ae.c device_if.h bus_if.h pci_if.h miibus_if.h
 
 .include <bsd.kmod.mk>
Index: sys/modules/ip_mroute_mod/Makefile
===================================================================
--- sys/modules/ip_mroute_mod/Makefile	(revision 185561)
+++ sys/modules/ip_mroute_mod/Makefile	(working copy)
@@ -7,7 +7,7 @@
 KMOD=	ip_mroute
 
 SRCS=	ip_mroute.c
-SRCS+=	opt_inet.h opt_mac.h opt_mrouting.h
+SRCS+=	opt_inet.h opt_mac.h opt_mrouting.h opt_route.h
 SRCS+=	opt_inet6.h
 
 .if ${MK_INET6_SUPPORT} != "no"
Index: sys/modules/ath_rate_sample/Makefile
===================================================================
--- sys/modules/ath_rate_sample/Makefile	(revision 185561)
+++ sys/modules/ath_rate_sample/Makefile	(working copy)
@@ -33,7 +33,7 @@
 
 KMOD=	ath_rate
 SRCS=	sample.c
-SRCS+=	device_if.h bus_if.h pci_if.h opt_inet.h opt_route.h opt_ah.h opt_wlan.h
+SRCS+=	device_if.h bus_if.h pci_if.h opt_inet.h opt_ah.h opt_wlan.h
 
 CFLAGS+=  -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal
 
Index: sys/modules/if_ef/Makefile
===================================================================
--- sys/modules/if_ef/Makefile	(revision 185561)
+++ sys/modules/if_ef/Makefile	(working copy)
@@ -3,7 +3,7 @@
 .PATH: ${.CURDIR}/../../net
 
 KMOD=	if_ef
-SRCS=	if_ef.c opt_ipx.h opt_inet.h opt_ef.h
+SRCS=	if_ef.c opt_ipx.h opt_inet.h opt_ef.h opt_route.h
 
 .if defined(EFDEBUG)
 CFLAGS+= -DEF_DEBUG
Index: sys/modules/bridgestp/Makefile
===================================================================
--- sys/modules/bridgestp/Makefile	(revision 185561)
+++ sys/modules/bridgestp/Makefile	(working copy)
@@ -3,6 +3,6 @@
 .PATH: ${.CURDIR}/../../net
 
 KMOD=	bridgestp
-SRCS=	bridgestp.c
+SRCS=	bridgestp.c opt_route.h
 
 .include <bsd.kmod.mk>
Index: sys/modules/wlan/Makefile
===================================================================
--- sys/modules/wlan/Makefile	(revision 185561)
+++ sys/modules/wlan/Makefile	(working copy)
@@ -10,7 +10,8 @@
 	ieee80211_regdomain.c ieee80211_ht.c \
 	ieee80211_adhoc.c ieee80211_hostap.c ieee80211_monitor.c \
 	ieee80211_sta.c ieee80211_wds.c ieee80211_ddb.c
-SRCS+=	bus_if.h device_if.h opt_inet.h opt_ipx.h opt_wlan.h opt_ddb.h
+SRCS+=	bus_if.h device_if.h opt_inet.h opt_ipx.h opt_wlan.h opt_ddb.h \
+	opt_route.h
 
 .if !defined(KERNBUILDDIR)
 opt_wlan.h:
Index: sys/modules/nfsclient/Makefile
===================================================================
--- sys/modules/nfsclient/Makefile	(revision 185561)
+++ sys/modules/nfsclient/Makefile	(working copy)
@@ -10,7 +10,7 @@
 	opt_inet.h opt_nfs.h opt_bootp.h opt_nfsroot.h
 SRCS+=	nfs4_dev.c nfs4_idmap.c nfs4_socket.c nfs4_subs.c \
 	nfs4_vfs_subs.c  nfs4_vfsops.c nfs4_vn_subs.c nfs4_vnops.c
-SRCS+=	opt_inet6.h opt_kgssapi.h
+SRCS+=	opt_inet6.h opt_kgssapi.h opt_route.h
 
 # USE THE RPCCLNT:
 CFLAGS+= -DRPCCLNT_DEBUG
Index: sys/modules/ath_rate_amrr/Makefile
===================================================================
--- sys/modules/ath_rate_amrr/Makefile	(revision 185561)
+++ sys/modules/ath_rate_amrr/Makefile	(working copy)
@@ -33,7 +33,7 @@
 
 KMOD=	ath_rate
 SRCS=	amrr.c
-SRCS+=	device_if.h bus_if.h pci_if.h opt_inet.h opt_route.h opt_ah.h opt_wlan.h
+SRCS+=	device_if.h bus_if.h pci_if.h opt_inet.h opt_ah.h opt_wlan.h
 
 CFLAGS+=  -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal
 
Index: sys/modules/cxgb/iw_cxgb/Makefile
===================================================================
--- sys/modules/cxgb/iw_cxgb/Makefile	(revision 185561)
+++ sys/modules/cxgb/iw_cxgb/Makefile	(working copy)
@@ -7,7 +7,8 @@
 SRCS=   iw_cxgb.c iw_cxgb_cm.c iw_cxgb_hal.c 
 SRCS+=  iw_cxgb_provider.c iw_cxgb_qp.c iw_cxgb_resource.c
 SRCS+=  iw_cxgb_ev.c iw_cxgb_mem.c iw_cxgb_dbg.c iw_cxgb_cq.c
-SRCS+=  bus_if.h device_if.h opt_sched.h pci_if.h pcib_if.h opt_ktr.h opt_inet.h
+SRCS+=  bus_if.h device_if.h opt_sched.h pci_if.h pcib_if.h opt_ktr.h
+SRCS+=  opt_inet.h opt_route.h
 CFLAGS+= -g -I${CXGB}
 #CFLAGS+= -DDEBUG
 
Index: sys/modules/linux/Makefile
===================================================================
--- sys/modules/linux/Makefile	(revision 185561)
+++ sys/modules/linux/Makefile	(working copy)
@@ -13,7 +13,7 @@
 	linux${SFX}_machdep.c linux_mib.c linux_misc.c linux_signal.c \
 	linux_socket.c linux_stats.c linux_sysctl.c linux${SFX}_sysent.c \
 	linux${SFX}_sysvec.c linux_uid16.c linux_util.c linux_time.c \
-	opt_inet6.h opt_mac.h opt_compat.h opt_posix.h vnode_if.h \
+	opt_inet6.h opt_route.h opt_mac.h opt_compat.h opt_posix.h vnode_if.h \
 	device_if.h bus_if.h assym.s
 
 # XXX: for assym.s
Index: sys/modules/ipfw/Makefile
===================================================================
--- sys/modules/ipfw/Makefile	(revision 185561)
+++ sys/modules/ipfw/Makefile	(working copy)
@@ -6,7 +6,7 @@
 
 KMOD=	ipfw
 SRCS=	ip_fw2.c ip_fw_pfil.c
-SRCS+=	opt_inet6.h opt_ipsec.h opt_mac.h
+SRCS+=	opt_inet6.h opt_ipsec.h opt_mac.h opt_route.h
 
 CFLAGS+= -DIPFIREWALL
 CFLAGS+= -I${.CURDIR}/../../contrib/pf
Index: sys/modules/ath/Makefile
===================================================================
--- sys/modules/ath/Makefile	(revision 185561)
+++ sys/modules/ath/Makefile	(working copy)
@@ -66,7 +66,7 @@
 SRCS+=	${AR5212_SRCS}
 SRCS+=	${AR5416_SRCS}
 SRCS+=	${AR9160_SRCS}
-SRCS+=	device_if.h bus_if.h pci_if.h opt_inet.h opt_route.h opt_ath.h opt_ah.h
+SRCS+=	device_if.h bus_if.h pci_if.h opt_inet.h opt_ath.h opt_ah.h
 
 CFLAGS+=  -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal
 
Index: sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c
===================================================================
--- sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c	(revision 185561)
+++ sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c	(working copy)
@@ -78,6 +78,9 @@
 #include <netinet/tcp_seq.h>
 #include <netinet/tcp_syncache.h>
 #include <netinet/tcp_timer.h>
+#if __FreeBSD_version >= 800056
+#include <netinet/vinet.h>
+#endif
 #include <net/route.h>
 
 #include <t3cdev.h>
Index: sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
===================================================================
--- sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c	(revision 185561)
+++ sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c	(working copy)
@@ -62,6 +62,9 @@
 
 #include <net/if.h>
 #include <net/if_var.h>
+#if __FreeBSD_version >= 800056
+#include <net/vnet.h>
+#endif
 
 #include <netinet/in.h>
 
Index: sys/net80211/ieee80211_ddb.c
===================================================================
--- sys/net80211/ieee80211_ddb.c	(revision 185561)
+++ sys/net80211/ieee80211_ddb.c	(working copy)
@@ -44,6 +44,7 @@
 #include <net/if_media.h>
 #include <net/if_types.h>
 #include <net/ethernet.h>
+#include <net/vnet.h>
 
 #include <net80211/ieee80211_var.h>
 
Index: sys/compat/linprocfs/linprocfs.c
===================================================================
--- sys/compat/linprocfs/linprocfs.c	(revision 185561)
+++ sys/compat/linprocfs/linprocfs.c	(working copy)
@@ -76,6 +76,7 @@
 #include <sys/vimage.h>
 
 #include <net/if.h>
+#include <net/vnet.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
Index: sys/compat/linux/linux_socket.c
===================================================================
--- sys/compat/linux/linux_socket.c	(revision 185561)
+++ sys/compat/linux/linux_socket.c	(working copy)
@@ -52,12 +52,15 @@
 #include <sys/un.h>
 #include <sys/vimage.h>
 
+#include <net/if.h>
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #ifdef INET6
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
+#include <netinet6/in6_var.h>
+#include <netinet6/vinet6.h>
 #endif
 
 #ifdef COMPAT_LINUX32
Index: sys/compat/linux/linux_ioctl.c
===================================================================
--- sys/compat/linux/linux_ioctl.c	(revision 185561)
+++ sys/compat/linux/linux_ioctl.c	(working copy)
@@ -63,6 +63,7 @@
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
+#include <net/vnet.h>
 
 #ifdef COMPAT_LINUX32
 #include <machine/../linux32/linux.h>
Index: sys/net/if.c
===================================================================
--- sys/net/if.c	(revision 185561)
+++ sys/net/if.c	(working copy)
@@ -67,6 +67,7 @@
 #include <net/if_var.h>
 #include <net/radix.h>
 #include <net/route.h>
+#include <net/vnet.h>
 
 #if defined(INET) || defined(INET6)
 /*XXX*/
@@ -79,6 +80,7 @@
 #endif
 #ifdef INET
 #include <netinet/if_ether.h>
+#include <netinet/vinet.h>
 #endif
 #ifdef DEV_CARP
 #include <netinet/ip_carp.h>
Index: sys/net/if_stf.c
===================================================================
--- sys/net/if_stf.c	(revision 185561)
+++ sys/net/if_stf.c	(working copy)
@@ -107,6 +107,7 @@
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/in_var.h>
+#include <netinet/vinet.h>
 
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
Index: sys/net/route.c
===================================================================
--- sys/net/route.c	(revision 185561)
+++ sys/net/route.c	(working copy)
@@ -57,9 +57,11 @@
 #ifdef RADIX_MPATH
 #include <net/radix_mpath.h>
 #endif
+#include <net/vnet.h>
 
 #include <netinet/in.h>
 #include <netinet/ip_mroute.h>
+#include <netinet/vinet.h>
 
 #include <vm/uma.h>
 
Index: sys/net/if_ef.c
===================================================================
--- sys/net/if_ef.c	(revision 185561)
+++ sys/net/if_ef.c	(working copy)
@@ -50,6 +50,7 @@
 #include <net/netisr.h>
 #include <net/route.h>
 #include <net/bpf.h>
+#include <net/vnet.h>
 
 #ifdef INET
 #include <netinet/in.h>
Index: sys/net/if_bridge.c
===================================================================
--- sys/net/if_bridge.c	(revision 185561)
+++ sys/net/if_bridge.c	(working copy)
@@ -115,9 +115,11 @@
 #include <netinet/in_var.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
+#include <netinet/vinet.h>
 #ifdef INET6
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
+#include <netinet6/vinet6.h>
 #endif
 #ifdef DEV_CARP
 #include <netinet/ip_carp.h>
Index: sys/net/bridgestp.c
===================================================================
--- sys/net/bridgestp.c	(revision 185561)
+++ sys/net/bridgestp.c	(working copy)
@@ -56,6 +56,7 @@
 #include <net/if_types.h>
 #include <net/if_llc.h>
 #include <net/if_media.h>
+#include <net/vnet.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
Index: sys/net/raw_cb.c
===================================================================
--- sys/net/raw_cb.c	(revision 185561)
+++ sys/net/raw_cb.c	(working copy)
@@ -46,6 +46,7 @@
 
 #include <net/if.h>
 #include <net/raw_cb.h>
+#include <net/vnet.h>
 
 /*
  * Routines to manage the raw protocol control blocks.
Index: sys/net/if_vlan.c
===================================================================
--- sys/net/if_vlan.c	(revision 185561)
+++ sys/net/if_vlan.c	(working copy)
@@ -64,6 +64,7 @@
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #include <net/if_vlan_var.h>
+#include <net/vnet.h>
 
 #define VLANNAME	"vlan"
 #define	VLAN_DEF_HWIDTH	4
Index: sys/net/if_ethersubr.c
===================================================================
--- sys/net/if_ethersubr.c	(revision 185561)
+++ sys/net/if_ethersubr.c	(working copy)
@@ -63,6 +63,7 @@
 #include <net/if_bridgevar.h>
 #include <net/if_vlan_var.h>
 #include <net/pf_mtag.h>
+#include <net/vnet.h>
 
 #if defined(INET) || defined(INET6)
 #include <netinet/in.h>
Index: sys/net/if_mib.c
===================================================================
--- sys/net/if_mib.c	(revision 185561)
+++ sys/net/if_mib.c	(working copy)
@@ -38,6 +38,7 @@
 
 #include <net/if.h>
 #include <net/if_mib.h>
+#include <net/vnet.h>
 
 /*
  * A sysctl(3) MIB for generic interface information.  This information
Index: sys/net/if_loop.c
===================================================================
--- sys/net/if_loop.c	(revision 185561)
+++ sys/net/if_loop.c	(working copy)
@@ -57,6 +57,7 @@
 #include <net/netisr.h>
 #include <net/route.h>
 #include <net/bpf.h>
+#include <net/vnet.h>
 
 #ifdef	INET
 #include <netinet/in.h>
Index: sys/net/rtsock.c
===================================================================
--- sys/net/rtsock.c	(revision 185561)
+++ sys/net/rtsock.c	(working copy)
@@ -54,6 +54,7 @@
 #include <net/netisr.h>
 #include <net/raw_cb.h>
 #include <net/route.h>
+#include <net/vnet.h>
 
 #include <netinet/in.h>
 #ifdef INET6
Index: sys/net/if_faith.c
===================================================================
--- sys/net/if_faith.c	(revision 185561)
+++ sys/net/if_faith.c	(working copy)
@@ -77,6 +77,7 @@
 #include <netinet6/in6_var.h>
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
+#include <netinet6/vinet6.h>
 #endif
 
 #define FAITHNAME	"faith"
Index: sys/net/if_var.h
===================================================================
--- sys/net/if_var.h	(revision 185561)
+++ sys/net/if_var.h	(working copy)
@@ -720,8 +720,6 @@
 int    ether_poll_deregister(struct ifnet *ifp);
 #endif /* DEVICE_POLLING */
 
-#include <net/vnet.h>
-
 #endif /* _KERNEL */
 
 #endif /* !_NET_IF_VAR_H_ */
Index: sys/net/raw_usrreq.c
===================================================================
--- sys/net/raw_usrreq.c	(revision 185561)
+++ sys/net/raw_usrreq.c	(working copy)
@@ -48,6 +48,7 @@
 
 #include <net/if.h>
 #include <net/raw_cb.h>
+#include <net/vnet.h>
 
 MTX_SYSINIT(rawcb_mtx, &rawcb_mtx, "rawcb", MTX_DEF);
 
Index: sys/net/if_gre.c
===================================================================
--- sys/net/if_gre.c	(revision 185561)
+++ sys/net/if_gre.c	(working copy)
@@ -79,6 +79,7 @@
 #include <netinet/ip_gre.h>
 #include <netinet/ip_var.h>
 #include <netinet/ip_encap.h>
+#include <netinet/vinet.h>
 #else
 #error "Huh? if_gre without inet?"
 #endif
Index: sys/net/if_spppsubr.c
===================================================================
--- sys/net/if_spppsubr.c	(revision 185561)
+++ sys/net/if_spppsubr.c	(working copy)
@@ -56,6 +56,7 @@
 #ifdef INET
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
+#include <netinet/vinet.h>
 #endif
 
 #ifdef INET6
Index: sys/netinet6/in6_ifattach.c
===================================================================
--- sys/netinet6/in6_ifattach.c	(revision 185561)
+++ sys/netinet6/in6_ifattach.c	(working copy)
@@ -46,11 +46,13 @@
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #include <net/route.h>
+#include <net/vnet.h>
 
 #include <netinet/in.h>
 #include <netinet/in_var.h>
 #include <netinet/if_ether.h>
 #include <netinet/in_pcb.h>
+#include <netinet/vinet.h>
 
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
@@ -60,6 +62,7 @@
 #include <netinet6/ip6_var.h>
 #include <netinet6/nd6.h>
 #include <netinet6/scope6_var.h>
+#include <netinet6/vinet6.h>
 
 #ifdef VIMAGE_GLOBALS
 unsigned long in6_maxmtu;
Index: sys/netinet6/scope6.c
===================================================================
--- sys/netinet6/scope6.c	(revision 185561)
+++ sys/netinet6/scope6.c	(working copy)
@@ -43,12 +43,14 @@
 
 #include <net/route.h>
 #include <net/if.h>
+#include <net/vnet.h>
 
 #include <netinet/in.h>
+
 #include <netinet/ip6.h>
-
 #include <netinet6/in6_var.h>
 #include <netinet6/scope6_var.h>
+#include <netinet6/vinet6.h>
 
 
 /*
Index: sys/netinet6/frag6.c
===================================================================
--- sys/netinet6/frag6.c	(revision 185561)
+++ sys/netinet6/frag6.c	(working copy)
@@ -57,6 +57,7 @@
 #include <netinet/icmp6.h>
 #include <netinet/in_systm.h>	/* for ECN definitions */
 #include <netinet/ip.h>		/* for ECN definitions */
+#include <netinet6/vinet6.h>
 
 #include <security/mac/mac_framework.h>
 
Index: sys/netinet6/raw_ip6.c
===================================================================
--- sys/netinet6/raw_ip6.c	(revision 185561)
+++ sys/netinet6/raw_ip6.c	(working copy)
@@ -84,12 +84,15 @@
 #include <net/if.h>
 #include <net/if_types.h>
 #include <net/route.h>
+#include <net/vnet.h>
 
 #include <netinet/in.h>
 #include <netinet/in_var.h>
 #include <netinet/in_systm.h>
+#include <netinet/in_pcb.h>
+#include <netinet/vinet.h>
+
 #include <netinet/icmp6.h>
-#include <netinet/in_pcb.h>
 #include <netinet/ip6.h>
 #include <netinet6/ip6protosw.h>
 #include <netinet6/ip6_mroute.h>
@@ -98,6 +101,7 @@
 #include <netinet6/nd6.h>
 #include <netinet6/raw_ip6.h>
 #include <netinet6/scope6_var.h>
+#include <netinet6/vinet6.h>
 
 #ifdef IPSEC
 #include <netipsec/ipsec.h>
Index: sys/netinet6/ip6_output.c
===================================================================
--- sys/netinet6/ip6_output.c	(revision 185561)
+++ sys/netinet6/ip6_output.c	(working copy)
@@ -84,6 +84,7 @@
 #include <net/netisr.h>
 #include <net/route.h>
 #include <net/pfil.h>
+#include <net/vnet.h>
 
 #include <netinet/in.h>
 #include <netinet/in_var.h>
@@ -94,6 +95,7 @@
 #include <netinet/in_pcb.h>
 #include <netinet/tcp_var.h>
 #include <netinet6/nd6.h>
+#include <netinet/vinet.h>
 
 #ifdef IPSEC
 #include <netipsec/ipsec.h>
@@ -104,6 +106,7 @@
 
 #include <netinet6/ip6protosw.h>
 #include <netinet6/scope6_var.h>
+#include <netinet6/vinet6.h>
 
 static MALLOC_DEFINE(M_IP6MOPTS, "ip6_moptions", "internet multicast options");
 
Index: sys/netinet6/icmp6.c
===================================================================
--- sys/netinet6/icmp6.c	(revision 185561)
+++ sys/netinet6/icmp6.c	(working copy)
@@ -87,6 +87,7 @@
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #include <net/route.h>
+#include <net/vnet.h>
 
 #include <netinet/in.h>
 #include <netinet/in_pcb.h>
@@ -94,6 +95,8 @@
 #include <netinet/ip6.h>
 #include <netinet/icmp6.h>
 #include <netinet/tcp_var.h>
+#include <netinet/vinet.h>
+
 #include <netinet6/in6_ifattach.h>
 #include <netinet6/in6_pcb.h>
 #include <netinet6/ip6protosw.h>
@@ -101,6 +104,7 @@
 #include <netinet6/scope6_var.h>
 #include <netinet6/mld6_var.h>
 #include <netinet6/nd6.h>
+#include <netinet6/vinet6.h>
 
 #ifdef IPSEC
 #include <netipsec/ipsec.h>
Index: sys/netinet6/in6_proto.c
===================================================================
--- sys/netinet6/in6_proto.c	(revision 185561)
+++ sys/netinet6/in6_proto.c	(working copy)
@@ -128,6 +128,7 @@
 #endif /* IPSEC */
 
 #include <netinet6/ip6protosw.h>
+#include <netinet6/vinet6.h>
 
 /*
  * TCP/IP protocol family: IP6, ICMP6, UDP, TCP.
Index: sys/netinet6/udp6_usrreq.c
===================================================================
--- sys/netinet6/udp6_usrreq.c	(revision 185561)
+++ sys/netinet6/udp6_usrreq.c	(working copy)
@@ -103,11 +103,14 @@
 #include <netinet/ip_var.h>
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>
+#include <netinet/vinet.h>
+
 #include <netinet6/ip6protosw.h>
 #include <netinet6/ip6_var.h>
 #include <netinet6/in6_pcb.h>
 #include <netinet6/udp6_var.h>
 #include <netinet6/scope6_var.h>
+#include <netinet6/vinet6.h>
 
 #ifdef IPSEC
 #include <netipsec/ipsec.h>
Index: sys/netinet6/ip6_ipsec.c
===================================================================
--- sys/netinet6/ip6_ipsec.c	(revision 185561)
+++ sys/netinet6/ip6_ipsec.c	(working copy)
@@ -72,6 +72,7 @@
 
 #include <netinet6/ip6_ipsec.h>
 #include <netinet6/ip6_var.h>
+#include <netinet6/vinet6.h>
 
 extern	struct protosw inet6sw[];
 
Index: sys/netinet6/ip6_forward.c
===================================================================
--- sys/netinet6/ip6_forward.c	(revision 185561)
+++ sys/netinet6/ip6_forward.c	(working copy)
@@ -65,6 +65,7 @@
 #include <netinet6/scope6_var.h>
 #include <netinet/icmp6.h>
 #include <netinet6/nd6.h>
+#include <netinet6/vinet6.h>
 
 #include <netinet/in_pcb.h>
 
Index: sys/netinet6/in6_rmx.c
===================================================================
--- sys/netinet6/in6_rmx.c	(revision 185561)
+++ sys/netinet6/in6_rmx.c	(working copy)
@@ -89,6 +89,8 @@
 
 #include <net/if.h>
 #include <net/route.h>
+#include <net/vnet.h>
+
 #include <netinet/in.h>
 #include <netinet/ip_var.h>
 #include <netinet/in_var.h>
@@ -98,6 +100,7 @@
 
 #include <netinet/icmp6.h>
 #include <netinet6/nd6.h>
+#include <netinet6/vinet6.h>
 
 #include <netinet/tcp.h>
 #include <netinet/tcp_seq.h>
Index: sys/netinet6/dest6.c
===================================================================
--- sys/netinet6/dest6.c	(revision 185561)
+++ sys/netinet6/dest6.c	(working copy)
@@ -55,6 +55,7 @@
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
 #include <netinet/icmp6.h>
+#include <netinet6/vinet6.h>
 
 /*
  * Destination options header processing.
Index: sys/netinet6/nd6.c
===================================================================
--- sys/netinet6/nd6.c	(revision 185561)
+++ sys/netinet6/nd6.c	(working copy)
@@ -58,6 +58,7 @@
 #include <net/iso88025.h>
 #include <net/fddi.h>
 #include <net/route.h>
+#include <net/vnet.h>
 
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
@@ -67,6 +68,7 @@
 #include <netinet6/scope6_var.h>
 #include <netinet6/nd6.h>
 #include <netinet/icmp6.h>
+#include <netinet6/vinet6.h>
 
 #include <sys/limits.h>
 #include <sys/vimage.h>
Index: sys/netinet6/nd6_nbr.c
===================================================================
--- sys/netinet6/nd6_nbr.c	(revision 185561)
+++ sys/netinet6/nd6_nbr.c	(working copy)
@@ -70,6 +70,7 @@
 #include <netinet6/scope6_var.h>
 #include <netinet6/nd6.h>
 #include <netinet/icmp6.h>
+#include <netinet6/vinet6.h>
 
 #ifdef DEV_CARP
 #include <netinet/ip_carp.h>
Index: sys/netinet6/in6.c
===================================================================
--- sys/netinet6/in6.c	(revision 185561)
+++ sys/netinet6/in6.c	(working copy)
@@ -84,6 +84,7 @@
 #include <net/if_types.h>
 #include <net/route.h>
 #include <net/if_dl.h>
+#include <net/vnet.h>
 
 #include <netinet/in.h>
 #include <netinet/in_var.h>
@@ -100,6 +101,7 @@
 #include <netinet6/in6_ifattach.h>
 #include <netinet6/scope6_var.h>
 #include <netinet6/in6_pcb.h>
+#include <netinet6/vinet6.h>
 
 MALLOC_DEFINE(M_IP6MADDR, "in6_multi", "internet multicast address");
 
Index: sys/netinet6/mld6.c
===================================================================
--- sys/netinet6/mld6.c	(revision 185561)
+++ sys/netinet6/mld6.c	(working copy)
@@ -91,6 +91,7 @@
 #include <netinet6/scope6_var.h>
 #include <netinet/icmp6.h>
 #include <netinet6/mld6_var.h>
+#include <netinet6/vinet6.h>
 
 /*
  * Protocol constants
Index: sys/netinet6/in6_src.c
===================================================================
--- sys/netinet6/in6_src.c	(revision 185561)
+++ sys/netinet6/in6_src.c	(working copy)
@@ -99,12 +99,15 @@
 #include <netinet/ip_var.h>
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>
+#include <netinet/vinet.h>
+
 #include <netinet6/in6_var.h>
 #include <netinet/ip6.h>
 #include <netinet6/in6_pcb.h>
 #include <netinet6/ip6_var.h>
 #include <netinet6/scope6_var.h>
 #include <netinet6/nd6.h>
+#include <netinet6/vinet6.h>
 
 static struct mtx addrsel_lock;
 #define	ADDRSEL_LOCK_INIT()	mtx_init(&addrsel_lock, "addrsel_lock", NULL, MTX_DEF)
Index: sys/netinet6/ip6_input.c
===================================================================
--- sys/netinet6/ip6_input.c	(revision 185561)
+++ sys/netinet6/ip6_input.c	(working copy)
@@ -88,12 +88,14 @@
 #include <net/route.h>
 #include <net/netisr.h>
 #include <net/pfil.h>
+#include <net/vnet.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #ifdef INET
 #include <netinet/ip.h>
 #include <netinet/ip_icmp.h>
+#include <netinet/vinet.h>
 #endif /* INET */
 #include <netinet/ip6.h>
 #include <netinet6/in6_var.h>
@@ -103,6 +105,7 @@
 #include <netinet6/scope6_var.h>
 #include <netinet6/in6_ifattach.h>
 #include <netinet6/nd6.h>
+#include <netinet6/vinet6.h>
 
 #ifdef IPSEC
 #include <netipsec/ipsec.h>
Index: sys/netinet6/nd6_rtr.c
===================================================================
--- sys/netinet6/nd6_rtr.c	(revision 185561)
+++ sys/netinet6/nd6_rtr.c	(working copy)
@@ -53,6 +53,7 @@
 #include <net/if_dl.h>
 #include <net/route.h>
 #include <net/radix.h>
+#include <net/vnet.h>
 
 #include <netinet/in.h>
 #include <netinet6/in6_var.h>
@@ -62,6 +63,7 @@
 #include <netinet6/nd6.h>
 #include <netinet/icmp6.h>
 #include <netinet6/scope6_var.h>
+#include <netinet6/vinet6.h>
 
 #define SDL(s)	((struct sockaddr_dl *)s)
 
Index: sys/netinet6/in6_pcb.c
===================================================================
--- sys/netinet6/in6_pcb.c	(revision 185561)
+++ sys/netinet6/in6_pcb.c	(working copy)
@@ -96,12 +96,14 @@
 #include <netinet/tcp_var.h>
 #include <netinet/ip6.h>
 #include <netinet/ip_var.h>
+#include <netinet/vinet.h>
 
 #include <netinet6/ip6_var.h>
 #include <netinet6/nd6.h>
 #include <netinet/in_pcb.h>
 #include <netinet6/in6_pcb.h>
 #include <netinet6/scope6_var.h>
+#include <netinet6/vinet6.h>
 
 #include <security/mac/mac_framework.h>
 
Index: sys/netinet6/vinet6.h
===================================================================
--- sys/netinet6/vinet6.h	(revision 185561)
+++ sys/netinet6/vinet6.h	(working copy)
@@ -33,17 +33,19 @@
 #ifndef _NETINET6_VINET6_H_
 #define _NETINET6_VINET6_H_
 
-#include <sys/socket.h>
-#include <netinet/ip6.h>
-#include <net/if.h>
+#include <sys/callout.h>
+#include <sys/queue.h>
+#include <sys/types.h>
+
+#include <net/if_var.h>
+
+#include <netinet/icmp6.h>
+#include <netinet/in.h>
+
 #include <netinet6/ip6_var.h>
+#include <netinet6/nd6.h>
 #include <netinet6/raw_ip6.h>
-#include <netinet/icmp6.h>
 #include <netinet6/scope6_var.h>
-#include <netinet6/in6_ifattach.h>
-#include <netinet6/in6_var.h>
-#include <netinet6/nd6.h>
-#include <netinet/in_pcb.h>
 
 struct vnet_inet6 {
 	struct in6_ifaddr *		_in6_ifaddr;
Index: sys/netinet6/in6_gif.c
===================================================================
--- sys/netinet6/in6_gif.c	(revision 185561)
+++ sys/netinet6/in6_gif.c	(working copy)
@@ -66,6 +66,7 @@
 #include <netinet/ip_ecn.h>
 #ifdef INET6
 #include <netinet6/ip6_ecn.h>
+#include <netinet6/vinet6.h>
 #endif
 
 #include <net/if_gif.h>
Index: sys/netinet6/route6.c
===================================================================
--- sys/netinet6/route6.c	(revision 185561)
+++ sys/netinet6/route6.c	(working copy)
@@ -51,6 +51,7 @@
 #include <netinet6/scope6_var.h>
 
 #include <netinet/icmp6.h>
+#include <netinet6/vinet6.h>
 
 #if 0
 static int ip6_rthdr0 __P((struct mbuf *, struct ip6_hdr *,
Index: sys/netinet6/ip6_mroute.c
===================================================================
--- sys/netinet6/ip6_mroute.c	(revision 185561)
+++ sys/netinet6/ip6_mroute.c	(working copy)
@@ -107,10 +107,12 @@
 #include <net/if_types.h>
 #include <net/raw_cb.h>
 #include <net/route.h>
+#include <net/vnet.h>
 
 #include <netinet/in.h>
 #include <netinet/in_var.h>
 #include <netinet/icmp6.h>
+#include <netinet/vinet.h>
 
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
@@ -120,6 +122,7 @@
 #include <netinet6/ip6protosw.h>
 #include <netinet6/pim6.h>
 #include <netinet6/pim6_var.h>
+#include <netinet6/vinet6.h>
 
 static MALLOC_DEFINE(M_MRTABLE6, "mf6c", "multicast forwarding cache entry");
 
Index: sys/contrib/altq/altq/altq_subr.c
===================================================================
--- sys/contrib/altq/altq/altq_subr.c	(revision 185561)
+++ sys/contrib/altq/altq/altq_subr.c	(working copy)
@@ -51,6 +51,7 @@
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
+#include <net/vnet.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
Index: sys/contrib/rdma/rdma_cma.c
===================================================================
--- sys/contrib/rdma/rdma_cma.c	(revision 185561)
+++ sys/contrib/rdma/rdma_cma.c	(working copy)
@@ -51,6 +51,7 @@
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netinet/in_pcb.h>
+#include <netinet/vinet.h>
 
 #include <contrib/rdma/rdma_cm.h>
 #include <contrib/rdma/ib_cache.h>
Index: sys/contrib/pf/net/pf_ioctl.c
===================================================================
--- sys/contrib/pf/net/pf_ioctl.c	(revision 185561)
+++ sys/contrib/pf/net/pf_ioctl.c	(working copy)
@@ -102,6 +102,9 @@
 #include <net/if.h>
 #include <net/if_types.h>
 #include <net/route.h>
+#ifdef __FreeBSD__
+#include <net/vnet.h>
+#endif
 
 #include <netinet/in.h>
 #include <netinet/in_var.h>
Index: sys/contrib/pf/net/pf_subr.c
===================================================================
--- sys/contrib/pf/net/pf_subr.c	(revision 185561)
+++ sys/contrib/pf/net/pf_subr.c	(working copy)
@@ -65,6 +65,7 @@
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
 #include <netinet/if_ether.h>
+#include <netinet/vinet.h>
 #include <net/pfvar.h>
 
 /*
Index: sys/contrib/pf/net/pf_if.c
===================================================================
--- sys/contrib/pf/net/pf_if.c	(revision 185561)
+++ sys/contrib/pf/net/pf_if.c	(working copy)
@@ -54,10 +54,15 @@
 #include <sys/device.h>
 #endif
 #include <sys/time.h>
+#ifdef __FreeBSD__
 #include <sys/vimage.h>
+#endif
 
 #include <net/if.h>
 #include <net/if_types.h>
+#ifdef __FreeBSD__
+#include <net/vnet.h>
+#endif
 
 #include <netinet/in.h>
 #include <netinet/in_var.h>
Index: sys/contrib/pf/net/pf.c
===================================================================
--- sys/contrib/pf/net/pf.c	(revision 185561)
+++ sys/contrib/pf/net/pf.c	(working copy)
@@ -120,6 +120,9 @@
 #include <netinet/udp_var.h>
 #include <netinet/icmp_var.h>
 #include <netinet/if_ether.h>
+#ifdef __FreeBSD__
+#include <netinet/vinet.h>
+#endif
 
 #ifndef __FreeBSD__
 #include <dev/rndvar.h>
@@ -139,6 +142,7 @@
 #ifdef __FreeBSD__
 #include <netinet6/ip6_var.h>
 #include <netinet6/in6_pcb.h>
+#include <netinet6/vinet6.h>
 #endif
 #endif /* INET6 */
 
Index: sys/contrib/ipfilter/netinet/mlfk_ipl.c
===================================================================
--- sys/contrib/ipfilter/netinet/mlfk_ipl.c	(revision 185561)
+++ sys/contrib/ipfilter/netinet/mlfk_ipl.c	(working copy)
@@ -43,9 +43,7 @@
 static int ipf_modload(void);
 static int ipf_modunload(void);
 
-#if __FreeBSD_version < 800055
 SYSCTL_DECL(_net_inet);
-#endif
 #define SYSCTL_IPF(parent, nbr, name, access, ptr, val, descr) \
 	SYSCTL_OID(parent, nbr, name, CTLTYPE_INT|access, \
 		   ptr, val, sysctl_ipf_int, "I", descr);
Index: sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
===================================================================
--- sys/contrib/ipfilter/netinet/ip_fil_freebsd.c	(revision 185561)
+++ sys/contrib/ipfilter/netinet/ip_fil_freebsd.c	(working copy)
@@ -112,6 +112,9 @@
 #include "netinet/ip_scan.h"
 #endif
 #include "netinet/ip_pool.h"
+#if defined(__FreeBSD_version) && (__FreeBSD_version >= 800056)
+# include <netinet/vinet.h>
+#endif
 #if defined(__FreeBSD_version) && (__FreeBSD_version >= 300000)
 # include <sys/malloc.h>
 #endif
Index: sys/netipsec/vipsec.h
===================================================================
--- sys/netipsec/vipsec.h	(revision 185561)
+++ sys/netipsec/vipsec.h	(working copy)
@@ -33,21 +33,18 @@
 #ifndef _NETIPSEC_VIPSEC_H_
 #define _NETIPSEC_VIPSEC_H_
 
-#include <sys/proc.h>
 #include <sys/protosw.h>
-#include <sys/socket.h>
 
-#include <netipsec/ipsec.h>
-#include <netipsec/esp_var.h>
+#include <net/pfkeyv2.h>
+#include <net/raw_cb.h>
+
+#include <netinet/ipprotosw.h>
+
 #include <netipsec/ah_var.h>
+#include <netipsec/esp_var.h>
 #include <netipsec/ipcomp_var.h>
 #include <netipsec/ipip_var.h>
-
-#include <net/if.h>
-#include <net/if_var.h>
-#include <net/route.h>
-#include <net/raw_cb.h>
-
+#include <netipsec/ipsec.h>
 #include <netipsec/keysock.h>
 
 struct vnet_ipsec {
Index: sys/netipsec/keysock.c
===================================================================
--- sys/netipsec/keysock.c	(revision 185561)
+++ sys/netipsec/keysock.c	(working copy)
@@ -55,6 +55,7 @@
 #include <net/if.h>
 #include <net/raw_cb.h>
 #include <net/route.h>
+#include <net/vnet.h>
 
 #include <netinet/in.h>
 
Index: sys/netipsec/xform_ipip.c
===================================================================
--- sys/netipsec/xform_ipip.c	(revision 185561)
+++ sys/netipsec/xform_ipip.c	(working copy)
@@ -56,6 +56,7 @@
 #include <net/pfil.h>
 #include <net/route.h>
 #include <net/netisr.h>
+#include <net/vnet.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
@@ -64,16 +65,16 @@
 #include <netinet/ip_ecn.h>
 #include <netinet/ip_var.h>
 #include <netinet/ip_encap.h>
+#ifdef MROUTING
+#include <netinet/ip_mroute.h>
+#endif
+#include <netinet/vinet.h>
 
 #include <netipsec/ipsec.h>
 #include <netipsec/xform.h>
 
 #include <netipsec/ipip_var.h>
 
-#ifdef MROUTING
-#include <netinet/ip_mroute.h>
-#endif
-
 #ifdef INET6
 #include <netinet/ip6.h>
 #include <netipsec/ipsec6.h>
Index: sys/netipsec/ipsec_input.c
===================================================================
--- sys/netipsec/ipsec_input.c	(revision 185561)
+++ sys/netipsec/ipsec_input.c	(working copy)
@@ -74,6 +74,7 @@
 #include <netinet/in_pcb.h>
 #ifdef INET6
 #include <netinet/icmp6.h>
+#include <netinet6/vinet6.h>
 #endif
 
 #include <netipsec/ipsec.h>
Index: sys/netipsec/ipsec_output.c
===================================================================
--- sys/netipsec/ipsec_output.c	(revision 185561)
+++ sys/netipsec/ipsec_output.c	(working copy)
@@ -65,6 +65,7 @@
 #include <netinet/in_pcb.h>
 #ifdef INET6
 #include <netinet/icmp6.h>
+#include <netinet6/vinet6.h>
 #endif
 
 #include <netipsec/ipsec.h>
Index: sys/netipsec/key.c
===================================================================
--- sys/netipsec/key.c	(revision 185561)
+++ sys/netipsec/key.c	(working copy)
@@ -75,9 +75,11 @@
 
 #ifdef INET
 #include <netinet/in_pcb.h>
+#include <netinet/vinet.h>
 #endif
 #ifdef INET6
 #include <netinet6/in6_pcb.h>
+#include <netinet6/vinet6.h>
 #endif /* INET6 */
 
 #include <net/pfkeyv2.h>