--- Libc/Libc-1725.40.4/include/runetype.h
+++ Libc/Libc-583/include/runetype.h
@@ -39,18 +39,36 @@
 #ifndef	_RUNETYPE_H_
 #define	_RUNETYPE_H_
 
-#include <_bounds.h>
 #include <_types.h>
-
-_LIBC_SINGLE_BY_DEFAULT()
 
 #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) */
 
@@ -64,12 +82,12 @@
 	__darwin_rune_t	__min;		/* First rune of the range */
 	__darwin_rune_t	__max;		/* Last rune (inclusive) of the range */
 	__darwin_rune_t	__map;		/* What first maps to in maps */
-	__uint32_t *_LIBC_UNSAFE_INDEXABLE	__types;	/* Array of types in range */
+	__uint32_t	*__types;	/* Array of types in range */
 } _RuneEntry;
 
 typedef struct {
 	int		__nranges;	/* Number of ranges stored */
-	_RuneEntry *_LIBC_COUNT(__nranges)	__ranges;	/* Pointer to the ranges */
+	_RuneEntry	*__ranges;	/* Pointer to the ranges */
 } _RuneRange;
 
 typedef struct {
@@ -81,9 +99,9 @@
 	char		__magic[8];	/* Magic saying what version we are */
 	char		__encoding[32];	/* ASCII name of this encoding */
 
-	__darwin_rune_t	(*__sgetrune)(const char *_LIBC_COUNT(__n) __string, __darwin_size_t __n, char const *_LIBC_UNSAFE_INDEXABLE /* NULL or within bounds of __string */ *);
-	int		(*__sputrune)(__darwin_rune_t, char *_LIBC_COUNT(__n) __string, __darwin_size_t __n, char *_LIBC_UNSAFE_INDEXABLE /* NULL or within bounds of __string */ *);
-	__darwin_rune_t	__invalid_rune;	/* Deprecated */
+	__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;
 
 	__uint32_t	__runetype[_CACHED_RUNES];
 	__darwin_rune_t	__maplower[_CACHED_RUNES];
@@ -98,14 +116,14 @@
 	_RuneRange	__maplower_ext;
 	_RuneRange	__mapupper_ext;
 
-	void *_LIBC_SIZE(__variable_len)	__variable;	/* Data which depends on the encoding */
+	void		*__variable;	/* Data which depends on the encoding */
 	int		__variable_len;	/* how long that data is */
 
 	/*
 	 * extra fields to deal with arbitrary character classes
 	 */
 	int		__ncharclasses;
-	_RuneCharClass *_LIBC_COUNT(__ncharclasses)	__charclasses;
+	_RuneCharClass	*__charclasses;
 } _RuneLocale;
 
 #define	_RUNE_MAGIC_A	"RuneMagA"	/* Indicates version A of RuneLocale */