diff --git a/arch/arm/src/common/arm_backtrace_unwind.c b/arch/arm/src/common/arm_backtrace_unwind.c
index 2c9c1414540a6..1b9a141a152d8 100644
--- a/arch/arm/src/common/arm_backtrace_unwind.c
+++ b/arch/arm/src/common/arm_backtrace_unwind.c
@@ -25,7 +25,7 @@
 #include <nuttx/config.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/elf.h>
+#include <arch/elf.h>
 
 #include "sched/sched.h"
 #include "arm_internal.h"
diff --git a/include/nuttx/elf.h b/include/nuttx/elf.h
index abb3c2fa6dcd8..2b7d48d35750a 100644
--- a/include/nuttx/elf.h
+++ b/include/nuttx/elf.h
@@ -28,7 +28,9 @@
  ****************************************************************************/
 
 #include <elf.h>
-#include <arch/elf.h>
+#ifdef CONFIG_LIBC_ARCH_ELF
+#  include <arch/elf.h>
+#endif
 #include <stdbool.h>
 
 /****************************************************************************
diff --git a/libs/libc/machine/arm/gnu_unwind_find_exidx.c b/libs/libc/machine/arm/gnu_unwind_find_exidx.c
index 5ff5a52014227..578cf04248b00 100644
--- a/libs/libc/machine/arm/gnu_unwind_find_exidx.c
+++ b/libs/libc/machine/arm/gnu_unwind_find_exidx.c
@@ -24,7 +24,8 @@
  * Included Files
  ****************************************************************************/
 
-#include <nuttx/elf.h>
+#include <elf32.h>
+#include <arch/elf.h>
 #include <unwind.h>
 
 /****************************************************************************