diff --git a/src/soc/amd/picasso/include/soc/gpio.h b/src/soc/amd/picasso/include/soc/gpio.h
index 0f4507cd2e..70eaf9857f 100644
--- a/src/soc/amd/picasso/include/soc/gpio.h
+++ b/src/soc/amd/picasso/include/soc/gpio.h
@@ -9,6 +9,9 @@
 #ifndef __ACPI__
 #include <soc/iomap.h>
 #include <amdblocks/gpio_banks.h>
+#endif /* !__ACPI__ */
+
+#include <amdblocks/gpio_defs.h>
 
 /* The following sections describe only the GPIOs defined for this SOC */
 
@@ -296,5 +299,4 @@
 
 #define GPIO_2_EVENT GEVENT_8
 
-#endif /* __ACPI__ */
 #endif /* AMD_PICASSO_GPIO_H */