summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/adi/rcc-dff/acpi_tables.c1
-rw-r--r--src/mainboard/advansus/a785e-i/acpi_tables.c1
-rw-r--r--src/mainboard/advansus/a785e-i/get_bus_conf.c1
-rw-r--r--src/mainboard/advansus/a785e-i/romstage.c1
-rw-r--r--src/mainboard/amd/bettong/acpi_tables.c1
-rw-r--r--src/mainboard/amd/bimini_fam10/acpi_tables.c1
-rw-r--r--src/mainboard/amd/bimini_fam10/get_bus_conf.c1
-rw-r--r--src/mainboard/amd/bimini_fam10/romstage.c1
-rw-r--r--src/mainboard/amd/db-ft3b-lc/acpi_tables.c1
-rw-r--r--src/mainboard/amd/db-ft3b-lc/romstage.c1
-rw-r--r--src/mainboard/amd/inagua/acpi_tables.c1
-rw-r--r--src/mainboard/amd/lamar/acpi_tables.c1
-rw-r--r--src/mainboard/amd/lamar/romstage.c1
-rw-r--r--src/mainboard/amd/mahogany_fam10/acpi_tables.c1
-rw-r--r--src/mainboard/amd/mahogany_fam10/get_bus_conf.c1
-rw-r--r--src/mainboard/amd/mahogany_fam10/romstage.c1
-rw-r--r--src/mainboard/amd/olivehill/acpi_tables.c1
-rw-r--r--src/mainboard/amd/olivehill/romstage.c1
-rw-r--r--src/mainboard/amd/olivehillplus/acpi_tables.c1
-rw-r--r--src/mainboard/amd/olivehillplus/romstage.c1
-rw-r--r--src/mainboard/amd/parmer/acpi_tables.c1
-rw-r--r--src/mainboard/amd/persimmon/acpi_tables.c1
-rw-r--r--src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c1
-rw-r--r--src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c1
-rw-r--r--src/mainboard/amd/serengeti_cheetah_fam10/romstage.c1
-rw-r--r--src/mainboard/amd/south_station/acpi_tables.c1
-rw-r--r--src/mainboard/amd/thatcher/acpi_tables.c1
-rw-r--r--src/mainboard/amd/thatcher/romstage.c1
-rw-r--r--src/mainboard/amd/tilapia_fam10/acpi_tables.c1
-rw-r--r--src/mainboard/amd/tilapia_fam10/get_bus_conf.c1
-rw-r--r--src/mainboard/amd/tilapia_fam10/romstage.c1
-rw-r--r--src/mainboard/amd/torpedo/acpi_tables.c1
-rw-r--r--src/mainboard/amd/union_station/acpi_tables.c1
-rw-r--r--src/mainboard/aopen/dxplplusu/acpi_tables.c1
-rw-r--r--src/mainboard/apple/macbook21/mainboard.c1
-rw-r--r--src/mainboard/asrock/e350m1/acpi_tables.c1
-rw-r--r--src/mainboard/asrock/imb-a180/acpi_tables.c1
-rw-r--r--src/mainboard/asrock/imb-a180/romstage.c1
-rw-r--r--src/mainboard/asus/am1i-a/acpi_tables.c1
-rw-r--r--src/mainboard/asus/f2a85-m/acpi_tables.c1
-rw-r--r--src/mainboard/asus/kcma-d8/acpi_tables.c1
-rw-r--r--src/mainboard/asus/kcma-d8/get_bus_conf.c1
-rw-r--r--src/mainboard/asus/kcma-d8/romstage.c1
-rw-r--r--src/mainboard/asus/kfsn4-dre/acpi_tables.c1
-rw-r--r--src/mainboard/asus/kfsn4-dre/get_bus_conf.c1
-rw-r--r--src/mainboard/asus/kgpe-d16/acpi_tables.c1
-rw-r--r--src/mainboard/asus/kgpe-d16/get_bus_conf.c1
-rw-r--r--src/mainboard/asus/kgpe-d16/romstage.c1
-rw-r--r--src/mainboard/asus/m4a78-em/acpi_tables.c1
-rw-r--r--src/mainboard/asus/m4a78-em/get_bus_conf.c1
-rw-r--r--src/mainboard/asus/m4a78-em/romstage.c1
-rw-r--r--src/mainboard/asus/m4a785-m/acpi_tables.c1
-rw-r--r--src/mainboard/asus/m4a785-m/get_bus_conf.c1
-rw-r--r--src/mainboard/asus/m4a785-m/romstage.c1
-rw-r--r--src/mainboard/asus/m5a88-v/acpi_tables.c1
-rw-r--r--src/mainboard/asus/m5a88-v/get_bus_conf.c1
-rw-r--r--src/mainboard/asus/m5a88-v/romstage.c1
-rw-r--r--src/mainboard/avalue/eax-785e/acpi_tables.c1
-rw-r--r--src/mainboard/avalue/eax-785e/get_bus_conf.c1
-rw-r--r--src/mainboard/avalue/eax-785e/romstage.c1
-rw-r--r--src/mainboard/bap/ode_e20XX/acpi_tables.c1
-rw-r--r--src/mainboard/bap/ode_e21XX/acpi_tables.c1
-rw-r--r--src/mainboard/bap/ode_e21XX/romstage.c1
-rw-r--r--src/mainboard/biostar/a68n_5200/acpi_tables.c1
-rw-r--r--src/mainboard/biostar/a68n_5200/romstage.c1
-rw-r--r--src/mainboard/biostar/am1ml/acpi_tables.c1
-rw-r--r--src/mainboard/elmex/pcm205400/acpi_tables.c1
-rw-r--r--src/mainboard/emulation/qemu-q35/acpi_tables.c1
-rw-r--r--src/mainboard/emulation/qemu-q35/mainboard.c1
-rw-r--r--src/mainboard/esd/atom15/acpi_tables.c1
-rw-r--r--src/mainboard/getac/p470/acpi_tables.c1
-rw-r--r--src/mainboard/gigabyte/ma785gm/acpi_tables.c1
-rw-r--r--src/mainboard/gigabyte/ma785gm/get_bus_conf.c1
-rw-r--r--src/mainboard/gigabyte/ma785gm/romstage.c1
-rw-r--r--src/mainboard/gigabyte/ma785gmt/acpi_tables.c1
-rw-r--r--src/mainboard/gigabyte/ma785gmt/get_bus_conf.c1
-rw-r--r--src/mainboard/gigabyte/ma785gmt/romstage.c1
-rw-r--r--src/mainboard/gigabyte/ma78gm/acpi_tables.c1
-rw-r--r--src/mainboard/gigabyte/ma78gm/get_bus_conf.c1
-rw-r--r--src/mainboard/gigabyte/ma78gm/romstage.c1
-rw-r--r--src/mainboard/gizmosphere/gizmo/acpi_tables.c1
-rw-r--r--src/mainboard/gizmosphere/gizmo2/acpi_tables.c1
-rw-r--r--src/mainboard/google/beltino/acpi_tables.c1
-rw-r--r--src/mainboard/google/jecht/acpi_tables.c1
-rw-r--r--src/mainboard/google/parrot/acpi_tables.c1
-rw-r--r--src/mainboard/google/rambi/acpi_tables.c1
-rw-r--r--src/mainboard/google/slippy/acpi_tables.c1
-rw-r--r--src/mainboard/google/stout/acpi_tables.c1
-rw-r--r--src/mainboard/hp/abm/acpi_tables.c1
-rw-r--r--src/mainboard/hp/dl165_g6_fam10/get_bus_conf.c1
-rw-r--r--src/mainboard/hp/dl165_g6_fam10/romstage.c1
-rw-r--r--src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c1
-rw-r--r--src/mainboard/iei/kino-780am2-fam10/acpi_tables.c1
-rw-r--r--src/mainboard/iei/kino-780am2-fam10/get_bus_conf.c1
-rw-r--r--src/mainboard/iei/kino-780am2-fam10/romstage.c1
-rw-r--r--src/mainboard/intel/baskingridge/acpi_tables.c1
-rw-r--r--src/mainboard/intel/bayleybay_fsp/acpi_tables.c1
-rw-r--r--src/mainboard/intel/emeraldlake2/acpi_tables.c1
-rw-r--r--src/mainboard/intel/harcuvar/acpi_tables.c1
-rw-r--r--src/mainboard/intel/littleplains/acpi_tables.c1
-rw-r--r--src/mainboard/intel/minnowmax/acpi_tables.c1
-rw-r--r--src/mainboard/intel/mohonpeak/acpi_tables.c1
-rw-r--r--src/mainboard/intel/strago/acpi_tables.c1
-rw-r--r--src/mainboard/intel/wtm2/acpi_tables.c1
-rw-r--r--src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c1
-rw-r--r--src/mainboard/jetway/pa78vm5/acpi_tables.c1
-rw-r--r--src/mainboard/jetway/pa78vm5/get_bus_conf.c1
-rw-r--r--src/mainboard/jetway/pa78vm5/romstage.c1
-rw-r--r--src/mainboard/lenovo/g505s/acpi_tables.c1
-rw-r--r--src/mainboard/lenovo/t400/acpi_tables.c1
-rw-r--r--src/mainboard/lenovo/x200/acpi_tables.c1
-rw-r--r--src/mainboard/lippert/frontrunner-af/acpi_tables.c1
-rw-r--r--src/mainboard/lippert/toucan-af/acpi_tables.c1
-rw-r--r--src/mainboard/msi/ms7721/acpi_tables.c1
-rw-r--r--src/mainboard/msi/ms9652_fam10/acpi_tables.c1
-rw-r--r--src/mainboard/msi/ms9652_fam10/get_bus_conf.c1
-rw-r--r--src/mainboard/packardbell/ms2290/mainboard.c1
-rw-r--r--src/mainboard/pcengines/apu1/acpi_tables.c1
-rw-r--r--src/mainboard/pcengines/apu2/acpi_tables.c1
-rw-r--r--src/mainboard/pcengines/apu2/romstage.c1
-rw-r--r--src/mainboard/roda/rk9/acpi_tables.c1
-rw-r--r--src/mainboard/samsung/lumpy/acpi_tables.c1
-rw-r--r--src/mainboard/samsung/stumpy/acpi_tables.c1
-rw-r--r--src/mainboard/scaleway/tagada/acpi_tables.c1
-rw-r--r--src/mainboard/siemens/mc_tcu3/acpi_tables.c1
-rw-r--r--src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c1
-rw-r--r--src/mainboard/supermicro/h8qme_fam10/get_bus_conf.c1
-rw-r--r--src/mainboard/supermicro/h8scm_fam10/acpi_tables.c1
-rw-r--r--src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c1
-rw-r--r--src/mainboard/supermicro/h8scm_fam10/romstage.c1
-rw-r--r--src/mainboard/tyan/s2912_fam10/get_bus_conf.c1
-rw-r--r--src/mainboard/via/epia-m850/romstage.c1
132 files changed, 0 insertions, 132 deletions
diff --git a/src/mainboard/adi/rcc-dff/acpi_tables.c b/src/mainboard/adi/rcc-dff/acpi_tables.c
index 00a0b7484bf9..bc5f953451b4 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 0cf430046707..d7b6fefeebff 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 82c7df0c90e8..c3909775241c 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 e8e2ec72664c..c63c2feb35af 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 9f1eb46061dd..676318d17a1e 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 ca18f06bc10e..a140e28f02a7 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 d38d37cda4e5..8ad67301963b 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 9d05096846a7..6c40f6e036e9 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 ade8dd6df05d..6188cd23ace2 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 4aceeea3ea4a..712ba67be5df 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 567c108d364f..74be72f2179f 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 6466156b8acc..cfae02e5f549 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 7f811c5abfc0..4a99834bad79 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 33234eba13d8..3cba4e8168f2 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 09aead726f95..eca0ba7187f9 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 39ff7a0f8650..ef7afdeb71ae 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 d56a2432b490..84ad76e734d4 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 35ca4b14c8f3..fc55660e5cac 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 ade8dd6df05d..6188cd23ace2 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 3cd8b732cdd9..d7afe960e983 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 3cbca2d52a13..cd28d9df988b 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 0734faf86e24..5727da868015 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 03b849d0d08e..bf8ef2a824cc 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 4e84fb2062ae..5fc708df31ca 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 e923513e9cdb..fcb10b1daa63 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 567c108d364f..74be72f2179f 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 3cbca2d52a13..cd28d9df988b 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 d4097fff2953..645afd4d32fe 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 49d6923deae4..6261a96de57e 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 09aead726f95..eca0ba7187f9 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 4e1a72e9ebf7..0001f9326045 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 a0c75ab3db0a..e3beb740bbdb 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 567c108d364f..74be72f2179f 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 e60b31481341..29814030ad07 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 49d342753fb9..3f4d6e63384e 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 2cd7e2a31c3a..a61d91e10268 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 d56a2432b490..84ad76e734d4 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 8a5e05d948f1..3a1472b28138 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 f151490e2067..68cd23999b12 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 45e59d26fe95..f94fde014f94 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 9c2f294c8e96..7da13908be68 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 014ef537fa91..62b726cc82fb 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 5b12845834ab..12c0926f8719 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 dd5a07615b17..36f55afd4790 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 5c8c75e9ce23..c8bf9a872889 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 9c2f294c8e96..7da13908be68 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 014ef537fa91..62b726cc82fb 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 1b586fd36966..31ba25192c93 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 ca0c0a3f0c41..8b5f1b53787e 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 09aead726f95..eca0ba7187f9 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 96d80cc11868..3175a027551f 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 48c70d173fc3..541e4837fd3e 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 09aead726f95..eca0ba7187f9 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 8eb92264b174..8dbaefa21dbe 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 0cf430046707..d7b6fefeebff 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 a57b73851473..780630568ce6 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 bb43dd58408f..3ad33ec862b6 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 0cf430046707..d7b6fefeebff 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 a57b73851473..780630568ce6 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 ba7e7ad14dd7..85ff722f5991 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 d56a2432b490..84ad76e734d4 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 ade8dd6df05d..6188cd23ace2 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 eefda26b3e3c..ea7dcb07a852 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 d56a2432b490..84ad76e734d4 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 e081a58aab23..43b2c82e705f 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 f151490e2067..68cd23999b12 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 0734faf86e24..5727da868015 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 5a36cb141cca..b8df5091a549 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 f89b0a88fede..90a32f4000fb 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 a7f71e2ddc46..bdb201c42770 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 30364bab1970..162c20a89186 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 49d6923deae4..6261a96de57e 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 09aead726f95..eca0ba7187f9 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 098baacdcedd..3a777f2adb78 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 ed5772dcab71..0cdcdb791cfe 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 09aead726f95..eca0ba7187f9 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 05d2e04ac435..d08e1e03ab6b 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 ed5772dcab71..0cdcdb791cfe 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 09aead726f95..eca0ba7187f9 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 536a041f55ba..7e854980ec46 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 2db0a46cc14b..644ab96e013d 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 d56a2432b490..84ad76e734d4 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 3f6e9de68641..f7b51a94230f 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 4e86f87b0bb8..9bc1816a2d7a 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 36139b1cf3df..61dcde10f06f 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 ecfab5668ad2..d9f511ace9c9 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 b17f5a629613..0ffd05469572 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 735d70f18617..9fbdcfcd3355 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 d56a2432b490..84ad76e734d4 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 b29fb2c51e7e..c43509ccbd28 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 1b2b40bf467d..5b19688d68d1 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 45e59d26fe95..f94fde014f94 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 33234eba13d8..3cba4e8168f2 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 09aead726f95..eca0ba7187f9 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 fc1b32f06c12..72146e7ef426 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 d6dce6172fa9..c5293dc9dd19 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 1536e2d64d02..0a1656519a2a 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 6c7d87a63a77..d5deff033165 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 3d83d3cbd1f1..92cf5a242539 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 00a0b7484bf9..bc5f953451b4 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 a7f71e2ddc46..bdb201c42770 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 00a0b7484bf9..bc5f953451b4 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 d830c3a4347f..62fcc19c0f8c 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 7579b2b1c437..16cd0c614f97 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 2cd7e2a31c3a..a61d91e10268 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 87881b071342..8c6a0962f5d3 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 09aead726f95..eca0ba7187f9 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 f75c5a4d4826..45ee1c2c2711 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 45e59d26fe95..f94fde014f94 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 2893d398f3ca..24c3a794e354 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 2893d398f3ca..24c3a794e354 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 567c108d364f..74be72f2179f 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 567c108d364f..74be72f2179f 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 45e59d26fe95..f94fde014f94 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 1ab102918eaa..5b00374abc78 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 9c744ced1ac9..4f9499b5233f 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 77a626dfdb9f..de9f13d0e3cd 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 0734faf86e24..5727da868015 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 ade8dd6df05d..6188cd23ace2 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 55a89fb0c299..329e7988fb17 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 b67378455937..7ddc5b850959 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 c801b348c485..e1364b6cef6d 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 f875b88854d0..ad3b29cf8e96 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 3d83d3cbd1f1..92cf5a242539 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 1536e2d64d02..0a1656519a2a 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 58b5ba4ff9ed..0982138f6875 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 b3195584fde9..280267e01817 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 1d6e7cb8eb6d..4b2095ac1050 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 3410673f25b0..bab194ff3f62 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 3eeaeda0c522..0ad12188d1f9 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 7164940b9122..9f95b6563ea8 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/via/epia-m850/romstage.c b/src/mainboard/via/epia-m850/romstage.c
index dd303b7b874a..d9ed0e67cb47 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>