8 files changed, 8 insertions, 8 deletions
diff --git a/src/mainboard/google/dragonegg/smihandler.c b/src/mainboard/google/dragonegg/smihandler.c
index 9c72cb694e..8d2afd60b7 100644
--- a/src/mainboard/google/dragonegg/smihandler.c
+++ b/src/mainboard/google/dragonegg/smihandler.c
@@ -17,7 +17,7 @@
 #include <ec/google/chromeec/smm.h>
 #include <gpio.h>
 #include <soc/gpio.h>
-#include <soc/smm.h>
+#include <intelblocks/smihandler.h>
 #include <variant/ec.h>
 
 void mainboard_smi_espi_handler(void)
diff --git a/src/mainboard/google/drallion/smihandler.c b/src/mainboard/google/drallion/smihandler.c
index 0efcaa9ef1..18dbfbc154 100644
--- a/src/mainboard/google/drallion/smihandler.c
+++ b/src/mainboard/google/drallion/smihandler.c
@@ -15,7 +15,7 @@
 
 #include <cpu/x86/smm.h>
 #include <ec/google/wilco/smm.h>
-#include <soc/smm.h>
+#include <intelblocks/smihandler.h>
 #include <variant/ec.h>
 
 void mainboard_smi_espi_handler(void)
diff --git a/src/mainboard/google/eve/smihandler.c b/src/mainboard/google/eve/smihandler.c
index 7b97446271..5bca488d7c 100644
--- a/src/mainboard/google/eve/smihandler.c
+++ b/src/mainboard/google/eve/smihandler.c
@@ -16,7 +16,7 @@
 #include <cpu/x86/smm.h>
 #include <ec/google/chromeec/smm.h>
 #include <gpio.h>
-#include <soc/smm.h>
+#include <intelblocks/smihandler.h>
 #include "ec.h"
 #include "gpio.h"
 
diff --git a/src/mainboard/google/fizz/smihandler.c b/src/mainboard/google/fizz/smihandler.c
index 2b7367ad34..d20780c709 100644
--- a/src/mainboard/google/fizz/smihandler.c
+++ b/src/mainboard/google/fizz/smihandler.c
@@ -15,7 +15,7 @@
 
 #include <cpu/x86/smm.h>
 #include <ec/google/chromeec/smm.h>
-#include <soc/smm.h>
+#include <intelblocks/smihandler.h>
 
 #include <baseboard/variants.h>
 #include <variant/ec.h>
diff --git a/src/mainboard/google/glados/smihandler.c b/src/mainboard/google/glados/smihandler.c
index a4a1ccadaa..114b937a29 100644
--- a/src/mainboard/google/glados/smihandler.c
+++ b/src/mainboard/google/glados/smihandler.c
@@ -24,7 +24,7 @@
 #include <soc/iomap.h>
 #include <soc/nvs.h>
 #include <soc/pm.h>
-#include <soc/smm.h>
+#include <intelblocks/smihandler.h>
 #include "ec.h"
 #include <variant/gpio.h>
 
diff --git a/src/mainboard/google/hatch/smihandler.c b/src/mainboard/google/hatch/smihandler.c
index 68d562dd0f..c7833e3900 100644
--- a/src/mainboard/google/hatch/smihandler.c
+++ b/src/mainboard/google/hatch/smihandler.c
@@ -17,7 +17,7 @@
 #include <ec/google/chromeec/ec.h>
 #include <ec/google/chromeec/smm.h>
 #include <elog.h>
-#include <soc/smm.h>
+#include <intelblocks/smihandler.h>
 #include <variant/ec.h>
 
 void mainboard_smi_espi_handler(void)
diff --git a/src/mainboard/google/poppy/smihandler.c b/src/mainboard/google/poppy/smihandler.c
index 4f45687700..44ab10cdf1 100644
--- a/src/mainboard/google/poppy/smihandler.c
+++ b/src/mainboard/google/poppy/smihandler.c
@@ -19,7 +19,7 @@
 #include <elog.h>
 #include <gpio.h>
 #include <soc/gpio.h>
-#include <soc/smm.h>
+#include <intelblocks/smihandler.h>
 
 #include <baseboard/variants.h>
 #include <variant/gpio.h>
diff --git a/src/mainboard/google/sarien/smihandler.c b/src/mainboard/google/sarien/smihandler.c
index 0efcaa9ef1..18dbfbc154 100644
--- a/src/mainboard/google/sarien/smihandler.c
+++ b/src/mainboard/google/sarien/smihandler.c
@@ -15,7 +15,7 @@
 
 #include <cpu/x86/smm.h>
 #include <ec/google/wilco/smm.h>
-#include <soc/smm.h>
+#include <intelblocks/smihandler.h>
 #include <variant/ec.h>
 
 void mainboard_smi_espi_handler(void)