diff --git a/src/soc/intel/icelake/bootblock/bootblock.c b/src/soc/intel/icelake/bootblock/bootblock.c
index db43e50ec8..f348c1be6a 100644
--- a/src/soc/intel/icelake/bootblock/bootblock.c
+++ b/src/soc/intel/icelake/bootblock/bootblock.c
@@ -15,6 +15,7 @@
 
 #include <bootblock_common.h>
 #include <intelblocks/gspi.h>
+#include <intelblocks/systemagent.h>
 #include <intelblocks/uart.h>
 #include <soc/bootblock.h>
 #include <soc/iomap.h>
diff --git a/src/soc/intel/icelake/include/soc/bootblock.h b/src/soc/intel/icelake/include/soc/bootblock.h
index 2f6473da02..4ca2c37288 100644
--- a/src/soc/intel/icelake/include/soc/bootblock.h
+++ b/src/soc/intel/icelake/include/soc/bootblock.h
@@ -16,8 +16,6 @@
 #ifndef _SOC_ICELAKE_BOOTBLOCK_H_
 #define _SOC_ICELAKE_BOOTBLOCK_H_
 
-#include <intelblocks/systemagent.h>
-
 /* Bootblock pre console init programming */
 void bootblock_cpu_init(void);
 void bootblock_pch_early_init(void);
diff --git a/src/soc/intel/icelake/include/soc/cpu.h b/src/soc/intel/icelake/include/soc/cpu.h
index b5722da742..7d17058004 100644
--- a/src/soc/intel/icelake/include/soc/cpu.h
+++ b/src/soc/intel/icelake/include/soc/cpu.h
@@ -16,7 +16,6 @@
 #ifndef _SOC_ICELAKE_CPU_H_
 #define _SOC_ICELAKE_CPU_H_
 
-#include <device/device.h>
 #include <intelblocks/msr.h>
 
 /* Latency times in units of 32768ns */