18 files changed, 0 insertions, 18 deletions

diff --git a/src/cpu/intel/speedstep/acpi.c b/src/cpu/intel/speedstep/acpi.c
index 395561481f..2beb89061c 100644
--- a/src/cpu/intel/speedstep/acpi.c
+++ b/src/cpu/intel/speedstep/acpi.c
@@ -5,7 +5,6 @@
 #include <acpi/acpi.h>
 #include <acpi/acpigen.h>
 #include <arch/cpu.h>
-#include <cpu/x86/msr.h>
 #include <cpu/intel/fsb.h>
 #include <cpu/intel/speedstep.h>
 #include <device/device.h>
diff --git a/src/cpu/x86/lapic/apic_timer.c b/src/cpu/x86/lapic/apic_timer.c
index 97c28bdb91..01a67fa6b1 100644
--- a/src/cpu/x86/lapic/apic_timer.c
+++ b/src/cpu/x86/lapic/apic_timer.c
@@ -4,7 +4,6 @@
 #include <console/console.h>
 #include <delay.h>
 #include <thread.h>
-#include <cpu/x86/msr.h>
 #include <cpu/x86/lapic.h>
 
 void init_timer(void)
diff --git a/src/mainboard/intel/harcuvar/acpi_tables.c b/src/mainboard/intel/harcuvar/acpi_tables.c
index e91b3b0e69..c51bd69872 100644
--- a/src/mainboard/intel/harcuvar/acpi_tables.c
+++ b/src/mainboard/intel/harcuvar/acpi_tables.c
@@ -3,7 +3,6 @@
 #include <acpi/acpi.h>
 #include <acpi/acpi_gnvs.h>
 #include <device/device.h>
-#include <cpu/x86/msr.h>
 
 #include <intelblocks/acpi.h>
 #include <soc/acpi.h>
diff --git a/src/mainboard/kontron/ktqm77/early_init.c b/src/mainboard/kontron/ktqm77/early_init.c
index b8f44b5561..669577ef0d 100644
--- a/src/mainboard/kontron/ktqm77/early_init.c
+++ b/src/mainboard/kontron/ktqm77/early_init.c
@@ -4,7 +4,6 @@
 #include <stdint.h>
 #include <device/pnp_ops.h>
 #include <device/pci_ops.h>
-#include <cpu/x86/msr.h>
 #include <device/pci_def.h>
 #include <northbridge/intel/sandybridge/raminit_native.h>
 #include <northbridge/intel/sandybridge/raminit.h>
diff --git a/src/mainboard/lenovo/x220/early_init.c b/src/mainboard/lenovo/x220/early_init.c
index 5f0ad456be..e4c854c734 100644
--- a/src/mainboard/lenovo/x220/early_init.c
+++ b/src/mainboard/lenovo/x220/early_init.c
@@ -7,7 +7,6 @@
 #include <northbridge/intel/sandybridge/raminit_native.h>
 #include <southbridge/intel/bd82x6x/pch.h>
 #include <southbridge/intel/common/gpio.h>
-#include <cpu/x86/msr.h>
 
 void mainboard_fill_pei_data(struct pei_data *pei_data)
 {
diff --git a/src/mainboard/scaleway/tagada/acpi_tables.c b/src/mainboard/scaleway/tagada/acpi_tables.c
index e91b3b0e69..c51bd69872 100644
--- a/src/mainboard/scaleway/tagada/acpi_tables.c
+++ b/src/mainboard/scaleway/tagada/acpi_tables.c
@@ -3,7 +3,6 @@
 #include <acpi/acpi.h>
 #include <acpi/acpi_gnvs.h>
 #include <device/device.h>
-#include <cpu/x86/msr.h>
 
 #include <intelblocks/acpi.h>
 #include <soc/acpi.h>
diff --git a/src/northbridge/intel/e7505/raminit.c b/src/northbridge/intel/e7505/raminit.c
index 404ab2fb39..a5280830ea 100644
--- a/src/northbridge/intel/e7505/raminit.c
+++ b/src/northbridge/intel/e7505/raminit.c
@@ -20,7 +20,6 @@
 #include <lib.h>
 #include <commonlib/helpers.h>
 #include <console/console.h>
-#include <cpu/x86/msr.h>
 #include <assert.h>
 #include <spd.h>
 #include <sdram_mode.h>
diff --git a/src/northbridge/intel/ironlake/northbridge.c b/src/northbridge/intel/ironlake/northbridge.c
index 81bb0e79d7..c1a2840bda 100644
--- a/src/northbridge/intel/ironlake/northbridge.c
+++ b/src/northbridge/intel/ironlake/northbridge.c
@@ -6,7 +6,6 @@
 #include <stdint.h>
 #include <delay.h>
 #include <cpu/intel/model_2065x/model_2065x.h>
-#include <cpu/x86/msr.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/security/intel/stm/SmmStm.h b/src/security/intel/stm/SmmStm.h
index c12b0347af..0447a9edc2 100644
--- a/src/security/intel/stm/SmmStm.h
+++ b/src/security/intel/stm/SmmStm.h
@@ -3,7 +3,6 @@
 #ifndef _SMM_STM_H_
 #define _SMM_STM_H_
 
-#include <cpu/x86/msr.h>
 #include "StmApi.h"
 
 /*
diff --git a/src/soc/amd/common/block/psp/psp.c b/src/soc/amd/common/block/psp/psp.c
index 0e03174f08..2787b73c6e 100644
--- a/src/soc/amd/common/block/psp/psp.c
+++ b/src/soc/amd/common/block/psp/psp.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <device/mmio.h>
-#include <cpu/x86/msr.h>
 #include <bootstate.h>
 #include <console/console.h>
 #include <amdblocks/psp.h>
diff --git a/src/soc/amd/picasso/romstage.c b/src/soc/amd/picasso/romstage.c
index 7d086fe43a..6855bf6129 100644
--- a/src/soc/amd/picasso/romstage.c
+++ b/src/soc/amd/picasso/romstage.c
@@ -3,7 +3,6 @@
 #include <arch/cpu.h>
 #include <acpi/acpi.h>
 #include <cpu/x86/cache.h>
-#include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
 #include <console/uart.h>
 #include <cbmem.h>
diff --git a/src/soc/intel/apollolake/car.c b/src/soc/intel/apollolake/car.c
index cbc43d5892..fc6691b0fb 100644
--- a/src/soc/intel/apollolake/car.c
+++ b/src/soc/intel/apollolake/car.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include <assert.h>
-#include <cpu/x86/msr.h>
 #include <intelblocks/msr.h>
 #include <program_loading.h>
 #include <soc/cpu.h>
diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c
index dd7dd1a4e0..92edbada79 100644
--- a/src/soc/intel/apollolake/chip.c
+++ b/src/soc/intel/apollolake/chip.c
@@ -5,7 +5,6 @@
 #include <cbmem.h>
 #include <console/console.h>
 #include <cpu/x86/mp.h>
-#include <cpu/x86/msr.h>
 #include <device/mmio.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/soc/intel/broadwell/cpu_info.c b/src/soc/intel/broadwell/cpu_info.c
index 5542f17914..506b1a7985 100644
--- a/src/soc/intel/broadwell/cpu_info.c
+++ b/src/soc/intel/broadwell/cpu_info.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <arch/cpu.h>
-#include <cpu/x86/msr.h>
 #include <soc/cpu.h>
 #include <soc/msr.h>
 #include <soc/systemagent.h>
diff --git a/src/soc/intel/common/block/acpi/acpi.c b/src/soc/intel/common/block/acpi/acpi.c
index 5e4c6e8e4c..05d14ecd70 100644
--- a/src/soc/intel/common/block/acpi/acpi.c
+++ b/src/soc/intel/common/block/acpi/acpi.c
@@ -9,7 +9,6 @@
 #include <acpi/acpi_gnvs.h>
 #include <console/console.h>
 #include <cpu/intel/turbo.h>
-#include <cpu/x86/msr.h>
 #include <cpu/x86/smm.h>
 #include <intelblocks/acpi.h>
 #include <intelblocks/msr.h>
diff --git a/src/soc/intel/quark/include/soc/reg_access.h b/src/soc/intel/quark/include/soc/reg_access.h
index 31df09d7c5..1f186f781c 100644
--- a/src/soc/intel/quark/include/soc/reg_access.h
+++ b/src/soc/intel/quark/include/soc/reg_access.h
@@ -4,7 +4,6 @@
 #define _QUARK_REG_ACCESS_H_
 
 #include <cpu/x86/cr.h>
-#include <cpu/x86/msr.h>
 #include <fsp/util.h>
 #include <reg_script.h>
 #include <soc/IntelQNCConfig.h>
diff --git a/src/soc/intel/xeon_sp/skx/soc_util.c b/src/soc/intel/xeon_sp/skx/soc_util.c
index dc97d5ec34..f69f0b98d4 100644
--- a/src/soc/intel/xeon_sp/skx/soc_util.c
+++ b/src/soc/intel/xeon_sp/skx/soc_util.c
@@ -3,7 +3,6 @@
 #include <assert.h>
 #include <commonlib/sort.h>
 #include <console/console.h>
-#include <cpu/x86/msr.h>
 #include <delay.h>
 #include <device/pci.h>
 #include <hob_iiouds.h>
diff --git a/src/southbridge/amd/pi/hudson/early_setup.c b/src/southbridge/amd/pi/hudson/early_setup.c
index 8bca42b6ee..14bb5e29c3 100644
--- a/src/southbridge/amd/pi/hudson/early_setup.c
+++ b/src/southbridge/amd/pi/hudson/early_setup.c
@@ -16,7 +16,6 @@
 
 #if CONFIG(HUDSON_UART)
 
-#include <cpu/x86/msr.h>
 #include <delay.h>
 
 void configure_hudson_uart(void)