--- Libc/Libc-997.1.1/xcodescripts/headers.sh
+++ Libc/Libc-825.24/xcodescripts/headers.sh
@@ -38,19 +38,20 @@
 INSTALLMODE=$([[ `id -u` -eq 0 ]] && echo 444 || echo 644)
 
 INSTHDRS=(
+	${SRCROOT}/darwin/libproc.h
 	${SRCROOT}/gen/get_compat.h
 	${SRCROOT}/gen/execinfo.h
 )
 
 INC_INSTHDRS=(
 	NSSystemDirectories.h _locale.h _structs.h _types.h _wctype.h _xlocale.h aio.h alloca.h \
-	ar.h assert.h asm.h bitstring.h cpio.h crt_externs.h ctype.h db.h dirent.h disktab.h err.h \
+	ar.h asl.h assert.h asm.h bitstring.h cpio.h crt_externs.h ctype.h db.h dirent.h disktab.h err.h \
 	errno.h fcntl.h fmtmsg.h fnmatch.h fsproperties.h fstab.h fts.h ftw.h getopt.h glob.h inttypes.h \
 	iso646.h langinfo.h libc.h libgen.h limits.h locale.h memory.h monetary.h monitor.h mpool.h ndbm.h \
-	nlist.h paths.h printf.h poll.h ranlib.h readpassphrase.h regex.h runetype.h search.h \
-	semaphore.h sgtty.h signal.h stab.h standards.h stdbool.h stddef.h stdio.h stdint.h \
+	nlist.h paths.h poll.h ranlib.h readpassphrase.h regex.h runetype.h search.h \
+	semaphore.h setjmp.h sgtty.h signal.h spawn.h stab.h standards.h stdbool.h stddef.h stdio.h stdint.h \
 	stdlib.h strhash.h string.h stringlist.h strings.h struct.h sysexits.h syslog.h tar.h termios.h time.h \
-	timeconv.h ttyent.h ulimit.h unistd.h util.h utime.h vis.h wchar.h wctype.h \
+	timeconv.h ttyent.h ucontext.h ulimit.h unistd.h util.h utime.h vis.h wchar.h wctype.h \
 	wordexp.h xlocale.h
 )
 if [ "x${FEATURE_LEGACY_RUNE_APIS}" == "x1" ]; then
@@ -66,15 +67,24 @@
 	${SRCROOT}/include/NetBSD/utmpx.h
 	${SRCROOT}/stdtime/FreeBSD/tzfile.h
 )
-INSTHDRS=( "${INSTHDRS[@]}" "${INC_INSTHDRS[@]}" )
+INC_PTHREADHDRS=(
+	${SRCROOT}/pthreads/pthread.h 
+	${SRCROOT}/pthreads/pthread_spis.h 
+	${SRCROOT}/pthreads/pthread_impl.h 
+	${SRCROOT}/pthreads/sched.h
+)
+INSTHDRS=( "${INSTHDRS[@]}" "${INC_INSTHDRS[@]}" "${INC_PTHREADHDRS[@]}" )
 
-INC_ARPA_INSTHDRS=( ftp.h inet.h nameser_compat.h telnet.h tftp.h )
+INC_ARPA_INSTHDRS=( ftp.h nameser_compat.h telnet.h tftp.h )
 ARPA_INSTHDRS=( "${INC_ARPA_INSTHDRS[@]/#/${SRCROOT}/include/arpa/}" )
 
+INC_LIBKERN_INSTHDRS=( OSAtomic.h OSCacheControl.h )
 if [ "x${FEATURE_MEM_THERM_NOTIFICATION_APIS}" == "x1" ]; then
-	INC_LIBKERN_INSTHDRS=( OSMemoryNotification.h OSThermalNotification.h )
-	LIBKERN_INSTHDRS=( "${INC_LIBKERN_INSTHDRS[@]/#/${SRCROOT}/include/libkern/}" )
+	INC_LIBKERN_INSTHDRS+=( OSMemoryNotification.h OSThermalNotification.h )
 fi
+LIBKERN_INSTHDRS=( "${INC_LIBKERN_INSTHDRS[@]/#/${SRCROOT}/include/libkern/}" )
+
+MALLOC_INSTHDRS=( ${SRCROOT}/include/malloc/malloc.h )
 
 INC_PROTO_INSTHDRS=(routed.h rwhod.h talkd.h timed.h )
 PROTO_INSTHDRS=( "${INC_PROTO_INSTHDRS[@]/#/${SRCROOT}/include/protocols/}" )
@@ -90,29 +100,30 @@
 )
 XLOCALE_INSTHDRS=( "${INC_XLOCALE_INSTHDRS[@]/#/${SRCROOT}/include/xlocale/}" )
 
-TYPES_INSTHDRS=(
-	${SRCROOT}/include/_types/_intmax_t.h
-	${SRCROOT}/include/_types/_nl_item.h
-	${SRCROOT}/include/_types/_uint16_t.h
-	${SRCROOT}/include/_types/_uint32_t.h
-	${SRCROOT}/include/_types/_uint64_t.h
-	${SRCROOT}/include/_types/_uint8_t.h
-	${SRCROOT}/include/_types/_uintmax_t.h
-	${SRCROOT}/include/_types/_wctrans_t.h
-	${SRCROOT}/include/_types/_wctype_t.h
-)
-
 LOCALHDRS=(
 	${SRCROOT}/darwin/dirhelper.defs
 	${SRCROOT}/darwin/dirhelper_priv.h
-	${SRCROOT}/gen/assumes.h
+	${SRCROOT}/darwin/libproc.h
+	${SRCROOT}/darwin/libproc_internal.h
+	${SRCROOT}/gen/asl_core.h 
+	${SRCROOT}/gen/asl_file.h 
+	${SRCROOT}/gen/asl_ipc.defs 
+	${SRCROOT}/gen/asl_legacy1.h 
+	${SRCROOT}/gen/asl_msg.h 
+	${SRCROOT}/gen/asl_private.h 
+	${SRCROOT}/gen/asl_store.h 
+	${SRCROOT}/gen/assumes.h 
+	${SRCROOT}/gen/_simple.h 
+	${SRCROOT}/gen/stack_logging.h 
 	${SRCROOT}/gen/utmpx_thread.h
+	${SRCROOT}/include/spawn_private.h
 	${SRCROOT}/nls/FreeBSD/msgcat.h
+	${SRCROOT}/pthreads/pthread_workqueue.h
 )
 
-OS_LOCALHDRS=( ${SRCROOT}/os/assumes.h ${SRCROOT}/os/base.h ${SRCROOT}/os/trace.h )
-
 PRIV_INSTHDRS=(
+	${SRCROOT}/gen/stack_logging.h
+	${SRCROOT}/pthreads/pthread_machdep.h
 	${SRCROOT}/stdlib/FreeBSD/atexit.h
 )
 
@@ -121,7 +132,7 @@
 	${SRCROOT}/db/btree/FreeBSD/bt_extern.h
 )
 
-SYS_INSTHDRS=( ${SRCROOT}/include/sys/acl.h ${SRCROOT}/include/sys/rbtree.h ${SRCROOT}/include/sys/statvfs.h )
+SYS_INSTHDRS=( ${SRCROOT}/include/sys/acl.h ${SRCROOT}/include/sys/statvfs.h )
 PRIVUUID_INSTHDRS=( ${SRCROOT}/uuid/namespace.h )
 
 ${MKDIR} ${INCDIR}/arpa
@@ -131,21 +142,16 @@
 ${MKDIR} ${INCDIR}/secure
 ${MKDIR} ${INCDIR}/sys
 ${MKDIR} ${INCDIR}/xlocale
-${MKDIR} ${INCDIR}/_types
 ${INSTALL} -m ${INSTALLMODE} ${INSTHDRS[@]} ${INCDIR}
 ${INSTALL} -m ${INSTALLMODE} ${ARPA_INSTHDRS[@]} ${INCDIR}/arpa
-if [ "x${FEATURE_MEM_THERM_NOTIFICATION_APIS}" == "x1" ]; then
 ${INSTALL} -m ${INSTALLMODE} ${LIBKERN_INSTHDRS[@]} ${INCDIR}/libkern
-fi
+${INSTALL} -m ${INSTALLMODE} ${MALLOC_INSTHDRS[@]} ${INCDIR}/malloc
 ${INSTALL} -m ${INSTALLMODE} ${PROTO_INSTHDRS[@]} ${INCDIR}/protocols
 ${INSTALL} -m ${INSTALLMODE} ${SECURE_INSTHDRS[@]} ${INCDIR}/secure
 ${INSTALL} -m ${INSTALLMODE} ${SYS_INSTHDRS[@]} ${INCDIR}/sys
 ${INSTALL} -m ${INSTALLMODE} ${XLOCALE_INSTHDRS[@]} ${INCDIR}/xlocale
-${INSTALL} -m ${INSTALLMODE} ${TYPES_INSTHDRS[@]} ${INCDIR}/_types
 ${MKDIR} ${LOCINCDIR}
-${MKDIR} ${LOCINCDIR}/os
 ${INSTALL} -m ${INSTALLMODE} ${LOCALHDRS[@]} ${LOCINCDIR}
-${INSTALL} -m ${INSTALLMODE} ${OS_LOCALHDRS[@]} ${LOCINCDIR}/os
 ${MKDIR} ${PRIVHDRS}/btree
 ${MKDIR} ${PRIVHDRS}/machine
 ${MKDIR} ${PRIVHDRS}/uuid
@@ -164,7 +170,7 @@
 	${ED} - $i < ${SRCROOT}/xcodescripts/strip-header.ed &&
 	${CHMOD} u-w $i || exit 1;
 done
-for i in `${FIND} "${DSTROOT}" -name \*.h -print0 | ${XARGS} -0 ${FGREP} -l -e UNIFDEF -e OPEN_SOURCE`; do
+for i in `${FIND} "${DSTROOT}" -name \*.h -print0 | ${XARGS} -0 ${FGREP} -l UNIFDEF`; do
 	${CHMOD} u+w $i &&
 	${CP} $i $i.orig &&
 	${ECHO} ${UNIFDEF} ${UNIFDEFARGS} $i.orig \> $i &&