diff --git a/arch/arm/src/common/arm_backtrace_unwind.c b/arch/arm/src/common/arm_backtrace_unwind.c
index 5fc33ff2cb..a6d9a1a592 100644
--- a/arch/arm/src/common/arm_backtrace_unwind.c
+++ b/arch/arm/src/common/arm_backtrace_unwind.c
@@ -23,9 +23,9 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <nuttx/arch.h>
 
-#include <arch/elf.h>
+#include <nuttx/arch.h>
+#include <nuttx/elf.h>
 
 #include "sched/sched.h"
 #include "arm_internal.h"
diff --git a/include/nuttx/elf.h b/include/nuttx/elf.h
index b9c2588f0d..c0f8d9fffc 100644
--- a/include/nuttx/elf.h
+++ b/include/nuttx/elf.h
@@ -26,9 +26,7 @@
  ****************************************************************************/
 
 #include <elf.h>
-#ifdef CONFIG_ELF_COREDUMP
 #include <arch/elf.h>
-#endif
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/libs/libc/machine/arm/arm/arch_elf.c b/libs/libc/machine/arm/arm/arch_elf.c
index 9fb385aeb6..a3c94a35e8 100644
--- a/libs/libc/machine/arm/arm/arch_elf.c
+++ b/libs/libc/machine/arm/arm/arch_elf.c
@@ -29,7 +29,6 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <arch/elf.h>
 #include <nuttx/elf.h>
 
 /****************************************************************************
diff --git a/libs/libc/machine/arm/armv6-m/arch_elf.c b/libs/libc/machine/arm/armv6-m/arch_elf.c
index 60001cbf85..0972646585 100644
--- a/libs/libc/machine/arm/armv6-m/arch_elf.c
+++ b/libs/libc/machine/arm/armv6-m/arch_elf.c
@@ -28,7 +28,6 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <arch/elf.h>
 #include <nuttx/elf.h>
 
 /****************************************************************************
diff --git a/libs/libc/machine/arm/armv7-a/arch_elf.c b/libs/libc/machine/arm/armv7-a/arch_elf.c
index 1ecacf3de7..6d5f270da5 100644
--- a/libs/libc/machine/arm/armv7-a/arch_elf.c
+++ b/libs/libc/machine/arm/armv7-a/arch_elf.c
@@ -29,7 +29,6 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <arch/elf.h>
 #include <nuttx/elf.h>
 
 /****************************************************************************
diff --git a/libs/libc/machine/arm/armv7-m/arch_elf.c b/libs/libc/machine/arm/armv7-m/arch_elf.c
index c2e6c27056..2bfc8f2c2f 100644
--- a/libs/libc/machine/arm/armv7-m/arch_elf.c
+++ b/libs/libc/machine/arm/armv7-m/arch_elf.c
@@ -29,7 +29,6 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <arch/elf.h>
 #include <nuttx/elf.h>
 
 /****************************************************************************
diff --git a/libs/libc/machine/arm/armv7-r/arch_elf.c b/libs/libc/machine/arm/armv7-r/arch_elf.c
index 8726637421..7b1144465e 100644
--- a/libs/libc/machine/arm/armv7-r/arch_elf.c
+++ b/libs/libc/machine/arm/armv7-r/arch_elf.c
@@ -29,7 +29,6 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <arch/elf.h>
 #include <nuttx/elf.h>
 
 /****************************************************************************
diff --git a/libs/libc/machine/arm/armv8-m/arch_elf.c b/libs/libc/machine/arm/armv8-m/arch_elf.c
index d63e5edc7d..2b146a2e85 100644
--- a/libs/libc/machine/arm/armv8-m/arch_elf.c
+++ b/libs/libc/machine/arm/armv8-m/arch_elf.c
@@ -29,7 +29,6 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <arch/elf.h>
 #include <nuttx/elf.h>
 
 /****************************************************************************
diff --git a/libs/libc/machine/risc-v/arch_elf.c b/libs/libc/machine/risc-v/arch_elf.c
index 9efa483722..ef7324ecf8 100644
--- a/libs/libc/machine/risc-v/arch_elf.c
+++ b/libs/libc/machine/risc-v/arch_elf.c
@@ -30,7 +30,6 @@
 #include <debug.h>
 #include <assert.h>
 
-#include <arch/elf.h>
 #include <nuttx/elf.h>
 
 /****************************************************************************
diff --git a/libs/libc/machine/sparc/arch_elf.c b/libs/libc/machine/sparc/arch_elf.c
index 7777c723a2..fb19702878 100644
--- a/libs/libc/machine/sparc/arch_elf.c
+++ b/libs/libc/machine/sparc/arch_elf.c
@@ -29,7 +29,6 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <arch/elf.h>
 #include <nuttx/elf.h>
 
 /****************************************************************************
diff --git a/libs/libc/machine/xtensa/arch_elf.c b/libs/libc/machine/xtensa/arch_elf.c
index 56eded4fb8..45168ba82b 100644
--- a/libs/libc/machine/xtensa/arch_elf.c
+++ b/libs/libc/machine/xtensa/arch_elf.c
@@ -29,7 +29,6 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <arch/elf.h>
 #include <nuttx/elf.h>
 
 /****************************************************************************