After cleaning up rt_tables from vnet.h and cleaning up opt_route.h

a lot of files no longer need route.h either. Garbage collect them.
While here remove now unneeded vnet.h #includes as well.

27 files changed, 3 insertions, 27 deletions

diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c
index 37b656b..ed68b1a 100644
--- a/sys/compat/linprocfs/linprocfs.c
+++ b/sys/compat/linprocfs/linprocfs.c
@@ -77,7 +77,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 
 #include <net/if.h>
-#include <net/route.h>
 #include <net/vnet.h>
 
 #include <vm/vm.h>
diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c
index 20786fc..7d11b98 100644
--- a/sys/compat/linux/linux_ioctl.c
+++ b/sys/compat/linux/linux_ioctl.c
@@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
-#include <net/route.h>
 #include <net/vnet.h>
 
 #ifdef COMPAT_LINUX32
diff --git a/sys/compat/svr4/svr4_sockio.c b/sys/compat/svr4/svr4_sockio.c
index 2f3f6ec..6ed4e69 100644
--- a/sys/compat/svr4/svr4_sockio.c
+++ b/sys/compat/svr4/svr4_sockio.c
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/vimage.h>
 
 #include <net/if.h>
-#include <net/route.h>
 #include <net/vnet.h>
 
 #include <compat/svr4/svr4.h>
diff --git a/sys/contrib/altq/altq/altq_subr.c b/sys/contrib/altq/altq/altq_subr.c
index ef09145..ac36770 100644
--- a/sys/contrib/altq/altq/altq_subr.c
+++ b/sys/contrib/altq/altq/altq_subr.c
@@ -55,7 +55,6 @@
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #ifdef __FreeBSD__
-#include <net/route.h>
 #include <net/vnet.h>
 #endif
 
diff --git a/sys/contrib/pf/net/pf_if.c b/sys/contrib/pf/net/pf_if.c
index b1bc9bd..1972edc 100644
--- a/sys/contrib/pf/net/pf_if.c
+++ b/sys/contrib/pf/net/pf_if.c
@@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>
 #include <net/if_types.h>
 #ifdef __FreeBSD__
-#include <net/route.h>
 #include <net/vnet.h>
 #endif
 
diff --git a/sys/contrib/pf/net/pf_ioctl.c b/sys/contrib/pf/net/pf_ioctl.c
index 713ad9c..436f765 100644
--- a/sys/contrib/pf/net/pf_ioctl.c
+++ b/sys/contrib/pf/net/pf_ioctl.c
@@ -98,7 +98,6 @@ __FBSDID("$FreeBSD$");
 
 #include <net/if.h>
 #include <net/if_types.h>
-#include <net/route.h>
 #ifdef __FreeBSD__
 #include <net/vnet.h>
 #endif
diff --git a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
index 417a211..db1c406 100644
--- a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
+++ b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
@@ -63,7 +63,6 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>
 #include <net/if_var.h>
 #if __FreeBSD_version >= 800056
-#include <net/route.h>
 #include <net/vnet.h>
 #endif
 
diff --git a/sys/kern/kern_poll.c b/sys/kern/kern_poll.c
index 760dada..d9cf49f 100644
--- a/sys/kern/kern_poll.c
+++ b/sys/kern/kern_poll.c
@@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$");
 
 #include <net/if.h>			/* for IFF_* flags		*/
 #include <net/netisr.h>			/* for NETISR_POLL		*/
-#include <net/route.h>
 #include <net/vnet.h>
 
 static int poll_switch(SYSCTL_HANDLER_ARGS);
diff --git a/sys/kern/kern_uuid.c b/sys/kern/kern_uuid.c
index 628ef3a..a0c26b9 100644
--- a/sys/kern/kern_uuid.c
+++ b/sys/kern/kern_uuid.c
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
-#include <net/route.h>
 #include <net/vnet.h>
 
 /*
diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c
index 264844c..a4ec6bc 100644
--- a/sys/net/bridgestp.c
+++ b/sys/net/bridgestp.c
@@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$");
 #include <net/if_types.h>
 #include <net/if_llc.h>
 #include <net/if_media.h>
-#include <net/route.h>
 #include <net/vnet.h>
 
 #include <netinet/in.h>
diff --git a/sys/net/if_ef.c b/sys/net/if_ef.c
index 6d06c56..e5e7dd8 100644
--- a/sys/net/if_ef.c
+++ b/sys/net/if_ef.c
@@ -48,7 +48,6 @@
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #include <net/netisr.h>
-#include <net/route.h>
 #include <net/bpf.h>
 #include <net/vnet.h>
 
diff --git a/sys/net/if_mib.c b/sys/net/if_mib.c
index 15b1e01..e4c8a98 100644
--- a/sys/net/if_mib.c
+++ b/sys/net/if_mib.c
@@ -38,7 +38,6 @@
 
 #include <net/if.h>
 #include <net/if_mib.h>
-#include <net/route.h>
 #include <net/vnet.h>
 
 /*
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index 3206e59..6278396 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -64,7 +64,6 @@
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #include <net/if_vlan_var.h>
-#include <net/route.h>
 #include <net/vnet.h>
 
 #define VLANNAME	"vlan"
diff --git a/sys/net/raw_cb.c b/sys/net/raw_cb.c
index 4152731..1dedff8 100644
--- a/sys/net/raw_cb.c
+++ b/sys/net/raw_cb.c
@@ -46,7 +46,6 @@
 
 #include <net/if.h>
 #include <net/raw_cb.h>
-#include <net/route.h>
 #include <net/vnet.h>
 
 /*
diff --git a/sys/net/raw_usrreq.c b/sys/net/raw_usrreq.c
index 0d375cf..79d3e30 100644
--- a/sys/net/raw_usrreq.c
+++ b/sys/net/raw_usrreq.c
@@ -48,7 +48,6 @@
 
 #include <net/if.h>
 #include <net/raw_cb.h>
-#include <net/route.h>
 #include <net/vnet.h>
 
 MTX_SYSINIT(rawcb_mtx, &rawcb_mtx, "rawcb", MTX_DEF);
diff --git a/sys/net80211/ieee80211_ddb.c b/sys/net80211/ieee80211_ddb.c
index bf44c90..6d70930 100644
--- a/sys/net80211/ieee80211_ddb.c
+++ b/sys/net80211/ieee80211_ddb.c
@@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$");
 #include <net/if_media.h>
 #include <net/if_types.h>
 #include <net/ethernet.h>
-#include <net/route.h>
 #include <net/vnet.h>
 
 #include <net80211/ieee80211_var.h>
diff --git a/sys/netgraph/atm/ng_atm.c b/sys/netgraph/atm/ng_atm.c
index 1b545c9..e5e1e2e 100644
--- a/sys/netgraph/atm/ng_atm.c
+++ b/sys/netgraph/atm/ng_atm.c
@@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$");
 #include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_atm.h>
-#include <net/route.h>
 #include <net/vnet.h>
 
 #include <netgraph/ng_message.h>
diff --git a/sys/netgraph/ng_ether.c b/sys/netgraph/ng_ether.c
index 457a042..5f22f17 100644
--- a/sys/netgraph/ng_ether.c
+++ b/sys/netgraph/ng_ether.c
@@ -63,7 +63,6 @@
 #include <net/if_var.h>
 #include <net/ethernet.h>
 #include <net/if_bridgevar.h>
-#include <net/route.h>
 #include <net/vnet.h>
 
 #include <netgraph/ng_message.h>
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index 82b0cc0..91172ba 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -56,11 +56,10 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
-#include <net/route.h>
 #include <net/netisr.h>
 #include <net/if_llc.h>
 #include <net/ethernet.h>
-#include <net/vnet.h>
+#include <net/route.h>
 
 #include <netinet/in.h>
 #include <netinet/in_var.h>
diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
index 3e58193..2761590 100644
--- a/sys/netinet/igmp.c
+++ b/sys/netinet/igmp.c
@@ -65,7 +65,6 @@ __FBSDID("$FreeBSD$");
 
 #include <net/if.h>
 #include <net/netisr.h>
-#include <net/route.h>
 #include <net/vnet.h>
 
 #include <netinet/in.h>
diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h
index da1e80d..f5b713b 100644
--- a/sys/netinet/in_pcb.h
+++ b/sys/netinet/in_pcb.h
@@ -39,8 +39,6 @@
 #include <sys/_mutex.h>
 #include <sys/_rwlock.h>
 
-#include <net/route.h>
-
 #ifdef _KERNEL
 #include <sys/rwlock.h>
 #endif
diff --git a/sys/netinet/in_rmx.c b/sys/netinet/in_rmx.c
index ceb139b..feaa2f9 100644
--- a/sys/netinet/in_rmx.c
+++ b/sys/netinet/in_rmx.c
@@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$");
 
 #include <net/if.h>
 #include <net/route.h>
-#include <net/vnet.h>
 
 #include <netinet/in.h>
 #include <netinet/in_var.h>
diff --git a/sys/netinet/tcp_hostcache.c b/sys/netinet/tcp_hostcache.c
index e04499d..cdd8c36 100644
--- a/sys/netinet/tcp_hostcache.c
+++ b/sys/netinet/tcp_hostcache.c
@@ -79,6 +79,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/vimage.h>
 
 #include <net/if.h>
+#include <net/route.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
diff --git a/sys/netinet/tcp_offload.c b/sys/netinet/tcp_offload.c
index fbaa05e..5afd8cd 100644
--- a/sys/netinet/tcp_offload.c
+++ b/sys/netinet/tcp_offload.c
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>
 #include <net/if_types.h>
 #include <net/if_var.h>
+#include <net/route.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c
index 49a4d65..46bfcf1 100644
--- a/sys/netinet6/ip6_mroute.c
+++ b/sys/netinet6/ip6_mroute.c
@@ -108,7 +108,6 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>
 #include <net/if_types.h>
 #include <net/raw_cb.h>
-#include <net/route.h>
 #include <net/vnet.h>
 
 #include <netinet/in.h>
diff --git a/sys/netinet6/scope6.c b/sys/netinet6/scope6.c
index 9267230..c9028b9 100644
--- a/sys/netinet6/scope6.c
+++ b/sys/netinet6/scope6.c
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/syslog.h>
 #include <sys/vimage.h>
 
-#include <net/route.h>
 #include <net/if.h>
 #include <net/vnet.h>
 
diff --git a/sys/nfsclient/nfs_diskless.c b/sys/nfsclient/nfs_diskless.c
index ee0b022..e67b073 100644
--- a/sys/nfsclient/nfs_diskless.c
+++ b/sys/nfsclient/nfs_diskless.c
@@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$");
 #include <net/if_types.h>
 #include <net/if_var.h>
 #include <net/ethernet.h>
-#include <net/route.h>
 #include <net/vnet.h>
 
 #include <netinet/in.h>