diff --git a/src/drivers/spi/flashconsole.c b/src/drivers/spi/flashconsole.c
index d5c4382101..679c814dff 100644
--- a/src/drivers/spi/flashconsole.c
+++ b/src/drivers/spi/flashconsole.c
@@ -2,7 +2,6 @@
 
 #include <commonlib/helpers.h>
 #include <commonlib/region.h>
-#include <boot_device.h>
 #include <fmap.h>
 #include <console/console.h>
 #include <console/flash.h>
diff --git a/src/drivers/spi/spi_flash.c b/src/drivers/spi/spi_flash.c
index 2406a90e52..b674749feb 100644
--- a/src/drivers/spi/spi_flash.c
+++ b/src/drivers/spi/spi_flash.c
@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include <assert.h>
-#include <boot_device.h>
 #include <boot/coreboot_tables.h>
+#include <commonlib/region.h>
 #include <console/console.h>
 #include <string.h>
 #include <spi-generic.h>
diff --git a/src/soc/intel/common/block/cse/cse_lite.c b/src/soc/intel/common/block/cse/cse_lite.c
index 62c274be57..c7dec5c666 100644
--- a/src/soc/intel/common/block/cse/cse_lite.c
+++ b/src/soc/intel/common/block/cse/cse_lite.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <console/console.h>
-#include <boot_device.h>
 #include <cbfs.h>
 #include <commonlib/cbfs.h>
 #include <commonlib/region.h>
diff --git a/src/soc/samsung/exynos5250/spi.c b/src/soc/samsung/exynos5250/spi.c
index 879d04a598..e630090852 100644
--- a/src/soc/samsung/exynos5250/spi.c
+++ b/src/soc/samsung/exynos5250/spi.c
@@ -2,7 +2,7 @@
 
 #include <device/mmio.h>
 #include <assert.h>
-#include <boot_device.h>
+#include <commonlib/region.h>
 #include <console/console.h>
 #include <soc/clk.h>
 #include <soc/gpio.h>