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

6 files changed, 17 insertions, 14 deletions

diff --git a/sys/netipsec/ipsec_input.c b/sys/netipsec/ipsec_input.c
index 0c37aef..018e0c5 100644
--- a/sys/netipsec/ipsec_input.c
+++ b/sys/netipsec/ipsec_input.c
@@ -74,6 +74,7 @@
 #include <netinet/in_pcb.h>
 #ifdef INET6
 #include <netinet/icmp6.h>
+#include <netinet6/vinet6.h>
 #endif
 
 #include <netipsec/ipsec.h>
diff --git a/sys/netipsec/ipsec_output.c b/sys/netipsec/ipsec_output.c
index 7b79294..5728427 100644
--- a/sys/netipsec/ipsec_output.c
+++ b/sys/netipsec/ipsec_output.c
@@ -65,6 +65,7 @@
 #include <netinet/in_pcb.h>
 #ifdef INET6
 #include <netinet/icmp6.h>
+#include <netinet6/vinet6.h>
 #endif
 
 #include <netipsec/ipsec.h>
diff --git a/sys/netipsec/key.c b/sys/netipsec/key.c
index 3e2b4e0..f65d1f1 100644
--- a/sys/netipsec/key.c
+++ b/sys/netipsec/key.c
@@ -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>
diff --git a/sys/netipsec/keysock.c b/sys/netipsec/keysock.c
index 6842b5f..5fb7fd5 100644
--- a/sys/netipsec/keysock.c
+++ b/sys/netipsec/keysock.c
@@ -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>
 
diff --git a/sys/netipsec/vipsec.h b/sys/netipsec/vipsec.h
index 32818b9..de97452 100644
--- a/sys/netipsec/vipsec.h
+++ b/sys/netipsec/vipsec.h
@@ -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 {
diff --git a/sys/netipsec/xform_ipip.c b/sys/netipsec/xform_ipip.c
index 610f984..a9492dc 100644
--- a/sys/netipsec/xform_ipip.c
+++ b/sys/netipsec/xform_ipip.c
@@ -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>