diff --git a/arch/xtensa/src/common/xtensa.h b/arch/xtensa/src/common/xtensa.h
index bde2eaba5f8..6cd35c9d085 100644
--- a/arch/xtensa/src/common/xtensa.h
+++ b/arch/xtensa/src/common/xtensa.h
@@ -278,7 +278,7 @@ void xtensa_add_region(void);
 
 void up_lowputc(char ch);
 #if CONFIG_NFILE_DESCRIPTORS > 0
-void xtensa_earlyserialinit(void);
+void xtensa_early_serial_initialize(void);
 void xtensa_serial_initialize(void);
 #else
 # define xtensa_earlyserialinit()
diff --git a/arch/xtensa/src/esp32/esp32_irq.c b/arch/xtensa/src/esp32/esp32_irq.c
index 33f94576bd4..c407b991e8f 100644
--- a/arch/xtensa/src/esp32/esp32_irq.c
+++ b/arch/xtensa/src/esp32/esp32_irq.c
@@ -47,6 +47,7 @@
 #include <arch/irq.h>
 
 #include "xtensa.h"
+#include "esp32_cpuint.h"
 
 /****************************************************************************
  * Public Data
diff --git a/arch/xtensa/src/esp32/esp32_serial.c b/arch/xtensa/src/esp32/esp32_serial.c
index b6ebb6c253a..69423e4ccca 100644
--- a/arch/xtensa/src/esp32/esp32_serial.c
+++ b/arch/xtensa/src/esp32/esp32_serial.c
@@ -1178,7 +1178,7 @@ static bool esp32_txempty(struct uart_dev_s *dev)
  ****************************************************************************/
 
 #ifdef USE_EARLYSERIALINIT
-void up_earlyserialinit(void)
+void xtensa_early_serial_initialize(void)
 {
   /* NOTE:  All GPIO configuration for the UARTs was performed in
    * esp32_lowsetup
diff --git a/arch/xtensa/src/esp32/esp32_start.c b/arch/xtensa/src/esp32/esp32_start.c
index 7d6ef7d5dc2..a468e83a9c8 100644
--- a/arch/xtensa/src/esp32/esp32_start.c
+++ b/arch/xtensa/src/esp32/esp32_start.c
@@ -98,7 +98,7 @@ void IRAM_ATTR __start(void)
 #ifdef USE_EARLYSERIALINIT
  /* Perform early serial initialization */
 
-  xtensa_earlyserialinit();
+  xtensa_early_serial_initialize();
 #endif
 
   /* Initialize onboard resources */