[coreboot-gerrit] Change in coreboot[master]: src/mainboard: Remove unused '#include <device/pci.h>'

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/37522 )

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

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

Change-Id: I5791fddec8b2387df5979adbb1a0fa64c5dd23ea
Signed-off-by: Elyes HAOUAS 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37522
Tested-by: build bot (Jenkins) 
Reviewed-by: Werner Zeh 
---
M src/mainboard/amd/bettong/acpi_tables.c
M src/mainboard/amd/bettong/irq_tables.c
M src/mainboard/amd/bettong/mptable.c
M src/mainboard/amd/db-ft3b-lc/acpi_tables.c
M src/mainboard/amd/db-ft3b-lc/irq_tables.c
M src/mainboard/amd/db-ft3b-lc/mainboard.c
M src/mainboard/amd/db-ft3b-lc/mptable.c
M src/mainboard/amd/gardenia/irq_tables.c
M src/mainboard/amd/gardenia/mptable.c
M src/mainboard/amd/inagua/acpi_tables.c
M src/mainboard/amd/inagua/irq_tables.c
M src/mainboard/amd/inagua/mptable.c
M src/mainboard/amd/lamar/acpi_tables.c
M src/mainboard/amd/lamar/irq_tables.c
M src/mainboard/amd/lamar/mainboard.c
M src/mainboard/amd/lamar/mptable.c
M src/mainboard/amd/olivehill/acpi_tables.c
M src/mainboard/amd/olivehill/irq_tables.c
M src/mainboard/amd/olivehill/mptable.c
M src/mainboard/amd/olivehillplus/acpi_tables.c
M src/mainboard/amd/olivehillplus/irq_tables.c
M src/mainboard/amd/olivehillplus/mainboard.c
M src/mainboard/amd/olivehillplus/mptable.c
M src/mainboard/amd/padmelon/bootblock/bootblock.c
M src/mainboard/amd/parmer/acpi_tables.c
M src/mainboard/amd/parmer/irq_tables.c
M src/mainboard/amd/parmer/mptable.c
M src/mainboard/amd/persimmon/acpi_tables.c
M src/mainboard/amd/persimmon/irq_tables.c
M src/mainboard/amd/persimmon/mptable.c
M src/mainboard/amd/south_station/acpi_tables.c
M src/mainboard/amd/south_station/irq_tables.c
M src/mainboard/amd/south_station/mptable.c
M src/mainboard/amd/thatcher/acpi_tables.c
M src/mainboard/amd/thatcher/irq_tables.c
M src/mainboard/amd/thatcher/mptable.c
M src/mainboard/amd/union_station/acpi_tables.c
M src/mainboard/amd/union_station/irq_tables.c
M src/mainboard/amd/union_station/mptable.c
M src/mainboard/aopen/dxplplusu/acpi_tables.c
M src/mainboard/aopen/dxplplusu/fadt.c
M src/mainboard/apple/macbook21/mptable.c
M src/mainboard/asrock/e350m1/acpi_tables.c
M src/mainboard/asrock/e350m1/irq_tables.c
M src/mainboard/asrock/e350m1/mptable.c
M src/mainboard/asrock/imb-a180/acpi_tables.c
M src/mainboard/asrock/imb-a180/irq_tables.c
M src/mainboard/asrock/imb-a180/mptable.c
M src/mainboard/asus/am1i-a/acpi_tables.c
M src/mainboard/asus/am1i-a/mptable.c
M src/mainboard/asus/f2a85-m/acpi_tables.c
M src/mainboard/asus/f2a85-m/mptable.c
M src/mainboard/asus/p2b-d/mptable.c
M src/mainboard/asus/p2b-ds/mptable.c
M src/mainboard/bap/ode_e20XX/acpi_tables.c
M src/mainboard/bap/ode_e20XX/irq_tables.c
M src/mainboard/bap/ode_e20XX/mptable.c
M src/mainboard/bap/ode_e21XX/acpi_tables.c
M src/mainboard/bap/ode_e21XX/irq_tables.c
M src/mainboard/bap/ode_e21XX/mainboard.c
M src/mainboard/bap/ode_e21XX/mptable.c
M src/mainboard/biostar/a68n_5200/acpi_tables.c
M src/mainboard/biostar/a68n_5200/irq_tables.c
M src/mainboard/biostar/a68n_5200/mptable.c
M src/mainboard/biostar/am1ml/acpi_tables.c
M src/mainboard/biostar/am1ml/mptable.c
M src/mainboard/elmex/pcm205400/acpi_tables.c
M src/mainboard/elmex/pcm205400/irq_tables.c
M src/mainboard/elmex/pcm205400/mptable.c
M src/mainboard/emulation/qemu-i440fx/northbridge.c
M src/mainboard/emulation/qemu-q35/acpi_tables.c
M src/mainboard/getac/p470/acpi_tables.c
M src/mainboard/getac/p470/mptable.c
M src/mainboard/gizmosphere/gizmo/acpi_tables.c
M src/mainboard/gizmosphere/gizmo/irq_tables.c
M src/mainboard/gizmosphere/gizmo/mptable.c
M src/mainboard/gizmosphere/gizmo2/acpi_tables.c
M src/mainboard/gizmosphere/gizmo2/irq_tables.c
M src/mainboard/gizmosphere/gizmo2/mptable.c
M src/mainboard/google/auron/variants/buddy/variant.c
M src/mainboard/google/beltino/acpi_tables.c
M src/mainboard/google/beltino/chromeos.c
M src/mainboard/google/beltino/lan.c
M src/mainboard/google/butterfly/chromeos.c
M src/mainboard/google/butterfly/mainboard.c
M src/mainboard/google/jecht/acpi_tables.c
M src/mainboard/google/jecht/chromeos.c
M src/mainboard/google/jecht/lan.c
M src/mainboard/google/kahlee/irq_tables.c
M src/mainboard/google/kahlee/mptable.c
M src/mainboard/google/kahlee/variants/baseboard/mainboard.c
M src/mainboard/google/link/early_init.c
M src/mainboard/google/link/mainboard.c
M src/mainboard/google/parrot/acpi_tables.c
M src/mainboard/google/parrot/chromeos.c
M src/mainboard/google/parrot/mainboard.c
M src/mainboard/google/poppy/variants/nautilus/mainboard.c
M src/mainboard/google/rambi/acpi_tables.c
M src/mainboard/google/rambi/variants/ninja/lan.c
M src/mainboard/google/rambi/variants/sumo/lan.c
M src/mainboard/google/slippy/acpi_tables.c
M src/mainboard/google/stout/acpi_tables.c
M src/mainboard/google/stout/chromeos.c
M src/mainboard/google/stout/ec.c
M src/mainboard/google/stout/mainboard.c
M src/mainboard/hp/abm/acpi_tables.c
M src/mainboard/hp/abm/irq_tables.c
M src/mainboard/hp/abm/mptable.c
M src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c
M src/mainboard/hp/pavilion_m6_1035dx/mptable.c
M src/mainboard/ibase/mb899/mptable.c
M src/mainboard/intel/baskingridge/acpi_tables.c
M src/mainboard/intel/baskingridge/chromeos.c
M src/mainboard/intel/d510mo/mainboard.c
M src/mainboard/intel/d945gclf/mptable.c
M src/mainboard/intel/emeraldlake2/acpi_tables.c
M src/mainboard/intel/emeraldlake2/chromeos.c
M src/mainboard/intel/harcuvar/acpi_tables.c
M src/mainboard/intel/kblrvp/chromeos.c
M src/mainboard/intel/strago/acpi_tables.c
M src/mainboard/intel/wtm2/acpi_tables.c
M src/mainboard/intel/wtm2/chromeos.c
M src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c
M src/mainboard/jetway/nf81-t56n-lf/mptable.c
M src/mainboard/kontron/986lcd-m/mptable.c
M src/mainboard/lenovo/g505s/acpi_tables.c
M src/mainboard/lenovo/g505s/mptable.c
M src/mainboard/lenovo/t400/acpi_tables.c
M src/mainboard/lenovo/t400/dock.c
M src/mainboard/lenovo/t400/fadt.c
M src/mainboard/lenovo/t420/early_init.c
M src/mainboard/lenovo/t420s/early_init.c
M src/mainboard/lenovo/t430/early_init.c
M src/mainboard/lenovo/t520/early_init.c
M src/mainboard/lenovo/t530/early_init.c
M src/mainboard/lenovo/t60/mptable.c
M src/mainboard/lenovo/x200/acpi_tables.c
M src/mainboard/lenovo/x200/fadt.c
M src/mainboard/lenovo/x60/mptable.c
M src/mainboard/lippert/frontrunner-af/acpi_tables.c
M src/mainboard/lippert/frontrunner-af/irq_tables.c
M src/mainboard/lippert/frontrunner-af/mainboard.c
M src/mainboard/lippert/frontrunner-af/mptable.c
M src/mainboard/lippert/toucan-af/acpi_tables.c
M src/mainboard/lippert/toucan-af/irq_tables.c
M src/mainboard/lippert/toucan-af/mainboard.c
M src/mainboard/lippert/toucan-af/mptable.c
M src/mainboard/msi/ms7721/acpi_tables.c
M src/mainboard/msi/ms7721/mptable.c
M src/mainboard/packardbell/ms2290/mainboard.c
M src/mainboard/pcengines/apu1/acpi_tables.c
M src/mainboard/pcengines/apu1/irq_tables.c
M src/mainboard/pcengines/apu1/mainboard.c
M src/mainboard/pcengines/apu1/mptable.c
M src/mainboard/pcengines/apu2/acpi_tables.c
M src/mainboard/pcengines/apu2/irq_tables.c
M src/mainboard/pcengines/apu2/mainboard.c
M src/mainboard/roda/rk886ex/mptable.c
M src/mainboard/roda/rk9/acpi_tables.c
M src/mainboard/roda/rk9/fadt.c
M src/mainboard/roda/rv11/variants/rv11/early_init.c
M src/mainboard/roda/rv11/variants/rw11/early_init.c
M src/mainboard/samsung/lumpy/acpi_tables.c
M src/mainboard/samsung/lumpy/chromeos.c
M src/mainboard/samsung/stumpy/acpi_tables.c
M src/mainboard/samsung/stumpy/chromeos.c
M src/mainboard/scaleway/tagada/acpi_tables.c
M src/mainboard/siemens/mc_apl1/mainboard.c
168 files changed, 0 insertions(+), 168 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Werner Zeh: Looks good to me, approved

diff --git a/src/mainboard/amd/bettong/acpi_tables.c b/src/mainboard/amd/bettong/acpi_tables.c
index 8c68404..9117c1f 100644
--- a/src/mainboard/amd/bettong/acpi_tables.c
+++ b/src/mainboard/amd/bettong/acpi_tables.c
@@ -15,7 +15,6 @@

#include <arch/acpi.h>
 #include <arch/ioapic.h>
-#include <device/pci.h>

#define IO_APIC2_ADDR 0xFEC20000

diff --git a/src/mainboard/amd/bettong/irq_tables.c b/src/mainboard/amd/bettong/irq_tables.c
index 2a961a4..4503099 100644
--- a/src/mainboard/amd/bettong/irq_tables.c
+++ b/src/mainboard/amd/bettong/irq_tables.c
@@ -14,7 +14,6 @@
  */

#include <console/console.h>
-#include <device/pci.h>
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/amd/bettong/mptable.c b/src/mainboard/amd/bettong/mptable.c
index af943f1..d9632d5 100644
--- a/src/mainboard/amd/bettong/mptable.c
+++ b/src/mainboard/amd/bettong/mptable.c
@@ -14,7 +14,6 @@
  */

#include <arch/smp/mpspec.h>
-#include <device/pci.h>
 #include <arch/ioapic.h>
 #include <string.h>
 #include <stdint.h>
diff --git a/src/mainboard/amd/db-ft3b-lc/acpi_tables.c b/src/mainboard/amd/db-ft3b-lc/acpi_tables.c
index 08f6076..20509e9 100644
--- a/src/mainboard/amd/db-ft3b-lc/acpi_tables.c
+++ b/src/mainboard/amd/db-ft3b-lc/acpi_tables.c
@@ -15,7 +15,6 @@

#include <arch/acpi.h>
 #include <arch/ioapic.h>
-#include <device/pci.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/amd/db-ft3b-lc/irq_tables.c b/src/mainboard/amd/db-ft3b-lc/irq_tables.c
index e18e478..530c132 100644
--- a/src/mainboard/amd/db-ft3b-lc/irq_tables.c
+++ b/src/mainboard/amd/db-ft3b-lc/irq_tables.c
@@ -14,7 +14,6 @@
  */

#include <console/console.h>
-#include <device/pci.h>
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/amd/db-ft3b-lc/mainboard.c b/src/mainboard/amd/db-ft3b-lc/mainboard.c
index 6ea80ed..a339659 100644
--- a/src/mainboard/amd/db-ft3b-lc/mainboard.c
+++ b/src/mainboard/amd/db-ft3b-lc/mainboard.c
@@ -16,7 +16,6 @@

#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_def.h>
 #include <southbridge/amd/pi/hudson/hudson.h>
 #include <southbridge/amd/pi/hudson/pci_devs.h>
diff --git a/src/mainboard/amd/db-ft3b-lc/mptable.c b/src/mainboard/amd/db-ft3b-lc/mptable.c
index 3aad0e3..40a75ad 100644
--- a/src/mainboard/amd/db-ft3b-lc/mptable.c
+++ b/src/mainboard/amd/db-ft3b-lc/mptable.c
@@ -15,7 +15,6 @@
  */

#include <arch/smp/mpspec.h>
-#include <device/pci.h>
 #include <arch/ioapic.h>
 #include <stdint.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/mainboard/amd/gardenia/irq_tables.c b/src/mainboard/amd/gardenia/irq_tables.c
index 3af2757..66dafb7 100644
--- a/src/mainboard/amd/gardenia/irq_tables.c
+++ b/src/mainboard/amd/gardenia/irq_tables.c
@@ -14,7 +14,6 @@
  */

#include <console/console.h>
-#include <device/pci.h>
 #include <device/pci_def.h>
 #include <string.h>
 #include <stdint.h>
diff --git a/src/mainboard/amd/gardenia/mptable.c b/src/mainboard/amd/gardenia/mptable.c
index fa60d35..5bb70e9 100644
--- a/src/mainboard/amd/gardenia/mptable.c
+++ b/src/mainboard/amd/gardenia/mptable.c
@@ -14,7 +14,6 @@
  */

#include <arch/smp/mpspec.h>
-#include <device/pci.h>
 #include <arch/ioapic.h>
 #include <string.h>
 #include <stdint.h>
diff --git a/src/mainboard/amd/inagua/acpi_tables.c b/src/mainboard/amd/inagua/acpi_tables.c
index 787c432..97ea649 100644
--- a/src/mainboard/amd/inagua/acpi_tables.c
+++ b/src/mainboard/amd/inagua/acpi_tables.c
@@ -15,7 +15,6 @@

#include <arch/acpi.h>
 #include <arch/ioapic.h>
-#include <device/pci.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/amd/inagua/irq_tables.c b/src/mainboard/amd/inagua/irq_tables.c
index 9ebe58a..a066864 100644
--- a/src/mainboard/amd/inagua/irq_tables.c
+++ b/src/mainboard/amd/inagua/irq_tables.c
@@ -14,7 +14,6 @@
  */

#include <console/console.h>
-#include <device/pci.h>
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/amd/inagua/mptable.c b/src/mainboard/amd/inagua/mptable.c
index 8d1ec59..1b4e64a 100644
--- a/src/mainboard/amd/inagua/mptable.c
+++ b/src/mainboard/amd/inagua/mptable.c
@@ -14,7 +14,6 @@
  */

#include <arch/smp/mpspec.h>
-#include <device/pci.h>
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <string.h>
diff --git a/src/mainboard/amd/lamar/acpi_tables.c b/src/mainboard/amd/lamar/acpi_tables.c
index 8b0c2c9..65e74ba 100644
--- a/src/mainboard/amd/lamar/acpi_tables.c
+++ b/src/mainboard/amd/lamar/acpi_tables.c
@@ -15,7 +15,6 @@

#include <arch/acpi.h>
 #include <arch/ioapic.h>
-#include <device/pci.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/amd/lamar/irq_tables.c b/src/mainboard/amd/lamar/irq_tables.c
index be8c702..9cc27f7 100644
--- a/src/mainboard/amd/lamar/irq_tables.c
+++ b/src/mainboard/amd/lamar/irq_tables.c
@@ -14,7 +14,6 @@
  */

#include <console/console.h>
-#include <device/pci.h>
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/amd/lamar/mainboard.c b/src/mainboard/amd/lamar/mainboard.c
index 3d33850..2f716d0 100644
--- a/src/mainboard/amd/lamar/mainboard.c
+++ b/src/mainboard/amd/lamar/mainboard.c
@@ -15,7 +15,6 @@

#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_def.h>
 #include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
diff --git a/src/mainboard/amd/lamar/mptable.c b/src/mainboard/amd/lamar/mptable.c
index d89e02f..1f2093d 100644
--- a/src/mainboard/amd/lamar/mptable.c
+++ b/src/mainboard/amd/lamar/mptable.c
@@ -14,7 +14,6 @@
  */

#include <arch/smp/mpspec.h>
-#include <device/pci.h>
 #include <arch/ioapic.h>
 #include <stdint.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/mainboard/amd/olivehill/acpi_tables.c b/src/mainboard/amd/olivehill/acpi_tables.c
index 08f6076..20509e9 100644
--- a/src/mainboard/amd/olivehill/acpi_tables.c
+++ b/src/mainboard/amd/olivehill/acpi_tables.c
@@ -15,7 +15,6 @@

#include <arch/acpi.h>
 #include <arch/ioapic.h>
-#include <device/pci.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/amd/olivehill/irq_tables.c b/src/mainboard/amd/olivehill/irq_tables.c
index e18e478..530c132 100644
--- a/src/mainboard/amd/olivehill/irq_tables.c
+++ b/src/mainboard/amd/olivehill/irq_tables.c
@@ -14,7 +14,6 @@
  */

#include <console/console.h>
-#include <device/pci.h>
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/amd/olivehill/mptable.c b/src/mainboard/amd/olivehill/mptable.c
index 3054eff..52374f1 100644
--- a/src/mainboard/amd/olivehill/mptable.c
+++ b/src/mainboard/amd/olivehill/mptable.c
@@ -14,7 +14,6 @@
  */

#include <arch/smp/mpspec.h>
-#include <device/pci.h>
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <string.h>
diff --git a/src/mainboard/amd/olivehillplus/acpi_tables.c b/src/mainboard/amd/olivehillplus/acpi_tables.c
index 08f6076..20509e9 100644
--- a/src/mainboard/amd/olivehillplus/acpi_tables.c
+++ b/src/mainboard/amd/olivehillplus/acpi_tables.c
@@ -15,7 +15,6 @@

#include <arch/acpi.h>
 #include <arch/ioapic.h>
-#include <device/pci.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/amd/olivehillplus/irq_tables.c b/src/mainboard/amd/olivehillplus/irq_tables.c
index e18e478..530c132 100644
--- a/src/mainboard/amd/olivehillplus/irq_tables.c
+++ b/src/mainboard/amd/olivehillplus/irq_tables.c
@@ -14,7 +14,6 @@
  */

#include <console/console.h>
-#include <device/pci.h>
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/amd/olivehillplus/mainboard.c b/src/mainboard/amd/olivehillplus/mainboard.c
index 00ac1a4..1367b03 100644
--- a/src/mainboard/amd/olivehillplus/mainboard.c
+++ b/src/mainboard/amd/olivehillplus/mainboard.c
@@ -15,7 +15,6 @@

#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_def.h>
 #include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
diff --git a/src/mainboard/amd/olivehillplus/mptable.c b/src/mainboard/amd/olivehillplus/mptable.c
index b04f5ac..6c81d06 100644
--- a/src/mainboard/amd/olivehillplus/mptable.c
+++ b/src/mainboard/amd/olivehillplus/mptable.c
@@ -14,7 +14,6 @@
  */

#include <arch/smp/mpspec.h>
-#include <device/pci.h>
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <string.h>
diff --git a/src/mainboard/amd/padmelon/bootblock/bootblock.c b/src/mainboard/amd/padmelon/bootblock/bootblock.c
index 8649287..9886b61 100644
--- a/src/mainboard/amd/padmelon/bootblock/bootblock.c
+++ b/src/mainboard/amd/padmelon/bootblock/bootblock.c
@@ -16,7 +16,6 @@
 #include <bootblock_common.h>
 #include <soc/southbridge.h>
 #include <amdblocks/lpc.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include <soc/pci_devs.h>
 #include <drivers/uart/uart8250reg.h>
diff --git a/src/mainboard/amd/parmer/acpi_tables.c b/src/mainboard/amd/parmer/acpi_tables.c
index eba2d1d..fd59a3a 100644
--- a/src/mainboard/amd/parmer/acpi_tables.c
+++ b/src/mainboard/amd/parmer/acpi_tables.c
@@ -15,7 +15,6 @@

#include <arch/acpi.h>
 #include <arch/ioapic.h>
-#include <device/pci.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/amd/parmer/irq_tables.c b/src/mainboard/amd/parmer/irq_tables.c
index e18e478..530c132 100644
--- a/src/mainboard/amd/parmer/irq_tables.c
+++ b/src/mainboard/amd/parmer/irq_tables.c
@@ -14,7 +14,6 @@
  */

#include <console/console.h>
-#include <device/pci.h>
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/amd/parmer/mptable.c b/src/mainboard/amd/parmer/mptable.c
index ea18624..c2b9f98 100644
--- a/src/mainboard/amd/parmer/mptable.c
+++ b/src/mainboard/amd/parmer/mptable.c
@@ -14,7 +14,6 @@
  */

#include <arch/smp/mpspec.h>
-#include <device/pci.h>
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <string.h>
diff --git a/src/mainboard/amd/persimmon/acpi_tables.c b/src/mainboard/amd/persimmon/acpi_tables.c
index 787c432..97ea649 100644
--- a/src/mainboard/amd/persimmon/acpi_tables.c
+++ b/src/mainboard/amd/persimmon/acpi_tables.c
@@ -15,7 +15,6 @@

#include <arch/acpi.h>
 #include <arch/ioapic.h>
-#include <device/pci.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/amd/persimmon/irq_tables.c b/src/mainboard/amd/persimmon/irq_tables.c
index 9ebe58a..a066864 100644
--- a/src/mainboard/amd/persimmon/irq_tables.c
+++ b/src/mainboard/amd/persimmon/irq_tables.c
@@ -14,7 +14,6 @@
  */

#include <console/console.h>
-#include <device/pci.h>
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/amd/persimmon/mptable.c b/src/mainboard/amd/persimmon/mptable.c
index d9f550e..bc7a3ac 100644
--- a/src/mainboard/amd/persimmon/mptable.c
+++ b/src/mainboard/amd/persimmon/mptable.c
@@ -15,7 +15,6 @@
  */

#include <arch/smp/mpspec.h>
-#include <device/pci.h>
 #include <stdint.h>
 #include <southbridge/amd/cimx/sb800/SBPLATFORM.h>
 #include <southbridge/amd/common/amd_pci_util.h>
diff --git a/src/mainboard/amd/south_station/acpi_tables.c b/src/mainboard/amd/south_station/acpi_tables.c
index 787c432..97ea649 100644
--- a/src/mainboard/amd/south_station/acpi_tables.c
+++ b/src/mainboard/amd/south_station/acpi_tables.c
@@ -15,7 +15,6 @@

#include <arch/acpi.h>
 #include <arch/ioapic.h>
-#include <device/pci.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/amd/south_station/irq_tables.c b/src/mainboard/amd/south_station/irq_tables.c
index 9ebe58a..a066864 100644
--- a/src/mainboard/amd/south_station/irq_tables.c
+++ b/src/mainboard/amd/south_station/irq_tables.c
@@ -14,7 +14,6 @@
  */

#include <console/console.h>
-#include <device/pci.h>
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/amd/south_station/mptable.c b/src/mainboard/amd/south_station/mptable.c
index 8052dc0..c38708e 100644
--- a/src/mainboard/amd/south_station/mptable.c
+++ b/src/mainboard/amd/south_station/mptable.c
@@ -14,7 +14,6 @@
  */

#include <arch/smp/mpspec.h>
-#include <device/pci.h>
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <string.h>
diff --git a/src/mainboard/amd/thatcher/acpi_tables.c b/src/mainboard/amd/thatcher/acpi_tables.c
index eba2d1d..fd59a3a 100644
--- a/src/mainboard/amd/thatcher/acpi_tables.c
+++ b/src/mainboard/amd/thatcher/acpi_tables.c
@@ -15,7 +15,6 @@

#include <arch/acpi.h>
 #include <arch/ioapic.h>
-#include <device/pci.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/amd/thatcher/irq_tables.c b/src/mainboard/amd/thatcher/irq_tables.c
index e18e478..530c132 100644
--- a/src/mainboard/amd/thatcher/irq_tables.c
+++ b/src/mainboard/amd/thatcher/irq_tables.c
@@ -14,7 +14,6 @@
  */

#include <console/console.h>
-#include <device/pci.h>
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/amd/thatcher/mptable.c b/src/mainboard/amd/thatcher/mptable.c
index f7698bb..b23d036 100644
--- a/src/mainboard/amd/thatcher/mptable.c
+++ b/src/mainboard/amd/thatcher/mptable.c
@@ -14,7 +14,6 @@
  */

#include <arch/smp/mpspec.h>
-#include <device/pci.h>
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <string.h>
diff --git a/src/mainboard/amd/union_station/acpi_tables.c b/src/mainboard/amd/union_station/acpi_tables.c
index 787c432..97ea649 100644
--- a/src/mainboard/amd/union_station/acpi_tables.c
+++ b/src/mainboard/amd/union_station/acpi_tables.c
@@ -15,7 +15,6 @@

#include <arch/acpi.h>
 #include <arch/ioapic.h>
-#include <device/pci.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/amd/union_station/irq_tables.c b/src/mainboard/amd/union_station/irq_tables.c
index 9ebe58a..a066864 100644
--- a/src/mainboard/amd/union_station/irq_tables.c
+++ b/src/mainboard/amd/union_station/irq_tables.c
@@ -14,7 +14,6 @@
  */

#include <console/console.h>
-#include <device/pci.h>
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/amd/union_station/mptable.c b/src/mainboard/amd/union_station/mptable.c
index 8052dc0..c38708e 100644
--- a/src/mainboard/amd/union_station/mptable.c
+++ b/src/mainboard/amd/union_station/mptable.c
@@ -14,7 +14,6 @@
  */

#include <arch/smp/mpspec.h>
-#include <device/pci.h>
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <string.h>
diff --git a/src/mainboard/aopen/dxplplusu/acpi_tables.c b/src/mainboard/aopen/dxplplusu/acpi_tables.c
index 70bfa27..84bb64e 100644
--- a/src/mainboard/aopen/dxplplusu/acpi_tables.c
+++ b/src/mainboard/aopen/dxplplusu/acpi_tables.c
@@ -19,7 +19,6 @@
  */

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

#define IOAPIC_ICH4		2
diff --git a/src/mainboard/aopen/dxplplusu/fadt.c b/src/mainboard/aopen/dxplplusu/fadt.c
index adf94e9..a716a02 100644
--- a/src/mainboard/aopen/dxplplusu/fadt.c
+++ b/src/mainboard/aopen/dxplplusu/fadt.c
@@ -14,7 +14,6 @@
  */

#include <string.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include <arch/acpi.h>
 #include <version.h>
diff --git a/src/mainboard/apple/macbook21/mptable.c b/src/mainboard/apple/macbook21/mptable.c
index 6129613..021115a 100644
--- a/src/mainboard/apple/macbook21/mptable.c
+++ b/src/mainboard/apple/macbook21/mptable.c
@@ -15,7 +15,6 @@
  */

#include <device/device.h>
-#include <device/pci.h>
 #include <arch/smp/mpspec.h>
 #include <arch/ioapic.h>
 #include <stdint.h>
diff --git a/src/mainboard/asrock/e350m1/acpi_tables.c b/src/mainboard/asrock/e350m1/acpi_tables.c
index 787c432..97ea649 100644
--- a/src/mainboard/asrock/e350m1/acpi_tables.c
+++ b/src/mainboard/asrock/e350m1/acpi_tables.c
@@ -15,7 +15,6 @@

#include <arch/acpi.h>
 #include <arch/ioapic.h>
-#include <device/pci.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/asrock/e350m1/irq_tables.c b/src/mainboard/asrock/e350m1/irq_tables.c
index 0bcb041..1d1e81f 100644
--- a/src/mainboard/asrock/e350m1/irq_tables.c
+++ b/src/mainboard/asrock/e350m1/irq_tables.c
@@ -14,7 +14,6 @@
  */

#include <console/console.h>
-#include <device/pci.h>
 #include <device/pci_def.h>
 #include <string.h>
 #include <stdint.h>
diff --git a/src/mainboard/asrock/e350m1/mptable.c b/src/mainboard/asrock/e350m1/mptable.c
index 9c62712..6093e8f 100644
--- a/src/mainboard/asrock/e350m1/mptable.c
+++ b/src/mainboard/asrock/e350m1/mptable.c
@@ -17,7 +17,6 @@
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
-#include <device/pci.h>
 #include <stdint.h>
 #include <string.h>

diff --git a/src/mainboard/asrock/imb-a180/acpi_tables.c b/src/mainboard/asrock/imb-a180/acpi_tables.c
index 08f6076..20509e9 100644
--- a/src/mainboard/asrock/imb-a180/acpi_tables.c
+++ b/src/mainboard/asrock/imb-a180/acpi_tables.c
@@ -15,7 +15,6 @@

#include <arch/acpi.h>
 #include <arch/ioapic.h>
-#include <device/pci.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/asrock/imb-a180/irq_tables.c b/src/mainboard/asrock/imb-a180/irq_tables.c
index be71dd4..181908a 100644
--- a/src/mainboard/asrock/imb-a180/irq_tables.c
+++ b/src/mainboard/asrock/imb-a180/irq_tables.c
@@ -14,7 +14,6 @@
  */

#include <console/console.h>
-#include <device/pci.h>
 #include <device/pci_def.h>
 #include <string.h>
 #include <stdint.h>
diff --git a/src/mainboard/asrock/imb-a180/mptable.c b/src/mainboard/asrock/imb-a180/mptable.c
index fd4dff7..37080ea 100644
--- a/src/mainboard/asrock/imb-a180/mptable.c
+++ b/src/mainboard/asrock/imb-a180/mptable.c
@@ -14,7 +14,6 @@
  */

#include <arch/smp/mpspec.h>
-#include <device/pci.h>
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <string.h>
diff --git a/src/mainboard/asus/am1i-a/acpi_tables.c b/src/mainboard/asus/am1i-a/acpi_tables.c
index 411ebe7..447c895 100644
--- a/src/mainboard/asus/am1i-a/acpi_tables.c
+++ b/src/mainboard/asus/am1i-a/acpi_tables.c
@@ -15,7 +15,6 @@

#include <arch/acpi.h>
 #include <arch/ioapic.h>
-#include <device/pci.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/asus/am1i-a/mptable.c b/src/mainboard/asus/am1i-a/mptable.c
index d97e6ac..9efcab3 100644
--- a/src/mainboard/asus/am1i-a/mptable.c
+++ b/src/mainboard/asus/am1i-a/mptable.c
@@ -15,7 +15,6 @@
  */

#include <arch/smp/mpspec.h>
-#include <device/pci.h>
 #include <arch/ioapic.h>
 #include <stdint.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/mainboard/asus/f2a85-m/acpi_tables.c b/src/mainboard/asus/f2a85-m/acpi_tables.c
index eba2d1d..fd59a3a 100644
--- a/src/mainboard/asus/f2a85-m/acpi_tables.c
+++ b/src/mainboard/asus/f2a85-m/acpi_tables.c
@@ -15,7 +15,6 @@

#include <arch/acpi.h>
 #include <arch/ioapic.h>
-#include <device/pci.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/asus/f2a85-m/mptable.c b/src/mainboard/asus/f2a85-m/mptable.c
index 8bfe4d5..303f3bf 100644
--- a/src/mainboard/asus/f2a85-m/mptable.c
+++ b/src/mainboard/asus/f2a85-m/mptable.c
@@ -17,7 +17,6 @@
 #include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
 #include <cpu/x86/lapic.h>
-#include <device/pci.h>
 #include <stdint.h>
 #include <string.h>
 #include <southbridge/amd/agesa/hudson/hudson.h>
diff --git a/src/mainboard/asus/p2b-d/mptable.c b/src/mainboard/asus/p2b-d/mptable.c
index fde1281..8f643d1 100644
--- a/src/mainboard/asus/p2b-d/mptable.c
+++ b/src/mainboard/asus/p2b-d/mptable.c
@@ -16,7 +16,6 @@

#include <arch/smp/mpspec.h>
 #include <arch/ioapic.h>
-#include <device/pci.h>
 #include <stdint.h>

static void *smp_write_config_table(void *v)
diff --git a/src/mainboard/asus/p2b-ds/mptable.c b/src/mainboard/asus/p2b-ds/mptable.c
index 4e085b1..b492511 100644
--- a/src/mainboard/asus/p2b-ds/mptable.c
+++ b/src/mainboard/asus/p2b-ds/mptable.c
@@ -16,7 +16,6 @@

#include <arch/smp/mpspec.h>
 #include <arch/ioapic.h>
-#include <device/pci.h>
 #include <stdint.h>

static void *smp_write_config_table(void *v)
diff --git a/src/mainboard/bap/ode_e20XX/acpi_tables.c b/src/mainboard/bap/ode_e20XX/acpi_tables.c
index 08f6076..20509e9 100644
--- a/src/mainboard/bap/ode_e20XX/acpi_tables.c
+++ b/src/mainboard/bap/ode_e20XX/acpi_tables.c
@@ -15,7 +15,6 @@

#include <arch/acpi.h>
 #include <arch/ioapic.h>
-#include <device/pci.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/bap/ode_e20XX/irq_tables.c b/src/mainboard/bap/ode_e20XX/irq_tables.c
index e18e478..530c132 100644
--- a/src/mainboard/bap/ode_e20XX/irq_tables.c
+++ b/src/mainboard/bap/ode_e20XX/irq_tables.c
@@ -14,7 +14,6 @@
  */

#include <console/console.h>
-#include <device/pci.h>
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/bap/ode_e20XX/mptable.c b/src/mainboard/bap/ode_e20XX/mptable.c
index ea9f959..e4edc5f 100644
--- a/src/mainboard/bap/ode_e20XX/mptable.c
+++ b/src/mainboard/bap/ode_e20XX/mptable.c
@@ -14,7 +14,6 @@
  */

#include <arch/smp/mpspec.h>
-#include <device/pci.h>
 #include <arch/ioapic.h>
 #include <stdint.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/mainboard/bap/ode_e21XX/acpi_tables.c b/src/mainboard/bap/ode_e21XX/acpi_tables.c
index 08f6076..20509e9 100644
--- a/src/mainboard/bap/ode_e21XX/acpi_tables.c
+++ b/src/mainboard/bap/ode_e21XX/acpi_tables.c
@@ -15,7 +15,6 @@

#include <arch/acpi.h>
 #include <arch/ioapic.h>
-#include <device/pci.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/bap/ode_e21XX/irq_tables.c b/src/mainboard/bap/ode_e21XX/irq_tables.c
index f1dbc08..413ccf8 100644
--- a/src/mainboard/bap/ode_e21XX/irq_tables.c
+++ b/src/mainboard/bap/ode_e21XX/irq_tables.c
@@ -14,7 +14,6 @@
  */

#include <console/console.h>
-#include <device/pci.h>
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/bap/ode_e21XX/mainboard.c b/src/mainboard/bap/ode_e21XX/mainboard.c
index 00ac1a4..1367b03 100644
--- a/src/mainboard/bap/ode_e21XX/mainboard.c
+++ b/src/mainboard/bap/ode_e21XX/mainboard.c
@@ -15,7 +15,6 @@

#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_def.h>
 #include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
diff --git a/src/mainboard/bap/ode_e21XX/mptable.c b/src/mainboard/bap/ode_e21XX/mptable.c
index b04f5ac..6c81d06 100644
--- a/src/mainboard/bap/ode_e21XX/mptable.c
+++ b/src/mainboard/bap/ode_e21XX/mptable.c
@@ -14,7 +14,6 @@
  */

#include <arch/smp/mpspec.h>
-#include <device/pci.h>
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <string.h>
diff --git a/src/mainboard/biostar/a68n_5200/acpi_tables.c b/src/mainboard/biostar/a68n_5200/acpi_tables.c
index 08f6076..20509e9 100644
--- a/src/mainboard/biostar/a68n_5200/acpi_tables.c
+++ b/src/mainboard/biostar/a68n_5200/acpi_tables.c
@@ -15,7 +15,6 @@

#include <arch/acpi.h>
 #include <arch/ioapic.h>
-#include <device/pci.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/biostar/a68n_5200/irq_tables.c b/src/mainboard/biostar/a68n_5200/irq_tables.c
index e18e478..530c132 100644
--- a/src/mainboard/biostar/a68n_5200/irq_tables.c
+++ b/src/mainboard/biostar/a68n_5200/irq_tables.c
@@ -14,7 +14,6 @@
  */

#include <console/console.h>
-#include <device/pci.h>
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/biostar/a68n_5200/mptable.c b/src/mainboard/biostar/a68n_5200/mptable.c
index 3054eff..52374f1 100644
--- a/src/mainboard/biostar/a68n_5200/mptable.c
+++ b/src/mainboard/biostar/a68n_5200/mptable.c
@@ -14,7 +14,6 @@
  */

#include <arch/smp/mpspec.h>
-#include <device/pci.h>
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <string.h>
diff --git a/src/mainboard/biostar/am1ml/acpi_tables.c b/src/mainboard/biostar/am1ml/acpi_tables.c
index 411ebe7..447c895 100644
--- a/src/mainboard/biostar/am1ml/acpi_tables.c
+++ b/src/mainboard/biostar/am1ml/acpi_tables.c
@@ -15,7 +15,6 @@

#include <arch/acpi.h>
 #include <arch/ioapic.h>
-#include <device/pci.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/biostar/am1ml/mptable.c b/src/mainboard/biostar/am1ml/mptable.c
index 4d93361..659a141 100644
--- a/src/mainboard/biostar/am1ml/mptable.c
+++ b/src/mainboard/biostar/am1ml/mptable.c
@@ -14,7 +14,6 @@
  */

#include <arch/smp/mpspec.h>
-#include <device/pci.h>
 #include <arch/ioapic.h>
 #include <stdint.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/mainboard/elmex/pcm205400/acpi_tables.c b/src/mainboard/elmex/pcm205400/acpi_tables.c
index 787c432..97ea649 100644
--- a/src/mainboard/elmex/pcm205400/acpi_tables.c
+++ b/src/mainboard/elmex/pcm205400/acpi_tables.c
@@ -15,7 +15,6 @@

#include <arch/acpi.h>
 #include <arch/ioapic.h>
-#include <device/pci.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/elmex/pcm205400/irq_tables.c b/src/mainboard/elmex/pcm205400/irq_tables.c
index 591cabb..804f52d 100644
--- a/src/mainboard/elmex/pcm205400/irq_tables.c
+++ b/src/mainboard/elmex/pcm205400/irq_tables.c
@@ -15,7 +15,6 @@

#include <console/console.h>
-#include <device/pci.h>
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/elmex/pcm205400/mptable.c b/src/mainboard/elmex/pcm205400/mptable.c
index d9f550e..bc7a3ac 100644
--- a/src/mainboard/elmex/pcm205400/mptable.c
+++ b/src/mainboard/elmex/pcm205400/mptable.c
@@ -15,7 +15,6 @@
  */

#include <arch/smp/mpspec.h>
-#include <device/pci.h>
 #include <stdint.h>
 #include <southbridge/amd/cimx/sb800/SBPLATFORM.h>
 #include <southbridge/amd/common/amd_pci_util.h>
diff --git a/src/mainboard/emulation/qemu-i440fx/northbridge.c b/src/mainboard/emulation/qemu-i440fx/northbridge.c
index 1c27a0f..b30723d 100644
--- a/src/mainboard/emulation/qemu-i440fx/northbridge.c
+++ b/src/mainboard/emulation/qemu-i440fx/northbridge.c
@@ -20,7 +20,6 @@
 #include <arch/ioapic.h>
 #include <stdint.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <stdlib.h>
 #include <string.h>
 #include <smbios.h>
diff --git a/src/mainboard/emulation/qemu-q35/acpi_tables.c b/src/mainboard/emulation/qemu-q35/acpi_tables.c
index a609b5d..5c48e95 100644
--- a/src/mainboard/emulation/qemu-q35/acpi_tables.c
+++ b/src/mainboard/emulation/qemu-q35/acpi_tables.c
@@ -19,7 +19,6 @@
 #include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include <version.h>

diff --git a/src/mainboard/getac/p470/acpi_tables.c b/src/mainboard/getac/p470/acpi_tables.c
index 59c2876..3372ace 100644
--- a/src/mainboard/getac/p470/acpi_tables.c
+++ b/src/mainboard/getac/p470/acpi_tables.c
@@ -20,7 +20,6 @@
 #include <arch/acpi.h>
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
-#include <device/pci.h>

#include <southbridge/intel/i82801gx/nvs.h>
 #include "mainboard.h"
diff --git a/src/mainboard/getac/p470/mptable.c b/src/mainboard/getac/p470/mptable.c
index 86006e1..795ac08 100644
--- a/src/mainboard/getac/p470/mptable.c
+++ b/src/mainboard/getac/p470/mptable.c
@@ -15,7 +15,6 @@
  */

#include <device/device.h>
-#include <device/pci.h>
 #include <arch/smp/mpspec.h>
 #include <arch/ioapic.h>
 #include <stdint.h>
diff --git a/src/mainboard/gizmosphere/gizmo/acpi_tables.c b/src/mainboard/gizmosphere/gizmo/acpi_tables.c
index 2154cd8..364c915 100644
--- a/src/mainboard/gizmosphere/gizmo/acpi_tables.c
+++ b/src/mainboard/gizmosphere/gizmo/acpi_tables.c
@@ -16,7 +16,6 @@

#include <arch/acpi.h>
 #include <arch/ioapic.h>
-#include <device/pci.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/gizmosphere/gizmo/irq_tables.c b/src/mainboard/gizmosphere/gizmo/irq_tables.c
index bf2379c..9d74dc8 100644
--- a/src/mainboard/gizmosphere/gizmo/irq_tables.c
+++ b/src/mainboard/gizmosphere/gizmo/irq_tables.c
@@ -15,7 +15,6 @@
  */

#include <console/console.h>
-#include <device/pci.h>
 #include <device/pci_def.h>
 #include <string.h>
 #include <stdint.h>
diff --git a/src/mainboard/gizmosphere/gizmo/mptable.c b/src/mainboard/gizmosphere/gizmo/mptable.c
index d44e276..dca5f3c 100644
--- a/src/mainboard/gizmosphere/gizmo/mptable.c
+++ b/src/mainboard/gizmosphere/gizmo/mptable.c
@@ -15,7 +15,6 @@
  */

#include <arch/smp/mpspec.h>
-#include <device/pci.h>
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <string.h>
diff --git a/src/mainboard/gizmosphere/gizmo2/acpi_tables.c b/src/mainboard/gizmosphere/gizmo2/acpi_tables.c
index 08f6076..20509e9 100644
--- a/src/mainboard/gizmosphere/gizmo2/acpi_tables.c
+++ b/src/mainboard/gizmosphere/gizmo2/acpi_tables.c
@@ -15,7 +15,6 @@

#include <arch/acpi.h>
 #include <arch/ioapic.h>
-#include <device/pci.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/gizmosphere/gizmo2/irq_tables.c b/src/mainboard/gizmosphere/gizmo2/irq_tables.c
index e18e478..530c132 100644
--- a/src/mainboard/gizmosphere/gizmo2/irq_tables.c
+++ b/src/mainboard/gizmosphere/gizmo2/irq_tables.c
@@ -14,7 +14,6 @@
  */

#include <console/console.h>
-#include <device/pci.h>
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/gizmosphere/gizmo2/mptable.c b/src/mainboard/gizmosphere/gizmo2/mptable.c
index ea9f959..e4edc5f 100644
--- a/src/mainboard/gizmosphere/gizmo2/mptable.c
+++ b/src/mainboard/gizmosphere/gizmo2/mptable.c
@@ -14,7 +14,6 @@
  */

#include <arch/smp/mpspec.h>
-#include <device/pci.h>
 #include <arch/ioapic.h>
 #include <stdint.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/mainboard/google/auron/variants/buddy/variant.c b/src/mainboard/google/auron/variants/buddy/variant.c
index dcda04d..58fee1e 100644
--- a/src/mainboard/google/auron/variants/buddy/variant.c
+++ b/src/mainboard/google/auron/variants/buddy/variant.c
@@ -18,7 +18,6 @@
 #include <device/pci_ops.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <smbios.h>
 #include <soc/pch.h>
 #include <variant/onboard.h>
diff --git a/src/mainboard/google/beltino/acpi_tables.c b/src/mainboard/google/beltino/acpi_tables.c
index 2b2acba..a04a950 100644
--- a/src/mainboard/google/beltino/acpi_tables.c
+++ b/src/mainboard/google/beltino/acpi_tables.c
@@ -17,7 +17,6 @@
 #include <arch/acpi.h>
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <ec/google/chromeec/ec.h>
 #include <southbridge/intel/lynxpoint/nvs.h>
 #include <southbridge/intel/lynxpoint/pch.h>
diff --git a/src/mainboard/google/beltino/chromeos.c b/src/mainboard/google/beltino/chromeos.c
index 1039707..8940d36 100644
--- a/src/mainboard/google/beltino/chromeos.c
+++ b/src/mainboard/google/beltino/chromeos.c
@@ -17,7 +17,6 @@
 #include <bootmode.h>
 #include <boot/coreboot_tables.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <southbridge/intel/lynxpoint/pch.h>
 #include <southbridge/intel/common/gpio.h>
 #include <vendorcode/google/chromeos/chromeos.h>
diff --git a/src/mainboard/google/beltino/lan.c b/src/mainboard/google/beltino/lan.c
index 090f280..1c38e45 100644
--- a/src/mainboard/google/beltino/lan.c
+++ b/src/mainboard/google/beltino/lan.c
@@ -19,7 +19,6 @@
 #include <device/pci_ops.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <fmap.h>
 #include <southbridge/intel/bd82x6x/pch.h>
 #include "onboard.h"
diff --git a/src/mainboard/google/butterfly/chromeos.c b/src/mainboard/google/butterfly/chromeos.c
index ea4b8ac..63e582e 100644
--- a/src/mainboard/google/butterfly/chromeos.c
+++ b/src/mainboard/google/butterfly/chromeos.c
@@ -17,7 +17,6 @@
 #include <bootmode.h>
 #include <boot/coreboot_tables.h>
 #include <device/device.h>
-#include <device/pci.h>

#include <southbridge/intel/bd82x6x/pch.h>
 #include <southbridge/intel/common/gpio.h>
diff --git a/src/mainboard/google/butterfly/mainboard.c b/src/mainboard/google/butterfly/mainboard.c
index b52351b..eb4d15b 100644
--- a/src/mainboard/google/butterfly/mainboard.c
+++ b/src/mainboard/google/butterfly/mainboard.c
@@ -27,7 +27,6 @@
 #include "ec.h"
 #include <southbridge/intel/bd82x6x/pch.h>
 #include <smbios.h>
-#include <device/pci.h>
 #include <ec/quanta/ene_kb3940q/ec.h>
 #include <vendorcode/google/chromeos/chromeos.h>

diff --git a/src/mainboard/google/jecht/acpi_tables.c b/src/mainboard/google/jecht/acpi_tables.c
index 879ff93..445f037 100644
--- a/src/mainboard/google/jecht/acpi_tables.c
+++ b/src/mainboard/google/jecht/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <soc/acpi.h>
 #include <soc/nvs.h>
 #include <variant/thermal.h>
diff --git a/src/mainboard/google/jecht/chromeos.c b/src/mainboard/google/jecht/chromeos.c
index f2db756..e8a9d1a 100644
--- a/src/mainboard/google/jecht/chromeos.c
+++ b/src/mainboard/google/jecht/chromeos.c
@@ -16,7 +16,6 @@
 #include <boot/coreboot_tables.h>
 #include <device/pci_ops.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 #include <ec/google/chromeec/ec.h>
 #include <soc/gpio.h>
diff --git a/src/mainboard/google/jecht/lan.c b/src/mainboard/google/jecht/lan.c
index f733bca..bd08b09 100644
--- a/src/mainboard/google/jecht/lan.c
+++ b/src/mainboard/google/jecht/lan.c
@@ -20,7 +20,6 @@
 #include <device/pci_ops.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <soc/pch.h>
 #include "onboard.h"

diff --git a/src/mainboard/google/kahlee/irq_tables.c b/src/mainboard/google/kahlee/irq_tables.c
index 31cfbc1..b134c6b 100644
--- a/src/mainboard/google/kahlee/irq_tables.c
+++ b/src/mainboard/google/kahlee/irq_tables.c
@@ -14,7 +14,6 @@
  */

#include <console/console.h>
-#include <device/pci.h>
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/google/kahlee/mptable.c b/src/mainboard/google/kahlee/mptable.c
index fa60d35..5bb70e9 100644
--- a/src/mainboard/google/kahlee/mptable.c
+++ b/src/mainboard/google/kahlee/mptable.c
@@ -14,7 +14,6 @@
  */

#include <arch/smp/mpspec.h>
-#include <device/pci.h>
 #include <arch/ioapic.h>
 #include <string.h>
 #include <stdint.h>
diff --git a/src/mainboard/google/kahlee/variants/baseboard/mainboard.c b/src/mainboard/google/kahlee/variants/baseboard/mainboard.c
index 30fcc8c..69b9b40 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/mainboard.c
+++ b/src/mainboard/google/kahlee/variants/baseboard/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/mainboard/google/link/early_init.c b/src/mainboard/google/link/early_init.c
index 19cd295..c234e5b 100644
--- a/src/mainboard/google/link/early_init.c
+++ b/src/mainboard/google/link/early_init.c
@@ -17,7 +17,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <device/pci_ops.h>
-#include <device/pci.h>
 #include <cpu/x86/lapic.h>
 #include <arch/acpi.h>
 #include <console/console.h>
diff --git a/src/mainboard/google/link/mainboard.c b/src/mainboard/google/link/mainboard.c
index 21274b34..5a812e8 100644
--- a/src/mainboard/google/link/mainboard.c
+++ b/src/mainboard/google/link/mainboard.c
@@ -29,7 +29,6 @@
 #include <southbridge/intel/bd82x6x/pch.h>
 #include <southbridge/intel/common/gpio.h>
 #include <smbios.h>
-#include <device/pci.h>
 #include <ec/google/chromeec/ec.h>
 #include <vendorcode/google/chromeos/chromeos.h>

diff --git a/src/mainboard/google/parrot/acpi_tables.c b/src/mainboard/google/parrot/acpi_tables.c
index 93d77da..e92734d 100644
--- a/src/mainboard/google/parrot/acpi_tables.c
+++ b/src/mainboard/google/parrot/acpi_tables.c
@@ -17,7 +17,6 @@
 #include <arch/acpi.h>
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <vendorcode/google/chromeos/gnvs.h>
 #include <ec/compal/ene932/ec.h>
 #include "ec.h"
diff --git a/src/mainboard/google/parrot/chromeos.c b/src/mainboard/google/parrot/chromeos.c
index 4587a12..ae8da67 100644
--- a/src/mainboard/google/parrot/chromeos.c
+++ b/src/mainboard/google/parrot/chromeos.c
@@ -18,7 +18,6 @@
 #include <boot/coreboot_tables.h>
 #include <device/pci_ops.h>
 #include <device/device.h>
-#include <device/pci.h>

#include <southbridge/intel/bd82x6x/pch.h>
 #include <southbridge/intel/common/gpio.h>
diff --git a/src/mainboard/google/parrot/mainboard.c b/src/mainboard/google/parrot/mainboard.c
index 5f47c05..873776b 100644
--- a/src/mainboard/google/parrot/mainboard.c
+++ b/src/mainboard/google/parrot/mainboard.c
@@ -23,7 +23,6 @@
 #include "ec.h"
 #include <southbridge/intel/bd82x6x/pch.h>
 #include <smbios.h>
-#include <device/pci.h>
 #include <ec/compal/ene932/ec.h>
 #include <vendorcode/google/chromeos/chromeos.h>

diff --git a/src/mainboard/google/poppy/variants/nautilus/mainboard.c b/src/mainboard/google/poppy/variants/nautilus/mainboard.c
index b78ec82..8485507 100644
--- a/src/mainboard/google/poppy/variants/nautilus/mainboard.c
+++ b/src/mainboard/google/poppy/variants/nautilus/mainboard.c
@@ -17,7 +17,6 @@
 #include <chip.h>
 #include <arch/io.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include <smbios.h>
 #include <string.h>
diff --git a/src/mainboard/google/rambi/acpi_tables.c b/src/mainboard/google/rambi/acpi_tables.c
index 8e6db19..867b220 100644
--- a/src/mainboard/google/rambi/acpi_tables.c
+++ b/src/mainboard/google/rambi/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <soc/acpi.h>
 #include <soc/nvs.h>
 #include <soc/iomap.h>
diff --git a/src/mainboard/google/rambi/variants/ninja/lan.c b/src/mainboard/google/rambi/variants/ninja/lan.c
index edf2a62..5b220e0 100644
--- a/src/mainboard/google/rambi/variants/ninja/lan.c
+++ b/src/mainboard/google/rambi/variants/ninja/lan.c
@@ -19,7 +19,6 @@
 #include <device/pci_ops.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <fmap.h>
 #include <variant/onboard.h>

diff --git a/src/mainboard/google/rambi/variants/sumo/lan.c b/src/mainboard/google/rambi/variants/sumo/lan.c
index 9ed2b04..d6cd580 100644
--- a/src/mainboard/google/rambi/variants/sumo/lan.c
+++ b/src/mainboard/google/rambi/variants/sumo/lan.c
@@ -19,7 +19,6 @@
 #include <device/pci_ops.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <fmap.h>
 #include <variant/onboard.h>

diff --git a/src/mainboard/google/slippy/acpi_tables.c b/src/mainboard/google/slippy/acpi_tables.c
index 0b303ae..5838823 100644
--- a/src/mainboard/google/slippy/acpi_tables.c
+++ b/src/mainboard/google/slippy/acpi_tables.c
@@ -17,7 +17,6 @@
 #include <arch/acpi.h>
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <vendorcode/google/chromeos/gnvs.h>
 #include <ec/google/chromeec/ec.h>
 #include <southbridge/intel/lynxpoint/pch.h>
diff --git a/src/mainboard/google/stout/acpi_tables.c b/src/mainboard/google/stout/acpi_tables.c
index 46aadaf..597cb8f 100644
--- a/src/mainboard/google/stout/acpi_tables.c
+++ b/src/mainboard/google/stout/acpi_tables.c
@@ -17,7 +17,6 @@
 #include <arch/acpi.h>
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <vendorcode/google/chromeos/gnvs.h>
 #include <bootmode.h>
 #include <ec/quanta/it8518/ec.h>
diff --git a/src/mainboard/google/stout/chromeos.c b/src/mainboard/google/stout/chromeos.c
index dc3f3ab..fbb8190 100644
--- a/src/mainboard/google/stout/chromeos.c
+++ b/src/mainboard/google/stout/chromeos.c
@@ -18,7 +18,6 @@
 #include <device/pci_ops.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>

#include <southbridge/intel/bd82x6x/pch.h>
 #include <southbridge/intel/common/gpio.h>
diff --git a/src/mainboard/google/stout/ec.c b/src/mainboard/google/stout/ec.c
index 0ea32bc..3e91282 100644
--- a/src/mainboard/google/stout/ec.c
+++ b/src/mainboard/google/stout/ec.c
@@ -20,7 +20,6 @@
 #include <cpu/x86/smm.h>
 #include <ec/quanta/it8518/ec.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <southbridge/intel/bd82x6x/pch.h>
 #include <southbridge/intel/common/pmbase.h>
 #include <elog.h>
diff --git a/src/mainboard/google/stout/mainboard.c b/src/mainboard/google/stout/mainboard.c
index 2d4086a..dcd8fc6 100644
--- a/src/mainboard/google/stout/mainboard.c
+++ b/src/mainboard/google/stout/mainboard.c
@@ -20,7 +20,6 @@
 #include <drivers/intel/gma/int15.h>
 #include <arch/acpi.h>
 #include <southbridge/intel/bd82x6x/pch.h>
-#include <device/pci.h>
 #include <ec/quanta/it8518/ec.h>
 #include <vendorcode/google/chromeos/chromeos.h>

diff --git a/src/mainboard/hp/abm/acpi_tables.c b/src/mainboard/hp/abm/acpi_tables.c
index 08f6076..20509e9 100644
--- a/src/mainboard/hp/abm/acpi_tables.c
+++ b/src/mainboard/hp/abm/acpi_tables.c
@@ -15,7 +15,6 @@

#include <arch/acpi.h>
 #include <arch/ioapic.h>
-#include <device/pci.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/hp/abm/irq_tables.c b/src/mainboard/hp/abm/irq_tables.c
index e18e478..530c132 100644
--- a/src/mainboard/hp/abm/irq_tables.c
+++ b/src/mainboard/hp/abm/irq_tables.c
@@ -14,7 +14,6 @@
  */

#include <console/console.h>
-#include <device/pci.h>
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/hp/abm/mptable.c b/src/mainboard/hp/abm/mptable.c
index 3054eff..52374f1 100644
--- a/src/mainboard/hp/abm/mptable.c
+++ b/src/mainboard/hp/abm/mptable.c
@@ -14,7 +14,6 @@
  */

#include <arch/smp/mpspec.h>
-#include <device/pci.h>
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <string.h>
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c b/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c
index eba2d1d..fd59a3a 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c
+++ b/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c
@@ -15,7 +15,6 @@

#include <arch/acpi.h>
 #include <arch/ioapic.h>
-#include <device/pci.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/mptable.c b/src/mainboard/hp/pavilion_m6_1035dx/mptable.c
index 0d44397..f3c2f0a 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/mptable.c
+++ b/src/mainboard/hp/pavilion_m6_1035dx/mptable.c
@@ -17,7 +17,6 @@
 #include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
 #include <cpu/x86/lapic.h>
-#include <device/pci.h>
 #include <stdint.h>
 #include <string.h>
 #include <southbridge/amd/agesa/hudson/hudson.h>
diff --git a/src/mainboard/ibase/mb899/mptable.c b/src/mainboard/ibase/mb899/mptable.c
index 14f93ec..b24d8bf 100644
--- a/src/mainboard/ibase/mb899/mptable.c
+++ b/src/mainboard/ibase/mb899/mptable.c
@@ -14,7 +14,6 @@
  */

#include <device/device.h>
-#include <device/pci.h>
 #include <console/console.h>
 #include <arch/smp/mpspec.h>
 #include <arch/ioapic.h>
diff --git a/src/mainboard/intel/baskingridge/acpi_tables.c b/src/mainboard/intel/baskingridge/acpi_tables.c
index 497b10b..60f9c46 100644
--- a/src/mainboard/intel/baskingridge/acpi_tables.c
+++ b/src/mainboard/intel/baskingridge/acpi_tables.c
@@ -17,7 +17,6 @@
 #include <arch/acpi.h>
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <vendorcode/google/chromeos/gnvs.h>
 #include <southbridge/intel/lynxpoint/pch.h>
 #include <southbridge/intel/lynxpoint/nvs.h>
diff --git a/src/mainboard/intel/baskingridge/chromeos.c b/src/mainboard/intel/baskingridge/chromeos.c
index 74eb788..cf89f0d 100644
--- a/src/mainboard/intel/baskingridge/chromeos.c
+++ b/src/mainboard/intel/baskingridge/chromeos.c
@@ -16,7 +16,6 @@
 #include <bootmode.h>
 #include <boot/coreboot_tables.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <southbridge/intel/lynxpoint/pch.h>
 #include <southbridge/intel/common/gpio.h>
 #include <vendorcode/google/chromeos/chromeos.h>
diff --git a/src/mainboard/intel/d510mo/mainboard.c b/src/mainboard/intel/d510mo/mainboard.c
index f90ee89..3263f9a 100644
--- a/src/mainboard/intel/d510mo/mainboard.c
+++ b/src/mainboard/intel/d510mo/mainboard.c
@@ -14,7 +14,6 @@
  */

#include <device/device.h>
-#include <device/pci.h>
 #include <drivers/intel/gma/int15.h>

static void mainboard_enable(struct device *dev)
diff --git a/src/mainboard/intel/d945gclf/mptable.c b/src/mainboard/intel/d945gclf/mptable.c
index c58cbf5..89df425 100644
--- a/src/mainboard/intel/d945gclf/mptable.c
+++ b/src/mainboard/intel/d945gclf/mptable.c
@@ -14,7 +14,6 @@
  */

#include <device/device.h>
-#include <device/pci.h>
 #include <arch/smp/mpspec.h>
 #include <arch/ioapic.h>
 #include <stdint.h>
diff --git a/src/mainboard/intel/emeraldlake2/acpi_tables.c b/src/mainboard/intel/emeraldlake2/acpi_tables.c
index 74edc38..9d15eb6 100644
--- a/src/mainboard/intel/emeraldlake2/acpi_tables.c
+++ b/src/mainboard/intel/emeraldlake2/acpi_tables.c
@@ -17,7 +17,6 @@
 #include <arch/acpi.h>
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <vendorcode/google/chromeos/gnvs.h>
 #include <southbridge/intel/bd82x6x/nvs.h>

diff --git a/src/mainboard/intel/emeraldlake2/chromeos.c b/src/mainboard/intel/emeraldlake2/chromeos.c
index 470688f..4b52a2c 100644
--- a/src/mainboard/intel/emeraldlake2/chromeos.c
+++ b/src/mainboard/intel/emeraldlake2/chromeos.c
@@ -16,7 +16,6 @@
 #include <bootmode.h>
 #include <boot/coreboot_tables.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <southbridge/intel/bd82x6x/pch.h>
 #include <southbridge/intel/common/gpio.h>
 #include <vendorcode/google/chromeos/chromeos.h>
diff --git a/src/mainboard/intel/harcuvar/acpi_tables.c b/src/mainboard/intel/harcuvar/acpi_tables.c
index 43818ee..1f92419 100644
--- a/src/mainboard/intel/harcuvar/acpi_tables.c
+++ b/src/mainboard/intel/harcuvar/acpi_tables.c
@@ -19,7 +19,6 @@
 #include <arch/acpi.h>
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <cpu/x86/msr.h>

#include <intelblocks/acpi.h>
diff --git a/src/mainboard/intel/kblrvp/chromeos.c b/src/mainboard/intel/kblrvp/chromeos.c
index 29f05c9..9db4674 100644
--- a/src/mainboard/intel/kblrvp/chromeos.c
+++ b/src/mainboard/intel/kblrvp/chromeos.c
@@ -16,7 +16,6 @@

#include <boot/coreboot_tables.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <gpio.h>
 #include <soc/gpio.h>
 #include <ec/google/chromeec/ec.h>
diff --git a/src/mainboard/intel/strago/acpi_tables.c b/src/mainboard/intel/strago/acpi_tables.c
index 38ca9ff..518e0aa 100644
--- a/src/mainboard/intel/strago/acpi_tables.c
+++ b/src/mainboard/intel/strago/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <soc/acpi.h>
 #include <soc/iomap.h>
 #include <soc/nvs.h>
diff --git a/src/mainboard/intel/wtm2/acpi_tables.c b/src/mainboard/intel/wtm2/acpi_tables.c
index c94c7bf..8ceea46 100644
--- a/src/mainboard/intel/wtm2/acpi_tables.c
+++ b/src/mainboard/intel/wtm2/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <soc/acpi.h>
 #include <soc/nvs.h>
 #include "thermal.h"
diff --git a/src/mainboard/intel/wtm2/chromeos.c b/src/mainboard/intel/wtm2/chromeos.c
index 556677a..95664f1 100644
--- a/src/mainboard/intel/wtm2/chromeos.c
+++ b/src/mainboard/intel/wtm2/chromeos.c
@@ -16,7 +16,6 @@
 #include <bootmode.h>
 #include <boot/coreboot_tables.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <soc/gpio.h>
 #include <vendorcode/google/chromeos/chromeos.h>

diff --git a/src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c b/src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c
index 787c432..97ea649 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c
+++ b/src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c
@@ -15,7 +15,6 @@

#include <arch/acpi.h>
 #include <arch/ioapic.h>
-#include <device/pci.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/jetway/nf81-t56n-lf/mptable.c b/src/mainboard/jetway/nf81-t56n-lf/mptable.c
index 8fbdc58..9a983b4 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/mptable.c
+++ b/src/mainboard/jetway/nf81-t56n-lf/mptable.c
@@ -17,7 +17,6 @@

#include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
-#include <device/pci.h>
 #include <drivers/generic/ioapic/chip.h>
 #include <stdint.h>
 #include <southbridge/amd/common/amd_pci_util.h>
diff --git a/src/mainboard/kontron/986lcd-m/mptable.c b/src/mainboard/kontron/986lcd-m/mptable.c
index 1b5d45e..a5018f2 100644
--- a/src/mainboard/kontron/986lcd-m/mptable.c
+++ b/src/mainboard/kontron/986lcd-m/mptable.c
@@ -14,7 +14,6 @@
  */

#include <device/device.h>
-#include <device/pci.h>
 #include <arch/smp/mpspec.h>
 #include <arch/ioapic.h>
 #include <stdint.h>
diff --git a/src/mainboard/lenovo/g505s/acpi_tables.c b/src/mainboard/lenovo/g505s/acpi_tables.c
index eba2d1d..fd59a3a 100644
--- a/src/mainboard/lenovo/g505s/acpi_tables.c
+++ b/src/mainboard/lenovo/g505s/acpi_tables.c
@@ -15,7 +15,6 @@

#include <arch/acpi.h>
 #include <arch/ioapic.h>
-#include <device/pci.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/lenovo/g505s/mptable.c b/src/mainboard/lenovo/g505s/mptable.c
index 0d44397..f3c2f0a 100644
--- a/src/mainboard/lenovo/g505s/mptable.c
+++ b/src/mainboard/lenovo/g505s/mptable.c
@@ -17,7 +17,6 @@
 #include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
 #include <cpu/x86/lapic.h>
-#include <device/pci.h>
 #include <stdint.h>
 #include <string.h>
 #include <southbridge/amd/agesa/hudson/hudson.h>
diff --git a/src/mainboard/lenovo/t400/acpi_tables.c b/src/mainboard/lenovo/t400/acpi_tables.c
index 8fb9056..953a2b8 100644
--- a/src/mainboard/lenovo/t400/acpi_tables.c
+++ b/src/mainboard/lenovo/t400/acpi_tables.c
@@ -19,7 +19,6 @@
 #include <arch/acpi.h>
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <southbridge/intel/i82801ix/nvs.h>
 #include "thermal.h"

diff --git a/src/mainboard/lenovo/t400/dock.c b/src/mainboard/lenovo/t400/dock.c
index ccd6dcd..2eb9903 100644
--- a/src/mainboard/lenovo/t400/dock.c
+++ b/src/mainboard/lenovo/t400/dock.c
@@ -20,7 +20,6 @@
 #include <arch/io.h>
 #include <device/pnp_ops.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pnp.h>
 #include <delay.h>
 #include "dock.h"
diff --git a/src/mainboard/lenovo/t400/fadt.c b/src/mainboard/lenovo/t400/fadt.c
index e335787..9f4ebf6 100644
--- a/src/mainboard/lenovo/t400/fadt.c
+++ b/src/mainboard/lenovo/t400/fadt.c
@@ -15,7 +15,6 @@
  */

#include <string.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include <arch/acpi.h>
 #include <cpu/x86/smm.h>
diff --git a/src/mainboard/lenovo/t420/early_init.c b/src/mainboard/lenovo/t420/early_init.c
index 8afd1501..2e39885 100644
--- a/src/mainboard/lenovo/t420/early_init.c
+++ b/src/mainboard/lenovo/t420/early_init.c
@@ -21,7 +21,6 @@
 #include <drivers/lenovo/hybrid_graphics/hybrid_graphics.h>
 #include <northbridge/intel/sandybridge/sandybridge.h>
 #include <device/device.h>
-#include <device/pci.h>

static void hybrid_graphics_init(void)
 {
diff --git a/src/mainboard/lenovo/t420s/early_init.c b/src/mainboard/lenovo/t420s/early_init.c
index e2cdebf..276c66e 100644
--- a/src/mainboard/lenovo/t420s/early_init.c
+++ b/src/mainboard/lenovo/t420s/early_init.c
@@ -21,7 +21,6 @@
 #include <drivers/lenovo/hybrid_graphics/hybrid_graphics.h>
 #include <northbridge/intel/sandybridge/sandybridge.h>
 #include <device/device.h>
-#include <device/pci.h>

static void hybrid_graphics_init(void)
 {
diff --git a/src/mainboard/lenovo/t430/early_init.c b/src/mainboard/lenovo/t430/early_init.c
index 74c8b60..27258a3 100644
--- a/src/mainboard/lenovo/t430/early_init.c
+++ b/src/mainboard/lenovo/t430/early_init.c
@@ -21,7 +21,6 @@
 #include <drivers/lenovo/hybrid_graphics/hybrid_graphics.h>
 #include <northbridge/intel/sandybridge/sandybridge.h>
 #include <device/device.h>
-#include <device/pci.h>

static void hybrid_graphics_init(void)
 {
diff --git a/src/mainboard/lenovo/t520/early_init.c b/src/mainboard/lenovo/t520/early_init.c
index ad8e152..8e5bf2a 100644
--- a/src/mainboard/lenovo/t520/early_init.c
+++ b/src/mainboard/lenovo/t520/early_init.c
@@ -23,7 +23,6 @@
 #include <southbridge/intel/bd82x6x/pch.h>
 #include <drivers/lenovo/hybrid_graphics/hybrid_graphics.h>
 #include <device/device.h>
-#include <device/pci.h>

static void hybrid_graphics_init(void)
 {
diff --git a/src/mainboard/lenovo/t530/early_init.c b/src/mainboard/lenovo/t530/early_init.c
index aeb27a6..c6ff7e7 100644
--- a/src/mainboard/lenovo/t530/early_init.c
+++ b/src/mainboard/lenovo/t530/early_init.c
@@ -23,7 +23,6 @@
 #include <northbridge/intel/sandybridge/sandybridge.h>
 #include <drivers/lenovo/hybrid_graphics/hybrid_graphics.h>
 #include <device/device.h>
-#include <device/pci.h>

static void hybrid_graphics_init(void)
 {
diff --git a/src/mainboard/lenovo/t60/mptable.c b/src/mainboard/lenovo/t60/mptable.c
index 165b725..85b569a 100644
--- a/src/mainboard/lenovo/t60/mptable.c
+++ b/src/mainboard/lenovo/t60/mptable.c
@@ -15,7 +15,6 @@
  */

#include <device/device.h>
-#include <device/pci.h>
 #include <arch/smp/mpspec.h>
 #include <arch/ioapic.h>
 #include <stdint.h>
diff --git a/src/mainboard/lenovo/x200/acpi_tables.c b/src/mainboard/lenovo/x200/acpi_tables.c
index 8fb9056..953a2b8 100644
--- a/src/mainboard/lenovo/x200/acpi_tables.c
+++ b/src/mainboard/lenovo/x200/acpi_tables.c
@@ -19,7 +19,6 @@
 #include <arch/acpi.h>
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <southbridge/intel/i82801ix/nvs.h>
 #include "thermal.h"

diff --git a/src/mainboard/lenovo/x200/fadt.c b/src/mainboard/lenovo/x200/fadt.c
index e335787..9f4ebf6 100644
--- a/src/mainboard/lenovo/x200/fadt.c
+++ b/src/mainboard/lenovo/x200/fadt.c
@@ -15,7 +15,6 @@
  */

#include <string.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include <arch/acpi.h>
 #include <cpu/x86/smm.h>
diff --git a/src/mainboard/lenovo/x60/mptable.c b/src/mainboard/lenovo/x60/mptable.c
index 886f72d..22c5907 100644
--- a/src/mainboard/lenovo/x60/mptable.c
+++ b/src/mainboard/lenovo/x60/mptable.c
@@ -15,7 +15,6 @@
  */

#include <device/device.h>
-#include <device/pci.h>
 #include <arch/smp/mpspec.h>
 #include <arch/ioapic.h>
 #include <stdint.h>
diff --git a/src/mainboard/lippert/frontrunner-af/acpi_tables.c b/src/mainboard/lippert/frontrunner-af/acpi_tables.c
index 787c432..97ea649 100644
--- a/src/mainboard/lippert/frontrunner-af/acpi_tables.c
+++ b/src/mainboard/lippert/frontrunner-af/acpi_tables.c
@@ -15,7 +15,6 @@

#include <arch/acpi.h>
 #include <arch/ioapic.h>
-#include <device/pci.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/lippert/frontrunner-af/irq_tables.c b/src/mainboard/lippert/frontrunner-af/irq_tables.c
index 9ebe58a..a066864 100644
--- a/src/mainboard/lippert/frontrunner-af/irq_tables.c
+++ b/src/mainboard/lippert/frontrunner-af/irq_tables.c
@@ -14,7 +14,6 @@
  */

#include <console/console.h>
-#include <device/pci.h>
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/lippert/frontrunner-af/mainboard.c b/src/mainboard/lippert/frontrunner-af/mainboard.c
index ea473c0..6ad5234 100644
--- a/src/mainboard/lippert/frontrunner-af/mainboard.c
+++ b/src/mainboard/lippert/frontrunner-af/mainboard.c
@@ -17,7 +17,6 @@
 #include <amdblocks/acpimmio.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <arch/io.h>
 #include <device/mmio.h>
 #include <device/pci_ops.h>
diff --git a/src/mainboard/lippert/frontrunner-af/mptable.c b/src/mainboard/lippert/frontrunner-af/mptable.c
index 5e3a950..347b781 100644
--- a/src/mainboard/lippert/frontrunner-af/mptable.c
+++ b/src/mainboard/lippert/frontrunner-af/mptable.c
@@ -14,7 +14,6 @@
  */

#include <arch/smp/mpspec.h>
-#include <device/pci.h>
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <string.h>
diff --git a/src/mainboard/lippert/toucan-af/acpi_tables.c b/src/mainboard/lippert/toucan-af/acpi_tables.c
index 787c432..97ea649 100644
--- a/src/mainboard/lippert/toucan-af/acpi_tables.c
+++ b/src/mainboard/lippert/toucan-af/acpi_tables.c
@@ -15,7 +15,6 @@

#include <arch/acpi.h>
 #include <arch/ioapic.h>
-#include <device/pci.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/lippert/toucan-af/irq_tables.c b/src/mainboard/lippert/toucan-af/irq_tables.c
index 9ebe58a..a066864 100644
--- a/src/mainboard/lippert/toucan-af/irq_tables.c
+++ b/src/mainboard/lippert/toucan-af/irq_tables.c
@@ -14,7 +14,6 @@
  */

#include <console/console.h>
-#include <device/pci.h>
 #include <string.h>
 #include <stdint.h>
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/lippert/toucan-af/mainboard.c b/src/mainboard/lippert/toucan-af/mainboard.c
index b000688..1c9c5a6 100644
--- a/src/mainboard/lippert/toucan-af/mainboard.c
+++ b/src/mainboard/lippert/toucan-af/mainboard.c
@@ -17,7 +17,6 @@
 #include <amdblocks/acpimmio.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/lippert/toucan-af/mptable.c b/src/mainboard/lippert/toucan-af/mptable.c
index 5e3a950..347b781 100644
--- a/src/mainboard/lippert/toucan-af/mptable.c
+++ b/src/mainboard/lippert/toucan-af/mptable.c
@@ -14,7 +14,6 @@
  */

#include <arch/smp/mpspec.h>
-#include <device/pci.h>
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <string.h>
diff --git a/src/mainboard/msi/ms7721/acpi_tables.c b/src/mainboard/msi/ms7721/acpi_tables.c
index eba2d1d..fd59a3a 100644
--- a/src/mainboard/msi/ms7721/acpi_tables.c
+++ b/src/mainboard/msi/ms7721/acpi_tables.c
@@ -15,7 +15,6 @@

#include <arch/acpi.h>
 #include <arch/ioapic.h>
-#include <device/pci.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/msi/ms7721/mptable.c b/src/mainboard/msi/ms7721/mptable.c
index 8bfe4d5..303f3bf 100644
--- a/src/mainboard/msi/ms7721/mptable.c
+++ b/src/mainboard/msi/ms7721/mptable.c
@@ -17,7 +17,6 @@
 #include <arch/ioapic.h>
 #include <arch/smp/mpspec.h>
 #include <cpu/x86/lapic.h>
-#include <device/pci.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 d4e48bc..169b0ac 100644
--- a/src/mainboard/packardbell/ms2290/mainboard.c
+++ b/src/mainboard/packardbell/ms2290/mainboard.c
@@ -24,7 +24,6 @@
 #include <drivers/intel/gma/int15.h>
 #include <pc80/keyboard.h>
 #include <cpu/x86/lapic.h>
-#include <device/pci.h>
 #include <smbios.h>

static void mainboard_enable(struct device *dev)
diff --git a/src/mainboard/pcengines/apu1/acpi_tables.c b/src/mainboard/pcengines/apu1/acpi_tables.c
index 787c432..97ea649 100644
--- a/src/mainboard/pcengines/apu1/acpi_tables.c
+++ b/src/mainboard/pcengines/apu1/acpi_tables.c
@@ -15,7 +15,6 @@

#include <arch/acpi.h>
 #include <arch/ioapic.h>
-#include <device/pci.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/pcengines/apu1/irq_tables.c b/src/mainboard/pcengines/apu1/irq_tables.c
index 0bcb041..1d1e81f 100644
--- a/src/mainboard/pcengines/apu1/irq_tables.c
+++ b/src/mainboard/pcengines/apu1/irq_tables.c
@@ -14,7 +14,6 @@
  */

#include <console/console.h>
-#include <device/pci.h>
 #include <device/pci_def.h>
 #include <string.h>
 #include <stdint.h>
diff --git a/src/mainboard/pcengines/apu1/mainboard.c b/src/mainboard/pcengines/apu1/mainboard.c
index 1c30291..854fb8a 100644
--- a/src/mainboard/pcengines/apu1/mainboard.c
+++ b/src/mainboard/pcengines/apu1/mainboard.c
@@ -16,7 +16,6 @@

#include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/pcengines/apu1/mptable.c b/src/mainboard/pcengines/apu1/mptable.c
index bb8d01e..89e5dfc 100644
--- a/src/mainboard/pcengines/apu1/mptable.c
+++ b/src/mainboard/pcengines/apu1/mptable.c
@@ -15,7 +15,6 @@
  */

#include <arch/smp/mpspec.h>
-#include <device/pci.h>
 #include <stdint.h>
 #include <southbridge/amd/cimx/sb800/SBPLATFORM.h>
 #include <southbridge/amd/common/amd_pci_util.h>
diff --git a/src/mainboard/pcengines/apu2/acpi_tables.c b/src/mainboard/pcengines/apu2/acpi_tables.c
index 08f6076..20509e9 100644
--- a/src/mainboard/pcengines/apu2/acpi_tables.c
+++ b/src/mainboard/pcengines/apu2/acpi_tables.c
@@ -15,7 +15,6 @@

#include <arch/acpi.h>
 #include <arch/ioapic.h>
-#include <device/pci.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/pcengines/apu2/irq_tables.c b/src/mainboard/pcengines/apu2/irq_tables.c
index 2c93401..3d6346e 100644
--- a/src/mainboard/pcengines/apu2/irq_tables.c
+++ b/src/mainboard/pcengines/apu2/irq_tables.c
@@ -14,7 +14,6 @@
  */

#include <console/console.h>
-#include <device/pci.h>
 #include <device/pci_def.h>
 #include <string.h>
 #include <stdint.h>
diff --git a/src/mainboard/pcengines/apu2/mainboard.c b/src/mainboard/pcengines/apu2/mainboard.c
index d46361c..6cb504a 100644
--- a/src/mainboard/pcengines/apu2/mainboard.c
+++ b/src/mainboard/pcengines/apu2/mainboard.c
@@ -18,7 +18,6 @@
 #include <device/pci_ops.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_def.h>
 #include <southbridge/amd/pi/hudson/hudson.h>
 #include <southbridge/amd/pi/hudson/pci_devs.h>
diff --git a/src/mainboard/roda/rk886ex/mptable.c b/src/mainboard/roda/rk886ex/mptable.c
index 2db0f75..e17dcc2 100644
--- a/src/mainboard/roda/rk886ex/mptable.c
+++ b/src/mainboard/roda/rk886ex/mptable.c
@@ -15,7 +15,6 @@
  */

#include <device/device.h>
-#include <device/pci.h>
 #include <arch/smp/mpspec.h>
 #include <arch/ioapic.h>
 #include <stdint.h>
diff --git a/src/mainboard/roda/rk9/acpi_tables.c b/src/mainboard/roda/rk9/acpi_tables.c
index 0700ca0..3c76fac 100644
--- a/src/mainboard/roda/rk9/acpi_tables.c
+++ b/src/mainboard/roda/rk9/acpi_tables.c
@@ -19,7 +19,6 @@
 #include <arch/acpi.h>
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <southbridge/intel/i82801ix/nvs.h>

void acpi_create_gnvs(global_nvs_t *gnvs)
diff --git a/src/mainboard/roda/rk9/fadt.c b/src/mainboard/roda/rk9/fadt.c
index e335787..9f4ebf6 100644
--- a/src/mainboard/roda/rk9/fadt.c
+++ b/src/mainboard/roda/rk9/fadt.c
@@ -15,7 +15,6 @@
  */

#include <string.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include <arch/acpi.h>
 #include <cpu/x86/smm.h>
diff --git a/src/mainboard/roda/rv11/variants/rv11/early_init.c b/src/mainboard/roda/rv11/variants/rv11/early_init.c
index 80d8028..bd4d5c5 100644
--- a/src/mainboard/roda/rv11/variants/rv11/early_init.c
+++ b/src/mainboard/roda/rv11/variants/rv11/early_init.c
@@ -14,7 +14,6 @@
  */

#include <stdint.h>
-#include <device/pci.h>
 #include <northbridge/intel/sandybridge/raminit.h>
 #include <northbridge/intel/sandybridge/raminit_native.h>
 #include <northbridge/intel/sandybridge/sandybridge.h>
diff --git a/src/mainboard/roda/rv11/variants/rw11/early_init.c b/src/mainboard/roda/rv11/variants/rw11/early_init.c
index b64faca..cefb6d6 100644
--- a/src/mainboard/roda/rv11/variants/rw11/early_init.c
+++ b/src/mainboard/roda/rv11/variants/rw11/early_init.c
@@ -15,7 +15,6 @@

#include <bootblock_common.h>
 #include <stdint.h>
-#include <device/pci.h>
 #include <device/pnp_ops.h>
 #include <device/pnp.h>
 #include <northbridge/intel/sandybridge/raminit.h>
diff --git a/src/mainboard/samsung/lumpy/acpi_tables.c b/src/mainboard/samsung/lumpy/acpi_tables.c
index 8038664..413841c 100644
--- a/src/mainboard/samsung/lumpy/acpi_tables.c
+++ b/src/mainboard/samsung/lumpy/acpi_tables.c
@@ -17,7 +17,6 @@
 #include <arch/acpi.h>
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <ec/acpi/ec.h>
 #if CONFIG(CHROMEOS)
 #include <vendorcode/google/chromeos/gnvs.h>
diff --git a/src/mainboard/samsung/lumpy/chromeos.c b/src/mainboard/samsung/lumpy/chromeos.c
index c70ee1d..342f7a9 100644
--- a/src/mainboard/samsung/lumpy/chromeos.c
+++ b/src/mainboard/samsung/lumpy/chromeos.c
@@ -17,7 +17,6 @@
 #include <boot/coreboot_tables.h>
 #include <device/pci_ops.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <northbridge/intel/sandybridge/sandybridge.h>
 #include <southbridge/intel/bd82x6x/pch.h>
 #include <southbridge/intel/common/gpio.h>
diff --git a/src/mainboard/samsung/stumpy/acpi_tables.c b/src/mainboard/samsung/stumpy/acpi_tables.c
index 17d7e0e..b913bd6 100644
--- a/src/mainboard/samsung/stumpy/acpi_tables.c
+++ b/src/mainboard/samsung/stumpy/acpi_tables.c
@@ -17,7 +17,6 @@
 #include <arch/acpi.h>
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <vendorcode/google/chromeos/gnvs.h>
 #include <southbridge/intel/bd82x6x/nvs.h>

diff --git a/src/mainboard/samsung/stumpy/chromeos.c b/src/mainboard/samsung/stumpy/chromeos.c
index 2cce8ad..955ba5a 100644
--- a/src/mainboard/samsung/stumpy/chromeos.c
+++ b/src/mainboard/samsung/stumpy/chromeos.c
@@ -17,7 +17,6 @@
 #include <boot/coreboot_tables.h>
 #include <device/pci_ops.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <southbridge/intel/bd82x6x/pch.h>
 #include <southbridge/intel/common/gpio.h>
 #include <vendorcode/google/chromeos/chromeos.h>
diff --git a/src/mainboard/scaleway/tagada/acpi_tables.c b/src/mainboard/scaleway/tagada/acpi_tables.c
index 43818ee..1f92419 100644
--- a/src/mainboard/scaleway/tagada/acpi_tables.c
+++ b/src/mainboard/scaleway/tagada/acpi_tables.c
@@ -19,7 +19,6 @@
 #include <arch/acpi.h>
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <cpu/x86/msr.h>

#include <intelblocks/acpi.h>
diff --git a/src/mainboard/siemens/mc_apl1/mainboard.c b/src/mainboard/siemens/mc_apl1/mainboard.c
index 22d37bf..784a08c 100644
--- a/src/mainboard/siemens/mc_apl1/mainboard.c
+++ b/src/mainboard/siemens/mc_apl1/mainboard.c
@@ -17,7 +17,6 @@
 #include <console/console.h>
 #include <device/mmio.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <device/pci_ops.h>
 #include <device/pci_ids.h>
 #include <hwilib.h>