diff --git a/src/mainboard/aopen/dxplplusu/acpi/e7505_sec.asl b/src/mainboard/aopen/dxplplusu/acpi/e7505_sec.asl
index 6ae27500d1..620799cf2b 100644
--- a/src/mainboard/aopen/dxplplusu/acpi/e7505_sec.asl
+++ b/src/mainboard/aopen/dxplplusu/acpi/e7505_sec.asl
@@ -13,6 +13,8 @@
  * GNU General Public License for more details.
  */
 
+#include <arch/ioapic.h>
+
 Name (PBRS, ResourceTemplate ()
 {
 	WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDecode,
diff --git a/src/mainboard/aopen/dxplplusu/acpi/i82801db.asl b/src/mainboard/aopen/dxplplusu/acpi/i82801db.asl
index bd6b28692d..4be964d034 100644
--- a/src/mainboard/aopen/dxplplusu/acpi/i82801db.asl
+++ b/src/mainboard/aopen/dxplplusu/acpi/i82801db.asl
@@ -13,6 +13,8 @@
  * GNU General Public License for more details.
  */
 
+#include <arch/ioapic.h>
+
 Device (USB0)
 {
 	Name (_ADR, 0x001D0000)
diff --git a/src/mainboard/aopen/dxplplusu/dsdt.asl b/src/mainboard/aopen/dxplplusu/dsdt.asl
index 011428a09f..af8012efe8 100644
--- a/src/mainboard/aopen/dxplplusu/dsdt.asl
+++ b/src/mainboard/aopen/dxplplusu/dsdt.asl
@@ -13,9 +13,8 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/ioapic.h>
-
 #include <arch/acpi.h>
+
 DefinitionBlock(
 	"dsdt.aml",
 	"DSDT",
diff --git a/src/mainboard/google/beltino/acpi_tables.c b/src/mainboard/google/beltino/acpi_tables.c
index 9ed8cfde6a..7356030394 100644
--- a/src/mainboard/google/beltino/acpi_tables.c
+++ b/src/mainboard/google/beltino/acpi_tables.c
@@ -16,7 +16,6 @@
 #include <string.h>
 #include <types.h>
 #include <arch/acpi.h>
-#include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/mainboard/google/slippy/acpi_tables.c b/src/mainboard/google/slippy/acpi_tables.c
index 2d1082f66d..bf5e2947a9 100644
--- a/src/mainboard/google/slippy/acpi_tables.c
+++ b/src/mainboard/google/slippy/acpi_tables.c
@@ -16,7 +16,6 @@
 #include <types.h>
 #include <string.h>
 #include <arch/acpi.h>
-#include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/mainboard/intel/baskingridge/acpi_tables.c b/src/mainboard/intel/baskingridge/acpi_tables.c
index 559c555799..081733c6c4 100644
--- a/src/mainboard/intel/baskingridge/acpi_tables.c
+++ b/src/mainboard/intel/baskingridge/acpi_tables.c
@@ -16,7 +16,6 @@
 #include <types.h>
 #include <string.h>
 #include <arch/acpi.h>
-#include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/mainboard/intel/harcuvar/acpi_tables.c b/src/mainboard/intel/harcuvar/acpi_tables.c
index 6be920b571..e126bd8e83 100644
--- a/src/mainboard/intel/harcuvar/acpi_tables.c
+++ b/src/mainboard/intel/harcuvar/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <types.h>
 #include <string.h>
 #include <arch/acpi.h>
-#include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/mainboard/scaleway/tagada/acpi_tables.c b/src/mainboard/scaleway/tagada/acpi_tables.c
index 6be920b571..e126bd8e83 100644
--- a/src/mainboard/scaleway/tagada/acpi_tables.c
+++ b/src/mainboard/scaleway/tagada/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <types.h>
 #include <string.h>
 #include <arch/acpi.h>
-#include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/northbridge/intel/fsp_rangeley/acpi/hostbridge.asl b/src/northbridge/intel/fsp_rangeley/acpi/hostbridge.asl
index 0c92da677e..cb0d2a43ce 100644
--- a/src/northbridge/intel/fsp_rangeley/acpi/hostbridge.asl
+++ b/src/northbridge/intel/fsp_rangeley/acpi/hostbridge.asl
@@ -14,8 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/ioapic.h>
-
 Name(_HID,EISAID("PNP0A08"))	// PCIe
 Name(_CID,EISAID("PNP0A03"))	// PCI