--- Libc/Libc-763.13/include/Makefile.inc
+++ Libc/Libc-391.4.3/include/Makefile.inc
@@ -1,17 +1,14 @@
 .include "${.CURDIR}/include/arpa/Makefile.inc"
 .include "${.CURDIR}/include/libkern/Makefile.inc"
 .include "${.CURDIR}/include/protocols/Makefile.inc"
+.include "${.CURDIR}/include/machine/Makefile.inc"
 .include "${.CURDIR}/include/malloc/Makefile.inc"
-.ifdef FEATURE_LEGACY_NXZONE_APIS
 .include "${.CURDIR}/include/objc/Makefile.inc"
-.endif
-.include "${.CURDIR}/include/secure/Makefile.inc"
 .include "${.CURDIR}/include/sys/Makefile.inc"
 .include "${.CURDIR}/include/xlocale/Makefile.inc"
 
 INC_INSTHDRS += NSSystemDirectories.h \
 		_locale.h \
-		_structs.h \
 		_types.h \
 		_wctype.h \
 		_xlocale.h \
@@ -22,6 +19,7 @@
 		assert.h \
 		asm.h \
 		bitstring.h \
+		c.h \
 		cpio.h \
 		crt_externs.h \
 		ctype.h \
@@ -31,6 +29,7 @@
 		err.h \
 		errno.h \
 		fcntl.h \
+		float.h \
 		fmtmsg.h \
 		fnmatch.h \
 		fsproperties.h \
@@ -42,6 +41,7 @@
 		grp.h \
 		inttypes.h \
 		iso646.h \
+		kvm.h \
 		langinfo.h \
 		libc.h \
 		libgen.h \
@@ -60,19 +60,19 @@
 		ranlib.h \
 		readpassphrase.h \
 		regex.h \
+		rune.h \
 		runetype.h \
 		search.h \
 		semaphore.h \
 		setjmp.h \
 		sgtty.h \
 		signal.h \
-		spawn.h \
 		stab.h \
 		standards.h \
+		stdarg.h \
 		stdbool.h \
 		stddef.h \
 		stdio.h \
-		stdint.h \
 		stdlib.h \
 		strhash.h \
 		string.h \
@@ -91,36 +91,23 @@
 		unistd.h \
 		util.h \
 		utime.h \
-		utmpx.h \
+		utmp.h \
+		varargs.h \
 		vis.h \
 		wchar.h \
 		wctype.h \
 		wordexp.h \
 		xlocale.h
 
-.ifdef FEATURE_LEGACY_RUNE_APIS
-INC_INSTHDRS += rune.h
-.endif
-
-.ifdef FEATURE_LEGACY_UTMP_APIS
-INC_INSTHDRS += utmp.h
-.endif
-
 .PATH: ${.CURDIR}/include
-CWD := ${.CURDIR}/include
-
 MAN3 += sysexits.3
 
 INC_INSTHDRS := ${INC_INSTHDRS:S/^/${.CURDIR}\/include\//}
 INSTHDRS += ${INC_INSTHDRS}
 
-LOCALHDRS += ${.CURDIR}/include/spawn_private.h
+STRIP_HDRS += ctype.h
 
 .include "Makefile.nbsd_begin"
 NBSDHDRS = utmpx.h
 .include "Makefile.nbsd_end"
-
-.include "Makefile.fbsd_begin"
-FBSDHDRS= nl_types.h
-.include "Makefile.fbsd_end"
-
+INSTHDRS_AUTOPATCH += utmpx.h