diff --git a/cpu/esp8266/Makefile.dep b/cpu/esp8266/Makefile.dep
index 36cff9c75b..c6028b4235 100644
--- a/cpu/esp8266/Makefile.dep
+++ b/cpu/esp8266/Makefile.dep
@@ -2,6 +2,17 @@
 
 include $(RIOTCPU)/esp_common/Makefile.dep
 
+USEMODULE += esp_idf_esp8266
+USEMODULE += esp_idf_nvs_flash
+USEMODULE += esp_idf_spi_flash
+USEMODULE += esp_idf_util
+USEMODULE += esp_idf_wpa_supplicant_crypto
+USEMODULE += esp_sdk
+USEMODULE += mtd
+USEMODULE += newlib
+USEMODULE += periph_common
+USEMODULE += ps
+
 ifneq (,$(filter periph_i2c,$(USEMODULE)))
   USEMODULE += esp_i2c_sw
   USEMODULE += periph_i2c_sw
diff --git a/cpu/esp8266/Makefile.include b/cpu/esp8266/Makefile.include
index 34996ffc58..1bbf335991 100644
--- a/cpu/esp8266/Makefile.include
+++ b/cpu/esp8266/Makefile.include
@@ -28,17 +28,6 @@ TARGET_ARCH ?= xtensa-esp8266-elf
 
 PSEUDOMODULES += esp_sw_timer
 
-USEMODULE += esp_idf_esp8266
-USEMODULE += esp_idf_nvs_flash
-USEMODULE += esp_idf_spi_flash
-USEMODULE += esp_idf_util
-USEMODULE += esp_idf_wpa_supplicant_crypto
-USEMODULE += esp_sdk
-USEMODULE += mtd
-USEMODULE += newlib
-USEMODULE += periph_common
-USEMODULE += ps
-
 INCLUDES += -I$(RIOTCPU)/$(CPU)
 INCLUDES += -I$(RIOTCPU)/$(CPU)/include
 INCLUDES += -I$(RIOTCPU)/$(CPU)/vendor