diff --git a/src/soc/amd/stoneyridge/include/soc/southbridge.h b/src/soc/amd/stoneyridge/include/soc/southbridge.h
index 32756cd364..88aa7db874 100644
--- a/src/soc/amd/stoneyridge/include/soc/southbridge.h
+++ b/src/soc/amd/stoneyridge/include/soc/southbridge.h
@@ -19,7 +19,6 @@
 
 #include <arch/io.h>
 #include <types.h>
-#include <device/pci_ids.h>
 #include <device/device.h>
 #include <device/pci_def.h>
 #include <soc/iomap.h>
diff --git a/src/soc/intel/apollolake/lpc.c b/src/soc/intel/apollolake/lpc.c
index 451aa736d1..a20b82ae0a 100644
--- a/src/soc/intel/apollolake/lpc.c
+++ b/src/soc/intel/apollolake/lpc.c
@@ -16,7 +16,6 @@
 
 #include <console/console.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <intelblocks/lpc_lib.h>
 #include <intelblocks/rtc.h>
 #include <soc/gpio.h>
diff --git a/src/soc/intel/baytrail/scc.c b/src/soc/intel/baytrail/scc.c
index 7f97f09147..a6b4fe3f2f 100644
--- a/src/soc/intel/baytrail/scc.c
+++ b/src/soc/intel/baytrail/scc.c
@@ -18,7 +18,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <reg_script.h>
 
 #include <soc/iosf.h>
diff --git a/src/soc/intel/baytrail/spi.c b/src/soc/intel/baytrail/spi.c
index d81b878e51..d893816145 100644
--- a/src/soc/intel/baytrail/spi.c
+++ b/src/soc/intel/baytrail/spi.c
@@ -21,7 +21,6 @@
 #include <arch/io.h>
 #include <commonlib/helpers.h>
 #include <console/console.h>
-#include <device/pci_ids.h>
 #include <spi_flash.h>
 #include <spi-generic.h>
 
diff --git a/src/soc/intel/braswell/acpi.c b/src/soc/intel/braswell/acpi.c
index 5c66ea127a..efddc3b447 100644
--- a/src/soc/intel/braswell/acpi.c
+++ b/src/soc/intel/braswell/acpi.c
@@ -28,7 +28,6 @@
 #include <cpu/x86/smm.h>
 #include <cpu/x86/tsc.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <ec/google/chromeec/ec.h>
 #include <drivers/intel/gma/opregion.h>
 #include <rules.h>
diff --git a/src/soc/intel/braswell/scc.c b/src/soc/intel/braswell/scc.c
index 17fc685b3c..5c874e198c 100644
--- a/src/soc/intel/braswell/scc.c
+++ b/src/soc/intel/braswell/scc.c
@@ -19,7 +19,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <soc/iosf.h>
 #include <soc/nvs.h>
 #include <soc/ramstage.h>
diff --git a/src/soc/intel/braswell/spi.c b/src/soc/intel/braswell/spi.c
index 0f42a90e2d..a5f835d55a 100644
--- a/src/soc/intel/braswell/spi.c
+++ b/src/soc/intel/braswell/spi.c
@@ -19,7 +19,6 @@
 #include <commonlib/helpers.h>
 #include <console/console.h>
 #include <delay.h>
-#include <device/pci_ids.h>
 #include <rules.h>
 #include <soc/lpc.h>
 #include <soc/pci_devs.h>
diff --git a/src/soc/intel/broadwell/me_status.c b/src/soc/intel/broadwell/me_status.c
index 819e94ce3c..374870185b 100644
--- a/src/soc/intel/broadwell/me_status.c
+++ b/src/soc/intel/broadwell/me_status.c
@@ -16,7 +16,6 @@
 #include <arch/io.h>
 #include <console/console.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
 #include <soc/pci_devs.h>
diff --git a/src/soc/intel/broadwell/romstage/smbus.c b/src/soc/intel/broadwell/romstage/smbus.c
index 3f9dcd0ab7..fd886c47f9 100644
--- a/src/soc/intel/broadwell/romstage/smbus.c
+++ b/src/soc/intel/broadwell/romstage/smbus.c
@@ -15,7 +15,6 @@
  */
 
 #include <arch/io.h>
-#include <device/pci_ids.h>
 #include <device/pci_def.h>
 #include <reg_script.h>
 #include <soc/iomap.h>
diff --git a/src/soc/intel/broadwell/romstage/spi.c b/src/soc/intel/broadwell/romstage/spi.c
index c4a5452c20..2fd1fc8532 100644
--- a/src/soc/intel/broadwell/romstage/spi.c
+++ b/src/soc/intel/broadwell/romstage/spi.c
@@ -15,7 +15,6 @@
 
 #include <arch/io.h>
 #include <console/console.h>
-#include <device/pci_ids.h>
 #include <device/pci_def.h>
 #include <delay.h>
 #include <soc/spi.h>
diff --git a/src/soc/intel/broadwell/smbus_common.c b/src/soc/intel/broadwell/smbus_common.c
index bec988f74f..99ed55b531 100644
--- a/src/soc/intel/broadwell/smbus_common.c
+++ b/src/soc/intel/broadwell/smbus_common.c
@@ -21,7 +21,6 @@
 #include <device/path.h>
 #include <device/smbus_def.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <soc/ramstage.h>
 #include <soc/smbus.h>
 
diff --git a/src/soc/intel/broadwell/spi.c b/src/soc/intel/broadwell/spi.c
index 2b2d603b68..2317c9a137 100644
--- a/src/soc/intel/broadwell/spi.c
+++ b/src/soc/intel/broadwell/spi.c
@@ -20,7 +20,6 @@
 #include <delay.h>
 #include <arch/io.h>
 #include <console/console.h>
-#include <device/pci_ids.h>
 #include <spi_flash.h>
 #include <spi-generic.h>
 #include <soc/pci_devs.h>
diff --git a/src/soc/intel/cannonlake/bootblock/pch.c b/src/soc/intel/cannonlake/bootblock/pch.c
index b06c81bf32..73e159ab09 100644
--- a/src/soc/intel/cannonlake/bootblock/pch.c
+++ b/src/soc/intel/cannonlake/bootblock/pch.c
@@ -16,7 +16,6 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci_ids.h>
 #include <intelblocks/fast_spi.h>
 #include <intelblocks/gspi.h>
 #include <intelblocks/lpc_lib.h>
diff --git a/src/soc/intel/cannonlake/lpc.c b/src/soc/intel/cannonlake/lpc.c
index 0195cefb84..c33b3c33d4 100644
--- a/src/soc/intel/cannonlake/lpc.c
+++ b/src/soc/intel/cannonlake/lpc.c
@@ -19,7 +19,6 @@
 #include <delay.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <pc80/isa-dma.h>
 #include <pc80/i8259.h>
 #include <arch/io.h>
diff --git a/src/soc/intel/fsp_baytrail/acpi.c b/src/soc/intel/fsp_baytrail/acpi.c
index fb14af984c..8fcbb5260f 100644
--- a/src/soc/intel/fsp_baytrail/acpi.c
+++ b/src/soc/intel/fsp_baytrail/acpi.c
@@ -29,7 +29,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <soc/baytrail.h>
-#include <device/pci_ids.h>
 #include <soc/pci_devs.h>
 #include <soc/acpi.h>
 #include <string.h>
diff --git a/src/soc/intel/fsp_baytrail/include/soc/i2c.h b/src/soc/intel/fsp_baytrail/include/soc/i2c.h
index 4efb9bd1b9..7ac5f8f499 100644
--- a/src/soc/intel/fsp_baytrail/include/soc/i2c.h
+++ b/src/soc/intel/fsp_baytrail/include/soc/i2c.h
@@ -18,7 +18,6 @@
 
 #include <arch/io.h>
 #include <console/console.h>
-#include <device/pci_ids.h>
 #include <device/pci_def.h>
 #include <stdlib.h>
 
diff --git a/src/soc/intel/fsp_baytrail/spi.c b/src/soc/intel/fsp_baytrail/spi.c
index 26d2281a68..4537bcc339 100644
--- a/src/soc/intel/fsp_baytrail/spi.c
+++ b/src/soc/intel/fsp_baytrail/spi.c
@@ -22,7 +22,6 @@
 #include <delay.h>
 #include <arch/io.h>
 #include <console/console.h>
-#include <device/pci_ids.h>
 #include <spi_flash.h>
 #include <spi-generic.h>
 
diff --git a/src/soc/intel/fsp_broadwell_de/smbus_common.c b/src/soc/intel/fsp_broadwell_de/smbus_common.c
index 20e8f0941e..e179b55987 100644
--- a/src/soc/intel/fsp_broadwell_de/smbus_common.c
+++ b/src/soc/intel/fsp_broadwell_de/smbus_common.c
@@ -21,7 +21,6 @@
 #include <device/path.h>
 #include <device/smbus_def.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <soc/ramstage.h>
 #include <soc/smbus.h>
 
diff --git a/src/soc/intel/icelake/bootblock/pch.c b/src/soc/intel/icelake/bootblock/pch.c
index 5268856007..28d669aa2c 100644
--- a/src/soc/intel/icelake/bootblock/pch.c
+++ b/src/soc/intel/icelake/bootblock/pch.c
@@ -15,7 +15,6 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci_ids.h>
 #include <intelblocks/fast_spi.h>
 #include <intelblocks/gspi.h>
 #include <intelblocks/lpc_lib.h>
diff --git a/src/soc/intel/icelake/lpc.c b/src/soc/intel/icelake/lpc.c
index 9bf1b789dd..422ba1e3f5 100644
--- a/src/soc/intel/icelake/lpc.c
+++ b/src/soc/intel/icelake/lpc.c
@@ -18,7 +18,6 @@
 #include <delay.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <pc80/isa-dma.h>
 #include <pc80/i8259.h>
 #include <arch/io.h>
diff --git a/src/soc/intel/quark/i2c.c b/src/soc/intel/quark/i2c.c
index 2a194af768..a3bfb3bcbb 100644
--- a/src/soc/intel/quark/i2c.c
+++ b/src/soc/intel/quark/i2c.c
@@ -19,7 +19,6 @@
 #include <device/device.h>
 #include <device/i2c_simple.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <soc/i2c.h>
 #include <soc/ramstage.h>
 #include <soc/reg_access.h>
diff --git a/src/soc/intel/quark/romstage/pcie.c b/src/soc/intel/quark/romstage/pcie.c
index bdc3902e6c..dc54a3274c 100644
--- a/src/soc/intel/quark/romstage/pcie.c
+++ b/src/soc/intel/quark/romstage/pcie.c
@@ -15,7 +15,6 @@
 
 #include <delay.h>
 #include <device/device.h>
-#include <device/pci_ids.h>
 #include <soc/pci_devs.h>
 #include <soc/reg_access.h>
 #include <soc/romstage.h>
diff --git a/src/soc/intel/skylake/lpc.c b/src/soc/intel/skylake/lpc.c
index 73757f25f0..8d978222a2 100644
--- a/src/soc/intel/skylake/lpc.c
+++ b/src/soc/intel/skylake/lpc.c
@@ -19,7 +19,6 @@
 #include <delay.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <pc80/isa-dma.h>
 #include <pc80/i8259.h>
 #include <arch/io.h>
diff --git a/src/soc/intel/skylake/me.c b/src/soc/intel/skylake/me.c
index 6baa568efa..64a94ab0f7 100644
--- a/src/soc/intel/skylake/me.c
+++ b/src/soc/intel/skylake/me.c
@@ -18,7 +18,6 @@
 #include <commonlib/helpers.h>
 #include <console/console.h>
 #include <device/pci.h>
-#include <device/pci_ids.h>
 #include <intelblocks/cse.h>
 #include <soc/iomap.h>
 #include <soc/me.h>