diff --git a/misc/uClibc++/install.sh b/misc/uClibc++/install.sh
index 3a2bb66f2f..065738e1a0 100755
--- a/misc/uClibc++/install.sh
+++ b/misc/uClibc++/install.sh
@@ -217,7 +217,7 @@ if [ ! -d "${nuttx_path}" ]; then
 fi
 
 if [ ! -f "${nuttx_path}/Makefile" ]; then
-  echo "ERROR: Not Makefile in directory ${nuttx_path}"
+  echo "ERROR: No Makefile in directory ${nuttx_path}"
   echo $usage
   exit 1
 fi
diff --git a/misc/uClibc++/libxx/uClib++/Make.defs b/misc/uClibc++/libxx/uClibc++/Make.defs
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/Make.defs
rename to misc/uClibc++/libxx/uClibc++/Make.defs
diff --git a/misc/uClibc++/libxx/uClib++/algorithm.cxx b/misc/uClibc++/libxx/uClibc++/algorithm.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/algorithm.cxx
rename to misc/uClibc++/libxx/uClibc++/algorithm.cxx
diff --git a/misc/uClibc++/libxx/uClib++/associative_base.cxx b/misc/uClibc++/libxx/uClibc++/associative_base.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/associative_base.cxx
rename to misc/uClibc++/libxx/uClibc++/associative_base.cxx
diff --git a/misc/uClibc++/libxx/uClib++/bitset.cxx b/misc/uClibc++/libxx/uClibc++/bitset.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/bitset.cxx
rename to misc/uClibc++/libxx/uClibc++/bitset.cxx
diff --git a/misc/uClibc++/libxx/uClib++/char_traits.cxx b/misc/uClibc++/libxx/uClibc++/char_traits.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/char_traits.cxx
rename to misc/uClibc++/libxx/uClibc++/char_traits.cxx
diff --git a/misc/uClibc++/libxx/uClib++/complex.cxx b/misc/uClibc++/libxx/uClibc++/complex.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/complex.cxx
rename to misc/uClibc++/libxx/uClibc++/complex.cxx
diff --git a/misc/uClibc++/libxx/uClib++/del_op.cxx b/misc/uClibc++/libxx/uClibc++/del_op.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/del_op.cxx
rename to misc/uClibc++/libxx/uClibc++/del_op.cxx
diff --git a/misc/uClibc++/libxx/uClib++/del_opnt.cxx b/misc/uClibc++/libxx/uClibc++/del_opnt.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/del_opnt.cxx
rename to misc/uClibc++/libxx/uClibc++/del_opnt.cxx
diff --git a/misc/uClibc++/libxx/uClib++/del_opv.cxx b/misc/uClibc++/libxx/uClibc++/del_opv.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/del_opv.cxx
rename to misc/uClibc++/libxx/uClibc++/del_opv.cxx
diff --git a/misc/uClibc++/libxx/uClib++/del_opvnt.cxx b/misc/uClibc++/libxx/uClibc++/del_opvnt.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/del_opvnt.cxx
rename to misc/uClibc++/libxx/uClibc++/del_opvnt.cxx
diff --git a/misc/uClibc++/libxx/uClib++/deque.cxx b/misc/uClibc++/libxx/uClibc++/deque.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/deque.cxx
rename to misc/uClibc++/libxx/uClibc++/deque.cxx
diff --git a/misc/uClibc++/libxx/uClib++/eh_alloc.cxx b/misc/uClibc++/libxx/uClibc++/eh_alloc.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/eh_alloc.cxx
rename to misc/uClibc++/libxx/uClibc++/eh_alloc.cxx
diff --git a/misc/uClibc++/libxx/uClib++/eh_globals.cxx b/misc/uClibc++/libxx/uClibc++/eh_globals.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/eh_globals.cxx
rename to misc/uClibc++/libxx/uClibc++/eh_globals.cxx
diff --git a/misc/uClibc++/libxx/uClib++/exception.cxx b/misc/uClibc++/libxx/uClibc++/exception.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/exception.cxx
rename to misc/uClibc++/libxx/uClibc++/exception.cxx
diff --git a/misc/uClibc++/libxx/uClib++/fstream.cxx b/misc/uClibc++/libxx/uClibc++/fstream.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/fstream.cxx
rename to misc/uClibc++/libxx/uClibc++/fstream.cxx
diff --git a/misc/uClibc++/libxx/uClib++/func_exception.cxx b/misc/uClibc++/libxx/uClibc++/func_exception.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/func_exception.cxx
rename to misc/uClibc++/libxx/uClibc++/func_exception.cxx
diff --git a/misc/uClibc++/libxx/uClib++/iomanip.cxx b/misc/uClibc++/libxx/uClibc++/iomanip.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/iomanip.cxx
rename to misc/uClibc++/libxx/uClibc++/iomanip.cxx
diff --git a/misc/uClibc++/libxx/uClib++/ios.cxx b/misc/uClibc++/libxx/uClibc++/ios.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/ios.cxx
rename to misc/uClibc++/libxx/uClibc++/ios.cxx
diff --git a/misc/uClibc++/libxx/uClib++/iostream.cxx b/misc/uClibc++/libxx/uClibc++/iostream.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/iostream.cxx
rename to misc/uClibc++/libxx/uClibc++/iostream.cxx
diff --git a/misc/uClibc++/libxx/uClib++/istream.cxx b/misc/uClibc++/libxx/uClibc++/istream.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/istream.cxx
rename to misc/uClibc++/libxx/uClibc++/istream.cxx
diff --git a/misc/uClibc++/libxx/uClib++/iterator.cxx b/misc/uClibc++/libxx/uClibc++/iterator.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/iterator.cxx
rename to misc/uClibc++/libxx/uClibc++/iterator.cxx
diff --git a/misc/uClibc++/libxx/uClib++/limits.cxx b/misc/uClibc++/libxx/uClibc++/limits.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/limits.cxx
rename to misc/uClibc++/libxx/uClibc++/limits.cxx
diff --git a/misc/uClibc++/libxx/uClib++/list.cxx b/misc/uClibc++/libxx/uClibc++/list.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/list.cxx
rename to misc/uClibc++/libxx/uClibc++/list.cxx
diff --git a/misc/uClibc++/libxx/uClib++/locale.cxx b/misc/uClibc++/libxx/uClibc++/locale.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/locale.cxx
rename to misc/uClibc++/libxx/uClibc++/locale.cxx
diff --git a/misc/uClibc++/libxx/uClib++/map.cxx b/misc/uClibc++/libxx/uClibc++/map.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/map.cxx
rename to misc/uClibc++/libxx/uClibc++/map.cxx
diff --git a/misc/uClibc++/libxx/uClib++/new_handler.cxx b/misc/uClibc++/libxx/uClibc++/new_handler.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/new_handler.cxx
rename to misc/uClibc++/libxx/uClibc++/new_handler.cxx
diff --git a/misc/uClibc++/libxx/uClib++/new_op.cxx b/misc/uClibc++/libxx/uClibc++/new_op.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/new_op.cxx
rename to misc/uClibc++/libxx/uClibc++/new_op.cxx
diff --git a/misc/uClibc++/libxx/uClib++/new_opnt.cxx b/misc/uClibc++/libxx/uClibc++/new_opnt.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/new_opnt.cxx
rename to misc/uClibc++/libxx/uClibc++/new_opnt.cxx
diff --git a/misc/uClibc++/libxx/uClib++/new_opv.cxx b/misc/uClibc++/libxx/uClibc++/new_opv.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/new_opv.cxx
rename to misc/uClibc++/libxx/uClibc++/new_opv.cxx
diff --git a/misc/uClibc++/libxx/uClib++/new_opvnt.cxx b/misc/uClibc++/libxx/uClibc++/new_opvnt.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/new_opvnt.cxx
rename to misc/uClibc++/libxx/uClibc++/new_opvnt.cxx
diff --git a/misc/uClibc++/libxx/uClib++/numeric.cxx b/misc/uClibc++/libxx/uClibc++/numeric.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/numeric.cxx
rename to misc/uClibc++/libxx/uClibc++/numeric.cxx
diff --git a/misc/uClibc++/libxx/uClib++/ostream.cxx b/misc/uClibc++/libxx/uClibc++/ostream.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/ostream.cxx
rename to misc/uClibc++/libxx/uClibc++/ostream.cxx
diff --git a/misc/uClibc++/libxx/uClib++/queue.cxx b/misc/uClibc++/libxx/uClibc++/queue.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/queue.cxx
rename to misc/uClibc++/libxx/uClibc++/queue.cxx
diff --git a/misc/uClibc++/libxx/uClib++/set.cxx b/misc/uClibc++/libxx/uClibc++/set.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/set.cxx
rename to misc/uClibc++/libxx/uClibc++/set.cxx
diff --git a/misc/uClibc++/libxx/uClib++/sstream.cxx b/misc/uClibc++/libxx/uClibc++/sstream.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/sstream.cxx
rename to misc/uClibc++/libxx/uClibc++/sstream.cxx
diff --git a/misc/uClibc++/libxx/uClib++/stack.cxx b/misc/uClibc++/libxx/uClibc++/stack.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/stack.cxx
rename to misc/uClibc++/libxx/uClibc++/stack.cxx
diff --git a/misc/uClibc++/libxx/uClib++/stdexcept.cxx b/misc/uClibc++/libxx/uClibc++/stdexcept.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/stdexcept.cxx
rename to misc/uClibc++/libxx/uClibc++/stdexcept.cxx
diff --git a/misc/uClibc++/libxx/uClib++/streambuf.cxx b/misc/uClibc++/libxx/uClibc++/streambuf.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/streambuf.cxx
rename to misc/uClibc++/libxx/uClibc++/streambuf.cxx
diff --git a/misc/uClibc++/libxx/uClib++/string.cxx b/misc/uClibc++/libxx/uClibc++/string.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/string.cxx
rename to misc/uClibc++/libxx/uClibc++/string.cxx
diff --git a/misc/uClibc++/libxx/uClib++/support.cxx b/misc/uClibc++/libxx/uClibc++/support.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/support.cxx
rename to misc/uClibc++/libxx/uClibc++/support.cxx
diff --git a/misc/uClibc++/libxx/uClib++/typeinfo.cxx b/misc/uClibc++/libxx/uClibc++/typeinfo.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/typeinfo.cxx
rename to misc/uClibc++/libxx/uClibc++/typeinfo.cxx
diff --git a/misc/uClibc++/libxx/uClib++/utility.cxx b/misc/uClibc++/libxx/uClibc++/utility.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/utility.cxx
rename to misc/uClibc++/libxx/uClibc++/utility.cxx
diff --git a/misc/uClibc++/libxx/uClib++/valarray.cxx b/misc/uClibc++/libxx/uClibc++/valarray.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/valarray.cxx
rename to misc/uClibc++/libxx/uClibc++/valarray.cxx
diff --git a/misc/uClibc++/libxx/uClib++/vector.cxx b/misc/uClibc++/libxx/uClibc++/vector.cxx
similarity index 100%
rename from misc/uClibc++/libxx/uClib++/vector.cxx
rename to misc/uClibc++/libxx/uClibc++/vector.cxx
diff --git a/misc/uClibc++/uninstall.sh b/misc/uClibc++/uninstall.sh
new file mode 100755
index 0000000000..ae73444498
--- /dev/null
+++ b/misc/uClibc++/uninstall.sh
@@ -0,0 +1,94 @@
+#!/bin/bash
+
+usage="USAGE: $0 <full path to the NuttX directory>"
+special="include/features.h"
+
+# Get the single, required command line argument
+
+nuttx_path=$1
+if [ -z "${nuttx_path}" ]; then
+  echo "ERROR: Missing path to the NuttX directory"
+  echo $usage
+  exit 1
+fi
+
+# Lots of sanity checking so that we do not do anything too stupid
+
+if [ ! -d libxx ]; then
+  echo "ERROR: Directory libxx does not exist in this directory"
+  echo "       Please CD into the misc/uClibc++ directory and try again"
+  echo $usage
+  exit 1
+fi
+
+if [ ! -d include ]; then
+  echo "ERROR: Directory include does not exist in this directory"
+  echo "       Please CD into the misc/uClibc++ directory and try again"
+  echo $usage
+  exit 1
+fi
+
+if [ ! -d "${nuttx_path}" ]; then
+  echo "ERROR: Directory ${nuttx_path} does not exist"
+  echo $usage
+  exit 1
+fi
+
+if [ ! -f "${nuttx_path}/Makefile" ]; then
+  echo "ERROR: No Makefile in directory ${nuttx_path}"
+  echo $usage
+  exit 1
+fi
+
+libxx_srcdir=${nuttx_path}/libxx
+
+if [ ! -d "${libxx_srcdir}" ]; then
+  echo "ERROR: Directory ${libxx_srcdir} does not exist"
+  echo $usage
+  exit 1
+fi
+
+if [ ! -f "${libxx_srcdir}/Makefile" ]; then
+  echo "ERROR: No Makefile in directory ${libxx_srcdir}"
+  echo $usage
+  exit 1
+fi
+
+uclibc_srcdir=${libxx_srcdir}/uClibc++
+
+if [ ! -d "${uclibc_srcdir}" ]; then
+  echo "ERROR: Directory ${uclibc_srcdir} already exists"
+  echo "       uClibc++ is not installed"
+  exit 0
+fi
+
+nuttx_incdir=${nuttx_path}/include
+
+if [ ! -d "${nuttx_incdir}" ]; then
+  echo "ERROR: Directory ${nuttx_incdir} does not exist"
+  echo $usage
+  exit 1
+fi
+
+uclibc_incdir=${nuttx_incdir}/uClibc++
+
+if [ ! -d "${uclibc_incdir}" ]; then
+  echo "ERROR: Directory ${uclibc_incdir} does not exist"
+  echo "       uClibc++ is only partially installed"
+fi
+
+echo "Removing uClibc++ in the NuttX source tree"
+
+rm -rf ${uclibc_incdir} || \
+  { echo "ERROR: 'rm -rf ${uclibc_incdir}' failed"; exit 1; }
+
+rm -rf ${uclibc_srcdir} || \
+  { echo "ERROR: 'rm -rf ${libxx_srcdir}' failed"; exit 1; }
+
+for file in $special; do
+  rm -f ${nuttx_path}/${special} || \
+    { echo "ERROR: ' rm -f ${nuttx_path}/${special}' failed"; exit 1; }
+done
+
+echo "Successfully uninstalled"
+echo ""
diff --git a/nuttx/configs/sim/cxxtest/defconfig b/nuttx/configs/sim/cxxtest/defconfig
index 8e1fd8c57d..5797c8d4c8 100644
--- a/nuttx/configs/sim/cxxtest/defconfig
+++ b/nuttx/configs/sim/cxxtest/defconfig
@@ -28,7 +28,7 @@ CONFIG_NUTTX_NEWCONFIG=y
 #
 # CONFIG_ARCH_STDBOOL_H is not set
 # CONFIG_ARCH_MATH_H is not set
-# CONFIG_ARCH_FLOAT_H is not set
+CONFIG_ARCH_FLOAT_H=y
 # CONFIG_ARCH_STDARG_H is not set
 
 #
@@ -262,7 +262,7 @@ CONFIG_STDIO_BUFFER_SIZE=1024
 CONFIG_STDIO_LINEBUFFER=y
 CONFIG_NUNGET_CHARS=2
 CONFIG_LIB_HOMEDIR="/"
-# CONFIG_LIBM is not set
+CONFIG_LIBM=y
 # CONFIG_NOPRINTF_FIELDWIDTH is not set
 # CONFIG_LIBC_FLOATINGPOINT is not set
 # CONFIG_EOL_IS_CR is not set