diff --git a/src/arch/x86/breakpoint.c b/src/arch/x86/breakpoint.c
index 4b21e32823..d3ba783a55 100644
--- a/src/arch/x86/breakpoint.c
+++ b/src/arch/x86/breakpoint.c
@@ -2,7 +2,6 @@
 #include <arch/registers.h>
 #include <arch/breakpoint.h>
 #include <console/console.h>
-#include <stdint.h>
 #include <types.h>
 
 #define DEBUG_REGISTER_COUNT 4
diff --git a/src/include/device/xhci.h b/src/include/device/xhci.h
index a4a3bc1de7..b9c784ee91 100644
--- a/src/include/device/xhci.h
+++ b/src/include/device/xhci.h
@@ -5,7 +5,6 @@
 
 #include <types.h>
 #include <device/device.h>
-#include <commonlib/bsd/cb_err.h>
 
 #define XHCI_HCCPARAMS1_XECP 0x12
 
diff --git a/src/security/tpm/tis.h b/src/security/tpm/tis.h
index b6a258f491..df39498462 100644
--- a/src/security/tpm/tis.h
+++ b/src/security/tpm/tis.h
@@ -3,8 +3,6 @@
 #ifndef TIS_H_
 #define TIS_H_
 
-#include <stddef.h>
-#include <stdint.h>
 #include <types.h>
 
 enum tis_access {
diff --git a/src/soc/intel/meteorlake/elog.c b/src/soc/intel/meteorlake/elog.c
index 14d086c38d..5cfc7eccd2 100644
--- a/src/soc/intel/meteorlake/elog.c
+++ b/src/soc/intel/meteorlake/elog.c
@@ -9,7 +9,6 @@
 #include <soc/pci_devs.h>
 #include <soc/pm.h>
 #include <soc/soc_info.h>
-#include <stdint.h>
 #include <types.h>
 
 struct pme_map {
diff --git a/src/soc/intel/meteorlake/include/soc/meminit.h b/src/soc/intel/meteorlake/include/soc/meminit.h
index cc5ab18cdc..cd978504b6 100644
--- a/src/soc/intel/meteorlake/include/soc/meminit.h
+++ b/src/soc/intel/meteorlake/include/soc/meminit.h
@@ -3,8 +3,6 @@
 #ifndef _SOC_METEORLAKE_MEMINIT_H_
 #define _SOC_METEORLAKE_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/qualcomm/sc7280/include/soc/display/edp_ctrl.h b/src/soc/qualcomm/sc7280/include/soc/display/edp_ctrl.h
index fa6e1720b7..7a86b942c6 100644
--- a/src/soc/qualcomm/sc7280/include/soc/display/edp_ctrl.h
+++ b/src/soc/qualcomm/sc7280/include/soc/display/edp_ctrl.h
@@ -4,7 +4,6 @@
 #define _EDP_CTRL_H
 
 #include <types.h>
-#include <stdint.h>
 
 enum cb_err edp_ctrl_init(struct edid *edid);
 
diff --git a/src/soc/qualcomm/sc7280/include/soc/display/edp_phy.h b/src/soc/qualcomm/sc7280/include/soc/display/edp_phy.h
index 84932f0f79..8e8e397fc3 100644
--- a/src/soc/qualcomm/sc7280/include/soc/display/edp_phy.h
+++ b/src/soc/qualcomm/sc7280/include/soc/display/edp_phy.h
@@ -4,7 +4,6 @@
 #define _EDP_PHY_H
 
 #include <types.h>
-#include <stdint.h>
 
 void edp_phy_config(u8 v_level, u8 p_level);
 void edp_phy_vm_pe_init(void);
diff --git a/src/soc/qualcomm/sc7280/include/soc/display/edp_reg.h b/src/soc/qualcomm/sc7280/include/soc/display/edp_reg.h
index 1bdf4b17cb..1e49226e74 100644
--- a/src/soc/qualcomm/sc7280/include/soc/display/edp_reg.h
+++ b/src/soc/qualcomm/sc7280/include/soc/display/edp_reg.h
@@ -4,7 +4,6 @@
 #define _EDP_REG_H_
 
 #include <types.h>
-#include <stdint.h>
 
 struct edp_ahbclk_regs {
 	uint32_t hw_version;
diff --git a/src/soc/qualcomm/sc7280/include/soc/display/mdssreg.h b/src/soc/qualcomm/sc7280/include/soc/display/mdssreg.h
index 40968f2229..7fdd14ae55 100644
--- a/src/soc/qualcomm/sc7280/include/soc/display/mdssreg.h
+++ b/src/soc/qualcomm/sc7280/include/soc/display/mdssreg.h
@@ -4,7 +4,6 @@
 #define _SOC_DISPLAY_MDSS_REG_H_
 
 #include <types.h>
-#include <stdint.h>
 #include <edid.h>
 
 #define INTF_FLUSH      INTF_FLUSH_5