diff --git a/external/bsd/nvi/usr.bin/nvi/Makefile b/external/bsd/nvi/usr.bin/nvi/Makefile
index eaf00efc701d..02ef4e511656 100644
--- a/external/bsd/nvi/usr.bin/nvi/Makefile
+++ b/external/bsd/nvi/usr.bin/nvi/Makefile
@@ -58,6 +58,10 @@ NOTUSED=ip_funcs.c ip_read.c ip_screen.c ip_term.c \
 .if ${USE_WIDECHAR} == "yes"
 SRCS+=	regcomp.c regerror.c regexec.c regfree.c
 CPPFLAGS+=-I${DIST}/regex -D__REGEX_PRIVATE -DUSE_WIDECHAR
+CPPFLAGS+=-Dregcomp=vi_regcomp
+CPPFLAGS+=-Dregerror=vi_regerror
+CPPFLAGS+=-Dregexec=vi_regexec
+CPPFLAGS+=-Dregfree=vi_regfree
 .endif
 
 # For db3 db1 emulation
diff --git a/external/gpl2/diffutils/lib/Makefile b/external/gpl2/diffutils/lib/Makefile
index 93780edf0222..ba46758c2074 100644
--- a/external/gpl2/diffutils/lib/Makefile
+++ b/external/gpl2/diffutils/lib/Makefile
@@ -8,6 +8,11 @@ LIB=	diffutils
 DIST=	${IDIST}/lib
 .PATH:	${DIST}
 
+CPPFLAGS+=	-Dregcomp=diffutils_regcomp
+CPPFLAGS+=	-Dregerror=diffutils_regerror
+CPPFLAGS+=	-Dregexec=diffutils_regexec
+CPPFLAGS+=	-Dregfree=diffutils_regfree
+
 SRCS=	basename.c c-stack.c cmpbuf.c error.c exclude.c exitfail.c \
 	freesoft.c \
 	hard-locale.c imaxtostr.c offtostr.c prepargs.c posixver.c quotesys.c \
diff --git a/external/gpl2/grep/lib/Makefile b/external/gpl2/grep/lib/Makefile
index 34eda48edeb9..8d390bfc3dc9 100644
--- a/external/gpl2/grep/lib/Makefile
+++ b/external/gpl2/grep/lib/Makefile
@@ -9,6 +9,11 @@ LIB=	greputils
 DIST=	${IDIST}/lib
 .PATH:	${DIST}
 
+CPPFLAGS+=	-Dregcomp=grep_regcomp
+CPPFLAGS+=	-Dregerror=grep_regerror
+CPPFLAGS+=	-Dregexec=grep_regexec
+CPPFLAGS+=	-Dregfree=grep_regfree
+
 SRCS=	closeout.c error.c exclude.c hard-locale.c isdir.c \
 	obstack.c quotearg.c regex.c savedir.c stpcpy.c \
 	xmalloc.c xstrtol.c xstrtoumax.c
diff --git a/external/gpl2/xcvs/lib/libcvs/Makefile b/external/gpl2/xcvs/lib/libcvs/Makefile
index ba299e748d7f..b6f5f3633e08 100644
--- a/external/gpl2/xcvs/lib/libcvs/Makefile
+++ b/external/gpl2/xcvs/lib/libcvs/Makefile
@@ -10,6 +10,11 @@ DIST=	${IDIST}/lib
 .PATH:	${DIST}
 CPPFLAGS+=-I${DIST}
 
+CPPFLAGS+=	-Dregcomp=cvs_regcomp
+CPPFLAGS+=	-Dregerror=cvs_regerror
+CPPFLAGS+=	-Dregexec=cvs_regexec
+CPPFLAGS+=	-Dregfree=cvs_regfree
+
 SRCS=	__fpending.c asnprintf.c basename.c canon-host.c canonicalize.c \
 	chdir-long.c closeout.c cycle-check.c dirname.c dup-safer.c exitfail.c \
 	fd-safer.c getdate.c gettime.c md5.c \
diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile
index fb7462fed212..2ce250168082 100644
--- a/usr.bin/chpass/Makefile
+++ b/usr.bin/chpass/Makefile
@@ -21,7 +21,12 @@ DPADD+=	${LIBRPCSVC}
 LDADD+=	-lrpcsvc
 .else
 SRCS+=	getpwent.c
-CPPFLAGS.getpwent.c=-UYP
+CPPFLAGS.getpwent.c=	-UYP
+CPPFLAGS.getpwent.c+=	-D__getpwent50=chpass_getpwent
+CPPFLAGS.getpwent.c+=	-D__getpwnam50=chpass_getpwnam
+CPPFLAGS.getpwent.c+=	-D__getpwnam_r50=chpass_getpwnam_r
+CPPFLAGS.getpwent.c+=	-D__getpwuid50=chpass_getpwuid
+CPPFLAGS.getpwent.c+=	-D__getpwuid_r50=chpass_getpwuid_r
 .endif
 
 DPADD+= ${LIBUTIL}