From 32da3437f92f1c7e19b81e3bc99b4951d5268502 Mon Sep 17 00:00:00 2001
From: Elyes HAOUAS <ehaouas@noos.fr>
Date: Sun, 17 May 2020 17:15:31 +0200
Subject: src: Remove unused '#include <cpu/x86/lapic.h>'

Also, replace 'lapic.h' by 'lapic_def.h' in 'soc/intel/braswell/northcluster.c'.

Change-Id: I71cff43d53660dc1e5a760ac3034bcf75f93c6e7
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/41489
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/cpu/amd/smm/smm_init.c                           | 1 -
 src/cpu/intel/haswell/smmrelocate.c                  | 1 -
 src/cpu/intel/hyperthreading/intel_sibling.c         | 1 -
 src/cpu/x86/mtrr/mtrr.c                              | 1 -
 src/mainboard/amd/gardenia/mptable.c                 | 1 -
 src/mainboard/amd/olivehill/mptable.c                | 1 -
 src/mainboard/amd/parmer/mptable.c                   | 1 -
 src/mainboard/amd/thatcher/mptable.c                 | 1 -
 src/mainboard/asrock/imb-a180/mptable.c              | 1 -
 src/mainboard/asus/am1i-a/mptable.c                  | 1 -
 src/mainboard/asus/f2a85-m/mptable.c                 | 1 -
 src/mainboard/bap/ode_e20XX/mptable.c                | 1 -
 src/mainboard/bap/ode_e21XX/mptable.c                | 1 -
 src/mainboard/bap/ode_e21XX/romstage.c               | 1 -
 src/mainboard/biostar/a68n_5200/mptable.c            | 1 -
 src/mainboard/biostar/am1ml/mptable.c                | 1 -
 src/mainboard/gizmosphere/gizmo2/mptable.c           | 1 -
 src/mainboard/google/butterfly/early_init.c          | 1 -
 src/mainboard/google/kahlee/mptable.c                | 1 -
 src/mainboard/google/link/early_init.c               | 1 -
 src/mainboard/google/parrot/early_init.c             | 1 -
 src/mainboard/google/stout/early_init.c              | 1 -
 src/mainboard/hp/abm/mptable.c                       | 1 -
 src/mainboard/hp/pavilion_m6_1035dx/mptable.c        | 1 -
 src/mainboard/intel/emeraldlake2/early_init.c        | 1 -
 src/mainboard/kontron/ktqm77/early_init.c            | 1 -
 src/mainboard/lenovo/g505s/mptable.c                 | 1 -
 src/mainboard/lenovo/x1_carbon_gen1/early_init.c     | 1 -
 src/mainboard/lenovo/x201/mainboard.c                | 1 -
 src/mainboard/lenovo/x220/early_init.c               | 1 -
 src/mainboard/lenovo/x230/variants/x230/early_init.c | 1 -
 src/mainboard/msi/ms7721/mptable.c                   | 1 -
 src/mainboard/packardbell/ms2290/mainboard.c         | 1 -
 src/mainboard/samsung/lumpy/early_init.c             | 1 -
 src/mainboard/samsung/stumpy/early_init.c            | 1 -
 src/northbridge/amd/agesa/family14/northbridge.c     | 1 -
 src/soc/amd/common/block/smbus/sm.c                  | 1 -
 src/soc/intel/braswell/northcluster.c                | 2 +-
 src/soc/intel/broadwell/smmrelocate.c                | 1 -
 src/soc/intel/cannonlake/smmrelocate.c               | 1 -
 src/soc/intel/icelake/smmrelocate.c                  | 1 -
 src/soc/intel/jasperlake/smmrelocate.c               | 1 -
 src/soc/intel/skylake/smmrelocate.c                  | 1 -
 src/soc/intel/tigerlake/smmrelocate.c                | 1 -
 src/soc/intel/xeon_sp/uncore.c                       | 2 +-
 src/southbridge/amd/agesa/hudson/sm.c                | 1 -
 src/southbridge/amd/pi/hudson/sm.c                   | 1 -
 47 files changed, 2 insertions(+), 47 deletions(-)

diff --git a/src/cpu/amd/smm/smm_init.c b/src/cpu/amd/smm/smm_init.c
index 0de8fba085..71cca82b23 100644
--- a/src/cpu/amd/smm/smm_init.c
+++ b/src/cpu/amd/smm/smm_init.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <cpu/x86/lapic.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/mtrr.h>
 #include <cpu/amd/mtrr.h>
diff --git a/src/cpu/intel/haswell/smmrelocate.c b/src/cpu/intel/haswell/smmrelocate.c
index 1c961881ed..0f7585ae69 100644
--- a/src/cpu/intel/haswell/smmrelocate.c
+++ b/src/cpu/intel/haswell/smmrelocate.c
@@ -5,7 +5,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include <cpu/x86/lapic.h>
 #include <cpu/x86/mp.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/mtrr.h>
diff --git a/src/cpu/intel/hyperthreading/intel_sibling.c b/src/cpu/intel/hyperthreading/intel_sibling.c
index 9febc839c5..329b693140 100644
--- a/src/cpu/intel/hyperthreading/intel_sibling.c
+++ b/src/cpu/intel/hyperthreading/intel_sibling.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <console/console.h>
-#include <cpu/x86/lapic.h>
 #include <cpu/intel/hyperthreading.h>
 #include <device/device.h>
 #include <option.h>
diff --git a/src/cpu/x86/mtrr/mtrr.c b/src/cpu/x86/mtrr/mtrr.c
index 6187578c0a..1f37659503 100644
--- a/src/cpu/x86/mtrr/mtrr.c
+++ b/src/cpu/x86/mtrr/mtrr.c
@@ -19,7 +19,6 @@
 #include <cpu/x86/msr.h>
 #include <cpu/x86/mtrr.h>
 #include <cpu/x86/cache.h>
-#include <cpu/x86/lapic.h>
 #include <memrange.h>
 #include <cpu/amd/mtrr.h>
 #include <assert.h>
diff --git a/src/mainboard/amd/gardenia/mptable.c b/src/mainboard/amd/gardenia/mptable.c
index 3528a13ce1..6460fedb8b 100644
--- a/src/mainboard/amd/gardenia/mptable.c
+++ b/src/mainboard/amd/gardenia/mptable.c
@@ -4,7 +4,6 @@
 #include <arch/ioapic.h>
 #include <string.h>
 #include <stdint.h>
-#include <cpu/x86/lapic.h>
 #include <soc/southbridge.h>
 #include <amdblocks/amd_pci_util.h>
 
diff --git a/src/mainboard/amd/olivehill/mptable.c b/src/mainboard/amd/olivehill/mptable.c
index ab321c0d5c..4761728927 100644
--- a/src/mainboard/amd/olivehill/mptable.c
+++ b/src/mainboard/amd/olivehill/mptable.c
@@ -5,7 +5,6 @@
 #include <arch/ioapic.h>
 #include <string.h>
 #include <stdint.h>
-#include <cpu/x86/lapic.h>
 #include <southbridge/amd/agesa/hudson/hudson.h>
 
 u8 picr_data[0x54] = {
diff --git a/src/mainboard/amd/parmer/mptable.c b/src/mainboard/amd/parmer/mptable.c
index 28866e8cec..c7aa69eee6 100644
--- a/src/mainboard/amd/parmer/mptable.c
+++ b/src/mainboard/amd/parmer/mptable.c
@@ -5,7 +5,6 @@
 #include <arch/ioapic.h>
 #include <string.h>
 #include <stdint.h>
-#include <cpu/x86/lapic.h>
 #include <southbridge/amd/agesa/hudson/hudson.h>
 
 u8 picr_data[0x54] = {
diff --git a/src/mainboard/amd/thatcher/mptable.c b/src/mainboard/amd/thatcher/mptable.c
index 8b8bc03b0a..bc091e5125 100644
--- a/src/mainboard/amd/thatcher/mptable.c
+++ b/src/mainboard/amd/thatcher/mptable.c
@@ -5,7 +5,6 @@
 #include <arch/ioapic.h>
 #include <string.h>
 #include <stdint.h>
-#include <cpu/x86/lapic.h>
 #include <southbridge/amd/agesa/hudson/hudson.h>
 
 u8 picr_data[] = {
diff --git a/src/mainboard/asrock/imb-a180/mptable.c b/src/mainboard/asrock/imb-a180/mptable.c
index 2a35eb9bda..20c4b8d781 100644
--- a/src/mainboard/asrock/imb-a180/mptable.c
+++ b/src/mainboard/asrock/imb-a180/mptable.c
@@ -5,7 +5,6 @@
 #include <arch/ioapic.h>
 #include <string.h>
 #include <stdint.h>
-#include <cpu/x86/lapic.h>
 #include <southbridge/amd/agesa/hudson/hudson.h>
 
 
diff --git a/src/mainboard/asus/am1i-a/mptable.c b/src/mainboard/asus/am1i-a/mptable.c
index 5caa78384e..cd72ca3927 100644
--- a/src/mainboard/asus/am1i-a/mptable.c
+++ b/src/mainboard/asus/am1i-a/mptable.c
@@ -3,7 +3,6 @@
 #include <arch/smp/mpspec.h>
 #include <arch/ioapic.h>
 #include <stdint.h>
-#include <cpu/x86/lapic.h>
 #include <southbridge/amd/common/amd_pci_util.h>
 #include <drivers/generic/ioapic/chip.h>
 
diff --git a/src/mainboard/asus/f2a85-m/mptable.c b/src/mainboard/asus/f2a85-m/mptable.c
index 7d9dcc3a69..e3c7d80028 100644
--- a/src/mainboard/asus/f2a85-m/mptable.c
+++ b/src/mainboard/asus/f2a85-m/mptable.c
@@ -3,7 +3,6 @@
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
-#include <cpu/x86/lapic.h>
 #include <stdint.h>
 #include <string.h>
 #include <southbridge/amd/agesa/hudson/hudson.h>
diff --git a/src/mainboard/bap/ode_e20XX/mptable.c b/src/mainboard/bap/ode_e20XX/mptable.c
index b854b75297..c0ad4ed349 100644
--- a/src/mainboard/bap/ode_e20XX/mptable.c
+++ b/src/mainboard/bap/ode_e20XX/mptable.c
@@ -3,7 +3,6 @@
 #include <arch/smp/mpspec.h>
 #include <arch/ioapic.h>
 #include <stdint.h>
-#include <cpu/x86/lapic.h>
 #include <southbridge/amd/common/amd_pci_util.h>
 #include <drivers/generic/ioapic/chip.h>
 
diff --git a/src/mainboard/bap/ode_e21XX/mptable.c b/src/mainboard/bap/ode_e21XX/mptable.c
index 0d8c942462..c5aeeb0b4e 100644
--- a/src/mainboard/bap/ode_e21XX/mptable.c
+++ b/src/mainboard/bap/ode_e21XX/mptable.c
@@ -5,7 +5,6 @@
 #include <arch/ioapic.h>
 #include <string.h>
 #include <stdint.h>
-#include <cpu/x86/lapic.h>
 #include <southbridge/amd/pi/hudson/hudson.h>
 
 u8 picr_data[0x54] = {
diff --git a/src/mainboard/bap/ode_e21XX/romstage.c b/src/mainboard/bap/ode_e21XX/romstage.c
index 74b8517c73..6b116fd46f 100644
--- a/src/mainboard/bap/ode_e21XX/romstage.c
+++ b/src/mainboard/bap/ode_e21XX/romstage.c
@@ -5,7 +5,6 @@
 #include <device/pci_def.h>
 #include <arch/io.h>
 #include <arch/cpu.h>
-#include <cpu/x86/lapic.h>
 #include <console/console.h>
 #include <northbridge/amd/agesa/state_machine.h>
 #include <southbridge/amd/pi/hudson/hudson.h>
diff --git a/src/mainboard/biostar/a68n_5200/mptable.c b/src/mainboard/biostar/a68n_5200/mptable.c
index ab321c0d5c..4761728927 100644
--- a/src/mainboard/biostar/a68n_5200/mptable.c
+++ b/src/mainboard/biostar/a68n_5200/mptable.c
@@ -5,7 +5,6 @@
 #include <arch/ioapic.h>
 #include <string.h>
 #include <stdint.h>
-#include <cpu/x86/lapic.h>
 #include <southbridge/amd/agesa/hudson/hudson.h>
 
 u8 picr_data[0x54] = {
diff --git a/src/mainboard/biostar/am1ml/mptable.c b/src/mainboard/biostar/am1ml/mptable.c
index 7a028007aa..41e70b9b5f 100644
--- a/src/mainboard/biostar/am1ml/mptable.c
+++ b/src/mainboard/biostar/am1ml/mptable.c
@@ -3,7 +3,6 @@
 #include <arch/smp/mpspec.h>
 #include <arch/ioapic.h>
 #include <stdint.h>
-#include <cpu/x86/lapic.h>
 #include <southbridge/amd/common/amd_pci_util.h>
 #include <drivers/generic/ioapic/chip.h>
 
diff --git a/src/mainboard/gizmosphere/gizmo2/mptable.c b/src/mainboard/gizmosphere/gizmo2/mptable.c
index b854b75297..c0ad4ed349 100644
--- a/src/mainboard/gizmosphere/gizmo2/mptable.c
+++ b/src/mainboard/gizmosphere/gizmo2/mptable.c
@@ -3,7 +3,6 @@
 #include <arch/smp/mpspec.h>
 #include <arch/ioapic.h>
 #include <stdint.h>
-#include <cpu/x86/lapic.h>
 #include <southbridge/amd/common/amd_pci_util.h>
 #include <drivers/generic/ioapic/chip.h>
 
diff --git a/src/mainboard/google/butterfly/early_init.c b/src/mainboard/google/butterfly/early_init.c
index 21d59d18ac..df51f66518 100644
--- a/src/mainboard/google/butterfly/early_init.c
+++ b/src/mainboard/google/butterfly/early_init.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <stdint.h>
-#include <cpu/x86/lapic.h>
 #include <acpi/acpi.h>
 #include <northbridge/intel/sandybridge/sandybridge.h>
 #include <northbridge/intel/sandybridge/raminit.h>
diff --git a/src/mainboard/google/kahlee/mptable.c b/src/mainboard/google/kahlee/mptable.c
index 3528a13ce1..6460fedb8b 100644
--- a/src/mainboard/google/kahlee/mptable.c
+++ b/src/mainboard/google/kahlee/mptable.c
@@ -4,7 +4,6 @@
 #include <arch/ioapic.h>
 #include <string.h>
 #include <stdint.h>
-#include <cpu/x86/lapic.h>
 #include <soc/southbridge.h>
 #include <amdblocks/amd_pci_util.h>
 
diff --git a/src/mainboard/google/link/early_init.c b/src/mainboard/google/link/early_init.c
index 27f086cea4..8360f2ac24 100644
--- a/src/mainboard/google/link/early_init.c
+++ b/src/mainboard/google/link/early_init.c
@@ -3,7 +3,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <device/pci_ops.h>
-#include <cpu/x86/lapic.h>
 #include <acpi/acpi.h>
 #include <console/console.h>
 #include <northbridge/intel/sandybridge/sandybridge.h>
diff --git a/src/mainboard/google/parrot/early_init.c b/src/mainboard/google/parrot/early_init.c
index cff8438f5d..3c5c36369b 100644
--- a/src/mainboard/google/parrot/early_init.c
+++ b/src/mainboard/google/parrot/early_init.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <stdint.h>
-#include <cpu/x86/lapic.h>
 #include <acpi/acpi.h>
 #include <northbridge/intel/sandybridge/sandybridge.h>
 #include <northbridge/intel/sandybridge/raminit.h>
diff --git a/src/mainboard/google/stout/early_init.c b/src/mainboard/google/stout/early_init.c
index 1b73fc0d36..e71d0eec78 100644
--- a/src/mainboard/google/stout/early_init.c
+++ b/src/mainboard/google/stout/early_init.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <stdint.h>
-#include <cpu/x86/lapic.h>
 #include <acpi/acpi.h>
 #include <console/console.h>
 #include <northbridge/intel/sandybridge/sandybridge.h>
diff --git a/src/mainboard/hp/abm/mptable.c b/src/mainboard/hp/abm/mptable.c
index ab321c0d5c..4761728927 100644
--- a/src/mainboard/hp/abm/mptable.c
+++ b/src/mainboard/hp/abm/mptable.c
@@ -5,7 +5,6 @@
 #include <arch/ioapic.h>
 #include <string.h>
 #include <stdint.h>
-#include <cpu/x86/lapic.h>
 #include <southbridge/amd/agesa/hudson/hudson.h>
 
 u8 picr_data[0x54] = {
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/mptable.c b/src/mainboard/hp/pavilion_m6_1035dx/mptable.c
index 4433c71bcd..c620be253e 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/mptable.c
+++ b/src/mainboard/hp/pavilion_m6_1035dx/mptable.c
@@ -3,7 +3,6 @@
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
-#include <cpu/x86/lapic.h>
 #include <stdint.h>
 #include <string.h>
 #include <southbridge/amd/agesa/hudson/hudson.h>
diff --git a/src/mainboard/intel/emeraldlake2/early_init.c b/src/mainboard/intel/emeraldlake2/early_init.c
index 6e1f7e3a8f..119346efb7 100644
--- a/src/mainboard/intel/emeraldlake2/early_init.c
+++ b/src/mainboard/intel/emeraldlake2/early_init.c
@@ -3,7 +3,6 @@
 #include <bootblock_common.h>
 #include <stdint.h>
 #include <arch/io.h>
-#include <cpu/x86/lapic.h>
 #include <superio/smsc/sio1007/sio1007.h>
 #include <northbridge/intel/sandybridge/sandybridge.h>
 #include <northbridge/intel/sandybridge/raminit.h>
diff --git a/src/mainboard/kontron/ktqm77/early_init.c b/src/mainboard/kontron/ktqm77/early_init.c
index 31eb05b645..b8f44b5561 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/lapic.h>
 #include <cpu/x86/msr.h>
 #include <device/pci_def.h>
 #include <northbridge/intel/sandybridge/raminit_native.h>
diff --git a/src/mainboard/lenovo/g505s/mptable.c b/src/mainboard/lenovo/g505s/mptable.c
index 19ac198b46..bc1759a5c1 100644
--- a/src/mainboard/lenovo/g505s/mptable.c
+++ b/src/mainboard/lenovo/g505s/mptable.c
@@ -3,7 +3,6 @@
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
-#include <cpu/x86/lapic.h>
 #include <stdint.h>
 #include <string.h>
 #include <southbridge/amd/agesa/hudson/hudson.h>
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/early_init.c b/src/mainboard/lenovo/x1_carbon_gen1/early_init.c
index a709450678..f5299ea94d 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/early_init.c
+++ b/src/mainboard/lenovo/x1_carbon_gen1/early_init.c
@@ -2,7 +2,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <cpu/x86/lapic.h>
 #include <console/console.h>
 #include <northbridge/intel/sandybridge/sandybridge.h>
 #include <northbridge/intel/sandybridge/raminit_native.h>
diff --git a/src/mainboard/lenovo/x201/mainboard.c b/src/mainboard/lenovo/x201/mainboard.c
index beb99385f5..1a306b1695 100644
--- a/src/mainboard/lenovo/x201/mainboard.c
+++ b/src/mainboard/lenovo/x201/mainboard.c
@@ -6,7 +6,6 @@
 #include <southbridge/intel/bd82x6x/pch.h>
 #include "dock.h"
 #include <drivers/intel/gma/int15.h>
-#include <cpu/x86/lapic.h>
 #include <drivers/lenovo/lenovo.h>
 
 static void fill_ssdt(const struct device *device)
diff --git a/src/mainboard/lenovo/x220/early_init.c b/src/mainboard/lenovo/x220/early_init.c
index f87a9d48d2..5f0ad456be 100644
--- a/src/mainboard/lenovo/x220/early_init.c
+++ b/src/mainboard/lenovo/x220/early_init.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <stdint.h>
-#include <cpu/x86/lapic.h>
 #include <acpi/acpi.h>
 #include <northbridge/intel/sandybridge/sandybridge.h>
 #include <northbridge/intel/sandybridge/raminit.h>
diff --git a/src/mainboard/lenovo/x230/variants/x230/early_init.c b/src/mainboard/lenovo/x230/variants/x230/early_init.c
index 2089ee6bb2..e6c4ffa038 100644
--- a/src/mainboard/lenovo/x230/variants/x230/early_init.c
+++ b/src/mainboard/lenovo/x230/variants/x230/early_init.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <cpu/x86/lapic.h>
 #include <northbridge/intel/sandybridge/sandybridge.h>
 #include <northbridge/intel/sandybridge/raminit_native.h>
 #include <southbridge/intel/bd82x6x/pch.h>
diff --git a/src/mainboard/msi/ms7721/mptable.c b/src/mainboard/msi/ms7721/mptable.c
index 7d9dcc3a69..e3c7d80028 100644
--- a/src/mainboard/msi/ms7721/mptable.c
+++ b/src/mainboard/msi/ms7721/mptable.c
@@ -3,7 +3,6 @@
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
-#include <cpu/x86/lapic.h>
 #include <stdint.h>
 #include <string.h>
 #include <southbridge/amd/agesa/hudson/hudson.h>
diff --git a/src/mainboard/packardbell/ms2290/mainboard.c b/src/mainboard/packardbell/ms2290/mainboard.c
index 6df8fad268..ce8d504211 100644
--- a/src/mainboard/packardbell/ms2290/mainboard.c
+++ b/src/mainboard/packardbell/ms2290/mainboard.c
@@ -7,7 +7,6 @@
 #include <ec/acpi/ec.h>
 #include <drivers/intel/gma/int15.h>
 #include <pc80/keyboard.h>
-#include <cpu/x86/lapic.h>
 
 static void mainboard_enable(struct device *dev)
 {
diff --git a/src/mainboard/samsung/lumpy/early_init.c b/src/mainboard/samsung/lumpy/early_init.c
index 23309ba498..091cbc5064 100644
--- a/src/mainboard/samsung/lumpy/early_init.c
+++ b/src/mainboard/samsung/lumpy/early_init.c
@@ -4,7 +4,6 @@
 #include <string.h>
 #include <arch/io.h>
 #include <bootblock_common.h>
-#include <cpu/x86/lapic.h>
 #include <cbfs.h>
 #include <console/console.h>
 #include <bootmode.h>
diff --git a/src/mainboard/samsung/stumpy/early_init.c b/src/mainboard/samsung/stumpy/early_init.c
index 6636a6b744..f07948291f 100644
--- a/src/mainboard/samsung/stumpy/early_init.c
+++ b/src/mainboard/samsung/stumpy/early_init.c
@@ -2,7 +2,6 @@
 
 #include <bootblock_common.h>
 #include <stdint.h>
-#include <cpu/x86/lapic.h>
 #include <pc80/mc146818rtc.h>
 #include <console/console.h>
 #include <bootmode.h>
diff --git a/src/northbridge/amd/agesa/family14/northbridge.c b/src/northbridge/amd/agesa/family14/northbridge.c
index 34fc0c08b3..7c5ecdc8f4 100644
--- a/src/northbridge/amd/agesa/family14/northbridge.c
+++ b/src/northbridge/amd/agesa/family14/northbridge.c
@@ -12,7 +12,6 @@
 #include <string.h>
 #include <lib.h>
 #include <cpu/cpu.h>
-#include <cpu/x86/lapic.h>
 #include <cpu/amd/msr.h>
 #include <cpu/amd/mtrr.h>
 #include <northbridge/amd/agesa/nb_common.h>
diff --git a/src/soc/amd/common/block/smbus/sm.c b/src/soc/amd/common/block/smbus/sm.c
index 2f37a91362..5a4edd8b2b 100644
--- a/src/soc/amd/common/block/smbus/sm.c
+++ b/src/soc/amd/common/block/smbus/sm.c
@@ -6,7 +6,6 @@
 #include <device/pci_ids.h>
 #include <device/smbus.h>
 #include <device/smbus_host.h>
-#include <cpu/x86/lapic.h>
 #include <arch/ioapic.h>
 #include <soc/southbridge.h>
 
diff --git a/src/soc/intel/braswell/northcluster.c b/src/soc/intel/braswell/northcluster.c
index 94b91cc047..dd49acd3fc 100644
--- a/src/soc/intel/braswell/northcluster.c
+++ b/src/soc/intel/braswell/northcluster.c
@@ -6,7 +6,7 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <cpu/x86/lapic.h>
+#include <cpu/x86/lapic_def.h>
 #include <cpu/x86/smm.h>
 #include <fsp/util.h>
 #include <soc/iomap.h>
diff --git a/src/soc/intel/broadwell/smmrelocate.c b/src/soc/intel/broadwell/smmrelocate.c
index 660a688df4..03ed24494b 100644
--- a/src/soc/intel/broadwell/smmrelocate.c
+++ b/src/soc/intel/broadwell/smmrelocate.c
@@ -5,7 +5,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include <cpu/x86/lapic.h>
 #include <cpu/x86/mp.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/mtrr.h>
diff --git a/src/soc/intel/cannonlake/smmrelocate.c b/src/soc/intel/cannonlake/smmrelocate.c
index dcf67bc924..3aec51b216 100644
--- a/src/soc/intel/cannonlake/smmrelocate.c
+++ b/src/soc/intel/cannonlake/smmrelocate.c
@@ -5,7 +5,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include <cpu/x86/lapic.h>
 #include <cpu/x86/mp.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/mtrr.h>
diff --git a/src/soc/intel/icelake/smmrelocate.c b/src/soc/intel/icelake/smmrelocate.c
index d9ca915bb2..f1a7033498 100644
--- a/src/soc/intel/icelake/smmrelocate.c
+++ b/src/soc/intel/icelake/smmrelocate.c
@@ -5,7 +5,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include <cpu/x86/lapic.h>
 #include <cpu/x86/mp.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/mtrr.h>
diff --git a/src/soc/intel/jasperlake/smmrelocate.c b/src/soc/intel/jasperlake/smmrelocate.c
index af16fbd3e5..664ea6cfe4 100644
--- a/src/soc/intel/jasperlake/smmrelocate.c
+++ b/src/soc/intel/jasperlake/smmrelocate.c
@@ -5,7 +5,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include <cpu/x86/lapic.h>
 #include <cpu/x86/mp.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/mtrr.h>
diff --git a/src/soc/intel/skylake/smmrelocate.c b/src/soc/intel/skylake/smmrelocate.c
index e45da91353..cb83d615fd 100644
--- a/src/soc/intel/skylake/smmrelocate.c
+++ b/src/soc/intel/skylake/smmrelocate.c
@@ -5,7 +5,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include <cpu/x86/lapic.h>
 #include <cpu/x86/mp.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/mtrr.h>
diff --git a/src/soc/intel/tigerlake/smmrelocate.c b/src/soc/intel/tigerlake/smmrelocate.c
index af16fbd3e5..664ea6cfe4 100644
--- a/src/soc/intel/tigerlake/smmrelocate.c
+++ b/src/soc/intel/tigerlake/smmrelocate.c
@@ -5,7 +5,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include <cpu/x86/lapic.h>
 #include <cpu/x86/mp.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/mtrr.h>
diff --git a/src/soc/intel/xeon_sp/uncore.c b/src/soc/intel/xeon_sp/uncore.c
index 1d46e4070f..a549acb0f6 100644
--- a/src/soc/intel/xeon_sp/uncore.c
+++ b/src/soc/intel/xeon_sp/uncore.c
@@ -2,7 +2,7 @@
 
 #include <cbmem.h>
 #include <console/console.h>
-#include <cpu/x86/lapic.h>
+#include <cpu/x86/lapic_def.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <soc/iomap.h>
diff --git a/src/southbridge/amd/agesa/hudson/sm.c b/src/southbridge/amd/agesa/hudson/sm.c
index 9f149080ba..39e6752f6e 100644
--- a/src/southbridge/amd/agesa/hudson/sm.c
+++ b/src/southbridge/amd/agesa/hudson/sm.c
@@ -4,7 +4,6 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/smbus.h>
-#include <cpu/x86/lapic.h>
 #include <arch/ioapic.h>
 
 #include "hudson.h"
diff --git a/src/southbridge/amd/pi/hudson/sm.c b/src/southbridge/amd/pi/hudson/sm.c
index ee30b7fa5e..268d7e4ee2 100644
--- a/src/southbridge/amd/pi/hudson/sm.c
+++ b/src/southbridge/amd/pi/hudson/sm.c
@@ -4,7 +4,6 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/smbus.h>
-#include <cpu/x86/lapic.h>
 #include <arch/ioapic.h>
 
 #include "hudson.h"
-- 
cgit v1.2.3