diff --git a/drivers/clock_control/clock_control_esp32.c b/drivers/clock_control/clock_control_esp32.c
index 766076544d5..e4ea81d90b0 100644
--- a/drivers/clock_control/clock_control_esp32.c
+++ b/drivers/clock_control/clock_control_esp32.c
@@ -21,6 +21,7 @@
 #include <sys/util.h>
 #include "clock_control_esp32.h"
 #include "driver/periph_ctrl.h"
+#include <xtensa/core-macros.h>
 
 struct esp32_clock_config {
 	uint32_t clk_src_sel;
diff --git a/drivers/entropy/entropy_esp32.c b/drivers/entropy/entropy_esp32.c
index f3c235a1097..80cfc31814b 100644
--- a/drivers/entropy/entropy_esp32.c
+++ b/drivers/entropy/entropy_esp32.c
@@ -15,6 +15,7 @@
 #include <soc/apb_ctrl_reg.h>
 #include <esp_system.h>
 #include <soc.h>
+#include <xtensa/core-macros.h>
 
 extern int esp_clk_cpu_freq(void);
 extern int esp_clk_apb_freq(void);
diff --git a/include/arch/xtensa/xtensa_api.h b/include/arch/xtensa/xtensa_api.h
index 324d9a36e26..67cd578deb8 100644
--- a/include/arch/xtensa/xtensa_api.h
+++ b/include/arch/xtensa/xtensa_api.h
@@ -7,7 +7,6 @@
 #define ZEPHYR_ARCH_XTENSA_INCLUDE_XTENSA_API_H_
 
 #include <xtensa/hal.h>
-#include <xtensa/core-macros.h>
 #include "xtensa_rtos.h"
 #include "xtensa_context.h"