--- Libc/Libc-262.3.2/include/Makefile.inc
+++ Libc/Libc-498/include/Makefile.inc
@@ -1,70 +1,117 @@
+.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 \
-               ar.h \
-               asm.h \
-               bitstring.h \
-               c.h \
-               crt_externs.h \
-               ctype.h \
-               db.h \
-               dirent.h \
-               disktab.h \
-               err.h \
-               errno.h \
-               fcntl.h \
-               fnmatch.h \
-               fsproperties.h \
-               fstab.h \
-               fts.h \
-               glob.h \
-               grp.h \
-               kvm.h \
-               libc.h \
-               libgen.h \
-               limits.h \
-               locale.h \
-               memory.h \
-               monitor.h \
-               mpool.h \
-               ndbm.h \
-               netdb.h \
-               nlist.h \
-               paths.h \
-               pwd.h \
-               ranlib.h \
-               regex.h \
-               regexp.h \
-               rune.h \
-               runetype.h \
-               semaphore.h \
-               setjmp.h \
-               sgtty.h \
-               signal.h \
-               stab.h \
-               standards.h \
-               stddef.h \
-               stdio.h \
-               stdlib.h \
-               string.h \
-               strings.h \
-               struct.h \
-               sysexits.h \
-               syslog.h \
-               tar.h \
-               termios.h \
-               time.h \
-               ttyent.h \
-               tzfile.h \
-               ucontext.h \
-               ulimit.h \
-               unistd.h \
-               util.h \
-               utime.h \
-               utmp.h \
-               vis.h \
+		_locale.h \
+		_structs.h \
+		_types.h \
+		_wctype.h \
+		_xlocale.h \
+		aio.h \
+		alloca.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 \
+		float.h \
+		fmtmsg.h \
+		fnmatch.h \
+		fsproperties.h \
+		fstab.h \
+		fts.h \
+		ftw.h \
+		getopt.h \
+		glob.h \
+		grp.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 \
+		nl_types.h \
+		nlist.h \
+		paths.h \
+		poll.h \
+		pwd.h \
+		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 \
+		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 \
+		ucontext.h \
+		ulimit.h \
+		unistd.h \
+		util.h \
+		utime.h \
+		utmp.h \
+		utmpx.h \
+		varargs.h \
+		vis.h \
+		wchar.h \
+		wctype.h \
+		wordexp.h \
+		xlocale.h
+
+.PATH: ${.CURDIR}/include
+MAN3 += sysexits.3
 
 INC_INSTHDRS := ${INC_INSTHDRS:S/^/${.CURDIR}\/include\//}
 INSTHDRS += ${INC_INSTHDRS}
+
+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"