diff --git a/src/arch/arm/armv7/exception.c b/src/arch/arm/armv7/exception.c
index 39ef16da22..799ae027c9 100644
--- a/src/arch/arm/armv7/exception.c
+++ b/src/arch/arm/armv7/exception.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 
-#include <stdint.h>
 #include <types.h>
 #include <arch/cache.h>
 #include <arch/exception.h>
diff --git a/src/arch/arm64/armv8/exception.c b/src/arch/arm64/armv8/exception.c
index db399fe699..88e68e759e 100644
--- a/src/arch/arm64/armv8/exception.c
+++ b/src/arch/arm64/armv8/exception.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 
-#include <stdint.h>
 #include <types.h>
 #include <arch/barrier.h>
 #include <arch/exception.h>
diff --git a/src/device/pci_device.c b/src/device/pci_device.c
index e6c6ff31a4..f83520e079 100644
--- a/src/device/pci_device.c
+++ b/src/device/pci_device.c
@@ -11,7 +11,6 @@
 #include <console/console.h>
 #include <cpu/cpu.h>
 #include <stdlib.h>
-#include <stdint.h>
 #include <string.h>
 #include <delay.h>
 #include <device/cardbus.h>
diff --git a/src/drivers/i2c/tpm/tpm.c b/src/drivers/i2c/tpm/tpm.c
index 41d4577b48..78ac224eda 100644
--- a/src/drivers/i2c/tpm/tpm.c
+++ b/src/drivers/i2c/tpm/tpm.c
@@ -17,7 +17,6 @@
 
 
 #include <commonlib/endian.h>
-#include <stdint.h>
 #include <string.h>
 #include <types.h>
 #include <delay.h>
diff --git a/src/drivers/intel/fsp2_0/include/fsp/info_header.h b/src/drivers/intel/fsp2_0/include/fsp/info_header.h
index f6f66cea37..7755d2a2f9 100644
--- a/src/drivers/intel/fsp2_0/include/fsp/info_header.h
+++ b/src/drivers/intel/fsp2_0/include/fsp/info_header.h
@@ -3,7 +3,6 @@
 #ifndef _FSP2_0_INFO_HEADER_H_
 #define _FSP2_0_INFO_HEADER_H_
 
-#include <stdint.h>
 #include <types.h>
 
 #define FSP_HDR_OFFSET			0x94
diff --git a/src/drivers/tpm/tpm.c b/src/drivers/tpm/tpm.c
index ad4a54c770..d3485bbec9 100644
--- a/src/drivers/tpm/tpm.c
+++ b/src/drivers/tpm/tpm.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <types.h>
-#include <stddef.h>
 #include <bootstate.h>
 #include <security/tpm/tspi.h>
 
diff --git a/src/drivers/uart/pl011.h b/src/drivers/uart/pl011.h
index 7b573a4eda..d4d54c45f4 100644
--- a/src/drivers/uart/pl011.h
+++ b/src/drivers/uart/pl011.h
@@ -7,7 +7,6 @@
 #ifndef __DRIVERS_UART_PL011_H
 #define __DRIVERS_UART_PL011_H
 
-#include <stdint.h>
 #include <types.h>
 
 /* PL011 r1p5 registers */
diff --git a/src/ec/google/wilco/commands.h b/src/ec/google/wilco/commands.h
index 912e88a1ec..a2163459e1 100644
--- a/src/ec/google/wilco/commands.h
+++ b/src/ec/google/wilco/commands.h
@@ -3,7 +3,6 @@
 #ifndef EC_GOOGLE_WILCO_COMMANDS_H
 #define EC_GOOGLE_WILCO_COMMANDS_H
 
-#include <stdint.h>
 #include <types.h>
 
 enum {
diff --git a/src/ec/google/wilco/mailbox.c b/src/ec/google/wilco/mailbox.c
index c592d81f76..f7aac863de 100644
--- a/src/ec/google/wilco/mailbox.c
+++ b/src/ec/google/wilco/mailbox.c
@@ -4,7 +4,6 @@
 #include <console/console.h>
 #include <delay.h>
 #include <ec/google/common/mec.h>
-#include <stdint.h>
 #include <string.h>
 #include <timer.h>
 #include <types.h>
diff --git a/src/include/device/dram/ddr3.h b/src/include/device/dram/ddr3.h
index 08b7b7c72c..a209e48b8b 100644
--- a/src/include/device/dram/ddr3.h
+++ b/src/include/device/dram/ddr3.h
@@ -15,7 +15,6 @@
  * \brief Utilities for decoding DDR3 SPDs
  */
 
-#include <stdint.h>
 #include <spd.h>
 #include <device/dram/common.h>
 #include <types.h>
diff --git a/src/include/device/dram/ddr4.h b/src/include/device/dram/ddr4.h
index 51fd7bff6d..f258fa9f09 100644
--- a/src/include/device/dram/ddr4.h
+++ b/src/include/device/dram/ddr4.h
@@ -14,7 +14,6 @@
  * \brief Utilities for decoding DDR4 SPDs
  */
 
-#include <stdint.h>
 #include <spd.h>
 #include <device/dram/common.h>
 #include <types.h>
diff --git a/src/include/lib.h b/src/include/lib.h
index d7b6b14b91..0d6fdb14be 100644
--- a/src/include/lib.h
+++ b/src/include/lib.h
@@ -4,7 +4,7 @@
 
 #ifndef __LIB_H__
 #define __LIB_H__
-#include <stdint.h>
+
 #include <types.h>
 
 /* Defined in src/lib/lzma.c. Returns decompressed size or 0 on error. */
diff --git a/src/mainboard/supermicro/x10slm-f/mainboard.c b/src/mainboard/supermicro/x10slm-f/mainboard.c
index 7d840f5c32..2f206060b7 100644
--- a/src/mainboard/supermicro/x10slm-f/mainboard.c
+++ b/src/mainboard/supermicro/x10slm-f/mainboard.c
@@ -3,7 +3,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <option.h>
-#include <stdint.h>
 #include <types.h>
 
 /*
diff --git a/src/northbridge/intel/x4x/dq_dqs.c b/src/northbridge/intel/x4x/dq_dqs.c
index 7df259172a..dda41744ae 100644
--- a/src/northbridge/intel/x4x/dq_dqs.c
+++ b/src/northbridge/intel/x4x/dq_dqs.c
@@ -3,7 +3,6 @@
 #include <device/mmio.h>
 #include <console/console.h>
 #include <delay.h>
-#include <stdint.h>
 #include <string.h>
 #include <types.h>
 #include "x4x.h"
diff --git a/src/security/tpm/tss.h b/src/security/tpm/tss.h
index f644e3e7e7..4a8206d056 100644
--- a/src/security/tpm/tss.h
+++ b/src/security/tpm/tss.h
@@ -9,7 +9,6 @@
 #ifndef TSS_H_
 #define TSS_H_
 
-#include <stdint.h>
 #include <types.h>
 
 #include <security/tpm/tss/common/tss_common.h>
diff --git a/src/security/tpm/tss/tcg-2.0/tss_structures.h b/src/security/tpm/tss/tcg-2.0/tss_structures.h
index f8c6012990..1c7aa4b48f 100644
--- a/src/security/tpm/tss/tcg-2.0/tss_structures.h
+++ b/src/security/tpm/tss/tcg-2.0/tss_structures.h
@@ -7,7 +7,6 @@
  * This file includes a subset of definitions of TPM protocol version 2.x
  * constants and structures needed for functions used in coreboot.
  */
-#include <stdint.h>
 #include <types.h>
 #include "../common/tss_common.h"
 
diff --git a/src/soc/amd/common/block/include/amdblocks/acpimmio.h b/src/soc/amd/common/block/include/amdblocks/acpimmio.h
index 0d41782003..84a9360d1b 100644
--- a/src/soc/amd/common/block/include/amdblocks/acpimmio.h
+++ b/src/soc/amd/common/block/include/amdblocks/acpimmio.h
@@ -4,7 +4,6 @@
 #define __AMDBLOCKS_ACPIMMIO_H__
 
 #include <device/mmio.h>
-#include <stdint.h>
 #include <types.h>
 #include <amdblocks/acpimmio_map.h>
 
diff --git a/src/soc/amd/common/block/include/amdblocks/lpc.h b/src/soc/amd/common/block/include/amdblocks/lpc.h
index 11acc78228..7412e7bb1b 100644
--- a/src/soc/amd/common/block/include/amdblocks/lpc.h
+++ b/src/soc/amd/common/block/include/amdblocks/lpc.h
@@ -4,7 +4,6 @@
 #define __AMDBLOCKS_LPC_H__
 
 #include <types.h>
-#include <stdint.h>
 
 /* PCI registers for D14F3 */
 #define LPC_PCI_CONTROL			0x40
diff --git a/src/soc/amd/common/block/lpc/espi_util.c b/src/soc/amd/common/block/lpc/espi_util.c
index 5ca0d2831a..3750a8b7f9 100644
--- a/src/soc/amd/common/block/lpc/espi_util.c
+++ b/src/soc/amd/common/block/lpc/espi_util.c
@@ -7,8 +7,6 @@
 #include <console/console.h>
 #include <espi.h>
 #include <soc/pci_devs.h>
-#include <stddef.h>
-#include <stdint.h>
 #include <timer.h>
 #include <types.h>
 
diff --git a/src/soc/cavium/cn81xx/include/soc/soc.h b/src/soc/cavium/cn81xx/include/soc/soc.h
index 39395171f7..78343fd705 100644
--- a/src/soc/cavium/cn81xx/include/soc/soc.h
+++ b/src/soc/cavium/cn81xx/include/soc/soc.h
@@ -3,7 +3,6 @@
 #ifndef __SOC_CAVIUM_CN81XX_INCLUDE_SOC_SOC_H
 #define __SOC_CAVIUM_CN81XX_INCLUDE_SOC_SOC_H
 
-#include <stdint.h>
 #include <types.h>
 
 /* MIO BOOT Registers */
diff --git a/src/soc/cavium/cn81xx/include/soc/timer.h b/src/soc/cavium/cn81xx/include/soc/timer.h
index 99dbb6ad5a..d7225692f9 100644
--- a/src/soc/cavium/cn81xx/include/soc/timer.h
+++ b/src/soc/cavium/cn81xx/include/soc/timer.h
@@ -3,7 +3,6 @@
 #ifndef __SOC_CAVIUM_CN81XX_TIMER_H__
 #define __SOC_CAVIUM_CN81XX_TIMER_H__
 
-#include <stdint.h>
 #include <types.h>
 
 /* Watchdog functions */
diff --git a/src/soc/cavium/cn81xx/include/soc/uart.h b/src/soc/cavium/cn81xx/include/soc/uart.h
index db1a51eb90..afafd0ec1b 100644
--- a/src/soc/cavium/cn81xx/include/soc/uart.h
+++ b/src/soc/cavium/cn81xx/include/soc/uart.h
@@ -3,7 +3,6 @@
 #ifndef __SOC_CAVIUM_COMMON_INCLUDE_SOC_UART_H
 #define __SOC_CAVIUM_COMMON_INCLUDE_SOC_UART_H
 
-#include <stdint.h>
 #include <types.h>
 
 int uart_is_enabled(const size_t bus);
diff --git a/src/soc/intel/common/block/include/intelblocks/cse.h b/src/soc/intel/common/block/include/intelblocks/cse.h
index 9f85730e3f..a1dc3d9d56 100644
--- a/src/soc/intel/common/block/include/intelblocks/cse.h
+++ b/src/soc/intel/common/block/include/intelblocks/cse.h
@@ -3,7 +3,6 @@
 #ifndef SOC_INTEL_COMMON_CSE_H
 #define SOC_INTEL_COMMON_CSE_H
 
-#include <stdint.h>
 #include <types.h>
 
 /* MKHI Command groups */
diff --git a/src/soc/mediatek/mt8173/flash_controller.c b/src/soc/mediatek/mt8173/flash_controller.c
index c1f2dae7f3..64eff2e309 100644
--- a/src/soc/mediatek/mt8173/flash_controller.c
+++ b/src/soc/mediatek/mt8173/flash_controller.c
@@ -7,7 +7,6 @@
 #include <console/console.h>
 #include <spi_flash.h>
 #include <spi-generic.h>
-#include <stdint.h>
 #include <string.h>
 #include <symbols.h>
 #include <timer.h>
diff --git a/src/soc/mediatek/mt8173/include/soc/dramc_register.h b/src/soc/mediatek/mt8173/include/soc/dramc_register.h
index 5841b24be7..cabc1dcd19 100644
--- a/src/soc/mediatek/mt8173/include/soc/dramc_register.h
+++ b/src/soc/mediatek/mt8173/include/soc/dramc_register.h
@@ -3,7 +3,6 @@
 #ifndef _DRAMC_REGISTER_H_
 #define _DRAMC_REGISTER_H_
 
-#include <stddef.h>
 #include <types.h>
 
 #define DRIVING_DS2_0	    7	/* DS[2:0] 7->6 */
diff --git a/src/soc/mediatek/mt8173/include/soc/emi.h b/src/soc/mediatek/mt8173/include/soc/emi.h
index 8f12ee3ad9..1cc2577a94 100644
--- a/src/soc/mediatek/mt8173/include/soc/emi.h
+++ b/src/soc/mediatek/mt8173/include/soc/emi.h
@@ -4,7 +4,6 @@
 #define SOC_MEDIATEK_MT8173_EMI_H
 
 #include <soc/dramc_common.h>
-#include <stdint.h>
 #include <types.h>
 
 /* DDR type */
diff --git a/src/soc/mediatek/mt8183/include/soc/emi.h b/src/soc/mediatek/mt8183/include/soc/emi.h
index e775973b4c..b2d78b965f 100644
--- a/src/soc/mediatek/mt8183/include/soc/emi.h
+++ b/src/soc/mediatek/mt8183/include/soc/emi.h
@@ -3,7 +3,6 @@
 #ifndef SOC_MEDIATEK_MT8183_EMI_H
 #define SOC_MEDIATEK_MT8183_EMI_H
 
-#include <stdint.h>
 #include <types.h>
 #include <soc/dramc_common_mt8183.h>
 
diff --git a/src/soc/mediatek/mt8183/include/soc/spm.h b/src/soc/mediatek/mt8183/include/soc/spm.h
index e09d451ccf..fa6d6d00ce 100644
--- a/src/soc/mediatek/mt8183/include/soc/spm.h
+++ b/src/soc/mediatek/mt8183/include/soc/spm.h
@@ -4,7 +4,6 @@
 #define SOC_MEDIATEK_MT8183_SPM_H
 
 #include <soc/addressmap.h>
-#include <stdint.h>
 #include <types.h>
 
 /* SPM READ/WRITE CFG */
diff --git a/src/soc/nvidia/tegra/dc.h b/src/soc/nvidia/tegra/dc.h
index f0f5b11172..27bbee80e6 100644
--- a/src/soc/nvidia/tegra/dc.h
+++ b/src/soc/nvidia/tegra/dc.h
@@ -2,8 +2,8 @@
 
 #ifndef __SOC_NVIDIA_TEGRA_DC_H
 #define __SOC_NVIDIA_TEGRA_DC_H
+
 #include <device/device.h>
-#include <stddef.h>
 #include <types.h>
 
 /* Register definitions for the Tegra display controller */
diff --git a/src/soc/nvidia/tegra124/spi.c b/src/soc/nvidia/tegra124/spi.c
index 6a2572167e..adf0248849 100644
--- a/src/soc/nvidia/tegra124/spi.c
+++ b/src/soc/nvidia/tegra124/spi.c
@@ -7,7 +7,6 @@
 #include <boot_device.h>
 #include <console/console.h>
 #include <delay.h>
-#include <stdint.h>
 #include <soc/addressmap.h>
 #include <soc/dma.h>
 #include <soc/spi.h>
diff --git a/src/soc/nvidia/tegra210/include/soc/dma.h b/src/soc/nvidia/tegra210/include/soc/dma.h
index 3add2baf99..b06cec6212 100644
--- a/src/soc/nvidia/tegra210/include/soc/dma.h
+++ b/src/soc/nvidia/tegra210/include/soc/dma.h
@@ -3,7 +3,6 @@
 #ifndef __NVIDIA_TEGRA210_DMA_H__
 #define __NVIDIA_TEGRA210_DMA_H__
 
-#include <stdint.h>
 #include <soc/addressmap.h>
 #include <types.h>
 
diff --git a/src/soc/nvidia/tegra210/spi.c b/src/soc/nvidia/tegra210/spi.c
index eae8f39cc9..8fde9c2ea7 100644
--- a/src/soc/nvidia/tegra210/spi.c
+++ b/src/soc/nvidia/tegra210/spi.c
@@ -7,7 +7,6 @@
 #include <boot_device.h>
 #include <console/console.h>
 #include <delay.h>
-#include <stdint.h>
 #include <spi-generic.h>
 #include <spi_flash.h>
 #include <soc/addressmap.h>