diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_gpio.h b/arch/risc-v/src/esp32c3/hardware/esp32c3_gpio.h
index d05c9dafc61..588ed1bd7b4 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_gpio.h
+++ b/arch/risc-v/src/esp32c3/hardware/esp32c3_gpio.h
@@ -25,7 +25,7 @@
  * Included Files
  ****************************************************************************/
 
-#include "hardware/esp32c3_soc.h"
+#include "esp32c3_soc.h"
 
 /****************************************************************************
  * Pre-preprocessor Definitions
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_interrupt.h b/arch/risc-v/src/esp32c3/hardware/esp32c3_interrupt.h
index ce40a865b88..675a584e4c3 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_interrupt.h
+++ b/arch/risc-v/src/esp32c3/hardware/esp32c3_interrupt.h
@@ -25,7 +25,7 @@
  * Included Files
  ****************************************************************************/
 
-#include "hardware/esp32c3_soc.h"
+#include "esp32c3_soc.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_memorymap.h b/arch/risc-v/src/esp32c3/hardware/esp32c3_memorymap.h
index 51a80589ae2..c9cf552438a 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_memorymap.h
+++ b/arch/risc-v/src/esp32c3/hardware/esp32c3_memorymap.h
@@ -21,12 +21,6 @@
 #ifndef __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_MEMORYMAP_H
 #define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_MEMORYMAP_H
 
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_system.h b/arch/risc-v/src/esp32c3/hardware/esp32c3_system.h
index 8e8dd9a18ae..34ede266fb3 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_system.h
+++ b/arch/risc-v/src/esp32c3/hardware/esp32c3_system.h
@@ -25,7 +25,7 @@
  * Included Files
  ****************************************************************************/
 
-#include "hardware/esp32c3_soc.h"
+#include "esp32c3_soc.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_systimer.h b/arch/risc-v/src/esp32c3/hardware/esp32c3_systimer.h
index 7d32e04fb1d..ef317cb0201 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_systimer.h
+++ b/arch/risc-v/src/esp32c3/hardware/esp32c3_systimer.h
@@ -25,7 +25,7 @@
  * Included Files
  ****************************************************************************/
 
-#include "hardware/esp32c3_soc.h"
+#include "esp32c3_soc.h"
 
 /****************************************************************************
  * Pre-processor Definitions