2 files changed, 79 insertions, 18 deletions

diff --git a/libcxx/include/cwctype b/libcxx/include/cwctype
index f31dd0367c4..25b2489edf2 100644
--- a/libcxx/include/cwctype
+++ b/libcxx/include/cwctype
@@ -63,41 +63,23 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 using ::wint_t;
 using ::wctrans_t;
 using ::wctype_t;
-#undef iswalnum
 using ::iswalnum;
-#undef iswalpha
 using ::iswalpha;
-#undef iswblank
 using ::iswblank;
-#undef iswcntrl
 using ::iswcntrl;
-#undef iswdigit
 using ::iswdigit;
-#undef iswgraph
 using ::iswgraph;
-#undef iswlower
 using ::iswlower;
-#undef iswprint
 using ::iswprint;
-#undef iswpunct
 using ::iswpunct;
-#undef iswspace
 using ::iswspace;
-#undef iswupper
 using ::iswupper;
-#undef iswxdigit
 using ::iswxdigit;
-#undef iswctype
 using ::iswctype;
-#undef wctype
 using ::wctype;
-#undef towlower
 using ::towlower;
-#undef towupper
 using ::towupper;
-#undef towctrans
 using ::towctrans;
-#undef wctrans
 using ::wctrans;
 
 _LIBCPP_END_NAMESPACE_STD
diff --git a/libcxx/include/wctype.h b/libcxx/include/wctype.h
new file mode 100644
index 00000000000..f9c5a47754b
--- /dev/null
+++ b/libcxx/include/wctype.h
@@ -0,0 +1,79 @@
+// -*- C++ -*-
+//===--------------------------- wctype.h ---------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef _LIBCPP_WCTYPE_H
+#define _LIBCPP_WCTYPE_H
+
+/*
+    wctype.h synopsis
+
+Macros:
+
+    WEOF
+
+Types:
+
+    wint_t
+    wctrans_t
+    wctype_t
+
+int iswalnum(wint_t wc);
+int iswalpha(wint_t wc);
+int iswblank(wint_t wc);  // C99
+int iswcntrl(wint_t wc);
+int iswdigit(wint_t wc);
+int iswgraph(wint_t wc);
+int iswlower(wint_t wc);
+int iswprint(wint_t wc);
+int iswpunct(wint_t wc);
+int iswspace(wint_t wc);
+int iswupper(wint_t wc);
+int iswxdigit(wint_t wc);
+int iswctype(wint_t wc, wctype_t desc);
+wctype_t wctype(const char* property);
+wint_t towlower(wint_t wc);
+wint_t towupper(wint_t wc);
+wint_t towctrans(wint_t wc, wctrans_t desc);
+wctrans_t wctrans(const char* property);
+
+*/
+
+#include <__config>
+
+#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+#pragma GCC system_header
+#endif
+
+#include_next <wctype.h>
+
+#ifdef __cplusplus
+
+#undef iswalnum
+#undef iswalpha
+#undef iswblank
+#undef iswcntrl
+#undef iswdigit
+#undef iswgraph
+#undef iswlower
+#undef iswprint
+#undef iswpunct
+#undef iswspace
+#undef iswupper
+#undef iswxdigit
+#undef iswctype
+#undef wctype
+#undef towlower
+#undef towupper
+#undef towctrans
+#undef wctrans
+
+#endif  // __cplusplus
+
+#endif  // _LIBCPP_WCTYPE_H