13 files changed, 4 insertions, 12 deletions

diff --git a/src/soc/intel/common/block/cpu/cpulib.c b/src/soc/intel/common/block/cpu/cpulib.c
index 62b70be98e..0c042df8b2 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 7325ecb571..110d67d6de 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 2564944aef..5cdedcaadb 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 ceb1547fd8..061d16747e 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 d9137adfe4..b93b39d83d 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 205bc1e1db..3f5256796e 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 b6d0c10d7a..eed9ed7d03 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 fc48aa7849..d5db769735 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 d5a7255ed4..de27e07645 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 89447e26fe..b19db43885 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 f81cb32584..e0924d8e56 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 cf34064a92..87eb5370d8 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 64dfc394a4..51963fa94f 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>