Rather than using hidden includes (with cicular dependencies),

directly include only the header files needed. This reduces the
unneeded spamming of various headers into lots of files.

For now, this leaves us with very few modules including vnet.h
and thus needing to depend on opt_route.h.

Reviewed by:	brooks, gnn, des, zec, imp
Sponsored by:	The FreeBSD Foundation

35 files changed, 53 insertions, 9 deletions

diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index 82dc605..cf19a22 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -61,10 +61,12 @@ __FBSDID("$FreeBSD$");
 #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>
diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
index f77434c..3dacdcd 100644
--- a/sys/netinet/igmp.c
+++ b/sys/netinet/igmp.c
@@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$");
 
 #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 @@ __FBSDID("$FreeBSD$");
 #include <netinet/ip_options.h>
 #include <netinet/igmp.h>
 #include <netinet/igmp_var.h>
+#include <netinet/vinet.h>
 
 #include <machine/in_cksum.h>
 
diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index b57049f..9b6dd48 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
 #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);
diff --git a/sys/netinet/in.h b/sys/netinet/in.h
index b505a2e..b969bdf 100644
--- a/sys/netinet/in.h
+++ b/sys/netinet/in.h
@@ -743,8 +743,4 @@ void	 in_ifdetach(struct ifnet *);
 #undef __KAME_NETINET_IN_H_INCLUDED_
 #endif
 
-#ifdef _KERNEL
-#include <netinet/vinet.h>
-#endif
-
 #endif /* !_NETINET_IN_H_*/
diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c
index f347102..9bcb09e 100644
--- a/sys/netinet/in_gif.c
+++ b/sys/netinet/in_gif.c
@@ -59,6 +59,7 @@ __FBSDID("$FreeBSD$");
 #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>
diff --git a/sys/netinet/in_mcast.c b/sys/netinet/in_mcast.c
index 6cf6d92..e7916dd 100644
--- a/sys/netinet/in_mcast.c
+++ b/sys/netinet/in_mcast.c
@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
 #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 @@ __FBSDID("$FreeBSD$");
 #include <netinet/in_var.h>
 #include <netinet/ip_var.h>
 #include <netinet/igmp_var.h>
+#include <netinet/vinet.h>
 
 #ifndef __SOCKUNION_DECLARED
 union sockunion {
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index bb2eae0..35eb687 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -71,9 +71,11 @@ __FBSDID("$FreeBSD$");
 #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 */
 
 
diff --git a/sys/netinet/in_rmx.c b/sys/netinet/in_rmx.c
index adb4fee..aa4ca0d 100644
--- a/sys/netinet/in_rmx.c
+++ b/sys/netinet/in_rmx.c
@@ -55,9 +55,12 @@ __FBSDID("$FreeBSD$");
 
 #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);
 
diff --git a/sys/netinet/ip6.h b/sys/netinet/ip6.h
index a7df9c8..0896949 100644
--- a/sys/netinet/ip6.h
+++ b/sys/netinet/ip6.h
@@ -347,8 +347,6 @@ do {									\
 	}								\
 } while (/*CONSTCOND*/ 0)
 
-#include <netinet6/vinet6.h>
-
 #endif /*_KERNEL*/
 
 #endif /* not _NETINET_IP6_H_ */
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c
index f93b895..b4212cc 100644
--- a/sys/netinet/ip_carp.c
+++ b/sys/netinet/ip_carp.c
@@ -74,6 +74,7 @@ __FBSDID("$FreeBSD$");
 #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 @@ __FBSDID("$FreeBSD$");
 #include <netinet6/ip6_var.h>
 #include <netinet6/scope6_var.h>
 #include <netinet6/nd6.h>
+#include <netinet6/vinet6.h>
 #endif
 
 #include <crypto/sha1.h>
diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c
index b74f5db..dc627a8 100644
--- a/sys/netinet/ip_divert.c
+++ b/sys/netinet/ip_divert.c
@@ -74,6 +74,7 @@ __FBSDID("$FreeBSD$");
 #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>
 
diff --git a/sys/netinet/ip_fastfwd.c b/sys/netinet/ip_fastfwd.c
index 7af1758..407b08c 100644
--- a/sys/netinet/ip_fastfwd.c
+++ b/sys/netinet/ip_fastfwd.c
@@ -103,6 +103,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet/ip_var.h>
 #include <netinet/ip_icmp.h>
 #include <netinet/ip_options.h>
+#include <netinet/vinet.h>
 
 #include <machine/in_cksum.h>
 
diff --git a/sys/netinet/ip_fw2.c b/sys/netinet/ip_fw2.c
index f7c5735..f9696cc 100644
--- a/sys/netinet/ip_fw2.c
+++ b/sys/netinet/ip_fw2.c
@@ -69,6 +69,7 @@ __FBSDID("$FreeBSD$");
 #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 @@ __FBSDID("$FreeBSD$");
 #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>
diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c
index e631dae..3666f5c 100644
--- a/sys/netinet/ip_icmp.c
+++ b/sys/netinet/ip_icmp.c
@@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp_var.h>
 #include <netinet/tcpip.h>
 #include <netinet/icmp_var.h>
+#include <netinet/vinet.h>
 
 #ifdef IPSEC
 #include <netipsec/ipsec.h>
diff --git a/sys/netinet/ip_id.c b/sys/netinet/ip_id.c
index ed0a3e4..ce8c6b4 100644
--- a/sys/netinet/ip_id.c
+++ b/sys/netinet/ip_id.c
@@ -104,6 +104,7 @@ static int	sysctl_ip_id_change(SYSCTL_HANDLER_ARGS);
 
 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,
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 7f12098..35ebf86 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$");
 #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 @@ __FBSDID("$FreeBSD$");
 #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
diff --git a/sys/netinet/ip_ipsec.c b/sys/netinet/ip_ipsec.c
index a4f8631..a1e082b 100644
--- a/sys/netinet/ip_ipsec.c
+++ b/sys/netinet/ip_ipsec.c
@@ -55,6 +55,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet/ip_var.h>
 #include <netinet/ip_options.h>
 #include <netinet/ip_ipsec.h>
+#include <netinet/vinet.h>
 
 #include <machine/in_cksum.h>
 
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index a241ec4..36a5efd 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -96,6 +96,8 @@ __FBSDID("$FreeBSD$");
 #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>
diff --git a/sys/netinet/ip_options.c b/sys/netinet/ip_options.c
index 1cbe9f6..1a97c6f 100644
--- a/sys/netinet/ip_options.c
+++ b/sys/netinet/ip_options.c
@@ -63,6 +63,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet/ip_options.h>
 #include <netinet/ip_icmp.h>
 #include <machine/in_cksum.h>
+#include <netinet/vinet.h>
 
 #include <sys/socketvar.h>
 
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index 197ce9c..a40dd1d 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -59,6 +59,7 @@ __FBSDID("$FreeBSD$");
 #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 @@ __FBSDID("$FreeBSD$");
 #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>
diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c
index 71eaaa0..7871949 100644
--- a/sys/netinet/raw_ip.c
+++ b/sys/netinet/raw_ip.c
@@ -58,6 +58,7 @@ __FBSDID("$FreeBSD$");
 
 #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 @@ __FBSDID("$FreeBSD$");
 
 #include <netinet/ip_fw.h>
 #include <netinet/ip_dummynet.h>
+#include <netinet/vinet.h>
 
 #ifdef IPSEC
 #include <netipsec/ipsec.h>
diff --git a/sys/netinet/sctp_os_bsd.h b/sys/netinet/sctp_os_bsd.h
index bead1ae..64a4794 100644
--- a/sys/netinet/sctp_os_bsd.h
+++ b/sys/netinet/sctp_os_bsd.h
@@ -77,7 +77,7 @@ __FBSDID("$FreeBSD$");
 #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>
diff --git a/sys/netinet/tcp_hostcache.c b/sys/netinet/tcp_hostcache.c
index ae89d59..7c76160 100644
--- a/sys/netinet/tcp_hostcache.c
+++ b/sys/netinet/tcp_hostcache.c
@@ -92,6 +92,8 @@ __FBSDID("$FreeBSD$");
 #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
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 7b292d2..18a1bab 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -87,6 +87,11 @@ __FBSDID("$FreeBSD$");
 #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>
diff --git a/sys/netinet/tcp_offload.c b/sys/netinet/tcp_offload.c
index 6419a95..fbaa05e 100644
--- a/sys/netinet/tcp_offload.c
+++ b/sys/netinet/tcp_offload.c
@@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp_var.h>
 #include <netinet/tcp_offload.h>
 #include <netinet/toedev.h>
+#include <netinet/vinet.h>
 
 uint32_t toedev_registration_count;
 
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index d93592b..2347305 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 #include <sys/vimage.h>
 
+#include <net/if.h>
 #include <net/route.h>
 
 #include <netinet/in.h>
@@ -74,6 +75,7 @@ __FBSDID("$FreeBSD$");
 #ifdef TCPDEBUG
 #include <netinet/tcp_debug.h>
 #endif
+#include <netinet/vinet.h>
 
 #ifdef IPSEC
 #include <netipsec/ipsec.h>
diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c
index 5f47be0..172abc5 100644
--- a/sys/netinet/tcp_reass.c
+++ b/sys/netinet/tcp_reass.c
@@ -73,6 +73,7 @@ __FBSDID("$FreeBSD$");
 #ifdef TCPDEBUG
 #include <netinet/tcp_debug.h>
 #endif /* TCPDEBUG */
+#include <netinet/vinet.h>
 
 #ifdef VIMAGE_GLOBALS
 static int tcp_reass_maxseg;
diff --git a/sys/netinet/tcp_sack.c b/sys/netinet/tcp_sack.c
index 9eb57ba..b52b5b3 100644
--- a/sys/netinet/tcp_sack.c
+++ b/sys/netinet/tcp_sack.c
@@ -119,6 +119,7 @@ __FBSDID("$FreeBSD$");
 #ifdef TCPDEBUG
 #include <netinet/tcp_debug.h>
 #endif /* TCPDEBUG */
+#include <netinet/vinet.h>
 
 #include <machine/in_cksum.h>
 
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index c7146c8..639c42f 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -94,7 +94,9 @@ __FBSDID("$FreeBSD$");
 #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>
diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c
index 252fa1c..838fd52 100644
--- a/sys/netinet/tcp_syncache.c
+++ b/sys/netinet/tcp_syncache.c
@@ -85,6 +85,7 @@ __FBSDID("$FreeBSD$");
 #ifdef INET6
 #include <netinet6/tcp6_var.h>
 #endif
+#include <netinet/vinet.h>
 
 #ifdef IPSEC
 #include <netipsec/ipsec.h>
diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c
index 2e70719..acce92f 100644
--- a/sys/netinet/tcp_timer.c
+++ b/sys/netinet/tcp_timer.c
@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/vimage.h>
 
+#include <net/if.h>
 #include <net/route.h>
 
 #include <netinet/in.h>
@@ -64,6 +65,7 @@ __FBSDID("$FreeBSD$");
 #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,
diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c
index 7b06de4..37fafa0 100644
--- a/sys/netinet/tcp_timewait.c
+++ b/sys/netinet/tcp_timewait.c
@@ -88,6 +88,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp_debug.h>
 #endif
 #include <netinet6/ip6protosw.h>
+#include <netinet/vinet.h>
 
 #include <machine/in_cksum.h>
 
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index 6428b64..2011dff 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -87,6 +87,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp_debug.h>
 #endif
 #include <netinet/tcp_offload.h>
+#include <netinet/vinet.h>
 
 /*
  * TCP protocol interface to socket abstraction.
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index 2e52309..53e9626 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -81,6 +81,7 @@ __FBSDID("$FreeBSD$");
 #endif
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>
+#include <netinet/vinet.h>
 
 #ifdef IPSEC
 #include <netipsec/ipsec.h>
diff --git a/sys/netinet/vinet.h b/sys/netinet/vinet.h
index 5fdb1c0..8a8baba 100644
--- a/sys/netinet/vinet.h
+++ b/sys/netinet/vinet.h
@@ -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>