--- Libc/Libc-1725.40.4/include/search.h
+++ Libc/Libc-583/include/search.h
@@ -10,14 +10,15 @@
 #define _SEARCH_H_
 
 #include <sys/cdefs.h>
-#include <_bounds.h>
 #include <_types.h>
-#include <sys/_types/_size_t.h>
 
-_LIBC_SINGLE_BY_DEFAULT()
+#ifndef _SIZE_T
+#define _SIZE_T
+typedef __darwin_size_t	size_t;
+#endif
 
 typedef	struct entry {
-	char *_LIBC_CSTR	key;
+	char	*key;
 	void	*data;
 } ENTRY;
 
@@ -34,7 +35,7 @@
 
 #ifdef _SEARCH_PRIVATE
 typedef	struct node {
-	char *_LIBC_CSTR	key;
+	char         *key;
 	struct node  *llink, *rlink;
 } node_t;
 
@@ -49,9 +50,9 @@
 void	 hdestroy(void);
 ENTRY	*hsearch(ENTRY, ACTION);
 void	 insque(void *, void *);
-void	*lfind(const void *, const void *_LIBC_UNSAFE_INDEXABLE, size_t *, size_t,
+void	*lfind(const void *, const void *, size_t *, size_t,
 	    int (*)(const void *, const void *));
-void	*lsearch(const void *, void *, size_t *_LIBC_UNSAFE_INDEXABLE, size_t,
+void	*lsearch(const void *, void *, size_t *, size_t,
 	    int (*)(const void *, const void *));
 void	 remque(void *);
 void	*tdelete(const void * __restrict, void ** __restrict,