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

19 files changed, 22 insertions, 19 deletions

diff --git a/sys/modules/ae/Makefile b/sys/modules/ae/Makefile
index fd810e9..4cd97a1 100644
--- a/sys/modules/ae/Makefile
+++ b/sys/modules/ae/Makefile
@@ -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>
diff --git a/sys/modules/ath/Makefile b/sys/modules/ath/Makefile
index 6105fd9..4f478f6 100644
--- a/sys/modules/ath/Makefile
+++ b/sys/modules/ath/Makefile
@@ -66,7 +66,7 @@ SRCS+=	${AR5211_SRCS}
 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
 
diff --git a/sys/modules/ath_rate_amrr/Makefile b/sys/modules/ath_rate_amrr/Makefile
index e3c3cb5..cbeea9c 100644
--- a/sys/modules/ath_rate_amrr/Makefile
+++ b/sys/modules/ath_rate_amrr/Makefile
@@ -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
 
diff --git a/sys/modules/ath_rate_onoe/Makefile b/sys/modules/ath_rate_onoe/Makefile
index eea8cbe..fe725e4 100644
--- a/sys/modules/ath_rate_onoe/Makefile
+++ b/sys/modules/ath_rate_onoe/Makefile
@@ -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
 
diff --git a/sys/modules/ath_rate_sample/Makefile b/sys/modules/ath_rate_sample/Makefile
index b3e3a6c..c179d10 100644
--- a/sys/modules/ath_rate_sample/Makefile
+++ b/sys/modules/ath_rate_sample/Makefile
@@ -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
 
diff --git a/sys/modules/bridgestp/Makefile b/sys/modules/bridgestp/Makefile
index 3cfc6e3..e27bbc3e 100644
--- a/sys/modules/bridgestp/Makefile
+++ b/sys/modules/bridgestp/Makefile
@@ -3,6 +3,6 @@
 .PATH: ${.CURDIR}/../../net
 
 KMOD=	bridgestp
-SRCS=	bridgestp.c
+SRCS=	bridgestp.c opt_route.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/cxgb/iw_cxgb/Makefile b/sys/modules/cxgb/iw_cxgb/Makefile
index 8cfe6db..e7f0523 100644
--- a/sys/modules/cxgb/iw_cxgb/Makefile
+++ b/sys/modules/cxgb/iw_cxgb/Makefile
@@ -7,7 +7,8 @@ KMOD=   iw_cxgb
 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
 
diff --git a/sys/modules/if_ef/Makefile b/sys/modules/if_ef/Makefile
index dc40213..79a0081 100644
--- a/sys/modules/if_ef/Makefile
+++ b/sys/modules/if_ef/Makefile
@@ -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
diff --git a/sys/modules/if_vlan/Makefile b/sys/modules/if_vlan/Makefile
index 9842619..65ed060 100644
--- a/sys/modules/if_vlan/Makefile
+++ b/sys/modules/if_vlan/Makefile
@@ -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>
diff --git a/sys/modules/ip_mroute_mod/Makefile b/sys/modules/ip_mroute_mod/Makefile
index 5b3330f..3ca0a3dc 100644
--- a/sys/modules/ip_mroute_mod/Makefile
+++ b/sys/modules/ip_mroute_mod/Makefile
@@ -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"
diff --git a/sys/modules/ipfw/Makefile b/sys/modules/ipfw/Makefile
index e208e1d..8e40d42 100644
--- a/sys/modules/ipfw/Makefile
+++ b/sys/modules/ipfw/Makefile
@@ -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
diff --git a/sys/modules/linprocfs/Makefile b/sys/modules/linprocfs/Makefile
index 9b89c96..a7cb129 100644
--- a/sys/modules/linprocfs/Makefile
+++ b/sys/modules/linprocfs/Makefile
@@ -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
diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile
index 82eb056..fbf5a58 100644
--- a/sys/modules/linux/Makefile
+++ b/sys/modules/linux/Makefile
@@ -13,7 +13,7 @@ SRCS=	linux${SFX}_dummy.c linux_emul.c linux_file.c \
 	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
diff --git a/sys/modules/netgraph/atm/atm/Makefile b/sys/modules/netgraph/atm/atm/Makefile
index ebd94e1..fff3230b 100644
--- a/sys/modules/netgraph/atm/atm/Makefile
+++ b/sys/modules/netgraph/atm/atm/Makefile
@@ -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>
diff --git a/sys/modules/netgraph/ether/Makefile b/sys/modules/netgraph/ether/Makefile
index 7a3950e..49f2bb6 100644
--- a/sys/modules/netgraph/ether/Makefile
+++ b/sys/modules/netgraph/ether/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
 KMOD=	ng_ether
-SRCS= 	ng_ether.c
+SRCS= 	ng_ether.c opt_route.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/gif/Makefile b/sys/modules/netgraph/gif/Makefile
index acf4373..121cfa9 100644
--- a/sys/modules/netgraph/gif/Makefile
+++ b/sys/modules/netgraph/gif/Makefile
@@ -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:
diff --git a/sys/modules/nfsclient/Makefile b/sys/modules/nfsclient/Makefile
index 1562a64..11742f5 100644
--- a/sys/modules/nfsclient/Makefile
+++ b/sys/modules/nfsclient/Makefile
@@ -10,7 +10,7 @@ SRCS=	vnode_if.h \
 	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
diff --git a/sys/modules/pf/Makefile b/sys/modules/pf/Makefile
index 3b07c41..3b53050 100644
--- a/sys/modules/pf/Makefile
+++ b/sys/modules/pf/Makefile
@@ -9,7 +9,7 @@ KMOD=	pf
 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
 
diff --git a/sys/modules/wlan/Makefile b/sys/modules/wlan/Makefile
index 70533ba..edb2218 100644
--- a/sys/modules/wlan/Makefile
+++ b/sys/modules/wlan/Makefile
@@ -10,7 +10,8 @@ SRCS=	ieee80211.c ieee80211_crypto.c ieee80211_crypto_none.c ieee80211_dfs.c \
 	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: