diff --git a/cpu/esp32/esp-idf/gpio/Makefile b/cpu/esp32/esp-idf/gpio/Makefile
index 820a5f5c1f..893f3d2359 100644
--- a/cpu/esp32/esp-idf/gpio/Makefile
+++ b/cpu/esp32/esp-idf/gpio/Makefile
@@ -2,9 +2,9 @@ MODULE = esp_idf_gpio
 
 # source files to be compiled for this module
 ESP32_SDK_SRC = \
-  components/driver/gpio.c \
-  components/driver/rtc_io.c \
-  components/driver/rtc_module.c \
+  components/esp_driver_gpio/src/gpio.c \
+  components/esp_driver_gpio/src/rtc_io.c \
+  components/esp_hw_support/rtc_module.c \
   components/hal/gpio_hal.c \
   components/soc/$(CPU_FAM)/gpio_periph.c \
   #
diff --git a/cpu/esp32/esp-idf/include/driver/gpio.h b/cpu/esp32/esp-idf/include/driver/gpio.h
deleted file mode 100644
index baa7501adf..0000000000
--- a/cpu/esp32/esp-idf/include/driver/gpio.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#ifdef ESP_IDF_CODE
-
-#include_next "driver/gpio.h"
-
-#else
-
-#include "hal/gpio_types.h"
-
-#define GPIO_PIN_COUNT  (SOC_GPIO_PIN_COUNT)
-
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif