diff --git a/src/soc/intel/apollolake/include/soc/gpio.h b/src/soc/intel/apollolake/include/soc/gpio.h
index f06b9f52dc..6dfc54ced2 100644
--- a/src/soc/intel/apollolake/include/soc/gpio.h
+++ b/src/soc/intel/apollolake/include/soc/gpio.h
@@ -8,8 +8,8 @@
 #else
 #include <soc/gpio_apl.h>
 #endif
-#include <intelblocks/gpio.h>/* intelblocks/gpio.h depends on definitions in
-				soc/gpio_glk.h and soc/gpio_apl.h */
+/* intelblocks/gpio.h depends on definitions in soc/gpio_glk.h and soc/gpio_apl.h */
+#include <intelblocks/gpio.h> /* IWYU pragma: export */
 
 /*
  * APL/GLK doesn't support dynamic GPIO PM hence GPIO community
diff --git a/src/soc/intel/cannonlake/include/soc/gpio.h b/src/soc/intel/cannonlake/include/soc/gpio.h
index f204ca2510..7072b1dea1 100644
--- a/src/soc/intel/cannonlake/include/soc/gpio.h
+++ b/src/soc/intel/cannonlake/include/soc/gpio.h
@@ -10,7 +10,7 @@
 #include <soc/gpio_defs.h>
 #define CROS_GPIO_DEVICE_NAME	"INT34BB:00"
 #endif
-#include <intelblocks/gpio.h>
+#include <intelblocks/gpio.h> /* IWYU pragma: export */
 
 /* Enable GPIO community power management configuration */
 #define MISCCFG_GPIO_PM_CONFIG_BITS (MISCCFG_GPSIDEDPCGEN | \
diff --git a/src/soc/intel/elkhartlake/include/soc/gpio.h b/src/soc/intel/elkhartlake/include/soc/gpio.h
index 1eac393986..f60da27071 100644
--- a/src/soc/intel/elkhartlake/include/soc/gpio.h
+++ b/src/soc/intel/elkhartlake/include/soc/gpio.h
@@ -4,7 +4,7 @@
 #define _SOC_ELKHARTLAKE_GPIO_H_
 
 #include <soc/gpio_defs.h>
-#include <intelblocks/gpio.h>
+#include <intelblocks/gpio.h> /* IWYU pragma: export */
 
 #define CROS_GPIO_NAME		"INTC1020"
 #define CROS_GPIO_DEVICE_NAME	"INTC1020:00"
diff --git a/src/soc/intel/jasperlake/include/soc/gpio.h b/src/soc/intel/jasperlake/include/soc/gpio.h
index fa7f915eb0..c25e3907f6 100644
--- a/src/soc/intel/jasperlake/include/soc/gpio.h
+++ b/src/soc/intel/jasperlake/include/soc/gpio.h
@@ -4,7 +4,7 @@
 #define _SOC_JASPERLAKE_GPIO_H_
 
 #include <soc/gpio_defs.h>
-#include <intelblocks/gpio.h>
+#include <intelblocks/gpio.h> /* IWYU pragma: export */
 
 #define CROS_GPIO_NAME		"INT34C8"
 #define CROS_GPIO_COMM0_NAME    "INT34C8:00"
diff --git a/src/soc/intel/skylake/include/soc/gpio.h b/src/soc/intel/skylake/include/soc/gpio.h
index b55dea8197..1e33aa335c 100644
--- a/src/soc/intel/skylake/include/soc/gpio.h
+++ b/src/soc/intel/skylake/include/soc/gpio.h
@@ -4,8 +4,8 @@
 #define _SOC_GPIO_H_
 
 #include <soc/gpio_defs.h>
-#include <intelblocks/gpio.h> /* intelblocks/gpio.h depends on definitions in
-				soc/gpio_defs.h */
+/* intelblocks/gpio.h depends on definitions in soc/gpio_defs.h */
+#include <intelblocks/gpio.h> /* IWYU pragma: export */
 
 #define CROS_GPIO_DEVICE_NAME	"INT344B:00"
 
diff --git a/src/soc/intel/tigerlake/include/soc/gpio.h b/src/soc/intel/tigerlake/include/soc/gpio.h
index eece28f7c9..51df41511e 100644
--- a/src/soc/intel/tigerlake/include/soc/gpio.h
+++ b/src/soc/intel/tigerlake/include/soc/gpio.h
@@ -9,7 +9,7 @@
 #include <soc/gpio_defs.h>
 #define CROS_GPIO_DEVICE_NAME	"INT34C5:00"
 #endif
-#include <intelblocks/gpio.h>
+#include <intelblocks/gpio.h> /* IWYU pragma: export */
 
 /* Enable GPIO community power management configuration */
 #define MISCCFG_GPIO_PM_CONFIG_BITS (MISCCFG_GPVNNREQEN | \
diff --git a/src/soc/intel/xeon_sp/include/soc/gpio.h b/src/soc/intel/xeon_sp/include/soc/gpio.h
index e7ffa6ffcd..10347b7c26 100644
--- a/src/soc/intel/xeon_sp/include/soc/gpio.h
+++ b/src/soc/intel/xeon_sp/include/soc/gpio.h
@@ -4,7 +4,7 @@
 #define _SOC_GPIO_H_
 
 #include <soc/gpio_soc_defs.h>
-#include <intelblocks/gpio.h>
+#include <intelblocks/gpio.h> /* IWYU pragma: export */
 
 /*
  * XEON SP series doesn't support dynamic GPIO PM hence GPIO community