diff --git a/src/arch/x86/cpu_common.c b/src/arch/x86/cpu_common.c
index 302a14e6d2..e674afae30 100644
--- a/src/arch/x86/cpu_common.c
+++ b/src/arch/x86/cpu_common.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <cpu/cpu.h>
+#include <types.h>
 
 #if ENV_X86_32
 /* Standard macro to see if a specific flag is changeable */
diff --git a/src/arch/x86/ebda.c b/src/arch/x86/ebda.c
index e576a14791..e835fcefef 100644
--- a/src/arch/x86/ebda.c
+++ b/src/arch/x86/ebda.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi.h>
 #include <bootstate.h>
 #include <commonlib/endian.h>
-#include <stdint.h>
+#include <types.h>
 
 #define X86_BDA_SIZE		0x200
 #define X86_BDA_BASE		((void *)0x400)
diff --git a/src/arch/x86/mpspec.c b/src/arch/x86/mpspec.c
index 739d185bf0..d94308ee18 100644
--- a/src/arch/x86/mpspec.c
+++ b/src/arch/x86/mpspec.c
@@ -1,14 +1,17 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <console/console.h>
-#include <device/path.h>
-#include <device/pci_ids.h>
+#include <acpi/acpi.h>
 #include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
-#include <string.h>
+#include <console/console.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/lapic.h>
+#include <device/device.h>
+#include <device/path.h>
+#include <device/pci_ids.h>
 #include <drivers/generic/ioapic/chip.h>
+#include <stdint.h>
+#include <string.h>
 
 /* Initialize the specified "mc" struct with initial values. */
 void mptable_init(struct mp_config_table *mc)
diff --git a/src/arch/x86/null_breakpoint.c b/src/arch/x86/null_breakpoint.c
index 70b94b6909..43e3727448 100644
--- a/src/arch/x86/null_breakpoint.c
+++ b/src/arch/x86/null_breakpoint.c
@@ -1,9 +1,10 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
+
 #include <arch/breakpoint.h>
 #include <arch/null_breakpoint.h>
 #include <bootstate.h>
 #include <console/console.h>
-#include <stdint.h>
+#include <types.h>
 
 static struct breakpoint_handle null_deref_bp;
 static struct breakpoint_handle null_fetch_bp;
diff --git a/src/arch/x86/post.c b/src/arch/x86/post.c
index 3c1ca43170..908cc3bd36 100644
--- a/src/arch/x86/post.c
+++ b/src/arch/x86/post.c
@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#include <arch/io.h>
+#include <console/console.h>
 #include <post.h>
 #include <stdint.h>
-#include <console/console.h>
-#include <arch/io.h>
 
 void arch_post_code(uint8_t value)
 {
diff --git a/src/arch/x86/postcar_loader.c b/src/arch/x86/postcar_loader.c
index c6a128bb69..be4a235bf1 100644
--- a/src/arch/x86/postcar_loader.c
+++ b/src/arch/x86/postcar_loader.c
@@ -9,9 +9,10 @@
 #include <program_loading.h>
 #include <reset.h>
 #include <rmodule.h>
+#include <security/vboot/vboot_common.h>
 #include <stage_cache.h>
 #include <timestamp.h>
-#include <security/vboot/vboot_common.h>
+#include <types.h>
 
 static size_t var_mtrr_ctx_size(void)
 {
diff --git a/src/arch/x86/rdrand.c b/src/arch/x86/rdrand.c
index 5374933b5e..985aeba6c1 100644
--- a/src/arch/x86/rdrand.c
+++ b/src/arch/x86/rdrand.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <random.h>
+#include <stdint.h>
 
 /*
  * Intel recommends that applications attempt 10 retries in a tight loop