diff --git a/src/soc/intel/icelake/bootblock/bootblock.c b/src/soc/intel/icelake/bootblock/bootblock.c
index ce71cdde89..54ad85a82e 100644
--- a/src/soc/intel/icelake/bootblock/bootblock.c
+++ b/src/soc/intel/icelake/bootblock/bootblock.c
@@ -1,12 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <bootblock_common.h>
-#include <intelblocks/gspi.h>
 #include <intelblocks/systemagent.h>
 #include <intelblocks/uart.h>
 #include <soc/bootblock.h>
-#include <soc/iomap.h>
-#include <soc/pch.h>
 
 asmlinkage void bootblock_c_entry(uint64_t base_timestamp)
 {
diff --git a/src/soc/intel/jasperlake/bootblock/bootblock.c b/src/soc/intel/jasperlake/bootblock/bootblock.c
index ce71cdde89..54ad85a82e 100644
--- a/src/soc/intel/jasperlake/bootblock/bootblock.c
+++ b/src/soc/intel/jasperlake/bootblock/bootblock.c
@@ -1,12 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <bootblock_common.h>
-#include <intelblocks/gspi.h>
 #include <intelblocks/systemagent.h>
 #include <intelblocks/uart.h>
 #include <soc/bootblock.h>
-#include <soc/iomap.h>
-#include <soc/pch.h>
 
 asmlinkage void bootblock_c_entry(uint64_t base_timestamp)
 {
diff --git a/src/soc/intel/skylake/bootblock/bootblock.c b/src/soc/intel/skylake/bootblock/bootblock.c
index 461e28cbc5..6380db2e1f 100644
--- a/src/soc/intel/skylake/bootblock/bootblock.c
+++ b/src/soc/intel/skylake/bootblock/bootblock.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <bootblock_common.h>
-#include <drivers/i2c/designware/dw_i2c.h>
+#include <intelblocks/systemagent.h>
 #include <intelblocks/gspi.h>
 #include <intelblocks/uart.h>
 #include <soc/bootblock.h>
diff --git a/src/soc/intel/tigerlake/bootblock/bootblock.c b/src/soc/intel/tigerlake/bootblock/bootblock.c
index ce71cdde89..54ad85a82e 100644
--- a/src/soc/intel/tigerlake/bootblock/bootblock.c
+++ b/src/soc/intel/tigerlake/bootblock/bootblock.c
@@ -1,12 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <bootblock_common.h>
-#include <intelblocks/gspi.h>
 #include <intelblocks/systemagent.h>
 #include <intelblocks/uart.h>
 #include <soc/bootblock.h>
-#include <soc/iomap.h>
-#include <soc/pch.h>
 
 asmlinkage void bootblock_c_entry(uint64_t base_timestamp)
 {