Change in coreboot[master]: src: Remove unused include <device/pci.h>

[HAOUAS Elyes (Code Review)]

HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/38610 )

Change subject: src: Remove unused include <device/pci.h>
......................................................................

src: Remove unused include <device/pci.h>

Change-Id: I73430fdbdf6306df701480ab6353c840c71f607b
Signed-off-by: Elyes HAOUAS 
---
M src/arch/x86/acpi.c
M src/commonlib/storage/pci_sdhci.c
M src/cpu/intel/haswell/smmrelocate.c
M src/cpu/intel/smm/gen1/smmrelocate.c
M src/device/device_const.c
M src/device/oprom/realmode/x86.c
M src/device/oprom/realmode/x86_interrupts.c
M src/device/oprom/yabel/device.c
M src/device/oprom/yabel/interrupt.c
M src/device/oprom/yabel/io.c
M src/device/pci_ops.c
M src/device/pci_rom.c
M src/drivers/aspeed/common/aspeed_coreboot.h
M src/drivers/intel/gma/intel_ddi.c
M src/drivers/intel/gma/opregion.c
M src/drivers/intel/gma/vbt.c
M src/drivers/xgi/common/xgi_coreboot.c
M src/drivers/xgi/common/xgi_coreboot.h
M src/lib/hardwaremain.c
M src/lib/reg_script.c
M src/mainboard/google/kahlee/variants/treeya/mainboard.c
M src/northbridge/intel/gm45/acpi.c
M src/northbridge/intel/haswell/acpi.c
M src/northbridge/intel/i945/acpi.c
M src/northbridge/intel/nehalem/acpi.c
M src/northbridge/intel/nehalem/smi.c
M src/northbridge/intel/pineview/acpi.c
M src/northbridge/intel/pineview/early_init.c
M src/northbridge/intel/sandybridge/acpi.c
M src/northbridge/intel/sandybridge/common.c
M src/northbridge/intel/x4x/acpi.c
M src/soc/amd/picasso/acpi.c
M src/soc/amd/picasso/sata.c
M src/soc/amd/picasso/southbridge.c
M src/soc/amd/stoneyridge/acpi.c
M src/soc/amd/stoneyridge/sata.c
M src/soc/amd/stoneyridge/southbridge.c
M src/soc/cavium/cn81xx/sdram.c
M src/soc/cavium/common/ecam.c
M src/soc/intel/apollolake/bootblock/bootblock.c
M src/soc/intel/apollolake/lpc.c
M src/soc/intel/apollolake/pmc.c
M src/soc/intel/apollolake/pmutil.c
M src/soc/intel/apollolake/xdci.c
M src/soc/intel/baytrail/elog.c
M src/soc/intel/baytrail/gpio.c
M src/soc/intel/baytrail/pmutil.c
M src/soc/intel/baytrail/scc.c
M src/soc/intel/baytrail/smm.c
M src/soc/intel/braswell/acpi.c
M src/soc/intel/braswell/elog.c
M src/soc/intel/braswell/gpio.c
M src/soc/intel/braswell/pmutil.c
M src/soc/intel/braswell/scc.c
M src/soc/intel/braswell/smm.c
M src/soc/intel/broadwell/gpio.c
M src/soc/intel/broadwell/me_status.c
M src/soc/intel/broadwell/memmap.c
M src/soc/intel/broadwell/pch.c
M src/soc/intel/broadwell/pmutil.c
M src/soc/intel/broadwell/romstage/power_state.c
M src/soc/intel/broadwell/romstage/report_platform.c
M src/soc/intel/broadwell/smi.c
M src/soc/intel/broadwell/smmrelocate.c
M src/soc/intel/cannonlake/bootblock/report_platform.c
M src/soc/intel/cannonlake/cpu.c
M src/soc/intel/cannonlake/finalize.c
M src/soc/intel/cannonlake/fsp_params.c
M src/soc/intel/cannonlake/lpc.c
M src/soc/intel/cannonlake/me.c
M src/soc/intel/cannonlake/pmutil.c
M src/soc/intel/cannonlake/smmrelocate.c
M src/soc/intel/cannonlake/systemagent.c
M src/soc/intel/common/block/include/intelblocks/imc.h
M src/soc/intel/common/block/lpc/lpc_lib.c
M src/soc/intel/common/block/scs/early_mmc.c
M src/soc/intel/common/block/smbus/tco.c
M src/soc/intel/common/block/systemagent/systemagent_early.c
M src/soc/intel/denverton_ns/acpi.c
M src/soc/intel/denverton_ns/bootblock/bootblock.c
M src/soc/intel/denverton_ns/gpio_dnv.c
M src/soc/intel/denverton_ns/smm.c
M src/soc/intel/denverton_ns/soc_util.c
M src/soc/intel/icelake/bootblock/report_platform.c
M src/soc/intel/icelake/cpu.c
M src/soc/intel/icelake/espi.c
M src/soc/intel/icelake/finalize.c
M src/soc/intel/icelake/fsp_params.c
M src/soc/intel/icelake/pmutil.c
M src/soc/intel/icelake/smmrelocate.c
M src/soc/intel/icelake/systemagent.c
M src/soc/intel/quark/i2c.c
M src/soc/intel/quark/include/soc/pci_devs.h
M src/soc/intel/quark/include/soc/storage_test.h
M src/soc/intel/quark/romstage/report_platform.c
M src/soc/intel/skylake/bootblock/report_platform.c
M src/soc/intel/skylake/cpu.c
M src/soc/intel/skylake/finalize.c
M src/soc/intel/skylake/irq.c
M src/soc/intel/skylake/lpc.c
M src/soc/intel/skylake/me.c
M src/soc/intel/skylake/pmutil.c
M src/soc/intel/skylake/smmrelocate.c
M src/soc/intel/tigerlake/bootblock/report_platform.c
M src/soc/intel/tigerlake/cpu.c
M src/soc/intel/tigerlake/espi.c
M src/soc/intel/tigerlake/finalize.c
M src/soc/intel/tigerlake/fsp_params_tgl.c
M src/soc/intel/tigerlake/pmutil.c
M src/soc/intel/tigerlake/smmrelocate.c
M src/soc/intel/tigerlake/systemagent.c
M src/southbridge/amd/agesa/hudson/hudson.c
M src/southbridge/amd/agesa/hudson/spi.c
M src/southbridge/amd/cimx/sb800/spi.c
M src/southbridge/amd/pi/hudson/hudson.c
M src/southbridge/intel/bd82x6x/elog.c
M src/southbridge/intel/bd82x6x/pch.c
M src/southbridge/intel/common/gpio.c
M src/southbridge/intel/common/pmbase.c
M src/southbridge/intel/common/rcba_pirq.c
M src/southbridge/intel/common/smi.c
M src/southbridge/intel/common/spi.c
M src/southbridge/intel/common/watchdog.c
M src/southbridge/intel/i82371eb/fadt.c
M src/southbridge/intel/i82801dx/i82801dx.c
M src/southbridge/intel/i82801dx/smi.c
M src/southbridge/intel/i82801gx/i82801gx.c
M src/southbridge/intel/i82801ix/i82801ix.c
M src/southbridge/intel/i82801ix/smi.c
M src/southbridge/intel/i82801jx/i82801jx.c
M src/southbridge/intel/ibexpeak/madt.c
M src/southbridge/intel/ibexpeak/pch.c
M src/southbridge/intel/lynxpoint/elog.c
M src/southbridge/intel/lynxpoint/lp_gpio.c
M src/southbridge/intel/lynxpoint/pch.c
M src/southbridge/intel/lynxpoint/pmutil.c
M src/southbridge/intel/lynxpoint/rcba.c
M src/southbridge/intel/lynxpoint/smi.c
M src/vendorcode/eltan/security/verified_boot/vboot_check.h
139 files changed, 0 insertions(+), 139 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/10/38610/1

diff --git a/src/arch/x86/acpi.c b/src/arch/x86/acpi.c
index 2f793b4..5b5e587 100644
--- a/src/arch/x86/acpi.c
+++ b/src/arch/x86/acpi.c
@@ -28,7 +28,6 @@
 #include <arch/acpi.h>
 #include <arch/acpi_ivrs.h>
 #include <arch/acpigen.h>
-#include <device/pci.h>
 #include <cbmem.h>
 #include <commonlib/helpers.h>
 #include <cpu/x86/lapic_def.h>
diff --git a/src/commonlib/storage/pci_sdhci.c b/src/commonlib/storage/pci_sdhci.c
index 380f2db..abade3d 100644
--- a/src/commonlib/storage/pci_sdhci.c
+++ b/src/commonlib/storage/pci_sdhci.c
@@ -13,7 +13,6 @@
  */

#include <commonlib/sdhci.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/src/cpu/intel/haswell/smmrelocate.c b/src/cpu/intel/haswell/smmrelocate.c
index d259460..7d7922e 100644
--- a/src/cpu/intel/haswell/smmrelocate.c
+++ b/src/cpu/intel/haswell/smmrelocate.c
@@ -14,7 +14,6 @@
 #include <types.h>
 #include <string.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/cpu/intel/smm/gen1/smmrelocate.c b/src/cpu/intel/smm/gen1/smmrelocate.c
index 834ec04..2920822 100644
--- a/src/cpu/intel/smm/gen1/smmrelocate.c
+++ b/src/cpu/intel/smm/gen1/smmrelocate.c
@@ -17,7 +17,6 @@
 #include <types.h>
 #include <string.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <commonlib/helpers.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/mp.h>
diff --git a/src/device/device_const.c b/src/device/device_const.c
index c46f283..698648e 100644
--- a/src/device/device_const.c
+++ b/src/device/device_const.c
@@ -14,7 +14,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <device/path.h>
-#include <device/pci.h>
 #include <device/pci_def.h>
 #include <device/resource.h>

diff --git a/src/device/oprom/realmode/x86.c b/src/device/oprom/realmode/x86.c
index 8ba0241..095e427 100644
--- a/src/device/oprom/realmode/x86.c
+++ b/src/device/oprom/realmode/x86.c
@@ -17,7 +17,6 @@
 #include <boot/coreboot_tables.h>
 #include <console/console.h>
 #include <delay.h>
-#include <device/pci.h>
 #include <device/pci_ids.h>
 #include <pc80/i8259.h>
 #include <pc80/i8254.h>
diff --git a/src/device/oprom/realmode/x86_interrupts.c b/src/device/oprom/realmode/x86_interrupts.c
index c38da46..6ed547b 100644
--- a/src/device/oprom/realmode/x86_interrupts.c
+++ b/src/device/oprom/realmode/x86_interrupts.c
@@ -13,7 +13,6 @@

#include <arch/registers.h>
 #include <console/console.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>

/* we use x86emu's register file representation */
diff --git a/src/device/oprom/yabel/device.c b/src/device/oprom/yabel/device.c
index 4a50068..4814829 100644
--- a/src/device/oprom/yabel/device.c
+++ b/src/device/oprom/yabel/device.c
@@ -39,7 +39,6 @@
 #include "debug.h"

#include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include <device/resource.h>

diff --git a/src/device/oprom/yabel/interrupt.c b/src/device/oprom/yabel/interrupt.c
index 338156f..b9a708c 100644
--- a/src/device/oprom/yabel/interrupt.c
+++ b/src/device/oprom/yabel/interrupt.c
@@ -45,7 +45,6 @@
 #include <x86emu/x86emu.h>
 #include "../x86emu/prim_ops.h"

-#include <device/pci.h>
 #include <device/pci_ops.h>

diff --git a/src/device/oprom/yabel/io.c b/src/device/oprom/yabel/io.c
index 051a601..ec54ab0 100644
--- a/src/device/oprom/yabel/io.c
+++ b/src/device/oprom/yabel/io.c
@@ -41,7 +41,6 @@
 #include <device/oprom/include/io.h>
 #include "io.h"

-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include <device/resource.h>

diff --git a/src/device/pci_ops.c b/src/device/pci_ops.c
index 431160e..3e5a2ee 100644
--- a/src/device/pci_ops.c
+++ b/src/device/pci_ops.c
@@ -13,7 +13,6 @@

#include <stdint.h>
 #include <console/console.h>
-#include <device/pci.h>
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
 #include <device/pci_type.h>
diff --git a/src/device/pci_rom.c b/src/device/pci_rom.c
index 3676f9c..25acc30 100644
--- a/src/device/pci_rom.c
+++ b/src/device/pci_rom.c
@@ -14,7 +14,6 @@
 #include <console/console.h>
 #include <commonlib/endian.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <string.h>
diff --git a/src/drivers/aspeed/common/aspeed_coreboot.h b/src/drivers/aspeed/common/aspeed_coreboot.h
index d3b6981..088ea55 100644
--- a/src/drivers/aspeed/common/aspeed_coreboot.h
+++ b/src/drivers/aspeed/common/aspeed_coreboot.h
@@ -24,7 +24,6 @@

#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>

/* coreboot <--> kernel code interface */
diff --git a/src/drivers/intel/gma/intel_ddi.c b/src/drivers/intel/gma/intel_ddi.c
index d52b293..163a9ac 100644
--- a/src/drivers/intel/gma/intel_ddi.c
+++ b/src/drivers/intel/gma/intel_ddi.c
@@ -32,7 +32,6 @@
 #include <console/console.h>
 #include <arch/acpi.h>
 #include <smbios.h>
-#include <device/pci.h>
 #include <ec/google/chromeec/ec.h>
 #include <cpu/x86/tsc.h>
 #include <cpu/x86/cache.h>
diff --git a/src/drivers/intel/gma/opregion.c b/src/drivers/intel/gma/opregion.c
index 56449d0..1f46a76 100644
--- a/src/drivers/intel/gma/opregion.c
+++ b/src/drivers/intel/gma/opregion.c
@@ -17,7 +17,6 @@
 #include <string.h>
 #include <cbfs.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <console/console.h>
diff --git a/src/drivers/intel/gma/vbt.c b/src/drivers/intel/gma/vbt.c
index 603044a..93c3cf9 100644
--- a/src/drivers/intel/gma/vbt.c
+++ b/src/drivers/intel/gma/vbt.c
@@ -15,7 +15,6 @@
 #include <device/pci_ops.h>
 #include <device/device.h>
 #include <string.h>
-#include <device/pci.h>
 #include <drivers/intel/gma/opregion.h>

#include "i915.h"
diff --git a/src/drivers/xgi/common/xgi_coreboot.c b/src/drivers/xgi/common/xgi_coreboot.c
index d65e007..82a0179 100644
--- a/src/drivers/xgi/common/xgi_coreboot.c
+++ b/src/drivers/xgi/common/xgi_coreboot.c
@@ -17,7 +17,6 @@
 #include <vbe.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <pc80/vga.h>
diff --git a/src/drivers/xgi/common/xgi_coreboot.h b/src/drivers/xgi/common/xgi_coreboot.h
index a850087..0d368ac 100644
--- a/src/drivers/xgi/common/xgi_coreboot.h
+++ b/src/drivers/xgi/common/xgi_coreboot.h
@@ -25,7 +25,6 @@
 #include <device/mmio.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>

#include "initdef.h"
diff --git a/src/lib/hardwaremain.c b/src/lib/hardwaremain.c
index eba5f12..dc8fbb1 100644
--- a/src/lib/hardwaremain.c
+++ b/src/lib/hardwaremain.c
@@ -27,7 +27,6 @@
 #include <cbmem.h>
 #include <version.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <delay.h>
 #include <stdlib.h>
 #include <boot/tables.h>
diff --git a/src/lib/reg_script.c b/src/lib/reg_script.c
index 299fd75..8eeda05 100644
--- a/src/lib/reg_script.c
+++ b/src/lib/reg_script.c
@@ -20,7 +20,6 @@
 #include <delay.h>
 #include <device/device.h>
 #include <device/resource.h>
-#include <device/pci.h>
 #include <stdint.h>
 #include <reg_script.h>

diff --git a/src/mainboard/google/kahlee/variants/treeya/mainboard.c b/src/mainboard/google/kahlee/variants/treeya/mainboard.c
index cd42b56..6d981d2 100644
--- a/src/mainboard/google/kahlee/variants/treeya/mainboard.c
+++ b/src/mainboard/google/kahlee/variants/treeya/mainboard.c
@@ -21,7 +21,6 @@
 #include <smbios.h>
 #include <variant/gpio.h>
 #include <device/mmio.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include <drivers/generic/bayhub/bh720.h>

diff --git a/src/northbridge/intel/gm45/acpi.c b/src/northbridge/intel/gm45/acpi.c
index 82b6221..6035b7e 100644
--- a/src/northbridge/intel/gm45/acpi.c
+++ b/src/northbridge/intel/gm45/acpi.c
@@ -19,7 +19,6 @@
 #include <arch/acpi.h>
 #include <arch/acpigen.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_def.h>
 #include <device/pci_ops.h>

diff --git a/src/northbridge/intel/haswell/acpi.c b/src/northbridge/intel/haswell/acpi.c
index d92e858..a9b687b 100644
--- a/src/northbridge/intel/haswell/acpi.c
+++ b/src/northbridge/intel/haswell/acpi.c
@@ -19,7 +19,6 @@
 #include <console/console.h>
 #include <arch/acpi.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include "haswell.h"
 #include <southbridge/intel/lynxpoint/pch.h>
diff --git a/src/northbridge/intel/i945/acpi.c b/src/northbridge/intel/i945/acpi.c
index 3a9f6a2..66f26dd 100644
--- a/src/northbridge/intel/i945/acpi.c
+++ b/src/northbridge/intel/i945/acpi.c
@@ -18,7 +18,6 @@
 #include <arch/acpi.h>
 #include <arch/acpigen.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include "i945.h"

diff --git a/src/northbridge/intel/nehalem/acpi.c b/src/northbridge/intel/nehalem/acpi.c
index 462cdc0..43b13c2 100644
--- a/src/northbridge/intel/nehalem/acpi.c
+++ b/src/northbridge/intel/nehalem/acpi.c
@@ -20,7 +20,6 @@

#include <types.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include "nehalem.h"

diff --git a/src/northbridge/intel/nehalem/smi.c b/src/northbridge/intel/nehalem/smi.c
index 8c19852..c3433a3 100644
--- a/src/northbridge/intel/nehalem/smi.c
+++ b/src/northbridge/intel/nehalem/smi.c
@@ -15,7 +15,6 @@

#include <types.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include "nehalem.h"

diff --git a/src/northbridge/intel/pineview/acpi.c b/src/northbridge/intel/pineview/acpi.c
index 9dd8e31..2e12305 100644
--- a/src/northbridge/intel/pineview/acpi.c
+++ b/src/northbridge/intel/pineview/acpi.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/acpi.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <northbridge/intel/pineview/pineview.h>
 #include <types.h>

diff --git a/src/northbridge/intel/pineview/early_init.c b/src/northbridge/intel/pineview/early_init.c
index c3cd380..2625fe6 100644
--- a/src/northbridge/intel/pineview/early_init.c
+++ b/src/northbridge/intel/pineview/early_init.c
@@ -17,7 +17,6 @@
 #include <console/console.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
-#include <device/pci.h>
 #include <northbridge/intel/pineview/pineview.h>
 #include <northbridge/intel/pineview/chip.h>
 #include <option.h>
diff --git a/src/northbridge/intel/sandybridge/acpi.c b/src/northbridge/intel/sandybridge/acpi.c
index 4afb546..9665972 100644
--- a/src/northbridge/intel/sandybridge/acpi.c
+++ b/src/northbridge/intel/sandybridge/acpi.c
@@ -20,7 +20,6 @@
 #include <commonlib/helpers.h>
 #include <arch/acpi.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include "sandybridge.h"
 #include <southbridge/intel/bd82x6x/pch.h>
diff --git a/src/northbridge/intel/sandybridge/common.c b/src/northbridge/intel/sandybridge/common.c
index 8bfd476..d141c99 100644
--- a/src/northbridge/intel/sandybridge/common.c
+++ b/src/northbridge/intel/sandybridge/common.c
@@ -18,7 +18,6 @@
 #include <types.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include "sandybridge.h"

enum platform_type get_platform_type(void)
diff --git a/src/northbridge/intel/x4x/acpi.c b/src/northbridge/intel/x4x/acpi.c
index a91d227..d25eb2b 100644
--- a/src/northbridge/intel/x4x/acpi.c
+++ b/src/northbridge/intel/x4x/acpi.c
@@ -20,7 +20,6 @@
 #include <arch/acpi.h>
 #include <arch/acpigen.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include "x4x.h"

unsigned long acpi_fill_mcfg(unsigned long current)
diff --git a/src/soc/amd/picasso/acpi.c b/src/soc/amd/picasso/acpi.c
index 7b70ec6..4534f6a 100644
--- a/src/soc/amd/picasso/acpi.c
+++ b/src/soc/amd/picasso/acpi.c
@@ -27,7 +27,6 @@
 #include <cpu/x86/smm.h>
 #include <cbmem.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <amdblocks/acpimmio.h>
 #include <amdblocks/acpi.h>
 #include <soc/acpi.h>
diff --git a/src/soc/amd/picasso/sata.c b/src/soc/amd/picasso/sata.c
index d67f5b4..3d2571d 100644
--- a/src/soc/amd/picasso/sata.c
+++ b/src/soc/amd/picasso/sata.c
@@ -14,7 +14,6 @@
  */

#include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
 #include <amdblocks/sata.h>
diff --git a/src/soc/amd/picasso/southbridge.c b/src/soc/amd/picasso/southbridge.c
index 0dff4bc..757656e 100644
--- a/src/soc/amd/picasso/southbridge.c
+++ b/src/soc/amd/picasso/southbridge.c
@@ -19,7 +19,6 @@
 #include <cpu/x86/smm.h>
 #include <cpu/x86/msr.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include <cbmem.h>
 #include <amdblocks/amd_pci_util.h>
diff --git a/src/soc/amd/stoneyridge/acpi.c b/src/soc/amd/stoneyridge/acpi.c
index 13020ed..2cd4519 100644
--- a/src/soc/amd/stoneyridge/acpi.c
+++ b/src/soc/amd/stoneyridge/acpi.c
@@ -27,7 +27,6 @@
 #include <cpu/x86/smm.h>
 #include <cbmem.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <amdblocks/acpimmio.h>
 #include <amdblocks/acpi.h>
 #include <soc/acpi.h>
diff --git a/src/soc/amd/stoneyridge/sata.c b/src/soc/amd/stoneyridge/sata.c
index d67f5b4..3d2571d 100644
--- a/src/soc/amd/stoneyridge/sata.c
+++ b/src/soc/amd/stoneyridge/sata.c
@@ -14,7 +14,6 @@
  */

#include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
 #include <amdblocks/sata.h>
diff --git a/src/soc/amd/stoneyridge/southbridge.c b/src/soc/amd/stoneyridge/southbridge.c
index 1b2afec..1c10339 100644
--- a/src/soc/amd/stoneyridge/southbridge.c
+++ b/src/soc/amd/stoneyridge/southbridge.c
@@ -18,7 +18,6 @@
 #include <bootstate.h>
 #include <cpu/x86/smm.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include <cbmem.h>
 #include <amdblocks/amd_pci_util.h>
diff --git a/src/soc/cavium/cn81xx/sdram.c b/src/soc/cavium/cn81xx/sdram.c
index 71d6b48..1142a8a 100644
--- a/src/soc/cavium/cn81xx/sdram.c
+++ b/src/soc/cavium/cn81xx/sdram.c
@@ -32,7 +32,6 @@
 #include <soc/ecam.h>
 #include <device/pci_ops.h>
 #include <device/mmio.h>
-#include <device/pci.h>

size_t sdram_size_mb(void)
 {
diff --git a/src/soc/cavium/common/ecam.c b/src/soc/cavium/common/ecam.c
index 89c69db..a3fc94c 100644
--- a/src/soc/cavium/common/ecam.c
+++ b/src/soc/cavium/common/ecam.c
@@ -21,7 +21,6 @@

#include <device/pci_ops.h>
 #include <device/pci_def.h>
-#include <device/pci.h>
 #include <soc/addressmap.h>
 #include <soc/ecam.h>

diff --git a/src/soc/intel/apollolake/bootblock/bootblock.c b/src/soc/intel/apollolake/bootblock/bootblock.c
index a07c462..8a51224 100644
--- a/src/soc/intel/apollolake/bootblock/bootblock.c
+++ b/src/soc/intel/apollolake/bootblock/bootblock.c
@@ -17,7 +17,6 @@

#include <bootblock_common.h>
 #include <cpu/x86/pae.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include <intelblocks/cpulib.h>
 #include <intelblocks/fast_spi.h>
diff --git a/src/soc/intel/apollolake/lpc.c b/src/soc/intel/apollolake/lpc.c
index 636dd03..660157c 100644
--- a/src/soc/intel/apollolake/lpc.c
+++ b/src/soc/intel/apollolake/lpc.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */

-#include <device/pci.h>
 #include <intelblocks/lpc_lib.h>
 #include <intelblocks/rtc.h>
 #include <soc/gpio.h>
diff --git a/src/soc/intel/apollolake/pmc.c b/src/soc/intel/apollolake/pmc.c
index 286cd8a..1d59766 100644
--- a/src/soc/intel/apollolake/pmc.c
+++ b/src/soc/intel/apollolake/pmc.c
@@ -19,7 +19,6 @@
 #include <console/console.h>
 #include <device/mmio.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <intelblocks/pmc.h>
 #include <intelblocks/pmclib.h>
 #include <soc/iomap.h>
diff --git a/src/soc/intel/apollolake/pmutil.c b/src/soc/intel/apollolake/pmutil.c
index 559adad..715b922 100644
--- a/src/soc/intel/apollolake/pmutil.c
+++ b/src/soc/intel/apollolake/pmutil.c
@@ -24,7 +24,6 @@
 #include <console/console.h>
 #include <cpu/x86/msr.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_def.h>
 #include <intelblocks/msr.h>
 #include <intelblocks/pmclib.h>
diff --git a/src/soc/intel/apollolake/xdci.c b/src/soc/intel/apollolake/xdci.c
index 0a85f26..e918f15 100644
--- a/src/soc/intel/apollolake/xdci.c
+++ b/src/soc/intel/apollolake/xdci.c
@@ -16,7 +16,6 @@
 #include <device/mmio.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <intelblocks/xdci.h>
 #include <soc/pci_devs.h>
 #include <timer.h>
diff --git a/src/soc/intel/baytrail/elog.c b/src/soc/intel/baytrail/elog.c
index d7a0460..18708a9 100644
--- a/src/soc/intel/baytrail/elog.c
+++ b/src/soc/intel/baytrail/elog.c
@@ -19,7 +19,6 @@
 #include <console/console.h>
 #include <cbmem.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <elog.h>
 #include <soc/iomap.h>
 #include <soc/pmc.h>
diff --git a/src/soc/intel/baytrail/gpio.c b/src/soc/intel/baytrail/gpio.c
index 3460a5f..fcc89c2 100644
--- a/src/soc/intel/baytrail/gpio.c
+++ b/src/soc/intel/baytrail/gpio.c
@@ -15,7 +15,6 @@

#include <arch/io.h>
 #include <device/mmio.h>
-#include <device/pci.h>
 #include <console/console.h>
 #include <soc/gpio.h>
 #include <soc/pmc.h>
diff --git a/src/soc/intel/baytrail/pmutil.c b/src/soc/intel/baytrail/pmutil.c
index 51174fc..b4b06f3 100644
--- a/src/soc/intel/baytrail/pmutil.c
+++ b/src/soc/intel/baytrail/pmutil.c
@@ -18,7 +18,6 @@
 #include <arch/io.h>
 #include <device/device.h>
 #include <device/mmio.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include <cbmem.h>
 #include <console/console.h>
diff --git a/src/soc/intel/baytrail/scc.c b/src/soc/intel/baytrail/scc.c
index a6b4fe3..c56c042 100644
--- a/src/soc/intel/baytrail/scc.c
+++ b/src/soc/intel/baytrail/scc.c
@@ -17,7 +17,6 @@
 #include <cbmem.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <reg_script.h>

#include <soc/iosf.h>
diff --git a/src/soc/intel/baytrail/smm.c b/src/soc/intel/baytrail/smm.c
index 9f10f70..0aa6f23 100644
--- a/src/soc/intel/baytrail/smm.c
+++ b/src/soc/intel/baytrail/smm.c
@@ -15,7 +15,6 @@
  */

#include <device/device.h>
-#include <device/pci.h>
 #include <console/console.h>
 #include <arch/io.h>
 #include <device/mmio.h>
diff --git a/src/soc/intel/braswell/acpi.c b/src/soc/intel/braswell/acpi.c
index f68b7ce..33720b4 100644
--- a/src/soc/intel/braswell/acpi.c
+++ b/src/soc/intel/braswell/acpi.c
@@ -26,7 +26,6 @@
 #include <cpu/x86/msr.h>
 #include <cpu/x86/smm.h>
 #include <cpu/x86/tsc.h>
-#include <device/pci.h>
 #include <ec/google/chromeec/ec.h>
 #include <drivers/intel/gma/opregion.h>
 #include <soc/acpi.h>
diff --git a/src/soc/intel/braswell/elog.c b/src/soc/intel/braswell/elog.c
index 6efcef1..7a82725 100644
--- a/src/soc/intel/braswell/elog.c
+++ b/src/soc/intel/braswell/elog.c
@@ -19,7 +19,6 @@
 #include <cbmem.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <elog.h>
 #include <soc/iomap.h>
 #include <soc/pm.h>
diff --git a/src/soc/intel/braswell/gpio.c b/src/soc/intel/braswell/gpio.c
index 14f95e1..d22e04e 100644
--- a/src/soc/intel/braswell/gpio.c
+++ b/src/soc/intel/braswell/gpio.c
@@ -17,7 +17,6 @@
 #include <console/console.h>
 #include <arch/io.h>
 #include <device/mmio.h>
-#include <device/pci.h>
 #include <soc/gpio.h>
 #include <soc/pm.h>
 #include <soc/smm.h>
diff --git a/src/soc/intel/braswell/pmutil.c b/src/soc/intel/braswell/pmutil.c
index 18cb04d..11930d6 100644
--- a/src/soc/intel/braswell/pmutil.c
+++ b/src/soc/intel/braswell/pmutil.c
@@ -19,7 +19,6 @@
 #include <assert.h>
 #include <device/device.h>
 #include <device/mmio.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include <console/console.h>
 #include <soc/iomap.h>
diff --git a/src/soc/intel/braswell/scc.c b/src/soc/intel/braswell/scc.c
index 5c874e1..08f4831 100644
--- a/src/soc/intel/braswell/scc.c
+++ b/src/soc/intel/braswell/scc.c
@@ -18,7 +18,6 @@
 #include <cbmem.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <soc/iosf.h>
 #include <soc/nvs.h>
 #include <soc/ramstage.h>
diff --git a/src/soc/intel/braswell/smm.c b/src/soc/intel/braswell/smm.c
index c108a36..2f6610c 100644
--- a/src/soc/intel/braswell/smm.c
+++ b/src/soc/intel/braswell/smm.c
@@ -21,7 +21,6 @@
 #include <cpu/x86/smm.h>
 #include <cpu/intel/smm_reloc.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <soc/iomap.h>
 #include <soc/pm.h>
 #include <soc/smm.h>
diff --git a/src/soc/intel/broadwell/gpio.c b/src/soc/intel/broadwell/gpio.c
index 81ad9d4..2831f85 100644
--- a/src/soc/intel/broadwell/gpio.c
+++ b/src/soc/intel/broadwell/gpio.c
@@ -16,7 +16,6 @@
 #include <stdint.h>
 #include <arch/io.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <soc/gpio.h>
 #include <soc/iomap.h>
 #include <soc/pm.h>
diff --git a/src/soc/intel/broadwell/me_status.c b/src/soc/intel/broadwell/me_status.c
index d89f108..d494d71 100644
--- a/src/soc/intel/broadwell/me_status.c
+++ b/src/soc/intel/broadwell/me_status.c
@@ -15,7 +15,6 @@

#include <device/pci_ops.h>
 #include <console/console.h>
-#include <device/pci.h>
 #include <string.h>
 #include <soc/pci_devs.h>
 #include <soc/me.h>
diff --git a/src/soc/intel/broadwell/memmap.c b/src/soc/intel/broadwell/memmap.c
index 48492d3..837347c 100644
--- a/src/soc/intel/broadwell/memmap.c
+++ b/src/soc/intel/broadwell/memmap.c
@@ -17,7 +17,6 @@

#include <cbmem.h>
 #include <cpu/x86/smm.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include <soc/pci_devs.h>
 #include <soc/systemagent.h>
diff --git a/src/soc/intel/broadwell/pch.c b/src/soc/intel/broadwell/pch.c
index e6c2319..74536c9 100644
--- a/src/soc/intel/broadwell/pch.c
+++ b/src/soc/intel/broadwell/pch.c
@@ -17,7 +17,6 @@
 #include <console/console.h>
 #include <device/pci_ops.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_def.h>
 #include <soc/iobp.h>
 #include <soc/pch.h>
diff --git a/src/soc/intel/broadwell/pmutil.c b/src/soc/intel/broadwell/pmutil.c
index 00db615..5857cec 100644
--- a/src/soc/intel/broadwell/pmutil.c
+++ b/src/soc/intel/broadwell/pmutil.c
@@ -22,7 +22,6 @@
 #include <arch/io.h>
 #include <device/pci_ops.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_def.h>
 #include <console/console.h>
 #include <soc/iomap.h>
diff --git a/src/soc/intel/broadwell/romstage/power_state.c b/src/soc/intel/broadwell/romstage/power_state.c
index 1970c31..09ca8c0 100644
--- a/src/soc/intel/broadwell/romstage/power_state.c
+++ b/src/soc/intel/broadwell/romstage/power_state.c
@@ -18,7 +18,6 @@
 #include <cbmem.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_def.h>
 #include <reg_script.h>
 #include <stdint.h>
diff --git a/src/soc/intel/broadwell/romstage/report_platform.c b/src/soc/intel/broadwell/romstage/report_platform.c
index d60ed38..88be982 100644
--- a/src/soc/intel/broadwell/romstage/report_platform.c
+++ b/src/soc/intel/broadwell/romstage/report_platform.c
@@ -16,7 +16,6 @@
 #include <arch/cpu.h>
 #include <device/pci_ops.h>
 #include <console/console.h>
-#include <device/pci.h>
 #include <string.h>
 #include <cpu/x86/msr.h>
 #include <soc/cpu.h>
diff --git a/src/soc/intel/broadwell/smi.c b/src/soc/intel/broadwell/smi.c
index 2bdeecc..2342e37 100644
--- a/src/soc/intel/broadwell/smi.c
+++ b/src/soc/intel/broadwell/smi.c
@@ -15,7 +15,6 @@
  */

#include <device/device.h>
-#include <device/pci.h>
 #include <console/console.h>
 #include <arch/io.h>
 #include <cpu/x86/cache.h>
diff --git a/src/soc/intel/broadwell/smmrelocate.c b/src/soc/intel/broadwell/smmrelocate.c
index 7bf351a..c88b006 100644
--- a/src/soc/intel/broadwell/smmrelocate.c
+++ b/src/soc/intel/broadwell/smmrelocate.c
@@ -16,7 +16,6 @@
 #include <types.h>
 #include <string.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/soc/intel/cannonlake/bootblock/report_platform.c b/src/soc/intel/cannonlake/bootblock/report_platform.c
index 67dd452..380acce 100644
--- a/src/soc/intel/cannonlake/bootblock/report_platform.c
+++ b/src/soc/intel/cannonlake/bootblock/report_platform.c
@@ -19,7 +19,6 @@
 #include <console/console.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/name.h>
-#include <device/pci.h>
 #include <device/pci_ids.h>
 #include <intelblocks/mp_init.h>
 #include <soc/bootblock.h>
diff --git a/src/soc/intel/cannonlake/cpu.c b/src/soc/intel/cannonlake/cpu.c
index f01b499..6ec1afe 100644
--- a/src/soc/intel/cannonlake/cpu.c
+++ b/src/soc/intel/cannonlake/cpu.c
@@ -15,7 +15,6 @@

#include <arch/cpu.h>
 #include <console/console.h>
-#include <device/pci.h>
 #include <cpu/x86/lapic.h>
 #include <cpu/x86/mp.h>
 #include <cpu/x86/msr.h>
diff --git a/src/soc/intel/cannonlake/finalize.c b/src/soc/intel/cannonlake/finalize.c
index 002e8ea..2f45d37 100644
--- a/src/soc/intel/cannonlake/finalize.c
+++ b/src/soc/intel/cannonlake/finalize.c
@@ -20,7 +20,6 @@
 #include <console/console.h>
 #include <console/post_codes.h>
 #include <cpu/x86/smm.h>
-#include <device/pci.h>
 #include <intelblocks/lpc_lib.h>
 #include <intelblocks/pcr.h>
 #include <intelblocks/tco.h>
diff --git a/src/soc/intel/cannonlake/fsp_params.c b/src/soc/intel/cannonlake/fsp_params.c
index dc4a2a8..b90266b 100644
--- a/src/soc/intel/cannonlake/fsp_params.c
+++ b/src/soc/intel/cannonlake/fsp_params.c
@@ -16,7 +16,6 @@
 #include <cbmem.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <fsp/api.h>
 #include <fsp/util.h>
 #include <intelblocks/lpss.h>
diff --git a/src/soc/intel/cannonlake/lpc.c b/src/soc/intel/cannonlake/lpc.c
index c4eb884..84f66b26 100644
--- a/src/soc/intel/cannonlake/lpc.c
+++ b/src/soc/intel/cannonlake/lpc.c
@@ -16,7 +16,6 @@
  */

#include <device/device.h>
-#include <device/pci.h>
 #include <pc80/isa-dma.h>
 #include <pc80/i8259.h>
 #include <arch/io.h>
diff --git a/src/soc/intel/cannonlake/me.c b/src/soc/intel/cannonlake/me.c
index 0414470..868b7c1 100644
--- a/src/soc/intel/cannonlake/me.c
+++ b/src/soc/intel/cannonlake/me.c
@@ -17,7 +17,6 @@
 #include <bootstate.h>
 #include <commonlib/helpers.h>
 #include <console/console.h>
-#include <device/pci.h>
 #include <intelblocks/cse.h>
 #include <soc/me.h>
 #include <soc/pci_devs.h>
diff --git a/src/soc/intel/cannonlake/pmutil.c b/src/soc/intel/cannonlake/pmutil.c
index aded9c0..e5cb8ed 100644
--- a/src/soc/intel/cannonlake/pmutil.c
+++ b/src/soc/intel/cannonlake/pmutil.c
@@ -24,7 +24,6 @@
 #include <device/mmio.h>
 #include <cbmem.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_def.h>
 #include <console/console.h>
 #include <intelblocks/pmclib.h>
diff --git a/src/soc/intel/cannonlake/smmrelocate.c b/src/soc/intel/cannonlake/smmrelocate.c
index e99a9a2..ff81fe1 100644
--- a/src/soc/intel/cannonlake/smmrelocate.c
+++ b/src/soc/intel/cannonlake/smmrelocate.c
@@ -17,7 +17,6 @@
 #include <types.h>
 #include <string.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/soc/intel/cannonlake/systemagent.c b/src/soc/intel/cannonlake/systemagent.c
index 3f01f14..e4d387b 100644
--- a/src/soc/intel/cannonlake/systemagent.c
+++ b/src/soc/intel/cannonlake/systemagent.c
@@ -17,7 +17,6 @@

#include <device/device.h>
 #include <delay.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include <intelblocks/systemagent.h>
 #include <soc/cpu.h>
diff --git a/src/soc/intel/common/block/include/intelblocks/imc.h b/src/soc/intel/common/block/include/intelblocks/imc.h
index fc3c241..38564fb 100644
--- a/src/soc/intel/common/block/include/intelblocks/imc.h
+++ b/src/soc/intel/common/block/include/intelblocks/imc.h
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */

-#include <device/pci.h>
 #include <stdint.h>

#ifndef SOC_INTEL_COMMON_BLOCK_IMC_H
diff --git a/src/soc/intel/common/block/lpc/lpc_lib.c b/src/soc/intel/common/block/lpc/lpc_lib.c
index bc89e4c..badda2b 100644
--- a/src/soc/intel/common/block/lpc/lpc_lib.c
+++ b/src/soc/intel/common/block/lpc/lpc_lib.c
@@ -19,7 +19,6 @@

#include <assert.h>
 #include <console/console.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include <intelblocks/lpc_lib.h>
 #include <lib.h>
diff --git a/src/soc/intel/common/block/scs/early_mmc.c b/src/soc/intel/common/block/scs/early_mmc.c
index 8036450..3285f6e 100644
--- a/src/soc/intel/common/block/scs/early_mmc.c
+++ b/src/soc/intel/common/block/scs/early_mmc.c
@@ -20,7 +20,6 @@
 #include <commonlib/sdhci.h>
 #include <compiler.h>
 #include <console/console.h>
-#include <device/pci.h>
 #include <intelblocks/mmc.h>
 #include <soc/iomap.h>
 #include <soc/pci_devs.h>
diff --git a/src/soc/intel/common/block/smbus/tco.c b/src/soc/intel/common/block/smbus/tco.c
index 1a215eb..b0ec217 100644
--- a/src/soc/intel/common/block/smbus/tco.c
+++ b/src/soc/intel/common/block/smbus/tco.c
@@ -16,7 +16,6 @@
 #include <arch/io.h>
 #include <device/pci_ops.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_def.h>
 #include <intelblocks/pcr.h>
 #include <intelblocks/tco.h>
diff --git a/src/soc/intel/common/block/systemagent/systemagent_early.c b/src/soc/intel/common/block/systemagent/systemagent_early.c
index 1273c0f..73b6026 100644
--- a/src/soc/intel/common/block/systemagent/systemagent_early.c
+++ b/src/soc/intel/common/block/systemagent/systemagent_early.c
@@ -18,7 +18,6 @@
 #include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <intelblocks/systemagent.h>
 #include <soc/iomap.h>
 #include <soc/pci_devs.h>
diff --git a/src/soc/intel/denverton_ns/acpi.c b/src/soc/intel/denverton_ns/acpi.c
index 163f76a..9552bb0 100644
--- a/src/soc/intel/denverton_ns/acpi.c
+++ b/src/soc/intel/denverton_ns/acpi.c
@@ -22,7 +22,6 @@
 #include <arch/smp/mpspec.h>
 #include <cpu/x86/smm.h>
 #include <string.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include <cbmem.h>
 #include <console/console.h>
diff --git a/src/soc/intel/denverton_ns/bootblock/bootblock.c b/src/soc/intel/denverton_ns/bootblock/bootblock.c
index 47c76b5..6612cfd 100644
--- a/src/soc/intel/denverton_ns/bootblock/bootblock.c
+++ b/src/soc/intel/denverton_ns/bootblock/bootblock.c
@@ -16,7 +16,6 @@

#include <bootblock_common.h>
 #include <cpu/x86/mtrr.h>
-#include <device/pci.h>
 #include <FsptUpd.h>
 #include <intelblocks/fast_spi.h>
 #include <soc/bootblock.h>
diff --git a/src/soc/intel/denverton_ns/gpio_dnv.c b/src/soc/intel/denverton_ns/gpio_dnv.c
index b083768..c79d282 100644
--- a/src/soc/intel/denverton_ns/gpio_dnv.c
+++ b/src/soc/intel/denverton_ns/gpio_dnv.c
@@ -19,7 +19,6 @@
 #include <device/mmio.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>

#include <soc/iomap.h>
 #include <soc/pcr.h>
diff --git a/src/soc/intel/denverton_ns/smm.c b/src/soc/intel/denverton_ns/smm.c
index d05e76b..7326ab1 100644
--- a/src/soc/intel/denverton_ns/smm.c
+++ b/src/soc/intel/denverton_ns/smm.c
@@ -17,7 +17,6 @@
  */

#include <device/device.h>
-#include <device/pci.h>
 #include <console/console.h>
 #include <arch/io.h>
 #include <cpu/x86/smm.h>
diff --git a/src/soc/intel/denverton_ns/soc_util.c b/src/soc/intel/denverton_ns/soc_util.c
index ef95f7e..648a27c 100644
--- a/src/soc/intel/denverton_ns/soc_util.c
+++ b/src/soc/intel/denverton_ns/soc_util.c
@@ -17,7 +17,6 @@
 #include <stdint.h>
 #include <device/mmio.h>
 #include <device/pci_ops.h>
-#include <device/pci.h>
 #include <device/pci_def.h>
 #include <device/device.h>
 #include <string.h>
diff --git a/src/soc/intel/icelake/bootblock/report_platform.c b/src/soc/intel/icelake/bootblock/report_platform.c
index 660aab9..4202fd2 100644
--- a/src/soc/intel/icelake/bootblock/report_platform.c
+++ b/src/soc/intel/icelake/bootblock/report_platform.c
@@ -17,7 +17,6 @@
 #include <device/pci_ops.h>
 #include <console/console.h>
 #include <cpu/x86/msr.h>
-#include <device/pci.h>
 #include <device/pci_ids.h>
 #include <intelblocks/mp_init.h>
 #include <soc/bootblock.h>
diff --git a/src/soc/intel/icelake/cpu.c b/src/soc/intel/icelake/cpu.c
index e058442..b7a8512 100644
--- a/src/soc/intel/icelake/cpu.c
+++ b/src/soc/intel/icelake/cpu.c
@@ -15,7 +15,6 @@

#include <arch/cpu.h>
 #include <console/console.h>
-#include <device/pci.h>
 #include <cpu/x86/lapic.h>
 #include <cpu/x86/mp.h>
 #include <cpu/x86/msr.h>
diff --git a/src/soc/intel/icelake/espi.c b/src/soc/intel/icelake/espi.c
index efde625..acf9583 100644
--- a/src/soc/intel/icelake/espi.c
+++ b/src/soc/intel/icelake/espi.c
@@ -14,7 +14,6 @@
  */

#include <device/device.h>
-#include <device/pci.h>
 #include <pc80/isa-dma.h>
 #include <pc80/i8259.h>
 #include <arch/io.h>
diff --git a/src/soc/intel/icelake/finalize.c b/src/soc/intel/icelake/finalize.c
index 6afa61e..0d14124 100644
--- a/src/soc/intel/icelake/finalize.c
+++ b/src/soc/intel/icelake/finalize.c
@@ -19,7 +19,6 @@
 #include <console/console.h>
 #include <console/post_codes.h>
 #include <cpu/x86/smm.h>
-#include <device/pci.h>
 #include <intelblocks/lpc_lib.h>
 #include <intelblocks/pcr.h>
 #include <intelblocks/tco.h>
diff --git a/src/soc/intel/icelake/fsp_params.c b/src/soc/intel/icelake/fsp_params.c
index 448b82c..a6a6117 100644
--- a/src/soc/intel/icelake/fsp_params.c
+++ b/src/soc/intel/icelake/fsp_params.c
@@ -15,7 +15,6 @@

#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <fsp/api.h>
 #include <fsp/util.h>
 #include <intelblocks/lpss.h>
diff --git a/src/soc/intel/icelake/pmutil.c b/src/soc/intel/icelake/pmutil.c
index 7b6168b..ac7e3af 100644
--- a/src/soc/intel/icelake/pmutil.c
+++ b/src/soc/intel/icelake/pmutil.c
@@ -23,7 +23,6 @@
 #include <device/mmio.h>
 #include <cbmem.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_def.h>
 #include <console/console.h>
 #include <intelblocks/pmclib.h>
diff --git a/src/soc/intel/icelake/smmrelocate.c b/src/soc/intel/icelake/smmrelocate.c
index 0bedc9e6..8d53bb9 100644
--- a/src/soc/intel/icelake/smmrelocate.c
+++ b/src/soc/intel/icelake/smmrelocate.c
@@ -16,7 +16,6 @@
 #include <types.h>
 #include <string.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/soc/intel/icelake/systemagent.c b/src/soc/intel/icelake/systemagent.c
index 930e78e..36d38e7 100644
--- a/src/soc/intel/icelake/systemagent.c
+++ b/src/soc/intel/icelake/systemagent.c
@@ -14,7 +14,6 @@
  */

#include <device/device.h>
-#include <device/pci.h>
 #include <intelblocks/systemagent.h>
 #include <soc/iomap.h>
 #include <soc/systemagent.h>
diff --git a/src/soc/intel/quark/i2c.c b/src/soc/intel/quark/i2c.c
index 6430030..e8aed2d 100644
--- a/src/soc/intel/quark/i2c.c
+++ b/src/soc/intel/quark/i2c.c
@@ -19,7 +19,6 @@
 #include <delay.h>
 #include <device/device.h>
 #include <device/i2c_simple.h>
-#include <device/pci.h>
 #include <soc/i2c.h>
 #include <soc/ramstage.h>
 #include <soc/reg_access.h>
diff --git a/src/soc/intel/quark/include/soc/pci_devs.h b/src/soc/intel/quark/include/soc/pci_devs.h
index a24f28f..e16aff7 100644
--- a/src/soc/intel/quark/include/soc/pci_devs.h
+++ b/src/soc/intel/quark/include/soc/pci_devs.h
@@ -18,7 +18,6 @@
 #ifndef _QUARK_PCI_DEVS_H_
 #define _QUARK_PCI_DEVS_H_

-#include <device/pci.h>
 #include <device/pci_def.h>

/* DEVICE 0 (Memory Controller Hub) */
diff --git a/src/soc/intel/quark/include/soc/storage_test.h b/src/soc/intel/quark/include/soc/storage_test.h
index 1c93f1c..a8bdd8b 100644
--- a/src/soc/intel/quark/include/soc/storage_test.h
+++ b/src/soc/intel/quark/include/soc/storage_test.h
@@ -18,7 +18,6 @@

#include <commonlib/sd_mmc_ctrlr.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <timer.h>

#ifdef __SIMPLE_DEVICE__
diff --git a/src/soc/intel/quark/romstage/report_platform.c b/src/soc/intel/quark/romstage/report_platform.c
index cbbf43f..3e2b069 100644
--- a/src/soc/intel/quark/romstage/report_platform.c
+++ b/src/soc/intel/quark/romstage/report_platform.c
@@ -16,7 +16,6 @@

#include <arch/cpu.h>
 #include <console/console.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
 #include <soc/cpu.h>
diff --git a/src/soc/intel/skylake/bootblock/report_platform.c b/src/soc/intel/skylake/bootblock/report_platform.c
index 4a519cf..10a72e3 100644
--- a/src/soc/intel/skylake/bootblock/report_platform.c
+++ b/src/soc/intel/skylake/bootblock/report_platform.c
@@ -19,7 +19,6 @@
 #include <console/console.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/name.h>
-#include <device/pci.h>
 #include <device/pci_ids.h>
 #include <intelblocks/mp_init.h>
 #include <soc/bootblock.h>
diff --git a/src/soc/intel/skylake/cpu.c b/src/soc/intel/skylake/cpu.c
index f5273f6..08210cb 100644
--- a/src/soc/intel/skylake/cpu.c
+++ b/src/soc/intel/skylake/cpu.c
@@ -19,7 +19,6 @@
 #include <bootstate.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <cpu/x86/mtrr.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/soc/intel/skylake/finalize.c b/src/soc/intel/skylake/finalize.c
index e5d32d7..1ccaad0 100644
--- a/src/soc/intel/skylake/finalize.c
+++ b/src/soc/intel/skylake/finalize.c
@@ -22,7 +22,6 @@
 #include <console/post_codes.h>
 #include <cpu/x86/mp.h>
 #include <cpu/x86/smm.h>
-#include <device/pci.h>
 #include <intelblocks/cpulib.h>
 #include <intelblocks/lpc_lib.h>
 #include <intelblocks/p2sb.h>
diff --git a/src/soc/intel/skylake/irq.c b/src/soc/intel/skylake/irq.c
index 6e6d655..4a1b283 100644
--- a/src/soc/intel/skylake/irq.c
+++ b/src/soc/intel/skylake/irq.c
@@ -14,7 +14,6 @@
  */

#include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include <intelblocks/lpc_lib.h>
 #include <intelblocks/itss.h>
diff --git a/src/soc/intel/skylake/lpc.c b/src/soc/intel/skylake/lpc.c
index 71ffb9a..7ff9eda 100644
--- a/src/soc/intel/skylake/lpc.c
+++ b/src/soc/intel/skylake/lpc.c
@@ -16,7 +16,6 @@
  */

#include <device/device.h>
-#include <device/pci.h>
 #include <pc80/isa-dma.h>
 #include <pc80/i8259.h>
 #include <arch/ioapic.h>
diff --git a/src/soc/intel/skylake/me.c b/src/soc/intel/skylake/me.c
index d53d91e..937f72b 100644
--- a/src/soc/intel/skylake/me.c
+++ b/src/soc/intel/skylake/me.c
@@ -17,7 +17,6 @@
 #include <bootstate.h>
 #include <commonlib/helpers.h>
 #include <console/console.h>
-#include <device/pci.h>
 #include <intelblocks/cse.h>
 #include <soc/iomap.h>
 #include <soc/me.h>
diff --git a/src/soc/intel/skylake/pmutil.c b/src/soc/intel/skylake/pmutil.c
index 2b2141b..dee0915 100644
--- a/src/soc/intel/skylake/pmutil.c
+++ b/src/soc/intel/skylake/pmutil.c
@@ -23,7 +23,6 @@
 #include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_def.h>
 #include <console/console.h>
 #include <intelblocks/pmclib.h>
diff --git a/src/soc/intel/skylake/smmrelocate.c b/src/soc/intel/skylake/smmrelocate.c
index 62fc7e4..ae90068 100644
--- a/src/soc/intel/skylake/smmrelocate.c
+++ b/src/soc/intel/skylake/smmrelocate.c
@@ -17,7 +17,6 @@
 #include <types.h>
 #include <string.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/soc/intel/tigerlake/bootblock/report_platform.c b/src/soc/intel/tigerlake/bootblock/report_platform.c
index 127994d..4126674 100644
--- a/src/soc/intel/tigerlake/bootblock/report_platform.c
+++ b/src/soc/intel/tigerlake/bootblock/report_platform.c
@@ -23,7 +23,6 @@
 #include <device/pci_ops.h>
 #include <console/console.h>
 #include <cpu/x86/msr.h>
-#include <device/pci.h>
 #include <device/pci_ids.h>
 #include <intelblocks/mp_init.h>
 #include <soc/bootblock.h>
diff --git a/src/soc/intel/tigerlake/cpu.c b/src/soc/intel/tigerlake/cpu.c
index 5f4f081..c41807e 100644
--- a/src/soc/intel/tigerlake/cpu.c
+++ b/src/soc/intel/tigerlake/cpu.c
@@ -21,7 +21,6 @@

#include <arch/cpu.h>
 #include <console/console.h>
-#include <device/pci.h>
 #include <cpu/x86/lapic.h>
 #include <cpu/x86/mp.h>
 #include <cpu/x86/msr.h>
diff --git a/src/soc/intel/tigerlake/espi.c b/src/soc/intel/tigerlake/espi.c
index d07a582..18f5f80 100644
--- a/src/soc/intel/tigerlake/espi.c
+++ b/src/soc/intel/tigerlake/espi.c
@@ -20,7 +20,6 @@
  */

#include <device/device.h>
-#include <device/pci.h>
 #include <pc80/isa-dma.h>
 #include <pc80/i8259.h>
 #include <arch/io.h>
diff --git a/src/soc/intel/tigerlake/finalize.c b/src/soc/intel/tigerlake/finalize.c
index aed5cc0..65ade16 100644
--- a/src/soc/intel/tigerlake/finalize.c
+++ b/src/soc/intel/tigerlake/finalize.c
@@ -25,7 +25,6 @@
 #include <console/console.h>
 #include <console/post_codes.h>
 #include <cpu/x86/smm.h>
-#include <device/pci.h>
 #include <intelblocks/lpc_lib.h>
 #include <intelblocks/pcr.h>
 #include <intelblocks/tco.h>
diff --git a/src/soc/intel/tigerlake/fsp_params_tgl.c b/src/soc/intel/tigerlake/fsp_params_tgl.c
index 305748e..6aec3a1 100644
--- a/src/soc/intel/tigerlake/fsp_params_tgl.c
+++ b/src/soc/intel/tigerlake/fsp_params_tgl.c
@@ -15,7 +15,6 @@

#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <fsp/api.h>
 #include <fsp/util.h>
 #include <intelblocks/lpss.h>
diff --git a/src/soc/intel/tigerlake/pmutil.c b/src/soc/intel/tigerlake/pmutil.c
index 84a93ae..1dc3507 100644
--- a/src/soc/intel/tigerlake/pmutil.c
+++ b/src/soc/intel/tigerlake/pmutil.c
@@ -30,7 +30,6 @@
 #include <device/mmio.h>
 #include <cbmem.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_def.h>
 #include <console/console.h>
 #include <intelblocks/pmclib.h>
diff --git a/src/soc/intel/tigerlake/smmrelocate.c b/src/soc/intel/tigerlake/smmrelocate.c
index 9e21a23..cd28a3a 100644
--- a/src/soc/intel/tigerlake/smmrelocate.c
+++ b/src/soc/intel/tigerlake/smmrelocate.c
@@ -16,7 +16,6 @@
 #include <types.h>
 #include <string.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/soc/intel/tigerlake/systemagent.c b/src/soc/intel/tigerlake/systemagent.c
index 9c8f645..37e4abe 100644
--- a/src/soc/intel/tigerlake/systemagent.c
+++ b/src/soc/intel/tigerlake/systemagent.c
@@ -20,7 +20,6 @@
  */

#include <device/device.h>
-#include <device/pci.h>
 #include <intelblocks/systemagent.h>
 #include <soc/iomap.h>
 #include <soc/systemagent.h>
diff --git a/src/southbridge/amd/agesa/hudson/hudson.c b/src/southbridge/amd/agesa/hudson/hudson.c
index d586d33..f8a1151 100644
--- a/src/southbridge/amd/agesa/hudson/hudson.c
+++ b/src/southbridge/amd/agesa/hudson/hudson.c
@@ -17,7 +17,6 @@
 #include <console/console.h>
 #include <device/mmio.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
diff --git a/src/southbridge/amd/agesa/hudson/spi.c b/src/southbridge/amd/agesa/hudson/spi.c
index 9656027..53644b5 100644
--- a/src/southbridge/amd/agesa/hudson/spi.c
+++ b/src/southbridge/amd/agesa/hudson/spi.c
@@ -18,7 +18,6 @@
 #include <spi_flash.h>
 #include <spi-generic.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>

#include <Proc/Fch/FchPlatform.h>
diff --git a/src/southbridge/amd/cimx/sb800/spi.c b/src/southbridge/amd/cimx/sb800/spi.c
index fcb4fa1..2256221 100644
--- a/src/southbridge/amd/cimx/sb800/spi.c
+++ b/src/southbridge/amd/cimx/sb800/spi.c
@@ -18,7 +18,6 @@
 #include <spi_flash.h>
 #include <spi-generic.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include <types.h>

diff --git a/src/southbridge/amd/pi/hudson/hudson.c b/src/southbridge/amd/pi/hudson/hudson.c
index 51c37a1..db153fd 100644
--- a/src/southbridge/amd/pi/hudson/hudson.c
+++ b/src/southbridge/amd/pi/hudson/hudson.c
@@ -19,7 +19,6 @@
 #include <device/mmio.h>
 #include <arch/acpi.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
diff --git a/src/southbridge/intel/bd82x6x/elog.c b/src/southbridge/intel/bd82x6x/elog.c
index e96c38d..65cab72 100644
--- a/src/southbridge/intel/bd82x6x/elog.c
+++ b/src/southbridge/intel/bd82x6x/elog.c
@@ -16,7 +16,6 @@
 #include <arch/io.h>
 #include <arch/acpi.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include <stdint.h>
 #include <elog.h>
diff --git a/src/southbridge/intel/bd82x6x/pch.c b/src/southbridge/intel/bd82x6x/pch.c
index 5c2b130..3e19d61 100644
--- a/src/southbridge/intel/bd82x6x/pch.c
+++ b/src/southbridge/intel/bd82x6x/pch.c
@@ -18,7 +18,6 @@
 #include <console/console.h>
 #include <delay.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
 #include <string.h>
diff --git a/src/southbridge/intel/common/gpio.c b/src/southbridge/intel/common/gpio.c
index 9731d75..19d33ae 100644
--- a/src/southbridge/intel/common/gpio.c
+++ b/src/southbridge/intel/common/gpio.c
@@ -17,7 +17,6 @@
 #include <arch/io.h>
 #include <device/pci_ops.h>
 #include <device/device.h>
-#include <device/pci.h>

#include "gpio.h"

diff --git a/src/southbridge/intel/common/pmbase.c b/src/southbridge/intel/common/pmbase.c
index ff0410a..5aea7d6 100644
--- a/src/southbridge/intel/common/pmbase.c
+++ b/src/southbridge/intel/common/pmbase.c
@@ -18,7 +18,6 @@
 #include <arch/io.h>
 #include <device/pci_ops.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <assert.h>
 #include <security/vboot/vboot_common.h>

diff --git a/src/southbridge/intel/common/rcba_pirq.c b/src/southbridge/intel/common/rcba_pirq.c
index 366fe08..f2ddeb0 100644
--- a/src/southbridge/intel/common/rcba_pirq.c
+++ b/src/southbridge/intel/common/rcba_pirq.c
@@ -15,7 +15,6 @@

#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <southbridge/intel/common/acpi_pirq_gen.h>
 #include <southbridge/intel/common/rcba_pirq.h>
 #include <southbridge/intel/common/rcba.h>
diff --git a/src/southbridge/intel/common/smi.c b/src/southbridge/intel/common/smi.c
index 1348174..632b393 100644
--- a/src/southbridge/intel/common/smi.c
+++ b/src/southbridge/intel/common/smi.c
@@ -16,7 +16,6 @@

#include <device/device.h>
-#include <device/pci.h>
 #include <console/console.h>
 #include <arch/io.h>
 #include <cpu/x86/cache.h>
diff --git a/src/southbridge/intel/common/spi.c b/src/southbridge/intel/common/spi.c
index 8285200..4ff9ff4 100644
--- a/src/southbridge/intel/common/spi.c
+++ b/src/southbridge/intel/common/spi.c
@@ -28,7 +28,6 @@
 #include <device/pci_ops.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <spi_flash.h>
 #include <spi-generic.h>
 #include <timer.h>
diff --git a/src/southbridge/intel/common/watchdog.c b/src/southbridge/intel/common/watchdog.c
index 2eaedab..cace9d5 100644
--- a/src/southbridge/intel/common/watchdog.c
+++ b/src/southbridge/intel/common/watchdog.c
@@ -17,7 +17,6 @@

#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
 #include <southbridge/intel/common/pmbase.h>
diff --git a/src/southbridge/intel/i82371eb/fadt.c b/src/southbridge/intel/i82371eb/fadt.c
index cbfb0af..2496d19 100644
--- a/src/southbridge/intel/i82371eb/fadt.c
+++ b/src/southbridge/intel/i82371eb/fadt.c
@@ -20,7 +20,6 @@
 #include <string.h>
 #include <arch/acpi.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <version.h>

#include "i82371eb.h"
diff --git a/src/southbridge/intel/i82801dx/i82801dx.c b/src/southbridge/intel/i82801dx/i82801dx.c
index 765bcb2..759e726 100644
--- a/src/southbridge/intel/i82801dx/i82801dx.c
+++ b/src/southbridge/intel/i82801dx/i82801dx.c
@@ -15,7 +15,6 @@
  */

#include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include "i82801dx.h"

diff --git a/src/southbridge/intel/i82801dx/smi.c b/src/southbridge/intel/i82801dx/smi.c
index dc53220..2209292 100644
--- a/src/southbridge/intel/i82801dx/smi.c
+++ b/src/southbridge/intel/i82801dx/smi.c
@@ -16,7 +16,6 @@

#include <device/device.h>
-#include <device/pci.h>
 #include <console/console.h>
 #include <arch/acpi.h>
 #include <arch/io.h>
diff --git a/src/southbridge/intel/i82801gx/i82801gx.c b/src/southbridge/intel/i82801gx/i82801gx.c
index 6aab741..151a777 100644
--- a/src/southbridge/intel/i82801gx/i82801gx.c
+++ b/src/southbridge/intel/i82801gx/i82801gx.c
@@ -16,7 +16,6 @@

#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include "i82801gx.h"
 #include "sata.h"
diff --git a/src/southbridge/intel/i82801ix/i82801ix.c b/src/southbridge/intel/i82801ix/i82801ix.c
index 753c336a..9686ff8 100644
--- a/src/southbridge/intel/i82801ix/i82801ix.c
+++ b/src/southbridge/intel/i82801ix/i82801ix.c
@@ -19,7 +19,6 @@
 #include <arch/io.h>
 #include <device/pci_ops.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <console/console.h>
 #include "chip.h"
 #include "i82801ix.h"
diff --git a/src/southbridge/intel/i82801ix/smi.c b/src/southbridge/intel/i82801ix/smi.c
index 5f73f41..5650c75 100644
--- a/src/southbridge/intel/i82801ix/smi.c
+++ b/src/southbridge/intel/i82801ix/smi.c
@@ -17,7 +17,6 @@

#include <device/device.h>
-#include <device/pci.h>
 #include <console/console.h>
 #include <arch/io.h>
 #include <device/pci_ops.h>
diff --git a/src/southbridge/intel/i82801jx/i82801jx.c b/src/southbridge/intel/i82801jx/i82801jx.c
index ebd427f..3c6e293 100644
--- a/src/southbridge/intel/i82801jx/i82801jx.c
+++ b/src/southbridge/intel/i82801jx/i82801jx.c
@@ -19,7 +19,6 @@
 #include <arch/io.h>
 #include <device/pci_ops.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <console/console.h>
 #include "chip.h"
 #include "i82801jx.h"
diff --git a/src/southbridge/intel/ibexpeak/madt.c b/src/southbridge/intel/ibexpeak/madt.c
index 3676a47..15b9510 100644
--- a/src/southbridge/intel/ibexpeak/madt.c
+++ b/src/southbridge/intel/ibexpeak/madt.c
@@ -19,7 +19,6 @@
 #include <arch/acpi.h>
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
-#include <device/pci.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/southbridge/intel/ibexpeak/pch.c b/src/southbridge/intel/ibexpeak/pch.c
index 9148b44..f8bcc10 100644
--- a/src/southbridge/intel/ibexpeak/pch.c
+++ b/src/southbridge/intel/ibexpeak/pch.c
@@ -18,7 +18,6 @@
 #include <console/console.h>
 #include <device/pci_ops.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_def.h>
 #include "pch.h"

diff --git a/src/southbridge/intel/lynxpoint/elog.c b/src/southbridge/intel/lynxpoint/elog.c
index 6f12c70..15f9604 100644
--- a/src/southbridge/intel/lynxpoint/elog.c
+++ b/src/southbridge/intel/lynxpoint/elog.c
@@ -16,7 +16,6 @@
 #include <arch/io.h>
 #include <arch/acpi.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include <stdint.h>
 #include <elog.h>
diff --git a/src/southbridge/intel/lynxpoint/lp_gpio.c b/src/southbridge/intel/lynxpoint/lp_gpio.c
index 1919d58..115229f 100644
--- a/src/southbridge/intel/lynxpoint/lp_gpio.c
+++ b/src/southbridge/intel/lynxpoint/lp_gpio.c
@@ -17,7 +17,6 @@
 #include <arch/io.h>
 #include <device/pci_ops.h>
 #include <device/device.h>
-#include <device/pci.h>

#include "pch.h"
 #include "lp_gpio.h"
diff --git a/src/southbridge/intel/lynxpoint/pch.c b/src/southbridge/intel/lynxpoint/pch.c
index cb50c12..cdd2065 100644
--- a/src/southbridge/intel/lynxpoint/pch.c
+++ b/src/southbridge/intel/lynxpoint/pch.c
@@ -19,7 +19,6 @@
 #include <delay.h>
 #include <device/pci_ops.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_def.h>
 #include "pch.h"

diff --git a/src/southbridge/intel/lynxpoint/pmutil.c b/src/southbridge/intel/lynxpoint/pmutil.c
index cc49477..095fe64 100644
--- a/src/southbridge/intel/lynxpoint/pmutil.c
+++ b/src/southbridge/intel/lynxpoint/pmutil.c
@@ -21,7 +21,6 @@

#include <arch/io.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_def.h>
 #include <console/console.h>
 #include <security/vboot/vbnv.h>
diff --git a/src/southbridge/intel/lynxpoint/rcba.c b/src/southbridge/intel/lynxpoint/rcba.c
index 57253cb..d843547 100644
--- a/src/southbridge/intel/lynxpoint/rcba.c
+++ b/src/southbridge/intel/lynxpoint/rcba.c
@@ -15,7 +15,6 @@

#include <device/pci_def.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include "pch.h"

void pch_config_rcba(const struct rcba_config_instruction *rcba_config)
diff --git a/src/southbridge/intel/lynxpoint/smi.c b/src/southbridge/intel/lynxpoint/smi.c
index e5c390e..0d6a548 100644
--- a/src/southbridge/intel/lynxpoint/smi.c
+++ b/src/southbridge/intel/lynxpoint/smi.c
@@ -16,7 +16,6 @@

#include <bootstate.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <console/console.h>
 #include <arch/io.h>
 #include <cpu/intel/smm_reloc.h>
diff --git a/src/vendorcode/eltan/security/verified_boot/vboot_check.h b/src/vendorcode/eltan/security/verified_boot/vboot_check.h
index bd28492..d432ee3 100644
--- a/src/vendorcode/eltan/security/verified_boot/vboot_check.h
+++ b/src/vendorcode/eltan/security/verified_boot/vboot_check.h
@@ -19,7 +19,6 @@

#include <cbfs.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <lib.h>
 #include CONFIG_VENDORCODE_ELTAN_VBOOT_MANIFEST
 #include <console/console.h>

[HAOUAS Elyes (Code Review)]

Hello Patrick Rudolph, Vanessa Eusebio, build bot (Jenkins), Damien Zammit, David Guckian,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/38610

to look at the new patch set (#2).

Change subject: src: Remove unused include <device/pci.h>
......................................................................

src: Remove unused include <device/pci.h>

Change-Id: I73430fdbdf6306df701480ab6353c840c71f607b
Signed-off-by: Elyes HAOUAS 
---
M src/arch/x86/acpi.c
M src/commonlib/storage/pci_sdhci.c
M src/cpu/intel/haswell/smmrelocate.c
M src/cpu/intel/smm/gen1/smmrelocate.c
M src/device/device_const.c
M src/device/oprom/realmode/x86.c
M src/device/oprom/realmode/x86_interrupts.c
M src/device/oprom/yabel/device.c
M src/device/oprom/yabel/interrupt.c
M src/device/oprom/yabel/io.c
M src/device/pci_ops.c
M src/device/pci_rom.c
M src/drivers/aspeed/common/aspeed_coreboot.h
M src/drivers/intel/gma/intel_ddi.c
M src/drivers/intel/gma/opregion.c
M src/drivers/intel/gma/vbt.c
M src/lib/hardwaremain.c
M src/lib/reg_script.c
M src/mainboard/google/kahlee/variants/treeya/mainboard.c
M src/northbridge/intel/gm45/acpi.c
M src/northbridge/intel/haswell/acpi.c
M src/northbridge/intel/i945/acpi.c
M src/northbridge/intel/nehalem/acpi.c
M src/northbridge/intel/nehalem/smi.c
M src/northbridge/intel/pineview/acpi.c
M src/northbridge/intel/pineview/early_init.c
M src/northbridge/intel/sandybridge/acpi.c
M src/northbridge/intel/sandybridge/common.c
M src/northbridge/intel/x4x/acpi.c
M src/soc/amd/picasso/acpi.c
M src/soc/amd/picasso/sata.c
M src/soc/amd/picasso/southbridge.c
M src/soc/amd/stoneyridge/acpi.c
M src/soc/amd/stoneyridge/sata.c
M src/soc/amd/stoneyridge/southbridge.c
M src/soc/cavium/cn81xx/sdram.c
M src/soc/cavium/common/ecam.c
M src/soc/intel/apollolake/bootblock/bootblock.c
M src/soc/intel/apollolake/lpc.c
M src/soc/intel/apollolake/pmc.c
M src/soc/intel/apollolake/pmutil.c
M src/soc/intel/apollolake/xdci.c
M src/soc/intel/baytrail/elog.c
M src/soc/intel/baytrail/gpio.c
M src/soc/intel/baytrail/pmutil.c
M src/soc/intel/baytrail/scc.c
M src/soc/intel/baytrail/smm.c
M src/soc/intel/braswell/acpi.c
M src/soc/intel/braswell/elog.c
M src/soc/intel/braswell/gpio.c
M src/soc/intel/braswell/pmutil.c
M src/soc/intel/braswell/scc.c
M src/soc/intel/braswell/smm.c
M src/soc/intel/broadwell/gpio.c
M src/soc/intel/broadwell/me_status.c
M src/soc/intel/broadwell/memmap.c
M src/soc/intel/broadwell/pch.c
M src/soc/intel/broadwell/pmutil.c
M src/soc/intel/broadwell/romstage/power_state.c
M src/soc/intel/broadwell/romstage/report_platform.c
M src/soc/intel/broadwell/smi.c
M src/soc/intel/broadwell/smmrelocate.c
M src/soc/intel/cannonlake/bootblock/report_platform.c
M src/soc/intel/cannonlake/cpu.c
M src/soc/intel/cannonlake/finalize.c
M src/soc/intel/cannonlake/fsp_params.c
M src/soc/intel/cannonlake/lpc.c
M src/soc/intel/cannonlake/me.c
M src/soc/intel/cannonlake/pmutil.c
M src/soc/intel/cannonlake/smmrelocate.c
M src/soc/intel/cannonlake/systemagent.c
M src/soc/intel/common/block/include/intelblocks/imc.h
M src/soc/intel/common/block/lpc/lpc_lib.c
M src/soc/intel/common/block/scs/early_mmc.c
M src/soc/intel/common/block/smbus/tco.c
M src/soc/intel/common/block/systemagent/systemagent_early.c
M src/soc/intel/denverton_ns/acpi.c
M src/soc/intel/denverton_ns/bootblock/bootblock.c
M src/soc/intel/denverton_ns/gpio_dnv.c
M src/soc/intel/denverton_ns/smm.c
M src/soc/intel/denverton_ns/soc_util.c
M src/soc/intel/icelake/bootblock/report_platform.c
M src/soc/intel/icelake/cpu.c
M src/soc/intel/icelake/espi.c
M src/soc/intel/icelake/finalize.c
M src/soc/intel/icelake/fsp_params.c
M src/soc/intel/icelake/pmutil.c
M src/soc/intel/icelake/smmrelocate.c
M src/soc/intel/icelake/systemagent.c
M src/soc/intel/quark/i2c.c
M src/soc/intel/quark/include/soc/pci_devs.h
M src/soc/intel/quark/include/soc/storage_test.h
M src/soc/intel/quark/romstage/report_platform.c
M src/soc/intel/skylake/bootblock/report_platform.c
M src/soc/intel/skylake/cpu.c
M src/soc/intel/skylake/finalize.c
M src/soc/intel/skylake/irq.c
M src/soc/intel/skylake/lpc.c
M src/soc/intel/skylake/me.c
M src/soc/intel/skylake/pmutil.c
M src/soc/intel/skylake/smmrelocate.c
M src/soc/intel/tigerlake/bootblock/report_platform.c
M src/soc/intel/tigerlake/cpu.c
M src/soc/intel/tigerlake/espi.c
M src/soc/intel/tigerlake/finalize.c
M src/soc/intel/tigerlake/fsp_params_tgl.c
M src/soc/intel/tigerlake/pmutil.c
M src/soc/intel/tigerlake/smmrelocate.c
M src/soc/intel/tigerlake/systemagent.c
M src/southbridge/amd/agesa/hudson/hudson.c
M src/southbridge/amd/agesa/hudson/spi.c
M src/southbridge/amd/cimx/sb800/spi.c
M src/southbridge/amd/pi/hudson/hudson.c
M src/southbridge/intel/bd82x6x/elog.c
M src/southbridge/intel/bd82x6x/pch.c
M src/southbridge/intel/common/gpio.c
M src/southbridge/intel/common/pmbase.c
M src/southbridge/intel/common/rcba_pirq.c
M src/southbridge/intel/common/smi.c
M src/southbridge/intel/common/spi.c
M src/southbridge/intel/common/watchdog.c
M src/southbridge/intel/i82371eb/fadt.c
M src/southbridge/intel/i82801dx/i82801dx.c
M src/southbridge/intel/i82801dx/smi.c
M src/southbridge/intel/i82801gx/i82801gx.c
M src/southbridge/intel/i82801ix/i82801ix.c
M src/southbridge/intel/i82801ix/smi.c
M src/southbridge/intel/i82801jx/i82801jx.c
M src/southbridge/intel/ibexpeak/madt.c
M src/southbridge/intel/ibexpeak/pch.c
M src/southbridge/intel/lynxpoint/elog.c
M src/southbridge/intel/lynxpoint/lp_gpio.c
M src/southbridge/intel/lynxpoint/pch.c
M src/southbridge/intel/lynxpoint/pmutil.c
M src/southbridge/intel/lynxpoint/rcba.c
M src/southbridge/intel/lynxpoint/smi.c
M src/vendorcode/eltan/security/verified_boot/vboot_check.h
137 files changed, 0 insertions(+), 137 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/10/38610/2

[HAOUAS Elyes (Code Review)]

HAOUAS Elyes has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/38610 )

Change subject: src: Remove unused include <device/pci.h>
......................................................................

Abandoned