diff --git a/src/soc/amd/cezanne/include/soc/xhci.h b/src/soc/amd/cezanne/include/soc/xhci.h
index c590195731..a7fe53b548 100644
--- a/src/soc/amd/cezanne/include/soc/xhci.h
+++ b/src/soc/amd/cezanne/include/soc/xhci.h
@@ -3,7 +3,7 @@
 #ifndef AMD_CEZANNE_XHCI_H
 #define AMD_CEZANNE_XHCI_H
 
-#include <device/device.h>
+#include <static.h>
 
 #define SOC_XHCI_0 DEV_PTR(xhci_0)
 #define SOC_XHCI_1 DEV_PTR(xhci_1)
diff --git a/src/soc/amd/common/pi/agesawrapper.c b/src/soc/amd/common/pi/agesawrapper.c
index 8ad1e0e4a9..a828d24a33 100644
--- a/src/soc/amd/common/pi/agesawrapper.c
+++ b/src/soc/amd/common/pi/agesawrapper.c
@@ -10,6 +10,7 @@
 #include <soc/pci_devs.h>
 #include <soc/northbridge.h>
 #include <soc/cpu.h>
+#include <static.h>
 #include <string.h>
 
 void __weak SetMemParams(AMD_POST_PARAMS *PostParams) {}
diff --git a/src/soc/amd/mendocino/include/soc/xhci.h b/src/soc/amd/mendocino/include/soc/xhci.h
index b554c98219..1d45893d78 100644
--- a/src/soc/amd/mendocino/include/soc/xhci.h
+++ b/src/soc/amd/mendocino/include/soc/xhci.h
@@ -3,6 +3,8 @@
 #ifndef AMD_MENDOCINO_XHCI_H
 #define AMD_MENDOCINO_XHCI_H
 
+#include <static.h>
+
 #define SOC_XHCI_0 DEV_PTR(xhci_0)
 #define SOC_XHCI_1 DEV_PTR(xhci_1)
 #define SOC_XHCI_2 DEV_PTR(xhci_2)
diff --git a/src/soc/amd/mendocino/xhci.c b/src/soc/amd/mendocino/xhci.c
index 8f46374fce..ed8be752b4 100644
--- a/src/soc/amd/mendocino/xhci.c
+++ b/src/soc/amd/mendocino/xhci.c
@@ -11,6 +11,7 @@
 #include <drivers/usb/pci_xhci/pci_xhci.h>
 #include <soc/pci_devs.h>
 #include <soc/smi.h>
+#include <static.h>
 
 static const struct sci_source xhci_sci_sources[] = {
 	{
diff --git a/src/soc/amd/phoenix/include/soc/xhci.h b/src/soc/amd/phoenix/include/soc/xhci.h
index 5b7d6eb204..72e03cc7c4 100644
--- a/src/soc/amd/phoenix/include/soc/xhci.h
+++ b/src/soc/amd/phoenix/include/soc/xhci.h
@@ -3,7 +3,7 @@
 #ifndef AMD_PHOENIX_XHCI_H
 #define AMD_PHOENIX_XHCI_H
 
-#include <device/device.h>
+#include <static.h>
 
 #define SOC_XHCI_0 DEV_PTR(xhci_0)
 #define SOC_XHCI_1 DEV_PTR(xhci_1)
diff --git a/src/soc/amd/stoneyridge/BiosCallOuts.c b/src/soc/amd/stoneyridge/BiosCallOuts.c
index 1aebddb020..fa0eb202d9 100644
--- a/src/soc/amd/stoneyridge/BiosCallOuts.c
+++ b/src/soc/amd/stoneyridge/BiosCallOuts.c
@@ -6,6 +6,7 @@
 #include <console/console.h>
 #include <soc/southbridge.h>
 #include <soc/pci_devs.h>
+#include <static.h>
 #include <amdblocks/agesawrapper.h>
 #include <amdblocks/dimm_spd.h>
 #include <amdblocks/car.h>
diff --git a/src/soc/amd/stoneyridge/fch.c b/src/soc/amd/stoneyridge/fch.c
index 3013500fa9..8729a14dea 100644
--- a/src/soc/amd/stoneyridge/fch.c
+++ b/src/soc/amd/stoneyridge/fch.c
@@ -20,6 +20,7 @@
 #include <soc/acpi.h>
 #include <soc/aoac_defs.h>
 #include <soc/nvs.h>
+#include <static.h>
 #include <types.h>
 
 /*
diff --git a/src/soc/amd/stoneyridge/fch_agesa.c b/src/soc/amd/stoneyridge/fch_agesa.c
index 179999a47f..5031971de1 100644
--- a/src/soc/amd/stoneyridge/fch_agesa.c
+++ b/src/soc/amd/stoneyridge/fch_agesa.c
@@ -3,6 +3,7 @@
 #include <amdblocks/agesawrapper.h>
 #include <device/device.h>
 #include <soc/pci_devs.h>
+#include <static.h>
 
 static int is_sata_config(void)
 {
diff --git a/src/soc/amd/stoneyridge/northbridge.c b/src/soc/amd/stoneyridge/northbridge.c
index 9519713447..b6ebf4db4b 100644
--- a/src/soc/amd/stoneyridge/northbridge.c
+++ b/src/soc/amd/stoneyridge/northbridge.c
@@ -25,6 +25,7 @@
 #include <soc/northbridge.h>
 #include <soc/pci_devs.h>
 #include <soc/iomap.h>
+#include <static.h>
 #include <stdint.h>
 #include <string.h>
 
diff --git a/src/soc/intel/alderlake/retimer.c b/src/soc/intel/alderlake/retimer.c
index 3fd9c2d43d..fd047dd9f2 100644
--- a/src/soc/intel/alderlake/retimer.c
+++ b/src/soc/intel/alderlake/retimer.c
@@ -4,6 +4,7 @@
 #include <device/device.h>
 #include <drivers/intel/usb4/retimer/retimer.h>
 #include <intelblocks/tcss.h>
+#include <static.h>
 
 int retimer_get_index_for_typec(uint8_t typec_port)
 {
diff --git a/src/soc/intel/meteorlake/retimer.c b/src/soc/intel/meteorlake/retimer.c
index 269620d0d1..a559cfc5c7 100644
--- a/src/soc/intel/meteorlake/retimer.c
+++ b/src/soc/intel/meteorlake/retimer.c
@@ -4,6 +4,7 @@
 #include <device/device.h>
 #include <drivers/intel/usb4/retimer/retimer.h>
 #include <intelblocks/tcss.h>
+#include <static.h>
 
 int retimer_get_index_for_typec(uint8_t typec_port)
 {
diff --git a/src/soc/intel/pantherlake/retimer.c b/src/soc/intel/pantherlake/retimer.c
index c14c04405b..d55cd7de3d 100644
--- a/src/soc/intel/pantherlake/retimer.c
+++ b/src/soc/intel/pantherlake/retimer.c
@@ -4,6 +4,7 @@
 #include <device/device.h>
 #include <drivers/intel/usb4/retimer/retimer.h>
 #include <intelblocks/tcss.h>
+#include <static.h>
 
 int retimer_get_index_for_typec(uint8_t typec_port)
 {
diff --git a/src/soc/intel/tigerlake/retimer.c b/src/soc/intel/tigerlake/retimer.c
index 32cb828b66..4a2ed6a0e6 100644
--- a/src/soc/intel/tigerlake/retimer.c
+++ b/src/soc/intel/tigerlake/retimer.c
@@ -4,6 +4,7 @@
 #include <device/device.h>
 #include <drivers/intel/usb4/retimer/retimer.h>
 #include <intelblocks/tcss.h>
+#include <static.h>
 #include <stdint.h>
 
 int retimer_get_index_for_typec(uint8_t typec_port)