diff --git a/src/arch/x86/c_exit.S b/src/arch/x86/c_exit.S
index bb1df28adf..069a66c91e 100644
--- a/src/arch/x86/c_exit.S
+++ b/src/arch/x86/c_exit.S
@@ -1,10 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <arch/ram_segs.h>
-#include <cpu/x86/msr.h>
 #include <cpu/x86/cr.h>
 
-
 #if ENV_X86_64
 
 	/*
diff --git a/src/security/intel/txt/ramstage.c b/src/security/intel/txt/ramstage.c
index 265f81e62d..744b05e410 100644
--- a/src/security/intel/txt/ramstage.c
+++ b/src/security/intel/txt/ramstage.c
@@ -7,7 +7,6 @@
 #include <cbfs.h>
 #include <console/console.h>
 #include <cpu/intel/common/common.h>
-#include <cpu/x86/msr.h>
 #include <cpu/x86/smm.h>
 #include <device/pci_ops.h>
 #include <security/intel/cbnt/cbnt.h>
diff --git a/src/soc/amd/common/block/cpu/tsc/monotonic_timer.c b/src/soc/amd/common/block/cpu/tsc/monotonic_timer.c
index 941532cca6..4cedc3d3a2 100644
--- a/src/soc/amd/common/block/cpu/tsc/monotonic_timer.c
+++ b/src/soc/amd/common/block/cpu/tsc/monotonic_timer.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include <cpu/x86/msr.h>
 #include <cpu/x86/tsc.h>
 #include <timer.h>
 #include <timestamp.h>
diff --git a/src/soc/amd/picasso/fch.c b/src/soc/amd/picasso/fch.c
index 00402213d8..c4d34a5301 100644
--- a/src/soc/amd/picasso/fch.c
+++ b/src/soc/amd/picasso/fch.c
@@ -4,7 +4,6 @@
 #include <bootstate.h>
 #include <cpu/amd/msr.h>
 #include <cpu/x86/smm.h>
-#include <cpu/x86/msr.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
diff --git a/src/soc/intel/apollolake/pmutil.c b/src/soc/intel/apollolake/pmutil.c
index fbb2345653..4623017141 100644
--- a/src/soc/intel/apollolake/pmutil.c
+++ b/src/soc/intel/apollolake/pmutil.c
@@ -7,7 +7,6 @@
 #include <arch/io.h>
 #include <device/mmio.h>
 #include <console/console.h>
-#include <cpu/x86/msr.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_def.h>
diff --git a/src/soc/intel/broadwell/acpi.c b/src/soc/intel/broadwell/acpi.c
index 00e6807bd5..a9b47ccb11 100644
--- a/src/soc/intel/broadwell/acpi.c
+++ b/src/soc/intel/broadwell/acpi.c
@@ -10,7 +10,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <types.h>
-#include <cpu/x86/msr.h>
 #include <cpu/intel/turbo.h>
 #include <soc/acpi.h>
 #include <soc/device_nvs.h>
diff --git a/src/soc/intel/common/block/cpu/mp_init.c b/src/soc/intel/common/block/cpu/mp_init.c
index 3dbd573fef..8ec6c6660d 100644
--- a/src/soc/intel/common/block/cpu/mp_init.c
+++ b/src/soc/intel/common/block/cpu/mp_init.c
@@ -5,7 +5,6 @@
 #include <console/console.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
-#include <cpu/x86/msr.h>
 #include <cpu/x86/mp.h>
 #include <cpu/intel/microcode.h>
 #include <intelblocks/cfg.h>
diff --git a/src/soc/intel/common/block/timer/timer.c b/src/soc/intel/common/block/timer/timer.c
index ab411494aa..0d201a50e5 100644
--- a/src/soc/intel/common/block/timer/timer.c
+++ b/src/soc/intel/common/block/timer/timer.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <arch/cpu.h>
-#include <cpu/x86/msr.h>
 #include <cpu/x86/tsc.h>
 #include <intelblocks/msr.h>