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

Change-Id: I5791fddec8b2387df5979adbb1a0fa64c5dd23ea
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37522
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Werner Zeh <werner.zeh@siemens.com>

168 files changed, 0 insertions, 168 deletions

diff --git a/src/mainboard/amd/bettong/acpi_tables.c b/src/mainboard/amd/bettong/acpi_tables.c
index 8c6840476e..9117c1ffdf 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 2a961a4a15..45030994ba 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 af943f1212..d9632d58d1 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 08f6076e7c..20509e9d31 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 e18e47842a..530c132a05 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 6ea80ed82c..a3396593f4 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 3aad0e34f4..40a75ad1e1 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 3af2757c1f..66dafb7f28 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 fa60d35605..5bb70e9449 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 787c432041..97ea6492fb 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 9ebe58ae65..a066864abd 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 8d1ec59d9c..1b4e64aa1a 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 8b0c2c9690..65e74baf40 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 be8c702736..9cc27f78ca 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 3d338501a0..2f716d0c5d 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 d89e02fbef..1f2093dd3a 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 08f6076e7c..20509e9d31 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 e18e47842a..530c132a05 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 3054effc19..52374f1529 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 08f6076e7c..20509e9d31 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 e18e47842a..530c132a05 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 00ac1a4499..1367b03307 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 b04f5acb81..6c81d06cc5 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 864928732c..9886b61b71 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 eba2d1da8b..fd59a3aade 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 e18e47842a..530c132a05 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 ea1862495c..c2b9f98e68 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 787c432041..97ea6492fb 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 9ebe58ae65..a066864abd 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 d9f550ea42..bc7a3ac38f 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 787c432041..97ea6492fb 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 9ebe58ae65..a066864abd 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 8052dc0d67..c38708e76b 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 eba2d1da8b..fd59a3aade 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 e18e47842a..530c132a05 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 f7698bb16f..b23d036daf 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 787c432041..97ea6492fb 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 9ebe58ae65..a066864abd 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 8052dc0d67..c38708e76b 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 70bfa27978..84bb64e993 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 adf94e95eb..a716a02e9b 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 61296134a8..021115a85f 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 787c432041..97ea6492fb 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 0bcb041558..1d1e81f05e 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 9c62712aa2..6093e8f082 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 08f6076e7c..20509e9d31 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 be71dd491f..181908a8ad 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 fd4dff7f08..37080ea320 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 411ebe7436..447c89573e 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 d97e6ac7f0..9efcab35b9 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 eba2d1da8b..fd59a3aade 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 8bfe4d535a..303f3bf5c4 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 fde12814ab..8f643d1e99 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 4e085b1327..b4925118a3 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 08f6076e7c..20509e9d31 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 e18e47842a..530c132a05 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 ea9f95947d..e4edc5fe7a 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 08f6076e7c..20509e9d31 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 f1dbc087fe..413ccf8718 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 00ac1a4499..1367b03307 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 b04f5acb81..6c81d06cc5 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 08f6076e7c..20509e9d31 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 e18e47842a..530c132a05 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 3054effc19..52374f1529 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 411ebe7436..447c89573e 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 4d93361cba..659a141f95 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 787c432041..97ea6492fb 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 591cabbaa1..804f52dcc5 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 d9f550ea42..bc7a3ac38f 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 1c27a0fde8..b30723dd74 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 a609b5df38..5c48e956ce 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 59c28768d5..3372ace792 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 86006e1363..795ac08ff0 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 2154cd842f..364c915efc 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 bf2379c29e..9d74dc8942 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 d44e27613e..dca5f3c273 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 08f6076e7c..20509e9d31 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 e18e47842a..530c132a05 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 ea9f95947d..e4edc5fe7a 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 dcda04dbb6..58fee1ef18 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 2b2acbad61..a04a9507ff 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 1039707ec3..8940d360e3 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 090f280a83..1c38e45e43 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 ea4b8ac04f..63e582e48f 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 b52351baa4..eb4d15bea7 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 879ff93d97..445f03771c 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 f2db756e5e..e8a9d1abd1 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 f733bca112..bd08b0916b 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 31cfbc199d..b134c6bac0 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 fa60d35605..5bb70e9449 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 30fcc8c2a2..69b9b40f8d 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 19cd295948..c234e5b848 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 21274b345f..5a812e83e9 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 93d77daf03..e92734da1a 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 4587a127fd..ae8da676b3 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 5f47c05fa2..873776beff 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 b78ec82aeb..84855078cf 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 8e6db19a4d..867b2203a9 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 edf2a62bad..5b220e0efa 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 9ed2b04967..d6cd580588 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 0b303ae6dd..5838823ddd 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 46aadaf75b..597cb8fb76 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 dc3f3abb45..fbb81907ce 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 0ea32bcfc3..3e91282f10 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 2d4086a230..dcd8fc656a 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 08f6076e7c..20509e9d31 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 e18e47842a..530c132a05 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 3054effc19..52374f1529 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 eba2d1da8b..fd59a3aade 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 0d44397be5..f3c2f0a572 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 14f93eca51..b24d8bf3c6 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 497b10b3ee..60f9c463bc 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 74eb788595..cf89f0da1e 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 f90ee89cea..3263f9a065 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 c58cbf5999..89df425152 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 74edc385c1..9d15eb6548 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 470688fc98..4b52a2c794 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 43818eebe4..1f92419a75 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 29f05c9ec3..9db46744bc 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 38ca9ff8a2..518e0aa41c 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 c94c7bff55..8ceea46e07 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 556677acb6..95664f1d42 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 787c432041..97ea6492fb 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 8fbdc58a77..9a983b41f9 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 1b5d45efb3..a5018f2233 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 eba2d1da8b..fd59a3aade 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 0d44397be5..f3c2f0a572 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 8fb9056c51..953a2b84bf 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 ccd6dcd5b8..2eb9903bb7 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 e335787100..9f4ebf6fe5 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 8afd150129..2e39885b6b 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 e2cdebfe35..276c66e18e 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 74c8b60883..27258a3a57 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 ad8e1520bb..8e5bf2ae44 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 aeb27a6d28..c6ff7e7038 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 165b725ac6..85b569a560 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 8fb9056c51..953a2b84bf 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 e335787100..9f4ebf6fe5 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 886f72da37..22c5907e8e 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 787c432041..97ea6492fb 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 9ebe58ae65..a066864abd 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 ea473c035c..6ad5234d81 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 5e3a9508cb..347b7810b6 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 787c432041..97ea6492fb 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 9ebe58ae65..a066864abd 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 b000688da6..1c9c5a6b91 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 5e3a9508cb..347b7810b6 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 eba2d1da8b..fd59a3aade 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 8bfe4d535a..303f3bf5c4 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 d4e48bc0be..169b0ac7f8 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 787c432041..97ea6492fb 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 0bcb041558..1d1e81f05e 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 1c302912a9..854fb8ad4d 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 bb8d01ecb9..89e5dfc35b 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 08f6076e7c..20509e9d31 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 2c9340199c..3d6346e3c0 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 d46361c93b..6cb504abd2 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 2db0f75964..e17dcc2e4f 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 0700ca06a0..3c76fac8b5 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 e335787100..9f4ebf6fe5 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 80d8028b94..bd4d5c5726 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 b64facae1b..cefb6d653b 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 8038664025..413841c60b 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 c70ee1d22e..342f7a968a 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 17d7e0e296..b913bd623d 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 2cce8ad9fc..955ba5a620 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 43818eebe4..1f92419a75 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 22d37bfdc2..784a08c670 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>