diff --git a/kerberos5/include/config.h b/kerberos5/include/config.h
index 86c7bfbca517..73aacf8dfa6e 100644
--- a/kerberos5/include/config.h
+++ b/kerberos5/include/config.h
@@ -975,7 +975,7 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
 #define HAVE_STRVISX 1
 
 /* Define to 1 if you have the `svis' function. */
-/* #undef HAVE_SVIS */
+#define HAVE_SVIS 1
 
 /* Define if you have the function `swab'. */
 #define HAVE_SWAB 1
diff --git a/tools/build/Makefile b/tools/build/Makefile
index 023c6cf99f6f..01a29ad730af 100644
--- a/tools/build/Makefile
+++ b/tools/build/Makefile
@@ -57,8 +57,8 @@ _WITH_STRSVIS!=	grep -c strsvis ${HOST_INCLUDE_ROOT}/vis.h 2>/dev/null || true
 .PATH: ${.CURDIR}/../../contrib/libc-vis
 INCS+=		vis.h
 SRCS+=		vis.c unvis.c
-CFLAGS.vis.c+=	-I${.CURDIR}/../../contrib/libc-vis
-CFLAGS.unvis.c+=	-I${.CURDIR}/../../contrib/libc-vis
+CFLAGS.vis.c+=	-I${.CURDIR}/../../contrib/libc-vis -DHAVE_VIS=0 -DHAVE_SVIS=0
+CFLAGS.unvis.c+=	-I${.CURDIR}/../../contrib/libc-vis -DHAVE_VIS=0 -DHAVE_SVIS=0
 .endif
 
 _WITH_REALLOCARRAY!= grep -c reallocarray ${HOST_INCLUDE_ROOT}/stdlib.h || true
diff --git a/tools/build/cross-build/include/common/sys/cdefs.h b/tools/build/cross-build/include/common/sys/cdefs.h
index 2bd57eef908d..c86369ab778a 100644
--- a/tools/build/cross-build/include/common/sys/cdefs.h
+++ b/tools/build/cross-build/include/common/sys/cdefs.h
@@ -190,11 +190,6 @@ typedef unsigned short u_short;
 typedef unsigned int u_int;
 typedef unsigned long u_long;
 
-/* This is needed so that BSNMP doesn't redeclare an incompatible version */
-#define HAVE_STRLCPY 1
-/* The compiler supports __func__ */
-#define HAVE_DECL___FUNC__ 1
-
 /* On MacOS __CONCAT is defined as x ## y, which won't expand macros */
 #undef __CONCAT
 #define __CONCAT1(x, y) x##y