diff --git a/src/soc/intel/baytrail/acpi.c b/src/soc/intel/baytrail/acpi.c
index 44061889b6..75c28637ce 100644
--- a/src/soc/intel/baytrail/acpi.c
+++ b/src/soc/intel/baytrail/acpi.c
@@ -6,7 +6,6 @@
 #include <device/mmio.h>
 #include <arch/smp/mpspec.h>
 #include <console/console.h>
-#include <cpu/x86/smm.h>
 #include <types.h>
 #include <cpu/x86/msr.h>
 #include <cpu/intel/turbo.h>
diff --git a/src/soc/intel/skylake/fadt.c b/src/soc/intel/skylake/fadt.c
index a1b3e43c7f..68aab47711 100644
--- a/src/soc/intel/skylake/fadt.c
+++ b/src/soc/intel/skylake/fadt.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <acpi/acpi.h>
-#include <cpu/x86/smm.h>
 #include <soc/iomap.h>
 #include <soc/pm.h>
 #include "chip.h"
diff --git a/src/southbridge/intel/i82801jx/smihandler.c b/src/southbridge/intel/i82801jx/smihandler.c
index ed58a11882..b324e30f01 100644
--- a/src/southbridge/intel/i82801jx/smihandler.c
+++ b/src/southbridge/intel/i82801jx/smihandler.c
@@ -2,7 +2,6 @@
 
 #include <types.h>
 #include <console/console.h>
-#include <cpu/x86/smm.h>
 #include <device/pci_def.h>
 #include <southbridge/intel/common/pmutil.h>
 #include "i82801jx.h"
diff --git a/src/southbridge/intel/ibexpeak/smihandler.c b/src/southbridge/intel/ibexpeak/smihandler.c
index 81dde32499..cb4f65ea95 100644
--- a/src/southbridge/intel/ibexpeak/smihandler.c
+++ b/src/southbridge/intel/ibexpeak/smihandler.c
@@ -5,7 +5,6 @@
 #include <device/pci_ops.h>
 #include <console/console.h>
 #include <device/pci_def.h>
-#include <cpu/x86/smm.h>
 #include <cpu/intel/em64t101_save_state.h>
 #include <cpu/intel/model_2065x/model_2065x.h>
 #include <southbridge/intel/common/finalize.h>