--- Libc/Libc-1725.40.4/include/dirent.h
+++ Libc/Libc-825.26/include/dirent.h
@@ -61,14 +61,10 @@
 /*
  * The kernel defines the format of directory entries
  */
-#include <_bounds.h>
 #include <_types.h>
 #include <sys/dirent.h>
 #include <sys/cdefs.h>
 #include <Availability.h>
-#include <sys/_pthread/_pthread_types.h> /* __darwin_pthread_mutex_t */
-
-_LIBC_SINGLE_BY_DEFAULT()
 
 struct _telldir;		/* forward reference */
 
@@ -77,10 +73,10 @@
 	int	__dd_fd;	/* file descriptor associated with directory */
 	long	__dd_loc;	/* offset in current buffer */
 	long	__dd_size;	/* amount of data returned */
-	char *_LIBC_COUNT(__dd_len)	__dd_buf; /* data buffer */
+	char	*__dd_buf;	/* data buffer */
 	int	__dd_len;	/* size of data buffer */
 	long	__dd_seek;	/* magic cookie returned */
-	__unused long	__padding; /* (__dd_rewind space left for bincompat) */
+	long	__dd_rewind;	/* magic cookie for rewinding */
 	int	__dd_flags;	/* flags for readdir */
 	__darwin_pthread_mutex_t __dd_lock; /* for thread locking */
 	struct _telldir *__dd_td; /* telldir position recording */
@@ -96,8 +92,6 @@
 #define DTF_NODUP	0x0002	/* don't return duplicate names */
 #define DTF_REWIND	0x0004	/* rewind after reading union stack */
 #define __DTF_READALL	0x0008	/* everything has been read */
-#define __DTF_SKIPREAD  0x0010  /* assume internal buffer is populated */
-#define __DTF_ATEND     0x0020  /* there's nothing more to read in the kernel */
 
 #endif /* __DARWIN_C_LEVEL >= __DARWIN_C_FULL */
 
@@ -167,17 +161,6 @@
 
 #if __DARWIN_C_LEVEL >= 200809L
 __BEGIN_DECLS
-
-//Begin-Libc
-#ifndef LIBC_ALIAS_OPENDIR
-//End-Libc
-__OSX_AVAILABLE_STARTING(__MAC_10_10, __IPHONE_8_0)
-DIR *fdopendir(int) __DARWIN_ALIAS_I(fdopendir);
-//Begin-Libc
-#else /* LIBC_ALIAS_OPENDIR */
-DIR *fdopendir(int) LIBC_ALIAS_I(fdopendir);
-#endif /* !LIBC_ALIAS_OPENDIR */
-//End-Libc
 
 int alphasort(const struct dirent **, const struct dirent **) __DARWIN_INODE64(alphasort);
 
@@ -200,16 +183,8 @@
 int scandir(const char *, struct dirent ***,
     int (*)(const struct dirent *), int (*)(const struct dirent **, const struct dirent **)) __DARWIN_INODE64(scandir);
 #ifdef __BLOCKS__
-#if __has_attribute(noescape)
-#define __scandir_noescape __attribute__((__noescape__))
-#else
-#define __scandir_noescape
-#endif
-
 int scandir_b(const char *, struct dirent ***,
-    int (^)(const struct dirent *) __scandir_noescape,
-    int (^)(const struct dirent **, const struct dirent **) __scandir_noescape)
-    __DARWIN_INODE64(scandir_b) __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2);
+    int (^)(const struct dirent *), int (^)(const struct dirent **, const struct dirent **)) __DARWIN_INODE64(scandir_b) __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2);
 #endif /* __BLOCKS__ */
 
 __END_DECLS
@@ -219,7 +194,7 @@
 #if __DARWIN_C_LEVEL >= __DARWIN_C_FULL
 __BEGIN_DECLS
 
-int getdirentries(int, char *_LIBC_COUNT(__nbytes), int __nbytes, long *)
+int getdirentries(int, char *, int, long *)
 
 //Begin-Libc
 #ifndef __LIBC__