diff --git a/src/acpi/device.c b/src/acpi/device.c
index 7fe5a37..95316b0 100644
--- a/src/acpi/device.c
+++ b/src/acpi/device.c
@@ -7,7 +7,6 @@
 #include <acpi/acpigen.h>
 #include <acpi/acpigen_pci.h>
 #include <device/device.h>
-#include <device/path.h>
 #include <stdlib.h>
 #include <types.h>
 #include <crc_byte.h>
diff --git a/src/arch/x86/cpu.c b/src/arch/x86/cpu.c
index f4c18c2..91cbcb0 100644
--- a/src/arch/x86/cpu.c
+++ b/src/arch/x86/cpu.c
@@ -10,7 +10,6 @@
 #include <cpu/x86/mp.h>
 #include <cpu/x86/lapic.h>
 #include <cpu/x86/tsc.h>
-#include <device/path.h>
 #include <device/device.h>
 #include <smp/spinlock.h>
 
diff --git a/src/arch/x86/mpspec.c b/src/arch/x86/mpspec.c
index f5242d3..d6f0cd5b 100644
--- a/src/arch/x86/mpspec.c
+++ b/src/arch/x86/mpspec.c
@@ -7,7 +7,6 @@
 #include <cpu/cpu.h>
 #include <cpu/x86/lapic.h>
 #include <device/device.h>
-#include <device/path.h>
 #include <device/pci_def.h>
 #include <device/pci_ids.h>
 #include <identity.h>
diff --git a/src/cpu/x86/mp_init.c b/src/cpu/x86/mp_init.c
index dd5e94d..bb51697 100644
--- a/src/cpu/x86/mp_init.c
+++ b/src/cpu/x86/mp_init.c
@@ -17,7 +17,6 @@
 #include <cpu/x86/mp.h>
 #include <delay.h>
 #include <device/device.h>
-#include <device/path.h>
 #include <smp/atomic.h>
 #include <smp/spinlock.h>
 #include <symbols.h>
diff --git a/src/device/device_const.c b/src/device/device_const.c
index 0521c7e..fc76304 100644
--- a/src/device/device_const.c
+++ b/src/device/device_const.c
@@ -3,7 +3,6 @@
 #include <assert.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <device/path.h>
 #include <device/pci_def.h>
 #include <device/pci_type.h>
 #include <fw_config.h>
diff --git a/src/device/device_util.c b/src/device/device_util.c
index b5d0d98..02641c1 100644
--- a/src/device/device_util.c
+++ b/src/device/device_util.c
@@ -3,9 +3,7 @@
 #include <commonlib/bsd/helpers.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <device/path.h>
 #include <device/pci_def.h>
-#include <device/resource.h>
 #include <stdlib.h>
 #include <string.h>
 #include <types.h>
diff --git a/src/drivers/generic/adau7002/adau7002.c b/src/drivers/generic/adau7002/adau7002.c
index 5917f69..db48bfe 100644
--- a/src/drivers/generic/adau7002/adau7002.c
+++ b/src/drivers/generic/adau7002/adau7002.c
@@ -4,7 +4,6 @@
 #include <acpi/acpigen.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <device/path.h>
 #include "chip.h"
 
 #if CONFIG(HAVE_ACPI_TABLES)
diff --git a/src/drivers/generic/alc1015/alc1015.c b/src/drivers/generic/alc1015/alc1015.c
index 7245f0c..257775e 100644
--- a/src/drivers/generic/alc1015/alc1015.c
+++ b/src/drivers/generic/alc1015/alc1015.c
@@ -4,7 +4,6 @@
 #include <acpi/acpigen.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <device/path.h>
 #include "chip.h"
 
 static void alc1015_fill_ssdt(const struct device *dev)
diff --git a/src/drivers/generic/bayhub/bh720.c b/src/drivers/generic/bayhub/bh720.c
index 5104c35..fb782ca 100644
--- a/src/drivers/generic/bayhub/bh720.c
+++ b/src/drivers/generic/bayhub/bh720.c
@@ -5,7 +5,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <device/mmio.h>
-#include <device/path.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
 #include <device/pci_ids.h>
diff --git a/src/drivers/generic/bayhub_lv2/lv2.c b/src/drivers/generic/bayhub_lv2/lv2.c
index b2b85e1..3d94ac3 100644
--- a/src/drivers/generic/bayhub_lv2/lv2.c
+++ b/src/drivers/generic/bayhub_lv2/lv2.c
@@ -4,7 +4,6 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include <device/path.h>
 #include <device/pci.h>
 #include <device/pciexp.h>
 #include <device/pci_ops.h>
diff --git a/src/drivers/generic/gpio_keys/gpio_keys.c b/src/drivers/generic/gpio_keys/gpio_keys.c
index 28e5be5..37b90ca 100644
--- a/src/drivers/generic/gpio_keys/gpio_keys.c
+++ b/src/drivers/generic/gpio_keys/gpio_keys.c
@@ -3,7 +3,6 @@
 #include <acpi/acpi_device.h>
 #include <acpi/acpigen.h>
 #include <device/device.h>
-#include <device/path.h>
 #include <string.h>
 
 #include "chip.h"
diff --git a/src/drivers/generic/max98357a/max98357a.c b/src/drivers/generic/max98357a/max98357a.c
index 8ce80f1..9b190ce 100644
--- a/src/drivers/generic/max98357a/max98357a.c
+++ b/src/drivers/generic/max98357a/max98357a.c
@@ -4,7 +4,6 @@
 #include <acpi/acpigen.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <device/path.h>
 #include <gpio.h>
 #include "chip.h"
 
diff --git a/src/drivers/generic/nau8315/nau8315.c b/src/drivers/generic/nau8315/nau8315.c
index 8fe4e1f..294d519 100644
--- a/src/drivers/generic/nau8315/nau8315.c
+++ b/src/drivers/generic/nau8315/nau8315.c
@@ -4,7 +4,6 @@
 #include <acpi/acpigen.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <device/path.h>
 #include <gpio.h>
 #include "chip.h"
 
diff --git a/src/drivers/genesyslogic/gl9755/gl9755.c b/src/drivers/genesyslogic/gl9755/gl9755.c
index 6b8dd7d..a160c0b 100644
--- a/src/drivers/genesyslogic/gl9755/gl9755.c
+++ b/src/drivers/genesyslogic/gl9755/gl9755.c
@@ -4,7 +4,6 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include <device/path.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
 #include <device/pci_ids.h>
diff --git a/src/drivers/genesyslogic/gl9763e/gl9763e.c b/src/drivers/genesyslogic/gl9763e/gl9763e.c
index 140535d..136c585 100644
--- a/src/drivers/genesyslogic/gl9763e/gl9763e.c
+++ b/src/drivers/genesyslogic/gl9763e/gl9763e.c
@@ -4,7 +4,6 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include <device/path.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
 #include <device/pci_ids.h>
diff --git a/src/drivers/i2c/cs35l53/cs35l53.c b/src/drivers/i2c/cs35l53/cs35l53.c
index 578e272..479ef7f 100644
--- a/src/drivers/i2c/cs35l53/cs35l53.c
+++ b/src/drivers/i2c/cs35l53/cs35l53.c
@@ -6,7 +6,6 @@
 #include <console/console.h>
 #include <device/i2c_simple.h>
 #include <device/device.h>
-#include <device/path.h>
 
 #include "chip.h"
 
diff --git a/src/drivers/i2c/cs42l42/cs42l42.c b/src/drivers/i2c/cs42l42/cs42l42.c
index 8ccfd77..6d29dfe 100644
--- a/src/drivers/i2c/cs42l42/cs42l42.c
+++ b/src/drivers/i2c/cs42l42/cs42l42.c
@@ -5,7 +5,6 @@
 #include <console/console.h>
 #include <device/i2c_simple.h>
 #include <device/device.h>
-#include <device/path.h>
 
 #include "chip.h"
 
diff --git a/src/drivers/i2c/da7219/da7219.c b/src/drivers/i2c/da7219/da7219.c
index 1a149ca..e6a5283 100644
--- a/src/drivers/i2c/da7219/da7219.c
+++ b/src/drivers/i2c/da7219/da7219.c
@@ -6,7 +6,6 @@
 #include <console/console.h>
 #include <device/i2c_simple.h>
 #include <device/device.h>
-#include <device/path.h>
 
 #include "chip.h"
 
diff --git a/src/drivers/i2c/generic/generic.c b/src/drivers/i2c/generic/generic.c
index 03018ee..afff978 100644
--- a/src/drivers/i2c/generic/generic.c
+++ b/src/drivers/i2c/generic/generic.c
@@ -6,7 +6,6 @@
 #include <device/i2c_bus.h>
 #include <device/i2c_simple.h>
 #include <device/device.h>
-#include <device/path.h>
 #include <gpio.h>
 #include <string.h>
 #include "chip.h"
diff --git a/src/drivers/i2c/gpiomux/bus/bus.c b/src/drivers/i2c/gpiomux/bus/bus.c
index a6c603a..5487f6d 100644
--- a/src/drivers/i2c/gpiomux/bus/bus.c
+++ b/src/drivers/i2c/gpiomux/bus/bus.c
@@ -4,7 +4,6 @@
 #include <acpi/acpigen.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <device/path.h>
 #include <string.h>
 
 #include "chip.h"
diff --git a/src/drivers/i2c/gpiomux/mux/mux.c b/src/drivers/i2c/gpiomux/mux/mux.c
index 5f79fe5..91d4ebf 100644
--- a/src/drivers/i2c/gpiomux/mux/mux.c
+++ b/src/drivers/i2c/gpiomux/mux/mux.c
@@ -4,7 +4,6 @@
 #include <acpi/acpigen.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <device/path.h>
 #include <string.h>
 
 #include "chip.h"
diff --git a/src/drivers/i2c/max98373/max98373.c b/src/drivers/i2c/max98373/max98373.c
index 37a8864..1035a7c 100644
--- a/src/drivers/i2c/max98373/max98373.c
+++ b/src/drivers/i2c/max98373/max98373.c
@@ -5,7 +5,6 @@
 #include <console/console.h>
 #include <device/i2c_simple.h>
 #include <device/device.h>
-#include <device/path.h>
 #include "chip.h"
 
 #define MAX98373_ACPI_NAME	"MAXI"
diff --git a/src/drivers/i2c/max98390/max98390.c b/src/drivers/i2c/max98390/max98390.c
index f4c4a70..f4912c1 100644
--- a/src/drivers/i2c/max98390/max98390.c
+++ b/src/drivers/i2c/max98390/max98390.c
@@ -5,7 +5,6 @@
 #include <console/console.h>
 #include <device/i2c.h>
 #include <device/device.h>
-#include <device/path.h>
 #include <identity.h>
 #include <stdint.h>
 #include <vendorcode/google/dsm_calib.h>
diff --git a/src/drivers/i2c/max98396/max98396.c b/src/drivers/i2c/max98396/max98396.c
index 6ad3931..ca07dbd 100644
--- a/src/drivers/i2c/max98396/max98396.c
+++ b/src/drivers/i2c/max98396/max98396.c
@@ -5,7 +5,6 @@
 #include <console/console.h>
 #include <device/i2c_simple.h>
 #include <device/device.h>
-#include <device/path.h>
 
 #include "chip.h"
 
diff --git a/src/drivers/i2c/max98927/max98927.c b/src/drivers/i2c/max98927/max98927.c
index 9935d10..a5775db 100644
--- a/src/drivers/i2c/max98927/max98927.c
+++ b/src/drivers/i2c/max98927/max98927.c
@@ -5,7 +5,6 @@
 #include <console/console.h>
 #include <device/i2c_simple.h>
 #include <device/device.h>
-#include <device/path.h>
 #include "chip.h"
 
 #define MAX98927_ACPI_NAME	"MAXI"
diff --git a/src/drivers/i2c/nau8825/nau8825.c b/src/drivers/i2c/nau8825/nau8825.c
index 9e82538..8bf9e43 100644
--- a/src/drivers/i2c/nau8825/nau8825.c
+++ b/src/drivers/i2c/nau8825/nau8825.c
@@ -5,7 +5,6 @@
 #include <console/console.h>
 #include <device/i2c_simple.h>
 #include <device/device.h>
-#include <device/path.h>
 #include <stdint.h>
 #include "chip.h"
 
diff --git a/src/drivers/i2c/rt1011/rt1011.c b/src/drivers/i2c/rt1011/rt1011.c
index bf62a6f..e8ee8df 100644
--- a/src/drivers/i2c/rt1011/rt1011.c
+++ b/src/drivers/i2c/rt1011/rt1011.c
@@ -5,7 +5,6 @@
 #include <console/console.h>
 #include <device/i2c.h>
 #include <device/device.h>
-#include <device/path.h>
 #include <stdint.h>
 #include <vendorcode/google/dsm_calib.h>
 #include "chip.h"
diff --git a/src/drivers/i2c/rt5663/rt5663.c b/src/drivers/i2c/rt5663/rt5663.c
index e2341dd..bcbe0ff 100644
--- a/src/drivers/i2c/rt5663/rt5663.c
+++ b/src/drivers/i2c/rt5663/rt5663.c
@@ -5,7 +5,6 @@
 #include <console/console.h>
 #include <device/i2c.h>
 #include <device/device.h>
-#include <device/path.h>
 #include "chip.h"
 
 #define RT5663_ACPI_NAME	"RT53"
diff --git a/src/drivers/i2c/sx9310/sx9310.c b/src/drivers/i2c/sx9310/sx9310.c
index 5094608..e5142bc 100644
--- a/src/drivers/i2c/sx9310/sx9310.c
+++ b/src/drivers/i2c/sx9310/sx9310.c
@@ -5,7 +5,6 @@
 #include <console/console.h>
 #include <device/i2c_simple.h>
 #include <device/device.h>
-#include <device/path.h>
 #include <string.h>
 #include "chip.h"
 
diff --git a/src/drivers/i2c/sx9324/sx9324.c b/src/drivers/i2c/sx9324/sx9324.c
index 05aca00..966726f 100644
--- a/src/drivers/i2c/sx9324/sx9324.c
+++ b/src/drivers/i2c/sx9324/sx9324.c
@@ -5,7 +5,6 @@
 #include <console/console.h>
 #include <device/i2c_simple.h>
 #include <device/device.h>
-#include <device/path.h>
 #include <string.h>
 #include "chip.h"
 
diff --git a/src/drivers/i2c/sx9360/sx9360.c b/src/drivers/i2c/sx9360/sx9360.c
index c9de0de..df154f4 100644
--- a/src/drivers/i2c/sx9360/sx9360.c
+++ b/src/drivers/i2c/sx9360/sx9360.c
@@ -5,7 +5,6 @@
 #include <console/console.h>
 #include <device/i2c_simple.h>
 #include <device/device.h>
-#include <device/path.h>
 #include <string.h>
 #include "chip.h"
 
diff --git a/src/drivers/i2c/tpm/chip.c b/src/drivers/i2c/tpm/chip.c
index a1d7389..cb99144 100644
--- a/src/drivers/i2c/tpm/chip.c
+++ b/src/drivers/i2c/tpm/chip.c
@@ -5,7 +5,6 @@
 #include <console/console.h>
 #include <device/i2c_simple.h>
 #include <device/device.h>
-#include <device/path.h>
 #include "tpm.h"
 #include "chip.h"
 
diff --git a/src/drivers/intel/mipi_camera/camera.c b/src/drivers/intel/mipi_camera/camera.c
index 4044a26..92c45a8 100644
--- a/src/drivers/intel/mipi_camera/camera.c
+++ b/src/drivers/intel/mipi_camera/camera.c
@@ -8,7 +8,6 @@
 #include <console/console.h>
 #include <device/i2c_simple.h>
 #include <device/device.h>
-#include <device/path.h>
 #include <device/pci_def.h>
 #include "chip.h"
 
diff --git a/src/drivers/intel/soundwire/soundwire.c b/src/drivers/intel/soundwire/soundwire.c
index 0137dad..2afb156 100644
--- a/src/drivers/intel/soundwire/soundwire.c
+++ b/src/drivers/intel/soundwire/soundwire.c
@@ -5,7 +5,6 @@
 #include <acpi/acpi_soundwire.h>
 #include <commonlib/helpers.h>
 #include <device/device.h>
-#include <device/path.h>
 #include <device/soundwire.h>
 #include <stdbool.h>
 
diff --git a/src/drivers/intel/usb4/retimer/retimer.c b/src/drivers/intel/usb4/retimer/retimer.c
index 9704139..9e627de 100644
--- a/src/drivers/intel/usb4/retimer/retimer.c
+++ b/src/drivers/intel/usb4/retimer/retimer.c
@@ -5,7 +5,6 @@
 #include <acpi/acpi_pld.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <device/path.h>
 #include <drivers/usb/acpi/chip.h>
 #include <gpio.h>
 #include <string.h>
diff --git a/src/drivers/nxp/uwb/uwb.c b/src/drivers/nxp/uwb/uwb.c
index b828657..590b3f5 100644
--- a/src/drivers/nxp/uwb/uwb.c
+++ b/src/drivers/nxp/uwb/uwb.c
@@ -4,7 +4,6 @@
 #include <acpi/acpigen.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <device/path.h>
 #include <device/spi.h>
 #include <spi-generic.h>
 #include <string.h>
diff --git a/src/drivers/sof/sof.c b/src/drivers/sof/sof.c
index 8cd577e..9f6391b 100644
--- a/src/drivers/sof/sof.c
+++ b/src/drivers/sof/sof.c
@@ -3,7 +3,6 @@
 #include <acpi/acpi_device.h>
 #include <acpi/acpigen.h>
 #include <device/device.h>
-#include <device/path.h>
 
 #include "chip.h"
 
diff --git a/src/drivers/soundwire/alc1308/alc1308.c b/src/drivers/soundwire/alc1308/alc1308.c
index 5449fe8..fc7b2af 100644
--- a/src/drivers/soundwire/alc1308/alc1308.c
+++ b/src/drivers/soundwire/alc1308/alc1308.c
@@ -4,7 +4,6 @@
 #include <acpi/acpi_device.h>
 #include <acpi/acpi_soundwire.h>
 #include <device/device.h>
-#include <device/path.h>
 #include <device/soundwire.h>
 #include <mipi/ids.h>
 #include <stdio.h>
diff --git a/src/drivers/soundwire/alc5682/alc5682.c b/src/drivers/soundwire/alc5682/alc5682.c
index 0d8a3ab..67ce61c 100644
--- a/src/drivers/soundwire/alc5682/alc5682.c
+++ b/src/drivers/soundwire/alc5682/alc5682.c
@@ -4,7 +4,6 @@
 #include <acpi/acpi_device.h>
 #include <acpi/acpi_soundwire.h>
 #include <device/device.h>
-#include <device/path.h>
 #include <device/soundwire.h>
 #include <mipi/ids.h>
 #include <stdio.h>
diff --git a/src/drivers/soundwire/alc711/alc711.c b/src/drivers/soundwire/alc711/alc711.c
index cfe28ad..7d1ac42 100644
--- a/src/drivers/soundwire/alc711/alc711.c
+++ b/src/drivers/soundwire/alc711/alc711.c
@@ -4,7 +4,6 @@
 #include <acpi/acpi_device.h>
 #include <acpi/acpi_soundwire.h>
 #include <device/device.h>
-#include <device/path.h>
 #include <device/soundwire.h>
 #include <mipi/ids.h>
 #include <stdio.h>
diff --git a/src/drivers/soundwire/cs42l42/cs42l42.c b/src/drivers/soundwire/cs42l42/cs42l42.c
index e7c14cc..c0e1d90 100644
--- a/src/drivers/soundwire/cs42l42/cs42l42.c
+++ b/src/drivers/soundwire/cs42l42/cs42l42.c
@@ -4,7 +4,6 @@
 #include <acpi/acpi_device.h>
 #include <acpi/acpi_soundwire.h>
 #include <device/device.h>
-#include <device/path.h>
 #include <device/soundwire.h>
 #include <mipi/ids.h>
 #include <stdio.h>
diff --git a/src/drivers/soundwire/max98363/max98363.c b/src/drivers/soundwire/max98363/max98363.c
index 7b90d78..6eec97b 100644
--- a/src/drivers/soundwire/max98363/max98363.c
+++ b/src/drivers/soundwire/max98363/max98363.c
@@ -4,7 +4,6 @@
 #include <acpi/acpi_device.h>
 #include <acpi/acpi_soundwire.h>
 #include <device/device.h>
-#include <device/path.h>
 #include <device/soundwire.h>
 #include <mipi/ids.h>
 #include <stdio.h>
diff --git a/src/drivers/soundwire/max98373/max98373.c b/src/drivers/soundwire/max98373/max98373.c
index e3107c4..a394154 100644
--- a/src/drivers/soundwire/max98373/max98373.c
+++ b/src/drivers/soundwire/max98373/max98373.c
@@ -4,7 +4,6 @@
 #include <acpi/acpi_device.h>
 #include <acpi/acpi_soundwire.h>
 #include <device/device.h>
-#include <device/path.h>
 #include <device/soundwire.h>
 #include <mipi/ids.h>
 #include <stdio.h>
diff --git a/src/drivers/spi/acpi/acpi.c b/src/drivers/spi/acpi/acpi.c
index 537c377..e87946f 100644
--- a/src/drivers/spi/acpi/acpi.c
+++ b/src/drivers/spi/acpi/acpi.c
@@ -4,7 +4,6 @@
 #include <acpi/acpigen.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <device/path.h>
 #include <device/spi.h>
 #include <spi-generic.h>
 #include <string.h>
diff --git a/src/drivers/uart/acpi/acpi.c b/src/drivers/uart/acpi/acpi.c
index bcf896d..a245f2c 100644
--- a/src/drivers/uart/acpi/acpi.c
+++ b/src/drivers/uart/acpi/acpi.c
@@ -3,7 +3,6 @@
 #include <acpi/acpi_device.h>
 #include <acpi/acpigen.h>
 #include <console/console.h>
-#include <device/path.h>
 #include <string.h>
 #include "chip.h"
 
diff --git a/src/drivers/usb/acpi/usb_acpi.c b/src/drivers/usb/acpi/usb_acpi.c
index b463b3b..569147a 100644
--- a/src/drivers/usb/acpi/usb_acpi.c
+++ b/src/drivers/usb/acpi/usb_acpi.c
@@ -6,7 +6,6 @@
 #include <acpi/acpigen_dsm.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <device/path.h>
 #include "chip.h"
 
 static bool usb_acpi_add_gpios_to_crs(struct drivers_usb_acpi_config *cfg)
diff --git a/src/include/device/pci.h b/src/include/device/pci.h
index 88b9555..2e75195 100644
--- a/src/include/device/pci.h
+++ b/src/include/device/pci.h
@@ -25,7 +25,6 @@
 #include <device/pci_ops.h>
 #include <device/pci_rom.h>
 #include <device/pci_type.h> /* IWYU pragma: export */
-#include <device/resource.h>
 #include <stddef.h>
 #include <stdint.h>
 
diff --git a/src/include/reg_script.h b/src/include/reg_script.h
index 38a80aa..56db353 100644
--- a/src/include/reg_script.h
+++ b/src/include/reg_script.h
@@ -6,7 +6,6 @@
 #include <stdint.h>
 #include <device/device.h>
 #include <device/pci_type.h>
-#include <device/resource.h>
 
 /*
  * The reg script library is a way to provide data-driven I/O accesses for
diff --git a/src/lib/reg_script.c b/src/lib/reg_script.c
index bad9d9c..c14f927 100644
--- a/src/lib/reg_script.c
+++ b/src/lib/reg_script.c
@@ -5,7 +5,6 @@
 #include <console/console.h>
 #include <delay.h>
 #include <device/device.h>
-#include <device/resource.h>
 #include <device/pci.h>
 #include <stdint.h>
 #include <reg_script.h>
diff --git a/src/soc/amd/common/block/root_complex/ioapic.c b/src/soc/amd/common/block/root_complex/ioapic.c
index e183428..17e283f 100644
--- a/src/soc/amd/common/block/root_complex/ioapic.c
+++ b/src/soc/amd/common/block/root_complex/ioapic.c
@@ -4,7 +4,6 @@
 #include <amdblocks/root_complex.h>
 #include <arch/ioapic.h>
 #include <device/device.h>
-#include <device/resource.h>
 #include <types.h>
 
 void amd_pci_domain_init(struct device *domain)
diff --git a/src/soc/amd/common/fsp/fsp_graphics.c b/src/soc/amd/common/fsp/fsp_graphics.c
index 4847e3c..3e082e6 100644
--- a/src/soc/amd/common/fsp/fsp_graphics.c
+++ b/src/soc/amd/common/fsp/fsp_graphics.c
@@ -4,7 +4,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <device/resource.h>
 #include <fsp/graphics.h>
 
 void fsp_graphics_init(struct device *const dev)
diff --git a/src/soc/intel/apollolake/romstage.c b/src/soc/intel/apollolake/romstage.c
index ba865e3..f710883 100644
--- a/src/soc/intel/apollolake/romstage.c
+++ b/src/soc/intel/apollolake/romstage.c
@@ -9,7 +9,6 @@
 #include <device/device.h>
 #include <delay.h>
 #include <device/pci_def.h>
-#include <device/resource.h>
 #include <fsp/api.h>
 #include <fsp/util.h>
 #include <intelblocks/cpulib.h>
diff --git a/src/soc/intel/cannonlake/graphics.c b/src/soc/intel/cannonlake/graphics.c
index 93a84c2..abbe079 100644
--- a/src/soc/intel/cannonlake/graphics.c
+++ b/src/soc/intel/cannonlake/graphics.c
@@ -4,7 +4,6 @@
 #include <device/device.h>
 #include <device/mmio.h>
 #include <device/pci_def.h>
-#include <device/resource.h>
 #include <drivers/intel/gma/i915_reg.h>
 #include <intelblocks/graphics.h>
 #include <soc/ramstage.h>
diff --git a/src/soc/intel/common/block/smbus/smbus.c b/src/soc/intel/common/block/smbus/smbus.c
index 4f2ed36..97651c0 100644
--- a/src/soc/intel/common/block/smbus/smbus.c
+++ b/src/soc/intel/common/block/smbus/smbus.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <device/device.h>
-#include <device/path.h>
 #include <device/smbus.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/soc/intel/common/block/usb4/pcie.c b/src/soc/intel/common/block/usb4/pcie.c
index c066647..24b6f46 100644
--- a/src/soc/intel/common/block/usb4/pcie.c
+++ b/src/soc/intel/common/block/usb4/pcie.c
@@ -4,7 +4,6 @@
 #include <acpi/acpigen.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <device/path.h>
 #include <string.h>
 
 #include "chip.h"
diff --git a/src/soc/intel/xeon_sp/include/soc/chip_common.h b/src/soc/intel/xeon_sp/include/soc/chip_common.h
index c499f62..0c0258a 100644
--- a/src/soc/intel/xeon_sp/include/soc/chip_common.h
+++ b/src/soc/intel/xeon_sp/include/soc/chip_common.h
@@ -4,7 +4,6 @@
 #define _CHIP_COMMON_H_
 
 #include <device/device.h>
-#include <device/path.h>
 #include <soc/soc_util.h>
 
 union xeon_domain_path {
diff --git a/src/soc/intel/xeon_sp/spr/ioat.c b/src/soc/intel/xeon_sp/spr/ioat.c
index ecfc1f7..9ed9576 100644
--- a/src/soc/intel/xeon_sp/spr/ioat.c
+++ b/src/soc/intel/xeon_sp/spr/ioat.c
@@ -4,7 +4,6 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include <device/resource.h>
 
 #include <defs_iio.h>
 #include <hob_iiouds.h>
diff --git a/src/soc/mediatek/common/pcie.c b/src/soc/mediatek/common/pcie.c
index 10bece9..ce9055a 100644
--- a/src/soc/mediatek/common/pcie.c
+++ b/src/soc/mediatek/common/pcie.c
@@ -6,7 +6,6 @@
 #include <device/mmio.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <device/resource.h>
 #include <delay.h>
 #include <lib.h>
 #include <soc/addressmap.h>
diff --git a/src/southbridge/intel/bd82x6x/smbus.c b/src/southbridge/intel/bd82x6x/smbus.c
index d2ca247..9db8d7a 100644
--- a/src/southbridge/intel/bd82x6x/smbus.c
+++ b/src/southbridge/intel/bd82x6x/smbus.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <device/device.h>
-#include <device/path.h>
 #include <device/smbus.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/southbridge/intel/common/smbus_ops.c b/src/southbridge/intel/common/smbus_ops.c
index 347de73..8542ba3 100644
--- a/src/southbridge/intel/common/smbus_ops.c
+++ b/src/southbridge/intel/common/smbus_ops.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <device/device.h>
-#include <device/path.h>
 #include <device/smbus.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/southbridge/intel/i82801gx/smbus.c b/src/southbridge/intel/i82801gx/smbus.c
index d498037..f26ddd4 100644
--- a/src/southbridge/intel/i82801gx/smbus.c
+++ b/src/southbridge/intel/i82801gx/smbus.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <device/device.h>
-#include <device/path.h>
 #include <device/smbus.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/southbridge/intel/i82801ix/smbus.c b/src/southbridge/intel/i82801ix/smbus.c
index 1ddfb7f..8f60408 100644
--- a/src/southbridge/intel/i82801ix/smbus.c
+++ b/src/southbridge/intel/i82801ix/smbus.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <device/device.h>
-#include <device/path.h>
 #include <device/smbus.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/southbridge/intel/i82801jx/smbus.c b/src/southbridge/intel/i82801jx/smbus.c
index 8fa1914..15643bd 100644
--- a/src/southbridge/intel/i82801jx/smbus.c
+++ b/src/southbridge/intel/i82801jx/smbus.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <device/device.h>
-#include <device/path.h>
 #include <device/smbus.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/southbridge/intel/ibexpeak/smbus.c b/src/southbridge/intel/ibexpeak/smbus.c
index 3318458..6bbd1e4 100644
--- a/src/southbridge/intel/ibexpeak/smbus.c
+++ b/src/southbridge/intel/ibexpeak/smbus.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <device/device.h>
-#include <device/path.h>
 #include <device/smbus.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/southbridge/intel/lynxpoint/smbus.c b/src/southbridge/intel/lynxpoint/smbus.c
index 757254e..0363802 100644
--- a/src/southbridge/intel/lynxpoint/smbus.c
+++ b/src/southbridge/intel/lynxpoint/smbus.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <device/device.h>
-#include <device/path.h>
 #include <device/smbus.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/tests/lib/bootmem-test.c b/tests/lib/bootmem-test.c
index 4cf9a2d..5137533 100644
--- a/tests/lib/bootmem-test.c
+++ b/tests/lib/bootmem-test.c
@@ -3,7 +3,6 @@
 #include <bootmem.h>
 #include <commonlib/coreboot_tables.h>
 #include <device/device.h>
-#include <device/resource.h>
 #include <memrange.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/tests/lib/memrange-test.c b/tests/lib/memrange-test.c
index 9871484..eac4769 100644
--- a/tests/lib/memrange-test.c
+++ b/tests/lib/memrange-test.c
@@ -3,7 +3,6 @@
 #include <tests/test.h>
 
 #include <device/device.h>
-#include <device/resource.h>
 #include <commonlib/helpers.h>
 #include <memrange.h>
 
diff --git a/util/vgabios/device.c b/util/vgabios/device.c
index d130314..a129cbf 100644
--- a/util/vgabios/device.c
+++ b/util/vgabios/device.c
@@ -11,7 +11,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include <device/resource.h>
 
 /* the device we are working with... */
 biosemu_device_t bios_device;