From: Ondřej Surý <ondrej@sury.org>
Date: Tue, 17 Apr 2018 16:32:20 +0000 (-0700)
Subject: Remove $Id markers, Principal Author and Reviewed tags from the full source tree
X-Git-Tag: v9.13.0~20^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55a10b7acd8fd6f13a6c49398ed51efd02a6a973;p=thirdparty%2Fbind9.git

Remove $Id markers, Principal Author and Reviewed tags from the full source tree
---

diff --git a/bin/check/check-tool.c b/bin/check/check-tool.c
index 0a57a37957f..2979e252029 100644
--- a/bin/check/check-tool.c
+++ b/bin/check/check-tool.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: check-tool.c,v 1.44 2011/12/22 07:32:39 each Exp $ */
 
 /*! \file */
 
diff --git a/bin/check/check-tool.h b/bin/check/check-tool.h
index 8420857f087..575cccda233 100644
--- a/bin/check/check-tool.h
+++ b/bin/check/check-tool.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: check-tool.h,v 1.18 2011/12/09 23:47:02 tbox Exp $ */
 
 #ifndef CHECK_TOOL_H
 #define CHECK_TOOL_H
diff --git a/bin/check/named-checkconf.c b/bin/check/named-checkconf.c
index 944597857ec..661dd5a5de6 100644
--- a/bin/check/named-checkconf.c
+++ b/bin/check/named-checkconf.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: named-checkconf.c,v 1.56 2011/03/12 04:59:46 tbox Exp $ */
 
 /*! \file */
 
diff --git a/bin/check/named-checkzone.c b/bin/check/named-checkzone.c
index aed4ac89dd5..7f12abffb6e 100644
--- a/bin/check/named-checkzone.c
+++ b/bin/check/named-checkzone.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: named-checkzone.c,v 1.65.32.2 2012/02/07 02:45:21 each Exp $ */
 
 /*! \file */
 
diff --git a/bin/confgen/include/confgen/os.h b/bin/confgen/include/confgen/os.h
index 37eec1b2705..6346b2b4907 100644
--- a/bin/confgen/include/confgen/os.h
+++ b/bin/confgen/include/confgen/os.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: os.h,v 1.3 2009/06/11 23:47:55 tbox Exp $ */
 
 /*! \file */
 
diff --git a/bin/confgen/keygen.c b/bin/confgen/keygen.c
index ff899809694..9f3a4e1f8ab 100644
--- a/bin/confgen/keygen.c
+++ b/bin/confgen/keygen.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: keygen.c,v 1.4 2009/11/12 14:02:38 marka Exp $ */
 
 /*! \file */
 
diff --git a/bin/confgen/keygen.h b/bin/confgen/keygen.h
index 9c8a6582747..58debab4f86 100644
--- a/bin/confgen/keygen.h
+++ b/bin/confgen/keygen.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: keygen.h,v 1.3 2009/06/11 23:47:55 tbox Exp $ */
 
 #ifndef RNDC_KEYGEN_H
 #define RNDC_KEYGEN_H 1
diff --git a/bin/confgen/unix/Makefile.in b/bin/confgen/unix/Makefile.in
index f200d2e34d3..64e3cb8bb5b 100644
--- a/bin/confgen/unix/Makefile.in
+++ b/bin/confgen/unix/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.3 2009/06/11 23:47:55 tbox Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/bin/confgen/unix/os.c b/bin/confgen/unix/os.c
index 8bba386a4c9..b305b340964 100644
--- a/bin/confgen/unix/os.c
+++ b/bin/confgen/unix/os.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: os.c,v 1.3 2009/06/11 23:47:55 tbox Exp $ */
 
 /*! \file */
 
diff --git a/bin/confgen/util.c b/bin/confgen/util.c
index 144d4634e77..b5543a3be4d 100644
--- a/bin/confgen/util.c
+++ b/bin/confgen/util.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: util.c,v 1.3 2009/06/11 23:47:55 tbox Exp $ */
 
 /*! \file */
 
diff --git a/bin/confgen/util.h b/bin/confgen/util.h
index ba473af6da0..fa4a62b0235 100644
--- a/bin/confgen/util.h
+++ b/bin/confgen/util.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: util.h,v 1.4 2009/09/29 15:06:05 fdupont Exp $ */
 
 #ifndef RNDC_UTIL_H
 #define RNDC_UTIL_H 1
diff --git a/bin/confgen/win32/os.c b/bin/confgen/win32/os.c
index b0294fa84a5..4ef9d64e685 100644
--- a/bin/confgen/win32/os.c
+++ b/bin/confgen/win32/os.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: os.c,v 1.3 2009/06/11 23:47:55 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/bin/dnssec/dnssectool.h b/bin/dnssec/dnssectool.h
index 6e2dc338a37..41f048ed857 100644
--- a/bin/dnssec/dnssectool.h
+++ b/bin/dnssec/dnssectool.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: dnssectool.h,v 1.33 2011/10/20 23:46:51 tbox Exp $ */
 
 #ifndef DNSSECTOOL_H
 #define DNSSECTOOL_H 1
diff --git a/bin/named/builtin.c b/bin/named/builtin.c
index ac0cbfd4d0f..3049b0ffda7 100644
--- a/bin/named/builtin.c
+++ b/bin/named/builtin.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: builtin.c,v 1.26 2012/01/21 19:44:18 each Exp $ */
 
 /*! \file
  * \brief
diff --git a/bin/named/control.c b/bin/named/control.c
index 04563078890..035e39bddde 100644
--- a/bin/named/control.c
+++ b/bin/named/control.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: control.c,v 1.49 2012/01/31 23:47:31 tbox Exp $ */
 
 /*! \file */
 
diff --git a/bin/named/convertxsl.pl b/bin/named/convertxsl.pl
index 6ab2f4b9c1d..8f78be323de 100755
--- a/bin/named/convertxsl.pl
+++ b/bin/named/convertxsl.pl
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: convertxsl.pl,v 1.14 2008/07/17 23:43:26 jinmei Exp $
-
 use strict;
 use warnings;
 
diff --git a/bin/named/include/dlz/dlz_dlopen_driver.h b/bin/named/include/dlz/dlz_dlopen_driver.h
index 23bbb25f55b..14a637bc06c 100644
--- a/bin/named/include/dlz/dlz_dlopen_driver.h
+++ b/bin/named/include/dlz/dlz_dlopen_driver.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: dlz_dlopen_driver.h,v 1.4 2011/03/17 09:25:53 fdupont Exp $ */
 
 #ifndef DLZ_DLOPEN_DRIVER_H
 #define DLZ_DLOPEN_DRIVER_H
diff --git a/bin/named/include/named/config.h b/bin/named/include/named/config.h
index a3ab9aa9e26..1c6ce9e0062 100644
--- a/bin/named/include/named/config.h
+++ b/bin/named/include/named/config.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: config.h,v 1.16 2009/06/11 23:47:55 tbox Exp $ */
 
 #ifndef NAMED_CONFIG_H
 #define NAMED_CONFIG_H 1
diff --git a/bin/named/include/named/logconf.h b/bin/named/include/named/logconf.h
index 53281b3191d..047e85d88bb 100644
--- a/bin/named/include/named/logconf.h
+++ b/bin/named/include/named/logconf.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: logconf.h,v 1.17 2007/06/19 23:46:59 tbox Exp $ */
 
 #ifndef NAMED_LOGCONF_H
 #define NAMED_LOGCONF_H 1
diff --git a/bin/named/tkeyconf.c b/bin/named/tkeyconf.c
index 0a07de502a2..387d4508377 100644
--- a/bin/named/tkeyconf.c
+++ b/bin/named/tkeyconf.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: tkeyconf.c,v 1.33 2010/12/20 23:47:20 tbox Exp $ */
 
 /*! \file */
 
diff --git a/bin/named/tsigconf.c b/bin/named/tsigconf.c
index 85a2bede605..2e0fc3a8301 100644
--- a/bin/named/tsigconf.c
+++ b/bin/named/tsigconf.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: tsigconf.c,v 1.35 2011/01/11 23:47:12 tbox Exp $ */
 
 /*! \file */
 
diff --git a/bin/named/unix/Makefile.in b/bin/named/unix/Makefile.in
index 548aa37cf3c..30075e611b5 100644
--- a/bin/named/unix/Makefile.in
+++ b/bin/named/unix/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.15 2011/03/10 23:47:49 tbox Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/bin/named/unix/dlz_dlopen_driver.c b/bin/named/unix/dlz_dlopen_driver.c
index 15e2afce87f..83383c9c3e3 100644
--- a/bin/named/unix/dlz_dlopen_driver.c
+++ b/bin/named/unix/dlz_dlopen_driver.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #include <config.h>
 
diff --git a/bin/named/win32/dlz_dlopen_driver.c b/bin/named/win32/dlz_dlopen_driver.c
index d1d0dc542c2..1d8805b8c93 100644
--- a/bin/named/win32/dlz_dlopen_driver.c
+++ b/bin/named/win32/dlz_dlopen_driver.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: dlz_dlopen_driver.c,v 1.5 2011/10/14 00:52:32 marka Exp $ */
 
 #include <config.h>
 
diff --git a/bin/named/win32/include/named/ntservice.h b/bin/named/win32/include/named/ntservice.h
index 45890332933..38732fb2a63 100644
--- a/bin/named/win32/include/named/ntservice.h
+++ b/bin/named/win32/include/named/ntservice.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: ntservice.h,v 1.6 2007/06/19 23:46:59 tbox Exp $ */
 
 #ifndef NTSERVICE_H
 #define NTSERVICE_H
diff --git a/bin/pkcs11/pkcs11-destroy.c b/bin/pkcs11/pkcs11-destroy.c
index 81f4db2cdbe..2e2bf4c9453 100644
--- a/bin/pkcs11/pkcs11-destroy.c
+++ b/bin/pkcs11/pkcs11-destroy.c
@@ -38,7 +38,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $Id: pkcs11-destroy.c,v 1.8 2010/01/13 21:19:52 fdupont Exp $ */
 
 /*
  * pkcs11-destroy [-m module] [-s $slot] [-i $id | -l $label]
diff --git a/bin/pkcs11/pkcs11-list.c b/bin/pkcs11/pkcs11-list.c
index bb9cec38431..2f62a4593d1 100644
--- a/bin/pkcs11/pkcs11-list.c
+++ b/bin/pkcs11/pkcs11-list.c
@@ -33,7 +33,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $Id: pkcs11-list.c,v 1.7 2009/10/26 23:36:53 each Exp $ */
 
 /* pkcs11-list [-P] [-m module] [-s slot] [-i $id | -l $label] [-p $pin] */
 
diff --git a/bin/pkcs11/pkcs11-tokens.c b/bin/pkcs11/pkcs11-tokens.c
index ea1366690d6..bea4d02919e 100644
--- a/bin/pkcs11/pkcs11-tokens.c
+++ b/bin/pkcs11/pkcs11-tokens.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /* pkcs11-tokens [-m module] */
 
diff --git a/bin/rndc/include/rndc/os.h b/bin/rndc/include/rndc/os.h
index a7ace0cb448..6346b2b4907 100644
--- a/bin/rndc/include/rndc/os.h
+++ b/bin/rndc/include/rndc/os.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: os.h,v 1.12 2009/06/10 00:27:21 each Exp $ */
 
 /*! \file */
 
diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c
index 9590c6cf311..d1dd411c5b2 100644
--- a/bin/rndc/rndc.c
+++ b/bin/rndc/rndc.c
@@ -11,10 +11,6 @@
 
 /*! \file */
 
-/*
- * Principal Author: DCL
- */
-
 #include <config.h>
 
 #include <stdlib.h>
diff --git a/bin/rndc/util.c b/bin/rndc/util.c
index f408c5b44fd..b5543a3be4d 100644
--- a/bin/rndc/util.c
+++ b/bin/rndc/util.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: util.c,v 1.7 2007/06/19 23:46:59 tbox Exp $ */
 
 /*! \file */
 
diff --git a/bin/rndc/util.h b/bin/rndc/util.h
index 1049d3df595..fa4a62b0235 100644
--- a/bin/rndc/util.h
+++ b/bin/rndc/util.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: util.h,v 1.12 2009/09/29 23:48:03 tbox Exp $ */
 
 #ifndef RNDC_UTIL_H
 #define RNDC_UTIL_H 1
diff --git a/bin/tests/cfg_test.c b/bin/tests/cfg_test.c
index 5cd7f65caf5..91005a0fa74 100644
--- a/bin/tests/cfg_test.c
+++ b/bin/tests/cfg_test.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: cfg_test.c,v 1.25 2011/09/05 23:46:54 tbox Exp $ */
 
 /*! \file */
 
diff --git a/bin/tests/headerdep_test.sh.in b/bin/tests/headerdep_test.sh.in
index 73656122e9e..3a94d472ced 100644
--- a/bin/tests/headerdep_test.sh.in
+++ b/bin/tests/headerdep_test.sh.in
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: headerdep_test.sh.in,v 1.8 2007/06/19 23:46:59 tbox Exp $
-
 #
 # Check the installed bind9 headers to make sure that no header
 # depends on another header having been included first.
diff --git a/bin/tests/named.conf b/bin/tests/named.conf
index d4d32023241..5673e982ca0 100644
--- a/bin/tests/named.conf
+++ b/bin/tests/named.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: named.conf,v 1.60 2011/03/03 23:47:31 tbox Exp $ */
-
 /*
  * This is a worthless, nonrunnable example of a named.conf file that has
  * every conceivable syntax element in use.  We use it to test the parser.
diff --git a/bin/tests/optional/byaddr_test.c b/bin/tests/optional/byaddr_test.c
index 8089942d207..c6b598da420 100644
--- a/bin/tests/optional/byaddr_test.c
+++ b/bin/tests/optional/byaddr_test.c
@@ -10,8 +10,6 @@
  */
 
 /*! \file
- * \author
- * Principal Author: Bob Halley
  */
 
 #include <config.h>
diff --git a/bin/tests/optional/byname_test.c b/bin/tests/optional/byname_test.c
index 384e5b01da0..a94097c37f3 100644
--- a/bin/tests/optional/byname_test.c
+++ b/bin/tests/optional/byname_test.c
@@ -10,8 +10,6 @@
  */
 
 /*! \file
- * \author
- * Principal Author: Bob Halley
  */
 
 #include <config.h>
diff --git a/bin/tests/optional/db_test.c b/bin/tests/optional/db_test.c
index 6c1c2404e53..abc48478897 100644
--- a/bin/tests/optional/db_test.c
+++ b/bin/tests/optional/db_test.c
@@ -10,8 +10,6 @@
  */
 
 /*! \file
- * \author
- * Principal Author: Bob Halley
  */
 
 #include <config.h>
diff --git a/bin/tests/optional/log_test.c b/bin/tests/optional/log_test.c
index 50807e8c02b..c4a2caf050f 100644
--- a/bin/tests/optional/log_test.c
+++ b/bin/tests/optional/log_test.c
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* Principal Authors: DCL */
-
 #include <config.h>
 
 #include <stdlib.h>
diff --git a/bin/tests/pkcs11/benchmarks/create.c b/bin/tests/pkcs11/benchmarks/create.c
index d704fa33995..6aeee60558a 100644
--- a/bin/tests/pkcs11/benchmarks/create.c
+++ b/bin/tests/pkcs11/benchmarks/create.c
@@ -33,7 +33,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $Id$ */
 
 /* create [-m module] [-s $slot] [-p pin] [-t] [-n count] */
 
diff --git a/bin/tests/pkcs11/benchmarks/genrsa.c b/bin/tests/pkcs11/benchmarks/genrsa.c
index 8e1da3fa3c6..be78af3dbd3 100644
--- a/bin/tests/pkcs11/benchmarks/genrsa.c
+++ b/bin/tests/pkcs11/benchmarks/genrsa.c
@@ -33,7 +33,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $Id$ */
 
 /* genrsa [-m module] [-s $slot] [-p pin] [-t] [-b bits] [-n count] */
 
diff --git a/bin/tests/pkcs11/benchmarks/login.c b/bin/tests/pkcs11/benchmarks/login.c
index e1170523ae0..dc9fee3e251 100644
--- a/bin/tests/pkcs11/benchmarks/login.c
+++ b/bin/tests/pkcs11/benchmarks/login.c
@@ -33,7 +33,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $Id$ */
 
 /* login [-m module] [-s $slot] [-p pin] [-n count] */
 
diff --git a/bin/tests/pkcs11/benchmarks/privrsa.c b/bin/tests/pkcs11/benchmarks/privrsa.c
index ce8e21d36fe..bddf2818576 100644
--- a/bin/tests/pkcs11/benchmarks/privrsa.c
+++ b/bin/tests/pkcs11/benchmarks/privrsa.c
@@ -33,7 +33,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $Id$ */
 
 /* privrsa [-m module] [-s $slot] [-p pin] [-t] [-n count] */
 
diff --git a/bin/tests/pkcs11/benchmarks/pubrsa.c b/bin/tests/pkcs11/benchmarks/pubrsa.c
index 64d85c26b0f..e4dbc91b0b9 100644
--- a/bin/tests/pkcs11/benchmarks/pubrsa.c
+++ b/bin/tests/pkcs11/benchmarks/pubrsa.c
@@ -33,7 +33,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $Id$ */
 
 /* pubrsa [-m module] [-s $slot] [-p pin] [-t] [-n count] */
 
diff --git a/bin/tests/pkcs11/benchmarks/random.c b/bin/tests/pkcs11/benchmarks/random.c
index 0638968eb5f..1ebd1df230f 100644
--- a/bin/tests/pkcs11/benchmarks/random.c
+++ b/bin/tests/pkcs11/benchmarks/random.c
@@ -33,7 +33,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $Id$ */
 
 /* random [-m module] [-s $slot] [-n count] */
 
diff --git a/bin/tests/pkcs11/benchmarks/session.c b/bin/tests/pkcs11/benchmarks/session.c
index c8e1f484f0d..fb48f4b8747 100644
--- a/bin/tests/pkcs11/benchmarks/session.c
+++ b/bin/tests/pkcs11/benchmarks/session.c
@@ -33,7 +33,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $Id$ */
 
 /* session [-m module] [-s $slot] [-n count] */
 
diff --git a/bin/tests/pkcs11/benchmarks/sha1.c b/bin/tests/pkcs11/benchmarks/sha1.c
index 0c206743d9a..caed31ca592 100644
--- a/bin/tests/pkcs11/benchmarks/sha1.c
+++ b/bin/tests/pkcs11/benchmarks/sha1.c
@@ -33,7 +33,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $Id$ */
 
 /* sha1 [-m module] [-s $slot] [-n count] */
 
diff --git a/bin/tests/pkcs11/benchmarks/sign.c b/bin/tests/pkcs11/benchmarks/sign.c
index ace18e34dac..6e8610c6892 100644
--- a/bin/tests/pkcs11/benchmarks/sign.c
+++ b/bin/tests/pkcs11/benchmarks/sign.c
@@ -33,7 +33,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $Id$ */
 
 /* signrsa [-m module] [-s $slot] [-p pin] [-t] [-n count] */
 
diff --git a/bin/tests/pkcs11/benchmarks/verify.c b/bin/tests/pkcs11/benchmarks/verify.c
index 38c71965720..1015f7b98c9 100644
--- a/bin/tests/pkcs11/benchmarks/verify.c
+++ b/bin/tests/pkcs11/benchmarks/verify.c
@@ -33,7 +33,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $Id$ */
 
 /* verify [-m module] [-s $slot] [-p pin] [-t] [-n count] */
 
diff --git a/bin/tests/pkcs11/pkcs11-hmacmd5.c b/bin/tests/pkcs11/pkcs11-hmacmd5.c
index 3673fac0fb2..4b670e915f9 100644
--- a/bin/tests/pkcs11/pkcs11-hmacmd5.c
+++ b/bin/tests/pkcs11/pkcs11-hmacmd5.c
@@ -33,7 +33,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $Id$ */
 
 /*
  * pkcs11-hmacmd5
diff --git a/bin/tests/pkcs11/pkcs11-md5sum.c b/bin/tests/pkcs11/pkcs11-md5sum.c
index 425ded0dacd..10001d1dad2 100644
--- a/bin/tests/pkcs11/pkcs11-md5sum.c
+++ b/bin/tests/pkcs11/pkcs11-md5sum.c
@@ -33,7 +33,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $Id$ */
 
 /*
  * pkcs11-md5sum
diff --git a/bin/tests/startperf/clean.sh b/bin/tests/startperf/clean.sh
index d6997d2fd47..4049ba3a206 100644
--- a/bin/tests/startperf/clean.sh
+++ b/bin/tests/startperf/clean.sh
@@ -9,7 +9,5 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: clean.sh,v 1.3 2011/09/02 23:46:31 tbox Exp $
-
 rm -rf zones
 rm -f named.conf
diff --git a/bin/tests/startperf/makenames.pl b/bin/tests/startperf/makenames.pl
index d5442d48737..a2bb2cfb000 100644
--- a/bin/tests/startperf/makenames.pl
+++ b/bin/tests/startperf/makenames.pl
@@ -9,7 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: makenames.pl,v 1.3 2011/09/02 21:15:35 each Exp $
 use strict;
 
 die "Usage: makenames.pl <num> [<len>]" if (@ARGV == 0 || @ARGV > 2);
diff --git a/bin/tests/startperf/mkzonefile.pl b/bin/tests/startperf/mkzonefile.pl
index 9d33d223c00..f050535bb56 100644
--- a/bin/tests/startperf/mkzonefile.pl
+++ b/bin/tests/startperf/mkzonefile.pl
@@ -9,7 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: mkzonefile.pl,v 1.2 2011/09/02 21:15:35 each Exp $
 use strict;
 
 die "Usage: makenames.pl zonename num_records" if (@ARGV != 2);
diff --git a/bin/tests/startperf/setup.sh b/bin/tests/startperf/setup.sh
index 6fe10ed9eea..e7846656bcf 100644
--- a/bin/tests/startperf/setup.sh
+++ b/bin/tests/startperf/setup.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: setup.sh,v 1.4 2011/09/02 21:15:35 each Exp $
-
 usage () {
     echo "Usage: $0 [-s] <number of zones> [<records per zone>]"
     echo "       -s: use the same zone file all zones"
diff --git a/bin/tests/startperf/smallzone.db b/bin/tests/startperf/smallzone.db
index 9a87b360cdc..20a3b9d4c81 100644
--- a/bin/tests/startperf/smallzone.db
+++ b/bin/tests/startperf/smallzone.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: smallzone.db,v 1.3 2011/07/07 23:47:49 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/addzone/ns2/added.db b/bin/tests/system/addzone/ns2/added.db
index 56e0d7f2f37..9b54d19204d 100644
--- a/bin/tests/system/addzone/ns2/added.db
+++ b/bin/tests/system/addzone/ns2/added.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: added.db,v 1.2 2010/08/11 18:14:18 each Exp $
-
 ;$ORIGIN added.example.
 $TTL 300	; 5 minutes
 @                       IN SOA	mname1. . (
diff --git a/bin/tests/system/addzone/ns2/hints.db b/bin/tests/system/addzone/ns2/hints.db
index 7f5cc13dbb6..418ea963faa 100644
--- a/bin/tests/system/addzone/ns2/hints.db
+++ b/bin/tests/system/addzone/ns2/hints.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.hint,v 1.5 2007/06/19 23:47:01 tbox Exp $
-
 $TTL 999999
 .			 IN NS	a.root-servers.nil.
 a.root-servers.nil.	 IN A	10.53.0.1
diff --git a/bin/tests/system/addzone/ns2/normal.db b/bin/tests/system/addzone/ns2/normal.db
index 7f3e17193dc..50450928e96 100644
--- a/bin/tests/system/addzone/ns2/normal.db
+++ b/bin/tests/system/addzone/ns2/normal.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: normal.db,v 1.2 2010/08/11 18:14:19 each Exp $
-
 $ORIGIN normal.example.
 $TTL 300	; 5 minutes
 @                       IN SOA	mname1. . (
diff --git a/bin/tests/system/addzone/ns2/previous.db b/bin/tests/system/addzone/ns2/previous.db
index 8f34292f325..7fe55176187 100644
--- a/bin/tests/system/addzone/ns2/previous.db
+++ b/bin/tests/system/addzone/ns2/previous.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: previous.db,v 1.2 2010/08/11 18:14:19 each Exp $
-
 $ORIGIN previous.example.
 $TTL 300	; 5 minutes
 @                       IN SOA	mname1. . (
diff --git a/bin/tests/system/autosign/ns1/root.db.in b/bin/tests/system/autosign/ns1/root.db.in
index a9902f521bc..4ed999092c6 100644
--- a/bin/tests/system/autosign/ns1/root.db.in
+++ b/bin/tests/system/autosign/ns1/root.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.db.in,v 1.6 2010/08/16 22:21:06 marka Exp $
-
 $TTL 30
 . 			IN SOA	a.root.servers.nil. each.isc.org. (
 				2000042100   	; serial
diff --git a/bin/tests/system/autosign/ns2/bar.db.in b/bin/tests/system/autosign/ns2/bar.db.in
index 0aacb0f0d00..a78c518b0b6 100644
--- a/bin/tests/system/autosign/ns2/bar.db.in
+++ b/bin/tests/system/autosign/ns2/bar.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: bar.db.in,v 1.3 2010/01/18 23:48:40 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/autosign/ns2/child.nsec3.example.db b/bin/tests/system/autosign/ns2/child.nsec3.example.db
index 3a6b7e1fc2a..8c7db6531ce 100644
--- a/bin/tests/system/autosign/ns2/child.nsec3.example.db
+++ b/bin/tests/system/autosign/ns2/child.nsec3.example.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: child.nsec3.example.db,v 1.3 2009/11/30 23:48:02 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2006081400 ; serial
diff --git a/bin/tests/system/autosign/ns2/child.optout.example.db b/bin/tests/system/autosign/ns2/child.optout.example.db
index b637d8931de..8c7db6531ce 100644
--- a/bin/tests/system/autosign/ns2/child.optout.example.db
+++ b/bin/tests/system/autosign/ns2/child.optout.example.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: child.optout.example.db,v 1.3 2009/11/30 23:48:02 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2006081400 ; serial
diff --git a/bin/tests/system/autosign/ns2/dst.example.db.in b/bin/tests/system/autosign/ns2/dst.example.db.in
index ab610599895..769d2b5f065 100644
--- a/bin/tests/system/autosign/ns2/dst.example.db.in
+++ b/bin/tests/system/autosign/ns2/dst.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: dst.example.db.in,v 1.3 2009/11/30 23:48:02 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/autosign/ns2/example.db.in b/bin/tests/system/autosign/ns2/example.db.in
index a6529bc0256..b4eeccbecfa 100644
--- a/bin/tests/system/autosign/ns2/example.db.in
+++ b/bin/tests/system/autosign/ns2/example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example.db.in,v 1.5 2010/01/18 23:48:40 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/autosign/ns2/insecure.secure.example.db b/bin/tests/system/autosign/ns2/insecure.secure.example.db
index abf727bcb7d..86552149e16 100644
--- a/bin/tests/system/autosign/ns2/insecure.secure.example.db
+++ b/bin/tests/system/autosign/ns2/insecure.secure.example.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: insecure.secure.example.db,v 1.3 2009/11/30 23:48:02 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/autosign/ns2/private.secure.example.db.in b/bin/tests/system/autosign/ns2/private.secure.example.db.in
index 422982c4c1a..37a77b72f5d 100644
--- a/bin/tests/system/autosign/ns2/private.secure.example.db.in
+++ b/bin/tests/system/autosign/ns2/private.secure.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: private.secure.example.db.in,v 1.3 2009/11/30 23:48:02 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/autosign/ns3/autonsec3.example.db.in b/bin/tests/system/autosign/ns3/autonsec3.example.db.in
index 6e631afc4d8..0b160d79c26 100644
--- a/bin/tests/system/autosign/ns3/autonsec3.example.db.in
+++ b/bin/tests/system/autosign/ns3/autonsec3.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: autonsec3.example.db.in,v 1.3 2011/06/10 23:47:31 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/autosign/ns3/delay.example.db b/bin/tests/system/autosign/ns3/delay.example.db
index 8ba14542ecb..cbfb691d08d 100644
--- a/bin/tests/system/autosign/ns3/delay.example.db
+++ b/bin/tests/system/autosign/ns3/delay.example.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: delay.example.db,v 1.2 2011/03/26 01:19:03 each Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2009102722 ; serial
diff --git a/bin/tests/system/autosign/ns3/inaczsk.example.db.in b/bin/tests/system/autosign/ns3/inaczsk.example.db.in
index 75ff5c25445..90dcba9daf2 100644
--- a/bin/tests/system/autosign/ns3/inaczsk.example.db.in
+++ b/bin/tests/system/autosign/ns3/inaczsk.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: inaczsk.example.db.in,v 1.2 2011/07/08 01:43:26 each Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				1          ; serial
diff --git a/bin/tests/system/autosign/ns3/insecure.example.db b/bin/tests/system/autosign/ns3/insecure.example.db
index 19f9a57160b..86552149e16 100644
--- a/bin/tests/system/autosign/ns3/insecure.example.db
+++ b/bin/tests/system/autosign/ns3/insecure.example.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: insecure.example.db,v 1.3 2009/11/30 23:48:02 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/autosign/ns3/nozsk.example.db.in b/bin/tests/system/autosign/ns3/nozsk.example.db.in
index 4dea5908079..90dcba9daf2 100644
--- a/bin/tests/system/autosign/ns3/nozsk.example.db.in
+++ b/bin/tests/system/autosign/ns3/nozsk.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: nozsk.example.db.in,v 1.2 2011/07/08 01:43:26 each Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				1          ; serial
diff --git a/bin/tests/system/autosign/ns3/nsec.example.db.in b/bin/tests/system/autosign/ns3/nsec.example.db.in
index 7733b473468..cbfb691d08d 100644
--- a/bin/tests/system/autosign/ns3/nsec.example.db.in
+++ b/bin/tests/system/autosign/ns3/nsec.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: nsec.example.db.in,v 1.2 2010/01/18 19:19:31 each Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2009102722 ; serial
diff --git a/bin/tests/system/autosign/ns3/nsec3-to-nsec.example.db.in b/bin/tests/system/autosign/ns3/nsec3-to-nsec.example.db.in
index 152cae17a33..cbfb691d08d 100644
--- a/bin/tests/system/autosign/ns3/nsec3-to-nsec.example.db.in
+++ b/bin/tests/system/autosign/ns3/nsec3-to-nsec.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: nsec3-to-nsec.example.db.in,v 1.2 2010/01/18 19:19:31 each Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2009102722 ; serial
diff --git a/bin/tests/system/autosign/ns3/nsec3.example.db.in b/bin/tests/system/autosign/ns3/nsec3.example.db.in
index d3042a45414..0b160d79c26 100644
--- a/bin/tests/system/autosign/ns3/nsec3.example.db.in
+++ b/bin/tests/system/autosign/ns3/nsec3.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: nsec3.example.db.in,v 1.3 2009/11/30 23:48:02 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/autosign/ns3/nsec3.nsec3.example.db.in b/bin/tests/system/autosign/ns3/nsec3.nsec3.example.db.in
index e5075523514..3f10748395e 100644
--- a/bin/tests/system/autosign/ns3/nsec3.nsec3.example.db.in
+++ b/bin/tests/system/autosign/ns3/nsec3.nsec3.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: nsec3.nsec3.example.db.in,v 1.3 2009/11/30 23:48:02 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/autosign/ns3/nsec3.optout.example.db.in b/bin/tests/system/autosign/ns3/nsec3.optout.example.db.in
index cee535cf28a..3f10748395e 100644
--- a/bin/tests/system/autosign/ns3/nsec3.optout.example.db.in
+++ b/bin/tests/system/autosign/ns3/nsec3.optout.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: nsec3.optout.example.db.in,v 1.3 2009/11/30 23:48:02 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/autosign/ns3/oldsigs.example.db.in b/bin/tests/system/autosign/ns3/oldsigs.example.db.in
index 1e63bcaf4a2..cbfb691d08d 100644
--- a/bin/tests/system/autosign/ns3/oldsigs.example.db.in
+++ b/bin/tests/system/autosign/ns3/oldsigs.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: oldsigs.example.db.in,v 1.2 2010/01/18 19:19:31 each Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2009102722 ; serial
diff --git a/bin/tests/system/autosign/ns3/optout.example.db.in b/bin/tests/system/autosign/ns3/optout.example.db.in
index de5bd18ea33..5d5416db2e6 100644
--- a/bin/tests/system/autosign/ns3/optout.example.db.in
+++ b/bin/tests/system/autosign/ns3/optout.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: optout.example.db.in,v 1.3 2009/11/30 23:48:02 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/autosign/ns3/optout.nsec3.example.db.in b/bin/tests/system/autosign/ns3/optout.nsec3.example.db.in
index dfdf102adcf..3f10748395e 100644
--- a/bin/tests/system/autosign/ns3/optout.nsec3.example.db.in
+++ b/bin/tests/system/autosign/ns3/optout.nsec3.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: optout.nsec3.example.db.in,v 1.3 2009/11/30 23:48:02 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/autosign/ns3/optout.optout.example.db.in b/bin/tests/system/autosign/ns3/optout.optout.example.db.in
index ab1ebea2b41..3f10748395e 100644
--- a/bin/tests/system/autosign/ns3/optout.optout.example.db.in
+++ b/bin/tests/system/autosign/ns3/optout.optout.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: optout.optout.example.db.in,v 1.3 2009/11/30 23:48:02 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/autosign/ns3/rsasha256.example.db.in b/bin/tests/system/autosign/ns3/rsasha256.example.db.in
index 0a81f94f930..862dadba981 100644
--- a/bin/tests/system/autosign/ns3/rsasha256.example.db.in
+++ b/bin/tests/system/autosign/ns3/rsasha256.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: rsasha256.example.db.in,v 1.2 2009/11/30 21:00:47 each Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2009102722 ; serial
diff --git a/bin/tests/system/autosign/ns3/rsasha512.example.db.in b/bin/tests/system/autosign/ns3/rsasha512.example.db.in
index 62827a9848b..862dadba981 100644
--- a/bin/tests/system/autosign/ns3/rsasha512.example.db.in
+++ b/bin/tests/system/autosign/ns3/rsasha512.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: rsasha512.example.db.in,v 1.2 2009/11/30 21:00:47 each Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2009102722 ; serial
diff --git a/bin/tests/system/autosign/ns3/secure-to-insecure.example.db.in b/bin/tests/system/autosign/ns3/secure-to-insecure.example.db.in
index d3541c977dd..86552149e16 100644
--- a/bin/tests/system/autosign/ns3/secure-to-insecure.example.db.in
+++ b/bin/tests/system/autosign/ns3/secure-to-insecure.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: secure-to-insecure.example.db.in,v 1.3 2010/01/18 23:48:40 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/autosign/ns3/secure-to-insecure2.example.db.in b/bin/tests/system/autosign/ns3/secure-to-insecure2.example.db.in
index 36548a14851..86552149e16 100644
--- a/bin/tests/system/autosign/ns3/secure-to-insecure2.example.db.in
+++ b/bin/tests/system/autosign/ns3/secure-to-insecure2.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: secure-to-insecure2.example.db.in,v 1.2 2010/05/19 07:45:38 marka Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/autosign/ns3/secure.example.db.in b/bin/tests/system/autosign/ns3/secure.example.db.in
index 6776adc5af4..3f10748395e 100644
--- a/bin/tests/system/autosign/ns3/secure.example.db.in
+++ b/bin/tests/system/autosign/ns3/secure.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: secure.example.db.in,v 1.3 2009/11/30 23:48:02 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/autosign/ns3/secure.nsec3.example.db.in b/bin/tests/system/autosign/ns3/secure.nsec3.example.db.in
index 80b23a2db89..3f10748395e 100644
--- a/bin/tests/system/autosign/ns3/secure.nsec3.example.db.in
+++ b/bin/tests/system/autosign/ns3/secure.nsec3.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: secure.nsec3.example.db.in,v 1.3 2009/11/30 23:48:02 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/autosign/ns3/secure.optout.example.db.in b/bin/tests/system/autosign/ns3/secure.optout.example.db.in
index b7cf8bf4f65..3f10748395e 100644
--- a/bin/tests/system/autosign/ns3/secure.optout.example.db.in
+++ b/bin/tests/system/autosign/ns3/secure.optout.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: secure.optout.example.db.in,v 1.3 2009/11/30 23:48:02 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/autosign/ns3/ttl1.example.db.in b/bin/tests/system/autosign/ns3/ttl1.example.db.in
index 293c6bf720a..cbfb691d08d 100644
--- a/bin/tests/system/autosign/ns3/ttl1.example.db.in
+++ b/bin/tests/system/autosign/ns3/ttl1.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: ttl1.example.db.in,v 1.3 2011/03/17 23:47:30 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2009102722 ; serial
diff --git a/bin/tests/system/autosign/ns3/ttl2.example.db.in b/bin/tests/system/autosign/ns3/ttl2.example.db.in
index 199467beccb..cbfb691d08d 100644
--- a/bin/tests/system/autosign/ns3/ttl2.example.db.in
+++ b/bin/tests/system/autosign/ns3/ttl2.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: ttl2.example.db.in,v 1.3 2011/03/17 23:47:30 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2009102722 ; serial
diff --git a/bin/tests/system/autosign/ns3/ttl3.example.db.in b/bin/tests/system/autosign/ns3/ttl3.example.db.in
index 7207d180938..cbfb691d08d 100644
--- a/bin/tests/system/autosign/ns3/ttl3.example.db.in
+++ b/bin/tests/system/autosign/ns3/ttl3.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: ttl3.example.db.in,v 1.3 2011/03/17 23:47:30 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2009102722 ; serial
diff --git a/bin/tests/system/autosign/ns3/ttl4.example.db.in b/bin/tests/system/autosign/ns3/ttl4.example.db.in
index c52b1e97e73..cbfb691d08d 100644
--- a/bin/tests/system/autosign/ns3/ttl4.example.db.in
+++ b/bin/tests/system/autosign/ns3/ttl4.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: ttl4.example.db.in,v 1.3 2011/03/17 23:47:30 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2009102722 ; serial
diff --git a/bin/tests/system/cacheclean/ns1/example.db b/bin/tests/system/cacheclean/ns1/example.db
index cb116a05c36..0231fbcd316 100644
--- a/bin/tests/system/cacheclean/ns1/example.db
+++ b/bin/tests/system/cacheclean/ns1/example.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example.db,v 1.5 2007/06/19 23:47:00 tbox Exp $
-
 $TTL 999999
 $ORIGIN .
 .                       IN SOA  hostmaster.nominum.com. a.root-servers.nil. (
diff --git a/bin/tests/system/cacheclean/ns1/flushtest.db b/bin/tests/system/cacheclean/ns1/flushtest.db
index 940a547f7d6..72a1096feed 100644
--- a/bin/tests/system/cacheclean/ns1/flushtest.db
+++ b/bin/tests/system/cacheclean/ns1/flushtest.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: flushtest.db,v 1.3 2011/08/03 23:47:48 tbox Exp $
-
 $TTL 3600
 $ORIGIN flushtest.example.
 @			IN SOA	flushtest.example. ns.flushtest.example. (
diff --git a/bin/tests/system/checkconf/bad-also-notify.conf b/bin/tests/system/checkconf/bad-also-notify.conf
index a1e7f5e2adc..bf27dab0a62 100644
--- a/bin/tests/system/checkconf/bad-also-notify.conf
+++ b/bin/tests/system/checkconf/bad-also-notify.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
-
 /*
  * Missing master in also-notify clause.
  */
diff --git a/bin/tests/system/checkconf/bad-dnssec.conf b/bin/tests/system/checkconf/bad-dnssec.conf
index c5f3ac20038..9db164ed285 100644
--- a/bin/tests/system/checkconf/bad-dnssec.conf
+++ b/bin/tests/system/checkconf/bad-dnssec.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
-
 zone not-inline {
 	type slave;
 	masters { 127.0.0.1; };
diff --git a/bin/tests/system/checkconf/bad-many.conf b/bin/tests/system/checkconf/bad-many.conf
index bd3f0a2e7ee..27f7e9bd242 100644
--- a/bin/tests/system/checkconf/bad-many.conf
+++ b/bin/tests/system/checkconf/bad-many.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: bad.conf,v 1.4 2007/06/19 23:47:01 tbox Exp $ */
-
 options {
 	avoid-v4-udp-ports { 100; }
 	avoid-v6-udp-ports { 100; };
diff --git a/bin/tests/system/checkconf/bad-tsig.conf b/bin/tests/system/checkconf/bad-tsig.conf
index e98f1c366de..21be03e9d23 100644
--- a/bin/tests/system/checkconf/bad-tsig.conf
+++ b/bin/tests/system/checkconf/bad-tsig.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
-
 /* Bad secret */
 key "badtsig" {
 	algorithm hmac-md5;
diff --git a/bin/tests/system/checkconf/dlz-bad.conf b/bin/tests/system/checkconf/dlz-bad.conf
index de2f4da1fc8..2ba89b19d3f 100644
--- a/bin/tests/system/checkconf/dlz-bad.conf
+++ b/bin/tests/system/checkconf/dlz-bad.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
-
 dlz one {
 	database "one";
 };
diff --git a/bin/tests/system/checkconf/dnssec.1 b/bin/tests/system/checkconf/dnssec.1
index 429bb4abc9a..176711fc06a 100644
--- a/bin/tests/system/checkconf/dnssec.1
+++ b/bin/tests/system/checkconf/dnssec.1
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: dnssec.1,v 1.4 2011/05/08 07:12:47 marka Exp $ */
-
 options {
 	dnssec-enable no;
 	dnssec-validation yes;
diff --git a/bin/tests/system/checkconf/dnssec.2 b/bin/tests/system/checkconf/dnssec.2
index ee9fb4871e7..64db848ab1c 100644
--- a/bin/tests/system/checkconf/dnssec.2
+++ b/bin/tests/system/checkconf/dnssec.2
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: dnssec.2,v 1.5 2011/11/07 00:14:11 marka Exp $ */
-
 options {
 	dnssec-enable no;
 };
diff --git a/bin/tests/system/checkconf/dnssec.3 b/bin/tests/system/checkconf/dnssec.3
index a07a8cc6fd9..fbb5882deb9 100644
--- a/bin/tests/system/checkconf/dnssec.3
+++ b/bin/tests/system/checkconf/dnssec.3
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: dnssec.3,v 1.5 2011/11/07 00:14:11 marka Exp $ */
-
 options {
 	dnssec-validation no;
 };
diff --git a/bin/tests/system/checknames/ns1/fail.example.db.in b/bin/tests/system/checknames/ns1/fail.example.db.in
index cb61359f090..a984471212c 100644
--- a/bin/tests/system/checknames/ns1/fail.example.db.in
+++ b/bin/tests/system/checknames/ns1/fail.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: fail.example.db.in,v 1.5 2007/06/19 23:47:01 tbox Exp $
-
 $TTL 300
 @	SOA ns1.fail.example. hostmaster.fail.example. (
 	    1 3600 1200 604800 3600 )
diff --git a/bin/tests/system/checknames/ns1/fail.update.db.in b/bin/tests/system/checknames/ns1/fail.update.db.in
index b0c65797417..218f6bc35bb 100644
--- a/bin/tests/system/checknames/ns1/fail.update.db.in
+++ b/bin/tests/system/checknames/ns1/fail.update.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: fail.update.db.in,v 1.5 2007/06/19 23:47:01 tbox Exp $
-
 $TTL 300
 @	SOA ns1.fail.update. hostmaster.fail.update. (
 	    1 3600 1200 604800 3600 )
diff --git a/bin/tests/system/checknames/ns1/ignore.example.db.in b/bin/tests/system/checknames/ns1/ignore.example.db.in
index f99ba478a2c..050041e2eb4 100644
--- a/bin/tests/system/checknames/ns1/ignore.example.db.in
+++ b/bin/tests/system/checknames/ns1/ignore.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: ignore.example.db.in,v 1.5 2007/06/19 23:47:01 tbox Exp $
-
 $TTL 300
 @	SOA ns1.ignore.example. hostmaster.ignore.example. (
 	    1 3600 1200 604800 3600 )
diff --git a/bin/tests/system/checknames/ns1/ignore.update.db.in b/bin/tests/system/checknames/ns1/ignore.update.db.in
index 1c77f119c34..f7864ab322a 100644
--- a/bin/tests/system/checknames/ns1/ignore.update.db.in
+++ b/bin/tests/system/checknames/ns1/ignore.update.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: ignore.update.db.in,v 1.5 2007/06/19 23:47:01 tbox Exp $
-
 $TTL 300
 @	SOA ns1.ignore.update. hostmaster.ignore.update. (
 	    1 3600 1200 604800 3600 )
diff --git a/bin/tests/system/checknames/ns1/root.db b/bin/tests/system/checknames/ns1/root.db
index a47e05191de..1a0d44bdc5c 100644
--- a/bin/tests/system/checknames/ns1/root.db
+++ b/bin/tests/system/checknames/ns1/root.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.db,v 1.5 2007/06/19 23:47:01 tbox Exp $
-
 $TTL 300
 @	SOA ns1. hostmaster.warn.example. (
 	    1 3600 1200 604800 3600 )
diff --git a/bin/tests/system/checknames/ns1/warn.example.db.in b/bin/tests/system/checknames/ns1/warn.example.db.in
index eccd876634e..bc4d1c08fc7 100644
--- a/bin/tests/system/checknames/ns1/warn.example.db.in
+++ b/bin/tests/system/checknames/ns1/warn.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: warn.example.db.in,v 1.5 2007/06/19 23:47:01 tbox Exp $
-
 $TTL 300
 @	SOA ns1.warn.example. hostmaster.warn.example. (
 	    1 3600 1200 604800 3600 )
diff --git a/bin/tests/system/checknames/ns1/warn.update.db.in b/bin/tests/system/checknames/ns1/warn.update.db.in
index 28230ae70e3..1bf280a9077 100644
--- a/bin/tests/system/checknames/ns1/warn.update.db.in
+++ b/bin/tests/system/checknames/ns1/warn.update.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: warn.update.db.in,v 1.5 2007/06/19 23:47:01 tbox Exp $
-
 $TTL 300
 @	SOA ns1.warn.update. hostmaster.warn.update. (
 	    1 3600 1200 604800 3600 )
diff --git a/bin/tests/system/checknames/ns2/root.hints b/bin/tests/system/checknames/ns2/root.hints
index 05378430f0c..962d33d9d03 100644
--- a/bin/tests/system/checknames/ns2/root.hints
+++ b/bin/tests/system/checknames/ns2/root.hints
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.hints,v 1.5 2007/06/19 23:47:01 tbox Exp $
-
 $TTL 300
 . NS  ns1.
 ns1. A 10.53.0.1
diff --git a/bin/tests/system/checknames/ns3/root.hints b/bin/tests/system/checknames/ns3/root.hints
index 05378430f0c..962d33d9d03 100644
--- a/bin/tests/system/checknames/ns3/root.hints
+++ b/bin/tests/system/checknames/ns3/root.hints
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.hints,v 1.5 2007/06/19 23:47:01 tbox Exp $
-
 $TTL 300
 . NS  ns1.
 ns1. A 10.53.0.1
diff --git a/bin/tests/system/checknames/ns4/master-ignore.update.db.in b/bin/tests/system/checknames/ns4/master-ignore.update.db.in
index 1c77f119c34..f7864ab322a 100644
--- a/bin/tests/system/checknames/ns4/master-ignore.update.db.in
+++ b/bin/tests/system/checknames/ns4/master-ignore.update.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: ignore.update.db.in,v 1.5 2007/06/19 23:47:01 tbox Exp $
-
 $TTL 300
 @	SOA ns1.ignore.update. hostmaster.ignore.update. (
 	    1 3600 1200 604800 3600 )
diff --git a/bin/tests/system/checknames/ns4/root.hints b/bin/tests/system/checknames/ns4/root.hints
index 05378430f0c..962d33d9d03 100644
--- a/bin/tests/system/checknames/ns4/root.hints
+++ b/bin/tests/system/checknames/ns4/root.hints
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.hints,v 1.5 2007/06/19 23:47:01 tbox Exp $
-
 $TTL 300
 . NS  ns1.
 ns1. A 10.53.0.1
diff --git a/bin/tests/system/checkzone/zones/good1.db b/bin/tests/system/checkzone/zones/good1.db
index 3c1b74b2003..f77f3ec2269 100644
--- a/bin/tests/system/checkzone/zones/good1.db
+++ b/bin/tests/system/checkzone/zones/good1.db
@@ -7,9 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: good1.db,v 1.2 2011/03/02 04:20:34 marka Exp $
-
-
 $TTL 600
 @		SOA     ns hostmaster 2011012708 3600 1200 604800 1200
                 NS      ns
diff --git a/bin/tests/system/cleanpkcs11.sh b/bin/tests/system/cleanpkcs11.sh
index 4096c0bea26..b974708b1c9 100644
--- a/bin/tests/system/cleanpkcs11.sh
+++ b/bin/tests/system/cleanpkcs11.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: cleanpkcs11.sh,v 1.3 2010/06/08 23:50:24 tbox Exp $
-
 SYSTEMTESTTOP=.
 . $SYSTEMTESTTOP/conf.sh
 
diff --git a/bin/tests/system/common/controls.conf b/bin/tests/system/common/controls.conf
index 1a2cb7815d1..8cd709cb659 100644
--- a/bin/tests/system/common/controls.conf
+++ b/bin/tests/system/common/controls.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: controls.conf,v 1.6 2007/06/19 23:47:01 tbox Exp $ */
-
 key rndc_key {
 	secret "1234abcd8765";
 	algorithm hmac-sha256;
diff --git a/bin/tests/system/common/rndc.conf b/bin/tests/system/common/rndc.conf
index da9d784ed81..8fe0bc3b4f8 100644
--- a/bin/tests/system/common/rndc.conf
+++ b/bin/tests/system/common/rndc.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: rndc.conf,v 1.5 2007/06/19 23:47:01 tbox Exp $ */
-
 options {
 	default-key     "rndc_key";
 };
diff --git a/bin/tests/system/common/rndc.key b/bin/tests/system/common/rndc.key
index 7a0f79f9c68..b9def8ec5d4 100644
--- a/bin/tests/system/common/rndc.key
+++ b/bin/tests/system/common/rndc.key
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: rndc.key,v 1.3 2011/03/12 04:59:47 tbox Exp $ */
-
 key rndc_key {
 	secret "1234abcd8765";
 	algorithm hmac-sha256;
diff --git a/bin/tests/system/common/root.hint b/bin/tests/system/common/root.hint
index 7f5cc13dbb6..418ea963faa 100644
--- a/bin/tests/system/common/root.hint
+++ b/bin/tests/system/common/root.hint
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.hint,v 1.5 2007/06/19 23:47:01 tbox Exp $
-
 $TTL 999999
 .			 IN NS	a.root-servers.nil.
 a.root-servers.nil.	 IN A	10.53.0.1
diff --git a/bin/tests/system/cookie/ns1/root.hint b/bin/tests/system/cookie/ns1/root.hint
index 6671358152a..64769b9fe64 100644
--- a/bin/tests/system/cookie/ns1/root.hint
+++ b/bin/tests/system/cookie/ns1/root.hint
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.hint,v 1.7 2007/06/19 23:47:05 tbox Exp $
-
 $TTL 999999
 .			 IN NS	a.root-servers.nil.
 a.root-servers.nil.	 IN A	10.53.0.2
diff --git a/bin/tests/system/cookie/ns3/root.hint b/bin/tests/system/cookie/ns3/root.hint
index 6671358152a..64769b9fe64 100644
--- a/bin/tests/system/cookie/ns3/root.hint
+++ b/bin/tests/system/cookie/ns3/root.hint
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.hint,v 1.7 2007/06/19 23:47:05 tbox Exp $
-
 $TTL 999999
 .			 IN NS	a.root-servers.nil.
 a.root-servers.nil.	 IN A	10.53.0.2
diff --git a/bin/tests/system/cookie/ns4/root.hint b/bin/tests/system/cookie/ns4/root.hint
index 6671358152a..64769b9fe64 100644
--- a/bin/tests/system/cookie/ns4/root.hint
+++ b/bin/tests/system/cookie/ns4/root.hint
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.hint,v 1.7 2007/06/19 23:47:05 tbox Exp $
-
 $TTL 999999
 .			 IN NS	a.root-servers.nil.
 a.root-servers.nil.	 IN A	10.53.0.2
diff --git a/bin/tests/system/cookie/ns5/root.hint b/bin/tests/system/cookie/ns5/root.hint
index 6671358152a..64769b9fe64 100644
--- a/bin/tests/system/cookie/ns5/root.hint
+++ b/bin/tests/system/cookie/ns5/root.hint
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.hint,v 1.7 2007/06/19 23:47:05 tbox Exp $
-
 $TTL 999999
 .			 IN NS	a.root-servers.nil.
 a.root-servers.nil.	 IN A	10.53.0.2
diff --git a/bin/tests/system/cookie/ns6/root.hint b/bin/tests/system/cookie/ns6/root.hint
index 6671358152a..64769b9fe64 100644
--- a/bin/tests/system/cookie/ns6/root.hint
+++ b/bin/tests/system/cookie/ns6/root.hint
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.hint,v 1.7 2007/06/19 23:47:05 tbox Exp $
-
 $TTL 999999
 .			 IN NS	a.root-servers.nil.
 a.root-servers.nil.	 IN A	10.53.0.2
diff --git a/bin/tests/system/dialup/ns1/example.db b/bin/tests/system/dialup/ns1/example.db
index 14fe49ed725..e1f203ee642 100644
--- a/bin/tests/system/dialup/ns1/example.db
+++ b/bin/tests/system/dialup/ns1/example.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example.db,v 1.6 2007/06/19 23:47:01 tbox Exp $
-
 @	3600	SOA	hostmaster.ns1 ns1 (
 			1 3600 1200 3600000 1200 )
 		NS	ns1.example.
diff --git a/bin/tests/system/dialup/ns1/named.conf b/bin/tests/system/dialup/ns1/named.conf
index 99767c1cb45..d184cd824ac 100644
--- a/bin/tests/system/dialup/ns1/named.conf
+++ b/bin/tests/system/dialup/ns1/named.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: named.conf,v 1.8 2007/06/19 23:47:01 tbox Exp $ */
-
 controls { /* empty */ };
 
 options {
diff --git a/bin/tests/system/dialup/ns1/root.db b/bin/tests/system/dialup/ns1/root.db
index ad26e691816..7baffd2bf3c 100644
--- a/bin/tests/system/dialup/ns1/root.db
+++ b/bin/tests/system/dialup/ns1/root.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.db,v 1.6 2007/06/19 23:47:01 tbox Exp $
-
 @	3600	SOA	hostmaster.ns1.example ns1.example (
 			1 3600 1200 3600000 1200 )
 		NS	ns1.example
diff --git a/bin/tests/system/dialup/ns2/hint.db b/bin/tests/system/dialup/ns2/hint.db
index d15ffb71322..ffb6dcff3df 100644
--- a/bin/tests/system/dialup/ns2/hint.db
+++ b/bin/tests/system/dialup/ns2/hint.db
@@ -7,7 +7,5 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: hint.db,v 1.6 2007/06/19 23:47:01 tbox Exp $
-
 .	1200	NS	ns1.example
 ns1.example	A	10.53.0.1
diff --git a/bin/tests/system/dialup/ns2/named.conf b/bin/tests/system/dialup/ns2/named.conf
index 7980c664a61..a71d685b459 100644
--- a/bin/tests/system/dialup/ns2/named.conf
+++ b/bin/tests/system/dialup/ns2/named.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: named.conf,v 1.8 2007/06/19 23:47:02 tbox Exp $ */
-
 controls { /* empty */ };
 
 options {
diff --git a/bin/tests/system/dialup/ns3/hint.db b/bin/tests/system/dialup/ns3/hint.db
index 8b422f5096f..ffb6dcff3df 100644
--- a/bin/tests/system/dialup/ns3/hint.db
+++ b/bin/tests/system/dialup/ns3/hint.db
@@ -7,7 +7,5 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: hint.db,v 1.6 2007/06/19 23:47:02 tbox Exp $
-
 .	1200	NS	ns1.example
 ns1.example	A	10.53.0.1
diff --git a/bin/tests/system/dialup/ns3/named.conf b/bin/tests/system/dialup/ns3/named.conf
index 73a337d7285..7a7b42470f1 100644
--- a/bin/tests/system/dialup/ns3/named.conf
+++ b/bin/tests/system/dialup/ns3/named.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: named.conf,v 1.8 2007/06/19 23:47:02 tbox Exp $ */
-
 controls { /* empty */ };
 
 options {
diff --git a/bin/tests/system/dialup/setup.sh b/bin/tests/system/dialup/setup.sh
index d34d2980144..d97a021178e 100644
--- a/bin/tests/system/dialup/setup.sh
+++ b/bin/tests/system/dialup/setup.sh
@@ -7,7 +7,5 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: setup.sh,v 1.6 2007/06/19 23:47:01 tbox Exp $
-
 rm -f ns2/example.bk
 rm -f ns3/example.bk
diff --git a/bin/tests/system/digcomp.pl b/bin/tests/system/digcomp.pl
index d0696e3a9ae..5c2e85c0816 100644
--- a/bin/tests/system/digcomp.pl
+++ b/bin/tests/system/digcomp.pl
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: digcomp.pl,v 1.14 2007/06/19 23:47:00 tbox Exp $
-
 # Compare two files, each with the output from dig, for differences.
 # Ignore "unimportant" differences, like ordering of NS lines, TTL's,
 # etc...
diff --git a/bin/tests/system/dlv/ns1/root.db.in b/bin/tests/system/dlv/ns1/root.db.in
index e2ce3f07bcd..a4d4bd92691 100644
--- a/bin/tests/system/dlv/ns1/root.db.in
+++ b/bin/tests/system/dlv/ns1/root.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.db.in,v 1.3 2011/05/26 23:47:28 tbox Exp $
-
 $TTL	120
 @		SOA	ns.rootservers.utld hostmaster.ns.rootservers.utld (
 			1 3600 1200 604800 60 )
diff --git a/bin/tests/system/dlv/ns1/rootservers.utld.db b/bin/tests/system/dlv/ns1/rootservers.utld.db
index 820e610bf17..8491ed0e305 100644
--- a/bin/tests/system/dlv/ns1/rootservers.utld.db
+++ b/bin/tests/system/dlv/ns1/rootservers.utld.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: rootservers.utld.db,v 1.4 2007/06/19 23:47:02 tbox Exp $
-
 $TTL	120
 @	SOA	ns hostmaster.ns 1 3600 1200 604800 60
 @	NS	ns
diff --git a/bin/tests/system/dlv/ns2/druz.db.in b/bin/tests/system/dlv/ns2/druz.db.in
index 149ee853769..4e0f892a53f 100644
--- a/bin/tests/system/dlv/ns2/druz.db.in
+++ b/bin/tests/system/dlv/ns2/druz.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: druz.db.in,v 1.4 2011/05/26 23:47:28 tbox Exp $
-
 $TTL	120
 @		SOA	ns hostmaster.ns 1 3600 1200 604800 60
 @		NS	ns
diff --git a/bin/tests/system/dlv/ns2/hints b/bin/tests/system/dlv/ns2/hints
index 5916e9f781f..381e86b1522 100644
--- a/bin/tests/system/dlv/ns2/hints
+++ b/bin/tests/system/dlv/ns2/hints
@@ -7,7 +7,5 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: hints,v 1.4 2007/06/19 23:47:02 tbox Exp $
-
 . 0 NS ns.rootservers.utld.
 ns.rootservers.utld. 0 A 10.53.0.1
diff --git a/bin/tests/system/dlv/ns2/utld.db b/bin/tests/system/dlv/ns2/utld.db
index c64a02902fc..66f559d76f5 100644
--- a/bin/tests/system/dlv/ns2/utld.db
+++ b/bin/tests/system/dlv/ns2/utld.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: utld.db,v 1.4 2007/06/19 23:47:02 tbox Exp $
-
 $TTL	120
 @		SOA	ns hostmaster.ns 1 3600 1200 604800 60
 @		NS	ns
diff --git a/bin/tests/system/dlv/ns3/child.db.in b/bin/tests/system/dlv/ns3/child.db.in
index 5128a0d8d92..11df807ab75 100644
--- a/bin/tests/system/dlv/ns3/child.db.in
+++ b/bin/tests/system/dlv/ns3/child.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: child.db.in,v 1.6 2010/05/27 23:51:08 tbox Exp $
-
 $TTL	120
 @		SOA	ns hostmaster.ns 1 3600 1200 604800 60
 @		NS	ns
diff --git a/bin/tests/system/dlv/ns3/dlv.db.in b/bin/tests/system/dlv/ns3/dlv.db.in
index d25b9d8148f..fdc8ce99016 100644
--- a/bin/tests/system/dlv/ns3/dlv.db.in
+++ b/bin/tests/system/dlv/ns3/dlv.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: dlv.db.in,v 1.4 2007/06/19 23:47:02 tbox Exp $
-
 $TTL	120
 @		SOA	ns hostmaster.ns 1 3600 1200 604800 60
 @		NS	ns
diff --git a/bin/tests/system/dlv/ns3/hints b/bin/tests/system/dlv/ns3/hints
index 5916e9f781f..381e86b1522 100644
--- a/bin/tests/system/dlv/ns3/hints
+++ b/bin/tests/system/dlv/ns3/hints
@@ -7,7 +7,5 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: hints,v 1.4 2007/06/19 23:47:02 tbox Exp $
-
 . 0 NS ns.rootservers.utld.
 ns.rootservers.utld. 0 A 10.53.0.1
diff --git a/bin/tests/system/dlv/ns4/child.db b/bin/tests/system/dlv/ns4/child.db
index 2a94c7968ae..c123f70a950 100644
--- a/bin/tests/system/dlv/ns4/child.db
+++ b/bin/tests/system/dlv/ns4/child.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: child.db,v 1.4 2007/06/19 23:47:02 tbox Exp $
-
 $TTL	120
 @		SOA	ns hostmaster.ns 1 3600 1200 604800 60
 @		NS	ns
diff --git a/bin/tests/system/dlv/ns4/hints b/bin/tests/system/dlv/ns4/hints
index 5916e9f781f..381e86b1522 100644
--- a/bin/tests/system/dlv/ns4/hints
+++ b/bin/tests/system/dlv/ns4/hints
@@ -7,7 +7,5 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: hints,v 1.4 2007/06/19 23:47:02 tbox Exp $
-
 . 0 NS ns.rootservers.utld.
 ns.rootservers.utld. 0 A 10.53.0.1
diff --git a/bin/tests/system/dlv/ns5/hints b/bin/tests/system/dlv/ns5/hints
index 5916e9f781f..381e86b1522 100644
--- a/bin/tests/system/dlv/ns5/hints
+++ b/bin/tests/system/dlv/ns5/hints
@@ -7,7 +7,5 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: hints,v 1.4 2007/06/19 23:47:02 tbox Exp $
-
 . 0 NS ns.rootservers.utld.
 ns.rootservers.utld. 0 A 10.53.0.1
diff --git a/bin/tests/system/dlv/ns5/rndc.conf b/bin/tests/system/dlv/ns5/rndc.conf
index 070afc5ec9e..02bce927088 100644
--- a/bin/tests/system/dlv/ns5/rndc.conf
+++ b/bin/tests/system/dlv/ns5/rndc.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: rndc.conf,v 1.5 2007/06/19 23:47:02 tbox Exp $ */
-
 key "cc64b3d1db63fc88d7cb5d2f9f57d258" {
 	algorithm hmac-sha256;
 	secret "34f88008d07deabbe65bd01f1d233d47";
diff --git a/bin/tests/system/dlv/ns6/child.db.in b/bin/tests/system/dlv/ns6/child.db.in
index 6f884d5b871..09a942ed5f8 100644
--- a/bin/tests/system/dlv/ns6/child.db.in
+++ b/bin/tests/system/dlv/ns6/child.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: child.db.in,v 1.2 2010/05/26 06:28:00 marka Exp $
-
 $TTL	120
 @		SOA	ns hostmaster.ns6 1 3600 1200 604800 60
 @		NS	ns
diff --git a/bin/tests/system/dlv/ns6/hints b/bin/tests/system/dlv/ns6/hints
index 643113edeec..381e86b1522 100644
--- a/bin/tests/system/dlv/ns6/hints
+++ b/bin/tests/system/dlv/ns6/hints
@@ -7,7 +7,5 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: hints,v 1.3 2010/05/26 23:50:47 tbox Exp $
-
 . 0 NS ns.rootservers.utld.
 ns.rootservers.utld. 0 A 10.53.0.1
diff --git a/bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/DNAME=10=example.net.= b/bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/DNAME=10=example.net.=
index f5f98dd4332..be99eb3e713 100644
--- a/bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/DNAME=10=example.net.=
+++ b/bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/DNAME=10=example.net.=
@@ -2,7 +2,5 @@ Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: DNAME=10=example.net.=,v 1.2 2010/08/16 04:46:15 marka Exp $
-
 The contents of this file is not read by the filesystem driver.
 This is the file for "DNAME 10 example.net.".
diff --git a/bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/NS=10=example.com.= b/bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/NS=10=example.com.=
index baf3b1c1d19..cca17c384a8 100644
--- a/bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/NS=10=example.com.=
+++ b/bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/NS=10=example.com.=
@@ -2,7 +2,5 @@ Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: NS=10=example.com.=,v 1.1 2010/08/16 04:46:15 marka Exp $
-
 The contents of this file is not read by the filesystem driver.
 This is the file for "NS 10 example.com.".
diff --git a/bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/SOA=10=ns.example.com.=root.example.com.=2010062900=0=0=0=10= b/bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/SOA=10=ns.example.com.=root.example.com.=2010062900=0=0=0=10=
index f684476fdab..bb5ebac9ef3 100644
--- a/bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/SOA=10=ns.example.com.=root.example.com.=2010062900=0=0=0=10=
+++ b/bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/SOA=10=ns.example.com.=root.example.com.=2010062900=0=0=0=10=
@@ -2,7 +2,5 @@ Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: SOA=10=ns.example.com.=root.example.com.=2010062900=0=0=0=10=,v 1.1 2010/08/16 04:46:15 marka Exp $
-
 The contents of this file is not read by the filesystem driver.
 This is the file for "SOA 10 ns.example.com. root.example.com. 2010062900 0 0 0 10".
diff --git a/bin/tests/system/dlz/ns1/dns-root/com/example/xfr.d/10.53.0.1 b/bin/tests/system/dlz/ns1/dns-root/com/example/xfr.d/10.53.0.1
index d9e52cd7252..70deea6eb0f 100644
--- a/bin/tests/system/dlz/ns1/dns-root/com/example/xfr.d/10.53.0.1
+++ b/bin/tests/system/dlz/ns1/dns-root/com/example/xfr.d/10.53.0.1
@@ -2,7 +2,5 @@ Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: 10.53.0.1,v 1.2 2010/08/16 04:46:16 marka Exp $
-
 The contents of this file are not read by the filesystem driver.
 The presence of this file allows 10.53.0.1 to transfer this zone.
diff --git a/bin/tests/system/dlzexternal/driver.h b/bin/tests/system/dlzexternal/driver.h
index 92e145b82c3..7a0ec612cd3 100644
--- a/bin/tests/system/dlzexternal/driver.h
+++ b/bin/tests/system/dlzexternal/driver.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: driver.h,v 1.4 2011/03/17 09:25:54 fdupont Exp $ */
 
 /*
  * This header includes the declarations of entry points.
diff --git a/bin/tests/system/dlzexternal/ns1/root.db b/bin/tests/system/dlzexternal/ns1/root.db
index 7e4a77a5241..45a6b04c592 100644
--- a/bin/tests/system/dlzexternal/ns1/root.db
+++ b/bin/tests/system/dlzexternal/ns1/root.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.db,v 1.9 2007-06-19 23:47:03 tbox Exp $
-
 $TTL 300
 . 			IN SOA	gson.nominum.com. a.root.servers.nil. (
 				2000042100   	; serial
diff --git a/bin/tests/system/dns64/conf/bad1.conf b/bin/tests/system/dns64/conf/bad1.conf
index fa14e828694..3f749175fd2 100644
--- a/bin/tests/system/dns64/conf/bad1.conf
+++ b/bin/tests/system/dns64/conf/bad1.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: bad1.conf,v 1.3 2010/12/08 23:51:55 tbox Exp $ */
-
 options {
 	dns64 ::/0 { };
 };
diff --git a/bin/tests/system/dns64/conf/bad2.conf b/bin/tests/system/dns64/conf/bad2.conf
index d3eaffb30d5..79bc04f319f 100644
--- a/bin/tests/system/dns64/conf/bad2.conf
+++ b/bin/tests/system/dns64/conf/bad2.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: bad2.conf,v 1.3 2010/12/08 23:51:56 tbox Exp $ */
-
 options {
 	dns64 ::/96 { suffix ::1; };
 };
diff --git a/bin/tests/system/dns64/conf/bad3.conf b/bin/tests/system/dns64/conf/bad3.conf
index 197e8a3dfc5..76f160693aa 100644
--- a/bin/tests/system/dns64/conf/bad3.conf
+++ b/bin/tests/system/dns64/conf/bad3.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: bad3.conf,v 1.3 2010/12/08 23:51:56 tbox Exp $ */
-
 options {
 	dns64 ::/96 { suffix 127.0.0.1; };
 };
diff --git a/bin/tests/system/dns64/conf/bad4.conf b/bin/tests/system/dns64/conf/bad4.conf
index 9d18f109d20..fbf60d1b814 100644
--- a/bin/tests/system/dns64/conf/bad4.conf
+++ b/bin/tests/system/dns64/conf/bad4.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: bad4.conf,v 1.3 2010/12/08 23:51:56 tbox Exp $ */
-
 options {
 	dns64 ::/129 { };
 };
diff --git a/bin/tests/system/dns64/conf/bad5.conf b/bin/tests/system/dns64/conf/bad5.conf
index e93b9758a69..fbf60d1b814 100644
--- a/bin/tests/system/dns64/conf/bad5.conf
+++ b/bin/tests/system/dns64/conf/bad5.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: bad5.conf,v 1.3 2010/12/08 23:51:56 tbox Exp $ */
-
 options {
 	dns64 ::/129 { };
 };
diff --git a/bin/tests/system/dns64/conf/bad6.conf b/bin/tests/system/dns64/conf/bad6.conf
index 49db7528cac..c29bb3e8ede 100644
--- a/bin/tests/system/dns64/conf/bad6.conf
+++ b/bin/tests/system/dns64/conf/bad6.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: bad6.conf,v 1.3 2010/12/08 23:51:56 tbox Exp $ */
-
 options {
 	dns64 :: { };
 };
diff --git a/bin/tests/system/dns64/conf/bad7.conf b/bin/tests/system/dns64/conf/bad7.conf
index bff50bfcc0b..06919f99b93 100644
--- a/bin/tests/system/dns64/conf/bad7.conf
+++ b/bin/tests/system/dns64/conf/bad7.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id:$ */
-
 options {
 	dns64 FC36:EAFE:F993::/64 {
 		exclude { bogusacl; };
diff --git a/bin/tests/system/dns64/conf/bad8.conf b/bin/tests/system/dns64/conf/bad8.conf
index d38b11905ed..794ad7e4a38 100644
--- a/bin/tests/system/dns64/conf/bad8.conf
+++ b/bin/tests/system/dns64/conf/bad8.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id:$ */
-
 options {
 	dns64 FC36:EAFE:F993::/64 {
 		clients { bogusacl; };
diff --git a/bin/tests/system/dns64/conf/bad9.conf b/bin/tests/system/dns64/conf/bad9.conf
index bb889a66df8..af4b6d912f2 100644
--- a/bin/tests/system/dns64/conf/bad9.conf
+++ b/bin/tests/system/dns64/conf/bad9.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id:$ */
-
 options {
 	dns64 FC36:EAFE:F993::/64 {
 		mapped { bogusacl; };
diff --git a/bin/tests/system/dns64/conf/good1.conf b/bin/tests/system/dns64/conf/good1.conf
index 770f3e19b2f..8013b94b69d 100644
--- a/bin/tests/system/dns64/conf/good1.conf
+++ b/bin/tests/system/dns64/conf/good1.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: good1.conf,v 1.3 2010/12/08 23:51:56 tbox Exp $ */
-
 acl rfc1918 { 10/8; 192.168/16; 172.16/12; };
 options {
 	/* Well Known Prefix */
diff --git a/bin/tests/system/dns64/conf/good2.conf b/bin/tests/system/dns64/conf/good2.conf
index ee0c92b71e1..4bd4780a58b 100644
--- a/bin/tests/system/dns64/conf/good2.conf
+++ b/bin/tests/system/dns64/conf/good2.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: good2.conf,v 1.3 2010/12/08 23:51:56 tbox Exp $ */
-
 acl rfc1918 { 10/8; 192.168/16; 172.16/12; };
 options {
 	/* Well Known Prefix */
diff --git a/bin/tests/system/dns64/conf/good3.conf b/bin/tests/system/dns64/conf/good3.conf
index 653d4902649..aa07886dcb0 100644
--- a/bin/tests/system/dns64/conf/good3.conf
+++ b/bin/tests/system/dns64/conf/good3.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: good3.conf,v 1.3 2010/12/08 23:51:56 tbox Exp $ */
-
 acl rfc1918 { 10/8; 192.168/16; 172.16/12; };
 options {
 	/* Well Known Prefix */
diff --git a/bin/tests/system/dns64/conf/good4.conf b/bin/tests/system/dns64/conf/good4.conf
index 0f92f0efdf1..7ba43076cd6 100644
--- a/bin/tests/system/dns64/conf/good4.conf
+++ b/bin/tests/system/dns64/conf/good4.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: good4.conf,v 1.3 2010/12/08 23:51:56 tbox Exp $ */
-
 acl rfc1918 { 10/8; 192.168/16; 172.16/12; };
 options {
 	/* Well Known Prefix */
diff --git a/bin/tests/system/dns64/conf/good5.conf b/bin/tests/system/dns64/conf/good5.conf
index 031f0e7a97d..8a558ba310e 100644
--- a/bin/tests/system/dns64/conf/good5.conf
+++ b/bin/tests/system/dns64/conf/good5.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: good5.conf,v 1.3 2010/12/08 23:51:56 tbox Exp $ */
-
 acl rfc1918 { 10/8; 192.168/16; 172.16/12; };
 options {
 	/* Well Known Prefix */
diff --git a/bin/tests/system/dns64/ns1/example.db b/bin/tests/system/dns64/ns1/example.db
index 65d73a90e44..d91fccede65 100644
--- a/bin/tests/system/dns64/ns1/example.db
+++ b/bin/tests/system/dns64/ns1/example.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example.db,v 1.5 2011/02/03 12:18:11 tbox Exp $
-
 $TTL	3600
 @	SOA ns1 marka.isc.org. 0 0 0 0 1200
 @	NS ns1
diff --git a/bin/tests/system/dns64/ns1/root.db b/bin/tests/system/dns64/ns1/root.db
index 15ae10ed305..532063c05c8 100644
--- a/bin/tests/system/dns64/ns1/root.db
+++ b/bin/tests/system/dns64/ns1/root.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.db,v 1.3 2010/12/08 23:51:56 tbox Exp $
-
 $TTL 3600
 @		SOA	a.root-servers.nil. marka.isc.org. 0 0 0 0 0
 @		NS	a.root-servers.nil.
diff --git a/bin/tests/system/dns64/ns1/sign.sh b/bin/tests/system/dns64/ns1/sign.sh
index 766fec772c8..88b1bbbb9c1 100644
--- a/bin/tests/system/dns64/ns1/sign.sh
+++ b/bin/tests/system/dns64/ns1/sign.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: sign.sh,v 1.3 2010/12/08 23:51:56 tbox Exp $
-
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
diff --git a/bin/tests/system/dnssec/README b/bin/tests/system/dnssec/README
index 65ef6018d41..c45bd71f23e 100644
--- a/bin/tests/system/dnssec/README
+++ b/bin/tests/system/dnssec/README
@@ -2,8 +2,6 @@ Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: README,v 1.10 2011/01/04 23:47:13 tbox Exp $
-
 The test setup for the DNSSEC tests has a secure root.
 
 ns1 is the root server.
diff --git a/bin/tests/system/dnssec/ns1/root.db.in b/bin/tests/system/dnssec/ns1/root.db.in
index 6a97a0b4663..5ad5d9ef1d3 100644
--- a/bin/tests/system/dnssec/ns1/root.db.in
+++ b/bin/tests/system/dnssec/ns1/root.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.db.in,v 1.12 2010/11/17 23:47:08 tbox Exp $
-
 $TTL 300
 . 			IN SOA	gson.nominum.com. a.root.servers.nil. (
 				2000042100   	; serial
diff --git a/bin/tests/system/dnssec/ns2/algroll.db.in b/bin/tests/system/dnssec/ns2/algroll.db.in
index ea10cedc01f..73c0d6bda82 100644
--- a/bin/tests/system/dnssec/ns2/algroll.db.in
+++ b/bin/tests/system/dnssec/ns2/algroll.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: algroll.db.in,v 1.3 2010/11/17 23:47:08 tbox Exp $
-
 $TTL 30	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/dnssec/ns2/badparam.db.in b/bin/tests/system/dnssec/ns2/badparam.db.in
index 510908b0ded..091e4ea24f5 100644
--- a/bin/tests/system/dnssec/ns2/badparam.db.in
+++ b/bin/tests/system/dnssec/ns2/badparam.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: badparam.db.in,v 1.2 2010/08/13 06:46:24 marka Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2010081000 ; serial
diff --git a/bin/tests/system/dnssec/ns2/child.nsec3.example.db b/bin/tests/system/dnssec/ns2/child.nsec3.example.db
index 4fae531451e..8c7db6531ce 100644
--- a/bin/tests/system/dnssec/ns2/child.nsec3.example.db
+++ b/bin/tests/system/dnssec/ns2/child.nsec3.example.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: child.nsec3.example.db,v 1.3 2008/09/25 04:02:38 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2006081400 ; serial
diff --git a/bin/tests/system/dnssec/ns2/child.optout.example.db b/bin/tests/system/dnssec/ns2/child.optout.example.db
index 9deaf0ded1b..8c7db6531ce 100644
--- a/bin/tests/system/dnssec/ns2/child.optout.example.db
+++ b/bin/tests/system/dnssec/ns2/child.optout.example.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: child.optout.example.db,v 1.3 2008/09/25 04:02:38 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2006081400 ; serial
diff --git a/bin/tests/system/dnssec/ns2/dlv.db.in b/bin/tests/system/dnssec/ns2/dlv.db.in
index 7904a300010..836359dc561 100644
--- a/bin/tests/system/dnssec/ns2/dlv.db.in
+++ b/bin/tests/system/dnssec/ns2/dlv.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: dlv.db.in,v 1.5 2007/06/19 23:47:02 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/dnssec/ns2/dst.example.db.in b/bin/tests/system/dnssec/ns2/dst.example.db.in
index c034f7fd9e9..769d2b5f065 100644
--- a/bin/tests/system/dnssec/ns2/dst.example.db.in
+++ b/bin/tests/system/dnssec/ns2/dst.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: dst.example.db.in,v 1.4 2007/06/19 23:47:02 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/dnssec/ns2/example.db.in b/bin/tests/system/dnssec/ns2/example.db.in
index cde6307467a..0b831ec94e3 100644
--- a/bin/tests/system/dnssec/ns2/example.db.in
+++ b/bin/tests/system/dnssec/ns2/example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example.db.in,v 1.31 2011/11/04 05:36:28 each Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/dnssec/ns2/private.secure.example.db.in b/bin/tests/system/dnssec/ns2/private.secure.example.db.in
index 519bdfe0bf2..98b43a017bd 100644
--- a/bin/tests/system/dnssec/ns2/private.secure.example.db.in
+++ b/bin/tests/system/dnssec/ns2/private.secure.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: private.secure.example.db.in,v 1.10 2007/06/19 23:47:02 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/dnssec/ns2/single-nsec3.db.in b/bin/tests/system/dnssec/ns2/single-nsec3.db.in
index ef405a2cfbf..6fe1dd0a555 100644
--- a/bin/tests/system/dnssec/ns2/single-nsec3.db.in
+++ b/bin/tests/system/dnssec/ns2/single-nsec3.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: single-nsec3.db.in,v 1.2 2010/09/07 00:58:36 marka Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	ns2.example. . (
 				2010042407 ; serial
diff --git a/bin/tests/system/dnssec/ns3/auto-nsec.example.db.in b/bin/tests/system/dnssec/ns3/auto-nsec.example.db.in
index b2a45353c77..0e0e5e09e5d 100644
--- a/bin/tests/system/dnssec/ns3/auto-nsec.example.db.in
+++ b/bin/tests/system/dnssec/ns3/auto-nsec.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: auto-nsec.example.db.in,v 1.2 2011/02/15 22:02:36 marka Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/dnssec/ns3/auto-nsec3.example.db.in b/bin/tests/system/dnssec/ns3/auto-nsec3.example.db.in
index 64ee475495b..0e0e5e09e5d 100644
--- a/bin/tests/system/dnssec/ns3/auto-nsec3.example.db.in
+++ b/bin/tests/system/dnssec/ns3/auto-nsec3.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: auto-nsec3.example.db.in,v 1.2 2011/02/15 22:02:36 marka Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/dnssec/ns3/bogus.example.db.in b/bin/tests/system/dnssec/ns3/bogus.example.db.in
index 9bb46098337..8d49000ec17 100644
--- a/bin/tests/system/dnssec/ns3/bogus.example.db.in
+++ b/bin/tests/system/dnssec/ns3/bogus.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: bogus.example.db.in,v 1.9 2007/06/19 23:47:02 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/dnssec/ns3/dynamic.example.db.in b/bin/tests/system/dnssec/ns3/dynamic.example.db.in
index b9687d34094..c7dab830899 100644
--- a/bin/tests/system/dnssec/ns3/dynamic.example.db.in
+++ b/bin/tests/system/dnssec/ns3/dynamic.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: dynamic.example.db.in,v 1.5 2007/06/19 23:47:02 tbox Exp $
-
 ; This has the NS and glue at the apex because testing RT #2399
 ; requires we have only one name in the zone at a certain point
 ; during the test.
diff --git a/bin/tests/system/dnssec/ns3/expired.example.db.in b/bin/tests/system/dnssec/ns3/expired.example.db.in
index 9f5722bc91d..af312f2a16d 100644
--- a/bin/tests/system/dnssec/ns3/expired.example.db.in
+++ b/bin/tests/system/dnssec/ns3/expired.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: expired.example.db.in,v 1.2 2011/02/08 23:10:07 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/dnssec/ns3/expiring.example.db.in b/bin/tests/system/dnssec/ns3/expiring.example.db.in
index bc33a5eb6c0..4d8db530100 100644
--- a/bin/tests/system/dnssec/ns3/expiring.example.db.in
+++ b/bin/tests/system/dnssec/ns3/expiring.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: expiring.example.db.in,v 1.2 2011/05/21 15:07:10 each Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/dnssec/ns3/future.example.db.in b/bin/tests/system/dnssec/ns3/future.example.db.in
index 2a648799e5a..ddda25d2fd5 100644
--- a/bin/tests/system/dnssec/ns3/future.example.db.in
+++ b/bin/tests/system/dnssec/ns3/future.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: optout.example.db.in,v 1.3 2008/09/25 04:02:38 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/dnssec/ns3/inline.example.db b/bin/tests/system/dnssec/ns3/inline.example.db
index 009d2d26593..86552149e16 100644
--- a/bin/tests/system/dnssec/ns3/inline.example.db
+++ b/bin/tests/system/dnssec/ns3/inline.example.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: insecure.example.db,v 1.9 2007/06/19 23:47:02 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/dnssec/ns3/insecure.below-cname.example.db b/bin/tests/system/dnssec/ns3/insecure.below-cname.example.db
index 09df781b76d..86552149e16 100644
--- a/bin/tests/system/dnssec/ns3/insecure.below-cname.example.db
+++ b/bin/tests/system/dnssec/ns3/insecure.below-cname.example.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: insecure.below-cname.example.db,v 1.3 2011/03/01 23:48:06 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/dnssec/ns3/insecure.example.db b/bin/tests/system/dnssec/ns3/insecure.example.db
index 009d2d26593..86552149e16 100644
--- a/bin/tests/system/dnssec/ns3/insecure.example.db
+++ b/bin/tests/system/dnssec/ns3/insecure.example.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: insecure.example.db,v 1.9 2007/06/19 23:47:02 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/dnssec/ns3/insecure.nsec3.example.db b/bin/tests/system/dnssec/ns3/insecure.nsec3.example.db
index e5f82ea743c..86552149e16 100644
--- a/bin/tests/system/dnssec/ns3/insecure.nsec3.example.db
+++ b/bin/tests/system/dnssec/ns3/insecure.nsec3.example.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: insecure.nsec3.example.db,v 1.2 2008/09/24 02:46:21 marka Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/dnssec/ns3/insecure.optout.example.db b/bin/tests/system/dnssec/ns3/insecure.optout.example.db
index ecaab281b9c..86552149e16 100644
--- a/bin/tests/system/dnssec/ns3/insecure.optout.example.db
+++ b/bin/tests/system/dnssec/ns3/insecure.optout.example.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: insecure.optout.example.db,v 1.2 2008/09/24 02:46:21 marka Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/dnssec/ns3/kskonly.example.db.in b/bin/tests/system/dnssec/ns3/kskonly.example.db.in
index e0b6870e6a0..cbfb691d08d 100644
--- a/bin/tests/system/dnssec/ns3/kskonly.example.db.in
+++ b/bin/tests/system/dnssec/ns3/kskonly.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: kskonly.example.db.in,v 1.2 2010/01/18 19:19:31 each Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2009102722 ; serial
diff --git a/bin/tests/system/dnssec/ns3/lower.example.db.in b/bin/tests/system/dnssec/ns3/lower.example.db.in
index 07ea2b89136..7a3879fa78d 100644
--- a/bin/tests/system/dnssec/ns3/lower.example.db.in
+++ b/bin/tests/system/dnssec/ns3/lower.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: lower.example.db.in,v 1.1.2.1 2012/01/17 08:31:00 marka Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	MNAME1. . (
 				2012042407 ; serial
diff --git a/bin/tests/system/dnssec/ns3/multiple.example.db.in b/bin/tests/system/dnssec/ns3/multiple.example.db.in
index 4739e0cba5c..c9e7c2b3da7 100644
--- a/bin/tests/system/dnssec/ns3/multiple.example.db.in
+++ b/bin/tests/system/dnssec/ns3/multiple.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: multiple.example.db.in,v 1.3 2008/09/25 04:02:38 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/dnssec/ns3/nosign.example.db.in b/bin/tests/system/dnssec/ns3/nosign.example.db.in
index 620476740b7..f066e3c8366 100644
--- a/bin/tests/system/dnssec/ns3/nosign.example.db.in
+++ b/bin/tests/system/dnssec/ns3/nosign.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: nosign.example.db.in,v 1.2 2011/05/23 20:10:02 each Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/dnssec/ns3/nsec3-unknown.example.db.in b/bin/tests/system/dnssec/ns3/nsec3-unknown.example.db.in
index 33308f87dcf..c9e7c2b3da7 100644
--- a/bin/tests/system/dnssec/ns3/nsec3-unknown.example.db.in
+++ b/bin/tests/system/dnssec/ns3/nsec3-unknown.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: nsec3-unknown.example.db.in,v 1.3 2008/09/25 04:02:38 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/dnssec/ns3/nsec3.example.db.in b/bin/tests/system/dnssec/ns3/nsec3.example.db.in
index 386061af061..8761ebb0174 100644
--- a/bin/tests/system/dnssec/ns3/nsec3.example.db.in
+++ b/bin/tests/system/dnssec/ns3/nsec3.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: nsec3.example.db.in,v 1.3 2008/09/25 04:02:38 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/dnssec/ns3/nsec3.nsec3.example.db.in b/bin/tests/system/dnssec/ns3/nsec3.nsec3.example.db.in
index 9e69e15c668..3f10748395e 100644
--- a/bin/tests/system/dnssec/ns3/nsec3.nsec3.example.db.in
+++ b/bin/tests/system/dnssec/ns3/nsec3.nsec3.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: nsec3.nsec3.example.db.in,v 1.3 2008/09/25 04:02:38 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/dnssec/ns3/nsec3.optout.example.db.in b/bin/tests/system/dnssec/ns3/nsec3.optout.example.db.in
index d4a90f977c4..3f10748395e 100644
--- a/bin/tests/system/dnssec/ns3/nsec3.optout.example.db.in
+++ b/bin/tests/system/dnssec/ns3/nsec3.optout.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: nsec3.optout.example.db.in,v 1.3 2008/09/25 04:02:38 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/dnssec/ns3/optout-unknown.example.db.in b/bin/tests/system/dnssec/ns3/optout-unknown.example.db.in
index 21a17ea2cb1..c9e7c2b3da7 100644
--- a/bin/tests/system/dnssec/ns3/optout-unknown.example.db.in
+++ b/bin/tests/system/dnssec/ns3/optout-unknown.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: optout-unknown.example.db.in,v 1.3 2008/09/25 04:02:38 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/dnssec/ns3/optout.example.db.in b/bin/tests/system/dnssec/ns3/optout.example.db.in
index 2a648799e5a..ddda25d2fd5 100644
--- a/bin/tests/system/dnssec/ns3/optout.example.db.in
+++ b/bin/tests/system/dnssec/ns3/optout.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: optout.example.db.in,v 1.3 2008/09/25 04:02:38 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/dnssec/ns3/optout.nsec3.example.db.in b/bin/tests/system/dnssec/ns3/optout.nsec3.example.db.in
index 13ad8158ddc..3f10748395e 100644
--- a/bin/tests/system/dnssec/ns3/optout.nsec3.example.db.in
+++ b/bin/tests/system/dnssec/ns3/optout.nsec3.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: optout.nsec3.example.db.in,v 1.3 2008/09/25 04:02:38 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/dnssec/ns3/optout.optout.example.db.in b/bin/tests/system/dnssec/ns3/optout.optout.example.db.in
index 2b9dc947df9..3f10748395e 100644
--- a/bin/tests/system/dnssec/ns3/optout.optout.example.db.in
+++ b/bin/tests/system/dnssec/ns3/optout.optout.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: optout.optout.example.db.in,v 1.3 2008/09/25 04:02:38 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/dnssec/ns3/publish-inactive.example.db.in b/bin/tests/system/dnssec/ns3/publish-inactive.example.db.in
index 009d2d26593..86552149e16 100644
--- a/bin/tests/system/dnssec/ns3/publish-inactive.example.db.in
+++ b/bin/tests/system/dnssec/ns3/publish-inactive.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: insecure.example.db,v 1.9 2007/06/19 23:47:02 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/dnssec/ns3/rsasha256.example.db.in b/bin/tests/system/dnssec/ns3/rsasha256.example.db.in
index 1406e2cebb2..862dadba981 100644
--- a/bin/tests/system/dnssec/ns3/rsasha256.example.db.in
+++ b/bin/tests/system/dnssec/ns3/rsasha256.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: rsasha256.example.db.in,v 1.2 2009/10/27 22:25:37 marka Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2009102722 ; serial
diff --git a/bin/tests/system/dnssec/ns3/rsasha512.example.db.in b/bin/tests/system/dnssec/ns3/rsasha512.example.db.in
index 0886831facb..862dadba981 100644
--- a/bin/tests/system/dnssec/ns3/rsasha512.example.db.in
+++ b/bin/tests/system/dnssec/ns3/rsasha512.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: rsasha512.example.db.in,v 1.2 2009/10/27 22:25:37 marka Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2009102722 ; serial
diff --git a/bin/tests/system/dnssec/ns3/secure.below-cname.example.db.in b/bin/tests/system/dnssec/ns3/secure.below-cname.example.db.in
index b556a9ed660..86552149e16 100644
--- a/bin/tests/system/dnssec/ns3/secure.below-cname.example.db.in
+++ b/bin/tests/system/dnssec/ns3/secure.below-cname.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: secure.below-cname.example.db.in,v 1.3 2011/03/01 23:48:06 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/dnssec/ns3/secure.nsec3.example.db.in b/bin/tests/system/dnssec/ns3/secure.nsec3.example.db.in
index 2dec1e40bd2..3f10748395e 100644
--- a/bin/tests/system/dnssec/ns3/secure.nsec3.example.db.in
+++ b/bin/tests/system/dnssec/ns3/secure.nsec3.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: secure.nsec3.example.db.in,v 1.3 2008/09/25 04:02:38 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/dnssec/ns3/secure.optout.example.db.in b/bin/tests/system/dnssec/ns3/secure.optout.example.db.in
index 56c4976a7ab..3f10748395e 100644
--- a/bin/tests/system/dnssec/ns3/secure.optout.example.db.in
+++ b/bin/tests/system/dnssec/ns3/secure.optout.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: secure.optout.example.db.in,v 1.3 2008/09/25 04:02:38 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/dnssec/ns3/siginterval.example.db.in b/bin/tests/system/dnssec/ns3/siginterval.example.db.in
index 674ab82c366..703a306346c 100644
--- a/bin/tests/system/dnssec/ns3/siginterval.example.db.in
+++ b/bin/tests/system/dnssec/ns3/siginterval.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: upper.example.db.in,v 1.1.2.1 2012/01/17 08:31:00 marka Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2012042407 ; serial
diff --git a/bin/tests/system/dnssec/ns3/split-dnssec.example.db.in b/bin/tests/system/dnssec/ns3/split-dnssec.example.db.in
index 81fa6e7c601..8761ebb0174 100644
--- a/bin/tests/system/dnssec/ns3/split-dnssec.example.db.in
+++ b/bin/tests/system/dnssec/ns3/split-dnssec.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: split-dnssec.example.db.in,v 1.3 2011/03/05 23:52:29 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/dnssec/ns3/split-smart.example.db.in b/bin/tests/system/dnssec/ns3/split-smart.example.db.in
index 497e2be84c8..8761ebb0174 100644
--- a/bin/tests/system/dnssec/ns3/split-smart.example.db.in
+++ b/bin/tests/system/dnssec/ns3/split-smart.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: split-smart.example.db.in,v 1.3 2011/03/05 23:52:29 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/dnssec/ns3/ttlpatch.example.db.in b/bin/tests/system/dnssec/ns3/ttlpatch.example.db.in
index d7fc3e7a44e..86552149e16 100644
--- a/bin/tests/system/dnssec/ns3/ttlpatch.example.db.in
+++ b/bin/tests/system/dnssec/ns3/ttlpatch.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: ttlpatch.example.db.in,v 1.3 2011/02/28 23:47:39 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/dnssec/ns3/update-nsec3.example.db.in b/bin/tests/system/dnssec/ns3/update-nsec3.example.db.in
index ccd4c12b675..0e0e5e09e5d 100644
--- a/bin/tests/system/dnssec/ns3/update-nsec3.example.db.in
+++ b/bin/tests/system/dnssec/ns3/update-nsec3.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: update-nsec3.example.db.in,v 1.2 2011/02/14 23:53:44 marka Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/dnssec/ns3/upper.example.db.in b/bin/tests/system/dnssec/ns3/upper.example.db.in
index 674ab82c366..703a306346c 100644
--- a/bin/tests/system/dnssec/ns3/upper.example.db.in
+++ b/bin/tests/system/dnssec/ns3/upper.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: upper.example.db.in,v 1.1.2.1 2012/01/17 08:31:00 marka Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2012042407 ; serial
diff --git a/bin/tests/system/dnssec/ns5/trusted.conf.bad b/bin/tests/system/dnssec/ns5/trusted.conf.bad
index 8ad27d18753..ed30460bda4 100644
--- a/bin/tests/system/dnssec/ns5/trusted.conf.bad
+++ b/bin/tests/system/dnssec/ns5/trusted.conf.bad
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: trusted.conf.bad,v 1.9 2007/06/19 23:47:02 tbox Exp $ */
-
 trusted-keys {
     "." 256 3 1 "AQO6Cl+slAf+iuieDim9L3kujFHQD7s/IOj03ClMOpKYcTXtK4mRpuULVfvWxDi9Ew/gj0xLnnX7z9OJHIxLI+DSrAHd8Dm0XfBEAtVtJSn70GaPZgnLMw1rk5ap2DsEoWk=";
 };
diff --git a/bin/tests/system/dnssec/ns6/optout-tld.db.in b/bin/tests/system/dnssec/ns6/optout-tld.db.in
index b86563cee79..b90c9eaef92 100644
--- a/bin/tests/system/dnssec/ns6/optout-tld.db.in
+++ b/bin/tests/system/dnssec/ns6/optout-tld.db.in
@@ -7,7 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example.db.in,v 1.2 2010/06/03 06:29:03 marka Exp $
 $TTL 60
 optout-tld. 60 IN SOA example. . 0 0 0 0 0
 optout-tld. 60 IN NS ns6.optout-tld.
diff --git a/bin/tests/system/dnssec/ns6/sign.sh b/bin/tests/system/dnssec/ns6/sign.sh
index d8175d4f5dc..9266a646483 100644
--- a/bin/tests/system/dnssec/ns6/sign.sh
+++ b/bin/tests/system/dnssec/ns6/sign.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: sign.sh,v 1.43 2011/11/04 05:36:28 each Exp $
-
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
diff --git a/bin/tests/system/dnssec/ns7/named.nosoa b/bin/tests/system/dnssec/ns7/named.nosoa
index 21d970b965e..a7af1dd6c28 100644
--- a/bin/tests/system/dnssec/ns7/named.nosoa
+++ b/bin/tests/system/dnssec/ns7/named.nosoa
@@ -2,6 +2,4 @@ Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: named.nosoa,v 1.3 2010/06/26 23:46:49 tbox Exp $
-
 Add -T nosoa.
diff --git a/bin/tests/system/dnssec/ns7/nosoa.secure.example.db b/bin/tests/system/dnssec/ns7/nosoa.secure.example.db
index 6fcd498461d..e8949475c7d 100644
--- a/bin/tests/system/dnssec/ns7/nosoa.secure.example.db
+++ b/bin/tests/system/dnssec/ns7/nosoa.secure.example.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: nosoa.secure.example.db,v 1.2 2010/06/25 23:50:13 marka Exp $
-
 $TTL 300        ; 5 minutes
 @                       IN SOA  mname1. . (
                                 2010062400 ; serial
diff --git a/bin/tests/system/dnssec/ns7/sign.sh b/bin/tests/system/dnssec/ns7/sign.sh
index 4b08fa164a4..43e6dd338a6 100644
--- a/bin/tests/system/dnssec/ns7/sign.sh
+++ b/bin/tests/system/dnssec/ns7/sign.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: sign.sh,v 1.43 2011/11/04 05:36:28 each Exp $
-
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
diff --git a/bin/tests/system/dnssec/signer/example.db.in b/bin/tests/system/dnssec/signer/example.db.in
index e7589c1f16a..dbf60c1d596 100644
--- a/bin/tests/system/dnssec/signer/example.db.in
+++ b/bin/tests/system/dnssec/signer/example.db.in
@@ -7,7 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example.db.in,v 1.2 2010/06/03 06:29:03 marka Exp $
 $TTL 60
 example. 60 IN SOA example. . 0 0 0 0 0
 example. 60 IN NS example.
diff --git a/bin/tests/system/dnssec/signer/remove.db.in b/bin/tests/system/dnssec/signer/remove.db.in
index 7adb0c6106c..8e0fccdd66e 100644
--- a/bin/tests/system/dnssec/signer/remove.db.in
+++ b/bin/tests/system/dnssec/signer/remove.db.in
@@ -7,7 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example.db.in,v 1.2 2010/06/03 06:29:03 marka Exp $
 $TTL 60
 remove. 60 IN SOA remove. . 0 0 0 0 0
 remove. 60 IN NS remove.
diff --git a/bin/tests/system/dnssec/signer/remove2.db.in b/bin/tests/system/dnssec/signer/remove2.db.in
index fde5091fd68..aa1d2f55af7 100644
--- a/bin/tests/system/dnssec/signer/remove2.db.in
+++ b/bin/tests/system/dnssec/signer/remove2.db.in
@@ -7,7 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example.db.in,v 1.2 2010/06/03 06:29:03 marka Exp $
 $TTL 60
 remove. 60 IN SOA remove. . 0 0 0 0 0
 remove. 60 IN NS remove.
diff --git a/bin/tests/system/dsdigest/ns1/root.db.in b/bin/tests/system/dsdigest/ns1/root.db.in
index dffb20a4808..52232798fb6 100644
--- a/bin/tests/system/dsdigest/ns1/root.db.in
+++ b/bin/tests/system/dsdigest/ns1/root.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
 $TTL 300
 . 			IN SOA	marka.isc.org. a.root.servers.nil. (
 				2012062000   	; serial
diff --git a/bin/tests/system/dsdigest/ns2/bad.db.in b/bin/tests/system/dsdigest/ns2/bad.db.in
index a618ec3a0f5..ab5ce91b903 100644
--- a/bin/tests/system/dsdigest/ns2/bad.db.in
+++ b/bin/tests/system/dsdigest/ns2/bad.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/dsdigest/ns2/good.db.in b/bin/tests/system/dsdigest/ns2/good.db.in
index a618ec3a0f5..ab5ce91b903 100644
--- a/bin/tests/system/dsdigest/ns2/good.db.in
+++ b/bin/tests/system/dsdigest/ns2/good.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2000042407 ; serial
diff --git a/bin/tests/system/dsdigest/ns2/sign.sh b/bin/tests/system/dsdigest/ns2/sign.sh
index bf967b595e0..2c52d3bbf65 100644
--- a/bin/tests/system/dsdigest/ns2/sign.sh
+++ b/bin/tests/system/dsdigest/ns2/sign.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id$
-
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
diff --git a/bin/tests/system/ecdsa/ns1/named.conf b/bin/tests/system/ecdsa/ns1/named.conf
index f7cd7738d64..715f7d3f769 100644
--- a/bin/tests/system/ecdsa/ns1/named.conf
+++ b/bin/tests/system/ecdsa/ns1/named.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
-
 // NS1
 
 controls { /* empty */ };
diff --git a/bin/tests/system/ecdsa/ns1/root.db.in b/bin/tests/system/ecdsa/ns1/root.db.in
index d098a62106d..c0d7a839a84 100644
--- a/bin/tests/system/ecdsa/ns1/root.db.in
+++ b/bin/tests/system/ecdsa/ns1/root.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
 $TTL 300
 . 			IN SOA	fdupont.isc.org. a.root.servers.nil. (
 				2012040600   	; serial
diff --git a/bin/tests/system/ecdsa/ns2/named.conf b/bin/tests/system/ecdsa/ns2/named.conf
index 5e9cc8373ef..50621a53f16 100644
--- a/bin/tests/system/ecdsa/ns2/named.conf
+++ b/bin/tests/system/ecdsa/ns2/named.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
-
 // NS2
 
 controls { /* empty */ };
diff --git a/bin/tests/system/ecdsa/tests.sh b/bin/tests/system/ecdsa/tests.sh
index a72d18384fe..c4ceefc3460 100644
--- a/bin/tests/system/ecdsa/tests.sh
+++ b/bin/tests/system/ecdsa/tests.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id$
-
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
diff --git a/bin/tests/system/eddsa/ns1/named.conf b/bin/tests/system/eddsa/ns1/named.conf
index f7cd7738d64..715f7d3f769 100644
--- a/bin/tests/system/eddsa/ns1/named.conf
+++ b/bin/tests/system/eddsa/ns1/named.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
-
 // NS1
 
 controls { /* empty */ };
diff --git a/bin/tests/system/eddsa/ns1/root.db.in b/bin/tests/system/eddsa/ns1/root.db.in
index d098a62106d..c0d7a839a84 100644
--- a/bin/tests/system/eddsa/ns1/root.db.in
+++ b/bin/tests/system/eddsa/ns1/root.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
 $TTL 300
 . 			IN SOA	fdupont.isc.org. a.root.servers.nil. (
 				2012040600   	; serial
diff --git a/bin/tests/system/eddsa/ns2/example.com.db b/bin/tests/system/eddsa/ns2/example.com.db
index a022a84b94d..8a2b6cdf5b5 100644
--- a/bin/tests/system/eddsa/ns2/example.com.db
+++ b/bin/tests/system/eddsa/ns2/example.com.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
 $TTL 3600
 @ 			IN SOA	fdupont.isc.org. ns.example.com. (
 				2012040600   	; serial
diff --git a/bin/tests/system/eddsa/ns2/named.conf b/bin/tests/system/eddsa/ns2/named.conf
index 5e9cc8373ef..50621a53f16 100644
--- a/bin/tests/system/eddsa/ns2/named.conf
+++ b/bin/tests/system/eddsa/ns2/named.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
-
 // NS2
 
 controls { /* empty */ };
diff --git a/bin/tests/system/eddsa/tests.sh b/bin/tests/system/eddsa/tests.sh
index 6404956ca4e..361380cccde 100644
--- a/bin/tests/system/eddsa/tests.sh
+++ b/bin/tests/system/eddsa/tests.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id$
-
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
diff --git a/bin/tests/system/emptyzones/ns1/root.hint b/bin/tests/system/emptyzones/ns1/root.hint
index 6671358152a..64769b9fe64 100644
--- a/bin/tests/system/emptyzones/ns1/root.hint
+++ b/bin/tests/system/emptyzones/ns1/root.hint
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.hint,v 1.7 2007/06/19 23:47:05 tbox Exp $
-
 $TTL 999999
 .			 IN NS	a.root-servers.nil.
 a.root-servers.nil.	 IN A	10.53.0.2
diff --git a/bin/tests/system/fetchlimit/ns1/root.db b/bin/tests/system/fetchlimit/ns1/root.db
index d2aec1107ab..dab5cea7f77 100644
--- a/bin/tests/system/fetchlimit/ns1/root.db
+++ b/bin/tests/system/fetchlimit/ns1/root.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
 $TTL 300
 . 			IN SOA	gson.nominum.com. a.root.servers.nil. (
 				2000042100   	; serial
diff --git a/bin/tests/system/fetchlimit/ns3/root.hint b/bin/tests/system/fetchlimit/ns3/root.hint
index 22ab8724420..418ea963faa 100644
--- a/bin/tests/system/fetchlimit/ns3/root.hint
+++ b/bin/tests/system/fetchlimit/ns3/root.hint
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
 $TTL 999999
 .			 IN NS	a.root-servers.nil.
 a.root-servers.nil.	 IN A	10.53.0.1
diff --git a/bin/tests/system/filter-aaaa/conf/bad1.conf b/bin/tests/system/filter-aaaa/conf/bad1.conf
index cf588e51db5..9a23fd8b96f 100644
--- a/bin/tests/system/filter-aaaa/conf/bad1.conf
+++ b/bin/tests/system/filter-aaaa/conf/bad1.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: bad1.conf,v 1.2 2010/06/22 03:58:36 marka Exp $ */
-
 options {
 	filter-aaaa-on-v4 yes;
 	filter-aaaa { none; };
diff --git a/bin/tests/system/filter-aaaa/conf/bad2.conf b/bin/tests/system/filter-aaaa/conf/bad2.conf
index 98c1f82495e..798f4fd6e25 100644
--- a/bin/tests/system/filter-aaaa/conf/bad2.conf
+++ b/bin/tests/system/filter-aaaa/conf/bad2.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: bad2.conf,v 1.2 2010/06/22 03:58:36 marka Exp $ */
-
 options {
 	/*
 	 * While this matches the defaults, it is not a good configuration
diff --git a/bin/tests/system/filter-aaaa/conf/bad3.conf b/bin/tests/system/filter-aaaa/conf/bad3.conf
index 1d0b88367df..3c068bbb71f 100644
--- a/bin/tests/system/filter-aaaa/conf/bad3.conf
+++ b/bin/tests/system/filter-aaaa/conf/bad3.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: bad3.conf,v 1.2 2010/06/22 03:58:36 marka Exp $ */
-
 options {
 	filter-aaaa-on-v4 no;
 };
diff --git a/bin/tests/system/filter-aaaa/conf/bad4.conf b/bin/tests/system/filter-aaaa/conf/bad4.conf
index abaa2fcafad..5744c8b2c59 100644
--- a/bin/tests/system/filter-aaaa/conf/bad4.conf
+++ b/bin/tests/system/filter-aaaa/conf/bad4.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: bad4.conf,v 1.2 2010/06/22 03:58:36 marka Exp $ */
-
 options {
 	filter-aaaa { any; };
 };
diff --git a/bin/tests/system/filter-aaaa/conf/bad5.conf b/bin/tests/system/filter-aaaa/conf/bad5.conf
index 88c99ebb348..39f9acca51c 100644
--- a/bin/tests/system/filter-aaaa/conf/bad5.conf
+++ b/bin/tests/system/filter-aaaa/conf/bad5.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: bad5.conf,v 1.2 2010/06/22 03:58:37 marka Exp $ */
-
 options {
 	filter-aaaa { none; };
 };
diff --git a/bin/tests/system/filter-aaaa/conf/bad6.conf b/bin/tests/system/filter-aaaa/conf/bad6.conf
index 89bef8e5e5e..e92bb1e5f2a 100644
--- a/bin/tests/system/filter-aaaa/conf/bad6.conf
+++ b/bin/tests/system/filter-aaaa/conf/bad6.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: bad6.conf,v 1.2 2010/06/22 03:58:37 marka Exp $ */
-
 options {
 	filter-aaaa-on-v4 yes;
 };
diff --git a/bin/tests/system/filter-aaaa/conf/good1.conf b/bin/tests/system/filter-aaaa/conf/good1.conf
index 191b1c0976c..2a93ef6fb06 100644
--- a/bin/tests/system/filter-aaaa/conf/good1.conf
+++ b/bin/tests/system/filter-aaaa/conf/good1.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: good1.conf,v 1.2 2010/06/22 03:58:37 marka Exp $ */
-
 options {
 	filter-aaaa-on-v4 yes;
 };
diff --git a/bin/tests/system/filter-aaaa/conf/good2.conf b/bin/tests/system/filter-aaaa/conf/good2.conf
index 156699962a5..916af8e971d 100644
--- a/bin/tests/system/filter-aaaa/conf/good2.conf
+++ b/bin/tests/system/filter-aaaa/conf/good2.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: good2.conf,v 1.2 2010/06/22 03:58:37 marka Exp $ */
-
 options {
 	filter-aaaa-on-v4 break-dnssec;
 };
diff --git a/bin/tests/system/filter-aaaa/conf/good3.conf b/bin/tests/system/filter-aaaa/conf/good3.conf
index bdc0f5810bb..b3f8de4d95f 100644
--- a/bin/tests/system/filter-aaaa/conf/good3.conf
+++ b/bin/tests/system/filter-aaaa/conf/good3.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: good3.conf,v 1.2 2010/06/22 03:58:37 marka Exp $ */
-
 options {
 	filter-aaaa-on-v4 break-dnssec;
 	filter-aaaa { 1.0.0.0/8; };
diff --git a/bin/tests/system/filter-aaaa/conf/good4.conf b/bin/tests/system/filter-aaaa/conf/good4.conf
index 6b7a6cafa54..d789f30b575 100644
--- a/bin/tests/system/filter-aaaa/conf/good4.conf
+++ b/bin/tests/system/filter-aaaa/conf/good4.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: good4.conf,v 1.2 2010/06/22 03:58:37 marka Exp $ */
-
 options {
 	filter-aaaa-on-v4 yes;
 	filter-aaaa { 1.0.0.0/8; };
diff --git a/bin/tests/system/filter-aaaa/conf/good5.conf b/bin/tests/system/filter-aaaa/conf/good5.conf
index fef37790105..95baae5b28a 100644
--- a/bin/tests/system/filter-aaaa/conf/good5.conf
+++ b/bin/tests/system/filter-aaaa/conf/good5.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: good5.conf,v 1.2 2010/06/22 03:58:37 marka Exp $ */
-
 options {
 	filter-aaaa-on-v4 yes;
 };
diff --git a/bin/tests/system/filter-aaaa/conf/good6.conf b/bin/tests/system/filter-aaaa/conf/good6.conf
index 817e4d98a88..9e783670a06 100644
--- a/bin/tests/system/filter-aaaa/conf/good6.conf
+++ b/bin/tests/system/filter-aaaa/conf/good6.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: good6.conf,v 1.2 2010/06/22 03:58:37 marka Exp $ */
-
 options {
 	filter-aaaa { 1.0.0.0/8; };
 };
diff --git a/bin/tests/system/filter-aaaa/conf/good7.conf b/bin/tests/system/filter-aaaa/conf/good7.conf
index ca36a9c90a0..2531de95b63 100644
--- a/bin/tests/system/filter-aaaa/conf/good7.conf
+++ b/bin/tests/system/filter-aaaa/conf/good7.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: good7.conf,v 1.2 2010/06/22 03:58:37 marka Exp $ */
-
 options {
 };
 
diff --git a/bin/tests/system/filter-aaaa/conf/good8.conf b/bin/tests/system/filter-aaaa/conf/good8.conf
index 43029e944d1..f28fdd96ab4 100644
--- a/bin/tests/system/filter-aaaa/conf/good8.conf
+++ b/bin/tests/system/filter-aaaa/conf/good8.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: good8.conf,v 1.2 2010/06/22 03:58:37 marka Exp $ */
-
 options {
 	filter-aaaa-on-v4 no;
 };
diff --git a/bin/tests/system/filter-aaaa/ns2/hints b/bin/tests/system/filter-aaaa/ns2/hints
index 6e5eefc1ec6..381e86b1522 100644
--- a/bin/tests/system/filter-aaaa/ns2/hints
+++ b/bin/tests/system/filter-aaaa/ns2/hints
@@ -7,7 +7,5 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: hints,v 1.2 2010/06/22 03:58:37 marka Exp $
-
 . 0 NS ns.rootservers.utld.
 ns.rootservers.utld. 0 A 10.53.0.1
diff --git a/bin/tests/system/filter-aaaa/ns3/hints b/bin/tests/system/filter-aaaa/ns3/hints
index 9fc115821e4..381e86b1522 100644
--- a/bin/tests/system/filter-aaaa/ns3/hints
+++ b/bin/tests/system/filter-aaaa/ns3/hints
@@ -7,7 +7,5 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: hints,v 1.2 2010/06/22 03:58:38 marka Exp $
-
 . 0 NS ns.rootservers.utld.
 ns.rootservers.utld. 0 A 10.53.0.1
diff --git a/bin/tests/system/filter-aaaa/ns4/root.db b/bin/tests/system/filter-aaaa/ns4/root.db
index 7618cbc9ece..1511cc9ab5b 100644
--- a/bin/tests/system/filter-aaaa/ns4/root.db
+++ b/bin/tests/system/filter-aaaa/ns4/root.db
@@ -7,7 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.db,v 1.4 2012/01/31 23:47:32 tbox Exp $
 @		SOA	ns.utld hostmaster.ns.utld ( 1 3600 1200 604800 60 )
 @		NS	ns.utld
 ns.utld		A	10.53.0.4
diff --git a/bin/tests/system/formerr/formerr.pl b/bin/tests/system/formerr/formerr.pl
index cf0cde4b51d..f0937e29c78 100644
--- a/bin/tests/system/formerr/formerr.pl
+++ b/bin/tests/system/formerr/formerr.pl
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: packet.pl,v 1.2 2011/04/15 01:02:08 each Exp $
-
 # This is a tool for sending an arbitrary packet via UDP or TCP to an
 # arbitrary address and port.  The packet is specified in a file or on
 # the standard input, in the form of a series of bytes in hexidecimal.
diff --git a/bin/tests/system/formerr/ns1/root.db b/bin/tests/system/formerr/ns1/root.db
index 07bf4379622..9515924d38a 100644
--- a/bin/tests/system/formerr/ns1/root.db
+++ b/bin/tests/system/formerr/ns1/root.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.db,v 1.2 2010/09/15 12:07:56 marka Exp $
-
 $TTL 300
 . 			IN SOA	marka.isc.org. a.root.servers.nil. (
 				2010   	; serial
diff --git a/bin/tests/system/forward/ns1/root.db b/bin/tests/system/forward/ns1/root.db
index b92df7ead5d..7346810ba6a 100644
--- a/bin/tests/system/forward/ns1/root.db
+++ b/bin/tests/system/forward/ns1/root.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.db,v 1.4 2007/06/19 23:47:03 tbox Exp $
-
 $TTL 300
 . 			IN SOA	gson.nominum.com. a.root.servers.nil. (
 				2000042100   	; serial
diff --git a/bin/tests/system/forward/ns2/root.db b/bin/tests/system/forward/ns2/root.db
index b92df7ead5d..7346810ba6a 100644
--- a/bin/tests/system/forward/ns2/root.db
+++ b/bin/tests/system/forward/ns2/root.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.db,v 1.4 2007/06/19 23:47:03 tbox Exp $
-
 $TTL 300
 . 			IN SOA	gson.nominum.com. a.root.servers.nil. (
 				2000042100   	; serial
diff --git a/bin/tests/system/forward/ns3/root.db b/bin/tests/system/forward/ns3/root.db
index b92df7ead5d..7346810ba6a 100644
--- a/bin/tests/system/forward/ns3/root.db
+++ b/bin/tests/system/forward/ns3/root.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.db,v 1.4 2007/06/19 23:47:03 tbox Exp $
-
 $TTL 300
 . 			IN SOA	gson.nominum.com. a.root.servers.nil. (
 				2000042100   	; serial
diff --git a/bin/tests/system/forward/ns4/root.db b/bin/tests/system/forward/ns4/root.db
index b92df7ead5d..7346810ba6a 100644
--- a/bin/tests/system/forward/ns4/root.db
+++ b/bin/tests/system/forward/ns4/root.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.db,v 1.4 2007/06/19 23:47:03 tbox Exp $
-
 $TTL 300
 . 			IN SOA	gson.nominum.com. a.root.servers.nil. (
 				2000042100   	; serial
diff --git a/bin/tests/system/forward/ns5/root.db b/bin/tests/system/forward/ns5/root.db
index ef7e3b597eb..7346810ba6a 100644
--- a/bin/tests/system/forward/ns5/root.db
+++ b/bin/tests/system/forward/ns5/root.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.db,v 1.3 2011/10/13 22:48:23 tbox Exp $
-
 $TTL 300
 . 			IN SOA	gson.nominum.com. a.root.servers.nil. (
 				2000042100   	; serial
diff --git a/bin/tests/system/glue/ns1/cache.in b/bin/tests/system/glue/ns1/cache.in
index bec46d20f8a..8089efb11db 100644
--- a/bin/tests/system/glue/ns1/cache.in
+++ b/bin/tests/system/glue/ns1/cache.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: cache.in,v 1.4 2007/06/19 23:47:03 tbox Exp $
-
 ; Preloaded cache data for glue test
 
 $TTL 86400
diff --git a/bin/tests/system/glue/ns1/mil.db b/bin/tests/system/glue/ns1/mil.db
index e3be420f701..2dda6949c46 100644
--- a/bin/tests/system/glue/ns1/mil.db
+++ b/bin/tests/system/glue/ns1/mil.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: mil.db,v 1.8 2007/06/19 23:47:03 tbox Exp $
-
 $ORIGIN mil.
 $TTL 300
 @ 			IN SOA	gson.nominum.com. a.root.servers.nil. (
diff --git a/bin/tests/system/glue/ns1/net.db b/bin/tests/system/glue/ns1/net.db
index e9d460c3bd1..b98271ef6fb 100644
--- a/bin/tests/system/glue/ns1/net.db
+++ b/bin/tests/system/glue/ns1/net.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: net.db,v 1.8 2007/06/19 23:47:03 tbox Exp $
-
 $ORIGIN net.
 $TTL 300
 @ 			IN SOA	gson.nominum.com. a.root.servers.nil. (
diff --git a/bin/tests/system/glue/ns1/root-servers.nil.db b/bin/tests/system/glue/ns1/root-servers.nil.db
index 1543498cde9..e40f392d101 100644
--- a/bin/tests/system/glue/ns1/root-servers.nil.db
+++ b/bin/tests/system/glue/ns1/root-servers.nil.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root-servers.nil.db,v 1.7 2007/06/19 23:47:03 tbox Exp $
-
 $TTL 300
 @			IN SOA	ns hostmaster (
 				1
diff --git a/bin/tests/system/glue/ns1/root.db b/bin/tests/system/glue/ns1/root.db
index c531a506110..76fefad473b 100644
--- a/bin/tests/system/glue/ns1/root.db
+++ b/bin/tests/system/glue/ns1/root.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.db,v 1.7 2007/06/19 23:47:03 tbox Exp $
-
 $TTL 300
 . 			IN SOA	gson.nominum.com. a.root.servers.nil. (
 				2000042100   	; serial
diff --git a/bin/tests/system/gost/ns1/named.conf b/bin/tests/system/gost/ns1/named.conf
index c078d522cb4..715f7d3f769 100644
--- a/bin/tests/system/gost/ns1/named.conf
+++ b/bin/tests/system/gost/ns1/named.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: named.conf,v 1.2 2010/12/23 04:08:00 marka Exp $ */
-
 // NS1
 
 controls { /* empty */ };
diff --git a/bin/tests/system/gost/ns1/root.db.in b/bin/tests/system/gost/ns1/root.db.in
index 5b01c6da609..e882893e6f1 100644
--- a/bin/tests/system/gost/ns1/root.db.in
+++ b/bin/tests/system/gost/ns1/root.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.db.in,v 1.2 2010/12/23 04:08:00 marka Exp $
-
 $TTL 300
 . 			IN SOA	marka.isc.org. a.root.servers.nil. (
 				2010121600   	; serial
diff --git a/bin/tests/system/gost/ns2/named.conf b/bin/tests/system/gost/ns2/named.conf
index 4178bdac783..50621a53f16 100644
--- a/bin/tests/system/gost/ns2/named.conf
+++ b/bin/tests/system/gost/ns2/named.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: named.conf,v 1.2 2010/12/23 04:08:00 marka Exp $ */
-
 // NS2
 
 controls { /* empty */ };
diff --git a/bin/tests/system/gost/tests.sh b/bin/tests/system/gost/tests.sh
index d013c770e4f..516f0c13501 100644
--- a/bin/tests/system/gost/tests.sh
+++ b/bin/tests/system/gost/tests.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: tests.sh,v 1.2 2010/12/23 04:08:00 marka Exp $
-
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
diff --git a/bin/tests/system/ifconfig.sh b/bin/tests/system/ifconfig.sh
index 52d195dbb56..ab14da1a40b 100644
--- a/bin/tests/system/ifconfig.sh
+++ b/bin/tests/system/ifconfig.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: ifconfig.sh,v 1.59 2010/06/11 23:46:49 tbox Exp $
-
 #
 # Set up interface aliases for bind9 system tests.
 #
diff --git a/bin/tests/system/inline/ns1/root.db.in b/bin/tests/system/inline/ns1/root.db.in
index af2d0dff7d7..5f8640f55db 100644
--- a/bin/tests/system/inline/ns1/root.db.in
+++ b/bin/tests/system/inline/ns1/root.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.db.in,v 1.8 2012/02/23 06:53:15 marka Exp $
-
 $TTL 300
 . 			IN SOA	gson.nominum.com. a.root.servers.nil. (
 				2000042100   	; serial
diff --git a/bin/tests/system/inline/ns1/sign.sh b/bin/tests/system/inline/ns1/sign.sh
index 8e59d1f3887..7626a6771e7 100644
--- a/bin/tests/system/inline/ns1/sign.sh
+++ b/bin/tests/system/inline/ns1/sign.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: sign.sh,v 1.5 2012/02/23 07:09:28 tbox Exp $
-
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
diff --git a/bin/tests/system/inline/ns2/bits.db.in b/bin/tests/system/inline/ns2/bits.db.in
index 95f56837583..4b548775973 100644
--- a/bin/tests/system/inline/ns2/bits.db.in
+++ b/bin/tests/system/inline/ns2/bits.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: bits.db.in,v 1.2 2011/08/30 23:46:52 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	ns2 . (
 				2000042407 ; serial
diff --git a/bin/tests/system/inline/ns3/master.db.in b/bin/tests/system/inline/ns3/master.db.in
index b708279ad28..28af82a6b41 100644
--- a/bin/tests/system/inline/ns3/master.db.in
+++ b/bin/tests/system/inline/ns3/master.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: master.db.in,v 1.4 2012/01/16 23:46:46 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	ns3 . (
 				2000042407 ; serial
diff --git a/bin/tests/system/inline/ns3/master2.db.in b/bin/tests/system/inline/ns3/master2.db.in
index 0dd6752f7c6..0352d01c77c 100644
--- a/bin/tests/system/inline/ns3/master2.db.in
+++ b/bin/tests/system/inline/ns3/master2.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: master2.db.in,v 1.4 2012/01/16 23:46:46 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	ns3 . (
 				2000042408 ; serial
diff --git a/bin/tests/system/inline/ns3/master3.db.in b/bin/tests/system/inline/ns3/master3.db.in
index 75ae400d9b3..b0011354449 100644
--- a/bin/tests/system/inline/ns3/master3.db.in
+++ b/bin/tests/system/inline/ns3/master3.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: master3.db.in,v 1.3 2012/01/31 23:47:32 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	ns3 . (
 				2000042409 ; serial
diff --git a/bin/tests/system/inline/ns3/master4.db.in b/bin/tests/system/inline/ns3/master4.db.in
index fb9f58a4eec..209ee341a71 100644
--- a/bin/tests/system/inline/ns3/master4.db.in
+++ b/bin/tests/system/inline/ns3/master4.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: master3.db.in,v 1.3 2012/01/31 23:47:32 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	ns3 hostmaster. (
 				2000042410 ; serial
diff --git a/bin/tests/system/inline/ns4/noixfr.db.in b/bin/tests/system/inline/ns4/noixfr.db.in
index 6b37a4b39e8..6dbc7d51fbb 100644
--- a/bin/tests/system/inline/ns4/noixfr.db.in
+++ b/bin/tests/system/inline/ns4/noixfr.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: noixfr.db.in,v 1.2 2011/08/30 23:46:52 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	ns4 . (
 				2000042407 ; serial
diff --git a/bin/tests/system/ixfr/ns3/mytest0.db b/bin/tests/system/ixfr/ns3/mytest0.db
index 78a25e0fa5b..b05feccd3c5 100644
--- a/bin/tests/system/ixfr/ns3/mytest0.db
+++ b/bin/tests/system/ixfr/ns3/mytest0.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: mytest0.db,v 1.3 2011/09/07 23:46:27 tbox Exp $
-
 $ORIGIN test.
 $TTL    15
 test.  15  IN        SOA ns1.test.  hostmaster.test. (
diff --git a/bin/tests/system/ixfr/ns3/mytest1.db b/bin/tests/system/ixfr/ns3/mytest1.db
index 7b6d32c28e9..bb9fa4b0e94 100644
--- a/bin/tests/system/ixfr/ns3/mytest1.db
+++ b/bin/tests/system/ixfr/ns3/mytest1.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: mytest1.db,v 1.3 2011/09/07 23:46:27 tbox Exp $
-
 $ORIGIN test.
 $TTL    15
 test.  15  IN        SOA ns1.test.  hostmaster.test. (
diff --git a/bin/tests/system/ixfr/ns3/mytest2.db b/bin/tests/system/ixfr/ns3/mytest2.db
index b82267856a6..1eb3c9fda4e 100644
--- a/bin/tests/system/ixfr/ns3/mytest2.db
+++ b/bin/tests/system/ixfr/ns3/mytest2.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: mytest2.db,v 1.3 2011/09/07 23:46:27 tbox Exp $
-
 $ORIGIN test.
 $TTL    15
 test.  15  IN        SOA ns1.test.  hostmaster.test. (
diff --git a/bin/tests/system/ixfr/ns3/subtest0.db b/bin/tests/system/ixfr/ns3/subtest0.db
index 97debfc487c..7dc1ed79e62 100644
--- a/bin/tests/system/ixfr/ns3/subtest0.db
+++ b/bin/tests/system/ixfr/ns3/subtest0.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: subtest0.db,v 1.3 2011/09/07 23:46:27 tbox Exp $
-
 $ORIGIN sub.test.
 $TTL    15
 sub.test.  15  IN        SOA ns1.test.  hostmaster.test. (
diff --git a/bin/tests/system/ixfr/ns3/subtest1.db b/bin/tests/system/ixfr/ns3/subtest1.db
index d36b21b58e5..5af027a4c76 100644
--- a/bin/tests/system/ixfr/ns3/subtest1.db
+++ b/bin/tests/system/ixfr/ns3/subtest1.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: subtest1.db,v 1.3 2011/09/07 23:46:27 tbox Exp $
-
 $ORIGIN sub.test.
 $TTL    15
 sub.test.  15  IN        SOA ns1.test.  hostmaster.test. (
diff --git a/bin/tests/system/limits/ns1/example.db b/bin/tests/system/limits/ns1/example.db
index 5b332d99b28..1fc5ec63d28 100644
--- a/bin/tests/system/limits/ns1/example.db
+++ b/bin/tests/system/limits/ns1/example.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example.db,v 1.10 2007/06/19 23:47:03 tbox Exp $
-
 $TTL 300        ; 5 minutes
 @                 IN SOA  ns1.example. hostmaster.example. (
                                 2000042795 ; serial
diff --git a/bin/tests/system/limits/ns1/root.db b/bin/tests/system/limits/ns1/root.db
index 65134b148b2..12486d71d77 100644
--- a/bin/tests/system/limits/ns1/root.db
+++ b/bin/tests/system/limits/ns1/root.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.db,v 1.9 2007/06/19 23:47:03 tbox Exp $
-
 $TTL 300
 . 			IN SOA	gson.nominum.com. a.root.servers.nil. (
 				2000042100   	; serial
diff --git a/bin/tests/system/logfileconfig/ns1/root.db b/bin/tests/system/logfileconfig/ns1/root.db
index 6e64ba469b6..8aaa4ea9fd0 100644
--- a/bin/tests/system/logfileconfig/ns1/root.db
+++ b/bin/tests/system/logfileconfig/ns1/root.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.db,v 1.3 2011/03/05 23:52:30 tbox Exp $
-
 $TTL 300
 . 			IN SOA	gson.nominum.com. a.root.servers.nil. (
 				2000042100   	; serial
diff --git a/bin/tests/system/masterfile/ns1/include.db b/bin/tests/system/masterfile/ns1/include.db
index 70c552d8e6e..7836f9613f4 100644
--- a/bin/tests/system/masterfile/ns1/include.db
+++ b/bin/tests/system/masterfile/ns1/include.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: include.db,v 1.5 2007/06/19 23:47:04 tbox Exp $
-
 ; Test $INCLUDE current domain name and origin semantics
 
 $TTL 300
diff --git a/bin/tests/system/masterfile/ns1/sub.db b/bin/tests/system/masterfile/ns1/sub.db
index cbf2c7d03b1..5c84cec467e 100644
--- a/bin/tests/system/masterfile/ns1/sub.db
+++ b/bin/tests/system/masterfile/ns1/sub.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: sub.db,v 1.5 2007/06/19 23:47:04 tbox Exp $
-
 a		A	10.0.1.1
 $ORIGIN foo
 b		A	10.0.2.2
diff --git a/bin/tests/system/masterfile/ns1/ttl1.db b/bin/tests/system/masterfile/ns1/ttl1.db
index 577f74df2a8..6aa8f36e867 100644
--- a/bin/tests/system/masterfile/ns1/ttl1.db
+++ b/bin/tests/system/masterfile/ns1/ttl1.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: ttl1.db,v 1.6 2007/06/19 23:47:04 tbox Exp $
-
 @			IN SOA	ns hostmaster (
 				1        ; serial
 				3600
diff --git a/bin/tests/system/masterfile/ns1/ttl2.db b/bin/tests/system/masterfile/ns1/ttl2.db
index 0072ab96dd2..452d2092ecc 100644
--- a/bin/tests/system/masterfile/ns1/ttl2.db
+++ b/bin/tests/system/masterfile/ns1/ttl2.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: ttl2.db,v 1.6 2007/06/19 23:47:04 tbox Exp $
-
 @		1	IN SOA	ns hostmaster (
 				1        ; serial
 				3600
diff --git a/bin/tests/system/masterfile/ns2/example.db b/bin/tests/system/masterfile/ns2/example.db
index 322ceeef9f6..562a995e0aa 100644
--- a/bin/tests/system/masterfile/ns2/example.db
+++ b/bin/tests/system/masterfile/ns2/example.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example.db,v 1.2 2010/09/15 03:32:34 marka Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
 				2010042407 ; serial
diff --git a/bin/tests/system/masterformat/ns1/compile.sh b/bin/tests/system/masterformat/ns1/compile.sh
index 60b81b0ce16..70aef30bd39 100755
--- a/bin/tests/system/masterformat/ns1/compile.sh
+++ b/bin/tests/system/masterformat/ns1/compile.sh
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id$
-
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
diff --git a/bin/tests/system/masterformat/ns1/example.db b/bin/tests/system/masterformat/ns1/example.db
index 6cfee12f74e..b8e3247d72d 100644
--- a/bin/tests/system/masterformat/ns1/example.db
+++ b/bin/tests/system/masterformat/ns1/example.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example.db,v 1.5 2007/06/19 23:47:04 tbox Exp $
-
 $TTL 1D
 
 @			IN SOA	ns hostmaster (
diff --git a/bin/tests/system/masterformat/ns1/large.db.in b/bin/tests/system/masterformat/ns1/large.db.in
index 7cc4c462ee6..b30b456f52e 100644
--- a/bin/tests/system/masterformat/ns1/large.db.in
+++ b/bin/tests/system/masterformat/ns1/large.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: large.db.in,v 1.3 2012/02/14 23:47:15 tbox Exp $
-
 $TTL 1D
 
 @			IN SOA	ns hostmaster (
diff --git a/bin/tests/system/masterformat/ns2/formerly-text.db.in b/bin/tests/system/masterformat/ns2/formerly-text.db.in
index 68c3c4a659a..8007aa12084 100644
--- a/bin/tests/system/masterformat/ns2/formerly-text.db.in
+++ b/bin/tests/system/masterformat/ns2/formerly-text.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: formerly-text.db.in,v 1.3 2011/10/26 23:46:15 tbox Exp $
-
 $ORIGIN .
 $TTL 86400	; 1 day
 transfer3		IN SOA	ns.transfer3. hostmaster.transfer3. (
diff --git a/bin/tests/system/metadata/child.db b/bin/tests/system/metadata/child.db
index 81f272672a4..2905a563409 100644
--- a/bin/tests/system/metadata/child.db
+++ b/bin/tests/system/metadata/child.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: child.db,v 1.3 2009/11/30 23:48:02 tbox Exp $
-
 $ORIGIN .
 $TTL 20
 child.parent.nil		IN SOA	ns.child.parent.nil. hostmaster.parent.nil. (
diff --git a/bin/tests/system/metadata/parent.db b/bin/tests/system/metadata/parent.db
index eb1788805b1..6c6567f75c0 100644
--- a/bin/tests/system/metadata/parent.db
+++ b/bin/tests/system/metadata/parent.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: parent.db,v 1.3 2009/11/30 23:48:02 tbox Exp $
-
 $ORIGIN .
 $TTL 300	; 5 minutes
 parent.nil		IN SOA	ns1.parent.nil. hostmaster.parent.nil. (
diff --git a/bin/tests/system/notify/ns1/root.db b/bin/tests/system/notify/ns1/root.db
index 1c2cf17760d..dab5cea7f77 100644
--- a/bin/tests/system/notify/ns1/root.db
+++ b/bin/tests/system/notify/ns1/root.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.db,v 1.9 2007/06/19 23:47:04 tbox Exp $
-
 $TTL 300
 . 			IN SOA	gson.nominum.com. a.root.servers.nil. (
 				2000042100   	; serial
diff --git a/bin/tests/system/notify/ns2/example1.db b/bin/tests/system/notify/ns2/example1.db
index c28483886c4..38dd4437bb1 100644
--- a/bin/tests/system/notify/ns2/example1.db
+++ b/bin/tests/system/notify/ns2/example1.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example1.db,v 1.14 2009/01/21 23:47:26 tbox Exp $
-
 $ORIGIN .
 $TTL 300	; 5 minutes
 example			IN SOA	mname1. . (
diff --git a/bin/tests/system/notify/ns2/example2.db b/bin/tests/system/notify/ns2/example2.db
index e6a23b4bad1..5de0776dfb4 100644
--- a/bin/tests/system/notify/ns2/example2.db
+++ b/bin/tests/system/notify/ns2/example2.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example2.db,v 1.14 2009/01/21 23:47:26 tbox Exp $
-
 $ORIGIN .
 $TTL 300	; 5 minutes
 example			IN SOA	mname1. . (
diff --git a/bin/tests/system/notify/ns2/example3.db b/bin/tests/system/notify/ns2/example3.db
index 49f90919c8d..01befbcf844 100644
--- a/bin/tests/system/notify/ns2/example3.db
+++ b/bin/tests/system/notify/ns2/example3.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example3.db,v 1.14 2009/01/21 23:47:26 tbox Exp $
-
 $ORIGIN .
 $TTL 300	; 5 minutes
 example			IN SOA	mname1. . (
diff --git a/bin/tests/system/notify/ns2/example4.db b/bin/tests/system/notify/ns2/example4.db
index 0c770e785d1..9ff70f8e2a6 100644
--- a/bin/tests/system/notify/ns2/example4.db
+++ b/bin/tests/system/notify/ns2/example4.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example4.db,v 1.14 2009/01/21 23:47:26 tbox Exp $
-
 $ORIGIN .
 $TTL 300	; 5 minutes
 example			IN SOA	mname1. . (
diff --git a/bin/tests/system/nsupdate/ns1/example1.db b/bin/tests/system/nsupdate/ns1/example1.db
index aadb20d1410..1ca6589143a 100644
--- a/bin/tests/system/nsupdate/ns1/example1.db
+++ b/bin/tests/system/nsupdate/ns1/example1.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example1.db,v 1.10 2009/01/21 23:47:27 tbox Exp $
-
 $ORIGIN .
 $TTL 300	; 5 minutes
 example.nil		IN SOA	ns1.example.nil. hostmaster.example.nil. (
diff --git a/bin/tests/system/nsupdate/ns1/max-ttl.db b/bin/tests/system/nsupdate/ns1/max-ttl.db
index fd1862751b6..0250960592e 100644
--- a/bin/tests/system/nsupdate/ns1/max-ttl.db
+++ b/bin/tests/system/nsupdate/ns1/max-ttl.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: max-ttl.db,v 1.10 2009/01/21 23:47:27 tbox Exp $
-
 $ORIGIN .
 $TTL 300	; 5 minutes
 max-ttl.nil		IN SOA	ns1.max-ttl.nil. hostmaster.max-ttl.nil. (
diff --git a/bin/tests/system/nsupdate/ns3/dnskey.test.db.in b/bin/tests/system/nsupdate/ns3/dnskey.test.db.in
index 4bb5391de86..d3393a27068 100644
--- a/bin/tests/system/nsupdate/ns3/dnskey.test.db.in
+++ b/bin/tests/system/nsupdate/ns3/dnskey.test.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: dnskey.test.db.in,v 1.2 2011/02/03 06:03:15 marka Exp $
-
 $TTL 10
 dnskey.test. IN SOA dnskey.test. hostmaster.dnskey.test. 1 3600 900 2419200 3600
 dnskey.test. IN NS dnskey.test.
diff --git a/bin/tests/system/nsupdate/ns3/example.db.in b/bin/tests/system/nsupdate/ns3/example.db.in
index 9cbbddc7a3d..e151333951f 100644
--- a/bin/tests/system/nsupdate/ns3/example.db.in
+++ b/bin/tests/system/nsupdate/ns3/example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example.db.in,v 1.3 2010/12/07 23:47:02 tbox Exp $
-
 example. 10 IN SOA example. hostmaster.example. 1 3600 900 2419200 3600
 example. 10 IN NS example.
 example. 10 IN A 10.53.0.3
diff --git a/bin/tests/system/nsupdate/ns3/nsec3param.test.db.in b/bin/tests/system/nsupdate/ns3/nsec3param.test.db.in
index 7d5db295d19..6969414ec16 100644
--- a/bin/tests/system/nsupdate/ns3/nsec3param.test.db.in
+++ b/bin/tests/system/nsupdate/ns3/nsec3param.test.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: nsec3param.test.db.in,v 1.3 2010/12/07 23:47:02 tbox Exp $
-
 $TTL 10
 nsec3param.test. IN SOA nsec3param.test. hostmaster.nsec3param.test. 1 3600 900 2419200 3600
 nsec3param.test. IN NS nsec3param.test.
diff --git a/bin/tests/system/org.isc.bind.system b/bin/tests/system/org.isc.bind.system
index 9a3f235f97c..2096af2a2c9 100644
--- a/bin/tests/system/org.isc.bind.system
+++ b/bin/tests/system/org.isc.bind.system
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: org.isc.bind.system,v 1.1 2010/08/25 04:51:51 marka Exp $
-
 for ns in 1 2 3 4 5 6 7 8
 do
 	/sbin/ifconfig lo0 10.53.0.$ns alias
diff --git a/bin/tests/system/packet.pl b/bin/tests/system/packet.pl
index 4032bd54500..9cd55d6ce5a 100644
--- a/bin/tests/system/packet.pl
+++ b/bin/tests/system/packet.pl
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: packet.pl,v 1.2 2011/04/15 01:02:08 each Exp $
-
 # This is a tool for sending an arbitrary packet via UDP or TCP to an
 # arbitrary address and port.  The packet is specified in a file or on
 # the standard input, in the form of a series of bytes in hexidecimal.
diff --git a/bin/tests/system/pending/ns1/root.db.in b/bin/tests/system/pending/ns1/root.db.in
index 5176ea5b2b0..271a8e50e1b 100644
--- a/bin/tests/system/pending/ns1/root.db.in
+++ b/bin/tests/system/pending/ns1/root.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.db.in,v 1.6 2010/01/07 23:48:53 tbox Exp $
-
 $TTL 30
 . 			IN SOA	marka.isc.org. a.root.servers.nil. (
 				2000042100   	; serial
diff --git a/bin/tests/system/pending/ns2/example.com.db.in b/bin/tests/system/pending/ns2/example.com.db.in
index 15feee09b1f..6ec93625df6 100644
--- a/bin/tests/system/pending/ns2/example.com.db.in
+++ b/bin/tests/system/pending/ns2/example.com.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example.com.db.in,v 1.4 2010/01/18 23:48:40 tbox Exp $
-
 $TTL 30
 @			IN SOA	mname1. . (
 				2009110300 ; serial
diff --git a/bin/tests/system/pending/ns2/example.db.in b/bin/tests/system/pending/ns2/example.db.in
index a5c8b840b1e..a5dc49c76f2 100644
--- a/bin/tests/system/pending/ns2/example.db.in
+++ b/bin/tests/system/pending/ns2/example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example.db.in,v 1.4 2010/01/07 23:48:53 tbox Exp $
-
 $TTL 30
 $ORIGIN example.
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/pending/ns2/forgery.db b/bin/tests/system/pending/ns2/forgery.db
index 8de7ab5a91a..89f945915f0 100644
--- a/bin/tests/system/pending/ns2/forgery.db
+++ b/bin/tests/system/pending/ns2/forgery.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: forgery.db,v 1.3 2010/01/07 23:48:53 tbox Exp $
-
 $TTL 30
 $ORIGIN good.
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/pending/ns2/sign.sh b/bin/tests/system/pending/ns2/sign.sh
index 608e7f8a39a..aa0e956aa85 100644
--- a/bin/tests/system/pending/ns2/sign.sh
+++ b/bin/tests/system/pending/ns2/sign.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: sign.sh,v 1.7 2010/01/18 19:19:31 each Exp $
-
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
diff --git a/bin/tests/system/pending/ns3/hostile.db b/bin/tests/system/pending/ns3/hostile.db
index 8f8aae332f6..021258a70da 100644
--- a/bin/tests/system/pending/ns3/hostile.db
+++ b/bin/tests/system/pending/ns3/hostile.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: hostile.db,v 1.2 2009/11/17 23:55:18 marka Exp $
-
 $TTL 30
 @			IN SOA	mname1. . (
 				2009110500 ; serial
diff --git a/bin/tests/system/pending/ns3/mail.example.db b/bin/tests/system/pending/ns3/mail.example.db
index 41fc4c2de0b..2da8b4518b9 100644
--- a/bin/tests/system/pending/ns3/mail.example.db
+++ b/bin/tests/system/pending/ns3/mail.example.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: mail.example.db,v 1.2 2009/11/17 23:55:18 marka Exp $
-
 $TTL 30
 @			IN SOA	mname1. . (
 				2009110300 ; serial
diff --git a/bin/tests/system/pkcs11/ns1/example.db.in b/bin/tests/system/pkcs11/ns1/example.db.in
index c0df03bed74..95d2a63a542 100644
--- a/bin/tests/system/pkcs11/ns1/example.db.in
+++ b/bin/tests/system/pkcs11/ns1/example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example.db.in,v 1.3 2010/06/08 23:50:24 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	ns root (
 				2000082401 ; serial
diff --git a/bin/tests/system/pkcs11/ns1/named.conf b/bin/tests/system/pkcs11/ns1/named.conf
index 1e2c34b3de5..5ac9a2fbe69 100644
--- a/bin/tests/system/pkcs11/ns1/named.conf
+++ b/bin/tests/system/pkcs11/ns1/named.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: named.conf,v 1.3 2010/06/08 23:50:24 tbox Exp $ */
-
 controls { /* empty */ };
 
 options {
diff --git a/bin/tests/system/pkcs11/tests.sh b/bin/tests/system/pkcs11/tests.sh
index 7ba5ae9f62a..cf3b5492132 100644
--- a/bin/tests/system/pkcs11/tests.sh
+++ b/bin/tests/system/pkcs11/tests.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: tests.sh,v 1.3 2010/06/08 23:50:24 tbox Exp $
-
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
diff --git a/bin/tests/system/pkcs11ssl/ns1/example.db.in b/bin/tests/system/pkcs11ssl/ns1/example.db.in
index c0df03bed74..95d2a63a542 100644
--- a/bin/tests/system/pkcs11ssl/ns1/example.db.in
+++ b/bin/tests/system/pkcs11ssl/ns1/example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example.db.in,v 1.3 2010/06/08 23:50:24 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	ns root (
 				2000082401 ; serial
diff --git a/bin/tests/system/pkcs11ssl/ns1/named.conf b/bin/tests/system/pkcs11ssl/ns1/named.conf
index 2490f4ad322..7cd80742011 100644
--- a/bin/tests/system/pkcs11ssl/ns1/named.conf
+++ b/bin/tests/system/pkcs11ssl/ns1/named.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: named.conf,v 1.3 2010/06/08 23:50:24 tbox Exp $ */
-
 controls { /* empty */ };
 
 options {
diff --git a/bin/tests/system/pkcs11ssl/tests.sh b/bin/tests/system/pkcs11ssl/tests.sh
index 9e61729e7ef..2d7437e6731 100644
--- a/bin/tests/system/pkcs11ssl/tests.sh
+++ b/bin/tests/system/pkcs11ssl/tests.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: tests.sh,v 1.3 2010/06/08 23:50:24 tbox Exp $
-
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
diff --git a/bin/tests/system/redirect/conf/bad1.conf b/bin/tests/system/redirect/conf/bad1.conf
index fc73b31bac8..4928878ec8e 100644
--- a/bin/tests/system/redirect/conf/bad1.conf
+++ b/bin/tests/system/redirect/conf/bad1.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: bad1.conf,v 1.3 2011/03/01 23:48:06 tbox Exp $ */
-
 zone "." {
 	type hint;
 	file "hint.db";
diff --git a/bin/tests/system/redirect/conf/bad2.conf b/bin/tests/system/redirect/conf/bad2.conf
index 52640ed5c60..87a23fddcb7 100644
--- a/bin/tests/system/redirect/conf/bad2.conf
+++ b/bin/tests/system/redirect/conf/bad2.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: bad2.conf,v 1.3 2011/03/01 23:48:06 tbox Exp $ */
-
 zone "." {
 	type hint;
 	file "hint.db";
diff --git a/bin/tests/system/redirect/conf/bad3.conf b/bin/tests/system/redirect/conf/bad3.conf
index 638c15259db..ad7063cd13e 100644
--- a/bin/tests/system/redirect/conf/bad3.conf
+++ b/bin/tests/system/redirect/conf/bad3.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: bad3.conf,v 1.3 2011/03/01 23:48:06 tbox Exp $ */
-
 zone "." {
 	type hint;
 	file "hint.db";
diff --git a/bin/tests/system/redirect/conf/good1.conf b/bin/tests/system/redirect/conf/good1.conf
index cf81c17ea17..4e092108feb 100644
--- a/bin/tests/system/redirect/conf/good1.conf
+++ b/bin/tests/system/redirect/conf/good1.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: good1.conf,v 1.3 2011/03/01 23:48:06 tbox Exp $ */
-
 zone "." {
 	type hint;
 	file "hint.db";
diff --git a/bin/tests/system/redirect/conf/good2.conf b/bin/tests/system/redirect/conf/good2.conf
index 92f6d3c91c5..a01d645673f 100644
--- a/bin/tests/system/redirect/conf/good2.conf
+++ b/bin/tests/system/redirect/conf/good2.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: good2.conf,v 1.3 2011/03/01 23:48:06 tbox Exp $ */
-
 zone "." {
 	type master;
 	file "master.db";
diff --git a/bin/tests/system/redirect/conf/good3.conf b/bin/tests/system/redirect/conf/good3.conf
index 613563e61bc..3d91ba3b0a8 100644
--- a/bin/tests/system/redirect/conf/good3.conf
+++ b/bin/tests/system/redirect/conf/good3.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: good3.conf,v 1.3 2011/03/01 23:48:06 tbox Exp $ */
-
 zone "." {
 	type slave;
 	file "slave.db";
diff --git a/bin/tests/system/redirect/conf/good4.conf b/bin/tests/system/redirect/conf/good4.conf
index 72b37e799a9..f70b723d29d 100644
--- a/bin/tests/system/redirect/conf/good4.conf
+++ b/bin/tests/system/redirect/conf/good4.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: good4.conf,v 1.3 2011/03/01 23:48:06 tbox Exp $ */
-
 zone "." {
 	type hint;
 	file "hint.db";
diff --git a/bin/tests/system/redirect/ns1/example.db b/bin/tests/system/redirect/ns1/example.db
index fa204cdfb30..83140c25034 100644
--- a/bin/tests/system/redirect/ns1/example.db
+++ b/bin/tests/system/redirect/ns1/example.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example.db,v 1.3 2011/03/01 23:48:06 tbox Exp $
-
 $TTL	3600
 @	SOA ns1 marka.isc.org. 0 0 0 0 1200
 @	NS ns1
diff --git a/bin/tests/system/redirect/ns1/redirect.db b/bin/tests/system/redirect/ns1/redirect.db
index 6d61cf1af77..0797462a8e4 100644
--- a/bin/tests/system/redirect/ns1/redirect.db
+++ b/bin/tests/system/redirect/ns1/redirect.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: redirect.db,v 1.3 2011/03/01 23:48:06 tbox Exp $
-
 $TTL 300
 @ IN SOA ns.example.net hostmaster.example.net 0 0 0 0 0
 @ IN NS ns.example.net
diff --git a/bin/tests/system/redirect/ns1/root.db b/bin/tests/system/redirect/ns1/root.db
index 1622c9d5ce5..532063c05c8 100644
--- a/bin/tests/system/redirect/ns1/root.db
+++ b/bin/tests/system/redirect/ns1/root.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.db,v 1.3 2011/03/01 23:48:06 tbox Exp $
-
 $TTL 3600
 @		SOA	a.root-servers.nil. marka.isc.org. 0 0 0 0 0
 @		NS	a.root-servers.nil.
diff --git a/bin/tests/system/redirect/ns1/sign.sh b/bin/tests/system/redirect/ns1/sign.sh
index df44acbe845..3048160f38b 100644
--- a/bin/tests/system/redirect/ns1/sign.sh
+++ b/bin/tests/system/redirect/ns1/sign.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: sign.sh,v 1.3 2011/03/01 23:48:06 tbox Exp $
-
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
diff --git a/bin/tests/system/redirect/ns2/redirect.db.in b/bin/tests/system/redirect/ns2/redirect.db.in
index c6a78c7f65b..46e5db811fc 100644
--- a/bin/tests/system/redirect/ns2/redirect.db.in
+++ b/bin/tests/system/redirect/ns2/redirect.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
 $TTL 300
 @ IN SOA ns.example.net hostmaster.example.net 0 0 0 0 0
 @ IN NS ns.example.net
diff --git a/bin/tests/system/redirect/ns3/example.db b/bin/tests/system/redirect/ns3/example.db
index c1ce24d4bb8..065ad2dd683 100644
--- a/bin/tests/system/redirect/ns3/example.db
+++ b/bin/tests/system/redirect/ns3/example.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example.db,v 1.3 2011/03/01 23:48:06 tbox Exp $
-
 $TTL	3600
 @	SOA ns3 marka.isc.org. 0 0 0 0 1200
 @	NS ns3
diff --git a/bin/tests/system/redirect/ns3/redirect.db b/bin/tests/system/redirect/ns3/redirect.db
index b5b9325f447..b8ca047d4c6 100644
--- a/bin/tests/system/redirect/ns3/redirect.db
+++ b/bin/tests/system/redirect/ns3/redirect.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: redirect.db,v 1.3 2011/03/01 23:48:06 tbox Exp $
-
 $TTL 300
 @ IN SOA a.root-servers.nil. hostmaster.example.net. 0 0 0 0 0
 @ IN NS a.root-servers.nil.
diff --git a/bin/tests/system/redirect/ns3/root.db b/bin/tests/system/redirect/ns3/root.db
index 22ca3359458..1befd933baf 100644
--- a/bin/tests/system/redirect/ns3/root.db
+++ b/bin/tests/system/redirect/ns3/root.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.db,v 1.3 2011/03/01 23:48:06 tbox Exp $
-
 $TTL 3600
 @		SOA	a.root-servers.nil. marka.isc.org. 0 0 0 0 0
 @		NS	a.root-servers.nil.
diff --git a/bin/tests/system/redirect/ns3/sign.sh b/bin/tests/system/redirect/ns3/sign.sh
index df44acbe845..3048160f38b 100644
--- a/bin/tests/system/redirect/ns3/sign.sh
+++ b/bin/tests/system/redirect/ns3/sign.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: sign.sh,v 1.3 2011/03/01 23:48:06 tbox Exp $
-
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
diff --git a/bin/tests/system/redirect/ns4/root.hint b/bin/tests/system/redirect/ns4/root.hint
index 64e055161e7..20d2a27c2ac 100644
--- a/bin/tests/system/redirect/ns4/root.hint
+++ b/bin/tests/system/redirect/ns4/root.hint
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.hint,v 1.5 2007/06/19 23:47:01 tbox Exp $
-
 $TTL 999999
 .			 IN NS	a.root-servers.nil.
 a.root-servers.nil.	 IN A	10.53.0.3
diff --git a/bin/tests/system/resolver/ns1/root.hint b/bin/tests/system/resolver/ns1/root.hint
index 6671358152a..64769b9fe64 100644
--- a/bin/tests/system/resolver/ns1/root.hint
+++ b/bin/tests/system/resolver/ns1/root.hint
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.hint,v 1.7 2007/06/19 23:47:05 tbox Exp $
-
 $TTL 999999
 .			 IN NS	a.root-servers.nil.
 a.root-servers.nil.	 IN A	10.53.0.2
diff --git a/bin/tests/system/resolver/ns4/broken.db b/bin/tests/system/resolver/ns4/broken.db
index c7d295dec0f..886614c4128 100644
--- a/bin/tests/system/resolver/ns4/broken.db
+++ b/bin/tests/system/resolver/ns4/broken.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: tld1.db,v 1.3 2012/02/09 23:47:18 tbox Exp $ 
-
 $TTL 300
 @ 			IN SOA	marka.isc.org. ns.server. (
 				2010   	; serial
diff --git a/bin/tests/system/resolver/ns4/child.server.db b/bin/tests/system/resolver/ns4/child.server.db
index 9a0154e113f..e0dc65e985c 100644
--- a/bin/tests/system/resolver/ns4/child.server.db
+++ b/bin/tests/system/resolver/ns4/child.server.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: child.server.db,v 1.3 2011/03/13 23:47:35 tbox Exp $
-
 $TTL 300
 @ 			IN SOA	marka.isc.org. ns.server. (
 				2010   	; serial
diff --git a/bin/tests/system/resolver/ns4/moves.db b/bin/tests/system/resolver/ns4/moves.db
index b45cf54d2a6..cfd04de54b2 100644
--- a/bin/tests/system/resolver/ns4/moves.db
+++ b/bin/tests/system/resolver/ns4/moves.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: moves.db,v 1.3 2011/03/13 23:47:35 tbox Exp $
-
 $TTL 300
 @ 			IN SOA	marka.isc.org. ns.server. (
 				2010   	; serial
diff --git a/bin/tests/system/resolver/ns4/named.noaa b/bin/tests/system/resolver/ns4/named.noaa
index 38a96fbb9b4..0f215fcdc25 100644
--- a/bin/tests/system/resolver/ns4/named.noaa
+++ b/bin/tests/system/resolver/ns4/named.noaa
@@ -2,6 +2,4 @@ Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: named.noaa,v 1.2 2010/09/15 12:07:56 marka Exp $
-
 Add -T noaa.
diff --git a/bin/tests/system/resolver/ns4/root.db b/bin/tests/system/resolver/ns4/root.db
index 340a1235eae..721765d1be7 100644
--- a/bin/tests/system/resolver/ns4/root.db
+++ b/bin/tests/system/resolver/ns4/root.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.db,v 1.2 2010/09/15 12:07:56 marka Exp $
-
 $TTL 300
 . 			IN SOA	marka.isc.org. a.root.servers.nil. (
 				2010   	; serial
diff --git a/bin/tests/system/resolver/ns4/tld1.db b/bin/tests/system/resolver/ns4/tld1.db
index 4cc99138079..2736f7d69f4 100644
--- a/bin/tests/system/resolver/ns4/tld1.db
+++ b/bin/tests/system/resolver/ns4/tld1.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: tld1.db,v 1.3 2012/02/09 23:47:18 tbox Exp $ 
-
 $TTL 300
 @ 			IN SOA	marka.isc.org. ns.server. (
 				2010   	; serial
diff --git a/bin/tests/system/resolver/ns4/tld2.db b/bin/tests/system/resolver/ns4/tld2.db
index aa817e0c575..4664453a771 100644
--- a/bin/tests/system/resolver/ns4/tld2.db
+++ b/bin/tests/system/resolver/ns4/tld2.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: tld2.db,v 1.3 2012/02/09 23:47:18 tbox Exp $ 
-
 $TTL 300
 @ 			IN SOA	marka.isc.org. ns.server. (
 				2010   	; serial
diff --git a/bin/tests/system/resolver/ns5/child.server.db b/bin/tests/system/resolver/ns5/child.server.db
index e9a07f2a342..73eb84797d7 100644
--- a/bin/tests/system/resolver/ns5/child.server.db
+++ b/bin/tests/system/resolver/ns5/child.server.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: child.server.db,v 1.3 2011/03/13 23:47:36 tbox Exp $
-
 $TTL 300
 @ 			IN SOA	marka.isc.org. ns.server. (
 				2010   	; serial
diff --git a/bin/tests/system/resolver/ns5/moves.db b/bin/tests/system/resolver/ns5/moves.db
index 5439cbadf17..d2594b68b24 100644
--- a/bin/tests/system/resolver/ns5/moves.db
+++ b/bin/tests/system/resolver/ns5/moves.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: moves.db,v 1.3 2011/03/13 23:47:36 tbox Exp $
-
 $TTL 300
 @ 			IN SOA	marka.isc.org. ns.server. (
 				2010   	; serial
diff --git a/bin/tests/system/resolver/ns5/root.hint b/bin/tests/system/resolver/ns5/root.hint
index 58ad7852a54..e8cdaecdcb5 100644
--- a/bin/tests/system/resolver/ns5/root.hint
+++ b/bin/tests/system/resolver/ns5/root.hint
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.hint,v 1.2 2010/09/15 12:07:56 marka Exp $
-
 $TTL 999999
 .			 IN NS	a.root-servers.nil.
 a.root-servers.nil.	 IN A	10.53.0.4
diff --git a/bin/tests/system/resolver/ns6/broken.db b/bin/tests/system/resolver/ns6/broken.db
index c67eb453ea4..10edff8ac9e 100644
--- a/bin/tests/system/resolver/ns6/broken.db
+++ b/bin/tests/system/resolver/ns6/broken.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: to-be-removed.tld.db.in,v 1.3 2012/02/09 23:47:18 tbox Exp $
-
 $TTL 600
 @	IN SOA	ns hostmaster 1 1800 900 604800 600
 @	IN NS	ns
diff --git a/bin/tests/system/resolver/ns6/ds.example.net.db.in b/bin/tests/system/resolver/ns6/ds.example.net.db.in
index 3e3cb3c2b9a..d38d1a944ef 100644
--- a/bin/tests/system/resolver/ns6/ds.example.net.db.in
+++ b/bin/tests/system/resolver/ns6/ds.example.net.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example.net.db.in,v 1.3 2010/11/17 23:47:08 tbox Exp $
-
 $TTL 600
 @	IN SOA	ns hostmaster 1 1800 900 604800 600
 @	IN NS	ns
diff --git a/bin/tests/system/resolver/ns6/example.net.db.in b/bin/tests/system/resolver/ns6/example.net.db.in
index 1010a373dd6..fa4e96aad84 100644
--- a/bin/tests/system/resolver/ns6/example.net.db.in
+++ b/bin/tests/system/resolver/ns6/example.net.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example.net.db.in,v 1.3 2010/11/17 23:47:08 tbox Exp $
-
 $TTL 600
 @	IN SOA	ns hostmaster 1 1800 900 604800 600
 @	IN NS	ns
diff --git a/bin/tests/system/resolver/ns6/fetch.tld.db b/bin/tests/system/resolver/ns6/fetch.tld.db
index 683157b0e0c..3754373ec7c 100644
--- a/bin/tests/system/resolver/ns6/fetch.tld.db
+++ b/bin/tests/system/resolver/ns6/fetch.tld.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: moves.db,v 1.3 2011/03/13 23:47:36 tbox Exp $
-
 $TTL 300
 @ 			IN SOA	marka.isc.org. ns.fetch.tld. (
 				2010   	; serial
diff --git a/bin/tests/system/resolver/ns6/keygen.sh b/bin/tests/system/resolver/ns6/keygen.sh
index 5a564636c6d..6cf7b8cee13 100644
--- a/bin/tests/system/resolver/ns6/keygen.sh
+++ b/bin/tests/system/resolver/ns6/keygen.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: keygen.sh,v 1.2 2010/11/16 06:46:44 marka Exp $
-
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
diff --git a/bin/tests/system/resolver/ns6/moves.db b/bin/tests/system/resolver/ns6/moves.db
index 42339d4db23..27ce6d11da8 100644
--- a/bin/tests/system/resolver/ns6/moves.db
+++ b/bin/tests/system/resolver/ns6/moves.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: moves.db,v 1.3 2011/03/13 23:47:36 tbox Exp $
-
 $TTL 300
 @ 			IN SOA	marka.isc.org. ns.server. (
 				2010   	; serial
diff --git a/bin/tests/system/resolver/ns6/root.db b/bin/tests/system/resolver/ns6/root.db
index a8910fa25c2..09b23fc38bb 100644
--- a/bin/tests/system/resolver/ns6/root.db
+++ b/bin/tests/system/resolver/ns6/root.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.db,v 1.4 2011/03/13 23:47:36 tbox Exp $
-
 $TTL 300
 . 			IN SOA	marka.isc.org. a.root.servers.nil. (
 				2010   	; serial
diff --git a/bin/tests/system/resolver/ns6/to-be-removed.tld.db.in b/bin/tests/system/resolver/ns6/to-be-removed.tld.db.in
index d7d782169ef..2a1c960208e 100644
--- a/bin/tests/system/resolver/ns6/to-be-removed.tld.db.in
+++ b/bin/tests/system/resolver/ns6/to-be-removed.tld.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: to-be-removed.tld.db.in,v 1.3 2012/02/09 23:47:18 tbox Exp $
-
 $TTL 600
 @	IN SOA	ns hostmaster 1 1800 900 604800 600
 @	IN NS	ns
diff --git a/bin/tests/system/resolver/ns7/root.hint b/bin/tests/system/resolver/ns7/root.hint
index 0aeca5ea546..a623df91c0e 100644
--- a/bin/tests/system/resolver/ns7/root.hint
+++ b/bin/tests/system/resolver/ns7/root.hint
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.hint,v 1.2 2010/11/16 06:46:44 marka Exp $
-
 $TTL 999999
 .			 IN NS	a.root-servers.nil.
 a.root-servers.nil.	 IN A	10.53.0.6
diff --git a/bin/tests/system/resolver/ns7/server.db.in b/bin/tests/system/resolver/ns7/server.db.in
index 2b631bb6a4d..ab42f26e00c 100644
--- a/bin/tests/system/resolver/ns7/server.db.in
+++ b/bin/tests/system/resolver/ns7/server.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: server.db.in,v 1.3 2011/03/13 23:47:36 tbox Exp $
-
 $TTL 300
 @ 			IN SOA	marka.isc.org. a.root.servers.nil. (
 				2010   	; serial
diff --git a/bin/tests/system/rndc/ns2/secondkey.conf b/bin/tests/system/rndc/ns2/secondkey.conf
index 55c3f54b8aa..2563b6946b0 100644
--- a/bin/tests/system/rndc/ns2/secondkey.conf
+++ b/bin/tests/system/rndc/ns2/secondkey.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: rndc.conf,v 1.5 2007/06/19 23:47:01 tbox Exp $ */
-
 options {
 	default-key     "secondkey";
 };
diff --git a/bin/tests/system/rpz/ns1/root.db b/bin/tests/system/rpz/ns1/root.db
index d241627a4ac..0abc1a2f999 100644
--- a/bin/tests/system/rpz/ns1/root.db
+++ b/bin/tests/system/rpz/ns1/root.db
@@ -7,9 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
-
 $TTL	120
 .		SOA	ns. hostmaster.ns. ( 1 3600 1200 604800 60 )
 		NS	ns.
diff --git a/bin/tests/system/rpz/ns2/base-tld2s.db b/bin/tests/system/rpz/ns2/base-tld2s.db
index 877b848f998..039b1601418 100644
--- a/bin/tests/system/rpz/ns2/base-tld2s.db
+++ b/bin/tests/system/rpz/ns2/base-tld2s.db
@@ -7,10 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
-
-
 ; RPZ rewrite responses from this signed zone
 
 $TTL	120
diff --git a/bin/tests/system/rpz/ns2/bl.tld2.db.in b/bin/tests/system/rpz/ns2/bl.tld2.db.in
index 84edda8a80a..98b9e578e31 100644
--- a/bin/tests/system/rpz/ns2/bl.tld2.db.in
+++ b/bin/tests/system/rpz/ns2/bl.tld2.db.in
@@ -7,10 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
-
-
 ; master for slave RPZ zone
 
 $TTL	3600
diff --git a/bin/tests/system/rpz/ns2/blv2.tld2.db.in b/bin/tests/system/rpz/ns2/blv2.tld2.db.in
index c127f0ec953..e30db4b2007 100644
--- a/bin/tests/system/rpz/ns2/blv2.tld2.db.in
+++ b/bin/tests/system/rpz/ns2/blv2.tld2.db.in
@@ -7,10 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
-
-
 ; master for slave RPZ zone
 
 $TTL	3600
diff --git a/bin/tests/system/rpz/ns2/blv3.tld2.db.in b/bin/tests/system/rpz/ns2/blv3.tld2.db.in
index d5637e59d24..8a3d547fdd7 100644
--- a/bin/tests/system/rpz/ns2/blv3.tld2.db.in
+++ b/bin/tests/system/rpz/ns2/blv3.tld2.db.in
@@ -7,10 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
-
-
 ; master for slave RPZ zone
 
 $TTL	3600
diff --git a/bin/tests/system/rpz/ns2/hints b/bin/tests/system/rpz/ns2/hints
index 3b6b6077635..28e5850c4fc 100644
--- a/bin/tests/system/rpz/ns2/hints
+++ b/bin/tests/system/rpz/ns2/hints
@@ -7,8 +7,5 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
-
 .	120	NS	ns.
 ns.	120	A	10.53.0.1
diff --git a/bin/tests/system/rpz/ns2/tld2.db b/bin/tests/system/rpz/ns2/tld2.db
index 886f56a62a1..a16d196e39c 100644
--- a/bin/tests/system/rpz/ns2/tld2.db
+++ b/bin/tests/system/rpz/ns2/tld2.db
@@ -7,10 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
-
-
 ; RPZ rewrite responses from this zone
 
 $TTL	120
diff --git a/bin/tests/system/rpz/ns3/hints b/bin/tests/system/rpz/ns3/hints
index 3b6b6077635..28e5850c4fc 100644
--- a/bin/tests/system/rpz/ns3/hints
+++ b/bin/tests/system/rpz/ns3/hints
@@ -7,8 +7,5 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
-
 .	120	NS	ns.
 ns.	120	A	10.53.0.1
diff --git a/bin/tests/system/rpz/ns4/hints b/bin/tests/system/rpz/ns4/hints
index 3b6b6077635..28e5850c4fc 100644
--- a/bin/tests/system/rpz/ns4/hints
+++ b/bin/tests/system/rpz/ns4/hints
@@ -7,8 +7,5 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
-
 .	120	NS	ns.
 ns.	120	A	10.53.0.1
diff --git a/bin/tests/system/rpz/ns4/tld4.db b/bin/tests/system/rpz/ns4/tld4.db
index bf4824a8e4f..a16481823de 100644
--- a/bin/tests/system/rpz/ns4/tld4.db
+++ b/bin/tests/system/rpz/ns4/tld4.db
@@ -7,9 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
-
 ; RPZ rewrite responses from this zone
 
 $TTL	120
diff --git a/bin/tests/system/rpz/ns5/hints b/bin/tests/system/rpz/ns5/hints
index 3b6b6077635..28e5850c4fc 100644
--- a/bin/tests/system/rpz/ns5/hints
+++ b/bin/tests/system/rpz/ns5/hints
@@ -7,8 +7,5 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
-
 .	120	NS	ns.
 ns.	120	A	10.53.0.1
diff --git a/bin/tests/system/rpz/ns6/hints b/bin/tests/system/rpz/ns6/hints
index 3b6b6077635..28e5850c4fc 100644
--- a/bin/tests/system/rpz/ns6/hints
+++ b/bin/tests/system/rpz/ns6/hints
@@ -7,8 +7,5 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
-
 .	120	NS	ns.
 ns.	120	A	10.53.0.1
diff --git a/bin/tests/system/rpz/ns7/hints b/bin/tests/system/rpz/ns7/hints
index 3b6b6077635..28e5850c4fc 100644
--- a/bin/tests/system/rpz/ns7/hints
+++ b/bin/tests/system/rpz/ns7/hints
@@ -7,8 +7,5 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
-
 .	120	NS	ns.
 ns.	120	A	10.53.0.1
diff --git a/bin/tests/system/rpz/qperf.sh b/bin/tests/system/rpz/qperf.sh
index 1614ff21196..9c8b391af83 100644
--- a/bin/tests/system/rpz/qperf.sh
+++ b/bin/tests/system/rpz/qperf.sh
@@ -9,9 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id$
-
-
 for QDIR in `echo "$PATH" | tr : ' '` ../../../../contrib/queryperf; do
     QPERF=$QDIR/queryperf
     if test -f $QPERF -a -x $QPERF; then
diff --git a/bin/tests/system/rrsetorder/ns1/root.db b/bin/tests/system/rrsetorder/ns1/root.db
index 86fae7147de..b5a8f8f9827 100644
--- a/bin/tests/system/rrsetorder/ns1/root.db
+++ b/bin/tests/system/rrsetorder/ns1/root.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.db,v 1.6 2012/01/04 23:46:49 tbox Exp $
-
 $TTL 3600
 .                       SOA	hostmaster.isc.org. a.root-servers.nil. (
 				2000042100
diff --git a/bin/tests/system/rsabigexponent/bigkey.c b/bin/tests/system/rsabigexponent/bigkey.c
index af3d928c78d..8cfc6915dd5 100644
--- a/bin/tests/system/rsabigexponent/bigkey.c
+++ b/bin/tests/system/rsabigexponent/bigkey.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #include <config.h>
 
diff --git a/bin/tests/system/rsabigexponent/conf/bad01.conf b/bin/tests/system/rsabigexponent/conf/bad01.conf
index 6b106fa49ab..1c56cc338b6 100644
--- a/bin/tests/system/rsabigexponent/conf/bad01.conf
+++ b/bin/tests/system/rsabigexponent/conf/bad01.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
-
 options {
 	max-rsa-exponent-size 1;
 };
diff --git a/bin/tests/system/rsabigexponent/conf/bad02.conf b/bin/tests/system/rsabigexponent/conf/bad02.conf
index a94c941b12c..671199d3ff5 100644
--- a/bin/tests/system/rsabigexponent/conf/bad02.conf
+++ b/bin/tests/system/rsabigexponent/conf/bad02.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
-
 options {
 	max-rsa-exponent-size 34;
 };
diff --git a/bin/tests/system/rsabigexponent/conf/bad03.conf b/bin/tests/system/rsabigexponent/conf/bad03.conf
index 0996f4051df..d7edae6d063 100644
--- a/bin/tests/system/rsabigexponent/conf/bad03.conf
+++ b/bin/tests/system/rsabigexponent/conf/bad03.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
-
 options {
 	max-rsa-exponent-size 4097;
 };
diff --git a/bin/tests/system/rsabigexponent/conf/good01.conf b/bin/tests/system/rsabigexponent/conf/good01.conf
index ee57f58b754..bfa7a4517cd 100644
--- a/bin/tests/system/rsabigexponent/conf/good01.conf
+++ b/bin/tests/system/rsabigexponent/conf/good01.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
-
 options {
 	max-rsa-exponent-size 0;
 };
diff --git a/bin/tests/system/rsabigexponent/conf/good02.conf b/bin/tests/system/rsabigexponent/conf/good02.conf
index 9eecc76cb56..d87fb7fb53c 100644
--- a/bin/tests/system/rsabigexponent/conf/good02.conf
+++ b/bin/tests/system/rsabigexponent/conf/good02.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
-
 options {
 	max-rsa-exponent-size 35;
 };
diff --git a/bin/tests/system/rsabigexponent/conf/good03.conf b/bin/tests/system/rsabigexponent/conf/good03.conf
index 3cecd03c7de..0a70e29fe3c 100644
--- a/bin/tests/system/rsabigexponent/conf/good03.conf
+++ b/bin/tests/system/rsabigexponent/conf/good03.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
-
 options {
 	max-rsa-exponent-size 4096;
 };
diff --git a/bin/tests/system/rsabigexponent/ns1/root.db.in b/bin/tests/system/rsabigexponent/ns1/root.db.in
index c259a55440e..d205fc87e8b 100644
--- a/bin/tests/system/rsabigexponent/ns1/root.db.in
+++ b/bin/tests/system/rsabigexponent/ns1/root.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
 $TTL	300
 .		IN SOA	gson.nominum.com. a.root.servers.nil. (
 			2012050600	; serial
diff --git a/bin/tests/system/rsabigexponent/ns2/example.db.bad b/bin/tests/system/rsabigexponent/ns2/example.db.bad
index bbf8cc18dbb..1d0d4b582e1 100644
--- a/bin/tests/system/rsabigexponent/ns2/example.db.bad
+++ b/bin/tests/system/rsabigexponent/ns2/example.db.bad
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
 example.		300	IN SOA	mname1. . (
 					2012050601 ; serial
 					3600       ; refresh (1 hour)
diff --git a/bin/tests/system/rsabigexponent/ns2/example.db.in b/bin/tests/system/rsabigexponent/ns2/example.db.in
index 37c7313d9fa..3a958b51ec0 100644
--- a/bin/tests/system/rsabigexponent/ns2/example.db.in
+++ b/bin/tests/system/rsabigexponent/ns2/example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
 $TTL 300	; 5 minutes
 @		IN SOA	mname1. . (
 			2012050601 ; serial
diff --git a/bin/tests/system/rsabigexponent/ns2/sign.sh b/bin/tests/system/rsabigexponent/ns2/sign.sh
index 12fbc451a90..da479b27898 100755
--- a/bin/tests/system/rsabigexponent/ns2/sign.sh
+++ b/bin/tests/system/rsabigexponent/ns2/sign.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: sign.sh,v 1.3 2011/05/26 23:47:28 tbox Exp $
-
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
diff --git a/bin/tests/system/send.pl b/bin/tests/system/send.pl
index 758bf5fc1b4..01368b12e30 100644
--- a/bin/tests/system/send.pl
+++ b/bin/tests/system/send.pl
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: send.pl,v 1.7 2011/03/05 23:52:29 tbox Exp $
-
 #
 # Send a file to a given address and port using TCP.  Used for
 # configuring the test server in ans.pl.
diff --git a/bin/tests/system/smartsign/child.db b/bin/tests/system/smartsign/child.db
index e597488eb65..11af1a53d83 100644
--- a/bin/tests/system/smartsign/child.db
+++ b/bin/tests/system/smartsign/child.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: child.db,v 1.3 2010/01/18 23:48:40 tbox Exp $
-
 $ORIGIN .
 $TTL 60		; 1 minute
 child.parent.nil		IN SOA	ns.child.parent.nil. hostmaster.parent.nil. (
diff --git a/bin/tests/system/smartsign/parent.db b/bin/tests/system/smartsign/parent.db
index cf11509f477..6c6567f75c0 100644
--- a/bin/tests/system/smartsign/parent.db
+++ b/bin/tests/system/smartsign/parent.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: parent.db,v 1.3 2010/01/18 23:48:40 tbox Exp $
-
 $ORIGIN .
 $TTL 300	; 5 minutes
 parent.nil		IN SOA	ns1.parent.nil. hostmaster.parent.nil. (
diff --git a/bin/tests/system/sortlist/ns1/example.db b/bin/tests/system/sortlist/ns1/example.db
index bb74a2e45f3..94ebc73952b 100644
--- a/bin/tests/system/sortlist/ns1/example.db
+++ b/bin/tests/system/sortlist/ns1/example.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example.db,v 1.7 2007/06/19 23:47:05 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	ns1.example. hostmaster.example. (
 				2000042795 ; serial
diff --git a/bin/tests/system/sortlist/ns1/root.db b/bin/tests/system/sortlist/ns1/root.db
index df12612f970..dab5cea7f77 100644
--- a/bin/tests/system/sortlist/ns1/root.db
+++ b/bin/tests/system/sortlist/ns1/root.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.db,v 1.5 2007/06/19 23:47:05 tbox Exp $
-
 $TTL 300
 . 			IN SOA	gson.nominum.com. a.root.servers.nil. (
 				2000042100   	; serial
diff --git a/bin/tests/system/start.sh b/bin/tests/system/start.sh
index bcdcdb753f7..78fb0443d77 100644
--- a/bin/tests/system/start.sh
+++ b/bin/tests/system/start.sh
@@ -9,7 +9,5 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: start.sh,v 1.42 2007/06/18 23:47:27 tbox Exp $
-
 . ./conf.sh
 $PERL start.pl "$@"
diff --git a/bin/tests/system/staticstub/conf/bad01.conf b/bin/tests/system/staticstub/conf/bad01.conf
index a81ffee58ac..6f9bf55a40c 100644
--- a/bin/tests/system/staticstub/conf/bad01.conf
+++ b/bin/tests/system/staticstub/conf/bad01.conf
@@ -23,8 +23,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: bad01.conf,v 1.3 2010/12/18 23:47:10 tbox Exp $
-
 # prefix cannot be specified in the address list field.
 zone "example.com" {
 	type static-stub;
diff --git a/bin/tests/system/staticstub/conf/bad02.conf b/bin/tests/system/staticstub/conf/bad02.conf
index 3c7f503230e..dd23d739e9c 100644
--- a/bin/tests/system/staticstub/conf/bad02.conf
+++ b/bin/tests/system/staticstub/conf/bad02.conf
@@ -23,8 +23,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: bad02.conf,v 1.3 2010/12/18 23:47:10 tbox Exp $
-
 # server-names must be valid domain names.
 zone "example.com" {
      type static-stub;
diff --git a/bin/tests/system/staticstub/conf/bad03.conf b/bin/tests/system/staticstub/conf/bad03.conf
index 1230575779d..e8e9231237d 100644
--- a/bin/tests/system/staticstub/conf/bad03.conf
+++ b/bin/tests/system/staticstub/conf/bad03.conf
@@ -23,8 +23,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: bad03.conf,v 1.3 2010/12/18 23:47:10 tbox Exp $
-
 # Explicit port specification is not allowed (for now).
 zone "example.com" {
 	type static-stub;
diff --git a/bin/tests/system/staticstub/conf/bad04.conf b/bin/tests/system/staticstub/conf/bad04.conf
index 6d82f7c7005..54b5d288fa7 100644
--- a/bin/tests/system/staticstub/conf/bad04.conf
+++ b/bin/tests/system/staticstub/conf/bad04.conf
@@ -23,8 +23,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: bad04.conf,v 1.3 2010/12/18 23:47:10 tbox Exp $
-
 # scoped address is not allowed.
 zone "example.com" {
 	type static-stub;
diff --git a/bin/tests/system/staticstub/conf/bad05.conf b/bin/tests/system/staticstub/conf/bad05.conf
index 4446a459d2e..7a3ba554ff7 100644
--- a/bin/tests/system/staticstub/conf/bad05.conf
+++ b/bin/tests/system/staticstub/conf/bad05.conf
@@ -23,8 +23,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: bad05.conf,v 1.3 2010/12/18 23:47:11 tbox Exp $
-
 # server-name must not be a subdomain of the zone name.
 zone "example.com" {
 	type static-stub;
diff --git a/bin/tests/system/staticstub/conf/bad06.conf b/bin/tests/system/staticstub/conf/bad06.conf
index d2b0f2856bd..8c2ad5829e3 100644
--- a/bin/tests/system/staticstub/conf/bad06.conf
+++ b/bin/tests/system/staticstub/conf/bad06.conf
@@ -23,8 +23,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: bad06.conf,v 1.3 2010/12/18 23:47:11 tbox Exp $
-
 # server-name must not be a subdomain of the zone name.
 zone "example.com" {
 	type static-stub;
diff --git a/bin/tests/system/staticstub/conf/bad07.conf b/bin/tests/system/staticstub/conf/bad07.conf
index c4b2da3844c..c347102f13d 100644
--- a/bin/tests/system/staticstub/conf/bad07.conf
+++ b/bin/tests/system/staticstub/conf/bad07.conf
@@ -23,8 +23,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: bad07.conf,v 1.3 2010/12/18 23:47:11 tbox Exp $
-
 # server-addresses must not be specified more than once.
 zone "example.com" {
 	type static-stub;
diff --git a/bin/tests/system/staticstub/conf/bad08.conf b/bin/tests/system/staticstub/conf/bad08.conf
index 77bff4d6828..83f1f274514 100644
--- a/bin/tests/system/staticstub/conf/bad08.conf
+++ b/bin/tests/system/staticstub/conf/bad08.conf
@@ -23,8 +23,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: bad08.conf,v 1.3 2010/12/18 23:47:11 tbox Exp $
-
 # server-names must not be specified more than once.
 zone "example.com" {
 	type static-stub;
diff --git a/bin/tests/system/staticstub/conf/bad09.conf b/bin/tests/system/staticstub/conf/bad09.conf
index b7d03d13408..349b252f221 100644
--- a/bin/tests/system/staticstub/conf/bad09.conf
+++ b/bin/tests/system/staticstub/conf/bad09.conf
@@ -23,8 +23,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: bad09.conf,v 1.3 2010/12/18 23:47:11 tbox Exp $
-
 # "masters" isn't allowed for a static-stub zone (unlike a stub zone).
 zone "example.com" {
 	type static-stub;
diff --git a/bin/tests/system/staticstub/conf/bad10.conf b/bin/tests/system/staticstub/conf/bad10.conf
index a9a2a478fb6..f3ec70845bc 100644
--- a/bin/tests/system/staticstub/conf/bad10.conf
+++ b/bin/tests/system/staticstub/conf/bad10.conf
@@ -23,8 +23,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: bad10.conf,v 1.3 2010/12/18 23:47:11 tbox Exp $
-
 # "server-addresses" isn't allowed for a pure stub zone.
 # (or most of other types of zones, but confirming one case should be good
 # enough)
diff --git a/bin/tests/system/staticstub/conf/bad11.conf b/bin/tests/system/staticstub/conf/bad11.conf
index ead2b016923..afe78a9bb1d 100644
--- a/bin/tests/system/staticstub/conf/bad11.conf
+++ b/bin/tests/system/staticstub/conf/bad11.conf
@@ -23,8 +23,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: bad11.conf,v 1.3 2010/12/18 23:47:11 tbox Exp $
-
 # "server-names" isn't allowed for a pure stub zone.
 # (or most of other types of zones, but confirming one case should be good
 # enough)
diff --git a/bin/tests/system/staticstub/conf/good01.conf b/bin/tests/system/staticstub/conf/good01.conf
index 438ae76bc12..8f3558e83eb 100644
--- a/bin/tests/system/staticstub/conf/good01.conf
+++ b/bin/tests/system/staticstub/conf/good01.conf
@@ -23,8 +23,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: good01.conf,v 1.3 2010/12/18 23:47:11 tbox Exp $
-
 # both server-addresses and server-names can be specified.
 zone "example.com" {
 	type static-stub;
diff --git a/bin/tests/system/staticstub/conf/good02.conf b/bin/tests/system/staticstub/conf/good02.conf
index 5f8237e24f6..1bbb5c1171a 100644
--- a/bin/tests/system/staticstub/conf/good02.conf
+++ b/bin/tests/system/staticstub/conf/good02.conf
@@ -23,8 +23,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: good02.conf,v 1.3 2010/12/18 23:47:11 tbox Exp $
-
 # both IPv4 and IPv6 server-addresses should be allowable.
 zone "example.com" {
 	type static-stub;
diff --git a/bin/tests/system/staticstub/conf/good03.conf b/bin/tests/system/staticstub/conf/good03.conf
index b45ac2a28a9..af6fc8e6e9f 100644
--- a/bin/tests/system/staticstub/conf/good03.conf
+++ b/bin/tests/system/staticstub/conf/good03.conf
@@ -23,8 +23,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: good03.conf,v 1.3 2010/12/18 23:47:11 tbox Exp $
-
 # server-addresses can be empty, though it's meaningless.
 zone "example.com" {
 	type static-stub;
diff --git a/bin/tests/system/staticstub/conf/good04.conf b/bin/tests/system/staticstub/conf/good04.conf
index d4234822957..02009c52d70 100644
--- a/bin/tests/system/staticstub/conf/good04.conf
+++ b/bin/tests/system/staticstub/conf/good04.conf
@@ -23,8 +23,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: good04.conf,v 1.3 2010/12/18 23:47:11 tbox Exp $
-
 # server-names can be empty, though it's meaningless.
 zone "example.com" {
 	type static-stub;
diff --git a/bin/tests/system/staticstub/conf/good05.conf b/bin/tests/system/staticstub/conf/good05.conf
index b680940f8ad..59054eef04b 100644
--- a/bin/tests/system/staticstub/conf/good05.conf
+++ b/bin/tests/system/staticstub/conf/good05.conf
@@ -23,8 +23,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: good05.conf,v 1.3 2010/12/18 23:47:11 tbox Exp $
-
 # less common options
 zone "example.com" {
 	type static-stub;
diff --git a/bin/tests/system/staticstub/ns1/root.db b/bin/tests/system/staticstub/ns1/root.db
index f79f87132e5..c1b821dace3 100644
--- a/bin/tests/system/staticstub/ns1/root.db
+++ b/bin/tests/system/staticstub/ns1/root.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.db,v 1.1 2010/12/17 00:57:38 marka Exp $
-
 $TTL	120
 @		SOA	ns.utld hostmaster.ns.utld ( 46 3600 1200 604800 60 )
 @		NS	ns.utld
diff --git a/bin/tests/system/staticstub/ns3/example.db.in b/bin/tests/system/staticstub/ns3/example.db.in
index be8046ce30d..85fc1d848b8 100644
--- a/bin/tests/system/staticstub/ns3/example.db.in
+++ b/bin/tests/system/staticstub/ns3/example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example.db.in,v 1.1 2010/12/17 00:57:39 marka Exp $
-
 $ORIGIN .
 $TTL 300	; 5 minutes
 example			IN SOA	ns3.example. hostmaster.example. (
diff --git a/bin/tests/system/staticstub/ns3/example.org.db b/bin/tests/system/staticstub/ns3/example.org.db
index e97f8902eae..becf883a678 100644
--- a/bin/tests/system/staticstub/ns3/example.org.db
+++ b/bin/tests/system/staticstub/ns3/example.org.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example.org.db,v 1.1 2010/12/17 00:57:39 marka Exp $
-
 $ORIGIN .
 $TTL 300	; 5 minutes
 example.org		IN SOA	ns.example.org. hostmaster.example.org. (
diff --git a/bin/tests/system/staticstub/ns4/example.com.db b/bin/tests/system/staticstub/ns4/example.com.db
index 8e2899469a3..feda956b0b2 100644
--- a/bin/tests/system/staticstub/ns4/example.com.db
+++ b/bin/tests/system/staticstub/ns4/example.com.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example.com.db,v 1.1 2010/12/17 00:57:39 marka Exp $
-
 $ORIGIN .
 $TTL 300	; 5 minutes
 example.com		IN SOA	example. hostmaster.example. (
diff --git a/bin/tests/system/staticstub/ns4/example.info.db b/bin/tests/system/staticstub/ns4/example.info.db
index 7d2c2091984..42a0860c0ae 100644
--- a/bin/tests/system/staticstub/ns4/example.info.db
+++ b/bin/tests/system/staticstub/ns4/example.info.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example.info.db,v 1.1 2010/12/17 00:57:39 marka Exp $
-
 $ORIGIN .
 $TTL 300	; 5 minutes
 example.info		IN SOA	ns.example.info. hostmaster.example.info. (
diff --git a/bin/tests/system/staticstub/ns4/example.org.db b/bin/tests/system/staticstub/ns4/example.org.db
index 2bf95444023..13b3a610d27 100644
--- a/bin/tests/system/staticstub/ns4/example.org.db
+++ b/bin/tests/system/staticstub/ns4/example.org.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example.org.db,v 1.1 2010/12/17 00:57:39 marka Exp $
-
 $ORIGIN .
 $TTL 300	; 5 minutes
 example.org		IN SOA	ns.example.org. hostmaster.example.org. (
diff --git a/bin/tests/system/staticstub/ns4/sign.sh b/bin/tests/system/staticstub/ns4/sign.sh
index dea784fcd21..f7ed48a8fe3 100755
--- a/bin/tests/system/staticstub/ns4/sign.sh
+++ b/bin/tests/system/staticstub/ns4/sign.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: sign.sh,v 1.3 2010/12/17 00:57:39 marka Exp $
-
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
diff --git a/bin/tests/system/staticstub/ns4/sub.example.db.in b/bin/tests/system/staticstub/ns4/sub.example.db.in
index 255abd5702c..9d346eb7ee8 100644
--- a/bin/tests/system/staticstub/ns4/sub.example.db.in
+++ b/bin/tests/system/staticstub/ns4/sub.example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: sub.example.db.in,v 1.1 2010/12/17 00:57:39 marka Exp $
-
 $ORIGIN .
 $TTL 300	; 5 minutes
 sub.example.		IN SOA	ns.sub.example. hostmaster.example. (
diff --git a/bin/tests/system/statistics/ns1/root.db b/bin/tests/system/statistics/ns1/root.db
index d2aec1107ab..dab5cea7f77 100644
--- a/bin/tests/system/statistics/ns1/root.db
+++ b/bin/tests/system/statistics/ns1/root.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
 $TTL 300
 . 			IN SOA	gson.nominum.com. a.root.servers.nil. (
 				2000042100   	; serial
diff --git a/bin/tests/system/statistics/ns2/example.db b/bin/tests/system/statistics/ns2/example.db
index ede1838609a..4a3f33fb987 100644
--- a/bin/tests/system/statistics/ns2/example.db
+++ b/bin/tests/system/statistics/ns2/example.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example.db,v 1.1.2.1 2012/01/06 22:40:47 smann Exp $
-
 $ORIGIN .
 $TTL 300	; 5 minutes
 example			IN SOA	mname1. . (
diff --git a/bin/tests/system/statistics/ns2/internal.db b/bin/tests/system/statistics/ns2/internal.db
index 92c151a3baa..38a6b0d5909 100644
--- a/bin/tests/system/statistics/ns2/internal.db
+++ b/bin/tests/system/statistics/ns2/internal.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: internal.db,v 1.1.2.1 2012/01/06 22:40:47 smann Exp $
-
 $ORIGIN .
 $TTL 300	; 5 minutes
 example			IN SOA	mname1. . (
diff --git a/bin/tests/system/statistics/ns3/internal.db b/bin/tests/system/statistics/ns3/internal.db
index fd2ee7a99e1..cdf2648434b 100644
--- a/bin/tests/system/statistics/ns3/internal.db
+++ b/bin/tests/system/statistics/ns3/internal.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
 $ORIGIN .
 $TTL 300	; 5 minutes
 example			IN SOA	mname1. . (
diff --git a/bin/tests/system/statistics/ns3/root.hint b/bin/tests/system/statistics/ns3/root.hint
index 384156d05e9..1acfd1403d4 100644
--- a/bin/tests/system/statistics/ns3/root.hint
+++ b/bin/tests/system/statistics/ns3/root.hint
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
 $TTL 999999
 .			 IN NS	d.root-servers.nil.
 d.root-servers.nil.	 IN A	10.53.0.4
diff --git a/bin/tests/system/stop.sh b/bin/tests/system/stop.sh
index d41dffa199d..a2ae614d89a 100644
--- a/bin/tests/system/stop.sh
+++ b/bin/tests/system/stop.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: stop.sh,v 1.25 2007/06/18 23:47:27 tbox Exp $
-
 . ./conf.sh
 $PERL ./stop.pl "$@"
 
diff --git a/bin/tests/system/stress/clean.sh b/bin/tests/system/stress/clean.sh
index 97167373086..3d13acd14e6 100644
--- a/bin/tests/system/stress/clean.sh
+++ b/bin/tests/system/stress/clean.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: clean.sh,v 1.6 2007/09/26 03:22:44 marka Exp $
-
 rm -f reload.pid
 
 rm -f ns?/zones.conf
diff --git a/bin/tests/system/stress/ns1/named.conf b/bin/tests/system/stress/ns1/named.conf
index c48bed10e72..59690e799e1 100644
--- a/bin/tests/system/stress/ns1/named.conf
+++ b/bin/tests/system/stress/ns1/named.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: named.conf,v 1.6 2007/06/19 23:47:05 tbox Exp $ */
-
 controls { /* empty */ };
 
 options {
diff --git a/bin/tests/system/stress/ns2/named.conf b/bin/tests/system/stress/ns2/named.conf
index fce8c9f216e..c0fb05f51f8 100644
--- a/bin/tests/system/stress/ns2/named.conf
+++ b/bin/tests/system/stress/ns2/named.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: named.conf,v 1.7 2007/06/19 23:47:05 tbox Exp $ */
-
 controls { /* empty */ };
 
 options {
diff --git a/bin/tests/system/stress/ns3/named.conf b/bin/tests/system/stress/ns3/named.conf
index 796a594c6be..5c67d066ffd 100644
--- a/bin/tests/system/stress/ns3/named.conf
+++ b/bin/tests/system/stress/ns3/named.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: named.conf,v 1.8 2007/06/18 23:47:30 tbox Exp $ */
-
 controls { /* empty */ };
 
 options {
diff --git a/bin/tests/system/stress/ns4/named.conf b/bin/tests/system/stress/ns4/named.conf
index e5f010bdfaf..65b5b164193 100644
--- a/bin/tests/system/stress/ns4/named.conf
+++ b/bin/tests/system/stress/ns4/named.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: named.conf,v 1.8 2007/06/18 23:47:31 tbox Exp $ */
-
 controls { /* empty */ };
 
 options {
diff --git a/bin/tests/system/stress/setup.pl b/bin/tests/system/stress/setup.pl
index 4da9753c02d..40e3ceaae98 100644
--- a/bin/tests/system/stress/setup.pl
+++ b/bin/tests/system/stress/setup.pl
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: setup.pl,v 1.6 2007/06/19 23:47:05 tbox Exp $
-
 #
 # Set up test data for zone transfer quota tests.
 #
diff --git a/bin/tests/system/stress/setup.sh b/bin/tests/system/stress/setup.sh
index 7a96f76173a..b1798a4bb7a 100644
--- a/bin/tests/system/stress/setup.sh
+++ b/bin/tests/system/stress/setup.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: setup.sh,v 1.5 2007/06/19 23:47:05 tbox Exp $
-
 #
 # Set up test data for zone transfer quota tests.
 #
diff --git a/bin/tests/system/stress/update.pl b/bin/tests/system/stress/update.pl
index de01d4a04b2..6bb8afcebf0 100644
--- a/bin/tests/system/stress/update.pl
+++ b/bin/tests/system/stress/update.pl
@@ -31,8 +31,6 @@
 #
 #    perl -MCPAN -e "install Net::DNS"
 #
-# $Id: update.pl,v 1.5 2007/06/19 23:47:05 tbox Exp $
-#
 
 use Getopt::Std;
 use Net::DNS;
diff --git a/bin/tests/system/stub/ns1/root.db b/bin/tests/system/stub/ns1/root.db
index fc360a2a8e7..5d148992a87 100644
--- a/bin/tests/system/stub/ns1/root.db
+++ b/bin/tests/system/stub/ns1/root.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.db,v 1.9 2007/06/19 23:47:05 tbox Exp $
-
 $TTL 300
 . 			IN SOA	gson.nominum.com. a.root.servers.nil. (
 				2000042100   	; serial
diff --git a/bin/tests/system/stub/ns2/child.example.db b/bin/tests/system/stub/ns2/child.example.db
index 01e446ef62a..12acc8ae86e 100644
--- a/bin/tests/system/stub/ns2/child.example.db
+++ b/bin/tests/system/stub/ns2/child.example.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: child.example.db,v 1.9 2007/06/19 23:47:05 tbox Exp $
-
 $TTL 300	; 5 minutes
 child.example.		IN SOA	ns2.child.example. hostmaster.child.example. (
 				2000042795 ; serial
diff --git a/bin/tests/system/stub/ns3/example.db b/bin/tests/system/stub/ns3/example.db
index 3dbc25d37a7..cbf1392ed4b 100644
--- a/bin/tests/system/stub/ns3/example.db
+++ b/bin/tests/system/stub/ns3/example.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example.db,v 1.9 2007/06/19 23:47:05 tbox Exp $
-
 $ORIGIN .
 $TTL 300	; 5 minutes
 example			IN SOA	ns3.example. hostmaster.example. (
diff --git a/bin/tests/system/synthfromdnssec/ns3/redirect.db b/bin/tests/system/synthfromdnssec/ns3/redirect.db
index 4159dbe2e92..2e0ea151d3b 100644
--- a/bin/tests/system/synthfromdnssec/ns3/redirect.db
+++ b/bin/tests/system/synthfromdnssec/ns3/redirect.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: redirect.db,v 1.3 2011/03/01 23:48:06 tbox Exp $
-
 $TTL 300
 @ IN SOA ns.example.net hostmaster.example.net 0 0 0 0 0
 @ IN NS ns.example.net
diff --git a/bin/tests/system/testsock.pl b/bin/tests/system/testsock.pl
index 9f192d05be7..35d9f9328b5 100644
--- a/bin/tests/system/testsock.pl
+++ b/bin/tests/system/testsock.pl
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: testsock.pl,v 1.20 2011/03/01 23:48:05 tbox Exp $
-
 # Test whether the interfaces on 10.53.0.* are up.
 
 require 5.001;
diff --git a/bin/tests/system/testsock6.pl b/bin/tests/system/testsock6.pl
index e06486e8dfe..ff49b67f45c 100644
--- a/bin/tests/system/testsock6.pl
+++ b/bin/tests/system/testsock6.pl
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: testsock6.pl,v 1.5 2010/06/22 23:46:52 tbox Exp $
-
 require 5.001;
 
 use IO::Socket::INET6;
diff --git a/bin/tests/system/tkey/keycreate.c b/bin/tests/system/tkey/keycreate.c
index 7049f9f9ea4..1d1ca949653 100644
--- a/bin/tests/system/tkey/keycreate.c
+++ b/bin/tests/system/tkey/keycreate.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: keycreate.c,v 1.20 2011/01/11 23:47:13 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/bin/tests/system/tkey/keydelete.c b/bin/tests/system/tkey/keydelete.c
index 721ec3afbce..9b04843321a 100644
--- a/bin/tests/system/tkey/keydelete.c
+++ b/bin/tests/system/tkey/keydelete.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: keydelete.c,v 1.18 2011/01/11 23:47:13 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/bin/tests/system/tsig/ns1/example.db b/bin/tests/system/tsig/ns1/example.db
index cd90f08115c..05d8dd86111 100644
--- a/bin/tests/system/tsig/ns1/example.db
+++ b/bin/tests/system/tsig/ns1/example.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example.db,v 1.7 2009/01/21 23:47:27 tbox Exp $
-
 $ORIGIN .
 $TTL 300	; 5 minutes
 example.nil		IN SOA	ns1.example.nil. hostmaster.example.nil. (
diff --git a/bin/tests/system/unknown/ns1/broken1.db b/bin/tests/system/unknown/ns1/broken1.db
index e2e723905f1..0c5a4a51733 100644
--- a/bin/tests/system/unknown/ns1/broken1.db
+++ b/bin/tests/system/unknown/ns1/broken1.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: broken1.db,v 1.5 2007/06/19 23:47:06 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			SOA	mname1. . (
 				2000062101 ; serial
diff --git a/bin/tests/system/unknown/ns1/broken2.db b/bin/tests/system/unknown/ns1/broken2.db
index 6025af37d04..a3c84ffff11 100644
--- a/bin/tests/system/unknown/ns1/broken2.db
+++ b/bin/tests/system/unknown/ns1/broken2.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: broken2.db,v 1.5 2007/06/19 23:47:06 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			SOA	mname1. . (
 				2000062101 ; serial
diff --git a/bin/tests/system/unknown/ns1/broken3.db b/bin/tests/system/unknown/ns1/broken3.db
index cd787786aa8..17dde882e9e 100644
--- a/bin/tests/system/unknown/ns1/broken3.db
+++ b/bin/tests/system/unknown/ns1/broken3.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: broken3.db,v 1.5 2007/06/19 23:47:06 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			SOA	mname1. . (
 				2000062101 ; serial
diff --git a/bin/tests/system/unknown/ns1/broken4.db b/bin/tests/system/unknown/ns1/broken4.db
index acb0bb13fb3..a40425625ab 100644
--- a/bin/tests/system/unknown/ns1/broken4.db
+++ b/bin/tests/system/unknown/ns1/broken4.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: broken4.db,v 1.6 2007/06/19 23:47:06 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			SOA	mname1. . (
 				2000062101 ; serial
diff --git a/bin/tests/system/unknown/ns1/broken5.db b/bin/tests/system/unknown/ns1/broken5.db
index aa8870de9d4..c31e2791b88 100644
--- a/bin/tests/system/unknown/ns1/broken5.db
+++ b/bin/tests/system/unknown/ns1/broken5.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: broken5.db,v 1.5 2007/06/19 23:47:06 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			SOA	mname1. . (
 				2000062101 ; serial
diff --git a/bin/tests/system/unknown/ns1/class10.hints b/bin/tests/system/unknown/ns1/class10.hints
index 054b488f463..440b36fa159 100644
--- a/bin/tests/system/unknown/ns1/class10.hints
+++ b/bin/tests/system/unknown/ns1/class10.hints
@@ -7,7 +7,5 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: class10.hints,v 1.5 2007/06/19 23:47:06 tbox Exp $
-
 $TTL 3600
 .	NS	ns.
diff --git a/bin/tests/system/unknown/ns1/example-class10.db b/bin/tests/system/unknown/ns1/example-class10.db
index 0560f0843e1..a8e1d4d4976 100644
--- a/bin/tests/system/unknown/ns1/example-class10.db
+++ b/bin/tests/system/unknown/ns1/example-class10.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example-class10.db,v 1.5 2007/06/19 23:47:06 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			SOA	mname1. . (
 				2000062101 ; serial
diff --git a/bin/tests/system/unknown/ns1/example-in.db b/bin/tests/system/unknown/ns1/example-in.db
index e8bfca622f2..d29f8da5e86 100644
--- a/bin/tests/system/unknown/ns1/example-in.db
+++ b/bin/tests/system/unknown/ns1/example-in.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example-in.db,v 1.9 2011/11/02 23:46:24 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			SOA	mname1. . (
 				2000062101 ; serial
diff --git a/bin/tests/system/unknown/ns1/large.db b/bin/tests/system/unknown/ns1/large.db
index c689cbdac39..2c826d7e450 100644
--- a/bin/tests/system/unknown/ns1/large.db
+++ b/bin/tests/system/unknown/ns1/large.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
 large	IN TYPE45234	\# 48000 ( 45841674994e4f5e4ba43aada754d631
 			dfb7e12155e7f10c551032b3e56ed5ba
 			5136c15cda201e7e5e54fb60a99388b6
diff --git a/bin/tests/system/unknown/ns3/sign.sh b/bin/tests/system/unknown/ns3/sign.sh
index 8227d32e43f..e5e1173e011 100644
--- a/bin/tests/system/unknown/ns3/sign.sh
+++ b/bin/tests/system/unknown/ns3/sign.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: sign.sh,v 1.8 2012/02/23 06:53:15 marka Exp $
-
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
diff --git a/bin/tests/system/upforwd/ns1/example1.db b/bin/tests/system/upforwd/ns1/example1.db
index ca885c586ac..a703d022be8 100644
--- a/bin/tests/system/upforwd/ns1/example1.db
+++ b/bin/tests/system/upforwd/ns1/example1.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example1.db,v 1.4 2007/06/19 23:47:06 tbox Exp $
-
 @	3600	SOA	n1.example. hostmaster.ns1.example. (
 			1 3600 1200 604800 7200 )
 		NS	ns2.example.
diff --git a/bin/tests/system/upforwd/ns3/nomaster.db b/bin/tests/system/upforwd/ns3/nomaster.db
index 407c18296a4..443bedb78c2 100644
--- a/bin/tests/system/upforwd/ns3/nomaster.db
+++ b/bin/tests/system/upforwd/ns3/nomaster.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: nomaster.db,v 1.3 2011/08/31 23:46:44 tbox Exp $
-
 @ 0 SOA	. . 141235 3600 1200 86400 1200
 @ 0 NS ns4
 ns4 0 A 10.53.0.4
diff --git a/bin/tests/system/verify/zones/unsigned.db b/bin/tests/system/verify/zones/unsigned.db
index 0fa22ecffab..a1e250ed1c3 100644
--- a/bin/tests/system/verify/zones/unsigned.db
+++ b/bin/tests/system/verify/zones/unsigned.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
 $TTL 3600
 @		SOA	. . 0 0 0 2419200 3600	; 28 day expire
 @		NS	.
diff --git a/bin/tests/system/views/ns1/root.db b/bin/tests/system/views/ns1/root.db
index 38a04b55627..dab5cea7f77 100644
--- a/bin/tests/system/views/ns1/root.db
+++ b/bin/tests/system/views/ns1/root.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.db,v 1.9 2007/06/19 23:47:07 tbox Exp $
-
 $TTL 300
 . 			IN SOA	gson.nominum.com. a.root.servers.nil. (
 				2000042100   	; serial
diff --git a/bin/tests/system/views/ns2/example1.db b/bin/tests/system/views/ns2/example1.db
index 9a3a25cdca2..4a3f33fb987 100644
--- a/bin/tests/system/views/ns2/example1.db
+++ b/bin/tests/system/views/ns2/example1.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example1.db,v 1.9 2007/06/19 23:47:07 tbox Exp $
-
 $ORIGIN .
 $TTL 300	; 5 minutes
 example			IN SOA	mname1. . (
diff --git a/bin/tests/system/views/ns2/example2.db b/bin/tests/system/views/ns2/example2.db
index 939eb3dce5b..85af63822d1 100644
--- a/bin/tests/system/views/ns2/example2.db
+++ b/bin/tests/system/views/ns2/example2.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example2.db,v 1.10 2007/06/19 23:47:07 tbox Exp $
-
 $ORIGIN .
 $TTL 300	; 5 minutes
 example			IN SOA	mname1. . (
diff --git a/bin/tests/system/views/ns2/internal.db b/bin/tests/system/views/ns2/internal.db
index fc09d024090..38a6b0d5909 100644
--- a/bin/tests/system/views/ns2/internal.db
+++ b/bin/tests/system/views/ns2/internal.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: internal.db,v 1.9 2007/06/19 23:47:07 tbox Exp $
-
 $ORIGIN .
 $TTL 300	; 5 minutes
 example			IN SOA	mname1. . (
diff --git a/bin/tests/system/views/ns3/internal.db b/bin/tests/system/views/ns3/internal.db
index c6b3ef0ffec..cdf2648434b 100644
--- a/bin/tests/system/views/ns3/internal.db
+++ b/bin/tests/system/views/ns3/internal.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: internal.db,v 1.9 2007/06/19 23:47:07 tbox Exp $
-
 $ORIGIN .
 $TTL 300	; 5 minutes
 example			IN SOA	mname1. . (
diff --git a/bin/tests/system/wildcard/ns1/dlv.db.in b/bin/tests/system/wildcard/ns1/dlv.db.in
index f794f1a636a..413ca28fd7e 100644
--- a/bin/tests/system/wildcard/ns1/dlv.db.in
+++ b/bin/tests/system/wildcard/ns1/dlv.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
 $TTL 120
 @	SOA a.root-servers.nil. hostmaster.root-servers.nil. 1 1800 900 604800 86400
 @	NS  a.root-servers.nil.
diff --git a/bin/tests/system/wildcard/ns1/nsec.db.in b/bin/tests/system/wildcard/ns1/nsec.db.in
index 7ebfbc2d8f1..940e8e1dd11 100644
--- a/bin/tests/system/wildcard/ns1/nsec.db.in
+++ b/bin/tests/system/wildcard/ns1/nsec.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
 $TTL 120
 @	SOA a.root-servers.nil. hostmaster.root-servers.nil. 1 1800 900 604800 86400
 @	NS  a.root-servers.nil.
diff --git a/bin/tests/system/wildcard/ns1/nsec3.db.in b/bin/tests/system/wildcard/ns1/nsec3.db.in
index 7ebfbc2d8f1..940e8e1dd11 100644
--- a/bin/tests/system/wildcard/ns1/nsec3.db.in
+++ b/bin/tests/system/wildcard/ns1/nsec3.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
 $TTL 120
 @	SOA a.root-servers.nil. hostmaster.root-servers.nil. 1 1800 900 604800 86400
 @	NS  a.root-servers.nil.
diff --git a/bin/tests/system/wildcard/ns1/private.nsec.db.in b/bin/tests/system/wildcard/ns1/private.nsec.db.in
index 5362c0ad1b0..5114ac4bbea 100644
--- a/bin/tests/system/wildcard/ns1/private.nsec.db.in
+++ b/bin/tests/system/wildcard/ns1/private.nsec.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
 $TTL 120
 @	SOA a.root-servers.nil. hostmaster.root-servers.nil. 1 1800 900 604800 86400
 @	NS  a.root-servers.nil.
diff --git a/bin/tests/system/wildcard/ns1/private.nsec3.db.in b/bin/tests/system/wildcard/ns1/private.nsec3.db.in
index 2e42acb5242..98b78758571 100644
--- a/bin/tests/system/wildcard/ns1/private.nsec3.db.in
+++ b/bin/tests/system/wildcard/ns1/private.nsec3.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
 $TTL 120
 @	SOA a.root-servers.nil. hostmaster.root-servers.nil. 1 1800 900 604800 86400
 @	NS  a.root-servers.nil.
diff --git a/bin/tests/system/wildcard/ns1/root.db.in b/bin/tests/system/wildcard/ns1/root.db.in
index 62565c81f69..493140f203c 100644
--- a/bin/tests/system/wildcard/ns1/root.db.in
+++ b/bin/tests/system/wildcard/ns1/root.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
 $TTL 120
 @	SOA a.root-servers.nil hostmaster.root-servers.nil 1 1800 900 604800 86400
 @	NS  a.root-servers.nil
diff --git a/bin/tests/system/wildcard/ns2/hints b/bin/tests/system/wildcard/ns2/hints
index 66cb2f122e0..b4b8f7ab532 100644
--- a/bin/tests/system/wildcard/ns2/hints
+++ b/bin/tests/system/wildcard/ns2/hints
@@ -7,7 +7,5 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: hints,v 1.1.2.1 2010/06/01 03:55:02 marka Exp $
-
 . 0 NS ns.root-servers.nil.
 ns.root-servers.nil. 0 A 10.53.0.1
diff --git a/bin/tests/system/wildcard/ns3/hints b/bin/tests/system/wildcard/ns3/hints
index 66cb2f122e0..b4b8f7ab532 100644
--- a/bin/tests/system/wildcard/ns3/hints
+++ b/bin/tests/system/wildcard/ns3/hints
@@ -7,7 +7,5 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: hints,v 1.1.2.1 2010/06/01 03:55:02 marka Exp $
-
 . 0 NS ns.root-servers.nil.
 ns.root-servers.nil. 0 A 10.53.0.1
diff --git a/bin/tests/system/wildcard/ns5/hints b/bin/tests/system/wildcard/ns5/hints
index 66cb2f122e0..b4b8f7ab532 100644
--- a/bin/tests/system/wildcard/ns5/hints
+++ b/bin/tests/system/wildcard/ns5/hints
@@ -7,7 +7,5 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: hints,v 1.1.2.1 2010/06/01 03:55:02 marka Exp $
-
 . 0 NS ns.root-servers.nil.
 ns.root-servers.nil. 0 A 10.53.0.1
diff --git a/bin/tests/system/xfer/ns1/root.db b/bin/tests/system/xfer/ns1/root.db
index 2c1a29ebfa0..8aaa4ea9fd0 100644
--- a/bin/tests/system/xfer/ns1/root.db
+++ b/bin/tests/system/xfer/ns1/root.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.db,v 1.10 2007/06/19 23:47:07 tbox Exp $
-
 $TTL 300
 . 			IN SOA	gson.nominum.com. a.root.servers.nil. (
 				2000042100   	; serial
diff --git a/bin/tests/system/xfer/ns4/root.db.in b/bin/tests/system/xfer/ns4/root.db.in
index 9d400d410f5..c675b902d8a 100644
--- a/bin/tests/system/xfer/ns4/root.db.in
+++ b/bin/tests/system/xfer/ns4/root.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.db.in,v 1.3 2011/12/01 23:46:51 tbox Exp $
-
 @ 0 SOA . . 0 0 0 0 0
 @ 0 NS .
 @ 0 A 10.53.0.4
diff --git a/bin/tests/system/xferquota/ns1/changing1.db b/bin/tests/system/xferquota/ns1/changing1.db
index 6226c37ab5b..f103492decd 100644
--- a/bin/tests/system/xferquota/ns1/changing1.db
+++ b/bin/tests/system/xferquota/ns1/changing1.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: changing1.db,v 1.10 2007/06/19 23:47:07 tbox Exp $
-
 $TTL	600
 
 @               IN      SOA     dns1.changing. postmaster.changing. (
diff --git a/bin/tests/system/xferquota/ns1/changing2.db b/bin/tests/system/xferquota/ns1/changing2.db
index 5f390f32e2a..9afaf71b8d4 100644
--- a/bin/tests/system/xferquota/ns1/changing2.db
+++ b/bin/tests/system/xferquota/ns1/changing2.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: changing2.db,v 1.10 2007/06/19 23:47:07 tbox Exp $
-
 $TTL	600
 
 @               IN      SOA     dns1.changing. postmaster.changing. (
diff --git a/bin/tests/system/xferquota/ns1/root.db b/bin/tests/system/xferquota/ns1/root.db
index 738a81c9373..91692f79d8a 100644
--- a/bin/tests/system/xferquota/ns1/root.db
+++ b/bin/tests/system/xferquota/ns1/root.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.db,v 1.10 2007/06/19 23:47:07 tbox Exp $
-
 $TTL 300
 . 			IN SOA	gson.nominum.com. a.root.servers.nil. (
 				2000042100   	; serial
diff --git a/bin/tests/system/xferquota/ns2/example.db b/bin/tests/system/xferquota/ns2/example.db
index a8f518d0fe1..e47efcb4d4c 100644
--- a/bin/tests/system/xferquota/ns2/example.db
+++ b/bin/tests/system/xferquota/ns2/example.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example.db,v 1.14 2009/01/21 23:47:27 tbox Exp $
-
 $ORIGIN .
 $TTL 300	; 5 minutes
 example			IN SOA	mname1. . (
diff --git a/bin/tests/system/xferquota/setup.pl b/bin/tests/system/xferquota/setup.pl
index cf7ec39db89..6acbb736573 100644
--- a/bin/tests/system/xferquota/setup.pl
+++ b/bin/tests/system/xferquota/setup.pl
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: setup.pl,v 1.16 2011/10/26 23:46:15 tbox Exp $
-
 #
 # Set up test data for zone transfer quota tests.
 #
diff --git a/bin/tests/system/zonechecks/a.db b/bin/tests/system/zonechecks/a.db
index 6584ccac47a..637d5eda79b 100644
--- a/bin/tests/system/zonechecks/a.db
+++ b/bin/tests/system/zonechecks/a.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: a.db,v 1.5 2007/06/19 23:47:07 tbox Exp $
-
 @	3600	IN SOA	ns hostmaster 1 3600 1200 604800 3600
 @	3600	IN NS	127.0.0.1
 127.0.0.1 3600	IN A	127.0.0.1
diff --git a/bin/tests/system/zonechecks/aaaa.db b/bin/tests/system/zonechecks/aaaa.db
index 1679bb79280..9c833a754f2 100644
--- a/bin/tests/system/zonechecks/aaaa.db
+++ b/bin/tests/system/zonechecks/aaaa.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: aaaa.db,v 1.5 2007/06/19 23:47:07 tbox Exp $
-
 @	3600	IN SOA	ns hostmaster 1 3600 1200 604800 3600
 @	3600	IN NS	::1
 ::1	3600	IN AAAA	::1
diff --git a/bin/tests/system/zonechecks/cname.db b/bin/tests/system/zonechecks/cname.db
index 76a899f9c24..0bd91060707 100644
--- a/bin/tests/system/zonechecks/cname.db
+++ b/bin/tests/system/zonechecks/cname.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: cname.db,v 1.5 2007/06/19 23:47:07 tbox Exp $
-
 @	3600	IN SOA	ns hostmaster 1 3600 1200 604800 3600
 @	3600	IN NS	ns
 ns	3600	IN CNAME @
diff --git a/bin/tests/system/zonechecks/dname.db b/bin/tests/system/zonechecks/dname.db
index d507351114e..a5b4f0783c1 100644
--- a/bin/tests/system/zonechecks/dname.db
+++ b/bin/tests/system/zonechecks/dname.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: dname.db,v 1.5 2007/06/19 23:47:07 tbox Exp $
-
 @	3600	IN SOA	ns hostmaster 1 3600 1200 604800 3600
 @	3600	IN NS	ns
 @	3600	IN DNAME .
diff --git a/bin/tests/system/zonechecks/noaddress.db b/bin/tests/system/zonechecks/noaddress.db
index 43a8468a3b2..4227bd5f17a 100644
--- a/bin/tests/system/zonechecks/noaddress.db
+++ b/bin/tests/system/zonechecks/noaddress.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: noaddress.db,v 1.5 2007/06/19 23:47:07 tbox Exp $
-
 @	3600	IN SOA	ns hostmaster 1 3600 1200 604800 3600
 @	3600	IN NS	ns
 ns	3600	IN TXT	this name has no address records
diff --git a/bin/tests/system/zonechecks/nxdomain.db b/bin/tests/system/zonechecks/nxdomain.db
index 82c950dd147..7512e98cf4d 100644
--- a/bin/tests/system/zonechecks/nxdomain.db
+++ b/bin/tests/system/zonechecks/nxdomain.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: nxdomain.db,v 1.5 2007/06/19 23:47:07 tbox Exp $
-
 @	3600	IN SOA	ns hostmaster 1 3600 1200 604800 3600
 @	3600	IN NS	ns
 ; There are no records at all with the ownername of "ns".
diff --git a/bin/tests/virtual-time/Makefile.in b/bin/tests/virtual-time/Makefile.in
index bf4136dcfb7..bd51ce9890f 100644
--- a/bin/tests/virtual-time/Makefile.in
+++ b/bin/tests/virtual-time/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.2 2010/06/17 05:38:04 marka Exp $
-
 TARGETS =	libvtwrapper.so
 SRCS =		vtwrapper.c
 CFLAGS +=	-fPIC
diff --git a/bin/tests/virtual-time/README b/bin/tests/virtual-time/README
index 364816ff059..a58940fbd78 100644
--- a/bin/tests/virtual-time/README
+++ b/bin/tests/virtual-time/README
@@ -16,5 +16,3 @@ loader.
 Beware BIND clock uses unsigned integer, in 22 seconds isc_time_now()
 overflows and breaks assertions. Note 22 real seconds is 136 virtual
 years...
-
-$Id: README,v 1.2 2010/06/17 05:38:04 marka Exp $
diff --git a/bin/tests/virtual-time/autosign-ksk/clean.sh b/bin/tests/virtual-time/autosign-ksk/clean.sh
index 82354806fbe..5fd766ee9bd 100644
--- a/bin/tests/virtual-time/autosign-ksk/clean.sh
+++ b/bin/tests/virtual-time/autosign-ksk/clean.sh
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: clean.sh,v 1.2 2010/06/21 02:31:45 marka Exp $
-
 #
 # Clean up after virtual time tests.
 #
diff --git a/bin/tests/virtual-time/autosign-ksk/ns1/example.db.in b/bin/tests/virtual-time/autosign-ksk/ns1/example.db.in
index 693990c59f6..c61ebd38cf5 100644
--- a/bin/tests/virtual-time/autosign-ksk/ns1/example.db.in
+++ b/bin/tests/virtual-time/autosign-ksk/ns1/example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example.db.in,v 1.3 2010/06/21 23:46:48 tbox Exp $
-
 $TTL 60	; 1 mn (to avoid to delay activation with ttl > prepublish)
 @			IN SOA	ns root (
 				2000042100   	; serial
diff --git a/bin/tests/virtual-time/autosign-ksk/ns1/named.conf b/bin/tests/virtual-time/autosign-ksk/ns1/named.conf
index d2cbafa0f8b..141ce62a3d0 100644
--- a/bin/tests/virtual-time/autosign-ksk/ns1/named.conf
+++ b/bin/tests/virtual-time/autosign-ksk/ns1/named.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: named.conf,v 1.2 2010/06/21 02:31:45 marka Exp $ */
-
 controls { /* empty */ };
 
 options {
diff --git a/bin/tests/virtual-time/autosign-ksk/ns1/root.db b/bin/tests/virtual-time/autosign-ksk/ns1/root.db
index 98f72843b8a..d2c6cd48502 100644
--- a/bin/tests/virtual-time/autosign-ksk/ns1/root.db
+++ b/bin/tests/virtual-time/autosign-ksk/ns1/root.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.db,v 1.3 2010/06/21 23:46:48 tbox Exp $
-
 $TTL 300
 . 			IN SOA	gson.nominum.com. a.root.servers.nil. (
 				2000082401 ; serial
diff --git a/bin/tests/virtual-time/autosign-ksk/ns1/sign.sh b/bin/tests/virtual-time/autosign-ksk/ns1/sign.sh
index 7e2854292c8..acccdf06ae5 100644
--- a/bin/tests/virtual-time/autosign-ksk/ns1/sign.sh
+++ b/bin/tests/virtual-time/autosign-ksk/ns1/sign.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: sign.sh,v 1.2 2010/06/21 02:31:45 marka Exp $
-
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
diff --git a/bin/tests/virtual-time/autosign-ksk/ns1/wrap.sh b/bin/tests/virtual-time/autosign-ksk/ns1/wrap.sh
index 8a7420eaddf..9bc15bb2ccc 100644
--- a/bin/tests/virtual-time/autosign-ksk/ns1/wrap.sh
+++ b/bin/tests/virtual-time/autosign-ksk/ns1/wrap.sh
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: wrap.sh,v 1.3 2010/06/21 23:46:48 tbox Exp $
-
 #
 # Wrapper for named
 #
diff --git a/bin/tests/virtual-time/autosign-ksk/setup.sh b/bin/tests/virtual-time/autosign-ksk/setup.sh
index ec05f4ba56e..85a723a38f5 100644
--- a/bin/tests/virtual-time/autosign-ksk/setup.sh
+++ b/bin/tests/virtual-time/autosign-ksk/setup.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: setup.sh,v 1.2 2010/06/21 02:31:45 marka Exp $
-
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 . ./clean.sh
diff --git a/bin/tests/virtual-time/autosign-ksk/tests.sh b/bin/tests/virtual-time/autosign-ksk/tests.sh
index 5a43e94d45d..8588b0f5797 100644
--- a/bin/tests/virtual-time/autosign-ksk/tests.sh
+++ b/bin/tests/virtual-time/autosign-ksk/tests.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: tests.sh,v 1.2 2010/06/21 02:31:45 marka Exp $
-
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
diff --git a/bin/tests/virtual-time/autosign-zsk/clean.sh b/bin/tests/virtual-time/autosign-zsk/clean.sh
index 82354806fbe..5fd766ee9bd 100644
--- a/bin/tests/virtual-time/autosign-zsk/clean.sh
+++ b/bin/tests/virtual-time/autosign-zsk/clean.sh
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: clean.sh,v 1.2 2010/06/21 02:31:45 marka Exp $
-
 #
 # Clean up after virtual time tests.
 #
diff --git a/bin/tests/virtual-time/autosign-zsk/ns1/example.db.in b/bin/tests/virtual-time/autosign-zsk/ns1/example.db.in
index 693990c59f6..c61ebd38cf5 100644
--- a/bin/tests/virtual-time/autosign-zsk/ns1/example.db.in
+++ b/bin/tests/virtual-time/autosign-zsk/ns1/example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example.db.in,v 1.3 2010/06/21 23:46:48 tbox Exp $
-
 $TTL 60	; 1 mn (to avoid to delay activation with ttl > prepublish)
 @			IN SOA	ns root (
 				2000042100   	; serial
diff --git a/bin/tests/virtual-time/autosign-zsk/ns1/named.conf b/bin/tests/virtual-time/autosign-zsk/ns1/named.conf
index 038c6767399..94e91267b43 100644
--- a/bin/tests/virtual-time/autosign-zsk/ns1/named.conf
+++ b/bin/tests/virtual-time/autosign-zsk/ns1/named.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: named.conf,v 1.2 2010/06/21 02:31:45 marka Exp $ */
-
 controls { /* empty */ };
 
 options {
diff --git a/bin/tests/virtual-time/autosign-zsk/ns1/root.db b/bin/tests/virtual-time/autosign-zsk/ns1/root.db
index 98f72843b8a..d2c6cd48502 100644
--- a/bin/tests/virtual-time/autosign-zsk/ns1/root.db
+++ b/bin/tests/virtual-time/autosign-zsk/ns1/root.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.db,v 1.3 2010/06/21 23:46:48 tbox Exp $
-
 $TTL 300
 . 			IN SOA	gson.nominum.com. a.root.servers.nil. (
 				2000082401 ; serial
diff --git a/bin/tests/virtual-time/autosign-zsk/ns1/sign.sh b/bin/tests/virtual-time/autosign-zsk/ns1/sign.sh
index e1b360cdb6e..d0723db192e 100644
--- a/bin/tests/virtual-time/autosign-zsk/ns1/sign.sh
+++ b/bin/tests/virtual-time/autosign-zsk/ns1/sign.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: sign.sh,v 1.2 2010/06/21 02:31:46 marka Exp $
-
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
diff --git a/bin/tests/virtual-time/autosign-zsk/ns1/wrap.sh b/bin/tests/virtual-time/autosign-zsk/ns1/wrap.sh
index 8a7420eaddf..9bc15bb2ccc 100644
--- a/bin/tests/virtual-time/autosign-zsk/ns1/wrap.sh
+++ b/bin/tests/virtual-time/autosign-zsk/ns1/wrap.sh
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: wrap.sh,v 1.3 2010/06/21 23:46:48 tbox Exp $
-
 #
 # Wrapper for named
 #
diff --git a/bin/tests/virtual-time/autosign-zsk/setup.sh b/bin/tests/virtual-time/autosign-zsk/setup.sh
index ec05f4ba56e..85a723a38f5 100644
--- a/bin/tests/virtual-time/autosign-zsk/setup.sh
+++ b/bin/tests/virtual-time/autosign-zsk/setup.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: setup.sh,v 1.2 2010/06/21 02:31:45 marka Exp $
-
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 . ./clean.sh
diff --git a/bin/tests/virtual-time/autosign-zsk/tests.sh b/bin/tests/virtual-time/autosign-zsk/tests.sh
index ea573959705..e71af8fcbd7 100644
--- a/bin/tests/virtual-time/autosign-zsk/tests.sh
+++ b/bin/tests/virtual-time/autosign-zsk/tests.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: tests.sh,v 1.2 2010/06/21 02:31:45 marka Exp $
-
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
diff --git a/bin/tests/virtual-time/cleanall.sh b/bin/tests/virtual-time/cleanall.sh
index e91bf8a2f81..9bc5eea110a 100644
--- a/bin/tests/virtual-time/cleanall.sh
+++ b/bin/tests/virtual-time/cleanall.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: cleanall.sh,v 1.2 2010/06/17 05:38:05 marka Exp $
-
 #
 # Clean up after system tests.
 #
diff --git a/bin/tests/virtual-time/common/controls.conf b/bin/tests/virtual-time/common/controls.conf
index 82006c36aab..021bf861cbc 100644
--- a/bin/tests/virtual-time/common/controls.conf
+++ b/bin/tests/virtual-time/common/controls.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: controls.conf,v 1.2 2010/06/17 05:38:05 marka Exp $ */
-
 key rndc_key {
 	secret "1234abcd8765";
 	algorithm hmac-md5;
diff --git a/bin/tests/virtual-time/common/rndc.conf b/bin/tests/virtual-time/common/rndc.conf
index 4df55875c44..b47ca45ee01 100644
--- a/bin/tests/virtual-time/common/rndc.conf
+++ b/bin/tests/virtual-time/common/rndc.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: rndc.conf,v 1.2 2010/06/17 05:38:05 marka Exp $ */
-
 options {
 	default-key     "rndc_key";
 };
diff --git a/bin/tests/virtual-time/common/root.hint b/bin/tests/virtual-time/common/root.hint
index 7ca68f1d1f0..418ea963faa 100644
--- a/bin/tests/virtual-time/common/root.hint
+++ b/bin/tests/virtual-time/common/root.hint
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.hint,v 1.2 2010/06/17 05:38:05 marka Exp $
-
 $TTL 999999
 .			 IN NS	a.root-servers.nil.
 a.root-servers.nil.	 IN A	10.53.0.1
diff --git a/bin/tests/virtual-time/conf.sh.in b/bin/tests/virtual-time/conf.sh.in
index c548466e877..c62a7d69d2a 100644
--- a/bin/tests/virtual-time/conf.sh.in
+++ b/bin/tests/virtual-time/conf.sh.in
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: conf.sh.in,v 1.3 2010/06/21 02:31:45 marka Exp $
-
 #
 # Common configuration data for system tests, to be sourced into
 # other shell scripts.
diff --git a/bin/tests/virtual-time/run.sh b/bin/tests/virtual-time/run.sh
index b162a62d872..c29d2ed5bc9 100644
--- a/bin/tests/virtual-time/run.sh
+++ b/bin/tests/virtual-time/run.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: run.sh,v 1.2 2010/06/17 05:38:05 marka Exp $
-
 SYSTEMTESTTOP=.
 . $SYSTEMTESTTOP/conf.sh
 
diff --git a/bin/tests/virtual-time/runall.sh b/bin/tests/virtual-time/runall.sh
index 2ffe0ea5714..82b26bd4ad9 100644
--- a/bin/tests/virtual-time/runall.sh
+++ b/bin/tests/virtual-time/runall.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: runall.sh,v 1.2 2010/06/17 05:38:05 marka Exp $
-
 #
 # Run all the virtual time tests.
 #
diff --git a/bin/tests/virtual-time/setup.sh b/bin/tests/virtual-time/setup.sh
index 2ab99dcf78b..e2db2e55fd5 100644
--- a/bin/tests/virtual-time/setup.sh
+++ b/bin/tests/virtual-time/setup.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: setup.sh,v 1.2 2010/06/17 05:38:05 marka Exp $
-
 #
 # Run a system test.
 #
diff --git a/bin/tests/virtual-time/slave/clean.sh b/bin/tests/virtual-time/slave/clean.sh
index 167e6779b72..780e8b29613 100644
--- a/bin/tests/virtual-time/slave/clean.sh
+++ b/bin/tests/virtual-time/slave/clean.sh
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: clean.sh,v 1.2 2010/06/17 05:38:05 marka Exp $
-
 #
 # Clean up after virtual time tests.
 #
diff --git a/bin/tests/virtual-time/slave/ns1/example.db.in b/bin/tests/virtual-time/slave/ns1/example.db.in
index af9449c8494..9b54373d8a4 100644
--- a/bin/tests/virtual-time/slave/ns1/example.db.in
+++ b/bin/tests/virtual-time/slave/ns1/example.db.in
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: example.db.in,v 1.3 2010/06/18 23:46:42 tbox Exp $
-
 $TTL 300	; 5 minutes
 @			IN SOA	ns root (
 				2000042100   	; serial
diff --git a/bin/tests/virtual-time/slave/ns1/named.conf b/bin/tests/virtual-time/slave/ns1/named.conf
index 60d23c6a5bd..5cd39313f2d 100644
--- a/bin/tests/virtual-time/slave/ns1/named.conf
+++ b/bin/tests/virtual-time/slave/ns1/named.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: named.conf,v 1.3 2010/06/18 23:46:42 tbox Exp $ */
-
 controls { /* empty */ };
 
 options {
diff --git a/bin/tests/virtual-time/slave/ns1/root.db b/bin/tests/virtual-time/slave/ns1/root.db
index 2cbbd9221f1..d2c6cd48502 100644
--- a/bin/tests/virtual-time/slave/ns1/root.db
+++ b/bin/tests/virtual-time/slave/ns1/root.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: root.db,v 1.3 2010/06/18 23:46:43 tbox Exp $
-
 $TTL 300
 . 			IN SOA	gson.nominum.com. a.root.servers.nil. (
 				2000082401 ; serial
diff --git a/bin/tests/virtual-time/slave/ns1/wrap.sh b/bin/tests/virtual-time/slave/ns1/wrap.sh
index 764bc36b598..9bc15bb2ccc 100644
--- a/bin/tests/virtual-time/slave/ns1/wrap.sh
+++ b/bin/tests/virtual-time/slave/ns1/wrap.sh
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: wrap.sh,v 1.3 2010/06/18 23:46:43 tbox Exp $
-
 #
 # Wrapper for named
 #
diff --git a/bin/tests/virtual-time/slave/setup.sh b/bin/tests/virtual-time/slave/setup.sh
index ba7f3efc678..4b385e8ee45 100644
--- a/bin/tests/virtual-time/slave/setup.sh
+++ b/bin/tests/virtual-time/slave/setup.sh
@@ -7,7 +7,5 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: setup.sh,v 1.2 2010/06/17 05:38:05 marka Exp $
-
 rm -f ns1/example.db
 cp ns1/example.db.in ns1/example.db
diff --git a/bin/tests/virtual-time/slave/tests.sh b/bin/tests/virtual-time/slave/tests.sh
index 2f5a78bcfa7..37689109652 100644
--- a/bin/tests/virtual-time/slave/tests.sh
+++ b/bin/tests/virtual-time/slave/tests.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: tests.sh,v 1.2 2010/06/17 05:38:06 marka Exp $
-
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
diff --git a/bin/tests/virtual-time/start.pl b/bin/tests/virtual-time/start.pl
index 105ac3503a1..8e290335068 100644
--- a/bin/tests/virtual-time/start.pl
+++ b/bin/tests/virtual-time/start.pl
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: start.pl,v 1.2 2010/06/17 05:38:05 marka Exp $
-
 # Framework for starting test servers.
 # Based on the type of server specified, check for port availability, remove
 # temporary files, start the server, and verify that the server is running.
diff --git a/bin/tests/virtual-time/start.sh b/bin/tests/virtual-time/start.sh
index 258ce96d072..78fb0443d77 100644
--- a/bin/tests/virtual-time/start.sh
+++ b/bin/tests/virtual-time/start.sh
@@ -9,7 +9,5 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: start.sh,v 1.2 2010/06/17 05:38:05 marka Exp $
-
 . ./conf.sh
 $PERL start.pl "$@"
diff --git a/bin/tests/virtual-time/stop.pl b/bin/tests/virtual-time/stop.pl
index 2225147349f..b46aa600ab2 100644
--- a/bin/tests/virtual-time/stop.pl
+++ b/bin/tests/virtual-time/stop.pl
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: stop.pl,v 1.2 2010/06/17 05:38:05 marka Exp $
-
 # Framework for stopping test servers
 # Based on the type of server specified, signal the server to stop, wait
 # briefly for it to die, and then kill it if it is still alive.
diff --git a/bin/tests/virtual-time/stop.sh b/bin/tests/virtual-time/stop.sh
index 1a17f77bf15..a2ae614d89a 100644
--- a/bin/tests/virtual-time/stop.sh
+++ b/bin/tests/virtual-time/stop.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: stop.sh,v 1.2 2010/06/17 05:38:05 marka Exp $
-
 . ./conf.sh
 $PERL ./stop.pl "$@"
 
diff --git a/bin/tests/virtual-time/testsock.pl b/bin/tests/virtual-time/testsock.pl
index 7d8543c17b8..b793baef4a5 100644
--- a/bin/tests/virtual-time/testsock.pl
+++ b/bin/tests/virtual-time/testsock.pl
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: testsock.pl,v 1.2 2010/06/17 05:38:05 marka Exp $
-
 # Test whether the interfaces on 10.53.0.* are up.
 
 require 5.001;
diff --git a/bin/tests/virtual-time/vtwrapper.c b/bin/tests/virtual-time/vtwrapper.c
index 472aeb78bed..36471f2ef08 100644
--- a/bin/tests/virtual-time/vtwrapper.c
+++ b/bin/tests/virtual-time/vtwrapper.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: vtwrapper.c,v 1.4 2010/08/12 09:31:50 fdupont Exp $ */
 
 #define _GNU_SOURCE
 #include <sys/syscall.h>
diff --git a/bin/tools/arpaname.c b/bin/tools/arpaname.c
index 3ee90cffb9f..c154ee52fe0 100644
--- a/bin/tools/arpaname.c
+++ b/bin/tools/arpaname.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: arpaname.c,v 1.4 2009/10/27 03:05:33 marka Exp $ */
 
 #include "config.h"
 
diff --git a/bin/tools/genrandom.c b/bin/tools/genrandom.c
index f495a7e22d2..40dadbe646f 100644
--- a/bin/tools/genrandom.c
+++ b/bin/tools/genrandom.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: genrandom.c,v 1.7 2010/05/17 23:51:04 tbox Exp $ */
 
 /*! \file */
 #include <config.h>
diff --git a/bin/tools/named-journalprint.c b/bin/tools/named-journalprint.c
index a7c69207d4e..1bca1b2a5cd 100644
--- a/bin/tools/named-journalprint.c
+++ b/bin/tools/named-journalprint.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: named-journalprint.c,v 1.2 2009/12/04 21:59:23 marka Exp $ */
 
 /*! \file */
 #include <config.h>
diff --git a/bin/win32/BINDInstall/AccountInfo.cpp b/bin/win32/BINDInstall/AccountInfo.cpp
index 11383596bb4..73357a834d2 100644
--- a/bin/win32/BINDInstall/AccountInfo.cpp
+++ b/bin/win32/BINDInstall/AccountInfo.cpp
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: AccountInfo.cpp,v 1.10 2009/09/29 23:48:04 tbox Exp $ */
-
 /* Compiled with UNICODE */
 
 #include "stdafx.h"
diff --git a/bin/win32/BINDInstall/AccountInfo.h b/bin/win32/BINDInstall/AccountInfo.h
index 6e933926bc5..1eb684d331c 100644
--- a/bin/win32/BINDInstall/AccountInfo.h
+++ b/bin/win32/BINDInstall/AccountInfo.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: AccountInfo.h,v 1.6 2007/06/19 23:47:07 tbox Exp $ */
 
 
 #define RTN_OK		0
diff --git a/bin/win32/BINDInstall/BINDInstall.cpp b/bin/win32/BINDInstall/BINDInstall.cpp
index 63b5aead1d7..5ee09817ad1 100644
--- a/bin/win32/BINDInstall/BINDInstall.cpp
+++ b/bin/win32/BINDInstall/BINDInstall.cpp
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: BINDInstall.cpp,v 1.9 2009/09/29 23:48:04 tbox Exp $ */
-
 /*
  * Copyright (c) 1999-2000 by Nortel Networks Corporation
  *
diff --git a/bin/win32/BINDInstall/BINDInstall.h b/bin/win32/BINDInstall/BINDInstall.h
index ef66e4297a9..1d12d5ede1c 100644
--- a/bin/win32/BINDInstall/BINDInstall.h
+++ b/bin/win32/BINDInstall/BINDInstall.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: BINDInstall.h,v 1.6 2007/06/19 23:47:07 tbox Exp $ */
 
 /*
  * Copyright (c) 1999-2000 by Nortel Networks Corporation
diff --git a/bin/win32/BINDInstall/BINDInstallDlg.cpp b/bin/win32/BINDInstall/BINDInstallDlg.cpp
index d79147f5de9..1cbec5ccb78 100644
--- a/bin/win32/BINDInstall/BINDInstallDlg.cpp
+++ b/bin/win32/BINDInstall/BINDInstallDlg.cpp
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: BINDInstallDlg.cpp,v 1.48 2010/01/07 23:48:54 tbox Exp $ */
-
 /*
  * Copyright (c) 1999-2000 by Nortel Networks Corporation
  *
diff --git a/bin/win32/BINDInstall/BINDInstallDlg.h b/bin/win32/BINDInstall/BINDInstallDlg.h
index 4caac239a95..cdc3a4321d2 100644
--- a/bin/win32/BINDInstall/BINDInstallDlg.h
+++ b/bin/win32/BINDInstall/BINDInstallDlg.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: BINDInstallDlg.h,v 1.11 2009/09/01 06:51:47 marka Exp $ */
 
 /*
  * Copyright (c) 1999-2000 by Nortel Networks Corporation
diff --git a/bin/win32/BINDInstall/DirBrowse.cpp b/bin/win32/BINDInstall/DirBrowse.cpp
index 6c43c296d04..758dc605735 100644
--- a/bin/win32/BINDInstall/DirBrowse.cpp
+++ b/bin/win32/BINDInstall/DirBrowse.cpp
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: DirBrowse.cpp,v 1.6 2007/06/19 23:47:07 tbox Exp $ */
-
 /*
  * Copyright (c) 1999-2000 by Nortel Networks Corporation
  *
diff --git a/bin/win32/BINDInstall/DirBrowse.h b/bin/win32/BINDInstall/DirBrowse.h
index df9b5c6d8af..080cacfa511 100644
--- a/bin/win32/BINDInstall/DirBrowse.h
+++ b/bin/win32/BINDInstall/DirBrowse.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: DirBrowse.h,v 1.6 2007/06/19 23:47:07 tbox Exp $ */
 
 /*
  * Copyright (c) 1999-2000 by Nortel Networks Corporation
diff --git a/conftools/perllib/dnsconf/DNSConf-macros.h b/conftools/perllib/dnsconf/DNSConf-macros.h
index 94ece409b31..730dcb01611 100644
--- a/conftools/perllib/dnsconf/DNSConf-macros.h
+++ b/conftools/perllib/dnsconf/DNSConf-macros.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: DNSConf-macros.h,v 1.9 2007/06/19 23:47:07 tbox Exp $ */
 
 #define CONCAT(a,b) a ## b
 #define DNSCONF_SET_STRING(FIELD)					\
diff --git a/conftools/perllib/dnsconf/DNSConf.i b/conftools/perllib/dnsconf/DNSConf.i
index eb3e4a42f02..3238acb8504 100644
--- a/conftools/perllib/dnsconf/DNSConf.i
+++ b/conftools/perllib/dnsconf/DNSConf.i
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: DNSConf.i,v 1.9 2007/06/19 23:47:07 tbox Exp $ */
-
 %module DNSConf
 
 %{
diff --git a/conftools/perllib/dnsconf/Makefile.PL b/conftools/perllib/dnsconf/Makefile.PL
index 0014aa1b4a9..d600d48d34d 100644
--- a/conftools/perllib/dnsconf/Makefile.PL
+++ b/conftools/perllib/dnsconf/Makefile.PL
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.PL,v 1.9 2007/06/19 23:47:07 tbox Exp $
-
 use ExtUtils::MakeMaker;
 
 $ENV{CC} = "gcc";
diff --git a/conftools/perllib/dnsconf/named1.conf b/conftools/perllib/dnsconf/named1.conf
index 64b0f273d54..b28640a98f2 100644
--- a/conftools/perllib/dnsconf/named1.conf
+++ b/conftools/perllib/dnsconf/named1.conf
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: named1.conf,v 1.9 2007/06/19 23:47:07 tbox Exp $ */
-
 options {
 #	port 8888;
 	directory       "/etc/namedb"
diff --git a/conftools/perllib/dnsconf/test.pl b/conftools/perllib/dnsconf/test.pl
index 85c662f9c4c..5ff1b81e6aa 100644
--- a/conftools/perllib/dnsconf/test.pl
+++ b/conftools/perllib/dnsconf/test.pl
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: test.pl,v 1.9 2007/06/19 23:47:07 tbox Exp $
-
 push(@ARGV, "/etc/named.conf") if ! @ARGV;
 
 use DNSConf;
diff --git a/contrib/dlz/drivers/dlz_drivers.c b/contrib/dlz/drivers/dlz_drivers.c
index 7ad166c7f46..4e42d803e18 100644
--- a/contrib/dlz/drivers/dlz_drivers.c
+++ b/contrib/dlz/drivers/dlz_drivers.c
@@ -14,7 +14,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dlz_drivers.c,v 1.4 2011/03/10 04:36:16 each Exp $ */
 
 /*! \file */
 
diff --git a/contrib/dlz/drivers/include/dlz/dlz_drivers.h b/contrib/dlz/drivers/include/dlz/dlz_drivers.h
index dce7cd20e2f..58ffadad570 100644
--- a/contrib/dlz/drivers/include/dlz/dlz_drivers.h
+++ b/contrib/dlz/drivers/include/dlz/dlz_drivers.h
@@ -14,7 +14,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dlz_drivers.h,v 1.2 2005/09/05 00:10:58 marka Exp $ */
 
 #ifndef DLZ_DRIVERS_H
 #define DLZ_DRIVERS_H 1
diff --git a/contrib/dlz/drivers/rules.in b/contrib/dlz/drivers/rules.in
index e3b64b3fe9a..81d48d63fa5 100644
--- a/contrib/dlz/drivers/rules.in
+++ b/contrib/dlz/drivers/rules.in
@@ -12,8 +12,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: rules.in,v 1.3 2010/12/18 01:56:21 each Exp $
-
 dlz_drivers.@O@: ${DLZ_DRIVER_DIR}/dlz_drivers.c ${DLZ_DRIVER_DIR}/include/dlz/dlz_drivers.h
 	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -c ${DLZ_DRIVER_DIR}/dlz_drivers.c
 
diff --git a/contrib/dlz/example/win32/DLLMain.c b/contrib/dlz/example/win32/DLLMain.c
index 3003cf0ae3c..445905f3f4a 100644
--- a/contrib/dlz/example/win32/DLLMain.c
+++ b/contrib/dlz/example/win32/DLLMain.c
@@ -6,7 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: DLLMain.c,v 1.2 2011/03/10 04:36:16 each Exp $ */
 
 #include <windows.h>
 #include <signal.h>
diff --git a/contrib/dlz/modules/perl/testing/named.conf b/contrib/dlz/modules/perl/testing/named.conf
index 30427dd8347..32eebef20a3 100644
--- a/contrib/dlz/modules/perl/testing/named.conf
+++ b/contrib/dlz/modules/perl/testing/named.conf
@@ -14,8 +14,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf.in,v 1.1.4.3 2011-03-10 23:47:29 tbox Exp $ */
-
 options {
 	port 5300;
 	pid-file "named.pid";
diff --git a/contrib/dnsperf-2.1.0.0-1/dnsperf.c b/contrib/dnsperf-2.1.0.0-1/dnsperf.c
index d4f2b329d7b..67c5fc3ddb7 100644
--- a/contrib/dnsperf-2.1.0.0-1/dnsperf.c
+++ b/contrib/dnsperf-2.1.0.0-1/dnsperf.c
@@ -34,8 +34,6 @@
 
 /***
  ***	DNS Performance Testing Tool
- ***
- ***	Version $Id: dnsperf.c 263303 2015-12-15 01:09:36Z bwelling $
  ***/
 
 #include <errno.h>
diff --git a/contrib/dnsperf-2.1.0.0-1/resperf.c b/contrib/dnsperf-2.1.0.0-1/resperf.c
index 4dfbb2201c8..e94528e8025 100644
--- a/contrib/dnsperf-2.1.0.0-1/resperf.c
+++ b/contrib/dnsperf-2.1.0.0-1/resperf.c
@@ -34,8 +34,6 @@
 
 /***
  ***	DNS Resolution Performance Testing Tool
- ***
- ***	Version $Id: resperf.c 263304 2015-12-15 01:14:10Z bwelling $
  ***/
 
 #include <errno.h>
diff --git a/contrib/queryperf/README b/contrib/queryperf/README
index 54edd34027a..a52c31d1140 100644
--- a/contrib/queryperf/README
+++ b/contrib/queryperf/README
@@ -1,6 +1,3 @@
-
-$Id: README,v 1.1 2001/07/12 02:02:09 gson Exp $
-
 This is queryperf, a DNS server query performance testing tool.
 
 It is primarily intended for measuring the performance of
diff --git a/contrib/queryperf/queryperf.c b/contrib/queryperf/queryperf.c
index 28a62ea0193..cd2feb2a1c5 100644
--- a/contrib/queryperf/queryperf.c
+++ b/contrib/queryperf/queryperf.c
@@ -18,8 +18,6 @@
 /***
  ***	DNS Query Performance Testing Tool  (queryperf.c)
  ***
- ***	Version $Id: queryperf.c,v 1.12 2007/09/05 07:36:04 marka Exp $
- ***
  ***	Stephen Jacob <sj@nominum.com>
  ***/
 
diff --git a/contrib/queryperf/utils/gen-data-queryperf.py b/contrib/queryperf/utils/gen-data-queryperf.py
index be404cb2e8f..dbd1f9e2597 100644
--- a/contrib/queryperf/utils/gen-data-queryperf.py
+++ b/contrib/queryperf/utils/gen-data-queryperf.py
@@ -1,7 +1,5 @@
 #!/usr/bin/python
 
-#
-# $Id: gen-data-queryperf.py,v 1.2 2008/06/13 18:17:08 jinmei Exp $
 #
 # Contributed by Stephane Bortzmeyer <bortzmeyer@nic.fr>
 #
diff --git a/contrib/scripts/check-secure-delegation.pl.in b/contrib/scripts/check-secure-delegation.pl.in
index 92ea1b0e2d4..528900adcd3 100644
--- a/contrib/scripts/check-secure-delegation.pl.in
+++ b/contrib/scripts/check-secure-delegation.pl.in
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: check-secure-delegation.pl.in,v 1.2 2010/12/21 02:32:21 marka Exp $
-
 use warnings;
 use FileHandle;
 use IPC::Open2;
diff --git a/contrib/scripts/named-bootconf.sh b/contrib/scripts/named-bootconf.sh
index 3f2e583663a..29e41059b20 100644
--- a/contrib/scripts/named-bootconf.sh
+++ b/contrib/scripts/named-bootconf.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: named-bootconf.sh,v 1.12 2007/06/19 23:47:07 tbox Exp $
-
 # $NetBSD: named-bootconf.sh,v 1.5 1998/12/15 01:00:53 tron Exp $
 #
 # Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
diff --git a/contrib/scripts/nanny.pl b/contrib/scripts/nanny.pl
index 9cfc6d34beb..cb93441ac68 100644
--- a/contrib/scripts/nanny.pl
+++ b/contrib/scripts/nanny.pl
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: nanny.pl,v 1.11 2007/06/19 23:47:07 tbox Exp $
-
 # A simple nanny to make sure named stays running.
 
 $pid_file_location = '/var/run/named.pid';
diff --git a/contrib/scripts/zone-edit.sh.in b/contrib/scripts/zone-edit.sh.in
index f5419196d86..18132f9fd41 100644
--- a/contrib/scripts/zone-edit.sh.in
+++ b/contrib/scripts/zone-edit.sh.in
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: zone-edit.sh.in,v 1.2 2010/12/21 23:47:08 tbox Exp $
-
 dir=/tmp/zone-edit.$$
 mkdir ${dir} || exit 1
 trap "/bin/rm -rf ${dir}" 0
diff --git a/contrib/sdb/bdb/bdb.c b/contrib/sdb/bdb/bdb.c
index 8d514abb2d4..1b0516fff55 100644
--- a/contrib/sdb/bdb/bdb.c
+++ b/contrib/sdb/bdb/bdb.c
@@ -15,7 +15,6 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: bdb.c,v 1.2 2011/10/11 00:09:02 each Exp $ */
 
 /*
  * BIND 9.1.x simple database driver
diff --git a/contrib/sdb/bdb/bdb.h b/contrib/sdb/bdb/bdb.h
index 7ab56b49d82..9857380d2df 100644
--- a/contrib/sdb/bdb/bdb.h
+++ b/contrib/sdb/bdb/bdb.h
@@ -15,7 +15,6 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: bdb.h,v 1.1 2002/05/16 04:25:22 marka Exp $ */
 
 #ifndef BDB_H
 #define BDB_H	1
diff --git a/contrib/sdb/bdb/zone2bdb.c b/contrib/sdb/bdb/zone2bdb.c
index 7db731eb8a8..20852059374 100644
--- a/contrib/sdb/bdb/zone2bdb.c
+++ b/contrib/sdb/bdb/zone2bdb.c
@@ -15,7 +15,6 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone2bdb.c,v 1.3 2009/09/01 00:22:26 jinmei Exp $ */
 
 #include <stdio.h>
 
diff --git a/contrib/sdb/dir/dirdb.c b/contrib/sdb/dir/dirdb.c
index 66b54901d47..a83c4f3186f 100644
--- a/contrib/sdb/dir/dirdb.c
+++ b/contrib/sdb/dir/dirdb.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: dirdb.c,v 1.14 2011/10/11 23:46:45 tbox Exp $ */
 
 /*
  * A simple database driver that returns basic information about
diff --git a/contrib/sdb/dir/dirdb.h b/contrib/sdb/dir/dirdb.h
index 8fddafb37b9..e72dd69d2ec 100644
--- a/contrib/sdb/dir/dirdb.h
+++ b/contrib/sdb/dir/dirdb.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: dirdb.h,v 1.5 2007/06/19 23:47:07 tbox Exp $ */
 
 #include <isc/types.h>
 
diff --git a/contrib/sdb/pgsql/pgsqldb.c b/contrib/sdb/pgsql/pgsqldb.c
index ef5fc3c07c8..25510993502 100644
--- a/contrib/sdb/pgsql/pgsqldb.c
+++ b/contrib/sdb/pgsql/pgsqldb.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: pgsqldb.c,v 1.17 2011/10/11 23:46:45 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/contrib/sdb/pgsql/pgsqldb.h b/contrib/sdb/pgsql/pgsqldb.h
index 0655e334027..cd60f14469b 100644
--- a/contrib/sdb/pgsql/pgsqldb.h
+++ b/contrib/sdb/pgsql/pgsqldb.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: pgsqldb.h,v 1.5 2007/06/19 23:47:08 tbox Exp $ */
 
 #include <isc/types.h>
 
diff --git a/contrib/sdb/pgsql/zonetodb.c b/contrib/sdb/pgsql/zonetodb.c
index 898ed28839d..b8b7d6b1eb7 100644
--- a/contrib/sdb/pgsql/zonetodb.c
+++ b/contrib/sdb/pgsql/zonetodb.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: zonetodb.c,v 1.23 2009/09/02 23:48:01 tbox Exp $ */
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/contrib/sdb/sqlite/sqlitedb.c b/contrib/sdb/sqlite/sqlitedb.c
index fe21f33b532..dc93db4826d 100644
--- a/contrib/sdb/sqlite/sqlitedb.c
+++ b/contrib/sdb/sqlite/sqlitedb.c
@@ -6,7 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: sqlitedb.c,v 1.2 2011/10/11 00:09:02 each Exp $ */
 
 #include <config.h>
 
diff --git a/contrib/sdb/sqlite/sqlitedb.h b/contrib/sdb/sqlite/sqlitedb.h
index 713d06f6d99..34f63dc6c66 100644
--- a/contrib/sdb/sqlite/sqlitedb.h
+++ b/contrib/sdb/sqlite/sqlitedb.h
@@ -6,7 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: sqlitedb.h,v 1.1 2007/03/05 05:30:22 marka Exp $ */
 
 #include <isc/types.h>
 
diff --git a/contrib/sdb/tcl/lookup.tcl b/contrib/sdb/tcl/lookup.tcl
index 5ed7d62439e..7672ed1a04d 100644
--- a/contrib/sdb/tcl/lookup.tcl
+++ b/contrib/sdb/tcl/lookup.tcl
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: lookup.tcl,v 1.10 2007/06/19 23:47:08 tbox Exp $
-
 #
 # Sample lookup procedure for tcldb
 #
diff --git a/contrib/sdb/tcl/tcldb.c b/contrib/sdb/tcl/tcldb.c
index 733b11627b3..61be7df838b 100644
--- a/contrib/sdb/tcl/tcldb.c
+++ b/contrib/sdb/tcl/tcldb.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: tcldb.c,v 1.12 2011/10/11 23:46:45 tbox Exp $ */
 
 /*
  * A simple database driver that calls a Tcl procedure to define
diff --git a/contrib/sdb/tcl/tcldb.h b/contrib/sdb/tcl/tcldb.h
index cfe8b0dcc49..1d4d16c299b 100644
--- a/contrib/sdb/tcl/tcldb.h
+++ b/contrib/sdb/tcl/tcldb.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: tcldb.h,v 1.7 2007/06/19 23:47:10 tbox Exp $ */
 
 #include <isc/types.h>
 
diff --git a/contrib/sdb/time/timedb.c b/contrib/sdb/time/timedb.c
index 0285edb0229..11633caeb8a 100644
--- a/contrib/sdb/time/timedb.c
+++ b/contrib/sdb/time/timedb.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: timedb.c,v 1.12 2011/10/11 23:46:45 tbox Exp $ */
 
 /*
  * A simple database driver that enables the server to return the
diff --git a/contrib/sdb/time/timedb.h b/contrib/sdb/time/timedb.h
index 5df13d9758c..30899880814 100644
--- a/contrib/sdb/time/timedb.h
+++ b/contrib/sdb/time/timedb.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: timedb.h,v 1.5 2007/06/19 23:47:13 tbox Exp $ */
 
 #include <isc/types.h>
 
diff --git a/doc/arm/notes.html b/doc/arm/notes.html
index e74dc165d08..fd14ce2f4bd 100644
--- a/doc/arm/notes.html
+++ b/doc/arm/notes.html
@@ -4,7 +4,6 @@
  - License, v. 2.0. If a copy of the MPL was not distributed with this
  - file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
-<!-- $Id$ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
diff --git a/doc/design/addressdb b/doc/design/addressdb
index fbc57530a4a..5e290e13808 100644
--- a/doc/design/addressdb
+++ b/doc/design/addressdb
@@ -2,8 +2,6 @@ Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: addressdb,v 1.6 2004/03/05 05:04:45 marka Exp $
-
 You are lost in a maze of twisty little pointers, all alike...
 
 ADB                          |-> 0         |-> handle ---> handle ---> 0
diff --git a/doc/design/compression b/doc/design/compression
index a299069c846..11ae1d30122 100644
--- a/doc/design/compression
+++ b/doc/design/compression
@@ -4,8 +4,6 @@ See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 			Name Compression
 
-	$Id: compression,v 1.9 2004/03/05 05:04:46 marka Exp $
-
 Overview.
 
 	BIND 4.x and BIND 8.x only had one methods of compression to deal
diff --git a/doc/design/database b/doc/design/database
index a6f89956911..8f00f4b890c 100644
--- a/doc/design/database
+++ b/doc/design/database
@@ -2,8 +2,6 @@ Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: database,v 1.9 2004/03/05 05:04:46 marka Exp $
-
 Databases
 
 BIND 9 DNS database allows named rdatasets to be stored and retrieved.
diff --git a/doc/design/db_rules b/doc/design/db_rules
index b2410c58a42..e6335da6f6c 100644
--- a/doc/design/db_rules
+++ b/doc/design/db_rules
@@ -2,8 +2,6 @@ Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: db_rules,v 1.8 2004/03/05 05:04:46 marka Exp $
-
 Here is a more formal statement of the important database design
 rules.  Each rule has a 5 character mnemonic, for use in source code
 comments.
diff --git a/doc/design/decompression b/doc/design/decompression
index ab19cfe9acf..f9a1f2ab428 100644
--- a/doc/design/decompression
+++ b/doc/design/decompression
@@ -4,8 +4,6 @@ See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 			Name Decompression
 
-	$Id: decompression,v 1.8 2004/03/05 05:04:46 marka Exp $
-
 Overview.
 
 	There are 4 type of compression: global 14 bit, global 16 bit,
diff --git a/doc/design/dispatch b/doc/design/dispatch
index 20466fa6e8e..0729f623955 100644
--- a/doc/design/dispatch
+++ b/doc/design/dispatch
@@ -2,8 +2,6 @@ Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: dispatch,v 1.6 2004/03/05 05:04:46 marka Exp $
-
 UDP receive:
 
 /*
diff --git a/doc/design/dscp b/doc/design/dscp
index 84049318ede..94856d97052 100644
--- a/doc/design/dscp
+++ b/doc/design/dscp
@@ -4,8 +4,6 @@ See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 	Differentiate Services Code Point Support
 
-$Id: dscp,v 1.1.2.1 2012/02/24 05:20:36 marka Exp $
-
 Differentiate Services Code Point (DSCP) is implemented in IPv4 using the
 TOS octet and in IPv6 using the TCLASS octet.
 
diff --git a/doc/design/keydone b/doc/design/keydone
index 4ed65caf530..aac8db9652d 100644
--- a/doc/design/keydone
+++ b/doc/design/keydone
@@ -2,8 +2,6 @@ Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: keydone,v 1.2 2011/10/19 23:46:56 tbox Exp $
-
         rndc keydone <rdata> zone [class [view]]
 
         e.g.
diff --git a/doc/design/logging b/doc/design/logging
index d1752939422..84767954c61 100644
--- a/doc/design/logging
+++ b/doc/design/logging
@@ -2,8 +2,6 @@ Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: logging,v 1.10 2004/03/05 05:04:46 marka Exp $
-
 OVERVIEW
 
 The ISC logging system is designed to provide a flexible, extensible
diff --git a/doc/design/ncache b/doc/design/ncache
index 717dd5e5546..5bce7fa3b50 100644
--- a/doc/design/ncache
+++ b/doc/design/ncache
@@ -2,8 +2,6 @@ Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: ncache,v 1.7 2004/03/05 05:04:46 marka Exp $
-
 Negative Caching
 
 The non-DNSSEC case is pretty easy.
diff --git a/doc/design/rdataset b/doc/design/rdataset
index 2a14f68b588..0d0945c0455 100644
--- a/doc/design/rdataset
+++ b/doc/design/rdataset
@@ -2,8 +2,6 @@ Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: rdataset,v 1.6 2004/03/05 05:04:46 marka Exp $
-
 Need way to "dup" an rdataset (i.e. different rdataset handle, same underlying
 data).
 
diff --git a/doc/design/red-black b/doc/design/red-black
index 242c3f67b93..1fa5a4ae197 100644
--- a/doc/design/red-black
+++ b/doc/design/red-black
@@ -2,8 +2,6 @@ Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: red-black,v 1.9 2004/03/05 05:04:46 marka Exp $
-
                  Red-Black Tree Implementation Notes
 
 OVERVIEW
diff --git a/doc/design/resolver b/doc/design/resolver
index c3c3ae07c16..68f6c316e37 100644
--- a/doc/design/resolver
+++ b/doc/design/resolver
@@ -2,8 +2,6 @@ Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: resolver,v 1.6 2004/03/05 05:04:47 marka Exp $
-
 Multi-target Resolver
 =====================
 Due to IPv6 and other multiple-path resolving needs, the resolver in
diff --git a/doc/design/search b/doc/design/search
index ff14f89a042..10f2d56c8d6 100644
--- a/doc/design/search
+++ b/doc/design/search
@@ -2,8 +2,6 @@ Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: search,v 1.10 2004/03/05 05:04:47 marka Exp $
-
 What follows is pseudocode for the zone and cache lookup algorithms, as they
 will work in the RBT DB.
 
diff --git a/doc/design/tasks b/doc/design/tasks
index bc2c12db497..202876811f2 100644
--- a/doc/design/tasks
+++ b/doc/design/tasks
@@ -2,8 +2,6 @@ Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: tasks,v 1.7 2004/03/05 05:04:47 marka Exp $
-
 Changes I made last week to the task code simplified the task shutdown
 and termination model.  Here's how things now work:
 
diff --git a/doc/design/verify b/doc/design/verify
index adb3b87e95b..5e076756a3a 100644
--- a/doc/design/verify
+++ b/doc/design/verify
@@ -2,8 +2,6 @@ Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id$
-
 	dnssec-verify a tool to verify a zone is correctly signed.
 
 * check that every record that should be signed has a valid RRSIG set.
diff --git a/doc/design/windows-nt b/doc/design/windows-nt
index 46dcb66b88b..c8e7a3717fc 100644
--- a/doc/design/windows-nt
+++ b/doc/design/windows-nt
@@ -2,8 +2,6 @@ Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: windows-nt,v 1.8 2004/03/05 05:04:47 marka Exp $
-
                      Windows NT Portability Notes
 
 OVERVIEW
diff --git a/doc/design/zone b/doc/design/zone
index 5438fbb8319..7de045ea2ba 100644
--- a/doc/design/zone
+++ b/doc/design/zone
@@ -4,8 +4,6 @@ See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 			Zones
 
-	$Id: zone,v 1.10 2004/03/05 05:04:47 marka Exp $
-
 Overview
 
 	Zones are the unit of delegation in the DNS and may go from holding
diff --git a/doc/dev/DBC b/doc/dev/DBC
index db0c71ed876..6daf43c9cee 100644
--- a/doc/dev/DBC
+++ b/doc/dev/DBC
@@ -2,8 +2,6 @@ Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: DBC,v 1.6 2004/03/05 05:04:49 marka Exp $
-
 Design By Contract
 
 BIND 9 uses the "Design by Contract" idea for most function calls.
diff --git a/doc/dev/HOW-ADB-WORKS.txt b/doc/dev/HOW-ADB-WORKS.txt
index b798606ab2d..05d14a816f8 100644
--- a/doc/dev/HOW-ADB-WORKS.txt
+++ b/doc/dev/HOW-ADB-WORKS.txt
@@ -2,8 +2,6 @@ Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: HOW-ADB-WORKS.txt,v 1.2 2004/03/05 05:04:50 marka Exp $
-
 Recently, several groups have expressed concern over potential
 denial of service attacks within BIND 9, specifically within the ADB
 (address database.)  This document hopes to provide a more clear
diff --git a/doc/dev/autoconf b/doc/dev/autoconf
index 0109656e449..9ad6c719195 100644
--- a/doc/dev/autoconf
+++ b/doc/dev/autoconf
@@ -2,8 +2,6 @@ Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: autoconf,v 1.4 2004/03/05 05:04:50 marka Exp $
-
 Here are some hints on how to use autoconf correctly when doing
 BIND 9 development.
 
diff --git a/doc/dev/coding.html b/doc/dev/coding.html
index fda8a40131d..cd1a78c75b9 100644
--- a/doc/dev/coding.html
+++ b/doc/dev/coding.html
@@ -9,8 +9,6 @@
  - information regarding copyright ownership.
 -->
 
-<!-- $Id: coding.html,v 1.22 2007/06/19 23:47:13 tbox Exp $ -->
-
 <H2>C Language</H2>
 
 An ANSI standard C compiler and library are assumed.  Feel free to use any
diff --git a/doc/dev/cvs-usage b/doc/dev/cvs-usage
index 090b6813cd0..40e80282588 100644
--- a/doc/dev/cvs-usage
+++ b/doc/dev/cvs-usage
@@ -95,7 +95,3 @@ As an example, here's how queryperf was imported:
   cd queryperf
   cvs -d rc.isc.org:/proj/cvs/isc import bind9/contrib/queryperf \
 	NOMINUM NOMINUM_20010710
-
-
-
-$Id: cvs-usage,v 1.8 2004/03/05 05:04:50 marka Exp $
diff --git a/doc/dev/magic_numbers b/doc/dev/magic_numbers
index edbfd463f33..d1a1ea40345 100644
--- a/doc/dev/magic_numbers
+++ b/doc/dev/magic_numbers
@@ -2,8 +2,6 @@ Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: magic_numbers,v 1.7 2004/03/05 05:04:50 marka Exp $
-
 Magic Numbers
 
 A number of data structures in the ISC and DNS libraries have an unsigned int
diff --git a/doc/dev/release b/doc/dev/release
index 45a764d1c67..7f2ae7affea 100644
--- a/doc/dev/release
+++ b/doc/dev/release
@@ -2,8 +2,6 @@ Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: release,v 1.74 2009/08/06 23:47:44 tbox Exp $
-
 Preparing a bind9 release
 
 Here's a rough outline of the steps to follow in preparing a new bind9
diff --git a/doc/dev/results b/doc/dev/results
index efd49bdd4b9..52ead482502 100644
--- a/doc/dev/results
+++ b/doc/dev/results
@@ -2,8 +2,6 @@ Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: results,v 1.7 2004/03/05 05:04:50 marka Exp $
-
 Result Codes
 
 The use of global variables or a GetLastError() function to return results
diff --git a/doc/dev/tests b/doc/dev/tests
index 38e281ae93d..e1d31efdddb 100644
--- a/doc/dev/tests
+++ b/doc/dev/tests
@@ -2,8 +2,6 @@ Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: tests,v 1.15 2004/03/05 05:04:50 marka Exp $
-
 We do hourly test builds of the bind9 tree.  This is an attempt to
 document how they work.
 
diff --git a/doc/dev/unexpected b/doc/dev/unexpected
index ff84ab41e7c..b170fc7bc39 100644
--- a/doc/dev/unexpected
+++ b/doc/dev/unexpected
@@ -2,8 +2,6 @@ Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: unexpected,v 1.6 2004/03/05 05:04:50 marka Exp $
-
 Unexpected Errors
 
 For portability, the ISC and DNS libraries define their own result codes
diff --git a/doc/doxygen/Doxyfile.in b/doc/doxygen/Doxyfile.in
index f616f92928e..d43508595d2 100644
--- a/doc/doxygen/Doxyfile.in
+++ b/doc/doxygen/Doxyfile.in
@@ -1,5 +1,3 @@
-# $Id: Doxyfile.in,v 1.2 2006/12/22 01:44:59 marka Exp $
-
 # Doxyfile 1.4.7
 
 # This file describes the settings to be used by the documentation system
diff --git a/doc/doxygen/Makefile.in b/doc/doxygen/Makefile.in
index e9305ab2183..5cb250222dc 100644
--- a/doc/doxygen/Makefile.in
+++ b/doc/doxygen/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.4 2007/06/19 23:47:13 tbox Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/doc/doxygen/doxygen-input-filter.in b/doc/doxygen/doxygen-input-filter.in
index fefcd227cf2..419fca53963 100644
--- a/doc/doxygen/doxygen-input-filter.in
+++ b/doc/doxygen/doxygen-input-filter.in
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: doxygen-input-filter.in,v 1.4 2007/06/19 23:47:13 tbox Exp $
-
 # Input filter for feeding our source code into Doxygen.
 
 # Slurp whole file at once
diff --git a/doc/doxygen/isc-footer.html b/doc/doxygen/isc-footer.html
index 4b9dd2c441c..10176369301 100644
--- a/doc/doxygen/isc-footer.html
+++ b/doc/doxygen/isc-footer.html
@@ -9,10 +9,6 @@
  - information regarding copyright ownership.
 -->
 
-<!-- $Id: isc-footer.html,v 1.5 2007/06/19 23:47:13 tbox Exp $ -->
-
-<!-- $Id -->
-
     <hr size="1">
     <address style="align: right;">
       <small>
diff --git a/doc/doxygen/isc-header.html b/doc/doxygen/isc-header.html
index f42c5b66e05..a8d5cc66620 100644
--- a/doc/doxygen/isc-header.html
+++ b/doc/doxygen/isc-header.html
@@ -9,8 +9,6 @@
  - information regarding copyright ownership.
 -->
 
-<!-- $Id: isc-header.html,v 1.5 2007/06/19 23:47:13 tbox Exp $ -->
-
 <html>
   <head>
     <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
diff --git a/doc/doxygen/mainpage b/doc/doxygen/mainpage
index 990c4a7bb71..d3dcf9708e9 100644
--- a/doc/doxygen/mainpage
+++ b/doc/doxygen/mainpage
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-// $Id: mainpage,v 1.2 2006/12/22 01:44:59 marka Exp $
 //
 // Doxygen text.  Lines beginning with two slashes are comments; lines
 // beginning with three slashes are Doxygen input.
diff --git a/doc/misc/dnssec b/doc/misc/dnssec
index 9d9d5f146eb..84db388f8b1 100644
--- a/doc/misc/dnssec
+++ b/doc/misc/dnssec
@@ -79,6 +79,3 @@ BIND 9 does not implement the zone transfer security mechanisms of
 RFC2535 section 5.6, and we have no plans to implement them in the
 future as we consider them inferior to the use of TSIG or SIG(0) to
 ensure the integrity of zone transfers.
-
-
-$Id: dnssec,v 1.19 2004/03/05 05:04:53 marka Exp $
diff --git a/doc/misc/format-options.pl b/doc/misc/format-options.pl
index 8dbe3d583c0..338d61ebdba 100644
--- a/doc/misc/format-options.pl
+++ b/doc/misc/format-options.pl
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: format-options.pl,v 1.5 2007/09/24 04:21:59 marka Exp $
-
 print <<END;
 
 This is a summary of the named.conf options supported by 
diff --git a/doc/misc/ipv6 b/doc/misc/ipv6
index 321dea9be75..02cd19a2e10 100644
--- a/doc/misc/ipv6
+++ b/doc/misc/ipv6
@@ -109,5 +109,3 @@ RELEVANT RFCs
 
 3542:  Advanced Sockets Application Program Interface (API) for IPv6
 
-
-$Id: ipv6,v 1.9 2004/08/10 04:27:51 jinmei Exp $
diff --git a/doc/misc/migration b/doc/misc/migration
index baa11451999..aa78a74a921 100644
--- a/doc/misc/migration
+++ b/doc/misc/migration
@@ -262,6 +262,3 @@ This may cause files created by named, such as journal files, to be
 created with different file permissions than they did in BIND 8.  If
 necessary, the umask should be set explicitly in the script used to
 start the named process.
-
-
-$Id: migration,v 1.49 2008/03/18 15:42:53 jreed Exp $
diff --git a/doc/misc/migration-4to9 b/doc/misc/migration-4to9
index 3c24f9b8a60..4d038a5110c 100644
--- a/doc/misc/migration-4to9
+++ b/doc/misc/migration-4to9
@@ -2,8 +2,6 @@ Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
-$Id: migration-4to9,v 1.4 2004/03/05 05:04:53 marka Exp $
-
 		   BIND 4 to BIND 9 Migration Notes
 
 To transition from BIND 4 to BIND 9 you first need to convert your
diff --git a/doc/misc/sdb b/doc/misc/sdb
index 5b62a29e60a..bc9844954ba 100644
--- a/doc/misc/sdb
+++ b/doc/misc/sdb
@@ -165,5 +165,3 @@ Future Directions
 
 A future release may support dynamic loading of sdb drivers.
 
-
-$Id: sdb,v 1.6 2004/03/05 05:04:54 marka Exp $
diff --git a/doc/misc/sort-options.pl b/doc/misc/sort-options.pl
index cd3ffd3e87e..500f06042fa 100644
--- a/doc/misc/sort-options.pl
+++ b/doc/misc/sort-options.pl
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: sort-options.pl,v 1.3 2007/09/24 23:46:48 tbox Exp $
-
 sub sortlevel() {
 	my @options = ();
 	my $fin = "";
diff --git a/doc/xsl/copyright.xsl b/doc/xsl/copyright.xsl
index 6a0b8137551..100249b08a6 100644
--- a/doc/xsl/copyright.xsl
+++ b/doc/xsl/copyright.xsl
@@ -9,8 +9,6 @@
  - information regarding copyright ownership.
 -->
 
-<!-- $Id$ -->
-
 <!-- Generate ISC copyright comments from Docbook copyright metadata. -->
 
 <xsl:stylesheet version="1.0"
diff --git a/doc/xsl/isc-docbook-text.xsl b/doc/xsl/isc-docbook-text.xsl
index fcfa5b9e007..1e45e0d3e80 100644
--- a/doc/xsl/isc-docbook-text.xsl
+++ b/doc/xsl/isc-docbook-text.xsl
@@ -9,8 +9,6 @@
  - information regarding copyright ownership.
 -->
 
-<!-- $Id$ -->
-
 <!-- Tweaks to Docbook-XSL HTML for producing flat ASCII text. -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
diff --git a/doc/xsl/isc-manpage.xsl.in b/doc/xsl/isc-manpage.xsl.in
index f466d78c1d0..69ff90361b0 100644
--- a/doc/xsl/isc-manpage.xsl.in
+++ b/doc/xsl/isc-manpage.xsl.in
@@ -9,8 +9,6 @@
  - information regarding copyright ownership.
 -->
 
-<!-- $Id$ -->
-
 <!-- ISC customizations for Docbook-XSL manual page generator. -->
 
 <xsl:stylesheet version="1.0"
diff --git a/doc/xsl/pre-latex.xsl b/doc/xsl/pre-latex.xsl
index 375584aedb6..b527daaaaf9 100644
--- a/doc/xsl/pre-latex.xsl
+++ b/doc/xsl/pre-latex.xsl
@@ -9,8 +9,6 @@
  - information regarding copyright ownership.
 -->
 
-<!-- $Id: pre-latex.xsl,v 1.6 2007/06/19 23:47:13 tbox Exp $ -->
-
 <!--
   - Whack &mdash; into something that won't choke LaTeX.
   - There's probably a better way to do this, but this will work for now.
diff --git a/docutil/patch-db2latex-duplicate-template-bug b/docutil/patch-db2latex-duplicate-template-bug
index 75100e18e7a..c9354ae1c27 100644
--- a/docutil/patch-db2latex-duplicate-template-bug
+++ b/docutil/patch-db2latex-duplicate-template-bug
@@ -1,5 +1,3 @@
-;; $Id: patch-db2latex-duplicate-template-bug,v 1.2 2007/01/12 22:24:20 sra Exp $
-;; 
 ;; This is a patch to work around a known bug in db2latex.  Apparently
 ;; xsltproc's error checking got a lot better since the authors of
 ;; db2latex last tested this, so a clear language violation that
diff --git a/docutil/patch-db2latex-nested-param-bug b/docutil/patch-db2latex-nested-param-bug
index d73f19bec28..5facc0e74f7 100644
--- a/docutil/patch-db2latex-nested-param-bug
+++ b/docutil/patch-db2latex-nested-param-bug
@@ -1,5 +1,3 @@
-;; $Id: patch-db2latex-nested-param-bug,v 1.1 2007/02/06 20:58:13 sra Exp $
-;;
 ;; Latest version of xsltproc doesn't like <xsl:param><xsl:param/></xsl:param>.
 
 --- xsl/lists.mod.xsl.~1~	Sat Jan 31 06:53:50 2004
diff --git a/docutil/patch-db2latex-xsltproc-title-bug b/docutil/patch-db2latex-xsltproc-title-bug
index 88d6c24cfaf..65a5ca7c5ae 100644
--- a/docutil/patch-db2latex-xsltproc-title-bug
+++ b/docutil/patch-db2latex-xsltproc-title-bug
@@ -1,5 +1,3 @@
-;; $Id: patch-db2latex-xsltproc-title-bug,v 1.2 2007/01/12 22:24:20 sra Exp $
-;; 
 ;; This patches around a problem that I don't completely understand,
 ;; and which may in fact be an xsltproc bug rather than a db2latex
 ;; bug.  Symptom is that the generated \title{} contains not only the
diff --git a/isc-config.sh.in b/isc-config.sh.in
index 240a6c50be0..01a24990fa7 100644
--- a/isc-config.sh.in
+++ b/isc-config.sh.in
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: isc-config.sh.in,v 1.17 2007/06/19 23:46:59 tbox Exp $
-
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 exec_prefix_set=
diff --git a/lib/bind9/include/Makefile.in b/lib/bind9/include/Makefile.in
index 4127b6899ec..b2b35623d00 100644
--- a/lib/bind9/include/Makefile.in
+++ b/lib/bind9/include/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.4 2007/06/19 23:47:16 tbox Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/bind9/include/bind9/Makefile.in b/lib/bind9/include/bind9/Makefile.in
index 16d37b74fb9..bd58e8327e5 100644
--- a/lib/bind9/include/bind9/Makefile.in
+++ b/lib/bind9/include/bind9/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.8 2007/06/19 23:47:16 tbox Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/bind9/include/bind9/check.h b/lib/bind9/include/bind9/check.h
index b826e42504e..f796e268ed3 100644
--- a/lib/bind9/include/bind9/check.h
+++ b/lib/bind9/include/bind9/check.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: check.h,v 1.9 2007/06/19 23:47:16 tbox Exp $ */
 
 #ifndef BIND9_CHECK_H
 #define BIND9_CHECK_H 1
diff --git a/lib/bind9/include/bind9/getaddresses.h b/lib/bind9/include/bind9/getaddresses.h
index f4d012778b5..2ffbf9f0701 100644
--- a/lib/bind9/include/bind9/getaddresses.h
+++ b/lib/bind9/include/bind9/getaddresses.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: getaddresses.h,v 1.11 2009/01/17 23:47:42 tbox Exp $ */
 
 #ifndef BIND9_GETADDRESSES_H
 #define BIND9_GETADDRESSES_H 1
diff --git a/lib/bind9/include/bind9/version.h b/lib/bind9/include/bind9/version.h
index b4d8d04d713..fcc08790163 100644
--- a/lib/bind9/include/bind9/version.h
+++ b/lib/bind9/include/bind9/version.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: version.h,v 1.9 2007/06/19 23:47:16 tbox Exp $ */
 
 /*! \file bind9/version.h */
 
diff --git a/lib/bind9/version.c b/lib/bind9/version.c
index ac41f5754e8..89003c73db8 100644
--- a/lib/bind9/version.c
+++ b/lib/bind9/version.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: version.c,v 1.8 2007/06/19 23:47:16 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/bind9/win32/DLLMain.c b/lib/bind9/win32/DLLMain.c
index f5521b2aea3..8ff101757d0 100644
--- a/lib/bind9/win32/DLLMain.c
+++ b/lib/bind9/win32/DLLMain.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: DLLMain.c,v 1.4 2007/06/18 23:47:39 tbox Exp $ */
 
 #include <windows.h>
 #include <signal.h>
diff --git a/lib/bind9/win32/version.c b/lib/bind9/win32/version.c
index 47117a6d7fc..68ce9925bb9 100644
--- a/lib/bind9/win32/version.c
+++ b/lib/bind9/win32/version.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: version.c,v 1.5 2007/06/19 23:47:16 tbox Exp $ */
 
 #include <versions.h>
 
diff --git a/lib/dns/byaddr.c b/lib/dns/byaddr.c
index bdfa8cdb4f4..7e94fe03ef9 100644
--- a/lib/dns/byaddr.c
+++ b/lib/dns/byaddr.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: byaddr.c,v 1.41 2009/09/02 23:48:02 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/cache.c b/lib/dns/cache.c
index 5ed06107a1e..9a2ca1ac562 100644
--- a/lib/dns/cache.c
+++ b/lib/dns/cache.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: cache.c,v 1.91 2011/08/26 05:12:56 marka Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/callbacks.c b/lib/dns/callbacks.c
index 0a7d5d63b9a..42dae51f4fc 100644
--- a/lib/dns/callbacks.c
+++ b/lib/dns/callbacks.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: callbacks.c,v 1.19.40.1 2012/02/07 00:44:13 each Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/dbiterator.c b/lib/dns/dbiterator.c
index 2d507748767..dc81c9d8dcd 100644
--- a/lib/dns/dbiterator.c
+++ b/lib/dns/dbiterator.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: dbiterator.c,v 1.18 2007/06/19 23:47:16 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/dbtable.c b/lib/dns/dbtable.c
index 08aedf87226..b7c6395059e 100644
--- a/lib/dns/dbtable.c
+++ b/lib/dns/dbtable.c
@@ -9,15 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/*
- * $Id: dbtable.c,v 1.33 2007/06/19 23:47:16 tbox Exp $
- */
-
-/*! \file
- * \author
- * Principal Author: DCL
- */
-
 #include <config.h>
 
 #include <isc/mem.h>
diff --git a/lib/dns/diff.c b/lib/dns/diff.c
index 7ed4faeba51..4c85ac3b6a7 100644
--- a/lib/dns/diff.c
+++ b/lib/dns/diff.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: diff.c,v 1.26 2011/03/25 23:53:02 each Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/dlz.c b/lib/dns/dlz.c
index 1d8d3746ad4..db9ce17111c 100644
--- a/lib/dns/dlz.c
+++ b/lib/dns/dlz.c
@@ -44,7 +44,6 @@
  * USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/dns64.c b/lib/dns/dns64.c
index cbd8b73be96..44917187b08 100644
--- a/lib/dns/dns64.c
+++ b/lib/dns/dns64.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: dns64.c,v 1.8 2011/03/12 04:59:47 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/lib/dns/ds.c b/lib/dns/ds.c
index e24c176e489..d1a507bcc2f 100644
--- a/lib/dns/ds.c
+++ b/lib/dns/ds.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: ds.c,v 1.13 2010/12/23 23:47:08 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c
index 921ea48294b..aa630bc45c3 100644
--- a/lib/dns/dst_api.c
+++ b/lib/dns/dst_api.c
@@ -23,11 +23,6 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/*
- * Principal Author: Brian Wellington
- * $Id: dst_api.c,v 1.65 2011/10/20 21:20:02 marka Exp $
- */
-
 /*! \file */
 
 #include <config.h>
diff --git a/lib/dns/dst_internal.h b/lib/dns/dst_internal.h
index 7b82b74c488..886fa5660d9 100644
--- a/lib/dns/dst_internal.h
+++ b/lib/dns/dst_internal.h
@@ -23,7 +23,6 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dst_internal.h,v 1.31 2011/10/20 21:20:02 marka Exp $ */
 
 #ifndef DST_DST_INTERNAL_H
 #define DST_DST_INTERNAL_H 1
diff --git a/lib/dns/dst_lib.c b/lib/dns/dst_lib.c
index 44cb7c86464..4edf7281c47 100644
--- a/lib/dns/dst_lib.c
+++ b/lib/dns/dst_lib.c
@@ -9,11 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/*
- * Principal Author: Brian Wellington
- * $Id: dst_lib.c,v 1.5 2007/06/19 23:47:16 tbox Exp $
- */
-
 /*! \file */
 
 #include <config.h>
diff --git a/lib/dns/dst_parse.c b/lib/dns/dst_parse.c
index 36d464bf875..b0e5c895c6f 100644
--- a/lib/dns/dst_parse.c
+++ b/lib/dns/dst_parse.c
@@ -23,10 +23,6 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/*%
- * Principal Author: Brian Wellington
- */
-
 #include <config.h>
 
 #include <isc/base64.h>
diff --git a/lib/dns/dst_parse.h b/lib/dns/dst_parse.h
index 7747f0bc67b..a2600e1d58c 100644
--- a/lib/dns/dst_parse.h
+++ b/lib/dns/dst_parse.h
@@ -23,7 +23,6 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dst_parse.h,v 1.17 2010/12/23 23:47:08 tbox Exp $ */
 
 /*! \file */
 #ifndef DST_DST_PARSE_H
diff --git a/lib/dns/dst_result.c b/lib/dns/dst_result.c
index f7138d2b691..caee5f09eae 100644
--- a/lib/dns/dst_result.c
+++ b/lib/dns/dst_result.c
@@ -9,11 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/*%
- * Principal Author: Brian Wellington
- * $Id: dst_result.c,v 1.7 2008/04/01 23:47:10 tbox Exp $
- */
-
 #include <config.h>
 
 #include <isc/once.h>
diff --git a/lib/dns/gen-unix.h b/lib/dns/gen-unix.h
index 0c4ba46c257..816c66477ea 100644
--- a/lib/dns/gen-unix.h
+++ b/lib/dns/gen-unix.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: gen-unix.h,v 1.21 2009/01/17 23:47:42 tbox Exp $ */
 
 /*! \file
  * \brief
diff --git a/lib/dns/gen-win32.h b/lib/dns/gen-win32.h
index 2ff0e2f6503..cd21a562afb 100644
--- a/lib/dns/gen-win32.h
+++ b/lib/dns/gen-win32.h
@@ -38,13 +38,6 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: gen-win32.h,v 1.25 2009/01/17 23:47:42 tbox Exp $ */
-
-/*! \file
- * \author Principal Authors: Computer Systems Research Group at UC Berkeley
- * \author Principal ISC caretaker: DCL
- */
-
 /*
  * \note This file was adapted from the NetBSD project's source tree, RCS ID:
  *    NetBSD: getopt.c,v 1.15 1999/09/20 04:39:37 lukem Exp
diff --git a/lib/dns/gssapi_link.c b/lib/dns/gssapi_link.c
index 4d4549d2a46..5a4c5c4aad7 100644
--- a/lib/dns/gssapi_link.c
+++ b/lib/dns/gssapi_link.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/*
- * $Id: gssapi_link.c,v 1.17 2011/03/28 05:32:16 marka Exp $
- */
-
 #include <config.h>
 
 #ifdef GSSAPI
diff --git a/lib/dns/gssapictx.c b/lib/dns/gssapictx.c
index 45be76aaec5..d31ef21f326 100644
--- a/lib/dns/gssapictx.c
+++ b/lib/dns/gssapictx.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: gssapictx.c,v 1.29 2011/08/29 06:33:25 marka Exp $ */
 
 #include <config.h>
 
diff --git a/lib/dns/hmac_link.c b/lib/dns/hmac_link.c
index b1b9365f007..59aa4705e5b 100644
--- a/lib/dns/hmac_link.c
+++ b/lib/dns/hmac_link.c
@@ -23,10 +23,6 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/*
- * Principal Author: Brian Wellington
- */
-
 #include <config.h>
 
 #include <isc/buffer.h>
diff --git a/lib/dns/include/Makefile.in b/lib/dns/include/Makefile.in
index 10733c7c907..5467ea14739 100644
--- a/lib/dns/include/Makefile.in
+++ b/lib/dns/include/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.15 2007/06/19 23:47:16 tbox Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/dns/include/dns/adb.h b/lib/dns/include/dns/adb.h
index 7331d1c54e5..19b5caf7c1a 100644
--- a/lib/dns/include/dns/adb.h
+++ b/lib/dns/include/dns/adb.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: adb.h,v 1.88 2011/12/05 17:10:51 each Exp $ */
 
 #ifndef DNS_ADB_H
 #define DNS_ADB_H 1
diff --git a/lib/dns/include/dns/bit.h b/lib/dns/include/dns/bit.h
index ab46bcc1a50..2a6b258883f 100644
--- a/lib/dns/include/dns/bit.h
+++ b/lib/dns/include/dns/bit.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: bit.h,v 1.14 2007/06/19 23:47:16 tbox Exp $ */
 
 #ifndef DNS_BIT_H
 #define DNS_BIT_H 1
diff --git a/lib/dns/include/dns/byaddr.h b/lib/dns/include/dns/byaddr.h
index 1cf49c8190a..893ca4d6bfd 100644
--- a/lib/dns/include/dns/byaddr.h
+++ b/lib/dns/include/dns/byaddr.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: byaddr.h,v 1.22 2007/06/19 23:47:16 tbox Exp $ */
 
 #ifndef DNS_BYADDR_H
 #define DNS_BYADDR_H 1
diff --git a/lib/dns/include/dns/cache.h b/lib/dns/include/dns/cache.h
index 74b3b32f081..4dc7884a50f 100644
--- a/lib/dns/include/dns/cache.h
+++ b/lib/dns/include/dns/cache.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: cache.h,v 1.32 2011/08/02 23:47:52 tbox Exp $ */
 
 #ifndef DNS_CACHE_H
 #define DNS_CACHE_H 1
diff --git a/lib/dns/include/dns/callbacks.h b/lib/dns/include/dns/callbacks.h
index ea74117d3c0..9c723f3815b 100644
--- a/lib/dns/include/dns/callbacks.h
+++ b/lib/dns/include/dns/callbacks.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: callbacks.h,v 1.26.40.1 2012/02/07 00:44:16 each Exp $ */
 
 #ifndef DNS_CALLBACKS_H
 #define DNS_CALLBACKS_H 1
diff --git a/lib/dns/include/dns/cert.h b/lib/dns/include/dns/cert.h
index 80f2a0f1911..188d28305f2 100644
--- a/lib/dns/include/dns/cert.h
+++ b/lib/dns/include/dns/cert.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: cert.h,v 1.19 2007/06/19 23:47:16 tbox Exp $ */
 
 #ifndef DNS_CERT_H
 #define DNS_CERT_H 1
diff --git a/lib/dns/include/dns/client.h b/lib/dns/include/dns/client.h
index d1a57792ab6..b0ed77c97ed 100644
--- a/lib/dns/include/dns/client.h
+++ b/lib/dns/include/dns/client.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: client.h,v 1.3 2009/09/02 23:48:02 tbox Exp $ */
 
 #ifndef DNS_CLIENT_H
 #define DNS_CLIENT_H 1
diff --git a/lib/dns/include/dns/clientinfo.h b/lib/dns/include/dns/clientinfo.h
index a31937bdd1b..dcf6cc78b09 100644
--- a/lib/dns/include/dns/clientinfo.h
+++ b/lib/dns/include/dns/clientinfo.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: clientinfo.h,v 1.3 2011/10/11 23:46:45 tbox Exp $ */
 
 #ifndef DNS_CLIENTINFO_H
 #define DNS_CLIENTINFO_H 1
diff --git a/lib/dns/include/dns/dbiterator.h b/lib/dns/include/dns/dbiterator.h
index 1dbebc16002..9996a124baa 100644
--- a/lib/dns/include/dns/dbiterator.h
+++ b/lib/dns/include/dns/dbiterator.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: dbiterator.h,v 1.25 2007/06/19 23:47:16 tbox Exp $ */
 
 #ifndef DNS_DBITERATOR_H
 #define DNS_DBITERATOR_H 1
diff --git a/lib/dns/include/dns/dbtable.h b/lib/dns/include/dns/dbtable.h
index f0767c74569..f47f1695100 100644
--- a/lib/dns/include/dns/dbtable.h
+++ b/lib/dns/include/dns/dbtable.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: dbtable.h,v 1.23 2007/06/19 23:47:16 tbox Exp $ */
 
 #ifndef DNS_DBTABLE_H
 #define DNS_DBTABLE_H 1
diff --git a/lib/dns/include/dns/diff.h b/lib/dns/include/dns/diff.h
index 3997db2004f..f536db24dc5 100644
--- a/lib/dns/include/dns/diff.h
+++ b/lib/dns/include/dns/diff.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: diff.h,v 1.19 2010/06/04 23:51:14 tbox Exp $ */
 
 #ifndef DNS_DIFF_H
 #define DNS_DIFF_H 1
diff --git a/lib/dns/include/dns/dlz.h b/lib/dns/include/dns/dlz.h
index bb33e6f8890..f2b395bdd43 100644
--- a/lib/dns/include/dns/dlz.h
+++ b/lib/dns/include/dns/dlz.h
@@ -44,7 +44,6 @@
  * USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id$ */
 
 /*! \file dns/dlz.h */
 
diff --git a/lib/dns/include/dns/dlz_dlopen.h b/lib/dns/include/dns/dlz_dlopen.h
index aa8c0e29af4..2b6a04aa932 100644
--- a/lib/dns/include/dns/dlz_dlopen.h
+++ b/lib/dns/include/dns/dlz_dlopen.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file dns/dlz_dlopen.h */
 
diff --git a/lib/dns/include/dns/dns64.h b/lib/dns/include/dns/dns64.h
index 935d8926e86..e965d4685cf 100644
--- a/lib/dns/include/dns/dns64.h
+++ b/lib/dns/include/dns/dns64.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: dns64.h,v 1.3 2010/12/08 23:51:56 tbox Exp $ */
 
 #ifndef DNS_DNS64_H
 #define DNS_DNS64_H 1
diff --git a/lib/dns/include/dns/dnssec.h b/lib/dns/include/dns/dnssec.h
index a6f54c9b61c..1d3b5be6e56 100644
--- a/lib/dns/include/dns/dnssec.h
+++ b/lib/dns/include/dns/dnssec.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #ifndef DNS_DNSSEC_H
 #define DNS_DNSSEC_H 1
diff --git a/lib/dns/include/dns/ds.h b/lib/dns/include/dns/ds.h
index 24eb6645c14..4ea5a0d24df 100644
--- a/lib/dns/include/dns/ds.h
+++ b/lib/dns/include/dns/ds.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: ds.h,v 1.12 2010/12/23 23:47:08 tbox Exp $ */
 
 #ifndef DNS_DS_H
 #define DNS_DS_H 1
diff --git a/lib/dns/include/dns/dsdigest.h b/lib/dns/include/dns/dsdigest.h
index dada001be10..b029ecd405c 100644
--- a/lib/dns/include/dns/dsdigest.h
+++ b/lib/dns/include/dns/dsdigest.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #ifndef DNS_DSDIGEST_H
 #define DNS_DSDIGEST_H 1
diff --git a/lib/dns/include/dns/ecdb.h b/lib/dns/include/dns/ecdb.h
index b7f46144e36..6d6c8806ca8 100644
--- a/lib/dns/include/dns/ecdb.h
+++ b/lib/dns/include/dns/ecdb.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: ecdb.h,v 1.3 2009/09/02 23:48:02 tbox Exp $ */
 
 #ifndef DNS_ECDB_H
 #define DNS_ECDB_H 1
diff --git a/lib/dns/include/dns/events.h b/lib/dns/include/dns/events.h
index 7b108172238..e11989afb3e 100644
--- a/lib/dns/include/dns/events.h
+++ b/lib/dns/include/dns/events.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: events.h,v 1.61 2011/10/28 06:20:06 each Exp $ */
 
 #ifndef DNS_EVENTS_H
 #define DNS_EVENTS_H 1
diff --git a/lib/dns/include/dns/fixedname.h b/lib/dns/include/dns/fixedname.h
index 01fc41d94e6..50e66e9474f 100644
--- a/lib/dns/include/dns/fixedname.h
+++ b/lib/dns/include/dns/fixedname.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: fixedname.h,v 1.19 2007/06/19 23:47:16 tbox Exp $ */
 
 #ifndef DNS_FIXEDNAME_H
 #define DNS_FIXEDNAME_H 1
diff --git a/lib/dns/include/dns/iptable.h b/lib/dns/include/dns/iptable.h
index 20c455de8d9..636884ec67c 100644
--- a/lib/dns/include/dns/iptable.h
+++ b/lib/dns/include/dns/iptable.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: iptable.h,v 1.4 2007/09/14 01:46:05 marka Exp $ */
 
 #ifndef DNS_IPTABLE_H
 #define DNS_IPTABLE_H 1
diff --git a/lib/dns/include/dns/journal.h b/lib/dns/include/dns/journal.h
index 84d33978bad..7bcd7339784 100644
--- a/lib/dns/include/dns/journal.h
+++ b/lib/dns/include/dns/journal.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: journal.h,v 1.43 2011/12/22 07:32:41 each Exp $ */
 
 #ifndef DNS_JOURNAL_H
 #define DNS_JOURNAL_H 1
diff --git a/lib/dns/include/dns/keydata.h b/lib/dns/include/dns/keydata.h
index 0ee541b19b1..20195e10255 100644
--- a/lib/dns/include/dns/keydata.h
+++ b/lib/dns/include/dns/keydata.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: keydata.h,v 1.2 2009/06/30 02:52:32 each Exp $ */
 
 #ifndef DNS_KEYDATA_H
 #define DNS_KEYDATA_H 1
diff --git a/lib/dns/include/dns/keyflags.h b/lib/dns/include/dns/keyflags.h
index a27b52abd89..6d41a1c7840 100644
--- a/lib/dns/include/dns/keyflags.h
+++ b/lib/dns/include/dns/keyflags.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: keyflags.h,v 1.16 2007/06/19 23:47:16 tbox Exp $ */
 
 #ifndef DNS_KEYFLAGS_H
 #define DNS_KEYFLAGS_H 1
diff --git a/lib/dns/include/dns/keytable.h b/lib/dns/include/dns/keytable.h
index 32567e0c996..525481d35cf 100644
--- a/lib/dns/include/dns/keytable.h
+++ b/lib/dns/include/dns/keytable.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: keytable.h,v 1.23 2010/06/25 03:24:05 marka Exp $ */
 
 #ifndef DNS_KEYTABLE_H
 #define DNS_KEYTABLE_H 1
diff --git a/lib/dns/include/dns/keyvalues.h b/lib/dns/include/dns/keyvalues.h
index 79f650ffd94..ad17261a741 100644
--- a/lib/dns/include/dns/keyvalues.h
+++ b/lib/dns/include/dns/keyvalues.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: keyvalues.h,v 1.29 2010/12/23 23:47:08 tbox Exp $ */
 
 #ifndef DNS_KEYVALUES_H
 #define DNS_KEYVALUES_H 1
diff --git a/lib/dns/include/dns/lib.h b/lib/dns/include/dns/lib.h
index 4535e4f018e..bfbfb936c96 100644
--- a/lib/dns/include/dns/lib.h
+++ b/lib/dns/include/dns/lib.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: lib.h,v 1.18 2009/09/02 23:48:02 tbox Exp $ */
 
 #ifndef DNS_LIB_H
 #define DNS_LIB_H 1
diff --git a/lib/dns/include/dns/log.h b/lib/dns/include/dns/log.h
index 106dd1cf2a1..6f4d557a71b 100644
--- a/lib/dns/include/dns/log.h
+++ b/lib/dns/include/dns/log.h
@@ -10,7 +10,7 @@
  */
 
 /*! \file dns/log.h
- * \author  Principal Authors: DCL */
+ */
 
 #ifndef DNS_LOG_H
 #define DNS_LOG_H 1
diff --git a/lib/dns/include/dns/lookup.h b/lib/dns/include/dns/lookup.h
index c549ed96d26..ae1d2eeb789 100644
--- a/lib/dns/include/dns/lookup.h
+++ b/lib/dns/include/dns/lookup.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: lookup.h,v 1.14 2009/01/17 23:47:43 tbox Exp $ */
 
 #ifndef DNS_LOOKUP_H
 #define DNS_LOOKUP_H 1
diff --git a/lib/dns/include/dns/master.h b/lib/dns/include/dns/master.h
index 2c257e79839..a8f8ea8d0cb 100644
--- a/lib/dns/include/dns/master.h
+++ b/lib/dns/include/dns/master.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: master.h,v 1.57.8.1 2012/02/07 00:44:16 each Exp $ */
 
 #ifndef DNS_MASTER_H
 #define DNS_MASTER_H 1
diff --git a/lib/dns/include/dns/masterdump.h b/lib/dns/include/dns/masterdump.h
index f3acd11399b..28bc5564939 100644
--- a/lib/dns/include/dns/masterdump.h
+++ b/lib/dns/include/dns/masterdump.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: masterdump.h,v 1.47 2011/12/08 23:46:49 tbox Exp $ */
 
 #ifndef DNS_MASTERDUMP_H
 #define DNS_MASTERDUMP_H 1
diff --git a/lib/dns/include/dns/name.h b/lib/dns/include/dns/name.h
index 06235e8ff6f..ea6d772361f 100644
--- a/lib/dns/include/dns/name.h
+++ b/lib/dns/include/dns/name.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: name.h,v 1.137 2011/01/13 04:59:26 tbox Exp $ */
 
 #ifndef DNS_NAME_H
 #define DNS_NAME_H 1
diff --git a/lib/dns/include/dns/ncache.h b/lib/dns/include/dns/ncache.h
index 501e6424caf..27e37a556e8 100644
--- a/lib/dns/include/dns/ncache.h
+++ b/lib/dns/include/dns/ncache.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: ncache.h,v 1.29 2010/05/14 23:50:40 tbox Exp $ */
 
 #ifndef DNS_NCACHE_H
 #define DNS_NCACHE_H 1
diff --git a/lib/dns/include/dns/nsec.h b/lib/dns/include/dns/nsec.h
index 3c31e604b09..da1d5d695a5 100644
--- a/lib/dns/include/dns/nsec.h
+++ b/lib/dns/include/dns/nsec.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: nsec.h,v 1.14 2011/06/10 23:47:32 tbox Exp $ */
 
 #ifndef DNS_NSEC_H
 #define DNS_NSEC_H 1
diff --git a/lib/dns/include/dns/nsec3.h b/lib/dns/include/dns/nsec3.h
index cc4fa018355..255e982c9ca 100644
--- a/lib/dns/include/dns/nsec3.h
+++ b/lib/dns/include/dns/nsec3.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: nsec3.h,v 1.14 2011/10/28 12:20:31 tbox Exp $ */
 
 #ifndef DNS_NSEC3_H
 #define DNS_NSEC3_H 1
diff --git a/lib/dns/include/dns/opcode.h b/lib/dns/include/dns/opcode.h
index 887d31c2481..ff9e82e67b0 100644
--- a/lib/dns/include/dns/opcode.h
+++ b/lib/dns/include/dns/opcode.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: opcode.h,v 1.8 2007/06/19 23:47:17 tbox Exp $ */
 
 #ifndef DNS_OPCODE_H
 #define DNS_OPCODE_H 1
diff --git a/lib/dns/include/dns/order.h b/lib/dns/include/dns/order.h
index f96578ac138..3b833611452 100644
--- a/lib/dns/include/dns/order.h
+++ b/lib/dns/include/dns/order.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: order.h,v 1.9 2007/06/19 23:47:17 tbox Exp $ */
 
 #ifndef DNS_ORDER_H
 #define DNS_ORDER_H 1
diff --git a/lib/dns/include/dns/peer.h b/lib/dns/include/dns/peer.h
index 81eacd8e42c..2ae4e7676b5 100644
--- a/lib/dns/include/dns/peer.h
+++ b/lib/dns/include/dns/peer.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: peer.h,v 1.35 2009/01/17 23:47:43 tbox Exp $ */
 
 #ifndef DNS_PEER_H
 #define DNS_PEER_H 1
diff --git a/lib/dns/include/dns/private.h b/lib/dns/include/dns/private.h
index 53496b7559e..3fc79d05815 100644
--- a/lib/dns/include/dns/private.h
+++ b/lib/dns/include/dns/private.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: private.h,v 1.5 2011/10/28 12:20:31 tbox Exp $ */
 
 #include <isc/lang.h>
 #include <isc/types.h>
diff --git a/lib/dns/include/dns/rbt.h b/lib/dns/include/dns/rbt.h
index 47b753c4a70..0a7c0f83ffe 100644
--- a/lib/dns/include/dns/rbt.h
+++ b/lib/dns/include/dns/rbt.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: rbt.h,v 1.77.666.4 2012/02/08 19:53:30 each Exp $ */
 
 #ifndef DNS_RBT_H
 #define DNS_RBT_H 1
diff --git a/lib/dns/include/dns/rcode.h b/lib/dns/include/dns/rcode.h
index ba9a73cbbd2..59146af677b 100644
--- a/lib/dns/include/dns/rcode.h
+++ b/lib/dns/include/dns/rcode.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: rcode.h,v 1.21 2008/09/25 04:02:39 tbox Exp $ */
 
 #ifndef DNS_RCODE_H
 #define DNS_RCODE_H 1
diff --git a/lib/dns/include/dns/rdata.h b/lib/dns/include/dns/rdata.h
index 35125a2bf22..969e5fa7b98 100644
--- a/lib/dns/include/dns/rdata.h
+++ b/lib/dns/include/dns/rdata.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: rdata.h,v 1.80 2011/03/20 02:31:53 marka Exp $ */
 
 #ifndef DNS_RDATA_H
 #define DNS_RDATA_H 1
diff --git a/lib/dns/include/dns/rdataclass.h b/lib/dns/include/dns/rdataclass.h
index 3e186d50af1..67fe1c7156b 100644
--- a/lib/dns/include/dns/rdataclass.h
+++ b/lib/dns/include/dns/rdataclass.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: rdataclass.h,v 1.24 2007/06/19 23:47:17 tbox Exp $ */
 
 #ifndef DNS_RDATACLASS_H
 #define DNS_RDATACLASS_H 1
diff --git a/lib/dns/include/dns/rdatalist.h b/lib/dns/include/dns/rdatalist.h
index 6103fa9a13e..63015e186d3 100644
--- a/lib/dns/include/dns/rdatalist.h
+++ b/lib/dns/include/dns/rdatalist.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #ifndef DNS_RDATALIST_H
 #define DNS_RDATALIST_H 1
diff --git a/lib/dns/include/dns/rdatasetiter.h b/lib/dns/include/dns/rdatasetiter.h
index 7084763aa8b..54b3e90d5c1 100644
--- a/lib/dns/include/dns/rdatasetiter.h
+++ b/lib/dns/include/dns/rdatasetiter.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: rdatasetiter.h,v 1.21 2007/06/19 23:47:17 tbox Exp $ */
 
 #ifndef DNS_RDATASETITER_H
 #define DNS_RDATASETITER_H 1
diff --git a/lib/dns/include/dns/rdataslab.h b/lib/dns/include/dns/rdataslab.h
index 8a542cc0713..575bc99d54a 100644
--- a/lib/dns/include/dns/rdataslab.h
+++ b/lib/dns/include/dns/rdataslab.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: rdataslab.h,v 1.33 2008/04/01 23:47:10 tbox Exp $ */
 
 #ifndef DNS_RDATASLAB_H
 #define DNS_RDATASLAB_H 1
diff --git a/lib/dns/include/dns/rdatatype.h b/lib/dns/include/dns/rdatatype.h
index bc5ebf3188f..0e7923253ba 100644
--- a/lib/dns/include/dns/rdatatype.h
+++ b/lib/dns/include/dns/rdatatype.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: rdatatype.h,v 1.26 2008/09/25 04:02:39 tbox Exp $ */
 
 #ifndef DNS_RDATATYPE_H
 #define DNS_RDATATYPE_H 1
diff --git a/lib/dns/include/dns/request.h b/lib/dns/include/dns/request.h
index 4dbebca75df..5fa332a7c87 100644
--- a/lib/dns/include/dns/request.h
+++ b/lib/dns/include/dns/request.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: request.h,v 1.31 2010/03/04 23:50:34 tbox Exp $ */
 
 #ifndef DNS_REQUEST_H
 #define DNS_REQUEST_H 1
diff --git a/lib/dns/include/dns/rootns.h b/lib/dns/include/dns/rootns.h
index 03fe974b2ae..f6a18199950 100644
--- a/lib/dns/include/dns/rootns.h
+++ b/lib/dns/include/dns/rootns.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: rootns.h,v 1.16 2007/06/19 23:47:17 tbox Exp $ */
 
 #ifndef DNS_ROOTNS_H
 #define DNS_ROOTNS_H 1
diff --git a/lib/dns/include/dns/sdb.h b/lib/dns/include/dns/sdb.h
index e26d84a371a..f21d12651dc 100644
--- a/lib/dns/include/dns/sdb.h
+++ b/lib/dns/include/dns/sdb.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: sdb.h,v 1.25 2011/10/11 23:46:45 tbox Exp $ */
 
 #ifndef DNS_SDB_H
 #define DNS_SDB_H 1
diff --git a/lib/dns/include/dns/sdlz.h b/lib/dns/include/dns/sdlz.h
index e1c86793540..136e9ffe8c9 100644
--- a/lib/dns/include/dns/sdlz.h
+++ b/lib/dns/include/dns/sdlz.h
@@ -44,7 +44,6 @@
  * USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id$ */
 
 /*! \file dns/sdlz.h */
 
diff --git a/lib/dns/include/dns/secalg.h b/lib/dns/include/dns/secalg.h
index 9a748b2a0a6..e27d6b484e6 100644
--- a/lib/dns/include/dns/secalg.h
+++ b/lib/dns/include/dns/secalg.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: secalg.h,v 1.21 2009/10/12 23:48:02 tbox Exp $ */
 
 #ifndef DNS_SECALG_H
 #define DNS_SECALG_H 1
diff --git a/lib/dns/include/dns/secproto.h b/lib/dns/include/dns/secproto.h
index fbde88164f8..7ee8958fdbe 100644
--- a/lib/dns/include/dns/secproto.h
+++ b/lib/dns/include/dns/secproto.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: secproto.h,v 1.16 2007/06/19 23:47:17 tbox Exp $ */
 
 #ifndef DNS_SECPROTO_H
 #define DNS_SECPROTO_H 1
diff --git a/lib/dns/include/dns/soa.h b/lib/dns/include/dns/soa.h
index 56d334c4730..b3aa30063d0 100644
--- a/lib/dns/include/dns/soa.h
+++ b/lib/dns/include/dns/soa.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: soa.h,v 1.12 2009/09/10 01:47:09 each Exp $ */
 
 #ifndef DNS_SOA_H
 #define DNS_SOA_H 1
diff --git a/lib/dns/include/dns/tcpmsg.h b/lib/dns/include/dns/tcpmsg.h
index 03983ed1126..5be03c162f0 100644
--- a/lib/dns/include/dns/tcpmsg.h
+++ b/lib/dns/include/dns/tcpmsg.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: tcpmsg.h,v 1.22 2007/06/19 23:47:17 tbox Exp $ */
 
 #ifndef DNS_TCPMSG_H
 #define DNS_TCPMSG_H 1
diff --git a/lib/dns/include/dns/time.h b/lib/dns/include/dns/time.h
index 9d3650fbe17..36a53a670d1 100644
--- a/lib/dns/include/dns/time.h
+++ b/lib/dns/include/dns/time.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: time.h,v 1.19 2012/01/27 23:46:58 tbox Exp $ */
 
 #ifndef DNS_TIME_H
 #define DNS_TIME_H 1
diff --git a/lib/dns/include/dns/timer.h b/lib/dns/include/dns/timer.h
index 5778960467d..4b8fcd344be 100644
--- a/lib/dns/include/dns/timer.h
+++ b/lib/dns/include/dns/timer.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: timer.h,v 1.9 2007/06/19 23:47:17 tbox Exp $ */
 
 #ifndef DNS_TIMER_H
 #define DNS_TIMER_H 1
diff --git a/lib/dns/include/dns/tkey.h b/lib/dns/include/dns/tkey.h
index 98f6c6816bf..a478334301e 100644
--- a/lib/dns/include/dns/tkey.h
+++ b/lib/dns/include/dns/tkey.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: tkey.h,v 1.32 2011/01/08 23:47:01 tbox Exp $ */
 
 #ifndef DNS_TKEY_H
 #define DNS_TKEY_H 1
diff --git a/lib/dns/include/dns/tsec.h b/lib/dns/include/dns/tsec.h
index 452a3bf6b50..95e16c87173 100644
--- a/lib/dns/include/dns/tsec.h
+++ b/lib/dns/include/dns/tsec.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: tsec.h,v 1.6 2010/12/09 00:54:34 marka Exp $ */
 
 #ifndef DNS_TSEC_H
 #define DNS_TSEC_H 1
diff --git a/lib/dns/include/dns/tsig.h b/lib/dns/include/dns/tsig.h
index ea8a5e55f21..661ebbcbb29 100644
--- a/lib/dns/include/dns/tsig.h
+++ b/lib/dns/include/dns/tsig.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: tsig.h,v 1.59 2011/01/11 23:47:13 tbox Exp $ */
 
 #ifndef DNS_TSIG_H
 #define DNS_TSIG_H 1
diff --git a/lib/dns/include/dns/ttl.h b/lib/dns/include/dns/ttl.h
index ea26d09ebd0..34c7b5c1a5e 100644
--- a/lib/dns/include/dns/ttl.h
+++ b/lib/dns/include/dns/ttl.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: ttl.h,v 1.19 2007/06/19 23:47:17 tbox Exp $ */
 
 #ifndef DNS_TTL_H
 #define DNS_TTL_H 1
diff --git a/lib/dns/include/dns/update.h b/lib/dns/include/dns/update.h
index a2bc40f1de7..3a07ac982df 100644
--- a/lib/dns/include/dns/update.h
+++ b/lib/dns/include/dns/update.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: update.h,v 1.5 2011/08/30 23:46:53 tbox Exp $ */
 
 #ifndef DNS_UPDATE_H
 #define DNS_UPDATE_H 1
diff --git a/lib/dns/include/dns/validator.h b/lib/dns/include/dns/validator.h
index 1f845f8c8c9..100eab7a6f4 100644
--- a/lib/dns/include/dns/validator.h
+++ b/lib/dns/include/dns/validator.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: validator.h,v 1.46 2010/02/25 05:08:01 tbox Exp $ */
 
 #ifndef DNS_VALIDATOR_H
 #define DNS_VALIDATOR_H 1
diff --git a/lib/dns/include/dns/xfrin.h b/lib/dns/include/dns/xfrin.h
index 18d918cb41a..8b699a38c7d 100644
--- a/lib/dns/include/dns/xfrin.h
+++ b/lib/dns/include/dns/xfrin.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: xfrin.h,v 1.30 2009/01/17 23:47:43 tbox Exp $ */
 
 #ifndef DNS_XFRIN_H
 #define DNS_XFRIN_H 1
diff --git a/lib/dns/include/dns/zonekey.h b/lib/dns/include/dns/zonekey.h
index 10da59927ce..acba890cfc0 100644
--- a/lib/dns/include/dns/zonekey.h
+++ b/lib/dns/include/dns/zonekey.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: zonekey.h,v 1.10 2007/06/19 23:47:17 tbox Exp $ */
 
 #ifndef DNS_ZONEKEY_H
 #define DNS_ZONEKEY_H 1
diff --git a/lib/dns/include/dns/zt.h b/lib/dns/include/dns/zt.h
index 1194a9ac97b..337ff03b3bf 100644
--- a/lib/dns/include/dns/zt.h
+++ b/lib/dns/include/dns/zt.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: zt.h,v 1.40 2011/09/02 23:46:32 tbox Exp $ */
 
 #ifndef DNS_ZT_H
 #define DNS_ZT_H 1
diff --git a/lib/dns/include/dst/Makefile.in b/lib/dns/include/dst/Makefile.in
index 2c0676a3bc1..3c79bde7248 100644
--- a/lib/dns/include/dst/Makefile.in
+++ b/lib/dns/include/dst/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.4 2007/12/11 20:28:55 marka Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/dns/include/dst/gssapi.h b/lib/dns/include/dst/gssapi.h
index 291cff3bc06..084607046a4 100644
--- a/lib/dns/include/dst/gssapi.h
+++ b/lib/dns/include/dst/gssapi.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: gssapi.h,v 1.16 2011/01/08 23:47:01 tbox Exp $ */
 
 #ifndef DST_GSSAPI_H
 #define DST_GSSAPI_H 1
diff --git a/lib/dns/include/dst/lib.h b/lib/dns/include/dst/lib.h
index 28bb67a9821..508439fdae3 100644
--- a/lib/dns/include/dst/lib.h
+++ b/lib/dns/include/dst/lib.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: lib.h,v 1.7 2007/06/19 23:47:17 tbox Exp $ */
 
 #ifndef DST_LIB_H
 #define DST_LIB_H 1
diff --git a/lib/dns/include/dst/result.h b/lib/dns/include/dst/result.h
index cb03ce04669..0855d808c50 100644
--- a/lib/dns/include/dst/result.h
+++ b/lib/dns/include/dst/result.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: result.h,v 1.9 2008/04/01 23:47:10 tbox Exp $ */
 
 #ifndef DST_RESULT_H
 #define DST_RESULT_H 1
diff --git a/lib/dns/key.c b/lib/dns/key.c
index 543a338c65f..a4d4ea2e1aa 100644
--- a/lib/dns/key.c
+++ b/lib/dns/key.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: key.c,v 1.11 2011/10/20 21:20:02 marka Exp $ */
 
 #include <config.h>
 
diff --git a/lib/dns/keydata.c b/lib/dns/keydata.c
index f20c4a14da2..3a36772e93a 100644
--- a/lib/dns/keydata.c
+++ b/lib/dns/keydata.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: keydata.c,v 1.3 2009/07/01 23:47:36 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/keytable.c b/lib/dns/keytable.c
index af2666c9543..38ed494e8cd 100644
--- a/lib/dns/keytable.c
+++ b/lib/dns/keytable.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: keytable.c,v 1.41 2010/06/25 23:46:51 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/log.c b/lib/dns/log.c
index 910c4fb981f..f1d78d70270 100644
--- a/lib/dns/log.c
+++ b/lib/dns/log.c
@@ -11,8 +11,6 @@
 
 /*! \file */
 
-/* Principal Authors: DCL */
-
 #include <config.h>
 
 #include <isc/util.h>
diff --git a/lib/dns/lookup.c b/lib/dns/lookup.c
index 7d8cffbfcc2..d6a2405a987 100644
--- a/lib/dns/lookup.c
+++ b/lib/dns/lookup.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: lookup.c,v 1.21 2007/06/18 23:47:40 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/name.c b/lib/dns/name.c
index e728d8072df..5dc3e35e6f4 100644
--- a/lib/dns/name.c
+++ b/lib/dns/name.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/ncache.c b/lib/dns/ncache.c
index 3e4e4bf223d..de6986bda60 100644
--- a/lib/dns/ncache.c
+++ b/lib/dns/ncache.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/nsec.c b/lib/dns/nsec.c
index dc4ee21cdc8..bbf23f3a1ad 100644
--- a/lib/dns/nsec.c
+++ b/lib/dns/nsec.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/nsec3.c b/lib/dns/nsec3.c
index 3f4c87735df..2e90bf5f7c6 100644
--- a/lib/dns/nsec3.c
+++ b/lib/dns/nsec3.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #include <config.h>
 
diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c
index 65962f21caa..51fb743ccfc 100644
--- a/lib/dns/openssl_link.c
+++ b/lib/dns/openssl_link.c
@@ -23,9 +23,6 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/*
- * Principal Author: Brian Wellington
- */
 #ifdef OPENSSL
 
 #include <config.h>
diff --git a/lib/dns/openssldh_link.c b/lib/dns/openssldh_link.c
index ebdaeaa0da3..b86d111dc35 100644
--- a/lib/dns/openssldh_link.c
+++ b/lib/dns/openssldh_link.c
@@ -23,10 +23,6 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/*
- * Principal Author: Brian Wellington
- */
-
 #ifdef OPENSSL
 
 #include <config.h>
diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c
index 867b8f6cadc..aa8075c1ded 100644
--- a/lib/dns/opensslrsa_link.c
+++ b/lib/dns/opensslrsa_link.c
@@ -9,9 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/*
- * Principal Author: Brian Wellington
- */
 #ifdef OPENSSL
 #include <config.h>
 
diff --git a/lib/dns/pkcs11rsa_link.c b/lib/dns/pkcs11rsa_link.c
index d7494100f78..2f8a7f3baff 100644
--- a/lib/dns/pkcs11rsa_link.c
+++ b/lib/dns/pkcs11rsa_link.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #ifdef PKCS11CRYPTO
 
diff --git a/lib/dns/portlist.c b/lib/dns/portlist.c
index cc1bf720ffa..d624a7a0f8a 100644
--- a/lib/dns/portlist.c
+++ b/lib/dns/portlist.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: portlist.c,v 1.13 2007/06/19 23:47:16 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c
index 23e21dfb187..fb8f98dd6b6 100644
--- a/lib/dns/rbt.c
+++ b/lib/dns/rbt.c
@@ -11,8 +11,6 @@
 
 /*! \file */
 
-/* Principal Authors: DCL */
-
 #include <config.h>
 
 #include <sys/stat.h>
diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index 4c506a8cff1..a073d8ce5a7 100644
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -11,10 +11,6 @@
 
 /*! \file */
 
-/*
- * Principal Author: Bob Halley
- */
-
 #include <config.h>
 
 /* #define inline */
diff --git a/lib/dns/rbtdb.h b/lib/dns/rbtdb.h
index 5fe2f540490..2b30fb83afe 100644
--- a/lib/dns/rbtdb.h
+++ b/lib/dns/rbtdb.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #ifndef DNS_RBTDB_H
 #define DNS_RBTDB_H 1
diff --git a/lib/dns/rcode.c b/lib/dns/rcode.c
index 035edf09267..c4170981419 100644
--- a/lib/dns/rcode.c
+++ b/lib/dns/rcode.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #include <config.h>
 #include <ctype.h>
diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c
index 3788c6ce19b..aebf2542920 100644
--- a/lib/dns/rdata.c
+++ b/lib/dns/rdata.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/rdata/any_255/tsig_250.c b/lib/dns/rdata/any_255/tsig_250.c
index ed68b24919e..50b4d283b05 100644
--- a/lib/dns/rdata/any_255/tsig_250.c
+++ b/lib/dns/rdata/any_255/tsig_250.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
-
-/* Reviewed: Thu Mar 16 13:39:43 PST 2000 by gson */
-
 #ifndef RDATA_ANY_255_TSIG_250_C
 #define RDATA_ANY_255_TSIG_250_C
 
diff --git a/lib/dns/rdata/any_255/tsig_250.h b/lib/dns/rdata/any_255/tsig_250.h
index 16a2765a358..40f4f4fd9d4 100644
--- a/lib/dns/rdata/any_255/tsig_250.h
+++ b/lib/dns/rdata/any_255/tsig_250.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: tsig_250.h,v 1.25 2007/06/19 23:47:17 tbox Exp $ */
 
 #ifndef ANY_255_TSIG_250_H
 #define ANY_255_TSIG_250_H 1
diff --git a/lib/dns/rdata/ch_3/a_1.c b/lib/dns/rdata/ch_3/a_1.c
index 0bf718ebc52..bf0c1e3b6de 100644
--- a/lib/dns/rdata/ch_3/a_1.c
+++ b/lib/dns/rdata/ch_3/a_1.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: a_1.c,v 1.8 2009/12/04 22:06:37 tbox Exp $ */
 
 /* by Bjorn.Victor@it.uu.se, 2005-05-07 */
 /* Based on generic/soa_6.c and generic/mx_15.c */
diff --git a/lib/dns/rdata/ch_3/a_1.h b/lib/dns/rdata/ch_3/a_1.h
index ca0309ae4de..97ea2050701 100644
--- a/lib/dns/rdata/ch_3/a_1.h
+++ b/lib/dns/rdata/ch_3/a_1.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: a_1.h,v 1.5 2007/06/19 23:47:17 tbox Exp $ */
 
 /* by Bjorn.Victor@it.uu.se, 2005-05-07 */
 /* Based on generic/mx_15.h */
diff --git a/lib/dns/rdata/generic/afsdb_18.c b/lib/dns/rdata/generic/afsdb_18.c
index b72db8c7616..d7a1bbfc047 100644
--- a/lib/dns/rdata/generic/afsdb_18.c
+++ b/lib/dns/rdata/generic/afsdb_18.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: afsdb_18.c,v 1.49 2009/12/04 22:06:37 tbox Exp $ */
-
-/* Reviewed: Wed Mar 15 14:59:00 PST 2000 by explorer */
-
 /* RFC1183 */
 
 #ifndef RDATA_GENERIC_AFSDB_18_C
diff --git a/lib/dns/rdata/generic/afsdb_18.h b/lib/dns/rdata/generic/afsdb_18.h
index 13b078f150b..204de5d24d4 100644
--- a/lib/dns/rdata/generic/afsdb_18.h
+++ b/lib/dns/rdata/generic/afsdb_18.h
@@ -12,7 +12,6 @@
 #ifndef GENERIC_AFSDB_18_H
 #define GENERIC_AFSDB_18_H 1
 
-/* $Id: afsdb_18.h,v 1.20 2007/06/19 23:47:17 tbox Exp $ */
 
 /*!
  *  \brief Per RFC1183 */
diff --git a/lib/dns/rdata/generic/caa_257.h b/lib/dns/rdata/generic/caa_257.h
index 6283e7d30a7..7ed6a27ca2e 100644
--- a/lib/dns/rdata/generic/caa_257.h
+++ b/lib/dns/rdata/generic/caa_257.h
@@ -12,7 +12,6 @@
 #ifndef GENERIC_CAA_257_H
 #define GENERIC_CAA_257_H 1
 
-/* $Id$ */
 
 typedef struct dns_rdata_caa {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/generic/cert_37.c b/lib/dns/rdata/generic/cert_37.c
index 1838e38acff..64e665ded22 100644
--- a/lib/dns/rdata/generic/cert_37.c
+++ b/lib/dns/rdata/generic/cert_37.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
-
-/* Reviewed: Wed Mar 15 21:14:32 EST 2000 by tale */
-
 /* RFC2538 */
 
 #ifndef RDATA_GENERIC_CERT_37_C
diff --git a/lib/dns/rdata/generic/cert_37.h b/lib/dns/rdata/generic/cert_37.h
index d7047a501bb..f18fc53aed6 100644
--- a/lib/dns/rdata/generic/cert_37.h
+++ b/lib/dns/rdata/generic/cert_37.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: cert_37.h,v 1.20 2007/06/19 23:47:17 tbox Exp $ */
 
 #ifndef GENERIC_CERT_37_H
 #define GENERIC_CERT_37_H 1
diff --git a/lib/dns/rdata/generic/cname_5.c b/lib/dns/rdata/generic/cname_5.c
index b717219488b..c15131c76c1 100644
--- a/lib/dns/rdata/generic/cname_5.c
+++ b/lib/dns/rdata/generic/cname_5.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: cname_5.c,v 1.49 2009/12/04 22:06:37 tbox Exp $ */
-
-/* reviewed: Wed Mar 15 16:48:45 PST 2000 by brister */
-
 #ifndef RDATA_GENERIC_CNAME_5_C
 #define RDATA_GENERIC_CNAME_5_C
 
diff --git a/lib/dns/rdata/generic/cname_5.h b/lib/dns/rdata/generic/cname_5.h
index b65eb8e5aa2..6a5b6451b2f 100644
--- a/lib/dns/rdata/generic/cname_5.h
+++ b/lib/dns/rdata/generic/cname_5.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: cname_5.h,v 1.26 2007/06/19 23:47:17 tbox Exp $ */
 
 #ifndef GENERIC_CNAME_5_H
 #define GENERIC_CNAME_5_H 1
diff --git a/lib/dns/rdata/generic/dlv_32769.c b/lib/dns/rdata/generic/dlv_32769.c
index 82d07078de2..01b43087796 100644
--- a/lib/dns/rdata/generic/dlv_32769.c
+++ b/lib/dns/rdata/generic/dlv_32769.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /* RFC3658 */
 
diff --git a/lib/dns/rdata/generic/dlv_32769.h b/lib/dns/rdata/generic/dlv_32769.h
index 7095dbafd17..b94df712374 100644
--- a/lib/dns/rdata/generic/dlv_32769.h
+++ b/lib/dns/rdata/generic/dlv_32769.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: dlv_32769.h,v 1.5 2007/06/19 23:47:17 tbox Exp $ */
 
 /* draft-ietf-dnsext-delegation-signer-05.txt */
 #ifndef GENERIC_DLV_32769_H
diff --git a/lib/dns/rdata/generic/dname_39.c b/lib/dns/rdata/generic/dname_39.c
index 697c353e4f4..e429ae8c18e 100644
--- a/lib/dns/rdata/generic/dname_39.c
+++ b/lib/dns/rdata/generic/dname_39.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: dname_39.c,v 1.40 2009/12/04 22:06:37 tbox Exp $ */
-
-/* Reviewed: Wed Mar 15 16:52:38 PST 2000 by explorer */
-
 /* RFC2672 */
 
 #ifndef RDATA_GENERIC_DNAME_39_C
diff --git a/lib/dns/rdata/generic/dname_39.h b/lib/dns/rdata/generic/dname_39.h
index cd7fd5ee8ea..12b02e255ae 100644
--- a/lib/dns/rdata/generic/dname_39.h
+++ b/lib/dns/rdata/generic/dname_39.h
@@ -12,7 +12,6 @@
 #ifndef GENERIC_DNAME_39_H
 #define GENERIC_DNAME_39_H 1
 
-/* $Id: dname_39.h,v 1.21 2007/06/19 23:47:17 tbox Exp $ */
 
 /*!
  *  \brief per RFC2672 */
diff --git a/lib/dns/rdata/generic/dnskey_48.c b/lib/dns/rdata/generic/dnskey_48.c
index 0f14a6b8d2c..055055a0225 100644
--- a/lib/dns/rdata/generic/dnskey_48.c
+++ b/lib/dns/rdata/generic/dnskey_48.c
@@ -9,12 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
-
-/*
- * Reviewed: Wed Mar 15 16:47:10 PST 2000 by halley.
- */
-
 /* RFC2535 */
 
 #ifndef RDATA_GENERIC_DNSKEY_48_C
diff --git a/lib/dns/rdata/generic/ds_43.c b/lib/dns/rdata/generic/ds_43.c
index b2d4678ec38..2da4bdabdf5 100644
--- a/lib/dns/rdata/generic/ds_43.c
+++ b/lib/dns/rdata/generic/ds_43.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /* RFC3658 */
 
diff --git a/lib/dns/rdata/generic/ds_43.h b/lib/dns/rdata/generic/ds_43.h
index fdc4f524d61..663b7725bb6 100644
--- a/lib/dns/rdata/generic/ds_43.h
+++ b/lib/dns/rdata/generic/ds_43.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: ds_43.h,v 1.7 2007/06/19 23:47:17 tbox Exp $ */
 
 #ifndef GENERIC_DS_43_H
 #define GENERIC_DS_43_H 1
diff --git a/lib/dns/rdata/generic/gpos_27.c b/lib/dns/rdata/generic/gpos_27.c
index 90560d209f2..c0d93eea0fc 100644
--- a/lib/dns/rdata/generic/gpos_27.c
+++ b/lib/dns/rdata/generic/gpos_27.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: gpos_27.c,v 1.43 2009/12/04 22:06:37 tbox Exp $ */
-
-/* reviewed: Wed Mar 15 16:48:45 PST 2000 by brister */
-
 /* RFC1712 */
 
 #ifndef RDATA_GENERIC_GPOS_27_C
diff --git a/lib/dns/rdata/generic/gpos_27.h b/lib/dns/rdata/generic/gpos_27.h
index 96153a222e9..de195591677 100644
--- a/lib/dns/rdata/generic/gpos_27.h
+++ b/lib/dns/rdata/generic/gpos_27.h
@@ -12,7 +12,6 @@
 #ifndef GENERIC_GPOS_27_H
 #define GENERIC_GPOS_27_H 1
 
-/* $Id: gpos_27.h,v 1.17 2007/06/19 23:47:17 tbox Exp $ */
 
 /*!
  *  \brief per RFC1712 */
diff --git a/lib/dns/rdata/generic/hinfo_13.c b/lib/dns/rdata/generic/hinfo_13.c
index 848c2f981ad..b56ff7c56ce 100644
--- a/lib/dns/rdata/generic/hinfo_13.c
+++ b/lib/dns/rdata/generic/hinfo_13.c
@@ -9,12 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: hinfo_13.c,v 1.46 2009/12/04 22:06:37 tbox Exp $ */
-
-/*
- * Reviewed: Wed Mar 15 16:47:10 PST 2000 by halley.
- */
-
 #ifndef RDATA_GENERIC_HINFO_13_C
 #define RDATA_GENERIC_HINFO_13_C
 
diff --git a/lib/dns/rdata/generic/hinfo_13.h b/lib/dns/rdata/generic/hinfo_13.h
index 383dcfc872c..d9dd1d9dd5e 100644
--- a/lib/dns/rdata/generic/hinfo_13.h
+++ b/lib/dns/rdata/generic/hinfo_13.h
@@ -12,7 +12,6 @@
 #ifndef GENERIC_HINFO_13_H
 #define GENERIC_HINFO_13_H 1
 
-/* $Id: hinfo_13.h,v 1.25 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_hinfo {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/generic/hip_55.c b/lib/dns/rdata/generic/hip_55.c
index a2d9dc64ed8..c2d68122a05 100644
--- a/lib/dns/rdata/generic/hip_55.c
+++ b/lib/dns/rdata/generic/hip_55.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: hip_55.c,v 1.8 2011/01/13 04:59:26 tbox Exp $ */
-
-/* reviewed: TBC */
-
 /* RFC 5205 */
 
 #ifndef RDATA_GENERIC_HIP_5_C
diff --git a/lib/dns/rdata/generic/hip_55.h b/lib/dns/rdata/generic/hip_55.h
index 368a9831795..8df7a870c87 100644
--- a/lib/dns/rdata/generic/hip_55.h
+++ b/lib/dns/rdata/generic/hip_55.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: hip_55.h,v 1.2 2009/02/26 06:09:19 marka Exp $ */
 
 #ifndef GENERIC_HIP_5_H
 #define GENERIC_HIP_5_H 1
diff --git a/lib/dns/rdata/generic/ipseckey_45.c b/lib/dns/rdata/generic/ipseckey_45.c
index 040299d2f62..6405baea807 100644
--- a/lib/dns/rdata/generic/ipseckey_45.c
+++ b/lib/dns/rdata/generic/ipseckey_45.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #ifndef RDATA_GENERIC_IPSECKEY_45_C
 #define RDATA_GENERIC_IPSECKEY_45_C
diff --git a/lib/dns/rdata/generic/ipseckey_45.h b/lib/dns/rdata/generic/ipseckey_45.h
index 7f3704133c5..04a552169e0 100644
--- a/lib/dns/rdata/generic/ipseckey_45.h
+++ b/lib/dns/rdata/generic/ipseckey_45.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: ipseckey_45.h,v 1.4 2007/06/19 23:47:17 tbox Exp $ */
 
 #ifndef GENERIC_IPSECKEY_45_H
 #define GENERIC_IPSECKEY_45_H 1
diff --git a/lib/dns/rdata/generic/isdn_20.c b/lib/dns/rdata/generic/isdn_20.c
index f424150c739..8b15fb81b8e 100644
--- a/lib/dns/rdata/generic/isdn_20.c
+++ b/lib/dns/rdata/generic/isdn_20.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: isdn_20.c,v 1.40 2009/12/04 22:06:37 tbox Exp $ */
-
-/* Reviewed: Wed Mar 15 16:53:11 PST 2000 by bwelling */
-
 /* RFC1183 */
 
 #ifndef RDATA_GENERIC_ISDN_20_C
diff --git a/lib/dns/rdata/generic/isdn_20.h b/lib/dns/rdata/generic/isdn_20.h
index 52a4f90abef..70a6dfa9de1 100644
--- a/lib/dns/rdata/generic/isdn_20.h
+++ b/lib/dns/rdata/generic/isdn_20.h
@@ -12,7 +12,6 @@
 #ifndef GENERIC_ISDN_20_H
 #define GENERIC_ISDN_20_H 1
 
-/* $Id: isdn_20.h,v 1.18 2007/06/19 23:47:17 tbox Exp $ */
 
 /*!
  * \brief Per RFC1183 */
diff --git a/lib/dns/rdata/generic/key_25.c b/lib/dns/rdata/generic/key_25.c
index 9fff142c19c..6d42934687c 100644
--- a/lib/dns/rdata/generic/key_25.c
+++ b/lib/dns/rdata/generic/key_25.c
@@ -9,12 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
-
-/*
- * Reviewed: Wed Mar 15 16:47:10 PST 2000 by halley.
- */
-
 /* RFC2535 */
 
 #ifndef RDATA_GENERIC_KEY_25_C
diff --git a/lib/dns/rdata/generic/key_25.h b/lib/dns/rdata/generic/key_25.h
index edc1c6e94f2..090c812316b 100644
--- a/lib/dns/rdata/generic/key_25.h
+++ b/lib/dns/rdata/generic/key_25.h
@@ -12,7 +12,6 @@
 #ifndef GENERIC_KEY_25_H
 #define GENERIC_KEY_25_H 1
 
-/* $Id: key_25.h,v 1.19 2007/06/19 23:47:17 tbox Exp $ */
 
 /*!
  * \brief Per RFC2535 */
diff --git a/lib/dns/rdata/generic/keydata_65533.h b/lib/dns/rdata/generic/keydata_65533.h
index 903fa155d61..b95abfe0711 100644
--- a/lib/dns/rdata/generic/keydata_65533.h
+++ b/lib/dns/rdata/generic/keydata_65533.h
@@ -12,7 +12,6 @@
 #ifndef GENERIC_KEYDATA_65533_H
 #define GENERIC_KEYDATA_65533_H 1
 
-/* $Id: keydata_65533.h,v 1.2 2009/06/30 02:52:32 each Exp $ */
 
 typedef struct dns_rdata_keydata {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/generic/loc_29.c b/lib/dns/rdata/generic/loc_29.c
index fb5edcd2b4e..740439b5dde 100644
--- a/lib/dns/rdata/generic/loc_29.c
+++ b/lib/dns/rdata/generic/loc_29.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: loc_29.c,v 1.50 2009/12/04 21:09:33 marka Exp $ */
-
-/* Reviewed: Wed Mar 15 18:13:09 PST 2000 by explorer */
-
 /* RFC1876 */
 
 #ifndef RDATA_GENERIC_LOC_29_C
diff --git a/lib/dns/rdata/generic/loc_29.h b/lib/dns/rdata/generic/loc_29.h
index 1a654c01b57..e7535082e19 100644
--- a/lib/dns/rdata/generic/loc_29.h
+++ b/lib/dns/rdata/generic/loc_29.h
@@ -12,7 +12,6 @@
 #ifndef GENERIC_LOC_29_H
 #define GENERIC_LOC_29_H 1
 
-/* $Id: loc_29.h,v 1.19 2007/06/19 23:47:17 tbox Exp $ */
 
 /*!
  * \brief Per RFC1876 */
diff --git a/lib/dns/rdata/generic/mb_7.c b/lib/dns/rdata/generic/mb_7.c
index e0a5989b5b6..651503a3ff6 100644
--- a/lib/dns/rdata/generic/mb_7.c
+++ b/lib/dns/rdata/generic/mb_7.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: mb_7.c,v 1.47 2009/12/04 22:06:37 tbox Exp $ */
-
-/* Reviewed: Wed Mar 15 17:31:26 PST 2000 by bwelling */
-
 #ifndef RDATA_GENERIC_MB_7_C
 #define RDATA_GENERIC_MB_7_C
 
diff --git a/lib/dns/rdata/generic/mb_7.h b/lib/dns/rdata/generic/mb_7.h
index 5aa2e218824..59f4115e65d 100644
--- a/lib/dns/rdata/generic/mb_7.h
+++ b/lib/dns/rdata/generic/mb_7.h
@@ -13,7 +13,6 @@
 #ifndef GENERIC_MB_7_H
 #define GENERIC_MB_7_H 1
 
-/* $Id: mb_7.h,v 1.27 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_mb {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/generic/md_3.c b/lib/dns/rdata/generic/md_3.c
index ba193257fba..85d53eca822 100644
--- a/lib/dns/rdata/generic/md_3.c
+++ b/lib/dns/rdata/generic/md_3.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: md_3.c,v 1.49 2009/12/04 22:06:37 tbox Exp $ */
-
-/* Reviewed: Wed Mar 15 17:48:20 PST 2000 by bwelling */
-
 #ifndef RDATA_GENERIC_MD_3_C
 #define RDATA_GENERIC_MD_3_C
 
diff --git a/lib/dns/rdata/generic/md_3.h b/lib/dns/rdata/generic/md_3.h
index f51ad1c7eda..396c3c94e2a 100644
--- a/lib/dns/rdata/generic/md_3.h
+++ b/lib/dns/rdata/generic/md_3.h
@@ -13,7 +13,6 @@
 #ifndef GENERIC_MD_3_H
 #define GENERIC_MD_3_H 1
 
-/* $Id: md_3.h,v 1.28 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_md {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/generic/mf_4.c b/lib/dns/rdata/generic/mf_4.c
index 38f379ab4cf..0658c85fe31 100644
--- a/lib/dns/rdata/generic/mf_4.c
+++ b/lib/dns/rdata/generic/mf_4.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: mf_4.c,v 1.47 2009/12/04 22:06:37 tbox Exp $ */
-
-/* reviewed: Wed Mar 15 17:47:33 PST 2000 by brister */
-
 #ifndef RDATA_GENERIC_MF_4_C
 #define RDATA_GENERIC_MF_4_C
 
diff --git a/lib/dns/rdata/generic/mf_4.h b/lib/dns/rdata/generic/mf_4.h
index b571ebefd1f..d8821551cdd 100644
--- a/lib/dns/rdata/generic/mf_4.h
+++ b/lib/dns/rdata/generic/mf_4.h
@@ -13,7 +13,6 @@
 #ifndef GENERIC_MF_4_H
 #define GENERIC_MF_4_H 1
 
-/* $Id: mf_4.h,v 1.26 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_mf {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/generic/mg_8.c b/lib/dns/rdata/generic/mg_8.c
index 891d185f695..be694423d74 100644
--- a/lib/dns/rdata/generic/mg_8.c
+++ b/lib/dns/rdata/generic/mg_8.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: mg_8.c,v 1.45 2009/12/04 22:06:37 tbox Exp $ */
-
-/* reviewed: Wed Mar 15 17:49:21 PST 2000 by brister */
-
 #ifndef RDATA_GENERIC_MG_8_C
 #define RDATA_GENERIC_MG_8_C
 
diff --git a/lib/dns/rdata/generic/mg_8.h b/lib/dns/rdata/generic/mg_8.h
index f8eccda1335..0e0380ebe0a 100644
--- a/lib/dns/rdata/generic/mg_8.h
+++ b/lib/dns/rdata/generic/mg_8.h
@@ -13,7 +13,6 @@
 #ifndef GENERIC_MG_8_H
 #define GENERIC_MG_8_H 1
 
-/* $Id: mg_8.h,v 1.26 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_mg {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/generic/minfo_14.c b/lib/dns/rdata/generic/minfo_14.c
index a42ed4ca357..26779822733 100644
--- a/lib/dns/rdata/generic/minfo_14.c
+++ b/lib/dns/rdata/generic/minfo_14.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: minfo_14.c,v 1.47 2009/12/04 22:06:37 tbox Exp $ */
-
-/* reviewed: Wed Mar 15 17:45:32 PST 2000 by brister */
-
 #ifndef RDATA_GENERIC_MINFO_14_C
 #define RDATA_GENERIC_MINFO_14_C
 
diff --git a/lib/dns/rdata/generic/minfo_14.h b/lib/dns/rdata/generic/minfo_14.h
index fadcbccc7c8..10080fb38d6 100644
--- a/lib/dns/rdata/generic/minfo_14.h
+++ b/lib/dns/rdata/generic/minfo_14.h
@@ -13,7 +13,6 @@
 #ifndef GENERIC_MINFO_14_H
 #define GENERIC_MINFO_14_H 1
 
-/* $Id: minfo_14.h,v 1.27 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_minfo {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/generic/mr_9.c b/lib/dns/rdata/generic/mr_9.c
index 8a77205b6e2..a8ecf2d56a3 100644
--- a/lib/dns/rdata/generic/mr_9.c
+++ b/lib/dns/rdata/generic/mr_9.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: mr_9.c,v 1.44 2009/12/04 22:06:37 tbox Exp $ */
-
-/* Reviewed: Wed Mar 15 21:30:35 EST 2000 by tale */
-
 #ifndef RDATA_GENERIC_MR_9_C
 #define RDATA_GENERIC_MR_9_C
 
diff --git a/lib/dns/rdata/generic/mr_9.h b/lib/dns/rdata/generic/mr_9.h
index 8bab005eeec..888a82f0aff 100644
--- a/lib/dns/rdata/generic/mr_9.h
+++ b/lib/dns/rdata/generic/mr_9.h
@@ -13,7 +13,6 @@
 #ifndef GENERIC_MR_9_H
 #define GENERIC_MR_9_H 1
 
-/* $Id: mr_9.h,v 1.26 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_mr {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/generic/mx_15.c b/lib/dns/rdata/generic/mx_15.c
index dfc9a7ab1a8..a18ff49a10a 100644
--- a/lib/dns/rdata/generic/mx_15.c
+++ b/lib/dns/rdata/generic/mx_15.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: mx_15.c,v 1.58 2009/12/04 22:06:37 tbox Exp $ */
-
-/* reviewed: Wed Mar 15 18:05:46 PST 2000 by brister */
-
 #ifndef RDATA_GENERIC_MX_15_C
 #define RDATA_GENERIC_MX_15_C
 
diff --git a/lib/dns/rdata/generic/mx_15.h b/lib/dns/rdata/generic/mx_15.h
index 0a2d58e1afa..a0dfe297e59 100644
--- a/lib/dns/rdata/generic/mx_15.h
+++ b/lib/dns/rdata/generic/mx_15.h
@@ -13,7 +13,6 @@
 #ifndef GENERIC_MX_15_H
 #define GENERIC_MX_15_H 1
 
-/* $Id: mx_15.h,v 1.29 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_mx {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/generic/naptr_35.c b/lib/dns/rdata/generic/naptr_35.c
index c533226fd8a..d3c14f2a9e6 100644
--- a/lib/dns/rdata/generic/naptr_35.c
+++ b/lib/dns/rdata/generic/naptr_35.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
-
-/* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */
-
 /* RFC2915 */
 
 #ifndef RDATA_GENERIC_NAPTR_35_C
diff --git a/lib/dns/rdata/generic/naptr_35.h b/lib/dns/rdata/generic/naptr_35.h
index 8d67072226e..afbed869f5c 100644
--- a/lib/dns/rdata/generic/naptr_35.h
+++ b/lib/dns/rdata/generic/naptr_35.h
@@ -12,7 +12,6 @@
 #ifndef GENERIC_NAPTR_35_H
 #define GENERIC_NAPTR_35_H 1
 
-/* $Id$ */
 
 /*!
  *  \brief Per RFC2915 */
diff --git a/lib/dns/rdata/generic/ns_2.c b/lib/dns/rdata/generic/ns_2.c
index dc9c752edd2..cf481281248 100644
--- a/lib/dns/rdata/generic/ns_2.c
+++ b/lib/dns/rdata/generic/ns_2.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: ns_2.c,v 1.48 2009/12/04 22:06:37 tbox Exp $ */
-
-/* Reviewed: Wed Mar 15 18:15:00 PST 2000 by bwelling */
-
 #ifndef RDATA_GENERIC_NS_2_C
 #define RDATA_GENERIC_NS_2_C
 
diff --git a/lib/dns/rdata/generic/ns_2.h b/lib/dns/rdata/generic/ns_2.h
index f55fcb8265c..db9b6c07a92 100644
--- a/lib/dns/rdata/generic/ns_2.h
+++ b/lib/dns/rdata/generic/ns_2.h
@@ -13,7 +13,6 @@
 #ifndef GENERIC_NS_2_H
 #define GENERIC_NS_2_H 1
 
-/* $Id: ns_2.h,v 1.27 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_ns {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/generic/nsec3_50.c b/lib/dns/rdata/generic/nsec3_50.c
index e2b6645d949..c58e5754633 100644
--- a/lib/dns/rdata/generic/nsec3_50.c
+++ b/lib/dns/rdata/generic/nsec3_50.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*
  * Copyright (C) 2004  Nominet, Ltd.
diff --git a/lib/dns/rdata/generic/nsec3_50.h b/lib/dns/rdata/generic/nsec3_50.h
index 3dee38847a3..696dad39427 100644
--- a/lib/dns/rdata/generic/nsec3_50.h
+++ b/lib/dns/rdata/generic/nsec3_50.h
@@ -13,7 +13,6 @@
 #ifndef GENERIC_NSEC3_50_H
 #define GENERIC_NSEC3_50_H 1
 
-/* $Id$ */
 
 /*!
  * \brief Per RFC 5155 */
diff --git a/lib/dns/rdata/generic/nsec3param_51.c b/lib/dns/rdata/generic/nsec3param_51.c
index f708ebdb76c..88910697c35 100644
--- a/lib/dns/rdata/generic/nsec3param_51.c
+++ b/lib/dns/rdata/generic/nsec3param_51.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: nsec3param_51.c,v 1.7 2009/12/04 21:09:34 marka Exp $ */
 
 /*
  * Copyright (C) 2004  Nominet, Ltd.
diff --git a/lib/dns/rdata/generic/nsec3param_51.h b/lib/dns/rdata/generic/nsec3param_51.h
index df772b12a28..b8bc375550e 100644
--- a/lib/dns/rdata/generic/nsec3param_51.h
+++ b/lib/dns/rdata/generic/nsec3param_51.h
@@ -13,7 +13,6 @@
 #ifndef GENERIC_NSEC3PARAM_51_H
 #define GENERIC_NSEC3PARAM_51_H 1
 
-/* $Id: nsec3param_51.h,v 1.4 2008/09/25 04:02:39 tbox Exp $ */
 
 /*!
  * \brief Per RFC 5155 */
diff --git a/lib/dns/rdata/generic/nsec_47.c b/lib/dns/rdata/generic/nsec_47.c
index 0390cc0e68f..e6647bbc9c0 100644
--- a/lib/dns/rdata/generic/nsec_47.c
+++ b/lib/dns/rdata/generic/nsec_47.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: nsec_47.c,v 1.15 2011/01/13 04:59:26 tbox Exp $ */
-
-/* reviewed: Wed Mar 15 18:21:15 PST 2000 by brister */
-
 /* RFC 3845 */
 
 #ifndef RDATA_GENERIC_NSEC_47_C
diff --git a/lib/dns/rdata/generic/nsec_47.h b/lib/dns/rdata/generic/nsec_47.h
index 43930e0b07f..81118afde65 100644
--- a/lib/dns/rdata/generic/nsec_47.h
+++ b/lib/dns/rdata/generic/nsec_47.h
@@ -12,7 +12,6 @@
 #ifndef GENERIC_NSEC_47_H
 #define GENERIC_NSEC_47_H 1
 
-/* $Id: nsec_47.h,v 1.10 2008/07/15 23:47:21 tbox Exp $ */
 
 /*!
  * \brief Per RFC 3845 */
diff --git a/lib/dns/rdata/generic/null_10.c b/lib/dns/rdata/generic/null_10.c
index d03fff44cf8..f55eb70f029 100644
--- a/lib/dns/rdata/generic/null_10.c
+++ b/lib/dns/rdata/generic/null_10.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
-
-/* Reviewed: Thu Mar 16 13:57:50 PST 2000 by explorer */
-
 #ifndef RDATA_GENERIC_NULL_10_C
 #define RDATA_GENERIC_NULL_10_C
 
diff --git a/lib/dns/rdata/generic/null_10.h b/lib/dns/rdata/generic/null_10.h
index 24b6dd57fc7..26c1c833701 100644
--- a/lib/dns/rdata/generic/null_10.h
+++ b/lib/dns/rdata/generic/null_10.h
@@ -13,7 +13,6 @@
 #ifndef GENERIC_NULL_10_H
 #define GENERIC_NULL_10_H 1
 
-/* $Id: null_10.h,v 1.25 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_null {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/generic/nxt_30.c b/lib/dns/rdata/generic/nxt_30.c
index a155af2f22a..10c2ab798f0 100644
--- a/lib/dns/rdata/generic/nxt_30.c
+++ b/lib/dns/rdata/generic/nxt_30.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: nxt_30.c,v 1.65 2009/12/04 22:06:37 tbox Exp $ */
-
-/* reviewed: Wed Mar 15 18:21:15 PST 2000 by brister */
-
 /* RFC2535 */
 
 #ifndef RDATA_GENERIC_NXT_30_C
diff --git a/lib/dns/rdata/generic/nxt_30.h b/lib/dns/rdata/generic/nxt_30.h
index b907ad62da2..0e490cdab56 100644
--- a/lib/dns/rdata/generic/nxt_30.h
+++ b/lib/dns/rdata/generic/nxt_30.h
@@ -12,7 +12,6 @@
 #ifndef GENERIC_NXT_30_H
 #define GENERIC_NXT_30_H 1
 
-/* $Id: nxt_30.h,v 1.25 2007/06/19 23:47:17 tbox Exp $ */
 
 /*!
  *  \brief RFC2535 */
diff --git a/lib/dns/rdata/generic/opt_41.c b/lib/dns/rdata/generic/opt_41.c
index 9826b41266d..46405a316e2 100644
--- a/lib/dns/rdata/generic/opt_41.c
+++ b/lib/dns/rdata/generic/opt_41.c
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* Reviewed: Thu Mar 16 14:06:44 PST 2000 by gson */
-
 /* RFC2671 */
 
 #ifndef RDATA_GENERIC_OPT_41_C
diff --git a/lib/dns/rdata/generic/opt_41.h b/lib/dns/rdata/generic/opt_41.h
index a7318df6102..d31cf68d988 100644
--- a/lib/dns/rdata/generic/opt_41.h
+++ b/lib/dns/rdata/generic/opt_41.h
@@ -12,7 +12,6 @@
 #ifndef GENERIC_OPT_41_H
 #define GENERIC_OPT_41_H 1
 
-/* $Id: opt_41.h,v 1.18 2007/06/19 23:47:17 tbox Exp $ */
 
 /*!
  *  \brief Per RFC2671 */
diff --git a/lib/dns/rdata/generic/proforma.c b/lib/dns/rdata/generic/proforma.c
index 94c62a39565..83402d6bae4 100644
--- a/lib/dns/rdata/generic/proforma.c
+++ b/lib/dns/rdata/generic/proforma.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: proforma.c,v 1.38 2009/12/04 22:06:37 tbox Exp $ */
 
 #ifndef RDATA_GENERIC_#_#_C
 #define RDATA_GENERIC_#_#_C
diff --git a/lib/dns/rdata/generic/proforma.h b/lib/dns/rdata/generic/proforma.h
index 2a69fa01d88..cb49ee42513 100644
--- a/lib/dns/rdata/generic/proforma.h
+++ b/lib/dns/rdata/generic/proforma.h
@@ -13,7 +13,6 @@
 #ifndef GENERIC_PROFORMA_H
 #define GENERIC_PROFORMA_H 1
 
-/* $Id: proforma.h,v 1.23 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_# {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/generic/ptr_12.c b/lib/dns/rdata/generic/ptr_12.c
index 131ee90c0f0..8258d1d897b 100644
--- a/lib/dns/rdata/generic/ptr_12.c
+++ b/lib/dns/rdata/generic/ptr_12.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: ptr_12.c,v 1.45 2009/12/04 22:06:37 tbox Exp $ */
-
-/* Reviewed: Thu Mar 16 14:05:12 PST 2000 by explorer */
-
 #ifndef RDATA_GENERIC_PTR_12_C
 #define RDATA_GENERIC_PTR_12_C
 
diff --git a/lib/dns/rdata/generic/ptr_12.h b/lib/dns/rdata/generic/ptr_12.h
index 0d7e7129990..d71ebd92571 100644
--- a/lib/dns/rdata/generic/ptr_12.h
+++ b/lib/dns/rdata/generic/ptr_12.h
@@ -13,7 +13,6 @@
 #ifndef GENERIC_PTR_12_H
 #define GENERIC_PTR_12_H 1
 
-/* $Id: ptr_12.h,v 1.27 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_ptr {
 	dns_rdatacommon_t       common;
diff --git a/lib/dns/rdata/generic/rp_17.c b/lib/dns/rdata/generic/rp_17.c
index d0c67c55f5e..1630f0ce13e 100644
--- a/lib/dns/rdata/generic/rp_17.c
+++ b/lib/dns/rdata/generic/rp_17.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: rp_17.c,v 1.44 2009/12/04 22:06:37 tbox Exp $ */
 
 /* RFC1183 */
 
diff --git a/lib/dns/rdata/generic/rp_17.h b/lib/dns/rdata/generic/rp_17.h
index 4c7f2243be9..31b57682f9e 100644
--- a/lib/dns/rdata/generic/rp_17.h
+++ b/lib/dns/rdata/generic/rp_17.h
@@ -12,7 +12,6 @@
 #ifndef GENERIC_RP_17_H
 #define GENERIC_RP_17_H 1
 
-/* $Id: rp_17.h,v 1.21 2007/06/19 23:47:17 tbox Exp $ */
 
 /*!
  *  \brief Per RFC1183 */
diff --git a/lib/dns/rdata/generic/rrsig_46.c b/lib/dns/rdata/generic/rrsig_46.c
index 1718fe4a2b1..669731801f7 100644
--- a/lib/dns/rdata/generic/rrsig_46.c
+++ b/lib/dns/rdata/generic/rrsig_46.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
-
-/* Reviewed: Fri Mar 17 09:05:02 PST 2000 by gson */
-
 /* RFC2535 */
 
 #ifndef RDATA_GENERIC_RRSIG_46_C
diff --git a/lib/dns/rdata/generic/rrsig_46.h b/lib/dns/rdata/generic/rrsig_46.h
index 43a4c8f359c..b46f7fd6c7f 100644
--- a/lib/dns/rdata/generic/rrsig_46.h
+++ b/lib/dns/rdata/generic/rrsig_46.h
@@ -12,7 +12,6 @@
 #ifndef GENERIC_DNSSIG_46_H
 #define GENERIC_DNSSIG_46_H 1
 
-/* $Id: rrsig_46.h,v 1.7 2007/06/19 23:47:17 tbox Exp $ */
 
 /*!
  *  \brief Per RFC2535 */
diff --git a/lib/dns/rdata/generic/rt_21.c b/lib/dns/rdata/generic/rt_21.c
index 666af32ef19..64b4345fbb0 100644
--- a/lib/dns/rdata/generic/rt_21.c
+++ b/lib/dns/rdata/generic/rt_21.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: rt_21.c,v 1.48 2009/12/04 22:06:37 tbox Exp $ */
-
-/* reviewed: Thu Mar 16 15:02:31 PST 2000 by brister */
-
 /* RFC1183 */
 
 #ifndef RDATA_GENERIC_RT_21_C
diff --git a/lib/dns/rdata/generic/rt_21.h b/lib/dns/rdata/generic/rt_21.h
index b9c20a9308e..605422924a0 100644
--- a/lib/dns/rdata/generic/rt_21.h
+++ b/lib/dns/rdata/generic/rt_21.h
@@ -12,7 +12,6 @@
 #ifndef GENERIC_RT_21_H
 #define GENERIC_RT_21_H 1
 
-/* $Id: rt_21.h,v 1.21 2007/06/19 23:47:17 tbox Exp $ */
 
 /*!
  *  \brief Per RFC1183 */
diff --git a/lib/dns/rdata/generic/sig_24.c b/lib/dns/rdata/generic/sig_24.c
index eaa89cd1f0b..864c07d8426 100644
--- a/lib/dns/rdata/generic/sig_24.c
+++ b/lib/dns/rdata/generic/sig_24.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
-
-/* Reviewed: Fri Mar 17 09:05:02 PST 2000 by gson */
-
 /* RFC2535 */
 
 #ifndef RDATA_GENERIC_SIG_24_C
diff --git a/lib/dns/rdata/generic/sig_24.h b/lib/dns/rdata/generic/sig_24.h
index 9aee9b9db72..d1d5b73a3f6 100644
--- a/lib/dns/rdata/generic/sig_24.h
+++ b/lib/dns/rdata/generic/sig_24.h
@@ -12,7 +12,6 @@
 #ifndef GENERIC_SIG_24_H
 #define GENERIC_SIG_24_H 1
 
-/* $Id: sig_24.h,v 1.26 2007/06/19 23:47:17 tbox Exp $ */
 
 /*!
  *  \brief Per RFC2535 */
diff --git a/lib/dns/rdata/generic/soa_6.c b/lib/dns/rdata/generic/soa_6.c
index 8101ef59c73..5d8e99008f1 100644
--- a/lib/dns/rdata/generic/soa_6.c
+++ b/lib/dns/rdata/generic/soa_6.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
-
-/* Reviewed: Thu Mar 16 15:18:32 PST 2000 by explorer */
-
 #ifndef RDATA_GENERIC_SOA_6_C
 #define RDATA_GENERIC_SOA_6_C
 
diff --git a/lib/dns/rdata/generic/soa_6.h b/lib/dns/rdata/generic/soa_6.h
index 5d005572782..0fb39fc7d7b 100644
--- a/lib/dns/rdata/generic/soa_6.h
+++ b/lib/dns/rdata/generic/soa_6.h
@@ -13,7 +13,6 @@
 #ifndef GENERIC_SOA_6_H
 #define GENERIC_SOA_6_H 1
 
-/* $Id: soa_6.h,v 1.32 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_soa {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/generic/spf_99.c b/lib/dns/rdata/generic/spf_99.c
index 22b6a9e6a30..3595007c3d5 100644
--- a/lib/dns/rdata/generic/spf_99.c
+++ b/lib/dns/rdata/generic/spf_99.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: spf_99.c,v 1.6 2009/12/04 22:06:37 tbox Exp $ */
-
-/* Reviewed: Thu Mar 16 15:40:00 PST 2000 by bwelling */
-
 #ifndef RDATA_GENERIC_SPF_99_C
 #define RDATA_GENERIC_SPF_99_C
 
diff --git a/lib/dns/rdata/generic/spf_99.h b/lib/dns/rdata/generic/spf_99.h
index 02df8cf4020..f1305f40065 100644
--- a/lib/dns/rdata/generic/spf_99.h
+++ b/lib/dns/rdata/generic/spf_99.h
@@ -12,7 +12,6 @@
 #ifndef GENERIC_SPF_99_H
 #define GENERIC_SPF_99_H 1
 
-/* $Id: spf_99.h,v 1.4 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_spf_string {
 		isc_uint8_t    length;
diff --git a/lib/dns/rdata/generic/sshfp_44.c b/lib/dns/rdata/generic/sshfp_44.c
index b17a81f1432..8d131adb20c 100644
--- a/lib/dns/rdata/generic/sshfp_44.c
+++ b/lib/dns/rdata/generic/sshfp_44.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /* RFC 4255 */
 
diff --git a/lib/dns/rdata/generic/sshfp_44.h b/lib/dns/rdata/generic/sshfp_44.h
index f153600a8e4..e90f1a36a65 100644
--- a/lib/dns/rdata/generic/sshfp_44.h
+++ b/lib/dns/rdata/generic/sshfp_44.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: sshfp_44.h,v 1.8 2007/06/19 23:47:17 tbox Exp $ */
 
 /*!
  *  \brief Per RFC 4255 */
diff --git a/lib/dns/rdata/generic/tkey_249.c b/lib/dns/rdata/generic/tkey_249.c
index ddd234e95d5..e08034db691 100644
--- a/lib/dns/rdata/generic/tkey_249.c
+++ b/lib/dns/rdata/generic/tkey_249.c
@@ -9,12 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
-
-/*
- * Reviewed: Thu Mar 16 17:35:30 PST 2000 by halley.
- */
-
 /* draft-ietf-dnsext-tkey-01.txt */
 
 #ifndef RDATA_GENERIC_TKEY_249_C
diff --git a/lib/dns/rdata/generic/tkey_249.h b/lib/dns/rdata/generic/tkey_249.h
index 04e74b96bfb..7336b918e4e 100644
--- a/lib/dns/rdata/generic/tkey_249.h
+++ b/lib/dns/rdata/generic/tkey_249.h
@@ -12,7 +12,6 @@
 #ifndef GENERIC_TKEY_249_H
 #define GENERIC_TKEY_249_H 1
 
-/* $Id: tkey_249.h,v 1.24 2007/06/19 23:47:17 tbox Exp $ */
 
 /*!
  *  \brief Per draft-ietf-dnsind-tkey-00.txt */
diff --git a/lib/dns/rdata/generic/tlsa_52.h b/lib/dns/rdata/generic/tlsa_52.h
index f865d2b9e1f..51d21d79332 100644
--- a/lib/dns/rdata/generic/tlsa_52.h
+++ b/lib/dns/rdata/generic/tlsa_52.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #ifndef GENERIC_TLSA_52_H
 #define GENERIC_TLSA_52_H 1
diff --git a/lib/dns/rdata/generic/txt_16.c b/lib/dns/rdata/generic/txt_16.c
index ecac8855855..2eb0e53d7f8 100644
--- a/lib/dns/rdata/generic/txt_16.c
+++ b/lib/dns/rdata/generic/txt_16.c
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* Reviewed: Thu Mar 16 15:40:00 PST 2000 by bwelling */
-
 #ifndef RDATA_GENERIC_TXT_16_C
 #define RDATA_GENERIC_TXT_16_C
 
diff --git a/lib/dns/rdata/generic/txt_16.h b/lib/dns/rdata/generic/txt_16.h
index dfeb8ed5417..24e66b0b6a9 100644
--- a/lib/dns/rdata/generic/txt_16.h
+++ b/lib/dns/rdata/generic/txt_16.h
@@ -13,7 +13,6 @@
 #ifndef GENERIC_TXT_16_H
 #define GENERIC_TXT_16_H 1
 
-/* $Id: txt_16.h,v 1.28 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_txt_string {
 		isc_uint8_t    length;
diff --git a/lib/dns/rdata/generic/unspec_103.c b/lib/dns/rdata/generic/unspec_103.c
index 871392b6bfc..95bb5506b92 100644
--- a/lib/dns/rdata/generic/unspec_103.c
+++ b/lib/dns/rdata/generic/unspec_103.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: unspec_103.c,v 1.37 2009/12/04 22:06:37 tbox Exp $ */
 
 #ifndef RDATA_GENERIC_UNSPEC_103_C
 #define RDATA_GENERIC_UNSPEC_103_C
diff --git a/lib/dns/rdata/generic/unspec_103.h b/lib/dns/rdata/generic/unspec_103.h
index 9fbed866e4b..70923845c8e 100644
--- a/lib/dns/rdata/generic/unspec_103.h
+++ b/lib/dns/rdata/generic/unspec_103.h
@@ -13,7 +13,6 @@
 #ifndef GENERIC_UNSPEC_103_H
 #define GENERIC_UNSPEC_103_H 1
 
-/* $Id: unspec_103.h,v 1.17 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_unspec_t {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/generic/uri_256.c b/lib/dns/rdata/generic/uri_256.c
index fb635db6278..64019201264 100644
--- a/lib/dns/rdata/generic/uri_256.c
+++ b/lib/dns/rdata/generic/uri_256.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #ifndef GENERIC_URI_256_C
 #define GENERIC_URI_256_C 1
diff --git a/lib/dns/rdata/generic/uri_256.h b/lib/dns/rdata/generic/uri_256.h
index 8110d58d5ed..6e248a20b13 100644
--- a/lib/dns/rdata/generic/uri_256.h
+++ b/lib/dns/rdata/generic/uri_256.h
@@ -12,7 +12,6 @@
 #ifndef GENERIC_URI_256_H
 #define GENERIC_URI_256_H 1
 
-/* $Id$ */
 
 typedef struct dns_rdata_uri {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/generic/x25_19.c b/lib/dns/rdata/generic/x25_19.c
index 97bae8f687e..20f98e3729b 100644
--- a/lib/dns/rdata/generic/x25_19.c
+++ b/lib/dns/rdata/generic/x25_19.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: x25_19.c,v 1.41 2009/12/04 22:06:37 tbox Exp $ */
-
-/* Reviewed: Thu Mar 16 16:15:57 PST 2000 by bwelling */
-
 /* RFC1183 */
 
 #ifndef RDATA_GENERIC_X25_19_C
diff --git a/lib/dns/rdata/generic/x25_19.h b/lib/dns/rdata/generic/x25_19.h
index 420fe40299d..903c6378e45 100644
--- a/lib/dns/rdata/generic/x25_19.h
+++ b/lib/dns/rdata/generic/x25_19.h
@@ -12,7 +12,6 @@
 #ifndef GENERIC_X25_19_H
 #define GENERIC_X25_19_H 1
 
-/* $Id: x25_19.h,v 1.18 2007/06/19 23:47:17 tbox Exp $ */
 
 /*!
  *  \brief Per RFC1183 */
diff --git a/lib/dns/rdata/hs_4/a_1.c b/lib/dns/rdata/hs_4/a_1.c
index 358992249b2..531406065f8 100644
--- a/lib/dns/rdata/hs_4/a_1.c
+++ b/lib/dns/rdata/hs_4/a_1.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: a_1.c,v 1.33 2009/12/04 22:06:37 tbox Exp $ */
-
-/* reviewed: Thu Mar 16 15:58:36 PST 2000 by brister */
-
 #ifndef RDATA_HS_4_A_1_C
 #define RDATA_HS_4_A_1_C
 
diff --git a/lib/dns/rdata/hs_4/a_1.h b/lib/dns/rdata/hs_4/a_1.h
index fb1ceaf1e8d..c5f699684e6 100644
--- a/lib/dns/rdata/hs_4/a_1.h
+++ b/lib/dns/rdata/hs_4/a_1.h
@@ -13,7 +13,6 @@
 #ifndef HS_4_A_1_H
 #define HS_4_A_1_H 1
 
-/* $Id: a_1.h,v 1.12 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_hs_a {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/in_1/a6_38.c b/lib/dns/rdata/in_1/a6_38.c
index b0b09ef3503..36b06ee1f35 100644
--- a/lib/dns/rdata/in_1/a6_38.c
+++ b/lib/dns/rdata/in_1/a6_38.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: a6_38.c,v 1.56 2009/12/04 22:06:37 tbox Exp $ */
 
 /* RFC2874 */
 
diff --git a/lib/dns/rdata/in_1/a6_38.h b/lib/dns/rdata/in_1/a6_38.h
index bbeb891709b..f2aedfc2918 100644
--- a/lib/dns/rdata/in_1/a6_38.h
+++ b/lib/dns/rdata/in_1/a6_38.h
@@ -12,7 +12,6 @@
 #ifndef IN_1_A6_38_H
 #define IN_1_A6_38_H 1
 
-/* $Id: a6_38.h,v 1.24 2007/06/19 23:47:17 tbox Exp $ */
 
 /*!
  *  \brief Per RFC2874 */
diff --git a/lib/dns/rdata/in_1/a_1.c b/lib/dns/rdata/in_1/a_1.c
index 6c2356ffe3f..5db516d22b0 100644
--- a/lib/dns/rdata/in_1/a_1.c
+++ b/lib/dns/rdata/in_1/a_1.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: a_1.c,v 1.55 2009/12/04 22:06:37 tbox Exp $ */
-
-/* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */
-
 #ifndef RDATA_IN_1_A_1_C
 #define RDATA_IN_1_A_1_C
 
diff --git a/lib/dns/rdata/in_1/a_1.h b/lib/dns/rdata/in_1/a_1.h
index e2418b010d2..f44809d18fc 100644
--- a/lib/dns/rdata/in_1/a_1.h
+++ b/lib/dns/rdata/in_1/a_1.h
@@ -13,7 +13,6 @@
 #ifndef IN_1_A_1_H
 #define IN_1_A_1_H 1
 
-/* $Id: a_1.h,v 1.28 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_in_a {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/in_1/aaaa_28.c b/lib/dns/rdata/in_1/aaaa_28.c
index 8ecde12bbe9..0c640d7c03d 100644
--- a/lib/dns/rdata/in_1/aaaa_28.c
+++ b/lib/dns/rdata/in_1/aaaa_28.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: aaaa_28.c,v 1.47 2009/12/04 22:06:37 tbox Exp $ */
-
-/* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */
-
 /* RFC1886 */
 
 #ifndef RDATA_IN_1_AAAA_28_C
diff --git a/lib/dns/rdata/in_1/aaaa_28.h b/lib/dns/rdata/in_1/aaaa_28.h
index 3607155c5a7..caabf7e0214 100644
--- a/lib/dns/rdata/in_1/aaaa_28.h
+++ b/lib/dns/rdata/in_1/aaaa_28.h
@@ -12,7 +12,6 @@
 #ifndef IN_1_AAAA_28_H
 #define IN_1_AAAA_28_H 1
 
-/* $Id: aaaa_28.h,v 1.21 2007/06/19 23:47:17 tbox Exp $ */
 
 /*!
  *  \brief Per RFC1886 */
diff --git a/lib/dns/rdata/in_1/apl_42.c b/lib/dns/rdata/in_1/apl_42.c
index f71a33dd5f0..6a6ea5334bb 100644
--- a/lib/dns/rdata/in_1/apl_42.c
+++ b/lib/dns/rdata/in_1/apl_42.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: apl_42.c,v 1.16 2009/12/04 22:06:37 tbox Exp $ */
 
 /* RFC3123 */
 
diff --git a/lib/dns/rdata/in_1/apl_42.h b/lib/dns/rdata/in_1/apl_42.h
index 8520cdbc7d0..429de8fbf8f 100644
--- a/lib/dns/rdata/in_1/apl_42.h
+++ b/lib/dns/rdata/in_1/apl_42.h
@@ -13,7 +13,6 @@
 #ifndef IN_1_APL_42_H
 #define IN_1_APL_42_H 1
 
-/* $Id: apl_42.h,v 1.6 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_apl_ent {
 	isc_boolean_t	negative;
diff --git a/lib/dns/rdata/in_1/dhcid_49.c b/lib/dns/rdata/in_1/dhcid_49.c
index 9f4e8728d21..0558fca5c43 100644
--- a/lib/dns/rdata/in_1/dhcid_49.c
+++ b/lib/dns/rdata/in_1/dhcid_49.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /* RFC 4701 */
 
diff --git a/lib/dns/rdata/in_1/dhcid_49.h b/lib/dns/rdata/in_1/dhcid_49.h
index 8e3fc4bc31e..455eaed982f 100644
--- a/lib/dns/rdata/in_1/dhcid_49.h
+++ b/lib/dns/rdata/in_1/dhcid_49.h
@@ -13,7 +13,6 @@
 #ifndef IN_1_DHCID_49_H
 #define IN_1_DHCID_49_H 1
 
-/* $Id: dhcid_49.h,v 1.5 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef struct dns_rdata_in_dhcid {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/in_1/kx_36.c b/lib/dns/rdata/in_1/kx_36.c
index 96340de25cf..a2a7d3d24c0 100644
--- a/lib/dns/rdata/in_1/kx_36.c
+++ b/lib/dns/rdata/in_1/kx_36.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: kx_36.c,v 1.47 2009/12/04 22:06:37 tbox Exp $ */
-
-/* Reviewed: Thu Mar 16 17:24:54 PST 2000 by explorer */
-
 /* RFC2230 */
 
 #ifndef RDATA_IN_1_KX_36_C
diff --git a/lib/dns/rdata/in_1/kx_36.h b/lib/dns/rdata/in_1/kx_36.h
index ba725f26ad2..1074aa00611 100644
--- a/lib/dns/rdata/in_1/kx_36.h
+++ b/lib/dns/rdata/in_1/kx_36.h
@@ -12,7 +12,6 @@
 #ifndef IN_1_KX_36_H
 #define IN_1_KX_36_H 1
 
-/* $Id: kx_36.h,v 1.20 2007/06/19 23:47:17 tbox Exp $ */
 
 /*!
  *  \brief Per RFC2230 */
diff --git a/lib/dns/rdata/in_1/nsap-ptr_23.c b/lib/dns/rdata/in_1/nsap-ptr_23.c
index 0353f69a9a1..735c8bb7bb8 100644
--- a/lib/dns/rdata/in_1/nsap-ptr_23.c
+++ b/lib/dns/rdata/in_1/nsap-ptr_23.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: nsap-ptr_23.c,v 1.40 2009/12/04 22:06:37 tbox Exp $ */
-
-/* Reviewed: Fri Mar 17 10:16:02 PST 2000 by gson */
-
 /* RFC1348.  Obsoleted in RFC 1706 - use PTR instead. */
 
 #ifndef RDATA_IN_1_NSAP_PTR_23_C
diff --git a/lib/dns/rdata/in_1/nsap-ptr_23.h b/lib/dns/rdata/in_1/nsap-ptr_23.h
index 7e05201d45d..4880a09e641 100644
--- a/lib/dns/rdata/in_1/nsap-ptr_23.h
+++ b/lib/dns/rdata/in_1/nsap-ptr_23.h
@@ -12,7 +12,6 @@
 #ifndef IN_1_NSAP_PTR_23_H
 #define IN_1_NSAP_PTR_23_H 1
 
-/* $Id: nsap-ptr_23.h,v 1.19 2007/06/19 23:47:17 tbox Exp $ */
 
 /*!
  *  \brief Per RFC1348.  Obsoleted in RFC 1706 - use PTR instead. */
diff --git a/lib/dns/rdata/in_1/nsap_22.c b/lib/dns/rdata/in_1/nsap_22.c
index dfc78a6acf6..17a83a9ac4c 100644
--- a/lib/dns/rdata/in_1/nsap_22.c
+++ b/lib/dns/rdata/in_1/nsap_22.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: nsap_22.c,v 1.44 2009/12/04 22:06:37 tbox Exp $ */
-
-/* Reviewed: Fri Mar 17 10:41:07 PST 2000 by gson */
-
 /* RFC1706 */
 
 #ifndef RDATA_IN_1_NSAP_22_C
diff --git a/lib/dns/rdata/in_1/nsap_22.h b/lib/dns/rdata/in_1/nsap_22.h
index 23c99e39153..23098efa114 100644
--- a/lib/dns/rdata/in_1/nsap_22.h
+++ b/lib/dns/rdata/in_1/nsap_22.h
@@ -12,7 +12,6 @@
 #ifndef IN_1_NSAP_22_H
 #define IN_1_NSAP_22_H 1
 
-/* $Id: nsap_22.h,v 1.18 2007/06/19 23:47:17 tbox Exp $ */
 
 /*!
  *  \brief Per RFC1706 */
diff --git a/lib/dns/rdata/in_1/px_26.c b/lib/dns/rdata/in_1/px_26.c
index 77f6b9fe36e..5b1029dcaa4 100644
--- a/lib/dns/rdata/in_1/px_26.c
+++ b/lib/dns/rdata/in_1/px_26.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: px_26.c,v 1.45 2009/12/04 22:06:37 tbox Exp $ */
-
-/* Reviewed: Mon Mar 20 10:44:27 PST 2000 */
-
 /* RFC2163 */
 
 #ifndef RDATA_IN_1_PX_26_C
diff --git a/lib/dns/rdata/in_1/px_26.h b/lib/dns/rdata/in_1/px_26.h
index 985532b7628..6760163cee3 100644
--- a/lib/dns/rdata/in_1/px_26.h
+++ b/lib/dns/rdata/in_1/px_26.h
@@ -12,7 +12,6 @@
 #ifndef IN_1_PX_26_H
 #define IN_1_PX_26_H 1
 
-/* $Id: px_26.h,v 1.19 2007/06/19 23:47:17 tbox Exp $ */
 
 /*!
  *  \brief Per RFC2163 */
diff --git a/lib/dns/rdata/in_1/srv_33.c b/lib/dns/rdata/in_1/srv_33.c
index d1adf0c6f03..e185abb915a 100644
--- a/lib/dns/rdata/in_1/srv_33.c
+++ b/lib/dns/rdata/in_1/srv_33.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: srv_33.c,v 1.47 2009/12/04 22:06:37 tbox Exp $ */
-
-/* Reviewed: Fri Mar 17 13:01:00 PST 2000 by bwelling */
-
 /* RFC2782 */
 
 #ifndef RDATA_IN_1_SRV_33_C
diff --git a/lib/dns/rdata/in_1/srv_33.h b/lib/dns/rdata/in_1/srv_33.h
index 46fb89c6696..8a76a299320 100644
--- a/lib/dns/rdata/in_1/srv_33.h
+++ b/lib/dns/rdata/in_1/srv_33.h
@@ -12,10 +12,6 @@
 #ifndef IN_1_SRV_33_H
 #define IN_1_SRV_33_H 1
 
-/* $Id: srv_33.h,v 1.19 2007/06/19 23:47:17 tbox Exp $ */
-
-/* Reviewed: Fri Mar 17 13:01:00 PST 2000 by bwelling */
-
 /*!
  *  \brief Per RFC2782 */
 
diff --git a/lib/dns/rdata/in_1/wks_11.c b/lib/dns/rdata/in_1/wks_11.c
index cb3abd00c23..1ed3a514e74 100644
--- a/lib/dns/rdata/in_1/wks_11.c
+++ b/lib/dns/rdata/in_1/wks_11.c
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* Reviewed: Fri Mar 17 15:01:49 PST 2000 by explorer */
-
 #ifndef RDATA_IN_1_WKS_11_C
 #define RDATA_IN_1_WKS_11_C
 
diff --git a/lib/dns/rdata/in_1/wks_11.h b/lib/dns/rdata/in_1/wks_11.h
index 5ebe3e27f9e..7c0491081ce 100644
--- a/lib/dns/rdata/in_1/wks_11.h
+++ b/lib/dns/rdata/in_1/wks_11.h
@@ -12,7 +12,6 @@
 #ifndef IN_1_WKS_11_H
 #define IN_1_WKS_11_H 1
 
-/* $Id: wks_11.h,v 1.22 2007/06/19 23:47:17 tbox Exp $ */
 
 typedef	struct dns_rdata_in_wks {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/rdatastructpre.h b/lib/dns/rdata/rdatastructpre.h
index 4208772e6a0..d09cb27a01a 100644
--- a/lib/dns/rdata/rdatastructpre.h
+++ b/lib/dns/rdata/rdatastructpre.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: rdatastructpre.h,v 1.16 2007/06/19 23:47:17 tbox Exp $ */
 
 #ifndef DNS_RDATASTRUCT_H
 #define DNS_RDATASTRUCT_H 1
diff --git a/lib/dns/rdata/rdatastructsuf.h b/lib/dns/rdata/rdatastructsuf.h
index 3a15671ec09..d3a8e46b464 100644
--- a/lib/dns/rdata/rdatastructsuf.h
+++ b/lib/dns/rdata/rdatastructsuf.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: rdatastructsuf.h,v 1.10 2007/06/19 23:47:17 tbox Exp $ */
 
 ISC_LANG_ENDDECLS
 
diff --git a/lib/dns/rdatalist.c b/lib/dns/rdatalist.c
index 2e9752389d2..51f3dbb148a 100644
--- a/lib/dns/rdatalist.c
+++ b/lib/dns/rdatalist.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/rdatalist_p.h b/lib/dns/rdatalist_p.h
index 969fe96b654..766b826a085 100644
--- a/lib/dns/rdatalist_p.h
+++ b/lib/dns/rdatalist_p.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: rdatalist_p.h,v 1.11 2008/09/25 04:02:38 tbox Exp $ */
 
 #ifndef DNS_RDATALIST_P_H
 #define DNS_RDATALIST_P_H
diff --git a/lib/dns/rdatasetiter.c b/lib/dns/rdatasetiter.c
index 4c8177a6980..c292ef22e92 100644
--- a/lib/dns/rdatasetiter.c
+++ b/lib/dns/rdatasetiter.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: rdatasetiter.c,v 1.16 2007/06/19 23:47:16 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/rdataslab.c b/lib/dns/rdataslab.c
index 6ce2122c557..3df852e4254 100644
--- a/lib/dns/rdataslab.c
+++ b/lib/dns/rdataslab.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/request.c b/lib/dns/request.c
index 82e5a80da2b..679013dc1e4 100644
--- a/lib/dns/request.c
+++ b/lib/dns/request.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/rootns.c b/lib/dns/rootns.c
index 5a7b624ff35..3c1e7545580 100644
--- a/lib/dns/rootns.c
+++ b/lib/dns/rootns.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: rootns.c,v 1.40.476.1 2012/02/07 00:44:14 each Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/rriterator.c b/lib/dns/rriterator.c
index 694cc0cbde0..f8bc7ff09e7 100644
--- a/lib/dns/rriterator.c
+++ b/lib/dns/rriterator.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/soa.c b/lib/dns/soa.c
index 6a11c69b856..c5dc4553cdf 100644
--- a/lib/dns/soa.c
+++ b/lib/dns/soa.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: soa.c,v 1.12 2009/09/10 02:18:40 each Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/spnego.asn1 b/lib/dns/spnego.asn1
index 43d152bd4fc..abf9b76bba3 100644
--- a/lib/dns/spnego.asn1
+++ b/lib/dns/spnego.asn1
@@ -4,8 +4,6 @@
 
 -- (The above copyright notice is per RFC 3978 5.6 (a), q.v.)
 
--- $Id: spnego.asn1,v 1.2 2006/12/04 01:52:46 marka Exp $
-
 -- This is the SPNEGO ASN.1 module from RFC 4178, tweaked
 -- to get the Heimdal ASN.1 compiler to accept it.
 
diff --git a/lib/dns/spnego.h b/lib/dns/spnego.h
index 1c057b33162..31187209d00 100644
--- a/lib/dns/spnego.h
+++ b/lib/dns/spnego.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: spnego.h,v 1.4 2007/06/19 23:47:16 tbox Exp $ */
 
 /*! \file
  * \brief
diff --git a/lib/dns/spnego_asn1.c b/lib/dns/spnego_asn1.c
index 73180d0c49d..6fbce55b8ff 100644
--- a/lib/dns/spnego_asn1.c
+++ b/lib/dns/spnego_asn1.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: spnego_asn1.c,v 1.4 2007/06/19 23:47:16 tbox Exp $ */
 
 /*! \file
  * \brief Method routines generated from SPNEGO ASN.1 module.
diff --git a/lib/dns/spnego_asn1.pl b/lib/dns/spnego_asn1.pl
index b8bc9a12e82..66f7b731b85 100644
--- a/lib/dns/spnego_asn1.pl
+++ b/lib/dns/spnego_asn1.pl
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: spnego_asn1.pl,v 1.4 2007/06/19 23:47:16 tbox Exp $
-
 # Our SPNEGO implementation uses some functions generated by the
 # Heimdal ASN.1 compiler, which this script then whacks a bit to make
 # them work properly in this stripped down implementation.  We don't
diff --git a/lib/dns/ssu.c b/lib/dns/ssu.c
index baa7e8f390e..6b7aca1fe59 100644
--- a/lib/dns/ssu.c
+++ b/lib/dns/ssu.c
@@ -10,9 +10,6 @@
  */
 
 /*! \file */
-/*
- * Principal Author: Brian Wellington
- */
 
 #include <config.h>
 
diff --git a/lib/dns/ssu_external.c b/lib/dns/ssu_external.c
index 6ecf13dcbd4..55e021d676a 100644
--- a/lib/dns/ssu_external.c
+++ b/lib/dns/ssu_external.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*
  * This implements external update-policy rules.  This allows permission
diff --git a/lib/dns/stats.c b/lib/dns/stats.c
index 7cda902fa94..c0d332c4527 100644
--- a/lib/dns/stats.c
+++ b/lib/dns/stats.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: stats.c,v 1.18 2009/01/27 23:47:54 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/tcpmsg.c b/lib/dns/tcpmsg.c
index 050e6a01283..bf40d300454 100644
--- a/lib/dns/tcpmsg.c
+++ b/lib/dns/tcpmsg.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: tcpmsg.c,v 1.31 2007/06/19 23:47:16 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/tests/acl_test.c b/lib/dns/tests/acl_test.c
index e4b338117b4..acf29570d6d 100644
--- a/lib/dns/tests/acl_test.c
+++ b/lib/dns/tests/acl_test.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/tests/dbdiff_test.c b/lib/dns/tests/dbdiff_test.c
index 1acda0eded8..530952c1d4c 100644
--- a/lib/dns/tests/dbdiff_test.c
+++ b/lib/dns/tests/dbdiff_test.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/tests/dbiterator_test.c b/lib/dns/tests/dbiterator_test.c
index 7834a42b85b..dd5c9d15adb 100644
--- a/lib/dns/tests/dbiterator_test.c
+++ b/lib/dns/tests/dbiterator_test.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/tests/dbversion_test.c b/lib/dns/tests/dbversion_test.c
index d49a220b07f..d25b68759f8 100644
--- a/lib/dns/tests/dbversion_test.c
+++ b/lib/dns/tests/dbversion_test.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/tests/dh_test.c b/lib/dns/tests/dh_test.c
index b392a7e940c..9fa20ce7b76 100644
--- a/lib/dns/tests/dh_test.c
+++ b/lib/dns/tests/dh_test.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /* ! \file */
 
diff --git a/lib/dns/tests/geoip_test.c b/lib/dns/tests/geoip_test.c
index 4053d6e1eff..ee3e7be28d8 100644
--- a/lib/dns/tests/geoip_test.c
+++ b/lib/dns/tests/geoip_test.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/tests/gost_test.c b/lib/dns/tests/gost_test.c
index fe15626d2c8..1246575af5e 100644
--- a/lib/dns/tests/gost_test.c
+++ b/lib/dns/tests/gost_test.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /* ! \file */
 
diff --git a/lib/dns/tests/master_test.c b/lib/dns/tests/master_test.c
index 9beda1aaf29..2f33890afd5 100644
--- a/lib/dns/tests/master_test.c
+++ b/lib/dns/tests/master_test.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/tests/mkraw.pl b/lib/dns/tests/mkraw.pl
index 23ee6f69a71..9791adc1e4c 100644
--- a/lib/dns/tests/mkraw.pl
+++ b/lib/dns/tests/mkraw.pl
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id$
-
 # Convert a hexdump to binary format.
 #
 # To convert binary data to the input format for this command,
diff --git a/lib/dns/tests/nsec3_test.c b/lib/dns/tests/nsec3_test.c
index 51f57fdd59e..0c4d0841cc2 100644
--- a/lib/dns/tests/nsec3_test.c
+++ b/lib/dns/tests/nsec3_test.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/tests/private_test.c b/lib/dns/tests/private_test.c
index e4d9bebd4e9..1dd1f05cb86 100644
--- a/lib/dns/tests/private_test.c
+++ b/lib/dns/tests/private_test.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/tests/rbt_serialize_test.c b/lib/dns/tests/rbt_serialize_test.c
index 2d34424b844..11923f8639e 100644
--- a/lib/dns/tests/rbt_serialize_test.c
+++ b/lib/dns/tests/rbt_serialize_test.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: rbt_test.c,v 1.1.14.8 2012/02/10 16:24:37 ckb Exp $ */
 
 /* ! \file */
 
diff --git a/lib/dns/tests/rdataset_test.c b/lib/dns/tests/rdataset_test.c
index 4cee39ed111..55531e86ffd 100644
--- a/lib/dns/tests/rdataset_test.c
+++ b/lib/dns/tests/rdataset_test.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/tests/rdatasetstats_test.c b/lib/dns/tests/rdatasetstats_test.c
index 5672d95bed8..d3584c8bf62 100644
--- a/lib/dns/tests/rdatasetstats_test.c
+++ b/lib/dns/tests/rdatasetstats_test.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/tests/rsa_test.c b/lib/dns/tests/rsa_test.c
index 65ecd1212d8..db48e8cd97e 100644
--- a/lib/dns/tests/rsa_test.c
+++ b/lib/dns/tests/rsa_test.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /* ! \file */
 
diff --git a/lib/dns/tests/testdata/dbiterator/zone1.data b/lib/dns/tests/testdata/dbiterator/zone1.data
index 1c1853576e7..81c0abec6e8 100644
--- a/lib/dns/tests/testdata/dbiterator/zone1.data
+++ b/lib/dns/tests/testdata/dbiterator/zone1.data
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
 $TTL 600
 @		in	soa	localhost. postmaster.localhost. (
 				2011080901	;serial
diff --git a/lib/dns/tests/testdata/diff/zone1.data b/lib/dns/tests/testdata/diff/zone1.data
index 15585b0bb8a..6eb87abc7ea 100644
--- a/lib/dns/tests/testdata/diff/zone1.data
+++ b/lib/dns/tests/testdata/diff/zone1.data
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
 @ 	0	SOA . . 0 0 0 0 0
 @	0	NS @
 @	0	A 1.2.3.4
diff --git a/lib/dns/tests/testdata/diff/zone2.data b/lib/dns/tests/testdata/diff/zone2.data
index 95bdf5d19a2..d57d58671c6 100644
--- a/lib/dns/tests/testdata/diff/zone2.data
+++ b/lib/dns/tests/testdata/diff/zone2.data
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
 @ 	0	SOA . . 0 0 0 0 0
 @	0	NS @
 @	0	A 1.2.3.4
diff --git a/lib/dns/tests/testdata/diff/zone3.data b/lib/dns/tests/testdata/diff/zone3.data
index 9ecf156d88e..65f12dd37f7 100644
--- a/lib/dns/tests/testdata/diff/zone3.data
+++ b/lib/dns/tests/testdata/diff/zone3.data
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
 @ 	0	SOA . . 0 0 0 0 0
 @	0	NS @
 @	0	A 1.2.3.4
diff --git a/lib/dns/tests/testdata/nsec3/1024.db b/lib/dns/tests/testdata/nsec3/1024.db
index fe6dbb1f814..2e7f1821ace 100644
--- a/lib/dns/tests/testdata/nsec3/1024.db
+++ b/lib/dns/tests/testdata/nsec3/1024.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
 $TTL 0
 test. SOA . . 0 0 0 0 0
 test. NS .
diff --git a/lib/dns/tests/testdata/nsec3/2048.db b/lib/dns/tests/testdata/nsec3/2048.db
index cd52a6c26ef..eed399af570 100644
--- a/lib/dns/tests/testdata/nsec3/2048.db
+++ b/lib/dns/tests/testdata/nsec3/2048.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
 $TTL 0
 test. SOA . . 0 0 0 0 0
 test. NS .
diff --git a/lib/dns/tests/testdata/nsec3/4096.db b/lib/dns/tests/testdata/nsec3/4096.db
index 1996e02e57f..b5c8b7e4644 100644
--- a/lib/dns/tests/testdata/nsec3/4096.db
+++ b/lib/dns/tests/testdata/nsec3/4096.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
 $TTL 0
 test. SOA . . 0 0 0 0 0
 test. NS .
diff --git a/lib/dns/tests/testdata/nsec3/min-1024.db b/lib/dns/tests/testdata/nsec3/min-1024.db
index 310bc9ad545..7d0f95c595a 100644
--- a/lib/dns/tests/testdata/nsec3/min-1024.db
+++ b/lib/dns/tests/testdata/nsec3/min-1024.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
 $TTL 0
 test. SOA . . 0 0 0 0 0
 test. NS .
diff --git a/lib/dns/tests/testdata/nsec3/min-2048.db b/lib/dns/tests/testdata/nsec3/min-2048.db
index fd5fb4e96ab..027c0b9ba9c 100644
--- a/lib/dns/tests/testdata/nsec3/min-2048.db
+++ b/lib/dns/tests/testdata/nsec3/min-2048.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
 $TTL 0
 test. SOA . . 0 0 0 0 0
 test. NS .
diff --git a/lib/dns/tests/testdata/zt/zone1.db b/lib/dns/tests/testdata/zt/zone1.db
index 1d3e7cbe42d..8286d8833e3 100644
--- a/lib/dns/tests/testdata/zt/zone1.db
+++ b/lib/dns/tests/testdata/zt/zone1.db
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id$
-
 $TTL 1000
 @		in	soa	localhost. postmaster.localhost. (
 				1993050801	;serial
diff --git a/lib/dns/tests/time_test.c b/lib/dns/tests/time_test.c
index c2b6ed029ee..e4527938ada 100644
--- a/lib/dns/tests/time_test.c
+++ b/lib/dns/tests/time_test.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/tests/update_test.c b/lib/dns/tests/update_test.c
index 36605a15aef..fbf155bc8df 100644
--- a/lib/dns/tests/update_test.c
+++ b/lib/dns/tests/update_test.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/tests/zonemgr_test.c b/lib/dns/tests/zonemgr_test.c
index 4cad7366a49..6189d679d76 100644
--- a/lib/dns/tests/zonemgr_test.c
+++ b/lib/dns/tests/zonemgr_test.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/time.c b/lib/dns/time.c
index 180ae0dc5ec..ea3b389e63b 100644
--- a/lib/dns/time.c
+++ b/lib/dns/time.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/timer.c b/lib/dns/timer.c
index 340bfe18257..92874653087 100644
--- a/lib/dns/timer.c
+++ b/lib/dns/timer.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: timer.c,v 1.7 2007/06/19 23:47:16 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/ttl.c b/lib/dns/ttl.c
index 557058ea16b..a8d96a4cc5b 100644
--- a/lib/dns/ttl.c
+++ b/lib/dns/ttl.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/version.c b/lib/dns/version.c
index 24b6f199ad8..68ae7fe2918 100644
--- a/lib/dns/version.c
+++ b/lib/dns/version.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: version.c,v 1.15.1234.1 2012/02/11 22:37:57 each Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/win32/DLLMain.c b/lib/dns/win32/DLLMain.c
index 005df49d254..8ff101757d0 100644
--- a/lib/dns/win32/DLLMain.c
+++ b/lib/dns/win32/DLLMain.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: DLLMain.c,v 1.6 2007/06/18 23:47:44 tbox Exp $ */
 
 #include <windows.h>
 #include <signal.h>
diff --git a/lib/dns/win32/version.c b/lib/dns/win32/version.c
index 10f1d1034f7..852f70e81b5 100644
--- a/lib/dns/win32/version.c
+++ b/lib/dns/win32/version.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: version.c,v 1.6 2007/06/19 23:47:17 tbox Exp $ */
 
 #include <versions.h>
 
diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c
index 0a970da2014..986d6234d0f 100644
--- a/lib/dns/xfrin.c
+++ b/lib/dns/xfrin.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/zonekey.c b/lib/dns/zonekey.c
index 89efd39f69a..bdb71dc5c61 100644
--- a/lib/dns/zonekey.c
+++ b/lib/dns/zonekey.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: zonekey.c,v 1.9 2007/06/19 23:47:16 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/dns/zt.c b/lib/dns/zt.c
index 42787f5fca6..f5d80367c38 100644
--- a/lib/dns/zt.c
+++ b/lib/dns/zt.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/irs/Makefile.in b/lib/irs/Makefile.in
index 8970aad0410..fc114472df0 100644
--- a/lib/irs/Makefile.in
+++ b/lib/irs/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.3 2009/09/02 23:48:02 tbox Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/irs/context.c b/lib/irs/context.c
index f53b42d651a..7d3fbd3743d 100644
--- a/lib/irs/context.c
+++ b/lib/irs/context.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: context.c,v 1.3 2009/09/02 23:48:02 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/lib/irs/dnsconf.c b/lib/irs/dnsconf.c
index 2111237603f..401c23aa90d 100644
--- a/lib/irs/dnsconf.c
+++ b/lib/irs/dnsconf.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: dnsconf.c,v 1.3 2009/09/02 23:48:02 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/irs/gai_strerror.c b/lib/irs/gai_strerror.c
index d42b06e3ffe..76a561eee10 100644
--- a/lib/irs/gai_strerror.c
+++ b/lib/irs/gai_strerror.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: gai_strerror.c,v 1.5 2009/09/02 23:48:02 tbox Exp $ */
 
 /*! \file gai_strerror.c
  * gai_strerror() returns an error message corresponding to an
diff --git a/lib/irs/include/Makefile.in b/lib/irs/include/Makefile.in
index 030539f95b7..36013315d2c 100644
--- a/lib/irs/include/Makefile.in
+++ b/lib/irs/include/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.3 2009/09/02 23:48:02 tbox Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/irs/include/irs/Makefile.in b/lib/irs/include/irs/Makefile.in
index af65f55dd40..630dccaec49 100644
--- a/lib/irs/include/irs/Makefile.in
+++ b/lib/irs/include/irs/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.3 2009/09/02 23:48:02 tbox Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/irs/include/irs/context.h b/lib/irs/include/irs/context.h
index cc9a4d2f2a0..94e55c61a9f 100644
--- a/lib/irs/include/irs/context.h
+++ b/lib/irs/include/irs/context.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: context.h,v 1.3 2009/09/02 23:48:02 tbox Exp $ */
 
 #ifndef IRS_CONTEXT_H
 #define IRS_CONTEXT_H 1
diff --git a/lib/irs/include/irs/dnsconf.h b/lib/irs/include/irs/dnsconf.h
index 9013378a834..89898bafbcc 100644
--- a/lib/irs/include/irs/dnsconf.h
+++ b/lib/irs/include/irs/dnsconf.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: dnsconf.h,v 1.3 2009/09/02 23:48:02 tbox Exp $ */
 
 #ifndef IRS_DNSCONF_H
 #define IRS_DNSCONF_H 1
diff --git a/lib/irs/include/irs/netdb.h.in b/lib/irs/include/irs/netdb.h.in
index 556fe31427f..8806045ec26 100644
--- a/lib/irs/include/irs/netdb.h.in
+++ b/lib/irs/include/irs/netdb.h.in
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: netdb.h.in,v 1.3 2009/09/02 23:48:02 tbox Exp $ */
-
 /*! \file */
 
 #ifndef IRS_NETDB_H
diff --git a/lib/irs/include/irs/platform.h.in b/lib/irs/include/irs/platform.h.in
index d71d20214ab..78c91ce1447 100644
--- a/lib/irs/include/irs/platform.h.in
+++ b/lib/irs/include/irs/platform.h.in
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: platform.h.in,v 1.3 2009/09/02 23:48:02 tbox Exp $ */
-
 /*! \file */
 
 #ifndef IRS_PLATFORM_H
diff --git a/lib/irs/include/irs/resconf.h b/lib/irs/include/irs/resconf.h
index a70fe9238cf..6c0a8cce084 100644
--- a/lib/irs/include/irs/resconf.h
+++ b/lib/irs/include/irs/resconf.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: resconf.h,v 1.3 2009/09/02 23:48:02 tbox Exp $ */
 
 #ifndef IRS_RESCONF_H
 #define IRS_RESCONF_H 1
diff --git a/lib/irs/include/irs/types.h b/lib/irs/include/irs/types.h
index 60244e5f94c..1251e68b185 100644
--- a/lib/irs/include/irs/types.h
+++ b/lib/irs/include/irs/types.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: types.h,v 1.3 2009/09/02 23:48:02 tbox Exp $ */
 
 #ifndef IRS_TYPES_H
 #define IRS_TYPES_H 1
diff --git a/lib/irs/include/irs/version.h b/lib/irs/include/irs/version.h
index 641e5f1f73d..a0493746783 100644
--- a/lib/irs/include/irs/version.h
+++ b/lib/irs/include/irs/version.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: version.h,v 1.3 2009/09/02 23:48:02 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/irs/resconf.c b/lib/irs/resconf.c
index 55a50979cf6..57fe5a7dd5d 100644
--- a/lib/irs/resconf.c
+++ b/lib/irs/resconf.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file resconf.c */
 
diff --git a/lib/irs/version.c b/lib/irs/version.c
index c280e128063..4e33c7712e6 100644
--- a/lib/irs/version.c
+++ b/lib/irs/version.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: version.c,v 1.3 2009/09/02 23:48:02 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/irs/win32/DLLMain.c b/lib/irs/win32/DLLMain.c
index 03246be49bc..8ff101757d0 100644
--- a/lib/irs/win32/DLLMain.c
+++ b/lib/irs/win32/DLLMain.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #include <windows.h>
 #include <signal.h>
diff --git a/lib/irs/win32/Makefile.in b/lib/irs/win32/Makefile.in
index f352fcf04dd..419cf9f8755 100644
--- a/lib/irs/win32/Makefile.in
+++ b/lib/irs/win32/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id$
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/irs/win32/include/Makefile.in b/lib/irs/win32/include/Makefile.in
index e1a4542888e..36013315d2c 100644
--- a/lib/irs/win32/include/Makefile.in
+++ b/lib/irs/win32/include/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id$
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/irs/win32/include/irs/Makefile.in b/lib/irs/win32/include/irs/Makefile.in
index 7adf79c3ca7..0e3925e7812 100644
--- a/lib/irs/win32/include/irs/Makefile.in
+++ b/lib/irs/win32/include/irs/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id$
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/irs/win32/include/irs/netdb.h b/lib/irs/win32/include/irs/netdb.h
index 3fe7d399e67..77865d7417c 100644
--- a/lib/irs/win32/include/irs/netdb.h
+++ b/lib/irs/win32/include/irs/netdb.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/irs/win32/version.c b/lib/irs/win32/version.c
index 893545f4457..198e12d5dd7 100644
--- a/lib/irs/win32/version.c
+++ b/lib/irs/win32/version.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #include <versions.h>
 
diff --git a/lib/isc/aes.c b/lib/isc/aes.c
index b1ecdf47ffe..bf53df25296 100644
--- a/lib/isc/aes.c
+++ b/lib/isc/aes.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file isc/aes.c */
 
diff --git a/lib/isc/alpha/Makefile.in b/lib/isc/alpha/Makefile.in
index b5d0eed25f7..419cf9f8755 100644
--- a/lib/isc/alpha/Makefile.in
+++ b/lib/isc/alpha/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/alpha/include/Makefile.in b/lib/isc/alpha/include/Makefile.in
index 344085ee9fa..d33c0fcb2c9 100644
--- a/lib/isc/alpha/include/Makefile.in
+++ b/lib/isc/alpha/include/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/alpha/include/isc/Makefile.in b/lib/isc/alpha/include/isc/Makefile.in
index f164aa3c68c..9f87e48935a 100644
--- a/lib/isc/alpha/include/isc/Makefile.in
+++ b/lib/isc/alpha/include/isc/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/alpha/include/isc/atomic.h b/lib/isc/alpha/include/isc/atomic.h
index a01d39e3cb7..8d7c10fad84 100644
--- a/lib/isc/alpha/include/isc/atomic.h
+++ b/lib/isc/alpha/include/isc/atomic.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: atomic.h,v 1.7 2009/04/08 06:48:23 tbox Exp $ */
 
 /*
  * This code was written based on FreeBSD's kernel source whose copyright
diff --git a/lib/isc/app_api.c b/lib/isc/app_api.c
index 12dfa484297..5563c7cc0b7 100644
--- a/lib/isc/app_api.c
+++ b/lib/isc/app_api.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: app_api.c,v 1.5 2009/09/02 23:48:02 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/lib/isc/assertions.c b/lib/isc/assertions.c
index db4a31ab538..b52342eb613 100644
--- a/lib/isc/assertions.c
+++ b/lib/isc/assertions.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: assertions.c,v 1.26 2009/09/29 15:06:07 fdupont Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/backtrace-emptytbl.c b/lib/isc/backtrace-emptytbl.c
index d7dea914315..5822cfb1b56 100644
--- a/lib/isc/backtrace-emptytbl.c
+++ b/lib/isc/backtrace-emptytbl.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: backtrace-emptytbl.c,v 1.3 2009/09/01 20:13:44 each Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/backtrace.c b/lib/isc/backtrace.c
index 62c1d814458..b4fe3a5d715 100644
--- a/lib/isc/backtrace.c
+++ b/lib/isc/backtrace.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: backtrace.c,v 1.3 2009/09/02 23:48:02 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/base32.c b/lib/isc/base32.c
index da0f82a5185..edbb4db0120 100644
--- a/lib/isc/base32.c
+++ b/lib/isc/base32.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: base32.c,v 1.6.698.1 2012/02/15 05:00:16 marka Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/base64.c b/lib/isc/base64.c
index ac4f031a774..5dc49748015 100644
--- a/lib/isc/base64.c
+++ b/lib/isc/base64.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: base64.c,v 1.34 2009/10/21 23:48:05 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/bufferlist.c b/lib/isc/bufferlist.c
index d259e8506b7..f6ebdea635b 100644
--- a/lib/isc/bufferlist.c
+++ b/lib/isc/bufferlist.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: bufferlist.c,v 1.17 2007/06/19 23:47:17 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/commandline.c b/lib/isc/commandline.c
index 26e4d277202..69197bc93f6 100644
--- a/lib/isc/commandline.c
+++ b/lib/isc/commandline.c
@@ -38,7 +38,6 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: commandline.c,v 1.22 2008/09/25 04:02:39 tbox Exp $ */
 
 /*! \file
  * This file was adapted from the NetBSD project's source tree, RCS ID:
@@ -48,11 +47,6 @@
  * and format in the ISC coding style.
  */
 
-/*
- * \author Principal Authors: Computer Systems Research Group at UC Berkeley
- * \author Principal ISC caretaker: DCL
- */
-
 #include <config.h>
 
 #include <stdio.h>
diff --git a/lib/isc/entropy.c b/lib/isc/entropy.c
index 57d0a545381..a85650bdcec 100644
--- a/lib/isc/entropy.c
+++ b/lib/isc/entropy.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: entropy.c,v 1.22 2010/08/10 23:48:19 tbox Exp $ */
 
 /*! \file
  * \brief
diff --git a/lib/isc/error.c b/lib/isc/error.c
index efc436a1b43..b0fe500a418 100644
--- a/lib/isc/error.c
+++ b/lib/isc/error.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: error.c,v 1.21 2007/06/19 23:47:17 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/event.c b/lib/isc/event.c
index b4ecee131be..500b6fdcef6 100644
--- a/lib/isc/event.c
+++ b/lib/isc/event.c
@@ -9,11 +9,9 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: event.c,v 1.21 2007/06/19 23:47:17 tbox Exp $ */
 
 /*!
  * \file
- * \author Principal Author: Bob Halley
  */
 
 #include <config.h>
diff --git a/lib/isc/fsaccess.c b/lib/isc/fsaccess.c
index 525fb2d2a0c..296ada28b91 100644
--- a/lib/isc/fsaccess.c
+++ b/lib/isc/fsaccess.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: fsaccess.c,v 1.10 2007/06/19 23:47:17 tbox Exp $ */
 
 /*! \file
  * \brief
diff --git a/lib/isc/heap.c b/lib/isc/heap.c
index f694053dc77..3bd510fac91 100644
--- a/lib/isc/heap.c
+++ b/lib/isc/heap.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file
  * Heap implementation of priority queues adapted from the following:
diff --git a/lib/isc/hex.c b/lib/isc/hex.c
index 351ca8ceb9e..d9917681676 100644
--- a/lib/isc/hex.c
+++ b/lib/isc/hex.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: hex.c,v 1.20 2008/09/25 04:02:39 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/httpd.c b/lib/isc/httpd.c
index a5626874cf9..03b9e7c8037 100644
--- a/lib/isc/httpd.c
+++ b/lib/isc/httpd.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/ia64/Makefile.in b/lib/isc/ia64/Makefile.in
index b5d0eed25f7..419cf9f8755 100644
--- a/lib/isc/ia64/Makefile.in
+++ b/lib/isc/ia64/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/ia64/include/Makefile.in b/lib/isc/ia64/include/Makefile.in
index 344085ee9fa..d33c0fcb2c9 100644
--- a/lib/isc/ia64/include/Makefile.in
+++ b/lib/isc/ia64/include/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/ia64/include/isc/Makefile.in b/lib/isc/ia64/include/isc/Makefile.in
index f164aa3c68c..9f87e48935a 100644
--- a/lib/isc/ia64/include/isc/Makefile.in
+++ b/lib/isc/ia64/include/isc/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/ia64/include/isc/atomic.h b/lib/isc/ia64/include/isc/atomic.h
index 000f6e92ecf..361e46f0bb5 100644
--- a/lib/isc/ia64/include/isc/atomic.h
+++ b/lib/isc/ia64/include/isc/atomic.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: atomic.h,v 1.7 2009/06/24 02:22:50 marka Exp $ */
 
 #ifndef ISC_ATOMIC_H
 #define ISC_ATOMIC_H 1
diff --git a/lib/isc/include/Makefile.in b/lib/isc/include/Makefile.in
index b92f7081d6d..3b21e6e0b0f 100644
--- a/lib/isc/include/Makefile.in
+++ b/lib/isc/include/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.13 2007/06/19 23:47:18 tbox Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/include/isc/aes.h b/lib/isc/include/isc/aes.h
index 57a1c1d3f12..75f2a2b5525 100644
--- a/lib/isc/include/isc/aes.h
+++ b/lib/isc/include/isc/aes.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file isc/aes.h */
 
diff --git a/lib/isc/include/isc/app.h b/lib/isc/include/isc/app.h
index c7a4dace697..310adc7ec1f 100644
--- a/lib/isc/include/isc/app.h
+++ b/lib/isc/include/isc/app.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: app.h,v 1.11 2009/09/02 23:48:03 tbox Exp $ */
 
 #ifndef ISC_APP_H
 #define ISC_APP_H 1
diff --git a/lib/isc/include/isc/assertions.h b/lib/isc/include/isc/assertions.h
index 9c2635fc1f1..e5719d98d77 100644
--- a/lib/isc/include/isc/assertions.h
+++ b/lib/isc/include/isc/assertions.h
@@ -9,9 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/*
- * $Id: assertions.h,v 1.28 2009/09/29 23:48:04 tbox Exp $
- */
 /*! \file isc/assertions.h
  */
 
diff --git a/lib/isc/include/isc/backtrace.h b/lib/isc/include/isc/backtrace.h
index 02d85a5f921..27ab9da6b97 100644
--- a/lib/isc/include/isc/backtrace.h
+++ b/lib/isc/include/isc/backtrace.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: backtrace.h,v 1.2 2009/09/01 18:40:25 jinmei Exp $ */
 
 /*! \file isc/backtrace.h
  * \brief provide a back trace of the running process to help debug problems.
diff --git a/lib/isc/include/isc/base64.h b/lib/isc/include/isc/base64.h
index c8660ab5d6d..1504d3d4971 100644
--- a/lib/isc/include/isc/base64.h
+++ b/lib/isc/include/isc/base64.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: base64.h,v 1.22 2007/06/19 23:47:18 tbox Exp $ */
 
 #ifndef ISC_BASE64_H
 #define ISC_BASE64_H 1
diff --git a/lib/isc/include/isc/bind9.h b/lib/isc/include/isc/bind9.h
index b2492bdaa8f..7edd7c070c9 100644
--- a/lib/isc/include/isc/bind9.h
+++ b/lib/isc/include/isc/bind9.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: bind9.h,v 1.2 2009/12/05 23:31:41 each Exp $ */
 
 #ifndef ISC_BIND9_H
 #define ISC_BIND9_H 1
diff --git a/lib/isc/include/isc/bufferlist.h b/lib/isc/include/isc/bufferlist.h
index 09208885f35..ffb4986f899 100644
--- a/lib/isc/include/isc/bufferlist.h
+++ b/lib/isc/include/isc/bufferlist.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: bufferlist.h,v 1.17 2007/06/19 23:47:18 tbox Exp $ */
 
 #ifndef ISC_BUFFERLIST_H
 #define ISC_BUFFERLIST_H 1
diff --git a/lib/isc/include/isc/commandline.h b/lib/isc/include/isc/commandline.h
index a51dc9a993c..480629f6ebe 100644
--- a/lib/isc/include/isc/commandline.h
+++ b/lib/isc/include/isc/commandline.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #ifndef ISC_COMMANDLINE_H
 #define ISC_COMMANDLINE_H 1
diff --git a/lib/isc/include/isc/error.h b/lib/isc/include/isc/error.h
index bd785403d71..87bb6baedea 100644
--- a/lib/isc/include/isc/error.h
+++ b/lib/isc/include/isc/error.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: error.h,v 1.22 2009/09/29 23:48:04 tbox Exp $ */
 
 #ifndef ISC_ERROR_H
 #define ISC_ERROR_H 1
diff --git a/lib/isc/include/isc/event.h b/lib/isc/include/isc/event.h
index 0bc2c7c4c09..99d867cd5a3 100644
--- a/lib/isc/include/isc/event.h
+++ b/lib/isc/include/isc/event.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: event.h,v 1.34 2007/06/19 23:47:18 tbox Exp $ */
 
 #ifndef ISC_EVENT_H
 #define ISC_EVENT_H 1
diff --git a/lib/isc/include/isc/eventclass.h b/lib/isc/include/isc/eventclass.h
index b37750e5907..905181e0e65 100644
--- a/lib/isc/include/isc/eventclass.h
+++ b/lib/isc/include/isc/eventclass.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: eventclass.h,v 1.18 2007/06/19 23:47:18 tbox Exp $ */
 
 #ifndef ISC_EVENTCLASS_H
 #define ISC_EVENTCLASS_H 1
diff --git a/lib/isc/include/isc/file.h b/lib/isc/include/isc/file.h
index fc7a71f57ec..d19e4e8b827 100644
--- a/lib/isc/include/isc/file.h
+++ b/lib/isc/include/isc/file.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #ifndef ISC_FILE_H
 #define ISC_FILE_H 1
diff --git a/lib/isc/include/isc/formatcheck.h b/lib/isc/include/isc/formatcheck.h
index 6778bc6854f..162c16e3c16 100644
--- a/lib/isc/include/isc/formatcheck.h
+++ b/lib/isc/include/isc/formatcheck.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: formatcheck.h,v 1.13 2007/06/19 23:47:18 tbox Exp $ */
 
 #ifndef ISC_FORMATCHECK_H
 #define ISC_FORMATCHECK_H 1
diff --git a/lib/isc/include/isc/fsaccess.h b/lib/isc/include/isc/fsaccess.h
index 3d4ed7785aa..50fd013832f 100644
--- a/lib/isc/include/isc/fsaccess.h
+++ b/lib/isc/include/isc/fsaccess.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: fsaccess.h,v 1.16 2009/01/17 23:47:43 tbox Exp $ */
 
 #ifndef ISC_FSACCESS_H
 #define ISC_FSACCESS_H 1
diff --git a/lib/isc/include/isc/heap.h b/lib/isc/include/isc/heap.h
index 589232ce030..77b3d36ea82 100644
--- a/lib/isc/include/isc/heap.h
+++ b/lib/isc/include/isc/heap.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: heap.h,v 1.26 2009/01/17 23:47:43 tbox Exp $ */
 
 #ifndef ISC_HEAP_H
 #define ISC_HEAP_H 1
diff --git a/lib/isc/include/isc/hex.h b/lib/isc/include/isc/hex.h
index 22999521c38..3e09e59d3aa 100644
--- a/lib/isc/include/isc/hex.h
+++ b/lib/isc/include/isc/hex.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: hex.h,v 1.13 2008/09/25 04:02:39 tbox Exp $ */
 
 #ifndef ISC_HEX_H
 #define ISC_HEX_H 1
diff --git a/lib/isc/include/isc/hmacmd5.h b/lib/isc/include/isc/hmacmd5.h
index 31195e3a0ba..35207e4c302 100644
--- a/lib/isc/include/isc/hmacmd5.h
+++ b/lib/isc/include/isc/hmacmd5.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: hmacmd5.h,v 1.14 2009/02/06 23:47:42 tbox Exp $ */
 
 /*! \file isc/hmacmd5.h
  * \brief This is the header file for the HMAC-MD5 keyed hash algorithm
diff --git a/lib/isc/include/isc/hmacsha.h b/lib/isc/include/isc/hmacsha.h
index 78588c32f09..d5746130d8a 100644
--- a/lib/isc/include/isc/hmacsha.h
+++ b/lib/isc/include/isc/hmacsha.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: hmacsha.h,v 1.9 2009/02/06 23:47:42 tbox Exp $ */
 
 /*! \file isc/hmacsha.h
  * This is the header file for the HMAC-SHA1, HMAC-SHA224, HMAC-SHA256,
diff --git a/lib/isc/include/isc/httpd.h b/lib/isc/include/isc/httpd.h
index 7d93c4ceecd..f8726085374 100644
--- a/lib/isc/include/isc/httpd.h
+++ b/lib/isc/include/isc/httpd.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: httpd.h,v 1.9 2008/08/08 05:06:49 marka Exp $ */
 
 #ifndef ISC_HTTPD_H
 #define ISC_HTTPD_H 1
diff --git a/lib/isc/include/isc/interfaceiter.h b/lib/isc/include/isc/interfaceiter.h
index 7f5d184244c..98476863e30 100644
--- a/lib/isc/include/isc/interfaceiter.h
+++ b/lib/isc/include/isc/interfaceiter.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: interfaceiter.h,v 1.17 2007/06/19 23:47:18 tbox Exp $ */
 
 #ifndef ISC_INTERFACEITER_H
 #define ISC_INTERFACEITER_H 1
diff --git a/lib/isc/include/isc/iterated_hash.h b/lib/isc/include/isc/iterated_hash.h
index 0491d5ed462..a43ae69d45b 100644
--- a/lib/isc/include/isc/iterated_hash.h
+++ b/lib/isc/include/isc/iterated_hash.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: iterated_hash.h,v 1.3 2008/09/25 04:02:39 tbox Exp $ */
 
 #ifndef ISC_ITERATED_HASH_H
 #define ISC_ITERATED_HASH_H 1
diff --git a/lib/isc/include/isc/lang.h b/lib/isc/include/isc/lang.h
index cfae1f9b5a1..bffcbac07e4 100644
--- a/lib/isc/include/isc/lang.h
+++ b/lib/isc/include/isc/lang.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: lang.h,v 1.13 2007/06/19 23:47:18 tbox Exp $ */
 
 #ifndef ISC_LANG_H
 #define ISC_LANG_H 1
diff --git a/lib/isc/include/isc/lex.h b/lib/isc/include/isc/lex.h
index 51f23c1e417..e0925804736 100644
--- a/lib/isc/include/isc/lex.h
+++ b/lib/isc/include/isc/lex.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: lex.h,v 1.37 2008/05/30 23:47:01 tbox Exp $ */
 
 #ifndef ISC_LEX_H
 #define ISC_LEX_H 1
diff --git a/lib/isc/include/isc/lfsr.h b/lib/isc/include/isc/lfsr.h
index d2d46874c2e..500ed8aa127 100644
--- a/lib/isc/include/isc/lfsr.h
+++ b/lib/isc/include/isc/lfsr.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: lfsr.h,v 1.17 2007/06/19 23:47:18 tbox Exp $ */
 
 #ifndef ISC_LFSR_H
 #define ISC_LFSR_H 1
diff --git a/lib/isc/include/isc/lib.h b/lib/isc/include/isc/lib.h
index e40552b75a8..55ef20a4577 100644
--- a/lib/isc/include/isc/lib.h
+++ b/lib/isc/include/isc/lib.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: lib.h,v 1.16 2009/09/02 23:48:03 tbox Exp $ */
 
 #ifndef ISC_LIB_H
 #define ISC_LIB_H 1
diff --git a/lib/isc/include/isc/list.h b/lib/isc/include/isc/list.h
index 6bbdd4c0849..955a175d7f9 100644
--- a/lib/isc/include/isc/list.h
+++ b/lib/isc/include/isc/list.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #ifndef ISC_LIST_H
 #define ISC_LIST_H 1
diff --git a/lib/isc/include/isc/log.h b/lib/isc/include/isc/log.h
index 8b3eee0b6c1..f3f9e507f61 100644
--- a/lib/isc/include/isc/log.h
+++ b/lib/isc/include/isc/log.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: log.h,v 1.59 2009/02/16 02:01:16 marka Exp $ */
 
 #ifndef ISC_LOG_H
 #define ISC_LOG_H 1
diff --git a/lib/isc/include/isc/magic.h b/lib/isc/include/isc/magic.h
index fef2915b233..c342d0cd8e4 100644
--- a/lib/isc/include/isc/magic.h
+++ b/lib/isc/include/isc/magic.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: magic.h,v 1.18 2007/06/19 23:47:18 tbox Exp $ */
 
 #ifndef ISC_MAGIC_H
 #define ISC_MAGIC_H 1
diff --git a/lib/isc/include/isc/md5.h b/lib/isc/include/isc/md5.h
index f5ab832d1c2..e5f46dd9c76 100644
--- a/lib/isc/include/isc/md5.h
+++ b/lib/isc/include/isc/md5.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: md5.h,v 1.20 2010/01/07 23:48:54 tbox Exp $ */
 
 /*! \file isc/md5.h
  * \brief This is the header file for the MD5 message-digest algorithm.
diff --git a/lib/isc/include/isc/msgcat.h b/lib/isc/include/isc/msgcat.h
index e51b9e4a009..3b533d6e97a 100644
--- a/lib/isc/include/isc/msgcat.h
+++ b/lib/isc/include/isc/msgcat.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: msgcat.h,v 1.13 2007/06/19 23:47:18 tbox Exp $ */
 
 #ifndef ISC_MSGCAT_H
 #define ISC_MSGCAT_H 1
diff --git a/lib/isc/include/isc/msgs.h b/lib/isc/include/isc/msgs.h
index b737444a34f..01e3b48199a 100644
--- a/lib/isc/include/isc/msgs.h
+++ b/lib/isc/include/isc/msgs.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: msgs.h,v 1.19 2009/10/01 23:48:08 tbox Exp $ */
 
 #ifndef ISC_MSGS_H
 #define ISC_MSGS_H 1
diff --git a/lib/isc/include/isc/mutexblock.h b/lib/isc/include/isc/mutexblock.h
index c66b74d6679..f00088dbc67 100644
--- a/lib/isc/include/isc/mutexblock.h
+++ b/lib/isc/include/isc/mutexblock.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: mutexblock.h,v 1.17 2007/06/19 23:47:18 tbox Exp $ */
 
 #ifndef ISC_MUTEXBLOCK_H
 #define ISC_MUTEXBLOCK_H 1
diff --git a/lib/isc/include/isc/netaddr.h b/lib/isc/include/isc/netaddr.h
index b21845ab0b5..3376cdec585 100644
--- a/lib/isc/include/isc/netaddr.h
+++ b/lib/isc/include/isc/netaddr.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: netaddr.h,v 1.37 2009/01/17 23:47:43 tbox Exp $ */
 
 #ifndef ISC_NETADDR_H
 #define ISC_NETADDR_H 1
diff --git a/lib/isc/include/isc/netscope.h b/lib/isc/include/isc/netscope.h
index 57f4b6f46ef..681aafc4c9a 100644
--- a/lib/isc/include/isc/netscope.h
+++ b/lib/isc/include/isc/netscope.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: netscope.h,v 1.13 2009/06/25 23:48:02 tbox Exp $ */
 
 #ifndef ISC_NETSCOPE_H
 #define ISC_NETSCOPE_H 1
diff --git a/lib/isc/include/isc/os.h b/lib/isc/include/isc/os.h
index e4eb485b385..eb8223e9252 100644
--- a/lib/isc/include/isc/os.h
+++ b/lib/isc/include/isc/os.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: os.h,v 1.12 2007/06/19 23:47:18 tbox Exp $ */
 
 #ifndef ISC_OS_H
 #define ISC_OS_H 1
diff --git a/lib/isc/include/isc/parseint.h b/lib/isc/include/isc/parseint.h
index d4067ccc573..2c604d549fa 100644
--- a/lib/isc/include/isc/parseint.h
+++ b/lib/isc/include/isc/parseint.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: parseint.h,v 1.9 2007/06/19 23:47:18 tbox Exp $ */
 
 #ifndef ISC_PARSEINT_H
 #define ISC_PARSEINT_H 1
diff --git a/lib/isc/include/isc/portset.h b/lib/isc/include/isc/portset.h
index f5e6c739b1b..8a9002d9f21 100644
--- a/lib/isc/include/isc/portset.h
+++ b/lib/isc/include/isc/portset.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: portset.h,v 1.6 2009/06/25 05:28:34 marka Exp $ */
 
 /*! \file isc/portset.h
  * \brief Transport Protocol Port Manipulation Module
diff --git a/lib/isc/include/isc/queue.h b/lib/isc/include/isc/queue.h
index c5e797d487a..9cf07f0088b 100644
--- a/lib/isc/include/isc/queue.h
+++ b/lib/isc/include/isc/queue.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*
  * This is a generic implementation of a two-lock concurrent queue.
diff --git a/lib/isc/include/isc/quota.h b/lib/isc/include/isc/quota.h
index 1c53ab301e8..b9bf59877ac 100644
--- a/lib/isc/include/isc/quota.h
+++ b/lib/isc/include/isc/quota.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: quota.h,v 1.16 2007/06/19 23:47:18 tbox Exp $ */
 
 #ifndef ISC_QUOTA_H
 #define ISC_QUOTA_H 1
diff --git a/lib/isc/include/isc/ratelimiter.h b/lib/isc/include/isc/ratelimiter.h
index a6ae6faabeb..e60bf7e14bb 100644
--- a/lib/isc/include/isc/ratelimiter.h
+++ b/lib/isc/include/isc/ratelimiter.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: ratelimiter.h,v 1.23 2009/01/18 23:48:14 tbox Exp $ */
 
 #ifndef ISC_RATELIMITER_H
 #define ISC_RATELIMITER_H 1
diff --git a/lib/isc/include/isc/refcount.h b/lib/isc/include/isc/refcount.h
index b099df52a93..8b77f2e457f 100644
--- a/lib/isc/include/isc/refcount.h
+++ b/lib/isc/include/isc/refcount.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: refcount.h,v 1.17 2009/09/29 23:48:04 tbox Exp $ */
 
 #ifndef ISC_REFCOUNT_H
 #define ISC_REFCOUNT_H 1
diff --git a/lib/isc/include/isc/region.h b/lib/isc/include/isc/region.h
index d55b924d331..ee013547c4b 100644
--- a/lib/isc/include/isc/region.h
+++ b/lib/isc/include/isc/region.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: region.h,v 1.25 2007/06/19 23:47:18 tbox Exp $ */
 
 #ifndef ISC_REGION_H
 #define ISC_REGION_H 1
diff --git a/lib/isc/include/isc/resource.h b/lib/isc/include/isc/resource.h
index 12e4402d4c8..ee2c3c89c8f 100644
--- a/lib/isc/include/isc/resource.h
+++ b/lib/isc/include/isc/resource.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: resource.h,v 1.13 2008/07/11 23:47:09 tbox Exp $ */
 
 #ifndef ISC_RESOURCE_H
 #define ISC_RESOURCE_H 1
diff --git a/lib/isc/include/isc/result.h b/lib/isc/include/isc/result.h
index 9eb53d913cf..9e7d058a899 100644
--- a/lib/isc/include/isc/result.h
+++ b/lib/isc/include/isc/result.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #ifndef ISC_RESULT_H
 #define ISC_RESULT_H 1
diff --git a/lib/isc/include/isc/resultclass.h b/lib/isc/include/isc/resultclass.h
index c5781d7d5f1..08135f4180f 100644
--- a/lib/isc/include/isc/resultclass.h
+++ b/lib/isc/include/isc/resultclass.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: resultclass.h,v 1.20 2009/09/02 23:48:03 tbox Exp $ */
 
 #ifndef ISC_RESULTCLASS_H
 #define ISC_RESULTCLASS_H 1
diff --git a/lib/isc/include/isc/rwlock.h b/lib/isc/include/isc/rwlock.h
index 68a2b9979af..c47b8d062e8 100644
--- a/lib/isc/include/isc/rwlock.h
+++ b/lib/isc/include/isc/rwlock.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: rwlock.h,v 1.28 2007/06/19 23:47:18 tbox Exp $ */
 
 #ifndef ISC_RWLOCK_H
 #define ISC_RWLOCK_H 1
diff --git a/lib/isc/include/isc/safe.h b/lib/isc/include/isc/safe.h
index 1f8c9352e73..f29f00bac6d 100644
--- a/lib/isc/include/isc/safe.h
+++ b/lib/isc/include/isc/safe.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #ifndef ISC_SAFE_H
 #define ISC_SAFE_H 1
diff --git a/lib/isc/include/isc/serial.h b/lib/isc/include/isc/serial.h
index 721c1fbf80e..5f39bc1832b 100644
--- a/lib/isc/include/isc/serial.h
+++ b/lib/isc/include/isc/serial.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: serial.h,v 1.18 2009/01/18 23:48:14 tbox Exp $ */
 
 #ifndef ISC_SERIAL_H
 #define ISC_SERIAL_H 1
diff --git a/lib/isc/include/isc/sha1.h b/lib/isc/include/isc/sha1.h
index 97f3cf84e44..41476307b1a 100644
--- a/lib/isc/include/isc/sha1.h
+++ b/lib/isc/include/isc/sha1.h
@@ -12,7 +12,6 @@
 #ifndef ISC_SHA1_H
 #define ISC_SHA1_H 1
 
-/* $Id: sha1.h,v 1.19 2009/02/06 23:47:42 tbox Exp $ */
 
 /*	$NetBSD: sha1.h,v 1.2 1998/05/29 22:55:44 thorpej Exp $	*/
 
diff --git a/lib/isc/include/isc/sha2.h b/lib/isc/include/isc/sha2.h
index d7e967e0593..c3807496dfa 100644
--- a/lib/isc/include/isc/sha2.h
+++ b/lib/isc/include/isc/sha2.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: sha2.h,v 1.12 2009/10/22 02:21:31 each Exp $ */
 
 /*	$FreeBSD: src/sys/crypto/sha2/sha2.h,v 1.1.2.1 2001/07/03 11:01:36 ume Exp $	*/
 /*	$KAME: sha2.h,v 1.3 2001/03/12 08:27:48 itojun Exp $	*/
diff --git a/lib/isc/include/isc/sockaddr.h b/lib/isc/include/isc/sockaddr.h
index ce1fb5df615..3815ea158f0 100644
--- a/lib/isc/include/isc/sockaddr.h
+++ b/lib/isc/include/isc/sockaddr.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: sockaddr.h,v 1.57 2009/01/18 23:48:14 tbox Exp $ */
 
 #ifndef ISC_SOCKADDR_H
 #define ISC_SOCKADDR_H 1
diff --git a/lib/isc/include/isc/stats.h b/lib/isc/include/isc/stats.h
index 818031ea548..5c3d6f1931d 100644
--- a/lib/isc/include/isc/stats.h
+++ b/lib/isc/include/isc/stats.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #ifndef ISC_STATS_H
 #define ISC_STATS_H 1
diff --git a/lib/isc/include/isc/stdio.h b/lib/isc/include/isc/stdio.h
index d167ab219c1..1f44b5ac08d 100644
--- a/lib/isc/include/isc/stdio.h
+++ b/lib/isc/include/isc/stdio.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: stdio.h,v 1.13 2007/06/19 23:47:18 tbox Exp $ */
 
 #ifndef ISC_STDIO_H
 #define ISC_STDIO_H 1
diff --git a/lib/isc/include/isc/stdlib.h b/lib/isc/include/isc/stdlib.h
index 875491af600..c44b0ea605f 100644
--- a/lib/isc/include/isc/stdlib.h
+++ b/lib/isc/include/isc/stdlib.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: stdlib.h,v 1.8 2007/06/19 23:47:18 tbox Exp $ */
 
 #ifndef ISC_STDLIB_H
 #define ISC_STDLIB_H 1
diff --git a/lib/isc/include/isc/symtab.h b/lib/isc/include/isc/symtab.h
index cc0d8a92910..c71c103fd91 100644
--- a/lib/isc/include/isc/symtab.h
+++ b/lib/isc/include/isc/symtab.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #ifndef ISC_SYMTAB_H
 #define ISC_SYMTAB_H 1
diff --git a/lib/isc/include/isc/task.h b/lib/isc/include/isc/task.h
index 73089d000b7..24b351db408 100644
--- a/lib/isc/include/isc/task.h
+++ b/lib/isc/include/isc/task.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #ifndef ISC_TASK_H
 #define ISC_TASK_H 1
diff --git a/lib/isc/include/isc/taskpool.h b/lib/isc/include/isc/taskpool.h
index 957b215a6cd..b0b406b0caa 100644
--- a/lib/isc/include/isc/taskpool.h
+++ b/lib/isc/include/isc/taskpool.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #ifndef ISC_TASKPOOL_H
 #define ISC_TASKPOOL_H 1
diff --git a/lib/isc/include/isc/timer.h b/lib/isc/include/isc/timer.h
index 19b8f1274a6..6c7990b5cc7 100644
--- a/lib/isc/include/isc/timer.h
+++ b/lib/isc/include/isc/timer.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: timer.h,v 1.43 2009/09/02 23:48:03 tbox Exp $ */
 
 #ifndef ISC_TIMER_H
 #define ISC_TIMER_H 1
diff --git a/lib/isc/include/isc/version.h b/lib/isc/include/isc/version.h
index d92971c61e1..d371e0d3a29 100644
--- a/lib/isc/include/isc/version.h
+++ b/lib/isc/include/isc/version.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: version.h,v 1.9 2007/06/19 23:47:18 tbox Exp $ */
 
 /*! \file isc/version.h */
 
diff --git a/lib/isc/include/isc/xml.h b/lib/isc/include/isc/xml.h
index 4df2bb70227..a091d301039 100644
--- a/lib/isc/include/isc/xml.h
+++ b/lib/isc/include/isc/xml.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: xml.h,v 1.4 2007/06/19 23:47:18 tbox Exp $ */
 
 #ifndef ISC_XML_H
 #define ISC_XML_H 1
diff --git a/lib/isc/include/pk11/constants.h b/lib/isc/include/pk11/constants.h
index 720bca5da25..0abbf7ee37c 100644
--- a/lib/isc/include/pk11/constants.h
+++ b/lib/isc/include/pk11/constants.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #ifndef PK11_CONSTANTS_H
 #define PK11_CONSTANTS_H 1
diff --git a/lib/isc/include/pk11/internal.h b/lib/isc/include/pk11/internal.h
index 90b8e7d369a..aa8907ab080 100644
--- a/lib/isc/include/pk11/internal.h
+++ b/lib/isc/include/pk11/internal.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #ifndef PK11_INTERNAL_H
 #define PK11_INTERNAL_H 1
diff --git a/lib/isc/include/pkcs11/Makefile.in b/lib/isc/include/pkcs11/Makefile.in
index ebaf7f7b207..564242f50b4 100644
--- a/lib/isc/include/pkcs11/Makefile.in
+++ b/lib/isc/include/pkcs11/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.7 2007/06/19 23:47:22 tbox Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/inet_ntop.c b/lib/isc/inet_ntop.c
index 68285447c42..9f98139691c 100644
--- a/lib/isc/inet_ntop.c
+++ b/lib/isc/inet_ntop.c
@@ -11,11 +11,6 @@
 
 /*! \file */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] =
-	"$Id: inet_ntop.c,v 1.21 2009/07/17 23:47:41 tbox Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <config.h>
 
 #include <errno.h>
diff --git a/lib/isc/inet_pton.c b/lib/isc/inet_pton.c
index 5b2eb9b512d..bde88e3bec6 100644
--- a/lib/isc/inet_pton.c
+++ b/lib/isc/inet_pton.c
@@ -11,11 +11,6 @@
 
 /*! \file */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] =
-	"$Id: inet_pton.c,v 1.19 2007/06/19 23:47:17 tbox Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <config.h>
 
 #include <errno.h>
diff --git a/lib/isc/iterated_hash.c b/lib/isc/iterated_hash.c
index 4848395ce7d..cf4e67f9604 100644
--- a/lib/isc/iterated_hash.c
+++ b/lib/isc/iterated_hash.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: iterated_hash.c,v 1.6 2009/02/18 23:47:48 tbox Exp $ */
 
 #include "config.h"
 
diff --git a/lib/isc/lex.c b/lib/isc/lex.c
index ae8d453960a..eabcc81aa5c 100644
--- a/lib/isc/lex.c
+++ b/lib/isc/lex.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: lex.c,v 1.86 2007/09/17 09:56:29 shane Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/lfsr.c b/lib/isc/lfsr.c
index 31d140bb05d..73b20fd8b57 100644
--- a/lib/isc/lfsr.c
+++ b/lib/isc/lfsr.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: lfsr.c,v 1.20 2007/06/19 23:47:17 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/lib.c b/lib/isc/lib.c
index f816d445a8d..559ae1359b2 100644
--- a/lib/isc/lib.c
+++ b/lib/isc/lib.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: lib.c,v 1.16 2009/09/02 23:48:02 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/log.c b/lib/isc/log.c
index 98c0ed45dde..2006a870d6c 100644
--- a/lib/isc/log.c
+++ b/lib/isc/log.c
@@ -9,10 +9,7 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
-
-/*! \file
- * \author  Principal Authors: DCL */
+/*! \file */
 
 #include <config.h>
 
diff --git a/lib/isc/md5.c b/lib/isc/md5.c
index d384fea1004..740d863b1ba 100644
--- a/lib/isc/md5.c
+++ b/lib/isc/md5.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: md5.c,v 1.16 2009/02/06 23:47:42 tbox Exp $ */
 
 /*! \file
  * This code implements the MD5 message-digest algorithm.
diff --git a/lib/isc/mips/Makefile.in b/lib/isc/mips/Makefile.in
index b5d0eed25f7..419cf9f8755 100644
--- a/lib/isc/mips/Makefile.in
+++ b/lib/isc/mips/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/mips/include/Makefile.in b/lib/isc/mips/include/Makefile.in
index 344085ee9fa..d33c0fcb2c9 100644
--- a/lib/isc/mips/include/Makefile.in
+++ b/lib/isc/mips/include/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/mips/include/isc/Makefile.in b/lib/isc/mips/include/isc/Makefile.in
index f164aa3c68c..9f87e48935a 100644
--- a/lib/isc/mips/include/isc/Makefile.in
+++ b/lib/isc/mips/include/isc/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/mips/include/isc/atomic.h b/lib/isc/mips/include/isc/atomic.h
index b905380dfdf..d8e0c312ad7 100644
--- a/lib/isc/mips/include/isc/atomic.h
+++ b/lib/isc/mips/include/isc/atomic.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: atomic.h,v 1.3 2007/06/19 23:47:18 tbox Exp $ */
 
 #ifndef ISC_ATOMIC_H
 #define ISC_ATOMIC_H 1
diff --git a/lib/isc/mutexblock.c b/lib/isc/mutexblock.c
index d9d5e4b2ef6..6a629e7e0dc 100644
--- a/lib/isc/mutexblock.c
+++ b/lib/isc/mutexblock.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/netaddr.c b/lib/isc/netaddr.c
index 6d4dd40245c..0f29a6fff3c 100644
--- a/lib/isc/netaddr.c
+++ b/lib/isc/netaddr.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/nls/Makefile.in b/lib/isc/nls/Makefile.in
index 9baf0751ce3..704deadbea5 100644
--- a/lib/isc/nls/Makefile.in
+++ b/lib/isc/nls/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.17 2009/12/05 23:31:41 each Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/nls/msgcat.c b/lib/isc/nls/msgcat.c
index 60b7aaee275..ab09b945794 100644
--- a/lib/isc/nls/msgcat.c
+++ b/lib/isc/nls/msgcat.c
@@ -9,12 +9,8 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: msgcat.c,v 1.18 2007/06/19 23:47:18 tbox Exp $ */
 
-/*! \file msgcat.c
- *
- * \author Principal Author: Bob Halley
- */
+/*! \file msgcat.c */
 
 #include <config.h>
 
diff --git a/lib/isc/noatomic/Makefile.in b/lib/isc/noatomic/Makefile.in
index b5d0eed25f7..419cf9f8755 100644
--- a/lib/isc/noatomic/Makefile.in
+++ b/lib/isc/noatomic/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/noatomic/include/Makefile.in b/lib/isc/noatomic/include/Makefile.in
index 344085ee9fa..d33c0fcb2c9 100644
--- a/lib/isc/noatomic/include/Makefile.in
+++ b/lib/isc/noatomic/include/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/noatomic/include/isc/Makefile.in b/lib/isc/noatomic/include/isc/Makefile.in
index f164aa3c68c..9f87e48935a 100644
--- a/lib/isc/noatomic/include/isc/Makefile.in
+++ b/lib/isc/noatomic/include/isc/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/noatomic/include/isc/atomic.h b/lib/isc/noatomic/include/isc/atomic.h
index 4bbdc5822e3..5953e4b9524 100644
--- a/lib/isc/noatomic/include/isc/atomic.h
+++ b/lib/isc/noatomic/include/isc/atomic.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: atomic.h,v 1.4 2007/06/19 23:47:18 tbox Exp $ */
 
 #ifndef ISC_ATOMIC_H
 #define ISC_ATOMIC_H 1
diff --git a/lib/isc/nothreads/Makefile.in b/lib/isc/nothreads/Makefile.in
index a37a6e70022..c79477363e6 100644
--- a/lib/isc/nothreads/Makefile.in
+++ b/lib/isc/nothreads/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.12 2010/06/09 23:50:58 tbox Exp $
-
 top_srcdir =	@top_srcdir@
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/isc/nothreads/condition.c b/lib/isc/nothreads/condition.c
index 63e51ccad92..a549c30938a 100644
--- a/lib/isc/nothreads/condition.c
+++ b/lib/isc/nothreads/condition.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: condition.c,v 1.10 2007/06/19 23:47:18 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/lib/isc/nothreads/include/Makefile.in b/lib/isc/nothreads/include/Makefile.in
index e29f6445eea..d33c0fcb2c9 100644
--- a/lib/isc/nothreads/include/Makefile.in
+++ b/lib/isc/nothreads/include/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.5 2007/06/19 23:47:18 tbox Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/nothreads/include/isc/Makefile.in b/lib/isc/nothreads/include/isc/Makefile.in
index fe9e8fd196b..e50c70944a7 100644
--- a/lib/isc/nothreads/include/isc/Makefile.in
+++ b/lib/isc/nothreads/include/isc/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.7 2007/06/19 23:47:18 tbox Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/nothreads/include/isc/condition.h b/lib/isc/nothreads/include/isc/condition.h
index bc6d7f430f5..0bea23d2c90 100644
--- a/lib/isc/nothreads/include/isc/condition.h
+++ b/lib/isc/nothreads/include/isc/condition.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: condition.h,v 1.6 2007/06/19 23:47:18 tbox Exp $ */
 
 /*
  * This provides a limited subset of the isc_condition_t
diff --git a/lib/isc/nothreads/include/isc/once.h b/lib/isc/nothreads/include/isc/once.h
index 11eaed70249..c82530e750f 100644
--- a/lib/isc/nothreads/include/isc/once.h
+++ b/lib/isc/nothreads/include/isc/once.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: once.h,v 1.6 2007/06/19 23:47:18 tbox Exp $ */
 
 #ifndef ISC_ONCE_H
 #define ISC_ONCE_H 1
diff --git a/lib/isc/nothreads/include/isc/thread.h b/lib/isc/nothreads/include/isc/thread.h
index 18cd0d07fbf..8486c3f9abe 100644
--- a/lib/isc/nothreads/include/isc/thread.h
+++ b/lib/isc/nothreads/include/isc/thread.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: thread.h,v 1.6 2007/06/19 23:47:18 tbox Exp $ */
 
 #ifndef ISC_THREAD_H
 #define ISC_THREAD_H 1
diff --git a/lib/isc/nothreads/mutex.c b/lib/isc/nothreads/mutex.c
index 200658fdab9..e092ac9b736 100644
--- a/lib/isc/nothreads/mutex.c
+++ b/lib/isc/nothreads/mutex.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: mutex.c,v 1.10 2007/06/19 23:47:18 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/lib/isc/nothreads/thread.c b/lib/isc/nothreads/thread.c
index 88c3e9ad1d8..671261f7a31 100644
--- a/lib/isc/nothreads/thread.c
+++ b/lib/isc/nothreads/thread.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: thread.c,v 1.5 2007/06/19 23:47:18 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/lib/isc/parseint.c b/lib/isc/parseint.c
index 3dac4308333..6c3fe3c441b 100644
--- a/lib/isc/parseint.c
+++ b/lib/isc/parseint.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: parseint.c,v 1.8 2007/06/19 23:47:17 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/pool.c b/lib/isc/pool.c
index 05d7754baf0..e4ad2c4bcca 100644
--- a/lib/isc/pool.c
+++ b/lib/isc/pool.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/portset.c b/lib/isc/portset.c
index 5d75bc19ee3..c7366433b3c 100644
--- a/lib/isc/portset.c
+++ b/lib/isc/portset.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: portset.c,v 1.4 2008/06/24 23:24:35 marka Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/powerpc/Makefile.in b/lib/isc/powerpc/Makefile.in
index b5d0eed25f7..419cf9f8755 100644
--- a/lib/isc/powerpc/Makefile.in
+++ b/lib/isc/powerpc/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/powerpc/include/Makefile.in b/lib/isc/powerpc/include/Makefile.in
index 344085ee9fa..d33c0fcb2c9 100644
--- a/lib/isc/powerpc/include/Makefile.in
+++ b/lib/isc/powerpc/include/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/powerpc/include/isc/Makefile.in b/lib/isc/powerpc/include/isc/Makefile.in
index f164aa3c68c..9f87e48935a 100644
--- a/lib/isc/powerpc/include/isc/Makefile.in
+++ b/lib/isc/powerpc/include/isc/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/powerpc/include/isc/atomic.h b/lib/isc/powerpc/include/isc/atomic.h
index 24a68af396c..42e509fb2c9 100644
--- a/lib/isc/powerpc/include/isc/atomic.h
+++ b/lib/isc/powerpc/include/isc/atomic.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #ifndef ISC_ATOMIC_H
 #define ISC_ATOMIC_H 1
diff --git a/lib/isc/pthreads/Makefile.in b/lib/isc/pthreads/Makefile.in
index ff328955bfc..af4fd6ec299 100644
--- a/lib/isc/pthreads/Makefile.in
+++ b/lib/isc/pthreads/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.22 2009/12/05 23:31:41 each Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/pthreads/condition.c b/lib/isc/pthreads/condition.c
index 2ecbb823cb7..a7f1928126c 100644
--- a/lib/isc/pthreads/condition.c
+++ b/lib/isc/pthreads/condition.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: condition.c,v 1.36 2007/06/19 23:47:18 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/pthreads/include/Makefile.in b/lib/isc/pthreads/include/Makefile.in
index 2170c767c18..d33c0fcb2c9 100644
--- a/lib/isc/pthreads/include/Makefile.in
+++ b/lib/isc/pthreads/include/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.14 2007/06/19 23:47:18 tbox Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/pthreads/include/isc/Makefile.in b/lib/isc/pthreads/include/isc/Makefile.in
index ab9de0d2cce..e50c70944a7 100644
--- a/lib/isc/pthreads/include/isc/Makefile.in
+++ b/lib/isc/pthreads/include/isc/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.16 2007/06/19 23:47:18 tbox Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/pthreads/include/isc/condition.h b/lib/isc/pthreads/include/isc/condition.h
index c6791324466..28338c7fdf8 100644
--- a/lib/isc/pthreads/include/isc/condition.h
+++ b/lib/isc/pthreads/include/isc/condition.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: condition.h,v 1.26 2007/06/19 23:47:18 tbox Exp $ */
 
 #ifndef ISC_CONDITION_H
 #define ISC_CONDITION_H 1
diff --git a/lib/isc/pthreads/include/isc/mutex.h b/lib/isc/pthreads/include/isc/mutex.h
index 22e35b72549..6c34a69c470 100644
--- a/lib/isc/pthreads/include/isc/mutex.h
+++ b/lib/isc/pthreads/include/isc/mutex.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: mutex.h,v 1.30 2007/06/19 23:47:18 tbox Exp $ */
 
 #ifndef ISC_MUTEX_H
 #define ISC_MUTEX_H 1
diff --git a/lib/isc/pthreads/include/isc/once.h b/lib/isc/pthreads/include/isc/once.h
index 39987055f28..a0e955939c5 100644
--- a/lib/isc/pthreads/include/isc/once.h
+++ b/lib/isc/pthreads/include/isc/once.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: once.h,v 1.13 2007/06/19 23:47:18 tbox Exp $ */
 
 #ifndef ISC_ONCE_H
 #define ISC_ONCE_H 1
diff --git a/lib/isc/pthreads/include/isc/thread.h b/lib/isc/pthreads/include/isc/thread.h
index 13e308ead08..798af338ac0 100644
--- a/lib/isc/pthreads/include/isc/thread.h
+++ b/lib/isc/pthreads/include/isc/thread.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: thread.h,v 1.26 2007/06/19 23:47:18 tbox Exp $ */
 
 #ifndef ISC_THREAD_H
 #define ISC_THREAD_H 1
diff --git a/lib/isc/pthreads/mutex.c b/lib/isc/pthreads/mutex.c
index 8bb9f7d6bab..076004fa5c3 100644
--- a/lib/isc/pthreads/mutex.c
+++ b/lib/isc/pthreads/mutex.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: mutex.c,v 1.18 2011/01/04 23:47:14 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/pthreads/thread.c b/lib/isc/pthreads/thread.c
index 32911a780a0..94fb2c2bf3e 100644
--- a/lib/isc/pthreads/thread.c
+++ b/lib/isc/pthreads/thread.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: thread.c,v 1.17 2007/06/19 23:47:18 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/quota.c b/lib/isc/quota.c
index 190186fd6e0..3ddff0d875c 100644
--- a/lib/isc/quota.c
+++ b/lib/isc/quota.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: quota.c,v 1.18 2007/06/19 23:47:17 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/radix.c b/lib/isc/radix.c
index e51800a1e5a..191d783671f 100644
--- a/lib/isc/radix.c
+++ b/lib/isc/radix.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*
  * This source was adapted from MRT's RCS Ids:
diff --git a/lib/isc/ratelimiter.c b/lib/isc/ratelimiter.c
index 742af12d999..7da62c1af3e 100644
--- a/lib/isc/ratelimiter.c
+++ b/lib/isc/ratelimiter.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: ratelimiter.c,v 1.25 2007/06/19 23:47:17 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/refcount.c b/lib/isc/refcount.c
index 409809f2a4e..033af7b4cd8 100644
--- a/lib/isc/refcount.c
+++ b/lib/isc/refcount.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: refcount.c,v 1.5 2007/06/19 23:47:17 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/lib/isc/region.c b/lib/isc/region.c
index 73644f71191..2f858427f64 100644
--- a/lib/isc/region.c
+++ b/lib/isc/region.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: region.c,v 1.7 2007/06/19 23:47:17 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/rwlock.c b/lib/isc/rwlock.c
index b4b962c7f91..8c9455932f3 100644
--- a/lib/isc/rwlock.c
+++ b/lib/isc/rwlock.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/serial.c b/lib/isc/serial.c
index fb6611f7a85..8ccd1d0b1ea 100644
--- a/lib/isc/serial.c
+++ b/lib/isc/serial.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: serial.c,v 1.12 2007/06/19 23:47:17 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/sockaddr.c b/lib/isc/sockaddr.c
index 5bd405016eb..005a74dbe23 100644
--- a/lib/isc/sockaddr.c
+++ b/lib/isc/sockaddr.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/socket_api.c b/lib/isc/socket_api.c
index d6248c42f94..36b3d0e33dc 100644
--- a/lib/isc/socket_api.c
+++ b/lib/isc/socket_api.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #include <config.h>
 
diff --git a/lib/isc/sparc64/Makefile.in b/lib/isc/sparc64/Makefile.in
index b5d0eed25f7..419cf9f8755 100644
--- a/lib/isc/sparc64/Makefile.in
+++ b/lib/isc/sparc64/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/sparc64/include/Makefile.in b/lib/isc/sparc64/include/Makefile.in
index 344085ee9fa..d33c0fcb2c9 100644
--- a/lib/isc/sparc64/include/Makefile.in
+++ b/lib/isc/sparc64/include/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/sparc64/include/isc/Makefile.in b/lib/isc/sparc64/include/isc/Makefile.in
index 3d49e79d827..11e93a42bce 100644
--- a/lib/isc/sparc64/include/isc/Makefile.in
+++ b/lib/isc/sparc64/include/isc/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/sparc64/include/isc/atomic.h b/lib/isc/sparc64/include/isc/atomic.h
index 0aea98f91e1..fd5cf1da5ae 100644
--- a/lib/isc/sparc64/include/isc/atomic.h
+++ b/lib/isc/sparc64/include/isc/atomic.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: atomic.h,v 1.5 2007/06/19 23:47:18 tbox Exp $ */
 
 /*
  * This code was written based on FreeBSD's kernel source whose copyright
diff --git a/lib/isc/stats.c b/lib/isc/stats.c
index a43eca22006..5de077943c9 100644
--- a/lib/isc/stats.c
+++ b/lib/isc/stats.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/strtoul.c b/lib/isc/strtoul.c
index 293008112ce..382432a61fe 100644
--- a/lib/isc/strtoul.c
+++ b/lib/isc/strtoul.c
@@ -43,7 +43,6 @@
 static char sccsid[] = "@(#)strtoul.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 
-/* $Id: strtoul.c,v 1.7 2007/06/19 23:47:17 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/lib/isc/symtab.c b/lib/isc/symtab.c
index 0fcfb169377..62839e43712 100644
--- a/lib/isc/symtab.c
+++ b/lib/isc/symtab.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/task.c b/lib/isc/task.c
index 63e9154d4e3..7669045a5a3 100644
--- a/lib/isc/task.c
+++ b/lib/isc/task.c
@@ -9,9 +9,7 @@
  * information regarding copyright ownership.
  */
 
-/*! \file
- * \author Principal Author: Bob Halley
- */
+/*! \file */
 
 /*
  * XXXRTH  Need to document the states a task can be in, and the rules
diff --git a/lib/isc/taskpool.c b/lib/isc/taskpool.c
index c769f77d2d1..fe9ac5f7cc0 100644
--- a/lib/isc/taskpool.c
+++ b/lib/isc/taskpool.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/tests/aes_test.c b/lib/isc/tests/aes_test.c
index e407f77ea7f..9c15b5295d8 100644
--- a/lib/isc/tests/aes_test.c
+++ b/lib/isc/tests/aes_test.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /* ! \file */
 
diff --git a/lib/isc/tests/safe_test.c b/lib/isc/tests/safe_test.c
index 90d3ac578c6..f721cd10966 100644
--- a/lib/isc/tests/safe_test.c
+++ b/lib/isc/tests/safe_test.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /* ! \file */
 
diff --git a/lib/isc/timer.c b/lib/isc/timer.c
index 91d2cd57ee3..e979b044b8c 100644
--- a/lib/isc/timer.c
+++ b/lib/isc/timer.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/unix/dir.c b/lib/isc/unix/dir.c
index 829ca7b2dcb..93298ed5a47 100644
--- a/lib/isc/unix/dir.c
+++ b/lib/isc/unix/dir.c
@@ -9,10 +9,8 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
-/*! \file
- * \author  Principal Authors: DCL */
+/*! \file */
 
 #include <config.h>
 
diff --git a/lib/isc/unix/errno2result.c b/lib/isc/unix/errno2result.c
index e6c438d304e..b0c87886abf 100644
--- a/lib/isc/unix/errno2result.c
+++ b/lib/isc/unix/errno2result.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/unix/file.c b/lib/isc/unix/file.c
index efa0f2f933a..1196a68c72f 100644
--- a/lib/isc/unix/file.c
+++ b/lib/isc/unix/file.c
@@ -38,7 +38,6 @@
  * SUCH DAMAGE.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/unix/fsaccess.c b/lib/isc/unix/fsaccess.c
index abe568f506c..f33932e14d2 100644
--- a/lib/isc/unix/fsaccess.c
+++ b/lib/isc/unix/fsaccess.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: fsaccess.c,v 1.13 2007/06/19 23:47:18 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/lib/isc/unix/ifiter_getifaddrs.c b/lib/isc/unix/ifiter_getifaddrs.c
index af6b971167e..e75ec0a11c6 100644
--- a/lib/isc/unix/ifiter_getifaddrs.c
+++ b/lib/isc/unix/ifiter_getifaddrs.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: ifiter_getifaddrs.c,v 1.13 2009/09/24 23:48:13 tbox Exp $ */
 
 /*! \file
  * \brief
diff --git a/lib/isc/unix/ifiter_ioctl.c b/lib/isc/unix/ifiter_ioctl.c
index 6b6ab8ac34b..b8a1fa3cdd1 100644
--- a/lib/isc/unix/ifiter_ioctl.c
+++ b/lib/isc/unix/ifiter_ioctl.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: ifiter_ioctl.c,v 1.62 2009/01/18 23:48:14 tbox Exp $ */
 
 #include <isc/print.h>
 
diff --git a/lib/isc/unix/ifiter_sysctl.c b/lib/isc/unix/ifiter_sysctl.c
index b0945cdd943..7ff5a00fb2b 100644
--- a/lib/isc/unix/ifiter_sysctl.c
+++ b/lib/isc/unix/ifiter_sysctl.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: ifiter_sysctl.c,v 1.25 2007/06/19 23:47:18 tbox Exp $ */
 
 /*! \file
  * \brief
diff --git a/lib/isc/unix/include/Makefile.in b/lib/isc/unix/include/Makefile.in
index 81703f09f76..2cbf021bf93 100644
--- a/lib/isc/unix/include/Makefile.in
+++ b/lib/isc/unix/include/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.14 2007/06/19 23:47:18 tbox Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/unix/include/isc/Makefile.in b/lib/isc/unix/include/isc/Makefile.in
index deff70ef573..3892e0fb386 100644
--- a/lib/isc/unix/include/isc/Makefile.in
+++ b/lib/isc/unix/include/isc/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.30 2007/06/19 23:47:19 tbox Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/unix/include/isc/dir.h b/lib/isc/unix/include/isc/dir.h
index 1d691be36f2..36d0aad2898 100644
--- a/lib/isc/unix/include/isc/dir.h
+++ b/lib/isc/unix/include/isc/dir.h
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: dir.h,v 1.21 2007/06/19 23:47:19 tbox Exp $ */
-
-/* Principal Authors: DCL */
-
 #ifndef ISC_DIR_H
 #define ISC_DIR_H 1
 
diff --git a/lib/isc/unix/include/isc/keyboard.h b/lib/isc/unix/include/isc/keyboard.h
index c04e791c9c5..b60bdf27eb0 100644
--- a/lib/isc/unix/include/isc/keyboard.h
+++ b/lib/isc/unix/include/isc/keyboard.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: keyboard.h,v 1.11 2007/06/19 23:47:19 tbox Exp $ */
 
 #ifndef ISC_KEYBOARD_H
 #define ISC_KEYBOARD_H 1
diff --git a/lib/isc/unix/include/isc/net.h b/lib/isc/unix/include/isc/net.h
index 211b8af4b96..38504bcce48 100644
--- a/lib/isc/unix/include/isc/net.h
+++ b/lib/isc/unix/include/isc/net.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #ifndef ISC_NET_H
 #define ISC_NET_H 1
diff --git a/lib/isc/unix/include/isc/netdb.h b/lib/isc/unix/include/isc/netdb.h
index 43f45c4d5f6..5aaa9f62697 100644
--- a/lib/isc/unix/include/isc/netdb.h
+++ b/lib/isc/unix/include/isc/netdb.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: netdb.h,v 1.11 2007/06/19 23:47:19 tbox Exp $ */
 
 #ifndef ISC_NETDB_H
 #define ISC_NETDB_H 1
diff --git a/lib/isc/unix/include/isc/offset.h b/lib/isc/unix/include/isc/offset.h
index 72e079635f5..cf57292a54b 100644
--- a/lib/isc/unix/include/isc/offset.h
+++ b/lib/isc/unix/include/isc/offset.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: offset.h,v 1.17 2008/12/01 23:47:45 tbox Exp $ */
 
 #ifndef ISC_OFFSET_H
 #define ISC_OFFSET_H 1
diff --git a/lib/isc/unix/include/isc/stat.h b/lib/isc/unix/include/isc/stat.h
index 85957d25e3e..24c4ce5ee2a 100644
--- a/lib/isc/unix/include/isc/stat.h
+++ b/lib/isc/unix/include/isc/stat.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: stat.h,v 1.5 2007/06/19 23:47:19 tbox Exp $ */
 
 #ifndef ISC_STAT_H
 #define ISC_STAT_H 1
diff --git a/lib/isc/unix/include/isc/stdtime.h b/lib/isc/unix/include/isc/stdtime.h
index cdefa95d805..7b1e9ac2d13 100644
--- a/lib/isc/unix/include/isc/stdtime.h
+++ b/lib/isc/unix/include/isc/stdtime.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #ifndef ISC_STDTIME_H
 #define ISC_STDTIME_H 1
diff --git a/lib/isc/unix/include/isc/strerror.h b/lib/isc/unix/include/isc/strerror.h
index 43578bb0679..fa0e429d95a 100644
--- a/lib/isc/unix/include/isc/strerror.h
+++ b/lib/isc/unix/include/isc/strerror.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: strerror.h,v 1.10 2008/12/01 23:47:45 tbox Exp $ */
 
 #ifndef ISC_STRERROR_H
 #define ISC_STRERROR_H
diff --git a/lib/isc/unix/include/isc/syslog.h b/lib/isc/unix/include/isc/syslog.h
index 667927f6da9..e0b8e8599b8 100644
--- a/lib/isc/unix/include/isc/syslog.h
+++ b/lib/isc/unix/include/isc/syslog.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: syslog.h,v 1.7 2007/06/19 23:47:19 tbox Exp $ */
 
 #ifndef ISC_SYSLOG_H
 #define ISC_SYSLOG_H 1
diff --git a/lib/isc/unix/include/isc/time.h b/lib/isc/unix/include/isc/time.h
index e12bc08e411..1848428cc01 100644
--- a/lib/isc/unix/include/isc/time.h
+++ b/lib/isc/unix/include/isc/time.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: time.h,v 1.40 2009/01/05 23:47:54 tbox Exp $ */
 
 #ifndef ISC_TIME_H
 #define ISC_TIME_H 1
diff --git a/lib/isc/unix/include/pkcs11/Makefile.in b/lib/isc/unix/include/pkcs11/Makefile.in
index 24470ed5c4f..235bd3eac21 100644
--- a/lib/isc/unix/include/pkcs11/Makefile.in
+++ b/lib/isc/unix/include/pkcs11/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.4 2007/06/19 23:47:23 tbox Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/unix/interfaceiter.c b/lib/isc/unix/interfaceiter.c
index 6ab0eddee66..bfab189c8b0 100644
--- a/lib/isc/unix/interfaceiter.c
+++ b/lib/isc/unix/interfaceiter.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: interfaceiter.c,v 1.45 2008/12/01 03:51:47 marka Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/unix/ipv6.c b/lib/isc/unix/ipv6.c
index 94cc187a8bb..eb77377aac9 100644
--- a/lib/isc/unix/ipv6.c
+++ b/lib/isc/unix/ipv6.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: ipv6.c,v 1.14 2007/06/19 23:47:18 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/unix/keyboard.c b/lib/isc/unix/keyboard.c
index b95ae1086b2..8114d9edbcf 100644
--- a/lib/isc/unix/keyboard.c
+++ b/lib/isc/unix/keyboard.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: keyboard.c,v 1.13 2007/06/19 23:47:18 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/lib/isc/unix/net.c b/lib/isc/unix/net.c
index c7f24ad3f97..63b0910921d 100644
--- a/lib/isc/unix/net.c
+++ b/lib/isc/unix/net.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #include <config.h>
 
diff --git a/lib/isc/unix/os.c b/lib/isc/unix/os.c
index dce2123656f..8cff6b66eb5 100644
--- a/lib/isc/unix/os.c
+++ b/lib/isc/unix/os.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: os.c,v 1.18 2007/06/19 23:47:18 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/lib/isc/unix/pk11_api.c b/lib/isc/unix/pk11_api.c
index 7b23075ada3..bbc55afe2e4 100644
--- a/lib/isc/unix/pk11_api.c
+++ b/lib/isc/unix/pk11_api.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/unix/resource.c b/lib/isc/unix/resource.c
index 9975a541aec..5757f5f535e 100644
--- a/lib/isc/unix/resource.c
+++ b/lib/isc/unix/resource.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: resource.c,v 1.23 2009/02/13 23:48:14 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/lib/isc/unix/socket_p.h b/lib/isc/unix/socket_p.h
index acd7297178a..fb4fdb89d78 100644
--- a/lib/isc/unix/socket_p.h
+++ b/lib/isc/unix/socket_p.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: socket_p.h,v 1.15 2009/09/02 23:48:03 tbox Exp $ */
 
 #ifndef ISC_SOCKET_P_H
 #define ISC_SOCKET_P_H
diff --git a/lib/isc/unix/stdio.c b/lib/isc/unix/stdio.c
index 9d8b45a374c..d2b1ddaa017 100644
--- a/lib/isc/unix/stdio.c
+++ b/lib/isc/unix/stdio.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #include <config.h>
 
diff --git a/lib/isc/unix/stdtime.c b/lib/isc/unix/stdtime.c
index d7917ef3990..09cc51c7b45 100644
--- a/lib/isc/unix/stdtime.c
+++ b/lib/isc/unix/stdtime.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: stdtime.c,v 1.19 2007/06/19 23:47:18 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/unix/strerror.c b/lib/isc/unix/strerror.c
index 2cbb6fe68ef..e4fb7934cd0 100644
--- a/lib/isc/unix/strerror.c
+++ b/lib/isc/unix/strerror.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: strerror.c,v 1.10 2009/02/16 23:48:04 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/unix/syslog.c b/lib/isc/unix/syslog.c
index bc845c6c1cf..4ce327256ed 100644
--- a/lib/isc/unix/syslog.c
+++ b/lib/isc/unix/syslog.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: syslog.c,v 1.8 2007/09/13 04:45:18 each Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/unix/time.c b/lib/isc/unix/time.c
index 648324099b7..03367ff92de 100644
--- a/lib/isc/unix/time.c
+++ b/lib/isc/unix/time.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/version.c b/lib/isc/version.c
index 3bc2d7160d5..3a83a39fcb3 100644
--- a/lib/isc/version.c
+++ b/lib/isc/version.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: version.c,v 1.15 2007/06/19 23:47:17 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/win32/DLLMain.c b/lib/isc/win32/DLLMain.c
index eb1342dd35c..f14260e9f96 100644
--- a/lib/isc/win32/DLLMain.c
+++ b/lib/isc/win32/DLLMain.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: DLLMain.c,v 1.7 2007/06/18 23:47:49 tbox Exp $ */
 
 #include <windows.h>
 #include <stdio.h>
diff --git a/lib/isc/win32/app.c b/lib/isc/win32/app.c
index 5985e3ba915..fffa454b619 100644
--- a/lib/isc/win32/app.c
+++ b/lib/isc/win32/app.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: app.c,v 1.9 2009/09/02 23:48:03 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/lib/isc/win32/condition.c b/lib/isc/win32/condition.c
index 7a38852a27a..31d9aa368dd 100644
--- a/lib/isc/win32/condition.c
+++ b/lib/isc/win32/condition.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: condition.c,v 1.23 2007/06/18 23:47:49 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/lib/isc/win32/dir.c b/lib/isc/win32/dir.c
index 3ebef960cbe..16a424ee0f7 100644
--- a/lib/isc/win32/dir.c
+++ b/lib/isc/win32/dir.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
-
-/* Principal Authors: DCL */
-
 #include <config.h>
 
 #include <string.h>
diff --git a/lib/isc/win32/entropy.c b/lib/isc/win32/entropy.c
index 26faf995957..0cf69f5bc51 100644
--- a/lib/isc/win32/entropy.c
+++ b/lib/isc/win32/entropy.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: entropy.c,v 1.10 2009/01/18 23:48:14 tbox Exp $ */
 
 /*
  * This is the system dependent part of the ISC entropy API.
diff --git a/lib/isc/win32/errno2result.c b/lib/isc/win32/errno2result.c
index 4026917f626..800e5819df5 100644
--- a/lib/isc/win32/errno2result.c
+++ b/lib/isc/win32/errno2result.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: errno2result.c,v 1.17 2008/09/12 04:46:25 marka Exp $ */
 
 #include <config.h>
 
diff --git a/lib/isc/win32/errno2result.h b/lib/isc/win32/errno2result.h
index ec1f73754d4..26ed3e9b104 100644
--- a/lib/isc/win32/errno2result.h
+++ b/lib/isc/win32/errno2result.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: errno2result.h,v 1.10 2007/06/19 23:47:19 tbox Exp $ */
 
 #ifndef UNIX_ERRNO2RESULT_H
 #define UNIX_ERRNO2RESULT_H 1
diff --git a/lib/isc/win32/file.c b/lib/isc/win32/file.c
index 6c945636c0c..e33ade84eeb 100644
--- a/lib/isc/win32/file.c
+++ b/lib/isc/win32/file.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #include <config.h>
 
diff --git a/lib/isc/win32/fsaccess.c b/lib/isc/win32/fsaccess.c
index 916a4b13aff..f9db1b899fb 100644
--- a/lib/isc/win32/fsaccess.c
+++ b/lib/isc/win32/fsaccess.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: fsaccess.c,v 1.15 2007/06/19 23:47:19 tbox Exp $ */
 
 /*
  * Note that Win32 does not have the concept of files having access
diff --git a/lib/isc/win32/include/Makefile.in b/lib/isc/win32/include/Makefile.in
index 291e81a6a0e..2cbf021bf93 100644
--- a/lib/isc/win32/include/Makefile.in
+++ b/lib/isc/win32/include/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.9 2007/06/19 23:47:19 tbox Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/win32/include/isc/Makefile.in b/lib/isc/win32/include/isc/Makefile.in
index ee31fe8db3e..024d6b3d0ca 100644
--- a/lib/isc/win32/include/isc/Makefile.in
+++ b/lib/isc/win32/include/isc/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.11 2007/06/19 23:47:20 tbox Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/win32/include/isc/atomic.h b/lib/isc/win32/include/isc/atomic.h
index 50e435a5c0b..800b9458ce8 100644
--- a/lib/isc/win32/include/isc/atomic.h
+++ b/lib/isc/win32/include/isc/atomic.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #ifndef ISC_ATOMIC_H
 #define ISC_ATOMIC_H 1
diff --git a/lib/isc/win32/include/isc/bind_registry.h b/lib/isc/win32/include/isc/bind_registry.h
index e77eebe4984..57970be8068 100644
--- a/lib/isc/win32/include/isc/bind_registry.h
+++ b/lib/isc/win32/include/isc/bind_registry.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: bind_registry.h,v 1.8 2007/06/19 23:47:20 tbox Exp $ */
 
 #ifndef ISC_BINDREGISTRY_H
 #define ISC_BINDREGISTRY_H
diff --git a/lib/isc/win32/include/isc/bindevt.h b/lib/isc/win32/include/isc/bindevt.h
index 1b5aba8eefe..d4088e866ee 100644
--- a/lib/isc/win32/include/isc/bindevt.h
+++ b/lib/isc/win32/include/isc/bindevt.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: bindevt.h,v 1.6 2007/06/19 23:47:20 tbox Exp $ */
 
 #ifndef ISC_BINDEVT_H
 #define ISC_BINDEVT_H 1
diff --git a/lib/isc/win32/include/isc/condition.h b/lib/isc/win32/include/isc/condition.h
index d18ed9d5327..1f5b2d6042c 100644
--- a/lib/isc/win32/include/isc/condition.h
+++ b/lib/isc/win32/include/isc/condition.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: condition.h,v 1.17 2007/06/18 23:47:49 tbox Exp $ */
 
 #ifndef ISC_CONDITION_H
 #define ISC_CONDITION_H 1
diff --git a/lib/isc/win32/include/isc/dir.h b/lib/isc/win32/include/isc/dir.h
index d1b9203b103..8b4d5492fdc 100644
--- a/lib/isc/win32/include/isc/dir.h
+++ b/lib/isc/win32/include/isc/dir.h
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: dir.h,v 1.15 2007/06/19 23:47:20 tbox Exp $ */
-
-/* Principal Authors: DCL */
-
 #ifndef ISC_DIR_H
 #define ISC_DIR_H 1
 
diff --git a/lib/isc/win32/include/isc/ipv6.h b/lib/isc/win32/include/isc/ipv6.h
index 014d4ecadfb..bee1bd0faaf 100644
--- a/lib/isc/win32/include/isc/ipv6.h
+++ b/lib/isc/win32/include/isc/ipv6.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #ifndef ISC_IPV6_H
 #define ISC_IPV6_H 1
diff --git a/lib/isc/win32/include/isc/keyboard.h b/lib/isc/win32/include/isc/keyboard.h
index c387ff2fec4..1e121898752 100644
--- a/lib/isc/win32/include/isc/keyboard.h
+++ b/lib/isc/win32/include/isc/keyboard.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: keyboard.h,v 1.6 2007/06/19 23:47:20 tbox Exp $ */
 
 #ifndef ISC_KEYBOARD_H
 #define ISC_KEYBOARD_H 1
diff --git a/lib/isc/win32/include/isc/mutex.h b/lib/isc/win32/include/isc/mutex.h
index dee5ac9c3ad..6815741b89c 100644
--- a/lib/isc/win32/include/isc/mutex.h
+++ b/lib/isc/win32/include/isc/mutex.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: mutex.h,v 1.22 2009/01/18 23:48:14 tbox Exp $ */
 
 #ifndef ISC_MUTEX_H
 #define ISC_MUTEX_H 1
diff --git a/lib/isc/win32/include/isc/netdb.h b/lib/isc/win32/include/isc/netdb.h
index 4765937fe1e..c07194d5940 100644
--- a/lib/isc/win32/include/isc/netdb.h
+++ b/lib/isc/win32/include/isc/netdb.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: netdb.h,v 1.9 2007/06/19 23:47:20 tbox Exp $ */
 
 #ifndef ISC_NETDB_H
 #define ISC_NETDB_H 1
diff --git a/lib/isc/win32/include/isc/ntgroups.h b/lib/isc/win32/include/isc/ntgroups.h
index e1be8c8ece0..e8352fcb628 100644
--- a/lib/isc/win32/include/isc/ntgroups.h
+++ b/lib/isc/win32/include/isc/ntgroups.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: ntgroups.h,v 1.5 2007/06/19 23:47:20 tbox Exp $ */
 
 #ifndef ISC_NTGROUPS_H
 #define ISC_NTGROUPS_H 1
diff --git a/lib/isc/win32/include/isc/ntpaths.h b/lib/isc/win32/include/isc/ntpaths.h
index a0aa01d36ce..d781d990cf9 100644
--- a/lib/isc/win32/include/isc/ntpaths.h
+++ b/lib/isc/win32/include/isc/ntpaths.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: ntpaths.h,v 1.20 2009/07/14 22:54:57 each Exp $ */
 
 /*
  * Windows-specific path definitions
diff --git a/lib/isc/win32/include/isc/offset.h b/lib/isc/win32/include/isc/offset.h
index 2206934b7f9..14ef06fa385 100644
--- a/lib/isc/win32/include/isc/offset.h
+++ b/lib/isc/win32/include/isc/offset.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: offset.h,v 1.6 2007/06/19 23:47:20 tbox Exp $ */
 
 #ifndef ISC_OFFSET_H
 #define ISC_OFFSET_H 1
diff --git a/lib/isc/win32/include/isc/once.h b/lib/isc/win32/include/isc/once.h
index 750dbfd1e48..c005b0b06b0 100644
--- a/lib/isc/win32/include/isc/once.h
+++ b/lib/isc/win32/include/isc/once.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: once.h,v 1.9 2007/06/19 23:47:20 tbox Exp $ */
 
 #ifndef ISC_ONCE_H
 #define ISC_ONCE_H 1
diff --git a/lib/isc/win32/include/isc/platform.h.in b/lib/isc/win32/include/isc/platform.h.in
index 9cf466919a4..d7f94a6ff09 100644
--- a/lib/isc/win32/include/isc/platform.h.in
+++ b/lib/isc/win32/include/isc/platform.h.in
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: platform.h,v 1.19 2009/09/29 23:48:04 tbox Exp $ */
-
 #ifndef ISC_PLATFORM_H
 #define ISC_PLATFORM_H 1
 
diff --git a/lib/isc/win32/include/isc/stat.h b/lib/isc/win32/include/isc/stat.h
index bc4195d2972..8b7d6850b0d 100644
--- a/lib/isc/win32/include/isc/stat.h
+++ b/lib/isc/win32/include/isc/stat.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: stat.h,v 1.9 2009/10/01 23:48:08 tbox Exp $ */
 
 #ifndef ISC_STAT_H
 #define ISC_STAT_H 1
diff --git a/lib/isc/win32/include/isc/stdtime.h b/lib/isc/win32/include/isc/stdtime.h
index eccef90394a..0a241c5c75c 100644
--- a/lib/isc/win32/include/isc/stdtime.h
+++ b/lib/isc/win32/include/isc/stdtime.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #ifndef ISC_STDTIME_H
 #define ISC_STDTIME_H 1
diff --git a/lib/isc/win32/include/isc/strerror.h b/lib/isc/win32/include/isc/strerror.h
index e94deab5fd8..ae040a439a3 100644
--- a/lib/isc/win32/include/isc/strerror.h
+++ b/lib/isc/win32/include/isc/strerror.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: strerror.h,v 1.5 2007/06/19 23:47:20 tbox Exp $ */
 
 #ifndef ISC_STRERROR_H
 #define ISC_STRERROR_H
diff --git a/lib/isc/win32/include/isc/syslog.h b/lib/isc/win32/include/isc/syslog.h
index 95b699503e3..66431e5c36b 100644
--- a/lib/isc/win32/include/isc/syslog.h
+++ b/lib/isc/win32/include/isc/syslog.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: syslog.h,v 1.5 2007/06/19 23:47:20 tbox Exp $ */
 
 #ifndef ISC_SYSLOG_H
 #define ISC_SYSLOG_H 1
diff --git a/lib/isc/win32/include/isc/thread.h b/lib/isc/win32/include/isc/thread.h
index e85085d0afb..be1343afcb7 100644
--- a/lib/isc/win32/include/isc/thread.h
+++ b/lib/isc/win32/include/isc/thread.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: thread.h,v 1.25 2009/09/29 04:37:08 marka Exp $ */
 
 #ifndef ISC_THREAD_H
 #define ISC_THREAD_H 1
diff --git a/lib/isc/win32/include/isc/time.h b/lib/isc/win32/include/isc/time.h
index ba7ab559da6..ffdd62100f2 100644
--- a/lib/isc/win32/include/isc/time.h
+++ b/lib/isc/win32/include/isc/time.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: time.h,v 1.35 2009/01/05 23:47:54 tbox Exp $ */
 
 #ifndef ISC_TIME_H
 #define ISC_TIME_H 1
diff --git a/lib/isc/win32/include/isc/win32os.h b/lib/isc/win32/include/isc/win32os.h
index 86b4c0c81b4..bc18c40309b 100644
--- a/lib/isc/win32/include/isc/win32os.h
+++ b/lib/isc/win32/include/isc/win32os.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: win32os.h,v 1.7 2009/06/25 23:48:02 tbox Exp $ */
 
 #ifndef ISC_WIN32OS_H
 #define ISC_WIN32OS_H 1
diff --git a/lib/isc/win32/include/pkcs11/Makefile.in b/lib/isc/win32/include/pkcs11/Makefile.in
index 111460f6c45..b1a718ec219 100644
--- a/lib/isc/win32/include/pkcs11/Makefile.in
+++ b/lib/isc/win32/include/pkcs11/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id$
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/win32/interfaceiter.c b/lib/isc/win32/interfaceiter.c
index 08f96f43d9a..9d4e8b95930 100644
--- a/lib/isc/win32/interfaceiter.c
+++ b/lib/isc/win32/interfaceiter.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: interfaceiter.c,v 1.15 2009/01/18 23:48:14 tbox Exp $ */
 
 /*
  * Note that this code will need to be revisited to support IPv6 Interfaces.
diff --git a/lib/isc/win32/ipv6.c b/lib/isc/win32/ipv6.c
index 66284291c07..c2a4ac5b991 100644
--- a/lib/isc/win32/ipv6.c
+++ b/lib/isc/win32/ipv6.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: ipv6.c,v 1.8 2007/06/19 23:47:19 tbox Exp $ */
 
 #include <isc/net.h>
 #include <isc/platform.h>
diff --git a/lib/isc/win32/keyboard.c b/lib/isc/win32/keyboard.c
index 0edec85c231..1566d3fd8f9 100644
--- a/lib/isc/win32/keyboard.c
+++ b/lib/isc/win32/keyboard.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: keyboard.c,v 1.7 2007/06/19 23:47:19 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/lib/isc/win32/libgen.h b/lib/isc/win32/libgen.h
index 9f16865f85d..e74740f63f9 100644
--- a/lib/isc/win32/libgen.h
+++ b/lib/isc/win32/libgen.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: libgen.h,v 1.3 2009/07/17 23:47:41 tbox Exp $ */
 
 #ifndef LIBGEN_H
 #define LIBGEN_H 1
diff --git a/lib/isc/win32/net.c b/lib/isc/win32/net.c
index 152d328c105..c49bb6bedd8 100644
--- a/lib/isc/win32/net.c
+++ b/lib/isc/win32/net.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #include <config.h>
 
diff --git a/lib/isc/win32/netdb.h b/lib/isc/win32/netdb.h
index f794aa66841..a9398c8f155 100644
--- a/lib/isc/win32/netdb.h
+++ b/lib/isc/win32/netdb.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: netdb.h,v 1.9 2009/01/18 23:48:14 tbox Exp $ */
 
 #ifndef NETDB_H
 #define NETDB_H 1
diff --git a/lib/isc/win32/ntgroups.c b/lib/isc/win32/ntgroups.c
index 5ec5c292e78..e3a45ca5108 100644
--- a/lib/isc/win32/ntgroups.c
+++ b/lib/isc/win32/ntgroups.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: ntgroups.c,v 1.12 2009/09/29 23:48:04 tbox Exp $ */
 
 /*
  * The NT Groups have two groups that are not well documented and are
diff --git a/lib/isc/win32/ntpaths.c b/lib/isc/win32/ntpaths.c
index 15b93eae97d..69abaaad5c7 100644
--- a/lib/isc/win32/ntpaths.c
+++ b/lib/isc/win32/ntpaths.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: ntpaths.c,v 1.15 2009/07/14 22:54:57 each Exp $ */
 
 /*
  * This module fetches the required path information that is specific
diff --git a/lib/isc/win32/once.c b/lib/isc/win32/once.c
index 7d4b7830683..baf178d6084 100644
--- a/lib/isc/win32/once.c
+++ b/lib/isc/win32/once.c
@@ -9,10 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: once.c,v 1.12 2007/06/18 23:47:49 tbox Exp $ */
-
-/* Principal Authors: DCL */
-
 #include <config.h>
 
 #include <windows.h>
diff --git a/lib/isc/win32/os.c b/lib/isc/win32/os.c
index d50dc84cdb3..0f4023f4a3e 100644
--- a/lib/isc/win32/os.c
+++ b/lib/isc/win32/os.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: os.c,v 1.8 2007/06/19 23:47:19 tbox Exp $ */
 
 #include <windows.h>
 
diff --git a/lib/isc/win32/pk11_api.c b/lib/isc/win32/pk11_api.c
index e444a6acc03..76e4abb4afb 100644
--- a/lib/isc/win32/pk11_api.c
+++ b/lib/isc/win32/pk11_api.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/win32/resource.c b/lib/isc/win32/resource.c
index 640d668de6b..0fbc9a41cdd 100644
--- a/lib/isc/win32/resource.c
+++ b/lib/isc/win32/resource.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: resource.c,v 1.10 2008/07/11 23:47:09 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/lib/isc/win32/stdio.c b/lib/isc/win32/stdio.c
index 7b3e570c1a2..a4c813459d8 100644
--- a/lib/isc/win32/stdio.c
+++ b/lib/isc/win32/stdio.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: stdio.c,v 1.6 2007/06/19 23:47:19 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/lib/isc/win32/stdtime.c b/lib/isc/win32/stdtime.c
index a4201b6ce92..bff6fd18fd6 100644
--- a/lib/isc/win32/stdtime.c
+++ b/lib/isc/win32/stdtime.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: stdtime.c,v 1.12 2007/06/19 23:47:19 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/lib/isc/win32/strerror.c b/lib/isc/win32/strerror.c
index 137088a1d69..36c9b7985c1 100644
--- a/lib/isc/win32/strerror.c
+++ b/lib/isc/win32/strerror.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: strerror.c,v 1.8 2007/06/19 23:47:19 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/lib/isc/win32/syslog.c b/lib/isc/win32/syslog.c
index d2a1eaa6417..071e18784c4 100644
--- a/lib/isc/win32/syslog.c
+++ b/lib/isc/win32/syslog.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: syslog.c,v 1.10 2007/06/19 23:47:19 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/lib/isc/win32/syslog.h b/lib/isc/win32/syslog.h
index cef1f0b3092..019716555fd 100644
--- a/lib/isc/win32/syslog.h
+++ b/lib/isc/win32/syslog.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: syslog.h,v 1.7 2007/06/19 23:47:19 tbox Exp $ */
 
 #ifndef _SYSLOG_H
 #define _SYSLOG_H
diff --git a/lib/isc/win32/time.c b/lib/isc/win32/time.c
index 5f5c56c265a..61c6dd36c70 100644
--- a/lib/isc/win32/time.c
+++ b/lib/isc/win32/time.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: time.c,v 1.52 2009/08/14 07:51:08 marka Exp $ */
 
 #include <config.h>
 
diff --git a/lib/isc/win32/unistd.h b/lib/isc/win32/unistd.h
index a79e4fc42cc..170577e73d6 100644
--- a/lib/isc/win32/unistd.h
+++ b/lib/isc/win32/unistd.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: unistd.h,v 1.10 2009/07/17 23:47:41 tbox Exp $ */
 
 /* None of these are defined in NT, so define them for our use */
 #define O_NONBLOCK 1
diff --git a/lib/isc/win32/version.c b/lib/isc/win32/version.c
index d9abc7deae4..d86c7812401 100644
--- a/lib/isc/win32/version.c
+++ b/lib/isc/win32/version.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: version.c,v 1.7 2007/06/19 23:47:19 tbox Exp $ */
 
 #include <versions.h>
 
diff --git a/lib/isc/x86_32/Makefile.in b/lib/isc/x86_32/Makefile.in
index b5d0eed25f7..419cf9f8755 100644
--- a/lib/isc/x86_32/Makefile.in
+++ b/lib/isc/x86_32/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/x86_32/include/Makefile.in b/lib/isc/x86_32/include/Makefile.in
index 344085ee9fa..d33c0fcb2c9 100644
--- a/lib/isc/x86_32/include/Makefile.in
+++ b/lib/isc/x86_32/include/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/x86_32/include/isc/Makefile.in b/lib/isc/x86_32/include/isc/Makefile.in
index f164aa3c68c..9f87e48935a 100644
--- a/lib/isc/x86_32/include/isc/Makefile.in
+++ b/lib/isc/x86_32/include/isc/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/x86_32/include/isc/atomic.h b/lib/isc/x86_32/include/isc/atomic.h
index 9e1ba485757..6b0555ec307 100644
--- a/lib/isc/x86_32/include/isc/atomic.h
+++ b/lib/isc/x86_32/include/isc/atomic.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: atomic.h,v 1.10 2008/01/24 23:47:00 tbox Exp $ */
 
 #ifndef ISC_ATOMIC_H
 #define ISC_ATOMIC_H 1
diff --git a/lib/isc/x86_64/Makefile.in b/lib/isc/x86_64/Makefile.in
index b5d0eed25f7..419cf9f8755 100644
--- a/lib/isc/x86_64/Makefile.in
+++ b/lib/isc/x86_64/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/x86_64/include/Makefile.in b/lib/isc/x86_64/include/Makefile.in
index 344085ee9fa..d33c0fcb2c9 100644
--- a/lib/isc/x86_64/include/Makefile.in
+++ b/lib/isc/x86_64/include/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.2 2007/09/14 04:09:59 marka Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/x86_64/include/isc/Makefile.in b/lib/isc/x86_64/include/isc/Makefile.in
index 2e04caf575b..9f87e48935a 100644
--- a/lib/isc/x86_64/include/isc/Makefile.in
+++ b/lib/isc/x86_64/include/isc/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.2 2007/09/14 04:10:00 marka Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isc/x86_64/include/isc/atomic.h b/lib/isc/x86_64/include/isc/atomic.h
index d7a0de70b6f..8d68574aad1 100644
--- a/lib/isc/x86_64/include/isc/atomic.h
+++ b/lib/isc/x86_64/include/isc/atomic.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: atomic.h,v 1.6 2008/01/24 23:47:00 tbox Exp $ */
 
 #ifndef ISC_ATOMIC_H
 #define ISC_ATOMIC_H 1
diff --git a/lib/isccc/alist.c b/lib/isccc/alist.c
index db1e69f618d..063fcee7a6d 100644
--- a/lib/isccc/alist.c
+++ b/lib/isccc/alist.c
@@ -23,7 +23,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: alist.c,v 1.8 2007/08/28 07:20:43 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isccc/base64.c b/lib/isccc/base64.c
index c75bcfb3332..54e8bd0ed81 100644
--- a/lib/isccc/base64.c
+++ b/lib/isccc/base64.c
@@ -23,7 +23,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: base64.c,v 1.8 2007/08/28 07:20:43 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isccc/ccmsg.c b/lib/isccc/ccmsg.c
index 8be0aa733a5..efe3738a1b1 100644
--- a/lib/isccc/ccmsg.c
+++ b/lib/isccc/ccmsg.c
@@ -23,7 +23,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ccmsg.c,v 1.10 2007/08/28 07:20:43 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isccc/include/Makefile.in b/lib/isccc/include/Makefile.in
index 40fb8269dcb..aea49d75028 100644
--- a/lib/isccc/include/Makefile.in
+++ b/lib/isccc/include/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.5 2007/06/19 23:47:22 tbox Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isccc/include/isccc/Makefile.in b/lib/isccc/include/isccc/Makefile.in
index 191a1d3a97f..371f836c366 100644
--- a/lib/isccc/include/isccc/Makefile.in
+++ b/lib/isccc/include/isccc/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.7 2007/06/19 23:47:22 tbox Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isccc/include/isccc/alist.h b/lib/isccc/include/isccc/alist.h
index 7234d49bd96..b3b2abba1df 100644
--- a/lib/isccc/include/isccc/alist.h
+++ b/lib/isccc/include/isccc/alist.h
@@ -23,7 +23,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: alist.h,v 1.10 2007/08/28 07:20:43 tbox Exp $ */
 
 #ifndef ISCCC_ALIST_H
 #define ISCCC_ALIST_H 1
diff --git a/lib/isccc/include/isccc/base64.h b/lib/isccc/include/isccc/base64.h
index e07ea2d77a0..c9bf70a9d7a 100644
--- a/lib/isccc/include/isccc/base64.h
+++ b/lib/isccc/include/isccc/base64.h
@@ -23,7 +23,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: base64.h,v 1.10 2007/08/28 07:20:43 tbox Exp $ */
 
 #ifndef ISCCC_BASE64_H
 #define ISCCC_BASE64_H 1
diff --git a/lib/isccc/include/isccc/cc.h b/lib/isccc/include/isccc/cc.h
index b576289e11a..2891111a92e 100644
--- a/lib/isccc/include/isccc/cc.h
+++ b/lib/isccc/include/isccc/cc.h
@@ -23,7 +23,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: cc.h,v 1.11 2007/08/28 07:20:43 tbox Exp $ */
 
 #ifndef ISCCC_CC_H
 #define ISCCC_CC_H 1
diff --git a/lib/isccc/include/isccc/ccmsg.h b/lib/isccc/include/isccc/ccmsg.h
index 4a501faee88..56f7237b1c2 100644
--- a/lib/isccc/include/isccc/ccmsg.h
+++ b/lib/isccc/include/isccc/ccmsg.h
@@ -23,7 +23,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ccmsg.h,v 1.11 2007/08/28 07:20:43 tbox Exp $ */
 
 #ifndef ISCCC_CCMSG_H
 #define ISCCC_CCMSG_H 1
diff --git a/lib/isccc/include/isccc/events.h b/lib/isccc/include/isccc/events.h
index 0fa57612957..5b6d23fc1de 100644
--- a/lib/isccc/include/isccc/events.h
+++ b/lib/isccc/include/isccc/events.h
@@ -23,7 +23,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: events.h,v 1.10 2007/08/28 07:20:43 tbox Exp $ */
 
 #ifndef ISCCC_EVENTS_H
 #define ISCCC_EVENTS_H 1
diff --git a/lib/isccc/include/isccc/lib.h b/lib/isccc/include/isccc/lib.h
index e1f4519634f..408dee41ee2 100644
--- a/lib/isccc/include/isccc/lib.h
+++ b/lib/isccc/include/isccc/lib.h
@@ -23,7 +23,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lib.h,v 1.11 2007/08/28 07:20:43 tbox Exp $ */
 
 #ifndef ISCCC_LIB_H
 #define ISCCC_LIB_H 1
diff --git a/lib/isccc/include/isccc/result.h b/lib/isccc/include/isccc/result.h
index ae8ac47d346..6ff81ad9d47 100644
--- a/lib/isccc/include/isccc/result.h
+++ b/lib/isccc/include/isccc/result.h
@@ -23,7 +23,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: result.h,v 1.12 2007/08/28 07:20:43 tbox Exp $ */
 
 #ifndef ISCCC_RESULT_H
 #define ISCCC_RESULT_H 1
diff --git a/lib/isccc/include/isccc/sexpr.h b/lib/isccc/include/isccc/sexpr.h
index cbae4345e7c..237cc526de9 100644
--- a/lib/isccc/include/isccc/sexpr.h
+++ b/lib/isccc/include/isccc/sexpr.h
@@ -23,7 +23,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sexpr.h,v 1.11 2007/08/28 07:20:43 tbox Exp $ */
 
 #ifndef ISCCC_SEXPR_H
 #define ISCCC_SEXPR_H 1
diff --git a/lib/isccc/include/isccc/symtab.h b/lib/isccc/include/isccc/symtab.h
index a3af8bfed89..5042fd5577e 100644
--- a/lib/isccc/include/isccc/symtab.h
+++ b/lib/isccc/include/isccc/symtab.h
@@ -23,7 +23,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: symtab.h,v 1.10 2007/08/28 07:20:43 tbox Exp $ */
 
 #ifndef ISCCC_SYMTAB_H
 #define ISCCC_SYMTAB_H 1
diff --git a/lib/isccc/include/isccc/symtype.h b/lib/isccc/include/isccc/symtype.h
index 21ea76637cd..dbd9ad7276d 100644
--- a/lib/isccc/include/isccc/symtype.h
+++ b/lib/isccc/include/isccc/symtype.h
@@ -23,7 +23,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: symtype.h,v 1.10 2007/08/28 07:20:43 tbox Exp $ */
 
 #ifndef ISCCC_SYMTYPE_H
 #define ISCCC_SYMTYPE_H 1
diff --git a/lib/isccc/include/isccc/types.h b/lib/isccc/include/isccc/types.h
index be8ab2f18bb..c06fef08218 100644
--- a/lib/isccc/include/isccc/types.h
+++ b/lib/isccc/include/isccc/types.h
@@ -23,7 +23,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: types.h,v 1.10 2007/08/28 07:20:43 tbox Exp $ */
 
 #ifndef ISCCC_TYPES_H
 #define ISCCC_TYPES_H 1
diff --git a/lib/isccc/include/isccc/util.h b/lib/isccc/include/isccc/util.h
index 8c49b6bdcf1..63a3b4512fe 100644
--- a/lib/isccc/include/isccc/util.h
+++ b/lib/isccc/include/isccc/util.h
@@ -23,7 +23,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: util.h,v 1.11 2007/08/28 07:20:43 tbox Exp $ */
 
 #ifndef ISCCC_UTIL_H
 #define ISCCC_UTIL_H 1
diff --git a/lib/isccc/include/isccc/version.h b/lib/isccc/include/isccc/version.h
index 4348c0688da..dcb352f94ca 100644
--- a/lib/isccc/include/isccc/version.h
+++ b/lib/isccc/include/isccc/version.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: version.h,v 1.9 2007/06/19 23:47:22 tbox Exp $ */
 
 /*! \file isccc/version.h */
 
diff --git a/lib/isccc/lib.c b/lib/isccc/lib.c
index 0d7276682cf..1222bbe5ff6 100644
--- a/lib/isccc/lib.c
+++ b/lib/isccc/lib.c
@@ -23,7 +23,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lib.c,v 1.9 2007/08/28 07:20:43 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isccc/result.c b/lib/isccc/result.c
index 53d06ed0e70..75f5ade7f69 100644
--- a/lib/isccc/result.c
+++ b/lib/isccc/result.c
@@ -23,7 +23,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isccc/symtab.c b/lib/isccc/symtab.c
index 35d46e1166e..6179e8fc076 100644
--- a/lib/isccc/symtab.c
+++ b/lib/isccc/symtab.c
@@ -23,7 +23,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: symtab.c,v 1.11 2007/09/13 04:45:18 each Exp $ */
 
 /*! \file */
 
diff --git a/lib/isccc/version.c b/lib/isccc/version.c
index 2a0769c42ec..a3c1d9bc42f 100644
--- a/lib/isccc/version.c
+++ b/lib/isccc/version.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: version.c,v 1.7 2007/06/19 23:47:22 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isccc/win32/DLLMain.c b/lib/isccc/win32/DLLMain.c
index 4c5374ffdec..8ff101757d0 100644
--- a/lib/isccc/win32/DLLMain.c
+++ b/lib/isccc/win32/DLLMain.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: DLLMain.c,v 1.6 2007/06/18 23:47:50 tbox Exp $ */
 
 #include <windows.h>
 #include <signal.h>
diff --git a/lib/isccc/win32/version.c b/lib/isccc/win32/version.c
index 3fe9b4d5a8f..dfdd947a77c 100644
--- a/lib/isccc/win32/version.c
+++ b/lib/isccc/win32/version.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: version.c,v 1.7 2007/06/19 23:47:22 tbox Exp $ */
 
 #include <versions.h>
 
diff --git a/lib/isccfg/dnsconf.c b/lib/isccfg/dnsconf.c
index 1e6d71c450a..5d150c8028c 100644
--- a/lib/isccfg/dnsconf.c
+++ b/lib/isccfg/dnsconf.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: dnsconf.c,v 1.4 2009/09/02 23:48:03 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isccfg/include/Makefile.in b/lib/isccfg/include/Makefile.in
index 5b0653d63bb..b2d214722ab 100644
--- a/lib/isccfg/include/Makefile.in
+++ b/lib/isccfg/include/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.7 2007/06/19 23:47:22 tbox Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isccfg/include/isccfg/Makefile.in b/lib/isccfg/include/isccfg/Makefile.in
index 11ac7615eb6..e154280a261 100644
--- a/lib/isccfg/include/isccfg/Makefile.in
+++ b/lib/isccfg/include/isccfg/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.12 2007/06/19 23:47:22 tbox Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/isccfg/include/isccfg/aclconf.h b/lib/isccfg/include/isccfg/aclconf.h
index 334d4109bf6..78a16dbcf06 100644
--- a/lib/isccfg/include/isccfg/aclconf.h
+++ b/lib/isccfg/include/isccfg/aclconf.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #ifndef ISCCFG_ACLCONF_H
 #define ISCCFG_ACLCONF_H 1
diff --git a/lib/isccfg/include/isccfg/dnsconf.h b/lib/isccfg/include/isccfg/dnsconf.h
index 809d699f887..51221d37b88 100644
--- a/lib/isccfg/include/isccfg/dnsconf.h
+++ b/lib/isccfg/include/isccfg/dnsconf.h
@@ -12,6 +12,7 @@
 #ifndef ISCCFG_DNSCONF_H
 #define ISCCFG_DNSCONF_H 1
 
+
 /*! \file
  * \brief
  * This module defines the named.conf, rndc.conf, and rndc.key grammars.
diff --git a/lib/isccfg/include/isccfg/log.h b/lib/isccfg/include/isccfg/log.h
index 7513122b8cc..5c7fe95cef9 100644
--- a/lib/isccfg/include/isccfg/log.h
+++ b/lib/isccfg/include/isccfg/log.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: log.h,v 1.14 2009/01/18 23:48:14 tbox Exp $ */
 
 #ifndef ISCCFG_LOG_H
 #define ISCCFG_LOG_H 1
diff --git a/lib/isccfg/include/isccfg/namedconf.h b/lib/isccfg/include/isccfg/namedconf.h
index 61464eb3246..0a191c9a33b 100644
--- a/lib/isccfg/include/isccfg/namedconf.h
+++ b/lib/isccfg/include/isccfg/namedconf.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: namedconf.h,v 1.18 2010/08/11 18:14:20 each Exp $ */
 
 #ifndef ISCCFG_NAMEDCONF_H
 #define ISCCFG_NAMEDCONF_H 1
diff --git a/lib/isccfg/include/isccfg/version.h b/lib/isccfg/include/isccfg/version.h
index f02cb65a3d7..2e9a139209c 100644
--- a/lib/isccfg/include/isccfg/version.h
+++ b/lib/isccfg/include/isccfg/version.h
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: version.h,v 1.9 2007/06/19 23:47:22 tbox Exp $ */
 
 /*! \file isccfg/version.h */
 
diff --git a/lib/isccfg/log.c b/lib/isccfg/log.c
index fbf93085fc9..4fd5e5726f1 100644
--- a/lib/isccfg/log.c
+++ b/lib/isccfg/log.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: log.c,v 1.11 2007/06/19 23:47:22 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isccfg/version.c b/lib/isccfg/version.c
index 393879a8b08..51ed4b53e72 100644
--- a/lib/isccfg/version.c
+++ b/lib/isccfg/version.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: version.c,v 1.7 2007/06/19 23:47:22 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isccfg/win32/DLLMain.c b/lib/isccfg/win32/DLLMain.c
index db53ffa0e3d..93c2893b1e0 100644
--- a/lib/isccfg/win32/DLLMain.c
+++ b/lib/isccfg/win32/DLLMain.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: DLLMain.c,v 1.6 2007/06/18 23:47:51 tbox Exp $ */
 
 #include <windows.h>
 #include <signal.h>
diff --git a/lib/isccfg/win32/version.c b/lib/isccfg/win32/version.c
index d44cf8f93bc..4a69e878f7d 100644
--- a/lib/isccfg/win32/version.c
+++ b/lib/isccfg/win32/version.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: version.c,v 1.6 2007/06/19 23:47:22 tbox Exp $ */
 
 #include <versions.h>
 
diff --git a/lib/ns/win32/DLLMain.c b/lib/ns/win32/DLLMain.c
index 005df49d254..8ff101757d0 100644
--- a/lib/ns/win32/DLLMain.c
+++ b/lib/ns/win32/DLLMain.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: DLLMain.c,v 1.6 2007/06/18 23:47:44 tbox Exp $ */
 
 #include <windows.h>
 #include <signal.h>
diff --git a/lib/samples/nsprobe.c b/lib/samples/nsprobe.c
index a6c59880e55..eb4b8af4f06 100644
--- a/lib/samples/nsprobe.c
+++ b/lib/samples/nsprobe.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
 
 #include <config.h>
 
diff --git a/lib/samples/sample-async.c b/lib/samples/sample-async.c
index a52de9c4cf0..dfa1a052c91 100644
--- a/lib/samples/sample-async.c
+++ b/lib/samples/sample-async.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: sample-async.c,v 1.5 2009/09/29 15:06:07 fdupont Exp $ */
 
 #include <config.h>
 
diff --git a/lib/samples/sample-gai.c b/lib/samples/sample-gai.c
index bc9dcadff67..8b56ab9c170 100644
--- a/lib/samples/sample-gai.c
+++ b/lib/samples/sample-gai.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: sample-gai.c,v 1.4 2009/09/02 23:48:02 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/lib/samples/sample-request.c b/lib/samples/sample-request.c
index 90644c0f666..e60a6df8592 100644
--- a/lib/samples/sample-request.c
+++ b/lib/samples/sample-request.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: sample-request.c,v 1.5 2009/09/29 15:06:07 fdupont Exp $ */
 
 #include <config.h>
 
diff --git a/lib/samples/sample-update.c b/lib/samples/sample-update.c
index d948f7e7f75..d452e434aca 100644
--- a/lib/samples/sample-update.c
+++ b/lib/samples/sample-update.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: sample-update.c,v 1.10 2010/12/09 00:54:34 marka Exp $ */
 
 #include <config.h>
 
diff --git a/lib/win32/bindevt/bindevt.c b/lib/win32/bindevt/bindevt.c
index 0fe686898ec..d74a2f1c3d5 100644
--- a/lib/win32/bindevt/bindevt.c
+++ b/lib/win32/bindevt/bindevt.c
@@ -9,7 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id: bindevt.c,v 1.5 2007/06/19 23:47:24 tbox Exp $ */
 
 /*
  * bindevt.c : Defines the entry point for event log viewer DLL.
diff --git a/lib/win32/bindevt/bindevt.mc b/lib/win32/bindevt/bindevt.mc
index be88219b99a..7d34547211c 100644
--- a/lib/win32/bindevt/bindevt.mc
+++ b/lib/win32/bindevt/bindevt.mc
@@ -7,8 +7,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-; $Id: bindevt.mc,v 1.4 2007/06/19 23:47:24 tbox Exp $
-
 MessageIdTypedef=DWORD
 
 LanguageNames = (English=0x409:MSG00409)
diff --git a/make/Makefile.in b/make/Makefile.in
index a6f72130266..1c2b35ee0b9 100644
--- a/make/Makefile.in
+++ b/make/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id: Makefile.in,v 1.16 2007/06/19 23:47:24 tbox Exp $
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/mkinstalldirs b/mkinstalldirs
index 4992567c972..f945dbf2bce 100644
--- a/mkinstalldirs
+++ b/mkinstalldirs
@@ -4,8 +4,6 @@
 # Created: 1993-05-16
 # Public domain
 
-# $Id: mkinstalldirs,v 1.1 2000/09/20 19:05:51 gson Exp $
-
 errstatus=0
 
 for file
diff --git a/unit/Makefile.in b/unit/Makefile.in
index cc19c720740..342380ece60 100644
--- a/unit/Makefile.in
+++ b/unit/Makefile.in
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id$
-
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/util/altbuild.sh b/util/altbuild.sh
index 889b6901f95..a6f472cdb7a 100644
--- a/util/altbuild.sh
+++ b/util/altbuild.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id$
-
 #
 # "Alternative build" test.
 #
diff --git a/util/check-instincludes.sh b/util/check-instincludes.sh
index f445641c772..b84f3f8bce1 100644
--- a/util/check-instincludes.sh
+++ b/util/check-instincludes.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id$
-
 #
 # Check the installed bind9 header files to make sure that no header
 # depends on another header having been included first, and that
diff --git a/util/check-pullups.pl b/util/check-pullups.pl
index a66a663d41c..66a878c3a58 100644
--- a/util/check-pullups.pl
+++ b/util/check-pullups.pl
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id$
-
 # Given two CHANGES files, list [bug] entries present in the
 # first one but not in the second one.
 #
diff --git a/util/check-sources.pl b/util/check-sources.pl
index 8891293bff2..b18e575bac8 100644
--- a/util/check-sources.pl
+++ b/util/check-sources.pl
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id$
-
 # Rudimentary, primarily for use by the developers.
 # This just evolved with no serious attempt at making it
 # bulletproof or foolproof.  Or pretty even.  Probably would
diff --git a/util/commit-arm.sh b/util/commit-arm.sh
index 762b1d5c4e3..14288711a7c 100644
--- a/util/commit-arm.sh
+++ b/util/commit-arm.sh
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id$
-
 ps=`git log -1 --date=raw --pretty=format:%ad -- doc/arm/Bv9ARM.pdf | awk '{print $1;}'`
 for f in doc/arm/*.html
 do
diff --git a/util/kit.sh b/util/kit.sh
index 1e71f202bf2..5517f7831ea 100644
--- a/util/kit.sh
+++ b/util/kit.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id$
-
 # Make a release kit
 #
 # Usage: sh kit.sh tag tmpdir
diff --git a/util/mandoc2docbook.pl b/util/mandoc2docbook.pl
index 4a3261c05fe..d48ead78788 100644
--- a/util/mandoc2docbook.pl
+++ b/util/mandoc2docbook.pl
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id$
-
 #
 # Do a quick-and-dirty conversion of .mandoc man pages to
 # DocBook SGML.
diff --git a/util/mdnbuildtest.sh b/util/mdnbuildtest.sh
index fb2b99d6cd8..8fd166868dd 100644
--- a/util/mdnbuildtest.sh
+++ b/util/mdnbuildtest.sh
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id$
-
 # XXXDCL This is currently much too specific to the environment in which
 # it was written (NetBSD 1.5_alpha2 with libiconv in /usr/local/lib).  It
 # is essentially just a copy of the commands I used to test building of
diff --git a/util/memleak.pl b/util/memleak.pl
index 1e12760be2b..6cb43d0bf30 100644
--- a/util/memleak.pl
+++ b/util/memleak.pl
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id$
-
 # Massage the output from ISC_MEM_DEBUG to extract mem_get() calls
 # with no corresponding mem_put().
 
diff --git a/util/mksymtbl.pl b/util/mksymtbl.pl
index c5205bbea09..47941da7d83 100755
--- a/util/mksymtbl.pl
+++ b/util/mksymtbl.pl
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id$
-
 use strict;
 use diagnostics;
 $^W = 1;
diff --git a/util/nanny.pl b/util/nanny.pl
index 2cd17711af8..81a5f9575ee 100644
--- a/util/nanny.pl
+++ b/util/nanny.pl
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id$
-
 # A simple nanny to make sure named stays running.
 
 $pid_file_location = '/var/run/named.pid';
diff --git a/util/new-func b/util/new-func
index 8ec849d724f..74a2b02a2ff 100644
--- a/util/new-func
+++ b/util/new-func
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id$
-
 # Given two CHANGES files, list [bug] entries present in the
 # first one but not in the second one.
 #
diff --git a/util/nt-kit b/util/nt-kit
index 8bcb432896a..cdb00d0d79f 100644
--- a/util/nt-kit
+++ b/util/nt-kit
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id$
-
 # XXX no command line options at all.  especially useful would be a way
 # to specify the target directory on the NT machine, since it is needed
 # in the Makefiles and otherwise config.status.win32 needs to be edited.
diff --git a/util/spacewhack.pl b/util/spacewhack.pl
index 13e21ac5dcb..9782f77ffd1 100644
--- a/util/spacewhack.pl
+++ b/util/spacewhack.pl
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id$
-
 $0 =~ s%.*/%%;
 
 if (@ARGV != 0) {
diff --git a/util/tabify-changes b/util/tabify-changes
index 05d8b20265b..04065c8986a 100644
--- a/util/tabify-changes
+++ b/util/tabify-changes
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id$
-
 expand ${1} |
 sed \
 -e 's/^\([1-9][0-9][0-9][0-9][0-9][0-9]\.\) */\1	/' \
diff --git a/util/update-drafts.pl b/util/update-drafts.pl
index 308d57a05a0..9a606b14ce2 100644
--- a/util/update-drafts.pl
+++ b/util/update-drafts.pl
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id$
-
 #
 # Replace internet drafts with updated versions, if any.
 #
diff --git a/util/update_branches b/util/update_branches
index 0033f14446f..79e95b17b30 100644
--- a/util/update_branches
+++ b/util/update_branches
@@ -9,8 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id$
-
 #
 #  Track which branches are still open or not in the bind9 cvs repository.
 #  This is done so that work that is "in progress" (active) doesn't get
diff --git a/util/xc b/util/xc
index 5675ee5d771..73b7b11202e 100755
--- a/util/xc
+++ b/util/xc
@@ -7,8 +7,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# $Id$
-
 #
 #	test cross compiler
 #
diff --git a/win32utils/index.html b/win32utils/index.html
index e7bac6d4f14..04e6dfbf07d 100644
--- a/win32utils/index.html
+++ b/win32utils/index.html
@@ -9,8 +9,6 @@
  - information regarding copyright ownership.
 -->
 
-<!-- $Id$ -->
-
 <html>
 <head>
 <title>Bind9 docs index</title>