13 files changed, 18 insertions, 4 deletions
diff --git a/src/device/dram/ddr2.c b/src/device/dram/ddr2.c
index 53106f23f9..60588b880b 100644
--- a/src/device/dram/ddr2.c
+++ b/src/device/dram/ddr2.c
@@ -26,6 +26,7 @@
 #include <device/dram/ddr2.h>
 #include <lib.h>
 #include <string.h>
+#include <types.h>
 
 /*==============================================================================
  * = DDR2 SPD decoding helpers
diff --git a/src/device/dram/ddr3.c b/src/device/dram/ddr3.c
index e545b4d036..3272dac6d7 100644
--- a/src/device/dram/ddr3.c
+++ b/src/device/dram/ddr3.c
@@ -27,6 +27,7 @@
 #include <memory_info.h>
 #include <cbmem.h>
 #include <smbios.h>
+#include <types.h>
 
 /*==============================================================================
  * = DDR3 SPD decoding helpers
diff --git a/src/drivers/generic/bayhub/bh720.h b/src/drivers/generic/bayhub/bh720.h
index 3183bf1a84..ecea513bfb 100644
--- a/src/drivers/generic/bayhub/bh720.h
+++ b/src/drivers/generic/bayhub/bh720.h
@@ -15,6 +15,8 @@
  * GNU General Public License for more details.
  */
 
+#include <types.h>
+
 enum {
 	BH720_PROTECT                   = 0xd0,
 	BH720_PROTECT_LOCK_OFF          = 0,
diff --git a/src/drivers/intel/fsp2_0/graphics.c b/src/drivers/intel/fsp2_0/graphics.c
index e0c63d2570..55dc6dfddc 100644
--- a/src/drivers/intel/fsp2_0/graphics.c
+++ b/src/drivers/intel/fsp2_0/graphics.c
@@ -13,6 +13,7 @@
 #include <console/console.h>
 #include <fsp/util.h>
 #include <soc/intel/common/vbt.h>
+#include <types.h>
 
 enum pixel_format {
 	pixel_rgbx_8bpc = 0,
diff --git a/src/drivers/intel/fsp2_0/include/fsp/util.h b/src/drivers/intel/fsp2_0/include/fsp/util.h
index 231162ed17..ef7ecd163f 100644
--- a/src/drivers/intel/fsp2_0/include/fsp/util.h
+++ b/src/drivers/intel/fsp2_0/include/fsp/util.h
@@ -19,6 +19,7 @@
 #include <fsp/api.h>
 #include <fsp/info_header.h>
 #include <memrange.h>
+#include <types.h>
 
 struct hob_header {
 	uint16_t type;
diff --git a/src/drivers/intel/fsp2_0/memory_init.c b/src/drivers/intel/fsp2_0/memory_init.c
index 60e3310a4d..f248a58c77 100644
--- a/src/drivers/intel/fsp2_0/memory_init.c
+++ b/src/drivers/intel/fsp2_0/memory_init.c
@@ -32,6 +32,7 @@
 #include <security/tpm/tspi.h>
 #include <vb2_api.h>
 #include <fsp/memory_init.h>
+#include <types.h>
 
 /* TPM MRC hash functionality depends on vboot starting before memory init. */
 _Static_assert(!CONFIG(FSP2_0_USES_TPM_MRC_HASH) ||
diff --git a/src/drivers/intel/fsp2_0/silicon_init.c b/src/drivers/intel/fsp2_0/silicon_init.c
index 302bc0f3ad..e72e4ac163 100644
--- a/src/drivers/intel/fsp2_0/silicon_init.c
+++ b/src/drivers/intel/fsp2_0/silicon_init.c
@@ -22,6 +22,7 @@
 #include <stage_cache.h>
 #include <string.h>
 #include <timestamp.h>
+#include <types.h>
 
 struct fsp_header fsps_hdr;
 
diff --git a/src/drivers/intel/fsp2_0/temp_ram_exit.c b/src/drivers/intel/fsp2_0/temp_ram_exit.c
index ced3584fd0..075e923f84 100644
--- a/src/drivers/intel/fsp2_0/temp_ram_exit.c
+++ b/src/drivers/intel/fsp2_0/temp_ram_exit.c
@@ -15,6 +15,7 @@
 #include <fsp/util.h>
 #include <memrange.h>
 #include <cbfs.h>
+#include <types.h>
 
 void fsp_temp_ram_exit(void)
 {
diff --git a/src/drivers/intel/fsp2_0/util.c b/src/drivers/intel/fsp2_0/util.c
index 19b8127ac5..f670e6facd 100644
--- a/src/drivers/intel/fsp2_0/util.c
+++ b/src/drivers/intel/fsp2_0/util.c
@@ -16,6 +16,7 @@
 #include <console/console.h>
 #include <fsp/util.h>
 #include <string.h>
+#include <types.h>
 
 static bool looks_like_fsp_header(const uint8_t *raw_hdr)
 {
diff --git a/src/drivers/net/atl1e.c b/src/drivers/net/atl1e.c
index f6f04a1035..097b768b12 100644
--- a/src/drivers/net/atl1e.c
+++ b/src/drivers/net/atl1e.c
@@ -26,6 +26,7 @@
 #include <console/console.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
+#include <types.h>
 
 #define REG_SPI_FLASH_CTRL		0x200
 #define SPI_FLASH_CTRL_EN_VPD		0x2000
diff --git a/src/drivers/net/r8168.c b/src/drivers/net/r8168.c
index 3200163ab3..3188778900 100644
--- a/src/drivers/net/r8168.c
+++ b/src/drivers/net/r8168.c
@@ -33,6 +33,8 @@
 #include <device/pci_def.h>
 #include <delay.h>
 #include <fmap.h>
+#include <types.h>
+
 #include "chip.h"
 
 #define NIC_TIMEOUT		1000
diff --git a/src/drivers/pc80/rtc/mc146818rtc.c b/src/drivers/pc80/rtc/mc146818rtc.c
index 6e37cd2f78..e0869a9337 100644
--- a/src/drivers/pc80/rtc/mc146818rtc.c
+++ b/src/drivers/pc80/rtc/mc146818rtc.c
@@ -19,7 +19,6 @@
 #include <arch/io.h>
 #include <bcd.h>
 #include <fallback.h>
-#include <stdint.h>
 #include <version.h>
 #include <console/console.h>
 #include <pc80/mc146818rtc.h>
@@ -29,6 +28,7 @@
 #include <cbfs.h>
 #include <security/vboot/vbnv.h>
 #include <security/vboot/vbnv_layout.h>
+#include <types.h>
 
 /* There's no way around this include guard. option_table.h is autogenerated */
 #if CONFIG(USE_OPTION_TABLE)
diff --git a/src/drivers/xpowers/axp209/axp209.c b/src/drivers/xpowers/axp209/axp209.c
index da575ccffd..93e864dff7 100644
--- a/src/drivers/xpowers/axp209/axp209.c
+++ b/src/drivers/xpowers/axp209/axp209.c
@@ -8,12 +8,13 @@
  * Subject to the GNU GPL v2, or (at your option) any later version.
  */
 
-#include "axp209.h"
-#include "chip.h"
-
 #include <console/console.h>
 #include <device/device.h>
 #include <device/i2c_simple.h>
+#include <types.h>
+
+#include "axp209.h"
+#include "chip.h"
 
 /* Hide these definitions from the rest of the source, so keep them here */
 enum registers {