From f765d4f275197cfa791d70b2236b7273e4a70c53 Mon Sep 17 00:00:00 2001
From: Elyes HAOUAS <ehaouas@noos.fr>
Date: Sat, 27 Oct 2018 20:14:59 +0200
Subject: src: Remove unneeded include <lib.h>

Change-Id: I801849fb31fe6958e3d9510da50e2e2dd351a98d
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/29304
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
---
 src/cpu/x86/mp_init.c                                             | 1 -
 src/device/hypertransport.c                                       | 1 -
 src/drivers/intel/fsp1_0/hob.c                                    | 1 -
 src/drivers/intel/fsp1_1/fsp_gop.c                                | 1 -
 src/drivers/intel/fsp1_1/hob.c                                    | 1 -
 src/drivers/intel/fsp2_0/hand_off_block.c                         | 1 -
 src/drivers/intel/fsp2_0/util.c                                   | 1 -
 src/lib/hardwaremain.c                                            | 1 -
 src/lib/rmodule.c                                                 | 1 -
 src/mainboard/advansus/a785e-i/romstage.c                         | 1 -
 src/mainboard/amd/bimini_fam10/romstage.c                         | 1 -
 src/mainboard/amd/mahogany_fam10/romstage.c                       | 1 -
 src/mainboard/amd/serengeti_cheetah_fam10/romstage.c              | 1 -
 src/mainboard/amd/tilapia_fam10/romstage.c                        | 1 -
 src/mainboard/apple/macbook21/romstage.c                          | 1 -
 src/mainboard/apple/macbookair4_2/early_southbridge.c             | 1 -
 src/mainboard/asus/kcma-d8/romstage.c                             | 1 -
 src/mainboard/asus/kfsn4-dre/romstage.c                           | 1 -
 src/mainboard/asus/kgpe-d16/romstage.c                            | 1 -
 src/mainboard/asus/m4a78-em/romstage.c                            | 1 -
 src/mainboard/asus/m4a785-m/romstage.c                            | 1 -
 src/mainboard/asus/m5a88-v/romstage.c                             | 1 -
 src/mainboard/asus/p2b-ds/romstage.c                              | 1 -
 src/mainboard/asus/p2b-ls/romstage.c                              | 1 -
 src/mainboard/asus/p2b/romstage.c                                 | 1 -
 src/mainboard/asus/p3b-f/romstage.c                               | 1 -
 src/mainboard/asus/p5gc-mx/romstage.c                             | 1 -
 src/mainboard/avalue/eax-785e/romstage.c                          | 1 -
 src/mainboard/compulab/intense_pc/romstage.c                      | 1 -
 src/mainboard/esd/atom15/acpi_tables.c                            | 1 -
 src/mainboard/getac/p470/romstage.c                               | 1 -
 src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c                   | 1 -
 src/mainboard/gigabyte/ma785gm/romstage.c                         | 1 -
 src/mainboard/gigabyte/ma785gmt/romstage.c                        | 1 -
 src/mainboard/gigabyte/ma78gm/romstage.c                          | 1 -
 src/mainboard/google/butterfly/romstage.c                         | 1 -
 src/mainboard/google/link/romstage.c                              | 1 -
 src/mainboard/google/parrot/romstage.c                            | 1 -
 src/mainboard/google/stout/romstage.c                             | 1 -
 src/mainboard/hp/dl165_g6_fam10/romstage.c                        | 1 -
 src/mainboard/iei/kino-780am2-fam10/romstage.c                    | 1 -
 src/mainboard/intel/bayleybay_fsp/romstage.c                      | 1 -
 src/mainboard/intel/emeraldlake2/romstage.c                       | 1 -
 src/mainboard/intel/galileo/vboot.c                               | 1 -
 src/mainboard/intel/minnowmax/acpi_tables.c                       | 1 -
 src/mainboard/intel/saddlebrook/romstage.c                        | 2 --
 src/mainboard/intel/stargo2/romstage.c                            | 1 -
 src/mainboard/intel/strago/romstage.c                             | 1 -
 src/mainboard/jetway/pa78vm5/romstage.c                           | 1 -
 src/mainboard/kontron/ktqm77/romstage.c                           | 1 -
 src/mainboard/lenovo/s230u/romstage.c                             | 1 -
 src/mainboard/lenovo/t400/romstage.c                              | 1 -
 src/mainboard/lenovo/t520/romstage.c                              | 1 -
 src/mainboard/lenovo/t60/romstage.c                               | 1 -
 src/mainboard/lenovo/x1_carbon_gen1/romstage.c                    | 1 -
 src/mainboard/lenovo/x200/romstage.c                              | 1 -
 src/mainboard/lenovo/x220/romstage.c                              | 1 -
 src/mainboard/lenovo/x230/romstage.c                              | 1 -
 src/mainboard/lenovo/x60/romstage.c                               | 1 -
 src/mainboard/lenovo/z61t/romstage.c                              | 1 -
 src/mainboard/msi/ms9652_fam10/romstage.c                         | 1 -
 src/mainboard/pcengines/alix1c/romstage.c                         | 1 -
 src/mainboard/pcengines/alix2d/romstage.c                         | 1 -
 src/mainboard/roda/rk886ex/romstage.c                             | 1 -
 src/mainboard/roda/rk9/romstage.c                                 | 1 -
 src/mainboard/samsung/lumpy/romstage.c                            | 1 -
 src/mainboard/samsung/stumpy/romstage.c                           | 1 -
 src/mainboard/sapphire/pureplatinumh61/romstage.c                 | 1 -
 src/mainboard/siemens/mc_apl1/romstage.c                          | 1 -
 src/mainboard/siemens/mc_apl1/variants/mc_apl1/ptn3460.c          | 1 -
 src/mainboard/siemens/mc_tcu3/romstage.c                          | 1 -
 src/mainboard/supermicro/h8dmr_fam10/romstage.c                   | 1 -
 src/mainboard/supermicro/h8qme_fam10/romstage.c                   | 1 -
 src/mainboard/supermicro/h8scm_fam10/romstage.c                   | 1 -
 src/mainboard/tyan/s2912_fam10/romstage.c                         | 1 -
 src/northbridge/amd/amdfam10/link_control.c                       | 1 -
 src/northbridge/amd/amdfam10/nb_control.c                         | 1 -
 src/northbridge/intel/i945/debug.c                                | 1 -
 src/northbridge/intel/sandybridge/romstage.c                      | 1 -
 src/northbridge/intel/x4x/raminit.c                               | 1 -
 src/northbridge/via/vx900/northbridge.c                           | 1 -
 src/soc/intel/common/block/cpu/cpulib.c                           | 1 -
 src/soc/intel/denverton_ns/bootblock/bootblock.c                  | 1 -
 src/soc/intel/fsp_broadwell_de/chip.c                             | 1 -
 src/soc/nvidia/tegra124/display.c                                 | 1 -
 src/soc/nvidia/tegra124/sor.c                                     | 1 -
 src/soc/nvidia/tegra210/dsi.c                                     | 1 -
 src/soc/nvidia/tegra210/include/soc/mipi_dsi.h                    | 2 ++
 src/soc/nvidia/tegra210/jdi_25x18_display/panel-jdi-lpm102a188a.c | 1 -
 src/soc/nvidia/tegra210/mipi-phy.c                                | 1 -
 src/soc/nvidia/tegra210/mipi.c                                    | 3 ++-
 src/soc/nvidia/tegra210/mipi_dsi.c                                | 1 -
 src/soc/nvidia/tegra210/sor.c                                     | 1 -
 src/soc/samsung/exynos5420/dp.c                                   | 1 -
 src/southbridge/amd/sr5650/ht.c                                   | 1 -
 95 files changed, 4 insertions(+), 95 deletions(-)

diff --git a/src/cpu/x86/mp_init.c b/src/cpu/x86/mp_init.c
index fb3a98691be6..61512ee0382f 100644
--- a/src/cpu/x86/mp_init.c
+++ b/src/cpu/x86/mp_init.c
@@ -31,7 +31,6 @@
 #include <delay.h>
 #include <device/device.h>
 #include <device/path.h>
-#include <lib.h>
 #include <smp/atomic.h>
 #include <smp/spinlock.h>
 #include <symbols.h>
diff --git a/src/device/hypertransport.c b/src/device/hypertransport.c
index 4a4609d6e392..ed6b2dd99866 100644
--- a/src/device/hypertransport.c
+++ b/src/device/hypertransport.c
@@ -20,7 +20,6 @@
  * GNU General Public License for more details.
  */
 
-#include <lib.h>
 #include <console/console.h>
 #include <device/device.h>
 #include <device/path.h>
diff --git a/src/drivers/intel/fsp1_0/hob.c b/src/drivers/intel/fsp1_0/hob.c
index 9cf6f602c7f8..05060d83b083 100644
--- a/src/drivers/intel/fsp1_0/hob.c
+++ b/src/drivers/intel/fsp1_0/hob.c
@@ -16,7 +16,6 @@
 #include <types.h>
 #include <string.h>
 #include <console/console.h>
-#include <lib.h> // hexdump
 #include "fsp_util.h"
 
 
diff --git a/src/drivers/intel/fsp1_1/fsp_gop.c b/src/drivers/intel/fsp1_1/fsp_gop.c
index c5aae5c183ea..0e22ee5bb6ac 100644
--- a/src/drivers/intel/fsp1_1/fsp_gop.c
+++ b/src/drivers/intel/fsp1_1/fsp_gop.c
@@ -16,7 +16,6 @@
 #include <boot/coreboot_tables.h>
 #include <console/console.h>
 #include <fsp/util.h>
-#include <lib.h>
 
 int fill_lb_framebuffer(struct lb_framebuffer *framebuffer)
 {
diff --git a/src/drivers/intel/fsp1_1/hob.c b/src/drivers/intel/fsp1_1/hob.c
index 85d0f35f916f..40881d632a8e 100644
--- a/src/drivers/intel/fsp1_1/hob.c
+++ b/src/drivers/intel/fsp1_1/hob.c
@@ -21,7 +21,6 @@
 #include <console/console.h>
 #include <fsp/util.h>
 #include <ip_checksum.h>
-#include <lib.h> // hexdump
 #include <string.h>
 
 /* Compares two EFI GUIDs. Returns true of the GUIDs match, false otherwise. */
diff --git a/src/drivers/intel/fsp2_0/hand_off_block.c b/src/drivers/intel/fsp2_0/hand_off_block.c
index 4070a1fe8375..a5ca52d902c5 100644
--- a/src/drivers/intel/fsp2_0/hand_off_block.c
+++ b/src/drivers/intel/fsp2_0/hand_off_block.c
@@ -18,7 +18,6 @@
 #include <fsp/api.h>
 #include <fsp/util.h>
 #include <inttypes.h>
-#include <lib.h>
 #include <string.h>
 
 #define HOB_HEADER_LEN		8
diff --git a/src/drivers/intel/fsp2_0/util.c b/src/drivers/intel/fsp2_0/util.c
index 98026f336271..8c0af2eacf49 100644
--- a/src/drivers/intel/fsp2_0/util.c
+++ b/src/drivers/intel/fsp2_0/util.c
@@ -16,7 +16,6 @@
 #include <cf9_reset.h>
 #include <console/console.h>
 #include <fsp/util.h>
-#include <lib.h>
 #include <string.h>
 
 static bool looks_like_fsp_header(const uint8_t *raw_hdr)
diff --git a/src/lib/hardwaremain.c b/src/lib/hardwaremain.c
index a26d6788b503..e6cf67f064e4 100644
--- a/src/lib/hardwaremain.c
+++ b/src/lib/hardwaremain.c
@@ -32,7 +32,6 @@
 #include <reset.h>
 #include <boot/tables.h>
 #include <program_loading.h>
-#include <lib.h>
 #if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)
 #include <arch/acpi.h>
 #endif
diff --git a/src/lib/rmodule.c b/src/lib/rmodule.c
index 273e139e3d16..56529d2fb24d 100644
--- a/src/lib/rmodule.c
+++ b/src/lib/rmodule.c
@@ -18,7 +18,6 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <lib.h>
 #include <console/console.h>
 #include <program_loading.h>
 #include <rmodule.h>
diff --git a/src/mainboard/advansus/a785e-i/romstage.c b/src/mainboard/advansus/a785e-i/romstage.c
index f557772f5715..e8e2ec72664c 100644
--- a/src/mainboard/advansus/a785e-i/romstage.c
+++ b/src/mainboard/advansus/a785e-i/romstage.c
@@ -18,7 +18,6 @@
 #define FAM10_SCAN_PCI_BUS 0
 #define FAM10_ALLOCATE_IO_RANGE 0
 
-#include <lib.h>
 #include <stdint.h>
 #include <string.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/amd/bimini_fam10/romstage.c b/src/mainboard/amd/bimini_fam10/romstage.c
index 64cafa7bcebe..9d05096846a7 100644
--- a/src/mainboard/amd/bimini_fam10/romstage.c
+++ b/src/mainboard/amd/bimini_fam10/romstage.c
@@ -30,7 +30,6 @@
 #include <console/console.h>
 #include <timestamp.h>
 #include <cpu/amd/model_10xxx_rev.h>
-#include <lib.h>
 #include <commonlib/loglevel.h>
 #include <cpu/x86/bist.h>
 #include <cpu/amd/msr.h>
diff --git a/src/mainboard/amd/mahogany_fam10/romstage.c b/src/mainboard/amd/mahogany_fam10/romstage.c
index b5217369fba4..39ff7a0f8650 100644
--- a/src/mainboard/amd/mahogany_fam10/romstage.c
+++ b/src/mainboard/amd/mahogany_fam10/romstage.c
@@ -32,7 +32,6 @@
 #include <console/console.h>
 #include <timestamp.h>
 #include <cpu/amd/model_10xxx_rev.h>
-#include <lib.h>
 #include <commonlib/loglevel.h>
 #include <cpu/x86/bist.h>
 #include <superio/ite/common/ite.h>
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c b/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
index a33a68f5683d..e923513e9cdb 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
@@ -30,7 +30,6 @@
 #include <console/console.h>
 #include <timestamp.h>
 #include <cpu/amd/model_10xxx_rev.h>
-#include <lib.h>
 #include <spd.h>
 #include <commonlib/loglevel.h>
 #include <cpu/x86/bist.h>
diff --git a/src/mainboard/amd/tilapia_fam10/romstage.c b/src/mainboard/amd/tilapia_fam10/romstage.c
index 5671ccee343e..4e1a72e9ebf7 100644
--- a/src/mainboard/amd/tilapia_fam10/romstage.c
+++ b/src/mainboard/amd/tilapia_fam10/romstage.c
@@ -30,7 +30,6 @@
 #include <console/console.h>
 #include <timestamp.h>
 #include <cpu/amd/model_10xxx_rev.h>
-#include <lib.h>
 #include <commonlib/loglevel.h>
 #include <cpu/x86/bist.h>
 #include <superio/ite/common/ite.h>
diff --git a/src/mainboard/apple/macbook21/romstage.c b/src/mainboard/apple/macbook21/romstage.c
index 2e7470afba2f..a538e0f3e2e7 100644
--- a/src/mainboard/apple/macbook21/romstage.c
+++ b/src/mainboard/apple/macbook21/romstage.c
@@ -24,7 +24,6 @@
 #include <device/pnp_def.h>
 #include <cpu/intel/romstage.h>
 #include <cpu/x86/lapic.h>
-#include <lib.h>
 #include <timestamp.h>
 #include <console/console.h>
 #include <cpu/x86/bist.h>
diff --git a/src/mainboard/apple/macbookair4_2/early_southbridge.c b/src/mainboard/apple/macbookair4_2/early_southbridge.c
index d189ae287c74..3ec61873b046 100644
--- a/src/mainboard/apple/macbookair4_2/early_southbridge.c
+++ b/src/mainboard/apple/macbookair4_2/early_southbridge.c
@@ -13,7 +13,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <lib.h>
 #include <arch/byteorder.h>
 #include <arch/io.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/asus/kcma-d8/romstage.c b/src/mainboard/asus/kcma-d8/romstage.c
index d7cc9aef20b9..5b12845834ab 100644
--- a/src/mainboard/asus/kcma-d8/romstage.c
+++ b/src/mainboard/asus/kcma-d8/romstage.c
@@ -28,7 +28,6 @@
 #include <console/console.h>
 #include <romstage_handoff.h>
 #include <timestamp.h>
-#include <lib.h>
 #include <spd.h>
 #include <cpu/amd/model_10xxx_rev.h>
 #include <delay.h>
diff --git a/src/mainboard/asus/kfsn4-dre/romstage.c b/src/mainboard/asus/kfsn4-dre/romstage.c
index 1c685f28f208..b93372c372f3 100644
--- a/src/mainboard/asus/kfsn4-dre/romstage.c
+++ b/src/mainboard/asus/kfsn4-dre/romstage.c
@@ -30,7 +30,6 @@
 #include <cpu/x86/lapic.h>
 #include <console/console.h>
 #include <timestamp.h>
-#include <lib.h>
 #include <spd.h>
 #include <cbmem.h>
 #include <cpu/amd/model_10xxx_rev.h>
diff --git a/src/mainboard/asus/kgpe-d16/romstage.c b/src/mainboard/asus/kgpe-d16/romstage.c
index eb970ca1838e..bfa40427e45c 100644
--- a/src/mainboard/asus/kgpe-d16/romstage.c
+++ b/src/mainboard/asus/kgpe-d16/romstage.c
@@ -28,7 +28,6 @@
 #include <console/console.h>
 #include <romstage_handoff.h>
 #include <timestamp.h>
-#include <lib.h>
 #include <spd.h>
 #include <cpu/amd/model_10xxx_rev.h>
 #include <delay.h>
diff --git a/src/mainboard/asus/m4a78-em/romstage.c b/src/mainboard/asus/m4a78-em/romstage.c
index 5d61b529033d..96d80cc11868 100644
--- a/src/mainboard/asus/m4a78-em/romstage.c
+++ b/src/mainboard/asus/m4a78-em/romstage.c
@@ -31,7 +31,6 @@
 #include <console/console.h>
 #include <timestamp.h>
 #include <cpu/amd/model_10xxx_rev.h>
-#include <lib.h>
 #include <commonlib/loglevel.h>
 #include <cpu/x86/bist.h>
 #include <superio/ite/common/ite.h>
diff --git a/src/mainboard/asus/m4a785-m/romstage.c b/src/mainboard/asus/m4a785-m/romstage.c
index 80b77e6662be..8eb92264b174 100644
--- a/src/mainboard/asus/m4a785-m/romstage.c
+++ b/src/mainboard/asus/m4a785-m/romstage.c
@@ -32,7 +32,6 @@
 #include <console/console.h>
 #include <timestamp.h>
 #include <cpu/amd/model_10xxx_rev.h>
-#include <lib.h>
 #include <commonlib/loglevel.h>
 #include <cpu/x86/bist.h>
 #include <superio/ite/common/ite.h>
diff --git a/src/mainboard/asus/m5a88-v/romstage.c b/src/mainboard/asus/m5a88-v/romstage.c
index b9268dae1a36..bb43dd58408f 100644
--- a/src/mainboard/asus/m5a88-v/romstage.c
+++ b/src/mainboard/asus/m5a88-v/romstage.c
@@ -20,7 +20,6 @@
 #define FAM10_SCAN_PCI_BUS 0
 #define FAM10_ALLOCATE_IO_RANGE 0
 
-#include <lib.h>
 #include <stdint.h>
 #include <string.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/asus/p2b-ds/romstage.c b/src/mainboard/asus/p2b-ds/romstage.c
index 1aa59551135e..d3bc908039de 100644
--- a/src/mainboard/asus/p2b-ds/romstage.c
+++ b/src/mainboard/asus/p2b-ds/romstage.c
@@ -23,7 +23,6 @@
 #include <cpu/intel/romstage.h>
 #include <superio/winbond/common/winbond.h>
 #include <superio/winbond/w83977tf/w83977tf.h>
-#include <lib.h>
 #include <cbmem.h>
 
 #define SERIAL_DEV PNP_DEV(0x3f0, W83977TF_SP1)
diff --git a/src/mainboard/asus/p2b-ls/romstage.c b/src/mainboard/asus/p2b-ls/romstage.c
index b7132248cf6d..947de564f08e 100644
--- a/src/mainboard/asus/p2b-ls/romstage.c
+++ b/src/mainboard/asus/p2b-ls/romstage.c
@@ -24,7 +24,6 @@
 #include <superio/winbond/common/winbond.h>
 /* FIXME: The ASUS P2B-LS has a Winbond W83977EF, actually. */
 #include <superio/winbond/w83977tf/w83977tf.h>
-#include <lib.h>
 #include <cbmem.h>
 
 #define SERIAL_DEV PNP_DEV(0x3f0, W83977TF_SP1)
diff --git a/src/mainboard/asus/p2b/romstage.c b/src/mainboard/asus/p2b/romstage.c
index ccf39e6790a8..c53b386070a4 100644
--- a/src/mainboard/asus/p2b/romstage.c
+++ b/src/mainboard/asus/p2b/romstage.c
@@ -23,7 +23,6 @@
 #include <cpu/intel/romstage.h>
 #include <superio/winbond/common/winbond.h>
 #include <superio/winbond/w83977tf/w83977tf.h>
-#include <lib.h>
 #include <cbmem.h>
 
 #define SERIAL_DEV PNP_DEV(0x3f0, W83977TF_SP1)
diff --git a/src/mainboard/asus/p3b-f/romstage.c b/src/mainboard/asus/p3b-f/romstage.c
index a474907d7e4b..9a629f4db612 100644
--- a/src/mainboard/asus/p3b-f/romstage.c
+++ b/src/mainboard/asus/p3b-f/romstage.c
@@ -24,7 +24,6 @@
 #include <superio/winbond/common/winbond.h>
 /* FIXME: The ASUS P3B-F has a Winbond W83977EF, actually. */
 #include <superio/winbond/w83977tf/w83977tf.h>
-#include <lib.h>
 #include <cbmem.h>
 
 /* FIXME: The ASUS P3B-F has a Winbond W83977EF, actually. */
diff --git a/src/mainboard/asus/p5gc-mx/romstage.c b/src/mainboard/asus/p5gc-mx/romstage.c
index 512c1d6c1725..6f41b4ccc049 100644
--- a/src/mainboard/asus/p5gc-mx/romstage.c
+++ b/src/mainboard/asus/p5gc-mx/romstage.c
@@ -23,7 +23,6 @@
 #include <device/pci_def.h>
 #include <device/pnp_def.h>
 #include <cpu/x86/lapic.h>
-#include <lib.h>
 #include <arch/acpi.h>
 #include <timestamp.h>
 #include <superio/winbond/common/winbond.h>
diff --git a/src/mainboard/avalue/eax-785e/romstage.c b/src/mainboard/avalue/eax-785e/romstage.c
index fd810f8c34cf..ba7e7ad14dd7 100644
--- a/src/mainboard/avalue/eax-785e/romstage.c
+++ b/src/mainboard/avalue/eax-785e/romstage.c
@@ -18,7 +18,6 @@
 #define FAM10_SCAN_PCI_BUS 0
 #define FAM10_ALLOCATE_IO_RANGE 0
 
-#include <lib.h>
 #include <stdint.h>
 #include <string.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/compulab/intense_pc/romstage.c b/src/mainboard/compulab/intense_pc/romstage.c
index 7e59d95cc98b..a913f7738e15 100644
--- a/src/mainboard/compulab/intense_pc/romstage.c
+++ b/src/mainboard/compulab/intense_pc/romstage.c
@@ -14,7 +14,6 @@
  */
 
 #include <stdint.h>
-#include <lib.h>
 #include <arch/io.h>
 #include <northbridge/intel/sandybridge/raminit_native.h>
 #include <superio/smsc/sio1007/chip.h>
diff --git a/src/mainboard/esd/atom15/acpi_tables.c b/src/mainboard/esd/atom15/acpi_tables.c
index 88ede977f8d5..a7f71e2ddc46 100644
--- a/src/mainboard/esd/atom15/acpi_tables.c
+++ b/src/mainboard/esd/atom15/acpi_tables.c
@@ -16,7 +16,6 @@
 
 #include <types.h>
 #include <string.h>
-#include <lib.h> // hexdump
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <arch/acpigen.h>
diff --git a/src/mainboard/getac/p470/romstage.c b/src/mainboard/getac/p470/romstage.c
index b458c9b9fa76..18d856b8569c 100644
--- a/src/mainboard/getac/p470/romstage.c
+++ b/src/mainboard/getac/p470/romstage.c
@@ -20,7 +20,6 @@
 #include <device/pci_def.h>
 #include <device/pnp_def.h>
 #include <cpu/x86/lapic.h>
-#include <lib.h>
 #include <arch/acpi.h>
 #include <pc80/mc146818rtc.h>
 #include <console/console.h>
diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c b/src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c
index 6ed5b2f740fe..6c1da82af96d 100644
--- a/src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c
+++ b/src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c
@@ -22,7 +22,6 @@
 #include <device/pci_def.h>
 #include <device/pnp_def.h>
 #include <cpu/x86/lapic.h>
-#include <lib.h>
 #include <arch/acpi.h>
 #include <timestamp.h>
 #include <superio/ite/it8718f/it8718f.h>
diff --git a/src/mainboard/gigabyte/ma785gm/romstage.c b/src/mainboard/gigabyte/ma785gm/romstage.c
index 1adaad8261c6..098baacdcedd 100644
--- a/src/mainboard/gigabyte/ma785gm/romstage.c
+++ b/src/mainboard/gigabyte/ma785gm/romstage.c
@@ -28,7 +28,6 @@
 #include <console/console.h>
 #include <timestamp.h>
 #include <cpu/amd/model_10xxx_rev.h>
-#include <lib.h>
 #include <commonlib/loglevel.h>
 #include <cpu/x86/bist.h>
 #include <superio/ite/common/ite.h>
diff --git a/src/mainboard/gigabyte/ma785gmt/romstage.c b/src/mainboard/gigabyte/ma785gmt/romstage.c
index 41640d9972e4..05d2e04ac435 100644
--- a/src/mainboard/gigabyte/ma785gmt/romstage.c
+++ b/src/mainboard/gigabyte/ma785gmt/romstage.c
@@ -28,7 +28,6 @@
 #include <console/console.h>
 #include <timestamp.h>
 #include <cpu/amd/model_10xxx_rev.h>
-#include <lib.h>
 #include <commonlib/loglevel.h>
 #include <cpu/x86/bist.h>
 #include <superio/ite/common/ite.h>
diff --git a/src/mainboard/gigabyte/ma78gm/romstage.c b/src/mainboard/gigabyte/ma78gm/romstage.c
index f2abbd0aba33..536a041f55ba 100644
--- a/src/mainboard/gigabyte/ma78gm/romstage.c
+++ b/src/mainboard/gigabyte/ma78gm/romstage.c
@@ -31,7 +31,6 @@
 #include <console/console.h>
 #include <timestamp.h>
 #include <cpu/amd/model_10xxx_rev.h>
-#include <lib.h>
 #include <commonlib/loglevel.h>
 #include <cpu/x86/bist.h>
 #include <superio/ite/common/ite.h>
diff --git a/src/mainboard/google/butterfly/romstage.c b/src/mainboard/google/butterfly/romstage.c
index a8b3c6b1000a..595806b100f2 100644
--- a/src/mainboard/google/butterfly/romstage.c
+++ b/src/mainboard/google/butterfly/romstage.c
@@ -16,7 +16,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <lib.h>
 #include <timestamp.h>
 #include <arch/io.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/google/link/romstage.c b/src/mainboard/google/link/romstage.c
index 176be9d8543d..b8c13a1a1923 100644
--- a/src/mainboard/google/link/romstage.c
+++ b/src/mainboard/google/link/romstage.c
@@ -16,7 +16,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <lib.h>
 #include <timestamp.h>
 #include <arch/io.h>
 #include <device/pci.h>
diff --git a/src/mainboard/google/parrot/romstage.c b/src/mainboard/google/parrot/romstage.c
index bceaa884d083..143baf7a40e6 100644
--- a/src/mainboard/google/parrot/romstage.c
+++ b/src/mainboard/google/parrot/romstage.c
@@ -16,7 +16,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <lib.h>
 #include <timestamp.h>
 #include <arch/io.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/google/stout/romstage.c b/src/mainboard/google/stout/romstage.c
index a534f0f5d626..a0e828dc4efb 100644
--- a/src/mainboard/google/stout/romstage.c
+++ b/src/mainboard/google/stout/romstage.c
@@ -16,7 +16,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <lib.h>
 #include <timestamp.h>
 #include <arch/io.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/hp/dl165_g6_fam10/romstage.c b/src/mainboard/hp/dl165_g6_fam10/romstage.c
index 7a9d37fa3cb7..1b2b40bf467d 100644
--- a/src/mainboard/hp/dl165_g6_fam10/romstage.c
+++ b/src/mainboard/hp/dl165_g6_fam10/romstage.c
@@ -36,7 +36,6 @@
 #include <console/console.h>
 #include <timestamp.h>
 #include <cpu/amd/model_10xxx_rev.h>
-#include <lib.h>
 #include <spd.h>
 #include <delay.h>
 #include <superio/serverengines/pilot/pilot.h>
diff --git a/src/mainboard/iei/kino-780am2-fam10/romstage.c b/src/mainboard/iei/kino-780am2-fam10/romstage.c
index 52cbe4bd310c..fc1b32f06c12 100644
--- a/src/mainboard/iei/kino-780am2-fam10/romstage.c
+++ b/src/mainboard/iei/kino-780am2-fam10/romstage.c
@@ -31,7 +31,6 @@
 #include <console/console.h>
 #include <timestamp.h>
 #include <cpu/amd/model_10xxx_rev.h>
-#include <lib.h>
 #include <commonlib/loglevel.h>
 #include <cpu/x86/bist.h>
 #include <superio/fintek/common/fintek.h>
diff --git a/src/mainboard/intel/bayleybay_fsp/romstage.c b/src/mainboard/intel/bayleybay_fsp/romstage.c
index 84f705463b00..19a14cb07608 100644
--- a/src/mainboard/intel/bayleybay_fsp/romstage.c
+++ b/src/mainboard/intel/bayleybay_fsp/romstage.c
@@ -15,7 +15,6 @@
  */
 
 #include <stddef.h>
-#include <lib.h>
 #include <arch/io.h>
 #include <arch/cbfs.h>
 #include <arch/stages.h>
diff --git a/src/mainboard/intel/emeraldlake2/romstage.c b/src/mainboard/intel/emeraldlake2/romstage.c
index fa511fa2a464..9d8ecdf50303 100644
--- a/src/mainboard/intel/emeraldlake2/romstage.c
+++ b/src/mainboard/intel/emeraldlake2/romstage.c
@@ -16,7 +16,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <lib.h>
 #include <timestamp.h>
 #include <arch/io.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/intel/galileo/vboot.c b/src/mainboard/intel/galileo/vboot.c
index 124782d4c811..a5b74a08dc31 100644
--- a/src/mainboard/intel/galileo/vboot.c
+++ b/src/mainboard/intel/galileo/vboot.c
@@ -16,7 +16,6 @@
 #include <bootmode.h>
 #include <delay.h>
 #include <device/i2c_simple.h>
-#include <lib.h>
 #include <soc/i2c.h>
 #include <soc/reg_access.h>
 #include "reg_access.h"
diff --git a/src/mainboard/intel/minnowmax/acpi_tables.c b/src/mainboard/intel/minnowmax/acpi_tables.c
index 88ede977f8d5..a7f71e2ddc46 100644
--- a/src/mainboard/intel/minnowmax/acpi_tables.c
+++ b/src/mainboard/intel/minnowmax/acpi_tables.c
@@ -16,7 +16,6 @@
 
 #include <types.h>
 #include <string.h>
-#include <lib.h> // hexdump
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <arch/acpigen.h>
diff --git a/src/mainboard/intel/saddlebrook/romstage.c b/src/mainboard/intel/saddlebrook/romstage.c
index 49fa5e317c38..f65b52d31fbc 100644
--- a/src/mainboard/intel/saddlebrook/romstage.c
+++ b/src/mainboard/intel/saddlebrook/romstage.c
@@ -29,8 +29,6 @@
 #include <superio/nuvoton/common/nuvoton.h>
 #include <superio/nuvoton/nct6776/nct6776.h>
 
-#include <lib.h>
-
 #define SERIAL_DEV PNP_DEV(0x2e, NCT6776_SP1)
 
 void car_mainboard_pre_console_init(void)
diff --git a/src/mainboard/intel/stargo2/romstage.c b/src/mainboard/intel/stargo2/romstage.c
index fea3872eaf5a..56f0fc0b4ffe 100644
--- a/src/mainboard/intel/stargo2/romstage.c
+++ b/src/mainboard/intel/stargo2/romstage.c
@@ -17,7 +17,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <lib.h>
 #include <timestamp.h>
 #include <arch/io.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/intel/strago/romstage.c b/src/mainboard/intel/strago/romstage.c
index 429187b634cc..b702310f450e 100644
--- a/src/mainboard/intel/strago/romstage.c
+++ b/src/mainboard/intel/strago/romstage.c
@@ -15,7 +15,6 @@
  */
 
 #include <cbfs.h>
-#include <lib.h>
 #include <soc/gpio.h>
 #include <soc/pci_devs.h>
 #include <soc/romstage.h>
diff --git a/src/mainboard/jetway/pa78vm5/romstage.c b/src/mainboard/jetway/pa78vm5/romstage.c
index 9f6c1601ad7e..f75c5a4d4826 100644
--- a/src/mainboard/jetway/pa78vm5/romstage.c
+++ b/src/mainboard/jetway/pa78vm5/romstage.c
@@ -32,7 +32,6 @@
 #include <console/console.h>
 #include <timestamp.h>
 #include <cpu/amd/model_10xxx_rev.h>
-#include <lib.h>
 #include <commonlib/loglevel.h>
 #include <cpu/x86/bist.h>
 #include <superio/fintek/common/fintek.h>
diff --git a/src/mainboard/kontron/ktqm77/romstage.c b/src/mainboard/kontron/ktqm77/romstage.c
index 8995aa21ab57..f6b9cc569188 100644
--- a/src/mainboard/kontron/ktqm77/romstage.c
+++ b/src/mainboard/kontron/ktqm77/romstage.c
@@ -16,7 +16,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <lib.h>
 #include <timestamp.h>
 #include <device/pci_def.h>
 #include <device/pnp_def.h>
diff --git a/src/mainboard/lenovo/s230u/romstage.c b/src/mainboard/lenovo/s230u/romstage.c
index f4241dbba5ea..207333de81ea 100644
--- a/src/mainboard/lenovo/s230u/romstage.c
+++ b/src/mainboard/lenovo/s230u/romstage.c
@@ -16,7 +16,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <cbfs.h>
-#include <lib.h>
 #include <arch/byteorder.h>
 #include <arch/io.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/lenovo/t400/romstage.c b/src/mainboard/lenovo/t400/romstage.c
index 60e51c980844..6d931125884b 100644
--- a/src/mainboard/lenovo/t400/romstage.c
+++ b/src/mainboard/lenovo/t400/romstage.c
@@ -24,7 +24,6 @@
 #include <cpu/x86/tsc.h>
 #include <cpu/intel/romstage.h>
 #include <cbmem.h>
-#include <lib.h>
 #include <romstage_handoff.h>
 #include <console/console.h>
 #include <southbridge/intel/i82801ix/i82801ix.h>
diff --git a/src/mainboard/lenovo/t520/romstage.c b/src/mainboard/lenovo/t520/romstage.c
index 0ad74f56e18e..d4c2f9113d2c 100644
--- a/src/mainboard/lenovo/t520/romstage.c
+++ b/src/mainboard/lenovo/t520/romstage.c
@@ -17,7 +17,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <lib.h>
 #include <timestamp.h>
 #include <arch/byteorder.h>
 #include <arch/io.h>
diff --git a/src/mainboard/lenovo/t60/romstage.c b/src/mainboard/lenovo/t60/romstage.c
index 199831ccb544..3b806f9c3be6 100644
--- a/src/mainboard/lenovo/t60/romstage.c
+++ b/src/mainboard/lenovo/t60/romstage.c
@@ -23,7 +23,6 @@
 #include <device/pci_def.h>
 #include <device/pnp_def.h>
 #include <cpu/x86/lapic.h>
-#include <lib.h>
 #include <arch/acpi.h>
 #include <timestamp.h>
 #include <console/console.h>
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/romstage.c b/src/mainboard/lenovo/x1_carbon_gen1/romstage.c
index 90bf2ebe260c..e996974c365a 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/romstage.c
+++ b/src/mainboard/lenovo/x1_carbon_gen1/romstage.c
@@ -18,7 +18,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <lib.h>
 #include <timestamp.h>
 #include <arch/byteorder.h>
 #include <arch/io.h>
diff --git a/src/mainboard/lenovo/x200/romstage.c b/src/mainboard/lenovo/x200/romstage.c
index 6a230c945537..8176fadc3cc4 100644
--- a/src/mainboard/lenovo/x200/romstage.c
+++ b/src/mainboard/lenovo/x200/romstage.c
@@ -24,7 +24,6 @@
 #include <cpu/x86/tsc.h>
 #include <cpu/intel/romstage.h>
 #include <cbmem.h>
-#include <lib.h>
 #include <romstage_handoff.h>
 #include <console/console.h>
 #include <southbridge/intel/common/gpio.h>
diff --git a/src/mainboard/lenovo/x220/romstage.c b/src/mainboard/lenovo/x220/romstage.c
index 36fd3ca8db81..3429aad6b6cc 100644
--- a/src/mainboard/lenovo/x220/romstage.c
+++ b/src/mainboard/lenovo/x220/romstage.c
@@ -17,7 +17,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <lib.h>
 #include <timestamp.h>
 #include <arch/byteorder.h>
 #include <arch/io.h>
diff --git a/src/mainboard/lenovo/x230/romstage.c b/src/mainboard/lenovo/x230/romstage.c
index 4c946411f3e7..daf6aa33f921 100644
--- a/src/mainboard/lenovo/x230/romstage.c
+++ b/src/mainboard/lenovo/x230/romstage.c
@@ -17,7 +17,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <lib.h>
 #include <timestamp.h>
 #include <arch/byteorder.h>
 #include <arch/io.h>
diff --git a/src/mainboard/lenovo/x60/romstage.c b/src/mainboard/lenovo/x60/romstage.c
index fb2b9e172be4..d6674fe7bfc4 100644
--- a/src/mainboard/lenovo/x60/romstage.c
+++ b/src/mainboard/lenovo/x60/romstage.c
@@ -23,7 +23,6 @@
 #include <device/pci_def.h>
 #include <device/pnp_def.h>
 #include <cpu/x86/lapic.h>
-#include <lib.h>
 #include <arch/acpi.h>
 #include <timestamp.h>
 #include <console/console.h>
diff --git a/src/mainboard/lenovo/z61t/romstage.c b/src/mainboard/lenovo/z61t/romstage.c
index 9a4be1e16f76..20dbaba34adf 100644
--- a/src/mainboard/lenovo/z61t/romstage.c
+++ b/src/mainboard/lenovo/z61t/romstage.c
@@ -23,7 +23,6 @@
 #include <device/pci_def.h>
 #include <device/pnp_def.h>
 #include <cpu/x86/lapic.h>
-#include <lib.h>
 #include <arch/acpi.h>
 #include <timestamp.h>
 #include <console/console.h>
diff --git a/src/mainboard/msi/ms9652_fam10/romstage.c b/src/mainboard/msi/ms9652_fam10/romstage.c
index 803ff3a7660d..7caf6cde68e9 100644
--- a/src/mainboard/msi/ms9652_fam10/romstage.c
+++ b/src/mainboard/msi/ms9652_fam10/romstage.c
@@ -28,7 +28,6 @@
 #include <cpu/x86/lapic.h>
 #include <console/console.h>
 #include <timestamp.h>
-#include <lib.h>
 #include <spd.h>
 #include <cpu/amd/model_10xxx_rev.h>
 #include <delay.h>
diff --git a/src/mainboard/pcengines/alix1c/romstage.c b/src/mainboard/pcengines/alix1c/romstage.c
index e48284043187..ba2541a38cf3 100644
--- a/src/mainboard/pcengines/alix1c/romstage.c
+++ b/src/mainboard/pcengines/alix1c/romstage.c
@@ -20,7 +20,6 @@
 #include <arch/io.h>
 #include <device/pnp_def.h>
 #include <console/console.h>
-#include <lib.h>
 #include <cpu/x86/bist.h>
 #include <cpu/x86/msr.h>
 #include <cpu/amd/lxdef.h>
diff --git a/src/mainboard/pcengines/alix2d/romstage.c b/src/mainboard/pcengines/alix2d/romstage.c
index 9bb9c00d2de1..9d3e96578131 100644
--- a/src/mainboard/pcengines/alix2d/romstage.c
+++ b/src/mainboard/pcengines/alix2d/romstage.c
@@ -20,7 +20,6 @@
 #include <arch/io.h>
 #include <device/pnp_def.h>
 #include <console/console.h>
-#include <lib.h>
 #include <cpu/x86/bist.h>
 #include <cpu/x86/msr.h>
 #include <cpu/amd/lxdef.h>
diff --git a/src/mainboard/roda/rk886ex/romstage.c b/src/mainboard/roda/rk886ex/romstage.c
index a0792acd4d07..6e9cc835ec5a 100644
--- a/src/mainboard/roda/rk886ex/romstage.c
+++ b/src/mainboard/roda/rk886ex/romstage.c
@@ -22,7 +22,6 @@
 #include <device/pci_def.h>
 #include <device/pnp_def.h>
 #include <cpu/x86/lapic.h>
-#include <lib.h>
 #include <arch/acpi.h>
 #include <timestamp.h>
 #include <pc80/mc146818rtc.h>
diff --git a/src/mainboard/roda/rk9/romstage.c b/src/mainboard/roda/rk9/romstage.c
index 4f6c5b75cbde..1bcfd622f061 100644
--- a/src/mainboard/roda/rk9/romstage.c
+++ b/src/mainboard/roda/rk9/romstage.c
@@ -25,7 +25,6 @@
 #include <cpu/intel/romstage.h>
 #include <arch/acpi.h>
 #include <cbmem.h>
-#include <lib.h>
 #include <romstage_handoff.h>
 #include <console/console.h>
 #include <southbridge/intel/i82801ix/i82801ix.h>
diff --git a/src/mainboard/samsung/lumpy/romstage.c b/src/mainboard/samsung/lumpy/romstage.c
index b95a990a8f5c..ceb1f6da8cd7 100644
--- a/src/mainboard/samsung/lumpy/romstage.c
+++ b/src/mainboard/samsung/lumpy/romstage.c
@@ -16,7 +16,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <lib.h>
 #include <timestamp.h>
 #include <arch/io.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/samsung/stumpy/romstage.c b/src/mainboard/samsung/stumpy/romstage.c
index c47c6ff2b713..e810fee785da 100644
--- a/src/mainboard/samsung/stumpy/romstage.c
+++ b/src/mainboard/samsung/stumpy/romstage.c
@@ -16,7 +16,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <lib.h>
 #include <timestamp.h>
 #include <arch/io.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/sapphire/pureplatinumh61/romstage.c b/src/mainboard/sapphire/pureplatinumh61/romstage.c
index da825a9dc174..abf97f365075 100644
--- a/src/mainboard/sapphire/pureplatinumh61/romstage.c
+++ b/src/mainboard/sapphire/pureplatinumh61/romstage.c
@@ -16,7 +16,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <lib.h>
 #include <arch/byteorder.h>
 #include <arch/io.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/siemens/mc_apl1/romstage.c b/src/mainboard/siemens/mc_apl1/romstage.c
index 87e41dc1efcf..14836362d6f4 100644
--- a/src/mainboard/siemens/mc_apl1/romstage.c
+++ b/src/mainboard/siemens/mc_apl1/romstage.c
@@ -16,7 +16,6 @@
 
 #include <console/console.h>
 #include <hwilib.h>
-#include <lib.h>
 #include <string.h>
 #include <soc/meminit.h>
 #include <soc/romstage.h>
diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl1/ptn3460.c b/src/mainboard/siemens/mc_apl1/variants/mc_apl1/ptn3460.c
index 829af2a25b19..e95b75247b3d 100644
--- a/src/mainboard/siemens/mc_apl1/variants/mc_apl1/ptn3460.c
+++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl1/ptn3460.c
@@ -14,7 +14,6 @@
  */
 
 #include <console/console.h>
-#include <lib.h>
 #include <hwilib.h>
 #include <device/i2c_simple.h>
 #include <variant/ptn3460.h>
diff --git a/src/mainboard/siemens/mc_tcu3/romstage.c b/src/mainboard/siemens/mc_tcu3/romstage.c
index 2e7ec7a850fc..69e7d21fa634 100644
--- a/src/mainboard/siemens/mc_tcu3/romstage.c
+++ b/src/mainboard/siemens/mc_tcu3/romstage.c
@@ -15,7 +15,6 @@
  */
 
 #include <stddef.h>
-#include <lib.h>
 #include <arch/io.h>
 #include <arch/cbfs.h>
 #include <arch/stages.h>
diff --git a/src/mainboard/supermicro/h8dmr_fam10/romstage.c b/src/mainboard/supermicro/h8dmr_fam10/romstage.c
index 9ad865296211..dea481fe189e 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/romstage.c
+++ b/src/mainboard/supermicro/h8dmr_fam10/romstage.c
@@ -28,7 +28,6 @@
 #include <cpu/x86/lapic.h>
 #include <console/console.h>
 #include <timestamp.h>
-#include <lib.h>
 #include <spd.h>
 #include <cpu/amd/model_10xxx_rev.h>
 #include <delay.h>
diff --git a/src/mainboard/supermicro/h8qme_fam10/romstage.c b/src/mainboard/supermicro/h8qme_fam10/romstage.c
index c6e01e6f6469..127b76f0a2e3 100644
--- a/src/mainboard/supermicro/h8qme_fam10/romstage.c
+++ b/src/mainboard/supermicro/h8qme_fam10/romstage.c
@@ -28,7 +28,6 @@
 #include <cpu/x86/lapic.h>
 #include <console/console.h>
 #include <timestamp.h>
-#include <lib.h>
 #include <spd.h>
 #include <cpu/amd/model_10xxx_rev.h>
 #include <delay.h>
diff --git a/src/mainboard/supermicro/h8scm_fam10/romstage.c b/src/mainboard/supermicro/h8scm_fam10/romstage.c
index dc19870eb5dd..3eeaeda0c522 100644
--- a/src/mainboard/supermicro/h8scm_fam10/romstage.c
+++ b/src/mainboard/supermicro/h8scm_fam10/romstage.c
@@ -31,7 +31,6 @@
 #include <console/console.h>
 #include <timestamp.h>
 #include <cpu/amd/model_10xxx_rev.h>
-#include <lib.h>
 #include <commonlib/loglevel.h>
 #include <cpu/x86/bist.h>
 #include <cpu/amd/msr.h>
diff --git a/src/mainboard/tyan/s2912_fam10/romstage.c b/src/mainboard/tyan/s2912_fam10/romstage.c
index aa3b010a5213..1734b3a77cc4 100644
--- a/src/mainboard/tyan/s2912_fam10/romstage.c
+++ b/src/mainboard/tyan/s2912_fam10/romstage.c
@@ -28,7 +28,6 @@
 #include <cpu/x86/lapic.h>
 #include <console/console.h>
 #include <timestamp.h>
-#include <lib.h>
 #include <spd.h>
 #include <cpu/amd/model_10xxx_rev.h>
 #include <delay.h>
diff --git a/src/northbridge/amd/amdfam10/link_control.c b/src/northbridge/amd/amdfam10/link_control.c
index a7fbe4cd7b84..f82f238bc022 100644
--- a/src/northbridge/amd/amdfam10/link_control.c
+++ b/src/northbridge/amd/amdfam10/link_control.c
@@ -24,7 +24,6 @@
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <pc80/mc146818rtc.h>
-#include <lib.h>
 #include <cpu/amd/model_10xxx_rev.h>
 
 #include "amdfam10.h"
diff --git a/src/northbridge/amd/amdfam10/nb_control.c b/src/northbridge/amd/amdfam10/nb_control.c
index 1884799ec438..255948db8762 100644
--- a/src/northbridge/amd/amdfam10/nb_control.c
+++ b/src/northbridge/amd/amdfam10/nb_control.c
@@ -24,7 +24,6 @@
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <pc80/mc146818rtc.h>
-#include <lib.h>
 #include <cpu/amd/model_10xxx_rev.h>
 
 #include "amdfam10.h"
diff --git a/src/northbridge/intel/i945/debug.c b/src/northbridge/intel/i945/debug.c
index 0f388df4fb12..ef4f17bc6d1f 100644
--- a/src/northbridge/intel/i945/debug.c
+++ b/src/northbridge/intel/i945/debug.c
@@ -15,7 +15,6 @@
  */
 
 #include <spd.h>
-#include <lib.h>
 #include <arch/io.h>
 #include <device/pci_def.h>
 #include <console/console.h>
diff --git a/src/northbridge/intel/sandybridge/romstage.c b/src/northbridge/intel/sandybridge/romstage.c
index 63108de893d5..7345443c3def 100644
--- a/src/northbridge/intel/sandybridge/romstage.c
+++ b/src/northbridge/intel/sandybridge/romstage.c
@@ -19,7 +19,6 @@
 #include <string.h>
 #include <console/console.h>
 #include <arch/io.h>
-#include <lib.h>
 #include <cpu/x86/lapic.h>
 #include <timestamp.h>
 #include "sandybridge.h"
diff --git a/src/northbridge/intel/x4x/raminit.c b/src/northbridge/intel/x4x/raminit.c
index ce5c2ebcf0da..c97c139031df 100644
--- a/src/northbridge/intel/x4x/raminit.c
+++ b/src/northbridge/intel/x4x/raminit.c
@@ -22,7 +22,6 @@
 #include <arch/cpu.h>
 #include <delay.h>
 #include <halt.h>
-#include <lib.h>
 #include "iomap.h"
 #if IS_ENABLED(CONFIG_SOUTHBRIDGE_INTEL_I82801GX)
 #include <southbridge/intel/i82801gx/i82801gx.h> /* smbus_read_byte */
diff --git a/src/northbridge/via/vx900/northbridge.c b/src/northbridge/via/vx900/northbridge.c
index a699d86ed155..2b81b47ff2e4 100644
--- a/src/northbridge/via/vx900/northbridge.c
+++ b/src/northbridge/via/vx900/northbridge.c
@@ -24,7 +24,6 @@
 #include <cpu/cpu.h>
 #include <cbmem.h>
 #include <cf9_reset.h>
-#include <lib.h>
 #include <reset.h>
 #include <string.h>
 
diff --git a/src/soc/intel/common/block/cpu/cpulib.c b/src/soc/intel/common/block/cpu/cpulib.c
index 62b70be98eec..0c042df8b2be 100644
--- a/src/soc/intel/common/block/cpu/cpulib.c
+++ b/src/soc/intel/common/block/cpu/cpulib.c
@@ -24,7 +24,6 @@
 #include <delay.h>
 #include <intelblocks/cpulib.h>
 #include <intelblocks/fast_spi.h>
-#include <lib.h>
 #include <reset.h>
 #include <soc/cpu.h>
 #include <soc/iomap.h>
diff --git a/src/soc/intel/denverton_ns/bootblock/bootblock.c b/src/soc/intel/denverton_ns/bootblock/bootblock.c
index 7325ecb571eb..110d67d6deb8 100644
--- a/src/soc/intel/denverton_ns/bootblock/bootblock.c
+++ b/src/soc/intel/denverton_ns/bootblock/bootblock.c
@@ -19,7 +19,6 @@
 #include <device/pci.h>
 #include <FsptUpd.h>
 #include <intelblocks/fast_spi.h>
-#include <lib.h>
 #include <soc/bootblock.h>
 #include <soc/iomap.h>
 #include <spi-generic.h>
diff --git a/src/soc/intel/fsp_broadwell_de/chip.c b/src/soc/intel/fsp_broadwell_de/chip.c
index 2564944aef24..5cdedcaadbb6 100644
--- a/src/soc/intel/fsp_broadwell_de/chip.c
+++ b/src/soc/intel/fsp_broadwell_de/chip.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <lib.h>
 #include <string.h>
 #include <bootstate.h>
 #include <console/console.h>
diff --git a/src/soc/nvidia/tegra124/display.c b/src/soc/nvidia/tegra124/display.c
index ceb1547fd8d2..061d16747e6a 100644
--- a/src/soc/nvidia/tegra124/display.c
+++ b/src/soc/nvidia/tegra124/display.c
@@ -20,7 +20,6 @@
 #include <delay.h>
 #include <device/device.h>
 #include <edid.h>
-#include <lib.h>
 #include <soc/addressmap.h>
 #include <soc/clock.h>
 #include <soc/display.h>
diff --git a/src/soc/nvidia/tegra124/sor.c b/src/soc/nvidia/tegra124/sor.c
index d9137adfe44e..b93b39d83dcb 100644
--- a/src/soc/nvidia/tegra124/sor.c
+++ b/src/soc/nvidia/tegra124/sor.c
@@ -22,7 +22,6 @@
 #include <console/console.h>
 #include <cpu/cpu.h>
 #include <delay.h>
-#include <lib.h>
 #include <device/device.h>
 #include <soc/addressmap.h>
 #include <soc/clk_rst.h>
diff --git a/src/soc/nvidia/tegra210/dsi.c b/src/soc/nvidia/tegra210/dsi.c
index 205bc1e1db25..3f5256796ec5 100644
--- a/src/soc/nvidia/tegra210/dsi.c
+++ b/src/soc/nvidia/tegra210/dsi.c
@@ -15,7 +15,6 @@
 #include <console/console.h>
 #include <arch/io.h>
 #include <stdint.h>
-#include <lib.h>
 #include <stdlib.h>
 #include <delay.h>
 #include <timer.h>
diff --git a/src/soc/nvidia/tegra210/include/soc/mipi_dsi.h b/src/soc/nvidia/tegra210/include/soc/mipi_dsi.h
index b6d0c10d7aea..eed9ed7d033a 100644
--- a/src/soc/nvidia/tegra210/include/soc/mipi_dsi.h
+++ b/src/soc/nvidia/tegra210/include/soc/mipi_dsi.h
@@ -26,6 +26,8 @@
 #ifndef __MIPI_DSI_H__
 #define __MIPI_DSI_H__
 
+#include <types.h>
+
 struct mipi_dsi_host;
 struct mipi_dsi_device;
 
diff --git a/src/soc/nvidia/tegra210/jdi_25x18_display/panel-jdi-lpm102a188a.c b/src/soc/nvidia/tegra210/jdi_25x18_display/panel-jdi-lpm102a188a.c
index fc48aa78498e..d5db769735a6 100644
--- a/src/soc/nvidia/tegra210/jdi_25x18_display/panel-jdi-lpm102a188a.c
+++ b/src/soc/nvidia/tegra210/jdi_25x18_display/panel-jdi-lpm102a188a.c
@@ -15,7 +15,6 @@
 #include <console/console.h>
 #include <arch/io.h>
 #include <stdint.h>
-#include <lib.h>
 #include <stdlib.h>
 #include <delay.h>
 #include <soc/addressmap.h>
diff --git a/src/soc/nvidia/tegra210/mipi-phy.c b/src/soc/nvidia/tegra210/mipi-phy.c
index d5a7255ed4e6..de27e07645ea 100644
--- a/src/soc/nvidia/tegra210/mipi-phy.c
+++ b/src/soc/nvidia/tegra210/mipi-phy.c
@@ -15,7 +15,6 @@
 
 #include <arch/io.h>
 #include <stdint.h>
-#include <lib.h>
 #include <stdlib.h>
 
 #include <soc/addressmap.h>
diff --git a/src/soc/nvidia/tegra210/mipi.c b/src/soc/nvidia/tegra210/mipi.c
index 89447e26fe4f..b19db438854f 100644
--- a/src/soc/nvidia/tegra210/mipi.c
+++ b/src/soc/nvidia/tegra210/mipi.c
@@ -12,10 +12,11 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
+
+#include <types.h>
 #include <console/console.h>
 #include <arch/io.h>
 #include <stdint.h>
-#include <lib.h>
 #include <stdlib.h>
 #include <delay.h>
 #include <soc/addressmap.h>
diff --git a/src/soc/nvidia/tegra210/mipi_dsi.c b/src/soc/nvidia/tegra210/mipi_dsi.c
index f81cb32584c7..e0924d8e56b4 100644
--- a/src/soc/nvidia/tegra210/mipi_dsi.c
+++ b/src/soc/nvidia/tegra210/mipi_dsi.c
@@ -41,7 +41,6 @@
 #include <console/console.h>
 #include <arch/io.h>
 #include <stdint.h>
-#include <lib.h>
 #include <stdlib.h>
 #include <delay.h>
 #include <string.h>
diff --git a/src/soc/nvidia/tegra210/sor.c b/src/soc/nvidia/tegra210/sor.c
index cf34064a92f9..87eb5370d858 100644
--- a/src/soc/nvidia/tegra210/sor.c
+++ b/src/soc/nvidia/tegra210/sor.c
@@ -19,7 +19,6 @@
 #include <console/console.h>
 #include <arch/io.h>
 #include <stdint.h>
-#include <lib.h>
 #include <stdlib.h>
 #include <delay.h>
 #include <soc/addressmap.h>
diff --git a/src/soc/samsung/exynos5420/dp.c b/src/soc/samsung/exynos5420/dp.c
index 64dfc394a48c..51963fa94fa6 100644
--- a/src/soc/samsung/exynos5420/dp.c
+++ b/src/soc/samsung/exynos5420/dp.c
@@ -17,7 +17,6 @@
 #include <arch/io.h>
 #include <console/console.h>
 #include <delay.h>
-#include <lib.h>
 #include <soc/dp.h>
 #include <soc/fimd.h>
 #include <soc/i2c.h>
diff --git a/src/southbridge/amd/sr5650/ht.c b/src/southbridge/amd/sr5650/ht.c
index 563c67deb093..1b4c99bc6fe4 100644
--- a/src/southbridge/amd/sr5650/ht.c
+++ b/src/southbridge/amd/sr5650/ht.c
@@ -20,7 +20,6 @@
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <arch/ioapic.h>
-#include <lib.h>
 #include "sr5650.h"
 #include "cmn.h"
 
-- 
cgit v1.2.3