diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
index a5f5f906ba..b302a2dade 100644
--- a/bin/named/Makefile.in
+++ b/bin/named/Makefile.in
@@ -40,6 +40,9 @@ TARGETS =	named
 OBJS =		server.o udpclient.o tcpclient.o printmsg.o \
 		interfacemgr.o
 
+SRCS =		server.c udpclient.c tcpclient.c \
+		interfacemgr.c
+
 @BIND9_MAKE_RULES@
 
 printmsg.o: ${srcdir}/../tests/printmsg.c
diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in
index 7ac20ceaec..3ef23bceac 100644
--- a/bin/tests/Makefile.in
+++ b/bin/tests/Makefile.in
@@ -54,6 +54,25 @@ TARGETS =	res_test \
 		dispatch_test \
 		dispatch_tcp_test
 
+SRCS =		res_test.c \
+		lex_test.c \
+		name_test.c \
+		sock_test.c \
+		sym_test.c \
+		task_test.c \
+		shutdown_test.c \
+		timer_test.c \
+		rbt_test.c \
+		rdata_test.c \
+		rwlock_test.c \
+		wire_test.c \
+		master_test.c \
+		db_test.c \
+		compress_test.c \
+		mempool_test.c \
+		dispatch_test.c \
+		dispatch_tcp_test.c
+
 @BIND9_MAKE_RULES@
 
 res_test: res_test.o ${ISCDEPLIBS} ${DNSDEPLIBS}
diff --git a/bin/tests/dst/Makefile.in b/bin/tests/dst/Makefile.in
index 377aa62b65..7cd314003f 100644
--- a/bin/tests/dst/Makefile.in
+++ b/bin/tests/dst/Makefile.in
@@ -32,6 +32,8 @@ LIBS =		../../../lib/dns/libdns.@A@ \
 
 TARGETS =	dst_test
 
+SRCS =		dst_test.c
+
 @BIND9_MAKE_RULES@
 
 dst_test: dst_test.o
diff --git a/bin/tests/master/Makefile.in b/bin/tests/master/Makefile.in
index 21a537a6f2..614c816551 100644
--- a/bin/tests/master/Makefile.in
+++ b/bin/tests/master/Makefile.in
@@ -34,6 +34,8 @@ LIBS =		../../../lib/dns/libdns.@A@ \
 
 TARGETS =	t_master
 
+SRCS =		t_master.c
+
 @BIND9_MAKE_RULES@
 
 t_master: t_master.o
diff --git a/bin/tests/names/Makefile.in b/bin/tests/names/Makefile.in
index c4844fb38f..6b2a0db808 100644
--- a/bin/tests/names/Makefile.in
+++ b/bin/tests/names/Makefile.in
@@ -34,6 +34,8 @@ LIBS =		../../../lib/dns/libdns.@A@ \
 
 TARGETS =	t_names
 
+SRCS =		t_names.c
+
 @BIND9_MAKE_RULES@
 
 t_names: t_names.o
diff --git a/bin/tests/rbt/Makefile.in b/bin/tests/rbt/Makefile.in
index 8a4c721ea7..2e6e93aaed 100644
--- a/bin/tests/rbt/Makefile.in
+++ b/bin/tests/rbt/Makefile.in
@@ -34,6 +34,8 @@ LIBS =		../../../lib/dns/libdns.@A@ \
 
 TARGETS =	t_rbt
 
+SRCS =		t_rbt.c
+
 @BIND9_MAKE_RULES@
 
 t_rbt: t_rbt.o
diff --git a/lib/tests/Makefile.in b/lib/tests/Makefile.in
index 9e015c4770..0c49c53504 100644
--- a/lib/tests/Makefile.in
+++ b/lib/tests/Makefile.in
@@ -17,8 +17,6 @@ srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
 
-@BIND9_VERSION@
-
 CINCLUDES =	-I${srcdir}/unix/include \
 		-I${srcdir}/pthreads/include \
 		-I${srcdir}/include \
@@ -30,14 +28,13 @@ CWARNINGS =
 # Note: we are not using libtool with this library.
 OBJS =		t_api.o
 
+SRCS =		t_api.c
+
 SUBDIRS =	include
 TARGETS =	timestamp
 
 @BIND9_MAKE_RULES@
 
-version.o: version.c
-	${CC} ${ALL_CFLAGS} -DVERSION=\"${VERSION}\" -c $<
-
 libt_api.a: ${OBJS}
 	${AR} cruv libt_api.a ${OBJS}