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

17 files changed, 19 insertions, 2 deletions

diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c
index 99ad32e..7a75051 100644
--- a/sys/net/bridgestp.c
+++ b/sys/net/bridgestp.c
@@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$");
 #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>
diff --git a/sys/net/if.c b/sys/net/if.c
index 9cc6f83..59a5211 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -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>
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index 0a53265..8f07e6c 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -115,9 +115,11 @@ __FBSDID("$FreeBSD$");
 #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>
diff --git a/sys/net/if_ef.c b/sys/net/if_ef.c
index 59d4556..11e381e 100644
--- a/sys/net/if_ef.c
+++ b/sys/net/if_ef.c
@@ -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>
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index d790d91..d26609c 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -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>
diff --git a/sys/net/if_faith.c b/sys/net/if_faith.c
index 6fdb72b..c839748 100644
--- a/sys/net/if_faith.c
+++ b/sys/net/if_faith.c
@@ -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"
diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c
index 6b5e739..cfd249f 100644
--- a/sys/net/if_gre.c
+++ b/sys/net/if_gre.c
@@ -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
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index ab5bda7..4b42527 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -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>
diff --git a/sys/net/if_mib.c b/sys/net/if_mib.c
index 0902599..ae9088d 100644
--- a/sys/net/if_mib.c
+++ b/sys/net/if_mib.c
@@ -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
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index 51110c7..930ab4c 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -56,6 +56,7 @@
 #ifdef INET
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
+#include <netinet/vinet.h>
 #endif
 
 #ifdef INET6
diff --git a/sys/net/if_stf.c b/sys/net/if_stf.c
index d3c0d75..e3db9ae 100644
--- a/sys/net/if_stf.c
+++ b/sys/net/if_stf.c
@@ -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>
diff --git a/sys/net/if_var.h b/sys/net/if_var.h
index c6bcdf7..0724488 100644
--- a/sys/net/if_var.h
+++ b/sys/net/if_var.h
@@ -720,8 +720,6 @@ int    ether_poll_register(poll_handler_t *h, struct ifnet *ifp);
 int    ether_poll_deregister(struct ifnet *ifp);
 #endif /* DEVICE_POLLING */
 
-#include <net/vnet.h>
-
 #endif /* _KERNEL */
 
 #endif /* !_NET_IF_VAR_H_ */
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index 586fefd..ada6a72 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -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
diff --git a/sys/net/raw_cb.c b/sys/net/raw_cb.c
index b2a04ca..1dedff8 100644
--- a/sys/net/raw_cb.c
+++ b/sys/net/raw_cb.c
@@ -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.
diff --git a/sys/net/raw_usrreq.c b/sys/net/raw_usrreq.c
index 633125a..79d3e30 100644
--- a/sys/net/raw_usrreq.c
+++ b/sys/net/raw_usrreq.c
@@ -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);
 
diff --git a/sys/net/route.c b/sys/net/route.c
index f97c077..a20faf3 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -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>
 
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index 15c6928..7662c8d 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -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