diff --git a/src/cpu/intel/car/bootblock.c b/src/cpu/intel/car/bootblock.c
index dd9a77216f..c53379b69f 100644
--- a/src/cpu/intel/car/bootblock.c
+++ b/src/cpu/intel/car/bootblock.c
@@ -1,8 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <bootblock_common.h>
 #include <arch/bootblock.h>
+#include <bootblock_common.h>
 #include <cpu/x86/bist.h>
+#include <stdint.h>
 
 static uint32_t saved_bist;
 
diff --git a/src/cpu/intel/common/common_init.c b/src/cpu/intel/common/common_init.c
index 4d6df845f7..3a06281662 100644
--- a/src/cpu/intel/common/common_init.c
+++ b/src/cpu/intel/common/common_init.c
@@ -4,8 +4,10 @@
 #include <arch/cpu.h>
 #include <console/console.h>
 #include <cpu/intel/msr.h>
-#include <cpu/x86/msr.h>
 #include <cpu/intel/turbo.h>
+#include <cpu/x86/msr.h>
+#include <types.h>
+
 #include "common.h"
 
 #define  CPUID_6_ECX_EPB		(1 << 3)
diff --git a/src/cpu/intel/microcode/microcode.c b/src/cpu/intel/microcode/microcode.c
index bb2edfa07d..ac9453f461 100644
--- a/src/cpu/intel/microcode/microcode.c
+++ b/src/cpu/intel/microcode/microcode.c
@@ -2,14 +2,13 @@
 
 /* Microcode update for Intel PIII and later CPUs */
 
-#include <stdint.h>
-#include <stddef.h>
-#include <cbfs.h>
 #include <arch/cpu.h>
+#include <cbfs.h>
 #include <console/console.h>
-#include <cpu/x86/msr.h>
 #include <cpu/intel/microcode.h>
+#include <cpu/x86/msr.h>
 #include <smp/spinlock.h>
+#include <types.h>
 
 DECLARE_SPIN_LOCK(microcode_lock)
 
diff --git a/src/cpu/intel/model_f3x/model_f3x_init.c b/src/cpu/intel/model_f3x/model_f3x_init.c
index fdc5a1ef1d..198490ff85 100644
--- a/src/cpu/intel/model_f3x/model_f3x_init.c
+++ b/src/cpu/intel/model_f3x/model_f3x_init.c
@@ -1,12 +1,12 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <device/device.h>
 #include <cpu/cpu.h>
-#include <cpu/x86/mtrr.h>
-#include <cpu/intel/microcode.h>
-#include <cpu/intel/hyperthreading.h>
 #include <cpu/intel/common/common.h>
+#include <cpu/intel/hyperthreading.h>
+#include <cpu/intel/microcode.h>
 #include <cpu/x86/cache.h>
+#include <cpu/x86/mtrr.h>
+#include <device/device.h>
 
 static void model_f3x_init(struct device *cpu)
 {