From: Jonathan Gray <jsg@jsg.id.au>
Subject: unneeded #includes in sys/dev/pci
To: tech@openbsd.org
Date: Thu, 23 May 2024 13:49:15 +1000

includes such as rwlock.h timeout.h mutex.h queue.h are kept when used
in a driver specific header but not the pci attachment, even if the file
would build via other indirect includes.

diff --git sys/dev/pci/aac_pci.c sys/dev/pci/aac_pci.c
index fe2a6dfaf1a..a1c20887e83 100644
--- sys/dev/pci/aac_pci.c
+++ sys/dev/pci/aac_pci.c
@@ -41,11 +41,8 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/queue.h>
 #include <sys/rwlock.h>
-#include <sys/endian.h>
 
 #include <machine/bus.h>
 #include <machine/intr.h>
diff --git sys/dev/pci/adv_pci.c sys/dev/pci/adv_pci.c
index b870cc1d11c..9f8e6eb973e 100644
--- sys/dev/pci/adv_pci.c
+++ sys/dev/pci/adv_pci.c
@@ -57,8 +57,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/pci/adw_pci.c sys/dev/pci/adw_pci.c
index 995e71ec8d3..58c67a21bc5 100644
--- sys/dev/pci/adw_pci.c
+++ sys/dev/pci/adw_pci.c
@@ -43,11 +43,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/timeout.h>
 
 #include <machine/bus.h>
 
diff --git sys/dev/pci/agp.c sys/dev/pci/agp.c
index a0bab2839b4..362e9b52d48 100644
--- sys/dev/pci/agp.c
+++ sys/dev/pci/agp.c
@@ -34,12 +34,6 @@
 #include <uvm/uvm_extern.h>
 
 #include <dev/pci/pcivar.h>
-#include <dev/pci/pcidevs.h>
-
-#include <dev/ic/mc6845reg.h>
-#include <dev/ic/pcdisplayvar.h>
-#include <dev/ic/vgareg.h>
-#include <dev/ic/vgavar.h>
 
 #include <dev/pci/agpvar.h>
 #include <dev/pci/agpreg.h>
diff --git sys/dev/pci/agp_ali.c sys/dev/pci/agp_ali.c
index 308299f660d..566e06aaf8c 100644
--- sys/dev/pci/agp_ali.c
+++ sys/dev/pci/agp_ali.c
@@ -31,15 +31,12 @@
  */
 
 #include <sys/param.h>
-#include <sys/malloc.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <sys/rwlock.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcidevs.h>
-#include <dev/pci/vga_pcivar.h>
 #include <dev/pci/agpvar.h>
 #include <dev/pci/agpreg.h>
 
diff --git sys/dev/pci/agp_amd.c sys/dev/pci/agp_amd.c
index a57e8efec81..e56599e2c47 100644
--- sys/dev/pci/agp_amd.c
+++ sys/dev/pci/agp_amd.c
@@ -33,11 +33,9 @@
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
-#include <sys/rwlock.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
-#include <dev/pci/vga_pcivar.h>
 #include <dev/pci/agpvar.h>
 #include <dev/pci/agpreg.h>
 
diff --git sys/dev/pci/agp_apple.c sys/dev/pci/agp_apple.c
index e9b5f81f492..3f921c62d85 100644
--- sys/dev/pci/agp_apple.c
+++ sys/dev/pci/agp_apple.c
@@ -18,9 +18,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/device.h>
-#include <sys/rwlock.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
diff --git sys/dev/pci/agp_i810.c sys/dev/pci/agp_i810.c
index c8f9ec793f3..8e2326b0d6f 100644
--- sys/dev/pci/agp_i810.c
+++ sys/dev/pci/agp_i810.c
@@ -36,7 +36,6 @@
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
-#include <sys/rwlock.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
diff --git sys/dev/pci/agp_intel.c sys/dev/pci/agp_intel.c
index 628b122187e..8e6af96239c 100644
--- sys/dev/pci/agp_intel.c
+++ sys/dev/pci/agp_intel.c
@@ -31,9 +31,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/device.h>
-#include <sys/rwlock.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
diff --git sys/dev/pci/agp_sis.c sys/dev/pci/agp_sis.c
index f0d59d05494..1e1ad719bca 100644
--- sys/dev/pci/agp_sis.c
+++ sys/dev/pci/agp_sis.c
@@ -31,14 +31,11 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/device.h>
-#include <sys/rwlock.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcidevs.h>
-#include <dev/pci/vga_pcivar.h>
 #include <dev/pci/agpvar.h>
 #include <dev/pci/agpreg.h>
 
diff --git sys/dev/pci/agp_via.c sys/dev/pci/agp_via.c
index 75828c10a6c..cdaf690fdd0 100644
--- sys/dev/pci/agp_via.c
+++ sys/dev/pci/agp_via.c
@@ -31,14 +31,11 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/device.h>
-#include <sys/rwlock.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcidevs.h>
-#include <dev/pci/vga_pcivar.h>
 #include <dev/pci/agpvar.h>
 #include <dev/pci/agpreg.h>
 
diff --git sys/dev/pci/ahc_pci.c sys/dev/pci/ahc_pci.c
index 373e87e89f4..c6616c9a93e 100644
--- sys/dev/pci/ahc_pci.c
+++ sys/dev/pci/ahc_pci.c
@@ -55,10 +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>
 
 #include <machine/bus.h>
 #include <machine/intr.h>
diff --git sys/dev/pci/ahci_pci.c sys/dev/pci/ahci_pci.c
index 77da17ccb8f..99aa6f1888e 100644
--- sys/dev/pci/ahci_pci.c
+++ sys/dev/pci/ahci_pci.c
@@ -20,14 +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/timeout.h>
 #include <sys/queue.h>
 #include <sys/mutex.h>
-#include <sys/pool.h>
 
 #include <machine/bus.h>
 
@@ -35,8 +30,6 @@
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 
-#include <dev/ata/pmreg.h>
-
 #include <dev/ic/ahcireg.h>
 #include <dev/ic/ahcivar.h>
 
diff --git sys/dev/pci/alipm.c sys/dev/pci/alipm.c
index 228d5fb9216..7c1e87d3540 100644
--- sys/dev/pci/alipm.c
+++ sys/dev/pci/alipm.c
@@ -18,7 +18,6 @@
 
 #include <sys/param.h>
 #include <sys/device.h>
-#include <sys/kernel.h>
 #include <sys/rwlock.h>
 #include <sys/systm.h>
 
diff --git sys/dev/pci/amdiic.c sys/dev/pci/amdiic.c
index 1bee1fb6c73..1c7b9b93ee1 100644
--- sys/dev/pci/amdiic.c
+++ sys/dev/pci/amdiic.c
@@ -23,7 +23,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <sys/kernel.h>
 #include <sys/rwlock.h>
 
 #include <machine/bus.h>
diff --git sys/dev/pci/amdpm.c sys/dev/pci/amdpm.c
index dc9202f7a73..6310ddb79b7 100644
--- sys/dev/pci/amdpm.c
+++ sys/dev/pci/amdpm.c
@@ -48,7 +48,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <sys/kernel.h>
 #include <sys/rwlock.h>
 #include <sys/timeout.h>
 #include <sys/timetc.h>
diff --git sys/dev/pci/ami_pci.c sys/dev/pci/ami_pci.c
index 07fc567f1eb..61c75d8630b 100644
--- sys/dev/pci/ami_pci.c
+++ sys/dev/pci/ami_pci.c
@@ -28,8 +28,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/rwlock.h>
 
diff --git sys/dev/pci/arc.c sys/dev/pci/arc.c
index 718831fc5e7..00020a6534e 100644
--- sys/dev/pci/arc.c
+++ sys/dev/pci/arc.c
@@ -23,8 +23,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/buf.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/device.h>
diff --git sys/dev/pci/auacer.c sys/dev/pci/auacer.c
index cd3cb8fa116..f2b70041496 100644
--- sys/dev/pci/auacer.c
+++ sys/dev/pci/auacer.c
@@ -41,7 +41,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
 
diff --git sys/dev/pci/auixp.c sys/dev/pci/auixp.c
index e9f2216558a..7b1cd21ecf0 100644
--- sys/dev/pci/auixp.c
+++ sys/dev/pci/auixp.c
@@ -48,8 +48,6 @@
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
-#include <sys/conf.h>
-#include <sys/exec.h>
 #include <sys/audioio.h>
 #include <sys/queue.h>
 
diff --git sys/dev/pci/autri.c sys/dev/pci/autri.c
index 391397e714d..92d0faf7b35 100644
--- sys/dev/pci/autri.c
+++ sys/dev/pci/autri.c
@@ -38,7 +38,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/fcntl.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
@@ -51,7 +50,6 @@
 #include <dev/audio_if.h>
 #include <dev/midi_if.h>
 #include <dev/ic/ac97.h>
-#include <dev/ic/mpuvar.h>
 
 #include <machine/bus.h>
 #include <machine/intr.h>
diff --git sys/dev/pci/berkwdt.c sys/dev/pci/berkwdt.c
index bf9c3377ca0..8294fa7c68a 100644
--- sys/dev/pci/berkwdt.c
+++ sys/dev/pci/berkwdt.c
@@ -23,7 +23,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/pci/cac_pci.c sys/dev/pci/cac_pci.c
index d17f9888360..94061b00464 100644
--- sys/dev/pci/cac_pci.c
+++ sys/dev/pci/cac_pci.c
@@ -36,10 +36,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/queue.h>
-#include <sys/endian.h>
 #include <sys/sensors.h>
 
 #include <machine/bus.h>
diff --git sys/dev/pci/ccp_pci.c sys/dev/pci/ccp_pci.c
index 18407281d6c..dd14ba5d71f 100644
--- sys/dev/pci/ccp_pci.c
+++ sys/dev/pci/ccp_pci.c
@@ -18,11 +18,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/rwlock.h>
 #include <sys/device.h>
 #include <sys/timeout.h>
-#include <sys/queue.h>
 
 #include <machine/bus.h>
 
diff --git sys/dev/pci/ciss_pci.c sys/dev/pci/ciss_pci.c
index 004aface7d8..61985bda26d 100644
--- sys/dev/pci/ciss_pci.c
+++ sys/dev/pci/ciss_pci.c
@@ -19,8 +19,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/device.h>
 
 #include <dev/pci/pcidevs.h>
diff --git sys/dev/pci/cmpci.c sys/dev/pci/cmpci.c
index fcd23270867..f65b82e3d62 100644
--- sys/dev/pci/cmpci.c
+++ sys/dev/pci/cmpci.c
@@ -51,7 +51,6 @@ int cmpcidebug = 0;
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
 
@@ -60,7 +59,6 @@ int cmpcidebug = 0;
 
 #include <sys/audioio.h>
 #include <dev/audio_if.h>
-#include <dev/midi_if.h>
 
 #include <dev/pci/cmpcireg.h>
 #include <dev/pci/cmpcivar.h>
diff --git sys/dev/pci/com_pci.c sys/dev/pci/com_pci.c
index 745b7ccdef1..bdac4d98e4b 100644
--- sys/dev/pci/com_pci.c
+++ sys/dev/pci/com_pci.c
@@ -17,7 +17,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/tty.h>
 
 #include <dev/pci/pcidevs.h>
@@ -26,7 +25,6 @@
 
 #include <dev/ic/comreg.h>
 #include <dev/ic/comvar.h>
-#include <dev/ic/ns16550reg.h>
 
 #define com_usr 31	/* Synopsys DesignWare UART */
 
diff --git sys/dev/pci/cs4280.c sys/dev/pci/cs4280.c
index 837a15f6589..73b756a2112 100644
--- sys/dev/pci/cs4280.c
+++ sys/dev/pci/cs4280.c
@@ -67,8 +67,6 @@ int cs4280debug = 0;
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/fcntl.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
 
diff --git sys/dev/pci/cs4281.c sys/dev/pci/cs4281.c
index 93c96caa8e9..6ba92e6c20d 100644
--- sys/dev/pci/cs4281.c
+++ sys/dev/pci/cs4281.c
@@ -43,9 +43,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
-#include <sys/fcntl.h>
 #include <sys/device.h>
 
 #include <dev/pci/pcidevs.h>
@@ -54,7 +52,6 @@
 
 #include <sys/audioio.h>
 #include <dev/audio_if.h>
-#include <dev/midi_if.h>
 
 #include <dev/ic/ac97.h>
 
diff --git sys/dev/pci/cy82c693.c sys/dev/pci/cy82c693.c
index f7baa449a65..4c8e92e2122 100644
--- sys/dev/pci/cy82c693.c
+++ sys/dev/pci/cy82c693.c
@@ -41,8 +41,6 @@
 
 #include <machine/bus.h>
 
-#include <dev/pci/pcivar.h>
-
 #include <dev/pci/cy82c693reg.h>
 #include <dev/pci/cy82c693var.h>
 
diff --git sys/dev/pci/cz.c sys/dev/pci/cz.c
index f4d1b97dcd7..7e00669e869 100644
--- sys/dev/pci/cz.c
+++ sys/dev/pci/cz.c
@@ -81,8 +81,6 @@
 #include <sys/tty.h>
 #include <sys/conf.h>
 #include <sys/time.h>
-#include <sys/kernel.h>
-#include <sys/fcntl.h>
 #include <sys/syslog.h>
 
 #include <dev/pci/pcireg.h>
diff --git sys/dev/pci/dwiic_pci.c sys/dev/pci/dwiic_pci.c
index 76a39b60c4c..ddf48103e54 100644
--- sys/dev/pci/dwiic_pci.c
+++ sys/dev/pci/dwiic_pci.c
@@ -20,7 +20,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pcireg.h>
diff --git sys/dev/pci/eap.c sys/dev/pci/eap.c
index dd7e2c258b5..72335ebc54e 100644
--- sys/dev/pci/eap.c
+++ sys/dev/pci/eap.c
@@ -51,7 +51,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/fcntl.h>
 #include <sys/device.h>
 
diff --git sys/dev/pci/ehci_pci.c sys/dev/pci/ehci_pci.c
index 70ec084a59c..954b4d8218e 100644
--- sys/dev/pci/ehci_pci.c
+++ sys/dev/pci/ehci_pci.c
@@ -32,7 +32,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/rwlock.h>
 #include <sys/device.h>
 #include <sys/timeout.h>
@@ -46,7 +45,6 @@
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdivar.h>
-#include <dev/usb/usb_mem.h>
 
 #include <dev/usb/ehcireg.h>
 #include <dev/usb/ehcivar.h>
diff --git sys/dev/pci/envy.c sys/dev/pci/envy.c
index b230961c8e0..2cde23718c2 100644
--- sys/dev/pci/envy.c
+++ sys/dev/pci/envy.c
@@ -32,7 +32,6 @@
 #include <sys/device.h>
 #include <sys/audioio.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
 #include <dev/audio_if.h>
 #include <dev/midi_if.h>
 #include <dev/ic/ac97.h>
diff --git sys/dev/pci/esa.c sys/dev/pci/esa.c
index 603294058b6..a02a6a84cbc 100644
--- sys/dev/pci/esa.c
+++ sys/dev/pci/esa.c
@@ -48,8 +48,6 @@
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
-#include <sys/conf.h>
-#include <sys/exec.h>
 #include <sys/audioio.h>
 
 #include <machine/bus.h>
diff --git sys/dev/pci/eso.c sys/dev/pci/eso.c
index 27dde7265b1..afa70c5d1e0 100644
--- sys/dev/pci/eso.c
+++ sys/dev/pci/eso.c
@@ -35,7 +35,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
 
@@ -46,7 +45,6 @@
 #include <dev/audio_if.h>
 #include <dev/midi_if.h>
 
-#include <dev/ic/mpuvar.h>
 #include <dev/ic/i8237reg.h>
 #include <dev/pci/esoreg.h>
 #include <dev/pci/esovar.h>
diff --git sys/dev/pci/fms.c sys/dev/pci/fms.c
index 7927f9a47bc..1e13e5bb499 100644
--- sys/dev/pci/fms.c
+++ sys/dev/pci/fms.c
@@ -38,7 +38,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/audioio.h>
diff --git sys/dev/pci/fmsradio.c sys/dev/pci/fmsradio.c
index 26f34732dd3..f858e191a3a 100644
--- sys/dev/pci/fmsradio.c
+++ sys/dev/pci/fmsradio.c
@@ -39,17 +39,11 @@
 #include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/errno.h>
-#include <sys/ioctl.h>
 #include <sys/audioio.h>
 #include <sys/radioio.h>
 
 #include <machine/bus.h>
 
-#include <dev/pci/pcireg.h>
-#include <dev/pci/pcivar.h>
-#include <dev/pci/pcidevs.h>
-
-#include <dev/audio_if.h>
 #include <dev/radio_if.h>
 
 #include <dev/ic/ac97.h>
diff --git sys/dev/pci/gdt_pci.c sys/dev/pci/gdt_pci.c
index ac1a6b2329d..15b185347c2 100644
--- sys/dev/pci/gdt_pci.c
+++ sys/dev/pci/gdt_pci.c
@@ -32,10 +32,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/queue.h>
-#include <sys/endian.h>
 
 #include <machine/bus.h>
 
diff --git sys/dev/pci/i82365_pci.c sys/dev/pci/i82365_pci.c
index d5aaeef3ba4..020c54e86e8 100644
--- sys/dev/pci/i82365_pci.c
+++ sys/dev/pci/i82365_pci.c
@@ -36,7 +36,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
 
 #include <dev/ic/i82365reg.h>
@@ -47,7 +46,6 @@
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/i82365_pcivar.h>
 
-#include <dev/isa/isavar.h>
 #include <dev/isa/i82365_isavar.h>
 
 /*
diff --git sys/dev/pci/ichiic.c sys/dev/pci/ichiic.c
index 8477c002479..31c00bee6da 100644
--- sys/dev/pci/ichiic.c
+++ sys/dev/pci/ichiic.c
@@ -23,7 +23,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <sys/kernel.h>
 #include <sys/rwlock.h>
 
 #include <machine/bus.h>
diff --git sys/dev/pci/if_acx_pci.c sys/dev/pci/if_acx_pci.c
index 57a5ccc24a2..2c81419fe5f 100644
--- sys/dev/pci/if_acx_pci.c
+++ sys/dev/pci/if_acx_pci.c
@@ -25,12 +25,7 @@
 #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/timeout.h>
 #include <sys/device.h>
 
diff --git sys/dev/pci/if_age.c sys/dev/pci/if_age.c
index 15e93515a39..97c18979874 100644
--- sys/dev/pci/if_age.c
+++ sys/dev/pci/if_age.c
@@ -38,10 +38,8 @@
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/queue.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/timeout.h>
-#include <sys/socket.h>
 
 #include <machine/bus.h>
 
diff --git sys/dev/pci/if_alc.c sys/dev/pci/if_alc.c
index 86bff590e9b..484b12b165e 100644
--- sys/dev/pci/if_alc.c
+++ sys/dev/pci/if_alc.c
@@ -37,10 +37,8 @@
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/queue.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/timeout.h>
-#include <sys/socket.h>
 
 #include <machine/bus.h>
 
diff --git sys/dev/pci/if_ale.c sys/dev/pci/if_ale.c
index 51979420f39..7972459e58c 100644
--- sys/dev/pci/if_ale.c
+++ sys/dev/pci/if_ale.c
@@ -39,10 +39,8 @@
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/queue.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/timeout.h>
-#include <sys/socket.h>
 
 #include <machine/bus.h>
 
diff --git sys/dev/pci/if_an_pci.c sys/dev/pci/if_an_pci.c
index 6eeb32f9ca0..8ceea636e0e 100644
--- sys/dev/pci/if_an_pci.c
+++ sys/dev/pci/if_an_pci.c
@@ -57,9 +57,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <sys/timeout.h>
-#include <sys/socket.h>
-#include <sys/tree.h>
 
 #include <net/if.h>
 #include <net/if_media.h>
diff --git sys/dev/pci/if_aq_pci.c sys/dev/pci/if_aq_pci.c
index 8ac957befa7..1740d15da5f 100644
--- sys/dev/pci/if_aq_pci.c
+++ sys/dev/pci/if_aq_pci.c
@@ -84,7 +84,6 @@
 #include <sys/types.h>
 #include <sys/device.h>
 #include <sys/param.h>
-#include <sys/kernel.h>
 #include <sys/sockio.h>
 #include <sys/systm.h>
 #include <sys/intrmap.h>
diff --git sys/dev/pci/if_ath_pci.c sys/dev/pci/if_ath_pci.c
index 8944d4d8d90..5d2608b5fb9 100644
--- sys/dev/pci/if_ath_pci.c
+++ sys/dev/pci/if_ath_pci.c
@@ -39,13 +39,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/mbuf.h>
-#include <sys/malloc.h>
-#include <sys/kernel.h>
-#include <sys/lock.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
-#include <sys/errno.h>
 #include <sys/device.h>
 #include <sys/gpio.h>
 
diff --git sys/dev/pci/if_athn_pci.c sys/dev/pci/if_athn_pci.c
index 35db0664942..74ccf456ca5 100644
--- sys/dev/pci/if_athn_pci.c
+++ sys/dev/pci/if_athn_pci.c
@@ -23,12 +23,7 @@
 #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/timeout.h>
 #include <sys/device.h>
 
diff --git sys/dev/pci/if_atw_pci.c sys/dev/pci/if_atw_pci.c
index 899c1d5dd19..35f964dade2 100644
--- sys/dev/pci/if_atw_pci.c
+++ sys/dev/pci/if_atw_pci.c
@@ -39,14 +39,7 @@
 
 #include <sys/param.h>
 #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/endian.h>
  
 #include <net/if.h>
 #include <net/if_media.h>
@@ -60,8 +53,6 @@
 #include <machine/intr.h>
 
 #include <dev/ic/atwreg.h>
-#include <dev/ic/rf3000reg.h>
-#include <dev/ic/si4136reg.h>
 #include <dev/ic/atwvar.h>
 
 #include <dev/pci/pcivar.h>
diff --git sys/dev/pci/if_bce.c sys/dev/pci/if_bce.c
index 68bc288e23e..2147f5599ed 100644
--- sys/dev/pci/if_bce.c
+++ sys/dev/pci/if_bce.c
@@ -42,10 +42,7 @@
 #include <sys/timeout.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/malloc.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
-#include <sys/socket.h>
 
 #include <net/if.h>
 #include <net/if_media.h>
@@ -62,7 +59,6 @@
 
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
-#include <dev/mii/miidevs.h>
 
 #include <dev/pci/if_bcereg.h>
 
diff --git sys/dev/pci/if_bge.c sys/dev/pci/if_bge.c
index 1eb9acc03c9..8e08a1314c7 100644
--- sys/dev/pci/if_bge.c
+++ sys/dev/pci/if_bge.c
@@ -81,10 +81,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 <sys/kstat.h>
 
@@ -108,7 +106,6 @@
 
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
-#include <dev/mii/miidevs.h>
 #include <dev/mii/brgphyreg.h>
 
 #include <dev/pci/if_bgereg.h>
diff --git sys/dev/pci/if_bnxt.c sys/dev/pci/if_bnxt.c
index 3dadfafca81..e446c4fbabd 100644
--- sys/dev/pci/if_bnxt.c
+++ sys/dev/pci/if_bnxt.c
@@ -50,7 +50,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/stdint.h>
@@ -60,7 +59,6 @@
 
 #include <machine/bus.h>
 
-#include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 
diff --git sys/dev/pci/if_bwfm_pci.c sys/dev/pci/if_bwfm_pci.c
index b50c8f75c2e..a18388d376d 100644
--- sys/dev/pci/if_bwfm_pci.c
+++ sys/dev/pci/if_bwfm_pci.c
@@ -16,12 +16,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "bpfilter.h"
-
 #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>
@@ -32,11 +28,7 @@
 #include <dev/ofw/openfirm.h>
 #endif
 
-#if NBPFILTER > 0
-#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/pci/if_bwi_pci.c sys/dev/pci/if_bwi_pci.c
index 4f2103da492..f48e81945a6 100644
--- sys/dev/pci/if_bwi_pci.c
+++ sys/dev/pci/if_bwi_pci.c
@@ -23,12 +23,7 @@
 #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/timeout.h>
 #include <sys/device.h>
 
diff --git sys/dev/pci/if_cas.c sys/dev/pci/if_cas.c
index 09ac37cd980..a3512ced591 100644
--- sys/dev/pci/if_cas.c
+++ sys/dev/pci/if_cas.c
@@ -49,13 +49,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>
diff --git sys/dev/pci/if_dc_pci.c sys/dev/pci/if_dc_pci.c
index 771154ccd20..a5f14f11ef8 100644
--- sys/dev/pci/if_dc_pci.c
+++ sys/dev/pci/if_dc_pci.c
@@ -34,17 +34,10 @@
  * $FreeBSD: src/sys/pci/if_dc.c,v 1.5 2000/01/12 22:24:05 wpaul Exp $
  */
 
-#include "bpfilter.h"
-
 #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/timeout.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
 
 #include <net/if.h>
@@ -54,10 +47,6 @@
 
 #include <net/if_media.h>
 
-#if NBPFILTER > 0
-#include <net/bpf.h>
-#endif
-
 #include <dev/mii/miivar.h>
 
 #include <dev/pci/pcireg.h>
diff --git sys/dev/pci/if_de.c sys/dev/pci/if_de.c
index b178a4aeeef..12478cae3be 100644
--- sys/dev/pci/if_de.c
+++ sys/dev/pci/if_de.c
@@ -44,11 +44,9 @@
 #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>
-#include <sys/pool.h>
 
 #include <net/if.h>
 #include <net/if_media.h>
diff --git sys/dev/pci/if_em.c sys/dev/pci/if_em.c
index caf3a389dd7..7a1af9ab8fe 100644
--- sys/dev/pci/if_em.c
+++ sys/dev/pci/if_em.c
@@ -37,8 +37,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <dev/pci/if_em.h>
 #include <dev/pci/if_em_soc.h>
 
-#include <netinet/ip6.h>
-
 /*********************************************************************
  *  Driver version
  *********************************************************************/
diff --git sys/dev/pci/if_em_hw.c sys/dev/pci/if_em_hw.c
index 54b2e2039df..82928332386 100644
--- sys/dev/pci/if_em_hw.c
+++ sys/dev/pci/if_em_hw.c
@@ -38,13 +38,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/sockio.h>
-#include <sys/mbuf.h>
-#include <sys/malloc.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
-#include <sys/socket.h>
-#include <sys/kstat.h>
 
 #include <net/if.h>
 #include <net/if_media.h>
@@ -52,11 +46,6 @@
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 
-#include <uvm/uvm_extern.h>
-
-#include <dev/pci/pcireg.h>
-#include <dev/pci/pcivar.h>
-
 #include <dev/pci/if_em.h>
 #include <dev/pci/if_em_hw.h>
 #include <dev/pci/if_em_soc.h>
diff --git sys/dev/pci/if_ep_pci.c sys/dev/pci/if_ep_pci.c
index 93fed4ef8f2..ccfbbb66c79 100644
--- sys/dev/pci/if_ep_pci.c
+++ sys/dev/pci/if_ep_pci.c
@@ -31,16 +31,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "bpfilter.h" 
- 
 #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/timeout.h>
-#include <sys/syslog.h>
 #include <sys/device.h>
 
 #include <net/if.h>
@@ -49,11 +42,6 @@
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
  
-#if NBPFILTER > 0
-#include <net/bpf.h>
-#endif
-
-#include <machine/cpu.h>
 #include <machine/bus.h>
 #include <machine/intr.h>
 
diff --git sys/dev/pci/if_epic_pci.c sys/dev/pci/if_epic_pci.c
index 048ef120673..f5164c1c056 100644
--- sys/dev/pci/if_epic_pci.c
+++ sys/dev/pci/if_epic_pci.c
@@ -38,12 +38,6 @@
 
 #include <sys/param.h>
 #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 <net/if.h>
diff --git sys/dev/pci/if_et.c sys/dev/pci/if_et.c
index 63f5915fcf4..04ac47478b6 100644
--- sys/dev/pci/if_et.c
+++ sys/dev/pci/if_et.c
@@ -38,15 +38,12 @@
 #include "bpfilter.h"
 
 #include <sys/param.h>
-#include <sys/endian.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/queue.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/timeout.h>
-#include <sys/socket.h>
 
 #include <machine/bus.h>
  
@@ -63,7 +60,6 @@
  
 #include <dev/mii/miivar.h>
 
-#include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 
diff --git sys/dev/pci/if_fxp_pci.c sys/dev/pci/if_fxp_pci.c
index 6754ba4fc46..3ffeb6504dd 100644
--- sys/dev/pci/if_fxp_pci.c
+++ sys/dev/pci/if_fxp_pci.c
@@ -36,29 +36,19 @@
  * Intel EtherExpress Pro/100B PCI Fast Ethernet driver
  */
 
-#include "bpfilter.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/mbuf.h>
-#include <sys/malloc.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/timeout.h>
-#include <sys/syslog.h>
 
 #include <net/if.h>
 #include <net/if_media.h>
 
 #include <netinet/in.h>
 
-#include <sys/ioctl.h>
-#include <sys/errno.h>
 #include <sys/device.h>
 
 #include <netinet/if_ether.h>
 
-#include <machine/cpu.h>
 #include <machine/bus.h>
 #include <machine/intr.h>
 
diff --git sys/dev/pci/if_gem_pci.c sys/dev/pci/if_gem_pci.c
index 9dda743ef0e..7365956bd72 100644
--- sys/dev/pci/if_gem_pci.c
+++ sys/dev/pci/if_gem_pci.c
@@ -36,12 +36,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
-#include <sys/errno.h>
 #include <sys/device.h>
-#include <sys/endian.h>
 
 #include <net/if.h>
 #include <net/if_media.h>
@@ -57,7 +52,6 @@
 #endif
 
 #include <dev/mii/miivar.h>
-#include <dev/mii/mii_bitbang.h>
 
 #include <dev/ic/gemreg.h>
 #include <dev/ic/gemvar.h>
diff --git sys/dev/pci/if_hme_pci.c sys/dev/pci/if_hme_pci.c
index 3019ee18cec..257cd7e618e 100644
--- sys/dev/pci/if_hme_pci.c
+++ sys/dev/pci/if_hme_pci.c
@@ -33,10 +33,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/syslog.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
-#include <sys/socket.h>
 
 #include <net/if.h>
 #include <net/if_media.h>
@@ -50,7 +47,6 @@
 #include <machine/autoconf.h>
 #include <dev/ofw/openfirm.h>
 #endif
-#include <machine/cpu.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
diff --git sys/dev/pci/if_iavf.c sys/dev/pci/if_iavf.c
index eff312b6a70..4d9478859cd 100644
--- sys/dev/pci/if_iavf.c
+++ sys/dev/pci/if_iavf.c
@@ -55,7 +55,6 @@
 #include <sys/proc.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/device.h>
 #include <sys/pool.h>
@@ -68,7 +67,6 @@
 #include <machine/intr.h>
 
 #include <net/if.h>
-#include <net/if_dl.h>
 #include <net/if_media.h>
 
 #if NBPFILTER > 0
diff --git sys/dev/pci/if_igc.c sys/dev/pci/if_igc.c
index c808fd69dca..f48746a538b 100644
--- sys/dev/pci/if_igc.c
+++ sys/dev/pci/if_igc.c
@@ -37,7 +37,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/endian.h>
diff --git sys/dev/pci/if_iwi.c sys/dev/pci/if_iwi.c
index d086ade1efc..bec6decd31c 100644
--- sys/dev/pci/if_iwi.c
+++ sys/dev/pci/if_iwi.c
@@ -26,11 +26,9 @@
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
 #include <sys/rwlock.h>
 #include <sys/socket.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/task.h>
 #include <sys/endian.h>
diff --git sys/dev/pci/if_iwm.c sys/dev/pci/if_iwm.c
index f299e477e72..a4df6bfd289 100644
--- sys/dev/pci/if_iwm.c
+++ sys/dev/pci/if_iwm.c
@@ -109,12 +109,8 @@
 #include "bpfilter.h"
 
 #include <sys/param.h>
-#include <sys/conf.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
-#include <sys/mutex.h>
-#include <sys/proc.h>
 #include <sys/rwlock.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
@@ -134,7 +130,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/pci/if_iwn.c sys/dev/pci/if_iwn.c
index 6c783e34949..904b722f038 100644
--- sys/dev/pci/if_iwn.c
+++ sys/dev/pci/if_iwn.c
@@ -26,12 +26,10 @@
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
 #include <sys/rwlock.h>
 #include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
-#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/task.h>
 #include <sys/endian.h>
diff --git sys/dev/pci/if_iwx.c sys/dev/pci/if_iwx.c
index dbe9390de31..b29f6fed3ea 100644
--- sys/dev/pci/if_iwx.c
+++ sys/dev/pci/if_iwx.c
@@ -96,12 +96,8 @@
 #include "bpfilter.h"
 
 #include <sys/param.h>
-#include <sys/conf.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
-#include <sys/mutex.h>
-#include <sys/proc.h>
 #include <sys/rwlock.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
@@ -121,7 +117,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/pci/if_ixl.c sys/dev/pci/if_ixl.c
index 398b995a040..8d34a7ca6c5 100644
--- sys/dev/pci/if_ixl.c
+++ sys/dev/pci/if_ixl.c
@@ -55,7 +55,6 @@
 #include <sys/proc.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/device.h>
 #include <sys/pool.h>
@@ -69,7 +68,6 @@
 #include <machine/intr.h>
 
 #include <net/if.h>
-#include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/route.h>
 #include <net/toeplitz.h>
diff --git sys/dev/pci/if_jme.c sys/dev/pci/if_jme.c
index 08c08c8858b..6af0fc68015 100644
--- sys/dev/pci/if_jme.c
+++ sys/dev/pci/if_jme.c
@@ -38,10 +38,8 @@
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/queue.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/timeout.h>
-#include <sys/socket.h>
 
 #include <machine/bus.h>
 
diff --git sys/dev/pci/if_lge.c sys/dev/pci/if_lge.c
index 4a08513dfc4..909b748096a 100644
--- sys/dev/pci/if_lge.c
+++ sys/dev/pci/if_lge.c
@@ -80,10 +80,7 @@
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/malloc.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
-#include <sys/socket.h>
 
 #include <net/if.h>
 #include <net/if_media.h>
@@ -102,7 +99,6 @@
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 
-#include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 
 #define LGE_USEIOSPACE
diff --git sys/dev/pci/if_lii.c sys/dev/pci/if_lii.c
index 3d0d2f75a38..df4ad2c44e5 100644
--- sys/dev/pci/if_lii.c
+++ sys/dev/pci/if_lii.c
@@ -36,9 +36,7 @@
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
 #include <sys/socket.h>
-#include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/timeout.h>
 
diff --git sys/dev/pci/if_malo_pci.c sys/dev/pci/if_malo_pci.c
index a8cf0124299..bf77b8db4ab 100644
--- sys/dev/pci/if_malo_pci.c
+++ sys/dev/pci/if_malo_pci.c
@@ -23,12 +23,7 @@
 #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/timeout.h>
 #include <sys/device.h>
 
diff --git sys/dev/pci/if_mcx.c sys/dev/pci/if_mcx.c
index 8005312dcf8..a35cc584390 100644
--- sys/dev/pci/if_mcx.c
+++ sys/dev/pci/if_mcx.c
@@ -25,11 +25,8 @@
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/device.h>
-#include <sys/pool.h>
-#include <sys/queue.h>
 #include <sys/timeout.h>
 #include <sys/task.h>
 #include <sys/atomic.h>
@@ -40,7 +37,6 @@
 #include <machine/intr.h>
 
 #include <net/if.h>
-#include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/toeplitz.h>
 
diff --git sys/dev/pci/if_msk.c sys/dev/pci/if_msk.c
index 88d9e3d2ac3..99606095dd9 100644
--- sys/dev/pci/if_msk.c
+++ sys/dev/pci/if_msk.c
@@ -94,8 +94,6 @@
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/timeout.h>
 #include <sys/device.h>
 #include <sys/queue.h>
@@ -115,7 +113,6 @@
 #include <sys/kstat.h>
 #endif
 
-#include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 
 #include <dev/pci/pcireg.h>
diff --git sys/dev/pci/if_mtd_pci.c sys/dev/pci/if_mtd_pci.c
index 2a2242e52df..723d7fb82bd 100644
--- sys/dev/pci/if_mtd_pci.c
+++ sys/dev/pci/if_mtd_pci.c
@@ -31,7 +31,6 @@
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
-#include <sys/socket.h>
 
 #include <net/if.h>
 #include <net/if_media.h>
diff --git sys/dev/pci/if_myx.c sys/dev/pci/if_myx.c
index b13d445186d..e641f84e3d6 100644
--- sys/dev/pci/if_myx.c
+++ sys/dev/pci/if_myx.c
@@ -27,14 +27,11 @@
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/malloc.h>
 #include <sys/pool.h>
 #include <sys/timeout.h>
 #include <sys/device.h>
-#include <sys/proc.h>
-#include <sys/queue.h>
 #include <sys/rwlock.h>
 #include <sys/kstat.h>
 
diff --git sys/dev/pci/if_ne_pci.c sys/dev/pci/if_ne_pci.c
index 5ed6bc7b2f2..4634730c108 100644
--- sys/dev/pci/if_ne_pci.c
+++ sys/dev/pci/if_ne_pci.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>
diff --git sys/dev/pci/if_nep.c sys/dev/pci/if_nep.c
index 64c8d6a482a..618cc85d58a 100644
--- sys/dev/pci/if_nep.c
+++ sys/dev/pci/if_nep.c
@@ -36,7 +36,6 @@
 #include <net/bpf.h>
 #endif
 
-#include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 
 #include <dev/pci/pcireg.h>
diff --git sys/dev/pci/if_nfe.c sys/dev/pci/if_nfe.c
index ffe34c5e293..1f691477768 100644
--- sys/dev/pci/if_nfe.c
+++ sys/dev/pci/if_nfe.c
@@ -28,10 +28,8 @@
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/queue.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/timeout.h>
-#include <sys/socket.h>
 
 #include <machine/bus.h>
 
diff --git sys/dev/pci/if_ngbe.c sys/dev/pci/if_ngbe.c
index 5483380f6b4..2d835ca9e4d 100644
--- sys/dev/pci/if_ngbe.c
+++ sys/dev/pci/if_ngbe.c
@@ -25,8 +25,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/endian.h>
 #include <sys/intrmap.h>
diff --git sys/dev/pci/if_nge.c sys/dev/pci/if_nge.c
index 4971b174624..7f811207d8f 100644
--- sys/dev/pci/if_nge.c
+++ sys/dev/pci/if_nge.c
@@ -95,10 +95,7 @@
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/malloc.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
-#include <sys/socket.h>
 
 #include <net/if.h>
 #include <net/if_media.h>
@@ -117,7 +114,6 @@
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 
-#include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 
 #define NGE_USEIOSPACE
diff --git sys/dev/pci/if_nxe.c sys/dev/pci/if_nxe.c
index 30dc8fd8015..64e0f08f054 100644
--- sys/dev/pci/if_nxe.c
+++ sys/dev/pci/if_nxe.c
@@ -22,11 +22,9 @@
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
-#include <sys/proc.h>
 #include <sys/queue.h>
 #include <sys/timeout.h>
 #include <sys/sensors.h>
@@ -39,7 +37,6 @@
 #include <dev/pci/pcidevs.h>
 
 #include <net/if.h>
-#include <net/if_dl.h>
 #include <net/if_media.h>
 
 #if NBPFILTER > 0
diff --git sys/dev/pci/if_oce.c sys/dev/pci/if_oce.c
index 1e2710c4a87..44bc57ce55c 100644
--- sys/dev/pci/if_oce.c
+++ sys/dev/pci/if_oce.c
@@ -62,7 +62,6 @@
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/socket.h>
 #include <sys/queue.h>
@@ -75,10 +74,6 @@
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 
-#ifdef INET6
-#include <netinet/ip6.h>
-#endif
-
 #if NBPFILTER > 0
 #include <net/bpf.h>
 #endif
diff --git sys/dev/pci/if_pcn.c sys/dev/pci/if_pcn.c
index 28e98b037ff..0c29046b5b5 100644
--- sys/dev/pci/if_pcn.c
+++ sys/dev/pci/if_pcn.c
@@ -71,9 +71,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/pci/if_pgt_pci.c sys/dev/pci/if_pgt_pci.c
index dba3bdb7ed8..3d33973be76 100644
--- sys/dev/pci/if_pgt_pci.c
+++ sys/dev/pci/if_pgt_pci.c
@@ -23,12 +23,7 @@
 #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/timeout.h>
 #include <sys/device.h>
 
diff --git sys/dev/pci/if_qwx_pci.c sys/dev/pci/if_qwx_pci.c
index 6e27e346cb3..155b53ddc6e 100644
--- sys/dev/pci/if_qwx_pci.c
+++ sys/dev/pci/if_qwx_pci.c
@@ -53,14 +53,11 @@
 #include "bpfilter.h"
 
 #include <sys/param.h>
-#include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
-#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 
diff --git sys/dev/pci/if_ral_pci.c sys/dev/pci/if_ral_pci.c
index 8f049f05121..aaf308167c8 100644
--- sys/dev/pci/if_ral_pci.c
+++ sys/dev/pci/if_ral_pci.c
@@ -23,12 +23,7 @@
 #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/timeout.h>
 #include <sys/device.h>
 
diff --git sys/dev/pci/if_re_pci.c sys/dev/pci/if_re_pci.c
index aaf30479bf3..e6543a90986 100644
--- sys/dev/pci/if_re_pci.c
+++ sys/dev/pci/if_re_pci.c
@@ -21,15 +21,9 @@
  */
 
 #include <sys/param.h>
-#include <sys/endian.h>
 #include <sys/systm.h>
-#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 <net/if.h>
 #include <net/if_media.h>
diff --git sys/dev/pci/if_rge.c sys/dev/pci/if_rge.c
index 6a487c50f1b..676007c29a4 100644
--- sys/dev/pci/if_rge.c
+++ sys/dev/pci/if_rge.c
@@ -25,8 +25,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/endian.h>
 
diff --git sys/dev/pci/if_rl_pci.c sys/dev/pci/if_rl_pci.c
index d09daf7c4ed..8510bdc9ced 100644
--- sys/dev/pci/if_rl_pci.c
+++ sys/dev/pci/if_rl_pci.c
@@ -32,15 +32,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "bpfilter.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
-#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>
 
@@ -51,10 +44,6 @@
 
 #include <net/if_media.h>
 
-#if NBPFILTER > 0
-#include <net/bpf.h>
-#endif
-
 #include <machine/bus.h>
 
 #include <dev/mii/miivar.h>
diff --git sys/dev/pci/if_rtw_pci.c sys/dev/pci/if_rtw_pci.c
index 7f8c1f516f1..7f9541ca0d9 100644
--- sys/dev/pci/if_rtw_pci.c
+++ sys/dev/pci/if_rtw_pci.c
@@ -41,14 +41,7 @@
 
 #include <sys/param.h>
 #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/endian.h>
  
 #include <net/if.h>
 #include <net/if_media.h>
@@ -62,7 +55,6 @@
 #include <machine/intr.h>
 
 #include <dev/ic/rtwreg.h>
-#include <dev/ic/sa2400reg.h>
 #include <dev/ic/rtwvar.h>
 
 #include <dev/pci/pcivar.h>
diff --git sys/dev/pci/if_rtwn.c sys/dev/pci/if_rtwn.c
index 121b5a3cd8c..1353a561a81 100644
--- sys/dev/pci/if_rtwn.c
+++ sys/dev/pci/if_rtwn.c
@@ -25,14 +25,10 @@
 #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/task.h>
 #include <sys/timeout.h>
-#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 
@@ -43,7 +39,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/pci/if_se.c sys/dev/pci/if_se.c
index 7ad0bcc2370..d9bb3453960 100644
--- sys/dev/pci/if_se.c
+++ sys/dev/pci/if_se.c
@@ -57,10 +57,7 @@
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
-#include <sys/kernel.h>
 #include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
 #include <sys/timeout.h>
 
 #include <net/if.h>
diff --git sys/dev/pci/if_sf_pci.c sys/dev/pci/if_sf_pci.c
index cf58df25657..eea91262a91 100644
--- sys/dev/pci/if_sf_pci.c
+++ sys/dev/pci/if_sf_pci.c
@@ -37,12 +37,6 @@
 
 #include <sys/param.h>
 #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 <net/if.h>
diff --git sys/dev/pci/if_sis.c sys/dev/pci/if_sis.c
index 22d3a2056a5..081b33356f9 100644
--- sys/dev/pci/if_sis.c
+++ sys/dev/pci/if_sis.c
@@ -63,11 +63,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/timeout.h>
 
 #include <net/if.h>
diff --git sys/dev/pci/if_sk.c sys/dev/pci/if_sk.c
index dd8a69085f7..d79b9633ce8 100644
--- sys/dev/pci/if_sk.c
+++ sys/dev/pci/if_sk.c
@@ -93,8 +93,6 @@
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/timeout.h>
 #include <sys/device.h>
 #include <sys/queue.h>
diff --git sys/dev/pci/if_ste.c sys/dev/pci/if_ste.c
index fbbb82593f3..043b6f5c822 100644
--- sys/dev/pci/if_ste.c
+++ sys/dev/pci/if_ste.c
@@ -42,7 +42,6 @@
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
 #include <sys/timeout.h>
 
 #include <net/if.h>
@@ -60,7 +59,6 @@
 
 #include <sys/device.h>
 
-#include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 
 #include <dev/pci/pcireg.h>
diff --git sys/dev/pci/if_stge.c sys/dev/pci/if_stge.c
index 773bdd85c0c..1248a8092d3 100644
--- sys/dev/pci/if_stge.c
+++ sys/dev/pci/if_stge.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/pci/if_tht.c sys/dev/pci/if_tht.c
index 57e114057ba..fe22f4dac88 100644
--- sys/dev/pci/if_tht.c
+++ sys/dev/pci/if_tht.c
@@ -30,11 +30,9 @@
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
-#include <sys/timeout.h>
 #include <sys/queue.h>
 #include <sys/rwlock.h>
 #include <sys/time.h>
diff --git sys/dev/pci/if_ti_pci.c sys/dev/pci/if_ti_pci.c
index 05f6aa9b7fc..2cc50e734c7 100644
--- sys/dev/pci/if_ti_pci.c
+++ sys/dev/pci/if_ti_pci.c
@@ -73,7 +73,6 @@
 
 #include <sys/param.h>
 #include <sys/device.h>
-#include <sys/socket.h>
 #include <sys/systm.h>
 
 #include <net/if.h>
diff --git sys/dev/pci/if_tl.c sys/dev/pci/if_tl.c
index 895550ca3b7..ac27e692e0c 100644
--- sys/dev/pci/if_tl.c
+++ sys/dev/pci/if_tl.c
@@ -186,9 +186,6 @@
 #include <sys/systm.h>
 #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/pci/if_txp.c sys/dev/pci/if_txp.c
index a1fdd7e6960..9754db0593e 100644
--- sys/dev/pci/if_txp.c
+++ sys/dev/pci/if_txp.c
@@ -39,7 +39,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/pci/if_vge.c sys/dev/pci/if_vge.c
index f4d5cf204c0..b77d532caa0 100644
--- sys/dev/pci/if_vge.c
+++ sys/dev/pci/if_vge.c
@@ -89,11 +89,8 @@
 #include <sys/systm.h>
 #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 <net/if.h>
 #include <net/if_media.h>
diff --git sys/dev/pci/if_vic.c sys/dev/pci/if_vic.c
index 68198af6daa..ed8a97f216a 100644
--- sys/dev/pci/if_vic.c
+++ sys/dev/pci/if_vic.c
@@ -27,7 +27,6 @@
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/malloc.h>
 #include <sys/timeout.h>
diff --git sys/dev/pci/if_vr.c sys/dev/pci/if_vr.c
index 79e752901ca..3f87412ff6f 100644
--- sys/dev/pci/if_vr.c
+++ sys/dev/pci/if_vr.c
@@ -68,9 +68,7 @@
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
 #include <sys/timeout.h>
-#include <sys/socket.h>
 
 #include <net/if.h>
 #include <sys/device.h>
diff --git sys/dev/pci/if_vte.c sys/dev/pci/if_vte.c
index 73c255598f2..e3e079440cb 100644
--- sys/dev/pci/if_vte.c
+++ sys/dev/pci/if_vte.c
@@ -36,10 +36,8 @@
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/queue.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/timeout.h>
-#include <sys/socket.h>
 
 #include <machine/bus.h>
 
@@ -54,10 +52,8 @@
 #include <net/bpf.h>
 #endif
 
-#include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 
-#include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 
diff --git sys/dev/pci/if_wb.c sys/dev/pci/if_wb.c
index 3fbb0f927f4..51cfb32c354 100644
--- sys/dev/pci/if_wb.c
+++ sys/dev/pci/if_wb.c
@@ -91,9 +91,6 @@
 #include <sys/systm.h>
 #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>
 #include <sys/timeout.h>
@@ -112,7 +109,6 @@
 #include <uvm/uvm_extern.h>		/* for vtophys */
 #define	VTOPHYS(v)	vtophys((vaddr_t)(v))
 
-#include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
diff --git sys/dev/pci/if_wi_pci.c sys/dev/pci/if_wi_pci.c
index 85f9f91a858..0db785790a7 100644
--- sys/dev/pci/if_wi_pci.c
+++ sys/dev/pci/if_wi_pci.c
@@ -44,8 +44,6 @@
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/timeout.h>
-#include <sys/socket.h>
-#include <sys/tree.h>
 
 #include <net/if.h>
 #include <net/if_media.h>
diff --git sys/dev/pci/if_wpi.c sys/dev/pci/if_wpi.c
index 30dcc8a1a29..c9d02976c78 100644
--- sys/dev/pci/if_wpi.c
+++ sys/dev/pci/if_wpi.c
@@ -26,12 +26,9 @@
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
 #include <sys/rwlock.h>
-#include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
-#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/task.h>
 #include <sys/endian.h>
diff --git sys/dev/pci/if_xge.c sys/dev/pci/if_xge.c
index 67c4f4ac44b..0a4d81e33fe 100644
--- sys/dev/pci/if_xge.c
+++ sys/dev/pci/if_xge.c
@@ -46,9 +46,6 @@
 #include <sys/systm.h>
 #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/endian.h>
 
@@ -69,8 +66,6 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcidevs.h>
 
-#include <sys/lock.h>
-
 #include <dev/pci/if_xgereg.h>
 
 /* Xframe chipset revisions */
diff --git sys/dev/pci/if_xl_pci.c sys/dev/pci/if_xl_pci.c
index 963e1984c34..984c364948d 100644
--- sys/dev/pci/if_xl_pci.c
+++ sys/dev/pci/if_xl_pci.c
@@ -34,16 +34,8 @@
  * $FreeBSD: if_xl.c,v 1.72 2000/01/09 21:12:59 wpaul Exp $
  */
 
-#include "bpfilter.h"
-
 #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>
@@ -57,10 +49,6 @@
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 
-#if NBPFILTER > 0
-#include <net/bpf.h>
-#endif
-
 /*
  * The following #define causes the code to use PIO to access the
  * chip's registers instead of memory mapped mode. The reason PIO mode
diff --git sys/dev/pci/igc_base.c sys/dev/pci/igc_base.c
index fc441e942f9..2ef998e7b7e 100644
--- sys/dev/pci/igc_base.c
+++ sys/dev/pci/igc_base.c
@@ -6,7 +6,6 @@
  */
 
 #include <dev/pci/igc_hw.h>
-#include <dev/pci/igc_i225.h>
 #include <dev/pci/if_igc.h>
 #include <dev/pci/igc_mac.h>
 #include <dev/pci/igc_base.h>
diff --git sys/dev/pci/iosf_pci.c sys/dev/pci/iosf_pci.c
index 886a39c6071..bd97cc6ffe3 100644
--- sys/dev/pci/iosf_pci.c
+++ sys/dev/pci/iosf_pci.c
@@ -19,8 +19,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <sys/mutex.h>
-#include <sys/rwlock.h>
 
 #include <machine/bus.h>
 
diff --git sys/dev/pci/ips.c sys/dev/pci/ips.c
index afbd0e1849f..f093c8a1d7d 100644
--- sys/dev/pci/ips.c
+++ sys/dev/pci/ips.c
@@ -26,7 +26,6 @@
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/sensors.h>
 #include <sys/timeout.h>
diff --git sys/dev/pci/ixgb_ee.c sys/dev/pci/ixgb_ee.c
index cde1ec402fd..fe58047f809 100644
--- sys/dev/pci/ixgb_ee.c
+++ sys/dev/pci/ixgb_ee.c
@@ -35,12 +35,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/sockio.h>
-#include <sys/mbuf.h>
-#include <sys/malloc.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
-#include <sys/socket.h>
 
 #include <net/if.h>
 #include <net/if_media.h>
diff --git sys/dev/pci/ixgb_hw.c sys/dev/pci/ixgb_hw.c
index 2f9a5ca9b6f..28954596c7d 100644
--- sys/dev/pci/ixgb_hw.c
+++ sys/dev/pci/ixgb_hw.c
@@ -39,12 +39,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/sockio.h>
-#include <sys/mbuf.h>
-#include <sys/malloc.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
-#include <sys/socket.h>
 
 #include <net/if.h>
 #include <net/if_media.h>
diff --git sys/dev/pci/jmb.c sys/dev/pci/jmb.c
index b75f9250c13..61b5d02ef52 100644
--- sys/dev/pci/jmb.c
+++ sys/dev/pci/jmb.c
@@ -18,11 +18,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/queue.h>
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
diff --git sys/dev/pci/maestro.c sys/dev/pci/maestro.c
index f75e75ded5e..3557eff0758 100644
--- sys/dev/pci/maestro.c
+++ sys/dev/pci/maestro.c
@@ -48,7 +48,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/queue.h>
diff --git sys/dev/pci/mbg.c sys/dev/pci/mbg.c
index b525cc9eff4..769d94c8c99 100644
--- sys/dev/pci/mbg.c
+++ sys/dev/pci/mbg.c
@@ -18,11 +18,9 @@
 
 #include <sys/param.h>
 #include <sys/device.h>
-#include <sys/kernel.h>
 #include <sys/timeout.h>
 #include <sys/systm.h>
 #include <sys/sensors.h>
-#include <sys/syslog.h>
 #include <sys/time.h>
 
 #include <machine/bus.h>
diff --git sys/dev/pci/mfi_pci.c sys/dev/pci/mfi_pci.c
index 18ea6f5e77b..48e7e6e3f96 100644
--- sys/dev/pci/mfi_pci.c
+++ sys/dev/pci/mfi_pci.c
@@ -15,12 +15,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "bio.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/rwlock.h>
 #include <sys/sensors.h>
diff --git sys/dev/pci/mfii.c sys/dev/pci/mfii.c
index a12c33f6732..702530f319a 100644
--- sys/dev/pci/mfii.c
+++ sys/dev/pci/mfii.c
@@ -28,7 +28,6 @@
 #include <sys/atomic.h>
 #include <sys/sensors.h>
 #include <sys/rwlock.h>
-#include <sys/syslog.h>
 #include <sys/smr.h>
 
 #include <dev/biovar.h>
diff --git sys/dev/pci/mmuagp.c sys/dev/pci/mmuagp.c
index 26db845681d..88c21d49585 100644
--- sys/dev/pci/mmuagp.c
+++ sys/dev/pci/mmuagp.c
@@ -26,9 +26,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/device.h>
-#include <sys/rwlock.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
diff --git sys/dev/pci/mpi_pci.c sys/dev/pci/mpi_pci.c
index b44a46e7537..8a95f306011 100644
--- sys/dev/pci/mpi_pci.c
+++ sys/dev/pci/mpi_pci.c
@@ -17,12 +17,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "bio.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/sensors.h>
 #include <sys/rwlock.h>
diff --git sys/dev/pci/mpii.c sys/dev/pci/mpii.c
index 36a74fc5f2a..91a65e2c68d 100644
--- sys/dev/pci/mpii.c
+++ sys/dev/pci/mpii.c
@@ -23,13 +23,9 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <sys/ioctl.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
-#include <sys/rwlock.h>
 #include <sys/sensors.h>
 #include <sys/dkio.h>
-#include <sys/tree.h>
 #include <sys/task.h>
 
 #include <machine/bus.h>
diff --git sys/dev/pci/neo.c sys/dev/pci/neo.c
index fe77bc96d05..64a7f6a0487 100644
--- sys/dev/pci/neo.c
+++ sys/dev/pci/neo.c
@@ -34,8 +34,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/device.h>
 
 #include <dev/pci/pcidevs.h>
diff --git sys/dev/pci/nvme_pci.c sys/dev/pci/nvme_pci.c
index 3dfdf955a3c..a0088d902a1 100644
--- sys/dev/pci/nvme_pci.c
+++ sys/dev/pci/nvme_pci.c
@@ -18,14 +18,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/timeout.h>
 #include <sys/queue.h>
 #include <sys/mutex.h>
-#include <sys/pool.h>
 
 #include <machine/bus.h>
 
diff --git sys/dev/pci/ohci_pci.c sys/dev/pci/ohci_pci.c
index d132b45ae78..43e9d36f88b 100644
--- sys/dev/pci/ohci_pci.c
+++ sys/dev/pci/ohci_pci.c
@@ -40,7 +40,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/timeout.h>
 #include <sys/queue.h>
@@ -52,7 +51,6 @@
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdivar.h>
-#include <dev/usb/usb_mem.h>
 
 #include <dev/usb/ohcireg.h>
 #include <dev/usb/ohcivar.h>
diff --git sys/dev/pci/pccbb.c sys/dev/pci/pccbb.c
index 8d20757e607..c718721079a 100644
--- sys/dev/pci/pccbb.c
+++ sys/dev/pci/pccbb.c
@@ -40,10 +40,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/evcount.h>
-#include <sys/ioctl.h>
-#include <sys/syslog.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/task.h>
diff --git sys/dev/pci/pcscp.c sys/dev/pci/pcscp.c
index f1e862802ae..815e82f8449 100644
--- sys/dev/pci/pcscp.c
+++ sys/dev/pci/pcscp.c
@@ -42,7 +42,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <sys/buf.h>
 
 #include <machine/bus.h>
 
diff --git sys/dev/pci/piixpm.c sys/dev/pci/piixpm.c
index fa58f748c41..358ded24f11 100644
--- sys/dev/pci/piixpm.c
+++ sys/dev/pci/piixpm.c
@@ -23,7 +23,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <sys/kernel.h>
 #include <sys/rwlock.h>
 
 #include <machine/bus.h>
diff --git sys/dev/pci/pwdog.c sys/dev/pci/pwdog.c
index 12e30bbf36e..c1d091e94ed 100644
--- sys/dev/pci/pwdog.c
+++ sys/dev/pci/pwdog.c
@@ -18,7 +18,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/pci/qla_pci.c sys/dev/pci/qla_pci.c
index 4102f6c97c3..9798beb5ab7 100644
--- sys/dev/pci/qla_pci.c
+++ sys/dev/pci/qla_pci.c
@@ -17,15 +17,9 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "bio.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/device.h>
-#include <sys/sensors.h>
-#include <sys/rwlock.h>
 
 #include <machine/bus.h>
 
diff --git sys/dev/pci/qle.c sys/dev/pci/qle.c
index ced20f8948d..5d85b95c73a 100644
--- sys/dev/pci/qle.c
+++ sys/dev/pci/qle.c
@@ -16,15 +16,11 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "bio.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/atomic.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
-#include <sys/sensors.h>
-#include <sys/rwlock.h>
 #include <sys/task.h>
 #include <sys/timeout.h>
 
@@ -34,10 +30,6 @@
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 
-#ifdef __sparc64__
-#include <dev/ofw/openfirm.h>
-#endif
-
 #include <scsi/scsi_all.h>
 #include <scsi/scsiconf.h>
 
diff --git sys/dev/pci/qlw_pci.c sys/dev/pci/qlw_pci.c
index e1e4c5564f4..788bdca28a3 100644
--- sys/dev/pci/qlw_pci.c
+++ sys/dev/pci/qlw_pci.c
@@ -18,15 +18,9 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "bio.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/device.h>
-#include <sys/sensors.h>
-#include <sys/rwlock.h>
 
 #include <machine/bus.h>
 
diff --git sys/dev/pci/sili_pci.c sys/dev/pci/sili_pci.c
index ac4eb61b89f..c7d657ead2b 100644
--- sys/dev/pci/sili_pci.c
+++ sys/dev/pci/sili_pci.c
@@ -18,8 +18,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/timeout.h>
 
diff --git sys/dev/pci/siop_pci.c sys/dev/pci/siop_pci.c
index e3bae243be2..a61eccdb7ab 100644
--- sys/dev/pci/siop_pci.c
+++ sys/dev/pci/siop_pci.c
@@ -30,7 +30,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <sys/kernel.h>
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
diff --git sys/dev/pci/siop_pci_common.c sys/dev/pci/siop_pci_common.c
index bd5c8a621de..fd2f4588fd6 100644
--- sys/dev/pci/siop_pci_common.c
+++ sys/dev/pci/siop_pci_common.c
@@ -30,10 +30,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/endian.h>
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
diff --git sys/dev/pci/sv.c sys/dev/pci/sv.c
index 841738c45be..007abb57d39 100644
--- sys/dev/pci/sv.c
+++ sys/dev/pci/sv.c
@@ -38,7 +38,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
 
diff --git sys/dev/pci/twe_pci.c sys/dev/pci/twe_pci.c
index 01f3f021944..5eea3f1a533 100644
--- sys/dev/pci/twe_pci.c
+++ sys/dev/pci/twe_pci.c
@@ -28,8 +28,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/device.h>
 
 #include <dev/pci/pcidevs.h>
diff --git sys/dev/pci/uhci_pci.c sys/dev/pci/uhci_pci.c
index 1142f302255..2f0a3e2aaa8 100644
--- sys/dev/pci/uhci_pci.c
+++ sys/dev/pci/uhci_pci.c
@@ -33,7 +33,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/timeout.h>
 #include <sys/queue.h>
@@ -45,7 +44,6 @@
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdivar.h>
-#include <dev/usb/usb_mem.h>
 
 #include <dev/usb/uhcireg.h>
 #include <dev/usb/uhcivar.h>
diff --git sys/dev/pci/vga_pci.c sys/dev/pci/vga_pci.c
index 1e55723a5ab..f60af87a05e 100644
--- sys/dev/pci/vga_pci.c
+++ sys/dev/pci/vga_pci.c
@@ -69,10 +69,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
-#include <sys/rwlock.h>
 
 #include <machine/bus.h>
 
diff --git sys/dev/pci/vga_pci_common.c sys/dev/pci/vga_pci_common.c
index 094846a906d..ef3f043380f 100644
--- sys/dev/pci/vga_pci_common.c
+++ sys/dev/pci/vga_pci_common.c
@@ -21,7 +21,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 
 #include <machine/bus.h>
 
diff --git sys/dev/pci/viapm.c sys/dev/pci/viapm.c
index 2fc8f92cf55..e93bb79ab2a 100644
--- sys/dev/pci/viapm.c
+++ sys/dev/pci/viapm.c
@@ -60,7 +60,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <sys/kernel.h>
 #include <sys/rwlock.h>
 #include <sys/sensors.h>
 #include <sys/timeout.h>
diff --git sys/dev/pci/vmwpvs.c sys/dev/pci/vmwpvs.c
index 7a6efd294e3..9ec62ae7bd8 100644
--- sys/dev/pci/vmwpvs.c
+++ sys/dev/pci/vmwpvs.c
@@ -19,11 +19,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <sys/ioctl.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
-#include <sys/rwlock.h>
-#include <sys/dkio.h>
 #include <sys/task.h>
 
 #include <machine/bus.h>
diff --git sys/dev/pci/wdt.c sys/dev/pci/wdt.c
index c785979fcce..0451df5be20 100644
--- sys/dev/pci/wdt.c
+++ sys/dev/pci/wdt.c
@@ -29,7 +29,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/pci/xhci_pci.c sys/dev/pci/xhci_pci.c
index ca1a0b3431b..a642dfaa850 100644
--- sys/dev/pci/xhci_pci.c
+++ sys/dev/pci/xhci_pci.c
@@ -31,11 +31,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/rwlock.h>
 #include <sys/device.h>
-#include <sys/timeout.h>
-#include <sys/queue.h>
 
 #include <machine/bus.h>
 
@@ -45,7 +42,6 @@
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdivar.h>
-#include <dev/usb/usb_mem.h>
 
 #include <dev/usb/xhcireg.h>
 #include <dev/usb/xhcivar.h>
diff --git sys/dev/pci/yds.c sys/dev/pci/yds.c
index 666f3b465ef..b2cc77de4e2 100644
--- sys/dev/pci/yds.c
+++ sys/dev/pci/yds.c
@@ -41,11 +41,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/fcntl.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
-#include <sys/queue.h>
 
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pcireg.h>
@@ -53,7 +50,6 @@
 
 #include <sys/audioio.h>
 #include <dev/audio_if.h>
-#include <dev/midi_if.h>
 #include <dev/ic/ac97.h>
 
 #include <machine/bus.h>