4 files changed, 8 insertions, 8 deletions
diff --git a/src/soc/amd/common/block/acpi/cppc.c b/src/soc/amd/common/block/acpi/cppc.c
index ce40057c5d..81a09b4037 100644
--- a/src/soc/amd/common/block/acpi/cppc.c
+++ b/src/soc/amd/common/block/acpi/cppc.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_pm.h>
 #include <acpi/acpigen.h>
 #include <amdblocks/cppc.h>
-#include <arch/cpu.h>
+#include <cpu/cpu.h>
 #include <soc/msr.h>
 #include <types.h>
 
diff --git a/src/soc/amd/common/block/cpu/cpu.c b/src/soc/amd/common/block/cpu/cpu.c
index bece89bc72..7c1daf96f1 100644
--- a/src/soc/amd/common/block/cpu/cpu.c
+++ b/src/soc/amd/common/block/cpu/cpu.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <arch/cpu.h>
 #include <amdblocks/cpu.h>
+#include <cpu/cpu.h>
 
 int get_cpu_count(void)
 {
diff --git a/src/soc/amd/common/block/cpu/noncar/write_resume_eip.c b/src/soc/amd/common/block/cpu/noncar/write_resume_eip.c
index d53916107e..5863917920 100644
--- a/src/soc/amd/common/block/cpu/noncar/write_resume_eip.c
+++ b/src/soc/amd/common/block/cpu/noncar/write_resume_eip.c
@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <acpi/acpi.h>
-#include <arch/cpu.h>
 #include <amdblocks/cpu.h>
 #include <cpu/amd/msr.h>
+#include <cpu/cpu.h>
 #include <cpu/x86/msr.h>
 #include <stdint.h>
 
diff --git a/src/soc/amd/common/block/cpu/update_microcode.c b/src/soc/amd/common/block/cpu/update_microcode.c
index 79aaaf5d65..cfffbc0326 100644
--- a/src/soc/amd/common/block/cpu/update_microcode.c
+++ b/src/soc/amd/common/block/cpu/update_microcode.c
@@ -1,15 +1,15 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <arch/cpu.h>
-#include <types.h>
-#include <cpu/amd/microcode.h>
+#include <cbfs.h>
 #include <commonlib/helpers.h>
 #include <console/console.h>
-#include <cpu/x86/msr.h>
+#include <cpu/amd/microcode.h>
 #include <cpu/amd/msr.h>
-#include <cbfs.h>
+#include <cpu/cpu.h>
+#include <cpu/x86/msr.h>
 #include <stdio.h>
 #include <timestamp.h>
+#include <types.h>
 
 #define CPU_MICROCODE_BLOB_NAME "cpu_microcode_XXXX.bin"
 #define CPU_MICROCODE_BLOB_FORMAT "cpu_microcode_%04x.bin"