for some time now mandoc has not required MLINKS to function

correctly - logically complete that now by removing MLINKS from base;

authors need only to ensure there is an entry in NAME for any function/
util being added. MLINKS will still work, and remain for perl to ease
upgrades;

ok nicm (curses) bcook (ssl)
ok schwarze, who provided a lot of feedback and assistance
ok tb natano jung

19 files changed, 19 insertions, 557 deletions

diff --git a/lib/libc/asr/Makefile.inc b/lib/libc/asr/Makefile.inc
index 813ce2ed483..1816dd175a0 100644
--- a/lib/libc/asr/Makefile.inc
+++ b/lib/libc/asr/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.7 2014/03/26 18:13:15 eric Exp $
+#	$OpenBSD: Makefile.inc,v 1.8 2016/03/30 06:38:41 jmc Exp $
 
 # asr sources
 .PATH: ${LIBCSRCDIR}/asr
@@ -9,18 +9,3 @@ SRCS+=	asr.c asr_debug.c asr_utils.c \
 	getaddrinfo_async.c getnameinfo_async.c
 
 MAN+=	asr_run.3
-
-MLINKS+= \
-	asr_run.3	asr_run_sync.3		\
-	asr_run.3	asr_abort.3		\
-	asr_run.3	res_send_async.3	\
-	asr_run.3	res_query_async.3	\
-	asr_run.3	res_search_async.3	\
-	asr_run.3	getrrsetbyname_async.3	\
-	asr_run.3	gethostbyname_async.3	\
-	asr_run.3	gethostbyname2_async.3	\
-	asr_run.3	gethostbyaddr_async.3	\
-	asr_run.3	getnetbyname_async.3	\
-	asr_run.3	getnetbyaddr_async.3	\
-	asr_run.3	getaddrinfo_async.3	\
-	asr_run.3	getnameinfo_async.3
diff --git a/lib/libc/compat-43/Makefile.inc b/lib/libc/compat-43/Makefile.inc
index dc6901de44b..abdca33e8ba 100644
--- a/lib/libc/compat-43/Makefile.inc
+++ b/lib/libc/compat-43/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.8 2010/02/03 20:49:00 miod Exp $
+#	$OpenBSD: Makefile.inc,v 1.9 2016/03/30 06:38:41 jmc Exp $
 
 # compat-43 sources
 .PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/compat-43 ${LIBCSRCDIR}/compat-43
@@ -8,6 +8,3 @@ SRCS+=	creat.c getdtablesize.c gethostid.c getwd.c killpg.c sethostid.c \
 
 MAN+=	creat.3 getdtablesize.3 gethostid.3 killpg.3 \
 	sigblock.3 sigpause.3 sigsetmask.3 sigvec.3
-
-MLINKS+=gethostid.3 sethostid.3
-MLINKS+=sigblock.3 sigmask.3
diff --git a/lib/libc/crypt/Makefile.inc b/lib/libc/crypt/Makefile.inc
index bdca0bbf662..e9263b09fef 100644
--- a/lib/libc/crypt/Makefile.inc
+++ b/lib/libc/crypt/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.26 2014/12/08 20:46:04 tedu Exp $
+#	$OpenBSD: Makefile.inc,v 1.27 2016/03/30 06:38:41 jmc Exp $
 
 .PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/crypt ${LIBCSRCDIR}/crypt
 
@@ -6,10 +6,3 @@ SRCS+=	crypt.c cryptutil.c arc4random.c arc4random_uniform.c \
 	blowfish.c bcrypt.c
 
 MAN+=	crypt.3 crypt_checkpass.3 blowfish.3 arc4random.3
-MLINKS+=crypt.3 bcrypt_gensalt.3 crypt.3 bcrypt.3
-MLINKS+=crypt_checkpass.3 crypt_newhash.3
-MLINKS+=blowfish.3 blf_key.3 blowfish.3 blf_enc.3
-MLINKS+=blowfish.3 blf_dec.3 blowfish.3 blf_ecb_encrypt.3
-MLINKS+=blowfish.3 blf_ecb_decrypt.3 blowfish.3 blf_cbc_encrypt.3
-MLINKS+=blowfish.3 blf_cbc_decrypt.3
-MLINKS+=arc4random.3 arc4random_buf.3 arc4random.3 arc4random_uniform.3
diff --git a/lib/libc/db/Makefile.inc b/lib/libc/db/Makefile.inc
index a58c43db1de..f9cc7b65387 100644
--- a/lib/libc/db/Makefile.inc
+++ b/lib/libc/db/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.6 2015/10/17 21:48:42 guenther Exp $
+#	$OpenBSD: Makefile.inc,v 1.7 2016/03/30 06:38:41 jmc Exp $
 #
 .PATH: ${LIBCSRCDIR}/db/btree
 
@@ -18,13 +18,6 @@ SRCS+=	hash.c hash_bigkey.c hash_buf.c hash_func.c hash_log2.c \
 .PATH: ${LIBCSRCDIR}/db/man
 
 MAN+=	btree.3 dbm.3 dbopen.3 hash.3 ndbm.3 recno.3
-MLINKS+= dbopen.3 db.3
-MLINKS+= dbm.3 dbminit.3 dbm.3 dbmclose.3 dbm.3 fetch.3 dbm.3 store.3
-MLINKS+= dbm.3 delete.3 dbm.3 firstkey.3 dbm.3 nextkey.3
-MLINKS+= ndbm.3 dbm_clearerr.3 ndbm.3 dbm_close.3 ndbm.3 dbm_delete.3
-MLINKS+= ndbm.3 dbm_dirfno.3 ndbm.3 dbm_error.3 ndbm.3 dbm_fetch.3
-MLINKS+= ndbm.3 dbm_firstkey.3 ndbm.3 dbm_nextkey.3 ndbm.3 dbm_open.3
-MLINKS+= ndbm.3 dbm_pagfno.3 ndbm.3 dbm_rdonly.3 ndbm.3 dbm_store.3
 
 .PATH: ${LIBCSRCDIR}/db/mpool
 
diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc
index 53dab374ed0..b7a9d843be9 100644
--- a/lib/libc/gen/Makefile.inc
+++ b/lib/libc/gen/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.72 2015/11/18 19:33:43 tedu Exp $
+#	$OpenBSD: Makefile.inc,v 1.73 2016/03/30 06:38:41 jmc Exp $
 
 # gen sources
 .PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/gen ${LIBCSRCDIR}/gen
@@ -55,106 +55,3 @@ MAN+=	__tfork_thread.3 alarm.3 auth_subr.3 authenticate.3 basename.3 clock.3 \
 	sigsetops.3 sleep.3 statvfs.3 sysconf.3 sysctl.3 strtofflags.3 \
 	syslog.3 time.3 times.3 toascii.3 tolower.3 toupper.3 \
 	ttyname.3 ualarm.3 uname.3 unvis.3 usleep.3 utime.3 valloc.3 vis.3
-
-MLINKS+=__tfork_thread.3 __tfork.2
-MLINKS+=auth_subr.3 auth_open.3 auth_subr.3 auth_call.3 auth_subr.3 \
-	auth_challenge.3 auth_subr.3 auth_check_change.3 auth_subr.3 \
-	auth_check_expire.3 auth_subr.3 auth_clean.3 auth_subr.3 auth_close.3 \
-	auth_subr.3 auth_clrenv.3 auth_subr.3 auth_clroption.3 auth_subr.3 \
-	auth_clroptions.3 auth_subr.3 auth_getitem.3 auth_subr.3 auth_getpwd.3 \
-	auth_subr.3 auth_getstate.3 auth_subr.3 auth_getvalue.3 auth_subr.3 \
-	auth_set_va_list.3 auth_subr.3 auth_setdata.3 auth_subr.3 \
-	auth_setenv.3 auth_subr.3 auth_setitem.3 auth_subr.3 auth_setoption.3 \
-	auth_subr.3 auth_setpwd.3 auth_subr.3 auth_setstate.3 \
-	auth_subr.3 bsd_auth.3
-MLINKS+=authenticate.3 auth_approval.3 authenticate.3 auth_cat.3 \
-	authenticate.3 auth_checknologin.3 authenticate.3 auth_mkvalue.3 \
-	authenticate.3 auth_userchallenge.3 authenticate.3 auth_usercheck.3 \
-	authenticate.3 auth_userokay.3 authenticate.3 auth_userresponse.3 \
-	authenticate.3 auth_verify.3
-MLINKS+=directory.3 closedir.3 directory.3 dirfd.3 directory.3 opendir.3 \
-	directory.3 readdir.3 directory.3 rewinddir.3 directory.3 seekdir.3 \
-	directory.3 telldir.3 directory.3 readdir_r.3 directory.3 fdopendir.3
-MLINKS+=err.3 verr.3 err.3 errx.3 err.3 verrx.3 err.3 warn.3 err.3 vwarn.3 \
-	err.3 warnx.3 err.3 vwarnx.3 \
-	err.3 errc.3 err.3 verrc.3 err.3 warnc.3 err.3 vwarnc.3
-MLINKS+=exec.3 execl.3 exec.3 execle.3 exec.3 execlp.3 exec.3 execv.3 \
-	exec.3 execvp.3 exec.3 execvpe.3
-MLINKS+=fabs.3 fabsf.3 fabs.3 fabsl.3
-MLINKS+=fpclassify.3 finite.3 fpclassify.3 finitef.3 fpclassify.3 isfinite.3 \
-	fpclassify.3 isinf.3 fpclassify.3 isinff.3 fpclassify.3 isnan.3 \
-	fpclassify.3 isnanf.3 fpclassify.3 isnormal.3 fpclassify.3 signbit.3
-MLINKS+=fpgetmask.3 fpgetround.3 fpgetmask.3 fpgetsticky.3 \
-	fpgetmask.3 fpsetmask.3 fpgetmask.3 fpsetround.3 \
-	fpgetmask.3 fpsetsticky.3
-MLINKS+=frexp.3 frexpf.3 frexp.3 frexpl.3
-MLINKS+=fts.3 fts_open.3 fts.3 fts_read.3 fts.3 fts_children.3 \
-	fts.3 fts_set.3 fts.3 fts_close.3
-MLINKS+=ftw.3 nftw.3
-MLINKS+=getcap.3 cgetcap.3 getcap.3 cgetclose.3 getcap.3 cgetent.3 \
-	getcap.3 cgetfirst.3 getcap.3 cgetmatch.3 getcap.3 cgetnext.3 \
-	getcap.3 cgetnum.3 getcap.3 cgetset.3 getcap.3 cgetstr.3 \
-	getcap.3 cgetustr.3 getcap.3 cgetusedb.3
-MLINKS+=getcwd.3 getwd.3
-MLINKS+=getdomainname.3 setdomainname.3
-MLINKS+=getfsent.3 endfsent.3 getfsent.3 getfsfile.3 getfsent.3 getfsspec.3 \
-	getfsent.3 setfsent.3
-MLINKS+=getgrent.3 endgrent.3 getgrent.3 setgroupent.3 getgrent.3 getgrgid.3 \
-	getgrent.3 getgrnam.3 getgrent.3 setgrent.3 \
-	getgrent.3 getgrgid_r.3 getgrent.3 getgrnam_r.3
-MLINKS+=gethostname.3 sethostname.3
-MLINKS+=getnetgrent.3 endnetgrent.3 getnetgrent.3 innetgr.3 \
-	getnetgrent.3 setnetgrent.3
-MLINKS+=getprogname.3 setprogname.3
-MLINKS+=getpwent.3 endpwent.3 getpwent.3 setpwent.3
-MLINKS+=getpwnam.3 getpwuid.3 getpwnam.3 getpwnam_r.3 getpwnam.3 getpwuid_r.3 \
-	getpwnam.3 setpassent.3
-MLINKS+=getpwnam.3 getpwnam_shadow.3 getpwnam.3 getpwuid_shadow.3
-MLINKS+=getttyent.3 endttyent.3 getttyent.3 getttynam.3 getttyent.3 setttyent.3
-MLINKS+=getusershell.3 endusershell.3 getusershell.3 setusershell.3
-MLINKS+=glob.3 globfree.3
-MLINKS+=isgreater.3 isgreaterequal.3 isgreater.3 isless.3 isgreater.3 \
-	islessequal.3 isgreater.3 islessgreater.3 isgreater.3 isunordered.3
-MLINKS+=ldexp.3 ldexpf.3 ldexp.3 ldexpl.3
-MLINKS+=login_cap.3 login_getclass.3 login_cap.3 login_getstyle.3 login_cap.3 \
-	login_getcapbool.3 login_cap.3 login_getcapnum.3 login_cap.3 \
-	login_getcapsize.3 login_cap.3 login_getcapstr.3 login_cap.3 \
-	login_getcaptime.3 login_cap.3 login_close.3 login_cap.3 \
-	secure_path.3 login_cap.3 setclasscontext.3 login_cap.3 setusercontext.3
-MLINKS+=modf.3 modff.3 modf.3 modfl.3
-MLINKS+=popen.3 pclose.3
-MLINKS+=posix_spawn.3 posix_spawnp.3 \
-	posix_spawnattr_init.3 posix_spawnattr_destroy.3 \
-	posix_spawnattr_getpgroup.3 posix_spawnattr_setsigmask.3 \
-	posix_spawnattr_getpgroup.3 posix_spawnattr_setsigdefault.3 \
-	posix_spawnattr_getpgroup.3 posix_spawnattr_setschedpolicy.3 \
-	posix_spawnattr_getpgroup.3 posix_spawnattr_setschedparam.3 \
-	posix_spawnattr_getpgroup.3 posix_spawnattr_setpgroup.3 \
-	posix_spawnattr_getpgroup.3 posix_spawnattr_getschedparam.3 \
-	posix_spawnattr_getpgroup.3 posix_spawnattr_getschedpolicy.3 \
-	posix_spawnattr_getpgroup.3 posix_spawnattr_getsigdefault.3 \
-	posix_spawnattr_getpgroup.3 posix_spawnattr_getsigmask.3 \
-	posix_spawnattr_getflags.3 posix_spawnattr_setflags.3 \
-	posix_spawn_file_actions_init.3 posix_spawn_file_actions_destroy.3 \
-	posix_spawn_file_actions_addopen.3 posix_spawn_file_actions_adddup2.3 \
-	posix_spawn_file_actions_addopen.3 posix_spawn_file_actions_addclose.3
-MLINKS+=psignal.3 sys_siglist.3 psignal.3 sys_signame.3
-MLINKS+=pwcache.3 user_from_uid.3 pwcache.3 group_from_gid.3
-MLINKS+=scandir.3 alphasort.3
-MLINKS+=setjmp.3 _longjmp.3 setjmp.3 _setjmp.3 setjmp.3 longjmp.3 \
-	setjmp.3 longjmperror.3 setjmp.3 sigsetjmp.3 setjmp.3 siglongjmp.3
-MLINKS+=setmode.3 getmode.3
-MLINKS+=shm_open.3 shm_unlink.3 shm_open.3 shm_mkstemp.3
-MLINKS+=sigsetops.3 sigemptyset.3 sigsetops.3 sigfillset.3 \
-	sigsetops.3 sigaddset.3 sigsetops.3 sigdelset.3 \
-	sigsetops.3 sigismember.3
-MLINKS+=statvfs.3 fstatvfs.3
-MLINKS+=strtofflags.3 fflagstostr.3
-MLINKS+=syslog.3 closelog.3 syslog.3 openlog.3 syslog.3 setlogmask.3 \
-	syslog.3 vsyslog.3 syslog.3 syslog_r.3 syslog.3 closelog_r.3 \
-	syslog.3 openlog_r.3 syslog.3 setlogmask_r.3 syslog.3 vsyslog_r.3
-MLINKS+=tolower.3 _tolower.3
-MLINKS+=toupper.3 _toupper.3
-MLINKS+=ttyname.3 ttyname_r.3 ttyname.3 isatty.3 ttyname.3 ttyslot.3
-MLINKS+=unvis.3 strunvis.3 unvis.3 strnunvis.3
-MLINKS+=vis.3 strvis.3 vis.3 strnvis.3 vis.3 strvisx.3 vis.3 stravis.3
diff --git a/lib/libc/gmon/Makefile.inc b/lib/libc/gmon/Makefile.inc
index 7190de5d11c..7ba36bc84d6 100644
--- a/lib/libc/gmon/Makefile.inc
+++ b/lib/libc/gmon/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.5 2012/08/22 22:54:44 pascal Exp $
+#	$OpenBSD: Makefile.inc,v 1.6 2016/03/30 06:38:41 jmc Exp $
 
 # gmon sources
 .PATH: ${LIBCSRCDIR}/gmon
@@ -6,8 +6,6 @@
 SRCS+=	gmon.c mcount.c
 MAN+=	moncontrol.3
 
-MLINKS+=moncontrol.3 monstartup.3
-
 # mcount cannot be compiled with profiling or pie
 mcount.po:
 	@echo "${COMPILE.c} ${NOPIE_FLAGS} ${.IMPSRC} -o ${.TARGET}"
diff --git a/lib/libc/hash/Makefile.inc b/lib/libc/hash/Makefile.inc
index 58a30e30ff1..56444ea5997 100644
--- a/lib/libc/hash/Makefile.inc
+++ b/lib/libc/hash/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.22 2014/12/08 21:29:49 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.23 2016/03/30 06:38:41 jmc Exp $
 
 # hash functions
 .PATH: ${LIBCSRCDIR}/hash
@@ -7,30 +7,6 @@ HELPER=	md5hl.c rmd160hl.c sha1hl.c sha224hl.c sha256hl.c sha384hl.c sha512hl.c
 SRCS+=	md5.c rmd160.c sha1.c sha2.c ${HELPER} siphash.c
 MAN+=	md5.3 rmd160.3 sha1.3 sha2.3 SipHash24.3
 
-MLINKS+=md5.3 MD5Transform.3 md5.3 MD5Init.3 md5.3 MD5Final.3
-MLINKS+=md5.3 MD5Update.3    md5.3 MD5End.3  md5.3 MD5File.3
-MLINKS+=md5.3 MD5FileChunk.3 md5.3 MD5Pad.3  md5.3 MD5Data.3
-MLINKS+=rmd160.3 RMD160Transform.3 rmd160.3 RMD160Init.3 rmd160.3 RMD160Final.3
-MLINKS+=rmd160.3 RMD160Update.3    rmd160.3 RMD160End.3  rmd160.3 RMD160File.3
-MLINKS+=rmd160.3 RMD160FileChunk.3 rmd160.3 RMD160Pad.3  rmd160.3 RMD160Data.3
-MLINKS+=sha1.3 SHA1Transform.3 sha1.3 SHA1Init.3 sha1.3 SHA1Final.3
-MLINKS+=sha1.3 SHA1Update.3    sha1.3 SHA1End.3  sha1.3 SHA1File.3
-MLINKS+=sha1.3 SHA1FileChunk.3 sha1.3 SHA1Pad.3  sha1.3 SHA1Data.3
-MLINKS+=sha2.3 SHA224Init.3  sha2.3 SHA224Update.3    sha2.3 SHA224Pad.3
-MLINKS+=sha2.3 SHA224Final.3 sha2.3 SHA224Transform.3 sha2.3 SHA224End.3
-MLINKS+=sha2.3 SHA224File.3  sha2.3 SHA224FileChunk.3 sha2.3 SHA224Data.3
-MLINKS+=sha2.3 SHA256Init.3  sha2.3 SHA256Update.3    sha2.3 SHA256Pad.3
-MLINKS+=sha2.3 SHA256Final.3 sha2.3 SHA256Transform.3 sha2.3 SHA256End.3
-MLINKS+=sha2.3 SHA256File.3  sha2.3 SHA256FileChunk.3 sha2.3 SHA256Data.3
-MLINKS+=sha2.3 SHA384Init.3  sha2.3 SHA384Update.3    sha2.3 SHA384Pad.3
-MLINKS+=sha2.3 SHA384Final.3 sha2.3 SHA384Transform.3 sha2.3 SHA384End.3
-MLINKS+=sha2.3 SHA384File.3  sha2.3 SHA384FileChunk.3 sha2.3 SHA384Data.3
-MLINKS+=sha2.3 SHA512Init.3  sha2.3 SHA512Update.3    sha2.3 SHA512Pad.3
-MLINKS+=sha2.3 SHA512Final.3 sha2.3 SHA512Transform.3 sha2.3 SHA512End.3
-MLINKS+=sha2.3 SHA512File.3  sha2.3 SHA512FileChunk.3 sha2.3 SHA512Data.3
-MLINKS+=SipHash24.3 SipHash24_Init.3 SipHash24.3 SipHash24_Update.3
-MLINKS+=SipHash24.3 SipHash24_End.3 SipHash24.3 SipHash24_Final.3
-
 CLEANFILES+= ${HELPER}
 
 md5hl.c:	helper.c
diff --git a/lib/libc/locale/Makefile.inc b/lib/libc/locale/Makefile.inc
index 8c347ad9b25..75902fcc605 100644
--- a/lib/libc/locale/Makefile.inc
+++ b/lib/libc/locale/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.21 2016/03/20 15:42:35 jca Exp $
+#	$OpenBSD: Makefile.inc,v 1.22 2016/03/30 06:38:41 jmc Exp $
 
 # locale sources
 .PATH: ${LIBCSRCDIR}/locale
@@ -16,27 +16,5 @@ MAN+=	nl_langinfo.3 setlocale.3 iswalnum.3 towlower.3 \
 	mbstowcs.3 mbtowc.3 wcrtomb.3 wcsrtombs.3 wcstod.3 wcstol.3 \
 	wcstombs.3 wctob.3 wctomb.3 \
 	wctype.3 iswctype.3 wctrans.3 towctrans.3 wcwidth.3
-MLINKS+=setlocale.3 localeconv.3 \
-	iswalnum.3 iswalpha.3 \
-	iswalnum.3 iswblank.3 \
-	iswalnum.3 iswcntrl.3 \
-	iswalnum.3 iswdigit.3 \
-	iswalnum.3 iswgraph.3 \
-	iswalnum.3 iswlower.3 \
-	iswalnum.3 iswprint.3 \
-	iswalnum.3 iswpunct.3 \
-	iswalnum.3 iswspace.3 \
-	iswalnum.3 iswupper.3 \
-	iswalnum.3 iswxdigit.3 \
-	towlower.3 towupper.3 \
-	wcstod.3 wcstof.3 \
-	wcstod.3 wcstold.3 \
-	wcstol.3 wcstoul.3 \
-	wcstol.3 wcstoll.3 \
-	wcstol.3 wcstoull.3 \
-	wcstol.3 wcstoimax.3 \
-	wcstol.3 wcstoumax.3 \
-	mbsrtowcs.3 mbsnrtowcs.3 \
-	wcsrtombs.3 wcsnrtombs.3
 
 CFLAGS+=-I${.CURDIR} -I${LIBCSRCDIR}/citrus
diff --git a/lib/libc/net/Makefile.inc b/lib/libc/net/Makefile.inc
index 55a928cd3b1..b78cd6be852 100644
--- a/lib/libc/net/Makefile.inc
+++ b/lib/libc/net/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.58 2015/09/11 09:54:00 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.59 2016/03/30 06:38:41 jmc Exp $
 
 # net sources
 .PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/net ${LIBCSRCDIR}/net
@@ -34,56 +34,3 @@ MAN+=	byteorder.3 ethers.3 gai_strerror.3 getaddrinfo.3 gethostbyname.3 \
 	inet_addr.3 inet_lnaof.3 inet_net.3 inet_ntop.3 \
 	inet6_opt_init.3 inet6_rth_space.3 link_ntoa.3 \
 	rcmd.3 rcmdsh.3 resolver.3 sockatmark.3
-
-MLINKS+=byteorder.3 htobe16.3 byteorder.3 htobe32.3 byteorder.3 htobe64.3 \
-	byteorder.3 be16toh.3 byteorder.3 be32toh.3 byteorder.3 be64toh.3 \
-	byteorder.3 betoh16.3 byteorder.3 betoh32.3 byteorder.3 betoh64.3 \
-	byteorder.3 htole16.3 byteorder.3 htole32.3 byteorder.3 htole64.3 \
-	byteorder.3 le16toh.3 byteorder.3 le32toh.3 byteorder.3 le64toh.3 \
-	byteorder.3 letoh16.3 byteorder.3 letoh32.3 byteorder.3 letoh64.3 \
-	byteorder.3 swap16.3 byteorder.3 swap32.3 byteorder.3 swap64.3
-MLINKS+=ethers.3 ether_aton.3 ethers.3 ether_hostton.3 ethers.3 ether_line.3 \
-	ethers.3 ether_ntoa.3 ethers.3 ether_ntohost.3
-MLINKS+=getaddrinfo.3 freeaddrinfo.3
-MLINKS+=gethostbyname.3 endhostent.3 gethostbyname.3 gethostbyaddr.3 \
-	gethostbyname.3 sethostent.3 gethostbyname.3 gethostent.3 \
-	gethostbyname.3 herror.3 gethostbyname.3 gethostbyname2.3 \
-	gethostbyname.3 hstrerror.3
-MLINKS+=getifaddrs.3 freeifaddrs.3
-MLINKS+=getnetent.3 endnetent.3 getnetent.3 getnetbyaddr.3 \
-	getnetent.3 getnetbyname.3 getnetent.3 setnetent.3
-MLINKS+=getprotoent.3 endprotoent.3 getprotoent.3 getprotobyname.3 \
-	getprotoent.3 getprotobynumber.3 getprotoent.3 setprotoent.3 \
-	getprotoent.3 getprotoent_r.3 getprotoent.3 getprotobyname_r.3 \
-	getprotoent.3 getprotobynumber_r.3 getprotoent.3 setprotoent_r.3 \
-	getprotoent.3 endprotoent_r.3
-MLINKS+=getservent.3 endservent.3 getservent.3 getservbyname.3 \
-	getservent.3 getservbyport.3 getservent.3 setservent.3 \
-	getservent.3 getservent_r.3 getservent.3 getservbyname_r.3 \
-	getservent.3 getservbyport_r.3 getservent.3 setservent_r.3 \
-	getservent.3 endservent_r.3
-MLINKS+=htonl.3 htons.3 htonl.3 ntohl.3 htonl.3 ntohs.3
-MLINKS+= if_indextoname.3 if_nametoindex.3 if_indextoname.3 if_nameindex.3 \
-	if_indextoname.3 if_freenameindex.3
-MLINKS+=inet_addr.3 inet_aton.3 inet_addr.3 inet_network.3 \
-	inet_addr.3 inet_ntoa.3
-MLINKS+=inet_lnaof.3 inet_makeaddr.3 inet_lnaof.3 inet_netof.3
-MLINKS+=inet_ntop.3 inet_pton.3
-MLINKS+=inet_net.3 inet_net_ntop.3 inet_net.3 inet_net_pton.3
-MLINKS+=rcmd.3 iruserok.3 rcmd.3 rresvport.3 rcmd.3 ruserok.3 \
-	rcmd.3 rresvport_af.3 rcmd.3 rcmd_af.3 rcmd.3 iruserok_sa.3
-MLINKS+=resolver.3 dn_comp.3 resolver.3 dn_expand.3 resolver.3 res_init.3 \
-	resolver.3 res_mkquery.3 resolver.3 res_send.3 resolver.3 res_query.3 \
-	resolver.3 res_search.3
-MLINKS+=getrrsetbyname.3 freerrset.3
-MLINKS+=inet6_opt_init.3 inet6_opt_append.3 \
-	inet6_opt_init.3 inet6_opt_finish.3 \
-	inet6_opt_init.3 inet6_opt_set_val.3 \
-	inet6_opt_init.3 inet6_opt_next.3 \
-	inet6_opt_init.3 inet6_opt_find.3 \
-	inet6_opt_init.3 inet6_opt_get_val.3
-MLINKS+=inet6_rth_space.3 inet6_rth_init.3 \
-	inet6_rth_space.3 inet6_rth_add.3 \
-	inet6_rth_space.3 inet6_rth_reverse.3 \
-	inet6_rth_space.3 inet6_rth_segments.3 \
-	inet6_rth_space.3 inet6_rth_getaddr.3 \
diff --git a/lib/libc/regex/Makefile.inc b/lib/libc/regex/Makefile.inc
index 6f9b7733340..af55a88a8ec 100644
--- a/lib/libc/regex/Makefile.inc
+++ b/lib/libc/regex/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.7 2010/11/21 00:02:30 tedu Exp $
+#	$OpenBSD: Makefile.inc,v 1.8 2016/03/30 06:38:41 jmc Exp $
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
 
 # regex sources
@@ -7,5 +7,3 @@
 SRCS+=	regcomp.c regerror.c regexec.c regfree.c
 
 MAN+=	regex.3 re_format.7
-
-MLINKS+=regex.3 regcomp.3 regex.3 regexec.3 regex.3 regerror.3 regex.3 regfree.3
diff --git a/lib/libc/rpc/Makefile.inc b/lib/libc/rpc/Makefile.inc
index eec9de6f3fe..940fa4157aa 100644
--- a/lib/libc/rpc/Makefile.inc
+++ b/lib/libc/rpc/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.17 2015/09/11 12:39:46 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.18 2016/03/30 06:38:41 jmc Exp $
 
 # librpc sources
 .PATH:	${LIBCSRCDIR}/arch/${MACHINE}/rpc ${LIBCSRCDIR}/rpc
@@ -13,113 +13,3 @@ SRCS+=	auth_none.c auth_unix.c  authunix_prot.c bindresvport.c \
 	xdr_rec.c xdr_reference.c xdr_stdio.c
 
 MAN+=	authnone_create.3 bindresvport.3 getrpcent.3 getrpcport.3 rpc.3 xdr.3
-MLINKS+=	authnone_create.3 auth_destroy.3 \
-		authnone_create.3 authunix_create.3 \
-		authnone_create.3 authunix_create_default.3 \
-		authnone_create.3 set_rpc_maxgrouplist.3 \
-		bindresvport.3 bindresvport_sa.3 \
-		getrpcent.3 getrpcbyname.3 \
-		getrpcent.3 getrpcbynumber.3 \
-		getrpcent.3 endrpcent.3 \
-		getrpcent.3 setrpcent.3 \
-		rpc.3 callrpc.3 \
-		rpc.3 clnt_broadcast.3 \
-		rpc.3 clnt_call.3 \
-		rpc.3 clnt_control.3 \
-		rpc.3 clnt_create.3 \
-		rpc.3 clnt_destroy.3 \
-		rpc.3 clnt_freeres.3 \
-		rpc.3 clnt_geterr.3 \
-		rpc.3 clnt_pcreateerror.3 \
-		rpc.3 clnt_perrno.3 \
-		rpc.3 clnt_perror.3 \
-		rpc.3 clnt_spcreateerror.3 \
-		rpc.3 clnt_sperrno.3 \
-		rpc.3 clnt_sperror.3 \
-		rpc.3 clntraw_create.3 \
-		rpc.3 clnttcp_create.3 \
-		rpc.3 clntudp_bufcreate.3 \
-		rpc.3 clntudp_create.3 \
-		rpc.3 get_myaddress.3 \
-		rpc.3 pmap_getmaps.3 \
-		rpc.3 pmap_getport.3 \
-		rpc.3 pmap_rmtcall.3 \
-		rpc.3 pmap_set.3 \
-		rpc.3 pmap_unset.3 \
-		rpc.3 registerrpc.3 \
-		rpc.3 rpc_createerr.3 \
-		rpc.3 svc_destroy.3 \
-		rpc.3 svc_fds.3 \
-		rpc.3 svc_fdset.3 \
-		rpc.3 svc_freeargs.3 \
-		rpc.3 svc_getargs.3 \
-		rpc.3 svc_getcaller.3 \
-		rpc.3 svc_getreq.3 \
-		rpc.3 svc_getreq_common.3 \
-		rpc.3 svc_getreq_poll.3 \
-		rpc.3 svc_getreqset.3 \
-		rpc.3 svc_getreqset2.3 \
-		rpc.3 svc_max_pollfd.3 \
-		rpc.3 svc_pollfd.3 \
-		rpc.3 svc_register.3 \
-		rpc.3 svc_run.3 \
-		rpc.3 svc_sendreply.3 \
-		rpc.3 svc_unregister.3 \
-		rpc.3 svcerr_auth.3 \
-		rpc.3 svcerr_decode.3 \
-		rpc.3 svcerr_noproc.3 \
-		rpc.3 svcerr_noprog.3 \
-		rpc.3 svcerr_progvers.3 \
-		rpc.3 svcerr_systemerr.3 \
-		rpc.3 svcerr_weakauth.3 \
-		rpc.3 svcfd_create.3 \
-		rpc.3 svcraw_create.3 \
-		rpc.3 svctcp_create.3 \
-		rpc.3 svcudp_bufcreate.3 \
-		rpc.3 svcudp_create.3 \
-		rpc.3 xdr_accepted_reply.3 \
-		rpc.3 xdr_authunix_parms.3 \
-		rpc.3 xdr_callhdr.3 \
-		rpc.3 xdr_callmsg.3 \
-		rpc.3 xdr_opaque_auth.3 \
-		rpc.3 xdr_pmap.3 \
-		rpc.3 xdr_pmaplist.3 \
-		rpc.3 xdr_rejected_reply.3 \
-		rpc.3 xdr_replymsg.3 \
-		rpc.3 xprt_register.3 \
-		rpc.3 xprt_unregister.3 \
-		xdr.3 xdr_array.3 \
-		xdr.3 xdr_bool.3 \
-		xdr.3 xdr_bytes.3 \
-		xdr.3 xdr_char.3 \
-		xdr.3 xdr_destroy.3 \
-		xdr.3 xdr_double.3 \
-		xdr.3 xdr_enum.3 \
-		xdr.3 xdr_float.3 \
-		xdr.3 xdr_free.3 \
-		xdr.3 xdr_getpos.3 \
-		xdr.3 xdr_inline.3 \
-		xdr.3 xdr_int.3 \
-		xdr.3 xdr_long.3 \
-		xdr.3 xdr_int64_t.3 \
-		xdr.3 xdr_u_int64_t.3 \
-		xdr.3 xdrmem_create.3 \
-		xdr.3 xdr_opaque.3 \
-		xdr.3 xdr_pointer.3 \
-		xdr.3 xdrrec_create.3 \
-		xdr.3 xdrrec_endofrecord.3 \
-		xdr.3 xdrrec_eof.3 \
-		xdr.3 xdrrec_skiprecord.3 \
-		xdr.3 xdr_reference.3 \
-		xdr.3 xdr_setpos.3 \
-		xdr.3 xdr_short.3 \
-		xdr.3 xdrstdio_create.3 \
-		xdr.3 xdr_string.3 \
-		xdr.3 xdr_u_char.3 \
-		xdr.3 xdr_u_int.3 \
-		xdr.3 xdr_u_long.3 \
-		xdr.3 xdr_u_short.3 \
-		xdr.3 xdr_union.3 \
-		xdr.3 xdr_vector.3 \
-		xdr.3 xdr_void.3 \
-		xdr.3 xdr_wrapstring.3
diff --git a/lib/libc/stdio/Makefile.inc b/lib/libc/stdio/Makefile.inc
index f000047f00a..00ae1b2c2b6 100644
--- a/lib/libc/stdio/Makefile.inc
+++ b/lib/libc/stdio/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.28 2015/01/12 20:58:07 millert Exp $
+#	$OpenBSD: Makefile.inc,v 1.29 2016/03/30 06:38:41 jmc Exp $
 
 # stdio sources
 .PATH: ${LIBCSRCDIR}/stdio
@@ -26,36 +26,3 @@ MAN+=	fclose.3 ferror.3 fflush.3 fgetln.3 fgets.3 fgetwln.3 fmemopen.3 \
 	open_memstream.3 perror.3 printf.3 putc.3 remove.3 scanf.3 setbuf.3 \
 	setvbuf.3 stdio.3 tmpnam.3 ungetc.3 fgetws.3 fputws.3 fwide.3 getwc.3 \
 	putwc.3 ungetwc.3 wprintf.3 wscanf.3 getdelim.3
-
-MLINKS+=ferror.3 clearerr.3 ferror.3 feof.3 ferror.3 fileno.3
-MLINKS+=fflush.3 fpurge.3
-MLINKS+=fopen.3 fdopen.3 fopen.3 freopen.3
-MLINKS+=fputs.3 puts.3
-MLINKS+=fread.3 fwrite.3
-MLINKS+=fseek.3 fgetpos.3 fseek.3 fsetpos.3 fseek.3 ftell.3 fseek.3 rewind.3
-MLINKS+=fseek.3 fseeko.3 fseek.3 ftello.3
-MLINKS+=funopen.3 fropen.3 funopen.3 fwopen.3
-MLINKS+=getc.3 fgetc.3 getc.3 getchar.3 getc.3 getw.3
-MLINKS+=getdelim.3 getline.3
-MLINKS+=mktemp.3 mkstemp.3
-MLINKS+=mktemp.3 mkdtemp.3
-MLINKS+=mktemp.3 mkstemps.3
-MLINKS+=mktemp.3 mkostemp.3
-MLINKS+=mktemp.3 mkostemps.3
-MLINKS+=open_memstream.3 open_wmemstream.3
-MLINKS+=printf.3 fprintf.3 printf.3 snprintf.3 printf.3 sprintf.3 \
-	printf.3 vfprintf.3 printf.3 vprintf.3 printf.3 vsnprintf.3 \
-	printf.3 vsprintf.3 printf.3 asprintf.3 printf.3 vasprintf.3 \
-	printf.3 dprintf.3 printf.3 vdprintf.3
-MLINKS+=putc.3 fputc.3 putc.3 putchar.3 putc.3 putw.3
-MLINKS+=scanf.3 fscanf.3 scanf.3 sscanf.3 scanf.3 vfscanf.3 scanf.3 vscanf.3 \
-	scanf.3 vsscanf.3
-MLINKS+=setbuf.3 setbuffer.3 setbuf.3 setlinebuf.3
-MLINKS+=tmpnam.3 tempnam.3 tmpnam.3 tmpfile.3
-MLINKS+=wprintf.3 fwprintf.3 wprintf.3 swprintf.3 wprintf.3 vwprintf.3 \
-	wprintf.3 vfwprintf.3 wprintf.3 vswprintf.3
-MLINKS+=wscanf.3 fwscanf.3 wscanf.3 swscanf.3 wscanf.3 vfwscanf.3 wscanf.3 \
-	vswscanf.3 wscanf.3 vwscanf.3
-
-MLINKS+=getwc.3 fgetwc.3 getwc.3 getwchar.3
-MLINKS+=putwc.3 fputwc.3 putwc.3 putwchar.3
diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc
index fdc194b8c00..d3a0a835776 100644
--- a/lib/libc/stdlib/Makefile.inc
+++ b/lib/libc/stdlib/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.58 2015/11/18 16:50:08 tedu Exp $
+#	$OpenBSD: Makefile.inc,v 1.59 2016/03/30 06:38:41 jmc Exp $
 
 # stdlib sources
 .PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/stdlib ${LIBCSRCDIR}/stdlib
@@ -31,31 +31,3 @@ MAN+=	a64l.3 abort.3 abs.3 alloca.3 atexit.3 atof.3 atoi.3 atol.3 atoll.3 \
 	lldiv.3 lsearch.3 malloc.3 posix_memalign.3 posix_openpt.3 ptsname.3 \
 	qabs.3 qdiv.3 qsort.3 radixsort.3 rand48.3 rand.3 random.3 realpath.3 \
 	strtod.3 strtonum.3 strtol.3 strtoul.3 system.3 tsearch.3
-
-MLINKS+=ecvt.3 fcvt.3 ecvt.3 gcvt.3
-MLINKS+=getenv.3 setenv.3 getenv.3 unsetenv.3 getenv.3 putenv.3
-MLINKS+=getopt_long.3 getopt_long_only.3
-MLINKS+=hcreate.3 hdestroy.3 hcreate.3 hsearch.3
-MLINKS+=insque.3 remque.3
-MLINKS+=labs.3 llabs.3
-MLINKS+=lsearch.3 lfind.3
-MLINKS+=malloc.3 free.3 malloc.3 realloc.3 malloc.3 calloc.3
-MLINKS+=malloc.3 reallocarray.3
-MLINKS+=qsort.3 heapsort.3 qsort.3 mergesort.3
-MLINKS+=radixsort.3 sradixsort.3
-MLINKS+=rand.3 srand.3 rand.3 rand_r.3 rand.3 srand_deterministic.3
-MLINKS+=random.3 initstate.3 random.3 setstate.3
-MLINKS+=random.3 srandom.3 random.3 srandomdev.3 random.3 srandom_deterministic.3
-MLINKS+=rand48.3 drand48.3 rand48.3 erand48.3 rand48.3 lrand48.3
-MLINKS+=rand48.3 mrand48.3 rand48.3 nrand48.3 rand48.3 jrand48.3
-MLINKS+=rand48.3 srand48.3 rand48.3 srand48_deterministic.3
-MLINKS+=rand48.3 seed48.3 rand48.3 seed48_deterministic.3
-MLINKS+=rand48.3 lcong48.3 rand48.3 lcong48_deterministic.3
-MLINKS+=ptsname.3 grantpt.3 ptsname.3 unlockpt.3
-MLINKS+=strtod.3 strtof.3 strtod.3 strtold.3
-MLINKS+=strtol.3 strtoll.3 strtol.3 strtoq.3 strtol.3 strtoimax.3
-MLINKS+=strtoul.3 strtoull.3 strtoul.3 strtouq.3 strtoul.3 strtoumax.3
-MLINKS+=tsearch.3 tfind.3
-MLINKS+=tsearch.3 tdelete.3
-MLINKS+=tsearch.3 twalk.3
-MLINKS+=a64l.3 l64a.3
diff --git a/lib/libc/string/Makefile.inc b/lib/libc/string/Makefile.inc
index ec45da2463b..95eb93006b8 100644
--- a/lib/libc/string/Makefile.inc
+++ b/lib/libc/string/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.37 2014/12/09 07:28:46 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.38 2016/03/30 06:38:41 jmc Exp $
 
 # string sources
 .PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/string ${LIBCSRCDIR}/string
@@ -33,23 +33,3 @@ MAN+=	bcmp.3 bcopy.3 bzero.3 ffs.3 memccpy.3 memchr.3 \
 	wcscspn.3 wcsdup.3 wcslcpy.3 wcslen.3 wcspbrk.3 wcsrchr.3 wcsspn.3 \
 	wcsstr.3 wcstok.3 wcswidth.3 wmemchr.3 wmemcmp.3 wmemcpy.3 wmemmove.3 \
 	wmemset.3
-
-MLINKS+=bzero.3 explicit_bzero.3
-MLINKS+=memchr.3 memrchr.3
-MLINKS+=stpcpy.3 stpncpy.3
-MLINKS+=strchr.3 index.3
-MLINKS+=strrchr.3 rindex.3
-MLINKS+=strcasecmp.3 strncasecmp.3
-MLINKS+=strcmp.3 strncmp.3
-MLINKS+=strdup.3 strndup.3
-MLINKS+=strlcpy.3 strlcat.3
-MLINKS+=strlen.3 strnlen.3
-MLINKS+=strstr.3 strcasestr.3
-MLINKS+=strtok.3 strtok_r.3
-MLINKS+=strerror.3 strerror_r.3
-MLINKS+=timingsafe_bcmp.3 timingsafe_memcmp.3
-MLINKS+=wcscasecmp.3 wcsncasecmp.3
-MLINKS+=wcscat.3 wcsncat.3
-MLINKS+=wcscmp.3 wcsncmp.3
-MLINKS+=wcscpy.3 wcsncpy.3
-MLINKS+=wcslcpy.3 wcslcat.3
diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc
index 19dc9667548..b7feb186eb0 100644
--- a/lib/libc/sys/Makefile.inc
+++ b/lib/libc/sys/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.138 2016/03/21 22:41:28 bluhm Exp $
+#	$OpenBSD: Makefile.inc,v 1.139 2016/03/30 06:38:42 jmc Exp $
 #	$NetBSD: Makefile.inc,v 1.35 1995/10/16 23:49:07 jtc Exp $
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/17/93
 
@@ -169,77 +169,3 @@ MAN+=	__get_tcb.2 __thrsigdivert.2 __thrsleep.2 _exit.2 accept.2 \
 	socketpair.2 stat.2 statfs.2 swapctl.2 symlink.2 \
 	sync.2 sysarch.2 syscall.2 thrkill.2 truncate.2 umask.2 unlink.2 \
 	utimes.2 utrace.2 vfork.2 wait.2 write.2
-
-MLINKS+=__get_tcb.2 __set_tcb.2
-MLINKS+=__thrsleep.2 __thrwakeup.2
-MLINKS+=_exit.2 _Exit.2
-MLINKS+=accept.2 accept4.2
-MLINKS+=access.2 faccessat.2
-MLINKS+=brk.2 sbrk.2
-MLINKS+=chdir.2 fchdir.2
-MLINKS+=chflags.2 chflagsat.2 chflags.2 fchflags.2
-MLINKS+=chmod.2 fchmod.2 chmod.2 fchmodat.2
-MLINKS+=chown.2 fchown.2 chown.2 fchownat.2 chown.2 lchown.2
-MLINKS+=clock_gettime.2 clock_getres.2
-MLINKS+=clock_gettime.2 clock_settime.2
-MLINKS+=dup.2 dup2.2
-MLINKS+=dup.2 dup3.2
-MLINKS+=fhopen.2 fhstat.2 fhopen.2 fhstatfs.2
-MLINKS+=fsync.2 fdatasync.2
-MLINKS+=getgid.2 getegid.2
-MLINKS+=getitimer.2 setitimer.2
-MLINKS+=getitimer.2 timeradd.3
-MLINKS+=getitimer.2 timerclear.3
-MLINKS+=getitimer.2 timercmp.3
-MLINKS+=getitimer.2 timerisset.3
-MLINKS+=getitimer.2 timersub.3
-MLINKS+=getlogin.2 getlogin_r.2 getlogin.2 setlogin.2
-MLINKS+=getpgrp.2 getpgid.2
-MLINKS+=getpid.2 getppid.2
-MLINKS+=getpriority.2 setpriority.2
-MLINKS+=getrlimit.2 setrlimit.2
-MLINKS+=getrtable.2 setrtable.2
-MLINKS+=getsockopt.2 setsockopt.2
-MLINKS+=gettimeofday.2 settimeofday.2
-MLINKS+=getuid.2 geteuid.2
-MLINKS+=intro.2 errno.2
-MLINKS+=kqueue.2 kevent.2 kqueue.2 EV_SET.2
-MLINKS+=link.2 linkat.2
-MLINKS+=madvise.2 posix_madvise.2
-MLINKS+=mkdir.2 mkdirat.2
-MLINKS+=mkfifo.2 mkfifoat.2
-MLINKS+=mknod.2 mknodat.2
-MLINKS+=mlock.2 munlock.2
-MLINKS+=mlockall.2 munlockall.2
-MLINKS+=mount.2 unmount.2
-MLINKS+=open.2 openat.2
-MLINKS+=pathconf.2 fpathconf.2
-MLINKS+=pipe.2 pipe2.2
-MLINKS+=poll.2 ppoll.2
-MLINKS+=read.2 readv.2 read.2 pread.2 read.2 preadv.2
-MLINKS+=readlink.2 readlinkat.2
-MLINKS+=recv.2 recvfrom.2 recv.2 recvmsg.2
-MLINKS+=rename.2 renameat.2
-MLINKS+=select.2 pselect.2
-MLINKS+=select.2 FD_ISSET.3 select.2 FD_ZERO.3
-MLINKS+=select.2 FD_SET.3 select.2 FD_CLR.3
-MLINKS+=send.2 sendmsg.2 send.2 sendto.2
-MLINKS+=setpgid.2 setpgrp.2
-MLINKS+=setresuid.2 getresgid.2 setresuid.2 getresuid.2
-MLINKS+=setresuid.2 setresgid.2
-MLINKS+=setuid.2 setegid.2 setuid.2 seteuid.2 setuid.2 setgid.2
-MLINKS+=shmat.2 shmdt.2
-MLINKS+=stat.2 S_ISBLK.2 stat.2 S_ISCHR.2 stat.2 S_ISDIR.2
-MLINKS+=stat.2 S_ISFIFO.2 stat.2 S_ISLNK.2 stat.2 S_ISREG.2 stat.2 S_ISSOCK.2
-MLINKS+=stat.2 fstat.2 stat.2 fstatat.2 stat.2 lstat.2
-MLINKS+=statfs.2 fstatfs.2
-MLINKS+=symlink.2 symlinkat.2
-MLINKS+=syscall.2 __syscall.2
-MLINKS+=truncate.2 ftruncate.2
-MLINKS+=unlink.2 unlinkat.2
-MLINKS+=utimes.2 futimens.2 utimes.2 futimes.2 utimes.2 utimensat.2
-MLINKS+=wait.2 WEXITSTATUS.2 wait.2 WCOREDUMP.2 wait.2 WSTOPSIG.2
-MLINKS+=wait.2 WIFCONTINUED.2 wait.2 WIFEXITED.2
-MLINKS+=wait.2 WIFSIGNALED.2 wait.2 WIFSTOPPED.2 wait.2 WTERMSIG.2
-MLINKS+=wait.2 wait3.2 wait.2 wait4.2 wait.2 waitpid.2
-MLINKS+=write.2 writev.2 write.2 pwrite.2 write.2 pwritev.2
diff --git a/lib/libc/termios/Makefile.inc b/lib/libc/termios/Makefile.inc
index 23fa56e0179..85c1d52273c 100644
--- a/lib/libc/termios/Makefile.inc
+++ b/lib/libc/termios/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.4 2013/12/17 16:31:36 millert Exp $
+#	$OpenBSD: Makefile.inc,v 1.5 2016/03/30 06:38:42 jmc Exp $
 
 .PATH:	${LIBCSRCDIR}/termios
 
@@ -7,10 +7,3 @@ SRCS+=	cfgetispeed.c cfgetospeed.c cfmakeraw.c cfsetispeed.c cfsetospeed.c \
 	tcsendbreak.c tcsetattr.c tcsetpgrp.c tcgetsid.c
 
 MAN+=	tcgetpgrp.3 tcsendbreak.3 tcsetattr.3 tcsetpgrp.3 tcgetsid.3
-
-MLINKS+=tcsendbreak.3 tcdrain.3 tcsendbreak.3 tcflow.3 \
-	tcsendbreak.3 tcflush.3
-MLINKS+=tcsetattr.3 tcgetattr.3 tcsetattr.3 cfgetispeed.3 \
-	tcsetattr.3 cfgetospeed.3 tcsetattr.3 cfmakeraw.3 \
-	tcsetattr.3 cfsetispeed.3 tcsetattr.3 cfsetospeed.3 \
-	tcsetattr.3 cfsetspeed.3
diff --git a/lib/libc/time/Makefile.inc b/lib/libc/time/Makefile.inc
index c1cc4c5b2f7..f73cfbc9b56 100644
--- a/lib/libc/time/Makefile.inc
+++ b/lib/libc/time/Makefile.inc
@@ -1,14 +1,6 @@
-#	$OpenBSD: Makefile.inc,v 1.9 2011/10/16 13:22:06 stsp Exp $
+#	$OpenBSD: Makefile.inc,v 1.10 2016/03/30 06:38:42 jmc Exp $
 
 .PATH: ${LIBCSRCDIR}/time
 
 SRCS+=	asctime.c difftime.c localtime.c strftime.c strptime.c wcsftime.c
 MAN+=	ctime.3 strftime.3 time2posix.3 tzfile.5 tzset.3 strptime.3 wcsftime.3
-
-
-MLINKS+=ctime.3 asctime.3 ctime.3 difftime.3 ctime.3 gmtime.3 \
-	ctime.3 localtime.3 ctime.3 mktime.3 ctime.3 asctime_r.3 \
-	ctime.3 ctime_r.3 ctime.3 gmtime_r.3 ctime.3 localtime_r.3 \
-	ctime.3 timelocal.3 ctime.3 timegm.3
-MLINKS+=tzset.3 tzsetwall.3
-MLINKS+=time2posix.3 posix2time.3
diff --git a/lib/libc/uuid/Makefile.inc b/lib/libc/uuid/Makefile.inc
index a66d2a833c0..98a2b00f3dc 100644
--- a/lib/libc/uuid/Makefile.inc
+++ b/lib/libc/uuid/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2014/08/31 09:36:39 miod Exp $
+#	$OpenBSD: Makefile.inc,v 1.2 2016/03/30 06:38:42 jmc Exp $
 #	$NetBSD: Makefile.inc,v 1.1 2004/09/13 21:44:54 thorpej Exp $
 
 # DCE 1.1 compatible UUID implementation sources
@@ -10,17 +10,3 @@ SRCS+=	uuid_compare.c uuid_create.c uuid_create_nil.c uuid_equal.c \
 	uuid_to_string.c
 
 MAN+=	uuid.3
-
-MLINKS+=uuid.3 uuid_compare.3
-MLINKS+=uuid.3 uuid_create.3
-MLINKS+=uuid.3 uuid_create_nil.3
-MLINKS+=uuid.3 uuid_equal.3
-MLINKS+=uuid.3 uuid_from_string.3
-MLINKS+=uuid.3 uuid_hash.3
-MLINKS+=uuid.3 uuid_is_nil.3
-MLINKS+=uuid.3 uuid_to_string.3
-
-MLINKS+=uuid.3 uuid_enc_le.3
-MLINKS+=uuid.3 uuid_dec_le.3
-MLINKS+=uuid.3 uuid_enc_be.3
-MLINKS+=uuid.3 uuid_dec_be.3
diff --git a/lib/libc/yp/Makefile.inc b/lib/libc/yp/Makefile.inc
index ebbf96a59f4..dd89be06c69 100644
--- a/lib/libc/yp/Makefile.inc
+++ b/lib/libc/yp/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.7 2010/02/03 20:49:00 miod Exp $
+#	$OpenBSD: Makefile.inc,v 1.8 2016/03/30 06:38:42 jmc Exp $
 
 # yp sources
 .PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/yp ${LIBCSRCDIR}/yp
@@ -14,9 +14,3 @@ SRCS+=	ypmatch_cache.c yp_bind.c yp_get_default_domain.c \
 	xdr_ypresp_key_val.c xdr_ypresp_maplist.c xdr_ypresp_master.c \
 	xdr_ypresp_order.c xdr_ypresp_val.c xdr_ypstat.c
 MAN+=	ypclnt.3
-
-MLINKS+=ypclnt.3 yp_all.3 ypclnt.3 yp_bind.3 ypclnt.3 yp_first.3 \
-	ypclnt.3 yp_get_default_domain.3 ypclnt.3 yp_maplist.3 \
-	ypclnt.3 yp_master.3 ypclnt.3 yp_match.3 ypclnt.3 yp_next.3 \
-	ypclnt.3 yp_order.3 ypclnt.3 yp_unbind.3 \
-	ypclnt.3 yperr_string.3 ypclnt.3 ypprot_err.3