diff --git a/src/device/oprom/realmode/x86.h b/src/device/oprom/realmode/x86.h
index b0efe90d30..a770bcd7f5 100644
--- a/src/device/oprom/realmode/x86.h
+++ b/src/device/oprom/realmode/x86.h
@@ -3,7 +3,7 @@
 #ifndef __DEVICE_OPROM_REALMODE_X86_H__
 #define __DEVICE_OPROM_REALMODE_X86_H__
 
-#include <arch/cpu.h>
+#include <cpu/cpu.h>
 #include <stdint.h>
 
 #define REALMODE_BASE ((void *)0x600)
diff --git a/src/drivers/amd/agesa/romstage.c b/src/drivers/amd/agesa/romstage.c
index f60239abfe..5c3d90494f 100644
--- a/src/drivers/amd/agesa/romstage.c
+++ b/src/drivers/amd/agesa/romstage.c
@@ -1,21 +1,21 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <amdblocks/biosram.h>
 #include <acpi/acpi.h>
-#include <arch/cpu.h>
+#include <amdblocks/biosram.h>
 #include <arch/romstage.h>
 #include <cbmem.h>
 #include <console/console.h>
+#include <cpu/cpu.h>
 #include <cpu/x86/lapic.h>
 #include <halt.h>
+#include <northbridge/amd/agesa/agesa_helper.h>
+#include <northbridge/amd/agesa/state_machine.h>
 #include <program_loading.h>
+#include <romstage_common.h>
 #include <romstage_handoff.h>
 #include <smp/node.h>
 #include <string.h>
 #include <timestamp.h>
-#include <romstage_common.h>
-#include <northbridge/amd/agesa/agesa_helper.h>
-#include <northbridge/amd/agesa/state_machine.h>
 
 void __weak board_BeforeAgesa(struct sysinfo *cb) { }
 
diff --git a/src/drivers/intel/fsp1_1/include/fsp/util.h b/src/drivers/intel/fsp1_1/include/fsp/util.h
index 2dec3f0fb2..2f927607c2 100644
--- a/src/drivers/intel/fsp1_1/include/fsp/util.h
+++ b/src/drivers/intel/fsp1_1/include/fsp/util.h
@@ -3,7 +3,7 @@
 #ifndef FSP1_1_UTIL_H
 #define FSP1_1_UTIL_H
 
-#include <arch/cpu.h>
+#include <cpu/cpu.h>
 #include <fsp/api.h>
 /* Current users expect to get the SoC's FSP definitions by including util.h. */
 #include <fsp/soc_binding.h>
diff --git a/src/drivers/intel/fsp2_0/include/fsp/util.h b/src/drivers/intel/fsp2_0/include/fsp/util.h
index 96dc472361..1cc422e5db 100644
--- a/src/drivers/intel/fsp2_0/include/fsp/util.h
+++ b/src/drivers/intel/fsp2_0/include/fsp/util.h
@@ -6,7 +6,7 @@
 #include <boot/coreboot_tables.h>
 #include <cbfs.h>
 #include <commonlib/region.h>
-#include <arch/cpu.h>
+#include <cpu/cpu.h>
 #include <fsp/api.h>
 #include <efi/efi_datatype.h>
 #include <fsp/info_header.h>
diff --git a/src/drivers/intel/mipi_camera/camera.c b/src/drivers/intel/mipi_camera/camera.c
index ad473bc0b2..5b69c01aba 100644
--- a/src/drivers/intel/mipi_camera/camera.c
+++ b/src/drivers/intel/mipi_camera/camera.c
@@ -5,7 +5,7 @@
 #include <acpi/acpi_device.h>
 #include <acpi/acpigen.h>
 #include <acpi/acpigen_pci.h>
-#include <arch/cpu.h>
+#include <cpu/cpu.h>
 #include <console/console.h>
 #include <cpu/intel/cpu_ids.h>
 #include <device/i2c_simple.h>