[coreboot-gerrit] Change in ...coreboot[master]: src: Remove useless include <device/pci_ids.h>

[HAOUAS Elyes (Code Review)]

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

Change subject: src: Remove useless include <device/pci_ids.h>
......................................................................

src: Remove useless include <device/pci_ids.h>

Change-Id: Ia640131479d4221ccd84613033f28de3932b8bff
Signed-off-by: Elyes HAOUAS 
---
M src/cpu/amd/family_10h-family_15h/monotonic_timer.c
M src/cpu/amd/family_10h-family_15h/powernow_acpi.c
M src/device/azalia_device.c
M src/device/oprom/realmode/x86_interrupts.c
M src/device/pci_ops.c
M src/device/pci_ops_mmconf.c
M src/device/pcix_device.c
M src/drivers/aspeed/common/aspeed_coreboot.h
M src/drivers/sil/3114/sil_sata.c
M src/drivers/xgi/common/xgi_coreboot.h
M src/mainboard/adi/rcc-dff/acpi_tables.c
M src/mainboard/advansus/a785e-i/acpi_tables.c
M src/mainboard/advansus/a785e-i/get_bus_conf.c
M src/mainboard/advansus/a785e-i/romstage.c
M src/mainboard/amd/bettong/acpi_tables.c
M src/mainboard/amd/bimini_fam10/acpi_tables.c
M src/mainboard/amd/bimini_fam10/get_bus_conf.c
M src/mainboard/amd/bimini_fam10/romstage.c
M src/mainboard/amd/db-ft3b-lc/acpi_tables.c
M src/mainboard/amd/db-ft3b-lc/romstage.c
M src/mainboard/amd/inagua/acpi_tables.c
M src/mainboard/amd/lamar/acpi_tables.c
M src/mainboard/amd/lamar/romstage.c
M src/mainboard/amd/mahogany_fam10/acpi_tables.c
M src/mainboard/amd/mahogany_fam10/get_bus_conf.c
M src/mainboard/amd/mahogany_fam10/romstage.c
M src/mainboard/amd/olivehill/acpi_tables.c
M src/mainboard/amd/olivehill/romstage.c
M src/mainboard/amd/olivehillplus/acpi_tables.c
M src/mainboard/amd/olivehillplus/romstage.c
M src/mainboard/amd/parmer/acpi_tables.c
M src/mainboard/amd/persimmon/acpi_tables.c
M src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c
M src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c
M src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
M src/mainboard/amd/south_station/acpi_tables.c
M src/mainboard/amd/thatcher/acpi_tables.c
M src/mainboard/amd/thatcher/romstage.c
M src/mainboard/amd/tilapia_fam10/acpi_tables.c
M src/mainboard/amd/tilapia_fam10/get_bus_conf.c
M src/mainboard/amd/tilapia_fam10/romstage.c
M src/mainboard/amd/torpedo/acpi_tables.c
M src/mainboard/amd/union_station/acpi_tables.c
M src/mainboard/aopen/dxplplusu/acpi_tables.c
M src/mainboard/apple/macbook21/mainboard.c
M src/mainboard/asrock/e350m1/acpi_tables.c
M src/mainboard/asrock/imb-a180/acpi_tables.c
M src/mainboard/asrock/imb-a180/romstage.c
M src/mainboard/asus/am1i-a/acpi_tables.c
M src/mainboard/asus/f2a85-m/acpi_tables.c
M src/mainboard/asus/kcma-d8/acpi_tables.c
M src/mainboard/asus/kcma-d8/get_bus_conf.c
M src/mainboard/asus/kcma-d8/romstage.c
M src/mainboard/asus/kfsn4-dre/acpi_tables.c
M src/mainboard/asus/kfsn4-dre/get_bus_conf.c
M src/mainboard/asus/kgpe-d16/acpi_tables.c
M src/mainboard/asus/kgpe-d16/get_bus_conf.c
M src/mainboard/asus/kgpe-d16/romstage.c
M src/mainboard/asus/m4a78-em/acpi_tables.c
M src/mainboard/asus/m4a78-em/get_bus_conf.c
M src/mainboard/asus/m4a78-em/romstage.c
M src/mainboard/asus/m4a785-m/acpi_tables.c
M src/mainboard/asus/m4a785-m/get_bus_conf.c
M src/mainboard/asus/m4a785-m/romstage.c
M src/mainboard/asus/m5a88-v/acpi_tables.c
M src/mainboard/asus/m5a88-v/get_bus_conf.c
M src/mainboard/asus/m5a88-v/romstage.c
M src/mainboard/avalue/eax-785e/acpi_tables.c
M src/mainboard/avalue/eax-785e/get_bus_conf.c
M src/mainboard/avalue/eax-785e/romstage.c
M src/mainboard/bap/ode_e20XX/acpi_tables.c
M src/mainboard/bap/ode_e21XX/acpi_tables.c
M src/mainboard/bap/ode_e21XX/romstage.c
M src/mainboard/biostar/a68n_5200/acpi_tables.c
M src/mainboard/biostar/a68n_5200/romstage.c
M src/mainboard/biostar/am1ml/acpi_tables.c
M src/mainboard/elmex/pcm205400/acpi_tables.c
M src/mainboard/emulation/qemu-q35/acpi_tables.c
M src/mainboard/emulation/qemu-q35/mainboard.c
M src/mainboard/esd/atom15/acpi_tables.c
M src/mainboard/getac/p470/acpi_tables.c
M src/mainboard/gigabyte/ma785gm/acpi_tables.c
M src/mainboard/gigabyte/ma785gm/get_bus_conf.c
M src/mainboard/gigabyte/ma785gm/romstage.c
M src/mainboard/gigabyte/ma785gmt/acpi_tables.c
M src/mainboard/gigabyte/ma785gmt/get_bus_conf.c
M src/mainboard/gigabyte/ma785gmt/romstage.c
M src/mainboard/gigabyte/ma78gm/acpi_tables.c
M src/mainboard/gigabyte/ma78gm/get_bus_conf.c
M src/mainboard/gigabyte/ma78gm/romstage.c
M src/mainboard/gizmosphere/gizmo/acpi_tables.c
M src/mainboard/gizmosphere/gizmo2/acpi_tables.c
M src/mainboard/google/beltino/acpi_tables.c
M src/mainboard/google/jecht/acpi_tables.c
M src/mainboard/google/parrot/acpi_tables.c
M src/mainboard/google/rambi/acpi_tables.c
M src/mainboard/google/slippy/acpi_tables.c
M src/mainboard/google/stout/acpi_tables.c
M src/mainboard/hp/abm/acpi_tables.c
M src/mainboard/hp/dl165_g6_fam10/get_bus_conf.c
M src/mainboard/hp/dl165_g6_fam10/romstage.c
M src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c
M src/mainboard/iei/kino-780am2-fam10/acpi_tables.c
M src/mainboard/iei/kino-780am2-fam10/get_bus_conf.c
M src/mainboard/iei/kino-780am2-fam10/romstage.c
M src/mainboard/intel/baskingridge/acpi_tables.c
M src/mainboard/intel/bayleybay_fsp/acpi_tables.c
M src/mainboard/intel/emeraldlake2/acpi_tables.c
M src/mainboard/intel/harcuvar/acpi_tables.c
M src/mainboard/intel/littleplains/acpi_tables.c
M src/mainboard/intel/minnowmax/acpi_tables.c
M src/mainboard/intel/mohonpeak/acpi_tables.c
M src/mainboard/intel/strago/acpi_tables.c
M src/mainboard/intel/wtm2/acpi_tables.c
M src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c
M src/mainboard/jetway/pa78vm5/acpi_tables.c
M src/mainboard/jetway/pa78vm5/get_bus_conf.c
M src/mainboard/jetway/pa78vm5/romstage.c
M src/mainboard/lenovo/g505s/acpi_tables.c
M src/mainboard/lenovo/t400/acpi_tables.c
M src/mainboard/lenovo/x200/acpi_tables.c
M src/mainboard/lippert/frontrunner-af/acpi_tables.c
M src/mainboard/lippert/toucan-af/acpi_tables.c
M src/mainboard/msi/ms7721/acpi_tables.c
M src/mainboard/msi/ms9652_fam10/acpi_tables.c
M src/mainboard/msi/ms9652_fam10/get_bus_conf.c
M src/mainboard/packardbell/ms2290/mainboard.c
M src/mainboard/pcengines/apu1/acpi_tables.c
M src/mainboard/pcengines/apu2/acpi_tables.c
M src/mainboard/pcengines/apu2/romstage.c
M src/mainboard/roda/rk9/acpi_tables.c
M src/mainboard/samsung/lumpy/acpi_tables.c
M src/mainboard/samsung/stumpy/acpi_tables.c
M src/mainboard/scaleway/tagada/acpi_tables.c
M src/mainboard/siemens/mc_tcu3/acpi_tables.c
M src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c
M src/mainboard/supermicro/h8qme_fam10/get_bus_conf.c
M src/mainboard/supermicro/h8scm_fam10/acpi_tables.c
M src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c
M src/mainboard/supermicro/h8scm_fam10/romstage.c
M src/mainboard/tyan/s2912_fam10/get_bus_conf.c
M src/mainboard/tyan/s2912_fam10/romstage.c
M src/mainboard/via/epia-m850/romstage.c
M src/northbridge/amd/amdfam10/get_pci1234.c
M src/northbridge/amd/amdht/comlib.c
M src/northbridge/amd/amdht/h3finit.c
M src/northbridge/amd/amdht/h3ncmn.c
M src/northbridge/amd/lx/northbridgeinit.c
M src/northbridge/intel/gm45/acpi.c
M src/northbridge/intel/gm45/northbridge.c
M src/northbridge/intel/haswell/acpi.c
M src/northbridge/intel/i945/acpi.c
M src/northbridge/intel/nehalem/acpi.c
M src/northbridge/intel/pineview/northbridge.c
M src/northbridge/intel/sandybridge/acpi.c
M src/northbridge/intel/sandybridge/common.c
M src/northbridge/intel/x4x/acpi.c
M src/northbridge/intel/x4x/northbridge.c
M src/soc/amd/stoneyridge/include/soc/southbridge.h
M src/soc/intel/apollolake/lpc.c
M src/soc/intel/baytrail/scc.c
M src/soc/intel/baytrail/spi.c
M src/soc/intel/braswell/acpi.c
M src/soc/intel/braswell/scc.c
M src/soc/intel/braswell/spi.c
M src/soc/intel/broadwell/me_status.c
M src/soc/intel/broadwell/romstage/smbus.c
M src/soc/intel/broadwell/romstage/spi.c
M src/soc/intel/broadwell/smbus_common.c
M src/soc/intel/broadwell/spi.c
M src/soc/intel/cannonlake/bootblock/pch.c
M src/soc/intel/cannonlake/lpc.c
M src/soc/intel/fsp_baytrail/acpi.c
M src/soc/intel/fsp_baytrail/include/soc/i2c.h
M src/soc/intel/fsp_baytrail/spi.c
M src/soc/intel/fsp_broadwell_de/smbus_common.c
M src/soc/intel/icelake/bootblock/pch.c
M src/soc/intel/icelake/lpc.c
M src/soc/intel/quark/i2c.c
M src/soc/intel/quark/romstage/pcie.c
M src/soc/intel/skylake/lpc.c
M src/soc/intel/skylake/me.c
M src/southbridge/amd/agesa/hudson/bootblock.c
M src/southbridge/amd/agesa/hudson/hudson.h
M src/southbridge/amd/pi/hudson/hudson.h
M src/southbridge/amd/rs780/cmn.c
M src/southbridge/amd/rs780/pcie.c
M src/southbridge/amd/rs780/rs780.c
M src/southbridge/amd/rs780/rs780.h
M src/southbridge/amd/sb700/bootblock.c
M src/southbridge/amd/sb700/sb700.h
M src/southbridge/amd/sb800/bootblock.c
M src/southbridge/amd/sb800/sb800.h
M src/southbridge/amd/sr5650/pcie.c
M src/southbridge/amd/sr5650/sr5650.h
M src/southbridge/intel/bd82x6x/early_me.c
M src/southbridge/intel/bd82x6x/early_me_mrc.c
M src/southbridge/intel/bd82x6x/early_smbus.c
M src/southbridge/intel/bd82x6x/early_spi.c
M src/southbridge/intel/bd82x6x/early_usb.c
M src/southbridge/intel/bd82x6x/early_usb_mrc.c
M src/southbridge/intel/common/spi.c
M src/southbridge/intel/fsp_rangeley/early_smbus.c
M src/southbridge/intel/fsp_rangeley/early_spi.c
M src/southbridge/intel/fsp_rangeley/early_usb.c
M src/southbridge/intel/i82371eb/acpi_tables.c
M src/southbridge/intel/i82801dx/i82801dx.c
M src/southbridge/intel/i82801gx/early_smbus.c
M src/southbridge/intel/i82801ix/early_smbus.c
M src/southbridge/intel/i82801jx/early_smbus.c
M src/southbridge/intel/ibexpeak/early_smbus.c
M src/southbridge/intel/ibexpeak/madt.c
M src/southbridge/intel/lynxpoint/early_me.c
M src/southbridge/intel/lynxpoint/early_smbus.c
M src/southbridge/intel/lynxpoint/early_spi.c
M src/southbridge/intel/lynxpoint/early_usb.c
M src/southbridge/ti/pci7420/cardbus.c
M src/southbridge/ti/pci7420/firewire.c
M src/southbridge/ti/pcixx12/pcixx12.c
219 files changed, 0 insertions(+), 219 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/20/30120/1

diff --git a/src/cpu/amd/family_10h-family_15h/monotonic_timer.c b/src/cpu/amd/family_10h-family_15h/monotonic_timer.c
index b1886ea..aff1cee 100644
--- a/src/cpu/amd/family_10h-family_15h/monotonic_timer.c
+++ b/src/cpu/amd/family_10h-family_15h/monotonic_timer.c
@@ -19,7 +19,6 @@
 #include <cpu/amd/msr.h>
 #include <timer.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <northbridge/amd/amdht/AsPsDefs.h>

static struct monotonic_counter {
diff --git a/src/cpu/amd/family_10h-family_15h/powernow_acpi.c b/src/cpu/amd/family_10h-family_15h/powernow_acpi.c
index d228858..535b772 100644
--- a/src/cpu/amd/family_10h-family_15h/powernow_acpi.c
+++ b/src/cpu/amd/family_10h-family_15h/powernow_acpi.c
@@ -23,7 +23,6 @@
 #include <arch/acpigen.h>
 #include <cpu/amd/powernow.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <cpu/amd/mtrr.h>
 #include <cpu/amd/amdfam10_sysconf.h>
 #include <arch/cpu.h>
diff --git a/src/device/azalia_device.c b/src/device/azalia_device.c
index 5c2fcfc..364eec1 100644
--- a/src/device/azalia_device.c
+++ b/src/device/azalia_device.c
@@ -16,7 +16,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <device/azalia_device.h>
 #include <arch/io.h>
diff --git a/src/device/oprom/realmode/x86_interrupts.c b/src/device/oprom/realmode/x86_interrupts.c
index 7ec77f8..e70b25d 100644
--- a/src/device/oprom/realmode/x86_interrupts.c
+++ b/src/device/oprom/realmode/x86_interrupts.c
@@ -19,7 +19,6 @@
 #include <arch/registers.h>
 #include <console/console.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <string.h>

diff --git a/src/device/pci_ops.c b/src/device/pci_ops.c
index 202a9cd..82c22a7 100644
--- a/src/device/pci_ops.c
+++ b/src/device/pci_ops.c
@@ -17,7 +17,6 @@

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

static const struct pci_bus_operations *pci_bus_ops(struct bus *bus, struct device *dev)
diff --git a/src/device/pci_ops_mmconf.c b/src/device/pci_ops_mmconf.c
index abbab3f..04f3d23 100644
--- a/src/device/pci_ops_mmconf.c
+++ b/src/device/pci_ops_mmconf.c
@@ -13,7 +13,6 @@

#include <arch/io.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <device/pci_ops.h>

#if !defined(CONFIG_MMCONF_BASE_ADDRESS) || !CONFIG_MMCONF_BASE_ADDRESS
diff --git a/src/device/pcix_device.c b/src/device/pcix_device.c
index 31b74e5..1204660 100644
--- a/src/device/pcix_device.c
+++ b/src/device/pcix_device.c
@@ -17,7 +17,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <device/pcix.h>

static void pcix_tune_dev(struct device *dev)
diff --git a/src/drivers/aspeed/common/aspeed_coreboot.h b/src/drivers/aspeed/common/aspeed_coreboot.h
index b974840..4798ec2 100644
--- a/src/drivers/aspeed/common/aspeed_coreboot.h
+++ b/src/drivers/aspeed/common/aspeed_coreboot.h
@@ -26,7 +26,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <device/pci_ops.h>

/* coreboot <--> kernel code interface */
diff --git a/src/drivers/sil/3114/sil_sata.c b/src/drivers/sil/3114/sil_sata.c
index 3c56266..95499a7 100644
--- a/src/drivers/sil/3114/sil_sata.c
+++ b/src/drivers/sil/3114/sil_sata.c
@@ -22,7 +22,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <device/pci_ops.h>

static void si_sata_init(struct device *dev)
diff --git a/src/drivers/xgi/common/xgi_coreboot.h b/src/drivers/xgi/common/xgi_coreboot.h
index b9332e8..6c0fd6c 100644
--- a/src/drivers/xgi/common/xgi_coreboot.h
+++ b/src/drivers/xgi/common/xgi_coreboot.h
@@ -28,7 +28,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <device/pci_ops.h>

#include "initdef.h"
diff --git a/src/mainboard/adi/rcc-dff/acpi_tables.c b/src/mainboard/adi/rcc-dff/acpi_tables.c
index 00a0b74..bc5f953 100644
--- a/src/mainboard/adi/rcc-dff/acpi_tables.c
+++ b/src/mainboard/adi/rcc-dff/acpi_tables.c
@@ -22,7 +22,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <southbridge/intel/fsp_rangeley/nvs.h>
 #include <northbridge/intel/fsp_rangeley/northbridge.h>

diff --git a/src/mainboard/advansus/a785e-i/acpi_tables.c b/src/mainboard/advansus/a785e-i/acpi_tables.c
index 0cf4300..d7b6fef 100644
--- a/src/mainboard/advansus/a785e-i/acpi_tables.c
+++ b/src/mainboard/advansus/a785e-i/acpi_tables.c
@@ -17,7 +17,6 @@
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <cpu/amd/amdfam10_sysconf.h>

#include "mb_sysconf.h"
diff --git a/src/mainboard/advansus/a785e-i/get_bus_conf.c b/src/mainboard/advansus/a785e-i/get_bus_conf.c
index 82c7df0..c390977 100644
--- a/src/mainboard/advansus/a785e-i/get_bus_conf.c
+++ b/src/mainboard/advansus/a785e-i/get_bus_conf.c
@@ -14,7 +14,6 @@
  */

#include <device/pci.h>
-#include <device/pci_ids.h>
 #include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/mainboard/advansus/a785e-i/romstage.c b/src/mainboard/advansus/a785e-i/romstage.c
index e8e2ec7..c63c2fe 100644
--- a/src/mainboard/advansus/a785e-i/romstage.c
+++ b/src/mainboard/advansus/a785e-i/romstage.c
@@ -21,7 +21,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <device/pci_def.h>
-#include <device/pci_ids.h>
 #include <arch/io.h>
 #include <device/pnp_def.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/mainboard/amd/bettong/acpi_tables.c b/src/mainboard/amd/bettong/acpi_tables.c
index 9f1eb46..676318d 100644
--- a/src/mainboard/amd/bettong/acpi_tables.c
+++ b/src/mainboard/amd/bettong/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>

#define IO_APIC2_ADDR 0xFEC20000

diff --git a/src/mainboard/amd/bimini_fam10/acpi_tables.c b/src/mainboard/amd/bimini_fam10/acpi_tables.c
index ca18f06..a140e28 100644
--- a/src/mainboard/amd/bimini_fam10/acpi_tables.c
+++ b/src/mainboard/amd/bimini_fam10/acpi_tables.c
@@ -17,7 +17,6 @@
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <cpu/amd/amdfam10_sysconf.h>

#include "mb_sysconf.h"
diff --git a/src/mainboard/amd/bimini_fam10/get_bus_conf.c b/src/mainboard/amd/bimini_fam10/get_bus_conf.c
index d38d37c..8ad6730 100644
--- a/src/mainboard/amd/bimini_fam10/get_bus_conf.c
+++ b/src/mainboard/amd/bimini_fam10/get_bus_conf.c
@@ -14,7 +14,6 @@
  */

#include <device/pci.h>
-#include <device/pci_ids.h>
 #include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/mainboard/amd/bimini_fam10/romstage.c b/src/mainboard/amd/bimini_fam10/romstage.c
index 9d05096..6c40f6e 100644
--- a/src/mainboard/amd/bimini_fam10/romstage.c
+++ b/src/mainboard/amd/bimini_fam10/romstage.c
@@ -22,7 +22,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <device/pci_def.h>
-#include <device/pci_ids.h>
 #include <arch/io.h>
 #include <arch/cpu.h>
 #include <device/pnp_def.h>
diff --git a/src/mainboard/amd/db-ft3b-lc/acpi_tables.c b/src/mainboard/amd/db-ft3b-lc/acpi_tables.c
index ade8dd6..6188cd2 100644
--- a/src/mainboard/amd/db-ft3b-lc/acpi_tables.c
+++ b/src/mainboard/amd/db-ft3b-lc/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/amd/db-ft3b-lc/romstage.c b/src/mainboard/amd/db-ft3b-lc/romstage.c
index 4aceeea..712ba67 100644
--- a/src/mainboard/amd/db-ft3b-lc/romstage.c
+++ b/src/mainboard/amd/db-ft3b-lc/romstage.c
@@ -16,7 +16,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <device/pci_def.h>
-#include <device/pci_ids.h>
 #include <arch/io.h>
 #include <arch/stages.h>
 #include <device/pnp_def.h>
diff --git a/src/mainboard/amd/inagua/acpi_tables.c b/src/mainboard/amd/inagua/acpi_tables.c
index 567c108..74be72f 100644
--- a/src/mainboard/amd/inagua/acpi_tables.c
+++ b/src/mainboard/amd/inagua/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/amd/lamar/acpi_tables.c b/src/mainboard/amd/lamar/acpi_tables.c
index 6466156..cfae02e 100644
--- a/src/mainboard/amd/lamar/acpi_tables.c
+++ b/src/mainboard/amd/lamar/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/amd/lamar/romstage.c b/src/mainboard/amd/lamar/romstage.c
index 7f811c5..4a99834 100644
--- a/src/mainboard/amd/lamar/romstage.c
+++ b/src/mainboard/amd/lamar/romstage.c
@@ -16,7 +16,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <device/pci_def.h>
-#include <device/pci_ids.h>
 #include <arch/io.h>
 #include <arch/stages.h>
 #include <device/pnp_def.h>
diff --git a/src/mainboard/amd/mahogany_fam10/acpi_tables.c b/src/mainboard/amd/mahogany_fam10/acpi_tables.c
index 33234eb..3cba4e81 100644
--- a/src/mainboard/amd/mahogany_fam10/acpi_tables.c
+++ b/src/mainboard/amd/mahogany_fam10/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <cpu/amd/amdfam10_sysconf.h>
 #include "mb_sysconf.h"

diff --git a/src/mainboard/amd/mahogany_fam10/get_bus_conf.c b/src/mainboard/amd/mahogany_fam10/get_bus_conf.c
index 09aead7..eca0ba7 100644
--- a/src/mainboard/amd/mahogany_fam10/get_bus_conf.c
+++ b/src/mainboard/amd/mahogany_fam10/get_bus_conf.c
@@ -14,7 +14,6 @@
  */

#include <device/pci.h>
-#include <device/pci_ids.h>
 #include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/mainboard/amd/mahogany_fam10/romstage.c b/src/mainboard/amd/mahogany_fam10/romstage.c
index 39ff7a0..ef7afde 100644
--- a/src/mainboard/amd/mahogany_fam10/romstage.c
+++ b/src/mainboard/amd/mahogany_fam10/romstage.c
@@ -24,7 +24,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <device/pci_def.h>
-#include <device/pci_ids.h>
 #include <arch/io.h>
 #include <arch/cpu.h>
 #include <device/pnp_def.h>
diff --git a/src/mainboard/amd/olivehill/acpi_tables.c b/src/mainboard/amd/olivehill/acpi_tables.c
index d56a243..84ad76e 100644
--- a/src/mainboard/amd/olivehill/acpi_tables.c
+++ b/src/mainboard/amd/olivehill/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>

unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/amd/olivehill/romstage.c b/src/mainboard/amd/olivehill/romstage.c
index 35ca4b1..fc55660 100644
--- a/src/mainboard/amd/olivehill/romstage.c
+++ b/src/mainboard/amd/olivehill/romstage.c
@@ -16,7 +16,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <device/pci_def.h>
-#include <device/pci_ids.h>
 #include <arch/io.h>
 #include <arch/stages.h>
 #include <device/pnp_def.h>
diff --git a/src/mainboard/amd/olivehillplus/acpi_tables.c b/src/mainboard/amd/olivehillplus/acpi_tables.c
index ade8dd6..6188cd2 100644
--- a/src/mainboard/amd/olivehillplus/acpi_tables.c
+++ b/src/mainboard/amd/olivehillplus/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/amd/olivehillplus/romstage.c b/src/mainboard/amd/olivehillplus/romstage.c
index 3cd8b73..d7afe96 100644
--- a/src/mainboard/amd/olivehillplus/romstage.c
+++ b/src/mainboard/amd/olivehillplus/romstage.c
@@ -16,7 +16,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <device/pci_def.h>
-#include <device/pci_ids.h>
 #include <arch/io.h>
 #include <arch/stages.h>
 #include <device/pnp_def.h>
diff --git a/src/mainboard/amd/parmer/acpi_tables.c b/src/mainboard/amd/parmer/acpi_tables.c
index 3cbca2d..cd28d9d 100644
--- a/src/mainboard/amd/parmer/acpi_tables.c
+++ b/src/mainboard/amd/parmer/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/amd/persimmon/acpi_tables.c b/src/mainboard/amd/persimmon/acpi_tables.c
index 0734faf..5727da8 100644
--- a/src/mainboard/amd/persimmon/acpi_tables.c
+++ b/src/mainboard/amd/persimmon/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>

unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c b/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c
index 03b849d..bf8ef2a 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <cpu/amd/amdfam10_sysconf.h>
 #include <cbfs.h>

diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c b/src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c
index 4e84fb2..5fc708d 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c
@@ -15,7 +15,6 @@

#include <console/console.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <string.h>
 #include <stdint.h>
 #include <cpu/amd/multicore.h>
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c b/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
index e923513..fcb10b1 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
@@ -22,7 +22,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <device/pci_def.h>
-#include <device/pci_ids.h>
 #include <arch/io.h>
 #include <arch/cpu.h>
 #include <device/pnp_def.h>
diff --git a/src/mainboard/amd/south_station/acpi_tables.c b/src/mainboard/amd/south_station/acpi_tables.c
index 567c108..74be72f 100644
--- a/src/mainboard/amd/south_station/acpi_tables.c
+++ b/src/mainboard/amd/south_station/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/amd/thatcher/acpi_tables.c b/src/mainboard/amd/thatcher/acpi_tables.c
index 3cbca2d..cd28d9d 100644
--- a/src/mainboard/amd/thatcher/acpi_tables.c
+++ b/src/mainboard/amd/thatcher/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/amd/thatcher/romstage.c b/src/mainboard/amd/thatcher/romstage.c
index d4097ff..645afd4 100644
--- a/src/mainboard/amd/thatcher/romstage.c
+++ b/src/mainboard/amd/thatcher/romstage.c
@@ -16,7 +16,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <device/pci_def.h>
-#include <device/pci_ids.h>
 #include <arch/acpi.h>
 #include <arch/io.h>
 #include <arch/stages.h>
diff --git a/src/mainboard/amd/tilapia_fam10/acpi_tables.c b/src/mainboard/amd/tilapia_fam10/acpi_tables.c
index 49d6923..6261a96 100644
--- a/src/mainboard/amd/tilapia_fam10/acpi_tables.c
+++ b/src/mainboard/amd/tilapia_fam10/acpi_tables.c
@@ -17,7 +17,6 @@
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <cpu/amd/amdfam10_sysconf.h>

#include "mb_sysconf.h"
diff --git a/src/mainboard/amd/tilapia_fam10/get_bus_conf.c b/src/mainboard/amd/tilapia_fam10/get_bus_conf.c
index 09aead7..eca0ba7 100644
--- a/src/mainboard/amd/tilapia_fam10/get_bus_conf.c
+++ b/src/mainboard/amd/tilapia_fam10/get_bus_conf.c
@@ -14,7 +14,6 @@
  */

#include <device/pci.h>
-#include <device/pci_ids.h>
 #include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/mainboard/amd/tilapia_fam10/romstage.c b/src/mainboard/amd/tilapia_fam10/romstage.c
index 4e1a72e..0001f93 100644
--- a/src/mainboard/amd/tilapia_fam10/romstage.c
+++ b/src/mainboard/amd/tilapia_fam10/romstage.c
@@ -22,7 +22,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <device/pci_def.h>
-#include <device/pci_ids.h>
 #include <arch/io.h>
 #include <arch/cpu.h>
 #include <device/pnp_def.h>
diff --git a/src/mainboard/amd/torpedo/acpi_tables.c b/src/mainboard/amd/torpedo/acpi_tables.c
index a0c75ab..e3beb74 100644
--- a/src/mainboard/amd/torpedo/acpi_tables.c
+++ b/src/mainboard/amd/torpedo/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/ioapic.h>
 #include <arch/io.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>

extern u32 apicid_sb900;

diff --git a/src/mainboard/amd/union_station/acpi_tables.c b/src/mainboard/amd/union_station/acpi_tables.c
index 567c108..74be72f 100644
--- a/src/mainboard/amd/union_station/acpi_tables.c
+++ b/src/mainboard/amd/union_station/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/aopen/dxplplusu/acpi_tables.c b/src/mainboard/aopen/dxplplusu/acpi_tables.c
index e60b314..2981403 100644
--- a/src/mainboard/aopen/dxplplusu/acpi_tables.c
+++ b/src/mainboard/aopen/dxplplusu/acpi_tables.c
@@ -21,7 +21,6 @@
 #include <string.h>
 #include <arch/acpi.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <assert.h>
 #include "bus.h"

diff --git a/src/mainboard/apple/macbook21/mainboard.c b/src/mainboard/apple/macbook21/mainboard.c
index 49d3427..3f4d6e6 100644
--- a/src/mainboard/apple/macbook21/mainboard.c
+++ b/src/mainboard/apple/macbook21/mainboard.c
@@ -20,7 +20,6 @@
 #include <delay.h>
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
-#include <device/pci_ids.h>
 #include <arch/interrupt.h>
 #include <northbridge/intel/i945/i945.h>
 #include <arch/x86/include/arch/acpigen.h>
diff --git a/src/mainboard/asrock/e350m1/acpi_tables.c b/src/mainboard/asrock/e350m1/acpi_tables.c
index 2cd7e2a..a61d91e 100644
--- a/src/mainboard/asrock/e350m1/acpi_tables.c
+++ b/src/mainboard/asrock/e350m1/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <string.h>

unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/asrock/imb-a180/acpi_tables.c b/src/mainboard/asrock/imb-a180/acpi_tables.c
index d56a243..84ad76e 100644
--- a/src/mainboard/asrock/imb-a180/acpi_tables.c
+++ b/src/mainboard/asrock/imb-a180/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>

unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/asrock/imb-a180/romstage.c b/src/mainboard/asrock/imb-a180/romstage.c
index 8a5e05d..3a1472b 100644
--- a/src/mainboard/asrock/imb-a180/romstage.c
+++ b/src/mainboard/asrock/imb-a180/romstage.c
@@ -16,7 +16,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <device/pci_def.h>
-#include <device/pci_ids.h>
 #include <arch/acpi.h>
 #include <arch/io.h>
 #include <arch/stages.h>
diff --git a/src/mainboard/asus/am1i-a/acpi_tables.c b/src/mainboard/asus/am1i-a/acpi_tables.c
index f151490..68cd239 100644
--- a/src/mainboard/asus/am1i-a/acpi_tables.c
+++ b/src/mainboard/asus/am1i-a/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>

unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/asus/f2a85-m/acpi_tables.c b/src/mainboard/asus/f2a85-m/acpi_tables.c
index 45e59d2..f94fde0 100644
--- a/src/mainboard/asus/f2a85-m/acpi_tables.c
+++ b/src/mainboard/asus/f2a85-m/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <string.h>

unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/asus/kcma-d8/acpi_tables.c b/src/mainboard/asus/kcma-d8/acpi_tables.c
index 9c2f294..7da1390 100644
--- a/src/mainboard/asus/kcma-d8/acpi_tables.c
+++ b/src/mainboard/asus/kcma-d8/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <cpu/amd/amdfam10_sysconf.h>

#include "mb_sysconf.h"
diff --git a/src/mainboard/asus/kcma-d8/get_bus_conf.c b/src/mainboard/asus/kcma-d8/get_bus_conf.c
index 014ef53..62b726c 100644
--- a/src/mainboard/asus/kcma-d8/get_bus_conf.c
+++ b/src/mainboard/asus/kcma-d8/get_bus_conf.c
@@ -15,7 +15,6 @@
  */

#include <device/pci.h>
-#include <device/pci_ids.h>
 #include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/mainboard/asus/kcma-d8/romstage.c b/src/mainboard/asus/kcma-d8/romstage.c
index 5b12845..12c0926 100644
--- a/src/mainboard/asus/kcma-d8/romstage.c
+++ b/src/mainboard/asus/kcma-d8/romstage.c
@@ -20,7 +20,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <device/pci_def.h>
-#include <device/pci_ids.h>
 #include <arch/io.h>
 #include <arch/cpu.h>
 #include <device/pnp_def.h>
diff --git a/src/mainboard/asus/kfsn4-dre/acpi_tables.c b/src/mainboard/asus/kfsn4-dre/acpi_tables.c
index dd5a076..36f55af 100644
--- a/src/mainboard/asus/kfsn4-dre/acpi_tables.c
+++ b/src/mainboard/asus/kfsn4-dre/acpi_tables.c
@@ -26,7 +26,6 @@
 #include <arch/io.h>
 #include <arch/smp/mpspec.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <cpu/amd/amdfam10_sysconf.h>

/* APIC */
diff --git a/src/mainboard/asus/kfsn4-dre/get_bus_conf.c b/src/mainboard/asus/kfsn4-dre/get_bus_conf.c
index 5c8c75e..c8bf9a8 100644
--- a/src/mainboard/asus/kfsn4-dre/get_bus_conf.c
+++ b/src/mainboard/asus/kfsn4-dre/get_bus_conf.c
@@ -20,7 +20,6 @@

#include <console/console.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/mainboard/asus/kgpe-d16/acpi_tables.c b/src/mainboard/asus/kgpe-d16/acpi_tables.c
index 9c2f294..7da1390 100644
--- a/src/mainboard/asus/kgpe-d16/acpi_tables.c
+++ b/src/mainboard/asus/kgpe-d16/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <cpu/amd/amdfam10_sysconf.h>

#include "mb_sysconf.h"
diff --git a/src/mainboard/asus/kgpe-d16/get_bus_conf.c b/src/mainboard/asus/kgpe-d16/get_bus_conf.c
index 014ef53..62b726c 100644
--- a/src/mainboard/asus/kgpe-d16/get_bus_conf.c
+++ b/src/mainboard/asus/kgpe-d16/get_bus_conf.c
@@ -15,7 +15,6 @@
  */

#include <device/pci.h>
-#include <device/pci_ids.h>
 #include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/mainboard/asus/kgpe-d16/romstage.c b/src/mainboard/asus/kgpe-d16/romstage.c
index bfa4042..1efbda8 100644
--- a/src/mainboard/asus/kgpe-d16/romstage.c
+++ b/src/mainboard/asus/kgpe-d16/romstage.c
@@ -20,7 +20,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <device/pci_def.h>
-#include <device/pci_ids.h>
 #include <arch/io.h>
 #include <arch/cpu.h>
 #include <device/pnp_def.h>
diff --git a/src/mainboard/asus/m4a78-em/acpi_tables.c b/src/mainboard/asus/m4a78-em/acpi_tables.c
index ca0c0a3..8b5f1b5 100644
--- a/src/mainboard/asus/m4a78-em/acpi_tables.c
+++ b/src/mainboard/asus/m4a78-em/acpi_tables.c
@@ -17,7 +17,6 @@
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <cpu/amd/amdfam10_sysconf.h>
 #include "mb_sysconf.h"

diff --git a/src/mainboard/asus/m4a78-em/get_bus_conf.c b/src/mainboard/asus/m4a78-em/get_bus_conf.c
index 09aead7..eca0ba7 100644
--- a/src/mainboard/asus/m4a78-em/get_bus_conf.c
+++ b/src/mainboard/asus/m4a78-em/get_bus_conf.c
@@ -14,7 +14,6 @@
  */

#include <device/pci.h>
-#include <device/pci_ids.h>
 #include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/mainboard/asus/m4a78-em/romstage.c b/src/mainboard/asus/m4a78-em/romstage.c
index 96d80cc..3175a02 100644
--- a/src/mainboard/asus/m4a78-em/romstage.c
+++ b/src/mainboard/asus/m4a78-em/romstage.c
@@ -23,7 +23,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <device/pci_def.h>
-#include <device/pci_ids.h>
 #include <arch/io.h>
 #include <arch/cpu.h>
 #include <device/pnp_def.h>
diff --git a/src/mainboard/asus/m4a785-m/acpi_tables.c b/src/mainboard/asus/m4a785-m/acpi_tables.c
index 48c70d1..541e483 100644
--- a/src/mainboard/asus/m4a785-m/acpi_tables.c
+++ b/src/mainboard/asus/m4a785-m/acpi_tables.c
@@ -19,7 +19,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <cpu/amd/amdfam10_sysconf.h>
 #include "mb_sysconf.h"

diff --git a/src/mainboard/asus/m4a785-m/get_bus_conf.c b/src/mainboard/asus/m4a785-m/get_bus_conf.c
index 09aead7..eca0ba7 100644
--- a/src/mainboard/asus/m4a785-m/get_bus_conf.c
+++ b/src/mainboard/asus/m4a785-m/get_bus_conf.c
@@ -14,7 +14,6 @@
  */

#include <device/pci.h>
-#include <device/pci_ids.h>
 #include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/mainboard/asus/m4a785-m/romstage.c b/src/mainboard/asus/m4a785-m/romstage.c
index 8eb9226..8dbaefa 100644
--- a/src/mainboard/asus/m4a785-m/romstage.c
+++ b/src/mainboard/asus/m4a785-m/romstage.c
@@ -24,7 +24,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <device/pci_def.h>
-#include <device/pci_ids.h>
 #include <arch/io.h>
 #include <arch/cpu.h>
 #include <device/pnp_def.h>
diff --git a/src/mainboard/asus/m5a88-v/acpi_tables.c b/src/mainboard/asus/m5a88-v/acpi_tables.c
index 0cf4300..d7b6fef 100644
--- a/src/mainboard/asus/m5a88-v/acpi_tables.c
+++ b/src/mainboard/asus/m5a88-v/acpi_tables.c
@@ -17,7 +17,6 @@
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <cpu/amd/amdfam10_sysconf.h>

#include "mb_sysconf.h"
diff --git a/src/mainboard/asus/m5a88-v/get_bus_conf.c b/src/mainboard/asus/m5a88-v/get_bus_conf.c
index a57b738..7806305 100644
--- a/src/mainboard/asus/m5a88-v/get_bus_conf.c
+++ b/src/mainboard/asus/m5a88-v/get_bus_conf.c
@@ -14,7 +14,6 @@
  */

#include <device/pci.h>
-#include <device/pci_ids.h>
 #include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/mainboard/asus/m5a88-v/romstage.c b/src/mainboard/asus/m5a88-v/romstage.c
index bb43dd5..3ad33ec 100644
--- a/src/mainboard/asus/m5a88-v/romstage.c
+++ b/src/mainboard/asus/m5a88-v/romstage.c
@@ -23,7 +23,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <device/pci_def.h>
-#include <device/pci_ids.h>
 #include <arch/io.h>
 #include <arch/cpu.h>
 #include <device/pnp_def.h>
diff --git a/src/mainboard/avalue/eax-785e/acpi_tables.c b/src/mainboard/avalue/eax-785e/acpi_tables.c
index 0cf4300..d7b6fef 100644
--- a/src/mainboard/avalue/eax-785e/acpi_tables.c
+++ b/src/mainboard/avalue/eax-785e/acpi_tables.c
@@ -17,7 +17,6 @@
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <cpu/amd/amdfam10_sysconf.h>

#include "mb_sysconf.h"
diff --git a/src/mainboard/avalue/eax-785e/get_bus_conf.c b/src/mainboard/avalue/eax-785e/get_bus_conf.c
index a57b738..7806305 100644
--- a/src/mainboard/avalue/eax-785e/get_bus_conf.c
+++ b/src/mainboard/avalue/eax-785e/get_bus_conf.c
@@ -14,7 +14,6 @@
  */

#include <device/pci.h>
-#include <device/pci_ids.h>
 #include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/mainboard/avalue/eax-785e/romstage.c b/src/mainboard/avalue/eax-785e/romstage.c
index ba7e7ad..85ff722 100644
--- a/src/mainboard/avalue/eax-785e/romstage.c
+++ b/src/mainboard/avalue/eax-785e/romstage.c
@@ -21,7 +21,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <device/pci_def.h>
-#include <device/pci_ids.h>
 #include <arch/io.h>
 #include <arch/cpu.h>
 #include <device/pnp_def.h>
diff --git a/src/mainboard/bap/ode_e20XX/acpi_tables.c b/src/mainboard/bap/ode_e20XX/acpi_tables.c
index d56a243..84ad76e 100644
--- a/src/mainboard/bap/ode_e20XX/acpi_tables.c
+++ b/src/mainboard/bap/ode_e20XX/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>

unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/bap/ode_e21XX/acpi_tables.c b/src/mainboard/bap/ode_e21XX/acpi_tables.c
index ade8dd6..6188cd2 100644
--- a/src/mainboard/bap/ode_e21XX/acpi_tables.c
+++ b/src/mainboard/bap/ode_e21XX/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/bap/ode_e21XX/romstage.c b/src/mainboard/bap/ode_e21XX/romstage.c
index eefda26..ea7dcb0 100644
--- a/src/mainboard/bap/ode_e21XX/romstage.c
+++ b/src/mainboard/bap/ode_e21XX/romstage.c
@@ -16,7 +16,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <device/pci_def.h>
-#include <device/pci_ids.h>
 #include <arch/io.h>
 #include <arch/stages.h>
 #include <device/pnp_def.h>
diff --git a/src/mainboard/biostar/a68n_5200/acpi_tables.c b/src/mainboard/biostar/a68n_5200/acpi_tables.c
index d56a243..84ad76e 100644
--- a/src/mainboard/biostar/a68n_5200/acpi_tables.c
+++ b/src/mainboard/biostar/a68n_5200/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>

unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/biostar/a68n_5200/romstage.c b/src/mainboard/biostar/a68n_5200/romstage.c
index e081a58..43b2c82 100644
--- a/src/mainboard/biostar/a68n_5200/romstage.c
+++ b/src/mainboard/biostar/a68n_5200/romstage.c
@@ -18,7 +18,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <device/pci_def.h>
-#include <device/pci_ids.h>
 #include <arch/io.h>
 #include <arch/stages.h>
 #include <device/pnp_def.h>
diff --git a/src/mainboard/biostar/am1ml/acpi_tables.c b/src/mainboard/biostar/am1ml/acpi_tables.c
index f151490..68cd239 100644
--- a/src/mainboard/biostar/am1ml/acpi_tables.c
+++ b/src/mainboard/biostar/am1ml/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>

unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/elmex/pcm205400/acpi_tables.c b/src/mainboard/elmex/pcm205400/acpi_tables.c
index 0734faf..5727da8 100644
--- a/src/mainboard/elmex/pcm205400/acpi_tables.c
+++ b/src/mainboard/elmex/pcm205400/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>

unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/emulation/qemu-q35/acpi_tables.c b/src/mainboard/emulation/qemu-q35/acpi_tables.c
index 5a36cb1..b8df509 100644
--- a/src/mainboard/emulation/qemu-q35/acpi_tables.c
+++ b/src/mainboard/emulation/qemu-q35/acpi_tables.c
@@ -21,7 +21,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>

#include "../qemu-i440fx/fw_cfg.h"
 #include "../qemu-i440fx/acpi.h"
diff --git a/src/mainboard/emulation/qemu-q35/mainboard.c b/src/mainboard/emulation/qemu-q35/mainboard.c
index f89b0a8..90a32f4 100644
--- a/src/mainboard/emulation/qemu-q35/mainboard.c
+++ b/src/mainboard/emulation/qemu-q35/mainboard.c
@@ -16,7 +16,6 @@

#include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <pc80/keyboard.h>
 #include <drivers/intel/gma/i915.h>
diff --git a/src/mainboard/esd/atom15/acpi_tables.c b/src/mainboard/esd/atom15/acpi_tables.c
index a7f71e2..bdb201c 100644
--- a/src/mainboard/esd/atom15/acpi_tables.c
+++ b/src/mainboard/esd/atom15/acpi_tables.c
@@ -22,7 +22,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <soc/acpi.h>
 #include <soc/nvs.h>
 #include <soc/iomap.h>
diff --git a/src/mainboard/getac/p470/acpi_tables.c b/src/mainboard/getac/p470/acpi_tables.c
index 30364ba..162c20a 100644
--- a/src/mainboard/getac/p470/acpi_tables.c
+++ b/src/mainboard/getac/p470/acpi_tables.c
@@ -22,7 +22,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>

#include <southbridge/intel/i82801gx/nvs.h>
 #include "mainboard.h"
diff --git a/src/mainboard/gigabyte/ma785gm/acpi_tables.c b/src/mainboard/gigabyte/ma785gm/acpi_tables.c
index 49d6923..6261a96 100644
--- a/src/mainboard/gigabyte/ma785gm/acpi_tables.c
+++ b/src/mainboard/gigabyte/ma785gm/acpi_tables.c
@@ -17,7 +17,6 @@
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <cpu/amd/amdfam10_sysconf.h>

#include "mb_sysconf.h"
diff --git a/src/mainboard/gigabyte/ma785gm/get_bus_conf.c b/src/mainboard/gigabyte/ma785gm/get_bus_conf.c
index 09aead7..eca0ba7 100644
--- a/src/mainboard/gigabyte/ma785gm/get_bus_conf.c
+++ b/src/mainboard/gigabyte/ma785gm/get_bus_conf.c
@@ -14,7 +14,6 @@
  */

#include <device/pci.h>
-#include <device/pci_ids.h>
 #include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/mainboard/gigabyte/ma785gm/romstage.c b/src/mainboard/gigabyte/ma785gm/romstage.c
index 098baac..3a777f2 100644
--- a/src/mainboard/gigabyte/ma785gm/romstage.c
+++ b/src/mainboard/gigabyte/ma785gm/romstage.c
@@ -20,7 +20,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <device/pci_def.h>
-#include <device/pci_ids.h>
 #include <arch/io.h>
 #include <arch/cpu.h>
 #include <device/pnp_def.h>
diff --git a/src/mainboard/gigabyte/ma785gmt/acpi_tables.c b/src/mainboard/gigabyte/ma785gmt/acpi_tables.c
index ed5772d..0cdcdb7 100644
--- a/src/mainboard/gigabyte/ma785gmt/acpi_tables.c
+++ b/src/mainboard/gigabyte/ma785gmt/acpi_tables.c
@@ -17,7 +17,6 @@
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <cpu/amd/amdfam10_sysconf.h>

unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/gigabyte/ma785gmt/get_bus_conf.c b/src/mainboard/gigabyte/ma785gmt/get_bus_conf.c
index 09aead7..eca0ba7 100644
--- a/src/mainboard/gigabyte/ma785gmt/get_bus_conf.c
+++ b/src/mainboard/gigabyte/ma785gmt/get_bus_conf.c
@@ -14,7 +14,6 @@
  */

#include <device/pci.h>
-#include <device/pci_ids.h>
 #include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/mainboard/gigabyte/ma785gmt/romstage.c b/src/mainboard/gigabyte/ma785gmt/romstage.c
index 05d2e04..d08e1e0 100644
--- a/src/mainboard/gigabyte/ma785gmt/romstage.c
+++ b/src/mainboard/gigabyte/ma785gmt/romstage.c
@@ -20,7 +20,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <device/pci_def.h>
-#include <device/pci_ids.h>
 #include <arch/io.h>
 #include <arch/cpu.h>
 #include <device/pnp_def.h>
diff --git a/src/mainboard/gigabyte/ma78gm/acpi_tables.c b/src/mainboard/gigabyte/ma78gm/acpi_tables.c
index ed5772d..0cdcdb7 100644
--- a/src/mainboard/gigabyte/ma78gm/acpi_tables.c
+++ b/src/mainboard/gigabyte/ma78gm/acpi_tables.c
@@ -17,7 +17,6 @@
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <cpu/amd/amdfam10_sysconf.h>

unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/gigabyte/ma78gm/get_bus_conf.c b/src/mainboard/gigabyte/ma78gm/get_bus_conf.c
index 09aead7..eca0ba7 100644
--- a/src/mainboard/gigabyte/ma78gm/get_bus_conf.c
+++ b/src/mainboard/gigabyte/ma78gm/get_bus_conf.c
@@ -14,7 +14,6 @@
  */

#include <device/pci.h>
-#include <device/pci_ids.h>
 #include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/mainboard/gigabyte/ma78gm/romstage.c b/src/mainboard/gigabyte/ma78gm/romstage.c
index 536a041..7e85498 100644
--- a/src/mainboard/gigabyte/ma78gm/romstage.c
+++ b/src/mainboard/gigabyte/ma78gm/romstage.c
@@ -23,7 +23,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <device/pci_def.h>
-#include <device/pci_ids.h>
 #include <arch/io.h>
 #include <arch/cpu.h>
 #include <device/pnp_def.h>
diff --git a/src/mainboard/gizmosphere/gizmo/acpi_tables.c b/src/mainboard/gizmosphere/gizmo/acpi_tables.c
index 2db0a46..644ab96 100644
--- a/src/mainboard/gizmosphere/gizmo/acpi_tables.c
+++ b/src/mainboard/gizmosphere/gizmo/acpi_tables.c
@@ -19,7 +19,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/gizmosphere/gizmo2/acpi_tables.c b/src/mainboard/gizmosphere/gizmo2/acpi_tables.c
index d56a243..84ad76e 100644
--- a/src/mainboard/gizmosphere/gizmo2/acpi_tables.c
+++ b/src/mainboard/gizmosphere/gizmo2/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>

unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/google/beltino/acpi_tables.c b/src/mainboard/google/beltino/acpi_tables.c
index 3f6e9de..f7b51a9 100644
--- a/src/mainboard/google/beltino/acpi_tables.c
+++ b/src/mainboard/google/beltino/acpi_tables.c
@@ -21,7 +21,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.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/jecht/acpi_tables.c b/src/mainboard/google/jecht/acpi_tables.c
index 4e86f87..9bc1816 100644
--- a/src/mainboard/google/jecht/acpi_tables.c
+++ b/src/mainboard/google/jecht/acpi_tables.c
@@ -21,7 +21,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <soc/acpi.h>
 #include <soc/nvs.h>
 #include <variant/thermal.h>
diff --git a/src/mainboard/google/parrot/acpi_tables.c b/src/mainboard/google/parrot/acpi_tables.c
index 36139b1..61dcde1 100644
--- a/src/mainboard/google/parrot/acpi_tables.c
+++ b/src/mainboard/google/parrot/acpi_tables.c
@@ -20,7 +20,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <vendorcode/google/chromeos/gnvs.h>
 #include <ec/compal/ene932/ec.h>
 #include "ec.h"
diff --git a/src/mainboard/google/rambi/acpi_tables.c b/src/mainboard/google/rambi/acpi_tables.c
index ecfab56..d9f511a 100644
--- a/src/mainboard/google/rambi/acpi_tables.c
+++ b/src/mainboard/google/rambi/acpi_tables.c
@@ -21,7 +21,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <soc/acpi.h>
 #include <soc/nvs.h>
 #include <soc/iomap.h>
diff --git a/src/mainboard/google/slippy/acpi_tables.c b/src/mainboard/google/slippy/acpi_tables.c
index b17f5a6..0ffd054 100644
--- a/src/mainboard/google/slippy/acpi_tables.c
+++ b/src/mainboard/google/slippy/acpi_tables.c
@@ -21,7 +21,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <vendorcode/google/chromeos/gnvs.h>
 #include <ec/google/chromeec/ec.h>

diff --git a/src/mainboard/google/stout/acpi_tables.c b/src/mainboard/google/stout/acpi_tables.c
index 735d70f..9fbdcfc 100644
--- a/src/mainboard/google/stout/acpi_tables.c
+++ b/src/mainboard/google/stout/acpi_tables.c
@@ -20,7 +20,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <vendorcode/google/chromeos/gnvs.h>
 #include <bootmode.h>
 #include <ec/quanta/it8518/ec.h>
diff --git a/src/mainboard/hp/abm/acpi_tables.c b/src/mainboard/hp/abm/acpi_tables.c
index d56a243..84ad76e 100644
--- a/src/mainboard/hp/abm/acpi_tables.c
+++ b/src/mainboard/hp/abm/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>

unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/hp/dl165_g6_fam10/get_bus_conf.c b/src/mainboard/hp/dl165_g6_fam10/get_bus_conf.c
index b29fb2c..c43509c 100644
--- a/src/mainboard/hp/dl165_g6_fam10/get_bus_conf.c
+++ b/src/mainboard/hp/dl165_g6_fam10/get_bus_conf.c
@@ -17,7 +17,6 @@

#include <console/console.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <string.h>
 #include <stdint.h>
 #include <cpu/amd/multicore.h>
diff --git a/src/mainboard/hp/dl165_g6_fam10/romstage.c b/src/mainboard/hp/dl165_g6_fam10/romstage.c
index 1b2b40b..5b19688 100644
--- a/src/mainboard/hp/dl165_g6_fam10/romstage.c
+++ b/src/mainboard/hp/dl165_g6_fam10/romstage.c
@@ -27,7 +27,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <device/pci_def.h>
-#include <device/pci_ids.h>
 #include <arch/io.h>
 #include <arch/cpu.h>
 #include <device/pnp_def.h>
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c b/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c
index 45e59d2..f94fde0 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c
+++ b/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <string.h>

unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/iei/kino-780am2-fam10/acpi_tables.c b/src/mainboard/iei/kino-780am2-fam10/acpi_tables.c
index 33234eb..3cba4e81 100644
--- a/src/mainboard/iei/kino-780am2-fam10/acpi_tables.c
+++ b/src/mainboard/iei/kino-780am2-fam10/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <cpu/amd/amdfam10_sysconf.h>
 #include "mb_sysconf.h"

diff --git a/src/mainboard/iei/kino-780am2-fam10/get_bus_conf.c b/src/mainboard/iei/kino-780am2-fam10/get_bus_conf.c
index 09aead7..eca0ba7 100644
--- a/src/mainboard/iei/kino-780am2-fam10/get_bus_conf.c
+++ b/src/mainboard/iei/kino-780am2-fam10/get_bus_conf.c
@@ -14,7 +14,6 @@
  */

#include <device/pci.h>
-#include <device/pci_ids.h>
 #include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/mainboard/iei/kino-780am2-fam10/romstage.c b/src/mainboard/iei/kino-780am2-fam10/romstage.c
index fc1b32f..72146e7 100644
--- a/src/mainboard/iei/kino-780am2-fam10/romstage.c
+++ b/src/mainboard/iei/kino-780am2-fam10/romstage.c
@@ -23,7 +23,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <device/pci_def.h>
-#include <device/pci_ids.h>
 #include <arch/io.h>
 #include <arch/cpu.h>
 #include <device/pnp_def.h>
diff --git a/src/mainboard/intel/baskingridge/acpi_tables.c b/src/mainboard/intel/baskingridge/acpi_tables.c
index d6dce61..c5293dc 100644
--- a/src/mainboard/intel/baskingridge/acpi_tables.c
+++ b/src/mainboard/intel/baskingridge/acpi_tables.c
@@ -21,7 +21,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <vendorcode/google/chromeos/gnvs.h>

#include <southbridge/intel/lynxpoint/pch.h>
diff --git a/src/mainboard/intel/bayleybay_fsp/acpi_tables.c b/src/mainboard/intel/bayleybay_fsp/acpi_tables.c
index 1536e2d..0a16565 100644
--- a/src/mainboard/intel/bayleybay_fsp/acpi_tables.c
+++ b/src/mainboard/intel/bayleybay_fsp/acpi_tables.c
@@ -22,7 +22,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <soc/acpi.h>
 #include <soc/nvs.h>
 #include <soc/iomap.h>
diff --git a/src/mainboard/intel/emeraldlake2/acpi_tables.c b/src/mainboard/intel/emeraldlake2/acpi_tables.c
index 6c7d87a..d5deff0 100644
--- a/src/mainboard/intel/emeraldlake2/acpi_tables.c
+++ b/src/mainboard/intel/emeraldlake2/acpi_tables.c
@@ -20,7 +20,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <vendorcode/google/chromeos/gnvs.h>
 #include <southbridge/intel/bd82x6x/nvs.h>

diff --git a/src/mainboard/intel/harcuvar/acpi_tables.c b/src/mainboard/intel/harcuvar/acpi_tables.c
index 3d83d3c..92cf5a2 100644
--- a/src/mainboard/intel/harcuvar/acpi_tables.c
+++ b/src/mainboard/intel/harcuvar/acpi_tables.c
@@ -23,7 +23,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <cpu/x86/msr.h>

#include <soc/acpi.h>
diff --git a/src/mainboard/intel/littleplains/acpi_tables.c b/src/mainboard/intel/littleplains/acpi_tables.c
index 00a0b74..bc5f953 100644
--- a/src/mainboard/intel/littleplains/acpi_tables.c
+++ b/src/mainboard/intel/littleplains/acpi_tables.c
@@ -22,7 +22,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <southbridge/intel/fsp_rangeley/nvs.h>
 #include <northbridge/intel/fsp_rangeley/northbridge.h>

diff --git a/src/mainboard/intel/minnowmax/acpi_tables.c b/src/mainboard/intel/minnowmax/acpi_tables.c
index a7f71e2..bdb201c 100644
--- a/src/mainboard/intel/minnowmax/acpi_tables.c
+++ b/src/mainboard/intel/minnowmax/acpi_tables.c
@@ -22,7 +22,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <soc/acpi.h>
 #include <soc/nvs.h>
 #include <soc/iomap.h>
diff --git a/src/mainboard/intel/mohonpeak/acpi_tables.c b/src/mainboard/intel/mohonpeak/acpi_tables.c
index 00a0b74..bc5f953 100644
--- a/src/mainboard/intel/mohonpeak/acpi_tables.c
+++ b/src/mainboard/intel/mohonpeak/acpi_tables.c
@@ -22,7 +22,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <southbridge/intel/fsp_rangeley/nvs.h>
 #include <northbridge/intel/fsp_rangeley/northbridge.h>

diff --git a/src/mainboard/intel/strago/acpi_tables.c b/src/mainboard/intel/strago/acpi_tables.c
index d830c3a..62fcc19 100644
--- a/src/mainboard/intel/strago/acpi_tables.c
+++ b/src/mainboard/intel/strago/acpi_tables.c
@@ -20,7 +20,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.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 7579b2b..16cd0c6 100644
--- a/src/mainboard/intel/wtm2/acpi_tables.c
+++ b/src/mainboard/intel/wtm2/acpi_tables.c
@@ -21,7 +21,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <soc/acpi.h>
 #include <soc/nvs.h>
 #include "thermal.h"
diff --git a/src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c b/src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c
index 2cd7e2a..a61d91e 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c
+++ b/src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <string.h>

unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/jetway/pa78vm5/acpi_tables.c b/src/mainboard/jetway/pa78vm5/acpi_tables.c
index 87881b0..8c6a096 100644
--- a/src/mainboard/jetway/pa78vm5/acpi_tables.c
+++ b/src/mainboard/jetway/pa78vm5/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <cpu/amd/amdfam10_sysconf.h>

unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/jetway/pa78vm5/get_bus_conf.c b/src/mainboard/jetway/pa78vm5/get_bus_conf.c
index 09aead7..eca0ba7 100644
--- a/src/mainboard/jetway/pa78vm5/get_bus_conf.c
+++ b/src/mainboard/jetway/pa78vm5/get_bus_conf.c
@@ -14,7 +14,6 @@
  */

#include <device/pci.h>
-#include <device/pci_ids.h>
 #include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/mainboard/jetway/pa78vm5/romstage.c b/src/mainboard/jetway/pa78vm5/romstage.c
index f75c5a4..45ee1c2 100644
--- a/src/mainboard/jetway/pa78vm5/romstage.c
+++ b/src/mainboard/jetway/pa78vm5/romstage.c
@@ -24,7 +24,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <device/pci_def.h>
-#include <device/pci_ids.h>
 #include <arch/io.h>
 #include <arch/cpu.h>
 #include <device/pnp_def.h>
diff --git a/src/mainboard/lenovo/g505s/acpi_tables.c b/src/mainboard/lenovo/g505s/acpi_tables.c
index 45e59d2..f94fde0 100644
--- a/src/mainboard/lenovo/g505s/acpi_tables.c
+++ b/src/mainboard/lenovo/g505s/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <string.h>

unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/lenovo/t400/acpi_tables.c b/src/mainboard/lenovo/t400/acpi_tables.c
index 2893d39..24c3a79 100644
--- a/src/mainboard/lenovo/t400/acpi_tables.c
+++ b/src/mainboard/lenovo/t400/acpi_tables.c
@@ -22,7 +22,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <southbridge/intel/i82801ix/nvs.h>

void acpi_create_gnvs(global_nvs_t *gnvs)
diff --git a/src/mainboard/lenovo/x200/acpi_tables.c b/src/mainboard/lenovo/x200/acpi_tables.c
index 2893d39..24c3a79 100644
--- a/src/mainboard/lenovo/x200/acpi_tables.c
+++ b/src/mainboard/lenovo/x200/acpi_tables.c
@@ -22,7 +22,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <southbridge/intel/i82801ix/nvs.h>

void acpi_create_gnvs(global_nvs_t *gnvs)
diff --git a/src/mainboard/lippert/frontrunner-af/acpi_tables.c b/src/mainboard/lippert/frontrunner-af/acpi_tables.c
index 567c108..74be72f 100644
--- a/src/mainboard/lippert/frontrunner-af/acpi_tables.c
+++ b/src/mainboard/lippert/frontrunner-af/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/lippert/toucan-af/acpi_tables.c b/src/mainboard/lippert/toucan-af/acpi_tables.c
index 567c108..74be72f 100644
--- a/src/mainboard/lippert/toucan-af/acpi_tables.c
+++ b/src/mainboard/lippert/toucan-af/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/msi/ms7721/acpi_tables.c b/src/mainboard/msi/ms7721/acpi_tables.c
index 45e59d2..f94fde0 100644
--- a/src/mainboard/msi/ms7721/acpi_tables.c
+++ b/src/mainboard/msi/ms7721/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <string.h>

unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/msi/ms9652_fam10/acpi_tables.c b/src/mainboard/msi/ms9652_fam10/acpi_tables.c
index 1ab1029..5b00374 100644
--- a/src/mainboard/msi/ms9652_fam10/acpi_tables.c
+++ b/src/mainboard/msi/ms9652_fam10/acpi_tables.c
@@ -23,7 +23,6 @@
 #include <arch/acpi.h>
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
-#include <device/pci_ids.h>
 #include <cpu/amd/powernow.h>
 #include <device/pci.h>
 #include <cpu/amd/amdfam10_sysconf.h>
diff --git a/src/mainboard/msi/ms9652_fam10/get_bus_conf.c b/src/mainboard/msi/ms9652_fam10/get_bus_conf.c
index 9c744ce..4f9499b 100644
--- a/src/mainboard/msi/ms9652_fam10/get_bus_conf.c
+++ b/src/mainboard/msi/ms9652_fam10/get_bus_conf.c
@@ -17,7 +17,6 @@

#include <console/console.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <string.h>
 #include <stdint.h>
 #include <cpu/amd/multicore.h>
diff --git a/src/mainboard/packardbell/ms2290/mainboard.c b/src/mainboard/packardbell/ms2290/mainboard.c
index 77a626d..de9f13d 100644
--- a/src/mainboard/packardbell/ms2290/mainboard.c
+++ b/src/mainboard/packardbell/ms2290/mainboard.c
@@ -22,7 +22,6 @@
 #include <delay.h>
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
-#include <device/pci_ids.h>
 #include <northbridge/intel/nehalem/nehalem.h>
 #include <southbridge/intel/bd82x6x/pch.h>
 #include <ec/acpi/ec.h>
diff --git a/src/mainboard/pcengines/apu1/acpi_tables.c b/src/mainboard/pcengines/apu1/acpi_tables.c
index 0734faf..5727da8 100644
--- a/src/mainboard/pcengines/apu1/acpi_tables.c
+++ b/src/mainboard/pcengines/apu1/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>

unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/pcengines/apu2/acpi_tables.c b/src/mainboard/pcengines/apu2/acpi_tables.c
index ade8dd6..6188cd2 100644
--- a/src/mainboard/pcengines/apu2/acpi_tables.c
+++ b/src/mainboard/pcengines/apu2/acpi_tables.c
@@ -18,7 +18,6 @@
 #include <arch/acpigen.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/mainboard/pcengines/apu2/romstage.c b/src/mainboard/pcengines/apu2/romstage.c
index 55a89fb..329e798 100644
--- a/src/mainboard/pcengines/apu2/romstage.c
+++ b/src/mainboard/pcengines/apu2/romstage.c
@@ -16,7 +16,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <device/pci_def.h>
-#include <device/pci_ids.h>
 #include <arch/io.h>
 #include <arch/stages.h>
 #include <device/pnp.h>
diff --git a/src/mainboard/roda/rk9/acpi_tables.c b/src/mainboard/roda/rk9/acpi_tables.c
index b673784..7ddc5b8 100644
--- a/src/mainboard/roda/rk9/acpi_tables.c
+++ b/src/mainboard/roda/rk9/acpi_tables.c
@@ -22,7 +22,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <southbridge/intel/i82801ix/nvs.h>

void acpi_create_gnvs(global_nvs_t *gnvs)
diff --git a/src/mainboard/samsung/lumpy/acpi_tables.c b/src/mainboard/samsung/lumpy/acpi_tables.c
index c801b34..e1364b6 100644
--- a/src/mainboard/samsung/lumpy/acpi_tables.c
+++ b/src/mainboard/samsung/lumpy/acpi_tables.c
@@ -20,7 +20,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <ec/acpi/ec.h>
 #if IS_ENABLED(CONFIG_CHROMEOS)
 #include <vendorcode/google/chromeos/gnvs.h>
diff --git a/src/mainboard/samsung/stumpy/acpi_tables.c b/src/mainboard/samsung/stumpy/acpi_tables.c
index f875b88..ad3b29c 100644
--- a/src/mainboard/samsung/stumpy/acpi_tables.c
+++ b/src/mainboard/samsung/stumpy/acpi_tables.c
@@ -20,7 +20,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <vendorcode/google/chromeos/gnvs.h>
 #include <southbridge/intel/bd82x6x/nvs.h>

diff --git a/src/mainboard/scaleway/tagada/acpi_tables.c b/src/mainboard/scaleway/tagada/acpi_tables.c
index 3d83d3c..92cf5a2 100644
--- a/src/mainboard/scaleway/tagada/acpi_tables.c
+++ b/src/mainboard/scaleway/tagada/acpi_tables.c
@@ -23,7 +23,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <cpu/x86/msr.h>

#include <soc/acpi.h>
diff --git a/src/mainboard/siemens/mc_tcu3/acpi_tables.c b/src/mainboard/siemens/mc_tcu3/acpi_tables.c
index 1536e2d..0a16565 100644
--- a/src/mainboard/siemens/mc_tcu3/acpi_tables.c
+++ b/src/mainboard/siemens/mc_tcu3/acpi_tables.c
@@ -22,7 +22,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <soc/acpi.h>
 #include <soc/nvs.h>
 #include <soc/iomap.h>
diff --git a/src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c b/src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c
index 58b5ba4..0982138 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c
+++ b/src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c
@@ -17,7 +17,6 @@

#include <console/console.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <string.h>
 #include <stdint.h>
 #include <cpu/amd/multicore.h>
diff --git a/src/mainboard/supermicro/h8qme_fam10/get_bus_conf.c b/src/mainboard/supermicro/h8qme_fam10/get_bus_conf.c
index b319558..280267e 100644
--- a/src/mainboard/supermicro/h8qme_fam10/get_bus_conf.c
+++ b/src/mainboard/supermicro/h8qme_fam10/get_bus_conf.c
@@ -17,7 +17,6 @@

#include <console/console.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <string.h>
 #include <stdint.h>
 #include <cpu/amd/multicore.h>
diff --git a/src/mainboard/supermicro/h8scm_fam10/acpi_tables.c b/src/mainboard/supermicro/h8scm_fam10/acpi_tables.c
index 1d6e7cb..4b2095a 100644
--- a/src/mainboard/supermicro/h8scm_fam10/acpi_tables.c
+++ b/src/mainboard/supermicro/h8scm_fam10/acpi_tables.c
@@ -17,7 +17,6 @@
 #include <arch/acpi.h>
 #include <arch/ioapic.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <cpu/amd/amdfam10_sysconf.h>

#include "mb_sysconf.h"
diff --git a/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c b/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c
index 3410673..bab194f 100644
--- a/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c
+++ b/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c
@@ -14,7 +14,6 @@
  */

#include <device/pci.h>
-#include <device/pci_ids.h>
 #include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/mainboard/supermicro/h8scm_fam10/romstage.c b/src/mainboard/supermicro/h8scm_fam10/romstage.c
index 3eeaeda..0ad1218 100644
--- a/src/mainboard/supermicro/h8scm_fam10/romstage.c
+++ b/src/mainboard/supermicro/h8scm_fam10/romstage.c
@@ -23,7 +23,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <device/pci_def.h>
-#include <device/pci_ids.h>
 #include <arch/io.h>
 #include <arch/cpu.h>
 #include <device/pnp_def.h>
diff --git a/src/mainboard/tyan/s2912_fam10/get_bus_conf.c b/src/mainboard/tyan/s2912_fam10/get_bus_conf.c
index 7164940..9f95b65 100644
--- a/src/mainboard/tyan/s2912_fam10/get_bus_conf.c
+++ b/src/mainboard/tyan/s2912_fam10/get_bus_conf.c
@@ -17,7 +17,6 @@

#include <console/console.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <string.h>
 #include <stdint.h>
 #include <cpu/amd/multicore.h>
diff --git a/src/mainboard/tyan/s2912_fam10/romstage.c b/src/mainboard/tyan/s2912_fam10/romstage.c
index 1734b3a..746ffd6 100644
--- a/src/mainboard/tyan/s2912_fam10/romstage.c
+++ b/src/mainboard/tyan/s2912_fam10/romstage.c
@@ -21,7 +21,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <device/pci_def.h>
-#include <device/pci_ids.h>
 #include <arch/io.h>
 #include <arch/cpu.h>
 #include <device/pnp_def.h>
diff --git a/src/mainboard/via/epia-m850/romstage.c b/src/mainboard/via/epia-m850/romstage.c
index dd303b7..d9ed0e6 100644
--- a/src/mainboard/via/epia-m850/romstage.c
+++ b/src/mainboard/via/epia-m850/romstage.c
@@ -19,7 +19,6 @@
  */
 #include <stdint.h>
 #include <device/pci_def.h>
-#include <device/pci_ids.h>
 #include <arch/io.h>
 #include <device/pnp_def.h>
 #include <console/console.h>
diff --git a/src/northbridge/amd/amdfam10/get_pci1234.c b/src/northbridge/amd/amdfam10/get_pci1234.c
index fee31b6..d9dd2ce 100644
--- a/src/northbridge/amd/amdfam10/get_pci1234.c
+++ b/src/northbridge/amd/amdfam10/get_pci1234.c
@@ -14,7 +14,6 @@
  */

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

diff --git a/src/northbridge/amd/amdht/comlib.c b/src/northbridge/amd/amdht/comlib.c
index 85cbbc4..7d9a547 100644
--- a/src/northbridge/amd/amdht/comlib.c
+++ b/src/northbridge/amd/amdht/comlib.c
@@ -21,7 +21,6 @@
 #include <console/console.h>
 #include <cpu/amd/msr.h>
 #include <device/pci_def.h>
-#include <device/pci_ids.h>

/*
diff --git a/src/northbridge/amd/amdht/h3finit.c b/src/northbridge/amd/amdht/h3finit.c
index ee1a4d4..436cb59 100644
--- a/src/northbridge/amd/amdht/h3finit.c
+++ b/src/northbridge/amd/amdht/h3finit.c
@@ -33,7 +33,6 @@
 #include <cpu/x86/lapic_def.h>
 #include <cpu/amd/msr.h>
 #include <device/pci_def.h>
-#include <device/pci_ids.h>
 #include <northbridge/amd/amdfam10/raminit.h>
 #include <northbridge/amd/amdfam10/amdfam10.h>

diff --git a/src/northbridge/amd/amdht/h3ncmn.c b/src/northbridge/amd/amdht/h3ncmn.c
index abb7458..8370b58 100644
--- a/src/northbridge/amd/amdht/h3ncmn.c
+++ b/src/northbridge/amd/amdht/h3ncmn.c
@@ -32,7 +32,6 @@
 #include <device/pci.h>
 #include <cpu/amd/msr.h>
 #include <device/pci_def.h>
-#include <device/pci_ids.h>
 #include <northbridge/amd/amdfam10/raminit.h>
 #include <northbridge/amd/amdfam10/amdfam10.h>

diff --git a/src/northbridge/amd/lx/northbridgeinit.c b/src/northbridge/amd/lx/northbridgeinit.c
index c7db156..9655c0e 100644
--- a/src/northbridge/amd/lx/northbridgeinit.c
+++ b/src/northbridge/amd/lx/northbridgeinit.c
@@ -19,7 +19,6 @@
 #include <stdint.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
 #include "northbridge.h"
diff --git a/src/northbridge/intel/gm45/acpi.c b/src/northbridge/intel/gm45/acpi.c
index 673478c..467c6c1 100644
--- a/src/northbridge/intel/gm45/acpi.c
+++ b/src/northbridge/intel/gm45/acpi.c
@@ -21,7 +21,6 @@
 #include <arch/acpigen.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include "gm45.h"

unsigned long acpi_fill_mcfg(unsigned long current)
diff --git a/src/northbridge/intel/gm45/northbridge.c b/src/northbridge/intel/gm45/northbridge.c
index a001a67..a04f7f3 100644
--- a/src/northbridge/intel/gm45/northbridge.c
+++ b/src/northbridge/intel/gm45/northbridge.c
@@ -19,7 +19,6 @@
 #include <stdint.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
 #include <cpu/cpu.h>
diff --git a/src/northbridge/intel/haswell/acpi.c b/src/northbridge/intel/haswell/acpi.c
index b3ceed9..a73432a 100644
--- a/src/northbridge/intel/haswell/acpi.c
+++ b/src/northbridge/intel/haswell/acpi.c
@@ -20,7 +20,6 @@
 #include <arch/acpi.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include "haswell.h"
 #include <southbridge/intel/lynxpoint/pch.h>

diff --git a/src/northbridge/intel/i945/acpi.c b/src/northbridge/intel/i945/acpi.c
index 0ce7e4b..c36044f 100644
--- a/src/northbridge/intel/i945/acpi.c
+++ b/src/northbridge/intel/i945/acpi.c
@@ -20,7 +20,6 @@
 #include <arch/acpigen.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include "i945.h"

unsigned long acpi_fill_mcfg(unsigned long current)
diff --git a/src/northbridge/intel/nehalem/acpi.c b/src/northbridge/intel/nehalem/acpi.c
index 7a106c9..08fc09c 100644
--- a/src/northbridge/intel/nehalem/acpi.c
+++ b/src/northbridge/intel/nehalem/acpi.c
@@ -21,7 +21,6 @@
 #include <types.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include "nehalem.h"

unsigned long acpi_fill_mcfg(unsigned long current)
diff --git a/src/northbridge/intel/pineview/northbridge.c b/src/northbridge/intel/pineview/northbridge.c
index 192c24e..33e8089 100644
--- a/src/northbridge/intel/pineview/northbridge.c
+++ b/src/northbridge/intel/pineview/northbridge.c
@@ -20,7 +20,6 @@
 #include <stdint.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
 #include <cpu/cpu.h>
diff --git a/src/northbridge/intel/sandybridge/acpi.c b/src/northbridge/intel/sandybridge/acpi.c
index 88ac2b1..0a31c85 100644
--- a/src/northbridge/intel/sandybridge/acpi.c
+++ b/src/northbridge/intel/sandybridge/acpi.c
@@ -20,7 +20,6 @@
 #include <arch/acpi.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include "sandybridge.h"
 #include <southbridge/intel/bd82x6x/pch.h>

diff --git a/src/northbridge/intel/sandybridge/common.c b/src/northbridge/intel/sandybridge/common.c
index 72b5603..8bfd476 100644
--- a/src/northbridge/intel/sandybridge/common.c
+++ b/src/northbridge/intel/sandybridge/common.c
@@ -19,7 +19,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include "sandybridge.h"

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

unsigned long acpi_fill_mcfg(unsigned long current)
diff --git a/src/northbridge/intel/x4x/northbridge.c b/src/northbridge/intel/x4x/northbridge.c
index d6094ac..af3019c 100644
--- a/src/northbridge/intel/x4x/northbridge.c
+++ b/src/northbridge/intel/x4x/northbridge.c
@@ -20,7 +20,6 @@
 #include <stdint.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
 #include <cpu/cpu.h>
diff --git a/src/soc/amd/stoneyridge/include/soc/southbridge.h b/src/soc/amd/stoneyridge/include/soc/southbridge.h
index 32756cd..88aa7db 100644
--- a/src/soc/amd/stoneyridge/include/soc/southbridge.h
+++ b/src/soc/amd/stoneyridge/include/soc/southbridge.h
@@ -19,7 +19,6 @@

#include <arch/io.h>
 #include <types.h>
-#include <device/pci_ids.h>
 #include <device/device.h>
 #include <device/pci_def.h>
 #include <soc/iomap.h>
diff --git a/src/soc/intel/apollolake/lpc.c b/src/soc/intel/apollolake/lpc.c
index 451aa73..a20b82a 100644
--- a/src/soc/intel/apollolake/lpc.c
+++ b/src/soc/intel/apollolake/lpc.c
@@ -16,7 +16,6 @@

#include <console/console.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <intelblocks/lpc_lib.h>
 #include <intelblocks/rtc.h>
 #include <soc/gpio.h>
diff --git a/src/soc/intel/baytrail/scc.c b/src/soc/intel/baytrail/scc.c
index 7f97f09..a6b4fe3 100644
--- a/src/soc/intel/baytrail/scc.c
+++ b/src/soc/intel/baytrail/scc.c
@@ -18,7 +18,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <reg_script.h>

#include <soc/iosf.h>
diff --git a/src/soc/intel/baytrail/spi.c b/src/soc/intel/baytrail/spi.c
index d81b878..d893816 100644
--- a/src/soc/intel/baytrail/spi.c
+++ b/src/soc/intel/baytrail/spi.c
@@ -21,7 +21,6 @@
 #include <arch/io.h>
 #include <commonlib/helpers.h>
 #include <console/console.h>
-#include <device/pci_ids.h>
 #include <spi_flash.h>
 #include <spi-generic.h>

diff --git a/src/soc/intel/braswell/acpi.c b/src/soc/intel/braswell/acpi.c
index 5c66ea1..efddc3b 100644
--- a/src/soc/intel/braswell/acpi.c
+++ b/src/soc/intel/braswell/acpi.c
@@ -28,7 +28,6 @@
 #include <cpu/x86/smm.h>
 #include <cpu/x86/tsc.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <ec/google/chromeec/ec.h>
 #include <drivers/intel/gma/opregion.h>
 #include <rules.h>
diff --git a/src/soc/intel/braswell/scc.c b/src/soc/intel/braswell/scc.c
index 17fc685..5c874e1 100644
--- a/src/soc/intel/braswell/scc.c
+++ b/src/soc/intel/braswell/scc.c
@@ -19,7 +19,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <soc/iosf.h>
 #include <soc/nvs.h>
 #include <soc/ramstage.h>
diff --git a/src/soc/intel/braswell/spi.c b/src/soc/intel/braswell/spi.c
index 0f42a90..a5f835d 100644
--- a/src/soc/intel/braswell/spi.c
+++ b/src/soc/intel/braswell/spi.c
@@ -19,7 +19,6 @@
 #include <commonlib/helpers.h>
 #include <console/console.h>
 #include <delay.h>
-#include <device/pci_ids.h>
 #include <rules.h>
 #include <soc/lpc.h>
 #include <soc/pci_devs.h>
diff --git a/src/soc/intel/broadwell/me_status.c b/src/soc/intel/broadwell/me_status.c
index 819e94c..3748701 100644
--- a/src/soc/intel/broadwell/me_status.c
+++ b/src/soc/intel/broadwell/me_status.c
@@ -16,7 +16,6 @@
 #include <arch/io.h>
 #include <console/console.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
 #include <soc/pci_devs.h>
diff --git a/src/soc/intel/broadwell/romstage/smbus.c b/src/soc/intel/broadwell/romstage/smbus.c
index 3f9dcd0..fd886c4 100644
--- a/src/soc/intel/broadwell/romstage/smbus.c
+++ b/src/soc/intel/broadwell/romstage/smbus.c
@@ -15,7 +15,6 @@
  */

#include <arch/io.h>
-#include <device/pci_ids.h>
 #include <device/pci_def.h>
 #include <reg_script.h>
 #include <soc/iomap.h>
diff --git a/src/soc/intel/broadwell/romstage/spi.c b/src/soc/intel/broadwell/romstage/spi.c
index c4a5452..2fd1fc8 100644
--- a/src/soc/intel/broadwell/romstage/spi.c
+++ b/src/soc/intel/broadwell/romstage/spi.c
@@ -15,7 +15,6 @@

#include <arch/io.h>
 #include <console/console.h>
-#include <device/pci_ids.h>
 #include <device/pci_def.h>
 #include <delay.h>
 #include <soc/spi.h>
diff --git a/src/soc/intel/broadwell/smbus_common.c b/src/soc/intel/broadwell/smbus_common.c
index bec988f..99ed55b 100644
--- a/src/soc/intel/broadwell/smbus_common.c
+++ b/src/soc/intel/broadwell/smbus_common.c
@@ -21,7 +21,6 @@
 #include <device/path.h>
 #include <device/smbus_def.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <soc/ramstage.h>
 #include <soc/smbus.h>

diff --git a/src/soc/intel/broadwell/spi.c b/src/soc/intel/broadwell/spi.c
index 2b2d603..2317c9a 100644
--- a/src/soc/intel/broadwell/spi.c
+++ b/src/soc/intel/broadwell/spi.c
@@ -20,7 +20,6 @@
 #include <delay.h>
 #include <arch/io.h>
 #include <console/console.h>
-#include <device/pci_ids.h>
 #include <spi_flash.h>
 #include <spi-generic.h>
 #include <soc/pci_devs.h>
diff --git a/src/soc/intel/cannonlake/bootblock/pch.c b/src/soc/intel/cannonlake/bootblock/pch.c
index b06c81b..73e159a 100644
--- a/src/soc/intel/cannonlake/bootblock/pch.c
+++ b/src/soc/intel/cannonlake/bootblock/pch.c
@@ -16,7 +16,6 @@

#include <console/console.h>
 #include <device/device.h>
-#include <device/pci_ids.h>
 #include <intelblocks/fast_spi.h>
 #include <intelblocks/gspi.h>
 #include <intelblocks/lpc_lib.h>
diff --git a/src/soc/intel/cannonlake/lpc.c b/src/soc/intel/cannonlake/lpc.c
index 0195cef..c33b3c3 100644
--- a/src/soc/intel/cannonlake/lpc.c
+++ b/src/soc/intel/cannonlake/lpc.c
@@ -19,7 +19,6 @@
 #include <delay.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <pc80/isa-dma.h>
 #include <pc80/i8259.h>
 #include <arch/io.h>
diff --git a/src/soc/intel/fsp_baytrail/acpi.c b/src/soc/intel/fsp_baytrail/acpi.c
index fb14af9..8fcbb52 100644
--- a/src/soc/intel/fsp_baytrail/acpi.c
+++ b/src/soc/intel/fsp_baytrail/acpi.c
@@ -29,7 +29,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <soc/baytrail.h>
-#include <device/pci_ids.h>
 #include <soc/pci_devs.h>
 #include <soc/acpi.h>
 #include <string.h>
diff --git a/src/soc/intel/fsp_baytrail/include/soc/i2c.h b/src/soc/intel/fsp_baytrail/include/soc/i2c.h
index 4efb9bd..7ac5f8f 100644
--- a/src/soc/intel/fsp_baytrail/include/soc/i2c.h
+++ b/src/soc/intel/fsp_baytrail/include/soc/i2c.h
@@ -18,7 +18,6 @@

#include <arch/io.h>
 #include <console/console.h>
-#include <device/pci_ids.h>
 #include <device/pci_def.h>
 #include <stdlib.h>

diff --git a/src/soc/intel/fsp_baytrail/spi.c b/src/soc/intel/fsp_baytrail/spi.c
index 26d2281..4537bcc 100644
--- a/src/soc/intel/fsp_baytrail/spi.c
+++ b/src/soc/intel/fsp_baytrail/spi.c
@@ -22,7 +22,6 @@
 #include <delay.h>
 #include <arch/io.h>
 #include <console/console.h>
-#include <device/pci_ids.h>
 #include <spi_flash.h>
 #include <spi-generic.h>

diff --git a/src/soc/intel/fsp_broadwell_de/smbus_common.c b/src/soc/intel/fsp_broadwell_de/smbus_common.c
index 20e8f09..e179b55 100644
--- a/src/soc/intel/fsp_broadwell_de/smbus_common.c
+++ b/src/soc/intel/fsp_broadwell_de/smbus_common.c
@@ -21,7 +21,6 @@
 #include <device/path.h>
 #include <device/smbus_def.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <soc/ramstage.h>
 #include <soc/smbus.h>

diff --git a/src/soc/intel/icelake/bootblock/pch.c b/src/soc/intel/icelake/bootblock/pch.c
index 5268856..28d669a 100644
--- a/src/soc/intel/icelake/bootblock/pch.c
+++ b/src/soc/intel/icelake/bootblock/pch.c
@@ -15,7 +15,6 @@

#include <console/console.h>
 #include <device/device.h>
-#include <device/pci_ids.h>
 #include <intelblocks/fast_spi.h>
 #include <intelblocks/gspi.h>
 #include <intelblocks/lpc_lib.h>
diff --git a/src/soc/intel/icelake/lpc.c b/src/soc/intel/icelake/lpc.c
index 9bf1b78..422ba1e 100644
--- a/src/soc/intel/icelake/lpc.c
+++ b/src/soc/intel/icelake/lpc.c
@@ -18,7 +18,6 @@
 #include <delay.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <pc80/isa-dma.h>
 #include <pc80/i8259.h>
 #include <arch/io.h>
diff --git a/src/soc/intel/quark/i2c.c b/src/soc/intel/quark/i2c.c
index 2a194af..a3bfb3b 100644
--- a/src/soc/intel/quark/i2c.c
+++ b/src/soc/intel/quark/i2c.c
@@ -19,7 +19,6 @@
 #include <device/device.h>
 #include <device/i2c_simple.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <soc/i2c.h>
 #include <soc/ramstage.h>
 #include <soc/reg_access.h>
diff --git a/src/soc/intel/quark/romstage/pcie.c b/src/soc/intel/quark/romstage/pcie.c
index bdc3902..dc54a32 100644
--- a/src/soc/intel/quark/romstage/pcie.c
+++ b/src/soc/intel/quark/romstage/pcie.c
@@ -15,7 +15,6 @@

#include <delay.h>
 #include <device/device.h>
-#include <device/pci_ids.h>
 #include <soc/pci_devs.h>
 #include <soc/reg_access.h>
 #include <soc/romstage.h>
diff --git a/src/soc/intel/skylake/lpc.c b/src/soc/intel/skylake/lpc.c
index 73757f2..8d97822 100644
--- a/src/soc/intel/skylake/lpc.c
+++ b/src/soc/intel/skylake/lpc.c
@@ -19,7 +19,6 @@
 #include <delay.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <pc80/isa-dma.h>
 #include <pc80/i8259.h>
 #include <arch/io.h>
diff --git a/src/soc/intel/skylake/me.c b/src/soc/intel/skylake/me.c
index 6baa568..64a94ab 100644
--- a/src/soc/intel/skylake/me.c
+++ b/src/soc/intel/skylake/me.c
@@ -18,7 +18,6 @@
 #include <commonlib/helpers.h>
 #include <console/console.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <intelblocks/cse.h>
 #include <soc/iomap.h>
 #include <soc/me.h>
diff --git a/src/southbridge/amd/agesa/hudson/bootblock.c b/src/southbridge/amd/agesa/hudson/bootblock.c
index 32b1298..bb6a54b 100644
--- a/src/southbridge/amd/agesa/hudson/bootblock.c
+++ b/src/southbridge/amd/agesa/hudson/bootblock.c
@@ -15,7 +15,6 @@

#include <stdint.h>
 #include <arch/io.h>
-#include <device/pci_ids.h>

/*
  * Enable 4MB (LPC) ROM access at 0xFFC00000 - 0xFFFFFFFF.
diff --git a/src/southbridge/amd/agesa/hudson/hudson.h b/src/southbridge/amd/agesa/hudson/hudson.h
index 165d33f..bd49e8f 100644
--- a/src/southbridge/amd/agesa/hudson/hudson.h
+++ b/src/southbridge/amd/agesa/hudson/hudson.h
@@ -17,7 +17,6 @@
 #ifndef HUDSON_H
 #define HUDSON_H

-#include <device/pci_ids.h>
 #include <device/device.h>
 #include "chip.h"

diff --git a/src/southbridge/amd/pi/hudson/hudson.h b/src/southbridge/amd/pi/hudson/hudson.h
index 922c608..27ae4ed 100644
--- a/src/southbridge/amd/pi/hudson/hudson.h
+++ b/src/southbridge/amd/pi/hudson/hudson.h
@@ -18,7 +18,6 @@
 #define HUDSON_H

#include <types.h>
-#include <device/pci_ids.h>
 #include <device/device.h>
 #include "chip.h"

diff --git a/src/southbridge/amd/rs780/cmn.c b/src/southbridge/amd/rs780/cmn.c
index 23cd877..16270d6 100644
--- a/src/southbridge/amd/rs780/cmn.c
+++ b/src/southbridge/amd/rs780/cmn.c
@@ -18,7 +18,6 @@
 #include <arch/cpu.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
diff --git a/src/southbridge/amd/rs780/pcie.c b/src/southbridge/amd/rs780/pcie.c
index adf5401..437a62a 100644
--- a/src/southbridge/amd/rs780/pcie.c
+++ b/src/southbridge/amd/rs780/pcie.c
@@ -16,7 +16,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <delay.h>
 #include "rs780.h"
diff --git a/src/southbridge/amd/rs780/rs780.c b/src/southbridge/amd/rs780/rs780.c
index 3c9393d..36b37cc 100644
--- a/src/southbridge/amd/rs780/rs780.c
+++ b/src/southbridge/amd/rs780/rs780.c
@@ -18,7 +18,6 @@
 #include <arch/acpi.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
diff --git a/src/southbridge/amd/rs780/rs780.h b/src/southbridge/amd/rs780/rs780.h
index e96608e..354555f 100644
--- a/src/southbridge/amd/rs780/rs780.h
+++ b/src/southbridge/amd/rs780/rs780.h
@@ -18,7 +18,6 @@

#include <rules.h>
 #include <stdint.h>
-#include <device/pci_ids.h>
 #include "chip.h"
 #include "rev.h"

diff --git a/src/southbridge/amd/sb700/bootblock.c b/src/southbridge/amd/sb700/bootblock.c
index e77db5c..364fa01 100644
--- a/src/southbridge/amd/sb700/bootblock.c
+++ b/src/southbridge/amd/sb700/bootblock.c
@@ -16,7 +16,6 @@

#include <stdint.h>
 #include <arch/io.h>
-#include <device/pci_ids.h>

#define IO_MEM_PORT_DECODE_ENABLE_5	0x48
 #define IO_MEM_PORT_DECODE_ENABLE_6	0x4a
diff --git a/src/southbridge/amd/sb700/sb700.h b/src/southbridge/amd/sb700/sb700.h
index 73c0b37..0b638f6 100644
--- a/src/southbridge/amd/sb700/sb700.h
+++ b/src/southbridge/amd/sb700/sb700.h
@@ -17,7 +17,6 @@
 #ifndef SB700_H
 #define SB700_H

-#include <device/pci_ids.h>
 #include "chip.h"

/* Power management index/data registers */
diff --git a/src/southbridge/amd/sb800/bootblock.c b/src/southbridge/amd/sb800/bootblock.c
index e95d4e9..b08d477 100644
--- a/src/southbridge/amd/sb800/bootblock.c
+++ b/src/southbridge/amd/sb800/bootblock.c
@@ -15,7 +15,6 @@

#include <stdint.h>
 #include <arch/io.h>
-#include <device/pci_ids.h>

/*
  * Enable 4MB (LPC) ROM access at 0xFFC00000 - 0xFFFFFFFF.
diff --git a/src/southbridge/amd/sb800/sb800.h b/src/southbridge/amd/sb800/sb800.h
index a65c68a9..3715a3a 100644
--- a/src/southbridge/amd/sb800/sb800.h
+++ b/src/southbridge/amd/sb800/sb800.h
@@ -17,7 +17,6 @@
 #ifndef SB800_H
 #define SB800_H

-#include <device/pci_ids.h>
 #include "chip.h"

/* Power management index/data registers */
diff --git a/src/southbridge/amd/sr5650/pcie.c b/src/southbridge/amd/sr5650/pcie.c
index 159f3e4..f2fd539 100644
--- a/src/southbridge/amd/sr5650/pcie.c
+++ b/src/southbridge/amd/sr5650/pcie.c
@@ -17,7 +17,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <delay.h>
 #include "sr5650.h"
diff --git a/src/southbridge/amd/sr5650/sr5650.h b/src/southbridge/amd/sr5650/sr5650.h
index 2e6b728..06a4279 100644
--- a/src/southbridge/amd/sr5650/sr5650.h
+++ b/src/southbridge/amd/sr5650/sr5650.h
@@ -19,7 +19,6 @@

#include <stdint.h>
 #include <arch/acpi.h>
-#include <device/pci_ids.h>
 #include "chip.h"
 #include "rev.h"

diff --git a/src/southbridge/intel/bd82x6x/early_me.c b/src/southbridge/intel/bd82x6x/early_me.c
index bda139b..ee149d0 100644
--- a/src/southbridge/intel/bd82x6x/early_me.c
+++ b/src/southbridge/intel/bd82x6x/early_me.c
@@ -17,7 +17,6 @@
 #include <arch/io.h>
 #include <console/console.h>
 #include <delay.h>
-#include <device/pci_ids.h>
 #include <device/pci_def.h>
 #include <halt.h>
 #include <string.h>
diff --git a/src/southbridge/intel/bd82x6x/early_me_mrc.c b/src/southbridge/intel/bd82x6x/early_me_mrc.c
index a6562c7..ed27573 100644
--- a/src/southbridge/intel/bd82x6x/early_me_mrc.c
+++ b/src/southbridge/intel/bd82x6x/early_me_mrc.c
@@ -17,7 +17,6 @@
 #include <arch/io.h>
 #include <console/console.h>
 #include <delay.h>
-#include <device/pci_ids.h>
 #include <device/pci_def.h>
 #include <halt.h>
 #include <string.h>
diff --git a/src/southbridge/intel/bd82x6x/early_smbus.c b/src/southbridge/intel/bd82x6x/early_smbus.c
index 4c67aea..3cd98ac 100644
--- a/src/southbridge/intel/bd82x6x/early_smbus.c
+++ b/src/southbridge/intel/bd82x6x/early_smbus.c
@@ -16,7 +16,6 @@

#include <arch/io.h>
 #include <console/console.h>
-#include <device/pci_ids.h>
 #include <device/pci_def.h>
 #include <southbridge/intel/common/smbus.h>
 #include "pch.h"
diff --git a/src/southbridge/intel/bd82x6x/early_spi.c b/src/southbridge/intel/bd82x6x/early_spi.c
index 1400837..e3f07ad 100644
--- a/src/southbridge/intel/bd82x6x/early_spi.c
+++ b/src/southbridge/intel/bd82x6x/early_spi.c
@@ -16,7 +16,6 @@

#include <arch/io.h>
 #include <console/console.h>
-#include <device/pci_ids.h>
 #include <device/pci_def.h>
 #include <delay.h>
 #include "pch.h"
diff --git a/src/southbridge/intel/bd82x6x/early_usb.c b/src/southbridge/intel/bd82x6x/early_usb.c
index 1044953..c34b3ec 100644
--- a/src/southbridge/intel/bd82x6x/early_usb.c
+++ b/src/southbridge/intel/bd82x6x/early_usb.c
@@ -15,7 +15,6 @@
  */

#include <arch/io.h>
-#include <device/pci_ids.h>
 #include <device/pci_def.h>
 #include <northbridge/intel/sandybridge/sandybridge.h>
 #include "pch.h"
diff --git a/src/southbridge/intel/bd82x6x/early_usb_mrc.c b/src/southbridge/intel/bd82x6x/early_usb_mrc.c
index 8006d95..e4fadad 100644
--- a/src/southbridge/intel/bd82x6x/early_usb_mrc.c
+++ b/src/southbridge/intel/bd82x6x/early_usb_mrc.c
@@ -15,7 +15,6 @@
  */

#include <arch/io.h>
-#include <device/pci_ids.h>
 #include <device/pci_def.h>
 #include "pch.h"

diff --git a/src/southbridge/intel/common/spi.c b/src/southbridge/intel/common/spi.c
index fe3bf2a..3ca0d6c 100644
--- a/src/southbridge/intel/common/spi.c
+++ b/src/southbridge/intel/common/spi.c
@@ -25,7 +25,6 @@
 #include <delay.h>
 #include <arch/io.h>
 #include <console/console.h>
-#include <device/pci_ids.h>
 #include <device/pci.h>
 #include <spi_flash.h>

diff --git a/src/southbridge/intel/fsp_rangeley/early_smbus.c b/src/southbridge/intel/fsp_rangeley/early_smbus.c
index 84b750e..9b47837 100644
--- a/src/southbridge/intel/fsp_rangeley/early_smbus.c
+++ b/src/southbridge/intel/fsp_rangeley/early_smbus.c
@@ -16,7 +16,6 @@

#include <arch/io.h>
 #include <console/console.h>
-#include <device/pci_ids.h>
 #include <device/pci_def.h>
 #include <southbridge/intel/common/smbus.h>
 #include "soc.h"
diff --git a/src/southbridge/intel/fsp_rangeley/early_spi.c b/src/southbridge/intel/fsp_rangeley/early_spi.c
index dbf6003..3c4f2d7 100644
--- a/src/southbridge/intel/fsp_rangeley/early_spi.c
+++ b/src/southbridge/intel/fsp_rangeley/early_spi.c
@@ -16,7 +16,6 @@

#include <arch/io.h>
 #include <console/console.h>
-#include <device/pci_ids.h>
 #include <device/pci_def.h>
 #include <delay.h>
 #include "soc.h"
diff --git a/src/southbridge/intel/fsp_rangeley/early_usb.c b/src/southbridge/intel/fsp_rangeley/early_usb.c
index 3bb8dab..0bcd09d 100644
--- a/src/southbridge/intel/fsp_rangeley/early_usb.c
+++ b/src/southbridge/intel/fsp_rangeley/early_usb.c
@@ -15,7 +15,6 @@
  */

#include <arch/io.h>
-#include <device/pci_ids.h>
 #include <device/pci_def.h>
 #include "soc.h"

diff --git a/src/southbridge/intel/i82371eb/acpi_tables.c b/src/southbridge/intel/i82371eb/acpi_tables.c
index 9a720e2..7c6d3b4 100644
--- a/src/southbridge/intel/i82371eb/acpi_tables.c
+++ b/src/southbridge/intel/i82371eb/acpi_tables.c
@@ -21,7 +21,6 @@
 #include <arch/acpigen.h>
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
-#include <device/pci_ids.h>
 #include "i82371eb.h"

static int determine_total_number_of_cores(void)
diff --git a/src/southbridge/intel/i82801dx/i82801dx.c b/src/southbridge/intel/i82801dx/i82801dx.c
index fc38207..8db591c 100644
--- a/src/southbridge/intel/i82801dx/i82801dx.c
+++ b/src/southbridge/intel/i82801dx/i82801dx.c
@@ -16,7 +16,6 @@

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

void i82801dx_enable(struct device *dev)
diff --git a/src/southbridge/intel/i82801gx/early_smbus.c b/src/southbridge/intel/i82801gx/early_smbus.c
index bb5caf5..698458b 100644
--- a/src/southbridge/intel/i82801gx/early_smbus.c
+++ b/src/southbridge/intel/i82801gx/early_smbus.c
@@ -16,7 +16,6 @@

#include <arch/io.h>
 #include <console/console.h>
-#include <device/pci_ids.h>
 #include <device/pci_def.h>
 #include <southbridge/intel/common/smbus.h>
 #include "i82801gx.h"
diff --git a/src/southbridge/intel/i82801ix/early_smbus.c b/src/southbridge/intel/i82801ix/early_smbus.c
index 0e4195c..0dda0c8 100644
--- a/src/southbridge/intel/i82801ix/early_smbus.c
+++ b/src/southbridge/intel/i82801ix/early_smbus.c
@@ -17,7 +17,6 @@

#include <arch/io.h>
 #include <console/console.h>
-#include <device/pci_ids.h>
 #include <device/pci_def.h>
 #include <southbridge/intel/common/smbus.h>
 #include "i82801ix.h"
diff --git a/src/southbridge/intel/i82801jx/early_smbus.c b/src/southbridge/intel/i82801jx/early_smbus.c
index 16932e0..bd68955 100644
--- a/src/southbridge/intel/i82801jx/early_smbus.c
+++ b/src/southbridge/intel/i82801jx/early_smbus.c
@@ -17,7 +17,6 @@

#include <arch/io.h>
 #include <console/console.h>
-#include <device/pci_ids.h>
 #include <device/pci_def.h>
 #include <southbridge/intel/common/smbus.h>
 #include "i82801jx.h"
diff --git a/src/southbridge/intel/ibexpeak/early_smbus.c b/src/southbridge/intel/ibexpeak/early_smbus.c
index b7823eb..8760a82 100644
--- a/src/southbridge/intel/ibexpeak/early_smbus.c
+++ b/src/southbridge/intel/ibexpeak/early_smbus.c
@@ -16,7 +16,6 @@

#include <arch/io.h>
 #include <console/console.h>
-#include <device/pci_ids.h>
 #include <device/pci_def.h>
 #include <southbridge/intel/common/smbus.h>
 #include "pch.h"
diff --git a/src/southbridge/intel/ibexpeak/madt.c b/src/southbridge/intel/ibexpeak/madt.c
index e02cd88..585df93 100644
--- a/src/southbridge/intel/ibexpeak/madt.c
+++ b/src/southbridge/intel/ibexpeak/madt.c
@@ -23,7 +23,6 @@
 #include <arch/smp/mpspec.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>

unsigned long acpi_fill_madt(unsigned long current)
 {
diff --git a/src/southbridge/intel/lynxpoint/early_me.c b/src/southbridge/intel/lynxpoint/early_me.c
index 674534f..e02a16c 100644
--- a/src/southbridge/intel/lynxpoint/early_me.c
+++ b/src/southbridge/intel/lynxpoint/early_me.c
@@ -17,7 +17,6 @@
 #include <arch/io.h>
 #include <console/console.h>
 #include <delay.h>
-#include <device/pci_ids.h>
 #include <halt.h>
 #include <string.h>
 #include "me.h"
diff --git a/src/southbridge/intel/lynxpoint/early_smbus.c b/src/southbridge/intel/lynxpoint/early_smbus.c
index 4c67aea..3cd98ac 100644
--- a/src/southbridge/intel/lynxpoint/early_smbus.c
+++ b/src/southbridge/intel/lynxpoint/early_smbus.c
@@ -16,7 +16,6 @@

#include <arch/io.h>
 #include <console/console.h>
-#include <device/pci_ids.h>
 #include <device/pci_def.h>
 #include <southbridge/intel/common/smbus.h>
 #include "pch.h"
diff --git a/src/southbridge/intel/lynxpoint/early_spi.c b/src/southbridge/intel/lynxpoint/early_spi.c
index 1400837..e3f07ad 100644
--- a/src/southbridge/intel/lynxpoint/early_spi.c
+++ b/src/southbridge/intel/lynxpoint/early_spi.c
@@ -16,7 +16,6 @@

#include <arch/io.h>
 #include <console/console.h>
-#include <device/pci_ids.h>
 #include <device/pci_def.h>
 #include <delay.h>
 #include "pch.h"
diff --git a/src/southbridge/intel/lynxpoint/early_usb.c b/src/southbridge/intel/lynxpoint/early_usb.c
index 60ab09d..4b44716 100644
--- a/src/southbridge/intel/lynxpoint/early_usb.c
+++ b/src/southbridge/intel/lynxpoint/early_usb.c
@@ -15,7 +15,6 @@
  */

#include <arch/io.h>
-#include <device/pci_ids.h>
 #include <device/pci_def.h>
 #include "pch.h"

diff --git a/src/southbridge/ti/pci7420/cardbus.c b/src/southbridge/ti/pci7420/cardbus.c
index 910b0c8..3c88529 100644
--- a/src/southbridge/ti/pci7420/cardbus.c
+++ b/src/southbridge/ti/pci7420/cardbus.c
@@ -18,7 +18,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include <device/pci_ids.h>
 #include <console/console.h>
 #include <device/cardbus.h>
 #include "pci7420.h"
diff --git a/src/southbridge/ti/pci7420/firewire.c b/src/southbridge/ti/pci7420/firewire.c
index e42b6a6..1379d59 100644
--- a/src/southbridge/ti/pci7420/firewire.c
+++ b/src/southbridge/ti/pci7420/firewire.c
@@ -18,7 +18,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include <device/pci_ids.h>
 #include <console/console.h>
 #include <device/cardbus.h>
 #include "pci7420.h"
diff --git a/src/southbridge/ti/pcixx12/pcixx12.c b/src/southbridge/ti/pcixx12/pcixx12.c
index ab7231e..6385ba9 100644
--- a/src/southbridge/ti/pcixx12/pcixx12.c
+++ b/src/southbridge/ti/pcixx12/pcixx12.c
@@ -17,7 +17,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include <device/pci_ids.h>
 #include <console/console.h>
 #include <device/cardbus.h>