From e9a0130879bca97462c6184f1d368f773e00e8a0 Mon Sep 17 00:00:00 2001
From: Elyes HAOUAS <ehaouas@noos.fr>
Date: Fri, 26 Oct 2018 15:06:33 +0200
Subject: [PATCH] src: Remove unneeded include <console/console.h>

Change-Id: I40f8b4c7cbc55e16929b1f40d18bb5a9c19845da
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/29289
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
---
 src/arch/arm/armv7/thread.c                                  | 2 +-
 src/arch/arm64/boot.c                                        | 1 -
 src/arch/arm64/eabi_compat.c                                 | 2 --
 src/arch/arm64/transition.c                                  | 1 -
 src/cpu/allwinner/a10/cpu.c                                  | 1 -
 src/cpu/allwinner/a10/raminit.c                              | 1 -
 src/cpu/amd/pi/amd_late_init.c                               | 1 -
 src/cpu/amd/smm/smm_init.c                                   | 1 -
 src/device/pci_ops_mmconf.c                                  | 1 -
 src/drivers/ams/as3722rtc.c                                  | 1 -
 src/drivers/i2c/lm63/lm63.c                                  | 1 -
 src/drivers/i2c/pca9538/pca9538.c                            | 1 -
 src/drivers/intel/gma/vbt.c                                  | 1 -
 src/drivers/net/ne2k.c                                       | 1 -
 src/drivers/ricoh/rce822/rce822.c                            | 1 -
 src/drivers/siemens/nc_fpga/nc_fpga.c                        | 1 -
 src/drivers/uart/util.c                                      | 1 -
 src/ec/google/chromeec/vstore.c                              | 2 --
 src/lib/cbmem_common.c                                       | 2 +-
 src/northbridge/amd/amdfam10/get_pci1234.c                   | 1 -
 src/northbridge/amd/amdht/h3ncmn.c                           | 1 -
 src/northbridge/amd/amdk8/reset_test.c                       | 1 -
 src/northbridge/amd/amdmct/mct_ddr3/mctprob.c                | 1 -
 src/northbridge/amd/amdmct/mct_ddr3/mctproc.c                | 1 -
 src/northbridge/amd/amdmct/mct_ddr3/mctprod.c                | 1 -
 src/northbridge/amd/amdmct/mct_ddr3/mctsrc1p.c               | 1 -
 src/northbridge/amd/amdmct/mct_ddr3/modtrd.c                 | 1 -
 src/northbridge/amd/amdmct/mct_ddr3/mport_d.c                | 1 -
 src/northbridge/amd/amdmct/mct_ddr3/mutilc_d.c               | 1 -
 src/northbridge/intel/fsp_rangeley/acpi.c                    | 1 -
 src/northbridge/intel/fsp_rangeley/raminit.c                 | 1 -
 src/northbridge/intel/fsp_sandybridge/fsp/chipset_fsp_util.c | 1 -
 src/northbridge/intel/gm45/thermal.c                         | 1 -
 src/northbridge/intel/i945/acpi.c                            | 1 -
 src/security/vboot/common.c                                  | 1 -
 src/security/vboot/vboot_common.c                            | 1 -
 src/soc/amd/stoneyridge/hda.c                                | 1 -
 src/soc/amd/stoneyridge/sata.c                               | 1 -
 src/soc/amd/stoneyridge/sm.c                                 | 1 -
 src/soc/broadcom/cygnus/ns16550.c                            | 1 -
 src/soc/imgtec/pistachio/reset.c                             | 1 -
 src/soc/imgtec/pistachio/uart.c                              | 1 -
 src/soc/intel/apollolake/nhlt.c                              | 1 -
 src/soc/intel/baytrail/chip.c                                | 1 -
 src/soc/intel/baytrail/ehci.c                                | 1 -
 src/soc/intel/baytrail/northcluster.c                        | 1 -
 src/soc/intel/braswell/hda.c                                 | 2 +-
 src/soc/intel/braswell/memmap.c                              | 1 -
 src/soc/intel/braswell/northcluster.c                        | 1 -
 src/soc/intel/braswell/tsc_freq.c                            | 1 -
 src/soc/intel/broadwell/chip.c                               | 1 -
 src/soc/intel/broadwell/cpu_info.c                           | 1 -
 src/soc/intel/broadwell/ehci.c                               | 1 -
 src/soc/intel/broadwell/ramstage.c                           | 1 -
 src/soc/intel/broadwell/romstage/pch.c                       | 1 -
 src/soc/intel/broadwell/romstage/smbus.c                     | 1 -
 src/soc/intel/broadwell/romstage/stack.c                     | 1 -
 src/soc/intel/broadwell/smbus.c                              | 1 -
 src/soc/intel/broadwell/usb_debug.c                          | 1 -
 src/soc/intel/broadwell/xhci.c                               | 1 -
 src/soc/intel/cannonlake/chip.c                              | 1 -
 src/soc/intel/cannonlake/lpc.c                               | 1 -
 src/soc/intel/cannonlake/nhlt.c                              | 1 -
 src/soc/intel/cannonlake/systemagent.c                       | 1 -
 src/soc/intel/common/block/fast_spi/fast_spi.c               | 1 -
 src/soc/intel/common/pch/lockdown/lockdown.c                 | 1 -
 src/soc/intel/common/vbt.c                                   | 1 -
 src/soc/intel/denverton_ns/memmap.c                          | 1 -
 src/soc/intel/denverton_ns/soc_util.c                        | 1 -
 src/soc/intel/denverton_ns/spi.c                             | 1 -
 src/soc/intel/fsp_baytrail/romstage/pmc.c                    | 1 -
 src/soc/intel/fsp_broadwell_de/smbus.c                       | 1 -
 src/soc/intel/quark/chip.c                                   | 1 -
 src/soc/intel/quark/fsp1_1.c                                 | 2 +-
 src/soc/intel/quark/fsp2_0.c                                 | 2 +-
 src/soc/intel/quark/northcluster.c                           | 1 -
 src/soc/intel/quark/romstage/mtrr.c                          | 1 -
 src/soc/intel/quark/romstage/pcie.c                          | 1 -
 src/soc/intel/quark/sd.c                                     | 1 -
 src/soc/intel/skylake/lpc.c                                  | 1 -
 src/soc/intel/skylake/nhlt/da7219.c                          | 1 -
 src/soc/intel/skylake/pei_data.c                             | 1 -
 src/soc/intel/skylake/systemagent.c                          | 1 -
 src/soc/mediatek/common/timer.c                              | 1 -
 src/soc/mediatek/common/uart.c                               | 1 -
 src/soc/mediatek/mt8173/ddp.c                                | 1 -
 src/soc/mediatek/mt8173/gpio_init.c                          | 2 +-
 src/soc/mediatek/mt8173/soc.c                                | 1 -
 src/soc/nvidia/tegra/gpio.c                                  | 1 -
 src/soc/nvidia/tegra124/uart.c                               | 1 -
 src/soc/nvidia/tegra124/verstage.c                           | 1 -
 src/soc/nvidia/tegra210/mipi-phy.c                           | 2 +-
 src/soc/nvidia/tegra210/uart.c                               | 1 -
 src/soc/qualcomm/ipq40xx/uart.c                              | 1 -
 src/soc/qualcomm/sdm845/gpio.c                               | 1 -
 src/soc/rockchip/common/gpio.c                               | 1 -
 src/soc/rockchip/common/pwm.c                                | 1 -
 src/soc/rockchip/common/vop.c                                | 1 -
 src/soc/rockchip/rk3288/bootblock.c                          | 1 -
 src/soc/rockchip/rk3288/gpio.c                               | 1 -
 src/soc/rockchip/rk3288/tsadc.c                              | 1 -
 src/soc/rockchip/rk3399/decompressor.c                       | 1 -
 src/soc/rockchip/rk3399/gpio.c                               | 1 -
 src/soc/rockchip/rk3399/saradc.c                             | 1 -
 src/soc/rockchip/rk3399/tsadc.c                              | 1 -
 src/soc/samsung/exynos5250/clock_init.c                      | 1 -
 src/soc/samsung/exynos5250/dmc_common.c                      | 1 -
 src/soc/samsung/exynos5250/power.c                           | 1 -
 src/soc/samsung/exynos5250/wakeup.c                          | 1 -
 src/soc/samsung/exynos5420/clock_init.c                      | 1 -
 src/soc/samsung/exynos5420/dmc_common.c                      | 1 -
 src/soc/samsung/exynos5420/dmc_init_ddr3.c                   | 1 -
 src/soc/samsung/exynos5420/pinmux.c                          | 1 -
 src/soc/samsung/exynos5420/power.c                           | 1 -
 src/soc/samsung/exynos5420/wakeup.c                          | 1 -
 src/southbridge/amd/agesa/hudson/hda.c                       | 1 -
 src/southbridge/amd/agesa/hudson/ide.c                       | 1 -
 src/southbridge/amd/agesa/hudson/pci.c                       | 1 -
 src/southbridge/amd/agesa/hudson/pcie.c                      | 1 -
 src/southbridge/amd/agesa/hudson/sata.c                      | 1 -
 src/southbridge/amd/agesa/hudson/sm.c                        | 1 -
 src/southbridge/amd/agesa/hudson/smihandler.c                | 1 -
 src/southbridge/amd/agesa/hudson/usb.c                       | 1 -
 src/southbridge/amd/amd8111/ac97.c                           | 1 -
 src/southbridge/amd/amd8111/amd8111.c                        | 1 -
 src/southbridge/amd/amd8111/pci.c                            | 1 -
 src/southbridge/amd/amd8111/smbus.c                          | 1 -
 src/southbridge/amd/amd8111/usb.c                            | 1 -
 src/southbridge/amd/cimx/cimx_util.c                         | 1 -
 src/southbridge/amd/cimx/sb800/cfg.c                         | 1 -
 src/southbridge/amd/cs5536/pirq.c                            | 1 -
 src/southbridge/amd/pi/hudson/hda.c                          | 1 -
 src/southbridge/amd/pi/hudson/ide.c                          | 1 -
 src/southbridge/amd/pi/hudson/pci.c                          | 1 -
 src/southbridge/amd/pi/hudson/pcie.c                         | 1 -
 src/southbridge/amd/pi/hudson/sata.c                         | 1 -
 src/southbridge/amd/pi/hudson/sm.c                           | 1 -
 src/southbridge/amd/pi/hudson/smihandler.c                   | 1 -
 src/southbridge/amd/pi/hudson/usb.c                          | 1 -
 src/southbridge/amd/sb700/ide.c                              | 1 -
 src/southbridge/amd/sb700/pci.c                              | 1 -
 src/southbridge/amd/sb800/ide.c                              | 1 -
 src/southbridge/amd/sb800/pci.c                              | 1 -
 src/southbridge/broadcom/bcm5785/bcm5785.c                   | 1 -
 src/southbridge/broadcom/bcm5785/ide.c                       | 1 -
 src/southbridge/broadcom/bcm5785/sb_pci_main.c               | 1 -
 src/southbridge/broadcom/bcm5785/usb.c                       | 1 -
 src/southbridge/intel/bd82x6x/early_usb_mrc.c                | 1 -
 src/southbridge/intel/bd82x6x/elog.c                         | 1 -
 src/southbridge/intel/bd82x6x/smbus.c                        | 1 -
 src/southbridge/intel/common/usb_debug.c                     | 1 -
 src/southbridge/intel/fsp_bd82x6x/early_usb.c                | 1 -
 src/southbridge/intel/fsp_bd82x6x/elog.c                     | 1 -
 src/southbridge/intel/fsp_i89xx/early_usb.c                  | 1 -
 src/southbridge/intel/fsp_i89xx/elog.c                       | 1 -
 src/southbridge/intel/fsp_rangeley/early_usb.c               | 1 -
 src/southbridge/intel/fsp_rangeley/smbus.c                   | 1 -
 src/southbridge/intel/i82371eb/early_pm.c                    | 1 -
 src/southbridge/intel/i82371eb/early_smbus.c                 | 1 -
 src/southbridge/intel/i82371eb/usb.c                         | 1 -
 src/southbridge/intel/i82801dx/i82801dx.c                    | 1 -
 src/southbridge/intel/i82801dx/pci.c                         | 1 -
 src/southbridge/intel/i82801ix/smbus.c                       | 1 -
 src/southbridge/intel/i82801jx/smbus.c                       | 1 -
 src/southbridge/intel/i82870/pcibridge.c                     | 1 -
 src/southbridge/intel/ibexpeak/madt.c                        | 1 -
 src/southbridge/intel/ibexpeak/smbus.c                       | 1 -
 src/southbridge/intel/lynxpoint/early_usb.c                  | 1 -
 src/southbridge/intel/lynxpoint/elog.c                       | 1 -
 src/southbridge/intel/lynxpoint/rcba.c                       | 2 --
 src/southbridge/intel/lynxpoint/usb_xhci.c                   | 1 -
 src/southbridge/nvidia/ck804/ac97.c                          | 1 -
 src/southbridge/nvidia/ck804/ck804.c                         | 1 -
 src/southbridge/nvidia/ck804/nic.c                           | 1 -
 src/southbridge/nvidia/ck804/pcie.c                          | 1 -
 src/southbridge/nvidia/ck804/smbus.c                         | 1 -
 src/southbridge/nvidia/ck804/usb.c                           | 1 -
 src/southbridge/nvidia/ck804/usb2.c                          | 1 -
 src/southbridge/nvidia/mcp55/early_ctrl.c                    | 1 -
 src/southbridge/nvidia/mcp55/ht.c                            | 1 -
 src/southbridge/nvidia/mcp55/mcp55.c                         | 1 -
 src/southbridge/nvidia/mcp55/pcie.c                          | 1 -
 src/southbridge/nvidia/mcp55/smbus.c                         | 1 -
 src/southbridge/nvidia/mcp55/usb.c                           | 1 -
 src/southbridge/nvidia/mcp55/usb2.c                          | 1 -
 src/southbridge/via/common/early_smbus_print_error.c         | 1 -
 src/southbridge/via/common/early_smbus_wait_until_ready.c    | 1 -
 src/superio/fintek/f71805f/superio.c                         | 1 -
 src/superio/fintek/f71808a/superio.c                         | 1 -
 src/superio/fintek/f71859/superio.c                          | 1 -
 src/superio/fintek/f71863fg/superio.c                        | 1 -
 src/superio/fintek/f71869ad/superio.c                        | 1 -
 src/superio/fintek/f71872/superio.c                          | 1 -
 src/superio/fintek/f81865f/superio.c                         | 1 -
 src/superio/fintek/f81866d/superio.c                         | 1 -
 src/superio/ite/it8728f/superio.c                            | 1 -
 src/superio/nsc/pc87360/superio.c                            | 1 -
 src/superio/nsc/pc87366/superio.c                            | 1 -
 src/superio/nsc/pc87382/superio.c                            | 1 -
 src/superio/nsc/pc87384/superio.c                            | 1 -
 src/superio/nsc/pc87392/superio.c                            | 1 -
 src/superio/nsc/pc87417/superio.c                            | 1 -
 src/superio/nsc/pc97317/superio.c                            | 1 -
 src/superio/nuvoton/wpcm450/superio.c                        | 1 -
 src/superio/smsc/dme1737/superio.c                           | 1 -
 src/superio/smsc/kbc1100/superio.c                           | 1 -
 src/superio/smsc/lpc47b272/superio.c                         | 1 -
 src/superio/smsc/lpc47m10x/superio.c                         | 1 -
 src/superio/smsc/lpc47m15x/superio.c                         | 1 -
 src/superio/smsc/mec1308/superio.c                           | 1 -
 src/superio/smsc/sch4037/superio.c                           | 1 -
 src/superio/smsc/sio1036/superio.c                           | 1 -
 src/superio/winbond/w83627thg/superio.c                      | 1 -
 src/superio/winbond/w83627uhg/superio.c                      | 1 -
 src/superio/winbond/w83977tf/superio.c                       | 1 -
 215 files changed, 7 insertions(+), 218 deletions(-)

diff --git a/src/arch/arm/armv7/thread.c b/src/arch/arm/armv7/thread.c
index 9c1c1bbdf1..bcf692320c 100644
--- a/src/arch/arm/armv7/thread.c
+++ b/src/arch/arm/armv7/thread.c
@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
-#include <console/console.h>
+
 #include <thread.h>
 
 /* The stack frame looks like the following. */
diff --git a/src/arch/arm64/boot.c b/src/arch/arm64/boot.c
index d8a4630750..65a01bf562 100644
--- a/src/arch/arm64/boot.c
+++ b/src/arch/arm64/boot.c
@@ -19,7 +19,6 @@
 #include <arch/transition.h>
 #include <arm_tf.h>
 #include <cbmem.h>
-#include <console/console.h>
 #include <program_loading.h>
 #include <rules.h>
 #include <string.h>
diff --git a/src/arch/arm64/eabi_compat.c b/src/arch/arm64/eabi_compat.c
index b443e0045c..a6f40a4ea3 100644
--- a/src/arch/arm64/eabi_compat.c
+++ b/src/arch/arm64/eabi_compat.c
@@ -14,8 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
-
 int raise (int signum) __attribute__((used));
 int raise (int signum)
 {
diff --git a/src/arch/arm64/transition.c b/src/arch/arm64/transition.c
index fb4f4be162..b1ab2fcf0b 100644
--- a/src/arch/arm64/transition.c
+++ b/src/arch/arm64/transition.c
@@ -18,7 +18,6 @@
 #include <arch/mmu.h>
 #include <arch/transition.h>
 #include <assert.h>
-#include <console/console.h>
 
 /* Litte-endian, No XN-forced, Instr cache disabled,
  * Stack alignment disabled, Data and unified cache
diff --git a/src/cpu/allwinner/a10/cpu.c b/src/cpu/allwinner/a10/cpu.c
index b3ebe78bd3..c1455be1e6 100644
--- a/src/cpu/allwinner/a10/cpu.c
+++ b/src/cpu/allwinner/a10/cpu.c
@@ -17,7 +17,6 @@
  *
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <cbmem.h>
 #include <symbols.h>
diff --git a/src/cpu/allwinner/a10/raminit.c b/src/cpu/allwinner/a10/raminit.c
index bb4003dfcc..f7d66d5dd3 100644
--- a/src/cpu/allwinner/a10/raminit.c
+++ b/src/cpu/allwinner/a10/raminit.c
@@ -30,7 +30,6 @@
 #include "timer.h"
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <delay.h>
 
 static struct a1x_dramc *const dram = (void *)A1X_DRAMC_BASE;
diff --git a/src/cpu/amd/pi/amd_late_init.c b/src/cpu/amd/pi/amd_late_init.c
index d9a5b43743..8c0da9d48f 100644
--- a/src/cpu/amd/pi/amd_late_init.c
+++ b/src/cpu/amd/pi/amd_late_init.c
@@ -15,7 +15,6 @@
 
 #include <arch/acpi.h>
 #include <bootstate.h>
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
diff --git a/src/cpu/amd/smm/smm_init.c b/src/cpu/amd/smm/smm_init.c
index 9e7832e78f..521a89790d 100644
--- a/src/cpu/amd/smm/smm_init.c
+++ b/src/cpu/amd/smm/smm_init.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <arch/io.h>
 #include <cpu/x86/lapic.h>
 #include <cpu/x86/msr.h>
diff --git a/src/device/pci_ops_mmconf.c b/src/device/pci_ops_mmconf.c
index 40fa632e9c..abbab3f548 100644
--- a/src/device/pci_ops_mmconf.c
+++ b/src/device/pci_ops_mmconf.c
@@ -11,7 +11,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <arch/io.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/drivers/ams/as3722rtc.c b/src/drivers/ams/as3722rtc.c
index 40285d4ef2..d504b42403 100644
--- a/src/drivers/ams/as3722rtc.c
+++ b/src/drivers/ams/as3722rtc.c
@@ -14,7 +14,6 @@
  */
 
 #include <bcd.h>
-#include <console/console.h>
 #include <device/i2c_simple.h>
 #include <rtc.h>
 #include <stdint.h>
diff --git a/src/drivers/i2c/lm63/lm63.c b/src/drivers/i2c/lm63/lm63.c
index 1805778010..5ef70cb9c8 100644
--- a/src/drivers/i2c/lm63/lm63.c
+++ b/src/drivers/i2c/lm63/lm63.c
@@ -1,4 +1,3 @@
-#include <console/console.h>
 #include <device/device.h>
 #include <device/smbus.h>
 
diff --git a/src/drivers/i2c/pca9538/pca9538.c b/src/drivers/i2c/pca9538/pca9538.c
index 30e3b47acf..95848ad3de 100644
--- a/src/drivers/i2c/pca9538/pca9538.c
+++ b/src/drivers/i2c/pca9538/pca9538.c
@@ -15,7 +15,6 @@
 
 #include <device/i2c_bus.h>
 #include <device/device.h>
-#include <console/console.h>
 #include "pca9538.h"
 #include "chip.h"
 
diff --git a/src/drivers/intel/gma/vbt.c b/src/drivers/intel/gma/vbt.c
index c908eb4adb..f7dc99cef5 100644
--- a/src/drivers/intel/gma/vbt.c
+++ b/src/drivers/intel/gma/vbt.c
@@ -16,7 +16,6 @@
  */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <delay.h>
 #include <device/device.h>
 #include <string.h>
diff --git a/src/drivers/net/ne2k.c b/src/drivers/net/ne2k.c
index e02a331bed..f56ab0d941 100644
--- a/src/drivers/net/ne2k.c
+++ b/src/drivers/net/ne2k.c
@@ -28,7 +28,6 @@ SMC8416 PIO support added by Andrew Bettison (andrewb@zip.com.au) on 4/3/02
 */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <console/ne2k.h>
 #include <delay.h>
 #include <device/device.h>
diff --git a/src/drivers/ricoh/rce822/rce822.c b/src/drivers/ricoh/rce822/rce822.c
index 297dd61606..b16b05a91c 100644
--- a/src/drivers/ricoh/rce822/rce822.c
+++ b/src/drivers/ricoh/rce822/rce822.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/drivers/siemens/nc_fpga/nc_fpga.c b/src/drivers/siemens/nc_fpga/nc_fpga.c
index 5efded7304..846c8704d1 100644
--- a/src/drivers/siemens/nc_fpga/nc_fpga.c
+++ b/src/drivers/siemens/nc_fpga/nc_fpga.c
@@ -14,7 +14,6 @@
  */
 
 #include <types.h>
-#include <console/console.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
diff --git a/src/drivers/uart/util.c b/src/drivers/uart/util.c
index d38f688da2..e712600f78 100644
--- a/src/drivers/uart/util.c
+++ b/src/drivers/uart/util.c
@@ -11,7 +11,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <console/uart.h>
 #include <types.h>
 #include <timer.h>
diff --git a/src/ec/google/chromeec/vstore.c b/src/ec/google/chromeec/vstore.c
index fd0a7e7366..28c26036ba 100644
--- a/src/ec/google/chromeec/vstore.c
+++ b/src/ec/google/chromeec/vstore.c
@@ -13,8 +13,6 @@
  * GNU General Public License for more details.
  */
 
-
-#include <console/console.h>
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/lib/cbmem_common.c b/src/lib/cbmem_common.c
index fd2b46851a..e3bec17bd6 100644
--- a/src/lib/cbmem_common.c
+++ b/src/lib/cbmem_common.c
@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
-#include <console/console.h>
+
 #include <cbmem.h>
 #include <bootstate.h>
 #include <rules.h>
diff --git a/src/northbridge/amd/amdfam10/get_pci1234.c b/src/northbridge/amd/amdfam10/get_pci1234.c
index 08698dc3ed..fee31b639e 100644
--- a/src/northbridge/amd/amdfam10/get_pci1234.c
+++ b/src/northbridge/amd/amdfam10/get_pci1234.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <string.h>
diff --git a/src/northbridge/amd/amdht/h3ncmn.c b/src/northbridge/amd/amdht/h3ncmn.c
index 1294bb3da7..6173f17d5a 100644
--- a/src/northbridge/amd/amdht/h3ncmn.c
+++ b/src/northbridge/amd/amdht/h3ncmn.c
@@ -30,7 +30,6 @@
 
 #include <arch/cpu.h>
 #include <device/pci.h>
-#include <console/console.h>
 #include <cpu/amd/msr.h>
 #include <device/pci_def.h>
 #include <device/pci_ids.h>
diff --git a/src/northbridge/amd/amdk8/reset_test.c b/src/northbridge/amd/amdk8/reset_test.c
index 474f78f274..e58046d39c 100644
--- a/src/northbridge/amd/amdk8/reset_test.c
+++ b/src/northbridge/amd/amdk8/reset_test.c
@@ -12,7 +12,6 @@
  */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <stdint.h>
 #include <cpu/x86/lapic.h>
 #include "amdk8.h"
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctprob.c b/src/northbridge/amd/amdmct/mct_ddr3/mctprob.c
index 9c97250ef9..a02b15f4c4 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctprob.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctprob.c
@@ -14,7 +14,6 @@
  */
 
 #include <inttypes.h>
-#include <console/console.h>
 #include <string.h>
 #include "mct_d.h"
 #include "mct_d_gcc.h"
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctproc.c b/src/northbridge/amd/amdmct/mct_ddr3/mctproc.c
index 38354a5604..eb3143fd61 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctproc.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctproc.c
@@ -15,7 +15,6 @@
  */
 
 #include <inttypes.h>
-#include <console/console.h>
 #include <string.h>
 #include "mct_d.h"
 #include "mct_d_gcc.h"
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctprod.c b/src/northbridge/amd/amdmct/mct_ddr3/mctprod.c
index 947fa1515d..5a4fd2a7c0 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctprod.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctprod.c
@@ -15,7 +15,6 @@
  */
 
 #include <inttypes.h>
-#include <console/console.h>
 #include <string.h>
 #include "mct_d.h"
 #include "mct_d_gcc.h"
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctsrc1p.c b/src/northbridge/amd/amdmct/mct_ddr3/mctsrc1p.c
index 0047b55356..eb30c8d929 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctsrc1p.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctsrc1p.c
@@ -16,7 +16,6 @@
 
 #include <arch/cpu.h>
 #include <inttypes.h>
-#include <console/console.h>
 #include <string.h>
 #include "mct_d.h"
 #include "mct_d_gcc.h"
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/modtrd.c b/src/northbridge/amd/amdmct/mct_ddr3/modtrd.c
index 9c1ba892b7..26ea031304 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/modtrd.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/modtrd.c
@@ -14,7 +14,6 @@
  */
 
 #include <inttypes.h>
-#include <console/console.h>
 #include <string.h>
 #include "mct_d.h"
 #include "mct_d_gcc.h"
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mport_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mport_d.c
index 41d2c27b5f..76a63b558d 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mport_d.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mport_d.c
@@ -14,7 +14,6 @@
  */
 
 #include <inttypes.h>
-#include <console/console.h>
 #include <string.h>
 #include "mct_d.h"
 #include "mct_d_gcc.h"
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mutilc_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mutilc_d.c
index eb36c67d97..e4afa70fa0 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mutilc_d.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mutilc_d.c
@@ -18,7 +18,6 @@
 
 #include <arch/cpu.h>
 #include <inttypes.h>
-#include <console/console.h>
 #include <string.h>
 #include "mct_d.h"
 #include "mct_d_gcc.h"
diff --git a/src/northbridge/intel/fsp_rangeley/acpi.c b/src/northbridge/intel/fsp_rangeley/acpi.c
index 23044b7894..44ec0855c9 100644
--- a/src/northbridge/intel/fsp_rangeley/acpi.c
+++ b/src/northbridge/intel/fsp_rangeley/acpi.c
@@ -18,7 +18,6 @@
 
 #include <types.h>
 #include <string.h>
-#include <console/console.h>
 #include <arch/io.h>
 #include <arch/acpi.h>
 #include <device/device.h>
diff --git a/src/northbridge/intel/fsp_rangeley/raminit.c b/src/northbridge/intel/fsp_rangeley/raminit.c
index 32506aaedd..675a6f438e 100644
--- a/src/northbridge/intel/fsp_rangeley/raminit.c
+++ b/src/northbridge/intel/fsp_rangeley/raminit.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <string.h>
 #include <arch/io.h>
 #include <cbmem.h>
diff --git a/src/northbridge/intel/fsp_sandybridge/fsp/chipset_fsp_util.c b/src/northbridge/intel/fsp_sandybridge/fsp/chipset_fsp_util.c
index 24fdc7497b..3353d9c878 100644
--- a/src/northbridge/intel/fsp_sandybridge/fsp/chipset_fsp_util.c
+++ b/src/northbridge/intel/fsp_sandybridge/fsp/chipset_fsp_util.c
@@ -15,7 +15,6 @@
 
 #include <types.h>
 #include <string.h>
-#include <console/console.h>
 #include <bootstate.h>
 #include <cbmem.h>
 #include <cf9_reset.h>
diff --git a/src/northbridge/intel/gm45/thermal.c b/src/northbridge/intel/gm45/thermal.c
index b05d411dee..da631c12bf 100644
--- a/src/northbridge/intel/gm45/thermal.c
+++ b/src/northbridge/intel/gm45/thermal.c
@@ -21,7 +21,6 @@
 #include <device/pci_def.h>
 #include <device/pnp_def.h>
 #include <spd.h>
-#include <console/console.h>
 #include "delay.h"
 
 #include "gm45.h"
diff --git a/src/northbridge/intel/i945/acpi.c b/src/northbridge/intel/i945/acpi.c
index 41ebf17dcd..dd080118fb 100644
--- a/src/northbridge/intel/i945/acpi.c
+++ b/src/northbridge/intel/i945/acpi.c
@@ -16,7 +16,6 @@
 
 #include <types.h>
 #include <string.h>
-#include <console/console.h>
 #include <arch/acpi.h>
 #include <arch/acpigen.h>
 #include <device/device.h>
diff --git a/src/security/vboot/common.c b/src/security/vboot/common.c
index 72228e41d0..51343f8139 100644
--- a/src/security/vboot/common.c
+++ b/src/security/vboot/common.c
@@ -16,7 +16,6 @@
 #include <assert.h>
 #include <cbfs.h>
 #include <cbmem.h>
-#include <console/console.h>
 #include <reset.h>
 #include <string.h>
 #include <vb2_api.h>
diff --git a/src/security/vboot/vboot_common.c b/src/security/vboot/vboot_common.c
index 8b02da04c7..a8361cafaf 100644
--- a/src/security/vboot/vboot_common.c
+++ b/src/security/vboot/vboot_common.c
@@ -17,7 +17,6 @@
 #include <boot_device.h>
 #include <cbmem.h>
 #include <console/cbmem_console.h>
-#include <console/console.h>
 #include <fmap.h>
 #include <gbb_header.h>
 #include <reset.h>
diff --git a/src/soc/amd/stoneyridge/hda.c b/src/soc/amd/stoneyridge/hda.c
index 89fc0fdfff..4d3275902c 100644
--- a/src/soc/amd/stoneyridge/hda.c
+++ b/src/soc/amd/stoneyridge/hda.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 <device/pci_ids.h>
diff --git a/src/soc/amd/stoneyridge/sata.c b/src/soc/amd/stoneyridge/sata.c
index 5376786a91..dacff346de 100644
--- a/src/soc/amd/stoneyridge/sata.c
+++ b/src/soc/amd/stoneyridge/sata.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <delay.h>
 #include <device/pci.h>
diff --git a/src/soc/amd/stoneyridge/sm.c b/src/soc/amd/stoneyridge/sm.c
index 278f8a8001..385936c941 100644
--- a/src/soc/amd/stoneyridge/sm.c
+++ b/src/soc/amd/stoneyridge/sm.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 <device/pci_ids.h>
diff --git a/src/soc/broadcom/cygnus/ns16550.c b/src/soc/broadcom/cygnus/ns16550.c
index 68c4715cb3..0223278b04 100644
--- a/src/soc/broadcom/cygnus/ns16550.c
+++ b/src/soc/broadcom/cygnus/ns16550.c
@@ -18,7 +18,6 @@
 
 #include <arch/io.h>
 #include <boot/coreboot_tables.h>
-#include <console/console.h>	/* for __console definition */
 #include <console/uart.h>
 #include <delay.h>
 #include <soc/ns16550.h>
diff --git a/src/soc/imgtec/pistachio/reset.c b/src/soc/imgtec/pistachio/reset.c
index d5d0a8188d..9cdedc0809 100644
--- a/src/soc/imgtec/pistachio/reset.c
+++ b/src/soc/imgtec/pistachio/reset.c
@@ -14,7 +14,6 @@
  */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <reset.h>
 
 #define PISTACHIO_WD_ADDR		0xB8102100
diff --git a/src/soc/imgtec/pistachio/uart.c b/src/soc/imgtec/pistachio/uart.c
index f610f6a05d..585ac6b99b 100644
--- a/src/soc/imgtec/pistachio/uart.c
+++ b/src/soc/imgtec/pistachio/uart.c
@@ -18,7 +18,6 @@
 
 #include <arch/io.h>
 #include <boot/coreboot_tables.h>
-#include <console/console.h>
 #include <console/uart.h>
 #include <device/device.h>
 #include <delay.h>
diff --git a/src/soc/intel/apollolake/nhlt.c b/src/soc/intel/apollolake/nhlt.c
index 6a71f1ee7e..8a3cfac203 100644
--- a/src/soc/intel/apollolake/nhlt.c
+++ b/src/soc/intel/apollolake/nhlt.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <nhlt.h>
 #include <soc/nhlt.h>
 
diff --git a/src/soc/intel/baytrail/chip.c b/src/soc/intel/baytrail/chip.c
index 94a5a8ec14..2c026893b5 100644
--- a/src/soc/intel/baytrail/chip.c
+++ b/src/soc/intel/baytrail/chip.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 <arch/pci_ops.h>
diff --git a/src/soc/intel/baytrail/ehci.c b/src/soc/intel/baytrail/ehci.c
index e2ff3189b2..002d38c633 100644
--- a/src/soc/intel/baytrail/ehci.c
+++ b/src/soc/intel/baytrail/ehci.c
@@ -14,7 +14,6 @@
  */
 
 #include <arch/acpi.h>
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/soc/intel/baytrail/northcluster.c b/src/soc/intel/baytrail/northcluster.c
index 8186cecb6c..82717463fa 100644
--- a/src/soc/intel/baytrail/northcluster.c
+++ b/src/soc/intel/baytrail/northcluster.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <cpu/x86/smm.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/soc/intel/braswell/hda.c b/src/soc/intel/braswell/hda.c
index a92d7a9c8a..26ca8fdcf4 100644
--- a/src/soc/intel/braswell/hda.c
+++ b/src/soc/intel/braswell/hda.c
@@ -13,8 +13,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
+
 #include <arch/io.h>
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_def.h>
diff --git a/src/soc/intel/braswell/memmap.c b/src/soc/intel/braswell/memmap.c
index 19189f948e..d7c995290b 100644
--- a/src/soc/intel/braswell/memmap.c
+++ b/src/soc/intel/braswell/memmap.c
@@ -16,7 +16,6 @@
 
 #include <arch/io.h>
 #include <cbmem.h>
-#include <console/console.h>
 #include <fsp/memmap.h>
 #include <soc/iosf.h>
 #include <soc/smm.h>
diff --git a/src/soc/intel/braswell/northcluster.c b/src/soc/intel/braswell/northcluster.c
index 3245a288db..40d658c4d4 100644
--- a/src/soc/intel/braswell/northcluster.c
+++ b/src/soc/intel/braswell/northcluster.c
@@ -16,7 +16,6 @@
 
 #include <arch/acpi.h>
 #include <cbmem.h>
-#include <console/console.h>
 #include <cpu/x86/smm.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/soc/intel/braswell/tsc_freq.c b/src/soc/intel/braswell/tsc_freq.c
index 72dbca5af9..891aaff7de 100644
--- a/src/soc/intel/braswell/tsc_freq.c
+++ b/src/soc/intel/braswell/tsc_freq.c
@@ -18,7 +18,6 @@
 #include <cpu/x86/tsc.h>
 #include <rules.h>
 #include <soc/msr.h>
-#include <console/console.h>
 #if ENV_RAMSTAGE
 #include <soc/ramstage.h>
 #else
diff --git a/src/soc/intel/broadwell/chip.c b/src/soc/intel/broadwell/chip.c
index 70afa0d3cc..3b17745e35 100644
--- a/src/soc/intel/broadwell/chip.c
+++ b/src/soc/intel/broadwell/chip.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 <soc/acpi.h>
diff --git a/src/soc/intel/broadwell/cpu_info.c b/src/soc/intel/broadwell/cpu_info.c
index bb438ed51f..00f3690d89 100644
--- a/src/soc/intel/broadwell/cpu_info.c
+++ b/src/soc/intel/broadwell/cpu_info.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <arch/cpu.h>
 #include <cpu/x86/msr.h>
 #include <soc/cpu.h>
diff --git a/src/soc/intel/broadwell/ehci.c b/src/soc/intel/broadwell/ehci.c
index b1ead7783f..be4672704c 100644
--- a/src/soc/intel/broadwell/ehci.c
+++ b/src/soc/intel/broadwell/ehci.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <delay.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/soc/intel/broadwell/ramstage.c b/src/soc/intel/broadwell/ramstage.c
index 8fb731a6ca..e1883f2ecd 100644
--- a/src/soc/intel/broadwell/ramstage.c
+++ b/src/soc/intel/broadwell/ramstage.c
@@ -15,7 +15,6 @@
 
 #include <arch/acpi.h>
 #include <cbmem.h>
-#include <console/console.h>
 #include <device/device.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/soc/intel/broadwell/romstage/pch.c b/src/soc/intel/broadwell/romstage/pch.c
index 7e614c1aa4..cffe71b8da 100644
--- a/src/soc/intel/broadwell/romstage/pch.c
+++ b/src/soc/intel/broadwell/romstage/pch.c
@@ -14,7 +14,6 @@
  */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
diff --git a/src/soc/intel/broadwell/romstage/smbus.c b/src/soc/intel/broadwell/romstage/smbus.c
index 13fdaf6105..3f9dcd0ab7 100644
--- a/src/soc/intel/broadwell/romstage/smbus.c
+++ b/src/soc/intel/broadwell/romstage/smbus.c
@@ -15,7 +15,6 @@
  */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <device/pci_ids.h>
 #include <device/pci_def.h>
 #include <reg_script.h>
diff --git a/src/soc/intel/broadwell/romstage/stack.c b/src/soc/intel/broadwell/romstage/stack.c
index aa36e29ccf..35956760e0 100644
--- a/src/soc/intel/broadwell/romstage/stack.c
+++ b/src/soc/intel/broadwell/romstage/stack.c
@@ -17,7 +17,6 @@
 #include <stdint.h>
 #include <arch/cpu.h>
 #include <arch/early_variables.h>
-#include <console/console.h>
 #include <cbmem.h>
 #include <cpu/x86/mtrr.h>
 #include <soc/romstage.h>
diff --git a/src/soc/intel/broadwell/smbus.c b/src/soc/intel/broadwell/smbus.c
index 0e0eb8b883..26483fd2bc 100644
--- a/src/soc/intel/broadwell/smbus.c
+++ b/src/soc/intel/broadwell/smbus.c
@@ -15,7 +15,6 @@
  */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <device/device.h>
 #include <device/path.h>
 #include <device/smbus.h>
diff --git a/src/soc/intel/broadwell/usb_debug.c b/src/soc/intel/broadwell/usb_debug.c
index 9580a5c90d..662b35216d 100644
--- a/src/soc/intel/broadwell/usb_debug.c
+++ b/src/soc/intel/broadwell/usb_debug.c
@@ -18,7 +18,6 @@
 
 #include <stdint.h>
 #include <arch/io.h>
-#include <console/console.h>
 #include <device/pci_ehci.h>
 #include <device/pci_def.h>
 
diff --git a/src/soc/intel/broadwell/xhci.c b/src/soc/intel/broadwell/xhci.c
index 8b4c7b1b5e..aba1123492 100644
--- a/src/soc/intel/broadwell/xhci.c
+++ b/src/soc/intel/broadwell/xhci.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <delay.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/soc/intel/cannonlake/chip.c b/src/soc/intel/cannonlake/chip.c
index 4049c1e78c..17b173aec6 100644
--- a/src/soc/intel/cannonlake/chip.c
+++ b/src/soc/intel/cannonlake/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/cannonlake/lpc.c b/src/soc/intel/cannonlake/lpc.c
index c058065043..b440d392e4 100644
--- a/src/soc/intel/cannonlake/lpc.c
+++ b/src/soc/intel/cannonlake/lpc.c
@@ -16,7 +16,6 @@
  */
 
 #include "chip.h"
-#include <console/console.h>
 #include <delay.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/soc/intel/cannonlake/nhlt.c b/src/soc/intel/cannonlake/nhlt.c
index ca31d39574..ffe3f5bf6a 100644
--- a/src/soc/intel/cannonlake/nhlt.c
+++ b/src/soc/intel/cannonlake/nhlt.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <nhlt.h>
 #include <soc/nhlt.h>
 
diff --git a/src/soc/intel/cannonlake/systemagent.c b/src/soc/intel/cannonlake/systemagent.c
index 06b37e0a92..e6310c0c9a 100644
--- a/src/soc/intel/cannonlake/systemagent.c
+++ b/src/soc/intel/cannonlake/systemagent.c
@@ -15,7 +15,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/intel/common/block/fast_spi/fast_spi.c b/src/soc/intel/common/block/fast_spi/fast_spi.c
index e7f81fc323..5ff0872a4f 100644
--- a/src/soc/intel/common/block/fast_spi/fast_spi.c
+++ b/src/soc/intel/common/block/fast_spi/fast_spi.c
@@ -18,7 +18,6 @@
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
 #include <commonlib/helpers.h>
-#include <console/console.h>
 #include <cpu/x86/mtrr.h>
 #include <fast_spi_def.h>
 #include <intelblocks/fast_spi.h>
diff --git a/src/soc/intel/common/pch/lockdown/lockdown.c b/src/soc/intel/common/pch/lockdown/lockdown.c
index f37d00117e..5b78df5a6c 100644
--- a/src/soc/intel/common/pch/lockdown/lockdown.c
+++ b/src/soc/intel/common/pch/lockdown/lockdown.c
@@ -15,7 +15,6 @@
 
 #include <arch/io.h>
 #include <bootstate.h>
-#include <console/console.h>
 #include <intelblocks/chip.h>
 #include <intelblocks/fast_spi.h>
 #include <intelblocks/pcr.h>
diff --git a/src/soc/intel/common/vbt.c b/src/soc/intel/common/vbt.c
index 9eaa2cb048..3dd46fb5f8 100644
--- a/src/soc/intel/common/vbt.c
+++ b/src/soc/intel/common/vbt.c
@@ -14,7 +14,6 @@
  */
 
 #include <cbfs.h>
-#include <console/console.h>
 #include <arch/acpi.h>
 #include <bootmode.h>
 #include <bootstate.h>
diff --git a/src/soc/intel/denverton_ns/memmap.c b/src/soc/intel/denverton_ns/memmap.c
index 813d5c6553..21e069fc95 100644
--- a/src/soc/intel/denverton_ns/memmap.c
+++ b/src/soc/intel/denverton_ns/memmap.c
@@ -21,7 +21,6 @@
 #include <device/device.h>
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
-#include <console/console.h>
 #include <soc/pci_devs.h>
 #include <soc/systemagent.h>
 #include <soc/smm.h>
diff --git a/src/soc/intel/denverton_ns/soc_util.c b/src/soc/intel/denverton_ns/soc_util.c
index 1626927ef2..780695a573 100644
--- a/src/soc/intel/denverton_ns/soc_util.c
+++ b/src/soc/intel/denverton_ns/soc_util.c
@@ -19,7 +19,6 @@
 #include <device/pci.h>
 #include <device/pci_def.h>
 #include <device/device.h>
-#include <console/console.h>
 
 #include <soc/iomap.h>
 #include <soc/soc_util.h>
diff --git a/src/soc/intel/denverton_ns/spi.c b/src/soc/intel/denverton_ns/spi.c
index 9a651ee048..8d03c07f64 100644
--- a/src/soc/intel/denverton_ns/spi.c
+++ b/src/soc/intel/denverton_ns/spi.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <intelblocks/fast_spi.h>
 #include <spi-generic.h>
 
diff --git a/src/soc/intel/fsp_baytrail/romstage/pmc.c b/src/soc/intel/fsp_baytrail/romstage/pmc.c
index 8df2341947..dab31bf314 100644
--- a/src/soc/intel/fsp_baytrail/romstage/pmc.c
+++ b/src/soc/intel/fsp_baytrail/romstage/pmc.c
@@ -15,7 +15,6 @@
 
 #include <stddef.h>
 #include <arch/io.h>
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci_def.h>
 #include <soc/iomap.h>
diff --git a/src/soc/intel/fsp_broadwell_de/smbus.c b/src/soc/intel/fsp_broadwell_de/smbus.c
index b5870d77cf..339d47be8b 100644
--- a/src/soc/intel/fsp_broadwell_de/smbus.c
+++ b/src/soc/intel/fsp_broadwell_de/smbus.c
@@ -16,7 +16,6 @@
  */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <device/device.h>
 #include <device/smbus.h>
 #include <device/smbus_def.h>
diff --git a/src/soc/intel/quark/chip.c b/src/soc/intel/quark/chip.c
index 2f8b8267d1..59f8d1b474 100644
--- a/src/soc/intel/quark/chip.c
+++ b/src/soc/intel/quark/chip.c
@@ -15,7 +15,6 @@
  */
 
 #include <assert.h>
-#include <console/console.h>
 #include <device/device.h>
 #include <romstage_handoff.h>
 #include <soc/ramstage.h>
diff --git a/src/soc/intel/quark/fsp1_1.c b/src/soc/intel/quark/fsp1_1.c
index 1178031f8d..41dbb6c594 100644
--- a/src/soc/intel/quark/fsp1_1.c
+++ b/src/soc/intel/quark/fsp1_1.c
@@ -13,7 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
-#include <console/console.h>
+
 #include <fsp/util.h>
 #include <soc/ramstage.h>
 
diff --git a/src/soc/intel/quark/fsp2_0.c b/src/soc/intel/quark/fsp2_0.c
index 2487cdebd3..d96d410f9a 100644
--- a/src/soc/intel/quark/fsp2_0.c
+++ b/src/soc/intel/quark/fsp2_0.c
@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
-#include <console/console.h>
+
 #include <fsp/util.h>
 #include <soc/ramstage.h>
 
diff --git a/src/soc/intel/quark/northcluster.c b/src/soc/intel/quark/northcluster.c
index 124d767d13..01ff6b522e 100644
--- a/src/soc/intel/quark/northcluster.c
+++ b/src/soc/intel/quark/northcluster.c
@@ -16,7 +16,6 @@
  */
 
 #include <cbmem.h>
-#include <console/console.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <soc/iomap.h>
diff --git a/src/soc/intel/quark/romstage/mtrr.c b/src/soc/intel/quark/romstage/mtrr.c
index e6bb51fd25..6f2f00c862 100644
--- a/src/soc/intel/quark/romstage/mtrr.c
+++ b/src/soc/intel/quark/romstage/mtrr.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/mtrr.h>
 #include <soc/intel/common/util.h>
diff --git a/src/soc/intel/quark/romstage/pcie.c b/src/soc/intel/quark/romstage/pcie.c
index 24dcf23ffb..bdc3902e6c 100644
--- a/src/soc/intel/quark/romstage/pcie.c
+++ b/src/soc/intel/quark/romstage/pcie.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <delay.h>
 #include <device/device.h>
 #include <device/pci_ids.h>
diff --git a/src/soc/intel/quark/sd.c b/src/soc/intel/quark/sd.c
index e41afa4acd..a95e2f7272 100644
--- a/src/soc/intel/quark/sd.c
+++ b/src/soc/intel/quark/sd.c
@@ -16,7 +16,6 @@
 #include <arch/io.h>
 #include <commonlib/sdhci.h>
 #include <commonlib/storage.h>
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/soc/intel/skylake/lpc.c b/src/soc/intel/skylake/lpc.c
index 3d1dd7b024..73757f25f0 100644
--- a/src/soc/intel/skylake/lpc.c
+++ b/src/soc/intel/skylake/lpc.c
@@ -16,7 +16,6 @@
  */
 
 #include "chip.h"
-#include <console/console.h>
 #include <delay.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/soc/intel/skylake/nhlt/da7219.c b/src/soc/intel/skylake/nhlt/da7219.c
index 6aa66c73c2..5d872ecff7 100644
--- a/src/soc/intel/skylake/nhlt/da7219.c
+++ b/src/soc/intel/skylake/nhlt/da7219.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <nhlt.h>
 #include <soc/nhlt.h>
 
diff --git a/src/soc/intel/skylake/pei_data.c b/src/soc/intel/skylake/pei_data.c
index 8b840c9853..a2887ac4c4 100644
--- a/src/soc/intel/skylake/pei_data.c
+++ b/src/soc/intel/skylake/pei_data.c
@@ -15,7 +15,6 @@
  */
 
 #include <chip.h>
-#include <console/console.h>
 #include <console/streams.h>
 #include <device/device.h>
 #include <device/pci_def.h>
diff --git a/src/soc/intel/skylake/systemagent.c b/src/soc/intel/skylake/systemagent.c
index 2c4408fec6..6a4c8646ce 100644
--- a/src/soc/intel/skylake/systemagent.c
+++ b/src/soc/intel/skylake/systemagent.c
@@ -17,7 +17,6 @@
 
 #include <arch/io.h>
 #include <cpu/x86/msr.h>
-#include <console/console.h>
 #include <delay.h>
 #include <device/device.h>
 #include <device/pci_ops.h>
diff --git a/src/soc/mediatek/common/timer.c b/src/soc/mediatek/common/timer.c
index b05d29e0bf..2bf2aece9f 100644
--- a/src/soc/mediatek/common/timer.c
+++ b/src/soc/mediatek/common/timer.c
@@ -14,7 +14,6 @@
  */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <timer.h>
 #include <delay.h>
 #include <thread.h>
diff --git a/src/soc/mediatek/common/uart.c b/src/soc/mediatek/common/uart.c
index bc8053c6ab..56e98739cd 100644
--- a/src/soc/mediatek/common/uart.c
+++ b/src/soc/mediatek/common/uart.c
@@ -15,7 +15,6 @@
 
 #include <arch/io.h>
 #include <boot/coreboot_tables.h>
-#include <console/console.h>	/* for __console definition */
 #include <console/uart.h>
 #include <drivers/uart/uart8250reg.h>
 #include <stdint.h>
diff --git a/src/soc/mediatek/mt8173/ddp.c b/src/soc/mediatek/mt8173/ddp.c
index 977a9e5fe8..ea517449ce 100644
--- a/src/soc/mediatek/mt8173/ddp.c
+++ b/src/soc/mediatek/mt8173/ddp.c
@@ -14,7 +14,6 @@
  */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <delay.h>
 #include <edid.h>
 #include <stdlib.h>
diff --git a/src/soc/mediatek/mt8173/gpio_init.c b/src/soc/mediatek/mt8173/gpio_init.c
index 31c77f5240..d4fa4c7d7c 100644
--- a/src/soc/mediatek/mt8173/gpio_init.c
+++ b/src/soc/mediatek/mt8173/gpio_init.c
@@ -12,8 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
+
 #include <arch/io.h>
-#include <console/console.h>
 #include <soc/gpio.h>
 #include <soc/mipi.h>
 
diff --git a/src/soc/mediatek/mt8173/soc.c b/src/soc/mediatek/mt8173/soc.c
index 493ed51e8b..37ceb34fd4 100644
--- a/src/soc/mediatek/mt8173/soc.c
+++ b/src/soc/mediatek/mt8173/soc.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <symbols.h>
 #include <soc/emi.h>
diff --git a/src/soc/nvidia/tegra/gpio.c b/src/soc/nvidia/tegra/gpio.c
index 231e8b21ad..b8b9cefdf0 100644
--- a/src/soc/nvidia/tegra/gpio.c
+++ b/src/soc/nvidia/tegra/gpio.c
@@ -14,7 +14,6 @@
  */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <gpio.h>
 #include <soc/addressmap.h>
 #include <stddef.h>
diff --git a/src/soc/nvidia/tegra124/uart.c b/src/soc/nvidia/tegra124/uart.c
index 50c395658a..769c279202 100644
--- a/src/soc/nvidia/tegra124/uart.c
+++ b/src/soc/nvidia/tegra124/uart.c
@@ -15,7 +15,6 @@
 
 #include <arch/io.h>
 #include <boot/coreboot_tables.h>
-#include <console/console.h>	/* for __console definition */
 #include <console/uart.h>
 #include <drivers/uart/uart8250reg.h>
 
diff --git a/src/soc/nvidia/tegra124/verstage.c b/src/soc/nvidia/tegra124/verstage.c
index 526f14e066..f8617a8166 100644
--- a/src/soc/nvidia/tegra124/verstage.c
+++ b/src/soc/nvidia/tegra124/verstage.c
@@ -17,7 +17,6 @@
 #include <arch/exception.h>
 #include <arch/hlt.h>
 #include <arch/stages.h>
-#include <console/console.h>
 #include <program_loading.h>
 #include <soc/cache.h>
 #include <soc/early_configs.h>
diff --git a/src/soc/nvidia/tegra210/mipi-phy.c b/src/soc/nvidia/tegra210/mipi-phy.c
index 001032a591..d5a7255ed4 100644
--- a/src/soc/nvidia/tegra210/mipi-phy.c
+++ b/src/soc/nvidia/tegra210/mipi-phy.c
@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
-#include <console/console.h>
+
 #include <arch/io.h>
 #include <stdint.h>
 #include <lib.h>
diff --git a/src/soc/nvidia/tegra210/uart.c b/src/soc/nvidia/tegra210/uart.c
index b7cec3d171..6fa8429cf1 100644
--- a/src/soc/nvidia/tegra210/uart.c
+++ b/src/soc/nvidia/tegra210/uart.c
@@ -15,7 +15,6 @@
 
 #include <arch/io.h>
 #include <boot/coreboot_tables.h>
-#include <console/console.h>	/* for __console definition */
 #include <console/uart.h>
 #include <drivers/uart/uart8250reg.h>
 #include <stdint.h>
diff --git a/src/soc/qualcomm/ipq40xx/uart.c b/src/soc/qualcomm/ipq40xx/uart.c
index 4b0bffd216..fcca4ec526 100644
--- a/src/soc/qualcomm/ipq40xx/uart.c
+++ b/src/soc/qualcomm/ipq40xx/uart.c
@@ -30,7 +30,6 @@
 
 #include <arch/io.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/sdm845/gpio.c b/src/soc/qualcomm/sdm845/gpio.c
index edbb3b98fa..47c86cbb59 100644
--- a/src/soc/qualcomm/sdm845/gpio.c
+++ b/src/soc/qualcomm/sdm845/gpio.c
@@ -15,7 +15,6 @@
 
 #include <arch/io.h>
 #include <types.h>
-#include <console/console.h>
 #include <delay.h>
 #include <timer.h>
 #include <timestamp.h>
diff --git a/src/soc/rockchip/common/gpio.c b/src/soc/rockchip/common/gpio.c
index cd095ff374..0179bd64ea 100644
--- a/src/soc/rockchip/common/gpio.c
+++ b/src/soc/rockchip/common/gpio.c
@@ -15,7 +15,6 @@
 
 #include <arch/io.h>
 #include <assert.h>
-#include <console/console.h>
 #include <gpio.h>
 #include <soc/gpio.h>
 #include <soc/grf.h>
diff --git a/src/soc/rockchip/common/pwm.c b/src/soc/rockchip/common/pwm.c
index c294a0cdf2..b9b8ff041a 100644
--- a/src/soc/rockchip/common/pwm.c
+++ b/src/soc/rockchip/common/pwm.c
@@ -15,7 +15,6 @@
 
 #include <arch/io.h>
 #include <assert.h>
-#include <console/console.h>
 #include <delay.h>
 #include <soc/addressmap.h>
 #include <soc/grf.h>
diff --git a/src/soc/rockchip/common/vop.c b/src/soc/rockchip/common/vop.c
index 463159182a..c3f331f6df 100644
--- a/src/soc/rockchip/common/vop.c
+++ b/src/soc/rockchip/common/vop.c
@@ -14,7 +14,6 @@
  */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <delay.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/soc/rockchip/rk3288/bootblock.c b/src/soc/rockchip/rk3288/bootblock.c
index 02fe9ff885..7308241e17 100644
--- a/src/soc/rockchip/rk3288/bootblock.c
+++ b/src/soc/rockchip/rk3288/bootblock.c
@@ -16,7 +16,6 @@
 #include <arch/cache.h>
 #include <arch/io.h>
 #include <bootblock_common.h>
-#include <console/console.h>
 #include <soc/addressmap.h>
 #include <soc/clock.h>
 #include <soc/grf.h>
diff --git a/src/soc/rockchip/rk3288/gpio.c b/src/soc/rockchip/rk3288/gpio.c
index 662116ecb5..b74aa13adb 100644
--- a/src/soc/rockchip/rk3288/gpio.c
+++ b/src/soc/rockchip/rk3288/gpio.c
@@ -14,7 +14,6 @@
  */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <gpio.h>
 #include <soc/gpio.h>
 #include <soc/grf.h>
diff --git a/src/soc/rockchip/rk3288/tsadc.c b/src/soc/rockchip/rk3288/tsadc.c
index 1542ccf7e8..a93120d0f5 100644
--- a/src/soc/rockchip/rk3288/tsadc.c
+++ b/src/soc/rockchip/rk3288/tsadc.c
@@ -15,7 +15,6 @@
 
 #include <arch/io.h>
 #include <assert.h>
-#include <console/console.h>
 #include <delay.h>
 #include <soc/clock.h>
 #include <soc/grf.h>
diff --git a/src/soc/rockchip/rk3399/decompressor.c b/src/soc/rockchip/rk3399/decompressor.c
index 7d3c71478b..f4ca5d111f 100644
--- a/src/soc/rockchip/rk3399/decompressor.c
+++ b/src/soc/rockchip/rk3399/decompressor.c
@@ -17,7 +17,6 @@
 #include <arch/io.h>
 #include <arch/mmu.h>
 #include <bootblock_common.h>
-#include <console/console.h>
 #include <soc/mmu_operations.h>
 #include <symbols.h>
 
diff --git a/src/soc/rockchip/rk3399/gpio.c b/src/soc/rockchip/rk3399/gpio.c
index 3316027d4a..bd5c6ce6bc 100644
--- a/src/soc/rockchip/rk3399/gpio.c
+++ b/src/soc/rockchip/rk3399/gpio.c
@@ -14,7 +14,6 @@
  */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <gpio.h>
 #include <soc/addressmap.h>
 #include <soc/gpio.h>
diff --git a/src/soc/rockchip/rk3399/saradc.c b/src/soc/rockchip/rk3399/saradc.c
index 7c25936e20..eb28ca613f 100644
--- a/src/soc/rockchip/rk3399/saradc.c
+++ b/src/soc/rockchip/rk3399/saradc.c
@@ -16,7 +16,6 @@
 
 #include <arch/io.h>
 #include <assert.h>
-#include <console/console.h>
 #include <delay.h>
 #include <soc/clock.h>
 #include <soc/saradc.h>
diff --git a/src/soc/rockchip/rk3399/tsadc.c b/src/soc/rockchip/rk3399/tsadc.c
index 234cd23377..11f0c59c5f 100644
--- a/src/soc/rockchip/rk3399/tsadc.c
+++ b/src/soc/rockchip/rk3399/tsadc.c
@@ -15,7 +15,6 @@
 
 #include <arch/io.h>
 #include <assert.h>
-#include <console/console.h>
 #include <delay.h>
 #include <soc/clock.h>
 #include <soc/grf.h>
diff --git a/src/soc/samsung/exynos5250/clock_init.c b/src/soc/samsung/exynos5250/clock_init.c
index 970173e3b3..d75a33ae31 100644
--- a/src/soc/samsung/exynos5250/clock_init.c
+++ b/src/soc/samsung/exynos5250/clock_init.c
@@ -16,7 +16,6 @@
 /* Clock setup for SMDK5250 board based on EXYNOS5 */
 
 #include <delay.h>
-#include <console/console.h>
 #include <soc/clk.h>
 #include <soc/dp.h>
 #include <soc/setup.h>
diff --git a/src/soc/samsung/exynos5250/dmc_common.c b/src/soc/samsung/exynos5250/dmc_common.c
index 638c4b5f46..5a3a98994b 100644
--- a/src/soc/samsung/exynos5250/dmc_common.c
+++ b/src/soc/samsung/exynos5250/dmc_common.c
@@ -17,7 +17,6 @@
  */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <delay.h>
 #include <soc/clk.h>
 #include <soc/dmc.h>
diff --git a/src/soc/samsung/exynos5250/power.c b/src/soc/samsung/exynos5250/power.c
index 8bd63044cb..9d4c748d21 100644
--- a/src/soc/samsung/exynos5250/power.c
+++ b/src/soc/samsung/exynos5250/power.c
@@ -16,7 +16,6 @@
 /* Power setup code for EXYNOS5 */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <halt.h>
 #include <reset.h>
 #include <soc/dmc.h>
diff --git a/src/soc/samsung/exynos5250/wakeup.c b/src/soc/samsung/exynos5250/wakeup.c
index f7580b9a16..f83343bcff 100644
--- a/src/soc/samsung/exynos5250/wakeup.c
+++ b/src/soc/samsung/exynos5250/wakeup.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <soc/power.h>
 #include <soc/wakeup.h>
 
diff --git a/src/soc/samsung/exynos5420/clock_init.c b/src/soc/samsung/exynos5420/clock_init.c
index 295ef399c2..e239993b32 100644
--- a/src/soc/samsung/exynos5420/clock_init.c
+++ b/src/soc/samsung/exynos5420/clock_init.c
@@ -15,7 +15,6 @@
 
 /* Clock setup for SMDK5420 board based on EXYNOS5 */
 
-#include <console/console.h>
 #include <delay.h>
 #include <soc/clk.h>
 #include <soc/cpu.h>
diff --git a/src/soc/samsung/exynos5420/dmc_common.c b/src/soc/samsung/exynos5420/dmc_common.c
index ede7b042f2..a933ef996c 100644
--- a/src/soc/samsung/exynos5420/dmc_common.c
+++ b/src/soc/samsung/exynos5420/dmc_common.c
@@ -17,7 +17,6 @@
  */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <delay.h>
 #include <soc/clk.h>
 #include <soc/dmc.h>
diff --git a/src/soc/samsung/exynos5420/dmc_init_ddr3.c b/src/soc/samsung/exynos5420/dmc_init_ddr3.c
index e66049e185..c81982377e 100644
--- a/src/soc/samsung/exynos5420/dmc_init_ddr3.c
+++ b/src/soc/samsung/exynos5420/dmc_init_ddr3.c
@@ -17,7 +17,6 @@
  */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <delay.h>
 #include <soc/clk.h>
 #include <soc/dmc.h>
diff --git a/src/soc/samsung/exynos5420/pinmux.c b/src/soc/samsung/exynos5420/pinmux.c
index c063e20d77..d8c13780a4 100644
--- a/src/soc/samsung/exynos5420/pinmux.c
+++ b/src/soc/samsung/exynos5420/pinmux.c
@@ -14,7 +14,6 @@
  */
 
 #include <assert.h>
-#include <console/console.h>
 #include <soc/gpio.h>
 #include <soc/pinmux.h>
 #include <stdlib.h>
diff --git a/src/soc/samsung/exynos5420/power.c b/src/soc/samsung/exynos5420/power.c
index a168355f14..7e8e146b63 100644
--- a/src/soc/samsung/exynos5420/power.c
+++ b/src/soc/samsung/exynos5420/power.c
@@ -16,7 +16,6 @@
 /* Power setup code for EXYNOS5 */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <halt.h>
 #include <soc/dmc.h>
 #include <soc/power.h>
diff --git a/src/soc/samsung/exynos5420/wakeup.c b/src/soc/samsung/exynos5420/wakeup.c
index dd0c7878f2..2bcc6b4b5e 100644
--- a/src/soc/samsung/exynos5420/wakeup.c
+++ b/src/soc/samsung/exynos5420/wakeup.c
@@ -14,7 +14,6 @@
  */
 
 #include <arch/cache.h>
-#include <console/console.h>
 #include <soc/power.h>
 #include <soc/wakeup.h>
 
diff --git a/src/southbridge/amd/agesa/hudson/hda.c b/src/southbridge/amd/agesa/hudson/hda.c
index 360ca89ada..2f590c76bd 100644
--- a/src/southbridge/amd/agesa/hudson/hda.c
+++ b/src/southbridge/amd/agesa/hudson/hda.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 <device/pci_ids.h>
diff --git a/src/southbridge/amd/agesa/hudson/ide.c b/src/southbridge/amd/agesa/hudson/ide.c
index acafb731c7..66bb89b91f 100644
--- a/src/southbridge/amd/agesa/hudson/ide.c
+++ b/src/southbridge/amd/agesa/hudson/ide.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 <device/pci_ids.h>
diff --git a/src/southbridge/amd/agesa/hudson/pci.c b/src/southbridge/amd/agesa/hudson/pci.c
index 516a63b42d..31371ce250 100644
--- a/src/southbridge/amd/agesa/hudson/pci.c
+++ b/src/southbridge/amd/agesa/hudson/pci.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/southbridge/amd/agesa/hudson/pcie.c b/src/southbridge/amd/agesa/hudson/pcie.c
index 8fd3fdd70c..c765fb6c77 100644
--- a/src/southbridge/amd/agesa/hudson/pcie.c
+++ b/src/southbridge/amd/agesa/hudson/pcie.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 <device/pci_ids.h>
diff --git a/src/southbridge/amd/agesa/hudson/sata.c b/src/southbridge/amd/agesa/hudson/sata.c
index 8045279d0f..7762455c9a 100644
--- a/src/southbridge/amd/agesa/hudson/sata.c
+++ b/src/southbridge/amd/agesa/hudson/sata.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <delay.h>
 #include <device/pci.h>
diff --git a/src/southbridge/amd/agesa/hudson/sm.c b/src/southbridge/amd/agesa/hudson/sm.c
index 30fcd3772d..08ec59fa45 100644
--- a/src/southbridge/amd/agesa/hudson/sm.c
+++ b/src/southbridge/amd/agesa/hudson/sm.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 <device/pci_ids.h>
diff --git a/src/southbridge/amd/agesa/hudson/smihandler.c b/src/southbridge/amd/agesa/hudson/smihandler.c
index 5f97f57146..5ef9d6a89c 100644
--- a/src/southbridge/amd/agesa/hudson/smihandler.c
+++ b/src/southbridge/amd/agesa/hudson/smihandler.c
@@ -21,7 +21,6 @@
 #include "hudson.h"
 #include "smi.h"
 
-#include <console/console.h>
 #include <cpu/x86/smm.h>
 #include <delay.h>
 
diff --git a/src/southbridge/amd/agesa/hudson/usb.c b/src/southbridge/amd/agesa/hudson/usb.c
index 5b64ddff3e..b17537b2cd 100644
--- a/src/southbridge/amd/agesa/hudson/usb.c
+++ b/src/southbridge/amd/agesa/hudson/usb.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 <device/pci_ids.h>
diff --git a/src/southbridge/amd/amd8111/ac97.c b/src/southbridge/amd/amd8111/ac97.c
index 9e458ea83f..c952cce73b 100644
--- a/src/southbridge/amd/amd8111/ac97.c
+++ b/src/southbridge/amd/amd8111/ac97.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 <device/pci_ids.h>
diff --git a/src/southbridge/amd/amd8111/amd8111.c b/src/southbridge/amd/amd8111/amd8111.c
index f57952ede0..041a2994e1 100644
--- a/src/southbridge/amd/amd8111/amd8111.c
+++ b/src/southbridge/amd/amd8111/amd8111.c
@@ -11,7 +11,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/southbridge/amd/amd8111/pci.c b/src/southbridge/amd/amd8111/pci.c
index 695b6e143b..ae47716627 100644
--- a/src/southbridge/amd/amd8111/pci.c
+++ b/src/southbridge/amd/amd8111/pci.c
@@ -11,7 +11,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/southbridge/amd/amd8111/smbus.c b/src/southbridge/amd/amd8111/smbus.c
index 375234ee85..17782e2b62 100644
--- a/src/southbridge/amd/amd8111/smbus.c
+++ b/src/southbridge/amd/amd8111/smbus.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 <device/pci_ids.h>
diff --git a/src/southbridge/amd/amd8111/usb.c b/src/southbridge/amd/amd8111/usb.c
index 0b5a038611..5c29d7cc8b 100644
--- a/src/southbridge/amd/amd8111/usb.c
+++ b/src/southbridge/amd/amd8111/usb.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 <device/pci_ids.h>
diff --git a/src/southbridge/amd/cimx/cimx_util.c b/src/southbridge/amd/cimx/cimx_util.c
index 8ac3898941..1db04d8311 100644
--- a/src/southbridge/amd/cimx/cimx_util.c
+++ b/src/southbridge/amd/cimx/cimx_util.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/pci.h>
 #include <arch/io.h>
 #include "cimx_util.h"
diff --git a/src/southbridge/amd/cimx/sb800/cfg.c b/src/southbridge/amd/cimx/sb800/cfg.c
index c8f90fbf6e..f2cd9a9021 100644
--- a/src/southbridge/amd/cimx/sb800/cfg.c
+++ b/src/southbridge/amd/cimx/sb800/cfg.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include "SBPLATFORM.h"
 #include "cfg.h"
 #include <OEM.h>
diff --git a/src/southbridge/amd/cs5536/pirq.c b/src/southbridge/amd/cs5536/pirq.c
index 447d285f4b..75bb16853a 100644
--- a/src/southbridge/amd/cs5536/pirq.c
+++ b/src/southbridge/amd/cs5536/pirq.c
@@ -15,7 +15,6 @@
  */
 
 #include <arch/pirq_routing.h>
-#include <console/console.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
 
diff --git a/src/southbridge/amd/pi/hudson/hda.c b/src/southbridge/amd/pi/hudson/hda.c
index 79932ee53a..879e636418 100644
--- a/src/southbridge/amd/pi/hudson/hda.c
+++ b/src/southbridge/amd/pi/hudson/hda.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 <device/pci_ids.h>
diff --git a/src/southbridge/amd/pi/hudson/ide.c b/src/southbridge/amd/pi/hudson/ide.c
index acafb731c7..66bb89b91f 100644
--- a/src/southbridge/amd/pi/hudson/ide.c
+++ b/src/southbridge/amd/pi/hudson/ide.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 <device/pci_ids.h>
diff --git a/src/southbridge/amd/pi/hudson/pci.c b/src/southbridge/amd/pi/hudson/pci.c
index 9fcfa2c0d1..35cd2a95fc 100644
--- a/src/southbridge/amd/pi/hudson/pci.c
+++ b/src/southbridge/amd/pi/hudson/pci.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/southbridge/amd/pi/hudson/pcie.c b/src/southbridge/amd/pi/hudson/pcie.c
index 8fd3fdd70c..c765fb6c77 100644
--- a/src/southbridge/amd/pi/hudson/pcie.c
+++ b/src/southbridge/amd/pi/hudson/pcie.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 <device/pci_ids.h>
diff --git a/src/southbridge/amd/pi/hudson/sata.c b/src/southbridge/amd/pi/hudson/sata.c
index 11f0977296..d4279b2bbb 100644
--- a/src/southbridge/amd/pi/hudson/sata.c
+++ b/src/southbridge/amd/pi/hudson/sata.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <delay.h>
 #include <device/pci.h>
diff --git a/src/southbridge/amd/pi/hudson/sm.c b/src/southbridge/amd/pi/hudson/sm.c
index b3691555d2..3625f8a9c4 100644
--- a/src/southbridge/amd/pi/hudson/sm.c
+++ b/src/southbridge/amd/pi/hudson/sm.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 <device/pci_ids.h>
diff --git a/src/southbridge/amd/pi/hudson/smihandler.c b/src/southbridge/amd/pi/hudson/smihandler.c
index 5f97f57146..5ef9d6a89c 100644
--- a/src/southbridge/amd/pi/hudson/smihandler.c
+++ b/src/southbridge/amd/pi/hudson/smihandler.c
@@ -21,7 +21,6 @@
 #include "hudson.h"
 #include "smi.h"
 
-#include <console/console.h>
 #include <cpu/x86/smm.h>
 #include <delay.h>
 
diff --git a/src/southbridge/amd/pi/hudson/usb.c b/src/southbridge/amd/pi/hudson/usb.c
index 0d9102a97a..9bdc22de18 100644
--- a/src/southbridge/amd/pi/hudson/usb.c
+++ b/src/southbridge/amd/pi/hudson/usb.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 <device/pci_ids.h>
diff --git a/src/southbridge/amd/sb700/ide.c b/src/southbridge/amd/sb700/ide.c
index 5a5532dfc5..d08f2f1cb2 100644
--- a/src/southbridge/amd/sb700/ide.c
+++ b/src/southbridge/amd/sb700/ide.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/southbridge/amd/sb700/pci.c b/src/southbridge/amd/sb700/pci.c
index 80e94cb6c1..b3c71569c7 100644
--- a/src/southbridge/amd/sb700/pci.c
+++ b/src/southbridge/amd/sb700/pci.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 <device/pci_ids.h>
diff --git a/src/southbridge/amd/sb800/ide.c b/src/southbridge/amd/sb800/ide.c
index acb2c830f7..fddb48c8d2 100644
--- a/src/southbridge/amd/sb800/ide.c
+++ b/src/southbridge/amd/sb800/ide.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 <device/pci_ids.h>
diff --git a/src/southbridge/amd/sb800/pci.c b/src/southbridge/amd/sb800/pci.c
index 8184871976..025d0a3643 100644
--- a/src/southbridge/amd/sb800/pci.c
+++ b/src/southbridge/amd/sb800/pci.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 <device/pci_ids.h>
diff --git a/src/southbridge/broadcom/bcm5785/bcm5785.c b/src/southbridge/broadcom/bcm5785/bcm5785.c
index 6375805b9a..16f45bb671 100644
--- a/src/southbridge/broadcom/bcm5785/bcm5785.c
+++ b/src/southbridge/broadcom/bcm5785/bcm5785.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/southbridge/broadcom/bcm5785/ide.c b/src/southbridge/broadcom/bcm5785/ide.c
index 9dd06042eb..c96fc613fe 100644
--- a/src/southbridge/broadcom/bcm5785/ide.c
+++ b/src/southbridge/broadcom/bcm5785/ide.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/southbridge/broadcom/bcm5785/sb_pci_main.c b/src/southbridge/broadcom/bcm5785/sb_pci_main.c
index 5d98e7b4ee..6ef335bbf6 100644
--- a/src/southbridge/broadcom/bcm5785/sb_pci_main.c
+++ b/src/southbridge/broadcom/bcm5785/sb_pci_main.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pnp.h>
diff --git a/src/southbridge/broadcom/bcm5785/usb.c b/src/southbridge/broadcom/bcm5785/usb.c
index ab8e588f84..4929250067 100644
--- a/src/southbridge/broadcom/bcm5785/usb.c
+++ b/src/southbridge/broadcom/bcm5785/usb.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/southbridge/intel/bd82x6x/early_usb_mrc.c b/src/southbridge/intel/bd82x6x/early_usb_mrc.c
index 4b9061e800..8006d95fd9 100644
--- a/src/southbridge/intel/bd82x6x/early_usb_mrc.c
+++ b/src/southbridge/intel/bd82x6x/early_usb_mrc.c
@@ -15,7 +15,6 @@
  */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <device/pci_ids.h>
 #include <device/pci_def.h>
 #include "pch.h"
diff --git a/src/southbridge/intel/bd82x6x/elog.c b/src/southbridge/intel/bd82x6x/elog.c
index 814ff80598..3299d4b9d1 100644
--- a/src/southbridge/intel/bd82x6x/elog.c
+++ b/src/southbridge/intel/bd82x6x/elog.c
@@ -15,7 +15,6 @@
 
 #include <arch/io.h>
 #include <arch/acpi.h>
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
diff --git a/src/southbridge/intel/bd82x6x/smbus.c b/src/southbridge/intel/bd82x6x/smbus.c
index 1754734f03..908380626c 100644
--- a/src/southbridge/intel/bd82x6x/smbus.c
+++ b/src/southbridge/intel/bd82x6x/smbus.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <device/path.h>
 #include <device/smbus.h>
diff --git a/src/southbridge/intel/common/usb_debug.c b/src/southbridge/intel/common/usb_debug.c
index d87e018d85..31f84970d7 100644
--- a/src/southbridge/intel/common/usb_debug.c
+++ b/src/southbridge/intel/common/usb_debug.c
@@ -18,7 +18,6 @@
 
 #include <stdint.h>
 #include <arch/io.h>
-#include <console/console.h>
 #include <device/pci_ehci.h>
 #include <device/pci_def.h>
 
diff --git a/src/southbridge/intel/fsp_bd82x6x/early_usb.c b/src/southbridge/intel/fsp_bd82x6x/early_usb.c
index 4b9061e800..8006d95fd9 100644
--- a/src/southbridge/intel/fsp_bd82x6x/early_usb.c
+++ b/src/southbridge/intel/fsp_bd82x6x/early_usb.c
@@ -15,7 +15,6 @@
  */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <device/pci_ids.h>
 #include <device/pci_def.h>
 #include "pch.h"
diff --git a/src/southbridge/intel/fsp_bd82x6x/elog.c b/src/southbridge/intel/fsp_bd82x6x/elog.c
index 814ff80598..3299d4b9d1 100644
--- a/src/southbridge/intel/fsp_bd82x6x/elog.c
+++ b/src/southbridge/intel/fsp_bd82x6x/elog.c
@@ -15,7 +15,6 @@
 
 #include <arch/io.h>
 #include <arch/acpi.h>
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
diff --git a/src/southbridge/intel/fsp_i89xx/early_usb.c b/src/southbridge/intel/fsp_i89xx/early_usb.c
index 29ab9811c2..9eabd2448d 100644
--- a/src/southbridge/intel/fsp_i89xx/early_usb.c
+++ b/src/southbridge/intel/fsp_i89xx/early_usb.c
@@ -15,7 +15,6 @@
  */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <device/pci_ids.h>
 #include <device/pci_def.h>
 #include "pch.h"
diff --git a/src/southbridge/intel/fsp_i89xx/elog.c b/src/southbridge/intel/fsp_i89xx/elog.c
index 814ff80598..3299d4b9d1 100644
--- a/src/southbridge/intel/fsp_i89xx/elog.c
+++ b/src/southbridge/intel/fsp_i89xx/elog.c
@@ -15,7 +15,6 @@
 
 #include <arch/io.h>
 #include <arch/acpi.h>
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
diff --git a/src/southbridge/intel/fsp_rangeley/early_usb.c b/src/southbridge/intel/fsp_rangeley/early_usb.c
index dfd8cc245d..3bb8dab405 100644
--- a/src/southbridge/intel/fsp_rangeley/early_usb.c
+++ b/src/southbridge/intel/fsp_rangeley/early_usb.c
@@ -15,7 +15,6 @@
  */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <device/pci_ids.h>
 #include <device/pci_def.h>
 #include "soc.h"
diff --git a/src/southbridge/intel/fsp_rangeley/smbus.c b/src/southbridge/intel/fsp_rangeley/smbus.c
index 0ffe45e990..907f39270d 100644
--- a/src/southbridge/intel/fsp_rangeley/smbus.c
+++ b/src/southbridge/intel/fsp_rangeley/smbus.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <device/path.h>
 #include <device/smbus.h>
diff --git a/src/southbridge/intel/i82371eb/early_pm.c b/src/southbridge/intel/i82371eb/early_pm.c
index 1794393135..8ae7669f33 100644
--- a/src/southbridge/intel/i82371eb/early_pm.c
+++ b/src/southbridge/intel/i82371eb/early_pm.c
@@ -18,7 +18,6 @@
 #include <arch/io.h>
 #include <device/pci_def.h>
 #include <device/pci_ids.h>
-#include <console/console.h>
 #include "i82371eb.h"
 
 void enable_pm(void)
diff --git a/src/southbridge/intel/i82371eb/early_smbus.c b/src/southbridge/intel/i82371eb/early_smbus.c
index 89ed9c8e57..de16717416 100644
--- a/src/southbridge/intel/i82371eb/early_smbus.c
+++ b/src/southbridge/intel/i82371eb/early_smbus.c
@@ -16,7 +16,6 @@
 
 #include <stdint.h>
 #include <arch/io.h>
-#include <console/console.h>
 #include <device/pci_ids.h>
 #include <device/pci_def.h>
 #include <southbridge/intel/common/smbus.h>
diff --git a/src/southbridge/intel/i82371eb/usb.c b/src/southbridge/intel/i82371eb/usb.c
index 3bc237a27b..80b19a187e 100644
--- a/src/southbridge/intel/i82371eb/usb.c
+++ b/src/southbridge/intel/i82371eb/usb.c
@@ -15,7 +15,6 @@
  */
 
 #include <stdint.h>
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/southbridge/intel/i82801dx/i82801dx.c b/src/southbridge/intel/i82801dx/i82801dx.c
index cc70fdd9e8..fc38207c49 100644
--- a/src/southbridge/intel/i82801dx/i82801dx.c
+++ b/src/southbridge/intel/i82801dx/i82801dx.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/southbridge/intel/i82801dx/pci.c b/src/southbridge/intel/i82801dx/pci.c
index c062c85703..a48eed06fa 100644
--- a/src/southbridge/intel/i82801dx/pci.c
+++ b/src/southbridge/intel/i82801dx/pci.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 <device/pci_ids.h>
diff --git a/src/southbridge/intel/i82801ix/smbus.c b/src/southbridge/intel/i82801ix/smbus.c
index dc45510d01..303aae64f2 100644
--- a/src/southbridge/intel/i82801ix/smbus.c
+++ b/src/southbridge/intel/i82801ix/smbus.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <device/path.h>
 #include <device/smbus.h>
diff --git a/src/southbridge/intel/i82801jx/smbus.c b/src/southbridge/intel/i82801jx/smbus.c
index d3f0711904..1c479f7c15 100644
--- a/src/southbridge/intel/i82801jx/smbus.c
+++ b/src/southbridge/intel/i82801jx/smbus.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <device/path.h>
 #include <device/smbus.h>
diff --git a/src/southbridge/intel/i82870/pcibridge.c b/src/southbridge/intel/i82870/pcibridge.c
index 9b331be6d4..e6ef6b2e03 100644
--- a/src/southbridge/intel/i82870/pcibridge.c
+++ b/src/southbridge/intel/i82870/pcibridge.c
@@ -11,7 +11,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/southbridge/intel/ibexpeak/madt.c b/src/southbridge/intel/ibexpeak/madt.c
index d776c9fcb1..e02cd883dc 100644
--- a/src/southbridge/intel/ibexpeak/madt.c
+++ b/src/southbridge/intel/ibexpeak/madt.c
@@ -16,7 +16,6 @@
  */
 
 #include <string.h>
-#include <console/console.h>
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <arch/acpi.h>
diff --git a/src/southbridge/intel/ibexpeak/smbus.c b/src/southbridge/intel/ibexpeak/smbus.c
index 53aecef2d8..53ba9e2ce3 100644
--- a/src/southbridge/intel/ibexpeak/smbus.c
+++ b/src/southbridge/intel/ibexpeak/smbus.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <device/path.h>
 #include <device/smbus.h>
diff --git a/src/southbridge/intel/lynxpoint/early_usb.c b/src/southbridge/intel/lynxpoint/early_usb.c
index fbc7b37c0c..60ab09dc36 100644
--- a/src/southbridge/intel/lynxpoint/early_usb.c
+++ b/src/southbridge/intel/lynxpoint/early_usb.c
@@ -15,7 +15,6 @@
  */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <device/pci_ids.h>
 #include <device/pci_def.h>
 #include "pch.h"
diff --git a/src/southbridge/intel/lynxpoint/elog.c b/src/southbridge/intel/lynxpoint/elog.c
index 55559315c6..c575db0693 100644
--- a/src/southbridge/intel/lynxpoint/elog.c
+++ b/src/southbridge/intel/lynxpoint/elog.c
@@ -15,7 +15,6 @@
 
 #include <arch/io.h>
 #include <arch/acpi.h>
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
diff --git a/src/southbridge/intel/lynxpoint/rcba.c b/src/southbridge/intel/lynxpoint/rcba.c
index 24b745d04d..6faa982ac2 100644
--- a/src/southbridge/intel/lynxpoint/rcba.c
+++ b/src/southbridge/intel/lynxpoint/rcba.c
@@ -13,8 +13,6 @@
  * GNU General Public License for more details.
  */
 
-
-#include <console/console.h>
 #include <device/pci_def.h>
 #include <arch/io.h>
 #include <device/device.h>
diff --git a/src/southbridge/intel/lynxpoint/usb_xhci.c b/src/southbridge/intel/lynxpoint/usb_xhci.c
index 41d99f6842..af0e56f052 100644
--- a/src/southbridge/intel/lynxpoint/usb_xhci.c
+++ b/src/southbridge/intel/lynxpoint/usb_xhci.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <delay.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/southbridge/nvidia/ck804/ac97.c b/src/southbridge/nvidia/ck804/ac97.c
index 62f1090bea..f7c6f42e59 100644
--- a/src/southbridge/nvidia/ck804/ac97.c
+++ b/src/southbridge/nvidia/ck804/ac97.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/southbridge/nvidia/ck804/ck804.c b/src/southbridge/nvidia/ck804/ck804.c
index 5fd9084a47..a60331c5a1 100644
--- a/src/southbridge/nvidia/ck804/ck804.c
+++ b/src/southbridge/nvidia/ck804/ck804.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <arch/io.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/southbridge/nvidia/ck804/nic.c b/src/southbridge/nvidia/ck804/nic.c
index b536915aa6..8ea1040c87 100644
--- a/src/southbridge/nvidia/ck804/nic.c
+++ b/src/southbridge/nvidia/ck804/nic.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <device/smbus.h>
 #include <device/pci.h>
diff --git a/src/southbridge/nvidia/ck804/pcie.c b/src/southbridge/nvidia/ck804/pcie.c
index a2782b5156..7bd8324d8c 100644
--- a/src/southbridge/nvidia/ck804/pcie.c
+++ b/src/southbridge/nvidia/ck804/pcie.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/southbridge/nvidia/ck804/smbus.c b/src/southbridge/nvidia/ck804/smbus.c
index 4a4ac2f6e5..a1e50884c3 100644
--- a/src/southbridge/nvidia/ck804/smbus.c
+++ b/src/southbridge/nvidia/ck804/smbus.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/southbridge/nvidia/ck804/usb.c b/src/southbridge/nvidia/ck804/usb.c
index 8888c6dd0c..f7c315af91 100644
--- a/src/southbridge/nvidia/ck804/usb.c
+++ b/src/southbridge/nvidia/ck804/usb.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/southbridge/nvidia/ck804/usb2.c b/src/southbridge/nvidia/ck804/usb2.c
index 20984d9450..47643aefbf 100644
--- a/src/southbridge/nvidia/ck804/usb2.c
+++ b/src/southbridge/nvidia/ck804/usb2.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/southbridge/nvidia/mcp55/early_ctrl.c b/src/southbridge/nvidia/mcp55/early_ctrl.c
index c14224963e..092280b4af 100644
--- a/src/southbridge/nvidia/mcp55/early_ctrl.c
+++ b/src/southbridge/nvidia/mcp55/early_ctrl.c
@@ -16,7 +16,6 @@
  */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <reset.h>
 #include <northbridge/amd/amdfam10/amdfam10.h>
 #include <southbridge/amd/common/reset.h>
diff --git a/src/southbridge/nvidia/mcp55/ht.c b/src/southbridge/nvidia/mcp55/ht.c
index 2d60e8f9c4..0250900695 100644
--- a/src/southbridge/nvidia/mcp55/ht.c
+++ b/src/southbridge/nvidia/mcp55/ht.c
@@ -17,7 +17,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/southbridge/nvidia/mcp55/mcp55.c b/src/southbridge/nvidia/mcp55/mcp55.c
index 629fbac563..551da8937c 100644
--- a/src/southbridge/nvidia/mcp55/mcp55.c
+++ b/src/southbridge/nvidia/mcp55/mcp55.c
@@ -17,7 +17,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <arch/io.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/southbridge/nvidia/mcp55/pcie.c b/src/southbridge/nvidia/mcp55/pcie.c
index 72fdd93cfa..0a352443b4 100644
--- a/src/southbridge/nvidia/mcp55/pcie.c
+++ b/src/southbridge/nvidia/mcp55/pcie.c
@@ -17,7 +17,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/southbridge/nvidia/mcp55/smbus.c b/src/southbridge/nvidia/mcp55/smbus.c
index 244759dfa3..51a71805f3 100644
--- a/src/southbridge/nvidia/mcp55/smbus.c
+++ b/src/southbridge/nvidia/mcp55/smbus.c
@@ -17,7 +17,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/southbridge/nvidia/mcp55/usb.c b/src/southbridge/nvidia/mcp55/usb.c
index c9cbe9e7a1..18e6a65f48 100644
--- a/src/southbridge/nvidia/mcp55/usb.c
+++ b/src/southbridge/nvidia/mcp55/usb.c
@@ -17,7 +17,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/southbridge/nvidia/mcp55/usb2.c b/src/southbridge/nvidia/mcp55/usb2.c
index c697d8af42..590dedf04a 100644
--- a/src/southbridge/nvidia/mcp55/usb2.c
+++ b/src/southbridge/nvidia/mcp55/usb2.c
@@ -17,7 +17,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/southbridge/via/common/early_smbus_print_error.c b/src/southbridge/via/common/early_smbus_print_error.c
index 1aafcf31d3..8a59193a78 100644
--- a/src/southbridge/via/common/early_smbus_print_error.c
+++ b/src/southbridge/via/common/early_smbus_print_error.c
@@ -15,7 +15,6 @@
  */
 
 #include "via_early_smbus.h"
-#include <console/console.h>
 
 /**
  * \brief Print an error, should it occur. If no error, just exit.
diff --git a/src/southbridge/via/common/early_smbus_wait_until_ready.c b/src/southbridge/via/common/early_smbus_wait_until_ready.c
index 121803ea27..879bc23dd3 100644
--- a/src/southbridge/via/common/early_smbus_wait_until_ready.c
+++ b/src/southbridge/via/common/early_smbus_wait_until_ready.c
@@ -15,7 +15,6 @@
  */
 
 #include "via_early_smbus.h"
-#include <console/console.h>
 
 /**
  * \brief Wait for the SMBus to become ready to process a new transaction.
diff --git a/src/superio/fintek/f71805f/superio.c b/src/superio/fintek/f71805f/superio.c
index d702eec508..69d3a5c160 100644
--- a/src/superio/fintek/f71805f/superio.c
+++ b/src/superio/fintek/f71805f/superio.c
@@ -18,7 +18,6 @@
 #include <device/device.h>
 #include <device/pnp.h>
 #include <superio/conf_mode.h>
-#include <console/console.h>
 #include <stdlib.h>
 #include "f71805f.h"
 
diff --git a/src/superio/fintek/f71808a/superio.c b/src/superio/fintek/f71808a/superio.c
index e8fcd958ac..061986d88d 100644
--- a/src/superio/fintek/f71808a/superio.c
+++ b/src/superio/fintek/f71808a/superio.c
@@ -19,7 +19,6 @@
 #include <device/device.h>
 #include <device/pnp.h>
 #include <superio/conf_mode.h>
-#include <console/console.h>
 #include <stdlib.h>
 #include <pc80/keyboard.h>
 
diff --git a/src/superio/fintek/f71859/superio.c b/src/superio/fintek/f71859/superio.c
index 976cb87f8f..1a724f6abb 100644
--- a/src/superio/fintek/f71859/superio.c
+++ b/src/superio/fintek/f71859/superio.c
@@ -19,7 +19,6 @@
 #include <device/device.h>
 #include <device/pnp.h>
 #include <superio/conf_mode.h>
-#include <console/console.h>
 #include <stdlib.h>
 #include "f71859.h"
 
diff --git a/src/superio/fintek/f71863fg/superio.c b/src/superio/fintek/f71863fg/superio.c
index bfa0aee126..a19b1d053c 100644
--- a/src/superio/fintek/f71863fg/superio.c
+++ b/src/superio/fintek/f71863fg/superio.c
@@ -18,7 +18,6 @@
 #include <device/device.h>
 #include <device/pnp.h>
 #include <superio/conf_mode.h>
-#include <console/console.h>
 #include <stdlib.h>
 #include <pc80/keyboard.h>
 #include "f71863fg.h"
diff --git a/src/superio/fintek/f71869ad/superio.c b/src/superio/fintek/f71869ad/superio.c
index 7fc4db41c2..5625a354a2 100644
--- a/src/superio/fintek/f71869ad/superio.c
+++ b/src/superio/fintek/f71869ad/superio.c
@@ -18,7 +18,6 @@
 #include <device/device.h>
 #include <device/pnp.h>
 #include <superio/conf_mode.h>
-#include <console/console.h>
 #include <stdlib.h>
 #include <pc80/keyboard.h>
 
diff --git a/src/superio/fintek/f71872/superio.c b/src/superio/fintek/f71872/superio.c
index f26a0c6464..47ecf3d290 100644
--- a/src/superio/fintek/f71872/superio.c
+++ b/src/superio/fintek/f71872/superio.c
@@ -18,7 +18,6 @@
 #include <device/device.h>
 #include <device/pnp.h>
 #include <superio/conf_mode.h>
-#include <console/console.h>
 #include <stdlib.h>
 #include <pc80/keyboard.h>
 #include "f71872.h"
diff --git a/src/superio/fintek/f81865f/superio.c b/src/superio/fintek/f81865f/superio.c
index 08cbd90165..58a3aa28bd 100644
--- a/src/superio/fintek/f81865f/superio.c
+++ b/src/superio/fintek/f81865f/superio.c
@@ -18,7 +18,6 @@
 #include <device/device.h>
 #include <device/pnp.h>
 #include <superio/conf_mode.h>
-#include <console/console.h>
 #include <stdlib.h>
 #include <pc80/keyboard.h>
 #include "f81865f.h"
diff --git a/src/superio/fintek/f81866d/superio.c b/src/superio/fintek/f81866d/superio.c
index 7678383bbd..edd13a3564 100644
--- a/src/superio/fintek/f81866d/superio.c
+++ b/src/superio/fintek/f81866d/superio.c
@@ -20,7 +20,6 @@
 #include <device/device.h>
 #include <device/pnp.h>
 #include <superio/conf_mode.h>
-#include <console/console.h>
 #include <stdlib.h>
 #include <pc80/keyboard.h>
 #include "f81866d.h"
diff --git a/src/superio/ite/it8728f/superio.c b/src/superio/ite/it8728f/superio.c
index 912a4c3ce6..f806d358c5 100644
--- a/src/superio/ite/it8728f/superio.c
+++ b/src/superio/ite/it8728f/superio.c
@@ -18,7 +18,6 @@
 #include <device/device.h>
 #include <device/pnp.h>
 #include <superio/conf_mode.h>
-#include <console/console.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include <superio/ite/common/env_ctrl.h>
diff --git a/src/superio/nsc/pc87360/superio.c b/src/superio/nsc/pc87360/superio.c
index 85ccdea888..5b590ea351 100644
--- a/src/superio/nsc/pc87360/superio.c
+++ b/src/superio/nsc/pc87360/superio.c
@@ -18,7 +18,6 @@
 #include <arch/io.h>
 #include <device/device.h>
 #include <device/pnp.h>
-#include <console/console.h>
 #include <string.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
diff --git a/src/superio/nsc/pc87366/superio.c b/src/superio/nsc/pc87366/superio.c
index 6883e81945..feaed3b925 100644
--- a/src/superio/nsc/pc87366/superio.c
+++ b/src/superio/nsc/pc87366/superio.c
@@ -18,7 +18,6 @@
 #include <arch/io.h>
 #include <device/device.h>
 #include <device/pnp.h>
-#include <console/console.h>
 #include <string.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
diff --git a/src/superio/nsc/pc87382/superio.c b/src/superio/nsc/pc87382/superio.c
index ffcce65dea..a5d9a8bdcf 100644
--- a/src/superio/nsc/pc87382/superio.c
+++ b/src/superio/nsc/pc87382/superio.c
@@ -17,7 +17,6 @@
 #include <arch/io.h>
 #include <device/device.h>
 #include <device/pnp.h>
-#include <console/console.h>
 #include <string.h>
 #include <stdlib.h>
 #include "pc87382.h"
diff --git a/src/superio/nsc/pc87384/superio.c b/src/superio/nsc/pc87384/superio.c
index fd6c1940ac..d2a518a2a3 100644
--- a/src/superio/nsc/pc87384/superio.c
+++ b/src/superio/nsc/pc87384/superio.c
@@ -17,7 +17,6 @@
 #include <arch/io.h>
 #include <device/device.h>
 #include <device/pnp.h>
-#include <console/console.h>
 #include <string.h>
 #include <stdlib.h>
 #include "pc87384.h"
diff --git a/src/superio/nsc/pc87392/superio.c b/src/superio/nsc/pc87392/superio.c
index bf02e19eb1..0a46f4ae07 100644
--- a/src/superio/nsc/pc87392/superio.c
+++ b/src/superio/nsc/pc87392/superio.c
@@ -17,7 +17,6 @@
 #include <arch/io.h>
 #include <device/device.h>
 #include <device/pnp.h>
-#include <console/console.h>
 #include <string.h>
 #include <stdlib.h>
 #include "pc87392.h"
diff --git a/src/superio/nsc/pc87417/superio.c b/src/superio/nsc/pc87417/superio.c
index 73b7655712..c8616f665d 100644
--- a/src/superio/nsc/pc87417/superio.c
+++ b/src/superio/nsc/pc87417/superio.c
@@ -19,7 +19,6 @@
 #include <arch/io.h>
 #include <device/device.h>
 #include <device/pnp.h>
-#include <console/console.h>
 #include <string.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
diff --git a/src/superio/nsc/pc97317/superio.c b/src/superio/nsc/pc97317/superio.c
index c840ced324..3e664d1f1f 100644
--- a/src/superio/nsc/pc97317/superio.c
+++ b/src/superio/nsc/pc97317/superio.c
@@ -15,7 +15,6 @@
  */
 
 #include <arch/io.h>
-#include <console/console.h>
 #include <device/device.h>
 #include <device/pnp.h>
 #include <stdlib.h>
diff --git a/src/superio/nuvoton/wpcm450/superio.c b/src/superio/nuvoton/wpcm450/superio.c
index 05078ebd96..3a0cc5de80 100644
--- a/src/superio/nuvoton/wpcm450/superio.c
+++ b/src/superio/nuvoton/wpcm450/superio.c
@@ -17,7 +17,6 @@
 #include <arch/io.h>
 #include <device/device.h>
 #include <device/pnp.h>
-#include <console/console.h>
 #include <string.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
diff --git a/src/superio/smsc/dme1737/superio.c b/src/superio/smsc/dme1737/superio.c
index 42b9284d87..455fd5ec35 100644
--- a/src/superio/smsc/dme1737/superio.c
+++ b/src/superio/smsc/dme1737/superio.c
@@ -20,7 +20,6 @@
 #include <device/device.h>
 #include <device/pnp.h>
 #include <superio/conf_mode.h>
-#include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
 #include <pc80/keyboard.h>
diff --git a/src/superio/smsc/kbc1100/superio.c b/src/superio/smsc/kbc1100/superio.c
index bca4067e22..887dba107c 100644
--- a/src/superio/smsc/kbc1100/superio.c
+++ b/src/superio/smsc/kbc1100/superio.c
@@ -19,7 +19,6 @@
 #include <device/device.h>
 #include <device/pnp.h>
 #include <superio/conf_mode.h>
-#include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
 #include <pc80/keyboard.h>
diff --git a/src/superio/smsc/lpc47b272/superio.c b/src/superio/smsc/lpc47b272/superio.c
index ded4bb00e1..3f8bc2ba86 100644
--- a/src/superio/smsc/lpc47b272/superio.c
+++ b/src/superio/smsc/lpc47b272/superio.c
@@ -23,7 +23,6 @@
 #include <device/device.h>
 #include <device/pnp.h>
 #include <superio/conf_mode.h>
-#include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
 #include <pc80/keyboard.h>
diff --git a/src/superio/smsc/lpc47m10x/superio.c b/src/superio/smsc/lpc47m10x/superio.c
index 18618d337b..e71b78f1dc 100644
--- a/src/superio/smsc/lpc47m10x/superio.c
+++ b/src/superio/smsc/lpc47m10x/superio.c
@@ -22,7 +22,6 @@
 #include <device/device.h>
 #include <device/pnp.h>
 #include <superio/conf_mode.h>
-#include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
 #include <pc80/keyboard.h>
diff --git a/src/superio/smsc/lpc47m15x/superio.c b/src/superio/smsc/lpc47m15x/superio.c
index 41339c1b7b..23c13115a7 100644
--- a/src/superio/smsc/lpc47m15x/superio.c
+++ b/src/superio/smsc/lpc47m15x/superio.c
@@ -19,7 +19,6 @@
 #include <device/device.h>
 #include <device/pnp.h>
 #include <superio/conf_mode.h>
-#include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
 #include <pc80/keyboard.h>
diff --git a/src/superio/smsc/mec1308/superio.c b/src/superio/smsc/mec1308/superio.c
index 2f17deb472..5b9f0da2e8 100644
--- a/src/superio/smsc/mec1308/superio.c
+++ b/src/superio/smsc/mec1308/superio.c
@@ -19,7 +19,6 @@
 #include <device/device.h>
 #include <device/pnp.h>
 #include <superio/conf_mode.h>
-#include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
 #include <pc80/keyboard.h>
diff --git a/src/superio/smsc/sch4037/superio.c b/src/superio/smsc/sch4037/superio.c
index 5165dd6448..3f2a1ddeac 100644
--- a/src/superio/smsc/sch4037/superio.c
+++ b/src/superio/smsc/sch4037/superio.c
@@ -19,7 +19,6 @@
 #include <device/device.h>
 #include <device/pnp.h>
 #include <superio/conf_mode.h>
-#include <console/console.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 
diff --git a/src/superio/smsc/sio1036/superio.c b/src/superio/smsc/sio1036/superio.c
index 5725a6275a..351863e93a 100644
--- a/src/superio/smsc/sio1036/superio.c
+++ b/src/superio/smsc/sio1036/superio.c
@@ -19,7 +19,6 @@
 #include <device/device.h>
 #include <device/pnp.h>
 #include <superio/conf_mode.h>
-#include <console/console.h>
 #include <stdlib.h>
 
 #include "sio1036.h"
diff --git a/src/superio/winbond/w83627thg/superio.c b/src/superio/winbond/w83627thg/superio.c
index fb6e54d39e..03afe117b7 100644
--- a/src/superio/winbond/w83627thg/superio.c
+++ b/src/superio/winbond/w83627thg/superio.c
@@ -20,7 +20,6 @@
 #include <device/device.h>
 #include <device/pnp.h>
 #include <superio/conf_mode.h>
-#include <console/console.h>
 #include <string.h>
 #include <pc80/keyboard.h>
 #include "w83627thg.h"
diff --git a/src/superio/winbond/w83627uhg/superio.c b/src/superio/winbond/w83627uhg/superio.c
index f68aec9b89..d86560f1db 100644
--- a/src/superio/winbond/w83627uhg/superio.c
+++ b/src/superio/winbond/w83627uhg/superio.c
@@ -18,7 +18,6 @@
 #include <device/device.h>
 #include <device/pnp.h>
 #include <superio/conf_mode.h>
-#include <console/console.h>
 #include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/superio/winbond/w83977tf/superio.c b/src/superio/winbond/w83977tf/superio.c
index b0c838e782..9b78b84106 100644
--- a/src/superio/winbond/w83977tf/superio.c
+++ b/src/superio/winbond/w83977tf/superio.c
@@ -20,7 +20,6 @@
 #include <device/device.h>
 #include <device/pnp.h>
 #include <superio/conf_mode.h>
-#include <console/console.h>
 #include <string.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>