src: Remove unneeded include <cbmem.h>

Change-Id: I89e03b6def5c78415bf73baba55941953a70d8de
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/29302
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

60 files changed, 1 insertions, 59 deletions

diff --git a/src/arch/arm/armv7/mmu.c b/src/arch/arm/armv7/mmu.c
index 935f778ec51d..b63497ce8f71 100644
--- a/src/arch/arm/armv7/mmu.c
+++ b/src/arch/arm/armv7/mmu.c
@@ -33,7 +33,6 @@
 #include <stdint.h>
 #include <symbols.h>
 
-#include <cbmem.h>
 #include <console/console.h>
 
 #include <arch/cache.h>
diff --git a/src/arch/arm64/arm_tf.c b/src/arch/arm64/arm_tf.c
index 384b1b724e7c..eaf873965fcc 100644
--- a/src/arch/arm64/arm_tf.c
+++ b/src/arch/arm64/arm_tf.c
@@ -20,7 +20,6 @@
 #include <arm_tf.h>
 #include <assert.h>
 #include <cbfs.h>
-#include <cbmem.h>
 #include <program_loading.h>
 
 /*
diff --git a/src/arch/arm64/boot.c b/src/arch/arm64/boot.c
index 65a01bf562e8..54a33e0daf00 100644
--- a/src/arch/arm64/boot.c
+++ b/src/arch/arm64/boot.c
@@ -18,7 +18,6 @@
 #include <arch/stages.h>
 #include <arch/transition.h>
 #include <arm_tf.h>
-#include <cbmem.h>
 #include <program_loading.h>
 #include <rules.h>
 #include <string.h>
diff --git a/src/cpu/allwinner/a10/cpu.c b/src/cpu/allwinner/a10/cpu.c
index c1455be1e6f5..09f67662bfbd 100644
--- a/src/cpu/allwinner/a10/cpu.c
+++ b/src/cpu/allwinner/a10/cpu.c
@@ -18,7 +18,6 @@
  */
 
 #include <device/device.h>
-#include <cbmem.h>
 #include <symbols.h>
 
 static void cpu_enable_resources(struct device *dev)
diff --git a/src/cpu/amd/car/post_cache_as_ram.c b/src/cpu/amd/car/post_cache_as_ram.c
index adf959ce4f73..e55ef408f336 100644
--- a/src/cpu/amd/car/post_cache_as_ram.c
+++ b/src/cpu/amd/car/post_cache_as_ram.c
@@ -26,7 +26,6 @@
 #include <cpu/amd/msr.h>
 #include <arch/acpi.h>
 #include <romstage_handoff.h>
-#include <cbmem.h>
 
 #include "cpu/amd/car/disable_cache_as_ram.c"
 
diff --git a/src/drivers/amd/agesa/state_machine.c b/src/drivers/amd/agesa/state_machine.c
index 8fcc60af6814..15ea211f4be6 100644
--- a/src/drivers/amd/agesa/state_machine.c
+++ b/src/drivers/amd/agesa/state_machine.c
@@ -21,7 +21,6 @@
 #include <arch/cpu.h>
 #include <bootstate.h>
 #include <cbfs.h>
-#include <cbmem.h>
 
 #include <northbridge/amd/agesa/state_machine.h>
 #include <northbridge/amd/agesa/agesa_helper.h>
diff --git a/src/drivers/intel/fsp1_1/hob.c b/src/drivers/intel/fsp1_1/hob.c
index 40881d632a8e..ee1a6a328e8d 100644
--- a/src/drivers/intel/fsp1_1/hob.c
+++ b/src/drivers/intel/fsp1_1/hob.c
@@ -17,7 +17,6 @@
 #include <arch/early_variables.h>
 #include <arch/hlt.h>
 #include <bootstate.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <fsp/util.h>
 #include <ip_checksum.h>
diff --git a/src/drivers/intel/fsp1_1/ramstage.c b/src/drivers/intel/fsp1_1/ramstage.c
index bfc58f865cb7..864ab4509f89 100644
--- a/src/drivers/intel/fsp1_1/ramstage.c
+++ b/src/drivers/intel/fsp1_1/ramstage.c
@@ -16,7 +16,6 @@
 
 #include <bootmode.h>
 #include <arch/acpi.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <fsp/memmap.h>
 #include <fsp/ramstage.h>
diff --git a/src/mainboard/google/slippy/acpi_tables.c b/src/mainboard/google/slippy/acpi_tables.c
index 51c5b965c593..b17f5a629613 100644
--- a/src/mainboard/google/slippy/acpi_tables.c
+++ b/src/mainboard/google/slippy/acpi_tables.c
@@ -15,7 +15,6 @@
 
 #include <types.h>
 #include <string.h>
-#include <cbmem.h>
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <arch/acpigen.h>
diff --git a/src/mainboard/via/epia-m850/romstage.c b/src/mainboard/via/epia-m850/romstage.c
index db03103b0ebc..dd303b7b874a 100644
--- a/src/mainboard/via/epia-m850/romstage.c
+++ b/src/mainboard/via/epia-m850/romstage.c
@@ -27,6 +27,7 @@
 #include <cpu/x86/bist.h>
 #include <string.h>
 #include <timestamp.h>
+#include <cbmem.h>
 
 #include <northbridge/via/vx900/early_vx900.h>
 #include <northbridge/via/vx900/raminit.h>
diff --git a/src/northbridge/amd/agesa/family12/northbridge.c b/src/northbridge/amd/agesa/family12/northbridge.c
index 185111864594..ff011e360823 100644
--- a/src/northbridge/amd/agesa/family12/northbridge.c
+++ b/src/northbridge/amd/agesa/family12/northbridge.c
@@ -26,7 +26,6 @@
 #include <string.h>
 #include <lib.h>
 #include <cpu/cpu.h>
-#include <cbmem.h>
 
 #include <cpu/x86/lapic.h>
 #include <cpu/amd/msr.h>
diff --git a/src/northbridge/amd/agesa/family14/northbridge.c b/src/northbridge/amd/agesa/family14/northbridge.c
index 0a56d18e73cc..b843c799c204 100644
--- a/src/northbridge/amd/agesa/family14/northbridge.c
+++ b/src/northbridge/amd/agesa/family14/northbridge.c
@@ -26,7 +26,6 @@
 #include <string.h>
 #include <lib.h>
 #include <cpu/cpu.h>
-#include <cbmem.h>
 #include <cpu/x86/lapic.h>
 #include <cpu/amd/msr.h>
 #include <cpu/amd/mtrr.h>
diff --git a/src/northbridge/amd/agesa/family15tn/northbridge.c b/src/northbridge/amd/agesa/family15tn/northbridge.c
index 7248eb79a079..0361a77eb7cb 100644
--- a/src/northbridge/amd/agesa/family15tn/northbridge.c
+++ b/src/northbridge/amd/agesa/family15tn/northbridge.c
@@ -27,7 +27,6 @@
 #include <string.h>
 #include <lib.h>
 #include <cpu/cpu.h>
-#include <cbmem.h>
 #include <AGESA.h>
 #include <cpu/x86/lapic.h>
 #include <cpu/amd/msr.h>
diff --git a/src/northbridge/amd/agesa/family16kb/northbridge.c b/src/northbridge/amd/agesa/family16kb/northbridge.c
index a42ee5cd51e0..b3b0ba192af5 100644
--- a/src/northbridge/amd/agesa/family16kb/northbridge.c
+++ b/src/northbridge/amd/agesa/family16kb/northbridge.c
@@ -26,7 +26,6 @@
 #include <string.h>
 #include <lib.h>
 #include <cpu/cpu.h>
-#include <cbmem.h>
 #include <cpu/x86/lapic.h>
 #include <cpu/amd/msr.h>
 #include <cpu/amd/mtrr.h>
diff --git a/src/northbridge/amd/pi/00630F01/northbridge.c b/src/northbridge/amd/pi/00630F01/northbridge.c
index 7a24d11a6520..8166046a88f1 100644
--- a/src/northbridge/amd/pi/00630F01/northbridge.c
+++ b/src/northbridge/amd/pi/00630F01/northbridge.c
@@ -25,7 +25,6 @@
 #include <string.h>
 #include <lib.h>
 #include <cpu/cpu.h>
-#include <cbmem.h>
 #include <Porting.h>
 #include <AGESA.h>
 #include <FieldAccessors.h>
diff --git a/src/northbridge/amd/pi/00660F01/northbridge.c b/src/northbridge/amd/pi/00660F01/northbridge.c
index 826ce3ea4152..8dd9daaee0c9 100644
--- a/src/northbridge/amd/pi/00660F01/northbridge.c
+++ b/src/northbridge/amd/pi/00660F01/northbridge.c
@@ -25,7 +25,6 @@
 #include <string.h>
 #include <lib.h>
 #include <cpu/cpu.h>
-#include <cbmem.h>
 #include <Porting.h>
 #include <AGESA.h>
 #include <FieldAccessors.h>
diff --git a/src/northbridge/amd/pi/00730F01/northbridge.c b/src/northbridge/amd/pi/00730F01/northbridge.c
index 804ce6eab587..4d9fc280b208 100644
--- a/src/northbridge/amd/pi/00730F01/northbridge.c
+++ b/src/northbridge/amd/pi/00730F01/northbridge.c
@@ -27,7 +27,6 @@
 #include <string.h>
 #include <lib.h>
 #include <cpu/cpu.h>
-#include <cbmem.h>
 #include <Porting.h>
 #include <AGESA.h>
 #include <FieldAccessors.h>
diff --git a/src/northbridge/intel/e7505/northbridge.c b/src/northbridge/intel/e7505/northbridge.c
index a5dc6cdf32da..b4752c4c5203 100644
--- a/src/northbridge/intel/e7505/northbridge.c
+++ b/src/northbridge/intel/e7505/northbridge.c
@@ -20,7 +20,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include "e7505.h"
-#include <cbmem.h>
 #include <arch/acpi.h>
 
 unsigned long acpi_fill_mcfg(unsigned long current)
diff --git a/src/northbridge/intel/e7505/raminit.c b/src/northbridge/intel/e7505/raminit.c
index eadd5bca8a0d..8a44b271b412 100644
--- a/src/northbridge/intel/e7505/raminit.c
+++ b/src/northbridge/intel/e7505/raminit.c
@@ -37,7 +37,6 @@
 #include <assert.h>
 #include <spd.h>
 #include <sdram_mode.h>
-#include <cbmem.h>
 
 #include "raminit.h"
 #include "e7505.h"
diff --git a/src/northbridge/intel/fsp_rangeley/northbridge.c b/src/northbridge/intel/fsp_rangeley/northbridge.c
index 94855cfc4081..93d9c634210a 100644
--- a/src/northbridge/intel/fsp_rangeley/northbridge.c
+++ b/src/northbridge/intel/fsp_rangeley/northbridge.c
@@ -27,7 +27,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <cpu/cpu.h>
-#include <cbmem.h>
 #include "chip.h"
 #include "northbridge.h"
 #include <drivers/intel/fsp1_0/fsp_util.h>
diff --git a/src/northbridge/intel/fsp_sandybridge/northbridge.c b/src/northbridge/intel/fsp_sandybridge/northbridge.c
index 111c201097a8..c468e25752a1 100644
--- a/src/northbridge/intel/fsp_sandybridge/northbridge.c
+++ b/src/northbridge/intel/fsp_sandybridge/northbridge.c
@@ -27,7 +27,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <cpu/cpu.h>
-#include <cbmem.h>
 #include "chip.h"
 #include "northbridge.h"
 #include <fsp_util.h>
diff --git a/src/northbridge/intel/fsp_sandybridge/raminit.c b/src/northbridge/intel/fsp_sandybridge/raminit.c
index f67d4052244d..a9648ed30293 100644
--- a/src/northbridge/intel/fsp_sandybridge/raminit.c
+++ b/src/northbridge/intel/fsp_sandybridge/raminit.c
@@ -16,7 +16,6 @@
 #include <console/console.h>
 #include <string.h>
 #include <arch/io.h>
-#include <cbmem.h>
 #include <device/pci_def.h>
 #include "raminit.h"
 #include "northbridge.h"
diff --git a/src/northbridge/intel/gm45/acpi.c b/src/northbridge/intel/gm45/acpi.c
index 019c5ffdec04..673478c8fc60 100644
--- a/src/northbridge/intel/gm45/acpi.c
+++ b/src/northbridge/intel/gm45/acpi.c
@@ -22,7 +22,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <cbmem.h>
 #include "gm45.h"
 
 unsigned long acpi_fill_mcfg(unsigned long current)
diff --git a/src/northbridge/intel/haswell/northbridge.c b/src/northbridge/intel/haswell/northbridge.c
index 0ca071b9ce9c..42e1501cff44 100644
--- a/src/northbridge/intel/haswell/northbridge.c
+++ b/src/northbridge/intel/haswell/northbridge.c
@@ -27,7 +27,6 @@
 #include <string.h>
 #include <cpu/x86/smm.h>
 #include <boot/tables.h>
-#include <cbmem.h>
 #include "chip.h"
 #include "haswell.h"
 
diff --git a/src/northbridge/intel/i440bx/northbridge.c b/src/northbridge/intel/i440bx/northbridge.c
index 71b55041b317..4b1141c7ff0a 100644
--- a/src/northbridge/intel/i440bx/northbridge.c
+++ b/src/northbridge/intel/i440bx/northbridge.c
@@ -19,7 +19,6 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <cbmem.h>
 #include <cpu/cpu.h>
 #include "northbridge.h"
 #include "i440bx.h"
diff --git a/src/northbridge/intel/i945/acpi.c b/src/northbridge/intel/i945/acpi.c
index dd080118fb88..0ce7e4b9507d 100644
--- a/src/northbridge/intel/i945/acpi.c
+++ b/src/northbridge/intel/i945/acpi.c
@@ -21,7 +21,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <cbmem.h>
 #include "i945.h"
 
 unsigned long acpi_fill_mcfg(unsigned long current)
diff --git a/src/northbridge/intel/i945/raminit.c b/src/northbridge/intel/i945/raminit.c
index ed93daa8510a..30e16dbb486d 100644
--- a/src/northbridge/intel/i945/raminit.c
+++ b/src/northbridge/intel/i945/raminit.c
@@ -26,7 +26,6 @@
 #include "raminit.h"
 #include "i945.h"
 #include "chip.h"
-#include <cbmem.h>
 #include <device/dram/ddr2.h>
 #include <timestamp.h>
 
diff --git a/src/northbridge/intel/nehalem/northbridge.c b/src/northbridge/intel/nehalem/northbridge.c
index 4c6cdd4d731b..00f6913a0733 100644
--- a/src/northbridge/intel/nehalem/northbridge.c
+++ b/src/northbridge/intel/nehalem/northbridge.c
@@ -28,7 +28,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <cpu/cpu.h>
-#include <cbmem.h>
 #include "chip.h"
 #include "nehalem.h"
 #include <cpu/intel/smm/gen1/smi.h>
diff --git a/src/northbridge/intel/sandybridge/early_init.c b/src/northbridge/intel/sandybridge/early_init.c
index 7b4b3bed27c8..f8ecc1a77aa6 100644
--- a/src/northbridge/intel/sandybridge/early_init.c
+++ b/src/northbridge/intel/sandybridge/early_init.c
@@ -21,7 +21,6 @@
 #include <arch/acpi.h>
 #include <device/pci_def.h>
 #include <elog.h>
-#include <cbmem.h>
 #include <pc80/mc146818rtc.h>
 #include <romstage_handoff.h>
 #include "sandybridge.h"
diff --git a/src/northbridge/intel/sandybridge/northbridge.c b/src/northbridge/intel/sandybridge/northbridge.c
index cb0e5db4557b..5ec8292f6299 100644
--- a/src/northbridge/intel/sandybridge/northbridge.c
+++ b/src/northbridge/intel/sandybridge/northbridge.c
@@ -27,7 +27,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <cpu/cpu.h>
-#include <cbmem.h>
 #include "chip.h"
 #include "sandybridge.h"
 #include <cpu/intel/smm/gen1/smi.h>
diff --git a/src/northbridge/intel/x4x/acpi.c b/src/northbridge/intel/x4x/acpi.c
index c5c31e659911..0f235a4bb4e7 100644
--- a/src/northbridge/intel/x4x/acpi.c
+++ b/src/northbridge/intel/x4x/acpi.c
@@ -23,7 +23,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <cbmem.h>
 #include "x4x.h"
 
 unsigned long acpi_fill_mcfg(unsigned long current)
diff --git a/src/northbridge/intel/x4x/early_init.c b/src/northbridge/intel/x4x/early_init.c
index d410259d8253..c6eb38315b26 100644
--- a/src/northbridge/intel/x4x/early_init.c
+++ b/src/northbridge/intel/x4x/early_init.c
@@ -24,7 +24,6 @@
 #endif
 #include <pc80/mc146818rtc.h>
 #include "x4x.h"
-#include <cbmem.h>
 #include <console/console.h>
 #include <halt.h>
 #include <romstage_handoff.h>
diff --git a/src/northbridge/via/vx900/early_vx900.h b/src/northbridge/via/vx900/early_vx900.h
index 55b6c6976671..899512b90c20 100644
--- a/src/northbridge/via/vx900/early_vx900.h
+++ b/src/northbridge/via/vx900/early_vx900.h
@@ -21,7 +21,6 @@
 #include "vx900.h"
 
 #include <arch/io.h>
-#include <cbmem.h>
 #include <stdint.h>
 
 /* North Module devices */
diff --git a/src/northbridge/via/vx900/northbridge.c b/src/northbridge/via/vx900/northbridge.c
index 2b81b47ff2e4..ca414506df54 100644
--- a/src/northbridge/via/vx900/northbridge.c
+++ b/src/northbridge/via/vx900/northbridge.c
@@ -22,7 +22,6 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <cpu/cpu.h>
-#include <cbmem.h>
 #include <cf9_reset.h>
 #include <reset.h>
 #include <string.h>
diff --git a/src/security/vboot/vboot_loader.c b/src/security/vboot/vboot_loader.c
index 17ea0a9401ba..57a3b4985fbb 100644
--- a/src/security/vboot/vboot_loader.c
+++ b/src/security/vboot/vboot_loader.c
@@ -15,7 +15,6 @@
 
 #include <arch/early_variables.h>
 #include <cbfs.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <ec/google/chromeec/ec.h>
 #include <rmodule.h>
diff --git a/src/soc/amd/common/block/s3/s3_resume.c b/src/soc/amd/common/block/s3/s3_resume.c
index 1ba9468e3505..04414e8a2e6c 100644
--- a/src/soc/amd/common/block/s3/s3_resume.c
+++ b/src/soc/amd/common/block/s3/s3_resume.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <cbmem.h>
 #include <stage_cache.h>
 #include <mrc_cache.h>
 #include <console/console.h>
diff --git a/src/soc/intel/braswell/southcluster.c b/src/soc/intel/braswell/southcluster.c
index dd0c78e59a4b..ae4b8c5057b4 100644
--- a/src/soc/intel/braswell/southcluster.c
+++ b/src/soc/intel/braswell/southcluster.c
@@ -19,7 +19,6 @@
 #include <arch/acpi.h>
 #include <arch/acpigen.h>
 #include <bootstate.h>
-#include <cbmem.h>
 #include "chip.h"
 #include <console/console.h>
 #include <cpu/x86/smm.h>
diff --git a/src/soc/intel/broadwell/romstage/romstage.c b/src/soc/intel/broadwell/romstage/romstage.c
index b15057484c0e..7a796f4a6950 100644
--- a/src/soc/intel/broadwell/romstage/romstage.c
+++ b/src/soc/intel/broadwell/romstage/romstage.c
@@ -20,7 +20,6 @@
 #include <arch/early_variables.h>
 #include <bootmode.h>
 #include <console/console.h>
-#include <cbmem.h>
 #include <cpu/x86/mtrr.h>
 #include <elog.h>
 #include <program_loading.h>
diff --git a/src/soc/intel/broadwell/systemagent.c b/src/soc/intel/broadwell/systemagent.c
index afb60380d059..71477508b9f9 100644
--- a/src/soc/intel/broadwell/systemagent.c
+++ b/src/soc/intel/broadwell/systemagent.c
@@ -24,7 +24,6 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <cbmem.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 #include <soc/cpu.h>
 #include <soc/iomap.h>
diff --git a/src/soc/intel/cannonlake/romstage/power_state.c b/src/soc/intel/cannonlake/romstage/power_state.c
index 838a056a9e09..72361ff83ad8 100644
--- a/src/soc/intel/cannonlake/romstage/power_state.c
+++ b/src/soc/intel/cannonlake/romstage/power_state.c
@@ -16,7 +16,6 @@
 
 #include <arch/early_variables.h>
 #include <arch/io.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <device/device.h>
 #include <intelblocks/pmclib.h>
diff --git a/src/soc/intel/denverton_ns/chip.c b/src/soc/intel/denverton_ns/chip.c
index dfb6d2ee74b2..d0a21ac3357b 100644
--- a/src/soc/intel/denverton_ns/chip.c
+++ b/src/soc/intel/denverton_ns/chip.c
@@ -18,7 +18,6 @@
 #include <arch/acpi.h>
 #include <bootstate.h>
 #include <cbfs.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/soc/intel/denverton_ns/systemagent.c b/src/soc/intel/denverton_ns/systemagent.c
index f41714fb41d4..6ffa2c70caa5 100644
--- a/src/soc/intel/denverton_ns/systemagent.c
+++ b/src/soc/intel/denverton_ns/systemagent.c
@@ -25,7 +25,6 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <cbmem.h>
 #include <romstage_handoff.h>
 #include <timer.h>
 
diff --git a/src/soc/intel/fsp_baytrail/southcluster.c b/src/soc/intel/fsp_baytrail/southcluster.c
index d62805ff7adb..21cd0d5f07ee 100644
--- a/src/soc/intel/fsp_baytrail/southcluster.c
+++ b/src/soc/intel/fsp_baytrail/southcluster.c
@@ -19,7 +19,6 @@
 #include <stdint.h>
 #include <arch/io.h>
 #include <arch/ioapic.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/soc/intel/icelake/romstage/power_state.c b/src/soc/intel/icelake/romstage/power_state.c
index 3b6d5f25de24..17ed36a9d9e2 100644
--- a/src/soc/intel/icelake/romstage/power_state.c
+++ b/src/soc/intel/icelake/romstage/power_state.c
@@ -15,7 +15,6 @@
 
 #include <arch/early_variables.h>
 #include <arch/io.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <device/device.h>
 #include <intelblocks/pmclib.h>
diff --git a/src/soc/intel/skylake/romstage/romstage.c b/src/soc/intel/skylake/romstage/romstage.c
index 8710c5a6626c..b19425822828 100644
--- a/src/soc/intel/skylake/romstage/romstage.c
+++ b/src/soc/intel/skylake/romstage/romstage.c
@@ -19,7 +19,6 @@
 #include <arch/stages.h>
 #include <arch/early_variables.h>
 #include <assert.h>
-#include <cbmem.h>
 #include <chip.h>
 #include <console/console.h>
 #include <cpu/x86/mtrr.h>
diff --git a/src/soc/nvidia/tegra124/display.c b/src/soc/nvidia/tegra124/display.c
index 061d16747e6a..2e6696585b0a 100644
--- a/src/soc/nvidia/tegra124/display.c
+++ b/src/soc/nvidia/tegra124/display.c
@@ -15,7 +15,6 @@
 
 #include <arch/io.h>
 #include <boot/tables.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <delay.h>
 #include <device/device.h>
diff --git a/src/soc/nvidia/tegra124/sor.c b/src/soc/nvidia/tegra124/sor.c
index b93b39d83dcb..50d637057b83 100644
--- a/src/soc/nvidia/tegra124/sor.c
+++ b/src/soc/nvidia/tegra124/sor.c
@@ -18,7 +18,6 @@
 
 #include <arch/io.h>
 #include <boot/tables.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <cpu/cpu.h>
 #include <delay.h>
diff --git a/src/soc/nvidia/tegra210/soc.c b/src/soc/nvidia/tegra210/soc.c
index 076aa0055321..71532be989f3 100644
--- a/src/soc/nvidia/tegra210/soc.c
+++ b/src/soc/nvidia/tegra210/soc.c
@@ -18,7 +18,6 @@
 #include <arch/cache.h>
 #include <bootmode.h>
 #include <bootstate.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <device/device.h>
 #include <soc/nvidia/tegra/dc.h>
diff --git a/src/soc/nvidia/tegra210/sor.c b/src/soc/nvidia/tegra210/sor.c
index 87eb5370d858..604fa0e555d2 100644
--- a/src/soc/nvidia/tegra210/sor.c
+++ b/src/soc/nvidia/tegra210/sor.c
@@ -25,7 +25,6 @@
 #include <device/device.h>
 #include <string.h>
 #include <boot/tables.h>
-#include <cbmem.h>
 #include <soc/nvidia/tegra/dc.h>
 #include <soc/nvidia/tegra/types.h>
 #include <soc/sor.h>
diff --git a/src/soc/rockchip/rk3288/soc.c b/src/soc/rockchip/rk3288/soc.c
index eadbfc8ee275..c0a2ed002e5a 100644
--- a/src/soc/rockchip/rk3288/soc.c
+++ b/src/soc/rockchip/rk3288/soc.c
@@ -15,7 +15,6 @@
 
 #include <arch/cache.h>
 #include <bootmode.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <delay.h>
 #include <device/device.h>
diff --git a/src/soc/samsung/exynos5250/cpu.c b/src/soc/samsung/exynos5250/cpu.c
index 2196144dd75e..aed11146d91d 100644
--- a/src/soc/samsung/exynos5250/cpu.c
+++ b/src/soc/samsung/exynos5250/cpu.c
@@ -15,7 +15,6 @@
  */
 
 #include <arch/cache.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <delay.h>
 #include <device/device.h>
diff --git a/src/soc/samsung/exynos5420/cpu.c b/src/soc/samsung/exynos5420/cpu.c
index cab23a60e6c4..ecda54b15033 100644
--- a/src/soc/samsung/exynos5420/cpu.c
+++ b/src/soc/samsung/exynos5420/cpu.c
@@ -15,7 +15,6 @@
  */
 
 #include <arch/cache.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <delay.h>
 #include <device/device.h>
diff --git a/src/southbridge/amd/agesa/hudson/early_setup.c b/src/southbridge/amd/agesa/hudson/early_setup.c
index 66cd66ebe3a5..af0cb58f6c0a 100644
--- a/src/southbridge/amd/agesa/hudson/early_setup.c
+++ b/src/southbridge/amd/agesa/hudson/early_setup.c
@@ -21,7 +21,6 @@
 #include <arch/acpi.h>
 #include <console/console.h>
 #include <reset.h>
-#include <cbmem.h>
 #include "hudson.h"
 
 void hudson_pci_port80(void)
diff --git a/src/southbridge/amd/agesa/hudson/hudson.c b/src/southbridge/amd/agesa/hudson/hudson.c
index 4fc473bdf474..5d32a83d9186 100644
--- a/src/southbridge/amd/agesa/hudson/hudson.c
+++ b/src/southbridge/amd/agesa/hudson/hudson.c
@@ -23,7 +23,6 @@
 #include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
-#include <cbmem.h>
 #include "hudson.h"
 #include "imc.h"
 #include "smbus.h"
diff --git a/src/southbridge/amd/cimx/sb800/cfg.c b/src/southbridge/amd/cimx/sb800/cfg.c
index f2cd9a902137..10272166d097 100644
--- a/src/southbridge/amd/cimx/sb800/cfg.c
+++ b/src/southbridge/amd/cimx/sb800/cfg.c
@@ -16,7 +16,6 @@
 #include "SBPLATFORM.h"
 #include "cfg.h"
 #include <OEM.h>
-#include <cbmem.h>
 
 #include <arch/io.h>
 #include <arch/acpi.h>
diff --git a/src/southbridge/amd/cimx/sb800/lpc.c b/src/southbridge/amd/cimx/sb800/lpc.c
index 40c0739bb10d..2759af648848 100644
--- a/src/southbridge/amd/cimx/sb800/lpc.c
+++ b/src/southbridge/amd/cimx/sb800/lpc.c
@@ -20,7 +20,6 @@
 #include <arch/ioapic.h>
 #include "lpc.h"
 #include <arch/io.h>
-#include <cbmem.h>
 
 void lpc_read_resources(struct device *dev)
 {
diff --git a/src/southbridge/amd/pi/hudson/early_setup.c b/src/southbridge/amd/pi/hudson/early_setup.c
index c38e6f8d6928..07c4519182a1 100644
--- a/src/southbridge/amd/pi/hudson/early_setup.c
+++ b/src/southbridge/amd/pi/hudson/early_setup.c
@@ -22,7 +22,6 @@
 #include <arch/acpi.h>
 #include <console/console.h>
 #include <reset.h>
-#include <cbmem.h>
 #include "hudson.h"
 #include "pci_devs.h"
 #include <Fch/Fch.h>
diff --git a/src/southbridge/amd/pi/hudson/hudson.c b/src/southbridge/amd/pi/hudson/hudson.c
index ecf041aaae05..bf9cad0fafdc 100644
--- a/src/southbridge/amd/pi/hudson/hudson.c
+++ b/src/southbridge/amd/pi/hudson/hudson.c
@@ -23,7 +23,6 @@
 #include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
-#include <cbmem.h>
 #include "hudson.h"
 #include "smbus.h"
 #include "smi.h"
diff --git a/src/southbridge/amd/sb700/lpc.c b/src/southbridge/amd/sb700/lpc.c
index 6569e39b207a..857503a7ed9d 100644
--- a/src/southbridge/amd/sb700/lpc.c
+++ b/src/southbridge/amd/sb700/lpc.c
@@ -28,7 +28,6 @@
 #include <pc80/isa-dma.h>
 #include <arch/io.h>
 #include <arch/ioapic.h>
-#include <cbmem.h>
 #include <cpu/amd/powernow.h>
 #include "sb700.h"
 
diff --git a/src/southbridge/intel/bd82x6x/early_pch.c b/src/southbridge/intel/bd82x6x/early_pch.c
index aa69981361bc..c3422419dfed 100644
--- a/src/southbridge/intel/bd82x6x/early_pch.c
+++ b/src/southbridge/intel/bd82x6x/early_pch.c
@@ -15,7 +15,6 @@
 
 #include <string.h>
 #include <arch/io.h>
-#include <cbmem.h>
 #include <arch/cbfs.h>
 #include <ip_checksum.h>
 #include <pc80/mc146818rtc.h>