diff --git a/cpu/esp32/include/cpu_conf.h b/cpu/esp32/include/cpu_conf.h
index 2668bf7fec..0060d34337 100644
--- a/cpu/esp32/include/cpu_conf.h
+++ b/cpu/esp32/include/cpu_conf.h
@@ -23,6 +23,8 @@
 #define CPU_CONF_H
 
 #include <stdint.h>
+
+#include "cpu_conf_common.h"
 #include "esp_common_log.h"
 #include "xtensa_conf.h"
 #include "xtensa/xtensa_context.h"
diff --git a/cpu/esp8266/include/cpu_conf.h b/cpu/esp8266/include/cpu_conf.h
index f6931df9b3..6b943fad40 100644
--- a/cpu/esp8266/include/cpu_conf.h
+++ b/cpu/esp8266/include/cpu_conf.h
@@ -22,6 +22,7 @@
 #ifndef CPU_CONF_H
 #define CPU_CONF_H
 
+#include "cpu_conf_common.h"
 #include "xtensa_conf.h"
 
 #ifdef __cplusplus
diff --git a/cpu/esp_common/include/cpu_conf.h b/cpu/esp_common/include/cpu_conf_common.h
similarity index 88%
rename from cpu/esp_common/include/cpu_conf.h
rename to cpu/esp_common/include/cpu_conf_common.h
index b5d1a6841a..d768ce3a34 100644
--- a/cpu/esp_common/include/cpu_conf.h
+++ b/cpu/esp_common/include/cpu_conf_common.h
@@ -19,8 +19,8 @@
  * @author      Gunar Schorcht <gunar@schorcht.net>
  */
 
-#ifndef CPU_CONF_H
-#define CPU_CONF_H
+#ifndef CPU_CONF_COMMON_H
+#define CPU_CONF_COMMON_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -30,5 +30,5 @@ extern "C" {
 }
 #endif
 
-#endif /* CPU_CONF_H */
+#endif /* CPU_CONF_COMMON_H */
 /** @} */