diff --git a/gnu/lib/libreadline/readline/Makefile b/gnu/lib/libreadline/readline/Makefile
index 547f190a0ee3..17c84ae8e61f 100644
--- a/gnu/lib/libreadline/readline/Makefile
+++ b/gnu/lib/libreadline/readline/Makefile
@@ -16,9 +16,8 @@ INSTALLED_HEADERS= readline.h chardefs.h keymaps.h history.h tilde.h \
 CFLAGS+=	-I${.OBJDIR}/..
 SRCDIR=	${.CURDIR}/../../../../contrib/libreadline
 
-beforebuild: ${INSTALLED_HEADERS}
 CLEANFILES+= ${INSTALLED_HEADERS}
-DPSRCS+= ${INSTALLED_HEADERS}
+SRCS+= ${INSTALLED_HEADERS}
 
 .for _h in ${INSTALLED_HEADERS}
 ${_h}:	${SRCDIR}/${_h} .NOMETA
diff --git a/lib/libc/tests/rpc/Makefile b/lib/libc/tests/rpc/Makefile
index e6e58e76b905..66ff4c654d55 100644
--- a/lib/libc/tests/rpc/Makefile
+++ b/lib/libc/tests/rpc/Makefile
@@ -16,7 +16,7 @@ h_testbits_xdr.c: ${RPCSRC} h_testbits.h
 
 CLEANFILES+=	${RPCSRC:.x=.h} ${RPCSRC:.x=.c} h_testbits_xdr.c
 CFLAGS+=	-I${.OBJDIR}
-DPSRCS+=	h_testbits.h
+SRCS+=		h_testbits.h
 
 LDADD+=		-lrpcsvc -lutil
 DPADD+=		${LIBRPCSVC} ${LIBUTIL}
diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile
index 6f196ac9df1d..5048fdd67227 100644
--- a/usr.bin/kdump/Makefile
+++ b/usr.bin/kdump/Makefile
@@ -6,8 +6,7 @@
 .PATH: ${.CURDIR}/../ktrace
 
 PROG=		kdump
-SRCS=		kdump_subr.c kdump.c ioctl.c subr.c utrace.c
-DPSRCS=		kdump_subr.h
+SRCS=		kdump_subr.c kdump_subr.h kdump.c ioctl.c subr.c utrace.c
 CFLAGS+=	-I${.CURDIR}/../ktrace -I${.CURDIR} -I${.CURDIR}/../.. -I.
 
 .if ${MK_CASPER} != "no"
diff --git a/usr.bin/netstat/Makefile b/usr.bin/netstat/Makefile
index abfebf46ea00..8bbce9031927 100644
--- a/usr.bin/netstat/Makefile
+++ b/usr.bin/netstat/Makefile
@@ -6,8 +6,7 @@
 PROG=	netstat
 SRCS=	if.c inet.c main.c mbuf.c mroute.c netisr.c nl_symbols.c route.c \
 	unix.c mroute6.c ipsec.c bpf.c pfkey.c sctp.c \
-	flowtable.c
-DPSRCS=	nl_defs.h
+	flowtable.c nl_defs.h
 
 nl_symbols.c: nlist_symbols
 	awk '\
diff --git a/usr.bin/svn/svn/Makefile b/usr.bin/svn/svn/Makefile
index e88dbdf0fd32..87d9df1370fc 100644
--- a/usr.bin/svn/svn/Makefile
+++ b/usr.bin/svn/svn/Makefile
@@ -52,7 +52,7 @@ DPADD=	${LIBSVN_CLIENT} ${LIBSVN_WC} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} \
 
 CLEANFILES+=	svnlite.1
 .if(defined(ORGANIZATION) && !empty(ORGANIZATION))
-DPSRCS+=	freebsd-organization.h
+SRCS+=		freebsd-organization.h
 CLEANFILES+=	freebsd-organization.h
 CFLAGS+=	-I. -DHAS_ORGANIZATION_NAME
 freebsd-organization.h: