diff --git a/README.txt b/README.txt
index 4f481cefb..0f3a56b7e 100644
--- a/README.txt
+++ b/README.txt
@@ -61,7 +61,7 @@ collected during the make context build phase.
 
 To execute an application function:
 
-  exec_builtin() is defined in the nuttx/include/apps/builtin.h
+  exec_builtin() is defined in the nuttx/include/apps/builtin/builtin.h
 
 NuttShell (NSH) Built-In Commands
 ---------------------------------
diff --git a/builtin/exec_builtin.c b/builtin/exec_builtin.c
index f12316d45..36ea5a656 100644
--- a/builtin/exec_builtin.c
+++ b/builtin/exec_builtin.c
@@ -51,36 +51,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#if 0
-#include <sys/wait.h>
-#include <sched.h>
-#include <string.h>
-#include <semaphore.h>
-
-#include <nuttx/binfmt/builtin.h>
-#endif
-
-#include <apps/builtin.h>
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Function Prototypes
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
+#include <apps/builtin/builtin.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/include/builtin.h b/include/builtin/builtin.h
similarity index 94%
rename from include/builtin.h
rename to include/builtin/builtin.h
index 0820f522f..96aeb86a7 100644
--- a/include/builtin.h
+++ b/include/builtin/builtin.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/include/builtin.h
+ * apps/include/builtin/builtin.h
  *
  * Originally by:
  *
@@ -8,7 +8,7 @@
  *
  * With subsequent updates, modifications, and general maintenance by:
  *
- *   Copyright (C) 2012-2013, 2015 Gregory Nutt.  All rights reserved.
+ *   Copyright (C) 2012-2013, 2015-2016 Gregory Nutt.  All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -40,8 +40,8 @@
  *
  ****************************************************************************/
 
-#ifndef __APPS_INCLUDE_BUILTIN_H
-#define __APPS_INCLUDE_BUILTIN_H
+#ifndef __APPS_INCLUDE_BUILTIN_BUILTIN_H
+#define __APPS_INCLUDE_BUILTIN_BUILTIN_H
 
 /****************************************************************************
  * Included Files
@@ -109,4 +109,4 @@ int exec_builtin(FAR const char *appname, FAR char * const *argv,
 }
 #endif
 
-#endif /* __APPS_INCLUDE_BUILTIN_H */
+#endif /* __APPS_INCLUDE_BUILTIN_BUILTIN_H */
diff --git a/nshlib/nsh_builtin.c b/nshlib/nsh_builtin.c
index 5141273a9..046fab414 100644
--- a/nshlib/nsh_builtin.c
+++ b/nshlib/nsh_builtin.c
@@ -55,7 +55,7 @@
 #include <string.h>
 
 #include <nuttx/binfmt/builtin.h>
-#include <apps/builtin.h>
+#include <apps/builtin/builtin.h>
 
 #include "nsh.h"
 #include "nsh_console.h"