diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile
index 7445234b0986..8b887f823b9a 100644
--- a/usr.bin/chpass/Makefile
+++ b/usr.bin/chpass/Makefile
@@ -1,7 +1,10 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/2/94
 
 PROG=	chpass
-SRCS=	chpass.c edit.c field.c pw_copy.c pw_scan.c pw_util.c table.c util.c
+SRCS=	chpass.c edit.c field.c pw_copy.c pw_scan.c pw_util.c pw_yp.c \
+	table.c util.c ypxfr_misc.c ${GENSRCS}
+GENSRCS=yp.h yp_clnt.c yppasswd.h yppasswd_clnt.c yppasswd_private.h \
+	yppasswd_private_clnt.c yppasswd_private_xdr.c
 BINOWN=	root
 BINMODE=4555
 .PATH:	${.CURDIR}/../../usr.sbin/pwd_mkdb ${.CURDIR}/../../usr.sbin/vipw \
@@ -23,14 +26,11 @@ COPTS+=	-DYP -I. -I${.CURDIR}/../../libexec/ypxfr \
 #Some people need this, uncomment to activate
 #COPTS+= -DRESTRICT_FULLNAME_CHANGE
 
-SRCS+=	yppasswd_private_xdr.c yppasswd_private_clnt.c yp_clnt.c \
-	yppasswd_clnt.c pw_yp.c ypxfr_misc.c
-CLEANFILES= yp_clnt.c yp.h yppasswd_clnt.c yppasswd.h \
-	    yppasswd_private_xdr.c yppasswd_private_clnt.c yppasswd_private.h
-
 DPADD=	${LIBRPCSVC} ${LIBCRYPT}
 LDADD+=	-lrpcsvc -lcrypt
 
+CLEANFILES= ${GENSRCS}
+
 RPCGEN= rpcgen -C
 RPCSRC= ${DESTDIR}/usr/include/rpcsvc/yp.x
 RPCSRC_PW= ${DESTDIR}/usr/include/rpcsvc/yppasswd.x
@@ -39,22 +39,22 @@ RPCSRC_PRIV= ${.CURDIR}/../../usr.sbin/rpc.yppasswdd/yppasswd_private.x
 yp.h: ${RPCSRC}
 	${RPCGEN} -h -o ${.TARGET} ${RPCSRC}
 
-yp_clnt.c: ${RPCSRC} yp.h
+yp_clnt.c: ${RPCSRC}
 	${RPCGEN} -l -o ${.TARGET} ${RPCSRC}
 
 yppasswd.h: ${RPCSRC_PW}
 	${RPCGEN} -h -o ${.TARGET} ${RPCSRC_PW}
 
-yppasswd_clnt.c: ${RPCSRC_PW} yppasswd.h
+yppasswd_clnt.c: ${RPCSRC_PW}
 	${RPCGEN} -l -o ${.TARGET} ${RPCSRC_PW}
 
 yppasswd_private.h: ${RPCSRC_PRIV}
 	${RPCGEN} -h -o ${.TARGET} ${RPCSRC_PRIV}
 
-yppasswd_private_xdr.c: ${RPCSRC_PRIV} yppasswd_private.h
+yppasswd_private_xdr.c: ${RPCSRC_PRIV}
 	${RPCGEN} -c -o ${.TARGET} ${RPCSRC_PRIV}
 
-yppasswd_private_clnt.c: ${RPCSRC_PRIV} yppasswd_private.h
+yppasswd_private_clnt.c: ${RPCSRC_PRIV}
 	${RPCGEN} -l -o ${.TARGET} ${RPCSRC_PRIV}
 
 beforeinstall:
diff --git a/usr.sbin/bootparamd/callbootd/Makefile b/usr.sbin/bootparamd/callbootd/Makefile
index ebf161be6d9a..1d4fa9d80232 100644
--- a/usr.sbin/bootparamd/callbootd/Makefile
+++ b/usr.sbin/bootparamd/callbootd/Makefile
@@ -1,18 +1,19 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-#	$Id$
+#	$Id: Makefile,v 1.8 1997/02/22 16:04:27 peter Exp $
 
 PROG=	callbootd
-SRCS=	bootparam_prot_xdr.c bootparam_prot_clnt.c callbootd.c
+SRCS=	callbootd.c ${GENSRCS}
+GENSRCS=bootparam_prot.h bootparam_prot_clnt.c bootparam_prot_xdr.c
 NOMAN=
 CFLAGS+= -I.
-CLEANFILES= bootparam_prot_clnt.c bootparam_prot_xdr.c bootparam_prot.h
+CLEANFILES= ${GENSRCS}
 
 RPCSRC=	${DESTDIR}/usr/include/rpcsvc/bootparam_prot.x
 
-bootparam_prot_clnt.c: ${RPCSRC} bootparam_prot.h
+bootparam_prot_clnt.c: ${RPCSRC}
 	rpcgen -l -o ${.TARGET} ${RPCSRC}
 
-bootparam_prot_xdr.c: ${RPCSRC} bootparam_prot.h
+bootparam_prot_xdr.c: ${RPCSRC}
 	rpcgen -c -o ${.TARGET} ${RPCSRC}
 
 bootparam_prot.h: ${RPCSRC}
diff --git a/usr.sbin/rpc.yppasswdd/Makefile b/usr.sbin/rpc.yppasswdd/Makefile
index 60cb1e9c19e2..71398695be91 100644
--- a/usr.sbin/rpc.yppasswdd/Makefile
+++ b/usr.sbin/rpc.yppasswdd/Makefile
@@ -1,9 +1,10 @@
-# $Id: Makefile,v 1.2 1997/07/28 18:31:11 wpaul Exp $
+# $Id: Makefile,v 1.8 1997/07/29 15:43:12 wpaul Exp $
 
 PROG=	rpc.yppasswdd
-SRCS=	pw_copy.c pw_util.c util.c yppasswd_svc.c yp_error.c ypxfr_misc.c \
-	yp_dblookup.c yp_dbwrite.c yp_access.c yppasswd_private_xdr.c \
-	yppasswd_private_svc.c yp_clnt.c yppasswdd_server.c yppasswdd_main.c
+SRCS=	pw_copy.c pw_util.c util.c yp_access.c yp_dblookup.c yp_dbwrite.c \
+	yp_error.c yppasswdd_main.c yppasswdd_server.c ypxfr_misc.c ${GENSRCS}
+GENSRCS=yp.h yp_clnt.c yppasswd.h yppasswd_private.h yppasswd_private_svc.c \
+	yppasswd_private_xdr.c yppasswd_svc.c
 
 RPCDIR=	${DESTDIR}/usr/include/rpcsvc
 
@@ -19,9 +20,7 @@ CFLAGS+= -I${.CURDIR}/../../usr.sbin/vipw -I${.CURDIR}/../../usr.sbin/ypserv \
 DPADD=	${LIBRPCSVC} ${LIBCRYPT}
 LDADD=	-lrpcsvc -lcrypt
 
-CLEANFILES= yppasswd_svc.c yppasswd.h \
-	    yppasswd_private_xdr.c yppasswd_private.h \
-	    yppasswd_private_svc.c yp.h yp_clnt.c
+CLEANFILES= ${GENSRCS}
 
 RPCGEN= rpcgen -I -C