commit 7cba1c486beb9287dc563784904d2a8e0235340a
author Elyes Haouas <ehaouas@noos.fr> Tue Jan 31 07:39:43 2023 +0100
committer Elyes Haouas <ehaouas@noos.fr> Wed Feb 01 03:03:34 2023 +0000
tree 89b09e2fefe971a877a9a01e83fc4959c4acdab5
parent ddcb7f1cc410577726f1c34842cf3065ac985ec0

treewide: Remove duplicated include <device/pci.h>

<device/pci.h> chain-includes <device/pci_def.h> & <device/pci_type.h>.

Change-Id: I4e5999443e81ee1c4b1fd69942050b47f21f42f8
Signed-off-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/72626
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

src/arch/x86/smbios.c

diff --git a/src/arch/x86/smbios.c b/src/arch/x86/smbios.c
index 0b1f8fd..c505bb0 100644
--- a/src/arch/x86/smbios.c
+++ b/src/arch/x86/smbios.c
@@ -16,7 +16,6 @@
 #include <cbmem.h>
 #include <commonlib/helpers.h>
 #include <device/pci_ids.h>
-#include <device/pci_def.h>
 #include <device/pci.h>
 #include <drivers/vpd/vpd.h>
 #include <stdlib.h>

src/device/pci_early.c

diff --git a/src/device/pci_early.c b/src/device/pci_early.c
index 590b170..86278f9 100644
--- a/src/device/pci_early.c
+++ b/src/device/pci_early.c
@@ -1,9 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ops.h>
-#include <device/pci_type.h>
 #include <delay.h>
 
 void pci_s_assert_secondary_reset(pci_devfn_t p2p_bridge)

src/device/pci_ops.c

diff --git a/src/device/pci_ops.c b/src/device/pci_ops.c
index a4ef405..31b7345 100644
--- a/src/device/pci_ops.c
+++ b/src/device/pci_ops.c
@@ -3,9 +3,7 @@
 #include <stdint.h>
 #include <console/console.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ops.h>
-#include <device/pci_type.h>
 
 u8 *const pci_mmconf = (void *)(uintptr_t)CONFIG_ECAM_MMCONF_BASE_ADDRESS;
 

src/drivers/intel/i210/i210.c

diff --git a/src/drivers/intel/i210/i210.c b/src/drivers/intel/i210/i210.c
index 018a67d..45219c6 100644
--- a/src/drivers/intel/i210/i210.c
+++ b/src/drivers/intel/i210/i210.c
@@ -6,7 +6,6 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
-#include <device/pci_def.h>
 #include <string.h>
 #include <types.h>
 #include <delay.h>

src/drivers/net/r8168.c

diff --git a/src/drivers/net/r8168.c b/src/drivers/net/r8168.c
index 5d19d69..8f070bd 100644
--- a/src/drivers/net/r8168.c
+++ b/src/drivers/net/r8168.c
@@ -16,7 +16,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <delay.h>
 #include <fmap.h>

src/drivers/siemens/nc_fpga/nc_fpga.c

diff --git a/src/drivers/siemens/nc_fpga/nc_fpga.c b/src/drivers/siemens/nc_fpga/nc_fpga.c
index fe6eb15..dd30d51 100644
--- a/src/drivers/siemens/nc_fpga/nc_fpga.c
+++ b/src/drivers/siemens/nc_fpga/nc_fpga.c
@@ -4,7 +4,6 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
-#include <device/pci_def.h>
 #include <device/mmio.h>
 #include <hwilib.h>
 #include <bootstate.h>

src/drivers/siemens/nc_fpga/nc_fpga_early.c

diff --git a/src/drivers/siemens/nc_fpga/nc_fpga_early.c b/src/drivers/siemens/nc_fpga/nc_fpga_early.c
index 8cdc1f9..284ec8a 100644
--- a/src/drivers/siemens/nc_fpga/nc_fpga_early.c
+++ b/src/drivers/siemens/nc_fpga/nc_fpga_early.c
@@ -2,7 +2,6 @@
 
 #include <device/mmio.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <types.h>

src/drivers/uart/oxpcie.c

diff --git a/src/drivers/uart/oxpcie.c b/src/drivers/uart/oxpcie.c
index 59e8ff2..ae2a3a6 100644
--- a/src/drivers/uart/oxpcie.c
+++ b/src/drivers/uart/oxpcie.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <device/device.h>
-#include <device/pci_def.h>
 #include <device/pci.h>
 #include <console/console.h>
 #include <console/uart.h>

src/drivers/uart/oxpcie_early.c

diff --git a/src/drivers/uart/oxpcie_early.c b/src/drivers/uart/oxpcie_early.c
index ff7d0cf..2cbc8c7 100644
--- a/src/drivers/uart/oxpcie_early.c
+++ b/src/drivers/uart/oxpcie_early.c
@@ -5,7 +5,6 @@
 #include <device/pci_ops.h>
 #include <console/uart.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 
 static unsigned int oxpcie_present;
 static DEVTREE_CONST u32 uart0_base = CONFIG_EARLY_PCI_MMIO_BASE + 0x1000;

src/drivers/usb/pci_ehci.c

diff --git a/src/drivers/usb/pci_ehci.c b/src/drivers/usb/pci_ehci.c
index 8e85426..8b68bc2 100644
--- a/src/drivers/usb/pci_ehci.c
+++ b/src/drivers/usb/pci_ehci.c
@@ -5,7 +5,6 @@
 #include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <string.h>
 
 #include "ehci_debug.h"

src/drivers/wifi/generic/generic.c

diff --git a/src/drivers/wifi/generic/generic.c b/src/drivers/wifi/generic/generic.c
index 2368f51..adcb68d 100644
--- a/src/drivers/wifi/generic/generic.c
+++ b/src/drivers/wifi/generic/generic.c
@@ -2,7 +2,6 @@
 
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <elog.h>
 #include "chip.h"

src/northbridge/intel/haswell/northbridge.c

diff --git a/src/northbridge/intel/haswell/northbridge.c b/src/northbridge/intel/haswell/northbridge.c
index bcb2a0b..17ffff2 100644
--- a/src/northbridge/intel/haswell/northbridge.c
+++ b/src/northbridge/intel/haswell/northbridge.c
@@ -7,7 +7,6 @@
 #include <cpu/intel/haswell/haswell.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <boot/tables.h>

src/northbridge/intel/i945/early_init.c

diff --git a/src/northbridge/intel/i945/early_init.c b/src/northbridge/intel/i945/early_init.c
index d730b2e..d61949f 100644
--- a/src/northbridge/intel/i945/early_init.c
+++ b/src/northbridge/intel/i945/early_init.c
@@ -3,7 +3,6 @@
 #include <cbmem.h>
 #include <cf9_reset.h>
 #include <console/console.h>
-#include <device/pci_def.h>
 #include <device/pci_ops.h>
 #include <device/pci.h>
 #include <option.h>

src/northbridge/intel/pineview/gma.c

diff --git a/src/northbridge/intel/pineview/gma.c b/src/northbridge/intel/pineview/gma.c
index d68c04d..a7ff32f 100644
--- a/src/northbridge/intel/pineview/gma.c
+++ b/src/northbridge/intel/pineview/gma.c
@@ -6,7 +6,6 @@
 #include <delay.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <drivers/intel/gma/i915_reg.h>

src/soc/amd/common/block/lpc/lpc.c

diff --git a/src/soc/amd/common/block/lpc/lpc.c b/src/soc/amd/common/block/lpc/lpc.c
index 5633d8f..09c35db 100644
--- a/src/soc/amd/common/block/lpc/lpc.c
+++ b/src/soc/amd/common/block/lpc/lpc.c
@@ -6,7 +6,6 @@
 #include <device/pci.h>
 #include <device/pnp.h>
 #include <device/pci_ops.h>
-#include <device/pci_def.h>
 #include <pc80/mc146818rtc.h>
 #include <pc80/isa-dma.h>
 #include <pc80/i8254.h>

src/soc/amd/picasso/sata.c

diff --git a/src/soc/amd/picasso/sata.c b/src/soc/amd/picasso/sata.c
index e64635f..fb2f7ac 100644
--- a/src/soc/amd/picasso/sata.c
+++ b/src/soc/amd/picasso/sata.c
@@ -3,7 +3,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include <device/pci_def.h>
 #include <amdblocks/sata.h>
 #include <soc/southbridge.h>
 

src/soc/amd/stoneyridge/sata.c

diff --git a/src/soc/amd/stoneyridge/sata.c b/src/soc/amd/stoneyridge/sata.c
index e64635f..fb2f7ac 100644
--- a/src/soc/amd/stoneyridge/sata.c
+++ b/src/soc/amd/stoneyridge/sata.c
@@ -3,7 +3,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include <device/pci_def.h>
 #include <amdblocks/sata.h>
 #include <soc/southbridge.h>
 

src/soc/cavium/common/ecam.c

diff --git a/src/soc/cavium/common/ecam.c b/src/soc/cavium/common/ecam.c
index 88368178..1781820 100644
--- a/src/soc/cavium/common/ecam.c
+++ b/src/soc/cavium/common/ecam.c
@@ -7,7 +7,6 @@
 #define __SIMPLE_DEVICE__
 
 #include <device/pci_ops.h>
-#include <device/pci_def.h>
 #include <device/pci.h>
 #include <soc/addressmap.h>
 #include <soc/ecam.h>

src/soc/intel/alderlake/pmutil.c

diff --git a/src/soc/intel/alderlake/pmutil.c b/src/soc/intel/alderlake/pmutil.c
index 3e9f71f..0c508ff 100644
--- a/src/soc/intel/alderlake/pmutil.c
+++ b/src/soc/intel/alderlake/pmutil.c
@@ -18,7 +18,6 @@
 #include <device/mmio.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <gpio.h>
 #include <intelblocks/pmclib.h>
 #include <intelblocks/rtc.h>

src/soc/intel/apollolake/pmutil.c

diff --git a/src/soc/intel/apollolake/pmutil.c b/src/soc/intel/apollolake/pmutil.c
index 41f806f..b799d02 100644
--- a/src/soc/intel/apollolake/pmutil.c
+++ b/src/soc/intel/apollolake/pmutil.c
@@ -9,7 +9,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <intelblocks/msr.h>
 #include <intelblocks/pmclib.h>
 #include <intelblocks/rtc.h>

src/soc/intel/baytrail/hda.c

diff --git a/src/soc/intel/baytrail/hda.c b/src/soc/intel/baytrail/hda.c
index 6bebf05..46fbce1 100644
--- a/src/soc/intel/baytrail/hda.c
+++ b/src/soc/intel/baytrail/hda.c
@@ -2,7 +2,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <reg_script.h>
 

src/soc/intel/broadwell/pch/me.c

diff --git a/src/soc/intel/broadwell/pch/me.c b/src/soc/intel/broadwell/pch/me.c
index 08917fd..6973c72 100644
--- a/src/soc/intel/broadwell/pch/me.c
+++ b/src/soc/intel/broadwell/pch/me.c
@@ -15,7 +15,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <device/pci_def.h>
 #include <stdlib.h>
 #include <string.h>
 #include <delay.h>

src/soc/intel/broadwell/pch/pch.c

diff --git a/src/soc/intel/broadwell/pch/pch.c b/src/soc/intel/broadwell/pch/pch.c
index c2ff5b0..98fbc46 100644
--- a/src/soc/intel/broadwell/pch/pch.c
+++ b/src/soc/intel/broadwell/pch/pch.c
@@ -4,7 +4,6 @@
 #include <device/pci_ops.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <soc/pch.h>
 #include <soc/pci_devs.h>
 #include <soc/rcba.h>

src/soc/intel/broadwell/pch/pcie.c

diff --git a/src/soc/intel/broadwell/pch/pcie.c b/src/soc/intel/broadwell/pch/pcie.c
index 61d6962..ef03eee 100644
--- a/src/soc/intel/broadwell/pch/pcie.c
+++ b/src/soc/intel/broadwell/pch/pcie.c
@@ -6,7 +6,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pciexp.h>
-#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <soc/lpc.h>

src/soc/intel/broadwell/pch/pmutil.c

diff --git a/src/soc/intel/broadwell/pch/pmutil.c b/src/soc/intel/broadwell/pch/pmutil.c
index 931dcc9..4ba30b4 100644
--- a/src/soc/intel/broadwell/pch/pmutil.c
+++ b/src/soc/intel/broadwell/pch/pmutil.c
@@ -11,7 +11,6 @@
 #include <device/pci_ops.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <console/console.h>
 #include <soc/iomap.h>
 #include <soc/lpc.h>

src/soc/intel/broadwell/pch/power_state.c

diff --git a/src/soc/intel/broadwell/pch/power_state.c b/src/soc/intel/broadwell/pch/power_state.c
index b1ab622..842878b 100644
--- a/src/soc/intel/broadwell/pch/power_state.c
+++ b/src/soc/intel/broadwell/pch/power_state.c
@@ -6,7 +6,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <string.h>
 #include <soc/iomap.h>
 #include <soc/lpc.h>

src/soc/intel/cannonlake/pmutil.c

diff --git a/src/soc/intel/cannonlake/pmutil.c b/src/soc/intel/cannonlake/pmutil.c
index 512b49b..681068d 100644
--- a/src/soc/intel/cannonlake/pmutil.c
+++ b/src/soc/intel/cannonlake/pmutil.c
@@ -12,7 +12,6 @@
 #include <device/mmio.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <gpio.h>
 #include <intelblocks/pmclib.h>
 #include <intelblocks/rtc.h>

src/soc/intel/cannonlake/romstage/fsp_params.c

diff --git a/src/soc/intel/cannonlake/romstage/fsp_params.c b/src/soc/intel/cannonlake/romstage/fsp_params.c
index 842c8fb..737e7c3 100644
--- a/src/soc/intel/cannonlake/romstage/fsp_params.c
+++ b/src/soc/intel/cannonlake/romstage/fsp_params.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <assert.h>
-#include <device/pci_def.h>
 #include <device/pci.h>
 #include <cpu/x86/msr.h>
 #include <console/console.h>

src/soc/intel/common/block/fast_spi/fast_spi.c

diff --git a/src/soc/intel/common/block/fast_spi/fast_spi.c b/src/soc/intel/common/block/fast_spi/fast_spi.c
index a2c4991..ed2e8f2 100644
--- a/src/soc/intel/common/block/fast_spi/fast_spi.c
+++ b/src/soc/intel/common/block/fast_spi/fast_spi.c
@@ -8,7 +8,6 @@
 #include <device/mmio.h>
 #include <assert.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <console/console.h>

src/soc/intel/common/block/i2c/i2c.c

diff --git a/src/soc/intel/common/block/i2c/i2c.c b/src/soc/intel/common/block/i2c/i2c.c
index 481ba7b..70c7e18 100644
--- a/src/soc/intel/common/block/i2c/i2c.c
+++ b/src/soc/intel/common/block/i2c/i2c.c
@@ -5,7 +5,6 @@
 #include <device/device.h>
 #include <device/i2c_simple.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <drivers/i2c/designware/dw_i2c.h>
 #include <intelblocks/cfg.h>

src/soc/intel/common/block/irq/irq.c

diff --git a/src/soc/intel/common/block/irq/irq.c b/src/soc/intel/common/block/irq/irq.c
index 724061e..4ffe138 100644
--- a/src/soc/intel/common/block/irq/irq.c
+++ b/src/soc/intel/common/block/irq/irq.c
@@ -3,7 +3,6 @@
 #include <assert.h>
 #include <console/console.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ops.h>
 #include <intelblocks/gpio.h>
 #include <intelblocks/irq.h>

src/soc/intel/common/block/pcie/pcie.c

diff --git a/src/soc/intel/common/block/pcie/pcie.c b/src/soc/intel/common/block/pcie/pcie.c
index dd0b0ef..c8a958d 100644
--- a/src/soc/intel/common/block/pcie/pcie.c
+++ b/src/soc/intel/common/block/pcie/pcie.c
@@ -3,7 +3,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <device/pciexp.h>

src/soc/intel/common/block/smbus/tco.c

diff --git a/src/soc/intel/common/block/smbus/tco.c b/src/soc/intel/common/block/smbus/tco.c
index 12b176c..1f1a85c 100644
--- a/src/soc/intel/common/block/smbus/tco.c
+++ b/src/soc/intel/common/block/smbus/tco.c
@@ -6,7 +6,6 @@
 #include <device/pci_ops.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <intelblocks/gpmr.h>
 #include <intelblocks/pcr.h>
 #include <intelblocks/pmclib.h>

src/soc/intel/common/block/spi/spi.c

diff --git a/src/soc/intel/common/block/spi/spi.c b/src/soc/intel/common/block/spi/spi.c
index f6a211b..93278f1 100644
--- a/src/soc/intel/common/block/spi/spi.c
+++ b/src/soc/intel/common/block/spi/spi.c
@@ -7,10 +7,8 @@
 #include <device/device.h>
 #include <device/mmio.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
-#include <device/pci_type.h>
 #include <device/spi.h>
 #include <intelblocks/fast_spi.h>
 #include <intelblocks/gspi.h>

src/soc/intel/common/block/uart/uart.c

diff --git a/src/soc/intel/common/block/uart/uart.c b/src/soc/intel/common/block/uart/uart.c
index 0ca3361..76e4bc9 100644
--- a/src/soc/intel/common/block/uart/uart.c
+++ b/src/soc/intel/common/block/uart/uart.c
@@ -6,7 +6,6 @@
 #include <console/uart.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <intelblocks/irq.h>

src/soc/intel/common/block/usb4/usb4.c

diff --git a/src/soc/intel/common/block/usb4/usb4.c b/src/soc/intel/common/block/usb4/usb4.c
index d62496e..a90a35a 100644
--- a/src/soc/intel/common/block/usb4/usb4.c
+++ b/src/soc/intel/common/block/usb4/usb4.c
@@ -4,7 +4,6 @@
 #include <acpi/acpi_device.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <intelblocks/tcss.h>
 #include <soc/pci_devs.h>

src/soc/intel/denverton_ns/soc_util.c

diff --git a/src/soc/intel/denverton_ns/soc_util.c b/src/soc/intel/denverton_ns/soc_util.c
index b4c707d..dbe924b 100644
--- a/src/soc/intel/denverton_ns/soc_util.c
+++ b/src/soc/intel/denverton_ns/soc_util.c
@@ -4,7 +4,6 @@
 #include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/device.h>
 #include <string.h>
 #include <soc/iomap.h>

src/soc/intel/elkhartlake/pmutil.c

diff --git a/src/soc/intel/elkhartlake/pmutil.c b/src/soc/intel/elkhartlake/pmutil.c
index 4203bee..adc3056 100644
--- a/src/soc/intel/elkhartlake/pmutil.c
+++ b/src/soc/intel/elkhartlake/pmutil.c
@@ -12,7 +12,6 @@
 #include <device/device.h>
 #include <device/mmio.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <gpio.h>
 #include <intelblocks/pmclib.h>
 #include <intelblocks/rtc.h>

src/soc/intel/jasperlake/pmutil.c

diff --git a/src/soc/intel/jasperlake/pmutil.c b/src/soc/intel/jasperlake/pmutil.c
index 744a2fb..f52cc43 100644
--- a/src/soc/intel/jasperlake/pmutil.c
+++ b/src/soc/intel/jasperlake/pmutil.c
@@ -12,7 +12,6 @@
 #include <device/mmio.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <gpio.h>
 #include <intelblocks/pmclib.h>
 #include <intelblocks/rtc.h>

src/soc/intel/meteorlake/pmutil.c

diff --git a/src/soc/intel/meteorlake/pmutil.c b/src/soc/intel/meteorlake/pmutil.c
index 9ed87f8..8b377c0 100644
--- a/src/soc/intel/meteorlake/pmutil.c
+++ b/src/soc/intel/meteorlake/pmutil.c
@@ -12,7 +12,6 @@
 #include <device/mmio.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <gpio.h>
 #include <intelblocks/pmclib.h>
 #include <intelblocks/rtc.h>

src/soc/intel/quark/include/soc/pci_devs.h

diff --git a/src/soc/intel/quark/include/soc/pci_devs.h b/src/soc/intel/quark/include/soc/pci_devs.h
index 2c6a532..11594f5 100644
--- a/src/soc/intel/quark/include/soc/pci_devs.h
+++ b/src/soc/intel/quark/include/soc/pci_devs.h
@@ -4,7 +4,6 @@
 #define _QUARK_PCI_DEVS_H_
 
 #include <device/pci.h>
-#include <device/pci_def.h>
 
 /* DEVICE 0 (Memory Controller Hub) */
 #define MC_BDF			PCI_DEV(PCI_BUS_NUMBER_QNC, MC_DEV, MC_FUN)

src/soc/intel/quark/romstage/report_platform.c

diff --git a/src/soc/intel/quark/romstage/report_platform.c b/src/soc/intel/quark/romstage/report_platform.c
index 3b4e367..7a49148 100644
--- a/src/soc/intel/quark/romstage/report_platform.c
+++ b/src/soc/intel/quark/romstage/report_platform.c
@@ -3,7 +3,6 @@
 #include <console/console.h>
 #include <cpu/cpu.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ops.h>
 #include <soc/cpu.h>
 #include <soc/pci_devs.h>

src/soc/intel/quark/uart.c

diff --git a/src/soc/intel/quark/uart.c b/src/soc/intel/quark/uart.c
index c045c34..0047664 100644
--- a/src/soc/intel/quark/uart.c
+++ b/src/soc/intel/quark/uart.c
@@ -2,7 +2,6 @@
 
 #include <console/uart.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <soc/pci_devs.h>
 

src/soc/intel/skylake/pmutil.c

diff --git a/src/soc/intel/skylake/pmutil.c b/src/soc/intel/skylake/pmutil.c
index c31fb06..5152237 100644
--- a/src/soc/intel/skylake/pmutil.c
+++ b/src/soc/intel/skylake/pmutil.c
@@ -13,7 +13,6 @@
 #include <device/pci_ops.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <gpio.h>
 #include <intelblocks/pmclib.h>
 #include <intelblocks/lpc_lib.h>

src/soc/intel/tigerlake/pmutil.c

diff --git a/src/soc/intel/tigerlake/pmutil.c b/src/soc/intel/tigerlake/pmutil.c
index 3c870c5..f8a7b19 100644
--- a/src/soc/intel/tigerlake/pmutil.c
+++ b/src/soc/intel/tigerlake/pmutil.c
@@ -18,7 +18,6 @@
 #include <device/mmio.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <gpio.h>
 #include <intelblocks/pmclib.h>
 #include <intelblocks/rtc.h>

src/soc/mediatek/common/pcie.c

diff --git a/src/soc/mediatek/common/pcie.c b/src/soc/mediatek/common/pcie.c
index fd93665..8b5b36b 100644
--- a/src/soc/mediatek/common/pcie.c
+++ b/src/soc/mediatek/common/pcie.c
@@ -6,7 +6,6 @@
 #include <device/device.h>
 #include <device/mmio.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <device/resource.h>
 #include <delay.h>

src/soc/qualcomm/common/pcie_common.c

diff --git a/src/soc/qualcomm/common/pcie_common.c b/src/soc/qualcomm/common/pcie_common.c
index 940b206..9825508 100644
--- a/src/soc/qualcomm/common/pcie_common.c
+++ b/src/soc/qualcomm/common/pcie_common.c
@@ -6,7 +6,6 @@
 #include <device/device.h>
 #include <device/mmio.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <gpio.h>
 #include <soc/clock.h>

src/soc/qualcomm/sc7280/pcie.c

diff --git a/src/soc/qualcomm/sc7280/pcie.c b/src/soc/qualcomm/sc7280/pcie.c
index edc73b0..84fa44c 100644
--- a/src/soc/qualcomm/sc7280/pcie.c
+++ b/src/soc/qualcomm/sc7280/pcie.c
@@ -4,7 +4,6 @@
 #include <device/device.h>
 #include <device/mmio.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <gpio.h>
 #include <soc/addressmap.h>
 #include <soc/clock.h>

src/southbridge/amd/pi/hudson/hudson.c

diff --git a/src/southbridge/amd/pi/hudson/hudson.c b/src/southbridge/amd/pi/hudson/hudson.c
index 1e9864a..59e293f 100644
--- a/src/southbridge/amd/pi/hudson/hudson.c
+++ b/src/southbridge/amd/pi/hudson/hudson.c
@@ -7,7 +7,6 @@
 #include <acpi/acpi.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <types.h>

src/southbridge/amd/pi/hudson/lpc.c

diff --git a/src/southbridge/amd/pi/hudson/lpc.c b/src/southbridge/amd/pi/hudson/lpc.c
index ccca113..7abb5bf 100644
--- a/src/southbridge/amd/pi/hudson/lpc.c
+++ b/src/southbridge/amd/pi/hudson/lpc.c
@@ -7,7 +7,6 @@
 #include <device/pnp.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
-#include <device/pci_def.h>
 #include <pc80/mc146818rtc.h>
 #include <pc80/isa-dma.h>
 #include <arch/io.h>

src/southbridge/intel/bd82x6x/lpc.c

diff --git a/src/southbridge/intel/bd82x6x/lpc.c b/src/southbridge/intel/bd82x6x/lpc.c
index 7c10c81..0cf7b9c 100644
--- a/src/southbridge/intel/bd82x6x/lpc.c
+++ b/src/southbridge/intel/bd82x6x/lpc.c
@@ -5,7 +5,6 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
-#include <device/pci_def.h>
 #include <option.h>
 #include <pc80/isa-dma.h>
 #include <pc80/i8259.h>

src/southbridge/intel/bd82x6x/me.c

diff --git a/src/southbridge/intel/bd82x6x/me.c b/src/southbridge/intel/bd82x6x/me.c
index 66c7dd2..7394882 100644
--- a/src/southbridge/intel/bd82x6x/me.c
+++ b/src/southbridge/intel/bd82x6x/me.c
@@ -16,7 +16,6 @@
 #include <device/pci_ops.h>
 #include <console/console.h>
 #include <device/pci_ids.h>
-#include <device/pci_def.h>
 #include <elog.h>
 #include <halt.h>
 #include <option.h>

src/southbridge/intel/bd82x6x/me_8.x.c

diff --git a/src/southbridge/intel/bd82x6x/me_8.x.c b/src/southbridge/intel/bd82x6x/me_8.x.c
index 2a6caa6..8702c4d 100644
--- a/src/southbridge/intel/bd82x6x/me_8.x.c
+++ b/src/southbridge/intel/bd82x6x/me_8.x.c
@@ -16,7 +16,6 @@
 #include <device/pci_ops.h>
 #include <console/console.h>
 #include <device/pci_ids.h>
-#include <device/pci_def.h>
 #include <string.h>
 #include <elog.h>
 #include <halt.h>

src/southbridge/intel/bd82x6x/me_common.c

diff --git a/src/southbridge/intel/bd82x6x/me_common.c b/src/southbridge/intel/bd82x6x/me_common.c
index a48d4128..2db3c2d 100644
--- a/src/southbridge/intel/bd82x6x/me_common.c
+++ b/src/southbridge/intel/bd82x6x/me_common.c
@@ -6,7 +6,6 @@
 #include <device/pci_ops.h>
 #include <console/console.h>
 #include <device/pci_ids.h>
-#include <device/pci_def.h>
 #include <string.h>
 #include <delay.h>
 #include <halt.h>

src/southbridge/intel/bd82x6x/me_smm.c

diff --git a/src/southbridge/intel/bd82x6x/me_smm.c b/src/southbridge/intel/bd82x6x/me_smm.c
index c7a7f45..ea39559 100644
--- a/src/southbridge/intel/bd82x6x/me_smm.c
+++ b/src/southbridge/intel/bd82x6x/me_smm.c
@@ -2,7 +2,6 @@
 
 #include <console/console.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <stdint.h>

src/southbridge/intel/bd82x6x/pch.c

diff --git a/src/southbridge/intel/bd82x6x/pch.c b/src/southbridge/intel/bd82x6x/pch.c
index 16ffaf5..ae8ed9b 100644
--- a/src/southbridge/intel/bd82x6x/pch.c
+++ b/src/southbridge/intel/bd82x6x/pch.c
@@ -4,7 +4,6 @@
 #include <delay.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ops.h>
 #include <string.h>
 

src/southbridge/intel/bd82x6x/pci.c

diff --git a/src/southbridge/intel/bd82x6x/pci.c b/src/southbridge/intel/bd82x6x/pci.c
index b82f3da..382506b 100644
--- a/src/southbridge/intel/bd82x6x/pci.c
+++ b/src/southbridge/intel/bd82x6x/pci.c
@@ -3,7 +3,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ops.h>
 #include <device/pci_ids.h>
 #include "pch.h"

src/southbridge/intel/bd82x6x/pcie.c

diff --git a/src/southbridge/intel/bd82x6x/pcie.c b/src/southbridge/intel/bd82x6x/pcie.c
index a85b2619..6f082e8 100644
--- a/src/southbridge/intel/bd82x6x/pcie.c
+++ b/src/southbridge/intel/bd82x6x/pcie.c
@@ -3,7 +3,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ops.h>
 #include <device/pciexp.h>
 #include <device/pci_ids.h>

src/southbridge/intel/bd82x6x/smbus.c

diff --git a/src/southbridge/intel/bd82x6x/smbus.c b/src/southbridge/intel/bd82x6x/smbus.c
index 3c19075..0cb6d00 100644
--- a/src/southbridge/intel/bd82x6x/smbus.c
+++ b/src/southbridge/intel/bd82x6x/smbus.c
@@ -4,7 +4,6 @@
 #include <device/path.h>
 #include <device/smbus.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <device/smbus_host.h>

src/southbridge/intel/common/pciehp.c

diff --git a/src/southbridge/intel/common/pciehp.c b/src/southbridge/intel/common/pciehp.c
index 82b6122..db356b0 100644
--- a/src/southbridge/intel/common/pciehp.c
+++ b/src/southbridge/intel/common/pciehp.c
@@ -4,7 +4,6 @@
 #include <acpi/acpigen.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 
 #include "pciehp.h"
 

src/southbridge/intel/common/smbus_ops.c

diff --git a/src/southbridge/intel/common/smbus_ops.c b/src/southbridge/intel/common/smbus_ops.c
index 46fc58a..347de73 100644
--- a/src/southbridge/intel/common/smbus_ops.c
+++ b/src/southbridge/intel/common/smbus_ops.c
@@ -4,7 +4,6 @@
 #include <device/path.h>
 #include <device/smbus.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <device/smbus_host.h>
 #include <southbridge/intel/common/smbus_ops.h>

src/southbridge/intel/common/watchdog.c

diff --git a/src/southbridge/intel/common/watchdog.c b/src/southbridge/intel/common/watchdog.c
index e22dbfb..1c43a0c 100644
--- a/src/southbridge/intel/common/watchdog.c
+++ b/src/southbridge/intel/common/watchdog.c
@@ -3,7 +3,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ops.h>
 #include <southbridge/intel/common/pmbase.h>
 #include <southbridge/intel/common/tco.h>

src/southbridge/intel/i82371eb/early_pm.c

diff --git a/src/southbridge/intel/i82371eb/early_pm.c b/src/southbridge/intel/i82371eb/early_pm.c
index 2a1c6eb..3cf56f2 100644
--- a/src/southbridge/intel/i82371eb/early_pm.c
+++ b/src/southbridge/intel/i82371eb/early_pm.c
@@ -3,7 +3,6 @@
 #include <stdint.h>
 #include <device/pci_ops.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include "i82371eb.h"
 

src/southbridge/intel/i82371eb/early_smbus.c

diff --git a/src/southbridge/intel/i82371eb/early_smbus.c b/src/southbridge/intel/i82371eb/early_smbus.c
index d2ff00a..0e0fd5b 100644
--- a/src/southbridge/intel/i82371eb/early_smbus.c
+++ b/src/southbridge/intel/i82371eb/early_smbus.c
@@ -4,7 +4,6 @@
 #include <device/pci_ops.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <device/pci_def.h>
 #include <device/smbus_host.h>
 #include "i82371eb.h"
 

src/southbridge/intel/i82801gx/ac97.c

diff --git a/src/southbridge/intel/i82801gx/ac97.c b/src/southbridge/intel/i82801gx/ac97.c
index bdc8f77..aa73ae2 100644
--- a/src/southbridge/intel/i82801gx/ac97.c
+++ b/src/southbridge/intel/i82801gx/ac97.c
@@ -4,7 +4,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <device/pci_def.h>
 #include <arch/io.h>
 #include <device/pci_ops.h>
 #include <delay.h>

src/southbridge/intel/i82801gx/pci.c

diff --git a/src/southbridge/intel/i82801gx/pci.c b/src/southbridge/intel/i82801gx/pci.c
index bf123bd..a9e86a0 100644
--- a/src/southbridge/intel/i82801gx/pci.c
+++ b/src/southbridge/intel/i82801gx/pci.c
@@ -2,7 +2,6 @@
 
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ops.h>
 #include <device/pci_ids.h>
 #include "i82801gx.h"

src/southbridge/intel/i82801gx/pcie.c

diff --git a/src/southbridge/intel/i82801gx/pcie.c b/src/southbridge/intel/i82801gx/pcie.c
index b9b8ccd..befbf3b 100644
--- a/src/southbridge/intel/i82801gx/pcie.c
+++ b/src/southbridge/intel/i82801gx/pcie.c
@@ -3,7 +3,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ops.h>
 #include <device/pci_ids.h>
 #include "chip.h"

src/southbridge/intel/i82801gx/smbus.c

diff --git a/src/southbridge/intel/i82801gx/smbus.c b/src/southbridge/intel/i82801gx/smbus.c
index cfacca0..d498037 100644
--- a/src/southbridge/intel/i82801gx/smbus.c
+++ b/src/southbridge/intel/i82801gx/smbus.c
@@ -4,7 +4,6 @@
 #include <device/path.h>
 #include <device/smbus.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <device/smbus_host.h>
 #include <southbridge/intel/common/smbus_ops.h>

src/southbridge/intel/i82801gx/usb_ehci.c

diff --git a/src/southbridge/intel/i82801gx/usb_ehci.c b/src/southbridge/intel/i82801gx/usb_ehci.c
index 811dc50..bfaceea 100644
--- a/src/southbridge/intel/i82801gx/usb_ehci.c
+++ b/src/southbridge/intel/i82801gx/usb_ehci.c
@@ -7,7 +7,6 @@
 #include "i82801gx.h"
 #include <device/pci_ehci.h>
 #include <device/mmio.h>
-#include <device/pci_def.h>
 #include <device/pci_ops.h>
 
 static void usb_ehci_init(struct device *dev)

src/southbridge/intel/i82801ix/pcie.c

diff --git a/src/southbridge/intel/i82801ix/pcie.c b/src/southbridge/intel/i82801ix/pcie.c
index a199dd1..a374068 100644
--- a/src/southbridge/intel/i82801ix/pcie.c
+++ b/src/southbridge/intel/i82801ix/pcie.c
@@ -3,7 +3,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ops.h>
 #include <device/pciexp.h>
 #include <device/pci_ids.h>

src/southbridge/intel/i82801ix/smbus.c

diff --git a/src/southbridge/intel/i82801ix/smbus.c b/src/southbridge/intel/i82801ix/smbus.c
index 17f7b6b..1ddfb7f 100644
--- a/src/southbridge/intel/i82801ix/smbus.c
+++ b/src/southbridge/intel/i82801ix/smbus.c
@@ -4,7 +4,6 @@
 #include <device/path.h>
 #include <device/smbus.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <device/smbus_host.h>

src/southbridge/intel/i82801jx/pcie.c

diff --git a/src/southbridge/intel/i82801jx/pcie.c b/src/southbridge/intel/i82801jx/pcie.c
index 1d02898..3ed9d60 100644
--- a/src/southbridge/intel/i82801jx/pcie.c
+++ b/src/southbridge/intel/i82801jx/pcie.c
@@ -3,7 +3,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ops.h>
 #include <device/pciexp.h>
 #include <device/pci_ids.h>

src/southbridge/intel/i82801jx/smbus.c

diff --git a/src/southbridge/intel/i82801jx/smbus.c b/src/southbridge/intel/i82801jx/smbus.c
index 6c9df2f..8fa1914 100644
--- a/src/southbridge/intel/i82801jx/smbus.c
+++ b/src/southbridge/intel/i82801jx/smbus.c
@@ -4,7 +4,6 @@
 #include <device/path.h>
 #include <device/smbus.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <device/smbus_host.h>

src/southbridge/intel/ibexpeak/me.c

diff --git a/src/southbridge/intel/ibexpeak/me.c b/src/southbridge/intel/ibexpeak/me.c
index 08f89e3..fbcb01d 100644
--- a/src/southbridge/intel/ibexpeak/me.c
+++ b/src/southbridge/intel/ibexpeak/me.c
@@ -13,7 +13,6 @@
 #include <device/device.h>
 #include <device/mmio.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <string.h>

src/southbridge/intel/ibexpeak/pch.c

diff --git a/src/southbridge/intel/ibexpeak/pch.c b/src/southbridge/intel/ibexpeak/pch.c
index 958d1db..23768ed 100644
--- a/src/southbridge/intel/ibexpeak/pch.c
+++ b/src/southbridge/intel/ibexpeak/pch.c
@@ -4,7 +4,6 @@
 #include <device/pci_ops.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include "pch.h"
 
 /* Set bit in function disable register to hide this device */

src/southbridge/intel/ibexpeak/smbus.c

diff --git a/src/southbridge/intel/ibexpeak/smbus.c b/src/southbridge/intel/ibexpeak/smbus.c
index de1ad18..3318458 100644
--- a/src/southbridge/intel/ibexpeak/smbus.c
+++ b/src/southbridge/intel/ibexpeak/smbus.c
@@ -4,7 +4,6 @@
 #include <device/path.h>
 #include <device/smbus.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <device/smbus_host.h>

src/southbridge/intel/ibexpeak/thermal.c

diff --git a/src/southbridge/intel/ibexpeak/thermal.c b/src/southbridge/intel/ibexpeak/thermal.c
index 216af67..40df0bd 100644
--- a/src/southbridge/intel/ibexpeak/thermal.c
+++ b/src/southbridge/intel/ibexpeak/thermal.c
@@ -3,7 +3,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include "pch.h"
 #include <device/mmio.h>

src/southbridge/intel/lynxpoint/me.c

diff --git a/src/southbridge/intel/lynxpoint/me.c b/src/southbridge/intel/lynxpoint/me.c
index 91eeabd..66d56dc8 100644
--- a/src/southbridge/intel/lynxpoint/me.c
+++ b/src/southbridge/intel/lynxpoint/me.c
@@ -15,7 +15,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <device/pci_def.h>
 #include <string.h>
 #include <delay.h>
 #include <elog.h>

src/southbridge/intel/lynxpoint/pch.c

diff --git a/src/southbridge/intel/lynxpoint/pch.c b/src/southbridge/intel/lynxpoint/pch.c
index f83f3f6..8b037a9 100644
--- a/src/southbridge/intel/lynxpoint/pch.c
+++ b/src/southbridge/intel/lynxpoint/pch.c
@@ -4,7 +4,6 @@
 #include <device/pci_ops.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include "iobp.h"
 #include "pch.h"
 

src/southbridge/intel/lynxpoint/pcie.c

diff --git a/src/southbridge/intel/lynxpoint/pcie.c b/src/southbridge/intel/lynxpoint/pcie.c
index 2f01560..7d31b3e 100644
--- a/src/southbridge/intel/lynxpoint/pcie.c
+++ b/src/southbridge/intel/lynxpoint/pcie.c
@@ -5,7 +5,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <device/pciexp.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>

src/southbridge/intel/lynxpoint/pmutil.c

diff --git a/src/southbridge/intel/lynxpoint/pmutil.c b/src/southbridge/intel/lynxpoint/pmutil.c
index dd7f199..d67fb6c 100644
--- a/src/southbridge/intel/lynxpoint/pmutil.c
+++ b/src/southbridge/intel/lynxpoint/pmutil.c
@@ -8,7 +8,6 @@
 #include <arch/io.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/pci_def.h>
 #include <console/console.h>
 #include <security/vboot/vbnv.h>
 #include <security/vboot/vboot_common.h>