From 604d89458ab94ec81eaefa2d55ef219cba461e31 Mon Sep 17 00:00:00 2001 From: bz Date: Tue, 2 Dec 2008 21:37:28 +0000 Subject: [PATCH] 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 --- sys/compat/linprocfs/linprocfs.c | 1 + sys/compat/linux/linux_ioctl.c | 1 + sys/compat/linux/linux_socket.c | 3 +++ sys/compat/svr4/svr4_sockio.c | 1 + sys/contrib/altq/altq/altq_subr.c | 1 + sys/contrib/ipfilter/netinet/ip_fil_freebsd.c | 3 +++ sys/contrib/ipfilter/netinet/mlfk_ipl.c | 2 -- sys/contrib/pf/net/pf.c | 4 ++++ sys/contrib/pf/net/pf_if.c | 5 +++++ sys/contrib/pf/net/pf_ioctl.c | 3 +++ sys/contrib/pf/net/pf_subr.c | 1 + sys/contrib/rdma/rdma_cma.c | 1 + sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c | 3 +++ sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c | 3 +++ sys/kern/kern_poll.c | 1 + sys/kern/kern_uuid.c | 1 + sys/modules/ae/Makefile | 2 +- sys/modules/ath/Makefile | 2 +- sys/modules/ath_rate_amrr/Makefile | 2 +- sys/modules/ath_rate_onoe/Makefile | 2 +- sys/modules/ath_rate_sample/Makefile | 2 +- sys/modules/bridgestp/Makefile | 2 +- sys/modules/cxgb/iw_cxgb/Makefile | 3 ++- sys/modules/if_ef/Makefile | 2 +- sys/modules/if_vlan/Makefile | 2 +- sys/modules/ip_mroute_mod/Makefile | 2 +- sys/modules/ipfw/Makefile | 2 +- sys/modules/linprocfs/Makefile | 3 ++- sys/modules/linux/Makefile | 2 +- sys/modules/netgraph/atm/atm/Makefile | 2 +- sys/modules/netgraph/ether/Makefile | 2 +- sys/modules/netgraph/gif/Makefile | 2 +- sys/modules/nfsclient/Makefile | 2 +- sys/modules/pf/Makefile | 2 +- sys/modules/wlan/Makefile | 3 ++- sys/net/bridgestp.c | 1 + sys/net/if.c | 2 ++ sys/net/if_bridge.c | 2 ++ sys/net/if_ef.c | 1 + sys/net/if_ethersubr.c | 1 + sys/net/if_faith.c | 1 + sys/net/if_gre.c | 1 + sys/net/if_loop.c | 1 + sys/net/if_mib.c | 1 + sys/net/if_spppsubr.c | 1 + sys/net/if_stf.c | 1 + sys/net/if_var.h | 2 -- sys/net/if_vlan.c | 1 + sys/net/raw_cb.c | 1 + sys/net/raw_usrreq.c | 1 + sys/net/route.c | 2 ++ sys/net/rtsock.c | 1 + sys/net80211/ieee80211_ddb.c | 1 + sys/netgraph/atm/ng_atm.c | 1 + sys/netgraph/ng_eiface.c | 1 + sys/netgraph/ng_ether.c | 1 + sys/netgraph/ng_gif.c | 1 + sys/netinet/if_ether.c | 2 ++ sys/netinet/igmp.c | 2 ++ sys/netinet/in.c | 1 + sys/netinet/in.h | 4 ---- sys/netinet/in_gif.c | 1 + sys/netinet/in_mcast.c | 2 ++ sys/netinet/in_pcb.c | 2 ++ sys/netinet/in_rmx.c | 3 +++ sys/netinet/ip6.h | 2 -- sys/netinet/ip_carp.c | 2 ++ sys/netinet/ip_divert.c | 1 + sys/netinet/ip_fastfwd.c | 1 + sys/netinet/ip_fw2.c | 3 +++ sys/netinet/ip_icmp.c | 1 + sys/netinet/ip_id.c | 1 + sys/netinet/ip_input.c | 2 ++ sys/netinet/ip_ipsec.c | 1 + sys/netinet/ip_mroute.c | 2 ++ sys/netinet/ip_options.c | 1 + sys/netinet/ip_output.c | 2 ++ sys/netinet/raw_ip.c | 2 ++ sys/netinet/sctp_os_bsd.h | 2 +- sys/netinet/tcp_hostcache.c | 2 ++ sys/netinet/tcp_input.c | 5 +++++ sys/netinet/tcp_offload.c | 1 + sys/netinet/tcp_output.c | 2 ++ sys/netinet/tcp_reass.c | 1 + sys/netinet/tcp_sack.c | 1 + sys/netinet/tcp_subr.c | 2 ++ sys/netinet/tcp_syncache.c | 1 + sys/netinet/tcp_timer.c | 2 ++ sys/netinet/tcp_timewait.c | 1 + sys/netinet/tcp_usrreq.c | 1 + sys/netinet/udp_usrreq.c | 1 + sys/netinet/vinet.h | 2 -- sys/netinet6/dest6.c | 1 + sys/netinet6/frag6.c | 1 + sys/netinet6/icmp6.c | 4 ++++ sys/netinet6/in6.c | 2 ++ sys/netinet6/in6_gif.c | 1 + sys/netinet6/in6_ifattach.c | 3 +++ sys/netinet6/in6_pcb.c | 2 ++ sys/netinet6/in6_proto.c | 1 + sys/netinet6/in6_rmx.c | 3 +++ sys/netinet6/in6_src.c | 3 +++ sys/netinet6/ip6_forward.c | 1 + sys/netinet6/ip6_input.c | 3 +++ sys/netinet6/ip6_ipsec.c | 1 + sys/netinet6/ip6_mroute.c | 3 +++ sys/netinet6/ip6_output.c | 3 +++ sys/netinet6/mld6.c | 1 + sys/netinet6/nd6.c | 2 ++ sys/netinet6/nd6_nbr.c | 1 + sys/netinet6/nd6_rtr.c | 2 ++ sys/netinet6/raw_ip6.c | 6 +++++- sys/netinet6/route6.c | 1 + sys/netinet6/scope6.c | 4 +++- sys/netinet6/udp6_usrreq.c | 3 +++ sys/netinet6/vinet6.h | 20 ++++++++++--------- sys/netipsec/ipsec_input.c | 1 + sys/netipsec/ipsec_output.c | 1 + sys/netipsec/key.c | 2 ++ sys/netipsec/keysock.c | 1 + sys/netipsec/vipsec.h | 19 ++++++++---------- sys/netipsec/xform_ipip.c | 9 +++++---- sys/nfsclient/bootp_subr.c | 1 + sys/nfsclient/nfs_diskless.c | 2 ++ sys/nfsclient/nfs_vnops.c | 1 + 125 files changed, 214 insertions(+), 58 deletions(-) diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c index 7c7380bd4a33..9b6880d76610 100644 --- a/sys/compat/linprocfs/linprocfs.c +++ b/sys/compat/linprocfs/linprocfs.c @@ -76,6 +76,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index df081a7f0bdf..967ab71cac54 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -63,6 +63,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #ifdef COMPAT_LINUX32 #include diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 7875d4024712..af133d9af230 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -52,12 +52,15 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include #ifdef INET6 #include #include +#include +#include #endif #ifdef COMPAT_LINUX32 diff --git a/sys/compat/svr4/svr4_sockio.c b/sys/compat/svr4/svr4_sockio.c index b1fcd3eb3f03..6ed4e69e5fc2 100644 --- a/sys/compat/svr4/svr4_sockio.c +++ b/sys/compat/svr4/svr4_sockio.c @@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include diff --git a/sys/contrib/altq/altq/altq_subr.c b/sys/contrib/altq/altq/altq_subr.c index 0dd1801e82ae..a689fac6a3b0 100644 --- a/sys/contrib/altq/altq/altq_subr.c +++ b/sys/contrib/altq/altq/altq_subr.c @@ -51,6 +51,7 @@ #include #include #include +#include #include #include diff --git a/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c b/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c index f0604b090a3b..3bef15c24b9d 100644 --- a/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c +++ b/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c @@ -112,6 +112,9 @@ static const char rcsid[] = "@(#)$Id: ip_fil_freebsd.c,v 2.53.2.50 2007/09/20 12 #include "netinet/ip_scan.h" #endif #include "netinet/ip_pool.h" +#if defined(__FreeBSD_version) && (__FreeBSD_version >= 800056) +# include +#endif #if defined(__FreeBSD_version) && (__FreeBSD_version >= 300000) # include #endif diff --git a/sys/contrib/ipfilter/netinet/mlfk_ipl.c b/sys/contrib/ipfilter/netinet/mlfk_ipl.c index 0b462d9436c8..36048e4bb067 100644 --- a/sys/contrib/ipfilter/netinet/mlfk_ipl.c +++ b/sys/contrib/ipfilter/netinet/mlfk_ipl.c @@ -43,9 +43,7 @@ static int sysctl_ipf_int ( SYSCTL_HANDLER_ARGS ); static int ipf_modload(void); static int ipf_modunload(void); -#if __FreeBSD_version < 800055 SYSCTL_DECL(_net_inet); -#endif #define SYSCTL_IPF(parent, nbr, name, access, ptr, val, descr) \ SYSCTL_OID(parent, nbr, name, CTLTYPE_INT|access, \ ptr, val, sysctl_ipf_int, "I", descr); diff --git a/sys/contrib/pf/net/pf.c b/sys/contrib/pf/net/pf.c index 7ac43dadb861..29598302d241 100644 --- a/sys/contrib/pf/net/pf.c +++ b/sys/contrib/pf/net/pf.c @@ -120,6 +120,9 @@ __FBSDID("$FreeBSD$"); #include #include #include +#ifdef __FreeBSD__ +#include +#endif #ifndef __FreeBSD__ #include @@ -139,6 +142,7 @@ __FBSDID("$FreeBSD$"); #ifdef __FreeBSD__ #include #include +#include #endif #endif /* INET6 */ diff --git a/sys/contrib/pf/net/pf_if.c b/sys/contrib/pf/net/pf_if.c index 299d9e6a9da0..62dbbf22f7c0 100644 --- a/sys/contrib/pf/net/pf_if.c +++ b/sys/contrib/pf/net/pf_if.c @@ -54,10 +54,15 @@ __FBSDID("$FreeBSD$"); #include #endif #include +#ifdef __FreeBSD__ #include +#endif #include #include +#ifdef __FreeBSD__ +#include +#endif #include #include diff --git a/sys/contrib/pf/net/pf_ioctl.c b/sys/contrib/pf/net/pf_ioctl.c index 286fc31b21b3..6d509c5630cb 100644 --- a/sys/contrib/pf/net/pf_ioctl.c +++ b/sys/contrib/pf/net/pf_ioctl.c @@ -102,6 +102,9 @@ __FBSDID("$FreeBSD$"); #include #include #include +#ifdef __FreeBSD__ +#include +#endif #include #include diff --git a/sys/contrib/pf/net/pf_subr.c b/sys/contrib/pf/net/pf_subr.c index 5ea4b7167a6c..3b680e363720 100644 --- a/sys/contrib/pf/net/pf_subr.c +++ b/sys/contrib/pf/net/pf_subr.c @@ -65,6 +65,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include /* diff --git a/sys/contrib/rdma/rdma_cma.c b/sys/contrib/rdma/rdma_cma.c index 6b3c88d07eff..d5f7cae31d05 100644 --- a/sys/contrib/rdma/rdma_cma.c +++ b/sys/contrib/rdma/rdma_cma.c @@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include diff --git a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c index d2e3fe7e8173..db1c406f7830 100644 --- a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c +++ b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c @@ -62,6 +62,9 @@ __FBSDID("$FreeBSD$"); #include #include +#if __FreeBSD_version >= 800056 +#include +#endif #include diff --git a/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c b/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c index 0fe4416e78a9..334f3152e092 100644 --- a/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c +++ b/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c @@ -78,6 +78,9 @@ __FBSDID("$FreeBSD$"); #include #include #include +#if __FreeBSD_version >= 800056 +#include +#endif #include #include diff --git a/sys/kern/kern_poll.c b/sys/kern/kern_poll.c index 2cebab9bf4cf..48a3a09c5ba8 100644 --- a/sys/kern/kern_poll.c +++ b/sys/kern/kern_poll.c @@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$"); #include /* for IFF_* flags */ #include /* for NETISR_POLL */ +#include #include #include diff --git a/sys/kern/kern_uuid.c b/sys/kern/kern_uuid.c index 8677f7ac800f..f8b547c9cd21 100644 --- a/sys/kern/kern_uuid.c +++ b/sys/kern/kern_uuid.c @@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include /* * See also: diff --git a/sys/modules/ae/Makefile b/sys/modules/ae/Makefile index fd810e9ab11c..4cd97a118837 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 diff --git a/sys/modules/ath/Makefile b/sys/modules/ath/Makefile index 6105fd9bf632..4f478f60ff80 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 e3c3cb5eb350..cbeea9c55255 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 eea8cbeea239..fe725e45869e 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 b3e3a6ce67ed..c179d10f3866 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 3cfc6e376df2..e27bbc3e8281 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 diff --git a/sys/modules/cxgb/iw_cxgb/Makefile b/sys/modules/cxgb/iw_cxgb/Makefile index 8cfe6dbd6bda..e7f0523b191a 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 dc40213c7181..79a0081d7878 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 9842619b35da..65ed0609c3a1 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 diff --git a/sys/modules/ip_mroute_mod/Makefile b/sys/modules/ip_mroute_mod/Makefile index 5b3330fd513c..3ca0a3dc20e9 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 e208e1dccb8b..8e40d4291fc6 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 9b89c96aa56d..a7cb129defa5 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 82eb0561900d..fbf5a5851e26 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 ebd94e13f40e..fff3230beba8 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 diff --git a/sys/modules/netgraph/ether/Makefile b/sys/modules/netgraph/ether/Makefile index 7a3950edae75..49f2bb652ea5 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 diff --git a/sys/modules/netgraph/gif/Makefile b/sys/modules/netgraph/gif/Makefile index acf4373f26bf..121cfa96bca9 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 1562a64b7687..11742f55d7c3 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 3b07c41512b3..3b530509b925 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 70533ba873d8..edb2218d41ec 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: diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c index 99ad32e8f3ea..7a750513fbea 100644 --- a/sys/net/bridgestp.c +++ b/sys/net/bridgestp.c @@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include diff --git a/sys/net/if.c b/sys/net/if.c index 9cc6f83541b5..59a52113bd94 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -67,6 +67,7 @@ #include #include #include +#include #if defined(INET) || defined(INET6) /*XXX*/ @@ -79,6 +80,7 @@ #endif #ifdef INET #include +#include #endif #ifdef DEV_CARP #include diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 0a532652d738..8f07e6c22506 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -115,9 +115,11 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #ifdef INET6 #include #include +#include #endif #ifdef DEV_CARP #include diff --git a/sys/net/if_ef.c b/sys/net/if_ef.c index 59d45561f08c..11e381e876c9 100644 --- a/sys/net/if_ef.c +++ b/sys/net/if_ef.c @@ -50,6 +50,7 @@ #include #include #include +#include #ifdef INET #include diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index d790d9109a70..d26609cc1dc7 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -63,6 +63,7 @@ #include #include #include +#include #if defined(INET) || defined(INET6) #include diff --git a/sys/net/if_faith.c b/sys/net/if_faith.c index 6fdb72b0c5c4..c83974870e18 100644 --- a/sys/net/if_faith.c +++ b/sys/net/if_faith.c @@ -77,6 +77,7 @@ #include #include #include +#include #endif #define FAITHNAME "faith" diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c index 6b5e7392059e..cfd249f0c34d 100644 --- a/sys/net/if_gre.c +++ b/sys/net/if_gre.c @@ -79,6 +79,7 @@ #include #include #include +#include #else #error "Huh? if_gre without inet?" #endif diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c index ab5bda794d16..4b425275d370 100644 --- a/sys/net/if_loop.c +++ b/sys/net/if_loop.c @@ -57,6 +57,7 @@ #include #include #include +#include #ifdef INET #include diff --git a/sys/net/if_mib.c b/sys/net/if_mib.c index 090259920e62..ae9088dd7922 100644 --- a/sys/net/if_mib.c +++ b/sys/net/if_mib.c @@ -38,6 +38,7 @@ #include #include +#include /* * 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 51110c7cb983..930ab4c49d36 100644 --- a/sys/net/if_spppsubr.c +++ b/sys/net/if_spppsubr.c @@ -56,6 +56,7 @@ #ifdef INET #include #include +#include #endif #ifdef INET6 diff --git a/sys/net/if_stf.c b/sys/net/if_stf.c index d3c0d75f247f..e3db9aed95f7 100644 --- a/sys/net/if_stf.c +++ b/sys/net/if_stf.c @@ -107,6 +107,7 @@ #include #include #include +#include #include #include diff --git a/sys/net/if_var.h b/sys/net/if_var.h index c6bcdf7e8ee8..07244885d307 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 - #endif /* _KERNEL */ #endif /* !_NET_IF_VAR_H_ */ diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 586fefdc2ea3..ada6a72c7ed7 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -64,6 +64,7 @@ #include #include #include +#include #define VLANNAME "vlan" #define VLAN_DEF_HWIDTH 4 diff --git a/sys/net/raw_cb.c b/sys/net/raw_cb.c index b2a04ca849dc..1dedff8aac8a 100644 --- a/sys/net/raw_cb.c +++ b/sys/net/raw_cb.c @@ -46,6 +46,7 @@ #include #include +#include /* * Routines to manage the raw protocol control blocks. diff --git a/sys/net/raw_usrreq.c b/sys/net/raw_usrreq.c index 633125af0de8..79d3e30bb101 100644 --- a/sys/net/raw_usrreq.c +++ b/sys/net/raw_usrreq.c @@ -48,6 +48,7 @@ #include #include +#include MTX_SYSINIT(rawcb_mtx, &rawcb_mtx, "rawcb", MTX_DEF); diff --git a/sys/net/route.c b/sys/net/route.c index f97c07715f1c..a20faf3d6007 100644 --- a/sys/net/route.c +++ b/sys/net/route.c @@ -57,9 +57,11 @@ #ifdef RADIX_MPATH #include #endif +#include #include #include +#include #include diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 15c69288fdf4..7662c8d947ba 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -54,6 +54,7 @@ #include #include #include +#include #include #ifdef INET6 diff --git a/sys/net80211/ieee80211_ddb.c b/sys/net80211/ieee80211_ddb.c index a319bd5f0b3b..b3dd4d4c1d02 100644 --- a/sys/net80211/ieee80211_ddb.c +++ b/sys/net80211/ieee80211_ddb.c @@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include diff --git a/sys/netgraph/atm/ng_atm.c b/sys/netgraph/atm/ng_atm.c index 2beed3292827..e5e1e2eaadc1 100644 --- a/sys/netgraph/atm/ng_atm.c +++ b/sys/netgraph/atm/ng_atm.c @@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include diff --git a/sys/netgraph/ng_eiface.c b/sys/netgraph/ng_eiface.c index 1c952cd96d28..3d92e5f45b79 100644 --- a/sys/netgraph/ng_eiface.c +++ b/sys/netgraph/ng_eiface.c @@ -43,6 +43,7 @@ #include #include #include +#include #include #include diff --git a/sys/netgraph/ng_ether.c b/sys/netgraph/ng_ether.c index 9bcd374a21f8..d76e7e162849 100644 --- a/sys/netgraph/ng_ether.c +++ b/sys/netgraph/ng_ether.c @@ -63,6 +63,7 @@ #include #include #include +#include #include #include diff --git a/sys/netgraph/ng_gif.c b/sys/netgraph/ng_gif.c index 22d085a2bc04..9a2d3b94e0c9 100644 --- a/sys/netgraph/ng_gif.c +++ b/sys/netgraph/ng_gif.c @@ -84,6 +84,7 @@ #include #include #include +#include #include #include diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index 82dc605ce2d3..cf19a22bf1ea 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -61,10 +61,12 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include +#include #include #include diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c index f77434c6168b..3dacdcd9bc7f 100644 --- a/sys/netinet/igmp.c +++ b/sys/netinet/igmp.c @@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include @@ -70,6 +71,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include diff --git a/sys/netinet/in.c b/sys/netinet/in.c index b57049f155d6..9b6dd4882d75 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include static int in_mask2len(struct in_addr *); static void in_len2mask(struct in_addr *, int); diff --git a/sys/netinet/in.h b/sys/netinet/in.h index b505a2ebb09f..b969bdf5634b 100644 --- a/sys/netinet/in.h +++ b/sys/netinet/in.h @@ -743,8 +743,4 @@ void in_ifdetach(struct ifnet *); #undef __KAME_NETINET_IN_H_INCLUDED_ #endif -#ifdef _KERNEL -#include -#endif - #endif /* !_NETINET_IN_H_*/ diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c index f34710284da6..9bcb09e1c068 100644 --- a/sys/netinet/in_gif.c +++ b/sys/netinet/in_gif.c @@ -59,6 +59,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #ifdef INET6 #include diff --git a/sys/netinet/in_mcast.c b/sys/netinet/in_mcast.c index 6cf6d927b9cc..e7916dd62c36 100644 --- a/sys/netinet/in_mcast.c +++ b/sys/netinet/in_mcast.c @@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -60,6 +61,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #ifndef __SOCKUNION_DECLARED union sockunion { diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index bb2eae05f1dd..35eb6872e27e 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -71,9 +71,11 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #ifdef INET6 #include #include +#include #endif /* INET6 */ diff --git a/sys/netinet/in_rmx.c b/sys/netinet/in_rmx.c index adb4fee237dc..aa4ca0d80d83 100644 --- a/sys/netinet/in_rmx.c +++ b/sys/netinet/in_rmx.c @@ -55,9 +55,12 @@ __FBSDID("$FreeBSD$"); #include #include +#include + #include #include #include +#include extern int in_inithead(void **head, int off); diff --git a/sys/netinet/ip6.h b/sys/netinet/ip6.h index a7df9c86cea5..0896949cdd95 100644 --- a/sys/netinet/ip6.h +++ b/sys/netinet/ip6.h @@ -347,8 +347,6 @@ do { \ } \ } while (/*CONSTCOND*/ 0) -#include - #endif /*_KERNEL*/ #endif /* not _NETINET_IP6_H_ */ diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index f93b895a1781..b4212cc19f0c 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -74,6 +74,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #endif #ifdef INET6 @@ -82,6 +83,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #endif #include diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index b74f5db4e0b1..dc627a8df82d 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -74,6 +74,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include diff --git a/sys/netinet/ip_fastfwd.c b/sys/netinet/ip_fastfwd.c index 7af17582a802..407b08c4a713 100644 --- a/sys/netinet/ip_fastfwd.c +++ b/sys/netinet/ip_fastfwd.c @@ -103,6 +103,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include diff --git a/sys/netinet/ip_fw2.c b/sys/netinet/ip_fw2.c index f7c5735e5aed..f9696cc232b9 100644 --- a/sys/netinet/ip_fw2.c +++ b/sys/netinet/ip_fw2.c @@ -69,6 +69,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #define IPFW_INTERNAL /* Access to protected data structures in ip_fw.h. */ @@ -91,6 +92,8 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include + #include #include diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index e631dae8c2f2..3666f5c916d2 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #ifdef IPSEC #include diff --git a/sys/netinet/ip_id.c b/sys/netinet/ip_id.c index ed0a3e49b044..ce8c6b42ec78 100644 --- a/sys/netinet/ip_id.c +++ b/sys/netinet/ip_id.c @@ -104,6 +104,7 @@ static int sysctl_ip_id_change(SYSCTL_HANDLER_ARGS); MTX_SYSINIT(ip_id_mtx, &ip_id_mtx, "ip_id_mtx", MTX_DEF); +SYSCTL_DECL(_net_inet_ip); SYSCTL_PROC(_net_inet_ip, OID_AUTO, random_id_period, CTLTYPE_INT|CTLFLAG_RW, &array_size, 0, sysctl_ip_id_change, "IU", "IP ID Array size"); SYSCTL_INT(_net_inet_ip, OID_AUTO, random_id_collisions, CTLFLAG_RD, diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 7f12098fac20..35ebf86adac8 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -70,6 +71,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #ifdef DEV_CARP #include #endif diff --git a/sys/netinet/ip_ipsec.c b/sys/netinet/ip_ipsec.c index a4f8631f1dec..a1e082bafa88 100644 --- a/sys/netinet/ip_ipsec.c +++ b/sys/netinet/ip_ipsec.c @@ -55,6 +55,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index a241ec495fd5..36a5efdd5d37 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -96,6 +96,8 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include + #ifdef INET6 #include #include diff --git a/sys/netinet/ip_options.c b/sys/netinet/ip_options.c index 1cbe9f63b0c4..1a97c6fe14e2 100644 --- a/sys/netinet/ip_options.c +++ b/sys/netinet/ip_options.c @@ -63,6 +63,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index 197ce9c7467d..a40dd1d182f6 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -59,6 +59,7 @@ __FBSDID("$FreeBSD$"); #ifdef RADIX_MPATH #include #endif +#include #include #include @@ -67,6 +68,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #ifdef IPSEC #include diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 71eaaa0b9fd1..787194937fc4 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -58,6 +58,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include @@ -69,6 +70,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #ifdef IPSEC #include diff --git a/sys/netinet/sctp_os_bsd.h b/sys/netinet/sctp_os_bsd.h index bead1ae8fac1..64a4794a6bd9 100644 --- a/sys/netinet/sctp_os_bsd.h +++ b/sys/netinet/sctp_os_bsd.h @@ -77,7 +77,7 @@ __FBSDID("$FreeBSD$"); #include #include #include - +#include #ifdef IPSEC #include diff --git a/sys/netinet/tcp_hostcache.c b/sys/netinet/tcp_hostcache.c index ae89d59d6547..7c7616060a27 100644 --- a/sys/netinet/tcp_hostcache.c +++ b/sys/netinet/tcp_hostcache.c @@ -92,6 +92,8 @@ __FBSDID("$FreeBSD$"); #endif #include #include +#include +#include #ifdef INET6 #include #endif diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 7b292d27308b..18a1bab64431 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -87,6 +87,11 @@ __FBSDID("$FreeBSD$"); #ifdef TCPDEBUG #include #endif /* TCPDEBUG */ +#include + +#ifdef INET6 +#include +#endif #ifdef IPSEC #include diff --git a/sys/netinet/tcp_offload.c b/sys/netinet/tcp_offload.c index 6419a954ae8f..fbaa05e6ce22 100644 --- a/sys/netinet/tcp_offload.c +++ b/sys/netinet/tcp_offload.c @@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include uint32_t toedev_registration_count; diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index d93592b439c5..23473051c679 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include @@ -74,6 +75,7 @@ __FBSDID("$FreeBSD$"); #ifdef TCPDEBUG #include #endif +#include #ifdef IPSEC #include diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c index 5f47be0c99c2..172abc57002e 100644 --- a/sys/netinet/tcp_reass.c +++ b/sys/netinet/tcp_reass.c @@ -73,6 +73,7 @@ __FBSDID("$FreeBSD$"); #ifdef TCPDEBUG #include #endif /* TCPDEBUG */ +#include #ifdef VIMAGE_GLOBALS static int tcp_reass_maxseg; diff --git a/sys/netinet/tcp_sack.c b/sys/netinet/tcp_sack.c index 9eb57ba1d95c..b52b5b3a7fe1 100644 --- a/sys/netinet/tcp_sack.c +++ b/sys/netinet/tcp_sack.c @@ -119,6 +119,7 @@ __FBSDID("$FreeBSD$"); #ifdef TCPDEBUG #include #endif /* TCPDEBUG */ +#include #include diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index c7146c88133b..639c42f6c087 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -94,7 +94,9 @@ __FBSDID("$FreeBSD$"); #ifdef TCPDEBUG #include #endif +#include #include +#include #ifdef IPSEC #include diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 252fa1c09bab..838fd52e1a20 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -85,6 +85,7 @@ __FBSDID("$FreeBSD$"); #ifdef INET6 #include #endif +#include #ifdef IPSEC #include diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c index 2e7071935454..acce92f19307 100644 --- a/sys/netinet/tcp_timer.c +++ b/sys/netinet/tcp_timer.c @@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include @@ -64,6 +65,7 @@ __FBSDID("$FreeBSD$"); #ifdef TCPDEBUG #include #endif +#include int tcp_keepinit; SYSCTL_PROC(_net_inet_tcp, TCPCTL_KEEPINIT, keepinit, CTLTYPE_INT|CTLFLAG_RW, diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c index 7b06de4b77bb..37fafa016954 100644 --- a/sys/netinet/tcp_timewait.c +++ b/sys/netinet/tcp_timewait.c @@ -88,6 +88,7 @@ __FBSDID("$FreeBSD$"); #include #endif #include +#include #include diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 6428b642676e..2011dff7382f 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -87,6 +87,7 @@ __FBSDID("$FreeBSD$"); #include #endif #include +#include /* * TCP protocol interface to socket abstraction. diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 2e523091c74a..53e9626168ca 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -81,6 +81,7 @@ __FBSDID("$FreeBSD$"); #endif #include #include +#include #ifdef IPSEC #include diff --git a/sys/netinet/vinet.h b/sys/netinet/vinet.h index 5fdb1c0c28b0..8a8babadcfc7 100644 --- a/sys/netinet/vinet.h +++ b/sys/netinet/vinet.h @@ -37,8 +37,6 @@ #include #include -#include - #include #include #include diff --git a/sys/netinet6/dest6.c b/sys/netinet6/dest6.c index 6ac30edeab1d..f0045aab78ed 100644 --- a/sys/netinet6/dest6.c +++ b/sys/netinet6/dest6.c @@ -55,6 +55,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include /* * Destination options header processing. diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c index 391ce92a1050..5c4df75d013e 100644 --- a/sys/netinet6/frag6.c +++ b/sys/netinet6/frag6.c @@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$"); #include #include /* for ECN definitions */ #include /* for ECN definitions */ +#include #include diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 4424481ca668..59bc95acdd19 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -87,6 +87,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -94,6 +95,8 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include + #include #include #include @@ -101,6 +104,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #ifdef IPSEC #include diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index 483409665a0c..c78484542037 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -84,6 +84,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -100,6 +101,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include MALLOC_DEFINE(M_IP6MADDR, "in6_multi", "internet multicast address"); diff --git a/sys/netinet6/in6_gif.c b/sys/netinet6/in6_gif.c index a0bdda8ec00e..ff0b8d195d01 100644 --- a/sys/netinet6/in6_gif.c +++ b/sys/netinet6/in6_gif.c @@ -66,6 +66,7 @@ __FBSDID("$FreeBSD$"); #include #ifdef INET6 #include +#include #endif #include diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c index 48579bc404c5..7b5c2f90855c 100644 --- a/sys/netinet6/in6_ifattach.c +++ b/sys/netinet6/in6_ifattach.c @@ -46,11 +46,13 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include #include +#include #include #include @@ -60,6 +62,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #ifdef VIMAGE_GLOBALS unsigned long in6_maxmtu; diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index 6cf40ce9a203..ad19bee8bee7 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -96,12 +96,14 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include #include #include +#include #include diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c index f4fabf66c04b..112cda21b904 100644 --- a/sys/netinet6/in6_proto.c +++ b/sys/netinet6/in6_proto.c @@ -128,6 +128,7 @@ __FBSDID("$FreeBSD$"); #endif /* IPSEC */ #include +#include /* * TCP/IP protocol family: IP6, ICMP6, UDP, TCP. diff --git a/sys/netinet6/in6_rmx.c b/sys/netinet6/in6_rmx.c index f6289650b6ef..25e011acb11d 100644 --- a/sys/netinet6/in6_rmx.c +++ b/sys/netinet6/in6_rmx.c @@ -89,6 +89,8 @@ __FBSDID("$FreeBSD$"); #include #include +#include + #include #include #include @@ -98,6 +100,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include diff --git a/sys/netinet6/in6_src.c b/sys/netinet6/in6_src.c index 481ad12706f8..4d7723aa77e3 100644 --- a/sys/netinet6/in6_src.c +++ b/sys/netinet6/in6_src.c @@ -99,12 +99,15 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include + #include #include #include #include #include #include +#include static struct mtx addrsel_lock; #define ADDRSEL_LOCK_INIT() mtx_init(&addrsel_lock, "addrsel_lock", NULL, MTX_DEF) diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c index 7571507876f6..db0094c48f6e 100644 --- a/sys/netinet6/ip6_forward.c +++ b/sys/netinet6/ip6_forward.c @@ -65,6 +65,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index 320042f9ecd0..fb42c5e73103 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -88,12 +88,14 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #ifdef INET #include #include +#include #endif /* INET */ #include #include @@ -103,6 +105,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #ifdef IPSEC #include diff --git a/sys/netinet6/ip6_ipsec.c b/sys/netinet6/ip6_ipsec.c index 23f4e26ff382..a6ac5c9551f2 100644 --- a/sys/netinet6/ip6_ipsec.c +++ b/sys/netinet6/ip6_ipsec.c @@ -72,6 +72,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include extern struct protosw inet6sw[]; diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index 2ae6ed883363..9b85a1611374 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -107,10 +107,12 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include +#include #include #include @@ -120,6 +122,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include static MALLOC_DEFINE(M_MRTABLE6, "mf6c", "multicast forwarding cache entry"); diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index fb7162fbace5..6e5d0d03867c 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -84,6 +84,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -94,6 +95,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #ifdef IPSEC #include @@ -104,6 +106,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include static MALLOC_DEFINE(M_IP6MOPTS, "ip6_moptions", "internet multicast options"); diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c index 9c6bbdb40ff6..3e0f921c90ff 100644 --- a/sys/netinet6/mld6.c +++ b/sys/netinet6/mld6.c @@ -91,6 +91,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include /* * Protocol constants diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index dfe001675544..8f517a5729cc 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -58,6 +58,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -67,6 +68,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c index ef898cd35d19..ecfad0efe8e0 100644 --- a/sys/netinet6/nd6_nbr.c +++ b/sys/netinet6/nd6_nbr.c @@ -70,6 +70,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #ifdef DEV_CARP #include diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c index 200f1f40f9f8..5e52a8539110 100644 --- a/sys/netinet6/nd6_rtr.c +++ b/sys/netinet6/nd6_rtr.c @@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -62,6 +63,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #define SDL(s) ((struct sockaddr_dl *)s) diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c index 4537f7d540fe..b13275135c19 100644 --- a/sys/netinet6/raw_ip6.c +++ b/sys/netinet6/raw_ip6.c @@ -84,12 +84,15 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include -#include #include +#include + +#include #include #include #include @@ -98,6 +101,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #ifdef IPSEC #include diff --git a/sys/netinet6/route6.c b/sys/netinet6/route6.c index dd1ec68b2b5b..2bff4afbb252 100644 --- a/sys/netinet6/route6.c +++ b/sys/netinet6/route6.c @@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #if 0 static int ip6_rthdr0 __P((struct mbuf *, struct ip6_hdr *, diff --git a/sys/netinet6/scope6.c b/sys/netinet6/scope6.c index 4bb84d921a81..3dde09acac3e 100644 --- a/sys/netinet6/scope6.c +++ b/sys/netinet6/scope6.c @@ -43,12 +43,14 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include -#include +#include #include #include +#include /* diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index 6d233dd4d112..cfb0ad6a0608 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -103,11 +103,14 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include + #include #include #include #include #include +#include #ifdef IPSEC #include diff --git a/sys/netinet6/vinet6.h b/sys/netinet6/vinet6.h index cc8269c13dc1..a84be4fdb317 100644 --- a/sys/netinet6/vinet6.h +++ b/sys/netinet6/vinet6.h @@ -33,17 +33,19 @@ #ifndef _NETINET6_VINET6_H_ #define _NETINET6_VINET6_H_ -#include -#include -#include -#include -#include +#include +#include +#include + +#include + #include -#include -#include -#include +#include + +#include #include -#include +#include +#include struct vnet_inet6 { struct in6_ifaddr * _in6_ifaddr; diff --git a/sys/netipsec/ipsec_input.c b/sys/netipsec/ipsec_input.c index 0c37aef21955..018e0c58484f 100644 --- a/sys/netipsec/ipsec_input.c +++ b/sys/netipsec/ipsec_input.c @@ -74,6 +74,7 @@ #include #ifdef INET6 #include +#include #endif #include diff --git a/sys/netipsec/ipsec_output.c b/sys/netipsec/ipsec_output.c index 7b79294e4eeb..57284273a0f0 100644 --- a/sys/netipsec/ipsec_output.c +++ b/sys/netipsec/ipsec_output.c @@ -65,6 +65,7 @@ #include #ifdef INET6 #include +#include #endif #include diff --git a/sys/netipsec/key.c b/sys/netipsec/key.c index 3e2b4e093d67..f65d1f1080a5 100644 --- a/sys/netipsec/key.c +++ b/sys/netipsec/key.c @@ -75,9 +75,11 @@ #ifdef INET #include +#include #endif #ifdef INET6 #include +#include #endif /* INET6 */ #include diff --git a/sys/netipsec/keysock.c b/sys/netipsec/keysock.c index 6842b5f61233..5fb7fd58b676 100644 --- a/sys/netipsec/keysock.c +++ b/sys/netipsec/keysock.c @@ -55,6 +55,7 @@ #include #include #include +#include #include diff --git a/sys/netipsec/vipsec.h b/sys/netipsec/vipsec.h index 32818b90c17d..de97452c77d7 100644 --- a/sys/netipsec/vipsec.h +++ b/sys/netipsec/vipsec.h @@ -33,21 +33,18 @@ #ifndef _NETIPSEC_VIPSEC_H_ #define _NETIPSEC_VIPSEC_H_ -#include #include -#include -#include -#include -#include -#include -#include - -#include -#include -#include +#include #include +#include + +#include +#include +#include +#include +#include #include struct vnet_ipsec { diff --git a/sys/netipsec/xform_ipip.c b/sys/netipsec/xform_ipip.c index 610f984792c1..a9492dc27de2 100644 --- a/sys/netipsec/xform_ipip.c +++ b/sys/netipsec/xform_ipip.c @@ -56,6 +56,7 @@ #include #include #include +#include #include #include @@ -64,16 +65,16 @@ #include #include #include +#ifdef MROUTING +#include +#endif +#include #include #include #include -#ifdef MROUTING -#include -#endif - #ifdef INET6 #include #include diff --git a/sys/nfsclient/bootp_subr.c b/sys/nfsclient/bootp_subr.c index 1274da093de5..6f1014d4fe5d 100644 --- a/sys/nfsclient/bootp_subr.c +++ b/sys/nfsclient/bootp_subr.c @@ -65,6 +65,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include diff --git a/sys/nfsclient/nfs_diskless.c b/sys/nfsclient/nfs_diskless.c index 7362aa9011c5..025979084e72 100644 --- a/sys/nfsclient/nfs_diskless.c +++ b/sys/nfsclient/nfs_diskless.c @@ -50,6 +50,8 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include + #include #include #include diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c index b019af0a655b..73994707875c 100644 --- a/sys/nfsclient/nfs_vnops.c +++ b/sys/nfsclient/nfs_vnops.c @@ -83,6 +83,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include /* Defs */ #define TRUE 1