diff --git a/boards/common/esp32/Makefile.dep b/boards/common/esp32/Makefile.dep
index 2f0586ac52..5472bf8b8d 100644
--- a/boards/common/esp32/Makefile.dep
+++ b/boards/common/esp32/Makefile.dep
@@ -1,5 +1,3 @@
-include $(RIOTCPU)/esp32/Makefile.dep
-
 ifneq (,$(filter saul_default,$(USEMODULE)))
   USEMODULE += saul_gpio
 endif
diff --git a/boards/common/esp32/Makefile.features b/boards/common/esp32/Makefile.features
index 963790ff90..4766f0b22f 100644
--- a/boards/common/esp32/Makefile.features
+++ b/boards/common/esp32/Makefile.features
@@ -1,5 +1,5 @@
-# most board features results directly from ESP32 CPU features
-include $(RIOTCPU)/esp32/Makefile.features
+CPU = esp32
+CPU_MODEL = esp32
 
 # additional features provided by all boards are GPIOs and at least one UART
 FEATURES_PROVIDED += periph_gpio
diff --git a/boards/common/esp32/Makefile.include b/boards/common/esp32/Makefile.include
index 9a4f711f06..232091175e 100644
--- a/boards/common/esp32/Makefile.include
+++ b/boards/common/esp32/Makefile.include
@@ -1,7 +1,3 @@
-# the cpu to build for
-export CPU = esp32
-export CPU_MODEL = esp32
-
 # configure the serial interface
 PORT_LINUX ?= /dev/ttyUSB0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
diff --git a/boards/common/esp8266/Makefile.dep b/boards/common/esp8266/Makefile.dep
index 63fcc8a2a6..5472bf8b8d 100644
--- a/boards/common/esp8266/Makefile.dep
+++ b/boards/common/esp8266/Makefile.dep
@@ -1,5 +1,3 @@
-include $(RIOTCPU)/esp8266/Makefile.dep
-
 ifneq (,$(filter saul_default,$(USEMODULE)))
   USEMODULE += saul_gpio
 endif
diff --git a/boards/common/esp8266/Makefile.features b/boards/common/esp8266/Makefile.features
index 3bad7fb344..127c7b88b8 100644
--- a/boards/common/esp8266/Makefile.features
+++ b/boards/common/esp8266/Makefile.features
@@ -1,6 +1,5 @@
-# MCU defined features that are provided independent on board definitions
-
-include $(RIOTCPU)/esp8266/Makefile.features
+CPU = esp8266
+CPU_MODEL = esp8266
 
 # MCU defined peripheral features provided by all boards in alphabetical order
 
diff --git a/boards/common/esp8266/Makefile.include b/boards/common/esp8266/Makefile.include
index 63a50b28e8..232091175e 100644
--- a/boards/common/esp8266/Makefile.include
+++ b/boards/common/esp8266/Makefile.include
@@ -1,7 +1,3 @@
-# the cpu to build for
-export CPU = esp8266
-export CPU_MODEL = esp8266
-
 # configure the serial interface
 PORT_LINUX ?= /dev/ttyUSB0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))