diff --git a/libs/README.txt b/libs/README.txt
index c751de17fe..2c1fbff37e 100644
--- a/libs/README.txt
+++ b/libs/README.txt
@@ -22,4 +22,12 @@ creatures.  The have these properties:
    nxsem_wait() must be used.  Within libraries, the macro  _SEM_WAIT()
    (as defined in include/nuttx/semaphore.h) is used instead.  The
    definition of this macro accounts for the different usage environments.
- 
+
+NOTE:  The libraries under libs/ build differently from other NuttX
+components:  There are no build-related files in the libs/ directory; it
+is simply a container for other well-known, individual library directories.
+The upper level Makefile logic is aware of the libraries within the libs/
+container.
+
+The only real function of the libs/ directory is to prevent the top-level
+directory from becoming cluttered with individual libraries.
diff --git a/tools/FlatLibs.mk b/tools/FlatLibs.mk
index 88c015f3c0..1058a6c85a 100644
--- a/tools/FlatLibs.mk
+++ b/tools/FlatLibs.mk
@@ -69,7 +69,7 @@ endif
 # be defined in Make.defs for this to work!
 
 ifeq ($(CONFIG_HAVE_CXX),y)
-NUTTXLIBS += staging$(DELIM)libcxx$(LIBEXT)
+NUTTXLIBS += staging$(DELIM)$(LIBXX)$(LIBEXT)
 endif
 
 # Add library for application support.
@@ -124,7 +124,7 @@ endif
 # Add C++ library
 
 ifeq ($(CONFIG_HAVE_CXX),y)
-NUTTXLIBS += staging$(DELIM)libcxx$(LIBEXT)
+NUTTXLIBS += staging$(DELIM)$(LIBXX)$(LIBEXT)
 endif
 
 # Export all libraries
diff --git a/tools/KernelLibs.mk b/tools/KernelLibs.mk
index 50999914d4..bfbd18535f 100644
--- a/tools/KernelLibs.mk
+++ b/tools/KernelLibs.mk
@@ -68,7 +68,7 @@ USERLIBS  += staging$(DELIM)libumm$(LIBEXT) staging$(DELIM)libuarch$(LIBEXT)
 # be defined in Make.defs for this to work!
 
 ifeq ($(CONFIG_HAVE_CXX),y)
-USERLIBS += staging$(DELIM)libcxx$(LIBEXT)
+USERLIBS += staging$(DELIM)$(LIBXX)$(LIBEXT)
 endif
 
 # Add libraries for network support
@@ -119,7 +119,7 @@ endif
 # Add C++ library
 
 ifeq ($(CONFIG_HAVE_CXX),y)
-NUTTXLIBS += staging$(DELIM)libcxx$(LIBEXT)
+NUTTXLIBS += staging$(DELIM)$(LIBXX)$(LIBEXT)
 endif
 
 # Export only the user libraries
diff --git a/tools/ProtectedLibs.mk b/tools/ProtectedLibs.mk
index 91a19d214d..5a25626f81 100644
--- a/tools/ProtectedLibs.mk
+++ b/tools/ProtectedLibs.mk
@@ -69,7 +69,7 @@ USERLIBS  += staging$(DELIM)libumm$(LIBEXT) staging$(DELIM)libuarch$(LIBEXT)
 # be defined in Make.defs for this to work!
 
 ifeq ($(CONFIG_HAVE_CXX),y)
-USERLIBS += staging$(DELIM)libcxx$(LIBEXT)
+USERLIBS += staging$(DELIM)$(LIBXX)$(LIBEXT)
 endif
 
 # Add library for application support.
@@ -126,7 +126,7 @@ endif
 # Add C++ library
 
 ifeq ($(CONFIG_HAVE_CXX),y)
-NUTTXLIBS += staging$(DELIM)libcxx$(LIBEXT)
+NUTTXLIBS += staging$(DELIM)$(LIBXX)$(LIBEXT)
 endif
 
 # Export only the user libraries
diff --git a/tools/ide_exporter.py b/tools/ide_exporter.py
index f90da6f2e6..f7c5385181 100755
--- a/tools/ide_exporter.py
+++ b/tools/ide_exporter.py
@@ -955,7 +955,7 @@ if __name__ == '__main__':
             lib_prj.make_src_nodes(group_src_list)
             lib_prj.make_include(group_src_list)
             lib_prj.make_output_dir(lib_name)
-            if lib_name == 'libcxx':
+            if lib_name == 'libxx' or lib_name == 'libcxx':
                 lib_prj.add_misc('cxx_misc')
                 lib_prj.add_define('cxx_def', 'CONFIG_WCHAR_BUILTIN')
             else: