aboutsummaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/aac/aac.c1
-rw-r--r--sys/dev/aac/aac_pci.c1
-rw-r--r--sys/dev/acpica/Osd/OsdHardware.c1
-rw-r--r--sys/dev/acpica/acpi_package.c1
-rw-r--r--sys/dev/acpica/acpi_perf.c1
-rw-r--r--sys/dev/advansys/adv_eisa.c1
-rw-r--r--sys/dev/advansys/adv_isa.c1
-rw-r--r--sys/dev/advansys/adv_pci.c1
-rw-r--r--sys/dev/advansys/advansys.c1
-rw-r--r--sys/dev/advansys/advlib.c1
-rw-r--r--sys/dev/advansys/adw_pci.c1
-rw-r--r--sys/dev/advansys/adwcam.c2
-rw-r--r--sys/dev/advansys/adwlib.c2
-rw-r--r--sys/dev/aha/aha.c1
-rw-r--r--sys/dev/aha/aha_isa.c1
-rw-r--r--sys/dev/ahb/ahb.c1
-rw-r--r--sys/dev/aic/aic.c1
-rw-r--r--sys/dev/aic/aic_isa.c1
-rw-r--r--sys/dev/aic/aic_pccard.c1
-rw-r--r--sys/dev/aic7xxx/aic79xx_osm.h2
-rw-r--r--sys/dev/aic7xxx/aic7xxx_osm.h2
-rw-r--r--sys/dev/amd/amd.c1
-rw-r--r--sys/dev/amr/amr.c2
-rw-r--r--sys/dev/amr/amr_pci.c2
-rw-r--r--sys/dev/ar/if_ar.c2
-rw-r--r--sys/dev/ar/if_ar_isa.c2
-rw-r--r--sys/dev/ar/if_ar_pci.c2
-rw-r--r--sys/dev/arcmsr/arcmsr.c1
-rw-r--r--sys/dev/atkbdc/atkbdc.c1
-rw-r--r--sys/dev/atkbdc/atkbdc_isa.c2
-rw-r--r--sys/dev/atkbdc/atkbdc_subr.c2
-rw-r--r--sys/dev/awi/am79c930.c4
-rw-r--r--sys/dev/bfe/if_bfe.c1
-rw-r--r--sys/dev/bge/if_bge.c1
-rw-r--r--sys/dev/bktr/bktr_audio.c1
-rw-r--r--sys/dev/bktr/bktr_card.c1
-rw-r--r--sys/dev/bktr/bktr_core.c1
-rw-r--r--sys/dev/bktr/bktr_i2c.c1
-rw-r--r--sys/dev/bktr/bktr_os.c1
-rw-r--r--sys/dev/bktr/bktr_tuner.c1
-rw-r--r--sys/dev/buslogic/bt.c8
-rw-r--r--sys/dev/buslogic/bt_eisa.c1
-rw-r--r--sys/dev/buslogic/bt_isa.c1
-rw-r--r--sys/dev/buslogic/bt_pci.c2
-rw-r--r--sys/dev/ciss/ciss.c1
-rw-r--r--sys/dev/cnw/if_cnw.c1
-rw-r--r--sys/dev/dc/dcphy.c2
-rw-r--r--sys/dev/dc/if_dc.c2
-rw-r--r--sys/dev/dc/pnphy.c2
-rw-r--r--sys/dev/dpt/dpt_eisa.c1
-rw-r--r--sys/dev/dpt/dpt_isa.c1
-rw-r--r--sys/dev/dpt/dpt_pci.c2
-rw-r--r--sys/dev/dpt/dpt_scsi.c2
-rw-r--r--sys/dev/fb/boot_font.c1
-rw-r--r--sys/dev/fb/gfb.c1
-rw-r--r--sys/dev/fb/s3_pci.c2
-rw-r--r--sys/dev/fb/tga.c1
-rw-r--r--sys/dev/gfb/gfb_pci.c1
-rw-r--r--sys/dev/hfa/hfa_freebsd.c1
-rw-r--r--sys/dev/hfa/hfa_pci.c1
-rw-r--r--sys/dev/hptmv/osbsd.h1
-rw-r--r--sys/dev/ida/ida.c2
-rw-r--r--sys/dev/ida/ida_disk.c2
-rw-r--r--sys/dev/ida/ida_eisa.c1
-rw-r--r--sys/dev/ida/ida_pci.c2
-rw-r--r--sys/dev/idt/idt_harp.c1
-rw-r--r--sys/dev/idt/idt_pci.c1
-rw-r--r--sys/dev/ie/if_ie.c1
-rw-r--r--sys/dev/ie/if_ie_isa.c1
-rw-r--r--sys/dev/if_ndis/if_ndis.c2
-rw-r--r--sys/dev/iir/iir.c2
-rw-r--r--sys/dev/iir/iir_pci.c2
-rw-r--r--sys/dev/ips/ips.h1
-rw-r--r--sys/dev/ips/ips_disk.h1
-rw-r--r--sys/dev/isp/isp_freebsd.h2
-rw-r--r--sys/dev/isp/isp_pci.c2
-rw-r--r--sys/dev/kbd/atkbdc.c1
-rw-r--r--sys/dev/lge/if_lge.c2
-rw-r--r--sys/dev/mcd/mcd.c1
-rw-r--r--sys/dev/mcd/mcd_isa.c1
-rw-r--r--sys/dev/mii/dcphy.c2
-rw-r--r--sys/dev/mii/pnphy.c2
-rw-r--r--sys/dev/mlx/mlx.c2
-rw-r--r--sys/dev/mlx/mlx_pci.c2
-rw-r--r--sys/dev/mly/mly.c1
-rw-r--r--sys/dev/mpt/mpt_freebsd.h2
-rw-r--r--sys/dev/mpt/mpt_pci.c2
-rw-r--r--sys/dev/my/if_my.c2
-rw-r--r--sys/dev/ncv/ncr53c500.c1
-rw-r--r--sys/dev/ncv/ncr53c500_pccard.c1
-rw-r--r--sys/dev/nge/if_nge.c2
-rw-r--r--sys/dev/nsp/nsp.c2
-rw-r--r--sys/dev/nve/if_nve.c1
-rw-r--r--sys/dev/pbio/pbio.c1
-rw-r--r--sys/dev/pdq/if_fpa.c2
-rw-r--r--sys/dev/pdq/pdq_freebsd.h2
-rw-r--r--sys/dev/pdq/pdq_ifsubr.c2
-rw-r--r--sys/dev/re/if_re.c2
-rw-r--r--sys/dev/scd/scd.c1
-rw-r--r--sys/dev/scd/scd_isa.c1
-rw-r--r--sys/dev/sf/if_sf.c2
-rw-r--r--sys/dev/sio/sio.c1
-rw-r--r--sys/dev/sio/sio_isa.c1
-rw-r--r--sys/dev/sio/sio_pccard.c1
-rw-r--r--sys/dev/sio/sio_pci.c1
-rw-r--r--sys/dev/sio/sio_puc.c1
-rw-r--r--sys/dev/sk/if_sk.c2
-rw-r--r--sys/dev/sr/if_sr.c2
-rw-r--r--sys/dev/sr/if_sr_isa.c2
-rw-r--r--sys/dev/sr/if_sr_pci.c2
-rw-r--r--sys/dev/stg/tmc18c30.c1
-rw-r--r--sys/dev/stg/tmc18c30_isa.c1
-rw-r--r--sys/dev/stg/tmc18c30_pccard.c1
-rw-r--r--sys/dev/stg/tmc18c30_pci.c1
-rw-r--r--sys/dev/stg/tmc18c30_subr.c2
-rw-r--r--sys/dev/sym/sym_hipd.c10
-rw-r--r--sys/dev/tga/tga_pci.c1
-rw-r--r--sys/dev/ti/if_ti.c1
-rw-r--r--sys/dev/trm/trm.c1
-rw-r--r--sys/dev/twe/twe_compat.h1
-rw-r--r--sys/dev/tx/if_tx.c2
-rw-r--r--sys/dev/txp/if_txp.c2
-rw-r--r--sys/dev/usb/ehci.c2
-rw-r--r--sys/dev/usb/ohci.c2
-rw-r--r--sys/dev/usb/uhci.c1
-rw-r--r--sys/dev/vge/if_vge.c2
-rw-r--r--sys/dev/vr/if_vr.c2
-rw-r--r--sys/dev/vx/if_vx.c1
-rw-r--r--sys/dev/vx/if_vx_pci.c1
129 files changed, 0 insertions, 200 deletions
diff --git a/sys/dev/aac/aac.c b/sys/dev/aac/aac.c
index 466c290f42b91..ea71528fe9dcb 100644
--- a/sys/dev/aac/aac.c
+++ b/sys/dev/aac/aac.c
@@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$");
#include <sys/time.h>
#include <sys/eventhandler.h>
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <sys/bus_dma.h>
#include <machine/resource.h>
diff --git a/sys/dev/aac/aac_pci.c b/sys/dev/aac/aac_pci.c
index b57756fc582b1..15c4416a16477 100644
--- a/sys/dev/aac/aac_pci.c
+++ b/sys/dev/aac/aac_pci.c
@@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
#include <sys/conf.h>
#include <sys/disk.h>
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/acpica/Osd/OsdHardware.c b/sys/dev/acpica/Osd/OsdHardware.c
index e8f933d5af23f..e239325fa5cfc 100644
--- a/sys/dev/acpica/Osd/OsdHardware.c
+++ b/sys/dev/acpica/Osd/OsdHardware.c
@@ -33,7 +33,6 @@
#include "acpi.h"
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/pci_cfgreg.h>
#include <dev/pci/pcireg.h>
diff --git a/sys/dev/acpica/acpi_package.c b/sys/dev/acpica/acpi_package.c
index 0cad9a01fa9c2..78c1759cac5dc 100644
--- a/sys/dev/acpica/acpi_package.c
+++ b/sys/dev/acpica/acpi_package.c
@@ -31,7 +31,6 @@
#include <sys/bus.h>
#include <sys/sbuf.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/acpica/acpi_perf.c b/sys/dev/acpica/acpi_perf.c
index 19a12d92502dd..22b11bb8ece6d 100644
--- a/sys/dev/acpica/acpi_perf.c
+++ b/sys/dev/acpica/acpi_perf.c
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
#include <sys/sbuf.h>
#include <sys/pcpu.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/advansys/adv_eisa.c b/sys/dev/advansys/adv_eisa.c
index e56cf29653f0c..6d6fa70ca29c7 100644
--- a/sys/dev/advansys/adv_eisa.c
+++ b/sys/dev/advansys/adv_eisa.c
@@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$");
#include <sys/mutex.h>
#include <sys/bus.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/advansys/adv_isa.c b/sys/dev/advansys/adv_isa.c
index 8a3a0790843b6..e0b7c1591bacc 100644
--- a/sys/dev/advansys/adv_isa.c
+++ b/sys/dev/advansys/adv_isa.c
@@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$");
#include <sys/lock.h>
#include <sys/mutex.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/bus.h>
diff --git a/sys/dev/advansys/adv_pci.c b/sys/dev/advansys/adv_pci.c
index 909a85c20ed8a..455e2044555b4 100644
--- a/sys/dev/advansys/adv_pci.c
+++ b/sys/dev/advansys/adv_pci.c
@@ -68,7 +68,6 @@ __FBSDID("$FreeBSD$");
#include <sys/module.h>
#include <sys/mutex.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/bus.h>
diff --git a/sys/dev/advansys/advansys.c b/sys/dev/advansys/advansys.c
index 7b9cfb1e3fb84..aa6541dfa995e 100644
--- a/sys/dev/advansys/advansys.c
+++ b/sys/dev/advansys/advansys.c
@@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$");
#include <sys/lock.h>
#include <sys/mutex.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/bus.h>
diff --git a/sys/dev/advansys/advlib.c b/sys/dev/advansys/advlib.c
index 4604571da52fa..e89829f962e33 100644
--- a/sys/dev/advansys/advlib.c
+++ b/sys/dev/advansys/advlib.c
@@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/systm.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/bus.h>
diff --git a/sys/dev/advansys/adw_pci.c b/sys/dev/advansys/adw_pci.c
index 2e5e2e76637ab..4d40ae3eb7ccf 100644
--- a/sys/dev/advansys/adw_pci.c
+++ b/sys/dev/advansys/adw_pci.c
@@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$");
#include <sys/mutex.h>
#include <sys/bus.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
diff --git a/sys/dev/advansys/adwcam.c b/sys/dev/advansys/adwcam.c
index c6c14fd99cc08..3b9ce175eb864 100644
--- a/sys/dev/advansys/adwcam.c
+++ b/sys/dev/advansys/adwcam.c
@@ -54,8 +54,6 @@ __FBSDID("$FreeBSD$");
#include <sys/mutex.h>
#include <sys/bus.h>
-#include <machine/bus_pio.h>
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <machine/resource.h>
diff --git a/sys/dev/advansys/adwlib.c b/sys/dev/advansys/adwlib.c
index 518d76bc367d0..b926bba2c159e 100644
--- a/sys/dev/advansys/adwlib.c
+++ b/sys/dev/advansys/adwlib.c
@@ -49,8 +49,6 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/bus.h>
-#include <machine/bus_pio.h>
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <cam/cam.h>
diff --git a/sys/dev/aha/aha.c b/sys/dev/aha/aha.c
index 4300dbac7b268..b828a9daf84c4 100644
--- a/sys/dev/aha/aha.c
+++ b/sys/dev/aha/aha.c
@@ -68,7 +68,6 @@ __FBSDID("$FreeBSD$");
#include <sys/lock.h>
#include <sys/mutex.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <cam/cam.h>
diff --git a/sys/dev/aha/aha_isa.c b/sys/dev/aha/aha_isa.c
index 177b5cd4c1f8b..8805a60c6bc65 100644
--- a/sys/dev/aha/aha_isa.c
+++ b/sys/dev/aha/aha_isa.c
@@ -63,7 +63,6 @@ __FBSDID("$FreeBSD$");
#include <sys/lock.h>
#include <sys/mutex.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/module.h>
diff --git a/sys/dev/ahb/ahb.c b/sys/dev/ahb/ahb.c
index 4d7249c5aaa6a..cafcd1a765e79 100644
--- a/sys/dev/ahb/ahb.c
+++ b/sys/dev/ahb/ahb.c
@@ -37,7 +37,6 @@
#include <sys/mutex.h>
#include <sys/bus.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/aic/aic.c b/sys/dev/aic/aic.c
index 31f4283cb2bc5..b09d3e82bc073 100644
--- a/sys/dev/aic/aic.c
+++ b/sys/dev/aic/aic.c
@@ -32,7 +32,6 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/bus.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <cam/cam.h>
diff --git a/sys/dev/aic/aic_isa.c b/sys/dev/aic/aic_isa.c
index 0fd2125d07a62..71736f21d6671 100644
--- a/sys/dev/aic/aic_isa.c
+++ b/sys/dev/aic/aic_isa.c
@@ -32,7 +32,6 @@ __FBSDID("$FreeBSD$");
#include <sys/module.h>
#include <sys/bus.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/aic/aic_pccard.c b/sys/dev/aic/aic_pccard.c
index 55831508a9664..04e92ab0be1be 100644
--- a/sys/dev/aic/aic_pccard.c
+++ b/sys/dev/aic/aic_pccard.c
@@ -32,7 +32,6 @@ __FBSDID("$FreeBSD$");
#include <sys/module.h>
#include <sys/bus.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/aic7xxx/aic79xx_osm.h b/sys/dev/aic7xxx/aic79xx_osm.h
index c6f36f1d87000..66153321a06e1 100644
--- a/sys/dev/aic7xxx/aic79xx_osm.h
+++ b/sys/dev/aic7xxx/aic79xx_osm.h
@@ -53,8 +53,6 @@
#include <sys/queue.h>
#define AIC_PCI_CONFIG 1
-#include <machine/bus_memio.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/endian.h>
#include <machine/clock.h>
diff --git a/sys/dev/aic7xxx/aic7xxx_osm.h b/sys/dev/aic7xxx/aic7xxx_osm.h
index 07752a3b5bc44..159f9f9c31bab 100644
--- a/sys/dev/aic7xxx/aic7xxx_osm.h
+++ b/sys/dev/aic7xxx/aic7xxx_osm.h
@@ -59,9 +59,7 @@
#if NPCI > 0
#define AIC_PCI_CONFIG 1
-#include <machine/bus_memio.h>
#endif
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/endian.h>
#include <machine/clock.h>
diff --git a/sys/dev/amd/amd.c b/sys/dev/amd/amd.c
index b1b615ceeaf69..a91bd68487c4c 100644
--- a/sys/dev/amd/amd.c
+++ b/sys/dev/amd/amd.c
@@ -62,7 +62,6 @@
#include <vm/vm.h>
#include <vm/pmap.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/bus.h>
diff --git a/sys/dev/amr/amr.c b/sys/dev/amr/amr.c
index a20a580b09607..e6fa569214bd7 100644
--- a/sys/dev/amr/amr.c
+++ b/sys/dev/amr/amr.c
@@ -72,8 +72,6 @@ __FBSDID("$FreeBSD$");
#include <sys/conf.h>
#include <sys/stat.h>
-#include <machine/bus_memio.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/amr/amr_pci.c b/sys/dev/amr/amr_pci.c
index 6fab69855b8ae..0fdfd8c82b750 100644
--- a/sys/dev/amr/amr_pci.c
+++ b/sys/dev/amr/amr_pci.c
@@ -66,8 +66,6 @@ __FBSDID("$FreeBSD$");
#include <sys/bus.h>
#include <sys/conf.h>
-#include <machine/bus_memio.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c
index a459d92673746..70741c0a085d5 100644
--- a/sys/dev/ar/if_ar.c
+++ b/sys/dev/ar/if_ar.c
@@ -58,8 +58,6 @@ __FBSDID("$FreeBSD$");
#include <sys/bus.h>
#include <machine/bus.h>
#include <machine/resource.h>
-#include <machine/bus_pio.h>
-#include <machine/bus_memio.h>
#include <sys/rman.h>
#include <net/if.h>
diff --git a/sys/dev/ar/if_ar_isa.c b/sys/dev/ar/if_ar_isa.c
index 81c001f35e8a6..afe36153d0d37 100644
--- a/sys/dev/ar/if_ar_isa.c
+++ b/sys/dev/ar/if_ar_isa.c
@@ -52,8 +52,6 @@ __FBSDID("$FreeBSD$");
#include <sys/bus.h>
#include <machine/bus.h>
#include <machine/resource.h>
-#include <machine/bus_pio.h>
-#include <machine/bus_memio.h>
#include <sys/rman.h>
#include <isa/isavar.h>
diff --git a/sys/dev/ar/if_ar_pci.c b/sys/dev/ar/if_ar_pci.c
index 9b88c7c0bf5bd..3715c8b8ee333 100644
--- a/sys/dev/ar/if_ar_pci.c
+++ b/sys/dev/ar/if_ar_pci.c
@@ -38,8 +38,6 @@ __FBSDID("$FreeBSD$");
#include <sys/bus.h>
#include <machine/bus.h>
#include <machine/resource.h>
-#include <machine/bus_pio.h>
-#include <machine/bus_memio.h>
#include <sys/rman.h>
#include <dev/pci/pcireg.h>
diff --git a/sys/dev/arcmsr/arcmsr.c b/sys/dev/arcmsr/arcmsr.c
index e94e9887c676c..b7d985175accf 100644
--- a/sys/dev/arcmsr/arcmsr.c
+++ b/sys/dev/arcmsr/arcmsr.c
@@ -67,7 +67,6 @@
#include <isa/rtc.h>
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <machine/clock.h>
#include <machine/resource.h>
diff --git a/sys/dev/atkbdc/atkbdc.c b/sys/dev/atkbdc/atkbdc.c
index 7fc2325c0dd40..c0cee013e6c15 100644
--- a/sys/dev/atkbdc/atkbdc.c
+++ b/sys/dev/atkbdc/atkbdc.c
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
#include <sys/bus.h>
#include <sys/malloc.h>
#include <sys/syslog.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/atkbdc/atkbdc_isa.c b/sys/dev/atkbdc/atkbdc_isa.c
index d0476a315d448..5f1408c8ddb9a 100644
--- a/sys/dev/atkbdc/atkbdc_isa.c
+++ b/sys/dev/atkbdc/atkbdc_isa.c
@@ -35,8 +35,6 @@ __FBSDID("$FreeBSD$");
#include <sys/module.h>
#include <sys/bus.h>
#include <sys/malloc.h>
-#include <machine/bus_pio.h>
-#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/atkbdc/atkbdc_subr.c b/sys/dev/atkbdc/atkbdc_subr.c
index d0476a315d448..5f1408c8ddb9a 100644
--- a/sys/dev/atkbdc/atkbdc_subr.c
+++ b/sys/dev/atkbdc/atkbdc_subr.c
@@ -35,8 +35,6 @@ __FBSDID("$FreeBSD$");
#include <sys/module.h>
#include <sys/bus.h>
#include <sys/malloc.h>
-#include <machine/bus_pio.h>
-#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/awi/am79c930.c b/sys/dev/awi/am79c930.c
index 90f85c0b1acf6..a2eddd4bd7680 100644
--- a/sys/dev/awi/am79c930.c
+++ b/sys/dev/awi/am79c930.c
@@ -76,10 +76,6 @@ __FBSDID("$FreeBSD$");
#endif
#include <machine/cpu.h>
-#ifdef __FreeBSD__
-#include <machine/bus_pio.h>
-#include <machine/bus_memio.h>
-#endif
#include <machine/bus.h>
#ifdef __NetBSD__
#include <machine/intr.h>
diff --git a/sys/dev/bfe/if_bfe.c b/sys/dev/bfe/if_bfe.c
index 1f3cc7f4577b7..c83d17d394773 100644
--- a/sys/dev/bfe/if_bfe.c
+++ b/sys/dev/bfe/if_bfe.c
@@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$");
#include <netinet/ip.h>
#include <machine/clock.h> /* for DELAY */
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/bus.h>
diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c
index 8502e11683154..62a2cf63c886a 100644
--- a/sys/dev/bge/if_bge.c
+++ b/sys/dev/bge/if_bge.c
@@ -93,7 +93,6 @@ __FBSDID("$FreeBSD$");
#include <netinet/ip.h>
#include <machine/clock.h> /* for DELAY */
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/bus.h>
diff --git a/sys/dev/bktr/bktr_audio.c b/sys/dev/bktr/bktr_audio.c
index 7c6965d6a08d2..efc63da05bf4d 100644
--- a/sys/dev/bktr/bktr_audio.c
+++ b/sys/dev/bktr/bktr_audio.c
@@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$");
#include <dev/pci/pcivar.h>
#endif
-#include <machine/bus_memio.h> /* for bus space */
#include <machine/bus.h>
#include <sys/bus.h>
#endif
diff --git a/sys/dev/bktr/bktr_card.c b/sys/dev/bktr/bktr_card.c
index c0493fff2b6af..f08f810733a5b 100644
--- a/sys/dev/bktr/bktr_card.c
+++ b/sys/dev/bktr/bktr_card.c
@@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$");
#include <dev/pci/pcivar.h>
#endif
-#include <machine/bus_memio.h> /* for bus space */
#include <machine/bus.h>
#include <sys/bus.h>
#endif
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index 5daca971a0319..41f0b09ad6ea6 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -131,7 +131,6 @@ __FBSDID("$FreeBSD$");
#include <dev/pci/pcivar.h>
#endif
-#include <machine/bus_memio.h> /* for bus space */
#include <machine/bus.h>
#include <sys/bus.h>
diff --git a/sys/dev/bktr/bktr_i2c.c b/sys/dev/bktr/bktr_i2c.c
index 807144d6fe1f1..20802f4605878 100644
--- a/sys/dev/bktr/bktr_i2c.c
+++ b/sys/dev/bktr/bktr_i2c.c
@@ -58,7 +58,6 @@ __FBSDID("$FreeBSD$");
#include <dev/pci/pcireg.h>
#endif
-#include <machine/bus_memio.h> /* for bus space */
#include <machine/bus.h>
#include <sys/bus.h>
diff --git a/sys/dev/bktr/bktr_os.c b/sys/dev/bktr/bktr_os.c
index 27519bc1e2281..f555272233637 100644
--- a/sys/dev/bktr/bktr_os.c
+++ b/sys/dev/bktr/bktr_os.c
@@ -80,7 +80,6 @@ __FBSDID("$FreeBSD$");
#include <sys/bus.h> /* used by smbus and newbus */
-#include <machine/bus_memio.h> /* used by bus space */
#include <machine/bus.h> /* used by bus space and newbus */
#include <sys/bus.h>
diff --git a/sys/dev/bktr/bktr_tuner.c b/sys/dev/bktr/bktr_tuner.c
index a9b42ad76b4b7..a74dd4faf01ba 100644
--- a/sys/dev/bktr/bktr_tuner.c
+++ b/sys/dev/bktr/bktr_tuner.c
@@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$");
#include <dev/pci/pcivar.h>
#endif
-#include <machine/bus_memio.h> /* for bus space */
#include <machine/bus.h>
#include <sys/bus.h>
#endif
diff --git a/sys/dev/buslogic/bt.c b/sys/dev/buslogic/bt.c
index 74ad13b818759..37441f4a5da44 100644
--- a/sys/dev/buslogic/bt.c
+++ b/sys/dev/buslogic/bt.c
@@ -51,14 +51,6 @@ __FBSDID("$FreeBSD$");
#include <sys/sysctl.h>
#include <sys/bus.h>
-/*
- * XXX It appears that BusLogic PCI adapters go out to lunch if you
- * attempt to perform memory mapped I/O.
- */
-#if 0
-#include <machine/bus_memio.h>
-#endif
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <sys/rman.h>
diff --git a/sys/dev/buslogic/bt_eisa.c b/sys/dev/buslogic/bt_eisa.c
index b1c40107aa78b..cef2e53d61ce6 100644
--- a/sys/dev/buslogic/bt_eisa.c
+++ b/sys/dev/buslogic/bt_eisa.c
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
#include <sys/mutex.h>
#include <sys/bus.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/buslogic/bt_isa.c b/sys/dev/buslogic/bt_isa.c
index 78f4b2e1133bb..17638b22374fd 100644
--- a/sys/dev/buslogic/bt_isa.c
+++ b/sys/dev/buslogic/bt_isa.c
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
#include <sys/mutex.h>
#include <sys/bus.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/buslogic/bt_pci.c b/sys/dev/buslogic/bt_pci.c
index fe9d3f02ba1de..51d15cb3ca490 100644
--- a/sys/dev/buslogic/bt_pci.c
+++ b/sys/dev/buslogic/bt_pci.c
@@ -41,8 +41,6 @@ __FBSDID("$FreeBSD$");
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
-#include <machine/bus_memio.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c
index 0b23fbf52021c..62d296c824417 100644
--- a/sys/dev/ciss/ciss.c
+++ b/sys/dev/ciss/ciss.c
@@ -94,7 +94,6 @@
#include <cam/scsi/scsi_message.h>
#include <machine/clock.h>
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <machine/endian.h>
#include <machine/resource.h>
diff --git a/sys/dev/cnw/if_cnw.c b/sys/dev/cnw/if_cnw.c
index 9e2fdd4bea0d6..d1891c3d5ab6c 100644
--- a/sys/dev/cnw/if_cnw.c
+++ b/sys/dev/cnw/if_cnw.c
@@ -248,7 +248,6 @@ struct cfattach cnw_ca = {
#include <machine/resource.h>
#include <machine/clock.h>
#include <machine/md_var.h>
-#include <machine/bus_pio.h>
#include <sys/rman.h>
#include <net/if.h>
diff --git a/sys/dev/dc/dcphy.c b/sys/dev/dc/dcphy.c
index ddf9b7e2a6058..3a6a5de27e4e1 100644
--- a/sys/dev/dc/dcphy.c
+++ b/sys/dev/dc/dcphy.c
@@ -60,8 +60,6 @@ __FBSDID("$FreeBSD$");
#include <dev/mii/miivar.h>
#include "miidevs.h"
-#include <machine/bus_pio.h>
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/bus.h>
diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c
index 4fe664d1c8cb4..ae92c8dc920bf 100644
--- a/sys/dev/dc/if_dc.c
+++ b/sys/dev/dc/if_dc.c
@@ -112,8 +112,6 @@ __FBSDID("$FreeBSD$");
#include <net/bpf.h>
-#include <machine/bus_pio.h>
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/bus.h>
diff --git a/sys/dev/dc/pnphy.c b/sys/dev/dc/pnphy.c
index 63891f58e5e0c..98d269a34e6b9 100644
--- a/sys/dev/dc/pnphy.c
+++ b/sys/dev/dc/pnphy.c
@@ -58,8 +58,6 @@ __FBSDID("$FreeBSD$");
#include <dev/mii/miivar.h>
#include "miidevs.h"
-#include <machine/bus_pio.h>
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/bus.h>
diff --git a/sys/dev/dpt/dpt_eisa.c b/sys/dev/dpt/dpt_eisa.c
index 5e2a039f68719..1a6ef9a7bb6da 100644
--- a/sys/dev/dpt/dpt_eisa.c
+++ b/sys/dev/dpt/dpt_eisa.c
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
#include <sys/mutex.h>
#include <sys/bus.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/dpt/dpt_isa.c b/sys/dev/dpt/dpt_isa.c
index c0ede88cf9d54..c9264af3708cf 100644
--- a/sys/dev/dpt/dpt_isa.c
+++ b/sys/dev/dpt/dpt_isa.c
@@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$");
#include <sys/module.h>
#include <sys/bus.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/dpt/dpt_pci.c b/sys/dev/dpt/dpt_pci.c
index d3b1190f72117..c91ab25b1ef9c 100644
--- a/sys/dev/dpt/dpt_pci.c
+++ b/sys/dev/dpt/dpt_pci.c
@@ -38,8 +38,6 @@ __FBSDID("$FreeBSD$");
#include <sys/mutex.h>
#include <sys/bus.h>
-#include <machine/bus_memio.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/dpt/dpt_scsi.c b/sys/dev/dpt/dpt_scsi.c
index db2f7b06603c6..129c95b948245 100644
--- a/sys/dev/dpt/dpt_scsi.c
+++ b/sys/dev/dpt/dpt_scsi.c
@@ -58,8 +58,6 @@ __FBSDID("$FreeBSD$");
#include <sys/bus.h>
-#include <machine/bus_memio.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
diff --git a/sys/dev/fb/boot_font.c b/sys/dev/fb/boot_font.c
index 77090c5f38bfc..436ae40f46692 100644
--- a/sys/dev/fb/boot_font.c
+++ b/sys/dev/fb/boot_font.c
@@ -62,7 +62,6 @@ __FBSDID("$FreeBSD$");
#include <machine/md_var.h>
#include <machine/pc/bios.h>
#include <machine/clock.h>
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <machine/pc/vesa.h>
#include <machine/resource.h>
diff --git a/sys/dev/fb/gfb.c b/sys/dev/fb/gfb.c
index b0cf5a927f9a7..6a14dca6de822 100644
--- a/sys/dev/fb/gfb.c
+++ b/sys/dev/fb/gfb.c
@@ -71,7 +71,6 @@ __FBSDID("$FreeBSD$");
#include <machine/md_var.h>
#include <machine/pc/bios.h>
#include <machine/clock.h>
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <machine/pc/vesa.h>
#include <machine/resource.h>
diff --git a/sys/dev/fb/s3_pci.c b/sys/dev/fb/s3_pci.c
index 70f3b6bfc0a4d..854a68549cef6 100644
--- a/sys/dev/fb/s3_pci.c
+++ b/sys/dev/fb/s3_pci.c
@@ -34,8 +34,6 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <machine/bus_pio.h>
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <vm/vm.h>
diff --git a/sys/dev/fb/tga.c b/sys/dev/fb/tga.c
index b55dc5a5cf370..84923ef7784ca 100644
--- a/sys/dev/fb/tga.c
+++ b/sys/dev/fb/tga.c
@@ -77,7 +77,6 @@ __FBSDID("$FreeBSD$");
#include <machine/md_var.h>
#include <machine/pc/bios.h>
#include <machine/clock.h>
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <machine/pc/vesa.h>
#include <machine/resource.h>
diff --git a/sys/dev/gfb/gfb_pci.c b/sys/dev/gfb/gfb_pci.c
index c58ae0e021e14..9dc31aa45442d 100644
--- a/sys/dev/gfb/gfb_pci.c
+++ b/sys/dev/gfb/gfb_pci.c
@@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$");
#include <machine/md_var.h>
#include <machine/pc/bios.h>
#include <machine/clock.h>
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <machine/pc/vesa.h>
#include <machine/resource.h>
diff --git a/sys/dev/hfa/hfa_freebsd.c b/sys/dev/hfa/hfa_freebsd.c
index 34db172bb4cdb..9b8d69caac418 100644
--- a/sys/dev/hfa/hfa_freebsd.c
+++ b/sys/dev/hfa/hfa_freebsd.c
@@ -67,7 +67,6 @@
#include <sys/conf.h>
#include <sys/module.h>
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/hfa/hfa_pci.c b/sys/dev/hfa/hfa_pci.c
index 8fc59ed780deb..fb28478fac6c0 100644
--- a/sys/dev/hfa/hfa_pci.c
+++ b/sys/dev/hfa/hfa_pci.c
@@ -69,7 +69,6 @@ __FBSDID("$FreeBSD$");
#include <sys/conf.h>
#include <sys/module.h>
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/hptmv/osbsd.h b/sys/dev/hptmv/osbsd.h
index 5637c44c5e9af..d81229ec8754e 100644
--- a/sys/dev/hptmv/osbsd.h
+++ b/sys/dev/hptmv/osbsd.h
@@ -32,7 +32,6 @@
#include <sys/resource.h>
#include <sys/eventhandler.h>
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <machine/bus.h>
diff --git a/sys/dev/ida/ida.c b/sys/dev/ida/ida.c
index cd3a95fec3d84..663b816a71d88 100644
--- a/sys/dev/ida/ida.c
+++ b/sys/dev/ida/ida.c
@@ -46,8 +46,6 @@ __FBSDID("$FreeBSD$");
#include <sys/conf.h>
#include <sys/endian.h>
-#include <machine/bus_memio.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <sys/rman.h>
diff --git a/sys/dev/ida/ida_disk.c b/sys/dev/ida/ida_disk.c
index 794cb90b90c3f..2446dddbe1856 100644
--- a/sys/dev/ida/ida_disk.c
+++ b/sys/dev/ida/ida_disk.c
@@ -40,8 +40,6 @@
#include <sys/conf.h>
#include <sys/cons.h>
-#include <machine/bus_memio.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <sys/rman.h>
diff --git a/sys/dev/ida/ida_eisa.c b/sys/dev/ida/ida_eisa.c
index 719d38c33273c..864b1700a0101 100644
--- a/sys/dev/ida/ida_eisa.c
+++ b/sys/dev/ida/ida_eisa.c
@@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$");
#include <sys/bio.h>
#include <sys/conf.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/ida/ida_pci.c b/sys/dev/ida/ida_pci.c
index 0f2fd2a6fe0fe..3c9810537c2f5 100644
--- a/sys/dev/ida/ida_pci.c
+++ b/sys/dev/ida/ida_pci.c
@@ -36,8 +36,6 @@ __FBSDID("$FreeBSD$");
#include <sys/bus.h>
#include <sys/conf.h>
-#include <machine/bus_memio.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/idt/idt_harp.c b/sys/dev/idt/idt_harp.c
index 4659c46890373..84e52eb7b0710 100644
--- a/sys/dev/idt/idt_harp.c
+++ b/sys/dev/idt/idt_harp.c
@@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$");
#include <sys/conf.h>
#include <sys/module.h>
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/idt/idt_pci.c b/sys/dev/idt/idt_pci.c
index 26b1e5a9329d7..1a77c4bb060e0 100644
--- a/sys/dev/idt/idt_pci.c
+++ b/sys/dev/idt/idt_pci.c
@@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$");
#include <sys/conf.h>
#include <sys/module.h>
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index f30d7752f11f1..71845e94324d3 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -124,7 +124,6 @@ __FBSDID("$FreeBSD$");
#include <sys/module.h>
#include <sys/bus.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/ie/if_ie_isa.c b/sys/dev/ie/if_ie_isa.c
index b8448c86bcfd8..53ed25635d679 100644
--- a/sys/dev/ie/if_ie_isa.c
+++ b/sys/dev/ie/if_ie_isa.c
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
#include <sys/module.h>
#include <sys/bus.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/if_ndis/if_ndis.c b/sys/dev/if_ndis/if_ndis.c
index af7e02c5312c8..77eb9eee10b5d 100644
--- a/sys/dev/if_ndis/if_ndis.c
+++ b/sys/dev/if_ndis/if_ndis.c
@@ -60,8 +60,6 @@ __FBSDID("$FreeBSD$");
#include <net/bpf.h>
-#include <machine/bus_memio.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/bus.h>
diff --git a/sys/dev/iir/iir.c b/sys/dev/iir/iir.c
index 60b2962e64fda..4e3cef6b902e2 100644
--- a/sys/dev/iir/iir.c
+++ b/sys/dev/iir/iir.c
@@ -56,8 +56,6 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/bus.h>
-#include <machine/bus_memio.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/clock.h>
#include <machine/stdarg.h>
diff --git a/sys/dev/iir/iir_pci.c b/sys/dev/iir/iir_pci.c
index 2edfc91e042be..4ad5d0cbf4d5a 100644
--- a/sys/dev/iir/iir_pci.c
+++ b/sys/dev/iir/iir_pci.c
@@ -54,8 +54,6 @@ __FBSDID("$FreeBSD$");
#include <sys/module.h>
#include <sys/bus.h>
-#include <machine/bus_memio.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <machine/clock.h>
diff --git a/sys/dev/ips/ips.h b/sys/dev/ips/ips.h
index 0e5e658336e9a..829bb46d6ad93 100644
--- a/sys/dev/ips/ips.h
+++ b/sys/dev/ips/ips.h
@@ -43,7 +43,6 @@
#include <sys/sema.h>
#include <sys/time.h>
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <sys/rman.h>
#include <machine/resource.h>
diff --git a/sys/dev/ips/ips_disk.h b/sys/dev/ips/ips_disk.h
index 0b0fe65d4030a..b841eeaeea2fb 100644
--- a/sys/dev/ips/ips_disk.h
+++ b/sys/dev/ips/ips_disk.h
@@ -41,7 +41,6 @@
#include <sys/disk.h>
#include <geom/geom_disk.h>
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <sys/rman.h>
#include <machine/resource.h>
diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h
index 8b467c602e4b9..ede1fe14b2d37 100644
--- a/sys/dev/isp/isp_freebsd.h
+++ b/sys/dev/isp/isp_freebsd.h
@@ -42,8 +42,6 @@
#include <sys/proc.h>
#include <sys/bus.h>
-#include <machine/bus_memio.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/clock.h>
#include <machine/cpu.h>
diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c
index 3a9c041872baa..55a0ef7058ac3 100644
--- a/sys/dev/isp/isp_pci.c
+++ b/sys/dev/isp/isp_pci.c
@@ -38,8 +38,6 @@ __FBSDID("$FreeBSD$");
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
-#include <machine/bus_memio.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/kbd/atkbdc.c b/sys/dev/kbd/atkbdc.c
index 7fc2325c0dd40..c0cee013e6c15 100644
--- a/sys/dev/kbd/atkbdc.c
+++ b/sys/dev/kbd/atkbdc.c
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
#include <sys/bus.h>
#include <sys/malloc.h>
#include <sys/syslog.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/lge/if_lge.c b/sys/dev/lge/if_lge.c
index 9c01ca4db2df9..ace667df09104 100644
--- a/sys/dev/lge/if_lge.c
+++ b/sys/dev/lge/if_lge.c
@@ -89,8 +89,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h> /* for vtophys */
#include <vm/pmap.h> /* for vtophys */
#include <machine/clock.h> /* for DELAY */
-#include <machine/bus_pio.h>
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/bus.h>
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index 401781c95434b..86e40c474436e 100644
--- a/sys/dev/mcd/mcd.c
+++ b/sys/dev/mcd/mcd.c
@@ -56,7 +56,6 @@ static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
#include <sys/disk.h>
#include <sys/bus.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/mcd/mcd_isa.c b/sys/dev/mcd/mcd_isa.c
index f63167246f4d7..8b71f105977d2 100644
--- a/sys/dev/mcd/mcd_isa.c
+++ b/sys/dev/mcd/mcd_isa.c
@@ -17,7 +17,6 @@ __FBSDID("$FreeBSD$");
#include <sys/lock.h>
#include <sys/mutex.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/mii/dcphy.c b/sys/dev/mii/dcphy.c
index ddf9b7e2a6058..3a6a5de27e4e1 100644
--- a/sys/dev/mii/dcphy.c
+++ b/sys/dev/mii/dcphy.c
@@ -60,8 +60,6 @@ __FBSDID("$FreeBSD$");
#include <dev/mii/miivar.h>
#include "miidevs.h"
-#include <machine/bus_pio.h>
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/bus.h>
diff --git a/sys/dev/mii/pnphy.c b/sys/dev/mii/pnphy.c
index 63891f58e5e0c..98d269a34e6b9 100644
--- a/sys/dev/mii/pnphy.c
+++ b/sys/dev/mii/pnphy.c
@@ -58,8 +58,6 @@ __FBSDID("$FreeBSD$");
#include <dev/mii/miivar.h>
#include "miidevs.h"
-#include <machine/bus_pio.h>
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/bus.h>
diff --git a/sys/dev/mlx/mlx.c b/sys/dev/mlx/mlx.c
index dcee43c6576c2..d8cc79ac7b360 100644
--- a/sys/dev/mlx/mlx.c
+++ b/sys/dev/mlx/mlx.c
@@ -40,8 +40,6 @@
#include <sys/stat.h>
#include <machine/resource.h>
-#include <machine/bus_memio.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/clock.h>
#include <sys/rman.h>
diff --git a/sys/dev/mlx/mlx_pci.c b/sys/dev/mlx/mlx_pci.c
index da04278eb4c7f..732fed8697e30 100644
--- a/sys/dev/mlx/mlx_pci.c
+++ b/sys/dev/mlx/mlx_pci.c
@@ -35,8 +35,6 @@ __FBSDID("$FreeBSD$");
#include <sys/bus.h>
#include <sys/conf.h>
-#include <machine/bus_memio.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/mly/mly.c b/sys/dev/mly/mly.c
index c7fa06844aa23..074d6fa201764 100644
--- a/sys/dev/mly/mly.c
+++ b/sys/dev/mly/mly.c
@@ -37,7 +37,6 @@
#include <sys/ioccom.h>
#include <sys/stat.h>
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/mpt/mpt_freebsd.h b/sys/dev/mpt/mpt_freebsd.h
index 49e6f4e0c3714..50cd28289ded8 100644
--- a/sys/dev/mpt/mpt_freebsd.h
+++ b/sys/dev/mpt/mpt_freebsd.h
@@ -52,8 +52,6 @@
#include <sys/proc.h>
#include <sys/bus.h>
-#include <machine/bus_memio.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/clock.h>
#include <machine/cpu.h>
diff --git a/sys/dev/mpt/mpt_pci.c b/sys/dev/mpt/mpt_pci.c
index cdb128747e828..828d6e15df90f 100644
--- a/sys/dev/mpt/mpt_pci.c
+++ b/sys/dev/mpt/mpt_pci.c
@@ -42,8 +42,6 @@ __FBSDID("$FreeBSD$");
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
-#include <machine/bus_memio.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/my/if_my.c b/sys/dev/my/if_my.c
index c9835e55e62c1..20b57e8345cad 100644
--- a/sys/dev/my/if_my.c
+++ b/sys/dev/my/if_my.c
@@ -56,8 +56,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h> /* for vtophys */
#include <vm/pmap.h> /* for vtophys */
#include <machine/clock.h> /* for DELAY */
-#include <machine/bus_memio.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/bus.h>
diff --git a/sys/dev/ncv/ncr53c500.c b/sys/dev/ncv/ncr53c500.c
index 346c09aebda8b..32bd9021fac1b 100644
--- a/sys/dev/ncv/ncr53c500.c
+++ b/sys/dev/ncv/ncr53c500.c
@@ -75,7 +75,6 @@ __FBSDID("$FreeBSD$");
#ifdef __FreeBSD__
#include <machine/clock.h>
#include <machine/cpu.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <compat/netbsd/dvcfg.h>
diff --git a/sys/dev/ncv/ncr53c500_pccard.c b/sys/dev/ncv/ncr53c500_pccard.c
index 6434f6a817007..7472e625f32ca 100644
--- a/sys/dev/ncv/ncr53c500_pccard.c
+++ b/sys/dev/ncv/ncr53c500_pccard.c
@@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <machine/bus.h>
-#include <machine/bus_pio.h>
#include <machine/resource.h>
#include <sys/rman.h>
#include <compat/netbsd/dvcfg.h>
diff --git a/sys/dev/nge/if_nge.c b/sys/dev/nge/if_nge.c
index 0fc0fca782aac..f480cb5cf87f5 100644
--- a/sys/dev/nge/if_nge.c
+++ b/sys/dev/nge/if_nge.c
@@ -110,8 +110,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h> /* for vtophys */
#include <vm/pmap.h> /* for vtophys */
#include <machine/clock.h> /* for DELAY */
-#include <machine/bus_pio.h>
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/bus.h>
diff --git a/sys/dev/nsp/nsp.c b/sys/dev/nsp/nsp.c
index d955ff2938b27..cad74162fe562 100644
--- a/sys/dev/nsp/nsp.c
+++ b/sys/dev/nsp/nsp.c
@@ -74,8 +74,6 @@ __FBSDID("$FreeBSD$");
#ifdef __FreeBSD__
#include <machine/clock.h>
#include <machine/cpu.h>
-#include <machine/bus_pio.h>
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <compat/netbsd/dvcfg.h>
diff --git a/sys/dev/nve/if_nve.c b/sys/dev/nve/if_nve.c
index c4d3b393edd8d..0963a6b49c11e 100644
--- a/sys/dev/nve/if_nve.c
+++ b/sys/dev/nve/if_nve.c
@@ -95,7 +95,6 @@ __FBSDID("$FreeBSD$");
#include <net/bpf.h>
#include <net/if_vlan_var.h>
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <machine/resource.h>
diff --git a/sys/dev/pbio/pbio.c b/sys/dev/pbio/pbio.c
index e4c2b0ea185df..32f50a9cd8f8e 100644
--- a/sys/dev/pbio/pbio.c
+++ b/sys/dev/pbio/pbio.c
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
#include <sys/conf.h> /* cdevsw stuff */
#include <sys/malloc.h> /* malloc region definitions */
#include <sys/module.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <machine/clock.h> /* DELAY() */
diff --git a/sys/dev/pdq/if_fpa.c b/sys/dev/pdq/if_fpa.c
index cfb6f89fc48d5..6ed271aa1fc57 100644
--- a/sys/dev/pdq/if_fpa.c
+++ b/sys/dev/pdq/if_fpa.c
@@ -41,8 +41,6 @@ __FBSDID("$FreeBSD$");
#include <sys/module.h>
#include <sys/bus.h>
-#include <machine/bus_memio.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/pdq/pdq_freebsd.h b/sys/dev/pdq/pdq_freebsd.h
index ba2a993faf9ea..6dc7c6c9345d1 100644
--- a/sys/dev/pdq/pdq_freebsd.h
+++ b/sys/dev/pdq/pdq_freebsd.h
@@ -48,8 +48,6 @@
#include <sys/module.h>
#include <sys/bus.h>
-#include <machine/bus_memio.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/pdq/pdq_ifsubr.c b/sys/dev/pdq/pdq_ifsubr.c
index 1971a208ff23a..d3a64e223a109 100644
--- a/sys/dev/pdq/pdq_ifsubr.c
+++ b/sys/dev/pdq/pdq_ifsubr.c
@@ -55,8 +55,6 @@ __KERNEL_RCSID(0, "$NetBSD: pdq_ifsubr.c,v 1.38 2001/12/21 23:21:47 matt Exp $")
#include <sys/module.h>
#include <sys/bus.h>
-#include <machine/bus_memio.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c
index a887f1887acd3..ea52ef302076c 100644
--- a/sys/dev/re/if_re.c
+++ b/sys/dev/re/if_re.c
@@ -127,8 +127,6 @@ __FBSDID("$FreeBSD$");
#include <net/bpf.h>
-#include <machine/bus_pio.h>
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/bus.h>
diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c
index 2c5f7966f5063..136c900973e87 100644
--- a/sys/dev/scd/scd.c
+++ b/sys/dev/scd/scd.c
@@ -58,7 +58,6 @@ __FBSDID("$FreeBSD$");
#include <machine/stdarg.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/scd/scd_isa.c b/sys/dev/scd/scd_isa.c
index da2fe6a0d5eb9..082d0d8461af5 100644
--- a/sys/dev/scd/scd_isa.c
+++ b/sys/dev/scd/scd_isa.c
@@ -16,7 +16,6 @@ __FBSDID("$FreeBSD$");
#include <sys/mutex.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/sf/if_sf.c b/sys/dev/sf/if_sf.c
index ed91f015aadac..5593d525ecea3 100644
--- a/sys/dev/sf/if_sf.c
+++ b/sys/dev/sf/if_sf.c
@@ -98,8 +98,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h> /* for vtophys */
#include <vm/pmap.h> /* for vtophys */
-#include <machine/bus_pio.h>
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/bus.h>
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index 2a9240b0936ae..4dfabc0c8883c 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -67,7 +67,6 @@ __FBSDID("$FreeBSD$");
#include <sys/sysctl.h>
#include <sys/syslog.h>
#include <sys/tty.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <sys/rman.h>
#include <sys/timepps.h>
diff --git a/sys/dev/sio/sio_isa.c b/sys/dev/sio/sio_isa.c
index 40541e6625214..afb6fac79cffb 100644
--- a/sys/dev/sio/sio_isa.c
+++ b/sys/dev/sio/sio_isa.c
@@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$");
#include <sys/mutex.h>
#include <sys/module.h>
#include <sys/tty.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <sys/timepps.h>
diff --git a/sys/dev/sio/sio_pccard.c b/sys/dev/sio/sio_pccard.c
index 713393a87097a..b71582842eeaa 100644
--- a/sys/dev/sio/sio_pccard.c
+++ b/sys/dev/sio/sio_pccard.c
@@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$");
#include <sys/mutex.h>
#include <sys/module.h>
#include <sys/tty.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/timepps.h>
diff --git a/sys/dev/sio/sio_pci.c b/sys/dev/sio/sio_pci.c
index 05d42268f655d..459baa1693666 100644
--- a/sys/dev/sio/sio_pci.c
+++ b/sys/dev/sio/sio_pci.c
@@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$");
#include <sys/mutex.h>
#include <sys/module.h>
#include <sys/tty.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <sys/timepps.h>
diff --git a/sys/dev/sio/sio_puc.c b/sys/dev/sio/sio_puc.c
index 877a03966d07a..dd80e68f5d3bc 100644
--- a/sys/dev/sio/sio_puc.c
+++ b/sys/dev/sio/sio_puc.c
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
#include <sys/mutex.h>
#include <sys/module.h>
#include <sys/tty.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <sys/timepps.h>
diff --git a/sys/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c
index 9f148a1c72f4a..1703e2f36f565 100644
--- a/sys/dev/sk/if_sk.c
+++ b/sys/dev/sk/if_sk.c
@@ -106,8 +106,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h> /* for vtophys */
#include <vm/pmap.h> /* for vtophys */
-#include <machine/bus_pio.h>
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/bus.h>
diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c
index 7382fdc0bacde..db4eafb60913c 100644
--- a/sys/dev/sr/if_sr.c
+++ b/sys/dev/sr/if_sr.c
@@ -65,8 +65,6 @@ __FBSDID("$FreeBSD$");
#include <sys/bus.h>
#include <machine/bus.h>
#include <machine/resource.h>
-#include <machine/bus_pio.h>
-#include <machine/bus_memio.h>
#include <sys/rman.h>
#include <net/if.h>
diff --git a/sys/dev/sr/if_sr_isa.c b/sys/dev/sr/if_sr_isa.c
index 510a32b74196f..3f68e001295b6 100644
--- a/sys/dev/sr/if_sr_isa.c
+++ b/sys/dev/sr/if_sr_isa.c
@@ -42,8 +42,6 @@ __FBSDID("$FreeBSD$");
#include <sys/bus.h>
#include <machine/bus.h>
#include <machine/resource.h>
-#include <machine/bus_pio.h>
-#include <machine/bus_memio.h>
#include <sys/rman.h>
#include <sys/time.h>
diff --git a/sys/dev/sr/if_sr_pci.c b/sys/dev/sr/if_sr_pci.c
index dbb8a83a46ba8..8f62513b360fe 100644
--- a/sys/dev/sr/if_sr_pci.c
+++ b/sys/dev/sr/if_sr_pci.c
@@ -39,8 +39,6 @@ __FBSDID("$FreeBSD$");
#include <sys/bus.h>
#include <machine/bus.h>
#include <machine/resource.h>
-#include <machine/bus_pio.h>
-#include <machine/bus_memio.h>
#include <sys/rman.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/stg/tmc18c30.c b/sys/dev/stg/tmc18c30.c
index c07c4c8b516d5..a0e7139b4969e 100644
--- a/sys/dev/stg/tmc18c30.c
+++ b/sys/dev/stg/tmc18c30.c
@@ -73,7 +73,6 @@ __FBSDID("$FreeBSD$");
#ifdef __FreeBSD__
#include <machine/clock.h>
#include <machine/cpu.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <compat/netbsd/dvcfg.h>
diff --git a/sys/dev/stg/tmc18c30_isa.c b/sys/dev/stg/tmc18c30_isa.c
index 40966697dc43c..7165a817db90f 100644
--- a/sys/dev/stg/tmc18c30_isa.c
+++ b/sys/dev/stg/tmc18c30_isa.c
@@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$");
#include <sys/malloc.h>
#include <sys/errno.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/stg/tmc18c30_pccard.c b/sys/dev/stg/tmc18c30_pccard.c
index 67bffd3f40c28..a66f65c8841ac 100644
--- a/sys/dev/stg/tmc18c30_pccard.c
+++ b/sys/dev/stg/tmc18c30_pccard.c
@@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <machine/bus.h>
-#include <machine/bus_pio.h>
#include <compat/netbsd/dvcfg.h>
#include <sys/device_port.h>
diff --git a/sys/dev/stg/tmc18c30_pci.c b/sys/dev/stg/tmc18c30_pci.c
index cda2ed7e63d22..1edda5af141ab 100644
--- a/sys/dev/stg/tmc18c30_pci.c
+++ b/sys/dev/stg/tmc18c30_pci.c
@@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$");
#include <sys/malloc.h>
#include <sys/errno.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/stg/tmc18c30_subr.c b/sys/dev/stg/tmc18c30_subr.c
index c2cfd44b42ac7..152fd11bbbdf6 100644
--- a/sys/dev/stg/tmc18c30_subr.c
+++ b/sys/dev/stg/tmc18c30_subr.c
@@ -47,8 +47,6 @@ __FBSDID("$FreeBSD$");
#include <sys/module.h>
#include <sys/bus.h>
-#include <machine/bus_memio.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/sym/sym_hipd.c b/sys/dev/sym/sym_hipd.c
index 54abca694bdf7..e8f10f0f05bbc 100644
--- a/sys/dev/sym/sym_hipd.c
+++ b/sys/dev/sym/sym_hipd.c
@@ -86,17 +86,7 @@ __FBSDID("$FreeBSD$");
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
-#include <machine/bus_memio.h>
-/*
- * Only include bus_pio if needed.
- * This avoids bus space primitives to be uselessly bloated
- * by out-of-age PIO operations.
- */
-#ifdef SYM_CONF_IOMAPPED
-#include <machine/bus_pio.h>
-#endif
#include <machine/bus.h>
-
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/tga/tga_pci.c b/sys/dev/tga/tga_pci.c
index 25afbfd006f8d..47f32f4385261 100644
--- a/sys/dev/tga/tga_pci.c
+++ b/sys/dev/tga/tga_pci.c
@@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$");
#include <machine/md_var.h>
#include <machine/pc/bios.h>
#include <machine/clock.h>
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <machine/pc/vesa.h>
#include <machine/resource.h>
diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c
index 86cea7c747507..4af3b292bde47 100644
--- a/sys/dev/ti/if_ti.c
+++ b/sys/dev/ti/if_ti.c
@@ -108,7 +108,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h> /* for vtophys */
#include <vm/pmap.h> /* for vtophys */
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/bus.h>
diff --git a/sys/dev/trm/trm.c b/sys/dev/trm/trm.c
index 0c03791c6761c..500c3076f6b17 100644
--- a/sys/dev/trm/trm.c
+++ b/sys/dev/trm/trm.c
@@ -82,7 +82,6 @@ __FBSDID("$FreeBSD$");
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
#include <machine/resource.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/clock.h>
#include <sys/rman.h>
diff --git a/sys/dev/twe/twe_compat.h b/sys/dev/twe/twe_compat.h
index 3729100411315..1bd46f0022aee 100644
--- a/sys/dev/twe/twe_compat.h
+++ b/sys/dev/twe/twe_compat.h
@@ -51,7 +51,6 @@
#include <sys/disk.h>
#include <sys/stat.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c
index a7be0290c22d3..18fe63f2cc5ae 100644
--- a/sys/dev/tx/if_tx.c
+++ b/sys/dev/tx/if_tx.c
@@ -58,8 +58,6 @@ __FBSDID("$FreeBSD$");
#include <net/if_vlan_var.h>
-#include <machine/bus_memio.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <machine/clock.h> /* for DELAY */
diff --git a/sys/dev/txp/if_txp.c b/sys/dev/txp/if_txp.c
index 8e708ebfb75a4..749ea44874867 100644
--- a/sys/dev/txp/if_txp.c
+++ b/sys/dev/txp/if_txp.c
@@ -74,8 +74,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h> /* for vtophys */
#include <vm/pmap.h> /* for vtophys */
#include <machine/clock.h> /* for DELAY */
-#include <machine/bus_pio.h>
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/bus.h>
diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c
index 27680c4837500..5870c4fa8f58e 100644
--- a/sys/dev/usb/ehci.c
+++ b/sys/dev/usb/ehci.c
@@ -72,8 +72,6 @@ __FBSDID("$FreeBSD$");
#include <sys/endian.h>
#include <sys/module.h>
#include <sys/bus.h>
-#include <machine/bus_pio.h>
-#include <machine/bus_memio.h>
#include <sys/lockmgr.h>
#if defined(DIAGNOSTIC) && defined(__i386__) && defined(__FreeBSD__)
#include <machine/cpu.h>
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c
index e0db856e797ae..4821cc6a625b8 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/dev/usb/ohci.c
@@ -70,8 +70,6 @@ __FBSDID("$FreeBSD$");
#include <sys/endian.h>
#include <sys/module.h>
#include <sys/bus.h>
-#include <machine/bus_pio.h>
-#include <machine/bus_memio.h>
#if defined(DIAGNOSTIC) && defined(__i386__) && defined(__FreeBSD__)
#include <machine/cpu.h>
#endif
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index 4340a252340b7..05fdd1eddb184 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -72,7 +72,6 @@ __FBSDID("$FreeBSD$");
#include <sys/endian.h>
#include <sys/module.h>
#include <sys/bus.h>
-#include <machine/bus_pio.h>
#if defined(DIAGNOSTIC) && defined(__i386__)
#include <machine/cpu.h>
#endif
diff --git a/sys/dev/vge/if_vge.c b/sys/dev/vge/if_vge.c
index ef6040ec255d3..5607c9bbe053b 100644
--- a/sys/dev/vge/if_vge.c
+++ b/sys/dev/vge/if_vge.c
@@ -100,8 +100,6 @@ __FBSDID("$FreeBSD$");
#include <net/bpf.h>
-#include <machine/bus_pio.h>
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/bus.h>
diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c
index 843be854f4fe2..502deb1d212c7 100644
--- a/sys/dev/vr/if_vr.c
+++ b/sys/dev/vr/if_vr.c
@@ -79,8 +79,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h> /* for vtophys */
#include <vm/pmap.h> /* for vtophys */
-#include <machine/bus_pio.h>
-#include <machine/bus_memio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/bus.h>
diff --git a/sys/dev/vx/if_vx.c b/sys/dev/vx/if_vx.c
index 9fd6f5167cb73..e5265675f3986 100644
--- a/sys/dev/vx/if_vx.c
+++ b/sys/dev/vx/if_vx.c
@@ -69,7 +69,6 @@ __FBSDID("$FreeBSD$");
#include <net/ethernet.h>
#include <net/if_arp.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <sys/bus.h>
diff --git a/sys/dev/vx/if_vx_pci.c b/sys/dev/vx/if_vx_pci.c
index 3afe2385e0c5b..c0694f1978dad 100644
--- a/sys/dev/vx/if_vx_pci.c
+++ b/sys/dev/vx/if_vx_pci.c
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
#include <net/if.h>
#include <net/if_arp.h>
-#include <machine/bus_pio.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/bus.h>