diff --git a/examples/elf/tests/mksymtab.sh b/examples/elf/tests/mksymtab.sh
index c1c6fa202..2c650148f 100755
--- a/examples/elf/tests/mksymtab.sh
+++ b/examples/elf/tests/mksymtab.sh
@@ -30,7 +30,7 @@ varlist=`find ${dir} -executable -type f | xargs nm | fgrep ' U ' | sed -e "s/^[
 # faile
 
 echo "#include <nuttx/compiler.h>"
-echo "#include <nuttx/binfmt/symtab.h>"
+echo "#include <nuttx/symtab.h>"
 echo ""
 
 for var in $varlist; do
diff --git a/examples/module/drivers/mksymtab.sh b/examples/module/drivers/mksymtab.sh
index 569d2c6d6..118b464d3 100755
--- a/examples/module/drivers/mksymtab.sh
+++ b/examples/module/drivers/mksymtab.sh
@@ -30,7 +30,7 @@ varlist=`find ${dir} -executable -type f | xargs nm | fgrep ' U ' | sed -e "s/^[
 # faile
 
 echo "#include <nuttx/compiler.h>"
-echo "#include <nuttx/binfmt/symtab.h>"
+echo "#include <nuttx/symtab.h>"
 echo ""
 
 for var in $varlist; do
diff --git a/examples/module/module_main.c b/examples/module/module_main.c
index d5213106d..a0de9b9be 100644
--- a/examples/module/module_main.c
+++ b/examples/module/module_main.c
@@ -54,7 +54,7 @@
 #include <debug.h>
 
 #include <nuttx/module.h>
-#include <nuttx/binfmt/symtab.h>
+#include <nuttx/symtab.h>
 
 #if  defined(CONFIG_EXAMPLES_MODULE_ROMFS)
 #  include <nuttx/drivers/ramdisk.h>
diff --git a/examples/nxflat/tests/mksymtab.sh b/examples/nxflat/tests/mksymtab.sh
index 64d4a9bdb..b0d76e068 100755
--- a/examples/nxflat/tests/mksymtab.sh
+++ b/examples/nxflat/tests/mksymtab.sh
@@ -22,7 +22,7 @@ varlist=`find $dir -name "*-thunk.S"| xargs grep -h asciz | cut -f3 | sort | uni
 echo "#ifndef __EXAMPLES_NXFLAT_TESTS_SYMTAB_H"
 echo "#define __EXAMPLES_NXFLAT_TESTS_SYMTAB_H"
 echo ""
-echo "#include <nuttx/binfmt/symtab.h>"
+echo "#include <nuttx/symtab.h>"
 echo ""
 echo "static const struct symtab_s g_nxflat_exports[] = "
 echo "{"
diff --git a/examples/posix_spawn/Makefile b/examples/posix_spawn/Makefile
index a97dbdedc..9be2daf93 100644
--- a/examples/posix_spawn/Makefile
+++ b/examples/posix_spawn/Makefile
@@ -74,12 +74,11 @@ spawn_main.o: spawn_main.c \
 	$(TOPDIR)/include/debug.h \
 	$(TOPDIR)/include/errno.h \
 	$(TOPDIR)/include/nuttx/drivers/ramdisk.h \
-	$(TOPDIR)/include/nuttx/binfmt/elf.h \
-	$(TOPDIR)/include/nuttx/binfmt/symtab.h \
+	$(TOPDIR)/include/nuttx/symtab.h \
 	filesystem/romfs.h
 
 symtab.o: filesystem/symtab.c \
 	$(TOPDIR)/include/nuttx/compiler.h \
-	$(TOPDIR)/include/nuttx/binfmt/symtab.h
+	$(TOPDIR)/include/nuttx/symtab.h
 
 include $(APPDIR)/Application.mk
diff --git a/examples/posix_spawn/filesystem/mksymtab.sh b/examples/posix_spawn/filesystem/mksymtab.sh
index 5be28089e..ea68eae36 100755
--- a/examples/posix_spawn/filesystem/mksymtab.sh
+++ b/examples/posix_spawn/filesystem/mksymtab.sh
@@ -30,7 +30,7 @@ varlist=`find ${dir} -executable -type f | xargs nm | fgrep ' U ' | sed -e "s/^[
 # faile
 
 echo "#include <nuttx/compiler.h>"
-echo "#include <nuttx/binfmt/symtab.h>"
+echo "#include <nuttx/symtab.h>"
 echo ""
 
 for var in $varlist; do
diff --git a/examples/posix_spawn/spawn_main.c b/examples/posix_spawn/spawn_main.c
index 326e8231b..e4f545560 100644
--- a/examples/posix_spawn/spawn_main.c
+++ b/examples/posix_spawn/spawn_main.c
@@ -53,7 +53,7 @@
 #include <errno.h>
 
 #include <nuttx/drivers/ramdisk.h>
-#include <nuttx/binfmt/symtab.h>
+#include <nuttx/symtab.h>
 
 #include "filesystem/romfs.h"
 
diff --git a/examples/sotest/lib/mksymtab.sh b/examples/sotest/lib/mksymtab.sh
index d0dbade9f..fe5ba7b37 100755
--- a/examples/sotest/lib/mksymtab.sh
+++ b/examples/sotest/lib/mksymtab.sh
@@ -36,7 +36,7 @@ varlist=`echo $tmplist | sed -e "s/modprint//g"`
 # fail
 
 echo "#include <nuttx/compiler.h>"
-echo "#include <nuttx/binfmt/symtab.h>"
+echo "#include <nuttx/symtab.h>"
 echo ""
 
 for var in $varlist; do
diff --git a/examples/sotest/sotest_main.c b/examples/sotest/sotest_main.c
index f6bedcdf9..76baf2070 100644
--- a/examples/sotest/sotest_main.c
+++ b/examples/sotest/sotest_main.c
@@ -50,7 +50,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/binfmt/symtab.h>
+#include <nuttx/symtab.h>
 
 #ifdef CONFIG_EXAMPLES_SOTEST_BUILTINFS
 #  include <nuttx/drivers/ramdisk.h>
diff --git a/examples/thttpd/content/mksymtab.sh b/examples/thttpd/content/mksymtab.sh
index 40777af4d..39da0287f 100755
--- a/examples/thttpd/content/mksymtab.sh
+++ b/examples/thttpd/content/mksymtab.sh
@@ -22,7 +22,7 @@ varlist=`find $dir -name "*-thunk.S"| xargs grep -h asciz | cut -f3 | sort | uni
 echo "#ifndef __EXAMPLES_NXFLAT_TESTS_SYMTAB_H"
 echo "#define __EXAMPLES_NXFLAT_TESTS_SYMTAB_H"
 echo ""
-echo "#include <nuttx/binfmt/symtab.h>"
+echo "#include <nuttx/symtab.h>"
 echo ""
 echo "static const struct symtab_s g_thttpd_exports[] = "
 echo "{"
diff --git a/include/netutils/thttpd.h b/include/netutils/thttpd.h
index d24879709..dac1f9264 100644
--- a/include/netutils/thttpd.h
+++ b/include/netutils/thttpd.h
@@ -42,7 +42,7 @@
 
 #include <nuttx/config.h>
 
-#include <nuttx/binfmt/symtab.h>
+#include <nuttx/symtab.h>
 
 /****************************************************************************
  * Public Data
diff --git a/netutils/thttpd/thttpd.c b/netutils/thttpd/thttpd.c
index cbd06b14b..aa9d6782d 100644
--- a/netutils/thttpd/thttpd.c
+++ b/netutils/thttpd/thttpd.c
@@ -56,7 +56,7 @@
 #include <arpa/inet.h>
 
 #include <nuttx/compiler.h>
-#include <nuttx/binfmt/symtab.h>
+#include <nuttx/symtab.h>
 #include "netutils/thttpd.h"
 
 #include "config.h"
diff --git a/netutils/thttpd/thttpd_cgi.c b/netutils/thttpd/thttpd_cgi.c
index 45bc80001..fd9335ed2 100644
--- a/netutils/thttpd/thttpd_cgi.c
+++ b/netutils/thttpd/thttpd_cgi.c
@@ -54,7 +54,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/binfmt/symtab.h>
+#include <nuttx/symtab.h>
 #include <nuttx/binfmt/binfmt.h>
 #include "netutils/thttpd.h"
 
diff --git a/system/nsh/nsh_main.c b/system/nsh/nsh_main.c
index 39f2d365f..14b908cb2 100644
--- a/system/nsh/nsh_main.c
+++ b/system/nsh/nsh_main.c
@@ -47,7 +47,7 @@
 #include <errno.h>
 
 #if defined(CONFIG_LIBC_EXECFUNCS)
-#  include <nuttx/binfmt/symtab.h>
+#  include <nuttx/symtab.h>
 #endif
 
 #include "platform/cxxinitialize.h"