From 89989cf61f93fdbb0b61474d16fbc0dfdf419944 Mon Sep 17 00:00:00 2001
From: Elyes HAOUAS <ehaouas@noos.fr>
Date: Mon, 4 Mar 2019 17:49:46 +0100
Subject: [PATCH] src: Drop unused include <arch/acpi.h>

Change-Id: I1f44ffeb54955ed660162a791c6281f292b1116a
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/31715
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Werner Zeh <werner.zeh@siemens.com>
---
 src/cpu/amd/pi/00630F01/model_15_init.c               | 1 -
 src/cpu/amd/pi/00660F01/model_15_init.c               | 1 -
 src/cpu/amd/pi/00730F01/model_16_init.c               | 1 -
 src/cpu/intel/haswell/romstage.c                      | 1 -
 src/cpu/x86/mtrr/mtrr.c                               | 1 -
 src/mainboard/amd/bettong/mainboard.c                 | 1 -
 src/mainboard/amd/db-ft3b-lc/mainboard.c              | 1 -
 src/mainboard/amd/gardenia/mainboard.c                | 1 -
 src/mainboard/amd/lamar/mainboard.c                   | 1 -
 src/mainboard/amd/olivehillplus/mainboard.c           | 1 -
 src/mainboard/amd/thatcher/romstage.c                 | 1 -
 src/mainboard/asrock/imb-a180/romstage.c              | 1 -
 src/mainboard/asus/p5gc-mx/romstage.c                 | 1 -
 src/mainboard/bap/ode_e21XX/mainboard.c               | 1 -
 src/mainboard/getac/p470/romstage.c                   | 1 -
 src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c       | 1 -
 src/mainboard/intel/bayleybay_fsp/mainboard.c         | 1 -
 src/mainboard/intel/bayleybay_fsp/romstage.c          | 1 -
 src/mainboard/intel/camelbackmountain_fsp/mainboard.c | 1 -
 src/mainboard/intel/dcp847ske/early_southbridge.c     | 1 -
 src/mainboard/intel/emeraldlake2/romstage.c           | 1 -
 src/mainboard/intel/kblrvp/smihandler.c               | 1 -
 src/mainboard/kontron/ktqm77/mainboard.c              | 1 -
 src/mainboard/kontron/ktqm77/romstage.c               | 1 -
 src/mainboard/lenovo/t60/romstage.c                   | 1 -
 src/mainboard/lenovo/x1_carbon_gen1/romstage.c        | 1 -
 src/mainboard/lenovo/x230/romstage.c                  | 1 -
 src/mainboard/lippert/frontrunner-af/mainboard.c      | 1 -
 src/mainboard/lippert/toucan-af/mainboard.c           | 1 -
 src/mainboard/pcengines/apu1/mainboard.c              | 1 -
 src/mainboard/pcengines/apu2/mainboard.c              | 1 -
 src/mainboard/roda/rk886ex/romstage.c                 | 1 -
 src/mainboard/samsung/lumpy/romstage.c                | 1 -
 src/mainboard/samsung/stumpy/romstage.c               | 1 -
 src/mainboard/siemens/mc_bdx1/mainboard.c             | 1 -
 src/mainboard/siemens/mc_tcu3/mainboard.c             | 1 -
 src/northbridge/intel/gm45/iommu.c                    | 1 -
 src/northbridge/intel/gm45/northbridge.c              | 1 -
 src/northbridge/intel/i945/early_init.c               | 1 -
 src/northbridge/intel/sandybridge/early_init.c        | 1 -
 src/soc/amd/common/block/pi/heapmanager.c             | 1 -
 src/soc/intel/baytrail/placeholders.c                 | 1 -
 src/soc/intel/braswell/placeholders.c                 | 1 -
 src/soc/intel/braswell/xhci.c                         | 1 -
 src/soc/intel/broadwell/cpu.c                         | 1 -
 src/soc/intel/denverton_ns/systemagent.c              | 1 -
 src/soc/intel/fsp_broadwell_de/ramstage.c             | 1 -
 src/southbridge/amd/agesa/hudson/early_setup.c        | 1 -
 src/southbridge/amd/agesa/hudson/hudson.c             | 3 ---
 src/southbridge/amd/pi/hudson/early_setup.c           | 1 -
 50 files changed, 52 deletions(-)

diff --git a/src/cpu/amd/pi/00630F01/model_15_init.c b/src/cpu/amd/pi/00630F01/model_15_init.c
index d364513d4a..5455b0cf11 100644
--- a/src/cpu/amd/pi/00630F01/model_15_init.c
+++ b/src/cpu/amd/pi/00630F01/model_15_init.c
@@ -26,7 +26,6 @@
 #include <cpu/x86/lapic.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/cache.h>
-#include <arch/acpi.h>
 
 static void model_15_init(struct device *dev)
 {
diff --git a/src/cpu/amd/pi/00660F01/model_15_init.c b/src/cpu/amd/pi/00660F01/model_15_init.c
index 818cfa4a79..d156525b60 100644
--- a/src/cpu/amd/pi/00660F01/model_15_init.c
+++ b/src/cpu/amd/pi/00660F01/model_15_init.c
@@ -25,7 +25,6 @@
 #include <cpu/x86/lapic.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/cache.h>
-#include <arch/acpi.h>
 
 #include <amdlib.h>
 #include <PspBaseLib.h>
diff --git a/src/cpu/amd/pi/00730F01/model_16_init.c b/src/cpu/amd/pi/00730F01/model_16_init.c
index 9be6e2a124..7ae89b48e8 100644
--- a/src/cpu/amd/pi/00730F01/model_16_init.c
+++ b/src/cpu/amd/pi/00730F01/model_16_init.c
@@ -25,7 +25,6 @@
 #include <cpu/x86/lapic.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/cache.h>
-#include <arch/acpi.h>
 
 static void model_16_init(struct device *dev)
 {
diff --git a/src/cpu/intel/haswell/romstage.c b/src/cpu/intel/haswell/romstage.c
index e2dd0fa5fb..d5028c299b 100644
--- a/src/cpu/intel/haswell/romstage.c
+++ b/src/cpu/intel/haswell/romstage.c
@@ -24,7 +24,6 @@
 #include <halt.h>
 #include <lib.h>
 #include <timestamp.h>
-#include <arch/acpi.h>
 #include <device/pci_def.h>
 #include <cpu/x86/lapic.h>
 #include <cbmem.h>
diff --git a/src/cpu/x86/mtrr/mtrr.c b/src/cpu/x86/mtrr/mtrr.c
index 249d631875..b45d17f010 100644
--- a/src/cpu/x86/mtrr/mtrr.c
+++ b/src/cpu/x86/mtrr/mtrr.c
@@ -33,7 +33,6 @@
 #include <cpu/x86/mtrr.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/lapic.h>
-#include <arch/acpi.h>
 #include <memrange.h>
 #include <cpu/amd/mtrr.h>
 #include <assert.h>
diff --git a/src/mainboard/amd/bettong/mainboard.c b/src/mainboard/amd/bettong/mainboard.c
index 16fc47eb3f..80b888ee85 100644
--- a/src/mainboard/amd/bettong/mainboard.c
+++ b/src/mainboard/amd/bettong/mainboard.c
@@ -15,7 +15,6 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include <arch/acpi.h>
 #include <agesawrapper.h>
 #include <southbridge/amd/common/amd_pci_util.h>
 
diff --git a/src/mainboard/amd/db-ft3b-lc/mainboard.c b/src/mainboard/amd/db-ft3b-lc/mainboard.c
index d5ae9953dc..6ea80ed82c 100644
--- a/src/mainboard/amd/db-ft3b-lc/mainboard.c
+++ b/src/mainboard/amd/db-ft3b-lc/mainboard.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/acpi.h>
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/mainboard/amd/gardenia/mainboard.c b/src/mainboard/amd/gardenia/mainboard.c
index 86dfed4ebf..b3f2285ef0 100644
--- a/src/mainboard/amd/gardenia/mainboard.c
+++ b/src/mainboard/amd/gardenia/mainboard.c
@@ -15,7 +15,6 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include <arch/acpi.h>
 #include <amdblocks/agesawrapper.h>
 #include <amdblocks/amd_pci_util.h>
 #include <soc/southbridge.h>
diff --git a/src/mainboard/amd/lamar/mainboard.c b/src/mainboard/amd/lamar/mainboard.c
index 08d21c8149..3d338501a0 100644
--- a/src/mainboard/amd/lamar/mainboard.c
+++ b/src/mainboard/amd/lamar/mainboard.c
@@ -17,7 +17,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_def.h>
-#include <arch/acpi.h>
 #include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
 #include <northbridge/amd/pi/00630F01/pci_devs.h>
diff --git a/src/mainboard/amd/olivehillplus/mainboard.c b/src/mainboard/amd/olivehillplus/mainboard.c
index 45841f942a..00ac1a4499 100644
--- a/src/mainboard/amd/olivehillplus/mainboard.c
+++ b/src/mainboard/amd/olivehillplus/mainboard.c
@@ -17,7 +17,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_def.h>
-#include <arch/acpi.h>
 #include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
 
diff --git a/src/mainboard/amd/thatcher/romstage.c b/src/mainboard/amd/thatcher/romstage.c
index ed22ed1df3..54ced88fd6 100644
--- a/src/mainboard/amd/thatcher/romstage.c
+++ b/src/mainboard/amd/thatcher/romstage.c
@@ -16,7 +16,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <device/pci_def.h>
-#include <arch/acpi.h>
 #include <arch/io.h>
 #include <device/pci_ops.h>
 #include <commonlib/loglevel.h>
diff --git a/src/mainboard/asrock/imb-a180/romstage.c b/src/mainboard/asrock/imb-a180/romstage.c
index 83fc9a01b0..c100a616ca 100644
--- a/src/mainboard/asrock/imb-a180/romstage.c
+++ b/src/mainboard/asrock/imb-a180/romstage.c
@@ -16,7 +16,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <device/pci_def.h>
-#include <arch/acpi.h>
 #include <arch/io.h>
 #include <device/pci_ops.h>
 #include <commonlib/loglevel.h>
diff --git a/src/mainboard/asus/p5gc-mx/romstage.c b/src/mainboard/asus/p5gc-mx/romstage.c
index 2f45113d8d..26898cc669 100644
--- a/src/mainboard/asus/p5gc-mx/romstage.c
+++ b/src/mainboard/asus/p5gc-mx/romstage.c
@@ -24,7 +24,6 @@
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
 #include <cpu/x86/lapic.h>
-#include <arch/acpi.h>
 #include <superio/winbond/common/winbond.h>
 #include <superio/winbond/w83627dhg/w83627dhg.h>
 #include <console/console.h>
diff --git a/src/mainboard/bap/ode_e21XX/mainboard.c b/src/mainboard/bap/ode_e21XX/mainboard.c
index 45841f942a..00ac1a4499 100644
--- a/src/mainboard/bap/ode_e21XX/mainboard.c
+++ b/src/mainboard/bap/ode_e21XX/mainboard.c
@@ -17,7 +17,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_def.h>
-#include <arch/acpi.h>
 #include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
 
diff --git a/src/mainboard/getac/p470/romstage.c b/src/mainboard/getac/p470/romstage.c
index 2f90572b95..b7b5efefcb 100644
--- a/src/mainboard/getac/p470/romstage.c
+++ b/src/mainboard/getac/p470/romstage.c
@@ -21,7 +21,6 @@
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
 #include <cpu/x86/lapic.h>
-#include <arch/acpi.h>
 #include <pc80/mc146818rtc.h>
 #include <console/console.h>
 #include <cpu/x86/bist.h>
diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c b/src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c
index 4f445ab1e1..b3ee2a8e79 100644
--- a/src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c
+++ b/src/mainboard/gigabyte/ga-945gcm-s2l/romstage.c
@@ -21,7 +21,6 @@
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
 #include <cpu/x86/lapic.h>
-#include <arch/acpi.h>
 #include <superio/ite/it8718f/it8718f.h>
 #include <superio/ite/common/ite.h>
 #include <console/console.h>
diff --git a/src/mainboard/intel/bayleybay_fsp/mainboard.c b/src/mainboard/intel/bayleybay_fsp/mainboard.c
index 00f5f5dd0d..94248557bf 100644
--- a/src/mainboard/intel/bayleybay_fsp/mainboard.c
+++ b/src/mainboard/intel/bayleybay_fsp/mainboard.c
@@ -22,7 +22,6 @@
 #if IS_ENABLED(CONFIG_VGA_ROM_RUN)
 #include <x86emu/x86emu.h>
 #endif
-#include <arch/acpi.h>
 #include <arch/interrupt.h>
 #include <boot/coreboot_tables.h>
 
diff --git a/src/mainboard/intel/bayleybay_fsp/romstage.c b/src/mainboard/intel/bayleybay_fsp/romstage.c
index e3deddd04c..7c906ce368 100644
--- a/src/mainboard/intel/bayleybay_fsp/romstage.c
+++ b/src/mainboard/intel/bayleybay_fsp/romstage.c
@@ -24,7 +24,6 @@
 #include <soc/lpc.h>
 #include <soc/pci_devs.h>
 #include <soc/romstage.h>
-#include <soc/acpi.h>
 #include <soc/baytrail.h>
 #include <drivers/intel/fsp1_0/fsp_util.h>
 
diff --git a/src/mainboard/intel/camelbackmountain_fsp/mainboard.c b/src/mainboard/intel/camelbackmountain_fsp/mainboard.c
index e73da8d62f..946a45362a 100644
--- a/src/mainboard/intel/camelbackmountain_fsp/mainboard.c
+++ b/src/mainboard/intel/camelbackmountain_fsp/mainboard.c
@@ -22,7 +22,6 @@
 #if IS_ENABLED(CONFIG_VGA_ROM_RUN)
 #include <x86emu/x86emu.h>
 #endif
-#include <arch/acpi.h>
 #include <arch/interrupt.h>
 #include <boot/coreboot_tables.h>
 
diff --git a/src/mainboard/intel/dcp847ske/early_southbridge.c b/src/mainboard/intel/dcp847ske/early_southbridge.c
index 233800a818..1a46f8bbab 100644
--- a/src/mainboard/intel/dcp847ske/early_southbridge.c
+++ b/src/mainboard/intel/dcp847ske/early_southbridge.c
@@ -21,7 +21,6 @@
 #include <arch/io.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
-#include <arch/acpi.h>
 #include <console/console.h>
 #include <northbridge/intel/sandybridge/raminit_native.h>
 
diff --git a/src/mainboard/intel/emeraldlake2/romstage.c b/src/mainboard/intel/emeraldlake2/romstage.c
index 4074a30673..d5ba961bdb 100644
--- a/src/mainboard/intel/emeraldlake2/romstage.c
+++ b/src/mainboard/intel/emeraldlake2/romstage.c
@@ -21,7 +21,6 @@
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
 #include <cpu/x86/lapic.h>
-#include <arch/acpi.h>
 #include <superio/smsc/sio1007/chip.h>
 #include <northbridge/intel/sandybridge/sandybridge.h>
 #include <northbridge/intel/sandybridge/raminit.h>
diff --git a/src/mainboard/intel/kblrvp/smihandler.c b/src/mainboard/intel/kblrvp/smihandler.c
index a12a460fd6..bb09d78da2 100644
--- a/src/mainboard/intel/kblrvp/smihandler.c
+++ b/src/mainboard/intel/kblrvp/smihandler.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/acpi.h>
 #include <console/console.h>
 #include <cpu/x86/smm.h>
 #include <elog.h>
diff --git a/src/mainboard/kontron/ktqm77/mainboard.c b/src/mainboard/kontron/ktqm77/mainboard.c
index 4a5ad9319c..c2a8721bba 100644
--- a/src/mainboard/kontron/ktqm77/mainboard.c
+++ b/src/mainboard/kontron/ktqm77/mainboard.c
@@ -25,7 +25,6 @@
 #include <x86emu/x86emu.h>
 #endif
 #include <pc80/mc146818rtc.h>
-#include <arch/acpi.h>
 #include <arch/interrupt.h>
 #include <boot/coreboot_tables.h>
 #include <southbridge/intel/bd82x6x/pch.h>
diff --git a/src/mainboard/kontron/ktqm77/romstage.c b/src/mainboard/kontron/ktqm77/romstage.c
index 30800e8eb0..8c53420899 100644
--- a/src/mainboard/kontron/ktqm77/romstage.c
+++ b/src/mainboard/kontron/ktqm77/romstage.c
@@ -16,7 +16,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <arch/acpi.h>
 #include <device/pnp_ops.h>
 #include <device/pci_ops.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/mainboard/lenovo/t60/romstage.c b/src/mainboard/lenovo/t60/romstage.c
index daf4179b3d..efb03b1bb6 100644
--- a/src/mainboard/lenovo/t60/romstage.c
+++ b/src/mainboard/lenovo/t60/romstage.c
@@ -25,7 +25,6 @@
 #include <device/pci_def.h>
 #include <device/pnp_def.h>
 #include <cpu/x86/lapic.h>
-#include <arch/acpi.h>
 #include <console/console.h>
 #include <cpu/x86/bist.h>
 #include <cpu/intel/romstage.h>
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/romstage.c b/src/mainboard/lenovo/x1_carbon_gen1/romstage.c
index 13d9a196ee..e3d2000d1e 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/romstage.c
+++ b/src/mainboard/lenovo/x1_carbon_gen1/romstage.c
@@ -23,7 +23,6 @@
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
 #include <cpu/x86/lapic.h>
-#include <arch/acpi.h>
 #include <console/console.h>
 #include <northbridge/intel/sandybridge/sandybridge.h>
 #include <northbridge/intel/sandybridge/raminit_native.h>
diff --git a/src/mainboard/lenovo/x230/romstage.c b/src/mainboard/lenovo/x230/romstage.c
index b88d8f534c..b85e72078d 100644
--- a/src/mainboard/lenovo/x230/romstage.c
+++ b/src/mainboard/lenovo/x230/romstage.c
@@ -22,7 +22,6 @@
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
 #include <cpu/x86/lapic.h>
-#include <arch/acpi.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/lippert/frontrunner-af/mainboard.c b/src/mainboard/lippert/frontrunner-af/mainboard.c
index 8d4aff0636..653027630c 100644
--- a/src/mainboard/lippert/frontrunner-af/mainboard.c
+++ b/src/mainboard/lippert/frontrunner-af/mainboard.c
@@ -22,7 +22,6 @@
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
 #include <southbridge/amd/sb800/sb800.h>
-#include <arch/acpi.h>
 #include <southbridge/amd/cimx/sb800/SBPLATFORM.h>
 #include <vendorcode/amd/cimx/sb800/OEM.h> /* SMBUS0_BASE_ADDRESS */
 #include <southbridge/amd/cimx/sb800/gpio_oem.h>
diff --git a/src/mainboard/lippert/toucan-af/mainboard.c b/src/mainboard/lippert/toucan-af/mainboard.c
index 135b0a3714..b7126ea18b 100644
--- a/src/mainboard/lippert/toucan-af/mainboard.c
+++ b/src/mainboard/lippert/toucan-af/mainboard.c
@@ -21,7 +21,6 @@
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
 #include <southbridge/amd/sb800/sb800.h>
-#include <arch/acpi.h>
 #include <southbridge/amd/cimx/sb800/SBPLATFORM.h>
 #include <vendorcode/amd/cimx/sb800/OEM.h> /* SMBUS0_BASE_ADDRESS */
 #include <southbridge/amd/cimx/sb800/gpio_oem.h>
diff --git a/src/mainboard/pcengines/apu1/mainboard.c b/src/mainboard/pcengines/apu1/mainboard.c
index ac95894bbb..10460bd6f2 100644
--- a/src/mainboard/pcengines/apu1/mainboard.c
+++ b/src/mainboard/pcengines/apu1/mainboard.c
@@ -22,7 +22,6 @@
 #include <device/pci_def.h>
 #include <southbridge/amd/common/amd_pci_util.h>
 #include <southbridge/amd/cimx/cimx_util.h>
-#include <arch/acpi.h>
 #include <smbios.h>
 #include <string.h>
 #include <southbridge/amd/cimx/sb800/SBPLATFORM.h>
diff --git a/src/mainboard/pcengines/apu2/mainboard.c b/src/mainboard/pcengines/apu2/mainboard.c
index baad54c6f0..16bbf8a76b 100644
--- a/src/mainboard/pcengines/apu2/mainboard.c
+++ b/src/mainboard/pcengines/apu2/mainboard.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/acpi.h>
 #include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <console/console.h>
diff --git a/src/mainboard/roda/rk886ex/romstage.c b/src/mainboard/roda/rk886ex/romstage.c
index b36d78bd38..fbda731c02 100644
--- a/src/mainboard/roda/rk886ex/romstage.c
+++ b/src/mainboard/roda/rk886ex/romstage.c
@@ -23,7 +23,6 @@
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
 #include <cpu/x86/lapic.h>
-#include <arch/acpi.h>
 #include <pc80/mc146818rtc.h>
 #include <console/console.h>
 #include <cpu/x86/bist.h>
diff --git a/src/mainboard/samsung/lumpy/romstage.c b/src/mainboard/samsung/lumpy/romstage.c
index 244ce7c10d..d39d59c735 100644
--- a/src/mainboard/samsung/lumpy/romstage.c
+++ b/src/mainboard/samsung/lumpy/romstage.c
@@ -22,7 +22,6 @@
 #include <device/pci_def.h>
 #include <cpu/x86/lapic.h>
 #include <cbfs.h>
-#include <arch/acpi.h>
 #include <console/console.h>
 #include <bootmode.h>
 #include <northbridge/intel/sandybridge/sandybridge.h>
diff --git a/src/mainboard/samsung/stumpy/romstage.c b/src/mainboard/samsung/stumpy/romstage.c
index c45ca7e721..1c4e3d8f2f 100644
--- a/src/mainboard/samsung/stumpy/romstage.c
+++ b/src/mainboard/samsung/stumpy/romstage.c
@@ -21,7 +21,6 @@
 #include <device/pci_def.h>
 #include <cpu/x86/lapic.h>
 #include <pc80/mc146818rtc.h>
-#include <arch/acpi.h>
 #include <console/console.h>
 #include <bootmode.h>
 #include <superio/ite/common/ite.h>
diff --git a/src/mainboard/siemens/mc_bdx1/mainboard.c b/src/mainboard/siemens/mc_bdx1/mainboard.c
index fb4d1e3c15..1f87378135 100644
--- a/src/mainboard/siemens/mc_bdx1/mainboard.c
+++ b/src/mainboard/siemens/mc_bdx1/mainboard.c
@@ -26,7 +26,6 @@
 #if IS_ENABLED(CONFIG_VGA_ROM_RUN)
 #include <x86emu/x86emu.h>
 #endif
-#include <arch/acpi.h>
 #include <device/mmio.h>
 #include <arch/interrupt.h>
 #include <boot/coreboot_tables.h>
diff --git a/src/mainboard/siemens/mc_tcu3/mainboard.c b/src/mainboard/siemens/mc_tcu3/mainboard.c
index 469d2219e1..ecc2b2779b 100644
--- a/src/mainboard/siemens/mc_tcu3/mainboard.c
+++ b/src/mainboard/siemens/mc_tcu3/mainboard.c
@@ -22,7 +22,6 @@
 #if IS_ENABLED(CONFIG_VGA_ROM_RUN)
 #include <x86emu/x86emu.h>
 #endif
-#include <arch/acpi.h>
 #include <arch/interrupt.h>
 #include <boot/coreboot_tables.h>
 #include <hwilib.h>
diff --git a/src/northbridge/intel/gm45/iommu.c b/src/northbridge/intel/gm45/iommu.c
index 93e631638e..b6e38e7e72 100644
--- a/src/northbridge/intel/gm45/iommu.c
+++ b/src/northbridge/intel/gm45/iommu.c
@@ -19,7 +19,6 @@
 
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
-#include <arch/acpi.h>
 
 #include "gm45.h"
 
diff --git a/src/northbridge/intel/gm45/northbridge.c b/src/northbridge/intel/gm45/northbridge.c
index eda5e92225..40e4f61afd 100644
--- a/src/northbridge/intel/gm45/northbridge.c
+++ b/src/northbridge/intel/gm45/northbridge.c
@@ -27,7 +27,6 @@
 #include <cpu/intel/smm/gen1/smi.h>
 #include "chip.h"
 #include "gm45.h"
-#include "arch/acpi.h"
 
 /* Reserve segments A and B:
  *
diff --git a/src/northbridge/intel/i945/early_init.c b/src/northbridge/intel/i945/early_init.c
index d9d88bb445..1913b524a5 100644
--- a/src/northbridge/intel/i945/early_init.c
+++ b/src/northbridge/intel/i945/early_init.c
@@ -16,7 +16,6 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <console/console.h>
-#include <arch/acpi.h>
 #include <arch/io.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
diff --git a/src/northbridge/intel/sandybridge/early_init.c b/src/northbridge/intel/sandybridge/early_init.c
index 01787f13a9..44eebf3215 100644
--- a/src/northbridge/intel/sandybridge/early_init.c
+++ b/src/northbridge/intel/sandybridge/early_init.c
@@ -19,7 +19,6 @@
 #include <console/console.h>
 #include <arch/io.h>
 #include <device/pci_ops.h>
-#include <arch/acpi.h>
 #include <device/pci_def.h>
 #include <elog.h>
 #include <pc80/mc146818rtc.h>
diff --git a/src/soc/amd/common/block/pi/heapmanager.c b/src/soc/amd/common/block/pi/heapmanager.c
index 683a572bbc..3b383ace6f 100644
--- a/src/soc/amd/common/block/pi/heapmanager.c
+++ b/src/soc/amd/common/block/pi/heapmanager.c
@@ -13,7 +13,6 @@
 
 
 #include <amdblocks/agesawrapper.h>
-#include <arch/acpi.h>
 #include <amdblocks/BiosCallOuts.h>
 #include <cbmem.h>
 #include <string.h>
diff --git a/src/soc/intel/baytrail/placeholders.c b/src/soc/intel/baytrail/placeholders.c
index b476409fc4..e7b20988b6 100644
--- a/src/soc/intel/baytrail/placeholders.c
+++ b/src/soc/intel/baytrail/placeholders.c
@@ -12,7 +12,6 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/acpi.h>
 #include <device/pci_rom.h>
 #include <soc/acpi.h>
 
diff --git a/src/soc/intel/braswell/placeholders.c b/src/soc/intel/braswell/placeholders.c
index 7e633d9b56..503c431620 100644
--- a/src/soc/intel/braswell/placeholders.c
+++ b/src/soc/intel/braswell/placeholders.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/acpi.h>
 #include <device/pci_rom.h>
 #include <soc/acpi.h>
 
diff --git a/src/soc/intel/braswell/xhci.c b/src/soc/intel/braswell/xhci.c
index 49b6c4be13..6c9048238f 100644
--- a/src/soc/intel/braswell/xhci.c
+++ b/src/soc/intel/braswell/xhci.c
@@ -15,7 +15,6 @@
  *
  */
 
-#include <arch/acpi.h>
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/soc/intel/broadwell/cpu.c b/src/soc/intel/broadwell/cpu.c
index 10ae489e5f..d274be8c42 100644
--- a/src/soc/intel/broadwell/cpu.c
+++ b/src/soc/intel/broadwell/cpu.c
@@ -18,7 +18,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <string.h>
-#include <arch/acpi.h>
 #include <arch/cpu.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
diff --git a/src/soc/intel/denverton_ns/systemagent.c b/src/soc/intel/denverton_ns/systemagent.c
index 22eae36ac3..dbcc51aa79 100644
--- a/src/soc/intel/denverton_ns/systemagent.c
+++ b/src/soc/intel/denverton_ns/systemagent.c
@@ -16,7 +16,6 @@
  */
 
 #include <console/console.h>
-#include <arch/acpi.h>
 #include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <stdint.h>
diff --git a/src/soc/intel/fsp_broadwell_de/ramstage.c b/src/soc/intel/fsp_broadwell_de/ramstage.c
index 492378ec4b..a64e337ddd 100644
--- a/src/soc/intel/fsp_broadwell_de/ramstage.c
+++ b/src/soc/intel/fsp_broadwell_de/ramstage.c
@@ -16,7 +16,6 @@
 
 #include <stdlib.h>
 #include <arch/cpu.h>
-#include <arch/acpi.h>
 #include <console/console.h>
 #include <cpu/intel/microcode.h>
 #include <cpu/x86/cr.h>
diff --git a/src/southbridge/amd/agesa/hudson/early_setup.c b/src/southbridge/amd/agesa/hudson/early_setup.c
index 622931520f..f71f453bee 100644
--- a/src/southbridge/amd/agesa/hudson/early_setup.c
+++ b/src/southbridge/amd/agesa/hudson/early_setup.c
@@ -19,7 +19,6 @@
 #include <stdint.h>
 #include <arch/io.h>
 #include <device/pci_ops.h>
-#include <arch/acpi.h>
 #include <console/console.h>
 #include <reset.h>
 #include "hudson.h"
diff --git a/src/southbridge/amd/agesa/hudson/hudson.c b/src/southbridge/amd/agesa/hudson/hudson.c
index 6de016a0c8..8ae685e37d 100644
--- a/src/southbridge/amd/agesa/hudson/hudson.c
+++ b/src/southbridge/amd/agesa/hudson/hudson.c
@@ -14,10 +14,7 @@
  */
 
 #include <console/console.h>
-
 #include <device/mmio.h>
-#include <arch/acpi.h>
-
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_def.h>
diff --git a/src/southbridge/amd/pi/hudson/early_setup.c b/src/southbridge/amd/pi/hudson/early_setup.c
index 1e9f189022..25be669750 100644
--- a/src/southbridge/amd/pi/hudson/early_setup.c
+++ b/src/southbridge/amd/pi/hudson/early_setup.c
@@ -21,7 +21,6 @@
 #include <arch/io.h>
 #include <device/mmio.h>
 #include <device/pci_ops.h>
-#include <arch/acpi.h>
 #include <console/console.h>
 #include <reset.h>
 #include "hudson.h"