diff --git a/include/cxx/cwchar b/include/cxx/cwchar
index 7c29791570..52ced52699 100755
--- a/include/cxx/cwchar
+++ b/include/cxx/cwchar
@@ -1,7 +1,7 @@
 //***************************************************************************
 // include/cxx/cwchar
 //
-//   Copyright (C) 2015 Gregory Nutt. All rights reserved.
+//   Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved.
 //   Author: Gregory Nutt <gnutt@nuttx.org>
 //
 // Redistribution and use in source and binary forms, with or without
@@ -48,11 +48,83 @@
 
 namespace std
 {
-#if 0 // Not defined
   using ::mbstate_t;
-#endif
   using ::wint_t;
+  using ::wctype_t;
   using ::size_t;
+
+  using ::btowc;
+  using ::fwprintf;
+  using ::fwscanf;
+  using ::iswalnum;
+  using ::iswalpha;
+  using ::iswcntrl;
+  using ::iswdigit;
+  using ::iswgraph;
+  using ::iswlower;
+  using ::iswprint;
+  using ::iswpunct;
+  using ::iswspace;
+  using ::iswupper;
+  using ::iswxdigit;
+  using ::iswctype;
+  using ::fgetwc;
+  using ::fgetws;
+  using ::fputwc;
+  using ::fputws;
+  using ::fwide;
+  using ::getwc;
+  using ::getwchar;
+  using ::mbsinit;
+  using ::mbrlen;
+  using ::mbrtowc;
+  using ::mbsrtowcs;
+  using ::putwc;
+  using ::putwchar;
+  using ::swprintf;
+  using ::swscanf;
+  using ::towlower;
+  using ::towupper;
+  using ::ungetwc;
+  using ::vfwprintf;
+  using ::vwprintf;
+  using ::vswprintf;
+  using ::wcrtomb;
+  using ::wcscat;
+  using ::wcschr;
+  using ::wcscmp;
+  using ::wcscoll;
+  using ::wcscpy;
+  using ::wcscspn;
+  using ::wcsftime;
+  using ::wcslen;
+  using ::wcslcpy;
+  using ::wcslcat;
+  using ::wcsncat;
+  using ::wcsncmp;
+  using ::wcsncpy;
+  using ::wcspbrk;
+  using ::wcsrchr;
+  using ::wcsrtombs;
+  using ::wcsspn;
+  using ::wcsstr;
+  using ::wcstod;
+  using ::wcstok;
+  using ::wcstol;
+  using ::wcstoul;
+  using ::wcswcs;
+  using ::wcswidth;
+  using ::wcsxfrm;
+  using ::wctob;
+  using ::wctype;
+  using ::wcwidth;
+  using ::wmemchr;
+  using ::wmemcmp;
+  using ::wmemcpy;
+  using ::wmemmove;
+  using ::wmemset;
+  using ::wprintf;
+  using ::wscanf;
 };
 
 #endif // __INCLUDE_CXX_CWCHAR
diff --git a/include/cxx/cwctype b/include/cxx/cwctype
new file mode 100644
index 0000000000..5a8f35c0fb
--- /dev/null
+++ b/include/cxx/cwctype
@@ -0,0 +1,74 @@
+//***************************************************************************
+// include/cxx/cwctype
+//
+//   Copyright (C) 2017 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.
+//
+//***************************************************************************
+
+#ifndef __INCLUDE_CXX_CWCTYPE
+#define __INCLUDE_CXX_CWCTYPE
+
+//***************************************************************************
+// Included Files
+//***************************************************************************
+
+#include <wctype.h>
+
+//***************************************************************************
+// Namespace
+//***************************************************************************
+
+namespace std
+{
+  using ::wctrans_t;
+
+  using ::iswalnum;
+  using ::iswalpha;
+  using ::iswblank;
+  using ::iswcntrl;
+  using ::iswctype;
+  using ::iswdigit;
+  using ::iswgraph;
+  using ::iswlower;
+  using ::iswprint;
+  using ::iswpunct;
+  using ::iswspace;
+  using ::iswupper;
+  using ::iswxdigit;
+  using ::towctrans;
+  using ::towlower;
+  using ::towupper;
+  using ::wctrans;
+  using ::iswctype;
+  using ::wctype;
+};
+
+#endif // __INCLUDE_CXX_CWCTYPE