--- Libc/Libc-1725.40.4/include/search.h
+++ Libc/Libc-320.1.3/include/search.h
@@ -1,3 +1,25 @@
+/*
+ * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
 /*-
  * Written by J.T. Conklin <jtc@netbsd.org>
  * Public domain.
@@ -10,14 +32,10 @@
 #define _SEARCH_H_
 
 #include <sys/cdefs.h>
-#include <_bounds.h>
-#include <_types.h>
-#include <sys/_types/_size_t.h>
-
-_LIBC_SINGLE_BY_DEFAULT()
+#include <sys/types.h>
 
 typedef	struct entry {
-	char *_LIBC_CSTR	key;
+	char	*key;
 	void	*data;
 } ENTRY;
 
@@ -34,7 +52,7 @@
 
 #ifdef _SEARCH_PRIVATE
 typedef	struct node {
-	char *_LIBC_CSTR	key;
+	char         *key;
 	struct node  *llink, *rlink;
 } node_t;
 
@@ -49,9 +67,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,