diff --git a/src/cpu/amd/pi/00730F01/fixme.c b/src/cpu/amd/pi/00730F01/fixme.c
index 785d2dff09..bc649b795e 100644
--- a/src/cpu/amd/pi/00730F01/fixme.c
+++ b/src/cpu/amd/pi/00730F01/fixme.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <arch/hpet.h>
-#include <cpu/amd/msr.h>
 #include <cpu/amd/mtrr.h>
 #include <northbridge/amd/agesa/agesa_helper.h>
 #include <Porting.h>
diff --git a/src/drivers/amd/agesa/bootblock.c b/src/drivers/amd/agesa/bootblock.c
index df9876a84a..c293481984 100644
--- a/src/drivers/amd/agesa/bootblock.c
+++ b/src/drivers/amd/agesa/bootblock.c
@@ -5,7 +5,6 @@
 #include <amdblocks/amd_pci_mmconf.h>
 #include <amdblocks/biosram.h>
 #include <arch/bootblock.h>
-#include <cpu/amd/msr.h>
 #include <cpu/x86/mtrr.h>
 #include <cpu/x86/lapic.h>
 
diff --git a/src/soc/amd/cezanne/root_complex.c b/src/soc/amd/cezanne/root_complex.c
index 81b2b96c6c..6bef915085 100644
--- a/src/soc/amd/cezanne/root_complex.c
+++ b/src/soc/amd/cezanne/root_complex.c
@@ -8,7 +8,6 @@
 #include <arch/ioapic.h>
 #include <cbmem.h>
 #include <console/console.h>
-#include <cpu/amd/msr.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <fsp/util.h>
diff --git a/src/soc/amd/common/block/acpi/ivrs.c b/src/soc/amd/common/block/acpi/ivrs.c
index 0c5853a2c0..8923463729 100644
--- a/src/soc/amd/common/block/acpi/ivrs.c
+++ b/src/soc/amd/common/block/acpi/ivrs.c
@@ -8,7 +8,6 @@
 #include <arch/ioapic.h>
 #include <console/console.h>
 #include <cpu/amd/cpuid.h>
-#include <cpu/amd/msr.h>
 #include <device/device.h>
 #include <device/mmio.h>
 #include <device/pci_def.h>
diff --git a/src/soc/amd/common/block/acpi/tables.c b/src/soc/amd/common/block/acpi/tables.c
index ec484a9781..b7c942c27a 100644
--- a/src/soc/amd/common/block/acpi/tables.c
+++ b/src/soc/amd/common/block/acpi/tables.c
@@ -5,7 +5,6 @@
 #include <amdblocks/acpi.h>
 #include <amdblocks/chip.h>
 #include <assert.h>
-#include <cpu/amd/msr.h>
 #include <cpu/amd/mtrr.h>
 #include <device/device.h>
 #include <types.h>
diff --git a/src/soc/amd/common/block/cpu/noncar/memmap.c b/src/soc/amd/common/block/cpu/noncar/memmap.c
index 8cd9ec8998..2661914876 100644
--- a/src/soc/amd/common/block/cpu/noncar/memmap.c
+++ b/src/soc/amd/common/block/cpu/noncar/memmap.c
@@ -4,7 +4,6 @@
 #include <amdblocks/smm.h>
 #include <console/console.h>
 #include <cbmem.h>
-#include <cpu/amd/msr.h>
 #include <cpu/x86/smm.h>
 #include <fsp/util.h>
 #include <FspGuids.h>
diff --git a/src/soc/amd/common/block/cpu/smm/finalize.c b/src/soc/amd/common/block/cpu/smm/finalize.c
index 07196d13ca..a6d9a739f4 100644
--- a/src/soc/amd/common/block/cpu/smm/finalize.c
+++ b/src/soc/amd/common/block/cpu/smm/finalize.c
@@ -5,7 +5,6 @@
 #include <amdblocks/smm.h>
 #include <bootstate.h>
 #include <console/console.h>
-#include <cpu/amd/msr.h>
 #include <cpu/x86/mp.h>
 #include <cpu/x86/msr.h>
 #include <types.h>
diff --git a/src/soc/amd/common/block/psp/psb.c b/src/soc/amd/common/block/psp/psb.c
index be5d43b40d..be20fc88c5 100644
--- a/src/soc/amd/common/block/psp/psb.c
+++ b/src/soc/amd/common/block/psp/psb.c
@@ -4,7 +4,6 @@
 #include <amdblocks/smn.h>
 #include <bootstate.h>
 #include <console/console.h>
-#include <cpu/amd/msr.h>
 #include <device/mmio.h>
 #include <types.h>
 
diff --git a/src/soc/amd/glinda/root_complex.c b/src/soc/amd/glinda/root_complex.c
index 5cc88f1f4e..a8b54e2fa6 100644
--- a/src/soc/amd/glinda/root_complex.c
+++ b/src/soc/amd/glinda/root_complex.c
@@ -10,7 +10,6 @@
 #include <arch/ioapic.h>
 #include <cbmem.h>
 #include <console/console.h>
-#include <cpu/amd/msr.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <fsp/util.h>
diff --git a/src/soc/amd/mendocino/root_complex.c b/src/soc/amd/mendocino/root_complex.c
index f239a42d52..5185936e74 100644
--- a/src/soc/amd/mendocino/root_complex.c
+++ b/src/soc/amd/mendocino/root_complex.c
@@ -10,7 +10,6 @@
 #include <arch/ioapic.h>
 #include <cbmem.h>
 #include <console/console.h>
-#include <cpu/amd/msr.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <fsp/util.h>
diff --git a/src/soc/amd/morgana/root_complex.c b/src/soc/amd/morgana/root_complex.c
index 5a1a4ad1fe..72a69a4dc8 100644
--- a/src/soc/amd/morgana/root_complex.c
+++ b/src/soc/amd/morgana/root_complex.c
@@ -10,7 +10,6 @@
 #include <arch/ioapic.h>
 #include <cbmem.h>
 #include <console/console.h>
-#include <cpu/amd/msr.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <fsp/util.h>
diff --git a/src/soc/amd/picasso/agesa_acpi.c b/src/soc/amd/picasso/agesa_acpi.c
index 1e6a6d4765..fb140e2a0c 100644
--- a/src/soc/amd/picasso/agesa_acpi.c
+++ b/src/soc/amd/picasso/agesa_acpi.c
@@ -8,7 +8,6 @@
 #include <amdblocks/data_fabric.h>
 #include <amdblocks/ioapic.h>
 #include <cpu/amd/cpuid.h>
-#include <cpu/amd/msr.h>
 #include <cpu/cpu.h>
 #include <device/device.h>
 #include <device/mmio.h>
diff --git a/src/soc/amd/picasso/fch.c b/src/soc/amd/picasso/fch.c
index b83e700e57..e364a48419 100644
--- a/src/soc/amd/picasso/fch.c
+++ b/src/soc/amd/picasso/fch.c
@@ -2,7 +2,6 @@
 
 #include <device/mmio.h>
 #include <bootstate.h>
-#include <cpu/amd/msr.h>
 #include <cpu/x86/smm.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/soc/amd/picasso/root_complex.c b/src/soc/amd/picasso/root_complex.c
index 9af9c0a78d..5ea8b79710 100644
--- a/src/soc/amd/picasso/root_complex.c
+++ b/src/soc/amd/picasso/root_complex.c
@@ -9,7 +9,6 @@
 #include <assert.h>
 #include <cbmem.h>
 #include <console/console.h>
-#include <cpu/amd/msr.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <fsp/util.h>
diff --git a/src/soc/amd/stoneyridge/bootblock.c b/src/soc/amd/stoneyridge/bootblock.c
index f5451f8590..1d41477e4d 100644
--- a/src/soc/amd/stoneyridge/bootblock.c
+++ b/src/soc/amd/stoneyridge/bootblock.c
@@ -4,7 +4,6 @@
 #include <assert.h>
 #include <console/console.h>
 #include <cpu/x86/msr.h>
-#include <cpu/amd/msr.h>
 #include <cpu/x86/mtrr.h>
 #include <smp/node.h>
 #include <bootblock_common.h>
diff --git a/src/soc/amd/stoneyridge/memmap.c b/src/soc/amd/stoneyridge/memmap.c
index 7a225e1b1f..8f73a8cf12 100644
--- a/src/soc/amd/stoneyridge/memmap.c
+++ b/src/soc/amd/stoneyridge/memmap.c
@@ -5,7 +5,6 @@
 #include <stdint.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/smm.h>
-#include <cpu/amd/msr.h>
 #include <cpu/amd/mtrr.h>
 #include <cbmem.h>
 #include <soc/northbridge.h>
diff --git a/src/soc/amd/stoneyridge/northbridge.c b/src/soc/amd/stoneyridge/northbridge.c
index 3960a391b7..240aebdb1b 100644
--- a/src/soc/amd/stoneyridge/northbridge.c
+++ b/src/soc/amd/stoneyridge/northbridge.c
@@ -13,7 +13,6 @@
 #include <cpu/amd/mtrr.h>
 #include <cpu/x86/lapic_def.h>
 #include <cpu/x86/msr.h>
-#include <cpu/amd/msr.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>