--- Libc/Libc-391/include/Makefile.inc
+++ Libc/Libc-498/include/Makefile.inc
@@ -1,14 +1,18 @@
+.ifnmake autopatch
 .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"
 .include "${.CURDIR}/include/objc/Makefile.inc"
+.include "${.CURDIR}/include/secure/Makefile.inc"
 .include "${.CURDIR}/include/sys/Makefile.inc"
 .include "${.CURDIR}/include/xlocale/Makefile.inc"
+.endif # !autopatch
 
 INC_INSTHDRS += NSSystemDirectories.h \
 		_locale.h \
+		_structs.h \
 		_types.h \
 		_wctype.h \
 		_xlocale.h \
@@ -19,7 +23,6 @@
 		assert.h \
 		asm.h \
 		bitstring.h \
-		c.h \
 		cpio.h \
 		crt_externs.h \
 		ctype.h \
@@ -41,7 +44,6 @@
 		grp.h \
 		inttypes.h \
 		iso646.h \
-		kvm.h \
 		langinfo.h \
 		libc.h \
 		libgen.h \
@@ -67,6 +69,7 @@
 		setjmp.h \
 		sgtty.h \
 		signal.h \
+		spawn.h \
 		stab.h \
 		standards.h \
 		stdarg.h \
@@ -92,6 +95,7 @@
 		util.h \
 		utime.h \
 		utmp.h \
+		utmpx.h \
 		varargs.h \
 		vis.h \
 		wchar.h \
@@ -105,9 +109,9 @@
 INC_INSTHDRS := ${INC_INSTHDRS:S/^/${.CURDIR}\/include\//}
 INSTHDRS += ${INC_INSTHDRS}
 
-STRIP_HDRS += ctype.h
+STRIP_HDRS += ctype.h dirent.h fnmatch.h fts.h ftw.h glob.h regex.h \
+	signal.h stdio.h stdlib.h string.h time.h unistd.h wchar.h xlocale.h
 
 .include "Makefile.nbsd_begin"
 NBSDHDRS = utmpx.h
 .include "Makefile.nbsd_end"
-INSTHDRS_AUTOPATCH += utmpx.h