diff --git a/bin/rndc/Makefile.in b/bin/rndc/Makefile.in
index 7a7b13a1a9..07909ddab5 100644
--- a/bin/rndc/Makefile.in
+++ b/bin/rndc/Makefile.in
@@ -61,7 +61,7 @@ rndc.@O@: rndc.c
 
 rndc@EXEEXT@: rndc.@O@ util.@O@ ${RNDCDEPLIBS}
 	export BASEOBJS="rndc.@O@ util.@O@"; \
-	export LIBS0="${ISCCFGLIBS} ${ISCCCLIBS} ${BIND9LIBS} ${DNSLIBS}"; \
+	export LIBS0="${ISCCFGLIBS} ${ISCCCLIBS} ${BIND9LIBS} ${ISCLIBS} ${DNSLIBS}"; \
 	${FINALBUILDCMD}
 
 doc man:: ${MANOBJS}
diff --git a/bin/tools/Makefile.in b/bin/tools/Makefile.in
index ce4441c11c..1180d61d17 100644
--- a/bin/tools/Makefile.in
+++ b/bin/tools/Makefile.in
@@ -78,7 +78,7 @@ named-rrchecker@EXEEXT@: named-rrchecker.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 
 nsec3hash@EXEEXT@: nsec3hash.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	export BASEOBJS="nsec3hash.@O@"; \
-	export LIBS0="${DNSLIBS}"; \
+	export LIBS0="${ISCLIBS} ${DNSLIBS}"; \
 	${FINALBUILDCMD}
 
 isc-hmac-fixup@EXEEXT@: isc-hmac-fixup.@O@ ${ISCDEPLIBS}
diff --git a/lib/isc/hmacmd5.c b/lib/isc/hmacmd5.c
index 639a197c37..7121cbcc9c 100644
--- a/lib/isc/hmacmd5.c
+++ b/lib/isc/hmacmd5.c
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: hmacmd5.c,v 1.16 2009/02/06 23:47:42 tbox Exp $ */
-
 /*! \file
  * This code implements the HMAC-MD5 keyed hash algorithm
  * described in RFC2104.
diff --git a/lib/isc/hmacsha.c b/lib/isc/hmacsha.c
index 581af86a46..6e42ade218 100644
--- a/lib/isc/hmacsha.c
+++ b/lib/isc/hmacsha.c
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id$ */
-
 /*
  * This code implements the HMAC-SHA1, HMAC-SHA224, HMAC-SHA256, HMAC-SHA384
  * and HMAC-SHA512 keyed hash algorithm described in RFC 2104 and
diff --git a/lib/isc/sha1.c b/lib/isc/sha1.c
index 1b7bc1973e..cb9e66f9b9 100644
--- a/lib/isc/sha1.c
+++ b/lib/isc/sha1.c
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id$ */
-
 /*	$NetBSD: sha1.c,v 1.5 2000/01/22 22:19:14 mycroft Exp $	*/
 /*	$OpenBSD: sha1.c,v 1.9 1997/07/23 21:12:32 kstailey Exp $	*/
 
diff --git a/lib/isc/sha2.c b/lib/isc/sha2.c
index 26a940a0bd..1d0ad4d0cf 100644
--- a/lib/isc/sha2.c
+++ b/lib/isc/sha2.c
@@ -6,8 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id$ */
-
 /*	$FreeBSD: src/sys/crypto/sha2/sha2.c,v 1.2.2.2 2002/03/05 08:36:47 ume Exp $	*/
 /*	$KAME: sha2.c,v 1.8 2001/11/08 01:07:52 itojun Exp $	*/
 
diff --git a/lib/isccfg/tests/Makefile.in b/lib/isccfg/tests/Makefile.in
index be64b92965..fee8a7a793 100644
--- a/lib/isccfg/tests/Makefile.in
+++ b/lib/isccfg/tests/Makefile.in
@@ -40,8 +40,8 @@ TARGETS =	parser_test@EXEEXT@
 
 parser_test@EXEEXT@: parser_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS} ${ISCCFGDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
-			parser_test.@O@ ${ISCCFGLIBS} ${DNSLIBS} \
-				${ISCLIBS} ${LIBS}
+			parser_test.@O@ ${ISCCFGLIBS} ${ISCLIBS} \
+				${DNSLIBS} ${LIBS}
 
 unit::
 	sh ${top_srcdir}/unit/unittest.sh