From: Jonathan Gray <jsg@jsg.id.au>
Subject: Re: unneeded #includes in sys/dev/ic
To: tech@openbsd.org
Date: Mon, 11 Nov 2024 14:39:52 +1100

On Sat, May 25, 2024 at 06:29:57PM +1000, Jonathan Gray wrote:
> The uvm include in advlib.c is only used for TRUE/FALSE so is replaced
> by defines.

with qwz added

diff --git sys/dev/ic/aac.c sys/dev/ic/aac.c
index 4abaf52fa1e..aa9a55c1783 100644
--- sys/dev/ic/aac.c
+++ sys/dev/ic/aac.c
@@ -47,9 +47,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/buf.h>
 #include <sys/device.h>
-#include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/malloc.h>
 #include <sys/rwlock.h>
diff --git sys/dev/ic/ac97.c sys/dev/ic/ac97.c
index c8ab7ea30d1..4a0589b0769 100644
--- sys/dev/ic/ac97.c
+++ sys/dev/ic/ac97.c
@@ -62,11 +62,9 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 
 #include <sys/audioio.h>
-#include <dev/audio_if.h>
 #include <dev/ic/ac97.h>
 
 const struct audio_mixer_enum ac97_on_off = {
diff --git sys/dev/ic/acx.c sys/dev/ic/acx.c
index 76e4b75ba67..0ada5be14e3 100644
--- sys/dev/ic/acx.c
+++ sys/dev/ic/acx.c
@@ -90,12 +90,9 @@
 
 #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/sockio.h>
-#include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 #include <sys/endian.h>
diff --git sys/dev/ic/acx100.c sys/dev/ic/acx100.c
index 9fd2d271285..ff192d09ffb 100644
--- sys/dev/ic/acx100.c
+++ sys/dev/ic/acx100.c
@@ -56,7 +56,6 @@
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/endian.h>
-#include <sys/socket.h>
 #include <sys/device.h>
 
 #include <machine/bus.h>
diff --git sys/dev/ic/acx111.c sys/dev/ic/acx111.c
index 33b94486423..4a51dc8fac1 100644
--- sys/dev/ic/acx111.c
+++ sys/dev/ic/acx111.c
@@ -54,7 +54,6 @@
 
 #include <sys/param.h>
 #include <sys/endian.h>
-#include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
diff --git sys/dev/ic/adv.c sys/dev/ic/adv.c
index fdc232da655..74b866f2631 100644
--- sys/dev/ic/adv.c
+++ sys/dev/ic/adv.c
@@ -33,12 +33,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/errno.h>
-#include <sys/ioctl.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
-#include <sys/buf.h>
 
 #include <machine/bus.h>
 #include <machine/intr.h>
diff --git sys/dev/ic/advlib.c sys/dev/ic/advlib.c
index 92432e52b47..05156a204c7 100644
--- sys/dev/ic/advlib.c
+++ sys/dev/ic/advlib.c
@@ -48,8 +48,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/kernel.h>
 #include <sys/queue.h>
 #include <sys/device.h>
 
@@ -59,13 +57,13 @@
 #include <scsi/scsi_all.h>
 #include <scsi/scsiconf.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <dev/ic/adv.h>
 #include <dev/ic/advlib.h>
 
 #include <dev/microcode/adw/advmcode.h>
 
+#define TRUE	1
+#define FALSE	0
 
 /* #define ASC_DEBUG */
 
diff --git sys/dev/ic/adw.c sys/dev/ic/adw.c
index 33e253ed3e9..c960f34722c 100644
--- sys/dev/ic/adw.c
+++ sys/dev/ic/adw.c
@@ -33,11 +33,9 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
-#include <sys/buf.h>
 #include <sys/timeout.h>
 
 #include <machine/bus.h>
diff --git sys/dev/ic/adwlib.c sys/dev/ic/adwlib.c
index 7cb983372d0..c0c416139d1 100644
--- sys/dev/ic/adwlib.c
+++ sys/dev/ic/adwlib.c
@@ -47,8 +47,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/kernel.h>
 #include <sys/queue.h>
 #include <sys/device.h>
 
diff --git sys/dev/ic/ahci.c sys/dev/ic/ahci.c
index bd3fdbe7c28..3960f244c4a 100644
--- sys/dev/ic/ahci.c
+++ sys/dev/ic/ahci.c
@@ -20,8 +20,6 @@
 
 #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/queue.h>
diff --git sys/dev/ic/aic6360.c sys/dev/ic/aic6360.c
index d5890725c07..a1b02a5342c 100644
--- sys/dev/ic/aic6360.c
+++ sys/dev/ic/aic6360.c
@@ -124,11 +124,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
 #include <sys/device.h>
-#include <sys/buf.h>
 #include <sys/queue.h>
 
 #include <machine/bus.h>
@@ -138,8 +134,6 @@
 #include <scsi/scsi_message.h>
 #include <scsi/scsiconf.h>
 
-#include <dev/isa/isavar.h>
-
 #include <dev/ic/aic6360reg.h>
 #include <dev/ic/aic6360var.h>
 
diff --git sys/dev/ic/aic6915.c sys/dev/ic/aic6915.c
index eb8104d3930..1246dc85181 100644
--- sys/dev/ic/aic6915.c
+++ sys/dev/ic/aic6915.c
@@ -42,9 +42,6 @@
 #include <sys/systm.h>
 #include <sys/timeout.h>
 #include <sys/mbuf.h>
-#include <sys/malloc.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/device.h>
diff --git sys/dev/ic/aic7xxx_seeprom.c sys/dev/ic/aic7xxx_seeprom.c
index aac6460f1d3..aa2fd49fbff 100644
--- sys/dev/ic/aic7xxx_seeprom.c
+++ sys/dev/ic/aic7xxx_seeprom.c
@@ -55,15 +55,8 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
 #include <sys/queue.h>
 #include <sys/device.h>
-#include <sys/reboot.h>		/* for AB_* needed by bootverbose */
-
-#include <machine/intr.h>
-
-#include <scsi/scsi_all.h>
-#include <scsi/scsiconf.h>
 
 #include <dev/ic/aic7xxx_openbsd.h>
 #include <dev/ic/aic7xxx_inline.h>
diff --git sys/dev/ic/am7930.c sys/dev/ic/am7930.c
index 7a0173ea296..39f4bce353f 100644
--- sys/dev/ic/am7930.c
+++ sys/dev/ic/am7930.c
@@ -39,9 +39,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
-#include <sys/ioctl.h>
 #include <sys/device.h>
-#include <sys/proc.h>
 
 #include <sys/audioio.h>
 #include <dev/audio_if.h>
diff --git sys/dev/ic/am7990.c sys/dev/ic/am7990.c
index 72370cf1dfd..52b48e9f14a 100644
--- sys/dev/ic/am7990.c
+++ sys/dev/ic/am7990.c
@@ -70,12 +70,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
-#include <sys/syslog.h>
-#include <sys/socket.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
-#include <sys/ioctl.h>
-#include <sys/errno.h>
 
 #include <net/if.h>
 #include <net/if_media.h>
diff --git sys/dev/ic/ami.c sys/dev/ic/ami.c
index 8833497c885..26d58a10aad 100644
--- sys/dev/ic/ami.c
+++ sys/dev/ic/ami.c
@@ -52,10 +52,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/buf.h>
 #include <sys/ioctl.h>
 #include <sys/device.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/rwlock.h>
 #include <sys/pool.h>
diff --git sys/dev/ic/an.c sys/dev/ic/an.c
index 29cdc1a485b..8378003160a 100644
--- sys/dev/ic/an.c
+++ sys/dev/ic/an.c
@@ -83,13 +83,9 @@
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
 #include <sys/ucred.h>
-#include <sys/socket.h>
-#include <sys/timeout.h>
 #include <sys/device.h>
 #include <sys/endian.h>
-#include <sys/tree.h>
 
 #include <machine/bus.h>
 
diff --git sys/dev/ic/ar5008.c sys/dev/ic/ar5008.c
index eeadd6eb20d..1dbf7f9e20b 100644
--- sys/dev/ic/ar5008.c
+++ sys/dev/ic/ar5008.c
@@ -27,13 +27,10 @@
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/queue.h>
 #include <sys/timeout.h>
-#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/stdint.h>	/* uintptr_t */
 #include <sys/endian.h>
diff --git sys/dev/ic/ar5416.c sys/dev/ic/ar5416.c
index 30230bfd356..1f961027d29 100644
--- sys/dev/ic/ar5416.c
+++ sys/dev/ic/ar5416.c
@@ -26,23 +26,14 @@
 
 #include <sys/param.h>
 #include <sys/sockio.h>
-#include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/queue.h>
 #include <sys/timeout.h>
-#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/intr.h>
 
-#if NBPFILTER > 0
-#include <net/bpf.h>
-#endif
 #include <net/if.h>
 #include <net/if_media.h>
 
diff --git sys/dev/ic/ar5xxx.h sys/dev/ic/ar5xxx.h
index 916375f7c7d..49885469c60 100644
--- sys/dev/ic/ar5xxx.h
+++ sys/dev/ic/ar5xxx.h
@@ -34,13 +34,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/lock.h>
 #include <sys/kernel.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
 #include <sys/errno.h>
-#include <sys/endian.h>
 
 #include <machine/bus.h>
 
diff --git sys/dev/ic/ar9003.c sys/dev/ic/ar9003.c
index ad5fced1632..70b0254a77d 100644
--- sys/dev/ic/ar9003.c
+++ sys/dev/ic/ar9003.c
@@ -25,15 +25,11 @@
 #include "bpfilter.h"
 
 #include <sys/param.h>
-#include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/queue.h>
 #include <sys/timeout.h>
-#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/stdint.h>	/* uintptr_t */
 #include <sys/endian.h>
diff --git sys/dev/ic/ar9280.c sys/dev/ic/ar9280.c
index 60f8eb9ad02..3013b3d1ff7 100644
--- sys/dev/ic/ar9280.c
+++ sys/dev/ic/ar9280.c
@@ -25,24 +25,13 @@
 #include "bpfilter.h"
 
 #include <sys/param.h>
-#include <sys/sockio.h>
-#include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/queue.h>
 #include <sys/timeout.h>
-#include <sys/conf.h>
 #include <sys/device.h>
-#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/intr.h>
 
-#if NBPFILTER > 0
-#include <net/bpf.h>
-#endif
 #include <net/if.h>
 #include <net/if_media.h>
 
diff --git sys/dev/ic/ar9285.c sys/dev/ic/ar9285.c
index 15dd1cf0681..e24d19128b3 100644
--- sys/dev/ic/ar9285.c
+++ sys/dev/ic/ar9285.c
@@ -26,24 +26,14 @@
 #include "bpfilter.h"
 
 #include <sys/param.h>
-#include <sys/sockio.h>
-#include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
-#include <sys/queue.h>
 #include <sys/timeout.h>
-#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/intr.h>
 
-#if NBPFILTER > 0
-#include <net/bpf.h>
-#endif
 #include <net/if.h>
 #include <net/if_media.h>
 
diff --git sys/dev/ic/ar9287.c sys/dev/ic/ar9287.c
index ad2082cd3f7..683c5415233 100644
--- sys/dev/ic/ar9287.c
+++ sys/dev/ic/ar9287.c
@@ -25,24 +25,14 @@
 #include "bpfilter.h"
 
 #include <sys/param.h>
-#include <sys/sockio.h>
-#include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/queue.h>
 #include <sys/timeout.h>
-#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/intr.h>
 
-#if NBPFILTER > 0
-#include <net/bpf.h>
-#endif
 #include <net/if.h>
 #include <net/if_media.h>
 
diff --git sys/dev/ic/ar9380.c sys/dev/ic/ar9380.c
index 012c59b2a76..1bd81ca26e8 100644
--- sys/dev/ic/ar9380.c
+++ sys/dev/ic/ar9380.c
@@ -25,22 +25,13 @@
 #include "bpfilter.h"
 
 #include <sys/param.h>
-#include <sys/sockio.h>
-#include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/queue.h>
-#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 
 #include <machine/bus.h>
 
-#if NBPFILTER > 0
-#include <net/bpf.h>
-#endif
 #include <net/if.h>
 #include <net/if_media.h>
 
diff --git sys/dev/ic/arcofi.c sys/dev/ic/arcofi.c
index 3c8bd835a48..320491e2d3f 100644
--- sys/dev/ic/arcofi.c
+++ sys/dev/ic/arcofi.c
@@ -30,17 +30,12 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
 #include <sys/device.h>
-#include <sys/kernel.h>
-#include <sys/proc.h>
-#include <sys/endian.h>
 #include <sys/fcntl.h>
 
 #include <sys/audioio.h>
 #include <dev/audio_if.h>
 
-#include <machine/autoconf.h>
 #include <machine/bus.h>
 #include <machine/intr.h>
 
diff --git sys/dev/ic/ath.c sys/dev/ic/ath.c
index 8a991f09c1e..a7e3e7d9ac6 100644
--- sys/dev/ic/ath.c
+++ sys/dev/ic/ath.c
@@ -47,9 +47,7 @@
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
-#include <sys/lock.h>
 #include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/device.h>
 #include <sys/errno.h>
diff --git sys/dev/ic/athn.c sys/dev/ic/athn.c
index 24f8a4db31a..d44ba2b9929 100644
--- sys/dev/ic/athn.c
+++ sys/dev/ic/athn.c
@@ -28,12 +28,10 @@
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/queue.h>
 #include <sys/timeout.h>
-#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/stdint.h>	/* uintptr_t */
 #include <sys/endian.h>
diff --git sys/dev/ic/atw.c sys/dev/ic/atw.c
index 11aca2d3565..542081a7f5e 100644
--- sys/dev/ic/atw.c
+++ sys/dev/ic/atw.c
@@ -40,12 +40,9 @@
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/device.h>
-#include <sys/time.h>
 #include <sys/endian.h>
 
 #include <net/if.h>
diff --git sys/dev/ic/ax88190.c sys/dev/ic/ax88190.c
index 9cc37c9d809..dcbfb520ef1 100644
--- sys/dev/ic/ax88190.c
+++ sys/dev/ic/ax88190.c
@@ -33,7 +33,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <sys/socket.h>
 
 #include <net/if.h>
 #include <net/if_media.h>
@@ -44,7 +43,6 @@
 #include <machine/bus.h>
 
 #include <dev/mii/miivar.h>
-#include <dev/mii/mii.h>
 #include <dev/mii/mii_bitbang.h>
 
 #include <dev/ic/dp8390reg.h>
diff --git sys/dev/ic/bcmgenet.c sys/dev/ic/bcmgenet.c
index 8305d2d1429..f067c338ab7 100644
--- sys/dev/ic/bcmgenet.c
+++ sys/dev/ic/bcmgenet.c
@@ -35,10 +35,8 @@
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/queue.h>
-#include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/timeout.h>
 
diff --git sys/dev/ic/bt463.c sys/dev/ic/bt463.c
index b27c23155b3..2148274296f 100644
--- sys/dev/ic/bt463.c
+++ sys/dev/ic/bt463.c
@@ -65,12 +65,9 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <sys/buf.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 
 #include <dev/pci/pcivar.h>
-#include <dev/pci/tgareg.h>
 #include <dev/pci/tgavar.h>
 #include <dev/ic/bt463reg.h>
 #include <dev/ic/bt463var.h>
diff --git sys/dev/ic/bt485.c sys/dev/ic/bt485.c
index d56e08053f4..4b317565293 100644
--- sys/dev/ic/bt485.c
+++ sys/dev/ic/bt485.c
@@ -35,11 +35,8 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <sys/buf.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 
-#include <dev/pci/pcivar.h>
 #include <dev/ic/bt485reg.h>
 #include <dev/ic/bt485var.h>
 #include <dev/ic/ramdac.h>
diff --git sys/dev/ic/bwfm.c sys/dev/ic/bwfm.c
index 5f380f72456..54bf3f1183d 100644
--- sys/dev/ic/bwfm.c
+++ sys/dev/ic/bwfm.c
@@ -20,12 +20,9 @@
 
 #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/queue.h>
-#include <sys/socket.h>
 #include <sys/sockio.h>
 
 #if defined(__HAVE_FDT)
@@ -37,7 +34,6 @@
 #include <net/bpf.h>
 #endif
 #include <net/if.h>
-#include <net/if_dl.h>
 #include <net/if_media.h>
 
 #include <netinet/in.h>
diff --git sys/dev/ic/bwi.c sys/dev/ic/bwi.c
index 68b798aee1d..23426190feb 100644
--- sys/dev/ic/bwi.c
+++ sys/dev/ic/bwi.c
@@ -44,7 +44,6 @@
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
-#include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/systm.h>
 #include <sys/endian.h>
diff --git sys/dev/ic/cac.c sys/dev/ic/cac.c
index 59b103965c7..d284c825a71 100644
--- sys/dev/ic/cac.c
+++ sys/dev/ic/cac.c
@@ -68,14 +68,11 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/ioctl.h>
 #include <sys/device.h>
 #include <sys/queue.h>
-#include <sys/buf.h>
 #include <sys/endian.h>
 #include <sys/malloc.h>
-#include <sys/pool.h>
 
 #include <machine/bus.h>
 
diff --git sys/dev/ic/ciss.c sys/dev/ic/ciss.c
index 706872604bc..18db5cdd730 100644
--- sys/dev/ic/ciss.c
+++ sys/dev/ic/ciss.c
@@ -23,10 +23,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/buf.h>
 #include <sys/ioctl.h>
 #include <sys/device.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 
 #include <machine/bus.h>
diff --git sys/dev/ic/com.c sys/dev/ic/com.c
index dd45e3c901c..87c1a6a1bb6 100644
--- sys/dev/ic/com.c
+++ sys/dev/ic/com.c
@@ -69,7 +69,6 @@
 #include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/uio.h>
-#include <sys/kernel.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
 #include <sys/vnode.h>
diff --git sys/dev/ic/dc.c sys/dev/ic/dc.c
index fda85b84140..9af40574ee4 100644
--- sys/dev/ic/dc.c
+++ sys/dev/ic/dc.c
@@ -94,11 +94,9 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
-#include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/timeout.h>
 
diff --git sys/dev/ic/dl10019.c sys/dev/ic/dl10019.c
index 1f0d36a791a..c87967d1838 100644
--- sys/dev/ic/dl10019.c
+++ sys/dev/ic/dl10019.c
@@ -33,9 +33,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/syslog.h>
 
 #include <net/if.h>
 #include <net/if_media.h>
@@ -46,7 +43,6 @@
 #include <machine/bus.h>
 
 #include <dev/mii/miivar.h>
-#include <dev/mii/mii.h>
 #include <dev/mii/mii_bitbang.h>
 
 #include <dev/ic/dp8390reg.h>
diff --git sys/dev/ic/dp8390.c sys/dev/ic/dp8390.c
index 0a640c4860a..eb0abf72dcf 100644
--- sys/dev/ic/dp8390.c
+++ sys/dev/ic/dp8390.c
@@ -22,7 +22,6 @@
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/mbuf.h>
-#include <sys/socket.h>
 #include <sys/syslog.h>
 
 #include <net/if.h>
diff --git sys/dev/ic/dwhdmi.c sys/dev/ic/dwhdmi.c
index 77a6aab8450..90361590702 100644
--- sys/dev/ic/dwhdmi.c
+++ sys/dev/ic/dwhdmi.c
@@ -30,7 +30,6 @@
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 
 #include <dev/ic/dwhdmi.h>
 
diff --git sys/dev/ic/dwiic.c sys/dev/ic/dwiic.c
index b8d9a397f4d..dd9c87857fe 100644
--- sys/dev/ic/dwiic.c
+++ sys/dev/ic/dwiic.c
@@ -19,7 +19,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 
 #include <dev/i2c/i2cvar.h>
 
diff --git sys/dev/ic/dwqe.c sys/dev/ic/dwqe.c
index 917656a6c67..9f3025a5d02 100644
--- sys/dev/ic/dwqe.c
+++ sys/dev/ic/dwqe.c
@@ -26,11 +26,9 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.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/timeout.h>
 
@@ -39,7 +37,6 @@
 #include <net/if.h>
 #include <net/if_media.h>
 
-#include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 
 #if NBPFILTER > 0
diff --git sys/dev/ic/elink3.c sys/dev/ic/elink3.c
index 33134a2bde6..44259a5d483 100644
--- sys/dev/ic/elink3.c
+++ sys/dev/ic/elink3.c
@@ -37,7 +37,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
-#include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/syslog.h>
diff --git sys/dev/ic/fxp.c sys/dev/ic/fxp.c
index fde5d6a4f03..a7913afaee1 100644
--- sys/dev/ic/fxp.c
+++ sys/dev/ic/fxp.c
@@ -43,8 +43,6 @@
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/syslog.h>
 #include <sys/timeout.h>
 
diff --git sys/dev/ic/gdt_common.c sys/dev/ic/gdt_common.c
index 50b20795ae4..2a21ea27089 100644
--- sys/dev/ic/gdt_common.c
+++ sys/dev/ic/gdt_common.c
@@ -30,11 +30,8 @@
  */
 
 #include <sys/param.h>
-#include <sys/buf.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/systm.h>
 
 #include <machine/bus.h>
diff --git sys/dev/ic/gem.c sys/dev/ic/gem.c
index b0a4adf478d..cc65c3b3814 100644
--- sys/dev/ic/gem.c
+++ sys/dev/ic/gem.c
@@ -41,14 +41,9 @@
 #include <sys/timeout.h>
 #include <sys/mbuf.h>
 #include <sys/syslog.h>
-#include <sys/malloc.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/device.h>
-#include <sys/endian.h>
-#include <sys/atomic.h>
 
 #include <net/if.h>
 #include <net/if_media.h>
diff --git sys/dev/ic/hme.c sys/dev/ic/hme.c
index 732d33eedc2..55d1bb4e325 100644
--- sys/dev/ic/hme.c
+++ sys/dev/ic/hme.c
@@ -40,12 +40,9 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/mbuf.h> 
 #include <sys/syslog.h>
-#include <sys/socket.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 
diff --git sys/dev/ic/i82365.c sys/dev/ic/i82365.c
index 285b3ea628b..0f559c6fb3a 100644
--- sys/dev/ic/i82365.c
+++ sys/dev/ic/i82365.c
@@ -33,8 +33,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <sys/extent.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/kthread.h>
 
diff --git sys/dev/ic/i82596.c sys/dev/ic/i82596.c
index 6e8d321f088..dc1565b9e58 100644
--- sys/dev/ic/i82596.c
+++ sys/dev/ic/i82596.c
@@ -139,7 +139,6 @@ Mode of operation:
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
-#include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/syslog.h>
diff --git sys/dev/ic/ibm561.c sys/dev/ic/ibm561.c
index 6581384aa78..5ac8b435dd6 100644
--- sys/dev/ic/ibm561.c
+++ sys/dev/ic/ibm561.c
@@ -33,11 +33,8 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <sys/buf.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 
-#include <dev/pci/pcivar.h>
 #include <dev/ic/ibm561reg.h>
 #include <dev/ic/ibm561var.h>
 #include <dev/ic/ramdac.h>
diff --git sys/dev/ic/if_wi.c sys/dev/ic/if_wi.c
index dc6fbc39fa8..517a1f7468e 100644
--- sys/dev/ic/if_wi.c
+++ sys/dev/ic/if_wi.c
@@ -70,7 +70,6 @@
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/device.h>
 
 #include <net/if.h>
diff --git sys/dev/ic/if_wi_hostap.c sys/dev/ic/if_wi_hostap.c
index 64e3c10f3f5..e1af4e2f6ee 100644
--- sys/dev/ic/if_wi_hostap.c
+++ sys/dev/ic/if_wi_hostap.c
@@ -47,10 +47,7 @@
 #include <sys/kernel.h>
 #include <sys/timeout.h>
 #include <sys/ucred.h>
-#include <sys/socket.h>
 #include <sys/queue.h>
-#include <sys/syslog.h>
-#include <sys/sysctl.h>
 #include <sys/device.h>
 
 #include <machine/bus.h>
diff --git sys/dev/ic/iha.c sys/dev/ic/iha.c
index b5301eebbb7..dca7a989171 100644
--- sys/dev/ic/iha.c
+++ sys/dev/ic/iha.c
@@ -34,7 +34,6 @@
  */
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/buf.h>
 #include <sys/device.h>
 
 #include <machine/bus.h>
diff --git sys/dev/ic/imxiic.c sys/dev/ic/imxiic.c
index 0ba646ceae9..731b21bd501 100644
--- sys/dev/ic/imxiic.c
+++ sys/dev/ic/imxiic.c
@@ -17,7 +17,6 @@
 
 #include <sys/param.h>
 #include <sys/device.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
 
 #include <machine/bus.h>
diff --git sys/dev/ic/iosf.c sys/dev/ic/iosf.c
index fda04b0e90d..a244a2b5a3c 100644
--- sys/dev/ic/iosf.c
+++ sys/dev/ic/iosf.c
@@ -22,8 +22,6 @@
 #include <sys/mutex.h>
 #include <sys/rwlock.h>
 
-#include <machine/bus.h>
-
 #include <dev/ic/iosfvar.h>
 
 #define IOSF_MBI_MASK_HI		0xffffff00
diff --git sys/dev/ic/lance.c sys/dev/ic/lance.c
index 28f999be533..3f75e590bd1 100644
--- sys/dev/ic/lance.c
+++ sys/dev/ic/lance.c
@@ -71,7 +71,6 @@
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/syslog.h>
-#include <sys/socket.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/ioctl.h>
@@ -83,10 +82,6 @@
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 
-#if NBPFILTER > 0
-#include <net/bpf.h>
-#endif
-
 #include <dev/ic/lancereg.h>
 #include <dev/ic/lancevar.h>
 
diff --git sys/dev/ic/lemac.c sys/dev/ic/lemac.c
index 0bd9a4ef775..e6c7dbf7f6e 100644
--- sys/dev/ic/lemac.c
+++ sys/dev/ic/lemac.c
@@ -37,10 +37,8 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
-#include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/errno.h>
-#include <sys/malloc.h>
 #include <sys/device.h>
 
 #include <net/if.h>
diff --git sys/dev/ic/lm78.c sys/dev/ic/lm78.c
index e60f38577a6..15bbb027fbc 100644
--- sys/dev/ic/lm78.c
+++ sys/dev/ic/lm78.c
@@ -19,8 +19,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <sys/kernel.h>
-#include <sys/queue.h>
 #include <sys/sensors.h>
 
 #include <dev/ic/lm78var.h>
diff --git sys/dev/ic/lpt.c sys/dev/ic/lpt.c
index ca3c0dfd040..2be89614aed 100644
--- sys/dev/ic/lpt.c
+++ sys/dev/ic/lpt.c
@@ -57,7 +57,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
-#include <sys/kernel.h>
 #include <sys/uio.h>
 #include <sys/device.h>
 #include <sys/conf.h>
@@ -69,8 +68,6 @@
 #include <dev/ic/lptreg.h>
 #include <dev/ic/lptvar.h>
 
-#include "lpt.h"
-
 #define	TIMEOUT		16000	/* wait up to 16 seconds for a ready */
 #define	STEP		250	/* 1/4 seconds */
 
diff --git sys/dev/ic/lsi64854.c sys/dev/ic/lsi64854.c
index 069e3721954..d63887841e3 100644
--- sys/dev/ic/lsi64854.c
+++ sys/dev/ic/lsi64854.c
@@ -32,13 +32,9 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/errno.h>
 #include <sys/device.h>
 
 #include <machine/bus.h>
-#include <machine/autoconf.h>
-#include <machine/cpu.h>
 
 #include <scsi/scsi_all.h>
 #include <scsi/scsiconf.h>
diff --git sys/dev/ic/malo.c sys/dev/ic/malo.c
index 9131d0ab906..eea86c11df0 100644
--- sys/dev/ic/malo.c
+++ sys/dev/ic/malo.c
@@ -22,10 +22,8 @@
 #include <sys/param.h>
 
 #include <sys/device.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
-#include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/systm.h>
 #include <sys/endian.h>
diff --git sys/dev/ic/mfi.c sys/dev/ic/mfi.c
index 1e27a8cc846..b160a0921fc 100644
--- sys/dev/ic/mfi.c
+++ sys/dev/ic/mfi.c
@@ -19,9 +19,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/buf.h>
 #include <sys/device.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/rwlock.h>
 #include <sys/sensors.h>
diff --git sys/dev/ic/mk48txx.c sys/dev/ic/mk48txx.c
index a00f5e8d81c..c526e8ecf00 100644
--- sys/dev/ic/mk48txx.c
+++ sys/dev/ic/mk48txx.c
@@ -36,7 +36,6 @@
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
-#include <sys/errno.h>
 
 #include <machine/bus.h>
 #include <dev/clock_subr.h>
diff --git sys/dev/ic/mpi.c sys/dev/ic/mpi.c
index a8ef8fa3bc4..27e79f556a6 100644
--- sys/dev/ic/mpi.c
+++ sys/dev/ic/mpi.c
@@ -21,10 +21,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/buf.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
 #include <sys/mutex.h>
 #include <sys/rwlock.h>
 #include <sys/sensors.h>
diff --git sys/dev/ic/mtd8xx.c sys/dev/ic/mtd8xx.c
index 43bef7e86b8..77d809c4f1e 100644
--- sys/dev/ic/mtd8xx.c
+++ sys/dev/ic/mtd8xx.c
@@ -34,7 +34,6 @@
 #include <sys/mbuf.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <sys/socket.h>
 #include <sys/ioctl.h>
 
 #include <net/if.h>
@@ -49,7 +48,6 @@
 
 #include <machine/bus.h>
 
-#include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 
 #include <dev/pci/pcidevs.h>
diff --git sys/dev/ic/ncr53c9x.c sys/dev/ic/ncr53c9x.c
index dd829c8ec88..8eb4fd50bb7 100644
--- sys/dev/ic/ncr53c9x.c
+++ sys/dev/ic/ncr53c9x.c
@@ -69,7 +69,6 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/errno.h>
-#include <sys/ioctl.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/queue.h>
diff --git sys/dev/ic/ne2000.c sys/dev/ic/ne2000.c
index 500f236c96e..20dfae0a1af 100644
--- sys/dev/ic/ne2000.c
+++ sys/dev/ic/ne2000.c
@@ -51,7 +51,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <sys/socket.h>
 #include <sys/mbuf.h>
 #include <sys/syslog.h>
 
diff --git sys/dev/ic/nvme.c sys/dev/ic/nvme.c
index 1e6c62e4ac6..df36f3b6390 100644
--- sys/dev/ic/nvme.c
+++ sys/dev/ic/nvme.c
@@ -22,12 +22,10 @@
 #include <sys/ioctl.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/queue.h>
 #include <sys/mutex.h>
-#include <sys/pool.h>
 #include <sys/disk.h>
 
 #include <sys/atomic.h>
diff --git sys/dev/ic/oosiop.c sys/dev/ic/oosiop.c
index 6c8253c27a4..d7b91de1969 100644
--- sys/dev/ic/oosiop.c
+++ sys/dev/ic/oosiop.c
@@ -38,9 +38,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/timeout.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
-#include <sys/buf.h>
 #include <sys/malloc.h>
 #include <sys/queue.h>
 
diff --git sys/dev/ic/osiop.c sys/dev/ic/osiop.c
index b64e14b3d0b..1c5c68838b3 100644
--- sys/dev/ic/osiop.c
+++ sys/dev/ic/osiop.c
@@ -73,8 +73,6 @@
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
-#include <sys/buf.h>
-#include <sys/kernel.h>
 
 #include <scsi/scsi_all.h>
 #include <scsi/scsiconf.h>
diff --git sys/dev/ic/pcdisplay_chars.c sys/dev/ic/pcdisplay_chars.c
index e13d1aa1c22..838f10f11d0 100644
--- sys/dev/ic/pcdisplay_chars.c
+++ sys/dev/ic/pcdisplay_chars.c
@@ -29,7 +29,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/device.h>
 #include <machine/bus.h>
 
 #include <dev/ic/mc6845reg.h>
diff --git sys/dev/ic/pcdisplay_subr.c sys/dev/ic/pcdisplay_subr.c
index e8bdd13b634..e7bdc7bc4dc 100644
--- sys/dev/ic/pcdisplay_subr.c
+++ sys/dev/ic/pcdisplay_subr.c
@@ -30,14 +30,11 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/device.h>
 #include <machine/bus.h>
 
 #include <dev/ic/mc6845reg.h>
 #include <dev/ic/pcdisplayvar.h>
 
-#include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsdisplayvar.h>
 
 void
diff --git sys/dev/ic/pcf8584.c sys/dev/ic/pcf8584.c
index b86f6fec432..10b90875ded 100644
--- sys/dev/ic/pcf8584.c
+++ sys/dev/ic/pcf8584.c
@@ -19,10 +19,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
-#include <sys/kernel.h>
 #include <sys/rwlock.h>
-#include <sys/proc.h>
 
 #include <machine/bus.h>
 
diff --git sys/dev/ic/pckbc.c sys/dev/ic/pckbc.c
index 3c8212630d8..599aa5ce923 100644
--- sys/dev/ic/pckbc.c
+++ sys/dev/ic/pckbc.c
@@ -29,7 +29,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/timeout.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/errno.h>
diff --git sys/dev/ic/pgt.c sys/dev/ic/pgt.c
index 7dd6b675f36..d45f76b3df2 100644
--- sys/dev/ic/pgt.c
+++ sys/dev/ic/pgt.c
@@ -48,15 +48,12 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
-#include <sys/socket.h>
 #include <sys/mbuf.h>
 #include <sys/endian.h>
 #include <sys/sockio.h>
 #include <sys/kthread.h>
 #include <sys/time.h>
-#include <sys/ioctl.h>
 #include <sys/device.h>
 
 #include <machine/bus.h>
@@ -79,9 +76,7 @@
 #include <dev/ic/pgtreg.h>
 #include <dev/ic/pgtvar.h>
 
-#include <dev/ic/if_wireg.h>
 #include <dev/ic/if_wi_ieee.h>
-#include <dev/ic/if_wivar.h>
 
 #ifdef PGT_DEBUG
 #define DPRINTF(x)	do { printf x; } while (0)
diff --git sys/dev/ic/pluart.c sys/dev/ic/pluart.c
index 8a91d92d59d..e67ee5cdb1f 100644
--- sys/dev/ic/pluart.c
+++ sys/dev/ic/pluart.c
@@ -18,16 +18,12 @@
 
 #include <sys/param.h>
 #include <sys/ioctl.h>
-#include <sys/proc.h>
 #include <sys/tty.h>
-#include <sys/uio.h>
 #include <sys/systm.h>
-#include <sys/time.h>
 #include <sys/device.h>
 #include <sys/syslog.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
-#include <sys/kernel.h>
 
 #include <machine/bus.h>
 
diff --git sys/dev/ic/qla.c sys/dev/ic/qla.c
index 82e71ba6c09..c6bbe85cd5f 100644
--- sys/dev/ic/qla.c
+++ sys/dev/ic/qla.c
@@ -21,12 +21,8 @@
 #include <sys/systm.h>
 #include <sys/atomic.h>
 #include <sys/device.h>
-#include <sys/ioctl.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
 #include <sys/mutex.h>
-#include <sys/rwlock.h>
-#include <sys/sensors.h>
 #include <sys/queue.h>
 
 #include <machine/bus.h>
diff --git sys/dev/ic/qlw.c sys/dev/ic/qlw.c
index 4d7703155a5..839544f9a3c 100644
--- sys/dev/ic/qlw.c
+++ sys/dev/ic/qlw.c
@@ -22,12 +22,8 @@
 #include <sys/systm.h>
 #include <sys/atomic.h>
 #include <sys/device.h>
-#include <sys/ioctl.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
 #include <sys/mutex.h>
-#include <sys/rwlock.h>
-#include <sys/sensors.h>
 #include <sys/queue.h>
 
 #include <machine/bus.h>
diff --git sys/dev/ic/qwx.c sys/dev/ic/qwx.c
index 898e15e1fcb..f2d9569ac5e 100644
--- sys/dev/ic/qwx.c
+++ sys/dev/ic/qwx.c
@@ -61,7 +61,6 @@
 #include <sys/device.h>
 #include <sys/rwlock.h>
 #include <sys/systm.h>
-#include <sys/socket.h>
 #include <sys/sockio.h>
 
 #include <sys/refcnt.h>
diff --git sys/dev/ic/qwz.c sys/dev/ic/qwz.c
index c9014cc0aae..7bfeceeacb3 100644
--- sys/dev/ic/qwz.c
+++ sys/dev/ic/qwz.c
@@ -61,7 +61,6 @@
 #include <sys/device.h>
 #include <sys/rwlock.h>
 #include <sys/systm.h>
-#include <sys/socket.h>
 #include <sys/sockio.h>
 
 #include <sys/refcnt.h>
diff --git sys/dev/ic/re.c sys/dev/ic/re.c
index 17d783653b0..b5afa9b0c17 100644
--- sys/dev/ic/re.c
+++ sys/dev/ic/re.c
@@ -117,11 +117,8 @@
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/timeout.h>
-#include <sys/socket.h>
-#include <sys/atomic.h>
 
 #include <machine/bus.h>
 
diff --git sys/dev/ic/rt2560.c sys/dev/ic/rt2560.c
index 7b0938a09af..0b58895e0e3 100644
--- sys/dev/ic/rt2560.c
+++ sys/dev/ic/rt2560.c
@@ -27,12 +27,9 @@
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/timeout.h>
-#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 
diff --git sys/dev/ic/rt2661.c sys/dev/ic/rt2661.c
index ed7f1707d17..102d83edc09 100644
--- sys/dev/ic/rt2661.c
+++ sys/dev/ic/rt2661.c
@@ -27,12 +27,9 @@
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/timeout.h>
-#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/queue.h>
 #include <sys/endian.h>
diff --git sys/dev/ic/rt2860.c sys/dev/ic/rt2860.c
index 07aeeff7171..e5cba661b11 100644
--- sys/dev/ic/rt2860.c
+++ sys/dev/ic/rt2860.c
@@ -27,13 +27,9 @@
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/queue.h>
-#include <sys/timeout.h>
-#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 
diff --git sys/dev/ic/rtl80x9.c sys/dev/ic/rtl80x9.c
index 96d920e6932..72570eb666d 100644
--- sys/dev/ic/rtl80x9.c
+++ sys/dev/ic/rtl80x9.c
@@ -31,13 +31,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "bpfilter.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/mbuf.h>
-#include <sys/syslog.h>
-#include <sys/socket.h>
 #include <sys/device.h>
 
 #include <net/if.h>
@@ -51,8 +46,6 @@
 #include <dev/ic/dp8390reg.h>
 #include <dev/ic/dp8390var.h>
 
-#include <dev/ic/ne2000var.h>
-
 #include <dev/ic/rtl80x9reg.h>
 #include <dev/ic/rtl80x9var.h>
 
diff --git sys/dev/ic/rtl81x9.c sys/dev/ic/rtl81x9.c
index edf9ff6d233..651c7ee5db3 100644
--- sys/dev/ic/rtl81x9.c
+++ sys/dev/ic/rtl81x9.c
@@ -90,8 +90,6 @@
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/device.h>
 #include <sys/timeout.h>
 
diff --git sys/dev/ic/rtsx.c sys/dev/ic/rtsx.c
index 900eadbb64e..571d0dbaf16 100644
--- sys/dev/ic/rtsx.c
+++ sys/dev/ic/rtsx.c
@@ -23,7 +23,6 @@
 
 #include <sys/param.h>
 #include <sys/device.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
 
 #include <dev/ic/rtsxreg.h>
diff --git sys/dev/ic/rtw.c sys/dev/ic/rtw.c
index e875bb62b7c..1a0a6d9b73e 100644
--- sys/dev/ic/rtw.c
+++ sys/dev/ic/rtw.c
@@ -41,10 +41,7 @@
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
 #include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/time.h>
 #include <sys/endian.h>
 
 #include <machine/bus.h>
diff --git sys/dev/ic/rtwn.c sys/dev/ic/rtwn.c
index 0bc314e7d56..4fb8c10590b 100644
--- sys/dev/ic/rtwn.c
+++ sys/dev/ic/rtwn.c
@@ -27,16 +27,11 @@
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/task.h>
-#include <sys/timeout.h>
-#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 
-#include <machine/bus.h>
 #include <machine/intr.h>
 
 #if NBPFILTER > 0
diff --git sys/dev/ic/sili.c sys/dev/ic/sili.c
index c40c648997c..b73c5ccd9fa 100644
--- sys/dev/ic/sili.c
+++ sys/dev/ic/sili.c
@@ -23,7 +23,6 @@
 #include <sys/device.h>
 #include <sys/timeout.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
 #include <sys/mutex.h>
 
 #include <machine/bus.h>
diff --git sys/dev/ic/siop.c sys/dev/ic/siop.c
index f78ae70b13f..38c12694ff8 100644
--- sys/dev/ic/siop.c
+++ sys/dev/ic/siop.c
@@ -32,8 +32,6 @@
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
-#include <sys/endian.h>
 
 #include <machine/bus.h>
 
diff --git sys/dev/ic/siop_common.c sys/dev/ic/siop_common.c
index 545b5b32a01..53cd0af2045 100644
--- sys/dev/ic/siop_common.c
+++ sys/dev/ic/siop_common.c
@@ -31,11 +31,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
-#include <sys/buf.h>
-#include <sys/kernel.h>
-#include <sys/scsiio.h>
-#include <sys/endian.h>
 
 #include <machine/bus.h>
 
diff --git sys/dev/ic/smc83c170.c sys/dev/ic/smc83c170.c
index ae9014b554d..cf2785eca91 100644
--- sys/dev/ic/smc83c170.c
+++ sys/dev/ic/smc83c170.c
@@ -42,9 +42,6 @@
 #include <sys/systm.h>
 #include <sys/timeout.h>
 #include <sys/mbuf.h>
-#include <sys/malloc.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/device.h>
diff --git sys/dev/ic/smc91cxx.c sys/dev/ic/smc91cxx.c
index 364a4535b78..d8d736a2d1a 100644
--- sys/dev/ic/smc91cxx.c
+++ sys/dev/ic/smc91cxx.c
@@ -77,11 +77,8 @@
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/syslog.h>
-#include <sys/socket.h>
 #include <sys/device.h>
 #include <sys/timeout.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/ioctl.h> 
 #include <sys/errno.h>
 
diff --git sys/dev/ic/tcic2.c sys/dev/ic/tcic2.c
index 11dc78c8be7..85bdad180c9 100644
--- sys/dev/ic/tcic2.c
+++ sys/dev/ic/tcic2.c
@@ -36,7 +36,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <sys/extent.h>
 #include <sys/malloc.h>
 #include <sys/kthread.h>
 
diff --git sys/dev/ic/ti.c sys/dev/ic/ti.c
index 1aae1d1f148..961a69a96b6 100644
--- sys/dev/ic/ti.c
+++ sys/dev/ic/ti.c
@@ -79,8 +79,6 @@
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/device.h>
 #include <sys/queue.h>
 
diff --git sys/dev/ic/trm.c sys/dev/ic/trm.c
index 5e78a9da0b5..2a831bd440f 100644
--- sys/dev/ic/trm.c
+++ sys/dev/ic/trm.c
@@ -45,9 +45,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
-#include <sys/buf.h>
 #include <sys/device.h>
 
 #include <machine/bus.h>
diff --git sys/dev/ic/twe.c sys/dev/ic/twe.c
index 4d21e9fa225..d4cd1a67901 100644
--- sys/dev/ic/twe.c
+++ sys/dev/ic/twe.c
@@ -32,9 +32,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/buf.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
 #include <sys/kthread.h>
 
 #include <machine/bus.h>
diff --git sys/dev/ic/ufshci.c sys/dev/ic/ufshci.c
index 774c6d0f3cf..82d7601deca 100644
--- sys/dev/ic/ufshci.c
+++ sys/dev/ic/ufshci.c
@@ -23,15 +23,10 @@
 
 #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/queue.h>
 #include <sys/mutex.h>
-#include <sys/pool.h>
-
-#include <sys/atomic.h>
 
 #include <machine/bus.h>
 
diff --git sys/dev/ic/uha.c sys/dev/ic/uha.c
index e0aeb2ba67a..44eadab72a7 100644
--- sys/dev/ic/uha.c
+++ sys/dev/ic/uha.c
@@ -53,13 +53,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
 #include <sys/buf.h>
-#include <uvm/uvm_extern.h>
 
 #include <machine/bus.h>
 #include <machine/intr.h>
diff --git sys/dev/ic/vga.c sys/dev/ic/vga.c
index 0866e92fda8..5c668567d9c 100644
--- sys/dev/ic/vga.c
+++ sys/dev/ic/vga.c
@@ -61,7 +61,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/queue.h>
@@ -73,7 +72,6 @@
 
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/wscons/wsconsio.h>
-#include <dev/wscons/unicode.h>
 
 #include <dev/ic/vgavar.h>
 #include <dev/ic/pcdisplay.h>
diff --git sys/dev/ic/w83l518d.c sys/dev/ic/w83l518d.c
index 9aad19704ae..35beb6be850 100644
--- sys/dev/ic/w83l518d.c
+++ sys/dev/ic/w83l518d.c
@@ -27,13 +27,9 @@
  */
 
 #include <sys/param.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <sys/syslog.h>
+#include <sys/timeout.h>
 #include <sys/device.h>
-#include <sys/proc.h>
 
 #include <machine/bus.h>
 
diff --git sys/dev/ic/w83l518d_sdmmc.c sys/dev/ic/w83l518d_sdmmc.c
index 439e65893ce..fc7832d5fba 100644
--- sys/dev/ic/w83l518d_sdmmc.c
+++ sys/dev/ic/w83l518d_sdmmc.c
@@ -27,19 +27,15 @@
  */
 
 #include <sys/param.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <sys/syslog.h>
 #include <sys/device.h>
-#include <sys/proc.h>
+#include <sys/timeout.h>
 
 #include <machine/bus.h>
 
 #include <dev/sdmmc/sdmmcvar.h>
 #include <dev/sdmmc/sdmmcchip.h>
-#include <dev/sdmmc/sdmmc_ioreg.h>
 
 #include <dev/ic/w83l518dreg.h>
 #include <dev/ic/w83l518dvar.h>
diff --git sys/dev/ic/wdc.c sys/dev/ic/wdc.c
index 32ec659e4bd..4dac045f1da 100644
--- sys/dev/ic/wdc.c
+++ sys/dev/ic/wdc.c
@@ -55,13 +55,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/conf.h>
-#include <sys/buf.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
-#include <sys/syslog.h>
-#include <sys/disk.h>
 #include <sys/pool.h>
 
 #include <machine/intr.h>
diff --git sys/dev/ic/xl.c sys/dev/ic/xl.c
index 33bc6594b09..7d31c8b1c5d 100644
--- sys/dev/ic/xl.c
+++ sys/dev/ic/xl.c
@@ -105,11 +105,8 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
-#include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
-#include <sys/malloc.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
 
 #include <net/if.h>
diff --git sys/dev/ic/z8530sc.c sys/dev/ic/z8530sc.c
index 2648cba2985..f2a8e02df1e 100644
--- sys/dev/ic/z8530sc.c
+++ sys/dev/ic/z8530sc.c
@@ -93,14 +93,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/proc.h>
 #include <sys/device.h>
-#include <sys/conf.h>
-#include <sys/ioctl.h>
-#include <sys/tty.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
-#include <sys/syslog.h>
 
 #include <dev/ic/z8530reg.h>
 #include <machine/z8530var.h>
diff --git sys/dev/ic/z8530tty.c sys/dev/ic/z8530tty.c
index a0472d3f3a4..99aeb2036f7 100644
--- sys/dev/ic/z8530tty.c
+++ sys/dev/ic/z8530tty.c
@@ -97,7 +97,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/proc.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
@@ -105,7 +104,6 @@
 #include <sys/malloc.h>
 #include <sys/tty.h>
 #include <sys/time.h>
-#include <sys/kernel.h>
 #include <sys/syslog.h>
 
 #include <dev/ic/z8530reg.h>