diff --git a/src/mainboard/google/beltino/acpi_tables.c b/src/mainboard/google/beltino/acpi_tables.c
index b6a5606a8f..d2f7f45ff1 100644
--- a/src/mainboard/google/beltino/acpi_tables.c
+++ b/src/mainboard/google/beltino/acpi_tables.c
@@ -2,7 +2,6 @@
 
 #include <types.h>
 #include <acpi/acpi.h>
-#include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <ec/google/chromeec/ec.h>
 #include <southbridge/intel/lynxpoint/nvs.h>
diff --git a/src/mainboard/google/jecht/acpi_tables.c b/src/mainboard/google/jecht/acpi_tables.c
index 50bd1e04dd..3e8cc2016a 100644
--- a/src/mainboard/google/jecht/acpi_tables.c
+++ b/src/mainboard/google/jecht/acpi_tables.c
@@ -3,7 +3,6 @@
 #include <types.h>
 #include <acpi/acpi.h>
 #include <arch/ioapic.h>
-#include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <soc/acpi.h>
 #include <soc/nvs.h>
diff --git a/src/mainboard/google/parrot/acpi_tables.c b/src/mainboard/google/parrot/acpi_tables.c
index ce03c70324..62722ec486 100644
--- a/src/mainboard/google/parrot/acpi_tables.c
+++ b/src/mainboard/google/parrot/acpi_tables.c
@@ -2,7 +2,6 @@
 
 #include <types.h>
 #include <acpi/acpi.h>
-#include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <vendorcode/google/chromeos/gnvs.h>
 #include <ec/compal/ene932/ec.h>
diff --git a/src/mainboard/google/rambi/acpi_tables.c b/src/mainboard/google/rambi/acpi_tables.c
index 507da97979..c4c17888d8 100644
--- a/src/mainboard/google/rambi/acpi_tables.c
+++ b/src/mainboard/google/rambi/acpi_tables.c
@@ -3,7 +3,6 @@
 #include <types.h>
 #include <acpi/acpi.h>
 #include <arch/ioapic.h>
-#include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <soc/acpi.h>
 #include <soc/nvs.h>
diff --git a/src/mainboard/google/slippy/acpi_tables.c b/src/mainboard/google/slippy/acpi_tables.c
index d09193136c..ba55647e03 100644
--- a/src/mainboard/google/slippy/acpi_tables.c
+++ b/src/mainboard/google/slippy/acpi_tables.c
@@ -2,7 +2,6 @@
 
 #include <types.h>
 #include <acpi/acpi.h>
-#include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <vendorcode/google/chromeos/gnvs.h>
 #include <ec/google/chromeec/ec.h>
diff --git a/src/mainboard/google/stout/acpi_tables.c b/src/mainboard/google/stout/acpi_tables.c
index 76342d409d..08bd4cdd1c 100644
--- a/src/mainboard/google/stout/acpi_tables.c
+++ b/src/mainboard/google/stout/acpi_tables.c
@@ -2,7 +2,6 @@
 
 #include <types.h>
 #include <acpi/acpi.h>
-#include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <vendorcode/google/chromeos/gnvs.h>
 #include <bootmode.h>
diff --git a/src/mainboard/google/stout/onboard.h b/src/mainboard/google/stout/onboard.h
index 6024ba85e5..a31dffd4cd 100644
--- a/src/mainboard/google/stout/onboard.h
+++ b/src/mainboard/google/stout/onboard.h
@@ -3,8 +3,6 @@
 #ifndef STOUT_ONBOARD_H
 #define STOUT_ONBOARD_H
 
-#include <arch/smp/mpspec.h>
-
 #define STOUT_NIC_VENDOR_ID		0x10EC
 #define STOUT_NIC_DEVICE_ID		0x8168
 
diff --git a/src/mainboard/intel/baskingridge/acpi_tables.c b/src/mainboard/intel/baskingridge/acpi_tables.c
index ba6d9c06e1..24edfea49f 100644
--- a/src/mainboard/intel/baskingridge/acpi_tables.c
+++ b/src/mainboard/intel/baskingridge/acpi_tables.c
@@ -2,7 +2,6 @@
 
 #include <types.h>
 #include <acpi/acpi.h>
-#include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <vendorcode/google/chromeos/gnvs.h>
 #include <southbridge/intel/lynxpoint/pch.h>
diff --git a/src/mainboard/intel/emeraldlake2/acpi_tables.c b/src/mainboard/intel/emeraldlake2/acpi_tables.c
index 013487f48b..36d0d66fd8 100644
--- a/src/mainboard/intel/emeraldlake2/acpi_tables.c
+++ b/src/mainboard/intel/emeraldlake2/acpi_tables.c
@@ -2,7 +2,6 @@
 
 #include <types.h>
 #include <acpi/acpi.h>
-#include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <vendorcode/google/chromeos/gnvs.h>
 #include <southbridge/intel/bd82x6x/nvs.h>
diff --git a/src/mainboard/intel/harcuvar/acpi_tables.c b/src/mainboard/intel/harcuvar/acpi_tables.c
index 046d3acdcf..1351e62876 100644
--- a/src/mainboard/intel/harcuvar/acpi_tables.c
+++ b/src/mainboard/intel/harcuvar/acpi_tables.c
@@ -2,7 +2,6 @@
 
 #include <types.h>
 #include <acpi/acpi.h>
-#include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <cpu/x86/msr.h>
 
diff --git a/src/mainboard/intel/strago/acpi_tables.c b/src/mainboard/intel/strago/acpi_tables.c
index a3b9dd07fb..e97d9c14e7 100644
--- a/src/mainboard/intel/strago/acpi_tables.c
+++ b/src/mainboard/intel/strago/acpi_tables.c
@@ -2,7 +2,6 @@
 
 #include <acpi/acpi.h>
 #include <arch/ioapic.h>
-#include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <soc/acpi.h>
 #include <soc/iomap.h>
diff --git a/src/mainboard/intel/wtm2/acpi_tables.c b/src/mainboard/intel/wtm2/acpi_tables.c
index 960dbde3c0..87cb965313 100644
--- a/src/mainboard/intel/wtm2/acpi_tables.c
+++ b/src/mainboard/intel/wtm2/acpi_tables.c
@@ -3,7 +3,6 @@
 #include <types.h>
 #include <acpi/acpi.h>
 #include <arch/ioapic.h>
-#include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <soc/acpi.h>
 #include <soc/nvs.h>
diff --git a/src/mainboard/samsung/lumpy/acpi_tables.c b/src/mainboard/samsung/lumpy/acpi_tables.c
index 592ed50629..aafbdb6638 100644
--- a/src/mainboard/samsung/lumpy/acpi_tables.c
+++ b/src/mainboard/samsung/lumpy/acpi_tables.c
@@ -2,7 +2,6 @@
 
 #include <types.h>
 #include <acpi/acpi.h>
-#include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <ec/acpi/ec.h>
 #if CONFIG(CHROMEOS)
diff --git a/src/mainboard/samsung/stumpy/acpi_tables.c b/src/mainboard/samsung/stumpy/acpi_tables.c
index de2d51dfe0..b66e4ddd66 100644
--- a/src/mainboard/samsung/stumpy/acpi_tables.c
+++ b/src/mainboard/samsung/stumpy/acpi_tables.c
@@ -2,7 +2,6 @@
 
 #include <types.h>
 #include <acpi/acpi.h>
-#include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <vendorcode/google/chromeos/gnvs.h>
 #include <southbridge/intel/bd82x6x/nvs.h>
diff --git a/src/mainboard/scaleway/tagada/acpi_tables.c b/src/mainboard/scaleway/tagada/acpi_tables.c
index 046d3acdcf..1351e62876 100644
--- a/src/mainboard/scaleway/tagada/acpi_tables.c
+++ b/src/mainboard/scaleway/tagada/acpi_tables.c
@@ -2,7 +2,6 @@
 
 #include <types.h>
 #include <acpi/acpi.h>
-#include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <cpu/x86/msr.h>
 
diff --git a/src/southbridge/intel/i82371eb/acpi_tables.c b/src/southbridge/intel/i82371eb/acpi_tables.c
index ab28e760b5..7507cd5d5d 100644
--- a/src/southbridge/intel/i82371eb/acpi_tables.c
+++ b/src/southbridge/intel/i82371eb/acpi_tables.c
@@ -3,7 +3,6 @@
 #include <console/console.h>
 #include <acpi/acpi.h>
 #include <acpi/acpigen.h>
-#include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include "i82371eb.h"