diff --git a/include/nuttx/lib/builtin.h b/include/nuttx/lib/builtin.h
index 2050b20f27b..b0cf6ec0938 100644
--- a/include/nuttx/lib/builtin.h
+++ b/include/nuttx/lib/builtin.h
@@ -199,7 +199,7 @@ FAR const char *builtin_getname(int index);
  *
  ****************************************************************************/
 
-FAR const struct builtin_s *builtin_for_index(int index);
+FAR struct builtin_s const *builtin_for_index(int index);
 
 #undef EXTERN
 #if defined(__cplusplus)
diff --git a/libs/libc/builtin/Make.defs b/libs/libc/builtin/Make.defs
index 4b35f107f2f..44815a3edf7 100644
--- a/libs/libc/builtin/Make.defs
+++ b/libs/libc/builtin/Make.defs
@@ -38,7 +38,10 @@ ifeq ($(CONFIG_BUILTIN),y)
 # Builtin library files
 
 CSRCS += lib_builtin_getname.c lib_builtin_isavail.c lib_builtin_forindex.c
+
+ifeq ($(CONFIG_BUILD_PROTECTED),y)
 CSRCS += lib_builtin_setlist.c
+endif
 
 # Hook the builtin subdirectory into the build
 
diff --git a/libs/libc/builtin/lib_builtin_forindex.c b/libs/libc/builtin/lib_builtin_forindex.c
index 80409ca903d..1b804052396 100644
--- a/libs/libc/builtin/lib_builtin_forindex.c
+++ b/libs/libc/builtin/lib_builtin_forindex.c
@@ -49,7 +49,7 @@
  * Public Functions
  ****************************************************************************/
 
-FAR const struct builtin_s *builtin_for_index(int index)
+FAR struct builtin_s const *builtin_for_index(int index)
 {
   if (index < g_builtin_count)
     {
diff --git a/libs/libc/builtin/lib_builtin_setlist.c b/libs/libc/builtin/lib_builtin_setlist.c
index d20f4e1d2d9..eb1944ee7da 100644
--- a/libs/libc/builtin/lib_builtin_setlist.c
+++ b/libs/libc/builtin/lib_builtin_setlist.c
@@ -89,8 +89,8 @@ int g_builtin_count;
 
 void builtin_setlist(FAR struct builtin_s * const *builtins, int count)
 {
-  g_builtins = builtins;
-  g_builtin_count = builtins;
+  g_builtins      = builtins;
+  g_builtin_count = count;
 }
 
 #endif /* CONFIG_BUILD_PROTECTED && CONFIG_FS_BINFS && __KERNEL__ */