From: Jonathan Gray <jsg@jsg.id.au>
Subject: unneeded #includes in sys/net
To: tech@openbsd.org
Date: Sun, 6 Jul 2025 19:06:12 +1000

diff --git sys/net/af_frame.c sys/net/af_frame.c
index 4a512ea3aa2..a025023f691 100644
--- sys/net/af_frame.c
+++ sys/net/af_frame.c
@@ -20,15 +20,9 @@
 #include <sys/socket.h>
 #include <sys/protosw.h>
 #include <sys/domain.h>
-#include <sys/systm.h>
 
 #include <net/if_types.h>
 
-#include <net/if.h>
-#include <net/if_arp.h>
-#include <netinet/in.h>
-#include <netinet/if_ether.h>
-
 const struct domain framedomain;
 
 /* reach over to if_ethersubr.c */
diff --git sys/net/art.c sys/net/art.c
index 379767ba2eb..e9a72b2f783 100644
--- sys/net/art.c
+++ sys/net/art.c
@@ -32,7 +32,6 @@
 #include <sys/malloc.h>
 #include <sys/pool.h>
 #include <sys/task.h>
-#include <sys/socket.h>
 #endif
 
 #include <net/art.h>
diff --git sys/net/bpf.c sys/net/bpf.c
index 8984d35435a..4a08f35d736 100644
--- sys/net/bpf.c
+++ sys/net/bpf.c
@@ -38,21 +38,16 @@
  *	@(#)bpf.c	8.2 (Berkeley) 3/28/94
  */
 
-#include "bpfilter.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
-#include <sys/proc.h>
+#include <sys/timeout.h>
 #include <sys/signalvar.h>
 #include <sys/ioctl.h>
 #include <sys/conf.h>
 #include <sys/vnode.h>
-#include <sys/fcntl.h>
 #include <sys/socket.h>
-#include <sys/kernel.h>
 #include <sys/sysctl.h>
-#include <sys/rwlock.h>
 #include <sys/atomic.h>
 #include <sys/event.h>
 #include <sys/mutex.h>
@@ -71,9 +66,6 @@
 #include <netinet/if_ether.h>
 
 #include "vlan.h"
-#if NVLAN > 0
-#include <net/if_vlan_var.h>
-#endif
 
 #define BPF_BUFSIZE 32768
 
diff --git sys/net/bpf_filter.c sys/net/bpf_filter.c
index d6561ec5923..27e747072a7 100644
--- sys/net/bpf_filter.c
+++ sys/net/bpf_filter.c
@@ -38,7 +38,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/time.h>
 #ifndef _KERNEL
 #include <stdlib.h>
 #include <string.h>
@@ -47,8 +46,6 @@
 #include <sys/systm.h>
 #endif
 
-#include <sys/endian.h>
-
 #ifdef _KERNEL
 extern int bpf_maxbufsize;
 #define Static
diff --git sys/net/bridgestp.c sys/net/bridgestp.c
index 79d8f2c5e3d..4bcc2d4f6c8 100644
--- sys/net/bridgestp.c
+++ sys/net/bridgestp.c
@@ -35,20 +35,15 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
-#include <sys/socket.h>
 #include <sys/ioctl.h>
-#include <sys/device.h>
-#include <sys/kernel.h>
 #include <sys/timeout.h>
 
 #include <net/if.h>
 #include <net/if_types.h>
 #include <net/if_dl.h>
 #include <net/if_llc.h>
-#include <net/netisr.h>
 
 #include <netinet/in.h>
-#include <netinet/ip.h>
 #include <netinet/if_ether.h>
 
 #include <net/if_bridge.h>
diff --git sys/net/bsd-comp.c sys/net/bsd-comp.c
index cd843c7415d..e0b5057ed4f 100644
--- sys/net/bsd-comp.c
+++ sys/net/bsd-comp.c
@@ -43,11 +43,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <net/if_var.h>
 #include <net/ppp_defs.h>
-#include <net/if_ppp.h>
 
 #define PACKETPTR	struct mbuf *
 #include <net/ppp-comp.h>
diff --git sys/net/fq_codel.c sys/net/fq_codel.c
index 5b89978e216..84962c5205d 100644
--- sys/net/fq_codel.c
+++ sys/net/fq_codel.c
@@ -35,7 +35,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/socket.h>
 #include <sys/mbuf.h>
 #include <sys/queue.h>
 
diff --git sys/net/hfsc.c sys/net/hfsc.c
index 82132511517..271be79e4fa 100644
--- sys/net/hfsc.c
+++ sys/net/hfsc.c
@@ -46,7 +46,6 @@
 #include <sys/malloc.h>
 #include <sys/pool.h>
 #include <sys/mbuf.h>
-#include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/queue.h>
@@ -55,7 +54,6 @@
 
 #include <net/if.h>
 #include <net/if_var.h>
-#include <netinet/in.h>
 
 #include <net/pfvar.h>
 #include <net/hfsc.h>
diff --git sys/net/if.c sys/net/if.c
index a236d583dea..86dd9b0cbdf 100644
--- sys/net/if.c
+++ sys/net/if.c
@@ -73,16 +73,13 @@
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
-#include <sys/socketvar.h>
 #include <sys/timeout.h>
 #include <sys/protosw.h>
 #include <sys/kernel.h>
 #include <sys/ioctl.h>
-#include <sys/domain.h>
 #include <sys/task.h>
 #include <sys/atomic.h>
 #include <sys/percpu.h>
-#include <sys/proc.h>
 #include <sys/stdint.h>	/* uintptr_t */
 #include <sys/rwlock.h>
 #include <sys/smr.h>
@@ -93,11 +90,6 @@
 #include <net/route.h>
 #include <net/netisr.h>
 
-#include "vlan.h"
-#if NVLAN > 0
-#include <net/if_vlan_var.h>
-#endif
-
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 #include <netinet/igmp.h>
@@ -112,7 +104,6 @@
 #include <netinet6/in6_var.h>
 #include <netinet6/in6_ifattach.h>
 #include <netinet6/nd6.h>
-#include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
 #endif
 
@@ -128,10 +119,6 @@
 #include <net/if_bridge.h>
 #endif
 
-#if NCARP > 0
-#include <netinet/ip_carp.h>
-#endif
-
 #if NPF > 0
 #include <net/pfvar.h>
 #endif
diff --git sys/net/if_aggr.c sys/net/if_aggr.c
index c0e20cbeceb..41d96977109 100644
--- sys/net/if_aggr.c
+++ sys/net/if_aggr.c
@@ -71,7 +71,6 @@
 #include <sys/kstat.h>
 
 #include <net/if.h>
-#include <net/if_dl.h>
 #include <net/if_types.h>
 
 #include <net/if_media.h>
diff --git sys/net/if_bpe.c sys/net/if_bpe.c
index 0edede977f7..9b3e16e5505 100644
--- sys/net/if_bpe.c
+++ sys/net/if_bpe.c
@@ -20,11 +20,9 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
-#include <sys/timeout.h>
 #include <sys/pool.h>
 #include <sys/tree.h>
 #include <sys/smr.h>
@@ -32,9 +30,7 @@
 #include <net/if.h>
 #include <net/if_var.h>
 #include <net/if_dl.h>
-#include <net/if_media.h>
 #include <net/if_types.h>
-#include <net/rtable.h>
 
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
diff --git sys/net/if_bridge.c sys/net/if_bridge.c
index 0b12ddfd9a4..a2ba43c2492 100644
--- sys/net/if_bridge.c
+++ sys/net/if_bridge.c
@@ -32,7 +32,6 @@
  */
 
 #include "bpfilter.h"
-#include "gif.h"
 #include "pf.h"
 #include "carp.h"
 #include "vlan.h"
@@ -42,13 +41,11 @@
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
-#include <sys/kernel.h>
 
 #include <net/if.h>
 #include <net/if_types.h>
 #include <net/if_llc.h>
 #include <net/netisr.h>
-#include <net/route.h>
 
 #include <netinet/in.h>
 #include <netinet/ip.h>
@@ -62,9 +59,7 @@
 #endif
 
 #ifdef INET6
-#include <netinet6/in6_var.h>
 #include <netinet/ip6.h>
-#include <netinet6/ip6_var.h>
 #endif
 
 #if NPF > 0
diff --git sys/net/if_etherbridge.c sys/net/if_etherbridge.c
index c35c1327816..50367f17547 100644
--- sys/net/if_etherbridge.c
+++ sys/net/if_etherbridge.c
@@ -16,24 +16,15 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "bpfilter.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <sys/timeout.h>
 #include <sys/pool.h>
 #include <sys/tree.h>
 
 #include <net/if.h>
-#include <net/if_var.h>
-#include <net/if_dl.h>
-#include <net/if_media.h>
-#include <net/if_types.h>
-#include <net/rtable.h>
 #include <net/toeplitz.h>
 
 #include <netinet/in.h>
diff --git sys/net/if_etherip.c sys/net/if_etherip.c
index 4aa54698981..45f8c81dcf0 100644
--- sys/net/if_etherip.c
+++ sys/net/if_etherip.c
@@ -23,15 +23,11 @@
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
-#include <sys/device.h>
 #include <sys/sysctl.h>
-#include <sys/tree.h>
 
 #include <net/if.h>
 #include <net/if_var.h>
-#include <net/if_dl.h>
 #include <net/if_media.h>
-#include <net/route.h>
 #include <net/rtable.h>
 
 #include <netinet/in.h>
diff --git sys/net/if_ethersubr.c sys/net/if_ethersubr.c
index e282f054cba..25c079e7815 100644
--- sys/net/if_ethersubr.c
+++ sys/net/if_ethersubr.c
@@ -77,27 +77,20 @@ didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>.
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
-#include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
-#include <sys/syslog.h>
-#include <sys/timeout.h>
 #include <sys/smr.h>
 
 #include <net/if.h>
 #include <net/netisr.h>
 #include <net/route.h>
-#include <net/if_llc.h>
 #include <net/if_dl.h>
-#include <net/if_media.h>
 #include <net/if_types.h>
 
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#include <netinet/ip_ipsp.h>
 #include <netinet/ip.h>
 #include <netinet/ip6.h>
 #include <netinet/tcp.h>
@@ -128,7 +121,6 @@ didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>.
 #endif
 
 #ifdef INET6
-#include <netinet6/in6_var.h>
 #include <netinet6/nd6.h>
 #endif
 
@@ -1264,7 +1256,6 @@ ether_extract_headers(struct mbuf *m0, struct ether_extracted *ext)
 
 #include <sys/socket.h>
 #include <sys/protosw.h>
-#include <sys/domain.h>
 
 /*
  * lock order is:
diff --git sys/net/if_gif.c sys/net/if_gif.c
index 4bb3f0b25f0..11e0bb6ae4c 100644
--- sys/net/if_gif.c
+++ sys/net/if_gif.c
@@ -35,23 +35,19 @@
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
-#include <sys/syslog.h>
 #include <sys/queue.h>
 
 #include <net/if.h>
 #include <net/if_var.h>
 #include <net/if_types.h>
-#include <net/route.h>
 
 #include <netinet/in.h>
-#include <netinet/in_var.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/ip_ipip.h>
 #include <netinet/ip_ecn.h>
 
 #ifdef INET6
-#include <netinet6/in6_var.h>
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
 #endif /* INET6 */
diff --git sys/net/if_gre.c sys/net/if_gre.c
index a078b86deed..1174420c847 100644
--- sys/net/if_gre.c
+++ sys/net/if_gre.c
@@ -52,7 +52,6 @@
 #include <sys/queue.h>
 #include <sys/tree.h>
 #include <sys/pool.h>
-#include <sys/rwlock.h>
 
 #include <crypto/siphash.h>
 
diff --git sys/net/if_loop.c sys/net/if_loop.c
index 86258e8a9f5..d5d6e160cec 100644
--- sys/net/if_loop.c
+++ sys/net/if_loop.c
@@ -109,31 +109,17 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
-#include <sys/time.h>
-
 
 #include <net/if.h>
 #include <net/if_var.h>
 #include <net/if_types.h>
-#include <net/netisr.h>
 #include <net/rtable.h>
 #include <net/route.h>
 
-#include <netinet/in.h>
-
-#ifdef INET6
-#include <netinet/ip6.h>
-#endif
-
-#ifdef MPLS
-#include <netmpls/mpls.h>
-#endif
-
 #if NBPFILTER > 0
 #include <net/bpf.h>
 #endif
diff --git sys/net/if_media.c sys/net/if_media.c
index 91c38b08390..3d7ab4f51f8 100644
--- sys/net/if_media.c
+++ sys/net/if_media.c
@@ -80,7 +80,6 @@
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
-#include <sys/socket.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 
@@ -89,7 +88,6 @@
 #include <net/if_var.h>
 #endif
 #include <net/if_media.h>
-#include <net/netisr.h>
 
 /*
  * Compile-time options:
diff --git sys/net/if_mpe.c sys/net/if_mpe.c
index 6419c1130fc..3bccefffb9a 100644
--- sys/net/if_mpe.c
+++ sys/net/if_mpe.c
@@ -21,13 +21,11 @@
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
-#include <sys/ioctl.h>
 
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_var.h>
 #include <net/if_types.h>
-#include <net/netisr.h>
 #include <net/route.h>
 
 #include <netinet/in.h>
diff --git sys/net/if_mpw.c sys/net/if_mpw.c
index c302143e7ac..8453daf3bf6 100644
--- sys/net/if_mpw.c
+++ sys/net/if_mpw.c
@@ -27,7 +27,6 @@
 
 #include <net/if.h>
 #include <net/if_dl.h>
-#include <net/if_types.h>
 #include <net/route.h>
 
 #include <netinet/in.h>
diff --git sys/net/if_pair.c sys/net/if_pair.c
index 2a772cb8b14..f4fe8f0247c 100644
--- sys/net/if_pair.c
+++ sys/net/if_pair.c
@@ -20,9 +20,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
-#include <sys/socket.h>
 #include <sys/sockio.h>
-#include <sys/ioctl.h>
 
 #include <net/if.h>
 #include <net/if_media.h>
diff --git sys/net/if_pflog.c sys/net/if_pflog.c
index c69333148c0..d6491070f53 100644
--- sys/net/if_pflog.c
+++ sys/net/if_pflog.c
@@ -35,13 +35,11 @@
  */
 
 #include "bpfilter.h"
-#include "pflog.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/proc.h>
-#include <sys/socket.h>
 #include <sys/stdint.h>
 #include <sys/ioctl.h>
 
@@ -52,14 +50,12 @@
 #include <net/bpf.h>
 #endif
 
-#include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/ip_icmp.h>
 #include <netinet/tcp.h>
 #include <netinet/udp.h>
 
 #ifdef INET6
-#include <netinet/ip6.h>
 #include <netinet/icmp6.h>
 #endif /* INET6 */
 
diff --git sys/net/if_pflow.c sys/net/if_pflow.c
index b0c6eda9ba3..dd645d617a3 100644
--- sys/net/if_pflow.c
+++ sys/net/if_pflow.c
@@ -26,15 +26,12 @@
 #include <sys/socket.h>
 #include <sys/timeout.h>
 #include <sys/ioctl.h>
-#include <sys/kernel.h>
 #include <sys/socketvar.h>
 #include <sys/sysctl.h>
 #include <sys/mutex.h>
 
 #include <net/if.h>
 #include <net/if_types.h>
-#include <net/bpf.h>
-#include <net/route.h>
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 #include <netinet/tcp.h>
@@ -44,15 +41,12 @@
 #include <netinet/ip_var.h>
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>
-#include <netinet/in_pcb.h>
+#include <netinet/icmp6.h>
 
 #include <net/pfvar.h>
 #include <net/pfvar_priv.h>
 #include <net/if_pflow.h>
 
-#include "bpfilter.h"
-#include "pflow.h"
-
 #define PFLOW_MINMTU	\
     (sizeof(struct pflow_header) + sizeof(struct pflow_flow))
 
diff --git sys/net/if_pfsync.c sys/net/if_pfsync.c
index 9bd5fa8f5a3..a0643b9a846 100644
--- sys/net/if_pfsync.c
+++ sys/net/if_pfsync.c
@@ -43,7 +43,6 @@
  */
 
 #include "bpfilter.h"
-#include "pfsync.h"
 #include "kstat.h"
 
 #include <sys/param.h>
@@ -54,11 +53,9 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/timeout.h>
-#include <sys/kernel.h>
 #include <sys/sysctl.h>
 #include <sys/pool.h>
 #include <sys/syslog.h>
-#include <sys/tree.h>
 #include <sys/smr.h>
 #include <sys/percpu.h>
 #include <sys/refcnt.h>
@@ -68,8 +65,6 @@
 #include <net/if.h>
 #include <net/if_types.h>
 #include <net/bpf.h>
-#include <net/netisr.h>
-#include <net/route.h>
 
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
@@ -85,10 +80,8 @@
 #include <netinet/udp.h>
 
 #ifdef INET6
-#include <netinet6/in6_var.h>
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
-#include <netinet6/nd6.h>
 #endif /* INET6 */
 
 #include "carp.h"
diff --git sys/net/if_ppp.c sys/net/if_ppp.c
index 19df2669a00..2b58eb1e5be 100644
--- sys/net/if_ppp.c
+++ sys/net/if_ppp.c
@@ -114,7 +114,6 @@
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/malloc.h>
@@ -123,7 +122,6 @@
 #include <net/if_var.h>
 #include <net/if_types.h>
 #include <net/netisr.h>
-#include <net/route.h>
 #include <net/bpf.h>
 
 #include <netinet/in.h>
diff --git sys/net/if_pppoe.c sys/net/if_pppoe.c
index 09df3d0474b..fedb515237d 100644
--- sys/net/if_pppoe.c
+++ sys/net/if_pppoe.c
@@ -30,12 +30,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "pppoe.h"
 #include "bpfilter.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/timeout.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
@@ -50,7 +48,6 @@
 #include <net/if_sppp.h>
 #include <net/if_pppoe.h>
 #include <net/netisr.h>
-#include <netinet/in.h>
 #include <netinet/if_ether.h>
 
 #if NBPFILTER > 0
diff --git sys/net/if_pppx.c sys/net/if_pppx.c
index c9a2613b025..16b61599729 100644
--- sys/net/if_pppx.c
+++ sys/net/if_pppx.c
@@ -44,10 +44,7 @@
  */
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/buf.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
-#include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/queue.h>
 #include <sys/pool.h>
@@ -61,20 +58,13 @@
 #include <sys/refcnt.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_types.h>
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
 #include <net/if_dl.h>
 
 #include <netinet/in_var.h>
 #include <netinet/ip.h>
-#include <netinet/ip_var.h>
-
-#ifdef INET6
-#include <netinet6/in6_var.h>
-#include <netinet/ip6.h>
-#include <netinet6/nd6.h>
-#endif /* INET6 */
 
 #include "bpfilter.h"
 #if NBPFILTER > 0
@@ -87,11 +77,9 @@
 #endif
 
 #include <net/ppp_defs.h>
-#include <net/ppp-comp.h>
 #include <crypto/arc4.h>
 
 #ifdef PIPEX
-#include <net/radix.h>
 #include <net/pipex.h>
 #include <net/pipex_local.h>
 #else
diff --git sys/net/if_rport.c sys/net/if_rport.c
index 9934db12cbe..198915e4c7c 100644
--- sys/net/if_rport.c
+++ sys/net/if_rport.c
@@ -21,26 +21,12 @@
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
-#include <sys/syslog.h>
-#include <sys/queue.h>
 
 #include <net/if.h>
 #include <net/if_var.h>
 #include <net/if_types.h>
-#include <net/route.h>
 
 #include <netinet/in.h>
-#include <netinet/in_var.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-#include <netinet/ip_ipip.h>
-#include <netinet/ip_ecn.h>
-
-#ifdef INET6
-#include <netinet6/in6_var.h>
-#include <netinet/ip6.h>
-#include <netinet6/ip6_var.h>
-#endif /* INET6 */
 
 #include "bpfilter.h"
 #if NBPFILTER > 0
diff --git sys/net/if_spppsubr.c sys/net/if_spppsubr.c
index f23bcb29e7e..2e8b290833f 100644
--- sys/net/if_spppsubr.c
+++ sys/net/if_spppsubr.c
@@ -37,7 +37,6 @@
 #include <sys/param.h>
 
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/sockio.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
@@ -49,7 +48,6 @@
 
 #include <net/if.h>
 #include <net/if_var.h>
-#include <net/netisr.h>
 #include <net/if_types.h>
 #include <net/route.h>
 
diff --git sys/net/if_tpmr.c sys/net/if_tpmr.c
index 9cdba5b44ac..ca8cb28bef0 100644
--- sys/net/if_tpmr.c
+++ sys/net/if_tpmr.c
@@ -28,21 +28,17 @@
 #include "vlan.h"
 
 #include <sys/param.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
-#include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/systm.h>
 #include <sys/syslog.h>
-#include <sys/rwlock.h>
 #include <sys/percpu.h>
 #include <sys/smr.h>
 #include <sys/task.h>
 
 #include <net/if.h>
-#include <net/if_dl.h>
 #include <net/if_types.h>
 
 #include <netinet/in.h>
diff --git sys/net/if_trunk.c sys/net/if_trunk.c
index d4fab6aec47..eb9cda97bbb 100644
--- sys/net/if_trunk.c
+++ sys/net/if_trunk.c
@@ -17,7 +17,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/queue.h>
@@ -25,7 +24,6 @@
 #include <sys/sockio.h>
 #include <sys/systm.h>
 #include <sys/task.h>
-#include <sys/timeout.h>
 
 #include <crypto/siphash.h>
 
@@ -33,7 +31,6 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
-#include <net/route.h>
 
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
@@ -43,7 +40,6 @@
 #include <netinet/ip6.h>
 #endif
 
-#include <net/if_vlan_var.h>
 #include <net/if_trunk.h>
 #include <net/trunklacp.h>
 
diff --git sys/net/if_tun.c sys/net/if_tun.c
index 6e2390a955f..17dcbcf750a 100644
--- sys/net/if_tun.c
+++ sys/net/if_tun.c
@@ -38,7 +38,6 @@
 /* #define	TUN_DEBUG	9 */
 
 #include <sys/param.h>
-#include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
@@ -46,10 +45,6 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
-#include <sys/syslog.h>
-#include <sys/fcntl.h>
-#include <sys/time.h>
-#include <sys/device.h>
 #include <sys/vnode.h>
 #include <sys/signalvar.h>
 #include <sys/conf.h>
@@ -59,7 +54,6 @@
 
 #include <net/if.h>
 #include <net/if_types.h>
-#include <net/netisr.h>
 #include <net/rtable.h>
 
 #include <netinet/in.h>
diff --git sys/net/if_veb.c sys/net/if_veb.c
index a4259b9e05a..8b3a1c75b91 100644
--- sys/net/if_veb.c
+++ sys/net/if_veb.c
@@ -21,7 +21,6 @@
 #include "vlan.h"
 
 #include <sys/param.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/queue.h>
@@ -36,18 +35,11 @@
 #include <sys/pool.h>
 
 #include <net/if.h>
-#include <net/if_dl.h>
 #include <net/if_types.h>
 
 #include <netinet/in.h>
-#include <netinet/ip.h>
 #include <netinet/if_ether.h>
 
-#ifdef INET6
-#include <netinet6/in6_var.h>
-#include <netinet/ip6.h>
-#endif
-
 #if 0 && defined(IPSEC)
 /*
  * IPsec handling is disabled in veb until getting and using tdbs is mpsafe.
diff --git sys/net/if_vether.c sys/net/if_vether.c
index 32e61f72dce..d79da0b13d0 100644
--- sys/net/if_vether.c
+++ sys/net/if_vether.c
@@ -19,9 +19,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
-#include <sys/socket.h>
 #include <sys/sockio.h>
-#include <sys/ioctl.h>
 
 #include <net/if.h>
 #include <net/if_media.h>
diff --git sys/net/if_vlan.c sys/net/if_vlan.c
index 5d14abd6ca8..8f344a55ab5 100644
--- sys/net/if_vlan.c
+++ sys/net/if_vlan.c
@@ -48,7 +48,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/queue.h>
diff --git sys/net/if_vxlan.c sys/net/if_vxlan.c
index 77c447d43ed..d1e5976876a 100644
--- sys/net/if_vxlan.c
+++ sys/net/if_vxlan.c
@@ -21,11 +21,9 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
-#include <sys/timeout.h>
 #include <sys/pool.h>
 #include <sys/tree.h>
 #include <sys/refcnt.h>
@@ -35,10 +33,6 @@
 
 #include <net/if.h>
 #include <net/if_var.h>
-#include <net/if_dl.h>
-#include <net/if_media.h>
-#include <net/if_types.h>
-#include <net/route.h>
 #include <net/rtable.h>
 
 #include <netinet/in.h>
diff --git sys/net/if_wg.c sys/net/if_wg.c
index b0c8369bc78..c6fd9af0940 100644
--- sys/net/if_wg.c
+++ sys/net/if_wg.c
@@ -41,7 +41,6 @@
 #include <net/wg_cookie.h>
 
 #include <net/pfvar.h>
-#include <net/route.h>
 #include <net/bpf.h>
 #include <net/art.h>
 
diff --git sys/net/ifq.c sys/net/ifq.c
index cd414ef9b91..feff12ddf70 100644
--- sys/net/ifq.c
+++ sys/net/ifq.c
@@ -21,7 +21,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/socket.h>
 #include <sys/mbuf.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
diff --git sys/net/pf.c sys/net/pf.c
index c8035add4e5..290554ff2b3 100644
--- sys/net/pf.c
+++ sys/net/pf.c
@@ -35,7 +35,6 @@
  *
  */
 
-#include "bpfilter.h"
 #include "carp.h"
 #include "pflog.h"
 #include "pfsync.h"
@@ -44,10 +43,8 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
-#include <sys/filio.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <sys/kernel.h>
 #include <sys/time.h>
 #include <sys/pool.h>
 #include <sys/proc.h>
@@ -68,7 +65,6 @@
 #include <netinet/in_pcb.h>
 #include <netinet/ip_var.h>
 #include <netinet/ip_icmp.h>
-#include <netinet/icmp_var.h>
 #include <netinet/tcp.h>
 #include <netinet/tcp_seq.h>
 #include <netinet/tcp_timer.h>
@@ -83,16 +79,11 @@
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
 #include <netinet/icmp6.h>
-#include <netinet6/nd6.h>
 #endif /* INET6 */
 
 #include <net/pfvar.h>
 #include <net/pfvar_priv.h>
 
-#if NPFLOG > 0
-#include <net/if_pflog.h>
-#endif	/* NPFLOG > 0 */
-
 #if NPFLOW > 0
 #include <net/if_pflow.h>
 #endif	/* NPFLOW > 0 */
diff --git sys/net/pf_if.c sys/net/pf_if.c
index 046cc818be2..88e33f2ac92 100644
--- sys/net/pf_if.c
+++ sys/net/pf_if.c
@@ -35,11 +35,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
-#include <sys/filio.h>
 #include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/kernel.h>
-#include <sys/device.h>
 #include <sys/time.h>
 #include <sys/pool.h>
 #include <sys/syslog.h>
@@ -49,7 +45,6 @@
 
 #include <netinet/in.h>
 #include <netinet/ip.h>
-#include <netinet/ip_var.h>
 
 #include <net/pfvar.h>
 
diff --git sys/net/pf_ioctl.c sys/net/pf_ioctl.c
index 8ea807bf965..18b7777a4d3 100644
--- sys/net/pf_ioctl.c
+++ sys/net/pf_ioctl.c
@@ -45,8 +45,6 @@
 #include <sys/filio.h>
 #include <sys/fcntl.h>
 #include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/kernel.h>
 #include <sys/time.h>
 #include <sys/timeout.h>
 #include <sys/pool.h>
@@ -67,14 +65,11 @@
 
 #include <netinet/in.h>
 #include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/ip_var.h>
 #include <netinet/ip_icmp.h>
 #include <netinet/tcp.h>
 #include <netinet/udp.h>
 
 #ifdef INET6
-#include <netinet/ip6.h>
 #include <netinet/icmp6.h>
 #endif /* INET6 */
 
diff --git sys/net/pf_lb.c sys/net/pf_lb.c
index 7bd6dfd607b..d428fae756b 100644
--- sys/net/pf_lb.c
+++ sys/net/pf_lb.c
@@ -35,28 +35,16 @@
  *
  */
 
-#include "bpfilter.h"
-#include "pflog.h"
-#include "pfsync.h"
-#include "pflow.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
-#include <sys/filio.h>
 #include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/kernel.h>
-#include <sys/time.h>
-#include <sys/pool.h>
-#include <sys/rwlock.h>
 #include <sys/syslog.h>
 #include <sys/stdint.h>
 
 #include <crypto/siphash.h>
 
 #include <net/if.h>
-#include <net/bpf.h>
 #include <net/route.h>
 
 #include <netinet/in.h>
@@ -64,12 +52,8 @@
 #include <netinet/in_pcb.h>
 #include <netinet/ip_var.h>
 #include <netinet/ip_icmp.h>
-#include <netinet/icmp_var.h>
 #include <netinet/tcp.h>
-#include <netinet/tcp_seq.h>
-#include <netinet/tcp_timer.h>
 #include <netinet/udp.h>
-#include <netinet/udp_var.h>
 #include <netinet/if_ether.h>
 
 #ifdef INET6
@@ -80,18 +64,6 @@
 #include <net/pfvar.h>
 #include <net/pfvar_priv.h>
 
-#if NPFLOG > 0
-#include <net/if_pflog.h>
-#endif	/* NPFLOG > 0 */
-
-#if NPFLOW > 0
-#include <net/if_pflow.h>
-#endif	/* NPFLOW > 0 */
-
-#if NPFSYNC > 0
-#include <net/if_pfsync.h>
-#endif /* NPFSYNC > 0 */
-
 u_int64_t		 pf_hash(struct pf_addr *, struct pf_addr *,
 			    struct pf_poolhashkey *, sa_family_t);
 int			 pf_get_sport(struct pf_pdesc *, struct pf_rule *,
diff --git sys/net/pf_norm.c sys/net/pf_norm.c
index dd44ecbc4b3..6e76ce9df6b 100644
--- sys/net/pf_norm.c
+++ sys/net/pf_norm.c
@@ -27,15 +27,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "pflog.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
-#include <sys/filio.h>
-#include <sys/fcntl.h>
 #include <sys/socket.h>
-#include <sys/kernel.h>
 #include <sys/time.h>
 #include <sys/pool.h>
 #include <sys/syslog.h>
@@ -43,7 +38,6 @@
 
 #include <net/if.h>
 #include <net/if_var.h>
-#include <net/if_pflog.h>
 
 #include <netinet/in.h>
 #include <netinet/ip.h>
@@ -55,11 +49,9 @@
 #include <netinet/udp.h>
 
 #ifdef INET6
-#include <netinet6/in6_var.h>
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
 #include <netinet/icmp6.h>
-#include <netinet6/nd6.h>
 #endif /* INET6 */
 
 #include <net/pfvar.h>
diff --git sys/net/pf_ruleset.c sys/net/pf_ruleset.c
index 34673cf2129..e793a893bc9 100644
--- sys/net/pf_ruleset.c
+++ sys/net/pf_ruleset.c
@@ -36,7 +36,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/socket.h>
 #ifdef _KERNEL
 #include <sys/systm.h>
 #include <sys/mbuf.h>
@@ -44,18 +43,9 @@
 #endif /* _KERNEL */
 #include <sys/syslog.h>
 
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <netinet/tcp.h>
-
 #include <net/if.h>
 #include <net/pfvar.h>
 
-#ifdef INET6
-#include <netinet/ip6.h>
-#endif /* INET6 */
-
-
 #ifdef _KERNEL
 #define rs_malloc(x)		malloc(x, M_PF, M_WAITOK|M_CANFAIL|M_ZERO)
 #define rs_free(x, siz)		free(x, M_PF, siz)
diff --git sys/net/pf_syncookies.c sys/net/pf_syncookies.c
index b6e92509dd1..7c90d8b8d93 100644
--- sys/net/pf_syncookies.c
+++ sys/net/pf_syncookies.c
@@ -58,48 +58,29 @@
  *  http://cr.yp.to/syncookies/archive (details)
  */
 
-#include "pflog.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
-#include <sys/filio.h>
 #include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/kernel.h>
-#include <sys/time.h>
-#include <sys/pool.h>
-#include <sys/proc.h>
-#include <sys/rwlock.h>
 #include <sys/syslog.h>
 
+#include <crypto/siphash.h>
+
 #include <net/if.h>
-#include <net/if_var.h>
-#include <net/if_types.h>
 #include <net/route.h>
 
 #include <netinet/in.h>
 #include <netinet/ip.h>
-#include <netinet/ip_var.h>
 #include <netinet/tcp.h>
-#include <netinet/tcp_seq.h>
 #include <netinet/udp.h>
 #include <netinet/ip_icmp.h>
-#include <netinet/in_pcb.h>
+#include <netinet/icmp6.h>
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
-#include <netinet/tcp_fsm.h>
-#include <netinet/udp_var.h>
-#include <netinet/icmp_var.h>
-#include <netinet/ip_divert.h>
 
 #include <net/pfvar.h>
 #include <net/pfvar_priv.h>
 
-#if NPFLOG > 0
-#include <net/if_pflog.h>
-#endif	/* NPFLOG > 0 */
-
 union pf_syncookie {
 	uint8_t		cookie;
 	struct {
diff --git sys/net/pf_table.c sys/net/pf_table.c
index 5e8fff8c544..90c639033eb 100644
--- sys/net/pf_table.c
+++ sys/net/pf_table.c
@@ -48,7 +48,6 @@
 #include <netinet/udp.h>
 
 #ifdef INET6
-#include <netinet/ip6.h>
 #include <netinet/icmp6.h>
 #endif /* INET6 */
 
diff --git sys/net/pfkeyv2.c sys/net/pfkeyv2.c
index 400bbb13f69..69a9d2019e8 100644
--- sys/net/pfkeyv2.c
+++ sys/net/pfkeyv2.c
@@ -72,17 +72,14 @@
 
 #include <sys/param.h>
 #include <sys/socket.h>
-#include <sys/socketvar.h>
 #include <sys/protosw.h>
 #include <sys/domain.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/pool.h>
 #include <sys/mutex.h>
 
-#include <net/route.h>
 #include <netinet/ip_ipsp.h>
 #include <net/pfkeyv2.h>
 #include <net/radix.h>
diff --git sys/net/pfkeyv2_convert.c sys/net/pfkeyv2_convert.c
index 47b9743ec84..d2672fd6e2c 100644
--- sys/net/pfkeyv2_convert.c
+++ sys/net/pfkeyv2_convert.c
@@ -96,9 +96,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
 #include <sys/socket.h>
-#include <sys/timeout.h>
 #include <net/route.h>
 #include <net/if.h>
 
diff --git sys/net/pipex.c sys/net/pipex.c
index 570091be80f..ef2251d0f54 100644
--- sys/net/pipex.c
+++ sys/net/pipex.c
@@ -33,10 +33,7 @@
 #include <sys/ioctl.h>
 #include <sys/sysctl.h>
 #include <sys/syslog.h>
-#include <sys/conf.h>
-#include <sys/time.h>
 #include <sys/timeout.h>
-#include <sys/kernel.h>
 #include <sys/pool.h>
 #include <sys/percpu.h>
 #include <sys/mutex.h>
diff --git sys/net/ppp_tty.c sys/net/ppp_tty.c
index ce2131c2561..9e40d4b6400 100644
--- sys/net/ppp_tty.c
+++ sys/net/ppp_tty.c
@@ -106,7 +106,6 @@
 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
 #include <sys/tty.h>
-#include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/vnode.h>
 #include <sys/systm.h>
@@ -116,12 +115,6 @@
 #include <net/if.h>
 #include <net/if_var.h>
 
-#ifdef VJC
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <net/slcompress.h>
-#endif
-
 #include <net/bpf.h>
 #include <net/ppp_defs.h>
 #include <net/if_ppp.h>
diff --git sys/net/route.c sys/net/route.c
index 7cdd9a49768..e19eb640b37 100644
--- sys/net/route.c
+++ sys/net/route.c
@@ -105,11 +105,8 @@
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
-#include <sys/socketvar.h>
 #include <sys/timeout.h>
 #include <sys/domain.h>
-#include <sys/ioctl.h>
-#include <sys/kernel.h>
 #include <sys/queue.h>
 #include <sys/pool.h>
 #include <sys/atomic.h>
@@ -2012,7 +2009,6 @@ rt_plen2mask(struct rtentry *rt, struct sockaddr_in6 *sa_mask)
 }
 
 #ifdef DDB
-#include <machine/db_machdep.h>
 #include <ddb/db_output.h>
 
 void	db_print_sa(struct sockaddr *);
diff --git sys/net/rtable.c sys/net/rtable.c
index bc4f558a416..0c4da0ec5ef 100644
--- sys/net/rtable.c
+++ sys/net/rtable.c
@@ -23,7 +23,6 @@
 #include <sys/systm.h>
 #include <sys/socket.h>
 #include <sys/malloc.h>
-#include <sys/queue.h>
 #include <sys/domain.h>
 #include <sys/srp.h>
 #endif
diff --git sys/net/rtsock.c sys/net/rtsock.c
index d2fabc58459..892aef8c098 100644
--- sys/net/rtsock.c
+++ sys/net/rtsock.c
@@ -67,7 +67,6 @@
 #include <sys/sysctl.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
-#include <sys/socketvar.h>
 #include <sys/domain.h>
 #include <sys/pool.h>
 #include <sys/protosw.h>
@@ -84,7 +83,6 @@
 #include <netmpls/mpls.h>
 #endif
 #ifdef IPSEC
-#include <netinet/ip_ipsp.h>
 #include <net/if_enc.h>
 #endif
 #ifdef BFD
@@ -92,7 +90,6 @@
 #endif
 
 #include <sys/stdarg.h>
-#include <sys/kernel.h>
 #include <sys/timeout.h>
 
 #define	ROUTESNDQ	8192
diff --git sys/net/toeplitz.c sys/net/toeplitz.c
index 665d334f5d8..3be5e82aa1f 100644
--- sys/net/toeplitz.c
+++ sys/net/toeplitz.c
@@ -53,8 +53,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
 
 #include <netinet/in.h>
 
diff --git sys/net/trunklacp.c sys/net/trunklacp.c
index 19701a3748a..234bcb09224 100644
--- sys/net/trunklacp.c
+++ sys/net/trunklacp.c
@@ -33,11 +33,7 @@
 #include <sys/mbuf.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
 #include <sys/socket.h>
-#include <sys/sockio.h>
-#include <sys/lock.h>
-#include <sys/rwlock.h>
 #include <sys/queue.h>
 #include <sys/task.h>
 #include <sys/timeout.h>