diff --git a/arch/arm/include/elf.h b/arch/arm/include/elf.h
index d853853801..21b2c1c2c1 100644
--- a/arch/arm/include/elf.h
+++ b/arch/arm/include/elf.h
@@ -50,7 +50,7 @@
  * e_ident[EI_DATA]  = ELFDATA2LSB (little endian) or ELFDATA2MSB (big endian)
  */
 
-#if 0 /* Defined in include/elf.h */
+#if 0 /* Defined in include/elf32.h */
 #define EM_ARM                   40
 #endif
 
diff --git a/arch/sim/src/up_elf.c b/arch/sim/src/up_elf.c
index ca3b642dcd..26a8971a72 100644
--- a/arch/sim/src/up_elf.c
+++ b/arch/sim/src/up_elf.c
@@ -40,7 +40,7 @@
 #include <nuttx/config.h>
 
 #include <stdlib.h>
-#include <elf.h>
+#include <elf32.h>
 #include <errno.h>
 #include <debug.h>
 
diff --git a/arch/x86/src/common/up_elf.c b/arch/x86/src/common/up_elf.c
index be166b480c..da3f7b9935 100644
--- a/arch/x86/src/common/up_elf.c
+++ b/arch/x86/src/common/up_elf.c
@@ -40,7 +40,7 @@
 #include <nuttx/config.h>
 
 #include <stdlib.h>
-#include <elf.h>
+#include <elf32.h>
 #include <errno.h>
 #include <debug.h>