--- Libc/Libc-391/include/Makefile.inc
+++ Libc/Libc-583/include/Makefile.inc
@@ -1,14 +1,17 @@
 .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 \
@@ -19,7 +22,6 @@
 		assert.h \
 		asm.h \
 		bitstring.h \
-		c.h \
 		cpio.h \
 		crt_externs.h \
 		ctype.h \
@@ -41,7 +43,6 @@
 		grp.h \
 		inttypes.h \
 		iso646.h \
-		kvm.h \
 		langinfo.h \
 		libc.h \
 		libgen.h \
@@ -60,13 +61,13 @@
 		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 \
@@ -91,7 +92,7 @@
 		unistd.h \
 		util.h \
 		utime.h \
-		utmp.h \
+		utmpx.h \
 		varargs.h \
 		vis.h \
 		wchar.h \
@@ -99,15 +100,24 @@
 		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}
 
-STRIP_HDRS += ctype.h
+LOCALHDRS += ${.CURDIR}/include/spawn_private.h
 
 .include "Makefile.nbsd_begin"
 NBSDHDRS = utmpx.h
 .include "Makefile.nbsd_end"
-INSTHDRS_AUTOPATCH += utmpx.h