diff --git a/src/drivers/intel/gma/intel_ddi.c b/src/drivers/intel/gma/intel_ddi.c
index e51fb9ce13..9127060ece 100644
--- a/src/drivers/intel/gma/intel_ddi.c
+++ b/src/drivers/intel/gma/intel_ddi.c
@@ -42,7 +42,6 @@
 #include <smbios.h>
 #include <device/pci.h>
 #include <ec/google/chromeec/ec.h>
-#include <cbfs_core.h>
 
 #include <cpu/x86/tsc.h>
 #include <cpu/x86/cache.h>
diff --git a/src/lib/rmodule.c b/src/lib/rmodule.c
index 791029a250..d06409f490 100644
--- a/src/lib/rmodule.c
+++ b/src/lib/rmodule.c
@@ -18,7 +18,7 @@
  */
 #include <assert.h>
 #include <cbmem.h>
-#include <cbfs_core.h>
+#include <cbfs.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/mainboard/google/falco/gma.c b/src/mainboard/google/falco/gma.c
index 6e3afdbf34..018075cceb 100644
--- a/src/mainboard/google/falco/gma.c
+++ b/src/mainboard/google/falco/gma.c
@@ -34,7 +34,6 @@
 #include <smbios.h>
 #include <device/pci.h>
 #include <ec/google/chromeec/ec.h>
-#include <cbfs_core.h>
 
 #include <cpu/x86/tsc.h>
 #include <cpu/x86/cache.h>
diff --git a/src/mainboard/google/link/i915.c b/src/mainboard/google/link/i915.c
index a9028dd63e..e377e43f28 100644
--- a/src/mainboard/google/link/i915.c
+++ b/src/mainboard/google/link/i915.c
@@ -38,7 +38,6 @@
 #include <smbios.h>
 #include <device/pci.h>
 #include <ec/google/chromeec/ec.h>
-#include <cbfs_core.h>
 
 #include <cpu/x86/tsc.h>
 #include <cpu/x86/cache.h>
diff --git a/src/mainboard/google/peppy/gma.c b/src/mainboard/google/peppy/gma.c
index 953dad9a09..8997da6abb 100644
--- a/src/mainboard/google/peppy/gma.c
+++ b/src/mainboard/google/peppy/gma.c
@@ -34,7 +34,6 @@
 #include <smbios.h>
 #include <device/pci.h>
 #include <ec/google/chromeec/ec.h>
-#include <cbfs_core.h>
 
 #include <cpu/x86/tsc.h>
 #include <cpu/x86/cache.h>
diff --git a/src/mainboard/intel/wtm2/i915.c b/src/mainboard/intel/wtm2/i915.c
index 72957a0de4..3fb8acb521 100644
--- a/src/mainboard/intel/wtm2/i915.c
+++ b/src/mainboard/intel/wtm2/i915.c
@@ -34,7 +34,6 @@
 #include <smbios.h>
 #include <device/pci.h>
 #include <ec/google/chromeec/ec.h>
-#include <cbfs_core.h>
 
 #include <cpu/x86/tsc.h>
 #include <cpu/x86/cache.h>
diff --git a/src/soc/nvidia/tegra124/spi.c b/src/soc/nvidia/tegra124/spi.c
index 78a17d9b53..b88306bb4a 100644
--- a/src/soc/nvidia/tegra124/spi.c
+++ b/src/soc/nvidia/tegra124/spi.c
@@ -20,7 +20,6 @@
 
 #include <assert.h>
 #include <cbfs.h>
-#include <cbfs_core.h>
 #include <inttypes.h>
 #include <spi-generic.h>
 #include <spi_flash.h>
diff --git a/src/soc/nvidia/tegra132/spi.c b/src/soc/nvidia/tegra132/spi.c
index 882a6ad344..219998c88d 100644
--- a/src/soc/nvidia/tegra132/spi.c
+++ b/src/soc/nvidia/tegra132/spi.c
@@ -20,7 +20,6 @@
 
 #include <assert.h>
 #include <cbfs.h>
-#include <cbfs_core.h>
 #include <inttypes.h>
 #include <spi-generic.h>
 #include <spi_flash.h>