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

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

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 00a0b7484b..bc5f953451 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 0cf4300467..d7b6fefeeb 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 82c7df0c90..c390977524 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 e8e2ec7266..c63c2feb35 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 9f1eb46061..676318d17a 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 ca18f06bc1..a140e28f02 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 d38d37cda4..8ad6730196 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 9d05096846..6c40f6e036 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 ade8dd6df0..6188cd23ac 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 4aceeea3ea..712ba67be5 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 567c108d36..74be72f217 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 6466156b8a..cfae02e5f5 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 7f811c5abf..4a99834bad 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 33234eba13..3cba4e8168 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 09aead726f..eca0ba7187 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 39ff7a0f86..ef7afdeb71 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 d56a2432b4..84ad76e734 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 35ca4b14c8..fc55660e5c 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 ade8dd6df0..6188cd23ac 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 3cd8b732cd..d7afe960e9 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 3cbca2d52a..cd28d9df98 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 0734faf86e..5727da8680 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 03b849d0d0..bf8ef2a824 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 4e84fb2062..5fc708df31 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 e923513e9c..fcb10b1daa 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 567c108d36..74be72f217 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 3cbca2d52a..cd28d9df98 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 d4097fff29..645afd4d32 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 49d6923dea..6261a96de5 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 09aead726f..eca0ba7187 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 4e1a72e9eb..0001f93260 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 a0c75ab3db..e3beb740bb 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 567c108d36..74be72f217 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 e60b314813..29814030ad 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 49d342753f..3f4d6e6338 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 2cd7e2a31c..a61d91e102 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 d56a2432b4..84ad76e734 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 8a5e05d948..3a1472b281 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 f151490e20..68cd23999b 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 45e59d26fe..f94fde014f 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 9c2f294c8e..7da13908be 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 014ef537fa..62b726cc82 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 5b12845834..12c0926f87 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 dd5a07615b..36f55afd47 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 5c8c75e9ce..c8bf9a8728 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 9c2f294c8e..7da13908be 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 014ef537fa..62b726cc82 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 1b586fd369..31ba25192c 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 ca0c0a3f0c..8b5f1b5378 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 09aead726f..eca0ba7187 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 96d80cc118..3175a02755 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 48c70d173f..541e4837fd 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 09aead726f..eca0ba7187 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 8eb92264b1..8dbaefa21d 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 0cf4300467..d7b6fefeeb 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 a57b738514..780630568c 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 bb43dd5840..3ad33ec862 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 0cf4300467..d7b6fefeeb 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 a57b738514..780630568c 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 ba7e7ad14d..85ff722f59 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 d56a2432b4..84ad76e734 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 ade8dd6df0..6188cd23ac 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 eefda26b3e..ea7dcb07a8 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 d56a2432b4..84ad76e734 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 e081a58aab..43b2c82e70 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 f151490e20..68cd23999b 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 0734faf86e..5727da8680 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 5a36cb141c..b8df5091a5 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 f89b0a88fe..90a32f4000 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 a7f71e2ddc..bdb201c427 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 30364bab19..162c20a891 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 49d6923dea..6261a96de5 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 09aead726f..eca0ba7187 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 098baacdce..3a777f2adb 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 ed5772dcab..0cdcdb791c 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 09aead726f..eca0ba7187 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 05d2e04ac4..d08e1e03ab 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 ed5772dcab..0cdcdb791c 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 09aead726f..eca0ba7187 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 536a041f55..7e854980ec 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 2db0a46cc1..644ab96e01 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 d56a2432b4..84ad76e734 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 3f6e9de686..f7b51a9423 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 4e86f87b0b..9bc1816a2d 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 36139b1cf3..61dcde10f0 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 ecfab5668a..d9f511ace9 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 b17f5a6296..0ffd054695 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 735d70f186..9fbdcfcd33 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 d56a2432b4..84ad76e734 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 b29fb2c51e..c43509ccbd 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 1b2b40bf46..5b19688d68 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 45e59d26fe..f94fde014f 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 33234eba13..3cba4e8168 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 09aead726f..eca0ba7187 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 fc1b32f06c..72146e7ef4 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 d6dce6172f..c5293dc9dd 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 1536e2d64d..0a1656519a 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 6c7d87a63a..d5deff0331 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 3d83d3cbd1..92cf5a2425 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 00a0b7484b..bc5f953451 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 a7f71e2ddc..bdb201c427 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 00a0b7484b..bc5f953451 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 d830c3a434..62fcc19c0f 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 7579b2b1c4..16cd0c614f 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 2cd7e2a31c..a61d91e102 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 87881b0713..8c6a0962f5 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 09aead726f..eca0ba7187 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 f75c5a4d48..45ee1c2c27 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 45e59d26fe..f94fde014f 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 2893d398f3..24c3a794e3 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 2893d398f3..24c3a794e3 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 567c108d36..74be72f217 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 567c108d36..74be72f217 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 45e59d26fe..f94fde014f 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 1ab102918e..5b00374abc 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 9c744ced1a..4f9499b523 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 77a626dfdb..de9f13d0e3 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 0734faf86e..5727da8680 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 ade8dd6df0..6188cd23ac 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 55a89fb0c2..329e7988fb 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 b673784559..7ddc5b8509 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 c801b348c4..e1364b6cef 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 f875b88854..ad3b29cf8e 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 3d83d3cbd1..92cf5a2425 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 1536e2d64d..0a1656519a 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 58b5ba4ff9..0982138f68 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 b3195584fd..280267e018 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 1d6e7cb8eb..4b2095ac10 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 3410673f25..bab194ff3f 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 3eeaeda0c5..0ad12188d1 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 7164940b91..9f95b6563e 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 dd303b7b87..d9ed0e67cb 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>