16 files changed, 0 insertions, 16 deletions

diff --git a/src/drivers/amd/agesa/state_machine.c b/src/drivers/amd/agesa/state_machine.c
index 6ae7d999d6..606a66f5cb 100644
--- a/src/drivers/amd/agesa/state_machine.c
+++ b/src/drivers/amd/agesa/state_machine.c
@@ -5,7 +5,6 @@
 #include <acpi/acpi.h>
 #include <bootstate.h>
 #include <cbfs.h>
-#include <cbmem.h>
 #include <timestamp.h>
 
 #include <northbridge/amd/agesa/state_machine.h>
diff --git a/src/ec/google/chromeec/ec.c b/src/ec/google/chromeec/ec.c
index 954e6490f7..e66e3b16c9 100644
--- a/src/ec/google/chromeec/ec.c
+++ b/src/ec/google/chromeec/ec.c
@@ -3,7 +3,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <assert.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <delay.h>
 #include <device/device.h>
diff --git a/src/mainboard/emulation/qemu-aarch64/mainboard.c b/src/mainboard/emulation/qemu-aarch64/mainboard.c
index d43eb89d09..7bf9260f8a 100644
--- a/src/mainboard/emulation/qemu-aarch64/mainboard.c
+++ b/src/mainboard/emulation/qemu-aarch64/mainboard.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include <cbmem.h>
 #include <ramdetect.h>
 #include <symbols.h>
 #include <device/device.h>
diff --git a/src/security/vboot/bootmode.c b/src/security/vboot/bootmode.c
index 5bd3922932..4f491db951 100644
--- a/src/security/vboot/bootmode.c
+++ b/src/security/vboot/bootmode.c
@@ -3,7 +3,6 @@
 #include <assert.h>
 #include <bootmode.h>
 #include <bootstate.h>
-#include <cbmem.h>
 #include <vb2_api.h>
 #include <security/vboot/misc.h>
 #include <security/vboot/vbnv.h>
diff --git a/src/security/vboot/vboot_common.c b/src/security/vboot/vboot_common.c
index 1cddeeb5f3..215e209aa2 100644
--- a/src/security/vboot/vboot_common.c
+++ b/src/security/vboot/vboot_common.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <boot_device.h>
-#include <cbmem.h>
 #include <console/cbmem_console.h>
 #include <reset.h>
 #include <security/vboot/misc.h>
diff --git a/src/security/vboot/vboot_logic.c b/src/security/vboot/vboot_logic.c
index e23dcc4ed8..c4c3b4bf37 100644
--- a/src/security/vboot/vboot_logic.c
+++ b/src/security/vboot/vboot_logic.c
@@ -3,7 +3,6 @@
 #include <arch/exception.h>
 #include <assert.h>
 #include <bootmode.h>
-#include <cbmem.h>
 #include <fmap.h>
 #include <security/tpm/tspi/crtm.h>
 #include <security/tpm/tss/vendor/cr50/cr50.h>
diff --git a/src/soc/amd/picasso/mca.c b/src/soc/amd/picasso/mca.c
index 69363f5625..e16d0a19e3 100644
--- a/src/soc/amd/picasso/mca.c
+++ b/src/soc/amd/picasso/mca.c
@@ -7,7 +7,6 @@
 #include <console/console.h>
 #include <arch/bert_storage.h>
 #include <cper.h>
-#include <cbmem.h>
 
 struct mca_bank {
 	int bank;
diff --git a/src/soc/amd/picasso/romstage.c b/src/soc/amd/picasso/romstage.c
index 0a337e7720..372c6b5b18 100644
--- a/src/soc/amd/picasso/romstage.c
+++ b/src/soc/amd/picasso/romstage.c
@@ -5,7 +5,6 @@
 #include <cpu/x86/cache.h>
 #include <cpu/amd/mtrr.h>
 #include <console/uart.h>
-#include <cbmem.h>
 #include <commonlib/helpers.h>
 #include <console/console.h>
 #include <program_loading.h>
diff --git a/src/soc/intel/apollolake/romstage.c b/src/soc/intel/apollolake/romstage.c
index d14dd8d3ee..c5b060f70e 100644
--- a/src/soc/intel/apollolake/romstage.c
+++ b/src/soc/intel/apollolake/romstage.c
@@ -4,7 +4,6 @@
 #include <device/pci_ops.h>
 #include <arch/symbols.h>
 #include <assert.h>
-#include <cbmem.h>
 #include <cf9_reset.h>
 #include <console/console.h>
 #include <cpu/x86/pae.h>
diff --git a/src/soc/intel/cannonlake/elog.c b/src/soc/intel/cannonlake/elog.c
index fb254729da..9fa725e388 100644
--- a/src/soc/intel/cannonlake/elog.c
+++ b/src/soc/intel/cannonlake/elog.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <bootstate.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <device/pci_ops.h>
 #include <stdint.h>
diff --git a/src/soc/intel/denverton_ns/romstage.c b/src/soc/intel/denverton_ns/romstage.c
index 713fb1e3ac..add558bb98 100644
--- a/src/soc/intel/denverton_ns/romstage.c
+++ b/src/soc/intel/denverton_ns/romstage.c
@@ -2,7 +2,6 @@
 
 #include <arch/romstage.h>
 #include <arch/io.h>
-#include <cbmem.h>
 #include <cf9_reset.h>
 #include <console/console.h>
 #include <device/pci_ops.h>
diff --git a/src/soc/intel/icelake/elog.c b/src/soc/intel/icelake/elog.c
index 586dbfdd24..4727fbf9f6 100644
--- a/src/soc/intel/icelake/elog.c
+++ b/src/soc/intel/icelake/elog.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <bootstate.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <stdint.h>
 #include <elog.h>
diff --git a/src/soc/intel/jasperlake/elog.c b/src/soc/intel/jasperlake/elog.c
index 586dbfdd24..4727fbf9f6 100644
--- a/src/soc/intel/jasperlake/elog.c
+++ b/src/soc/intel/jasperlake/elog.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <bootstate.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <stdint.h>
 #include <elog.h>
diff --git a/src/soc/intel/tigerlake/elog.c b/src/soc/intel/tigerlake/elog.c
index d5b875419a..b38d316def 100644
--- a/src/soc/intel/tigerlake/elog.c
+++ b/src/soc/intel/tigerlake/elog.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <bootstate.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <stdint.h>
 #include <elog.h>
diff --git a/src/soc/intel/xeon_sp/skx/romstage.c b/src/soc/intel/xeon_sp/skx/romstage.c
index c4c473b4e6..a1c370d070 100644
--- a/src/soc/intel/xeon_sp/skx/romstage.c
+++ b/src/soc/intel/xeon_sp/skx/romstage.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <arch/romstage.h>
-#include <cbmem.h>
 #include <console/console.h>
 #include <intelblocks/rtc.h>
 #include <soc/romstage.h>
diff --git a/src/southbridge/amd/cimx/sb800/ramtop.c b/src/southbridge/amd/cimx/sb800/ramtop.c
index 5dac9ae61f..483716c202 100644
--- a/src/southbridge/amd/cimx/sb800/ramtop.c
+++ b/src/southbridge/amd/cimx/sb800/ramtop.c
@@ -3,7 +3,6 @@
 #include <stdint.h>
 #include <arch/io.h>
 #include <acpi/acpi.h>
-#include <cbmem.h>
 #include "SBPLATFORM.h"
 
 int acpi_get_sleep_type(void)