Mailing List Archive

kernel builds on amd64, i386, arm64, sparc64 as does make build/release on amd64 diff --git sys/netinet/if_ether.c sys/netinet/if_ether.c index a9dc10519d4..a1e3b737461 100644 --- sys/netinet/if_ether.c +++ sys/netinet/if_ether.c @@ -45,7 +45,6 @@ #include <sys/mbuf.h> #include <sys/socket.h> #include <sys/timeout.h> -#include <sys/kernel.h> #include <sys/syslog.h> #include <sys/queue.h> #include <sys/pool.h> @@ -58,7 +57,6 @@ #include <net/netisr.h> #include <netinet/in.h> -#include <netinet/in_var.h> #include <netinet/if_ether.h> #include <netinet/ip_var.h> #if NCARP > 0 diff --git sys/netinet/igmp.c sys/netinet/igmp.c index 2f67490099c..4a5ef5df3c3 100644 --- sys/netinet/igmp.c +++ sys/netinet/igmp.c @@ -92,8 +92,6 @@ #include <netinet/igmp.h> #include <netinet/igmp_var.h> -#include <sys/stdarg.h> - #define IP_MULTICASTOPTS 0 int igmp_timers_are_running; /* [a] shortcut for fast timer */ diff --git sys/netinet/in.c sys/netinet/in.c index 7cf2cc6392c..1532e68c7f7 100644 --- sys/netinet/in.c +++ sys/netinet/in.c @@ -79,9 +79,6 @@ #include <netinet/ip_mroute.h> #endif -#include "ether.h" - - void in_socktrim(struct sockaddr_in *); int in_ioctl_set_ifaddr(u_long, caddr_t, struct ifnet *); diff --git sys/netinet/in_pcb.c sys/netinet/in_pcb.c index 5046b742192..4afde2822d3 100644 --- sys/netinet/in_pcb.c +++ sys/netinet/in_pcb.c @@ -75,9 +75,7 @@ #include <sys/mbuf.h> #include <sys/protosw.h> #include <sys/socket.h> -#include <sys/socketvar.h> #include <sys/domain.h> -#include <sys/mount.h> #include <sys/pool.h> #include <sys/proc.h> diff --git sys/netinet/in_proto.c sys/netinet/in_proto.c index 223e2387382..66924e4c5a4 100644 --- sys/netinet/in_proto.c +++ sys/netinet/in_proto.c @@ -101,12 +101,9 @@ #include <sys/socket.h> #include <sys/protosw.h> #include <sys/domain.h> -#include <sys/mbuf.h> #include <net/if.h> #include <net/if_var.h> -#include <net/route.h> -#include <net/rtable.h> #include <netinet/in.h> #include <netinet/ip.h> @@ -114,10 +111,6 @@ #include <netinet/ip_icmp.h> #include <netinet/in_pcb.h> -#ifdef INET6 -#include <netinet/ip6.h> -#endif - #include <netinet/igmp_var.h> #include <netinet/tcp.h> #include <netinet/tcp_timer.h> @@ -134,15 +127,10 @@ #include <net/if_gif.h> #endif -#ifdef INET6 -#include <netinet6/ip6_var.h> -#endif /* INET6 */ - #ifdef IPSEC #include <netinet/ip_ipsp.h> #endif -#include <netinet/ip_ether.h> #include <netinet/ip_ipip.h> #include "gre.h" diff --git sys/netinet/inet_nat64.c sys/netinet/inet_nat64.c index 79d3c4539d3..ccbd7a5d23c 100644 --- sys/netinet/inet_nat64.c +++ sys/netinet/inet_nat64.c @@ -19,9 +19,7 @@ #include <sys/param.h> #include <sys/socket.h> -#ifdef _KERNEL -#include <sys/mbuf.h> -#else +#ifndef _KERNEL #include <errno.h> #endif diff --git sys/netinet/ip_ah.c sys/netinet/ip_ah.c index f087ef8dccc..98502302cbc 100644 --- sys/netinet/ip_ah.c +++ sys/netinet/ip_ah.c @@ -49,7 +49,6 @@ #include <netinet/in.h> #include <netinet/ip.h> -#include <netinet/ip_var.h> #ifdef INET6 #include <netinet/ip6.h> diff --git sys/netinet/ip_carp.c sys/netinet/ip_carp.c index aabddd51449..986d54c9651 100644 --- sys/netinet/ip_carp.c +++ sys/netinet/ip_carp.c @@ -34,18 +34,13 @@ * */ -#include "ether.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/socket.h> -#include <sys/socketvar.h> #include <sys/timeout.h> #include <sys/ioctl.h> #include <sys/errno.h> -#include <sys/device.h> -#include <sys/kernel.h> #include <sys/sysctl.h> #include <sys/syslog.h> #include <sys/refcnt.h> @@ -53,8 +48,6 @@ #include <net/if.h> #include <net/if_var.h> #include <net/if_types.h> -#include <net/netisr.h> -#include <net/route.h> #include <crypto/sha1.h> @@ -63,7 +56,6 @@ #include <netinet/ip.h> #include <netinet/ip_var.h> #include <netinet/if_ether.h> -#include <netinet/ip_ipsp.h> #include <net/if_dl.h> @@ -81,11 +73,6 @@ #include <net/bpf.h> #endif -#include "vlan.h" -#if NVLAN > 0 -#include <net/if_vlan_var.h> -#endif - #include <netinet/ip_carp.h> /* diff --git sys/netinet/ip_divert.c sys/netinet/ip_divert.c index 59f3b05a6be..dc79aa04782 100644 --- sys/netinet/ip_divert.c +++ sys/netinet/ip_divert.c @@ -21,13 +21,11 @@ #include <sys/mbuf.h> #include <sys/protosw.h> #include <sys/socket.h> -#include <sys/socketvar.h> #include <sys/sysctl.h> #include <net/if.h> #include <net/route.h> #include <net/if_var.h> -#include <net/netisr.h> #include <netinet/in.h> #include <netinet/in_var.h> diff --git sys/netinet/ip_ecn.c sys/netinet/ip_ecn.c index b4621a019f1..d692f319a26 100644 --- sys/netinet/ip_ecn.c +++ sys/netinet/ip_ecn.c @@ -37,15 +37,9 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/mbuf.h> #include <netinet/in.h> #include <netinet/ip.h> - -#ifdef INET6 -#include <netinet/ip6.h> -#endif - #include <netinet/ip_ecn.h> /* diff --git sys/netinet/ip_esp.c sys/netinet/ip_esp.c index 092cbad9bde..c6d88996f3d 100644 --- sys/netinet/ip_esp.c +++ sys/netinet/ip_esp.c @@ -48,7 +48,6 @@ #include <netinet/in.h> #include <netinet/ip.h> -#include <netinet/ip_var.h> #ifdef INET6 #include <netinet/ip6.h> diff --git sys/netinet/ip_gre.c sys/netinet/ip_gre.c index 702e0834fa0..5b4f52e2037 100644 --- sys/netinet/ip_gre.c +++ sys/netinet/ip_gre.c @@ -40,13 +40,9 @@ #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/protosw.h> -#include <sys/socket.h> -#include <sys/socketvar.h> -#include <sys/sysctl.h> #include <net/if.h> #include <net/if_var.h> -#include <net/route.h> #include <netinet/in.h> #include <netinet/ip.h> diff --git sys/netinet/ip_icmp.c sys/netinet/ip_icmp.c index daf539dd20f..ab50b0398d3 100644 --- sys/netinet/ip_icmp.c +++ sys/netinet/ip_icmp.c @@ -91,14 +91,9 @@ #include <netinet/icmp_var.h> #if NCARP > 0 -#include <net/if_types.h> #include <netinet/ip_carp.h> #endif -#if NPF > 0 -#include <net/pfvar.h> -#endif - /* * ICMP routines: error generation, receive packet processing, and * routines to turnaround packets back to the originator, and diff --git sys/netinet/ip_input.c sys/netinet/ip_input.c index 303d97df32b..8a4c7421038 100644 --- sys/netinet/ip_input.c +++ sys/netinet/ip_input.c @@ -42,7 +42,6 @@ #include <sys/mutex.h> #include <sys/protosw.h> #include <sys/socket.h> -#include <sys/socketvar.h> #include <sys/sysctl.h> #include <sys/pool.h> #include <sys/task.h> diff --git sys/netinet/ip_ipcomp.c sys/netinet/ip_ipcomp.c index cb290743729..fde299a5abf 100644 --- sys/netinet/ip_ipcomp.c +++ sys/netinet/ip_ipcomp.c @@ -40,7 +40,6 @@ #include <netinet/in.h> #include <netinet/ip.h> -#include <netinet/ip_var.h> #ifdef INET6 #include <netinet/ip6.h> diff --git sys/netinet/ip_ipip.c sys/netinet/ip_ipip.c index fd20630cd69..3ca06817030 100644 --- sys/netinet/ip_ipip.c +++ sys/netinet/ip_ipip.c @@ -53,21 +53,17 @@ #include <net/if_types.h> #include <net/if_var.h> #include <net/route.h> -#include <net/netisr.h> #include <net/bpf.h> #include <netinet/in.h> #include <netinet/ip.h> -#include <netinet/in_pcb.h> +#include <netinet/ip6.h> +#include <netinet/ip_ipsp.h> #include <netinet/ip_var.h> #include <netinet6/ip6_var.h> #include <netinet/ip_ecn.h> #include <netinet/ip_ipip.h> -#ifdef MROUTING -#include <netinet/ip_mroute.h> -#endif - #if NPF > 0 #include <net/pfvar.h> #endif diff --git sys/netinet/ip_ipsp.c sys/netinet/ip_ipsp.c index 31a4f3130a6..425a1554f58 100644 --- sys/netinet/ip_ipsp.c +++ sys/netinet/ip_ipsp.c @@ -45,20 +45,17 @@ #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/socket.h> -#include <sys/kernel.h> #include <sys/timeout.h> #include <sys/pool.h> #include <sys/atomic.h> #include <sys/mutex.h> +#include <crypto/siphash.h> + #include <net/if.h> -#include <net/route.h> #include <netinet/in.h> -#include <netinet/ip.h> -#include <netinet/in_pcb.h> -#include <netinet/ip_var.h> -#include <netinet/ip_ipip.h> +#include <netinet/ip_ipsp.h> #if NPF > 0 #include <net/pfvar.h> @@ -72,7 +69,6 @@ #include <net/if_sec.h> #endif -#include <netinet/ip_ipsp.h> #include <net/pfkeyv2.h> #ifdef DDB diff --git sys/netinet/ip_mroute.c sys/netinet/ip_mroute.c index c03f1803aa2..63aa9321315 100644 --- sys/netinet/ip_mroute.c +++ sys/netinet/ip_mroute.c @@ -60,7 +60,6 @@ #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/socket.h> -#include <sys/socketvar.h> #include <sys/protosw.h> #include <sys/ioctl.h> #include <sys/syslog.h> diff --git sys/netinet/ip_output.c sys/netinet/ip_output.c index 76ee3de2517..591c0a78005 100644 --- sys/netinet/ip_output.c +++ sys/netinet/ip_output.c @@ -39,9 +39,7 @@ #include <sys/mbuf.h> #include <sys/protosw.h> #include <sys/socket.h> -#include <sys/socketvar.h> #include <sys/proc.h> -#include <sys/kernel.h> #include <net/if.h> #include <net/if_var.h> diff --git sys/netinet/ip_spd.c sys/netinet/ip_spd.c index 8098c42fde3..b882d7954f6 100644 --- sys/netinet/ip_spd.c +++ sys/netinet/ip_spd.c @@ -24,18 +24,14 @@ #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/socket.h> -#include <sys/kernel.h> -#include <sys/socketvar.h> #include <sys/pool.h> #include <sys/timeout.h> -#include <net/route.h> -#include <net/netisr.h> +#include <net/rtable.h> #include <netinet/in.h> #include <netinet/ip.h> -#include <netinet/ip_var.h> -#include <netinet/in_pcb.h> +#include <netinet/ip6.h> #include <netinet/ip_ipsp.h> #include <net/pfkeyv2.h> diff --git sys/netinet/ipsec_input.c sys/netinet/ipsec_input.c index 458a2686c61..650d090c313 100644 --- sys/netinet/ipsec_input.c +++ sys/netinet/ipsec_input.c @@ -44,14 +44,11 @@ #include <sys/mbuf.h> #include <sys/socket.h> #include <sys/sysctl.h> -#include <sys/kernel.h> #include <sys/timeout.h> #include <net/if.h> #include <net/if_var.h> -#include <net/netisr.h> #include <net/bpf.h> -#include <net/route.h> #include <netinet/in.h> #include <netinet/ip.h> @@ -69,7 +66,6 @@ #endif #ifdef INET6 -#include <netinet6/in6_var.h> #include <netinet/ip6.h> #include <netinet6/ip6_var.h> #endif /* INET6 */ @@ -81,9 +77,6 @@ #include <net/if_enc.h> -#include <crypto/cryptodev.h> -#include <crypto/xform.h> - #include "bpfilter.h" /* diff --git sys/netinet/ipsec_output.c sys/netinet/ipsec_output.c index 97d80c972bc..9d31b8954a1 100644 --- sys/netinet/ipsec_output.c +++ sys/netinet/ipsec_output.c @@ -26,7 +26,6 @@ #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/socket.h> -#include <sys/kernel.h> #include <sys/timeout.h> #include <net/if.h> @@ -34,7 +33,8 @@ #include <netinet/in.h> #include <netinet/ip.h> -#include <netinet/in_pcb.h> +#include <netinet/ip6.h> +#include <netinet/ip_ipsp.h> #include <netinet/ip_var.h> #include <netinet6/ip6_var.h> @@ -48,7 +48,6 @@ #include <netinet/ip_esp.h> #include <netinet/ip_ipcomp.h> -#include <crypto/cryptodev.h> #include <crypto/xform.h> /* diff --git sys/netinet/raw_ip.c sys/netinet/raw_ip.c index bad3a7e6f2e..b4d91d3f6a8 100644 --- sys/netinet/raw_ip.c +++ sys/netinet/raw_ip.c @@ -73,11 +73,9 @@ #include <sys/mbuf.h> #include <sys/socket.h> #include <sys/protosw.h> -#include <sys/socketvar.h> #include <net/if.h> #include <net/if_var.h> -#include <net/route.h> #include <netinet/in.h> #include <netinet/ip.h> diff --git sys/netinet/tcp_debug.c sys/netinet/tcp_debug.c index 751e69a8975..1110ce1ab1a 100644 --- sys/netinet/tcp_debug.c +++ sys/netinet/tcp_debug.c @@ -84,10 +84,9 @@ #include <net/route.h> -#include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/ip.h> -#include <netinet/in_pcb.h> +#include <netinet/ip6.h> #include <netinet/ip_var.h> #include <netinet/tcp.h> #include <netinet/tcp_timer.h> @@ -95,10 +94,6 @@ #include <netinet/tcp_debug.h> #include <netinet/tcp_fsm.h> -#ifdef INET6 -#include <netinet/ip6.h> -#endif /* INET6 */ - #ifdef TCPDEBUG #include <sys/protosw.h> #endif diff --git sys/netinet/tcp_input.c sys/netinet/tcp_input.c index 73b5803740f..c7b9c9a9d25 100644 --- sys/netinet/tcp_input.c +++ sys/netinet/tcp_input.c @@ -75,7 +75,6 @@ #include <sys/mbuf.h> #include <sys/protosw.h> #include <sys/socket.h> -#include <sys/socketvar.h> #include <sys/timeout.h> #include <sys/kernel.h> #include <sys/pool.h> diff --git sys/netinet/tcp_output.c sys/netinet/tcp_output.c index 560e4ac76f2..a35554d0992 100644 --- sys/netinet/tcp_output.c +++ sys/netinet/tcp_output.c @@ -76,12 +76,9 @@ #include <sys/mbuf.h> #include <sys/protosw.h> #include <sys/socket.h> -#include <sys/socketvar.h> -#include <sys/kernel.h> #include <net/if.h> #include <net/if_var.h> -#include <net/route.h> #if NPF > 0 #include <net/pfvar.h> #endif diff --git sys/netinet/tcp_subr.c sys/netinet/tcp_subr.c index 6d3e6f73908..4ba5c9ab177 100644 --- sys/netinet/tcp_subr.c +++ sys/netinet/tcp_subr.c @@ -73,10 +73,7 @@ #include <sys/mbuf.h> #include <sys/mutex.h> #include <sys/socket.h> -#include <sys/socketvar.h> -#include <sys/timeout.h> #include <sys/protosw.h> -#include <sys/kernel.h> #include <sys/pool.h> #include <net/route.h> diff --git sys/netinet/tcp_timer.c sys/netinet/tcp_timer.c index cbba0b5ddf8..c7f57578691 100644 --- sys/netinet/tcp_timer.c +++ sys/netinet/tcp_timer.c @@ -36,9 +36,7 @@ #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/socket.h> -#include <sys/socketvar.h> #include <sys/protosw.h> -#include <sys/kernel.h> #include <sys/pool.h> #include <net/route.h> diff --git sys/netinet/tcp_usrreq.c sys/netinet/tcp_usrreq.c index 188a07019d5..2c12426265b 100644 --- sys/netinet/tcp_usrreq.c +++ sys/netinet/tcp_usrreq.c @@ -72,18 +72,14 @@ #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/socket.h> -#include <sys/socketvar.h> #include <sys/protosw.h> #include <sys/stat.h> #include <sys/sysctl.h> #include <sys/domain.h> -#include <sys/kernel.h> #include <sys/pool.h> -#include <sys/proc.h> #include <net/if.h> #include <net/if_var.h> -#include <net/route.h> #include <netinet/in.h> #include <netinet/in_var.h> diff --git sys/netinet/udp_usrreq.c sys/netinet/udp_usrreq.c index 55f00f82c87..9b5f0c6e647 100644 --- sys/netinet/udp_usrreq.c +++ sys/netinet/udp_usrreq.c @@ -76,14 +76,11 @@ #include <sys/mbuf.h> #include <sys/protosw.h> #include <sys/socket.h> -#include <sys/socketvar.h> #include <sys/sysctl.h> #include <sys/domain.h> #include <net/if.h> #include <net/if_var.h> -#include <net/if_media.h> -#include <net/route.h> #include <netinet/in.h> #include <netinet/in_var.h> @@ -110,7 +107,6 @@ #endif #ifdef PIPEX -#include <netinet/if_ether.h> #include <net/pipex.h> #endif diff --git sys/netinet6/dest6.c sys/netinet6/dest6.c index 42af42e975e..9d1901980fa 100644 --- sys/netinet6/dest6.c +++ sys/netinet6/dest6.c @@ -34,16 +34,12 @@ #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/socket.h> -#include <sys/errno.h> -#include <sys/time.h> -#include <sys/kernel.h> #include <net/route.h> #include <netinet/in.h> #include <netinet/ip6.h> #include <netinet6/ip6_var.h> -#include <netinet/icmp6.h> /* * Destination options header processing. diff --git sys/netinet6/frag6.c sys/netinet6/frag6.c index e48360d0fa7..8fabaeaf811 100644 --- sys/netinet6/frag6.c +++ sys/netinet6/frag6.c @@ -33,19 +33,14 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> -#include <sys/socket.h> #include <sys/errno.h> -#include <sys/time.h> -#include <sys/kernel.h> #include <sys/pool.h> #include <sys/mutex.h> #include <net/if.h> #include <net/if_var.h> -#include <net/route.h> #include <netinet/in.h> -#include <netinet6/in6_var.h> #include <netinet/ip6.h> #include <netinet6/ip6_var.h> #include <netinet/icmp6.h> diff --git sys/netinet6/icmp6.c sys/netinet6/icmp6.c index f62d49d1ce6..9d273868172 100644 --- sys/netinet6/icmp6.c +++ sys/netinet6/icmp6.c @@ -71,16 +71,12 @@ #include <sys/sysctl.h> #include <sys/protosw.h> #include <sys/socket.h> -#include <sys/socketvar.h> #include <sys/time.h> -#include <sys/kernel.h> -#include <sys/syslog.h> #include <net/if.h> #include <net/if_var.h> #include <net/route.h> #include <net/if_dl.h> -#include <net/if_types.h> #include <netinet/in.h> #include <netinet/ip.h> diff --git sys/netinet6/in6.c sys/netinet6/in6.c index 97f9eb383b0..0031e62a2bb 100644 --- sys/netinet6/in6.c +++ sys/netinet6/in6.c @@ -73,16 +73,14 @@ #include <sys/mbuf.h> #include <sys/systm.h> #include <sys/time.h> -#include <sys/kernel.h> #include <sys/syslog.h> #include <net/if.h> -#include <net/if_dl.h> +#include <net/if_var.h> #include <net/if_types.h> #include <net/route.h> #include <netinet/in.h> -#include <netinet/if_ether.h> #include <netinet6/in6_var.h> #include <netinet/ip6.h> diff --git sys/netinet6/in6_ifattach.c sys/netinet6/in6_ifattach.c index 87f9c67be43..73d4cb997bf 100644 --- sys/netinet6/in6_ifattach.c +++ sys/netinet6/in6_ifattach.c @@ -33,11 +33,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/socket.h> -#include <sys/sockio.h> -#include <sys/kernel.h> -#include <sys/syslog.h> - -#include <crypto/sha2.h> #include <net/if.h> #include <net/if_var.h> @@ -49,7 +44,6 @@ #include <netinet6/in6_var.h> #include <netinet/ip6.h> -#include <netinet6/ip6_var.h> #include <netinet6/in6_ifattach.h> #include <netinet6/nd6.h> #ifdef MROUTING diff --git sys/netinet6/in6_pcb.c sys/netinet6/in6_pcb.c index 77fdeb772db..0e54c2c50dc 100644 --- sys/netinet6/in6_pcb.c +++ sys/netinet6/in6_pcb.c @@ -107,7 +107,6 @@ #include <sys/mbuf.h> #include <sys/protosw.h> #include <sys/socket.h> -#include <sys/socketvar.h> #include <net/if.h> #include <net/if_var.h> @@ -116,7 +115,6 @@ #include <netinet/in.h> #include <netinet6/in6_var.h> #include <netinet/ip.h> -#include <netinet/ip_var.h> #include <netinet6/ip6_var.h> #include <netinet/in_pcb.h> diff --git sys/netinet6/in6_proto.c sys/netinet6/in6_proto.c index 6d1dd70645c..db63cd2df84 100644 --- sys/netinet6/in6_proto.c +++ sys/netinet6/in6_proto.c @@ -64,19 +64,14 @@ #include <sys/param.h> #include <sys/socket.h> #include <sys/protosw.h> -#include <sys/kernel.h> #include <sys/domain.h> -#include <sys/mbuf.h> #include <net/if.h> #include <net/if_var.h> -#include <net/route.h> -#include <net/rtable.h> #include <netinet/in.h> #include <netinet/ip.h> #include <netinet/ip_var.h> -#include <netinet/in_pcb.h> #include <netinet/ip6.h> #include <netinet6/ip6_var.h> #include <netinet/icmp6.h> @@ -87,12 +82,9 @@ #include <netinet/udp.h> #include <netinet/udp_var.h> #include <netinet/ip_ipsp.h> -#include <netinet/ip_ah.h> -#include <netinet/ip_esp.h> #include <netinet/ip_ipip.h> #include <netinet6/in6_var.h> -#include <netinet6/nd6.h> #include "gif.h" #if NGIF > 0 diff --git sys/netinet6/in6_src.c sys/netinet6/in6_src.c index d9e0ae29f75..421d6d048ad 100644 --- sys/netinet6/in6_src.c +++ sys/netinet6/in6_src.c @@ -63,12 +63,8 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/mbuf.h> #include <sys/socket.h> -#include <sys/socketvar.h> -#include <sys/ioctl.h> #include <sys/errno.h> -#include <sys/time.h> #include <net/if.h> #include <net/if_var.h> @@ -78,9 +74,7 @@ #include <netinet/ip.h> #include <netinet/in_pcb.h> #include <netinet6/in6_var.h> -#include <netinet/ip6.h> #include <netinet6/ip6_var.h> -#include <netinet6/nd6.h> int in6_selectif(const struct in6_addr *, struct ip6_pktopts *, struct ip6_moptions *, struct route *, struct ifnet **, u_int); diff --git sys/netinet6/ip6_divert.c sys/netinet6/ip6_divert.c index 86165316e70..4a4af976b45 100644 --- sys/netinet6/ip6_divert.c +++ sys/netinet6/ip6_divert.c @@ -21,13 +21,10 @@ #include <sys/mbuf.h> #include <sys/protosw.h> #include <sys/socket.h> -#include <sys/socketvar.h> -#include <sys/sysctl.h> #include <net/if.h> #include <net/route.h> #include <net/if_var.h> -#include <net/netisr.h> #include <netinet/in.h> #include <netinet6/in6_var.h> diff --git sys/netinet6/ip6_forward.c sys/netinet6/ip6_forward.c index 4ce6ce81bea..16d9001e770 100644 --- sys/netinet6/ip6_forward.c +++ sys/netinet6/ip6_forward.c @@ -38,19 +38,16 @@ #include <sys/socket.h> #include <sys/errno.h> #include <sys/time.h> -#include <sys/kernel.h> #include <sys/syslog.h> #include <net/if.h> #include <net/if_var.h> -#include <net/if_enc.h> #include <net/route.h> #if NPF > 0 #include <net/pfvar.h> #endif #include <netinet/in.h> -#include <netinet/ip_var.h> #include <netinet6/in6_var.h> #include <netinet/ip6.h> #include <netinet6/ip6_var.h> @@ -58,12 +55,8 @@ #include <netinet6/nd6.h> #include <netinet/udp.h> #include <netinet/tcp.h> -#include <netinet/tcp_timer.h> -#include <netinet/tcp_var.h> #ifdef IPSEC #include <netinet/ip_ipsp.h> -#include <netinet/ip_ah.h> -#include <netinet/ip_esp.h> #endif /* diff --git sys/netinet6/ip6_id.c sys/netinet6/ip6_id.c index 7c5277927c9..e26926368d1 100644 --- sys/netinet6/ip6_id.c +++ sys/netinet6/ip6_id.c @@ -82,14 +82,8 @@ */ #include <sys/param.h> -#include <sys/kernel.h> -#include <sys/mbuf.h> -#include <sys/socket.h> #include <sys/systm.h> -#include <netinet/in.h> -#include <netinet/ip6.h> - struct randomtab { const int ru_bits; /* resulting bits */ const long ru_out; /* Time after which will be reseeded */ diff --git sys/netinet6/ip6_input.c sys/netinet6/ip6_input.c index 54504764eb0..6492e3244e3 100644 --- sys/netinet6/ip6_input.c +++ sys/netinet6/ip6_input.c @@ -71,12 +71,8 @@ #include <sys/sysctl.h> #include <sys/protosw.h> #include <sys/socket.h> -#include <sys/socketvar.h> #include <sys/errno.h> #include <sys/time.h> -#include <sys/timeout.h> -#include <sys/kernel.h> -#include <sys/syslog.h> #include <sys/task.h> #include <net/if.h> @@ -92,15 +88,11 @@ #include <netinet/in_pcb.h> #include <netinet/ip_var.h> #include <netinet6/in6_var.h> -#include <netinet6/in6_ifattach.h> #include <netinet/ip6.h> #include <netinet6/ip6_var.h> #include <netinet/icmp6.h> #include <netinet6/nd6.h> -#include "gif.h" -#include "bpfilter.h" - #ifdef MROUTING #include <netinet6/ip6_mroute.h> #endif diff --git sys/netinet6/ip6_mroute.c sys/netinet6/ip6_mroute.c index 727ea48de05..5c7add42375 100644 --- sys/netinet6/ip6_mroute.c +++ sys/netinet6/ip6_mroute.c @@ -84,12 +84,9 @@ #include <sys/param.h> #include <sys/malloc.h> #include <sys/systm.h> -#include <sys/timeout.h> #include <sys/mbuf.h> #include <sys/socket.h> -#include <sys/socketvar.h> #include <sys/protosw.h> -#include <sys/kernel.h> #include <sys/ioctl.h> #include <sys/syslog.h> #include <sys/sysctl.h> diff --git sys/netinet6/ip6_output.c sys/netinet6/ip6_output.c index ed7db98af49..8cb1c822952 100644 --- sys/netinet6/ip6_output.c +++ sys/netinet6/ip6_output.c @@ -69,7 +69,6 @@ #include <sys/errno.h> #include <sys/protosw.h> #include <sys/socket.h> -#include <sys/socketvar.h> #include <sys/proc.h> #include <sys/systm.h> @@ -93,7 +92,6 @@ #include <netinet/ip6.h> #include <netinet/icmp6.h> #include <netinet6/ip6_var.h> -#include <netinet6/nd6.h> #include <crypto/idgen.h> @@ -103,8 +101,6 @@ #ifdef IPSEC #include <netinet/ip_ipsp.h> -#include <netinet/ip_ah.h> -#include <netinet/ip_esp.h> #ifdef ENCDEBUG #define DPRINTF(fmt, args...) \ diff --git sys/netinet6/mld6.c sys/netinet6/mld6.c index df5eafaf2fc..d4f1bae6015 100644 --- sys/netinet6/mld6.c +++ sys/netinet6/mld6.c @@ -70,11 +70,9 @@ #include <sys/mbuf.h> #include <sys/socket.h> #include <sys/protosw.h> -#include <sys/syslog.h> #include <net/if.h> #include <net/if_var.h> -#include <net/route.h> #include <netinet/in.h> #include <netinet6/in6_var.h> diff --git sys/netinet6/nd6.c sys/netinet6/nd6.c index 41acca1d8dd..a2b162c0d16 100644 --- sys/netinet6/nd6.c +++ sys/netinet6/nd6.c @@ -38,7 +38,6 @@ #include <sys/socket.h> #include <sys/sockio.h> #include <sys/time.h> -#include <sys/kernel.h> #include <sys/pool.h> #include <sys/errno.h> #include <sys/ioctl.h> @@ -54,7 +53,6 @@ #include <netinet/in.h> #include <netinet/if_ether.h> -#include <netinet/ip_ipsp.h> #include <netinet6/in6_var.h> #include <netinet/ip6.h> diff --git sys/netinet6/nd6_nbr.c sys/netinet6/nd6_nbr.c index 640a987b2b5..8ffc9fa19d8 100644 --- sys/netinet6/nd6_nbr.c +++ sys/netinet6/nd6_nbr.c @@ -35,10 +35,6 @@ #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/socket.h> -#include <sys/sockio.h> -#include <sys/time.h> -#include <sys/kernel.h> -#include <sys/ioctl.h> #include <sys/syslog.h> #include <sys/queue.h> #include <sys/timeout.h> diff --git sys/netinet6/nd6_rtr.c sys/netinet6/nd6_rtr.c index ea1123cb33a..752021f335a 100644 --- sys/netinet6/nd6_rtr.c +++ sys/netinet6/nd6_rtr.c @@ -32,26 +32,16 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/timeout.h> -#include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/socket.h> -#include <sys/sockio.h> -#include <sys/time.h> -#include <sys/kernel.h> #include <sys/errno.h> -#include <sys/ioctl.h> -#include <sys/syslog.h> -#include <sys/queue.h> #include <net/if.h> -#include <net/if_dl.h> #include <net/if_var.h> #include <net/route.h> #include <net/rtable.h> #include <netinet/in.h> -#include <netinet6/in6_var.h> #include <netinet/ip6.h> #include <netinet6/ip6_var.h> #include <netinet6/nd6.h> diff --git sys/netinet6/raw_ip6.c sys/netinet6/raw_ip6.c index c1fa7182c1a..aa22f7b3445 100644 --- sys/netinet6/raw_ip6.c +++ sys/netinet6/raw_ip6.c @@ -68,14 +68,12 @@ #include <sys/mbuf.h> #include <sys/socket.h> #include <sys/protosw.h> -#include <sys/socketvar.h> #include <sys/errno.h> #include <sys/systm.h> #include <sys/sysctl.h> #include <net/if.h> #include <net/if_var.h> -#include <net/route.h> #include <netinet/in.h> #include <netinet6/in6_var.h> @@ -87,7 +85,6 @@ #include <netinet/icmp6.h> #include <netinet/ip.h> #include <netinet/in_pcb.h> -#include <netinet6/nd6.h> #include <netinet6/ip6protosw.h> #include <netinet6/raw_ip6.h> @@ -95,8 +92,6 @@ #include <net/pfvar.h> #endif -#include <sys/stdarg.h> - /* * Raw interface to IP6 protocol. */ diff --git sys/netinet6/route6.c sys/netinet6/route6.c index 48396b0713e..985ee74ad6f 100644 --- sys/netinet6/route6.c +++ sys/netinet6/route6.c @@ -32,15 +32,12 @@ #include <sys/param.h> #include <sys/mbuf.h> -#include <sys/socket.h> #include <sys/systm.h> #include <net/if.h> #include <net/if_var.h> -#include <net/route.h> #include <netinet/in.h> -#include <netinet6/in6_var.h> #include <netinet/ip6.h> #include <netinet6/ip6_var.h> diff --git sys/netinet6/udp6_output.c sys/netinet6/udp6_output.c index 3039e594b62..5dba125cfca 100644 --- sys/netinet6/udp6_output.c +++ sys/netinet6/udp6_output.c @@ -67,19 +67,15 @@ #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/errno.h> -#include <sys/stat.h> #include <sys/systm.h> -#include <sys/syslog.h> #include <net/if.h> #include <net/if_var.h> -#include <net/route.h> #if NPF > 0 #include <net/pfvar.h> #endif #include <netinet/in.h> -#include <netinet6/in6_var.h> #include <netinet/ip.h> #include <netinet/ip_var.h> #include <netinet/in_pcb.h> @@ -87,7 +83,6 @@ #include <netinet/udp_var.h> #include <netinet/ip6.h> #include <netinet6/ip6_var.h> -#include <netinet/icmp6.h> /* * UDP protocol implementation.

2025-07-07 12:28 Jonathan Gray:
unneeded #includes in sys/netinet*
- 2025-07-07 12:34 Alexander Bluhm:
  unneeded #includes in sys/netinet*