--- Libc/Libc-1669.40.2/include/runetype.h
+++ Libc/Libc-498/include/runetype.h
@@ -43,11 +43,32 @@
 
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 
-#include <sys/_types/_size_t.h>
-#include <sys/_types/_ct_rune_t.h>
-#include <sys/_types/_rune_t.h>
-#include <sys/_types/_wchar_t.h>
-#include <sys/_types/_wint_t.h>
+#ifndef	_SIZE_T
+#define _SIZE_T
+typedef	__darwin_size_t		size_t;
+#endif
+
+#ifndef	_CT_RUNE_T
+#define _CT_RUNE_T
+typedef	__darwin_ct_rune_t	ct_rune_t;
+#endif
+
+#ifndef	_RUNE_T
+#define _RUNE_T
+typedef	__darwin_rune_t		rune_t;
+#endif
+
+#ifndef	__cplusplus
+#ifndef	_WCHAR_T
+#define	_WCHAR_T
+typedef	__darwin_wchar_t	wchar_t;
+#endif	/* _WCHAR_T */
+#endif	/* __cplusplus */
+
+#ifndef	_WINT_T
+#define _WINT_T
+typedef	__darwin_wint_t		wint_t;
+#endif
 
 #endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
 
@@ -80,7 +101,7 @@
 
 	__darwin_rune_t	(*__sgetrune)(const char *, __darwin_size_t, char const **);
 	int		(*__sputrune)(__darwin_rune_t, char *, __darwin_size_t, char **);
-	__darwin_rune_t	__invalid_rune;	/* Deprecated */
+	__darwin_rune_t	__invalid_rune;
 
 	__uint32_t	__runetype[_CACHED_RUNES];
 	__darwin_rune_t	__maplower[_CACHED_RUNES];