1 files changed, 21 insertions, 0 deletions
diff --git a/contrib/libstdc++/include/c/std_cwchar.h b/contrib/libstdc++/include/c/std_cwchar.h
index f9dfbadb..d06f5e4 100644
--- a/contrib/libstdc++/include/c/std_cwchar.h
+++ b/contrib/libstdc++/include/c/std_cwchar.h
@@ -36,6 +36,27 @@
 
 #pragma GCC system_header
 
+#include <bits/c++config.h>
+#include <cstddef>
+#include <ctime>
+
+#if _GLIBCPP_HAVE_WCHAR_H
 #include_next <wchar.h>
+#endif
+
+// Need to do a bit of trickery here with mbstate_t as char_traits
+// assumes it is in wchar.h, regardless of wchar_t specializations.
+#ifndef _GLIBCPP_HAVE_MBSTATE_T
+namespace std
+{
+  extern "C" 
+  {
+    typedef struct 
+    {
+      int __fill[6];
+    } mbstate_t;
+  }
+}
+#endif
 
 #endif