diff --git a/boards/arm/degu_evk/board.c b/boards/arm/degu_evk/board.c
index fa15bca6038..32552f1ec75 100644
--- a/boards/arm/degu_evk/board.c
+++ b/boards/arm/degu_evk/board.c
@@ -5,7 +5,7 @@
  */
 
 #include <init.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 static int board_degu_evk_init(struct device *dev)
 {
diff --git a/drivers/sensor/lps22hh/lps22hh.h b/drivers/sensor/lps22hh/lps22hh.h
index f81df74e1ae..d037ab02f7d 100644
--- a/drivers/sensor/lps22hh/lps22hh.h
+++ b/drivers/sensor/lps22hh/lps22hh.h
@@ -14,7 +14,7 @@
 #include <stdint.h>
 #include <drivers/i2c.h>
 #include <drivers/spi.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <sensor.h>
 #include <zephyr/types.h>
 #include <sys/util.h>
diff --git a/drivers/sensor/lps22hh/lps22hh_trigger.c b/drivers/sensor/lps22hh/lps22hh_trigger.c
index 55316563ed6..9f79164ecba 100644
--- a/drivers/sensor/lps22hh/lps22hh_trigger.c
+++ b/drivers/sensor/lps22hh/lps22hh_trigger.c
@@ -10,7 +10,7 @@
 
 #include <kernel.h>
 #include <sensor.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <logging/log.h>
 
 #include "lps22hh.h"
diff --git a/drivers/sensor/lsm6dso/lsm6dso.h b/drivers/sensor/lsm6dso/lsm6dso.h
index d56ddc12276..6f11f51c46c 100644
--- a/drivers/sensor/lsm6dso/lsm6dso.h
+++ b/drivers/sensor/lsm6dso/lsm6dso.h
@@ -13,7 +13,7 @@
 
 #include <sensor.h>
 #include <zephyr/types.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <drivers/spi.h>
 #include <sys/util.h>
 #include "lsm6dso_reg.h"
diff --git a/drivers/sensor/lsm6dso/lsm6dso_trigger.c b/drivers/sensor/lsm6dso/lsm6dso_trigger.c
index 3b4e3a5f865..4864983e8bd 100644
--- a/drivers/sensor/lsm6dso/lsm6dso_trigger.c
+++ b/drivers/sensor/lsm6dso/lsm6dso_trigger.c
@@ -10,7 +10,7 @@
 
 #include <kernel.h>
 #include <sensor.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <logging/log.h>
 
 #include "lsm6dso.h"
diff --git a/drivers/sensor/stts751/stts751.h b/drivers/sensor/stts751/stts751.h
index c2a8a5c6f43..7b7269047d4 100644
--- a/drivers/sensor/stts751/stts751.h
+++ b/drivers/sensor/stts751/stts751.h
@@ -13,7 +13,7 @@
 
 #include <stdint.h>
 #include <drivers/i2c.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <sensor.h>
 #include <zephyr/types.h>
 #include <sys/util.h>
diff --git a/drivers/sensor/stts751/stts751_trigger.c b/drivers/sensor/stts751/stts751_trigger.c
index b860b8267c2..89b4c87829c 100644
--- a/drivers/sensor/stts751/stts751_trigger.c
+++ b/drivers/sensor/stts751/stts751_trigger.c
@@ -10,7 +10,7 @@
 
 #include <kernel.h>
 #include <sensor.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <logging/log.h>
 
 #include "stts751.h"
diff --git a/samples/drivers/espi/src/main.c b/samples/drivers/espi/src/main.c
index c68cfa14e5f..8dfb77ebc7d 100644
--- a/samples/drivers/espi/src/main.c
+++ b/samples/drivers/espi/src/main.c
@@ -9,7 +9,7 @@
 #include <sys/printk.h>
 #include <device.h>
 #include <soc.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <drivers/espi.h>
 
 #ifdef CONFIG_ESPI_GPIO_DEV_NEEDED
diff --git a/samples/drivers/kscan/src/main.c b/samples/drivers/kscan/src/main.c
index 84e471f0e83..ef4d32d40af 100644
--- a/samples/drivers/kscan/src/main.c
+++ b/samples/drivers/kscan/src/main.c
@@ -6,7 +6,7 @@
 
 #include <zephyr.h>
 #include <sys/printk.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <soc.h>
 #include <kscan.h>