diff --git a/Make.defs b/Make.defs
index f0cbc2681..13d1ad1e7 100644
--- a/Make.defs
+++ b/Make.defs
@@ -92,25 +92,14 @@ BUILTIN_REGISTRY = $(APPDIR)$(DELIM)builtin$(DELIM)registry
 
 DEPCONFIG = $(TOPDIR)$(DELIM).config
 
-ifeq ($(CONFIG_WINDOWS_NATIVE),y)
 define REGISTER
 	$(Q) echo Register: $1
-	$(Q) echo { "$1", $2, $3, $4 }, > "$(BUILTIN_REGISTRY)$(DELIM)$1.bdat"
-	$(Q) if [ ! -z $4 ]; then \
-	        echo "int $4(int argc, char *argv[]);" > "$(BUILTIN_REGISTRY)$(DELIM)$1.pdat"; \
-	     fi;
-	$(Q) touch $(BUILTIN_REGISTRY)$(DELIM).updated"
-endef
-else
-define REGISTER
-	$(Q) echo "Register: $1"
-	$(Q) echo "{ \"$1\", $2, $3, $4 }," > "$(BUILTIN_REGISTRY)$(DELIM)$1.bdat"
+	$(Q) echo { \"$1\", $2, $3, $4 }, > "$(BUILTIN_REGISTRY)$(DELIM)$1.bdat"
 	$(Q) if [ ! -z $4 ]; then \
 	        echo "int $4(int argc, char *argv[]);" > "$(BUILTIN_REGISTRY)$(DELIM)$1.pdat"; \
 	     fi;
 	$(Q) touch "$(BUILTIN_REGISTRY)$(DELIM).updated"
 endef
-endif
 
 define ARLOCK
 	$(Q) flock $1.lock $(call ARCHIVE, $1, $(2))
diff --git a/Makefile b/Makefile
index 81f110d24..5b949abc0 100644
--- a/Makefile
+++ b/Makefile
@@ -154,7 +154,7 @@ depend: .depend
 
 clean_context:
 	$(Q) $(MAKE) -C platform clean_context TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
-	$(Q) $(MAKE) -C builtin/registry clean_context TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
+	$(Q) $(MAKE) -C builtin clean_context TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
 
 clean: $(foreach SDIR, $(CLEANDIRS), $(SDIR)_clean)
 	$(call DELFILE, $(SYMTABSRC))
diff --git a/builtin/Makefile b/builtin/Makefile
index 7b69ba6e6..f64e0b310 100644
--- a/builtin/Makefile
+++ b/builtin/Makefile
@@ -44,40 +44,38 @@ CSRCS = builtin_list.c exec_builtin.c
 PDATLIST = $(strip $(call RWILDCARD, registry, *.pdat))
 BDATLIST = $(strip $(call RWILDCARD, registry, *.bdat))
 
-registry$(DELIM).updated:
-	$(Q) $(MAKE) -C registry .updated TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
-
 builtin_list.c: builtin_list.h builtin_proto.h
 
+registry$(DELIM).updated:
+	$(Q) touch registry$(DELIM).updated
+
 builtin_list.h: registry$(DELIM).updated
-	$(call DELFILE, .xx_builtin_list.h)
-	$(Q) touch .xx_builtin_list.h
-ifneq ($(BDATLIST),)
-	$(call CATFILE, .xx_builtin_list.h, $(BDATLIST))
+ifeq ($(BDATLIST),)
+	$(call DELFILE, builtin_list.h)
+	$(Q) touch builtin_list.h
+else
+	$(call CATFILE, builtin_list.h, $(BDATLIST))
 endif
-	$(Q) mv .xx_builtin_list.h builtin_list.h
 
 builtin_proto.h: registry$(DELIM).updated
-	$(call DELFILE, .xx_builtin_proto.h)
-	$(Q) touch .xx_builtin_proto.h
-ifneq ($(PDATLIST),)
-	$(call CATFILE, .xx_builtin_proto.h, $(PDATLIST))
+ifeq ($(PDATLIST),)
+	$(call DELFILE, builtin_proto.h)
+	$(Q) touch builtin_proto.h
+else
+	$(call CATFILE, builtin_proto.h, $(PDATLIST))
 endif
-	$(Q) mv .xx_builtin_proto.h builtin_proto.h
-
-context::
-	$(Q) $(MAKE) -C registry context TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
 
 depend:: builtin_list.h builtin_proto.h
 
 clean::
-	$(Q) $(MAKE) -C registry clean TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
-	$(call DELFILE, .xx_builtin_list.h)
-	$(call DELFILE, .xx_builtin_proto.h)
-
-distclean::
-	$(Q) $(MAKE) -C registry distclean TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
 	$(call DELFILE, builtin_list.h)
 	$(call DELFILE, builtin_proto.h)
 
+clean_context::
+	$(call DELFILE, $(PDATLIST))
+	$(call DELFILE, $(BDATLIST))
+
+distclean:: clean_context clean
+	$(call DELFILE, registry$(DELIM).updated)
+
 include $(APPDIR)/Application.mk
diff --git a/builtin/registry/Makefile b/builtin/registry/Makefile
deleted file mode 100644
index c4e046644..000000000
--- a/builtin/registry/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-############################################################################
-# apps/builtin/registry/Makefile
-#
-#   Copyright (C) 2012 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
--include $(TOPDIR)/Make.defs
-include $(APPDIR)/Make.defs
-
-# NSH Library
-
-all:
-.PHONY: context depend clean distclean
-
-.updated: $(DEPCONFIG)
-	$(Q) touch .updated
-
-# This must run before any other context target
-
-install:
-
-context:
-
-depend:
-
-clean:
-	$(call CLEAN)
-
-clean_context:
-	$(call DELFILE, *.bdat)
-	$(call DELFILE, *.pdat)
-
-distclean: clean
-	$(call DELFILE, .updated)