[coreboot-gerrit] Change in coreboot[master]: src: Remove unneeded include <cpu/cpu.h>

[Elyes HAOUAS (Code Review)]

Elyes HAOUAS has uploaded this change for review. ( https://review.coreboot.org/29300


Change subject: src: Remove unneeded include <cpu/cpu.h>
......................................................................

src: Remove unneeded include <cpu/cpu.h>

Change-Id: I17c4fc4e3e2eeef7c720c6a020b37d8f7a0f57a4
Signed-off-by: Elyes HAOUAS <ehaouas at noos.fr>
---
M src/arch/x86/acpi_s3.c
M src/arch/x86/mpspec.c
M src/arch/x86/tables.c
M src/cpu/allwinner/a10/cpu.c
M src/cpu/amd/family_10h-family_15h/processor_name.c
M src/cpu/amd/family_10h-family_15h/ram_calc.c
M src/cpu/amd/quadcore/amd_sibling.c
M src/cpu/amd/smm/smm_init.c
M src/cpu/intel/fsp_model_206ax/finalize.c
M src/cpu/intel/haswell/finalize.c
M src/cpu/intel/haswell/romstage.c
M src/cpu/intel/haswell/smmrelocate.c
M src/cpu/intel/hyperthreading/intel_sibling.c
M src/cpu/intel/microcode/microcode.c
M src/cpu/intel/model_2065x/finalize.c
M src/cpu/intel/model_206ax/finalize.c
M src/cpu/intel/slot_1/l2_cache.c
M src/cpu/intel/smm/gen1/smmrelocate.c
M src/cpu/via/nano/update_ucode.c
M src/cpu/x86/name/name.c
M src/cpu/x86/pae/pgtbl.c
M src/lib/selfboot.c
M src/mainboard/intel/harcuvar/acpi_tables.c
M src/mainboard/scaleway/tagada/acpi_tables.c
M src/northbridge/intel/gm45/acpi.c
M src/northbridge/intel/haswell/northbridge.c
M src/northbridge/intel/i945/acpi.c
M src/northbridge/intel/x4x/acpi.c
M src/soc/amd/stoneyridge/chip.c
M src/soc/amd/stoneyridge/northbridge.c
M src/soc/amd/stoneyridge/smi.c
M src/soc/cavium/cn81xx/soc.c
M src/soc/intel/apollolake/acpi.c
M src/soc/intel/apollolake/chip.c
M src/soc/intel/baytrail/placeholders.c
M src/soc/intel/baytrail/smm.c
M src/soc/intel/baytrail/southcluster.c
M src/soc/intel/braswell/acpi.c
M src/soc/intel/braswell/placeholders.c
M src/soc/intel/braswell/smm.c
M src/soc/intel/broadwell/cpu_info.c
M src/soc/intel/broadwell/smi.c
M src/soc/intel/broadwell/smmrelocate.c
M src/soc/intel/cannonlake/acpi.c
M src/soc/intel/denverton_ns/acpi.c
M src/soc/intel/denverton_ns/chip.c
M src/soc/intel/denverton_ns/lpc.c
M src/soc/intel/denverton_ns/smm.c
M src/soc/intel/fsp_baytrail/acpi.c
M src/soc/intel/fsp_baytrail/placeholders.c
M src/soc/intel/fsp_baytrail/smm.c
M src/soc/intel/fsp_baytrail/southcluster.c
M src/soc/intel/fsp_broadwell_de/smmrelocate.c
M src/soc/intel/icelake/acpi.c
M src/soc/intel/skylake/acpi.c
M src/soc/intel/skylake/cpu.c
M src/soc/intel/skylake/smmrelocate.c
M src/soc/mediatek/mt8173/soc.c
M src/soc/nvidia/tegra124/display.c
M src/soc/nvidia/tegra124/sor.c
M src/soc/nvidia/tegra210/soc.c
M src/soc/nvidia/tegra210/sor.c
M src/soc/rockchip/rk3399/soc.c
M src/southbridge/amd/agesa/hudson/smi.c
M src/southbridge/amd/pi/hudson/smi.c
M src/southbridge/amd/rs780/cmn.c
M src/southbridge/intel/bd82x6x/lpc.c
M src/southbridge/intel/common/smi.c
M src/southbridge/intel/fsp_bd82x6x/lpc.c
M src/southbridge/intel/fsp_bd82x6x/smi.c
M src/southbridge/intel/fsp_i89xx/lpc.c
M src/southbridge/intel/fsp_i89xx/smi.c
M src/southbridge/intel/fsp_rangeley/lpc.c
M src/southbridge/intel/i82801dx/smi.c
M src/southbridge/intel/i82801gx/lpc.c
M src/southbridge/intel/i82801gx/smi.c
M src/southbridge/intel/i82801ix/lpc.c
M src/southbridge/intel/i82801ix/smi.c
M src/southbridge/intel/i82801jx/lpc.c
M src/southbridge/intel/i82801jx/smi.c
M src/southbridge/intel/ibexpeak/lpc.c
M src/southbridge/intel/ibexpeak/smi.c
M src/southbridge/intel/lynxpoint/lpc.c
M src/southbridge/intel/lynxpoint/smi.c
84 files changed, 0 insertions(+), 87 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/00/29300/1

diff --git a/src/arch/x86/acpi_s3.c b/src/arch/x86/acpi_s3.c
index 71267f0..86f3f82 100644
--- a/src/arch/x86/acpi_s3.c
+++ b/src/arch/x86/acpi_s3.c
@@ -17,7 +17,6 @@
 #include <string.h>
 #include <arch/acpi.h>
 #include <cbmem.h>
-#include <cpu/cpu.h>
 #include <fallback.h>
 #include <timestamp.h>
 #include <program_loading.h>
diff --git a/src/arch/x86/mpspec.c b/src/arch/x86/mpspec.c
index 8dd902e..b44662d 100644
--- a/src/arch/x86/mpspec.c
+++ b/src/arch/x86/mpspec.c
@@ -16,7 +16,6 @@
 #include <console/console.h>
 #include <device/path.h>
 #include <device/pci_ids.h>
-#include <cpu/cpu.h>
 #include <arch/smp/mpspec.h>
 #include <string.h>
 #include <arch/cpu.h>
diff --git a/src/arch/x86/tables.c b/src/arch/x86/tables.c
index 0bab423..5319c69 100644
--- a/src/arch/x86/tables.c
+++ b/src/arch/x86/tables.c
@@ -16,7 +16,6 @@
  */
 
 #include <console/console.h>
-#include <cpu/cpu.h>
 #include <bootmem.h>
 #include <bootstate.h>
 #include <boot/tables.h>
diff --git a/src/cpu/allwinner/a10/cpu.c b/src/cpu/allwinner/a10/cpu.c
index 0d06567..c1455be 100644
--- a/src/cpu/allwinner/a10/cpu.c
+++ b/src/cpu/allwinner/a10/cpu.c
@@ -18,11 +18,9 @@
  */
 
 #include <device/device.h>
-#include <cpu/cpu.h>
 #include <cbmem.h>
 #include <symbols.h>
 
-
 static void cpu_enable_resources(struct device *dev)
 {
 	ram_resource(dev, 0, (uintptr_t)_dram/KiB,
diff --git a/src/cpu/amd/family_10h-family_15h/processor_name.c b/src/cpu/amd/family_10h-family_15h/processor_name.c
index 7231103..478f0a5 100644
--- a/src/cpu/amd/family_10h-family_15h/processor_name.c
+++ b/src/cpu/amd/family_10h-family_15h/processor_name.c
@@ -27,7 +27,6 @@
 #include <string.h>
 #include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
-#include <cpu/cpu.h>
 #include <cpu/amd/model_10xxx_rev.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/cpu/amd/family_10h-family_15h/ram_calc.c b/src/cpu/amd/family_10h-family_15h/ram_calc.c
index 54fdaf5..dbea56a 100644
--- a/src/cpu/amd/family_10h-family_15h/ram_calc.c
+++ b/src/cpu/amd/family_10h-family_15h/ram_calc.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <cpu/cpu.h>
 #include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
 
diff --git a/src/cpu/amd/quadcore/amd_sibling.c b/src/cpu/amd/quadcore/amd_sibling.c
index 32b1784..f9259c2 100644
--- a/src/cpu/amd/quadcore/amd_sibling.c
+++ b/src/cpu/amd/quadcore/amd_sibling.c
@@ -13,9 +13,7 @@
  * GNU General Public License for more details.
  */
 
-
 #include <console/console.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/lapic.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/cpu/amd/smm/smm_init.c b/src/cpu/amd/smm/smm_init.c
index 591b506..521a897 100644
--- a/src/cpu/amd/smm/smm_init.c
+++ b/src/cpu/amd/smm/smm_init.c
@@ -15,7 +15,6 @@
  */
 
 #include <arch/io.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/lapic.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/mtrr.h>
diff --git a/src/cpu/intel/fsp_model_206ax/finalize.c b/src/cpu/intel/fsp_model_206ax/finalize.c
index d143497..97c6d98 100644
--- a/src/cpu/intel/fsp_model_206ax/finalize.c
+++ b/src/cpu/intel/fsp_model_206ax/finalize.c
@@ -16,7 +16,6 @@
 
 #include <stdint.h>
 #include <stdlib.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/msr.h>
 #include "model_206ax.h"
 
diff --git a/src/cpu/intel/haswell/finalize.c b/src/cpu/intel/haswell/finalize.c
index b170215..8fb64e8 100644
--- a/src/cpu/intel/haswell/finalize.c
+++ b/src/cpu/intel/haswell/finalize.c
@@ -16,7 +16,6 @@
 
 #include <stdint.h>
 #include <stdlib.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/msr.h>
 #include "haswell.h"
 
diff --git a/src/cpu/intel/haswell/romstage.c b/src/cpu/intel/haswell/romstage.c
index 8c65dae..7e4efa7 100644
--- a/src/cpu/intel/haswell/romstage.c
+++ b/src/cpu/intel/haswell/romstage.c
@@ -19,7 +19,6 @@
 #include <console/console.h>
 #include <arch/cpu.h>
 #include <cf9_reset.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/bist.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/mtrr.h>
diff --git a/src/cpu/intel/haswell/smmrelocate.c b/src/cpu/intel/haswell/smmrelocate.c
index 324c518..36ea92a 100644
--- a/src/cpu/intel/haswell/smmrelocate.c
+++ b/src/cpu/intel/haswell/smmrelocate.c
@@ -18,7 +18,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/lapic.h>
 #include <cpu/x86/mp.h>
diff --git a/src/cpu/intel/hyperthreading/intel_sibling.c b/src/cpu/intel/hyperthreading/intel_sibling.c
index d965470..b05d3d4 100644
--- a/src/cpu/intel/hyperthreading/intel_sibling.c
+++ b/src/cpu/intel/hyperthreading/intel_sibling.c
@@ -12,7 +12,6 @@
  */
 
 #include <console/console.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/lapic.h>
 #include <cpu/intel/hyperthreading.h>
 #include <device/device.h>
diff --git a/src/cpu/intel/microcode/microcode.c b/src/cpu/intel/microcode/microcode.c
index ae34347..737a175 100644
--- a/src/cpu/intel/microcode/microcode.c
+++ b/src/cpu/intel/microcode/microcode.c
@@ -24,7 +24,6 @@
 #else
 #include <arch/cbfs.h>
 #endif
-#include <cpu/cpu.h>
 #include <cpu/x86/msr.h>
 #include <cpu/intel/microcode.h>
 #include <rules.h>
diff --git a/src/cpu/intel/model_2065x/finalize.c b/src/cpu/intel/model_2065x/finalize.c
index 08541c0..c36e0d9 100644
--- a/src/cpu/intel/model_2065x/finalize.c
+++ b/src/cpu/intel/model_2065x/finalize.c
@@ -16,7 +16,6 @@
 
 #include <stdint.h>
 #include <stdlib.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/msr.h>
 #include <cpu/intel/speedstep.h>
 #include "model_2065x.h"
diff --git a/src/cpu/intel/model_206ax/finalize.c b/src/cpu/intel/model_206ax/finalize.c
index 5c69ffc..c2e0925 100644
--- a/src/cpu/intel/model_206ax/finalize.c
+++ b/src/cpu/intel/model_206ax/finalize.c
@@ -16,7 +16,6 @@
 
 #include <stdint.h>
 #include <stdlib.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/msr.h>
 #include <cpu/intel/speedstep.h>
 #include "model_206ax.h"
diff --git a/src/cpu/intel/slot_1/l2_cache.c b/src/cpu/intel/slot_1/l2_cache.c
index 617a4e6..7821ad1 100644
--- a/src/cpu/intel/slot_1/l2_cache.c
+++ b/src/cpu/intel/slot_1/l2_cache.c
@@ -40,7 +40,6 @@
 
 #include <stdint.h>
 #include <console/console.h>
-#include <cpu/cpu.h>
 #include <cpu/intel/l2_cache.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/msr.h>
diff --git a/src/cpu/intel/smm/gen1/smmrelocate.c b/src/cpu/intel/smm/gen1/smmrelocate.c
index 15caa0f..426eae5 100644
--- a/src/cpu/intel/smm/gen1/smmrelocate.c
+++ b/src/cpu/intel/smm/gen1/smmrelocate.c
@@ -21,7 +21,6 @@
 #include <string.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/mtrr.h>
diff --git a/src/cpu/via/nano/update_ucode.c b/src/cpu/via/nano/update_ucode.c
index efabac6..cb7d1e0 100644
--- a/src/cpu/via/nano/update_ucode.c
+++ b/src/cpu/via/nano/update_ucode.c
@@ -18,7 +18,6 @@
 #include <cpu/x86/msr.h>
 #include <console/console.h>
 #include <stddef.h>
-#include <cpu/cpu.h>
 #include <arch/cpu.h>
 #include <cbfs.h>
 
diff --git a/src/cpu/x86/name/name.c b/src/cpu/x86/name/name.c
index cff2e5c..fa4f3a3 100644
--- a/src/cpu/x86/name/name.c
+++ b/src/cpu/x86/name/name.c
@@ -15,7 +15,6 @@
 
 #include <string.h>
 #include <device/device.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/name.h>
 
 void fill_processor_name(char *processor_name)
diff --git a/src/cpu/x86/pae/pgtbl.c b/src/cpu/x86/pae/pgtbl.c
index 49c17b6..728135d 100644
--- a/src/cpu/x86/pae/pgtbl.c
+++ b/src/cpu/x86/pae/pgtbl.c
@@ -16,7 +16,6 @@
 #include <cbfs.h>
 #include <commonlib/helpers.h>
 #include <console/console.h>
-#include <cpu/cpu.h>
 #include <arch/cpu.h>
 #include <cpu/x86/cr.h>
 #include <cpu/x86/msr.h>
diff --git a/src/lib/selfboot.c b/src/lib/selfboot.c
index efd2d3d..9c52cd6 100644
--- a/src/lib/selfboot.c
+++ b/src/lib/selfboot.c
@@ -18,7 +18,6 @@
 #include <commonlib/compression.h>
 #include <commonlib/endian.h>
 #include <console/console.h>
-#include <cpu/cpu.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/mainboard/intel/harcuvar/acpi_tables.c b/src/mainboard/intel/harcuvar/acpi_tables.c
index 5e5b25b..3d83d3c 100644
--- a/src/mainboard/intel/harcuvar/acpi_tables.c
+++ b/src/mainboard/intel/harcuvar/acpi_tables.c
@@ -24,7 +24,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/msr.h>
 
 #include <soc/acpi.h>
diff --git a/src/mainboard/scaleway/tagada/acpi_tables.c b/src/mainboard/scaleway/tagada/acpi_tables.c
index 5e5b25b..3d83d3c 100644
--- a/src/mainboard/scaleway/tagada/acpi_tables.c
+++ b/src/mainboard/scaleway/tagada/acpi_tables.c
@@ -24,7 +24,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/msr.h>
 
 #include <soc/acpi.h>
diff --git a/src/northbridge/intel/gm45/acpi.c b/src/northbridge/intel/gm45/acpi.c
index d208eed..18f541f 100644
--- a/src/northbridge/intel/gm45/acpi.c
+++ b/src/northbridge/intel/gm45/acpi.c
@@ -24,7 +24,6 @@
 #include <device/pci_ids.h>
 #include <cbmem.h>
 #include <arch/acpigen.h>
-#include <cpu/cpu.h>
 #include "gm45.h"
 
 unsigned long acpi_fill_mcfg(unsigned long current)
diff --git a/src/northbridge/intel/haswell/northbridge.c b/src/northbridge/intel/haswell/northbridge.c
index 0453246..116fd33 100644
--- a/src/northbridge/intel/haswell/northbridge.c
+++ b/src/northbridge/intel/haswell/northbridge.c
@@ -25,7 +25,6 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/smm.h>
 #include <boot/tables.h>
 #include <cbmem.h>
diff --git a/src/northbridge/intel/i945/acpi.c b/src/northbridge/intel/i945/acpi.c
index 5372946..0abc2ea 100644
--- a/src/northbridge/intel/i945/acpi.c
+++ b/src/northbridge/intel/i945/acpi.c
@@ -23,7 +23,6 @@
 #include <device/pci_ids.h>
 #include <cbmem.h>
 #include <arch/acpigen.h>
-#include <cpu/cpu.h>
 #include "i945.h"
 
 unsigned long acpi_fill_mcfg(unsigned long current)
diff --git a/src/northbridge/intel/x4x/acpi.c b/src/northbridge/intel/x4x/acpi.c
index 678486c..b168ffa 100644
--- a/src/northbridge/intel/x4x/acpi.c
+++ b/src/northbridge/intel/x4x/acpi.c
@@ -25,7 +25,6 @@
 #include <device/pci_ids.h>
 #include <cbmem.h>
 #include <arch/acpigen.h>
-#include <cpu/cpu.h>
 #include "x4x.h"
 
 unsigned long acpi_fill_mcfg(unsigned long current)
diff --git a/src/soc/amd/stoneyridge/chip.c b/src/soc/amd/stoneyridge/chip.c
index 33c1730..db9c611 100644
--- a/src/soc/amd/stoneyridge/chip.c
+++ b/src/soc/amd/stoneyridge/chip.c
@@ -17,7 +17,6 @@
 #include <bootstate.h>
 #include <console/console.h>
 #include <cpu/amd/mtrr.h>
-#include <cpu/cpu.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <drivers/i2c/designware/dw_i2c.h>
diff --git a/src/soc/amd/stoneyridge/northbridge.c b/src/soc/amd/stoneyridge/northbridge.c
index a2ae52c..7acf66a 100644
--- a/src/soc/amd/stoneyridge/northbridge.c
+++ b/src/soc/amd/stoneyridge/northbridge.c
@@ -23,7 +23,6 @@
 #include <console/console.h>
 #include <cpu/amd/mtrr.h>
 #include <cpu/amd/amdfam15.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/lapic_def.h>
 #include <cpu/x86/msr.h>
 #include <cpu/amd/msr.h>
diff --git a/src/soc/amd/stoneyridge/smi.c b/src/soc/amd/stoneyridge/smi.c
index d21c70e..5ddc0dd 100644
--- a/src/soc/amd/stoneyridge/smi.c
+++ b/src/soc/amd/stoneyridge/smi.c
@@ -19,7 +19,6 @@
  */
 
 #include <console/console.h>
-#include <cpu/cpu.h>
 #include <soc/southbridge.h>
 #include <soc/smi.h>
 
diff --git a/src/soc/cavium/cn81xx/soc.c b/src/soc/cavium/cn81xx/soc.c
index 0bf76f7..8d42d3d 100644
--- a/src/soc/cavium/cn81xx/soc.c
+++ b/src/soc/cavium/cn81xx/soc.c
@@ -18,7 +18,6 @@
 
 #include <bootmode.h>
 #include <console/console.h>
-#include <cpu/cpu.h>
 #include <device/device.h>
 #include <soc/addressmap.h>
 #include <soc/clock.h>
diff --git a/src/soc/intel/apollolake/acpi.c b/src/soc/intel/apollolake/acpi.c
index d796fa0..0c4ff81 100644
--- a/src/soc/intel/apollolake/acpi.c
+++ b/src/soc/intel/apollolake/acpi.c
@@ -22,7 +22,6 @@
 #include <arch/smp/mpspec.h>
 #include <cbmem.h>
 #include <cpu/x86/smm.h>
-#include <cpu/cpu.h>
 #include <gpio.h>
 #include <intelblocks/acpi.h>
 #include <intelblocks/pmclib.h>
diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c
index 9ee6dbb..fd3a202 100644
--- a/src/soc/intel/apollolake/chip.c
+++ b/src/soc/intel/apollolake/chip.c
@@ -21,7 +21,6 @@
 #include <bootstate.h>
 #include <cbmem.h>
 #include <console/console.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/mp.h>
 #include <cpu/x86/msr.h>
 #include <device/device.h>
diff --git a/src/soc/intel/baytrail/placeholders.c b/src/soc/intel/baytrail/placeholders.c
index b110f5f..b476409 100644
--- a/src/soc/intel/baytrail/placeholders.c
+++ b/src/soc/intel/baytrail/placeholders.c
@@ -13,7 +13,6 @@
  */
 
 #include <arch/acpi.h>
-#include <cpu/cpu.h>
 #include <device/pci_rom.h>
 #include <soc/acpi.h>
 
diff --git a/src/soc/intel/baytrail/smm.c b/src/soc/intel/baytrail/smm.c
index 17541f6..a65e10e 100644
--- a/src/soc/intel/baytrail/smm.c
+++ b/src/soc/intel/baytrail/smm.c
@@ -18,7 +18,6 @@
 #include <device/pci.h>
 #include <console/console.h>
 #include <arch/io.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/smm.h>
 #include <string.h>
 
diff --git a/src/soc/intel/baytrail/southcluster.c b/src/soc/intel/baytrail/southcluster.c
index 0ef70d0..3ef44044 100644
--- a/src/soc/intel/baytrail/southcluster.c
+++ b/src/soc/intel/baytrail/southcluster.c
@@ -38,7 +38,6 @@
 #include "chip.h"
 #include <arch/acpi.h>
 #include <arch/acpigen.h>
-#include <cpu/cpu.h>
 
 static inline void
 add_mmio_resource(struct device *dev, int i, unsigned long addr,
diff --git a/src/soc/intel/braswell/acpi.c b/src/soc/intel/braswell/acpi.c
index c11adb9..f402f54 100644
--- a/src/soc/intel/braswell/acpi.c
+++ b/src/soc/intel/braswell/acpi.c
@@ -23,7 +23,6 @@
 #include <cbfs.h>
 #include <cbmem.h>
 #include <console/console.h>
-#include <cpu/cpu.h>
 #include <cpu/intel/turbo.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/smm.h>
diff --git a/src/soc/intel/braswell/placeholders.c b/src/soc/intel/braswell/placeholders.c
index 8493e38..7e633d9 100644
--- a/src/soc/intel/braswell/placeholders.c
+++ b/src/soc/intel/braswell/placeholders.c
@@ -14,7 +14,6 @@
  */
 
 #include <arch/acpi.h>
-#include <cpu/cpu.h>
 #include <device/pci_rom.h>
 #include <soc/acpi.h>
 
diff --git a/src/soc/intel/braswell/smm.c b/src/soc/intel/braswell/smm.c
index 3a7ab1c..ae0d80a 100644
--- a/src/soc/intel/braswell/smm.c
+++ b/src/soc/intel/braswell/smm.c
@@ -17,7 +17,6 @@
 
 #include <arch/io.h>
 #include <console/console.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/smm.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 4e2f392..0b8d95f 100644
--- a/src/soc/intel/broadwell/cpu_info.c
+++ b/src/soc/intel/broadwell/cpu_info.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <cpu/cpu.h>
 #include <cpu/x86/msr.h>
 #include <soc/cpu.h>
 #include <soc/msr.h>
diff --git a/src/soc/intel/broadwell/smi.c b/src/soc/intel/broadwell/smi.c
index c159a75..f87b8a2 100644
--- a/src/soc/intel/broadwell/smi.c
+++ b/src/soc/intel/broadwell/smi.c
@@ -18,7 +18,6 @@
 #include <device/pci.h>
 #include <console/console.h>
 #include <arch/io.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/smm.h>
 #include <string.h>
diff --git a/src/soc/intel/broadwell/smmrelocate.c b/src/soc/intel/broadwell/smmrelocate.c
index 08b98e9..5e95bb4 100644
--- a/src/soc/intel/broadwell/smmrelocate.c
+++ b/src/soc/intel/broadwell/smmrelocate.c
@@ -17,7 +17,6 @@
 #include <string.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/lapic.h>
 #include <cpu/x86/mp.h>
diff --git a/src/soc/intel/cannonlake/acpi.c b/src/soc/intel/cannonlake/acpi.c
index 4fd9241..864d41d 100644
--- a/src/soc/intel/cannonlake/acpi.c
+++ b/src/soc/intel/cannonlake/acpi.c
@@ -22,7 +22,6 @@
 #include <arch/smp/mpspec.h>
 #include <cbmem.h>
 #include <chip.h>
-#include <cpu/cpu.h>
 #include <ec/google/chromeec/ec.h>
 #include <intelblocks/cpulib.h>
 #include <intelblocks/pmclib.h>
diff --git a/src/soc/intel/denverton_ns/acpi.c b/src/soc/intel/denverton_ns/acpi.c
index 71e3960..bd41fd1 100644
--- a/src/soc/intel/denverton_ns/acpi.c
+++ b/src/soc/intel/denverton_ns/acpi.c
@@ -22,7 +22,6 @@
 #include <cpu/x86/smm.h>
 #include <string.h>
 #include <device/pci.h>
-#include <cpu/cpu.h>
 #include <cbmem.h>
 
 #include <soc/acpi.h>
diff --git a/src/soc/intel/denverton_ns/chip.c b/src/soc/intel/denverton_ns/chip.c
index 05dcb76..dfb6d2e 100644
--- a/src/soc/intel/denverton_ns/chip.c
+++ b/src/soc/intel/denverton_ns/chip.c
@@ -20,7 +20,6 @@
 #include <cbfs.h>
 #include <cbmem.h>
 #include <console/console.h>
-#include <cpu/cpu.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <fsp/api.h>
diff --git a/src/soc/intel/denverton_ns/lpc.c b/src/soc/intel/denverton_ns/lpc.c
index 0e1a95d..dbc5ecc 100644
--- a/src/soc/intel/denverton_ns/lpc.c
+++ b/src/soc/intel/denverton_ns/lpc.c
@@ -21,7 +21,6 @@
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <arch/acpi.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/smm.h>
 #include <bootstate.h>
 
diff --git a/src/soc/intel/denverton_ns/smm.c b/src/soc/intel/denverton_ns/smm.c
index 732aed4..9d3fa75 100644
--- a/src/soc/intel/denverton_ns/smm.c
+++ b/src/soc/intel/denverton_ns/smm.c
@@ -20,7 +20,6 @@
 #include <device/pci.h>
 #include <console/console.h>
 #include <arch/io.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/smm.h>
 #include <string.h>
 
diff --git a/src/soc/intel/fsp_baytrail/acpi.c b/src/soc/intel/fsp_baytrail/acpi.c
index 97c8d5b..8152bfb 100644
--- a/src/soc/intel/fsp_baytrail/acpi.c
+++ b/src/soc/intel/fsp_baytrail/acpi.c
@@ -43,7 +43,6 @@
 #include <soc/msr.h>
 #include <soc/pattrs.h>
 #include <soc/pmc.h>
-#include <cpu/cpu.h>
 #include <cbmem.h>
 
 #include "chip.h"
diff --git a/src/soc/intel/fsp_baytrail/placeholders.c b/src/soc/intel/fsp_baytrail/placeholders.c
index 587f0e9..e9a8757 100644
--- a/src/soc/intel/fsp_baytrail/placeholders.c
+++ b/src/soc/intel/fsp_baytrail/placeholders.c
@@ -13,7 +13,6 @@
  */
 
 #include <arch/acpi.h>
-#include <cpu/cpu.h>
 #include <device/pci_rom.h>
 #include <soc/acpi.h>
 
diff --git a/src/soc/intel/fsp_baytrail/smm.c b/src/soc/intel/fsp_baytrail/smm.c
index eb24d21..84f8d28 100644
--- a/src/soc/intel/fsp_baytrail/smm.c
+++ b/src/soc/intel/fsp_baytrail/smm.c
@@ -18,7 +18,6 @@
 #include <device/pci.h>
 #include <console/console.h>
 #include <arch/io.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/smm.h>
 #include <string.h>
 
diff --git a/src/soc/intel/fsp_baytrail/southcluster.c b/src/soc/intel/fsp_baytrail/southcluster.c
index 6fa2192..d62805f 100644
--- a/src/soc/intel/fsp_baytrail/southcluster.c
+++ b/src/soc/intel/fsp_baytrail/southcluster.c
@@ -42,7 +42,6 @@
 #include "chip.h"
 #include <arch/acpi.h>
 #include <arch/acpigen.h>
-#include <cpu/cpu.h>
 
 #define ENABLE_ACPI_MODE_IN_COREBOOT	0
 #define TEST_SMM_FLASH_LOCKDOWN		0
diff --git a/src/soc/intel/fsp_broadwell_de/smmrelocate.c b/src/soc/intel/fsp_broadwell_de/smmrelocate.c
index fe7bc6f..c8a9e00 100644
--- a/src/soc/intel/fsp_broadwell_de/smmrelocate.c
+++ b/src/soc/intel/fsp_broadwell_de/smmrelocate.c
@@ -19,7 +19,6 @@
 #include <types.h>
 #include <string.h>
 #include <device/pci.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/lapic.h>
 #include <cpu/x86/mp.h>
 #include <cpu/x86/mtrr.h>
diff --git a/src/soc/intel/icelake/acpi.c b/src/soc/intel/icelake/acpi.c
index be024fe..0fd6359 100644
--- a/src/soc/intel/icelake/acpi.c
+++ b/src/soc/intel/icelake/acpi.c
@@ -20,7 +20,6 @@
 #include <arch/smp/mpspec.h>
 #include <cbmem.h>
 #include <chip.h>
-#include <cpu/cpu.h>
 #include <ec/google/chromeec/ec.h>
 #include <intelblocks/cpulib.h>
 #include <intelblocks/pmclib.h>
diff --git a/src/soc/intel/skylake/acpi.c b/src/soc/intel/skylake/acpi.c
index 86dcc48..6687ea1 100644
--- a/src/soc/intel/skylake/acpi.c
+++ b/src/soc/intel/skylake/acpi.c
@@ -24,7 +24,6 @@
 #include <cbmem.h>
 #include <chip.h>
 #include <console/console.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/smm.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/tsc.h>
diff --git a/src/soc/intel/skylake/cpu.c b/src/soc/intel/skylake/cpu.c
index cf039d5..9e4bbe8 100644
--- a/src/soc/intel/skylake/cpu.c
+++ b/src/soc/intel/skylake/cpu.c
@@ -22,7 +22,6 @@
 #include <device/pci.h>
 #include <string.h>
 #include <chip.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/soc/intel/skylake/smmrelocate.c b/src/soc/intel/skylake/smmrelocate.c
index 3db60f9..cb4e23f 100644
--- a/src/soc/intel/skylake/smmrelocate.c
+++ b/src/soc/intel/skylake/smmrelocate.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/lapic.h>
 #include <cpu/x86/mp.h>
diff --git a/src/soc/mediatek/mt8173/soc.c b/src/soc/mediatek/mt8173/soc.c
index c159532..37ceb34 100644
--- a/src/soc/mediatek/mt8173/soc.c
+++ b/src/soc/mediatek/mt8173/soc.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <cpu/cpu.h>
 #include <device/device.h>
 #include <symbols.h>
 #include <soc/emi.h>
diff --git a/src/soc/nvidia/tegra124/display.c b/src/soc/nvidia/tegra124/display.c
index c90e392..ec3d537 100644
--- a/src/soc/nvidia/tegra124/display.c
+++ b/src/soc/nvidia/tegra124/display.c
@@ -17,7 +17,6 @@
 #include <boot/tables.h>
 #include <cbmem.h>
 #include <console/console.h>
-#include <cpu/cpu.h>
 #include <delay.h>
 #include <device/device.h>
 #include <edid.h>
diff --git a/src/soc/nvidia/tegra124/sor.c b/src/soc/nvidia/tegra124/sor.c
index d9137ad..a1f7b30 100644
--- a/src/soc/nvidia/tegra124/sor.c
+++ b/src/soc/nvidia/tegra124/sor.c
@@ -20,7 +20,6 @@
 #include <boot/tables.h>
 #include <cbmem.h>
 #include <console/console.h>
-#include <cpu/cpu.h>
 #include <delay.h>
 #include <lib.h>
 #include <device/device.h>
diff --git a/src/soc/nvidia/tegra210/soc.c b/src/soc/nvidia/tegra210/soc.c
index a8f111b..076aa00 100644
--- a/src/soc/nvidia/tegra210/soc.c
+++ b/src/soc/nvidia/tegra210/soc.c
@@ -16,7 +16,6 @@
 
 #include <arch/io.h>
 #include <arch/cache.h>
-#include <cpu/cpu.h>
 #include <bootmode.h>
 #include <bootstate.h>
 #include <cbmem.h>
diff --git a/src/soc/nvidia/tegra210/sor.c b/src/soc/nvidia/tegra210/sor.c
index a00bdad..df5c449 100644
--- a/src/soc/nvidia/tegra210/sor.c
+++ b/src/soc/nvidia/tegra210/sor.c
@@ -26,7 +26,6 @@
 #include <device/device.h>
 #include <stdlib.h>
 #include <string.h>
-#include <cpu/cpu.h>
 #include <boot/tables.h>
 #include <cbmem.h>
 #include <soc/nvidia/tegra/dc.h>
diff --git a/src/soc/rockchip/rk3399/soc.c b/src/soc/rockchip/rk3399/soc.c
index 30f51d0..45ccbb3 100644
--- a/src/soc/rockchip/rk3399/soc.c
+++ b/src/soc/rockchip/rk3399/soc.c
@@ -15,7 +15,6 @@
 
 #include <bootmode.h>
 #include <console/console.h>
-#include <cpu/cpu.h>
 #include <device/device.h>
 #include <soc/addressmap.h>
 #include <soc/clock.h>
diff --git a/src/southbridge/amd/agesa/hudson/smi.c b/src/southbridge/amd/agesa/hudson/smi.c
index e8b7868..4180795 100644
--- a/src/southbridge/amd/agesa/hudson/smi.c
+++ b/src/southbridge/amd/agesa/hudson/smi.c
@@ -21,7 +21,6 @@
 #include "smi.h"
 
 #include <console/console.h>
-#include <cpu/cpu.h>
 
 void smm_setup_structures(void *gnvs, void *tcg, void *smi1)
 {
diff --git a/src/southbridge/amd/pi/hudson/smi.c b/src/southbridge/amd/pi/hudson/smi.c
index e8b7868..4180795 100644
--- a/src/southbridge/amd/pi/hudson/smi.c
+++ b/src/southbridge/amd/pi/hudson/smi.c
@@ -21,7 +21,6 @@
 #include "smi.h"
 
 #include <console/console.h>
-#include <cpu/cpu.h>
 
 void smm_setup_structures(void *gnvs, void *tcg, void *smi1)
 {
diff --git a/src/southbridge/amd/rs780/cmn.c b/src/southbridge/amd/rs780/cmn.c
index b849e1e..5f299d2 100644
--- a/src/southbridge/amd/rs780/cmn.c
+++ b/src/southbridge/amd/rs780/cmn.c
@@ -24,7 +24,6 @@
 #include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
 #include <delay.h>
-#include <cpu/cpu.h>
 #include "rs780.h"
 
 static u32 nb_read_index(struct device *dev, u32 index_reg, u32 index)
diff --git a/src/southbridge/intel/bd82x6x/lpc.c b/src/southbridge/intel/bd82x6x/lpc.c
index 271b5b0..6140ca6 100644
--- a/src/southbridge/intel/bd82x6x/lpc.c
+++ b/src/southbridge/intel/bd82x6x/lpc.c
@@ -26,7 +26,6 @@
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <arch/acpi.h>
-#include <cpu/cpu.h>
 #include <elog.h>
 #include <arch/acpigen.h>
 #include <drivers/intel/gma/i915.h>
diff --git a/src/southbridge/intel/common/smi.c b/src/southbridge/intel/common/smi.c
index d8e6d43..391cd5c 100644
--- a/src/southbridge/intel/common/smi.c
+++ b/src/southbridge/intel/common/smi.c
@@ -19,8 +19,6 @@
 #include <device/pci.h>
 #include <console/console.h>
 #include <arch/io.h>
-#include <cpu/cpu.h>
-#include <cpu/x86/cache.h>
 #include <cpu/x86/smm.h>
 #include <cpu/intel/smm/gen1/smi.h>
 #include <southbridge/intel/common/pmbase.h>
diff --git a/src/southbridge/intel/fsp_bd82x6x/lpc.c b/src/southbridge/intel/fsp_bd82x6x/lpc.c
index 431587d..0643c8b 100644
--- a/src/southbridge/intel/fsp_bd82x6x/lpc.c
+++ b/src/southbridge/intel/fsp_bd82x6x/lpc.c
@@ -25,7 +25,6 @@
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <arch/acpi.h>
-#include <cpu/cpu.h>
 #include <elog.h>
 #include <arch/acpigen.h>
 #include <drivers/intel/gma/i915.h>
diff --git a/src/southbridge/intel/fsp_bd82x6x/smi.c b/src/southbridge/intel/fsp_bd82x6x/smi.c
index 2248904..35df352 100644
--- a/src/southbridge/intel/fsp_bd82x6x/smi.c
+++ b/src/southbridge/intel/fsp_bd82x6x/smi.c
@@ -19,7 +19,6 @@
 #include <device/pci.h>
 #include <console/console.h>
 #include <arch/io.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/smm.h>
 #include <string.h>
diff --git a/src/southbridge/intel/fsp_i89xx/lpc.c b/src/southbridge/intel/fsp_i89xx/lpc.c
index f584f36..b44faf4 100644
--- a/src/southbridge/intel/fsp_i89xx/lpc.c
+++ b/src/southbridge/intel/fsp_i89xx/lpc.c
@@ -25,7 +25,6 @@
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <arch/acpi.h>
-#include <cpu/cpu.h>
 #include <elog.h>
 #include <arch/acpigen.h>
 #include <drivers/intel/gma/i915.h>
diff --git a/src/southbridge/intel/fsp_i89xx/smi.c b/src/southbridge/intel/fsp_i89xx/smi.c
index 6dc58f0..33dc5f8 100644
--- a/src/southbridge/intel/fsp_i89xx/smi.c
+++ b/src/southbridge/intel/fsp_i89xx/smi.c
@@ -19,7 +19,6 @@
 #include <device/pci.h>
 #include <console/console.h>
 #include <arch/io.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/smm.h>
 #include <string.h>
diff --git a/src/southbridge/intel/fsp_rangeley/lpc.c b/src/southbridge/intel/fsp_rangeley/lpc.c
index 88cc73f..431de38 100644
--- a/src/southbridge/intel/fsp_rangeley/lpc.c
+++ b/src/southbridge/intel/fsp_rangeley/lpc.c
@@ -25,7 +25,6 @@
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <arch/acpi.h>
-#include <cpu/cpu.h>
 #include <elog.h>
 #include <string.h>
 #include <cbmem.h>
diff --git a/src/southbridge/intel/i82801dx/smi.c b/src/southbridge/intel/i82801dx/smi.c
index 945fcf2..0ff813e 100644
--- a/src/southbridge/intel/i82801dx/smi.c
+++ b/src/southbridge/intel/i82801dx/smi.c
@@ -20,7 +20,6 @@
 #include <console/console.h>
 #include <arch/acpi.h>
 #include <arch/io.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/smm.h>
 #include <string.h>
diff --git a/src/southbridge/intel/i82801gx/lpc.c b/src/southbridge/intel/i82801gx/lpc.c
index 6c8331f..7dcec50 100644
--- a/src/southbridge/intel/i82801gx/lpc.c
+++ b/src/southbridge/intel/i82801gx/lpc.c
@@ -24,7 +24,6 @@
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <arch/acpi.h>
-#include <cpu/cpu.h>
 #include "i82801gx.h"
 #include <cpu/x86/smm.h>
 #include <arch/acpigen.h>
diff --git a/src/southbridge/intel/i82801gx/smi.c b/src/southbridge/intel/i82801gx/smi.c
index 7355d11..8cfd511 100644
--- a/src/southbridge/intel/i82801gx/smi.c
+++ b/src/southbridge/intel/i82801gx/smi.c
@@ -20,7 +20,6 @@
 #include <console/console.h>
 #include <arch/io.h>
 #include <arch/acpi.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/smm.h>
 #include <string.h>
diff --git a/src/southbridge/intel/i82801ix/lpc.c b/src/southbridge/intel/i82801ix/lpc.c
index 18bfcf3..a69b879 100644
--- a/src/southbridge/intel/i82801ix/lpc.c
+++ b/src/southbridge/intel/i82801ix/lpc.c
@@ -25,7 +25,6 @@
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <arch/acpi.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/smm.h>
 #include <arch/acpigen.h>
 #include <cbmem.h>
diff --git a/src/southbridge/intel/i82801ix/smi.c b/src/southbridge/intel/i82801ix/smi.c
index 2fa0c96..9dc9a3b 100644
--- a/src/southbridge/intel/i82801ix/smi.c
+++ b/src/southbridge/intel/i82801ix/smi.c
@@ -21,7 +21,6 @@
 #include <console/console.h>
 #include <arch/io.h>
 #include <arch/acpi.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/smm.h>
 #include <string.h>
diff --git a/src/southbridge/intel/i82801jx/lpc.c b/src/southbridge/intel/i82801jx/lpc.c
index cd5e307..ba79e73 100644
--- a/src/southbridge/intel/i82801jx/lpc.c
+++ b/src/southbridge/intel/i82801jx/lpc.c
@@ -25,7 +25,6 @@
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <arch/acpi.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/smm.h>
 #include <arch/acpigen.h>
 #include <arch/smp/mpspec.h>
diff --git a/src/southbridge/intel/i82801jx/smi.c b/src/southbridge/intel/i82801jx/smi.c
index 8d87291..76d4520 100644
--- a/src/southbridge/intel/i82801jx/smi.c
+++ b/src/southbridge/intel/i82801jx/smi.c
@@ -21,7 +21,6 @@
 #include <console/console.h>
 #include <arch/io.h>
 #include <arch/acpi.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/smm.h>
 #include <string.h>
diff --git a/src/southbridge/intel/ibexpeak/lpc.c b/src/southbridge/intel/ibexpeak/lpc.c
index b09951f..449d82a 100644
--- a/src/southbridge/intel/ibexpeak/lpc.c
+++ b/src/southbridge/intel/ibexpeak/lpc.c
@@ -25,7 +25,6 @@
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <arch/acpi.h>
-#include <cpu/cpu.h>
 #include <elog.h>
 #include <arch/acpigen.h>
 #include <drivers/intel/gma/i915.h>
diff --git a/src/southbridge/intel/ibexpeak/smi.c b/src/southbridge/intel/ibexpeak/smi.c
index 10e2fa6..3173662 100644
--- a/src/southbridge/intel/ibexpeak/smi.c
+++ b/src/southbridge/intel/ibexpeak/smi.c
@@ -20,7 +20,6 @@
 #include <device/pci.h>
 #include <console/console.h>
 #include <arch/io.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/smm.h>
 #include <string.h>
diff --git a/src/southbridge/intel/lynxpoint/lpc.c b/src/southbridge/intel/lynxpoint/lpc.c
index 5b09fed..bc50fd6 100644
--- a/src/southbridge/intel/lynxpoint/lpc.c
+++ b/src/southbridge/intel/lynxpoint/lpc.c
@@ -26,7 +26,6 @@
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <arch/acpi.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/smm.h>
 #include <elog.h>
 #include <cbmem.h>
diff --git a/src/southbridge/intel/lynxpoint/smi.c b/src/southbridge/intel/lynxpoint/smi.c
index 386451f..5dab05c 100644
--- a/src/southbridge/intel/lynxpoint/smi.c
+++ b/src/southbridge/intel/lynxpoint/smi.c
@@ -19,7 +19,6 @@
 #include <device/pci.h>
 #include <console/console.h>
 #include <arch/io.h>
-#include <cpu/cpu.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/smm.h>
 #include <string.h>

-- 
To view, visit https://review.coreboot.org/29300
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I17c4fc4e3e2eeef7c720c6a020b37d8f7a0f57a4
Gerrit-Change-Number: 29300
Gerrit-PatchSet: 1
Gerrit-Owner: Elyes HAOUAS <ehaouas at noos.fr>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20181027/be604535/attachment-0001.html>