diff --git a/tools/build/Makefile b/tools/build/Makefile
index 76493f708ab4..b9b548ec39de 100644
--- a/tools/build/Makefile
+++ b/tools/build/Makefile
@@ -21,6 +21,22 @@ config.h: ${.CURDIR}/../../lib/libmagic/config.h
 	grep -v HAVE_GETLINE ${.ALLSRC} > ${.TARGET}
 .endif
 
+_WITH_PWCACHEDB!= grep -c pwcache_groupdb /usr/include/pwd.h || true
+.if ${_WITH_PWCACHEDB} == 0
+.PATH: ${.CURDIR}/../../contrib/libc-pwcache
+CFLAGS+=	-I${.CURDIR}/../../contrib/libc-pwcache \
+		-I${.CURDIR}/../../lib/libc/include
+SRCS+=		pwcache.c
+.endif
+
+_WITH_STRSVIS!=	grep -c strsvis /usr/include/vis.h || true
+.if ${_WITH_STRSVIS} == 0
+.PATH: ${.CURDIR}/../../contrib/libc-vis
+SRCS+=		vis.c
+CFLAGS+=	-I${.CURDIR}/../../contrib/libc-vis \
+		-I${.CURDIR}/../../lib/libc/include
+.endif
+
 .if empty(SRCS)
 SRCS=		dummy.c
 .endif