diff --git a/src/lib/libc/crypt/Makefile.inc b/src/lib/libc/crypt/Makefile.inc
index bdca0bbf..e9263b09 100644
--- a/src/lib/libc/crypt/Makefile.inc
+++ b/src/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/src/lib/libc/hash/Makefile.inc b/src/lib/libc/hash/Makefile.inc
index 58a30e30..56444ea5 100644
--- a/src/lib/libc/hash/Makefile.inc
+++ b/src/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/src/lib/libc/stdlib/Makefile.inc b/src/lib/libc/stdlib/Makefile.inc
index fdc194b8..d3a0a835 100644
--- a/src/lib/libc/stdlib/Makefile.inc
+++ b/src/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/src/lib/libc/string/Makefile.inc b/src/lib/libc/string/Makefile.inc
index ec45da24..95eb9300 100644
--- a/src/lib/libc/string/Makefile.inc
+++ b/src/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/src/lib/libutil/Makefile b/src/lib/libutil/Makefile
index 9a120e10..11bcfcdd 100644
--- a/src/lib/libutil/Makefile
+++ b/src/lib/libutil/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.38 2014/06/02 18:52:03 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.39 2016/03/30 06:38:43 jmc Exp $
 #	$NetBSD: Makefile,v 1.8 1996/05/16 07:03:28 thorpej Exp $
 
 LIB=	util
@@ -16,66 +16,10 @@ MAN=	bcrypt_pbkdf.3 check_expire.3 getmaxpartitions.3 getrawpartition.3 \
 	fparseln.3 opendisk.3 login_fbtab.3 pidfile.3 fmt_scaled.3 imsg_init.3 \
 	pkcs5_pbkdf2.3
 
-MLINKS+=imsg_init.3 imsg_read.3
-MLINKS+=imsg_init.3 imsg_get.3
-MLINKS+=imsg_init.3 imsg_compose.3
-MLINKS+=imsg_init.3 imsg_composev.3
-MLINKS+=imsg_init.3 imsg_create.3
-MLINKS+=imsg_init.3 imsg_add.3
-MLINKS+=imsg_init.3 imsg_close.3
-MLINKS+=imsg_init.3 imsg_free.3
-MLINKS+=imsg_init.3 imsg_flush.3
-MLINKS+=imsg_init.3 imsg_clear.3
-MLINKS+=imsg_init.3 ibuf_open.3
-MLINKS+=imsg_init.3 ibuf_dynamic.3
-MLINKS+=imsg_init.3 ibuf_add.3
-MLINKS+=imsg_init.3 ibuf_reserve.3
-MLINKS+=imsg_init.3 ibuf_seek.3
-MLINKS+=imsg_init.3 ibuf_size.3
-MLINKS+=imsg_init.3 ibuf_left.3
-MLINKS+=imsg_init.3 ibuf_close.3
-MLINKS+=imsg_init.3 ibuf_write.3
-MLINKS+=imsg_init.3 ibuf_free.3
-MLINKS+=imsg_init.3 msgbuf_init.3
-MLINKS+=imsg_init.3 msgbuf_clear.3
-MLINKS+=imsg_init.3 msgbuf_write.3
-MLINKS+=imsg_init.3 msgbuf_drain.3
-MLINKS+=login.3 logout.3
-MLINKS+=login.3 logwtmp.3
-MLINKS+=check_expire.3 login_check_expire.3
-MLINKS+=openpty.3 login_tty.3
-MLINKS+=openpty.3 forkpty.3
-MLINKS+=pw_init.3 pw_setdir.3
-MLINKS+=pw_init.3 pw_file.3
-MLINKS+=pw_init.3 pw_edit.3
-MLINKS+=pw_init.3 pw_prompt.3
-MLINKS+=pw_init.3 pw_copy.3
-MLINKS+=pw_init.3 pw_scan.3
-MLINKS+=pw_init.3 pw_error.3
-MLINKS+=pw_lock.3 pw_mkdb.3
-MLINKS+=pw_lock.3 pw_abort.3
-MLINKS+=uucplock.3 uu_lock.3
-MLINKS+=uucplock.3 uu_unlock.3
-MLINKS+=uucplock.3 uu_lockerr.3
-MLINKS+=uucplock.3 uu_lock_txfr.3
-MLINKS+=fmt_scaled.3 scan_scaled.3
-
 SRCS+=	ohash.c
 HDRS += ohash.h
 
 MAN +=	ohash_init.3 ohash_interval.3
-MLINKS += ohash_init.3 ohash_delete.3 \
-	ohash_init.3 ohash_lookup_interval.3 \
-	ohash_init.3 ohash_lookup_memory.3 \
-	ohash_init.3 ohash_find.3 \
-	ohash_init.3 ohash_remove.3 \
-	ohash_init.3 ohash_insert.3 \
-	ohash_init.3 ohash_first.3 \
-	ohash_init.3 ohash_next.3 \
-	ohash_init.3 ohash_entries.3 \
-	ohash_interval.3 ohash_create_entry.3 \
-	ohash_interval.3 ohash_qlookupi.3 \
-	ohash_interval.3 ohash_qlookup.3
 
 includes:
 	@cd ${.CURDIR}; for i in $(HDRS); do \