After r193232 rt_tables in vnet.h are no longer indirectly dependent on

the ROUTETABLES kernel option thus there is no need to include opt_route.h
anymore in all consumers of vnet.h and no longer depend on it for module
builds.

Remove the hidden include in flowtable.h as well and leave the two
explicit #includes in ip_input.c and ip_output.c.

65 files changed, 15 insertions, 84 deletions

diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c
index 52f6e946f492..7f89e41681e7 100644
--- a/sys/compat/linprocfs/linprocfs.c
+++ b/sys/compat/linprocfs/linprocfs.c
@@ -39,7 +39,6 @@
  *	@(#)procfs_status.c	8.4 (Berkeley) 6/15/94
  */
 
-#include "opt_route.h"
 #include "opt_compat.h"
 
 #include <sys/cdefs.h>
diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c
index f0a7559578c1..685979e76b9d 100644
--- a/sys/compat/linux/linux_ioctl.c
+++ b/sys/compat/linux/linux_ioctl.c
@@ -26,7 +26,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "opt_route.h"
 #include "opt_compat.h"
 
 #include <sys/cdefs.h>
diff --git a/sys/compat/svr4/svr4_sockio.c b/sys/compat/svr4/svr4_sockio.c
index bd4944e40e23..2f3f6ec73da8 100644
--- a/sys/compat/svr4/svr4_sockio.c
+++ b/sys/compat/svr4/svr4_sockio.c
@@ -29,8 +29,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_route.h"
-
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
diff --git a/sys/contrib/altq/altq/altq_subr.c b/sys/contrib/altq/altq/altq_subr.c
index 17557c130719..ef0914587812 100644
--- a/sys/contrib/altq/altq/altq_subr.c
+++ b/sys/contrib/altq/altq/altq_subr.c
@@ -32,7 +32,6 @@
 #include "opt_inet.h"
 #ifdef __FreeBSD__
 #include "opt_inet6.h"
-#include "opt_route.h"
 #endif
 #endif /* __FreeBSD__ || __NetBSD__ */
 
diff --git a/sys/contrib/pf/net/pf_if.c b/sys/contrib/pf/net/pf_if.c
index 31a4313743e6..b1bc9bd9db8c 100644
--- a/sys/contrib/pf/net/pf_if.c
+++ b/sys/contrib/pf/net/pf_if.c
@@ -35,7 +35,6 @@
 #if defined(__FreeBSD__)
 #include "opt_inet.h"
 #include "opt_inet6.h"
-#include "opt_route.h"
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
diff --git a/sys/contrib/pf/net/pf_ioctl.c b/sys/contrib/pf/net/pf_ioctl.c
index cb4533b0f5f3..713ad9ce8529 100644
--- a/sys/contrib/pf/net/pf_ioctl.c
+++ b/sys/contrib/pf/net/pf_ioctl.c
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
-#include "opt_route.h"
 #include "opt_bpf.h"
 #include "opt_pf.h"
 
diff --git a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
index dc751687d94d..417a211dddf5 100644
--- a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
+++ b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
@@ -29,8 +29,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_route.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/kern_poll.c b/sys/kern/kern_poll.c
index fbe90272e03c..760dada97df8 100644
--- a/sys/kern/kern_poll.c
+++ b/sys/kern/kern_poll.c
@@ -28,7 +28,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_route.h"
 #include "opt_device_polling.h"
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_uuid.c b/sys/kern/kern_uuid.c
index eec37efe14f9..628ef3a4b206 100644
--- a/sys/kern/kern_uuid.c
+++ b/sys/kern/kern_uuid.c
@@ -27,8 +27,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_route.h"
-
 #include <sys/param.h>
 #include <sys/endian.h>
 #include <sys/kernel.h>
diff --git a/sys/modules/bridgestp/Makefile b/sys/modules/bridgestp/Makefile
index e27bbc3e8281..3cfc6e376df2 100644
--- a/sys/modules/bridgestp/Makefile
+++ b/sys/modules/bridgestp/Makefile
@@ -3,6 +3,6 @@
 .PATH: ${.CURDIR}/../../net
 
 KMOD=	bridgestp
-SRCS=	bridgestp.c opt_route.h
+SRCS=	bridgestp.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/cxgb/iw_cxgb/Makefile b/sys/modules/cxgb/iw_cxgb/Makefile
index e7f0523b191a..2cf2ef8ec60a 100644
--- a/sys/modules/cxgb/iw_cxgb/Makefile
+++ b/sys/modules/cxgb/iw_cxgb/Makefile
@@ -8,7 +8,7 @@ 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
-SRCS+=  opt_inet.h opt_route.h
+SRCS+=  opt_inet.h
 CFLAGS+= -g -I${CXGB}
 #CFLAGS+= -DDEBUG
 
diff --git a/sys/modules/if_ef/Makefile b/sys/modules/if_ef/Makefile
index 79a0081d7878..dc40213c7181 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 opt_route.h
+SRCS=	if_ef.c opt_ipx.h opt_inet.h opt_ef.h
 
 .if defined(EFDEBUG)
 CFLAGS+= -DEF_DEBUG
diff --git a/sys/modules/if_vlan/Makefile b/sys/modules/if_vlan/Makefile
index 65ed0609c3a1..9842619b35da 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 opt_route.h
+SRCS+=	opt_inet.h opt_vlan.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ip_mroute_mod/Makefile b/sys/modules/ip_mroute_mod/Makefile
index d3dcc7efec53..df5424b639f7 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_mrouting.h opt_route.h
+SRCS+=	opt_inet.h opt_mrouting.h
 
 .if !defined(KERNBUILDDIR)
 opt_inet.h:
diff --git a/sys/modules/ipfw/Makefile b/sys/modules/ipfw/Makefile
index e99c9eb96598..dd31d7e053ff 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_route.h
+SRCS+=	opt_inet6.h opt_ipsec.h
 
 CFLAGS+= -DIPFIREWALL
 CFLAGS+= -I${.CURDIR}/../../contrib/pf
diff --git a/sys/modules/linprocfs/Makefile b/sys/modules/linprocfs/Makefile
index 62af13ebea31..f0f00cbea6f7 100644
--- a/sys/modules/linprocfs/Makefile
+++ b/sys/modules/linprocfs/Makefile
@@ -6,8 +6,7 @@ KMOD=	linprocfs
 SRCS=	vnode_if.h \
 	device_if.h bus_if.h \
 	linprocfs.c \
-	opt_compat.h \
-	opt_route.h
+	opt_compat.h
 
 .if ${MACHINE_ARCH} == "amd64"
 CFLAGS+=-DCOMPAT_LINUX32
diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile
index 7b491618dfce..a24b6b27be7f 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_route.h opt_compat.h opt_posix.h vnode_if.h \
+	opt_inet6.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 fff3230beba8..ebd94e13f40e 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 opt_route.h
+SRCS=	ng_atm.c
 # CFLAGS+= -DNGATM_DEBUG
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/ether/Makefile b/sys/modules/netgraph/ether/Makefile
index 49f2bb652ea5..7a3950edae75 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 opt_route.h
+SRCS= 	ng_ether.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/gif/Makefile b/sys/modules/netgraph/gif/Makefile
index 121cfa96bca9..acf4373f26bf 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 opt_route.h
+SRCS= 	ng_gif.c opt_inet.h opt_inet6.h
 
 .if !defined(KERNBUILDDIR)
 opt_inet.h:
diff --git a/sys/modules/nfsclient/Makefile b/sys/modules/nfsclient/Makefile
index af02f6a98ae5..cab161fbfff8 100644
--- a/sys/modules/nfsclient/Makefile
+++ b/sys/modules/nfsclient/Makefile
@@ -7,7 +7,7 @@ SRCS=	vnode_if.h \
 	nfs_bio.c nfs_lock.c nfs_node.c nfs_socket.c nfs_subs.c nfs_nfsiod.c \
 	nfs_vfsops.c nfs_vnops.c nfs_common.c nfs_krpc.c \
 	opt_inet.h opt_nfs.h opt_bootp.h opt_nfsroot.h
-SRCS+=	opt_inet6.h opt_kdtrace.h opt_kgssapi.h opt_route.h
+SRCS+=	opt_inet6.h opt_kdtrace.h opt_kgssapi.h
 
 .if !defined(KERNBUILDDIR)
 NFS_INET?=	1	# 0/1 - requires INET to be configured in kernel
diff --git a/sys/modules/pf/Makefile b/sys/modules/pf/Makefile
index e2930582895d..c921f806a666 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_route.h
+	opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h
 
 CFLAGS+=  -I${.CURDIR}/../../contrib/pf
 
diff --git a/sys/modules/svr4/Makefile b/sys/modules/svr4/Makefile
index 819118fdb693..50550989a6e4 100644
--- a/sys/modules/svr4/Makefile
+++ b/sys/modules/svr4/Makefile
@@ -9,7 +9,7 @@ SRCS=	svr4_sysent.c svr4_sysvec.c opt_compat.h opt_svr4.h \
 	svr4_machdep.c svr4_resource.c svr4_ipc.c
 OBJS=	svr4_locore.o 
 
-SRCS+=	opt_ktrace.h opt_sysvipc.h opt_route.h
+SRCS+=	opt_ktrace.h opt_sysvipc.h
 
 CLEANFILES=	svr4_assym.h svr4_genassym.o
 
diff --git a/sys/modules/wlan/Makefile b/sys/modules/wlan/Makefile
index bc39c29fc9a2..c5c788a0eb59 100644
--- a/sys/modules/wlan/Makefile
+++ b/sys/modules/wlan/Makefile
@@ -10,8 +10,7 @@ SRCS=	ieee80211.c ieee80211_crypto.c ieee80211_crypto_none.c ieee80211_dfs.c \
 	ieee80211_radiotap.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 \
-	opt_route.h
+SRCS+=	bus_if.h device_if.h opt_inet.h opt_ipx.h opt_wlan.h opt_ddb.h
 
 .if !defined(KERNBUILDDIR)
 opt_wlan.h:
diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c
index 059e963cf7ce..5007281f0ebb 100644
--- a/sys/net/bridgestp.c
+++ b/sys/net/bridgestp.c
@@ -37,8 +37,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_route.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
diff --git a/sys/net/flowtable.h b/sys/net/flowtable.h
index 50f126a190a8..c9a1f53006d9 100644
--- a/sys/net/flowtable.h
+++ b/sys/net/flowtable.h
@@ -33,8 +33,6 @@ $FreeBSD$
 #define	_NET_FLOWTABLE_H_
 
 #ifdef	_KERNEL
-#include "opt_route.h"
-
 #include <net/ethernet.h>
 #include <netinet/in.h>
 
diff --git a/sys/net/if.c b/sys/net/if.c
index 35a5e0b5df23..ba4cb1a8c19b 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -33,7 +33,6 @@
 #include "opt_compat.h"
 #include "opt_inet6.h"
 #include "opt_inet.h"
-#include "opt_route.h"
 #include "opt_carp.h"
 
 #include <sys/param.h>
diff --git a/sys/net/if_ef.c b/sys/net/if_ef.c
index c919e9f3feea..6d06c56b5138 100644
--- a/sys/net/if_ef.c
+++ b/sys/net/if_ef.c
@@ -29,7 +29,6 @@
 #include "opt_inet.h"
 #include "opt_ipx.h"
 #include "opt_ef.h"
-#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 02ff42222e2f..2bf4d3436d06 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -34,7 +34,6 @@
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipx.h"
-#include "opt_route.h"
 #include "opt_netgraph.h"
 #include "opt_carp.h"
 #include "opt_mbuf_profiling.h"
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index b0f22c89758d..82c68ffbd4a2 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -38,7 +38,6 @@
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipx.h"
-#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/net/if_mib.c b/sys/net/if_mib.c
index 4caa40fe57a0..15b1e013e8f3 100644
--- a/sys/net/if_mib.c
+++ b/sys/net/if_mib.c
@@ -29,8 +29,6 @@
  * $FreeBSD$
  */
 
-#include "opt_route.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index 562c58605802..3206e59b40bb 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -41,7 +41,6 @@
  * and ask it to send them.
  */
 
-#include "opt_route.h"
 #include "opt_vlan.h"
 
 #include <sys/param.h>
diff --git a/sys/net/raw_cb.c b/sys/net/raw_cb.c
index 408c2d2e4b48..415273194a76 100644
--- a/sys/net/raw_cb.c
+++ b/sys/net/raw_cb.c
@@ -31,8 +31,6 @@
  * $FreeBSD$
  */
 
-#include "opt_route.h"
-
 #include <sys/param.h>
 #include <sys/domain.h>
 #include <sys/lock.h>
diff --git a/sys/net/raw_usrreq.c b/sys/net/raw_usrreq.c
index 1749c13434e8..0d375cf663fe 100644
--- a/sys/net/raw_usrreq.c
+++ b/sys/net/raw_usrreq.c
@@ -31,8 +31,6 @@
  * $FreeBSD$
  */
 
-#include "opt_route.h"
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index 751e0ae8d713..2ea5eda12a07 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -31,7 +31,6 @@
  */
 #include "opt_sctp.h"
 #include "opt_mpath.h"
-#include "opt_route.h"
 #include "opt_inet.h"
 #include "opt_inet6.h"
 
diff --git a/sys/net80211/ieee80211_ddb.c b/sys/net80211/ieee80211_ddb.c
index 72304dad13ee..bf44c90801d1 100644
--- a/sys/net80211/ieee80211_ddb.c
+++ b/sys/net80211/ieee80211_ddb.c
@@ -27,7 +27,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
-#include "opt_route.h"
 #include "opt_wlan.h"
 
 #ifdef DDB
diff --git a/sys/netgraph/atm/ng_atm.c b/sys/netgraph/atm/ng_atm.c
index 88c8cf09d7a4..1b545c91a118 100644
--- a/sys/netgraph/atm/ng_atm.c
+++ b/sys/netgraph/atm/ng_atm.c
@@ -34,8 +34,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_route.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/netgraph/ng_ether.c b/sys/netgraph/ng_ether.c
index b26aea2b37ce..679c4e98cc23 100644
--- a/sys/netgraph/ng_ether.c
+++ b/sys/netgraph/ng_ether.c
@@ -46,8 +46,6 @@
  * ng_ether(4) netgraph node type
  */
 
-#include "opt_route.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/netgraph/ng_gif.c b/sys/netgraph/ng_gif.c
index 5b59feda2a4c..6f2657e74513 100644
--- a/sys/netgraph/ng_gif.c
+++ b/sys/netgraph/ng_gif.c
@@ -68,8 +68,6 @@
 /*
  * ng_gif(4) netgraph node type
  */
-#include "opt_route.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index f0716d2c0b7e..82b0cc04ca67 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -39,7 +39,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_inet.h"
-#include "opt_route.h"
 #include "opt_carp.h"
 
 #include <sys/param.h>
diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
index bc33acda2900..3e58193252e4 100644
--- a/sys/netinet/igmp.c
+++ b/sys/netinet/igmp.c
@@ -50,8 +50,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_route.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/module.h>
diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index a656102da0e7..6f408eb92860 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -34,7 +34,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_carp.h"
-#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netinet/in_mcast.c b/sys/netinet/in_mcast.c
index 66151f056dd1..d7cbd35b15e2 100644
--- a/sys/netinet/in_mcast.c
+++ b/sys/netinet/in_mcast.c
@@ -35,8 +35,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_route.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c
index 7d811f7a5814..d86cc19e5305 100644
--- a/sys/netinet/in_proto.c
+++ b/sys/netinet/in_proto.c
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_mrouting.h"
 #include "opt_ipsec.h"
 #include "opt_inet6.h"
-#include "opt_route.h"
 #include "opt_pf.h"
 #include "opt_carp.h"
 #include "opt_sctp.h"
diff --git a/sys/netinet/in_rmx.c b/sys/netinet/in_rmx.c
index f798f9c6866e..ceb139b03ea6 100644
--- a/sys/netinet/in_rmx.c
+++ b/sys/netinet/in_rmx.c
@@ -43,8 +43,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_route.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/netinet/ipfw/ip_fw2.c b/sys/netinet/ipfw/ip_fw2.c
index 760150a4ddb9..0a45658fcaf8 100644
--- a/sys/netinet/ipfw/ip_fw2.c
+++ b/sys/netinet/ipfw/ip_fw2.c
@@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$");
 #endif
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
-#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c
index 8063da134c30..43564a144391 100644
--- a/sys/netinet/raw_ip.c
+++ b/sys/netinet/raw_ip.c
@@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
-#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/jail.h>
diff --git a/sys/netinet/sctp_os_bsd.h b/sys/netinet/sctp_os_bsd.h
index faab253b1a3e..db139d8a8f45 100644
--- a/sys/netinet/sctp_os_bsd.h
+++ b/sys/netinet/sctp_os_bsd.h
@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_compat.h"
 #include "opt_inet6.h"
 #include "opt_inet.h"
-#include "opt_route.h"
 #include "opt_sctp.h"
 
 #include <sys/param.h>
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index e9ef879a2254..e2fc21c07ce4 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
-#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/domain.h>
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c
index 921618e888a6..9bb3d93a35a0 100644
--- a/sys/netinet6/in6.c
+++ b/sys/netinet6/in6.c
@@ -65,7 +65,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
-#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c
index 1666becb4a9c..c5d0729e6556 100644
--- a/sys/netinet6/in6_ifattach.c
+++ b/sys/netinet6/in6_ifattach.c
@@ -32,8 +32,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_route.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
diff --git a/sys/netinet6/in6_mcast.c b/sys/netinet6/in6_mcast.c
index 678dda024d7b..4ea8e102d887 100644
--- a/sys/netinet6/in6_mcast.c
+++ b/sys/netinet6/in6_mcast.c
@@ -36,7 +36,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_inet6.h"
-#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c
index e4d280dff241..76026866b43b 100644
--- a/sys/netinet6/in6_proto.c
+++ b/sys/netinet6/in6_proto.c
@@ -67,7 +67,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
 #include "opt_ipstealth.h"
-#include "opt_route.h"
 #include "opt_carp.h"
 #include "opt_sctp.h"
 #include "opt_mpath.h"
diff --git a/sys/netinet6/in6_rmx.c b/sys/netinet6/in6_rmx.c
index 4dbdad6e4b3e..00f833a6b54a 100644
--- a/sys/netinet6/in6_rmx.c
+++ b/sys/netinet6/in6_rmx.c
@@ -75,8 +75,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_route.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index 5166eb4cf3e9..182b5af47ec8 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
-#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c
index 79abf1f3cde4..e7bec95d702b 100644
--- a/sys/netinet6/ip6_mroute.c
+++ b/sys/netinet6/ip6_mroute.c
@@ -83,7 +83,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
-#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/callout.h>
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index 7f6aae4ffe9f..2755573d1e80 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
-#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index 96c6d018d39f..ce5aa9cbb479 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
-#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c
index eab8951ef56f..2160e291e31a 100644
--- a/sys/netinet6/nd6_rtr.c
+++ b/sys/netinet6/nd6_rtr.c
@@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
-#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c
index 43be628a8f4d..8b5a05cde4ec 100644
--- a/sys/netinet6/raw_ip6.c
+++ b/sys/netinet6/raw_ip6.c
@@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_ipsec.h"
 #include "opt_inet6.h"
-#include "opt_route.h"
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff --git a/sys/netinet6/scope6.c b/sys/netinet6/scope6.c
index b866cd916ff7..9267230ff60a 100644
--- a/sys/netinet6/scope6.c
+++ b/sys/netinet6/scope6.c
@@ -32,8 +32,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_route.h"
-
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
diff --git a/sys/netipsec/keysock.c b/sys/netipsec/keysock.c
index ec0fcf96456a..bb7cb00a910e 100644
--- a/sys/netipsec/keysock.c
+++ b/sys/netipsec/keysock.c
@@ -31,7 +31,6 @@
  */
 
 #include "opt_ipsec.h"
-#include "opt_route.h"
 
 /* This code has derived from sys/net/rtsock.c on FreeBSD2.2.5 */
 
diff --git a/sys/netipsec/xform_ipip.c b/sys/netipsec/xform_ipip.c
index 4d971681e449..e395f1b01d81 100644
--- a/sys/netipsec/xform_ipip.c
+++ b/sys/netipsec/xform_ipip.c
@@ -41,7 +41,6 @@
  */
 #include "opt_inet.h"
 #include "opt_inet6.h"
-#include "opt_route.h"
 #include "opt_enc.h"
 
 #include <sys/param.h>
diff --git a/sys/nfsclient/bootp_subr.c b/sys/nfsclient/bootp_subr.c
index 6f61abd67f07..1d7a308baec3 100644
--- a/sys/nfsclient/bootp_subr.c
+++ b/sys/nfsclient/bootp_subr.c
@@ -43,7 +43,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_route.h"
 #include "opt_bootp.h"
 
 #include <sys/param.h>
diff --git a/sys/nfsclient/nfs_diskless.c b/sys/nfsclient/nfs_diskless.c
index 26a27b97f4b6..ee0b022162d5 100644
--- a/sys/nfsclient/nfs_diskless.c
+++ b/sys/nfsclient/nfs_diskless.c
@@ -35,7 +35,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_route.h"
 #include "opt_bootp.h"
 
 #include <sys/param.h>