commit f765d4f275197cfa791d70b2236b7273e4a70c53
author Elyes HAOUAS <ehaouas@noos.fr> Sat Oct 27 20:14:59 2018 +0200
committer Patrick Georgi <pgeorgi@google.com> Fri Nov 16 09:50:51 2018 +0000
tree 1465c4b68585309769d25561c4c2a6b66cae9055
parent e9a0130879bca97462c6184f1d368f773e00e8a0

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

diff --git a/src/cpu/x86/mp_init.c b/src/cpu/x86/mp_init.c
index fb3a986..61512ee 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>

src/device/hypertransport.c

diff --git a/src/device/hypertransport.c b/src/device/hypertransport.c
index 4a4609d..ed6b2dd 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>

src/drivers/intel/fsp1_0/hob.c

diff --git a/src/drivers/intel/fsp1_0/hob.c b/src/drivers/intel/fsp1_0/hob.c
index 9cf6f60..05060d8 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"
 
 

src/drivers/intel/fsp1_1/fsp_gop.c

diff --git a/src/drivers/intel/fsp1_1/fsp_gop.c b/src/drivers/intel/fsp1_1/fsp_gop.c
index c5aae5c..0e22ee5 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)
 {

src/drivers/intel/fsp1_1/hob.c

diff --git a/src/drivers/intel/fsp1_1/hob.c b/src/drivers/intel/fsp1_1/hob.c
index 85d0f35..40881d6 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. */

src/drivers/intel/fsp2_0/hand_off_block.c

diff --git a/src/drivers/intel/fsp2_0/hand_off_block.c b/src/drivers/intel/fsp2_0/hand_off_block.c
index 4070a1f..a5ca52d 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

src/drivers/intel/fsp2_0/util.c

diff --git a/src/drivers/intel/fsp2_0/util.c b/src/drivers/intel/fsp2_0/util.c
index 98026f3..8c0af2e 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)

src/lib/hardwaremain.c

diff --git a/src/lib/hardwaremain.c b/src/lib/hardwaremain.c
index a26d678..e6cf67f 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

src/lib/rmodule.c

diff --git a/src/lib/rmodule.c b/src/lib/rmodule.c
index 273e139..56529d2 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>

src/mainboard/advansus/a785e-i/romstage.c

diff --git a/src/mainboard/advansus/a785e-i/romstage.c b/src/mainboard/advansus/a785e-i/romstage.c
index f557772..e8e2ec7 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>

src/mainboard/amd/bimini_fam10/romstage.c

diff --git a/src/mainboard/amd/bimini_fam10/romstage.c b/src/mainboard/amd/bimini_fam10/romstage.c
index 64cafa7..9d05096 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>

src/mainboard/amd/mahogany_fam10/romstage.c

diff --git a/src/mainboard/amd/mahogany_fam10/romstage.c b/src/mainboard/amd/mahogany_fam10/romstage.c
index b521736..39ff7a0 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>

src/mainboard/amd/serengeti_cheetah_fam10/romstage.c

diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c b/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
index a33a68f..e923513 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>

src/mainboard/amd/tilapia_fam10/romstage.c

diff --git a/src/mainboard/amd/tilapia_fam10/romstage.c b/src/mainboard/amd/tilapia_fam10/romstage.c
index 5671cce..4e1a72e 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>

src/mainboard/apple/macbook21/romstage.c

diff --git a/src/mainboard/apple/macbook21/romstage.c b/src/mainboard/apple/macbook21/romstage.c
index 2e7470a..a538e0f 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>

src/mainboard/apple/macbookair4_2/early_southbridge.c

diff --git a/src/mainboard/apple/macbookair4_2/early_southbridge.c b/src/mainboard/apple/macbookair4_2/early_southbridge.c
index d189ae2..3ec6187 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>

src/mainboard/asus/kcma-d8/romstage.c

diff --git a/src/mainboard/asus/kcma-d8/romstage.c b/src/mainboard/asus/kcma-d8/romstage.c
index d7cc9ae..5b12845 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>

src/mainboard/asus/kfsn4-dre/romstage.c

diff --git a/src/mainboard/asus/kfsn4-dre/romstage.c b/src/mainboard/asus/kfsn4-dre/romstage.c
index 1c685f2..b93372c 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>

src/mainboard/asus/kgpe-d16/romstage.c

diff --git a/src/mainboard/asus/kgpe-d16/romstage.c b/src/mainboard/asus/kgpe-d16/romstage.c
index eb970ca..bfa4042 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>

src/mainboard/asus/m4a78-em/romstage.c

diff --git a/src/mainboard/asus/m4a78-em/romstage.c b/src/mainboard/asus/m4a78-em/romstage.c
index 5d61b52..96d80cc 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>

src/mainboard/asus/m4a785-m/romstage.c

diff --git a/src/mainboard/asus/m4a785-m/romstage.c b/src/mainboard/asus/m4a785-m/romstage.c
index 80b77e6..8eb9226 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>

src/mainboard/asus/m5a88-v/romstage.c

diff --git a/src/mainboard/asus/m5a88-v/romstage.c b/src/mainboard/asus/m5a88-v/romstage.c
index b9268da..bb43dd5 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>

src/mainboard/asus/p2b-ds/romstage.c

diff --git a/src/mainboard/asus/p2b-ds/romstage.c b/src/mainboard/asus/p2b-ds/romstage.c
index 1aa5955..d3bc908 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)

src/mainboard/asus/p2b-ls/romstage.c

diff --git a/src/mainboard/asus/p2b-ls/romstage.c b/src/mainboard/asus/p2b-ls/romstage.c
index b713224..947de56 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)

src/mainboard/asus/p2b/romstage.c

diff --git a/src/mainboard/asus/p2b/romstage.c b/src/mainboard/asus/p2b/romstage.c
index ccf39e6..c53b386 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)

src/mainboard/asus/p3b-f/romstage.c

diff --git a/src/mainboard/asus/p3b-f/romstage.c b/src/mainboard/asus/p3b-f/romstage.c
index a474907..9a629f4 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. */

src/mainboard/asus/p5gc-mx/romstage.c

diff --git a/src/mainboard/asus/p5gc-mx/romstage.c b/src/mainboard/asus/p5gc-mx/romstage.c
index 512c1d6..6f41b4c 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>

src/mainboard/avalue/eax-785e/romstage.c

diff --git a/src/mainboard/avalue/eax-785e/romstage.c b/src/mainboard/avalue/eax-785e/romstage.c
index fd810f8..ba7e7ad 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>

src/mainboard/compulab/intense_pc/romstage.c

diff --git a/src/mainboard/compulab/intense_pc/romstage.c b/src/mainboard/compulab/intense_pc/romstage.c
index 7e59d95..a913f77 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>

src/mainboard/esd/atom15/acpi_tables.c

diff --git a/src/mainboard/esd/atom15/acpi_tables.c b/src/mainboard/esd/atom15/acpi_tables.c
index 88ede97..a7f71e2 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>

src/mainboard/getac/p470/romstage.c

diff --git a/src/mainboard/getac/p470/romstage.c b/src/mainboard/getac/p470/romstage.c
index b458c9b..18d856b 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>

src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c

diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c b/src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c
index 6ed5b2f..6c1da82 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>

src/mainboard/gigabyte/ma785gm/romstage.c

diff --git a/src/mainboard/gigabyte/ma785gm/romstage.c b/src/mainboard/gigabyte/ma785gm/romstage.c
index 1adaad8..098baac 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>

src/mainboard/gigabyte/ma785gmt/romstage.c

diff --git a/src/mainboard/gigabyte/ma785gmt/romstage.c b/src/mainboard/gigabyte/ma785gmt/romstage.c
index 41640d9..05d2e04 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>

src/mainboard/gigabyte/ma78gm/romstage.c

diff --git a/src/mainboard/gigabyte/ma78gm/romstage.c b/src/mainboard/gigabyte/ma78gm/romstage.c
index f2abbd0..536a041 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>

src/mainboard/google/butterfly/romstage.c

diff --git a/src/mainboard/google/butterfly/romstage.c b/src/mainboard/google/butterfly/romstage.c
index a8b3c6b..595806b 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>

src/mainboard/google/link/romstage.c

diff --git a/src/mainboard/google/link/romstage.c b/src/mainboard/google/link/romstage.c
index 176be9d..b8c13a1 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>

src/mainboard/google/parrot/romstage.c

diff --git a/src/mainboard/google/parrot/romstage.c b/src/mainboard/google/parrot/romstage.c
index bceaa88..143baf7 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>

src/mainboard/google/stout/romstage.c

diff --git a/src/mainboard/google/stout/romstage.c b/src/mainboard/google/stout/romstage.c
index a534f0f..a0e828d 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>

src/mainboard/hp/dl165_g6_fam10/romstage.c

diff --git a/src/mainboard/hp/dl165_g6_fam10/romstage.c b/src/mainboard/hp/dl165_g6_fam10/romstage.c
index 7a9d37f..1b2b40b 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>

src/mainboard/iei/kino-780am2-fam10/romstage.c

diff --git a/src/mainboard/iei/kino-780am2-fam10/romstage.c b/src/mainboard/iei/kino-780am2-fam10/romstage.c
index 52cbe4b..fc1b32f 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>

src/mainboard/intel/bayleybay_fsp/romstage.c

diff --git a/src/mainboard/intel/bayleybay_fsp/romstage.c b/src/mainboard/intel/bayleybay_fsp/romstage.c
index 84f7054..19a14cb 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>

src/mainboard/intel/emeraldlake2/romstage.c

diff --git a/src/mainboard/intel/emeraldlake2/romstage.c b/src/mainboard/intel/emeraldlake2/romstage.c
index fa511fa..9d8ecdf 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>

src/mainboard/intel/galileo/vboot.c

diff --git a/src/mainboard/intel/galileo/vboot.c b/src/mainboard/intel/galileo/vboot.c
index 124782d..a5b74a0 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"

src/mainboard/intel/minnowmax/acpi_tables.c

diff --git a/src/mainboard/intel/minnowmax/acpi_tables.c b/src/mainboard/intel/minnowmax/acpi_tables.c
index 88ede97..a7f71e2 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>

src/mainboard/intel/saddlebrook/romstage.c

diff --git a/src/mainboard/intel/saddlebrook/romstage.c b/src/mainboard/intel/saddlebrook/romstage.c
index 49fa5e3..f65b52d 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)

src/mainboard/intel/stargo2/romstage.c

diff --git a/src/mainboard/intel/stargo2/romstage.c b/src/mainboard/intel/stargo2/romstage.c
index fea3872..56f0fc0 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>

src/mainboard/intel/strago/romstage.c

diff --git a/src/mainboard/intel/strago/romstage.c b/src/mainboard/intel/strago/romstage.c
index 429187b..b702310 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>

src/mainboard/jetway/pa78vm5/romstage.c

diff --git a/src/mainboard/jetway/pa78vm5/romstage.c b/src/mainboard/jetway/pa78vm5/romstage.c
index 9f6c160..f75c5a4 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>

src/mainboard/kontron/ktqm77/romstage.c

diff --git a/src/mainboard/kontron/ktqm77/romstage.c b/src/mainboard/kontron/ktqm77/romstage.c
index 8995aa2..f6b9cc5 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>

src/mainboard/lenovo/s230u/romstage.c

diff --git a/src/mainboard/lenovo/s230u/romstage.c b/src/mainboard/lenovo/s230u/romstage.c
index f4241db..207333d 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>

src/mainboard/lenovo/t400/romstage.c

diff --git a/src/mainboard/lenovo/t400/romstage.c b/src/mainboard/lenovo/t400/romstage.c
index 60e51c9..6d93112 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>

src/mainboard/lenovo/t520/romstage.c

diff --git a/src/mainboard/lenovo/t520/romstage.c b/src/mainboard/lenovo/t520/romstage.c
index 0ad74f5..d4c2f91 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>

src/mainboard/lenovo/t60/romstage.c

diff --git a/src/mainboard/lenovo/t60/romstage.c b/src/mainboard/lenovo/t60/romstage.c
index 199831c..3b806f9 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>

src/mainboard/lenovo/x1_carbon_gen1/romstage.c

diff --git a/src/mainboard/lenovo/x1_carbon_gen1/romstage.c b/src/mainboard/lenovo/x1_carbon_gen1/romstage.c
index 90bf2eb..e996974 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>

src/mainboard/lenovo/x200/romstage.c

diff --git a/src/mainboard/lenovo/x200/romstage.c b/src/mainboard/lenovo/x200/romstage.c
index 6a230c9..8176fad 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>

src/mainboard/lenovo/x220/romstage.c

diff --git a/src/mainboard/lenovo/x220/romstage.c b/src/mainboard/lenovo/x220/romstage.c
index 36fd3ca..3429aad 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>

src/mainboard/lenovo/x230/romstage.c

diff --git a/src/mainboard/lenovo/x230/romstage.c b/src/mainboard/lenovo/x230/romstage.c
index 4c94641..daf6aa3 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>

src/mainboard/lenovo/x60/romstage.c

diff --git a/src/mainboard/lenovo/x60/romstage.c b/src/mainboard/lenovo/x60/romstage.c
index fb2b9e1..d6674fe 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>

src/mainboard/lenovo/z61t/romstage.c

diff --git a/src/mainboard/lenovo/z61t/romstage.c b/src/mainboard/lenovo/z61t/romstage.c
index 9a4be1e..20dbaba 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>

src/mainboard/msi/ms9652_fam10/romstage.c

diff --git a/src/mainboard/msi/ms9652_fam10/romstage.c b/src/mainboard/msi/ms9652_fam10/romstage.c
index 803ff3a..7caf6cd 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>

src/mainboard/pcengines/alix1c/romstage.c

diff --git a/src/mainboard/pcengines/alix1c/romstage.c b/src/mainboard/pcengines/alix1c/romstage.c
index e482840..ba2541a 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>

src/mainboard/pcengines/alix2d/romstage.c

diff --git a/src/mainboard/pcengines/alix2d/romstage.c b/src/mainboard/pcengines/alix2d/romstage.c
index 9bb9c00..9d3e965 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>

src/mainboard/roda/rk886ex/romstage.c

diff --git a/src/mainboard/roda/rk886ex/romstage.c b/src/mainboard/roda/rk886ex/romstage.c
index a0792ac..6e9cc83 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>

src/mainboard/roda/rk9/romstage.c

diff --git a/src/mainboard/roda/rk9/romstage.c b/src/mainboard/roda/rk9/romstage.c
index 4f6c5b7..1bcfd62 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>

src/mainboard/samsung/lumpy/romstage.c

diff --git a/src/mainboard/samsung/lumpy/romstage.c b/src/mainboard/samsung/lumpy/romstage.c
index b95a990..ceb1f6d 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>

src/mainboard/samsung/stumpy/romstage.c

diff --git a/src/mainboard/samsung/stumpy/romstage.c b/src/mainboard/samsung/stumpy/romstage.c
index c47c6ff..e810fee 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>

src/mainboard/sapphire/pureplatinumh61/romstage.c

diff --git a/src/mainboard/sapphire/pureplatinumh61/romstage.c b/src/mainboard/sapphire/pureplatinumh61/romstage.c
index da825a9..abf97f3 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>

src/mainboard/siemens/mc_apl1/romstage.c

diff --git a/src/mainboard/siemens/mc_apl1/romstage.c b/src/mainboard/siemens/mc_apl1/romstage.c
index 87e41dc..1483636 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>

src/mainboard/siemens/mc_apl1/variants/mc_apl1/ptn3460.c

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 829af2a..e95b752 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>

src/mainboard/siemens/mc_tcu3/romstage.c

diff --git a/src/mainboard/siemens/mc_tcu3/romstage.c b/src/mainboard/siemens/mc_tcu3/romstage.c
index 2e7ec7a..69e7d21 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>

src/mainboard/supermicro/h8dmr_fam10/romstage.c

diff --git a/src/mainboard/supermicro/h8dmr_fam10/romstage.c b/src/mainboard/supermicro/h8dmr_fam10/romstage.c
index 9ad8652..dea481f 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>

src/mainboard/supermicro/h8qme_fam10/romstage.c

diff --git a/src/mainboard/supermicro/h8qme_fam10/romstage.c b/src/mainboard/supermicro/h8qme_fam10/romstage.c
index c6e01e6..127b76f 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>

src/mainboard/supermicro/h8scm_fam10/romstage.c

diff --git a/src/mainboard/supermicro/h8scm_fam10/romstage.c b/src/mainboard/supermicro/h8scm_fam10/romstage.c
index dc19870..3eeaeda 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>

src/mainboard/tyan/s2912_fam10/romstage.c

diff --git a/src/mainboard/tyan/s2912_fam10/romstage.c b/src/mainboard/tyan/s2912_fam10/romstage.c
index aa3b010..1734b3a 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>

src/northbridge/amd/amdfam10/link_control.c

diff --git a/src/northbridge/amd/amdfam10/link_control.c b/src/northbridge/amd/amdfam10/link_control.c
index a7fbe4c..f82f238 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"

src/northbridge/amd/amdfam10/nb_control.c

diff --git a/src/northbridge/amd/amdfam10/nb_control.c b/src/northbridge/amd/amdfam10/nb_control.c
index 1884799..255948d 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"

src/northbridge/intel/i945/debug.c

diff --git a/src/northbridge/intel/i945/debug.c b/src/northbridge/intel/i945/debug.c
index 0f388df..ef4f17b 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>

src/northbridge/intel/sandybridge/romstage.c

diff --git a/src/northbridge/intel/sandybridge/romstage.c b/src/northbridge/intel/sandybridge/romstage.c
index 63108de..7345443 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"

src/northbridge/intel/x4x/raminit.c

diff --git a/src/northbridge/intel/x4x/raminit.c b/src/northbridge/intel/x4x/raminit.c
index ce5c2eb..c97c139 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 */

src/northbridge/via/vx900/northbridge.c

diff --git a/src/northbridge/via/vx900/northbridge.c b/src/northbridge/via/vx900/northbridge.c
index a699d86..2b81b47 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>
 

src/soc/intel/common/block/cpu/cpulib.c

diff --git a/src/soc/intel/common/block/cpu/cpulib.c b/src/soc/intel/common/block/cpu/cpulib.c
index 62b70be..0c042df 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>

src/soc/intel/denverton_ns/bootblock/bootblock.c

diff --git a/src/soc/intel/denverton_ns/bootblock/bootblock.c b/src/soc/intel/denverton_ns/bootblock/bootblock.c
index 7325ecb..110d67d 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>

src/soc/intel/fsp_broadwell_de/chip.c

diff --git a/src/soc/intel/fsp_broadwell_de/chip.c b/src/soc/intel/fsp_broadwell_de/chip.c
index 2564944..5cdedca 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>

src/soc/nvidia/tegra124/display.c

diff --git a/src/soc/nvidia/tegra124/display.c b/src/soc/nvidia/tegra124/display.c
index ceb1547..061d167 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>

src/soc/nvidia/tegra124/sor.c

diff --git a/src/soc/nvidia/tegra124/sor.c b/src/soc/nvidia/tegra124/sor.c
index d9137ad..b93b39d 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>

src/soc/nvidia/tegra210/dsi.c

diff --git a/src/soc/nvidia/tegra210/dsi.c b/src/soc/nvidia/tegra210/dsi.c
index 205bc1e..3f52567 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>

src/soc/nvidia/tegra210/include/soc/mipi_dsi.h

diff --git a/src/soc/nvidia/tegra210/include/soc/mipi_dsi.h b/src/soc/nvidia/tegra210/include/soc/mipi_dsi.h
index b6d0c10..eed9ed7 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;
 

src/soc/nvidia/tegra210/jdi_25x18_display/panel-jdi-lpm102a188a.c

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 fc48aa7..d5db769 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>

src/soc/nvidia/tegra210/mipi-phy.c

diff --git a/src/soc/nvidia/tegra210/mipi-phy.c b/src/soc/nvidia/tegra210/mipi-phy.c
index d5a7255..de27e07 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>

src/soc/nvidia/tegra210/mipi.c

diff --git a/src/soc/nvidia/tegra210/mipi.c b/src/soc/nvidia/tegra210/mipi.c
index 89447e2..b19db43 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>

src/soc/nvidia/tegra210/mipi_dsi.c

diff --git a/src/soc/nvidia/tegra210/mipi_dsi.c b/src/soc/nvidia/tegra210/mipi_dsi.c
index f81cb32..e0924d8 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>

src/soc/nvidia/tegra210/sor.c

diff --git a/src/soc/nvidia/tegra210/sor.c b/src/soc/nvidia/tegra210/sor.c
index cf34064..87eb537 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>

src/soc/samsung/exynos5420/dp.c

diff --git a/src/soc/samsung/exynos5420/dp.c b/src/soc/samsung/exynos5420/dp.c
index 64dfc39..51963fa 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>

src/southbridge/amd/sr5650/ht.c

diff --git a/src/southbridge/amd/sr5650/ht.c b/src/southbridge/amd/sr5650/ht.c
index 563c67d..1b4c99b 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"