--- Libc/Libc-1725.40.4/xcodescripts/headers.sh
+++ Libc/Libc-1583.60.2/xcodescripts/headers.sh
@@ -50,29 +50,12 @@
 )
 
 INC_INSTHDRS=(
-	___wctype.h
 	__wctype.h
-	__xlocale.h
-	_abort.h
-	_assert.h
-	_bounds.h
 	_ctype.h
-	_inttypes.h
-	_langinfo.h
 	_locale.h
-	_locale_posix2008.h
-	_mb_cur_max.h
-	_monetary.h
-	_printf.h
 	_regex.h
-	_static_assert.h
 	_stdio.h
-	_stdlib.h
-	_string.h
-	_strings.h
-	_time.h
 	_types.h
-	_wchar.h
 	_wctype.h
 	_xlocale.h
 	_ctermid.h
@@ -173,11 +156,7 @@
 
 if [ "x${FEATURE_THERM_NOTIFICATION_APIS}" == "x1" ]; then
 	INC_THERM_INSTHDRS=( OSThermalNotification.h )
-	if [ "${PLATFORM_NAME}" == "macosx" ]; then
-		THERM_INSTHDRS=( "${INC_THERM_INSTHDRS[@]/#/${SRCROOT}/include/libkern/}" )
-	else
-		THERM_LOCALHDRS=( "${INC_THERM_INSTHDRS[@]/#/${SRCROOT}/include/libkern/}" )
-	fi
+	THERM_INSTHDRS=( "${INC_THERM_INSTHDRS[@]/#/${SRCROOT}/include/libkern/}" )
 fi
 
 INC_PROTO_INSTHDRS=( routed.h rwhod.h talkd.h timed.h )
@@ -189,7 +168,7 @@
 SYS_INSTHDRS=( ${SRCROOT}/include/sys/acl.h ${SRCROOT}/include/sys/statvfs.h )
 
 INC_XLOCALE_INSTHDRS=(
-	___wctype.h
+	__wctype.h
 	_ctype.h
 	_inttypes.h
 	_langinfo.h
@@ -205,14 +184,17 @@
 XLOCALE_INSTHDRS=( "${INC_XLOCALE_INSTHDRS[@]/#/${SRCROOT}/include/xlocale/}" )
 
 MODULEMAPS=(
+	${SRCROOT}/include/_types.modulemap
+	${SRCROOT}/include/darwin_c_xlocale.modulemap
+	${SRCROOT}/include/secure.modulemap
 )
 
 PRIV_MODULEMAPS=(
+	${SRCROOT}/osprivate_os_assumes.modulemap
 )
 
 TYPES_INSTHDRS=(
 	${SRCROOT}/include/_types/_intmax_t.h
-	${SRCROOT}/include/_types/_locale_t.h
 	${SRCROOT}/include/_types/_nl_item.h
 	${SRCROOT}/include/_types/_uint16_t.h
 	${SRCROOT}/include/_types/_uint32_t.h
@@ -225,7 +207,6 @@
 
 LOCALHDRS=(
 	${SRCROOT}/darwin/libc_private.h
-	${SRCROOT}/darwin/libc_hooks.h
 	${SRCROOT}/gen/utmpx_thread.h
 	${SRCROOT}/nls/FreeBSD/msgcat.h
 	${SRCROOT}/gen/thread_stack_pcs.h
@@ -263,25 +244,11 @@
 UNIFDEFARGS="${UNIFDEFARGS} -U_USE_EXTENDED_LOCALES_"
 
 INC_INSTHDRS=(
-	___wctype.h
 	__wctype.h
-	_abort.h
-	_assert.h
-	_bounds.h
 	_ctype.h
-	_inttypes.h
 	_locale.h
-	_locale_posix2008.h
-	_mb_cur_max.h
-	_printf.h
-	_static_assert.h
 	_stdio.h
-	_stdlib.h
-	_string.h
-	_strings.h
-	_time.h
 	_types.h
-	_wchar.h
 	_wctype.h
 	alloca.h
 	assert.h
@@ -303,7 +270,6 @@
 
 TYPES_INSTHDRS=(
 	${SRCROOT}/include/_types/_intmax_t.h
-	${SRCROOT}/include/_types/_locale_t.h
 	${SRCROOT}/include/_types/_uint16_t.h
 	${SRCROOT}/include/_types/_uint32_t.h
 	${SRCROOT}/include/_types/_uint64_t.h
@@ -362,10 +328,6 @@
 if [ -n "${LOCALHDRS}" ]; then
 ${MKDIR} ${LOCINCDIR}
 ${INSTALL} -m ${INSTALLMODE} ${LOCALHDRS[@]} ${LOCINCDIR}
-fi
-if [ -n "${THERM_LOCALHDRS}" ]; then
-${MKDIR} ${LOCINCDIR}/libkern
-${INSTALL} -m ${INSTALLMODE} ${THERM_LOCALHDRS[@]} ${LOCINCDIR}/libkern
 fi
 if [ -n "${OS_LOCALHDRS}" ]; then
 ${MKDIR} ${LOCINCDIR}/os