15 files changed, 5 insertions, 10 deletions
diff --git a/src/arch/arm64/dma.c b/src/arch/arm64/dma.c
index cdeb50fa09..ec81ab7d5e 100644
--- a/src/arch/arm64/dma.c
+++ b/src/arch/arm64/dma.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <console/console.h>
 #include <stdlib.h>
 
 int dma_coherent(const void *ptr)
diff --git a/src/arch/arm64/smbios.c b/src/arch/arm64/smbios.c
index f0be956cd5..4bf35c4c17 100644
--- a/src/arch/arm64/smbios.c
+++ b/src/arch/arm64/smbios.c
@@ -3,7 +3,6 @@
 #include <arch/cache.h>
 #include <arch/lib_helpers.h>
 #include <arch/smc.h>
-#include <console/console.h>
 #include <smbios.h>
 #include <stdio.h>
 
diff --git a/src/include/device/dram/rcd.h b/src/include/device/dram/rcd.h
index d0b1f2c031..d8429b39b4 100644
--- a/src/include/device/dram/rcd.h
+++ b/src/include/device/dram/rcd.h
@@ -5,7 +5,6 @@
 
 #include <types.h>
 #include <device/i2c_simple.h>
-#include <console/console.h>
 
 enum rcw_idx {
 	VEN_ID_L,
diff --git a/src/mainboard/ibm/sbp1/romstage.c b/src/mainboard/ibm/sbp1/romstage.c
index 489f09f05b..2c4745e7e8 100644
--- a/src/mainboard/ibm/sbp1/romstage.c
+++ b/src/mainboard/ibm/sbp1/romstage.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <console/console.h>
 #include <soc/romstage.h>
 #include <soc/ddr.h>
 #include <soc/soc_util.h>
diff --git a/src/soc/intel/xeon_sp/chip_gen6.c b/src/soc/intel/xeon_sp/chip_gen6.c
index c4462d56c9..8bbfbe871b 100644
--- a/src/soc/intel/xeon_sp/chip_gen6.c
+++ b/src/soc/intel/xeon_sp/chip_gen6.c
@@ -2,7 +2,6 @@
 
 #include <acpi/acpigen_pci.h>
 #include <assert.h>
-#include <console/console.h>
 #include <device/pci.h>
 #include <intelblocks/acpi.h>
 #include <post.h>
diff --git a/src/soc/qualcomm/common/include/soc/qup_se_handlers_common.h b/src/soc/qualcomm/common/include/soc/qup_se_handlers_common.h
index a004c7944c..b9dfb25f02 100644
--- a/src/soc/qualcomm/common/include/soc/qup_se_handlers_common.h
+++ b/src/soc/qualcomm/common/include/soc/qup_se_handlers_common.h
@@ -3,7 +3,6 @@
 #ifndef __SOC_COMMON_QCOM_QUP_SE_H__
 #define __SOC_COMMON_QCOM_QUP_SE_H__
 
-#include <console/console.h>
 #include <device/mmio.h>
 #include <gpio.h>
 #include <soc/addressmap.h>
diff --git a/src/soc/qualcomm/common/include/soc/usb/qmp_usb_phy.h b/src/soc/qualcomm/common/include/soc/usb/qmp_usb_phy.h
index fc1721afa9..ad93865da8 100644
--- a/src/soc/qualcomm/common/include/soc/usb/qmp_usb_phy.h
+++ b/src/soc/qualcomm/common/include/soc/usb/qmp_usb_phy.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <device/mmio.h>
-#include <console/console.h>
 
 /* USB3PHY_PCIE_USB3_PCS_PCS_STATUS bit */
 #define USB3_PCS_PHYSTATUS		BIT(6)
diff --git a/src/soc/qualcomm/common/include/soc/usb/qusb_phy.h b/src/soc/qualcomm/common/include/soc/usb/qusb_phy.h
index dd4a736bd0..90c6ff3c35 100644
--- a/src/soc/qualcomm/common/include/soc/usb/qusb_phy.h
+++ b/src/soc/qualcomm/common/include/soc/usb/qusb_phy.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <device/mmio.h>
-#include <console/console.h>
 
 #define PORT_TUNE1_MASK				0xf0
 
diff --git a/src/soc/qualcomm/common/include/soc/usb/snps_usb_phy.h b/src/soc/qualcomm/common/include/soc/usb/snps_usb_phy.h
index de0b385c0b..353aba52a4 100644
--- a/src/soc/qualcomm/common/include/soc/usb/snps_usb_phy.h
+++ b/src/soc/qualcomm/common/include/soc/usb/snps_usb_phy.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <device/mmio.h>
-#include <console/console.h>
 
 struct usb_board_data {
 	/*Register values going to override from the boardfile*/
diff --git a/src/soc/qualcomm/common/qupv3_spi.c b/src/soc/qualcomm/common/qupv3_spi.c
index 1bb5c75e5e..5e05d573ff 100644
--- a/src/soc/qualcomm/common/qupv3_spi.c
+++ b/src/soc/qualcomm/common/qupv3_spi.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <assert.h>
+#include <console/console.h>
 #include <lib.h>
 #include <soc/clock.h>
 #include <soc/gpio.h>
diff --git a/src/soc/qualcomm/common/usb/qmpv3_usb_phy.c b/src/soc/qualcomm/common/usb/qmpv3_usb_phy.c
index c1782be790..8c4c339b50 100644
--- a/src/soc/qualcomm/common/usb/qmpv3_usb_phy.c
+++ b/src/soc/qualcomm/common/usb/qmpv3_usb_phy.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#include <console/console.h>
 #include <timer.h>
 #include <soc/usb/qmp_usb_phy.h>
 #include <soc/addressmap.h>
diff --git a/src/soc/qualcomm/common/usb/qmpv4_usb_phy.c b/src/soc/qualcomm/common/usb/qmpv4_usb_phy.c
index 23ab75ad2a..6a5d7abcb0 100644
--- a/src/soc/qualcomm/common/usb/qmpv4_usb_phy.c
+++ b/src/soc/qualcomm/common/usb/qmpv4_usb_phy.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#include <console/console.h>
 #include <timer.h>
 #include <soc/usb/qmp_usb_phy.h>
 #include <soc/addressmap.h>
diff --git a/src/soc/qualcomm/common/usb/qusb_phy.c b/src/soc/qualcomm/common/usb/qusb_phy.c
index ddb087f0aa..0defd2f3b3 100644
--- a/src/soc/qualcomm/common/usb/qusb_phy.c
+++ b/src/soc/qualcomm/common/usb/qusb_phy.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#include <console/console.h>
 #include <soc/usb/qusb_phy.h>
 #include <soc/efuse.h>
 #include <timer.h>
diff --git a/src/soc/qualcomm/common/usb/snps_usb_phy.c b/src/soc/qualcomm/common/usb/snps_usb_phy.c
index d04694b0c7..a7ad7ba819 100644
--- a/src/soc/qualcomm/common/usb/snps_usb_phy.c
+++ b/src/soc/qualcomm/common/usb/snps_usb_phy.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#include <console/console.h>
 #include <soc/usb/snps_usb_phy.h>
 #include <soc/addressmap.h>
 #include <commonlib/helpers.h>
diff --git a/src/superio/ite/it8772f/superio.c b/src/superio/ite/it8772f/superio.c
index 268df0a517..662b8a2ca9 100644
--- a/src/superio/ite/it8772f/superio.c
+++ b/src/superio/ite/it8772f/superio.c
@@ -2,7 +2,6 @@
 
 #include <device/device.h>
 #include <device/pnp.h>
-#include <console/console.h>
 #include <pc80/keyboard.h>
 #include <superio/ite/common/env_ctrl.h>
 #include <arch/io.h>