summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-03-02 18:00:29 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2019-03-04 15:08:03 +0000
commit065857ee7fd61b05025d7a803e82f2b9b53cbc9a (patch)
tree3016bedfeac37b6aca649f1474f6343228ae9673 /src/mainboard
parentbdaec07a859c0c05e7fd5276a15b3933da574368 (diff)
arch/io.h: Drop unnecessary include
Change-Id: I91158452680586ac676ea11c8589062880a31f91 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/31692 Reviewed-by: Patrick Georgi <pgeorgi@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/advansus/a785e-i/mainboard.c1
-rw-r--r--src/mainboard/advansus/a785e-i/resourcemap.c1
-rw-r--r--src/mainboard/amd/bettong/mptable.c1
-rw-r--r--src/mainboard/amd/bimini_fam10/mainboard.c1
-rw-r--r--src/mainboard/amd/bimini_fam10/resourcemap.c1
-rw-r--r--src/mainboard/amd/db-ft3b-lc/mainboard.c1
-rw-r--r--src/mainboard/amd/db-ft3b-lc/mptable.c1
-rw-r--r--src/mainboard/amd/gardenia/mptable.c1
-rw-r--r--src/mainboard/amd/lamar/mainboard.c1
-rw-r--r--src/mainboard/amd/lamar/mptable.c1
-rw-r--r--src/mainboard/amd/mahogany_fam10/mainboard.c1
-rw-r--r--src/mainboard/amd/mahogany_fam10/mptable.c1
-rw-r--r--src/mainboard/amd/mahogany_fam10/resourcemap.c1
-rw-r--r--src/mainboard/amd/olivehillplus/mainboard.c1
-rw-r--r--src/mainboard/amd/parmer/romstage.c1
-rw-r--r--src/mainboard/amd/persimmon/mptable.c1
-rw-r--r--src/mainboard/amd/serengeti_cheetah_fam10/resourcemap.c1
-rw-r--r--src/mainboard/amd/tilapia_fam10/mainboard.c1
-rw-r--r--src/mainboard/amd/tilapia_fam10/mptable.c1
-rw-r--r--src/mainboard/amd/tilapia_fam10/resourcemap.c1
-rw-r--r--src/mainboard/amd/torpedo/acpi_tables.c1
-rw-r--r--src/mainboard/aopen/dxplplusu/romstage.c1
-rw-r--r--src/mainboard/apple/macbook21/mainboard.c1
-rw-r--r--src/mainboard/apple/macbook21/smihandler.c1
-rw-r--r--src/mainboard/apple/macbookair4_2/romstage.c1
-rw-r--r--src/mainboard/asus/am1i-a/mptable.c1
-rw-r--r--src/mainboard/asus/kcma-d8/bootblock.c1
-rw-r--r--src/mainboard/asus/kcma-d8/mptable.c1
-rw-r--r--src/mainboard/asus/kcma-d8/resourcemap.c1
-rw-r--r--src/mainboard/asus/kfsn4-dre/acpi_tables.c1
-rw-r--r--src/mainboard/asus/kfsn4-dre/resourcemap.c1
-rw-r--r--src/mainboard/asus/kgpe-d16/bootblock.c1
-rw-r--r--src/mainboard/asus/kgpe-d16/mptable.c1
-rw-r--r--src/mainboard/asus/kgpe-d16/resourcemap.c1
-rw-r--r--src/mainboard/asus/m4a78-em/mainboard.c1
-rw-r--r--src/mainboard/asus/m4a78-em/mptable.c1
-rw-r--r--src/mainboard/asus/m4a78-em/resourcemap.c1
-rw-r--r--src/mainboard/asus/m4a785-m/mainboard.c1
-rw-r--r--src/mainboard/asus/m4a785-m/mptable.c1
-rw-r--r--src/mainboard/asus/m4a785-m/resourcemap.c1
-rw-r--r--src/mainboard/asus/m5a88-v/mainboard.c1
-rw-r--r--src/mainboard/asus/m5a88-v/resourcemap.c1
-rw-r--r--src/mainboard/asus/p5qc/romstage.c1
-rw-r--r--src/mainboard/asus/p8h61-m_lx/romstage.c1
-rw-r--r--src/mainboard/avalue/eax-785e/mainboard.c1
-rw-r--r--src/mainboard/avalue/eax-785e/resourcemap.c1
-rw-r--r--src/mainboard/bap/ode_e20XX/mptable.c1
-rw-r--r--src/mainboard/bap/ode_e21XX/mainboard.c1
-rw-r--r--src/mainboard/biostar/am1ml/mptable.c1
-rw-r--r--src/mainboard/elmex/pcm205400/mptable.c1
-rw-r--r--src/mainboard/emulation/qemu-power8/uart.c1
-rw-r--r--src/mainboard/emulation/qemu-q35/bootblock.c1
-rw-r--r--src/mainboard/emulation/qemu-riscv/uart.c1
-rw-r--r--src/mainboard/emulation/spike-riscv/uart.c1
-rw-r--r--src/mainboard/foxconn/d41s/romstage.c1
-rw-r--r--src/mainboard/getac/p470/mainboard.c1
-rw-r--r--src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c1
-rw-r--r--src/mainboard/gigabyte/ga-g41m-es2l/romstage.c1
-rw-r--r--src/mainboard/gigabyte/ma785gm/mainboard.c1
-rw-r--r--src/mainboard/gigabyte/ma785gm/mptable.c1
-rw-r--r--src/mainboard/gigabyte/ma785gm/resourcemap.c1
-rw-r--r--src/mainboard/gigabyte/ma785gmt/mainboard.c1
-rw-r--r--src/mainboard/gigabyte/ma785gmt/mptable.c1
-rw-r--r--src/mainboard/gigabyte/ma785gmt/resourcemap.c1
-rw-r--r--src/mainboard/gigabyte/ma78gm/mainboard.c1
-rw-r--r--src/mainboard/gigabyte/ma78gm/mptable.c1
-rw-r--r--src/mainboard/gigabyte/ma78gm/resourcemap.c1
-rw-r--r--src/mainboard/gizmosphere/gizmo2/mptable.c1
-rw-r--r--src/mainboard/google/auron/variant.h1
-rw-r--r--src/mainboard/google/beltino/chromeos.c1
-rw-r--r--src/mainboard/google/beltino/smihandler.c1
-rw-r--r--src/mainboard/google/butterfly/chromeos.c1
-rw-r--r--src/mainboard/google/butterfly/mainboard_smi.c1
-rw-r--r--src/mainboard/google/butterfly/romstage.c1
-rw-r--r--src/mainboard/google/eve/smihandler.c1
-rw-r--r--src/mainboard/google/foster/mainboard.c1
-rw-r--r--src/mainboard/google/foster/reset.c1
-rw-r--r--src/mainboard/google/glados/smihandler.c1
-rw-r--r--src/mainboard/google/gru/sdram_configs.c1
-rw-r--r--src/mainboard/google/jecht/chromeos.c1
-rw-r--r--src/mainboard/google/jecht/smihandler.c1
-rw-r--r--src/mainboard/google/kahlee/mptable.c1
-rw-r--r--src/mainboard/google/link/mainboard_smi.c1
-rw-r--r--src/mainboard/google/link/romstage.c1
-rw-r--r--src/mainboard/google/nyan/romstage.c1
-rw-r--r--src/mainboard/google/nyan_big/romstage.c1
-rw-r--r--src/mainboard/google/nyan_blaze/romstage.c1
-rw-r--r--src/mainboard/google/oak/mainboard.c1
-rw-r--r--src/mainboard/google/octopus/ec.c1
-rw-r--r--src/mainboard/google/parrot/chromeos.c1
-rw-r--r--src/mainboard/google/parrot/ec.c1
-rw-r--r--src/mainboard/google/parrot/romstage.c1
-rw-r--r--src/mainboard/google/parrot/smihandler.c1
-rw-r--r--src/mainboard/google/rambi/mainboard.c1
-rw-r--r--src/mainboard/google/smaug/reset.c1
-rw-r--r--src/mainboard/google/stout/chromeos.c1
-rw-r--r--src/mainboard/google/stout/ec.c1
-rw-r--r--src/mainboard/google/stout/mainboard.c1
-rw-r--r--src/mainboard/google/stout/mainboard_smi.c1
-rw-r--r--src/mainboard/google/stout/romstage.c1
-rw-r--r--src/mainboard/google/urara/mainboard.c1
-rw-r--r--src/mainboard/google/veyron/sdram_configs.c1
-rw-r--r--src/mainboard/google/veyron_mickey/sdram_configs.c1
-rw-r--r--src/mainboard/google/veyron_rialto/sdram_configs.c1
-rw-r--r--src/mainboard/hp/2570p/romstage.c1
-rw-r--r--src/mainboard/hp/2760p/romstage.c1
-rw-r--r--src/mainboard/hp/8460p/romstage.c1
-rw-r--r--src/mainboard/hp/8470p/romstage.c1
-rw-r--r--src/mainboard/hp/8770w/romstage.c1
-rw-r--r--src/mainboard/hp/compaq_8200_elite_sff/romstage.c1
-rw-r--r--src/mainboard/hp/folio_9470m/romstage.c1
-rw-r--r--src/mainboard/hp/pavilion_m6_1035dx/mainboard.c1
-rw-r--r--src/mainboard/hp/revolve_810_g1/romstage.c1
-rw-r--r--src/mainboard/iei/kino-780am2-fam10/mainboard.c1
-rw-r--r--src/mainboard/iei/kino-780am2-fam10/mptable.c1
-rw-r--r--src/mainboard/iei/kino-780am2-fam10/resourcemap.c1
-rw-r--r--src/mainboard/intel/bayleybay_fsp/mainboard.c1
-rw-r--r--src/mainboard/intel/bayleybay_fsp/romstage.c1
-rw-r--r--src/mainboard/intel/camelbackmountain_fsp/mainboard.c1
-rw-r--r--src/mainboard/intel/cannonlake_rvp/smihandler.c1
-rw-r--r--src/mainboard/intel/d510mo/romstage.c1
-rw-r--r--src/mainboard/intel/d945gclf/romstage.c1
-rw-r--r--src/mainboard/intel/dg43gt/romstage.c1
-rw-r--r--src/mainboard/intel/emeraldlake2/mainboard.c1
-rw-r--r--src/mainboard/intel/galileo/gpio.c1
-rw-r--r--src/mainboard/intel/galileo/reg_access.c1
-rw-r--r--src/mainboard/intel/kblrvp/chromeos.c1
-rw-r--r--src/mainboard/intel/kblrvp/smihandler.c1
-rw-r--r--src/mainboard/intel/kunimitsu/smihandler.c1
-rw-r--r--src/mainboard/intel/wtm2/chromeos.c1
-rw-r--r--src/mainboard/jetway/nf81-t56n-lf/mptable.c1
-rw-r--r--src/mainboard/jetway/pa78vm5/mainboard.c1
-rw-r--r--src/mainboard/jetway/pa78vm5/mptable.c1
-rw-r--r--src/mainboard/jetway/pa78vm5/resourcemap.c1
-rw-r--r--src/mainboard/kontron/ktqm77/mainboard.c1
-rw-r--r--src/mainboard/lenovo/l520/romstage.c1
-rw-r--r--src/mainboard/lenovo/s230u/mainboard.c1
-rw-r--r--src/mainboard/lenovo/s230u/romstage.c1
-rw-r--r--src/mainboard/lenovo/s230u/smihandler.c1
-rw-r--r--src/mainboard/lenovo/t400/acpi_tables.c1
-rw-r--r--src/mainboard/lenovo/t400/romstage.c1
-rw-r--r--src/mainboard/lenovo/t420/romstage.c1
-rw-r--r--src/mainboard/lenovo/t420s/romstage.c1
-rw-r--r--src/mainboard/lenovo/t430/romstage.c1
-rw-r--r--src/mainboard/lenovo/t430s/variants/t430s/romstage.c1
-rw-r--r--src/mainboard/lenovo/t430s/variants/t431s/romstage.c1
-rw-r--r--src/mainboard/lenovo/t520/romstage.c1
-rw-r--r--src/mainboard/lenovo/t530/romstage.c1
-rw-r--r--src/mainboard/lenovo/x131e/romstage.c1
-rw-r--r--src/mainboard/lenovo/x1_carbon_gen1/romstage.c1
-rw-r--r--src/mainboard/lenovo/x200/acpi_tables.c1
-rw-r--r--src/mainboard/lenovo/x200/romstage.c1
-rw-r--r--src/mainboard/lenovo/x220/romstage.c1
-rw-r--r--src/mainboard/lenovo/x230/romstage.c1
-rw-r--r--src/mainboard/msi/ms9652_fam10/resourcemap.c1
-rw-r--r--src/mainboard/pcengines/apu1/mptable.c1
-rw-r--r--src/mainboard/roda/rk9/acpi_tables.c1
-rw-r--r--src/mainboard/roda/rk9/smihandler.c1
-rw-r--r--src/mainboard/samsung/lumpy/chromeos.c1
-rw-r--r--src/mainboard/samsung/lumpy/smihandler.c1
-rw-r--r--src/mainboard/samsung/stumpy/chromeos.c1
-rw-r--r--src/mainboard/samsung/stumpy/romstage.c1
-rw-r--r--src/mainboard/samsung/stumpy/smihandler.c1
-rw-r--r--src/mainboard/sapphire/pureplatinumh61/romstage.c1
-rw-r--r--src/mainboard/siemens/mc_tcu3/mainboard.c1
-rw-r--r--src/mainboard/siemens/mc_tcu3/romstage.c1
-rw-r--r--src/mainboard/sifive/hifive-unleashed/mainboard.c1
-rw-r--r--src/mainboard/supermicro/h8dmr_fam10/resourcemap.c1
-rw-r--r--src/mainboard/supermicro/h8qme_fam10/resourcemap.c1
-rw-r--r--src/mainboard/supermicro/h8scm_fam10/mainboard.c1
-rw-r--r--src/mainboard/supermicro/h8scm_fam10/mptable.c1
-rw-r--r--src/mainboard/supermicro/h8scm_fam10/resourcemap.c1
-rw-r--r--src/mainboard/tyan/s2912_fam10/resourcemap.c1
-rw-r--r--src/mainboard/via/epia-m850/romstage.c1
174 files changed, 0 insertions, 174 deletions
diff --git a/src/mainboard/advansus/a785e-i/mainboard.c b/src/mainboard/advansus/a785e-i/mainboard.c
index 4b9f581371..d6372aaa7f 100644
--- a/src/mainboard/advansus/a785e-i/mainboard.c
+++ b/src/mainboard/advansus/a785e-i/mainboard.c
@@ -16,7 +16,6 @@
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <cpu/x86/msr.h>
#include <cpu/amd/mtrr.h>
#include <southbridge/amd/common/amd_defs.h>
diff --git a/src/mainboard/advansus/a785e-i/resourcemap.c b/src/mainboard/advansus/a785e-i/resourcemap.c
index ba264f3da5..b46866add5 100644
--- a/src/mainboard/advansus/a785e-i/resourcemap.c
+++ b/src/mainboard/advansus/a785e-i/resourcemap.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <commonlib/helpers.h>
#include <northbridge/amd/amdfam10/amdfam10.h>
diff --git a/src/mainboard/amd/bettong/mptable.c b/src/mainboard/amd/bettong/mptable.c
index 7c35f97c9b..40dec74d93 100644
--- a/src/mainboard/amd/bettong/mptable.c
+++ b/src/mainboard/amd/bettong/mptable.c
@@ -15,7 +15,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <arch/ioapic.h>
#include <string.h>
#include <stdint.h>
diff --git a/src/mainboard/amd/bimini_fam10/mainboard.c b/src/mainboard/amd/bimini_fam10/mainboard.c
index 6372c4b5d2..c8b4f63c36 100644
--- a/src/mainboard/amd/bimini_fam10/mainboard.c
+++ b/src/mainboard/amd/bimini_fam10/mainboard.c
@@ -16,7 +16,6 @@
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <device/pci_def.h>
#include <southbridge/amd/common/amd_defs.h>
#include <southbridge/amd/sb800/sb800.h>
diff --git a/src/mainboard/amd/bimini_fam10/resourcemap.c b/src/mainboard/amd/bimini_fam10/resourcemap.c
index 84897db3c5..47a118bbf8 100644
--- a/src/mainboard/amd/bimini_fam10/resourcemap.c
+++ b/src/mainboard/amd/bimini_fam10/resourcemap.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <commonlib/helpers.h>
#include <northbridge/amd/amdfam10/amdfam10.h>
diff --git a/src/mainboard/amd/db-ft3b-lc/mainboard.c b/src/mainboard/amd/db-ft3b-lc/mainboard.c
index 991b243d82..d5ae9953dc 100644
--- a/src/mainboard/amd/db-ft3b-lc/mainboard.c
+++ b/src/mainboard/amd/db-ft3b-lc/mainboard.c
@@ -15,7 +15,6 @@
*/
#include <arch/acpi.h>
-#include <arch/io.h>
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/mainboard/amd/db-ft3b-lc/mptable.c b/src/mainboard/amd/db-ft3b-lc/mptable.c
index 6495a27d6e..aeb814a81b 100644
--- a/src/mainboard/amd/db-ft3b-lc/mptable.c
+++ b/src/mainboard/amd/db-ft3b-lc/mptable.c
@@ -16,7 +16,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <arch/ioapic.h>
#include <string.h>
#include <stdint.h>
diff --git a/src/mainboard/amd/gardenia/mptable.c b/src/mainboard/amd/gardenia/mptable.c
index 428e5751f8..fa60d35605 100644
--- a/src/mainboard/amd/gardenia/mptable.c
+++ b/src/mainboard/amd/gardenia/mptable.c
@@ -15,7 +15,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <arch/ioapic.h>
#include <string.h>
#include <stdint.h>
diff --git a/src/mainboard/amd/lamar/mainboard.c b/src/mainboard/amd/lamar/mainboard.c
index 94e680b30f..08d21c8149 100644
--- a/src/mainboard/amd/lamar/mainboard.c
+++ b/src/mainboard/amd/lamar/mainboard.c
@@ -16,7 +16,6 @@
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <device/pci_def.h>
#include <arch/acpi.h>
#include <cpu/x86/msr.h>
diff --git a/src/mainboard/amd/lamar/mptable.c b/src/mainboard/amd/lamar/mptable.c
index 2b6c48571c..5b9170bf71 100644
--- a/src/mainboard/amd/lamar/mptable.c
+++ b/src/mainboard/amd/lamar/mptable.c
@@ -15,7 +15,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <arch/ioapic.h>
#include <string.h>
#include <stdint.h>
diff --git a/src/mainboard/amd/mahogany_fam10/mainboard.c b/src/mainboard/amd/mahogany_fam10/mainboard.c
index 48f3f34e14..4120338e41 100644
--- a/src/mainboard/amd/mahogany_fam10/mainboard.c
+++ b/src/mainboard/amd/mahogany_fam10/mainboard.c
@@ -16,7 +16,6 @@
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <southbridge/amd/sb700/sb700.h>
diff --git a/src/mainboard/amd/mahogany_fam10/mptable.c b/src/mainboard/amd/mahogany_fam10/mptable.c
index 8c6ecf3747..bffe1a24f2 100644
--- a/src/mainboard/amd/mahogany_fam10/mptable.c
+++ b/src/mainboard/amd/mahogany_fam10/mptable.c
@@ -15,7 +15,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <string.h>
#include <stdint.h>
diff --git a/src/mainboard/amd/mahogany_fam10/resourcemap.c b/src/mainboard/amd/mahogany_fam10/resourcemap.c
index e7a8cbf53f..80d2d9d05c 100644
--- a/src/mainboard/amd/mahogany_fam10/resourcemap.c
+++ b/src/mainboard/amd/mahogany_fam10/resourcemap.c
@@ -15,7 +15,6 @@
-#include <arch/io.h>
#include <commonlib/helpers.h>
#include <northbridge/amd/amdfam10/amdfam10.h>
diff --git a/src/mainboard/amd/olivehillplus/mainboard.c b/src/mainboard/amd/olivehillplus/mainboard.c
index 1e8d723bf9..45841f942a 100644
--- a/src/mainboard/amd/olivehillplus/mainboard.c
+++ b/src/mainboard/amd/olivehillplus/mainboard.c
@@ -16,7 +16,6 @@
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <device/pci_def.h>
#include <arch/acpi.h>
#include <cpu/x86/msr.h>
diff --git a/src/mainboard/amd/parmer/romstage.c b/src/mainboard/amd/parmer/romstage.c
index 397f361e21..48aee89a9b 100644
--- a/src/mainboard/amd/parmer/romstage.c
+++ b/src/mainboard/amd/parmer/romstage.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <northbridge/amd/agesa/state_machine.h>
#include <southbridge/amd/agesa/hudson/hudson.h>
diff --git a/src/mainboard/amd/persimmon/mptable.c b/src/mainboard/amd/persimmon/mptable.c
index 2b2d05abe1..8fda6662db 100644
--- a/src/mainboard/amd/persimmon/mptable.c
+++ b/src/mainboard/amd/persimmon/mptable.c
@@ -16,7 +16,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <string.h>
#include <stdint.h>
#include <southbridge/amd/cimx/sb800/SBPLATFORM.h>
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/resourcemap.c b/src/mainboard/amd/serengeti_cheetah_fam10/resourcemap.c
index 2c5c907f23..ad99aa835f 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/resourcemap.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/resourcemap.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <commonlib/helpers.h>
#include <northbridge/amd/amdfam10/amdfam10.h>
diff --git a/src/mainboard/amd/tilapia_fam10/mainboard.c b/src/mainboard/amd/tilapia_fam10/mainboard.c
index 63d3671db7..8e50114cab 100644
--- a/src/mainboard/amd/tilapia_fam10/mainboard.c
+++ b/src/mainboard/amd/tilapia_fam10/mainboard.c
@@ -16,7 +16,6 @@
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <southbridge/amd/sb700/sb700.h>
diff --git a/src/mainboard/amd/tilapia_fam10/mptable.c b/src/mainboard/amd/tilapia_fam10/mptable.c
index 8c6ecf3747..bffe1a24f2 100644
--- a/src/mainboard/amd/tilapia_fam10/mptable.c
+++ b/src/mainboard/amd/tilapia_fam10/mptable.c
@@ -15,7 +15,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <string.h>
#include <stdint.h>
diff --git a/src/mainboard/amd/tilapia_fam10/resourcemap.c b/src/mainboard/amd/tilapia_fam10/resourcemap.c
index d51e12819e..2e5c391301 100644
--- a/src/mainboard/amd/tilapia_fam10/resourcemap.c
+++ b/src/mainboard/amd/tilapia_fam10/resourcemap.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <commonlib/helpers.h>
#include <northbridge/amd/amdfam10/amdfam10.h>
diff --git a/src/mainboard/amd/torpedo/acpi_tables.c b/src/mainboard/amd/torpedo/acpi_tables.c
index e3beb740bb..a68592a130 100644
--- a/src/mainboard/amd/torpedo/acpi_tables.c
+++ b/src/mainboard/amd/torpedo/acpi_tables.c
@@ -16,7 +16,6 @@
#include <string.h>
#include <arch/acpi.h>
#include <arch/ioapic.h>
-#include <arch/io.h>
#include <device/pci.h>
extern u32 apicid_sb900;
diff --git a/src/mainboard/aopen/dxplplusu/romstage.c b/src/mainboard/aopen/dxplplusu/romstage.c
index 57538d6f80..2929c0dc58 100644
--- a/src/mainboard/aopen/dxplplusu/romstage.c
+++ b/src/mainboard/aopen/dxplplusu/romstage.c
@@ -14,7 +14,6 @@
*/
#include <stdint.h>
-#include <arch/io.h>
#include <cbmem.h>
#include <console/console.h>
#include <cpu/intel/romstage.h>
diff --git a/src/mainboard/apple/macbook21/mainboard.c b/src/mainboard/apple/macbook21/mainboard.c
index f26c6765f3..bafcb0be46 100644
--- a/src/mainboard/apple/macbook21/mainboard.c
+++ b/src/mainboard/apple/macbook21/mainboard.c
@@ -16,7 +16,6 @@
*/
#include <device/device.h>
-#include <arch/io.h>
#include <delay.h>
#include <device/pci_def.h>
#include <device/pci_ops.h>
diff --git a/src/mainboard/apple/macbook21/smihandler.c b/src/mainboard/apple/macbook21/smihandler.c
index ec2f0772cb..baff7c1905 100644
--- a/src/mainboard/apple/macbook21/smihandler.c
+++ b/src/mainboard/apple/macbook21/smihandler.c
@@ -14,7 +14,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <console/console.h>
#include <cpu/x86/smm.h>
#include <southbridge/intel/i82801gx/nvs.h>
diff --git a/src/mainboard/apple/macbookair4_2/romstage.c b/src/mainboard/apple/macbookair4_2/romstage.c
index 7ccbd6dbf8..68556d96e6 100644
--- a/src/mainboard/apple/macbookair4_2/romstage.c
+++ b/src/mainboard/apple/macbookair4_2/romstage.c
@@ -14,7 +14,6 @@
#include <stdint.h>
#include <string.h>
#include <arch/byteorder.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <northbridge/intel/sandybridge/sandybridge.h>
diff --git a/src/mainboard/asus/am1i-a/mptable.c b/src/mainboard/asus/am1i-a/mptable.c
index c131a43e4f..448a89e5cd 100644
--- a/src/mainboard/asus/am1i-a/mptable.c
+++ b/src/mainboard/asus/am1i-a/mptable.c
@@ -16,7 +16,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <arch/ioapic.h>
#include <string.h>
#include <stdint.h>
diff --git a/src/mainboard/asus/kcma-d8/bootblock.c b/src/mainboard/asus/kcma-d8/bootblock.c
index 01c99baeda..6cfc93ca93 100644
--- a/src/mainboard/asus/kcma-d8/bootblock.c
+++ b/src/mainboard/asus/kcma-d8/bootblock.c
@@ -15,7 +15,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <pc80/mc146818rtc.h>
diff --git a/src/mainboard/asus/kcma-d8/mptable.c b/src/mainboard/asus/kcma-d8/mptable.c
index 452c7a546f..1abca65407 100644
--- a/src/mainboard/asus/kcma-d8/mptable.c
+++ b/src/mainboard/asus/kcma-d8/mptable.c
@@ -16,7 +16,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <string.h>
#include <stdint.h>
diff --git a/src/mainboard/asus/kcma-d8/resourcemap.c b/src/mainboard/asus/kcma-d8/resourcemap.c
index 0dd0a9f12e..bcef3e45f4 100644
--- a/src/mainboard/asus/kcma-d8/resourcemap.c
+++ b/src/mainboard/asus/kcma-d8/resourcemap.c
@@ -17,7 +17,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <commonlib/helpers.h>
#include <northbridge/amd/amdfam10/amdfam10.h>
diff --git a/src/mainboard/asus/kfsn4-dre/acpi_tables.c b/src/mainboard/asus/kfsn4-dre/acpi_tables.c
index 530521b197..ce3d4178da 100644
--- a/src/mainboard/asus/kfsn4-dre/acpi_tables.c
+++ b/src/mainboard/asus/kfsn4-dre/acpi_tables.c
@@ -23,7 +23,6 @@
#include <string.h>
#include <assert.h>
#include <arch/acpi.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <arch/smp/mpspec.h>
#include <device/pci.h>
diff --git a/src/mainboard/asus/kfsn4-dre/resourcemap.c b/src/mainboard/asus/kfsn4-dre/resourcemap.c
index 9efc60cb56..b48f8f1275 100644
--- a/src/mainboard/asus/kfsn4-dre/resourcemap.c
+++ b/src/mainboard/asus/kfsn4-dre/resourcemap.c
@@ -17,7 +17,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <commonlib/helpers.h>
#include <northbridge/amd/amdfam10/amdfam10.h>
diff --git a/src/mainboard/asus/kgpe-d16/bootblock.c b/src/mainboard/asus/kgpe-d16/bootblock.c
index 01c99baeda..6cfc93ca93 100644
--- a/src/mainboard/asus/kgpe-d16/bootblock.c
+++ b/src/mainboard/asus/kgpe-d16/bootblock.c
@@ -15,7 +15,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <pc80/mc146818rtc.h>
diff --git a/src/mainboard/asus/kgpe-d16/mptable.c b/src/mainboard/asus/kgpe-d16/mptable.c
index fa31fc534c..15d0f500d6 100644
--- a/src/mainboard/asus/kgpe-d16/mptable.c
+++ b/src/mainboard/asus/kgpe-d16/mptable.c
@@ -16,7 +16,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <string.h>
#include <stdint.h>
diff --git a/src/mainboard/asus/kgpe-d16/resourcemap.c b/src/mainboard/asus/kgpe-d16/resourcemap.c
index cc3a23a4fd..ce9add3ae1 100644
--- a/src/mainboard/asus/kgpe-d16/resourcemap.c
+++ b/src/mainboard/asus/kgpe-d16/resourcemap.c
@@ -17,7 +17,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <commonlib/helpers.h>
#include <northbridge/amd/amdfam10/amdfam10.h>
diff --git a/src/mainboard/asus/m4a78-em/mainboard.c b/src/mainboard/asus/m4a78-em/mainboard.c
index 1607e7f5f3..66da65baad 100644
--- a/src/mainboard/asus/m4a78-em/mainboard.c
+++ b/src/mainboard/asus/m4a78-em/mainboard.c
@@ -16,7 +16,6 @@
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <southbridge/amd/sb700/sb700.h>
diff --git a/src/mainboard/asus/m4a78-em/mptable.c b/src/mainboard/asus/m4a78-em/mptable.c
index 8c6ecf3747..bffe1a24f2 100644
--- a/src/mainboard/asus/m4a78-em/mptable.c
+++ b/src/mainboard/asus/m4a78-em/mptable.c
@@ -15,7 +15,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <string.h>
#include <stdint.h>
diff --git a/src/mainboard/asus/m4a78-em/resourcemap.c b/src/mainboard/asus/m4a78-em/resourcemap.c
index e7a8cbf53f..80d2d9d05c 100644
--- a/src/mainboard/asus/m4a78-em/resourcemap.c
+++ b/src/mainboard/asus/m4a78-em/resourcemap.c
@@ -15,7 +15,6 @@
-#include <arch/io.h>
#include <commonlib/helpers.h>
#include <northbridge/amd/amdfam10/amdfam10.h>
diff --git a/src/mainboard/asus/m4a785-m/mainboard.c b/src/mainboard/asus/m4a785-m/mainboard.c
index f5683f84e0..aa6b920db2 100644
--- a/src/mainboard/asus/m4a785-m/mainboard.c
+++ b/src/mainboard/asus/m4a785-m/mainboard.c
@@ -16,7 +16,6 @@
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <southbridge/amd/sb700/sb700.h>
diff --git a/src/mainboard/asus/m4a785-m/mptable.c b/src/mainboard/asus/m4a785-m/mptable.c
index 8c6ecf3747..bffe1a24f2 100644
--- a/src/mainboard/asus/m4a785-m/mptable.c
+++ b/src/mainboard/asus/m4a785-m/mptable.c
@@ -15,7 +15,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <string.h>
#include <stdint.h>
diff --git a/src/mainboard/asus/m4a785-m/resourcemap.c b/src/mainboard/asus/m4a785-m/resourcemap.c
index e7a8cbf53f..80d2d9d05c 100644
--- a/src/mainboard/asus/m4a785-m/resourcemap.c
+++ b/src/mainboard/asus/m4a785-m/resourcemap.c
@@ -15,7 +15,6 @@
-#include <arch/io.h>
#include <commonlib/helpers.h>
#include <northbridge/amd/amdfam10/amdfam10.h>
diff --git a/src/mainboard/asus/m5a88-v/mainboard.c b/src/mainboard/asus/m5a88-v/mainboard.c
index 2eef74ffca..ee8ce5ea81 100644
--- a/src/mainboard/asus/m5a88-v/mainboard.c
+++ b/src/mainboard/asus/m5a88-v/mainboard.c
@@ -16,7 +16,6 @@
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <southbridge/amd/common/amd_defs.h>
#include <device/pci_def.h>
#include <southbridge/amd/rs780/rs780.h>
diff --git a/src/mainboard/asus/m5a88-v/resourcemap.c b/src/mainboard/asus/m5a88-v/resourcemap.c
index 85ba50b8aa..fe096a2c59 100644
--- a/src/mainboard/asus/m5a88-v/resourcemap.c
+++ b/src/mainboard/asus/m5a88-v/resourcemap.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <commonlib/helpers.h>
#include <northbridge/amd/amdfam10/amdfam10.h>
diff --git a/src/mainboard/asus/p5qc/romstage.c b/src/mainboard/asus/p5qc/romstage.c
index fa8408d640..216156780b 100644
--- a/src/mainboard/asus/p5qc/romstage.c
+++ b/src/mainboard/asus/p5qc/romstage.c
@@ -14,7 +14,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <console/console.h>
#include <southbridge/intel/i82801jx/i82801jx.h>
diff --git a/src/mainboard/asus/p8h61-m_lx/romstage.c b/src/mainboard/asus/p8h61-m_lx/romstage.c
index 76fc8aa842..09ca7db238 100644
--- a/src/mainboard/asus/p8h61-m_lx/romstage.c
+++ b/src/mainboard/asus/p8h61-m_lx/romstage.c
@@ -14,7 +14,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/dram/ddr3.h>
#include <northbridge/intel/sandybridge/raminit_native.h>
diff --git a/src/mainboard/avalue/eax-785e/mainboard.c b/src/mainboard/avalue/eax-785e/mainboard.c
index 67536336b5..45779dd15b 100644
--- a/src/mainboard/avalue/eax-785e/mainboard.c
+++ b/src/mainboard/avalue/eax-785e/mainboard.c
@@ -16,7 +16,6 @@
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <southbridge/amd/common/amd_defs.h>
#include <device/pci_def.h>
#include <southbridge/amd/rs780/rs780.h>
diff --git a/src/mainboard/avalue/eax-785e/resourcemap.c b/src/mainboard/avalue/eax-785e/resourcemap.c
index ba264f3da5..b46866add5 100644
--- a/src/mainboard/avalue/eax-785e/resourcemap.c
+++ b/src/mainboard/avalue/eax-785e/resourcemap.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <commonlib/helpers.h>
#include <northbridge/amd/amdfam10/amdfam10.h>
diff --git a/src/mainboard/bap/ode_e20XX/mptable.c b/src/mainboard/bap/ode_e20XX/mptable.c
index 1808181cd8..d0704f370d 100644
--- a/src/mainboard/bap/ode_e20XX/mptable.c
+++ b/src/mainboard/bap/ode_e20XX/mptable.c
@@ -15,7 +15,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <arch/ioapic.h>
#include <string.h>
#include <stdint.h>
diff --git a/src/mainboard/bap/ode_e21XX/mainboard.c b/src/mainboard/bap/ode_e21XX/mainboard.c
index 1e8d723bf9..45841f942a 100644
--- a/src/mainboard/bap/ode_e21XX/mainboard.c
+++ b/src/mainboard/bap/ode_e21XX/mainboard.c
@@ -16,7 +16,6 @@
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <device/pci_def.h>
#include <arch/acpi.h>
#include <cpu/x86/msr.h>
diff --git a/src/mainboard/biostar/am1ml/mptable.c b/src/mainboard/biostar/am1ml/mptable.c
index 6cb655ec09..cb1274ed91 100644
--- a/src/mainboard/biostar/am1ml/mptable.c
+++ b/src/mainboard/biostar/am1ml/mptable.c
@@ -15,7 +15,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <arch/ioapic.h>
#include <string.h>
#include <stdint.h>
diff --git a/src/mainboard/elmex/pcm205400/mptable.c b/src/mainboard/elmex/pcm205400/mptable.c
index 2b2d05abe1..8fda6662db 100644
--- a/src/mainboard/elmex/pcm205400/mptable.c
+++ b/src/mainboard/elmex/pcm205400/mptable.c
@@ -16,7 +16,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <string.h>
#include <stdint.h>
#include <southbridge/amd/cimx/sb800/SBPLATFORM.h>
diff --git a/src/mainboard/emulation/qemu-power8/uart.c b/src/mainboard/emulation/qemu-power8/uart.c
index 508d679c5c..9548b7c696 100644
--- a/src/mainboard/emulation/qemu-power8/uart.c
+++ b/src/mainboard/emulation/qemu-power8/uart.c
@@ -15,7 +15,6 @@
#include <types.h>
#include <console/uart.h>
-#include <arch/io.h>
#include <boot/coreboot_tables.h>
static uint8_t *buf = (void *)0;
diff --git a/src/mainboard/emulation/qemu-q35/bootblock.c b/src/mainboard/emulation/qemu-q35/bootblock.c
index 5ee5fc9738..13550f7e3d 100644
--- a/src/mainboard/emulation/qemu-q35/bootblock.c
+++ b/src/mainboard/emulation/qemu-q35/bootblock.c
@@ -11,7 +11,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <bootblock_common.h>
#include <southbridge/intel/i82801ix/i82801ix.h>
diff --git a/src/mainboard/emulation/qemu-riscv/uart.c b/src/mainboard/emulation/qemu-riscv/uart.c
index 084362abcf..021713a40a 100644
--- a/src/mainboard/emulation/qemu-riscv/uart.c
+++ b/src/mainboard/emulation/qemu-riscv/uart.c
@@ -15,7 +15,6 @@
#include <types.h>
#include <console/uart.h>
-#include <arch/io.h>
#include <boot/coreboot_tables.h>
#include <mainboard/addressmap.h>
diff --git a/src/mainboard/emulation/spike-riscv/uart.c b/src/mainboard/emulation/spike-riscv/uart.c
index 26ab630091..eeb0b5798a 100644
--- a/src/mainboard/emulation/spike-riscv/uart.c
+++ b/src/mainboard/emulation/spike-riscv/uart.c
@@ -15,7 +15,6 @@
#include <types.h>
#include <console/uart.h>
-#include <arch/io.h>
#include <boot/coreboot_tables.h>
uintptr_t uart_platform_base(int idx)
diff --git a/src/mainboard/foxconn/d41s/romstage.c b/src/mainboard/foxconn/d41s/romstage.c
index fefc5f9884..ecff4b9a2d 100644
--- a/src/mainboard/foxconn/d41s/romstage.c
+++ b/src/mainboard/foxconn/d41s/romstage.c
@@ -15,7 +15,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <southbridge/intel/i82801gx/i82801gx.h>
#include <northbridge/intel/pineview/pineview.h>
diff --git a/src/mainboard/getac/p470/mainboard.c b/src/mainboard/getac/p470/mainboard.c
index 20e723030a..813b1d632e 100644
--- a/src/mainboard/getac/p470/mainboard.c
+++ b/src/mainboard/getac/p470/mainboard.c
@@ -16,7 +16,6 @@
#include <device/device.h>
#include <device/pci_def.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <delay.h>
#include <drivers/intel/gma/int15.h>
diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c b/src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c
index 8d714a08b5..4f445ab1e1 100644
--- a/src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c
+++ b/src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c
@@ -18,7 +18,6 @@
#include <stdint.h>
#include <string.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <cpu/x86/lapic.h>
diff --git a/src/mainboard/gigabyte/ga-g41m-es2l/romstage.c b/src/mainboard/gigabyte/ga-g41m-es2l/romstage.c
index c5d731c3ea..7c033997f9 100644
--- a/src/mainboard/gigabyte/ga-g41m-es2l/romstage.c
+++ b/src/mainboard/gigabyte/ga-g41m-es2l/romstage.c
@@ -16,7 +16,6 @@
#include <stdint.h>
#include <device/pci_def.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <console/console.h>
#include <southbridge/intel/i82801gx/i82801gx.h>
diff --git a/src/mainboard/gigabyte/ma785gm/mainboard.c b/src/mainboard/gigabyte/ma785gm/mainboard.c
index ddf55b623f..1c5c1abc16 100644
--- a/src/mainboard/gigabyte/ma785gm/mainboard.c
+++ b/src/mainboard/gigabyte/ma785gm/mainboard.c
@@ -16,7 +16,6 @@
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <southbridge/amd/sb700/sb700.h>
diff --git a/src/mainboard/gigabyte/ma785gm/mptable.c b/src/mainboard/gigabyte/ma785gm/mptable.c
index 8c6ecf3747..bffe1a24f2 100644
--- a/src/mainboard/gigabyte/ma785gm/mptable.c
+++ b/src/mainboard/gigabyte/ma785gm/mptable.c
@@ -15,7 +15,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <string.h>
#include <stdint.h>
diff --git a/src/mainboard/gigabyte/ma785gm/resourcemap.c b/src/mainboard/gigabyte/ma785gm/resourcemap.c
index e7a8cbf53f..80d2d9d05c 100644
--- a/src/mainboard/gigabyte/ma785gm/resourcemap.c
+++ b/src/mainboard/gigabyte/ma785gm/resourcemap.c
@@ -15,7 +15,6 @@
-#include <arch/io.h>
#include <commonlib/helpers.h>
#include <northbridge/amd/amdfam10/amdfam10.h>
diff --git a/src/mainboard/gigabyte/ma785gmt/mainboard.c b/src/mainboard/gigabyte/ma785gmt/mainboard.c
index 22f71d05dc..899ca28ab4 100644
--- a/src/mainboard/gigabyte/ma785gmt/mainboard.c
+++ b/src/mainboard/gigabyte/ma785gmt/mainboard.c
@@ -16,7 +16,6 @@
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <southbridge/amd/sb700/sb700.h>
diff --git a/src/mainboard/gigabyte/ma785gmt/mptable.c b/src/mainboard/gigabyte/ma785gmt/mptable.c
index 8c6ecf3747..bffe1a24f2 100644
--- a/src/mainboard/gigabyte/ma785gmt/mptable.c
+++ b/src/mainboard/gigabyte/ma785gmt/mptable.c
@@ -15,7 +15,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <string.h>
#include <stdint.h>
diff --git a/src/mainboard/gigabyte/ma785gmt/resourcemap.c b/src/mainboard/gigabyte/ma785gmt/resourcemap.c
index e7a8cbf53f..80d2d9d05c 100644
--- a/src/mainboard/gigabyte/ma785gmt/resourcemap.c
+++ b/src/mainboard/gigabyte/ma785gmt/resourcemap.c
@@ -15,7 +15,6 @@
-#include <arch/io.h>
#include <commonlib/helpers.h>
#include <northbridge/amd/amdfam10/amdfam10.h>
diff --git a/src/mainboard/gigabyte/ma78gm/mainboard.c b/src/mainboard/gigabyte/ma78gm/mainboard.c
index 1fe75dfd1b..fb6045a6d8 100644
--- a/src/mainboard/gigabyte/ma78gm/mainboard.c
+++ b/src/mainboard/gigabyte/ma78gm/mainboard.c
@@ -17,7 +17,6 @@
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <southbridge/amd/sb700/sb700.h>
diff --git a/src/mainboard/gigabyte/ma78gm/mptable.c b/src/mainboard/gigabyte/ma78gm/mptable.c
index 8c6ecf3747..bffe1a24f2 100644
--- a/src/mainboard/gigabyte/ma78gm/mptable.c
+++ b/src/mainboard/gigabyte/ma78gm/mptable.c
@@ -15,7 +15,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <string.h>
#include <stdint.h>
diff --git a/src/mainboard/gigabyte/ma78gm/resourcemap.c b/src/mainboard/gigabyte/ma78gm/resourcemap.c
index e7a8cbf53f..80d2d9d05c 100644
--- a/src/mainboard/gigabyte/ma78gm/resourcemap.c
+++ b/src/mainboard/gigabyte/ma78gm/resourcemap.c
@@ -15,7 +15,6 @@
-#include <arch/io.h>
#include <commonlib/helpers.h>
#include <northbridge/amd/amdfam10/amdfam10.h>
diff --git a/src/mainboard/gizmosphere/gizmo2/mptable.c b/src/mainboard/gizmosphere/gizmo2/mptable.c
index 1808181cd8..d0704f370d 100644
--- a/src/mainboard/gizmosphere/gizmo2/mptable.c
+++ b/src/mainboard/gizmosphere/gizmo2/mptable.c
@@ -15,7 +15,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <arch/ioapic.h>
#include <string.h>
#include <stdint.h>
diff --git a/src/mainboard/google/auron/variant.h b/src/mainboard/google/auron/variant.h
index 9c27a9a652..e5f5f0404b 100644
--- a/src/mainboard/google/auron/variant.h
+++ b/src/mainboard/google/auron/variant.h
@@ -14,7 +14,6 @@
#ifndef VARIANT_H
#define VARIANT_H
-#include <arch/io.h>
#include <device/device.h>
#include <soc/romstage.h>
diff --git a/src/mainboard/google/beltino/chromeos.c b/src/mainboard/google/beltino/chromeos.c
index 0d7406d01a..8e8764e048 100644
--- a/src/mainboard/google/beltino/chromeos.c
+++ b/src/mainboard/google/beltino/chromeos.c
@@ -14,7 +14,6 @@
*/
#include <string.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <bootmode.h>
#include <device/device.h>
diff --git a/src/mainboard/google/beltino/smihandler.c b/src/mainboard/google/beltino/smihandler.c
index 074a3e9153..1a03f2340b 100644
--- a/src/mainboard/google/beltino/smihandler.c
+++ b/src/mainboard/google/beltino/smihandler.c
@@ -15,7 +15,6 @@
*/
#include <arch/acpi.h>
-#include <arch/io.h>
#include <console/console.h>
#include <cpu/intel/haswell/haswell.h>
#include <cpu/x86/smm.h>
diff --git a/src/mainboard/google/butterfly/chromeos.c b/src/mainboard/google/butterfly/chromeos.c
index 6aebaeb003..4108e31bbf 100644
--- a/src/mainboard/google/butterfly/chromeos.c
+++ b/src/mainboard/google/butterfly/chromeos.c
@@ -16,7 +16,6 @@
#include <console/console.h>
#include <string.h>
#include <bootmode.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/mainboard/google/butterfly/mainboard_smi.c b/src/mainboard/google/butterfly/mainboard_smi.c
index 03e03166f7..cd669c9dca 100644
--- a/src/mainboard/google/butterfly/mainboard_smi.c
+++ b/src/mainboard/google/butterfly/mainboard_smi.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <console/console.h>
#include <cpu/x86/smm.h>
#include <southbridge/intel/bd82x6x/nvs.h>
diff --git a/src/mainboard/google/butterfly/romstage.c b/src/mainboard/google/butterfly/romstage.c
index cb3f1395fe..f5383a770d 100644
--- a/src/mainboard/google/butterfly/romstage.c
+++ b/src/mainboard/google/butterfly/romstage.c
@@ -17,7 +17,6 @@
#include <stdint.h>
#include <string.h>
#include <timestamp.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <cpu/x86/lapic.h>
diff --git a/src/mainboard/google/eve/smihandler.c b/src/mainboard/google/eve/smihandler.c
index e449900cb1..7b97446271 100644
--- a/src/mainboard/google/eve/smihandler.c
+++ b/src/mainboard/google/eve/smihandler.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <cpu/x86/smm.h>
#include <ec/google/chromeec/smm.h>
#include <gpio.h>
diff --git a/src/mainboard/google/foster/mainboard.c b/src/mainboard/google/foster/mainboard.c
index 3c2d831bf8..d3091ad8f4 100644
--- a/src/mainboard/google/foster/mainboard.c
+++ b/src/mainboard/google/foster/mainboard.c
@@ -14,7 +14,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <arch/mmu.h>
#include <boot/coreboot_tables.h>
#include <delay.h>
diff --git a/src/mainboard/google/foster/reset.c b/src/mainboard/google/foster/reset.c
index b30e1ace91..60e8133776 100644
--- a/src/mainboard/google/foster/reset.c
+++ b/src/mainboard/google/foster/reset.c
@@ -14,7 +14,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <gpio.h>
#include <reset.h>
diff --git a/src/mainboard/google/glados/smihandler.c b/src/mainboard/google/glados/smihandler.c
index dd2c4486a8..5296b0f5cc 100644
--- a/src/mainboard/google/glados/smihandler.c
+++ b/src/mainboard/google/glados/smihandler.c
@@ -15,7 +15,6 @@
*/
#include <arch/acpi.h>
-#include <arch/io.h>
#include <baseboard/variant.h>
#include <console/console.h>
#include <cpu/x86/smm.h>
diff --git a/src/mainboard/google/gru/sdram_configs.c b/src/mainboard/google/gru/sdram_configs.c
index 2091c36b7a..e67f0ec2f7 100644
--- a/src/mainboard/google/gru/sdram_configs.c
+++ b/src/mainboard/google/gru/sdram_configs.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <boardid.h>
#include <cbfs.h>
#include <console/console.h>
diff --git a/src/mainboard/google/jecht/chromeos.c b/src/mainboard/google/jecht/chromeos.c
index 1e8ea9463f..6008ba70e3 100644
--- a/src/mainboard/google/jecht/chromeos.c
+++ b/src/mainboard/google/jecht/chromeos.c
@@ -14,7 +14,6 @@
*/
#include <string.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/mainboard/google/jecht/smihandler.c b/src/mainboard/google/jecht/smihandler.c
index b9a84bf018..8a9e2a61f9 100644
--- a/src/mainboard/google/jecht/smihandler.c
+++ b/src/mainboard/google/jecht/smihandler.c
@@ -15,7 +15,6 @@
*/
#include <arch/acpi.h>
-#include <arch/io.h>
#include <console/console.h>
#include <cpu/x86/smm.h>
#include <soc/pm.h>
diff --git a/src/mainboard/google/kahlee/mptable.c b/src/mainboard/google/kahlee/mptable.c
index 428e5751f8..fa60d35605 100644
--- a/src/mainboard/google/kahlee/mptable.c
+++ b/src/mainboard/google/kahlee/mptable.c
@@ -15,7 +15,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <arch/ioapic.h>
#include <string.h>
#include <stdint.h>
diff --git a/src/mainboard/google/link/mainboard_smi.c b/src/mainboard/google/link/mainboard_smi.c
index 0bd164e959..f2b55002f8 100644
--- a/src/mainboard/google/link/mainboard_smi.c
+++ b/src/mainboard/google/link/mainboard_smi.c
@@ -14,7 +14,6 @@
*/
#include <arch/acpi.h>
-#include <arch/io.h>
#include <console/console.h>
#include <cpu/x86/smm.h>
#include <southbridge/intel/bd82x6x/nvs.h>
diff --git a/src/mainboard/google/link/romstage.c b/src/mainboard/google/link/romstage.c
index d9755bea99..31051ef720 100644
--- a/src/mainboard/google/link/romstage.c
+++ b/src/mainboard/google/link/romstage.c
@@ -17,7 +17,6 @@
#include <stdint.h>
#include <string.h>
#include <timestamp.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/pci.h>
#include <device/pci_def.h>
diff --git a/src/mainboard/google/nyan/romstage.c b/src/mainboard/google/nyan/romstage.c
index 2dd4c2d8bd..098ebaf3e8 100644
--- a/src/mainboard/google/nyan/romstage.c
+++ b/src/mainboard/google/nyan/romstage.c
@@ -15,7 +15,6 @@
#include <arch/cache.h>
#include <arch/exception.h>
-#include <arch/io.h>
#include <cbmem.h>
#include <console/console.h>
#include <reset.h>
diff --git a/src/mainboard/google/nyan_big/romstage.c b/src/mainboard/google/nyan_big/romstage.c
index 2dd4c2d8bd..098ebaf3e8 100644
--- a/src/mainboard/google/nyan_big/romstage.c
+++ b/src/mainboard/google/nyan_big/romstage.c
@@ -15,7 +15,6 @@
#include <arch/cache.h>
#include <arch/exception.h>
-#include <arch/io.h>
#include <cbmem.h>
#include <console/console.h>
#include <reset.h>
diff --git a/src/mainboard/google/nyan_blaze/romstage.c b/src/mainboard/google/nyan_blaze/romstage.c
index 30278f9614..35b58d823b 100644
--- a/src/mainboard/google/nyan_blaze/romstage.c
+++ b/src/mainboard/google/nyan_blaze/romstage.c
@@ -15,7 +15,6 @@
#include <arch/cache.h>
#include <arch/exception.h>
-#include <arch/io.h>
#include <cbmem.h>
#include <console/console.h>
#include <reset.h>
diff --git a/src/mainboard/google/oak/mainboard.c b/src/mainboard/google/oak/mainboard.c
index 2510a6533e..7ffa746b66 100644
--- a/src/mainboard/google/oak/mainboard.c
+++ b/src/mainboard/google/oak/mainboard.c
@@ -14,7 +14,6 @@
*/
#include <arch/cache.h>
-#include <arch/io.h>
#include <boardid.h>
#include <boot/coreboot_tables.h>
#include <bootmode.h>
diff --git a/src/mainboard/google/octopus/ec.c b/src/mainboard/google/octopus/ec.c
index afc241dca8..469980687c 100644
--- a/src/mainboard/google/octopus/ec.c
+++ b/src/mainboard/google/octopus/ec.c
@@ -14,7 +14,6 @@
*/
#include <arch/acpi.h>
-#include <arch/io.h>
#include <console/console.h>
#include <ec/ec.h>
#include <ec/google/chromeec/ec.h>
diff --git a/src/mainboard/google/parrot/chromeos.c b/src/mainboard/google/parrot/chromeos.c
index 6efd57afb2..6e6a4dee03 100644
--- a/src/mainboard/google/parrot/chromeos.c
+++ b/src/mainboard/google/parrot/chromeos.c
@@ -16,7 +16,6 @@
#include <console/console.h>
#include <string.h>
#include <bootmode.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/mainboard/google/parrot/ec.c b/src/mainboard/google/parrot/ec.c
index d75cc29fa8..623c0bc77c 100644
--- a/src/mainboard/google/parrot/ec.c
+++ b/src/mainboard/google/parrot/ec.c
@@ -17,7 +17,6 @@
#include <types.h>
#include <console/console.h>
#include <device/device.h>
-#include <arch/io.h>
#include <ec/compal/ene932/ec.h>
#include "ec.h"
diff --git a/src/mainboard/google/parrot/romstage.c b/src/mainboard/google/parrot/romstage.c
index f6eb78a8a3..c9b4e9158c 100644
--- a/src/mainboard/google/parrot/romstage.c
+++ b/src/mainboard/google/parrot/romstage.c
@@ -17,7 +17,6 @@
#include <stdint.h>
#include <string.h>
#include <timestamp.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <cpu/x86/lapic.h>
diff --git a/src/mainboard/google/parrot/smihandler.c b/src/mainboard/google/parrot/smihandler.c
index e30f78f3a1..e49dfce2b1 100644
--- a/src/mainboard/google/parrot/smihandler.c
+++ b/src/mainboard/google/parrot/smihandler.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <console/console.h>
#include <cpu/x86/smm.h>
#include <southbridge/intel/bd82x6x/nvs.h>
diff --git a/src/mainboard/google/rambi/mainboard.c b/src/mainboard/google/rambi/mainboard.c
index 641b4de637..6802de9783 100644
--- a/src/mainboard/google/rambi/mainboard.c
+++ b/src/mainboard/google/rambi/mainboard.c
@@ -24,7 +24,6 @@
#include <x86emu/x86emu.h>
#endif
#include <arch/acpi.h>
-#include <arch/io.h>
#include <arch/interrupt.h>
#include <boot/coreboot_tables.h>
#include <smbios.h>
diff --git a/src/mainboard/google/smaug/reset.c b/src/mainboard/google/smaug/reset.c
index 121cf64bc9..1d96343b49 100644
--- a/src/mainboard/google/smaug/reset.c
+++ b/src/mainboard/google/smaug/reset.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <reset.h>
#include "gpio.h"
diff --git a/src/mainboard/google/stout/chromeos.c b/src/mainboard/google/stout/chromeos.c
index 090cd6c0d7..6a4be31fa4 100644
--- a/src/mainboard/google/stout/chromeos.c
+++ b/src/mainboard/google/stout/chromeos.c
@@ -15,7 +15,6 @@
#include <string.h>
#include <bootmode.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <console/console.h>
#include <device/device.h>
diff --git a/src/mainboard/google/stout/ec.c b/src/mainboard/google/stout/ec.c
index 229f919a53..6c895085c2 100644
--- a/src/mainboard/google/stout/ec.c
+++ b/src/mainboard/google/stout/ec.c
@@ -14,7 +14,6 @@
*/
#include <arch/acpi.h>
-#include <arch/io.h>
#include <bootmode.h>
#include <types.h>
#include <console/console.h>
diff --git a/src/mainboard/google/stout/mainboard.c b/src/mainboard/google/stout/mainboard.c
index b63083fb49..2024abf34c 100644
--- a/src/mainboard/google/stout/mainboard.c
+++ b/src/mainboard/google/stout/mainboard.c
@@ -21,7 +21,6 @@
#include <device/pci_ops.h>
#include <drivers/intel/gma/int15.h>
#include <arch/acpi.h>
-#include <arch/io.h>
#include <arch/interrupt.h>
#include <boot/coreboot_tables.h>
#include "onboard.h"
diff --git a/src/mainboard/google/stout/mainboard_smi.c b/src/mainboard/google/stout/mainboard_smi.c
index 77d7a05361..ce89f9c375 100644
--- a/src/mainboard/google/stout/mainboard_smi.c
+++ b/src/mainboard/google/stout/mainboard_smi.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <console/console.h>
#include <cpu/x86/smm.h>
diff --git a/src/mainboard/google/stout/romstage.c b/src/mainboard/google/stout/romstage.c
index ab25b14467..f6f36118e8 100644
--- a/src/mainboard/google/stout/romstage.c
+++ b/src/mainboard/google/stout/romstage.c
@@ -17,7 +17,6 @@
#include <stdint.h>
#include <string.h>
#include <timestamp.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <cpu/x86/lapic.h>
diff --git a/src/mainboard/google/urara/mainboard.c b/src/mainboard/google/urara/mainboard.c
index d7ed51e584..1158411654 100644
--- a/src/mainboard/google/urara/mainboard.c
+++ b/src/mainboard/google/urara/mainboard.c
@@ -13,7 +13,6 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <symbols.h>
#include <console/console.h>
#include <device/device.h>
diff --git a/src/mainboard/google/veyron/sdram_configs.c b/src/mainboard/google/veyron/sdram_configs.c
index d8748c1aa9..8cc16b3147 100644
--- a/src/mainboard/google/veyron/sdram_configs.c
+++ b/src/mainboard/google/veyron/sdram_configs.c
@@ -12,7 +12,6 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <boardid.h>
#include <console/console.h>
#include <gpio.h>
diff --git a/src/mainboard/google/veyron_mickey/sdram_configs.c b/src/mainboard/google/veyron_mickey/sdram_configs.c
index d8748c1aa9..8cc16b3147 100644
--- a/src/mainboard/google/veyron_mickey/sdram_configs.c
+++ b/src/mainboard/google/veyron_mickey/sdram_configs.c
@@ -12,7 +12,6 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <boardid.h>
#include <console/console.h>
#include <gpio.h>
diff --git a/src/mainboard/google/veyron_rialto/sdram_configs.c b/src/mainboard/google/veyron_rialto/sdram_configs.c
index eba7a39c39..590b051ff8 100644
--- a/src/mainboard/google/veyron_rialto/sdram_configs.c
+++ b/src/mainboard/google/veyron_rialto/sdram_configs.c
@@ -12,7 +12,6 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <boardid.h>
#include <console/console.h>
#include <gpio.h>
diff --git a/src/mainboard/hp/2570p/romstage.c b/src/mainboard/hp/2570p/romstage.c
index 0d6e65c230..21e3ceaa3d 100644
--- a/src/mainboard/hp/2570p/romstage.c
+++ b/src/mainboard/hp/2570p/romstage.c
@@ -14,7 +14,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <northbridge/intel/sandybridge/sandybridge.h>
#include <northbridge/intel/sandybridge/raminit_native.h>
diff --git a/src/mainboard/hp/2760p/romstage.c b/src/mainboard/hp/2760p/romstage.c
index 92a935ac31..68af61ba22 100644
--- a/src/mainboard/hp/2760p/romstage.c
+++ b/src/mainboard/hp/2760p/romstage.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <northbridge/intel/sandybridge/sandybridge.h>
#include <northbridge/intel/sandybridge/raminit_native.h>
diff --git a/src/mainboard/hp/8460p/romstage.c b/src/mainboard/hp/8460p/romstage.c
index dd95def916..a3fb5f095f 100644
--- a/src/mainboard/hp/8460p/romstage.c
+++ b/src/mainboard/hp/8460p/romstage.c
@@ -14,7 +14,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <northbridge/intel/sandybridge/sandybridge.h>
#include <northbridge/intel/sandybridge/raminit_native.h>
diff --git a/src/mainboard/hp/8470p/romstage.c b/src/mainboard/hp/8470p/romstage.c
index 7e18fb23b4..a8761739d5 100644
--- a/src/mainboard/hp/8470p/romstage.c
+++ b/src/mainboard/hp/8470p/romstage.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <northbridge/intel/sandybridge/sandybridge.h>
#include <northbridge/intel/sandybridge/raminit_native.h>
diff --git a/src/mainboard/hp/8770w/romstage.c b/src/mainboard/hp/8770w/romstage.c
index 6cce3312d8..a7f6b22aa3 100644
--- a/src/mainboard/hp/8770w/romstage.c
+++ b/src/mainboard/hp/8770w/romstage.c
@@ -14,7 +14,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <northbridge/intel/sandybridge/sandybridge.h>
#include <northbridge/intel/sandybridge/raminit_native.h>
diff --git a/src/mainboard/hp/compaq_8200_elite_sff/romstage.c b/src/mainboard/hp/compaq_8200_elite_sff/romstage.c
index 3ad60eb6b9..6ea302df5e 100644
--- a/src/mainboard/hp/compaq_8200_elite_sff/romstage.c
+++ b/src/mainboard/hp/compaq_8200_elite_sff/romstage.c
@@ -18,7 +18,6 @@
#include <stdint.h>
#include <arch/byteorder.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <superio/nuvoton/npcd378/npcd378.h>
diff --git a/src/mainboard/hp/folio_9470m/romstage.c b/src/mainboard/hp/folio_9470m/romstage.c
index 5230245d62..db3296c457 100644
--- a/src/mainboard/hp/folio_9470m/romstage.c
+++ b/src/mainboard/hp/folio_9470m/romstage.c
@@ -15,7 +15,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <northbridge/intel/sandybridge/sandybridge.h>
#include <northbridge/intel/sandybridge/raminit_native.h>
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/mainboard.c b/src/mainboard/hp/pavilion_m6_1035dx/mainboard.c
index d7f0771463..da450c6813 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/mainboard.c
+++ b/src/mainboard/hp/pavilion_m6_1035dx/mainboard.c
@@ -16,7 +16,6 @@
#include "ec.h"
#include <arch/acpi.h>
-#include <arch/io.h>
#include <console/console.h>
#include <device/device.h>
diff --git a/src/mainboard/hp/revolve_810_g1/romstage.c b/src/mainboard/hp/revolve_810_g1/romstage.c
index 9925709d7a..f62024c3e6 100644
--- a/src/mainboard/hp/revolve_810_g1/romstage.c
+++ b/src/mainboard/hp/revolve_810_g1/romstage.c
@@ -18,7 +18,6 @@
#include <string.h>
#include <cbfs.h>
#include <console/console.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <northbridge/intel/sandybridge/sandybridge.h>
#include <northbridge/intel/sandybridge/raminit_native.h>
diff --git a/src/mainboard/iei/kino-780am2-fam10/mainboard.c b/src/mainboard/iei/kino-780am2-fam10/mainboard.c
index ad1fdd5761..c602c82d60 100644
--- a/src/mainboard/iei/kino-780am2-fam10/mainboard.c
+++ b/src/mainboard/iei/kino-780am2-fam10/mainboard.c
@@ -16,7 +16,6 @@
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <device/pci_def.h>
#include <southbridge/amd/sb700/sb700.h>
#include <southbridge/amd/sb700/smbus.h>
diff --git a/src/mainboard/iei/kino-780am2-fam10/mptable.c b/src/mainboard/iei/kino-780am2-fam10/mptable.c
index 8c6ecf3747..bffe1a24f2 100644
--- a/src/mainboard/iei/kino-780am2-fam10/mptable.c
+++ b/src/mainboard/iei/kino-780am2-fam10/mptable.c
@@ -15,7 +15,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <string.h>
#include <stdint.h>
diff --git a/src/mainboard/iei/kino-780am2-fam10/resourcemap.c b/src/mainboard/iei/kino-780am2-fam10/resourcemap.c
index e7a8cbf53f..80d2d9d05c 100644
--- a/src/mainboard/iei/kino-780am2-fam10/resourcemap.c
+++ b/src/mainboard/iei/kino-780am2-fam10/resourcemap.c
@@ -15,7 +15,6 @@
-#include <arch/io.h>
#include <commonlib/helpers.h>
#include <northbridge/amd/amdfam10/amdfam10.h>
diff --git a/src/mainboard/intel/bayleybay_fsp/mainboard.c b/src/mainboard/intel/bayleybay_fsp/mainboard.c
index 0330d82db6..00f5f5dd0d 100644
--- a/src/mainboard/intel/bayleybay_fsp/mainboard.c
+++ b/src/mainboard/intel/bayleybay_fsp/mainboard.c
@@ -23,7 +23,6 @@
#include <x86emu/x86emu.h>
#endif
#include <arch/acpi.h>
-#include <arch/io.h>
#include <arch/interrupt.h>
#include <boot/coreboot_tables.h>
diff --git a/src/mainboard/intel/bayleybay_fsp/romstage.c b/src/mainboard/intel/bayleybay_fsp/romstage.c
index b944ba758e..e3deddd04c 100644
--- a/src/mainboard/intel/bayleybay_fsp/romstage.c
+++ b/src/mainboard/intel/bayleybay_fsp/romstage.c
@@ -15,7 +15,6 @@
*/
#include <stddef.h>
-#include <arch/io.h>
#include <arch/cbfs.h>
#include <cpu/x86/mtrr.h>
#include <romstage_handoff.h>
diff --git a/src/mainboard/intel/camelbackmountain_fsp/mainboard.c b/src/mainboard/intel/camelbackmountain_fsp/mainboard.c
index c5db452264..e73da8d62f 100644
--- a/src/mainboard/intel/camelbackmountain_fsp/mainboard.c
+++ b/src/mainboard/intel/camelbackmountain_fsp/mainboard.c
@@ -23,7 +23,6 @@
#include <x86emu/x86emu.h>
#endif
#include <arch/acpi.h>
-#include <arch/io.h>
#include <arch/interrupt.h>
#include <boot/coreboot_tables.h>
diff --git a/src/mainboard/intel/cannonlake_rvp/smihandler.c b/src/mainboard/intel/cannonlake_rvp/smihandler.c
index 0f05351bae..d5f6daeeb1 100644
--- a/src/mainboard/intel/cannonlake_rvp/smihandler.c
+++ b/src/mainboard/intel/cannonlake_rvp/smihandler.c
@@ -15,7 +15,6 @@
*/
#include <arch/acpi.h>
-#include <arch/io.h>
#include <console/console.h>
#include <cpu/x86/smm.h>
#include <intelblocks/smihandler.h>
diff --git a/src/mainboard/intel/d510mo/romstage.c b/src/mainboard/intel/d510mo/romstage.c
index aadd833709..c91d40e890 100644
--- a/src/mainboard/intel/d510mo/romstage.c
+++ b/src/mainboard/intel/d510mo/romstage.c
@@ -14,7 +14,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <southbridge/intel/i82801gx/i82801gx.h>
#include <northbridge/intel/pineview/pineview.h>
diff --git a/src/mainboard/intel/d945gclf/romstage.c b/src/mainboard/intel/d945gclf/romstage.c
index 44f785f226..e085d12640 100644
--- a/src/mainboard/intel/d945gclf/romstage.c
+++ b/src/mainboard/intel/d945gclf/romstage.c
@@ -17,7 +17,6 @@
#include <stdint.h>
#include <device/pci_def.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <cpu/x86/lapic.h>
#include <superio/smsc/lpc47m15x/lpc47m15x.h>
diff --git a/src/mainboard/intel/dg43gt/romstage.c b/src/mainboard/intel/dg43gt/romstage.c
index 6a93cea7bf..4e474263ae 100644
--- a/src/mainboard/intel/dg43gt/romstage.c
+++ b/src/mainboard/intel/dg43gt/romstage.c
@@ -14,7 +14,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <console/console.h>
#include <southbridge/intel/i82801jx/i82801jx.h>
diff --git a/src/mainboard/intel/emeraldlake2/mainboard.c b/src/mainboard/intel/emeraldlake2/mainboard.c
index d5a43567b2..c57bd6f6ef 100644
--- a/src/mainboard/intel/emeraldlake2/mainboard.c
+++ b/src/mainboard/intel/emeraldlake2/mainboard.c
@@ -21,7 +21,6 @@
#include <device/pci_ops.h>
#include <drivers/intel/gma/int15.h>
#include <arch/acpi.h>
-#include <arch/io.h>
#include <arch/interrupt.h>
#include <boot/coreboot_tables.h>
#include <southbridge/intel/bd82x6x/pch.h>
diff --git a/src/mainboard/intel/galileo/gpio.c b/src/mainboard/intel/galileo/gpio.c
index cee673de12..1791ee3e96 100644
--- a/src/mainboard/intel/galileo/gpio.c
+++ b/src/mainboard/intel/galileo/gpio.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <console/console.h>
#include <soc/car.h>
#include <soc/ramstage.h>
diff --git a/src/mainboard/intel/galileo/reg_access.c b/src/mainboard/intel/galileo/reg_access.c
index cff69aba4a..7aca458839 100644
--- a/src/mainboard/intel/galileo/reg_access.c
+++ b/src/mainboard/intel/galileo/reg_access.c
@@ -16,7 +16,6 @@
#define __SIMPLE_DEVICE__
#include <assert.h>
-#include <arch/io.h>
#include <console/console.h>
#include <device/i2c_simple.h>
#include <soc/pci_devs.h>
diff --git a/src/mainboard/intel/kblrvp/chromeos.c b/src/mainboard/intel/kblrvp/chromeos.c
index 2be3232123..d48c9c238b 100644
--- a/src/mainboard/intel/kblrvp/chromeos.c
+++ b/src/mainboard/intel/kblrvp/chromeos.c
@@ -14,7 +14,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/device.h>
#include <device/pci.h>
#include <gpio.h>
diff --git a/src/mainboard/intel/kblrvp/smihandler.c b/src/mainboard/intel/kblrvp/smihandler.c
index 6006767cb4..a12a460fd6 100644
--- a/src/mainboard/intel/kblrvp/smihandler.c
+++ b/src/mainboard/intel/kblrvp/smihandler.c
@@ -15,7 +15,6 @@
*/
#include <arch/acpi.h>
-#include <arch/io.h>
#include <console/console.h>
#include <cpu/x86/smm.h>
#include <elog.h>
diff --git a/src/mainboard/intel/kunimitsu/smihandler.c b/src/mainboard/intel/kunimitsu/smihandler.c
index 24a5b9619d..64cc34b6d6 100644
--- a/src/mainboard/intel/kunimitsu/smihandler.c
+++ b/src/mainboard/intel/kunimitsu/smihandler.c
@@ -15,7 +15,6 @@
*/
#include <arch/acpi.h>
-#include <arch/io.h>
#include <console/console.h>
#include <cpu/x86/smm.h>
#include <elog.h>
diff --git a/src/mainboard/intel/wtm2/chromeos.c b/src/mainboard/intel/wtm2/chromeos.c
index fe98fd85ec..ad651f5c8c 100644
--- a/src/mainboard/intel/wtm2/chromeos.c
+++ b/src/mainboard/intel/wtm2/chromeos.c
@@ -15,7 +15,6 @@
#include <string.h>
#include <bootmode.h>
-#include <arch/io.h>
#include <device/device.h>
#include <device/pci.h>
#include <soc/gpio.h>
diff --git a/src/mainboard/jetway/nf81-t56n-lf/mptable.c b/src/mainboard/jetway/nf81-t56n-lf/mptable.c
index 25229542e0..9ae585854d 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/mptable.c
+++ b/src/mainboard/jetway/nf81-t56n-lf/mptable.c
@@ -16,7 +16,6 @@
*/
-#include <arch/io.h>
#include <arch/ioapic.h>
#include <arch/smp/mpspec.h>
#include <device/pci.h>
diff --git a/src/mainboard/jetway/pa78vm5/mainboard.c b/src/mainboard/jetway/pa78vm5/mainboard.c
index e2d39dadbf..7bf82971c5 100644
--- a/src/mainboard/jetway/pa78vm5/mainboard.c
+++ b/src/mainboard/jetway/pa78vm5/mainboard.c
@@ -17,7 +17,6 @@
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <southbridge/amd/sb700/sb700.h>
diff --git a/src/mainboard/jetway/pa78vm5/mptable.c b/src/mainboard/jetway/pa78vm5/mptable.c
index 08df9434d2..5fb82ff52a 100644
--- a/src/mainboard/jetway/pa78vm5/mptable.c
+++ b/src/mainboard/jetway/pa78vm5/mptable.c
@@ -16,7 +16,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <string.h>
#include <stdint.h>
diff --git a/src/mainboard/jetway/pa78vm5/resourcemap.c b/src/mainboard/jetway/pa78vm5/resourcemap.c
index 1162d54337..d10263923f 100644
--- a/src/mainboard/jetway/pa78vm5/resourcemap.c
+++ b/src/mainboard/jetway/pa78vm5/resourcemap.c
@@ -16,7 +16,6 @@
-#include <arch/io.h>
#include <commonlib/helpers.h>
#include <northbridge/amd/amdfam10/amdfam10.h>
diff --git a/src/mainboard/kontron/ktqm77/mainboard.c b/src/mainboard/kontron/ktqm77/mainboard.c
index 3447646d24..4a5ad9319c 100644
--- a/src/mainboard/kontron/ktqm77/mainboard.c
+++ b/src/mainboard/kontron/ktqm77/mainboard.c
@@ -26,7 +26,6 @@
#endif
#include <pc80/mc146818rtc.h>
#include <arch/acpi.h>
-#include <arch/io.h>
#include <arch/interrupt.h>
#include <boot/coreboot_tables.h>
#include <southbridge/intel/bd82x6x/pch.h>
diff --git a/src/mainboard/lenovo/l520/romstage.c b/src/mainboard/lenovo/l520/romstage.c
index c2539b178a..c8003ae0a6 100644
--- a/src/mainboard/lenovo/l520/romstage.c
+++ b/src/mainboard/lenovo/l520/romstage.c
@@ -15,7 +15,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <northbridge/intel/sandybridge/sandybridge.h>
diff --git a/src/mainboard/lenovo/s230u/mainboard.c b/src/mainboard/lenovo/s230u/mainboard.c
index 769fe3c77e..ea4b9b6773 100644
--- a/src/mainboard/lenovo/s230u/mainboard.c
+++ b/src/mainboard/lenovo/s230u/mainboard.c
@@ -15,7 +15,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/device.h>
#include <console/console.h>
#include <drivers/intel/gma/int15.h>
diff --git a/src/mainboard/lenovo/s230u/romstage.c b/src/mainboard/lenovo/s230u/romstage.c
index ef3c835ed3..f4830fcd8e 100644
--- a/src/mainboard/lenovo/s230u/romstage.c
+++ b/src/mainboard/lenovo/s230u/romstage.c
@@ -17,7 +17,6 @@
#include <string.h>
#include <cbfs.h>
#include <arch/byteorder.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <console/console.h>
diff --git a/src/mainboard/lenovo/s230u/smihandler.c b/src/mainboard/lenovo/s230u/smihandler.c
index 4bd4d417dd..2f79243e62 100644
--- a/src/mainboard/lenovo/s230u/smihandler.c
+++ b/src/mainboard/lenovo/s230u/smihandler.c
@@ -18,7 +18,6 @@
#include "ec.h"
-#include <arch/io.h>
#include <console/console.h>
#include <cpu/x86/smm.h>
#include <delay.h>
diff --git a/src/mainboard/lenovo/t400/acpi_tables.c b/src/mainboard/lenovo/t400/acpi_tables.c
index 24c3a794e3..45636474f0 100644
--- a/src/mainboard/lenovo/t400/acpi_tables.c
+++ b/src/mainboard/lenovo/t400/acpi_tables.c
@@ -15,7 +15,6 @@
*/
#include <string.h>
-#include <arch/io.h>
#include <arch/ioapic.h>
#include <arch/acpi.h>
#include <arch/acpigen.h>
diff --git a/src/mainboard/lenovo/t400/romstage.c b/src/mainboard/lenovo/t400/romstage.c
index 0be24ebdce..6b03ad0ad8 100644
--- a/src/mainboard/lenovo/t400/romstage.c
+++ b/src/mainboard/lenovo/t400/romstage.c
@@ -16,7 +16,6 @@
// __PRE_RAM__ means: use "unsigned" for device, not a struct.
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <console/console.h>
#include <southbridge/intel/i82801ix/i82801ix.h>
diff --git a/src/mainboard/lenovo/t420/romstage.c b/src/mainboard/lenovo/t420/romstage.c
index d497e0ca18..806c72a3be 100644
--- a/src/mainboard/lenovo/t420/romstage.c
+++ b/src/mainboard/lenovo/t420/romstage.c
@@ -15,7 +15,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <northbridge/intel/sandybridge/raminit_native.h>
#include <southbridge/intel/bd82x6x/pch.h>
diff --git a/src/mainboard/lenovo/t420s/romstage.c b/src/mainboard/lenovo/t420s/romstage.c
index 1a7d341959..c42d165643 100644
--- a/src/mainboard/lenovo/t420s/romstage.c
+++ b/src/mainboard/lenovo/t420s/romstage.c
@@ -16,7 +16,6 @@
*/
#include <arch/byteorder.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <northbridge/intel/sandybridge/raminit_native.h>
#include <southbridge/intel/bd82x6x/pch.h>
diff --git a/src/mainboard/lenovo/t430/romstage.c b/src/mainboard/lenovo/t430/romstage.c
index b5dc2bc7af..db50bb3017 100644
--- a/src/mainboard/lenovo/t430/romstage.c
+++ b/src/mainboard/lenovo/t430/romstage.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <northbridge/intel/sandybridge/raminit_native.h>
diff --git a/src/mainboard/lenovo/t430s/variants/t430s/romstage.c b/src/mainboard/lenovo/t430s/variants/t430s/romstage.c
index 33d65dd5ab..e461681f19 100644
--- a/src/mainboard/lenovo/t430s/variants/t430s/romstage.c
+++ b/src/mainboard/lenovo/t430s/variants/t430s/romstage.c
@@ -17,7 +17,6 @@
#include <option.h>
#include <arch/byteorder.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <northbridge/intel/sandybridge/raminit_native.h>
diff --git a/src/mainboard/lenovo/t430s/variants/t431s/romstage.c b/src/mainboard/lenovo/t430s/variants/t431s/romstage.c
index 66e28ad21a..01728a36a0 100644
--- a/src/mainboard/lenovo/t430s/variants/t431s/romstage.c
+++ b/src/mainboard/lenovo/t430s/variants/t431s/romstage.c
@@ -17,7 +17,6 @@
#include <option.h>
#include <arch/byteorder.h>
-#include <arch/io.h>
#include <device/pci_def.h>
#include <console/console.h>
#include <cbfs.h>
diff --git a/src/mainboard/lenovo/t520/romstage.c b/src/mainboard/lenovo/t520/romstage.c
index 6f9525053a..96d07feac2 100644
--- a/src/mainboard/lenovo/t520/romstage.c
+++ b/src/mainboard/lenovo/t520/romstage.c
@@ -17,7 +17,6 @@
#include <stdint.h>
#include <arch/byteorder.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <northbridge/intel/sandybridge/sandybridge.h>
diff --git a/src/mainboard/lenovo/t530/romstage.c b/src/mainboard/lenovo/t530/romstage.c
index d37f0d14c1..2b850a20b1 100644
--- a/src/mainboard/lenovo/t530/romstage.c
+++ b/src/mainboard/lenovo/t530/romstage.c
@@ -17,7 +17,6 @@
#include <stdint.h>
#include <arch/byteorder.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <northbridge/intel/sandybridge/raminit_native.h>
diff --git a/src/mainboard/lenovo/x131e/romstage.c b/src/mainboard/lenovo/x131e/romstage.c
index c1a082f01f..ea550aa143 100644
--- a/src/mainboard/lenovo/x131e/romstage.c
+++ b/src/mainboard/lenovo/x131e/romstage.c
@@ -15,7 +15,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <northbridge/intel/sandybridge/raminit_native.h>
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/romstage.c b/src/mainboard/lenovo/x1_carbon_gen1/romstage.c
index fa7af40521..13d9a196ee 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/romstage.c
+++ b/src/mainboard/lenovo/x1_carbon_gen1/romstage.c
@@ -20,7 +20,6 @@
#include <string.h>
#include <timestamp.h>
#include <arch/byteorder.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <cpu/x86/lapic.h>
diff --git a/src/mainboard/lenovo/x200/acpi_tables.c b/src/mainboard/lenovo/x200/acpi_tables.c
index 24c3a794e3..45636474f0 100644
--- a/src/mainboard/lenovo/x200/acpi_tables.c
+++ b/src/mainboard/lenovo/x200/acpi_tables.c
@@ -15,7 +15,6 @@
*/
#include <string.h>
-#include <arch/io.h>
#include <arch/ioapic.h>
#include <arch/acpi.h>
#include <arch/acpigen.h>
diff --git a/src/mainboard/lenovo/x200/romstage.c b/src/mainboard/lenovo/x200/romstage.c
index 7e428e40fa..afaa9aafe1 100644
--- a/src/mainboard/lenovo/x200/romstage.c
+++ b/src/mainboard/lenovo/x200/romstage.c
@@ -16,7 +16,6 @@
// __PRE_RAM__ means: use "unsigned" for device, not a struct.
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <southbridge/intel/common/gpio.h>
#include <southbridge/intel/i82801ix/i82801ix.h>
diff --git a/src/mainboard/lenovo/x220/romstage.c b/src/mainboard/lenovo/x220/romstage.c
index a5b1b52c57..d50c7cd608 100644
--- a/src/mainboard/lenovo/x220/romstage.c
+++ b/src/mainboard/lenovo/x220/romstage.c
@@ -19,7 +19,6 @@
#include <string.h>
#include <timestamp.h>
#include <arch/byteorder.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <cpu/x86/lapic.h>
diff --git a/src/mainboard/lenovo/x230/romstage.c b/src/mainboard/lenovo/x230/romstage.c
index 5014a7627b..b88d8f534c 100644
--- a/src/mainboard/lenovo/x230/romstage.c
+++ b/src/mainboard/lenovo/x230/romstage.c
@@ -19,7 +19,6 @@
#include <string.h>
#include <timestamp.h>
#include <arch/byteorder.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <cpu/x86/lapic.h>
diff --git a/src/mainboard/msi/ms9652_fam10/resourcemap.c b/src/mainboard/msi/ms9652_fam10/resourcemap.c
index 7f8daac90e..5d8aca7f8e 100644
--- a/src/mainboard/msi/ms9652_fam10/resourcemap.c
+++ b/src/mainboard/msi/ms9652_fam10/resourcemap.c
@@ -15,7 +15,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <commonlib/helpers.h>
#include <northbridge/amd/amdfam10/amdfam10.h>
diff --git a/src/mainboard/pcengines/apu1/mptable.c b/src/mainboard/pcengines/apu1/mptable.c
index 0dcf4d7390..32b2a6eae4 100644
--- a/src/mainboard/pcengines/apu1/mptable.c
+++ b/src/mainboard/pcengines/apu1/mptable.c
@@ -16,7 +16,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <string.h>
#include <stdint.h>
#include <southbridge/amd/cimx/sb800/SBPLATFORM.h>
diff --git a/src/mainboard/roda/rk9/acpi_tables.c b/src/mainboard/roda/rk9/acpi_tables.c
index 7ddc5b8509..6132143ac9 100644
--- a/src/mainboard/roda/rk9/acpi_tables.c
+++ b/src/mainboard/roda/rk9/acpi_tables.c
@@ -15,7 +15,6 @@
*/
#include <string.h>
-#include <arch/io.h>
#include <arch/ioapic.h>
#include <arch/acpi.h>
#include <arch/acpigen.h>
diff --git a/src/mainboard/roda/rk9/smihandler.c b/src/mainboard/roda/rk9/smihandler.c
index 70aed9818b..72f1d35ea4 100644
--- a/src/mainboard/roda/rk9/smihandler.c
+++ b/src/mainboard/roda/rk9/smihandler.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <console/console.h>
#include <cpu/x86/smm.h>
#include <southbridge/intel/i82801ix/nvs.h>
diff --git a/src/mainboard/samsung/lumpy/chromeos.c b/src/mainboard/samsung/lumpy/chromeos.c
index cb709d132a..baa409472d 100644
--- a/src/mainboard/samsung/lumpy/chromeos.c
+++ b/src/mainboard/samsung/lumpy/chromeos.c
@@ -15,7 +15,6 @@
#include <string.h>
#include <bootmode.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/mainboard/samsung/lumpy/smihandler.c b/src/mainboard/samsung/lumpy/smihandler.c
index f2c2dc376a..627a3a7719 100644
--- a/src/mainboard/samsung/lumpy/smihandler.c
+++ b/src/mainboard/samsung/lumpy/smihandler.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <console/console.h>
#include <cpu/x86/smm.h>
#include <southbridge/intel/bd82x6x/nvs.h>
diff --git a/src/mainboard/samsung/stumpy/chromeos.c b/src/mainboard/samsung/stumpy/chromeos.c
index d6ec1478dd..85f9038428 100644
--- a/src/mainboard/samsung/stumpy/chromeos.c
+++ b/src/mainboard/samsung/stumpy/chromeos.c
@@ -15,7 +15,6 @@
#include <string.h>
#include <bootmode.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/mainboard/samsung/stumpy/romstage.c b/src/mainboard/samsung/stumpy/romstage.c
index 27759a64e2..c45ca7e721 100644
--- a/src/mainboard/samsung/stumpy/romstage.c
+++ b/src/mainboard/samsung/stumpy/romstage.c
@@ -17,7 +17,6 @@
#include <stdint.h>
#include <string.h>
#include <timestamp.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <cpu/x86/lapic.h>
diff --git a/src/mainboard/samsung/stumpy/smihandler.c b/src/mainboard/samsung/stumpy/smihandler.c
index ad27bce818..b78d9383f3 100644
--- a/src/mainboard/samsung/stumpy/smihandler.c
+++ b/src/mainboard/samsung/stumpy/smihandler.c
@@ -14,7 +14,6 @@
*/
#include <arch/acpi.h>
-#include <arch/io.h>
#include <console/console.h>
#include <cpu/x86/smm.h>
#include <southbridge/intel/bd82x6x/nvs.h>
diff --git a/src/mainboard/sapphire/pureplatinumh61/romstage.c b/src/mainboard/sapphire/pureplatinumh61/romstage.c
index 1b74cbb00d..30dfeab9aa 100644
--- a/src/mainboard/sapphire/pureplatinumh61/romstage.c
+++ b/src/mainboard/sapphire/pureplatinumh61/romstage.c
@@ -17,7 +17,6 @@
#include <stdint.h>
#include <string.h>
#include <arch/byteorder.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <northbridge/intel/sandybridge/sandybridge.h>
diff --git a/src/mainboard/siemens/mc_tcu3/mainboard.c b/src/mainboard/siemens/mc_tcu3/mainboard.c
index ea018e9b5f..469d2219e1 100644
--- a/src/mainboard/siemens/mc_tcu3/mainboard.c
+++ b/src/mainboard/siemens/mc_tcu3/mainboard.c
@@ -23,7 +23,6 @@
#include <x86emu/x86emu.h>
#endif
#include <arch/acpi.h>
-#include <arch/io.h>
#include <arch/interrupt.h>
#include <boot/coreboot_tables.h>
#include <hwilib.h>
diff --git a/src/mainboard/siemens/mc_tcu3/romstage.c b/src/mainboard/siemens/mc_tcu3/romstage.c
index 615498a6f7..d0e5e8283d 100644
--- a/src/mainboard/siemens/mc_tcu3/romstage.c
+++ b/src/mainboard/siemens/mc_tcu3/romstage.c
@@ -15,7 +15,6 @@
*/
#include <stddef.h>
-#include <arch/io.h>
#include <arch/cbfs.h>
#include <console/console.h>
#include <cpu/x86/mtrr.h>
diff --git a/src/mainboard/sifive/hifive-unleashed/mainboard.c b/src/mainboard/sifive/hifive-unleashed/mainboard.c
index baf44d4486..2d62cd077a 100644
--- a/src/mainboard/sifive/hifive-unleashed/mainboard.c
+++ b/src/mainboard/sifive/hifive-unleashed/mainboard.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <console/console.h>
#include <soc/sdram.h>
#include <symbols.h>
diff --git a/src/mainboard/supermicro/h8dmr_fam10/resourcemap.c b/src/mainboard/supermicro/h8dmr_fam10/resourcemap.c
index 55126d9de2..2398ba25d7 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/resourcemap.c
+++ b/src/mainboard/supermicro/h8dmr_fam10/resourcemap.c
@@ -15,7 +15,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <commonlib/helpers.h>
#include <northbridge/amd/amdfam10/amdfam10.h>
diff --git a/src/mainboard/supermicro/h8qme_fam10/resourcemap.c b/src/mainboard/supermicro/h8qme_fam10/resourcemap.c
index 55126d9de2..2398ba25d7 100644
--- a/src/mainboard/supermicro/h8qme_fam10/resourcemap.c
+++ b/src/mainboard/supermicro/h8qme_fam10/resourcemap.c
@@ -15,7 +15,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <commonlib/helpers.h>
#include <northbridge/amd/amdfam10/amdfam10.h>
diff --git a/src/mainboard/supermicro/h8scm_fam10/mainboard.c b/src/mainboard/supermicro/h8scm_fam10/mainboard.c
index 7ae3d70fad..b16f7a24d1 100644
--- a/src/mainboard/supermicro/h8scm_fam10/mainboard.c
+++ b/src/mainboard/supermicro/h8scm_fam10/mainboard.c
@@ -16,7 +16,6 @@
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <cpu/x86/msr.h>
#include <cpu/amd/mtrr.h>
#include <device/pci_def.h>
diff --git a/src/mainboard/supermicro/h8scm_fam10/mptable.c b/src/mainboard/supermicro/h8scm_fam10/mptable.c
index 1a8d191a5d..e3a572ed52 100644
--- a/src/mainboard/supermicro/h8scm_fam10/mptable.c
+++ b/src/mainboard/supermicro/h8scm_fam10/mptable.c
@@ -15,7 +15,6 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <string.h>
#include <stdint.h>
diff --git a/src/mainboard/supermicro/h8scm_fam10/resourcemap.c b/src/mainboard/supermicro/h8scm_fam10/resourcemap.c
index e7a8cbf53f..80d2d9d05c 100644
--- a/src/mainboard/supermicro/h8scm_fam10/resourcemap.c
+++ b/src/mainboard/supermicro/h8scm_fam10/resourcemap.c
@@ -15,7 +15,6 @@
-#include <arch/io.h>
#include <commonlib/helpers.h>
#include <northbridge/amd/amdfam10/amdfam10.h>
diff --git a/src/mainboard/tyan/s2912_fam10/resourcemap.c b/src/mainboard/tyan/s2912_fam10/resourcemap.c
index 51e257d0b6..50e245a610 100644
--- a/src/mainboard/tyan/s2912_fam10/resourcemap.c
+++ b/src/mainboard/tyan/s2912_fam10/resourcemap.c
@@ -15,7 +15,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <commonlib/helpers.h>
#include <northbridge/amd/amdfam10/amdfam10.h>
diff --git a/src/mainboard/via/epia-m850/romstage.c b/src/mainboard/via/epia-m850/romstage.c
index 7a0d824d17..f96dc448ca 100644
--- a/src/mainboard/via/epia-m850/romstage.c
+++ b/src/mainboard/via/epia-m850/romstage.c
@@ -18,7 +18,6 @@
* Inspired from the EPIA-M700
*/
#include <stdint.h>
-#include <arch/io.h>
#include <console/console.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>