diff --git a/src/acpi/gnvs.c b/src/acpi/gnvs.c
index 8024783af7..6de345fad1 100644
--- a/src/acpi/gnvs.c
+++ b/src/acpi/gnvs.c
@@ -5,7 +5,6 @@
 #include <cbmem.h>
 #include <console/console.h>
 #include <soc/nvs.h>
-#include <stdint.h>
 #include <string.h>
 #include <types.h>
 
diff --git a/src/arch/x86/include/arch/cpu.h b/src/arch/x86/include/arch/cpu.h
index 9a3b63d6b3..d3f50bf794 100644
--- a/src/arch/x86/include/arch/cpu.h
+++ b/src/arch/x86/include/arch/cpu.h
@@ -3,7 +3,6 @@
 #ifndef ARCH_CPU_H
 #define ARCH_CPU_H
 
-#include <stdint.h>
 #include <types.h>
 
 /*
diff --git a/src/drivers/tpm/ppi.c b/src/drivers/tpm/ppi.c
index 88dd649954..6b02d45247 100644
--- a/src/drivers/tpm/ppi.c
+++ b/src/drivers/tpm/ppi.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <types.h>
-#include <stddef.h>
 #include <acpi/acpi.h>
 #include <acpi/acpigen.h>
 #include <acpi/acpi_device.h>
diff --git a/src/drivers/tpm/ppi_stub.c b/src/drivers/tpm/ppi_stub.c
index 1e3a7fcb27..23236ff555 100644
--- a/src/drivers/tpm/ppi_stub.c
+++ b/src/drivers/tpm/ppi_stub.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <types.h>
-#include <stddef.h>
 #include <acpi/acpi.h>
 #include <acpi/acpigen.h>
 #include <acpi/acpi_device.h>
diff --git a/src/include/thread.h b/src/include/thread.h
index 4f10782415..f414db0281 100644
--- a/src/include/thread.h
+++ b/src/include/thread.h
@@ -4,7 +4,6 @@
 
 #include <arch/cpu.h>
 #include <bootstate.h>
-#include <commonlib/bsd/cb_err.h>
 #include <types.h>
 
 struct thread_mutex {
diff --git a/src/mainboard/emulation/qemu-i440fx/northbridge.c b/src/mainboard/emulation/qemu-i440fx/northbridge.c
index 9785a3acac..e1765faba1 100644
--- a/src/mainboard/emulation/qemu-i440fx/northbridge.c
+++ b/src/mainboard/emulation/qemu-i440fx/northbridge.c
@@ -8,7 +8,6 @@
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
 #include <arch/ioapic.h>
-#include <stdint.h>
 #include <device/device.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/mainboard/intel/adlrvp/board_id.c b/src/mainboard/intel/adlrvp/board_id.c
index 332ba1b7ae..de7a3804d9 100644
--- a/src/mainboard/intel/adlrvp/board_id.c
+++ b/src/mainboard/intel/adlrvp/board_id.c
@@ -3,7 +3,6 @@
 #include <boardid.h>
 #include <ec/acpi/ec.h>
 #include <ec/google/chromeec/ec.h>
-#include <stdint.h>
 #include <types.h>
 #include "board_id.h"
 
diff --git a/src/mainboard/starlabs/labtop/smbios.c b/src/mainboard/starlabs/labtop/smbios.c
index 8babae3943..9acf64f9f8 100644
--- a/src/mainboard/starlabs/labtop/smbios.c
+++ b/src/mainboard/starlabs/labtop/smbios.c
@@ -5,7 +5,6 @@
 #include <device/device.h>
 #include <device/pci_def.h>
 #include <ec/starlabs/merlin/ec.h>
-#include <limits.h>
 #include <option.h>
 #include <smbios.h>
 #include <types.h>
diff --git a/src/northbridge/intel/x4x/dq_dqs.c b/src/northbridge/intel/x4x/dq_dqs.c
index e4cc888875..870e660810 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 "raminit.h"
diff --git a/src/security/intel/txt/logging.c b/src/security/intel/txt/logging.c
index f3e37aafbb..46c594cb05 100644
--- a/src/security/intel/txt/logging.c
+++ b/src/security/intel/txt/logging.c
@@ -3,7 +3,6 @@
 #include <arch/mmio.h>
 #include <console/console.h>
 #include <cpu/x86/smm.h>
-#include <stdint.h>
 #include <types.h>
 
 #include "txt.h"
diff --git a/src/soc/amd/common/block/include/amdblocks/acp.h b/src/soc/amd/common/block/include/amdblocks/acp.h
index a4c926d246..13254e4c0a 100644
--- a/src/soc/amd/common/block/include/amdblocks/acp.h
+++ b/src/soc/amd/common/block/include/amdblocks/acp.h
@@ -3,7 +3,6 @@
 #ifndef AMD_COMMON_ACP_H
 #define AMD_COMMON_ACP_H
 
-#include <stdint.h>
 #include <types.h>
 
 struct acp_config {
diff --git a/src/soc/amd/common/block/lpc/spi_dma.c b/src/soc/amd/common/block/lpc/spi_dma.c
index baf1eb8036..2c183ee705 100644
--- a/src/soc/amd/common/block/lpc/spi_dma.c
+++ b/src/soc/amd/common/block/lpc/spi_dma.c
@@ -4,7 +4,6 @@
 #include <amdblocks/spi.h>
 #include <assert.h>
 #include <boot_device.h>
-#include <commonlib/bsd/cb_err.h>
 #include <commonlib/bsd/helpers.h>
 #include <commonlib/region.h>
 #include <console/console.h>
diff --git a/src/soc/intel/alderlake/elog.c b/src/soc/intel/alderlake/elog.c
index 7b0fd8779b..7f79d94988 100644
--- a/src/soc/intel/alderlake/elog.c
+++ b/src/soc/intel/alderlake/elog.c
@@ -8,7 +8,6 @@
 #include <intelblocks/xhci.h>
 #include <soc/pci_devs.h>
 #include <soc/pm.h>
-#include <stdint.h>
 #include <types.h>
 
 struct pme_map {
diff --git a/src/soc/intel/alderlake/include/soc/meminit.h b/src/soc/intel/alderlake/include/soc/meminit.h
index 49e3c769bc..debdef2ed4 100644
--- a/src/soc/intel/alderlake/include/soc/meminit.h
+++ b/src/soc/intel/alderlake/include/soc/meminit.h
@@ -3,8 +3,6 @@
 #ifndef _SOC_ALDERLAKE_MEMINIT_H_
 #define _SOC_ALDERLAKE_MEMINIT_H_
 
-#include <stddef.h>
-#include <stdint.h>
 #include <types.h>
 #include <fsp/soc_binding.h>
 #include <intelblocks/meminit.h>
diff --git a/src/soc/intel/common/block/cse/cse.c b/src/soc/intel/common/block/cse/cse.c
index a80ab48b48..05b67eed32 100644
--- a/src/soc/intel/common/block/cse/cse.c
+++ b/src/soc/intel/common/block/cse/cse.c
@@ -11,7 +11,6 @@
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <intelblocks/cse.h>
-#include <limits.h>
 #include <option.h>
 #include <security/vboot/misc.h>
 #include <security/vboot/vboot_common.h>
diff --git a/src/soc/intel/common/block/include/intelblocks/meminit.h b/src/soc/intel/common/block/include/intelblocks/meminit.h
index cbec04ddb2..1fed02f5c6 100644
--- a/src/soc/intel/common/block/include/intelblocks/meminit.h
+++ b/src/soc/intel/common/block/include/intelblocks/meminit.h
@@ -3,8 +3,6 @@
 #ifndef __SOC_INTEL_COMMON_BLOCK_MEMINIT_H__
 #define __SOC_INTEL_COMMON_BLOCK_MEMINIT_H__
 
-#include <stddef.h>
-#include <stdint.h>
 #include <types.h>
 
 /*
diff --git a/src/soc/intel/jasperlake/elog.c b/src/soc/intel/jasperlake/elog.c
index 61b8fb8a6b..0e4b2c5149 100644
--- a/src/soc/intel/jasperlake/elog.c
+++ b/src/soc/intel/jasperlake/elog.c
@@ -8,7 +8,6 @@
 #include <intelblocks/xhci.h>
 #include <soc/pci_devs.h>
 #include <soc/pm.h>
-#include <stdint.h>
 #include <types.h>
 
 struct pme_map {
diff --git a/src/soc/intel/tigerlake/elog.c b/src/soc/intel/tigerlake/elog.c
index 93174be88b..301c88acba 100644
--- a/src/soc/intel/tigerlake/elog.c
+++ b/src/soc/intel/tigerlake/elog.c
@@ -8,7 +8,6 @@
 #include <intelblocks/xhci.h>
 #include <soc/pci_devs.h>
 #include <soc/pm.h>
-#include <stdint.h>
 #include <types.h>
 
 struct pme_map {
diff --git a/src/soc/intel/tigerlake/include/soc/meminit.h b/src/soc/intel/tigerlake/include/soc/meminit.h
index 8583e669d0..6b3086ccbd 100644
--- a/src/soc/intel/tigerlake/include/soc/meminit.h
+++ b/src/soc/intel/tigerlake/include/soc/meminit.h
@@ -3,8 +3,6 @@
 #ifndef _SOC_TIGERLAKE_MEMINIT_H_
 #define _SOC_TIGERLAKE_MEMINIT_H_
 
-#include <stddef.h>
-#include <stdint.h>
 #include <types.h>
 #include <fsp/soc_binding.h>
 #include <intelblocks/meminit.h>
diff --git a/src/soc/mediatek/common/flash_controller.c b/src/soc/mediatek/common/flash_controller.c
index cdda056b9f..3fe17f8612 100644
--- a/src/soc/mediatek/common/flash_controller.c
+++ b/src/soc/mediatek/common/flash_controller.c
@@ -7,7 +7,6 @@
 #include <soc/symbols.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/common/include/soc/dpm.h b/src/soc/mediatek/common/include/soc/dpm.h
index 8c110aaaf1..e72b6a1f3d 100644
--- a/src/soc/mediatek/common/include/soc/dpm.h
+++ b/src/soc/mediatek/common/include/soc/dpm.h
@@ -5,7 +5,6 @@
 
 #include <soc/addressmap.h>
 #include <soc/mcu_common.h>
-#include <stdint.h>
 #include <types.h>
 
 struct dpm_regs {
diff --git a/src/soc/mediatek/mt8192/include/soc/spm.h b/src/soc/mediatek/mt8192/include/soc/spm.h
index d99ca6587b..4951f13ccb 100644
--- a/src/soc/mediatek/mt8192/include/soc/spm.h
+++ b/src/soc/mediatek/mt8192/include/soc/spm.h
@@ -5,7 +5,6 @@
 
 #include <soc/addressmap.h>
 #include <soc/mtcmos.h>
-#include <stdint.h>
 #include <types.h>
 
 /* SPM READ/WRITE CFG */
diff --git a/src/soc/mediatek/mt8195/include/soc/spm.h b/src/soc/mediatek/mt8195/include/soc/spm.h
index fb7d17fb54..945852a560 100644
--- a/src/soc/mediatek/mt8195/include/soc/spm.h
+++ b/src/soc/mediatek/mt8195/include/soc/spm.h
@@ -6,7 +6,6 @@
 #include <device/mmio.h>
 #include <soc/addressmap.h>
 #include <soc/mtcmos.h>
-#include <stdint.h>
 #include <types.h>
 
 /* SPM READ/WRITE CFG */
diff --git a/src/soc/qualcomm/sc7180/include/soc/display/mdssreg.h b/src/soc/qualcomm/sc7180/include/soc/display/mdssreg.h
index 57a30220bf..112cac67fb 100644
--- a/src/soc/qualcomm/sc7180/include/soc/display/mdssreg.h
+++ b/src/soc/qualcomm/sc7180/include/soc/display/mdssreg.h
@@ -4,7 +4,6 @@
 #define _SOC_DISPLAY_MDSS_REG_H_
 
 #include <types.h>
-#include <stdint.h>
 
 struct dsi_regs {
 	uint32_t hw_version;