11 files changed, 3 insertions, 13 deletions
diff --git a/src/soc/intel/apollolake/memmap.c b/src/soc/intel/apollolake/memmap.c
index ba1433c53b..4f91b8aea5 100644
--- a/src/soc/intel/apollolake/memmap.c
+++ b/src/soc/intel/apollolake/memmap.c
@@ -17,13 +17,15 @@
 
 #include <assert.h>
 #include <cbmem.h>
-#include "chip.h"
+#include <console/console.h>
 #include <device/pci.h>
 #include <fsp/memmap.h>
 #include <intelblocks/smm.h>
 #include <soc/systemagent.h>
 #include <soc/pci_devs.h>
 
+#include "chip.h"
+
 void *cbmem_top(void)
 {
 	const struct device *dev;
diff --git a/src/soc/intel/fsp_baytrail/include/soc/i2c.h b/src/soc/intel/fsp_baytrail/include/soc/i2c.h
index 7b3a3c8918..f0ae0b37ad 100644
--- a/src/soc/intel/fsp_baytrail/include/soc/i2c.h
+++ b/src/soc/intel/fsp_baytrail/include/soc/i2c.h
@@ -16,7 +16,6 @@
 #ifndef __SOC_INTEL_FSP_BAYTRAIL_I2C_H__
 #define __SOC_INTEL_FSP_BAYTRAIL_I2C_H__
 
-#include <console/console.h>
 #include <device/pci_def.h>
 #include <stdlib.h>
 
diff --git a/src/soc/intel/icelake/bootblock/pch.c b/src/soc/intel/icelake/bootblock/pch.c
index 2d35f5bf39..094079140d 100644
--- a/src/soc/intel/icelake/bootblock/pch.c
+++ b/src/soc/intel/icelake/bootblock/pch.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/mmio.h>
 #include <device/device.h>
 #include <device/pci_ops.h>
diff --git a/src/soc/intel/icelake/chip.c b/src/soc/intel/icelake/chip.c
index 0e4388efd6..464c25e509 100644
--- a/src/soc/intel/icelake/chip.c
+++ b/src/soc/intel/icelake/chip.c
@@ -14,7 +14,6 @@
  */
 
 #include <chip.h>
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <fsp/api.h>
diff --git a/src/soc/intel/icelake/lpc.c b/src/soc/intel/icelake/lpc.c
index 8fe0507255..3d05824279 100644
--- a/src/soc/intel/icelake/lpc.c
+++ b/src/soc/intel/icelake/lpc.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <pc80/isa-dma.h>
diff --git a/src/soc/intel/icelake/systemagent.c b/src/soc/intel/icelake/systemagent.c
index 7903667e9e..930e78ed5e 100644
--- a/src/soc/intel/icelake/systemagent.c
+++ b/src/soc/intel/icelake/systemagent.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <intelblocks/systemagent.h>
diff --git a/src/soc/mediatek/mt8183/auxadc.c b/src/soc/mediatek/mt8183/auxadc.c
index caf9a0346a..a167d2b58e 100644
--- a/src/soc/mediatek/mt8183/auxadc.c
+++ b/src/soc/mediatek/mt8183/auxadc.c
@@ -15,7 +15,6 @@
 
 #include <device/mmio.h>
 #include <assert.h>
-#include <console/console.h>
 #include <delay.h>
 #include <soc/addressmap.h>
 #include <soc/auxadc.h>
diff --git a/src/soc/qualcomm/ipq806x/uart.c b/src/soc/qualcomm/ipq806x/uart.c
index fe2d673d47..66c31034fa 100644
--- a/src/soc/qualcomm/ipq806x/uart.c
+++ b/src/soc/qualcomm/ipq806x/uart.c
@@ -33,7 +33,6 @@
 
 #include <device/mmio.h>
 #include <boot/coreboot_tables.h>
-#include <console/console.h>
 #include <console/uart.h>
 #include <delay.h>
 #include <gpio.h>
diff --git a/src/soc/qualcomm/qcs405/clock.c b/src/soc/qualcomm/qcs405/clock.c
index cd7c1f2f41..369bcdf531 100644
--- a/src/soc/qualcomm/qcs405/clock.c
+++ b/src/soc/qualcomm/qcs405/clock.c
@@ -14,12 +14,10 @@
 
 #include <device/mmio.h>
 #include <types.h>
-#include <console/console.h>
 #include <delay.h>
 #include <timestamp.h>
 #include <commonlib/helpers.h>
 #include <string.h>
-
 #include <soc/clock.h>
 
 #define DIV(div) (div ? (2*div - 1) : 0)
diff --git a/src/soc/qualcomm/qcs405/gpio.c b/src/soc/qualcomm/qcs405/gpio.c
index 5904cb3dc5..18aacf4ce4 100644
--- a/src/soc/qualcomm/qcs405/gpio.c
+++ b/src/soc/qualcomm/qcs405/gpio.c
@@ -15,10 +15,8 @@
 
 #include <device/mmio.h>
 #include <types.h>
-#include <console/console.h>
 #include <delay.h>
 #include <timestamp.h>
-
 #include <gpio.h>
 
 void gpio_configure(gpio_t gpio, uint32_t func, uint32_t pull,
diff --git a/src/soc/qualcomm/sdm845/clock.c b/src/soc/qualcomm/sdm845/clock.c
index 382e5a691e..addac5ef40 100644
--- a/src/soc/qualcomm/sdm845/clock.c
+++ b/src/soc/qualcomm/sdm845/clock.c
@@ -15,7 +15,6 @@
 
 #include <device/mmio.h>
 #include <types.h>
-#include <console/console.h>
 #include <commonlib/helpers.h>
 #include <assert.h>
 #include <soc/clock.h>