diff --git a/boards/arm/efm32hg_slstk3400a/board.c b/boards/arm/efm32hg_slstk3400a/board.c
index f65638ed99d..d4c6f95391e 100644
--- a/boards/arm/efm32hg_slstk3400a/board.c
+++ b/boards/arm/efm32hg_slstk3400a/board.c
@@ -6,7 +6,7 @@
 
 #include <init.h>
 #include "board.h"
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <misc/printk.h>
 
 static int efm32hg_slstk3400a_init(struct device *dev)
diff --git a/boards/arm/efm32pg_stk3402a/board.c b/boards/arm/efm32pg_stk3402a/board.c
index 763909a75dd..e4bc5ba6268 100644
--- a/boards/arm/efm32pg_stk3402a/board.c
+++ b/boards/arm/efm32pg_stk3402a/board.c
@@ -6,7 +6,7 @@
 
 #include <init.h>
 #include "board.h"
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <misc/printk.h>
 
 static int efm32pg_stk3402a_init(struct device *dev)
diff --git a/boards/arm/efm32wg_stk3800/board.c b/boards/arm/efm32wg_stk3800/board.c
index 148a9aabe6f..79deb059d22 100644
--- a/boards/arm/efm32wg_stk3800/board.c
+++ b/boards/arm/efm32wg_stk3800/board.c
@@ -6,7 +6,7 @@
 
 #include <init.h>
 #include "board.h"
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <misc/printk.h>
 
 static int efm32wg_stk3800_init(struct device *dev)
diff --git a/boards/arm/efr32_slwstk6061a/board.c b/boards/arm/efr32_slwstk6061a/board.c
index 38c64ad7070..ebc89373b01 100644
--- a/boards/arm/efr32_slwstk6061a/board.c
+++ b/boards/arm/efr32_slwstk6061a/board.c
@@ -6,7 +6,7 @@
 
 #include <init.h>
 #include "board.h"
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <misc/printk.h>
 
 static int efr32_slwstk6061a_init(struct device *dev)
diff --git a/boards/arm/hexiwear_k64/pinmux.c b/boards/arm/hexiwear_k64/pinmux.c
index 1e98ea6fc40..5870033b1c5 100644
--- a/boards/arm/hexiwear_k64/pinmux.c
+++ b/boards/arm/hexiwear_k64/pinmux.c
@@ -6,7 +6,7 @@
 
 #include <init.h>
 #include <pinmux.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <fsl_port.h>
 
 static int hexiwear_k64_pinmux_init(struct device *dev)
diff --git a/boards/arm/nrf52840_pca10090/board.c b/boards/arm/nrf52840_pca10090/board.c
index 3ac80150c31..e202505a623 100644
--- a/boards/arm/nrf52840_pca10090/board.c
+++ b/boards/arm/nrf52840_pca10090/board.c
@@ -6,7 +6,7 @@
 
 #include <zephyr.h>
 #include <init.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <logging/log.h>
 
 LOG_MODULE_REGISTER(board_control, CONFIG_BOARD_PCA10090_LOG_LEVEL);
diff --git a/boards/arm/nrf52_pca20020/board.c b/boards/arm/nrf52_pca20020/board.c
index 35504cb63c7..10b58b2364f 100644
--- a/boards/arm/nrf52_pca20020/board.c
+++ b/boards/arm/nrf52_pca20020/board.c
@@ -5,7 +5,7 @@
  */
 
 #include <init.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <misc/printk.h>
 
 #define VDD_PWR_CTRL_GPIO_PIN 30
diff --git a/boards/arm/nrf9160_pca10090/nrf52840_reset.c b/boards/arm/nrf9160_pca10090/nrf52840_reset.c
index 20bd8e08b5f..099c703d115 100644
--- a/boards/arm/nrf9160_pca10090/nrf52840_reset.c
+++ b/boards/arm/nrf9160_pca10090/nrf52840_reset.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <uart.h>
 #include <device.h>
 
diff --git a/boards/arm/particle_argon/board.c b/boards/arm/particle_argon/board.c
index 060ca9665dc..2bdd65c9c07 100644
--- a/boards/arm/particle_argon/board.c
+++ b/boards/arm/particle_argon/board.c
@@ -6,7 +6,7 @@
  */
 
 #include <init.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include "board.h"
 
 static inline void external_antenna(bool on)
diff --git a/boards/arm/particle_boron/board.c b/boards/arm/particle_boron/board.c
index 730fc2da307..c30d60abe02 100644
--- a/boards/arm/particle_boron/board.c
+++ b/boards/arm/particle_boron/board.c
@@ -6,7 +6,7 @@
  */
 
 #include <init.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include "board.h"
 
 static inline void external_antenna(bool on)
diff --git a/boards/arm/particle_xenon/board.c b/boards/arm/particle_xenon/board.c
index 37a47f9caf2..c395c4c7666 100644
--- a/boards/arm/particle_xenon/board.c
+++ b/boards/arm/particle_xenon/board.c
@@ -6,7 +6,7 @@
  */
 
 #include <init.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include "board.h"
 
 static inline void external_antenna(bool on)
diff --git a/boards/x86/arduino_101/nrf51_pm.c b/boards/x86/arduino_101/nrf51_pm.c
index 38df13c3ea1..d03a5c9c5f7 100644
--- a/boards/x86/arduino_101/nrf51_pm.c
+++ b/boards/x86/arduino_101/nrf51_pm.c
@@ -7,7 +7,7 @@
  */
 
 #include <zephyr.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <uart.h>
 
 #include <errno.h>
diff --git a/boards/x86/galileo/pinmux.c b/boards/x86/galileo/pinmux.c
index 1b5578c0b02..4c73b067be6 100644
--- a/boards/x86/galileo/pinmux.c
+++ b/boards/x86/galileo/pinmux.c
@@ -13,7 +13,7 @@
 
 #include <pinmux.h>
 #include <i2c.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <pwm.h>
 
 #include <pinmux/pinmux.h>
diff --git a/boards/x86/quark_se_c1000_devboard/board.c b/boards/x86/quark_se_c1000_devboard/board.c
index 6cd6eb0967b..dd0cac87089 100644
--- a/boards/x86/quark_se_c1000_devboard/board.c
+++ b/boards/x86/quark_se_c1000_devboard/board.c
@@ -12,7 +12,7 @@
 #if defined(CONFIG_IEEE802154_CC2520)
 
 #include <ieee802154/cc2520.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 static struct cc2520_gpio_configuration cc2520_gpios[CC2520_GPIO_IDX_MAX] = {
 	{ .dev = NULL, .pin = DT_INST_0_TI_CC2520_VREG_EN_GPIOS_PIN, },
diff --git a/drivers/audio/tlv320dac310x.c b/drivers/audio/tlv320dac310x.c
index 5b0ec779f37..76e84e00ca8 100644
--- a/drivers/audio/tlv320dac310x.c
+++ b/drivers/audio/tlv320dac310x.c
@@ -10,7 +10,7 @@
 
 #include <device.h>
 #include <i2c.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #include <audio/codec.h>
 #include "tlv320dac310x.h"
diff --git a/drivers/bluetooth/hci/spi.c b/drivers/bluetooth/hci/spi.c
index 0af2e5ec548..ca9c78f033a 100644
--- a/drivers/bluetooth/hci/spi.c
+++ b/drivers/bluetooth/hci/spi.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <init.h>
 #include <spi.h>
 #include <misc/byteorder.h>
diff --git a/drivers/can/can_mcp2515.c b/drivers/can/can_mcp2515.c
index ec84324dc0e..904bda7a187 100644
--- a/drivers/can/can_mcp2515.c
+++ b/drivers/can/can_mcp2515.c
@@ -7,7 +7,7 @@
 #include <kernel.h>
 #include <device.h>
 #include <spi.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #define LOG_LEVEL CONFIG_CAN_LOG_LEVEL
 #include <logging/log.h>
diff --git a/drivers/display/display_ili9340.c b/drivers/display/display_ili9340.c
index 473c1167eda..bb06c6f5082 100644
--- a/drivers/display/display_ili9340.c
+++ b/drivers/display/display_ili9340.c
@@ -12,7 +12,7 @@
 #include <logging/log.h>
 LOG_MODULE_REGISTER(display_ili9340);
 
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <misc/byteorder.h>
 #include <spi.h>
 #include <string.h>
diff --git a/drivers/display/mb_display.c b/drivers/display/mb_display.c
index 71f42df2f26..6cf25d75b5a 100644
--- a/drivers/display/mb_display.c
+++ b/drivers/display/mb_display.c
@@ -13,7 +13,7 @@
 
 #include <zephyr.h>
 #include <init.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <device.h>
 #include <string.h>
 #include <misc/printk.h>
diff --git a/drivers/display/ssd1306.c b/drivers/display/ssd1306.c
index 864be326999..647f12d836f 100644
--- a/drivers/display/ssd1306.c
+++ b/drivers/display/ssd1306.c
@@ -11,7 +11,7 @@ LOG_MODULE_REGISTER(ssd1306);
 #include <string.h>
 #include <device.h>
 #include <init.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <i2c.h>
 
 #include "ssd1306_regs.h"
diff --git a/drivers/display/ssd1673.c b/drivers/display/ssd1673.c
index 4b670346554..477121a0f9f 100644
--- a/drivers/display/ssd1673.c
+++ b/drivers/display/ssd1673.c
@@ -12,7 +12,7 @@ LOG_MODULE_REGISTER(ssd1673);
 #include <device.h>
 #include <display.h>
 #include <init.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <spi.h>
 #include <misc/byteorder.h>
 
diff --git a/drivers/ethernet/eth_enc28j60.c b/drivers/ethernet/eth_enc28j60.c
index c967ff8ec50..2c9c6cc8845 100644
--- a/drivers/ethernet/eth_enc28j60.c
+++ b/drivers/ethernet/eth_enc28j60.c
@@ -15,7 +15,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #include <device.h>
 #include <string.h>
 #include <errno.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <spi.h>
 #include <net/net_pkt.h>
 #include <net/net_if.h>
diff --git a/drivers/ethernet/eth_enc28j60_priv.h b/drivers/ethernet/eth_enc28j60_priv.h
index bcf1e9d6cbd..dbbb356cec7 100644
--- a/drivers/ethernet/eth_enc28j60_priv.h
+++ b/drivers/ethernet/eth_enc28j60_priv.h
@@ -6,7 +6,7 @@
  */
 
 #include <kernel.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #ifndef _ENC28J60_
 #define _ENC28J60_
diff --git a/drivers/gpio/gpio_altera_nios2.c b/drivers/gpio/gpio_altera_nios2.c
index 6f5ca70dbee..8a8a41e6701 100644
--- a/drivers/gpio/gpio_altera_nios2.c
+++ b/drivers/gpio/gpio_altera_nios2.c
@@ -13,7 +13,7 @@
 #include <device.h>
 #include <init.h>
 #include <soc.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #include "gpio_utils.h"
 #include "altera_avalon_pio_regs.h"
diff --git a/drivers/gpio/gpio_atmel_sam3.c b/drivers/gpio/gpio_atmel_sam3.c
index 5542d5125ee..39a3375b35e 100644
--- a/drivers/gpio/gpio_atmel_sam3.c
+++ b/drivers/gpio/gpio_atmel_sam3.c
@@ -17,7 +17,7 @@
 
 #include <soc.h>
 
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include "gpio_utils.h"
 
 typedef void (*config_func_t)(struct device *dev);
diff --git a/drivers/gpio/gpio_cc13xx_cc26xx.c b/drivers/gpio/gpio_cc13xx_cc26xx.c
index 610bb240de9..d1df171ac0e 100644
--- a/drivers/gpio/gpio_cc13xx_cc26xx.c
+++ b/drivers/gpio/gpio_cc13xx_cc26xx.c
@@ -8,7 +8,7 @@
 #include <misc/__assert.h>
 #include <device.h>
 #include <errno.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #include <driverlib/gpio.h>
 #include <driverlib/interrupt.h>
diff --git a/drivers/gpio/gpio_cc2650.c b/drivers/gpio/gpio_cc2650.c
index f1c43a9f127..8e370ce8453 100644
--- a/drivers/gpio/gpio_cc2650.c
+++ b/drivers/gpio/gpio_cc2650.c
@@ -6,7 +6,7 @@
 
 #include <toolchain/gcc.h>
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <init.h>
 #include <soc.h>
 #include <sys/sys_io.h>
diff --git a/drivers/gpio/gpio_cc32xx.c b/drivers/gpio/gpio_cc32xx.c
index a6856a90cd8..3aacc04b632 100644
--- a/drivers/gpio/gpio_cc32xx.c
+++ b/drivers/gpio/gpio_cc32xx.c
@@ -6,7 +6,7 @@
 #include <errno.h>
 
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <init.h>
 #include <kernel.h>
 #include <sys/sys_io.h>
diff --git a/drivers/gpio/gpio_cmsdk_ahb.c b/drivers/gpio/gpio_cmsdk_ahb.c
index 7a709fb1f2a..bc08fd5d24e 100644
--- a/drivers/gpio/gpio_cmsdk_ahb.c
+++ b/drivers/gpio/gpio_cmsdk_ahb.c
@@ -8,7 +8,7 @@
 
 #include <device.h>
 #include <errno.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <init.h>
 #include <soc.h>
 #include <clock_control/arm_clock_control.h>
diff --git a/drivers/gpio/gpio_cmsdk_ahb.h b/drivers/gpio/gpio_cmsdk_ahb.h
index a3177c52d6c..7070c1dc98d 100644
--- a/drivers/gpio/gpio_cmsdk_ahb.h
+++ b/drivers/gpio/gpio_cmsdk_ahb.h
@@ -6,7 +6,7 @@
 #ifndef ZEPHYR_DRIVERS_GPIO_GPIO_CMSDK_AHB_H_
 #define ZEPHYR_DRIVERS_GPIO_GPIO_CMSDK_AHB_H_
 
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/drivers/gpio/gpio_dw.c b/drivers/gpio/gpio_dw.c
index 6562654c10a..57bfe858915 100644
--- a/drivers/gpio/gpio_dw.c
+++ b/drivers/gpio/gpio_dw.c
@@ -7,7 +7,7 @@
 #include <errno.h>
 
 #include <kernel.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include "gpio_dw.h"
 #include "gpio_utils.h"
 
diff --git a/drivers/gpio/gpio_dw.h b/drivers/gpio/gpio_dw.h
index 0ec622f5447..8487c1543e0 100644
--- a/drivers/gpio/gpio_dw.h
+++ b/drivers/gpio/gpio_dw.h
@@ -8,7 +8,7 @@
 #define ZEPHYR_DRIVERS_GPIO_GPIO_DW_H_
 
 #include <zephyr/types.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include "gpio_dw_registers.h"
 
 #ifdef CONFIG_PCI
diff --git a/drivers/gpio/gpio_esp32.c b/drivers/gpio/gpio_esp32.c
index 5973c9082c3..d0d891aa382 100644
--- a/drivers/gpio/gpio_esp32.c
+++ b/drivers/gpio/gpio_esp32.c
@@ -13,7 +13,7 @@
 #include <soc.h>
 #include <errno.h>
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <kernel.h>
 #include <misc/util.h>
 #include <pinmux.h>
diff --git a/drivers/gpio/gpio_gecko.c b/drivers/gpio/gpio_gecko.c
index e7f5e7fbf3d..e3e97ddfba5 100644
--- a/drivers/gpio/gpio_gecko.c
+++ b/drivers/gpio/gpio_gecko.c
@@ -5,7 +5,7 @@
  */
 
 #include <errno.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <soc.h>
 #include <em_gpio.h>
 
diff --git a/drivers/gpio/gpio_handlers.c b/drivers/gpio/gpio_handlers.c
index cad773f4c48..88d1a14991f 100644
--- a/drivers/gpio/gpio_handlers.c
+++ b/drivers/gpio/gpio_handlers.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <syscall_handler.h>
 
 Z_SYSCALL_HANDLER(gpio_config, port, access_op, pin, flags)
diff --git a/drivers/gpio/gpio_ht16k33.c b/drivers/gpio/gpio_ht16k33.c
index 8dd48731282..ed3fba3efcd 100644
--- a/drivers/gpio/gpio_ht16k33.c
+++ b/drivers/gpio/gpio_ht16k33.c
@@ -9,7 +9,7 @@
  * @brief GPIO driver for the HT16K33 I2C LED driver with keyscan
  */
 
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <zephyr.h>
 
 #define LOG_LEVEL CONFIG_GPIO_LOG_LEVEL
diff --git a/drivers/gpio/gpio_imx.c b/drivers/gpio/gpio_imx.c
index af17071e2fd..bd2a393989d 100644
--- a/drivers/gpio/gpio_imx.c
+++ b/drivers/gpio/gpio_imx.c
@@ -6,7 +6,7 @@
 
 #include <errno.h>
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <soc.h>
 #include <gpio_imx.h>
 
diff --git a/drivers/gpio/gpio_intel_apl.c b/drivers/gpio/gpio_intel_apl.c
index b6374ad07f2..196e6eea070 100644
--- a/drivers/gpio/gpio_intel_apl.c
+++ b/drivers/gpio/gpio_intel_apl.c
@@ -22,7 +22,7 @@
 #define GPIO_INTEL_APL_NR_SUBDEVS 10
 
 #include <errno.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <soc.h>
 #include <sys/sys_io.h>
 #include <misc/__assert.h>
diff --git a/drivers/gpio/gpio_mchp_xec.c b/drivers/gpio/gpio_mchp_xec.c
index b9eb907df6e..82be7b32a07 100644
--- a/drivers/gpio/gpio_mchp_xec.c
+++ b/drivers/gpio/gpio_mchp_xec.c
@@ -6,7 +6,7 @@
 
 #include <errno.h>
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <soc.h>
 
 #include "gpio_utils.h"
diff --git a/drivers/gpio/gpio_mcux.c b/drivers/gpio/gpio_mcux.c
index 1e39f359a64..796ea792e4a 100644
--- a/drivers/gpio/gpio_mcux.c
+++ b/drivers/gpio/gpio_mcux.c
@@ -7,7 +7,7 @@
 
 #include <errno.h>
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <soc.h>
 #include <fsl_common.h>
 #include <fsl_port.h>
diff --git a/drivers/gpio/gpio_mcux_igpio.c b/drivers/gpio/gpio_mcux_igpio.c
index 2d8a165ff55..9e7e78033e6 100644
--- a/drivers/gpio/gpio_mcux_igpio.c
+++ b/drivers/gpio/gpio_mcux_igpio.c
@@ -6,7 +6,7 @@
 
 #include <errno.h>
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <soc.h>
 #include <fsl_common.h>
 #include <fsl_gpio.h>
diff --git a/drivers/gpio/gpio_mcux_lpc.c b/drivers/gpio/gpio_mcux_lpc.c
index 945c673c5bf..bbef207b219 100644
--- a/drivers/gpio/gpio_mcux_lpc.c
+++ b/drivers/gpio/gpio_mcux_lpc.c
@@ -15,7 +15,7 @@
 
 #include <errno.h>
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <soc.h>
 #include <fsl_common.h>
 #include "gpio_utils.h"
diff --git a/drivers/gpio/gpio_nrfx.c b/drivers/gpio/gpio_nrfx.c
index a6e7b6d0dfc..f2ceb2e7534 100644
--- a/drivers/gpio/gpio_nrfx.c
+++ b/drivers/gpio/gpio_nrfx.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <hal/nrf_gpio.h>
 #include <hal/nrf_gpiote.h>
 
diff --git a/drivers/gpio/gpio_pcal9535a.c b/drivers/gpio/gpio_pcal9535a.c
index fe3de448a34..e2fbc14f0cc 100644
--- a/drivers/gpio/gpio_pcal9535a.c
+++ b/drivers/gpio/gpio_pcal9535a.c
@@ -14,7 +14,7 @@
 #include <device.h>
 #include <init.h>
 #include <misc/util.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <i2c.h>
 
 #include "gpio_pcal9535a.h"
diff --git a/drivers/gpio/gpio_pcal9535a.h b/drivers/gpio/gpio_pcal9535a.h
index ef416f3da93..84dc67518f2 100644
--- a/drivers/gpio/gpio_pcal9535a.h
+++ b/drivers/gpio/gpio_pcal9535a.h
@@ -13,7 +13,7 @@
 
 #include <kernel.h>
 
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <i2c.h>
 
 #ifdef __cplusplus
diff --git a/drivers/gpio/gpio_qmsi.c b/drivers/gpio/gpio_qmsi.c
index 376285bfe27..d3a2d63b682 100644
--- a/drivers/gpio/gpio_qmsi.c
+++ b/drivers/gpio/gpio_qmsi.c
@@ -8,7 +8,7 @@
 
 #include <device.h>
 #include <drivers/interrupt_controller/ioapic.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <init.h>
 #include <sys/sys_io.h>
 #include <misc/util.h>
diff --git a/drivers/gpio/gpio_qmsi_ss.c b/drivers/gpio/gpio_qmsi_ss.c
index eee9900b535..3184b0efa47 100644
--- a/drivers/gpio/gpio_qmsi_ss.c
+++ b/drivers/gpio/gpio_qmsi_ss.c
@@ -6,7 +6,7 @@
 
 #include <errno.h>
 
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <soc.h>
 #include <misc/util.h>
 
diff --git a/drivers/gpio/gpio_rv32m1.c b/drivers/gpio/gpio_rv32m1.c
index bf287133c83..7956f3bacf2 100644
--- a/drivers/gpio/gpio_rv32m1.c
+++ b/drivers/gpio/gpio_rv32m1.c
@@ -8,7 +8,7 @@
 
 #include <errno.h>
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <soc.h>
 #include <fsl_common.h>
 #include <fsl_port.h>
diff --git a/drivers/gpio/gpio_sam.c b/drivers/gpio/gpio_sam.c
index e8c07b367a3..8ebb5ccad0b 100644
--- a/drivers/gpio/gpio_sam.c
+++ b/drivers/gpio/gpio_sam.c
@@ -9,7 +9,7 @@
 #include <device.h>
 #include <init.h>
 #include <soc.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #include "gpio_utils.h"
 
diff --git a/drivers/gpio/gpio_sam0.c b/drivers/gpio/gpio_sam0.c
index 7c849a6128a..2323e2d9297 100644
--- a/drivers/gpio/gpio_sam0.c
+++ b/drivers/gpio/gpio_sam0.c
@@ -6,7 +6,7 @@
 
 #include <errno.h>
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <soc.h>
 #include <interrupt_controller/sam0_eic.h>
 
diff --git a/drivers/gpio/gpio_sch.h b/drivers/gpio/gpio_sch.h
index c516e3371ca..2c929ea2f59 100644
--- a/drivers/gpio/gpio_sch.h
+++ b/drivers/gpio/gpio_sch.h
@@ -12,7 +12,7 @@
 
 #include <zephyr/types.h>
 #include <kernel.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #define GPIO_SCH_REG_GEN		(0x00)
 #define GPIO_SCH_REG_GIO		(0x04)
diff --git a/drivers/gpio/gpio_shell.c b/drivers/gpio/gpio_shell.c
index 27d2a335ff3..c3ca66ffa43 100644
--- a/drivers/gpio/gpio_shell.c
+++ b/drivers/gpio/gpio_shell.c
@@ -9,7 +9,7 @@
 #include <init.h>
 #include <string.h>
 #include <stdio.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <logging/log.h>
diff --git a/drivers/gpio/gpio_sifive.c b/drivers/gpio/gpio_sifive.c
index b17fe05cf54..a6efc2cce31 100644
--- a/drivers/gpio/gpio_sifive.c
+++ b/drivers/gpio/gpio_sifive.c
@@ -12,7 +12,7 @@
 #include <kernel.h>
 #include <device.h>
 #include <soc.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <misc/util.h>
 
 #include "gpio_utils.h"
diff --git a/drivers/gpio/gpio_stellaris.c b/drivers/gpio/gpio_stellaris.c
index 852ff81b306..ed2288e0a58 100644
--- a/drivers/gpio/gpio_stellaris.c
+++ b/drivers/gpio/gpio_stellaris.c
@@ -6,7 +6,7 @@
 
 #include <errno.h>
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <soc.h>
 #include <sys/sys_io.h>
 #include "gpio_utils.h"
diff --git a/drivers/gpio/gpio_stm32.c b/drivers/gpio/gpio_stm32.c
index 68c13c41c36..71645e1a747 100644
--- a/drivers/gpio/gpio_stm32.c
+++ b/drivers/gpio/gpio_stm32.c
@@ -9,7 +9,7 @@
 #include <kernel.h>
 #include <device.h>
 #include <soc.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <clock_control/stm32_clock_control.h>
 #include <pinmux/stm32/pinmux_stm32.h>
 #include <pinmux.h>
diff --git a/drivers/gpio/gpio_stm32.h b/drivers/gpio/gpio_stm32.h
index 16325d23f66..77acb2f3827 100644
--- a/drivers/gpio/gpio_stm32.h
+++ b/drivers/gpio/gpio_stm32.h
@@ -13,7 +13,7 @@
 
 #include <clock_control/stm32_clock_control.h>
 #include <pinmux/stm32/pinmux_stm32.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 /* GPIO buses definitions */
 
diff --git a/drivers/gpio/gpio_sx1509b.c b/drivers/gpio/gpio_sx1509b.c
index bafdc4aae7c..bc7484c442f 100644
--- a/drivers/gpio/gpio_sx1509b.c
+++ b/drivers/gpio/gpio_sx1509b.c
@@ -9,7 +9,7 @@
 #include <kernel.h>
 #include <device.h>
 #include <init.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <i2c.h>
 #include <misc/byteorder.h>
 #include <misc/util.h>
diff --git a/drivers/i2c/i2c_esp32.c b/drivers/i2c/i2c_esp32.c
index ac235a2db61..444cadf310d 100644
--- a/drivers/i2c/i2c_esp32.c
+++ b/drivers/i2c/i2c_esp32.c
@@ -12,7 +12,7 @@
 
 #include <soc.h>
 #include <errno.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <gpio/gpio_esp32.h>
 #include <i2c.h>
 #include <misc/util.h>
diff --git a/drivers/i2c/i2c_gpio.c b/drivers/i2c/i2c_gpio.c
index cc4a1a67a37..1aaec401f02 100644
--- a/drivers/i2c/i2c_gpio.c
+++ b/drivers/i2c/i2c_gpio.c
@@ -22,7 +22,7 @@
 
 #include <device.h>
 #include <errno.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <i2c.h>
 #include "i2c_bitbang.h"
 
diff --git a/drivers/ieee802154/ieee802154_cc1200.c b/drivers/ieee802154/ieee802154_cc1200.c
index 09b776931a0..fefecbbb382 100644
--- a/drivers/ieee802154/ieee802154_cc1200.c
+++ b/drivers/ieee802154/ieee802154_cc1200.c
@@ -27,7 +27,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #include <random/rand32.h>
 
 #include <spi.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #include <net/ieee802154_radio.h>
 
diff --git a/drivers/ieee802154/ieee802154_cc2520.c b/drivers/ieee802154/ieee802154_cc2520.c
index cad4e0d6848..cbac9271e12 100644
--- a/drivers/ieee802154/ieee802154_cc2520.c
+++ b/drivers/ieee802154/ieee802154_cc2520.c
@@ -26,7 +26,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #include <string.h>
 #include <random/rand32.h>
 
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #ifdef CONFIG_IEEE802154_CC2520_CRYPTO
 
diff --git a/drivers/ieee802154/ieee802154_mcr20a.c b/drivers/ieee802154/ieee802154_mcr20a.c
index 783437edf1f..95cbc52d8be 100644
--- a/drivers/ieee802154/ieee802154_mcr20a.c
+++ b/drivers/ieee802154/ieee802154_mcr20a.c
@@ -26,7 +26,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #include <string.h>
 #include <random/rand32.h>
 
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #include <net/ieee802154_radio.h>
 
diff --git a/drivers/led/ht16k33.c b/drivers/led/ht16k33.c
index 8dcc54fc113..5e727098dcb 100644
--- a/drivers/led/ht16k33.c
+++ b/drivers/led/ht16k33.c
@@ -9,7 +9,7 @@
  * @brief LED driver for the HT16K33 I2C LED driver with keyscan
  */
 
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <i2c.h>
 #include <kernel.h>
 #include <led.h>
diff --git a/drivers/led_strip/ws2812b_sw.c b/drivers/led_strip/ws2812b_sw.c
index 0a86025e4f5..147999dee96 100644
--- a/drivers/led_strip/ws2812b_sw.c
+++ b/drivers/led_strip/ws2812b_sw.c
@@ -14,7 +14,7 @@ LOG_MODULE_REGISTER(ws2812b_sw);
 
 #include <zephyr.h>
 #include <soc.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <device.h>
 #include <drivers/clock_control.h>
 
diff --git a/drivers/modem/ublox-sara-r4.c b/drivers/modem/ublox-sara-r4.c
index c429e52afd2..cb9a04fe6de 100644
--- a/drivers/modem/ublox-sara-r4.c
+++ b/drivers/modem/ublox-sara-r4.c
@@ -15,7 +15,7 @@ LOG_MODULE_REGISTER(LOG_DOMAIN);
 #include <ctype.h>
 #include <errno.h>
 #include <zephyr.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <device.h>
 #include <init.h>
 
diff --git a/drivers/modem/wncm14a2a.c b/drivers/modem/wncm14a2a.c
index 9b0bc9476e6..800af2633ae 100644
--- a/drivers/modem/wncm14a2a.c
+++ b/drivers/modem/wncm14a2a.c
@@ -15,7 +15,7 @@ LOG_MODULE_REGISTER(LOG_DOMAIN);
 #include <ctype.h>
 #include <errno.h>
 #include <zephyr.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <device.h>
 #include <init.h>
 
diff --git a/drivers/pwm/pwm_led_esp32.c b/drivers/pwm/pwm_led_esp32.c
index dae200a17f9..7ee9651a687 100644
--- a/drivers/pwm/pwm_led_esp32.c
+++ b/drivers/pwm/pwm_led_esp32.c
@@ -15,7 +15,7 @@
 #include <errno.h>
 #include <pwm.h>
 #include <kernel.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <string.h>
 
 #define PWM_ESP32_HSCH_HPOINT(i) (LEDC_HSCH0_HPOINT_REG + (0x14 * i))
diff --git a/drivers/pwm/pwm_pca9685.h b/drivers/pwm/pwm_pca9685.h
index 540fbde402f..e79577717ba 100644
--- a/drivers/pwm/pwm_pca9685.h
+++ b/drivers/pwm/pwm_pca9685.h
@@ -11,7 +11,7 @@
 #ifndef ZEPHYR_DRIVERS_PWM_PWM_PCA9685_H_
 #define ZEPHYR_DRIVERS_PWM_PWM_PCA9685_H_
 
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <i2c.h>
 
 #ifdef __cplusplus
diff --git a/drivers/sensor/adt7420/adt7420.h b/drivers/sensor/adt7420/adt7420.h
index ed1e02ac699..1f378483f12 100644
--- a/drivers/sensor/adt7420/adt7420.h
+++ b/drivers/sensor/adt7420/adt7420.h
@@ -9,7 +9,7 @@
 
 #include <zephyr/types.h>
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 /* ADT7420 registers */
 #define ADT7420_REG_TEMP_MSB		0x00 /* Temperature value MSB */
diff --git a/drivers/sensor/adt7420/adt7420_trigger.c b/drivers/sensor/adt7420/adt7420_trigger.c
index 96999d10412..9876e1195fe 100644
--- a/drivers/sensor/adt7420/adt7420_trigger.c
+++ b/drivers/sensor/adt7420/adt7420_trigger.c
@@ -5,7 +5,7 @@
  */
 
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <i2c.h>
 #include <misc/util.h>
 #include <kernel.h>
diff --git a/drivers/sensor/adxl362/adxl362.c b/drivers/sensor/adxl362/adxl362.c
index 4b44bbb712b..b3c17c77a75 100644
--- a/drivers/sensor/adxl362/adxl362.c
+++ b/drivers/sensor/adxl362/adxl362.c
@@ -9,7 +9,7 @@
 #include <string.h>
 #include <sensor.h>
 #include <init.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <misc/byteorder.h>
 #include <misc/__assert.h>
 #include <spi.h>
diff --git a/drivers/sensor/adxl362/adxl362.h b/drivers/sensor/adxl362/adxl362.h
index 31bcead1a3f..97621b5f1d0 100644
--- a/drivers/sensor/adxl362/adxl362.h
+++ b/drivers/sensor/adxl362/adxl362.h
@@ -9,7 +9,7 @@
 
 #include <zephyr/types.h>
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <spi.h>
 
 #define ADXL362_SLAVE_ID    1
diff --git a/drivers/sensor/adxl362/adxl362_trigger.c b/drivers/sensor/adxl362/adxl362_trigger.c
index a3210283816..7dc0dbef82f 100644
--- a/drivers/sensor/adxl362/adxl362_trigger.c
+++ b/drivers/sensor/adxl362/adxl362_trigger.c
@@ -5,7 +5,7 @@
  */
 
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <misc/util.h>
 #include <kernel.h>
 #include <sensor.h>
diff --git a/drivers/sensor/adxl372/adxl372.c b/drivers/sensor/adxl372/adxl372.c
index be866863e72..0d1553cdd63 100644
--- a/drivers/sensor/adxl372/adxl372.c
+++ b/drivers/sensor/adxl372/adxl372.c
@@ -8,7 +8,7 @@
 #include <string.h>
 #include <sensor.h>
 #include <init.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <misc/printk.h>
 #include <misc/__assert.h>
 #include <stdlib.h>
diff --git a/drivers/sensor/adxl372/adxl372.h b/drivers/sensor/adxl372/adxl372.h
index d5e6874bbd8..6006c1a02f7 100644
--- a/drivers/sensor/adxl372/adxl372.h
+++ b/drivers/sensor/adxl372/adxl372.h
@@ -9,7 +9,7 @@
 
 #include <zephyr/types.h>
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <spi.h>
 #include <i2c.h>
 #include <misc/util.h>
diff --git a/drivers/sensor/adxl372/adxl372_trigger.c b/drivers/sensor/adxl372/adxl372_trigger.c
index 10508934a64..88e7bbf3549 100644
--- a/drivers/sensor/adxl372/adxl372_trigger.c
+++ b/drivers/sensor/adxl372/adxl372_trigger.c
@@ -5,7 +5,7 @@
  */
 
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <misc/util.h>
 #include <kernel.h>
 #include <sensor.h>
diff --git a/drivers/sensor/amg88xx/amg88xx.c b/drivers/sensor/amg88xx/amg88xx.c
index 9bee22260dc..9537330275c 100644
--- a/drivers/sensor/amg88xx/amg88xx.c
+++ b/drivers/sensor/amg88xx/amg88xx.c
@@ -7,7 +7,7 @@
 #include <string.h>
 #include <device.h>
 #include <i2c.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <misc/byteorder.h>
 #include <misc/util.h>
 #include <kernel.h>
diff --git a/drivers/sensor/amg88xx/amg88xx.h b/drivers/sensor/amg88xx/amg88xx.h
index a6d63349e22..335001db07a 100644
--- a/drivers/sensor/amg88xx/amg88xx.h
+++ b/drivers/sensor/amg88xx/amg88xx.h
@@ -8,7 +8,7 @@
 #define ZEPHYR_DRIVERS_SENSOR_AMG88XX_AMG88XX_H_
 
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <misc/util.h>
 
 #define AMG88XX_I2C_ADDRESS	CONFIG_AMG88XX_I2C_ADDR
diff --git a/drivers/sensor/amg88xx/amg88xx_trigger.c b/drivers/sensor/amg88xx/amg88xx_trigger.c
index 32c463d9457..e4be3db0885 100644
--- a/drivers/sensor/amg88xx/amg88xx_trigger.c
+++ b/drivers/sensor/amg88xx/amg88xx_trigger.c
@@ -6,7 +6,7 @@
  */
 
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <i2c.h>
 #include <misc/util.h>
 #include <kernel.h>
diff --git a/drivers/sensor/apds9960/apds9960.h b/drivers/sensor/apds9960/apds9960.h
index d39affa6a1a..7e0ed606157 100644
--- a/drivers/sensor/apds9960/apds9960.h
+++ b/drivers/sensor/apds9960/apds9960.h
@@ -8,7 +8,7 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_APDS9960_APDS9960_H_
 #define ZEPHYR_DRIVERS_SENSOR_APDS9960_APDS9960_H_
 
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #define APDS9960_ENABLE_REG		0x80
 #define APDS9960_ENABLE_GEN		BIT(6)
diff --git a/drivers/sensor/apds9960/apds9960_trigger.c b/drivers/sensor/apds9960/apds9960_trigger.c
index 58334185886..17c5b4cd178 100644
--- a/drivers/sensor/apds9960/apds9960_trigger.c
+++ b/drivers/sensor/apds9960/apds9960_trigger.c
@@ -5,7 +5,7 @@
  */
 
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <i2c.h>
 #include <misc/util.h>
 #include <kernel.h>
diff --git a/drivers/sensor/bma280/bma280.h b/drivers/sensor/bma280/bma280.h
index 3e7f021acd9..11152aece16 100644
--- a/drivers/sensor/bma280/bma280.h
+++ b/drivers/sensor/bma280/bma280.h
@@ -10,7 +10,7 @@
 #include <device.h>
 #include <misc/util.h>
 #include <zephyr/types.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #define BMA280_I2C_ADDRESS		CONFIG_BMA280_I2C_ADDR
 
diff --git a/drivers/sensor/bmc150_magn/bmc150_magn.c b/drivers/sensor/bmc150_magn/bmc150_magn.c
index 8d45863c159..6eac8733509 100644
--- a/drivers/sensor/bmc150_magn/bmc150_magn.c
+++ b/drivers/sensor/bmc150_magn/bmc150_magn.c
@@ -16,7 +16,7 @@
 #include <misc/byteorder.h>
 #include <misc/__assert.h>
 
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <logging/log.h>
 
 #include "bmc150_magn.h"
diff --git a/drivers/sensor/bmc150_magn/bmc150_magn_trigger.c b/drivers/sensor/bmc150_magn/bmc150_magn_trigger.c
index 74140ebe59c..cc3e116cd4f 100644
--- a/drivers/sensor/bmc150_magn/bmc150_magn_trigger.c
+++ b/drivers/sensor/bmc150_magn/bmc150_magn_trigger.c
@@ -5,7 +5,7 @@
  */
 
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <misc/util.h>
 #include <kernel.h>
 #include <sensor.h>
diff --git a/drivers/sensor/bme280/bme280.c b/drivers/sensor/bme280/bme280.c
index a8767462c46..658e352e023 100644
--- a/drivers/sensor/bme280/bme280.c
+++ b/drivers/sensor/bme280/bme280.c
@@ -10,7 +10,7 @@
 #include <kernel.h>
 #include <sensor.h>
 #include <init.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <misc/byteorder.h>
 #include <misc/__assert.h>
 
diff --git a/drivers/sensor/bme680/bme680.c b/drivers/sensor/bme680/bme680.c
index fe1ee17301d..88177c02334 100644
--- a/drivers/sensor/bme680/bme680.c
+++ b/drivers/sensor/bme680/bme680.c
@@ -11,7 +11,7 @@
  */
 
 #include "bme680.h"
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <i2c.h>
 #include <init.h>
 #include <kernel.h>
diff --git a/drivers/sensor/bmg160/bmg160.h b/drivers/sensor/bmg160/bmg160.h
index 9bc538907c6..c7e31a73501 100644
--- a/drivers/sensor/bmg160/bmg160.h
+++ b/drivers/sensor/bmg160/bmg160.h
@@ -10,7 +10,7 @@
 #define ZEPHYR_DRIVERS_SENSOR_BMG160_BMG160_H_
 
 #include <i2c.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <misc/util.h>
 
 /* registers */
diff --git a/drivers/sensor/bmi160/bmi160.h b/drivers/sensor/bmi160/bmi160.h
index 31a80d1bc36..1dedafab790 100644
--- a/drivers/sensor/bmi160/bmi160.h
+++ b/drivers/sensor/bmi160/bmi160.h
@@ -8,7 +8,7 @@
 #ifndef ZEPHYR_DRIVERS_SENSOR_BMI160_BMI160_H_
 #define ZEPHYR_DRIVERS_SENSOR_BMI160_BMI160_H_
 
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <spi.h>
 #include <misc/util.h>
 
diff --git a/drivers/sensor/bmi160/bmi160_trigger.c b/drivers/sensor/bmi160/bmi160_trigger.c
index 6245d094e0a..fca4aebe53d 100644
--- a/drivers/sensor/bmi160/bmi160_trigger.c
+++ b/drivers/sensor/bmi160/bmi160_trigger.c
@@ -7,7 +7,7 @@
 
 #include <kernel.h>
 #include <sensor.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #include "bmi160.h"
 
diff --git a/drivers/sensor/bmm150/bmm150.h b/drivers/sensor/bmm150/bmm150.h
index f6438c83d46..1f7000df477 100644
--- a/drivers/sensor/bmm150/bmm150.h
+++ b/drivers/sensor/bmm150/bmm150.h
@@ -20,7 +20,7 @@
 #include <sensor.h>
 #include <misc/byteorder.h>
 #include <misc/__assert.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #define BMM150_REG_CHIP_ID         0x40
 #define BMM150_CHIP_ID_VAL         0x32
diff --git a/drivers/sensor/ccs811/ccs811.c b/drivers/sensor/ccs811/ccs811.c
index 4cac11f1ddf..9170f3d609a 100644
--- a/drivers/sensor/ccs811/ccs811.c
+++ b/drivers/sensor/ccs811/ccs811.c
@@ -5,7 +5,7 @@
  */
 
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <i2c.h>
 #include <kernel.h>
 #include <misc/byteorder.h>
diff --git a/drivers/sensor/ccs811/ccs811.h b/drivers/sensor/ccs811/ccs811.h
index a9d225697ab..9b9b4e56f4c 100644
--- a/drivers/sensor/ccs811/ccs811.h
+++ b/drivers/sensor/ccs811/ccs811.h
@@ -8,7 +8,7 @@
 #define ZEPHYR_DRIVERS_SENSOR_CCS811_CCS811_H_
 
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <misc/util.h>
 
 /* Registers */
diff --git a/drivers/sensor/dht/dht.c b/drivers/sensor/dht/dht.c
index 9099a20b908..f2276fe8f6b 100644
--- a/drivers/sensor/dht/dht.c
+++ b/drivers/sensor/dht/dht.c
@@ -5,7 +5,7 @@
  */
 
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <misc/byteorder.h>
 #include <misc/util.h>
 #include <sensor.h>
diff --git a/drivers/sensor/ens210/ens210.h b/drivers/sensor/ens210/ens210.h
index 99c39c76fe5..595038ab6b0 100644
--- a/drivers/sensor/ens210/ens210.h
+++ b/drivers/sensor/ens210/ens210.h
@@ -8,7 +8,7 @@
 #define ZEPHYR_DRIVERS_SENSOR_CCS8ZEPHYR_DRIVERS_SENSOR_ENS210_ENS210_H_11_CCS811_H_
 
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <misc/util.h>
 
 /* Registers */
diff --git a/drivers/sensor/fxas21002/fxas21002.h b/drivers/sensor/fxas21002/fxas21002.h
index 82bcee702ee..4170b5183eb 100644
--- a/drivers/sensor/fxas21002/fxas21002.h
+++ b/drivers/sensor/fxas21002/fxas21002.h
@@ -6,7 +6,7 @@
 
 #include <sensor.h>
 #include <i2c.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #define FXAS21002_REG_STATUS		0x00
 #define FXAS21002_REG_OUTXMSB		0x01
diff --git a/drivers/sensor/fxos8700/fxos8700.h b/drivers/sensor/fxos8700/fxos8700.h
index 302dbc90c9d..507ac24a18d 100644
--- a/drivers/sensor/fxos8700/fxos8700.h
+++ b/drivers/sensor/fxos8700/fxos8700.h
@@ -6,7 +6,7 @@
 
 #include <sensor.h>
 #include <i2c.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #define FXOS8700_REG_STATUS			0x00
 #define FXOS8700_REG_OUTXMSB			0x01
diff --git a/drivers/sensor/hmc5883l/hmc5883l.h b/drivers/sensor/hmc5883l/hmc5883l.h
index 0e959bdabe7..b773a5223b1 100644
--- a/drivers/sensor/hmc5883l/hmc5883l.h
+++ b/drivers/sensor/hmc5883l/hmc5883l.h
@@ -10,7 +10,7 @@
 #include <device.h>
 #include <misc/util.h>
 #include <zephyr/types.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #define HMC5883L_I2C_ADDR		0x1E
 
diff --git a/drivers/sensor/hp206c/hp206c.c b/drivers/sensor/hp206c/hp206c.c
index b2efbc2c502..5085b91d4ca 100644
--- a/drivers/sensor/hp206c/hp206c.c
+++ b/drivers/sensor/hp206c/hp206c.c
@@ -13,7 +13,7 @@
 #include <i2c.h>
 #include <misc/byteorder.h>
 #include <kernel.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <logging/log.h>
 
 #include "hp206c.h"
diff --git a/drivers/sensor/hts221/hts221.h b/drivers/sensor/hts221/hts221.h
index a1fb922c727..26fbbeeb665 100644
--- a/drivers/sensor/hts221/hts221.h
+++ b/drivers/sensor/hts221/hts221.h
@@ -10,7 +10,7 @@
 #include <device.h>
 #include <misc/util.h>
 #include <zephyr/types.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #define HTS221_AUTOINCREMENT_ADDR	BIT(7)
 
diff --git a/drivers/sensor/isl29035/isl29035.h b/drivers/sensor/isl29035/isl29035.h
index 2941bce1084..e1b339d7b94 100644
--- a/drivers/sensor/isl29035/isl29035.h
+++ b/drivers/sensor/isl29035/isl29035.h
@@ -12,7 +12,7 @@
 #include <device.h>
 #include <kernel.h>
 #include <sensor.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #define ISL29035_I2C_ADDRESS		0x44
 
diff --git a/drivers/sensor/lis2dh/lis2dh.h b/drivers/sensor/lis2dh/lis2dh.h
index b1556195a63..ca40c417eac 100644
--- a/drivers/sensor/lis2dh/lis2dh.h
+++ b/drivers/sensor/lis2dh/lis2dh.h
@@ -11,7 +11,7 @@
 #include <device.h>
 #include <misc/util.h>
 #include <stdint.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <sensor.h>
 #include <string.h>
 
diff --git a/drivers/sensor/lis2ds12/lis2ds12.h b/drivers/sensor/lis2ds12/lis2ds12.h
index 90e6e2651cc..ac5b7d1be4a 100644
--- a/drivers/sensor/lis2ds12/lis2ds12.h
+++ b/drivers/sensor/lis2ds12/lis2ds12.h
@@ -13,7 +13,7 @@
 
 #include <zephyr/types.h>
 #include <sensor.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #define LIS2DS12_REG_WHO_AM_I			0x0F
 #define LIS2DS12_VAL_WHO_AM_I			0x43
diff --git a/drivers/sensor/lis2dw12/lis2dw12.h b/drivers/sensor/lis2dw12/lis2dw12.h
index dcd10d0ae83..cd7bf6ffa81 100644
--- a/drivers/sensor/lis2dw12/lis2dw12.h
+++ b/drivers/sensor/lis2dw12/lis2dw12.h
@@ -12,7 +12,7 @@
 #define ZEPHYR_DRIVERS_SENSOR_LIS2DW12_LIS2DW12_H_
 
 #include <spi.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <misc/util.h>
 #include <sensor.h>
 #include "lis2dw12_reg.h"
diff --git a/drivers/sensor/lis2dw12/lis2dw12_trigger.c b/drivers/sensor/lis2dw12/lis2dw12_trigger.c
index 5b09d4c0018..5bb3cc5cd64 100644
--- a/drivers/sensor/lis2dw12/lis2dw12_trigger.c
+++ b/drivers/sensor/lis2dw12/lis2dw12_trigger.c
@@ -10,7 +10,7 @@
 
 #include <kernel.h>
 #include <sensor.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <logging/log.h>
 
 #include "lis2dw12.h"
diff --git a/drivers/sensor/lis2mdl/lis2mdl.h b/drivers/sensor/lis2mdl/lis2mdl.h
index fb82c83306a..b1bbffe83ac 100644
--- a/drivers/sensor/lis2mdl/lis2mdl.h
+++ b/drivers/sensor/lis2mdl/lis2mdl.h
@@ -9,7 +9,7 @@
 #ifndef __MAG_LIS2MDL_H
 #define __MAG_LIS2MDL_H
 
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <misc/util.h>
 #include <i2c.h>
 
diff --git a/drivers/sensor/lis2mdl/lis2mdl_trigger.c b/drivers/sensor/lis2mdl/lis2mdl_trigger.c
index bfa6d79d067..7448ca78a01 100644
--- a/drivers/sensor/lis2mdl/lis2mdl_trigger.c
+++ b/drivers/sensor/lis2mdl/lis2mdl_trigger.c
@@ -8,7 +8,7 @@
 
 #include <kernel.h>
 #include <sensor.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #include "lis2mdl.h"
 
diff --git a/drivers/sensor/lis3mdl/lis3mdl.h b/drivers/sensor/lis3mdl/lis3mdl.h
index 1f05b664560..5de57e5e653 100644
--- a/drivers/sensor/lis3mdl/lis3mdl.h
+++ b/drivers/sensor/lis3mdl/lis3mdl.h
@@ -10,7 +10,7 @@
 #include <device.h>
 #include <misc/util.h>
 #include <zephyr/types.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #define LIS3MDL_I2C_ADDR_BASE           0x1C
 #define LIS3MDL_I2C_ADDR_MASK           (~BIT(1))
diff --git a/drivers/sensor/lsm6dsl/lsm6dsl.h b/drivers/sensor/lsm6dsl/lsm6dsl.h
index 3aee094d590..f889cb1d4df 100644
--- a/drivers/sensor/lsm6dsl/lsm6dsl.h
+++ b/drivers/sensor/lsm6dsl/lsm6dsl.h
@@ -13,7 +13,7 @@
 
 #include <sensor.h>
 #include <zephyr/types.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <misc/util.h>
 
 #define LSM6DSL_REG_FUNC_CFG_ACCESS			0x01
diff --git a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c
index 9be0ff31017..1d9949f3a93 100644
--- a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c
+++ b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c
@@ -13,7 +13,7 @@
 #include <misc/byteorder.h>
 #include <misc/__assert.h>
 
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <logging/log.h>
 
 #include "lsm9ds0_gyro.h"
diff --git a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c
index ffe27b164e3..1dba5ad492e 100644
--- a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c
+++ b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c
@@ -12,7 +12,7 @@
 #include <misc/byteorder.h>
 #include <misc/__assert.h>
 
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #include "lsm9ds0_gyro.h"
 
diff --git a/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c b/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c
index 45729c59004..3a60e8da21e 100644
--- a/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c
+++ b/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c
@@ -14,7 +14,7 @@
 #include <init.h>
 #include <i2c.h>
 #include <misc/byteorder.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <logging/log.h>
 
 #include "lsm9ds0_mfd.h"
diff --git a/drivers/sensor/max30101/max30101.h b/drivers/sensor/max30101/max30101.h
index 8b385a0a0c6..c3d19bd011f 100644
--- a/drivers/sensor/max30101/max30101.h
+++ b/drivers/sensor/max30101/max30101.h
@@ -6,7 +6,7 @@
 
 #include <sensor.h>
 #include <i2c.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #define MAX30101_I2C_ADDRESS		0x57
 
diff --git a/drivers/sensor/mcp9808/mcp9808.h b/drivers/sensor/mcp9808/mcp9808.h
index 3bbc48d7949..473661bab2c 100644
--- a/drivers/sensor/mcp9808/mcp9808.h
+++ b/drivers/sensor/mcp9808/mcp9808.h
@@ -13,7 +13,7 @@
 #include <device.h>
 #include <sensor.h>
 #include <misc/util.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #define MCP9808_REG_CONFIG		0x01
 #define MCP9808_REG_UPPER_LIMIT		0x02
diff --git a/drivers/sensor/mpu6050/mpu6050.h b/drivers/sensor/mpu6050/mpu6050.h
index 0f0a55154a3..db4eab3500f 100644
--- a/drivers/sensor/mpu6050/mpu6050.h
+++ b/drivers/sensor/mpu6050/mpu6050.h
@@ -8,7 +8,7 @@
 #define ZEPHYR_DRIVERS_SENSOR_MPU6050_MPU6050_H_
 
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <misc/util.h>
 #include <zephyr/types.h>
 
diff --git a/drivers/sensor/sht3xd/sht3xd.h b/drivers/sensor/sht3xd/sht3xd.h
index 029c47df2b3..836f7150e45 100644
--- a/drivers/sensor/sht3xd/sht3xd.h
+++ b/drivers/sensor/sht3xd/sht3xd.h
@@ -9,7 +9,7 @@
 
 #include <device.h>
 #include <kernel.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #define SHT3XD_CMD_FETCH                0xE000
 #define SHT3XD_CMD_ART                  0x2B32
diff --git a/drivers/sensor/sx9500/sx9500.c b/drivers/sensor/sx9500/sx9500.c
index 58d81050983..34e8a5e06e8 100644
--- a/drivers/sensor/sx9500/sx9500.c
+++ b/drivers/sensor/sx9500/sx9500.c
@@ -12,7 +12,7 @@
 #include <i2c.h>
 #include <sensor.h>
 #include <init.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <misc/__assert.h>
 #include <logging/log.h>
 
diff --git a/drivers/sensor/sx9500/sx9500_trigger.c b/drivers/sensor/sx9500/sx9500_trigger.c
index 48b54c2aad3..629273e5616 100644
--- a/drivers/sensor/sx9500/sx9500_trigger.c
+++ b/drivers/sensor/sx9500/sx9500_trigger.c
@@ -9,7 +9,7 @@
 #include <kernel.h>
 #include <i2c.h>
 #include <sensor.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <misc/util.h>
 
 #include "sx9500.h"
diff --git a/drivers/sensor/ti_hdc/ti_hdc.c b/drivers/sensor/ti_hdc/ti_hdc.c
index f9e25081ffa..a94fccf5125 100644
--- a/drivers/sensor/ti_hdc/ti_hdc.c
+++ b/drivers/sensor/ti_hdc/ti_hdc.c
@@ -6,7 +6,7 @@
 
 #include <device.h>
 #include <i2c.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <kernel.h>
 #include <sensor.h>
 #include <misc/util.h>
diff --git a/drivers/sensor/tmp007/tmp007.c b/drivers/sensor/tmp007/tmp007.c
index 7019fb4fd1c..76a1881c702 100644
--- a/drivers/sensor/tmp007/tmp007.c
+++ b/drivers/sensor/tmp007/tmp007.c
@@ -6,7 +6,7 @@
 
 #include <device.h>
 #include <i2c.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <misc/byteorder.h>
 #include <misc/util.h>
 #include <kernel.h>
diff --git a/drivers/sensor/tmp007/tmp007.h b/drivers/sensor/tmp007/tmp007.h
index e9d87e7fcbc..325c11889e1 100644
--- a/drivers/sensor/tmp007/tmp007.h
+++ b/drivers/sensor/tmp007/tmp007.h
@@ -8,7 +8,7 @@
 #define ZEPHYR_DRIVERS_SENSOR_TMP007_TMP007_H_
 
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <misc/util.h>
 
 #define TMP007_I2C_ADDRESS		CONFIG_TMP007_I2C_ADDR
diff --git a/drivers/sensor/tmp007/tmp007_trigger.c b/drivers/sensor/tmp007/tmp007_trigger.c
index 4662a7a18d6..fabfcb9fbcd 100644
--- a/drivers/sensor/tmp007/tmp007_trigger.c
+++ b/drivers/sensor/tmp007/tmp007_trigger.c
@@ -5,7 +5,7 @@
  */
 
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <misc/util.h>
 #include <kernel.h>
 #include <sensor.h>
diff --git a/drivers/sensor/vl53l0x/vl53l0x.c b/drivers/sensor/vl53l0x/vl53l0x.c
index e8f6ccc8fa5..f44a25825da 100644
--- a/drivers/sensor/vl53l0x/vl53l0x.c
+++ b/drivers/sensor/vl53l0x/vl53l0x.c
@@ -12,7 +12,7 @@
 #include <i2c.h>
 #include <sensor.h>
 #include <init.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <misc/__assert.h>
 #include <zephyr/types.h>
 #include <device.h>
diff --git a/drivers/spi/spi_context.h b/drivers/spi/spi_context.h
index f23803875bb..2d01e8a0d02 100644
--- a/drivers/spi/spi_context.h
+++ b/drivers/spi/spi_context.h
@@ -12,7 +12,7 @@
 #ifndef ZEPHYR_DRIVERS_SPI_SPI_CONTEXT_H_
 #define ZEPHYR_DRIVERS_SPI_SPI_CONTEXT_H_
 
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <spi.h>
 
 #ifdef __cplusplus
diff --git a/drivers/usb/device/usb_dc_stm32.c b/drivers/usb/device/usb_dc_stm32.c
index b16f6ab7a37..1d33e2adba3 100644
--- a/drivers/usb/device/usb_dc_stm32.c
+++ b/drivers/usb/device/usb_dc_stm32.c
@@ -49,7 +49,7 @@
 #include <usb/usb_device.h>
 #include <clock_control/stm32_clock_control.h>
 #include <misc/util.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #define LOG_LEVEL CONFIG_USB_DRIVER_LOG_LEVEL
 #include <logging/log.h>
diff --git a/drivers/wifi/eswifi/eswifi_bus_spi.c b/drivers/wifi/eswifi/eswifi_bus_spi.c
index f3cfb722a43..52dbb650f09 100644
--- a/drivers/wifi/eswifi/eswifi_bus_spi.c
+++ b/drivers/wifi/eswifi/eswifi_bus_spi.c
@@ -12,7 +12,7 @@ LOG_MODULE_REGISTER(wifi_eswifi_bus_spi);
 #include <device.h>
 #include <string.h>
 #include <errno.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <spi.h>
 
 #include "eswifi.h"
diff --git a/drivers/wifi/eswifi/eswifi_core.c b/drivers/wifi/eswifi/eswifi_core.c
index 71142d20f11..459f272dbd9 100644
--- a/drivers/wifi/eswifi/eswifi_core.c
+++ b/drivers/wifi/eswifi/eswifi_core.c
@@ -12,7 +12,7 @@ LOG_MODULE_REGISTER(wifi_eswifi_core);
 #include <device.h>
 #include <string.h>
 #include <errno.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <net/net_pkt.h>
 #include <net/net_if.h>
 #include <net/net_context.h>
diff --git a/drivers/wifi/winc1500/wifi_winc1500_nm_bsp_internal.h b/drivers/wifi/winc1500/wifi_winc1500_nm_bsp_internal.h
index 1dbf9ee4deb..c5cd0049c5e 100644
--- a/drivers/wifi/winc1500/wifi_winc1500_nm_bsp_internal.h
+++ b/drivers/wifi/winc1500/wifi_winc1500_nm_bsp_internal.h
@@ -8,7 +8,7 @@
 #define ZEPHYR_DRIVERS_WIFI_WINC1500_WIFI_WINC1500_NM_BSP_INTERNAL_H_
 
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <spi.h>
 
 #include <wifi/winc1500.h>
diff --git a/include/drivers/gpio.h b/include/drivers/gpio.h
new file mode 100644
index 00000000000..bd732533e70
--- /dev/null
+++ b/include/drivers/gpio.h
@@ -0,0 +1,474 @@
+/*
+ * Copyright (c) 2017 ARM Ltd
+ * Copyright (c) 2015-2016 Intel Corporation.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @file
+ * @brief Public APIs for GPIO drivers
+ */
+
+#ifndef ZEPHYR_INCLUDE_DRIVERS_GPIO_H_
+#define ZEPHYR_INCLUDE_DRIVERS_GPIO_H_
+
+#include <misc/__assert.h>
+#include <misc/slist.h>
+
+#include <zephyr/types.h>
+#include <stddef.h>
+#include <device.h>
+#include <dt-bindings/gpio/gpio.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @brief GPIO Driver APIs
+ * @defgroup gpio_interface GPIO Driver APIs
+ * @ingroup io_interfaces
+ * @{
+ */
+
+/** @cond INTERNAL_HIDDEN */
+#define GPIO_ACCESS_BY_PIN 0
+#define GPIO_ACCESS_BY_PORT 1
+/**
+ * @endcond
+ */
+
+struct gpio_callback;
+
+/**
+ * @typedef gpio_callback_handler_t
+ * @brief Define the application callback handler function signature
+ *
+ * @param "struct device *port" Device struct for the GPIO device.
+ * @param "struct gpio_callback *cb" Original struct gpio_callback
+ *        owning this handler
+ * @param "u32_t pins" Mask of pins that triggers the callback handler
+ *
+ * Note: cb pointer can be used to retrieve private data through
+ * CONTAINER_OF() if original struct gpio_callback is stored in
+ * another private structure.
+ */
+typedef void (*gpio_callback_handler_t)(struct device *port,
+					struct gpio_callback *cb,
+					u32_t pins);
+
+/**
+ * @brief GPIO callback structure
+ *
+ * Used to register a callback in the driver instance callback list.
+ * As many callbacks as needed can be added as long as each of them
+ * are unique pointers of struct gpio_callback.
+ * Beware such structure should not be allocated on stack.
+ *
+ * Note: To help setting it, see gpio_init_callback() below
+ */
+struct gpio_callback {
+	/** This is meant to be used in the driver and the user should not
+	 * mess with it (see drivers/gpio/gpio_utils.h)
+	 */
+	sys_snode_t node;
+
+	/** Actual callback function being called when relevant. */
+	gpio_callback_handler_t handler;
+
+	/** A mask of pins the callback is interested in, if 0 the callback
+	 * will never be called. Such pin_mask can be modified whenever
+	 * necessary by the owner, and thus will affect the handler being
+	 * called or not. The selected pins must be configured to trigger
+	 * an interrupt.
+	 */
+	u32_t pin_mask;
+};
+
+/**
+ * @cond INTERNAL_HIDDEN
+ *
+ * GPIO driver API definition and system call entry points
+ *
+ * (Internal use only.)
+ */
+typedef int (*gpio_config_t)(struct device *port, int access_op,
+			     u32_t pin, int flags);
+typedef int (*gpio_write_t)(struct device *port, int access_op,
+			    u32_t pin, u32_t value);
+typedef int (*gpio_read_t)(struct device *port, int access_op,
+			   u32_t pin, u32_t *value);
+typedef int (*gpio_manage_callback_t)(struct device *port,
+				      struct gpio_callback *callback,
+				      bool set);
+typedef int (*gpio_enable_callback_t)(struct device *port,
+				      int access_op,
+				      u32_t pin);
+typedef int (*gpio_disable_callback_t)(struct device *port,
+				       int access_op,
+				       u32_t pin);
+typedef u32_t (*gpio_api_get_pending_int)(struct device *dev);
+
+struct gpio_driver_api {
+	gpio_config_t config;
+	gpio_write_t write;
+	gpio_read_t read;
+	gpio_manage_callback_t manage_callback;
+	gpio_enable_callback_t enable_callback;
+	gpio_disable_callback_t disable_callback;
+	gpio_api_get_pending_int get_pending_int;
+};
+
+__syscall int gpio_config(struct device *port, int access_op, u32_t pin,
+			  int flags);
+
+static inline int z_impl_gpio_config(struct device *port, int access_op,
+				    u32_t pin, int flags)
+{
+	const struct gpio_driver_api *api =
+		(const struct gpio_driver_api *)port->driver_api;
+
+	return api->config(port, access_op, pin, flags);
+}
+
+__syscall int gpio_write(struct device *port, int access_op, u32_t pin,
+			 u32_t value);
+
+static inline int z_impl_gpio_write(struct device *port, int access_op,
+				   u32_t pin, u32_t value)
+{
+	const struct gpio_driver_api *api =
+		(const struct gpio_driver_api *)port->driver_api;
+
+	return api->write(port, access_op, pin, value);
+}
+
+__syscall int gpio_read(struct device *port, int access_op, u32_t pin,
+			u32_t *value);
+
+static inline int z_impl_gpio_read(struct device *port, int access_op,
+				  u32_t pin, u32_t *value)
+{
+	const struct gpio_driver_api *api =
+		(const struct gpio_driver_api *)port->driver_api;
+
+	return api->read(port, access_op, pin, value);
+}
+
+__syscall int gpio_enable_callback(struct device *port, int access_op,
+				   u32_t pin);
+
+static inline int z_impl_gpio_enable_callback(struct device *port,
+					     int access_op, u32_t pin)
+{
+	const struct gpio_driver_api *api =
+		(const struct gpio_driver_api *)port->driver_api;
+
+	if (api->enable_callback == NULL) {
+		return -ENOTSUP;
+	}
+
+	return api->enable_callback(port, access_op, pin);
+}
+
+__syscall int gpio_disable_callback(struct device *port, int access_op,
+				    u32_t pin);
+
+static inline int z_impl_gpio_disable_callback(struct device *port,
+					      int access_op, u32_t pin)
+{
+	const struct gpio_driver_api *api =
+		(const struct gpio_driver_api *)port->driver_api;
+
+	if (api->disable_callback == NULL) {
+		return -ENOTSUP;
+	}
+
+	return api->disable_callback(port, access_op, pin);
+}
+/**
+ * @endcond
+ */
+
+/**
+ * @brief Configure a single pin.
+ * @param port Pointer to device structure for the driver instance.
+ * @param pin Pin number to configure.
+ * @param flags Flags for pin configuration. IN/OUT, interrupt ...
+ * @return 0 if successful, negative errno code on failure.
+ */
+static inline int gpio_pin_configure(struct device *port, u32_t pin,
+				     int flags)
+{
+	return gpio_config(port, GPIO_ACCESS_BY_PIN, pin, flags);
+}
+
+/**
+ * @brief Write the data value to a single pin.
+ * @param port Pointer to the device structure for the driver instance.
+ * @param pin Pin number where the data is written.
+ * @param value Value set on the pin.
+ * @return 0 if successful, negative errno code on failure.
+ */
+static inline int gpio_pin_write(struct device *port, u32_t pin,
+				 u32_t value)
+{
+	return gpio_write(port, GPIO_ACCESS_BY_PIN, pin, value);
+}
+
+/**
+ * @brief Read the data value of a single pin.
+ *
+ * Read the input state of a pin, returning the value 0 or 1.
+ *
+ * @param port Pointer to the device structure for the driver instance.
+ * @param pin Pin number where data is read.
+ * @param value Integer pointer to receive the data values from the pin.
+ * @return 0 if successful, negative errno code on failure.
+ */
+static inline int gpio_pin_read(struct device *port, u32_t pin,
+				u32_t *value)
+{
+	return gpio_read(port, GPIO_ACCESS_BY_PIN, pin, value);
+}
+
+/**
+ * @brief Helper to initialize a struct gpio_callback properly
+ * @param callback A valid Application's callback structure pointer.
+ * @param handler A valid handler function pointer.
+ * @param pin_mask A bit mask of relevant pins for the handler
+ */
+static inline void gpio_init_callback(struct gpio_callback *callback,
+				      gpio_callback_handler_t handler,
+				      u32_t pin_mask)
+{
+	__ASSERT(callback, "Callback pointer should not be NULL");
+	__ASSERT(handler, "Callback handler pointer should not be NULL");
+
+	callback->handler = handler;
+	callback->pin_mask = pin_mask;
+}
+
+/**
+ * @brief Add an application callback.
+ * @param port Pointer to the device structure for the driver instance.
+ * @param callback A valid Application's callback structure pointer.
+ * @return 0 if successful, negative errno code on failure.
+ *
+ * @note Callbacks may be added to the device from within a callback
+ * handler invocation, but whether they are invoked for the current
+ * GPIO event is not specified.
+ *
+ * Note: enables to add as many callback as needed on the same port.
+ */
+static inline int gpio_add_callback(struct device *port,
+				    struct gpio_callback *callback)
+{
+	const struct gpio_driver_api *api =
+		(const struct gpio_driver_api *)port->driver_api;
+
+	if (api->manage_callback == NULL) {
+		return -ENOTSUP;
+	}
+
+	return api->manage_callback(port, callback, true);
+}
+
+/**
+ * @brief Remove an application callback.
+ * @param port Pointer to the device structure for the driver instance.
+ * @param callback A valid application's callback structure pointer.
+ * @return 0 if successful, negative errno code on failure.
+ *
+ * @warning It is explicitly permitted, within a callback handler, to
+ * remove the registration for the callback that is running, i.e. @p
+ * callback.  Attempts to remove other registrations on the same
+ * device may result in undefined behavior, including failure to
+ * invoke callbacks that remain registered and unintended invocation
+ * of removed callbacks.
+ *
+ * Note: enables to remove as many callbacks as added through
+ *       gpio_add_callback().
+ */
+static inline int gpio_remove_callback(struct device *port,
+				       struct gpio_callback *callback)
+{
+	const struct gpio_driver_api *api =
+		(const struct gpio_driver_api *)port->driver_api;
+
+	if (api->manage_callback == NULL) {
+		return -ENOTSUP;
+	}
+
+	return api->manage_callback(port, callback, false);
+}
+
+/**
+ * @brief Enable callback(s) for a single pin.
+ * @param port Pointer to the device structure for the driver instance.
+ * @param pin Pin number where the callback function is enabled.
+ * @return 0 if successful, negative errno code on failure.
+ *
+ * Note: Depending on the driver implementation, this function will enable
+ *       the pin to trigger an interruption. So as a semantic detail, if no
+ *       callback is registered, of course none will be called.
+ */
+static inline int gpio_pin_enable_callback(struct device *port, u32_t pin)
+{
+	return gpio_enable_callback(port, GPIO_ACCESS_BY_PIN, pin);
+}
+
+/**
+ * @brief Disable callback(s) for a single pin.
+ * @param port Pointer to the device structure for the driver instance.
+ * @param pin Pin number where the callback function is disabled.
+ * @return 0 if successful, negative errno code on failure.
+ */
+static inline int gpio_pin_disable_callback(struct device *port, u32_t pin)
+{
+	return gpio_disable_callback(port, GPIO_ACCESS_BY_PIN, pin);
+}
+
+/**
+ * @brief Configure all the pins the same way in the port.
+ *        List out all flags on the detailed description.
+ *
+ * @param port Pointer to the device structure for the driver instance.
+ * @param flags Flags for the port configuration. IN/OUT, interrupt ...
+ * @return 0 if successful, negative errno code on failure.
+ */
+__deprecated static inline int gpio_port_configure(struct device *port,
+		int flags)
+{
+	return gpio_config(port, GPIO_ACCESS_BY_PORT, 0, flags);
+}
+
+/**
+ * @brief Write a data value to the port.
+ *
+ * Write the output state of a port. The state of each pin is
+ * represented by one bit in the value.  Pin 0 corresponds to the
+ * least significant bit, pin 31 corresponds to the most significant
+ * bit.  For ports with less that 32 physical pins the most significant
+ * bits which do not correspond to a physical pin are ignored.
+ *
+ * @param port Pointer to the device structure for the driver instance.
+ * @param value Value to set on the port.
+ * @return 0 if successful, negative errno code on failure.
+ */
+__deprecated static inline int gpio_port_write(struct device *port, u32_t value)
+{
+	return gpio_write(port, GPIO_ACCESS_BY_PORT, 0, value);
+}
+
+/**
+ * @brief Read data value from the port.
+ *
+ * Read the input state of a port.  The state of each pin is
+ * represented by one bit in the returned value.  Pin 0 corresponds to
+ * the least significant bit, pin 31 corresponds to the most
+ * significant bit. Unused bits for ports with less that 32 physical
+ * pins are returned as 0.
+ *
+ * @param port Pointer to the device structure for the driver instance.
+ * @param value Integer pointer to receive the data value from the port.
+ * @return 0 if successful, negative errno code on failure.
+ */
+__deprecated static inline int gpio_port_read(struct device *port, u32_t *value)
+{
+	return gpio_read(port, GPIO_ACCESS_BY_PORT, 0, value);
+}
+
+/**
+ * @brief Enable callback(s) for the port.
+ * @param port Pointer to the device structure for the driver instance.
+ * @return 0 if successful, negative errno code on failure.
+ *
+ * Note: Depending on the driver implementation, this function will enable
+ *       the port to trigger an interruption on all pins, as long as these
+ *       are configured properly. So as a semantic detail, if no callback
+ *       is registered, of course none will be called.
+ */
+__deprecated static inline int gpio_port_enable_callback(struct device *port)
+{
+	return gpio_enable_callback(port, GPIO_ACCESS_BY_PORT, 0);
+}
+
+/**
+ * @brief Disable callback(s) for the port.
+ * @param port Pointer to the device structure for the driver instance.
+ * @return 0 if successful, negative errno code on failure.
+ */
+__deprecated static inline int gpio_port_disable_callback(struct device *port)
+{
+	return gpio_disable_callback(port, GPIO_ACCESS_BY_PORT, 0);
+}
+
+/**
+ * @brief Function to get pending interrupts
+ *
+ * The purpose of this function is to return the interrupt
+ * status register for the device.
+ * This is especially useful when waking up from
+ * low power states to check the wake up source.
+ *
+ * @param dev Pointer to the device structure for the driver instance.
+ *
+ * @retval status != 0 if at least one gpio interrupt is pending.
+ * @retval 0 if no gpio interrupt is pending.
+ */
+__syscall int gpio_get_pending_int(struct device *dev);
+
+/**
+ * @internal
+ */
+static inline int z_impl_gpio_get_pending_int(struct device *dev)
+{
+	const struct gpio_driver_api *api =
+		(const struct gpio_driver_api *)dev->driver_api;
+
+	if (api->get_pending_int == NULL) {
+		return -ENOTSUP;
+	}
+
+	return api->get_pending_int(dev);
+}
+
+struct gpio_pin_config {
+	char *gpio_controller;
+	u32_t gpio_pin;
+};
+
+#define GPIO_DECLARE_PIN_CONFIG_IDX(_idx)	\
+	struct gpio_pin_config gpio_pin_ ##_idx
+#define GPIO_DECLARE_PIN_CONFIG		\
+	GPIO_DECLARE_PIN_CONFIG_IDX()
+
+#define GPIO_PIN_IDX(_idx, _controller, _pin)	\
+	.gpio_pin_ ##_idx = {			\
+		.gpio_controller = (_controller),\
+		.gpio_pin = (_pin),		\
+	}
+#define GPIO_PIN(_controller, _pin)		\
+	GPIO_PIN_IDX(, _controller, _pin)
+
+#define GPIO_GET_CONTROLLER_IDX(_idx, _conf)	\
+	((_conf)->gpio_pin_ ##_idx.gpio_controller)
+#define GPIO_GET_PIN_IDX(_idx, _conf)	\
+	((_conf)->gpio_pin_ ##_idx.gpio_pin)
+
+#define GPIO_GET_CONTROLLER(_conf)	GPIO_GET_CONTROLLER_IDX(, _conf)
+#define GPIO_GET_PIN(_conf)		GPIO_GET_PIN_IDX(, _conf)
+
+/**
+ * @}
+ */
+
+#include <syscalls/gpio.h>
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZEPHYR_INCLUDE_DRIVERS_GPIO_H_ */
diff --git a/include/drivers/gpio/gpio_mmio32.h b/include/drivers/gpio/gpio_mmio32.h
index 1285e283527..1b8c431c7ed 100644
--- a/include/drivers/gpio/gpio_mmio32.h
+++ b/include/drivers/gpio/gpio_mmio32.h
@@ -8,7 +8,7 @@
 #define ZEPHYR_INCLUDE_DRIVERS_GPIO_GPIO_MMIO32_H_
 
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <zephyr/types.h>
 
 struct gpio_mmio32_config {
diff --git a/include/gpio.h b/include/gpio.h
index 0d7dabe07a7..3520f39a7ce 100644
--- a/include/gpio.h
+++ b/include/gpio.h
@@ -1,474 +1,15 @@
 /*
- * Copyright (c) 2017 ARM Ltd
- * Copyright (c) 2015-2016 Intel Corporation.
+ * Copyright (c) 2019 Intel Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-
-/**
- * @file
- * @brief Public APIs for GPIO drivers
- */
-
 #ifndef ZEPHYR_INCLUDE_GPIO_H_
 #define ZEPHYR_INCLUDE_GPIO_H_
 
-#include <misc/__assert.h>
-#include <misc/slist.h>
-
-#include <zephyr/types.h>
-#include <stddef.h>
-#include <device.h>
-#include <dt-bindings/gpio/gpio.h>
-
-#ifdef __cplusplus
-extern "C" {
+#ifndef CONFIG_COMPAT_INCLUDES
+#warning "This header file has moved, include <drivers/gpio.h> instead."
 #endif
 
-/**
- * @brief GPIO Driver APIs
- * @defgroup gpio_interface GPIO Driver APIs
- * @ingroup io_interfaces
- * @{
- */
-
-/** @cond INTERNAL_HIDDEN */
-#define GPIO_ACCESS_BY_PIN 0
-#define GPIO_ACCESS_BY_PORT 1
-/**
- * @endcond
- */
-
-struct gpio_callback;
-
-/**
- * @typedef gpio_callback_handler_t
- * @brief Define the application callback handler function signature
- *
- * @param "struct device *port" Device struct for the GPIO device.
- * @param "struct gpio_callback *cb" Original struct gpio_callback
- *        owning this handler
- * @param "u32_t pins" Mask of pins that triggers the callback handler
- *
- * Note: cb pointer can be used to retrieve private data through
- * CONTAINER_OF() if original struct gpio_callback is stored in
- * another private structure.
- */
-typedef void (*gpio_callback_handler_t)(struct device *port,
-					struct gpio_callback *cb,
-					u32_t pins);
-
-/**
- * @brief GPIO callback structure
- *
- * Used to register a callback in the driver instance callback list.
- * As many callbacks as needed can be added as long as each of them
- * are unique pointers of struct gpio_callback.
- * Beware such structure should not be allocated on stack.
- *
- * Note: To help setting it, see gpio_init_callback() below
- */
-struct gpio_callback {
-	/** This is meant to be used in the driver and the user should not
-	 * mess with it (see drivers/gpio/gpio_utils.h)
-	 */
-	sys_snode_t node;
-
-	/** Actual callback function being called when relevant. */
-	gpio_callback_handler_t handler;
-
-	/** A mask of pins the callback is interested in, if 0 the callback
-	 * will never be called. Such pin_mask can be modified whenever
-	 * necessary by the owner, and thus will affect the handler being
-	 * called or not. The selected pins must be configured to trigger
-	 * an interrupt.
-	 */
-	u32_t pin_mask;
-};
-
-/**
- * @cond INTERNAL_HIDDEN
- *
- * GPIO driver API definition and system call entry points
- *
- * (Internal use only.)
- */
-typedef int (*gpio_config_t)(struct device *port, int access_op,
-			     u32_t pin, int flags);
-typedef int (*gpio_write_t)(struct device *port, int access_op,
-			    u32_t pin, u32_t value);
-typedef int (*gpio_read_t)(struct device *port, int access_op,
-			   u32_t pin, u32_t *value);
-typedef int (*gpio_manage_callback_t)(struct device *port,
-				      struct gpio_callback *callback,
-				      bool set);
-typedef int (*gpio_enable_callback_t)(struct device *port,
-				      int access_op,
-				      u32_t pin);
-typedef int (*gpio_disable_callback_t)(struct device *port,
-				       int access_op,
-				       u32_t pin);
-typedef u32_t (*gpio_api_get_pending_int)(struct device *dev);
-
-struct gpio_driver_api {
-	gpio_config_t config;
-	gpio_write_t write;
-	gpio_read_t read;
-	gpio_manage_callback_t manage_callback;
-	gpio_enable_callback_t enable_callback;
-	gpio_disable_callback_t disable_callback;
-	gpio_api_get_pending_int get_pending_int;
-};
-
-__syscall int gpio_config(struct device *port, int access_op, u32_t pin,
-			  int flags);
-
-static inline int z_impl_gpio_config(struct device *port, int access_op,
-				    u32_t pin, int flags)
-{
-	const struct gpio_driver_api *api =
-		(const struct gpio_driver_api *)port->driver_api;
-
-	return api->config(port, access_op, pin, flags);
-}
-
-__syscall int gpio_write(struct device *port, int access_op, u32_t pin,
-			 u32_t value);
-
-static inline int z_impl_gpio_write(struct device *port, int access_op,
-				   u32_t pin, u32_t value)
-{
-	const struct gpio_driver_api *api =
-		(const struct gpio_driver_api *)port->driver_api;
-
-	return api->write(port, access_op, pin, value);
-}
-
-__syscall int gpio_read(struct device *port, int access_op, u32_t pin,
-			u32_t *value);
-
-static inline int z_impl_gpio_read(struct device *port, int access_op,
-				  u32_t pin, u32_t *value)
-{
-	const struct gpio_driver_api *api =
-		(const struct gpio_driver_api *)port->driver_api;
-
-	return api->read(port, access_op, pin, value);
-}
-
-__syscall int gpio_enable_callback(struct device *port, int access_op,
-				   u32_t pin);
-
-static inline int z_impl_gpio_enable_callback(struct device *port,
-					     int access_op, u32_t pin)
-{
-	const struct gpio_driver_api *api =
-		(const struct gpio_driver_api *)port->driver_api;
-
-	if (api->enable_callback == NULL) {
-		return -ENOTSUP;
-	}
-
-	return api->enable_callback(port, access_op, pin);
-}
-
-__syscall int gpio_disable_callback(struct device *port, int access_op,
-				    u32_t pin);
-
-static inline int z_impl_gpio_disable_callback(struct device *port,
-					      int access_op, u32_t pin)
-{
-	const struct gpio_driver_api *api =
-		(const struct gpio_driver_api *)port->driver_api;
-
-	if (api->disable_callback == NULL) {
-		return -ENOTSUP;
-	}
-
-	return api->disable_callback(port, access_op, pin);
-}
-/**
- * @endcond
- */
-
-/**
- * @brief Configure a single pin.
- * @param port Pointer to device structure for the driver instance.
- * @param pin Pin number to configure.
- * @param flags Flags for pin configuration. IN/OUT, interrupt ...
- * @return 0 if successful, negative errno code on failure.
- */
-static inline int gpio_pin_configure(struct device *port, u32_t pin,
-				     int flags)
-{
-	return gpio_config(port, GPIO_ACCESS_BY_PIN, pin, flags);
-}
-
-/**
- * @brief Write the data value to a single pin.
- * @param port Pointer to the device structure for the driver instance.
- * @param pin Pin number where the data is written.
- * @param value Value set on the pin.
- * @return 0 if successful, negative errno code on failure.
- */
-static inline int gpio_pin_write(struct device *port, u32_t pin,
-				 u32_t value)
-{
-	return gpio_write(port, GPIO_ACCESS_BY_PIN, pin, value);
-}
-
-/**
- * @brief Read the data value of a single pin.
- *
- * Read the input state of a pin, returning the value 0 or 1.
- *
- * @param port Pointer to the device structure for the driver instance.
- * @param pin Pin number where data is read.
- * @param value Integer pointer to receive the data values from the pin.
- * @return 0 if successful, negative errno code on failure.
- */
-static inline int gpio_pin_read(struct device *port, u32_t pin,
-				u32_t *value)
-{
-	return gpio_read(port, GPIO_ACCESS_BY_PIN, pin, value);
-}
-
-/**
- * @brief Helper to initialize a struct gpio_callback properly
- * @param callback A valid Application's callback structure pointer.
- * @param handler A valid handler function pointer.
- * @param pin_mask A bit mask of relevant pins for the handler
- */
-static inline void gpio_init_callback(struct gpio_callback *callback,
-				      gpio_callback_handler_t handler,
-				      u32_t pin_mask)
-{
-	__ASSERT(callback, "Callback pointer should not be NULL");
-	__ASSERT(handler, "Callback handler pointer should not be NULL");
-
-	callback->handler = handler;
-	callback->pin_mask = pin_mask;
-}
-
-/**
- * @brief Add an application callback.
- * @param port Pointer to the device structure for the driver instance.
- * @param callback A valid Application's callback structure pointer.
- * @return 0 if successful, negative errno code on failure.
- *
- * @note Callbacks may be added to the device from within a callback
- * handler invocation, but whether they are invoked for the current
- * GPIO event is not specified.
- *
- * Note: enables to add as many callback as needed on the same port.
- */
-static inline int gpio_add_callback(struct device *port,
-				    struct gpio_callback *callback)
-{
-	const struct gpio_driver_api *api =
-		(const struct gpio_driver_api *)port->driver_api;
-
-	if (api->manage_callback == NULL) {
-		return -ENOTSUP;
-	}
-
-	return api->manage_callback(port, callback, true);
-}
-
-/**
- * @brief Remove an application callback.
- * @param port Pointer to the device structure for the driver instance.
- * @param callback A valid application's callback structure pointer.
- * @return 0 if successful, negative errno code on failure.
- *
- * @warning It is explicitly permitted, within a callback handler, to
- * remove the registration for the callback that is running, i.e. @p
- * callback.  Attempts to remove other registrations on the same
- * device may result in undefined behavior, including failure to
- * invoke callbacks that remain registered and unintended invocation
- * of removed callbacks.
- *
- * Note: enables to remove as many callbacks as added through
- *       gpio_add_callback().
- */
-static inline int gpio_remove_callback(struct device *port,
-				       struct gpio_callback *callback)
-{
-	const struct gpio_driver_api *api =
-		(const struct gpio_driver_api *)port->driver_api;
-
-	if (api->manage_callback == NULL) {
-		return -ENOTSUP;
-	}
-
-	return api->manage_callback(port, callback, false);
-}
-
-/**
- * @brief Enable callback(s) for a single pin.
- * @param port Pointer to the device structure for the driver instance.
- * @param pin Pin number where the callback function is enabled.
- * @return 0 if successful, negative errno code on failure.
- *
- * Note: Depending on the driver implementation, this function will enable
- *       the pin to trigger an interruption. So as a semantic detail, if no
- *       callback is registered, of course none will be called.
- */
-static inline int gpio_pin_enable_callback(struct device *port, u32_t pin)
-{
-	return gpio_enable_callback(port, GPIO_ACCESS_BY_PIN, pin);
-}
-
-/**
- * @brief Disable callback(s) for a single pin.
- * @param port Pointer to the device structure for the driver instance.
- * @param pin Pin number where the callback function is disabled.
- * @return 0 if successful, negative errno code on failure.
- */
-static inline int gpio_pin_disable_callback(struct device *port, u32_t pin)
-{
-	return gpio_disable_callback(port, GPIO_ACCESS_BY_PIN, pin);
-}
-
-/**
- * @brief Configure all the pins the same way in the port.
- *        List out all flags on the detailed description.
- *
- * @param port Pointer to the device structure for the driver instance.
- * @param flags Flags for the port configuration. IN/OUT, interrupt ...
- * @return 0 if successful, negative errno code on failure.
- */
-__deprecated static inline int gpio_port_configure(struct device *port,
-		int flags)
-{
-	return gpio_config(port, GPIO_ACCESS_BY_PORT, 0, flags);
-}
-
-/**
- * @brief Write a data value to the port.
- *
- * Write the output state of a port. The state of each pin is
- * represented by one bit in the value.  Pin 0 corresponds to the
- * least significant bit, pin 31 corresponds to the most significant
- * bit.  For ports with less that 32 physical pins the most significant
- * bits which do not correspond to a physical pin are ignored.
- *
- * @param port Pointer to the device structure for the driver instance.
- * @param value Value to set on the port.
- * @return 0 if successful, negative errno code on failure.
- */
-__deprecated static inline int gpio_port_write(struct device *port, u32_t value)
-{
-	return gpio_write(port, GPIO_ACCESS_BY_PORT, 0, value);
-}
-
-/**
- * @brief Read data value from the port.
- *
- * Read the input state of a port.  The state of each pin is
- * represented by one bit in the returned value.  Pin 0 corresponds to
- * the least significant bit, pin 31 corresponds to the most
- * significant bit. Unused bits for ports with less that 32 physical
- * pins are returned as 0.
- *
- * @param port Pointer to the device structure for the driver instance.
- * @param value Integer pointer to receive the data value from the port.
- * @return 0 if successful, negative errno code on failure.
- */
-__deprecated static inline int gpio_port_read(struct device *port, u32_t *value)
-{
-	return gpio_read(port, GPIO_ACCESS_BY_PORT, 0, value);
-}
-
-/**
- * @brief Enable callback(s) for the port.
- * @param port Pointer to the device structure for the driver instance.
- * @return 0 if successful, negative errno code on failure.
- *
- * Note: Depending on the driver implementation, this function will enable
- *       the port to trigger an interruption on all pins, as long as these
- *       are configured properly. So as a semantic detail, if no callback
- *       is registered, of course none will be called.
- */
-__deprecated static inline int gpio_port_enable_callback(struct device *port)
-{
-	return gpio_enable_callback(port, GPIO_ACCESS_BY_PORT, 0);
-}
-
-/**
- * @brief Disable callback(s) for the port.
- * @param port Pointer to the device structure for the driver instance.
- * @return 0 if successful, negative errno code on failure.
- */
-__deprecated static inline int gpio_port_disable_callback(struct device *port)
-{
-	return gpio_disable_callback(port, GPIO_ACCESS_BY_PORT, 0);
-}
-
-/**
- * @brief Function to get pending interrupts
- *
- * The purpose of this function is to return the interrupt
- * status register for the device.
- * This is especially useful when waking up from
- * low power states to check the wake up source.
- *
- * @param dev Pointer to the device structure for the driver instance.
- *
- * @retval status != 0 if at least one gpio interrupt is pending.
- * @retval 0 if no gpio interrupt is pending.
- */
-__syscall int gpio_get_pending_int(struct device *dev);
-
-/**
- * @internal
- */
-static inline int z_impl_gpio_get_pending_int(struct device *dev)
-{
-	const struct gpio_driver_api *api =
-		(const struct gpio_driver_api *)dev->driver_api;
-
-	if (api->get_pending_int == NULL) {
-		return -ENOTSUP;
-	}
-
-	return api->get_pending_int(dev);
-}
-
-struct gpio_pin_config {
-	char *gpio_controller;
-	u32_t gpio_pin;
-};
-
-#define GPIO_DECLARE_PIN_CONFIG_IDX(_idx)	\
-	struct gpio_pin_config gpio_pin_ ##_idx
-#define GPIO_DECLARE_PIN_CONFIG		\
-	GPIO_DECLARE_PIN_CONFIG_IDX()
-
-#define GPIO_PIN_IDX(_idx, _controller, _pin)	\
-	.gpio_pin_ ##_idx = {			\
-		.gpio_controller = (_controller),\
-		.gpio_pin = (_pin),		\
-	}
-#define GPIO_PIN(_controller, _pin)		\
-	GPIO_PIN_IDX(, _controller, _pin)
-
-#define GPIO_GET_CONTROLLER_IDX(_idx, _conf)	\
-	((_conf)->gpio_pin_ ##_idx.gpio_controller)
-#define GPIO_GET_PIN_IDX(_idx, _conf)	\
-	((_conf)->gpio_pin_ ##_idx.gpio_pin)
-
-#define GPIO_GET_CONTROLLER(_conf)	GPIO_GET_CONTROLLER_IDX(, _conf)
-#define GPIO_GET_PIN(_conf)		GPIO_GET_PIN_IDX(, _conf)
-
-/**
- * @}
- */
-
-#include <syscalls/gpio.h>
-
-#ifdef __cplusplus
-}
-#endif
+#include <drivers/gpio.h>
 
 #endif /* ZEPHYR_INCLUDE_GPIO_H_ */
diff --git a/samples/basic/blinky/src/main.c b/samples/basic/blinky/src/main.c
index 2ca87c23197..22d7637dad7 100644
--- a/samples/basic/blinky/src/main.c
+++ b/samples/basic/blinky/src/main.c
@@ -6,7 +6,7 @@
 
 #include <zephyr.h>
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #define LED_PORT LED0_GPIO_CONTROLLER
 #define LED	LED0_GPIO_PIN
diff --git a/samples/basic/button/src/main.c b/samples/basic/button/src/main.c
index 13c9e9df6fb..900c7204c63 100644
--- a/samples/basic/button/src/main.c
+++ b/samples/basic/button/src/main.c
@@ -6,7 +6,7 @@
 
 #include <zephyr.h>
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <misc/util.h>
 #include <misc/printk.h>
 
diff --git a/samples/basic/disco/src/main.c b/samples/basic/disco/src/main.c
index b0503107376..b8098481918 100644
--- a/samples/basic/disco/src/main.c
+++ b/samples/basic/disco/src/main.c
@@ -6,7 +6,7 @@
 
 #include <zephyr.h>
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #define PORT0  LED0_GPIO_CONTROLLER
 #define PORT1  LED1_GPIO_CONTROLLER
diff --git a/samples/basic/threads/src/main.c b/samples/basic/threads/src/main.c
index dd6fcb021e6..19a795b6c5f 100644
--- a/samples/basic/threads/src/main.c
+++ b/samples/basic/threads/src/main.c
@@ -6,7 +6,7 @@
 
 #include <zephyr.h>
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <misc/printk.h>
 #include <misc/__assert.h>
 #include <string.h>
diff --git a/samples/bluetooth/hci_spi/src/main.c b/samples/bluetooth/hci_spi/src/main.c
index 6a2d87345c0..88ab8ff533f 100644
--- a/samples/bluetooth/hci_spi/src/main.c
+++ b/samples/bluetooth/hci_spi/src/main.c
@@ -17,7 +17,7 @@
 
 #include <device.h>
 #include <init.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <spi.h>
 
 #include <net/buf.h>
diff --git a/samples/bluetooth/mesh/src/microbit.c b/samples/bluetooth/mesh/src/microbit.c
index b8780026062..9230ea5ab13 100644
--- a/samples/bluetooth/mesh/src/microbit.c
+++ b/samples/bluetooth/mesh/src/microbit.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #include <display/mb_display.h>
 
diff --git a/samples/bluetooth/mesh_demo/src/microbit.c b/samples/bluetooth/mesh_demo/src/microbit.c
index 00d790b96dd..bcffdcef208 100644
--- a/samples/bluetooth/mesh_demo/src/microbit.c
+++ b/samples/bluetooth/mesh_demo/src/microbit.c
@@ -6,12 +6,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <board.h>
 #include <soc.h>
 #include <misc/printk.h>
 #include <ctype.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <pwm.h>
 
 #include <display/mb_display.h>
diff --git a/samples/boards/96b_argonkey/microphone/src/main.c b/samples/boards/96b_argonkey/microphone/src/main.c
index 0a88df24b62..f04b4d0cd57 100644
--- a/samples/boards/96b_argonkey/microphone/src/main.c
+++ b/samples/boards/96b_argonkey/microphone/src/main.c
@@ -8,7 +8,7 @@
 #include <zephyr.h>
 #include <misc/printk.h>
 
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <led.h>
 
 #include <audio/dmic.h>
diff --git a/samples/boards/96b_argonkey/sensors/src/main.c b/samples/boards/96b_argonkey/sensors/src/main.c
index 015c71270e1..214c8b50acf 100644
--- a/samples/boards/96b_argonkey/sensors/src/main.c
+++ b/samples/boards/96b_argonkey/sensors/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr.h>
 #include <misc/printk.h>
 
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <led.h>
 #include <i2c.h>
 #include <spi.h>
diff --git a/samples/boards/altera_max10/pio/src/main.c b/samples/boards/altera_max10/pio/src/main.c
index 563b481ac3b..865645c7b5d 100644
--- a/samples/boards/altera_max10/pio/src/main.c
+++ b/samples/boards/altera_max10/pio/src/main.c
@@ -6,7 +6,7 @@
 
 #include <zephyr.h>
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <misc/printk.h>
 #include <misc/util.h>
 
diff --git a/samples/boards/bbc_microbit/display/src/main.c b/samples/boards/bbc_microbit/display/src/main.c
index d8f6763c552..162268b60d5 100644
--- a/samples/boards/bbc_microbit/display/src/main.c
+++ b/samples/boards/bbc_microbit/display/src/main.c
@@ -6,7 +6,7 @@
 
 #include <zephyr.h>
 #include <misc/printk.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <device.h>
 
 #include <display/mb_display.h>
diff --git a/samples/boards/bbc_microbit/pong/src/ble.c b/samples/boards/bbc_microbit/pong/src/ble.c
index 4d9342a4fbc..3e769379a52 100644
--- a/samples/boards/bbc_microbit/pong/src/ble.c
+++ b/samples/boards/bbc_microbit/pong/src/ble.c
@@ -6,7 +6,7 @@
 
 #include <zephyr.h>
 #include <misc/printk.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <device.h>
 #include <string.h>
 
diff --git a/samples/boards/bbc_microbit/pong/src/main.c b/samples/boards/bbc_microbit/pong/src/main.c
index a08495cc70e..551c5e37863 100644
--- a/samples/boards/bbc_microbit/pong/src/main.c
+++ b/samples/boards/bbc_microbit/pong/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr.h>
 #include <misc/printk.h>
 #include <board.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <device.h>
 #include <string.h>
 #include <pwm.h>
diff --git a/samples/boards/bbc_microbit/sound/src/main.c b/samples/boards/bbc_microbit/sound/src/main.c
index d248527a475..2779c56297e 100644
--- a/samples/boards/bbc_microbit/sound/src/main.c
+++ b/samples/boards/bbc_microbit/sound/src/main.c
@@ -7,7 +7,7 @@
 #include <zephyr.h>
 #include <misc/printk.h>
 #include <board.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <pwm.h>
 #include <device.h>
 
diff --git a/samples/boards/nrf52/mesh/onoff-app/src/main.c b/samples/boards/nrf52/mesh/onoff-app/src/main.c
index 2bbbb8a56d8..dc3f7530482 100644
--- a/samples/boards/nrf52/mesh/onoff-app/src/main.c
+++ b/samples/boards/nrf52/mesh/onoff-app/src/main.c
@@ -41,7 +41,7 @@
 #include <misc/byteorder.h>
 #include <nrf.h>
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/conn.h>
 #include <bluetooth/l2cap.h>
diff --git a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/app_gpio.c b/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/app_gpio.c
index 65d3520c37d..f82f6c1153a 100644
--- a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/app_gpio.c
+++ b/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/app_gpio.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #include "publisher.h"
 
diff --git a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/main.c b/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/main.c
index ae288bdd0f3..3cec599d31f 100644
--- a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/main.c
+++ b/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/main.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #include "app_gpio.h"
 #include "ble_mesh.h"
diff --git a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/device_composition.c b/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/device_composition.c
index fba5d698704..d1d4c0aa47d 100644
--- a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/device_composition.c
+++ b/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/device_composition.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #include "app_gpio.h"
 #include "storage.h"
diff --git a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/publisher.c b/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/publisher.c
index da0a3edac03..5df9fb76002 100644
--- a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/publisher.c
+++ b/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/publisher.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #include "app_gpio.h"
 
diff --git a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/state_binding.c b/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/state_binding.c
index a71614f822a..64ed4baec6c 100644
--- a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/state_binding.c
+++ b/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/state_binding.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #include "ble_mesh.h"
 #include "device_composition.h"
diff --git a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/transition.c b/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/transition.c
index d7500bc4e46..19fc8666293 100644
--- a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/transition.c
+++ b/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/transition.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #include "ble_mesh.h"
 #include "common.h"
diff --git a/samples/boards/nrf52/power_mgr/src/sample.h b/samples/boards/nrf52/power_mgr/src/sample.h
index 54dac237b2f..6bce3d3566b 100644
--- a/samples/boards/nrf52/power_mgr/src/sample.h
+++ b/samples/boards/nrf52/power_mgr/src/sample.h
@@ -9,7 +9,7 @@
 #include <string.h>
 #include <soc.h>
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <misc/printk.h>
 
 #define GPIO_CFG_SENSE_LOW (GPIO_PIN_CNF_SENSE_Low << GPIO_PIN_CNF_SENSE_Pos)
diff --git a/samples/boards/reel_board/mesh_badge/src/periphs.c b/samples/boards/reel_board/mesh_badge/src/periphs.c
index 9ea0e3ca638..400c2cb9b23 100644
--- a/samples/boards/reel_board/mesh_badge/src/periphs.c
+++ b/samples/boards/reel_board/mesh_badge/src/periphs.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <sensor.h>
 #include "board.h"
 #include "mesh.h"
diff --git a/samples/boards/reel_board/mesh_badge/src/reel_board.c b/samples/boards/reel_board/mesh_badge/src/reel_board.c
index 03ca895a9be..88800e714bd 100644
--- a/samples/boards/reel_board/mesh_badge/src/reel_board.c
+++ b/samples/boards/reel_board/mesh_badge/src/reel_board.c
@@ -7,7 +7,7 @@
 
 #include <zephyr.h>
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <display/cfb.h>
 #include <misc/printk.h>
 #include <drivers/flash.h>
diff --git a/samples/boards/up_squared/gpio_counter/src/main.c b/samples/boards/up_squared/gpio_counter/src/main.c
index 85a91a50ad1..f9ca56592f6 100644
--- a/samples/boards/up_squared/gpio_counter/src/main.c
+++ b/samples/boards/up_squared/gpio_counter/src/main.c
@@ -8,7 +8,7 @@
 
 #include <board.h>
 #include <soc.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #include <misc/printk.h>
 #include <misc/util.h>
diff --git a/samples/drivers/CAN/src/main.c b/samples/drivers/CAN/src/main.c
index 3daf5ed8e70..3f2b1ac5bc9 100644
--- a/samples/drivers/CAN/src/main.c
+++ b/samples/drivers/CAN/src/main.c
@@ -9,7 +9,7 @@
 #include <misc/printk.h>
 #include <device.h>
 #include <drivers/can.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #define TX_THREAD_STACK_SIZE 512
 #define LED_THREAD_STACK_SIZE 512
diff --git a/samples/drivers/gpio/src/main.c b/samples/drivers/gpio/src/main.c
index 99c0fe8fd79..0fb3faad073 100644
--- a/samples/drivers/gpio/src/main.c
+++ b/samples/drivers/gpio/src/main.c
@@ -17,7 +17,7 @@
 #include <misc/printk.h>
 
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <misc/util.h>
 
 #if defined(SW0_GPIO_CONTROLLER) && defined(LED0_GPIO_CONTROLLER)
diff --git a/samples/drivers/ht16k33/src/main.c b/samples/drivers/ht16k33/src/main.c
index bf098302b86..b50036725d6 100644
--- a/samples/drivers/ht16k33/src/main.c
+++ b/samples/drivers/ht16k33/src/main.c
@@ -6,7 +6,7 @@
 
 #include <device.h>
 #include <led.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <zephyr.h>
 
 #define LOG_LEVEL CONFIG_LOG_DEFAULT_LEVEL
diff --git a/samples/drivers/lcd_hd44780/src/main.c b/samples/drivers/lcd_hd44780/src/main.c
index 40f155990ec..f3849251702 100644
--- a/samples/drivers/lcd_hd44780/src/main.c
+++ b/samples/drivers/lcd_hd44780/src/main.c
@@ -67,7 +67,7 @@
 #include <zephyr.h>
 
 #include <misc/printk.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <string.h>
 
 
diff --git a/samples/drivers/led_apa102c_bitbang/src/main.c b/samples/drivers/led_apa102c_bitbang/src/main.c
index 85157206d34..1648119485b 100644
--- a/samples/drivers/led_apa102c_bitbang/src/main.c
+++ b/samples/drivers/led_apa102c_bitbang/src/main.c
@@ -27,7 +27,7 @@
 #include <misc/printk.h>
 
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 /* in millisecond */
 #define SLEEPTIME	250
 
diff --git a/samples/net/lwm2m_client/src/lwm2m-client.c b/samples/net/lwm2m_client/src/lwm2m-client.c
index a37e49b3b2d..4f521bc609d 100644
--- a/samples/net/lwm2m_client/src/lwm2m-client.c
+++ b/samples/net/lwm2m_client/src/lwm2m-client.c
@@ -12,7 +12,7 @@
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <zephyr.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <sensor.h>
 #include <net/lwm2m.h>
 
diff --git a/samples/net/nats/src/main.c b/samples/net/nats/src/main.c
index 4c3750c8795..7d3eb9f21b6 100644
--- a/samples/net/nats/src/main.c
+++ b/samples/net/nats/src/main.c
@@ -7,7 +7,7 @@
 #include <logging/log.h>
 LOG_MODULE_REGISTER(net_nats_sample, LOG_LEVEL_DBG);
 
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <net/net_context.h>
 #include <net/net_core.h>
 #include <net/net_if.h>
diff --git a/samples/net/wifi/src/wifi_test.c b/samples/net/wifi/src/wifi_test.c
index 89fe7270ae0..50a7ad423d3 100644
--- a/samples/net/wifi/src/wifi_test.c
+++ b/samples/net/wifi/src/wifi_test.c
@@ -10,7 +10,7 @@
 #ifdef CONFIG_WIFI_WINC1500
 
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <wifi/winc1500.h>
 
 static
diff --git a/samples/sensor/fxos8700-hid/src/main.c b/samples/sensor/fxos8700-hid/src/main.c
index 0cf59076509..6485d464d70 100644
--- a/samples/sensor/fxos8700-hid/src/main.c
+++ b/samples/sensor/fxos8700-hid/src/main.c
@@ -7,7 +7,7 @@
  */
 #include <zephyr.h>
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #include <usb/usb_device.h>
 #include <usb/class/usb_hid.h>
diff --git a/samples/sensor/ti_hdc/src/main.c b/samples/sensor/ti_hdc/src/main.c
index ed9cee4dd6c..2734b402d2b 100644
--- a/samples/sensor/ti_hdc/src/main.c
+++ b/samples/sensor/ti_hdc/src/main.c
@@ -10,7 +10,7 @@
 #include <misc/printk.h>
 #include <misc/__assert.h>
 #include <logging/log.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 void main(void)
 {
diff --git a/samples/subsys/usb/hid-cdc/src/main.c b/samples/subsys/usb/hid-cdc/src/main.c
index 60499f3d9a0..0a8cea7deaf 100644
--- a/samples/subsys/usb/hid-cdc/src/main.c
+++ b/samples/subsys/usb/hid-cdc/src/main.c
@@ -5,7 +5,7 @@
  */
 #include <zephyr.h>
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <uart.h>
 #include <string.h>
 #include <random/rand32.h>
diff --git a/samples/subsys/usb/hid-mouse/src/main.c b/samples/subsys/usb/hid-mouse/src/main.c
index 833cb9559f8..889ca99c066 100644
--- a/samples/subsys/usb/hid-mouse/src/main.c
+++ b/samples/subsys/usb/hid-mouse/src/main.c
@@ -6,7 +6,7 @@
  */
 #include <zephyr.h>
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #include <usb/usb_device.h>
 #include <usb/class/usb_hid.h>
diff --git a/subsys/disk/disk_access_sdhc.c b/subsys/disk/disk_access_sdhc.c
index c84abc62ac8..6207df7279a 100644
--- a/subsys/disk/disk_access_sdhc.c
+++ b/subsys/disk/disk_access_sdhc.c
@@ -9,7 +9,7 @@
 LOG_MODULE_REGISTER(sdhc, CONFIG_DISK_LOG_LEVEL);
 
 #include <disk/disk_access.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <misc/byteorder.h>
 #include <spi.h>
 #include <sys/crc.h>
diff --git a/subsys/usb/usb_device.c b/subsys/usb/usb_device.c
index 92b55693ba0..36e74245c3d 100644
--- a/subsys/usb/usb_device.c
+++ b/subsys/usb/usb_device.c
@@ -62,7 +62,7 @@
 #include <misc/__assert.h>
 #include <init.h>
 #if defined(CONFIG_USB_VBUS_GPIO)
-#include <gpio.h>
+#include <drivers/gpio.h>
 #endif
 #include <misc/byteorder.h>
 #include <usb/usb_device.h>
diff --git a/tests/application_development/cpp/src/main.cpp b/tests/application_development/cpp/src/main.cpp
index 9631c9cdf6d..d209a188392 100644
--- a/tests/application_development/cpp/src/main.cpp
+++ b/tests/application_development/cpp/src/main.cpp
@@ -21,7 +21,7 @@
 #include <sys/crc.h>
 #include <sys/crc.h>
 
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <led_strip.h>
 #include <spi.h>
 #include <uart.h>
diff --git a/tests/bluetooth/mesh/src/microbit.c b/tests/bluetooth/mesh/src/microbit.c
index fae120297a6..86eb395511e 100644
--- a/tests/bluetooth/mesh/src/microbit.c
+++ b/tests/bluetooth/mesh/src/microbit.c
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #include <display/mb_display.h>
 
diff --git a/tests/boards/intel_s1000_crb/src/gpio_test.c b/tests/boards/intel_s1000_crb/src/gpio_test.c
index 0901ef18357..a43a65e273b 100644
--- a/tests/boards/intel_s1000_crb/src/gpio_test.c
+++ b/tests/boards/intel_s1000_crb/src/gpio_test.c
@@ -31,7 +31,7 @@
 #include <misc/printk.h>
 
 #include <device.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #define GPIO_OUT_PIN            23
 #define GPIO_INT_PIN            24
diff --git a/tests/drivers/aio/api/src/test_callback.c b/tests/drivers/aio/api/src/test_callback.c
index 6588414ade3..966845a4a10 100644
--- a/tests/drivers/aio/api/src/test_callback.c
+++ b/tests/drivers/aio/api/src/test_callback.c
@@ -5,7 +5,7 @@
  */
 
 #include <ztest.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <pinmux.h>
 #include <drivers/aio_comparator.h>
 
diff --git a/tests/drivers/gpio/gpio_basic_api/src/test_gpio.h b/tests/drivers/gpio/gpio_basic_api/src/test_gpio.h
index 448dcaa3336..d56f87b8831 100644
--- a/tests/drivers/gpio/gpio_basic_api/src/test_gpio.h
+++ b/tests/drivers/gpio/gpio_basic_api/src/test_gpio.h
@@ -8,7 +8,7 @@
 #define __TEST_GPIO_H__
 
 #include <zephyr.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <misc/util.h>
 #include <ztest.h>
 
diff --git a/tests/drivers/pinmux/pinmux_basic_api/src/pinmux_gpio.c b/tests/drivers/pinmux/pinmux_basic_api/src/pinmux_gpio.c
index 9446d1a084c..7d791d26584 100644
--- a/tests/drivers/pinmux/pinmux_basic_api/src/pinmux_gpio.c
+++ b/tests/drivers/pinmux/pinmux_basic_api/src/pinmux_gpio.c
@@ -24,7 +24,7 @@
  * @}
  */
 
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <pinmux.h>
 #include <ztest.h>