--- Libc/Libc-997.1.1/include/stddef.h
+++ Libc/Libc-583/include/stddef.h
@@ -62,47 +62,59 @@
 
 #if !defined(__need_wchar_t) && !defined(__need_size_t) \
     && !defined(__need_ptrdiff_t) && !defined(__need_NULL) \
-    && !defined(__need_wint_t) && !defined(__need_rsize_t)
+    && !defined(__need_wint_t)
 #define __STDDEF_H__
 #endif /* none of __need_* defined */
 
 #include <_types.h>
 
 #if defined(__STDDEF_H__) || defined(__need_ptrdiff_t)
-#include <sys/_types/_ptrdiff_t.h>
+#ifndef _PTRDIFF_T
+#define _PTRDIFF_T
+typedef	__darwin_ptrdiff_t	ptrdiff_t;
+#endif /* _PTRDIFF_T */
 #endif /* __STDDEF_H__ || __need_ptrdiff_t */
 
 #if defined(__STDDEF_H__) || defined(__need_size_t)
+#ifndef	_SIZE_T
+#define	_SIZE_T
 /* DO NOT REMOVE THIS COMMENT: fixincludes needs to see:
  * _GCC_SIZE_T */
-#include <sys/_types/_size_t.h>
+typedef	__darwin_size_t		size_t;
+#endif /* _SIZE_T */
 #endif /* __STDDEF_H__ || __need_size_t */
 
-#if (defined(__STDDEF_H__) && defined(__STDC_WANT_LIB_EXT1__) && __STDC_WANT_LIB_EXT1__ >= 1) || defined(__need_rsize_t)
-#include <sys/_types/_rsize_t.h>
-#endif /* (__STDDEF_H__ && __STDC_WANT_LIB_EXT1__ >= 1) || __need_rsize_t */
-
 #if defined(__STDDEF_H__) || defined(__need_wchar_t)
-#include <sys/_types/_wchar_t.h>
+#ifndef	__cplusplus
+#ifndef	_WCHAR_T
+#define	_WCHAR_T
+typedef	__darwin_wchar_t	wchar_t;
+#endif	/* _WCHAR_T */
+#endif	/* __cplusplus */
 #endif /* __STDDEF_H__ || __need_wchar_t */
 
 #if (defined(__STDDEF_H__) && !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))) \
     || defined(__need_wint_t)
-#include <sys/_types/_wint_t.h>
+#ifndef	_WINT_T
+#define	_WINT_T
+typedef	__darwin_wint_t		wint_t;
+#endif	/* _WINT_T */
 #endif /* __STDDEF_H__ && !_ANSI_SOURCE && (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) || __need_wchar_t */
 
 #if defined(__STDDEF_H__) || defined(__need_NULL)
-#include <sys/_types/_null.h>
+#ifndef NULL
+#define NULL __DARWIN_NULL
+#endif /* ! NULL */
 #endif /* __STDDEF_H__ || __need_NULL */
 
 #ifdef __STDDEF_H__
 #if defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 5 || __GNUC__ > 3)
-#ifndef __offsetof	/* Deprecated: for source compatibility only */
+#ifndef __offsetof	/* Deprecated: for source compatability only */
 #define __offsetof(type, field) __builtin_offsetof(type, field)
 #endif
 #define offsetof(type, field) __builtin_offsetof(type, field)
 #else /* ! (gcc >= 3.5) */
-#ifndef __offsetof	/* Deprecated: for source compatibility only */
+#ifndef __offsetof	/* Deprecated: for source compatability only */
 #define __offsetof(type, field) ((size_t)(&((type *)0)->field))
 #endif
 #define offsetof(type, field) ((size_t)(&((type *)0)->field))