diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile
index 6af5e844a85..f99ff49e4cf 100644
--- a/usr.bin/chpass/Makefile
+++ b/usr.bin/chpass/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.16 2024/01/22 21:07:10 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.17 2026/03/07 18:20:25 deraadt Exp $
 
 .include <bsd.own.mk>
 
@@ -6,14 +6,9 @@ PROG=	chpass
 SRCS=	chpass.c edit.c field.c table.c util.c getpwent.c
 BINOWN=	root
 BINMODE=4555
-.PATH:	${.CURDIR}/../../lib/libc/gen
 LINKS=	${BINDIR}/chpass ${BINDIR}/chfn ${BINDIR}/chpass ${BINDIR}/chsh
-CFLAGS+=-I${.CURDIR}/../../lib/libc/include -DFORCE_DBOPEN
+CFLAGS+=-DFORCE_DBOPEN
 DPADD+= ${LIBUTIL}
 LDADD+= -lutil
 
 .include <bsd.prog.mk>
-
-getpwent.o: getpwent.c
-	${COMPILE.c} -UYP -D'DEF_WEAK(x)=asm("")' \
-	    ${.CURDIR}/../../lib/libc/gen/getpwent.c
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index c671a8898ce..e4f8bb782ba 100644
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -1,22 +1,16 @@
-#	$OpenBSD: Makefile,v 1.42 2024/01/22 21:07:10 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.43 2026/03/07 18:20:26 deraadt Exp $
 
 .include <bsd.own.mk>
 
 PROG=	passwd
 SRCS=	local_passwd.c passwd.c getpwent.c \
 	pwd_check.c
-.PATH:  ${.CURDIR}/../../lib/libc/gen
+.PATH:  ${.CURDIR}/../chpass
 DPADD+= ${LIBRPCSVC} ${LIBUTIL}
 LDADD+= -lrpcsvc -lutil
 CFLAGS+= -I${.CURDIR} -DFORCE_DBOPEN
 
-CFLAGS+=-I${.CURDIR}/../../lib/libc/include
-
 BINMODE=4555
 BINOWN=root
 
-getpwent.o: getpwent.c
-	${COMPILE.c} -UYP -D'DEF_WEAK(x)=asm("")' \
-	    ${.CURDIR}/../../lib/libc/gen/getpwent.c
-
 .include <bsd.prog.mk>