diff --git a/bin/tests/byname_test.c b/bin/tests/byname_test.c
index 9d8af8f806..3c01b73b1d 100644
--- a/bin/tests/byname_test.c
+++ b/bin/tests/byname_test.c
@@ -15,8 +15,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: byname_test.c,v 1.33 2009/09/02 23:48:01 tbox Exp $ */
-
/*! \file
* \author
* Principal Author: Bob Halley
diff --git a/bin/tests/system/dname/ns1/root.db b/bin/tests/system/dname/ns1/root.db
index bce6319e23..3d55ace4b7 100644
--- a/bin/tests/system/dname/ns1/root.db
+++ b/bin/tests/system/dname/ns1/root.db
@@ -12,8 +12,6 @@
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; PERFORMANCE OF THIS SOFTWARE.
-; $Id$
-
$TTL 300
. IN SOA gson.nominum.com. a.root.servers.nil. (
2000042100 ; serial
diff --git a/bin/tests/system/dname/tests.sh b/bin/tests/system/dname/tests.sh
index e434786daf..6a06276cce 100644
--- a/bin/tests/system/dname/tests.sh
+++ b/bin/tests/system/dname/tests.sh
@@ -14,8 +14,6 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
-# $Id: tests.sh,v 1.2 2011/03/18 21:14:19 fdupont Exp $
-
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/smartsign/tests.sh b/bin/tests/system/smartsign/tests.sh
index b018d2eb8e..541f24ae5f 100644
--- a/bin/tests/system/smartsign/tests.sh
+++ b/bin/tests/system/smartsign/tests.sh
@@ -14,8 +14,6 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
-# $Id: tests.sh,v 1.21 2012/02/09 23:47:18 tbox Exp $
-
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
diff --git a/doc/arm/notes.html b/doc/arm/notes.html
index 8ef41e2196..b34a5604a4 100644
--- a/doc/arm/notes.html
+++ b/doc/arm/notes.html
@@ -12,7 +12,6 @@
- OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- PERFORMANCE OF THIS SOFTWARE.
-->
-
diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c
index b1df70aaf1..3371af0baa 100644
--- a/lib/dns/dispatch.c
+++ b/lib/dns/dispatch.c
@@ -15,8 +15,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: dispatch.c,v 1.175 2011/11/29 01:03:47 marka Exp $ */
-
/*! \file */
#include
diff --git a/lib/dns/include/dns/masterdump.h b/lib/dns/include/dns/masterdump.h
index 1c0bce2eda..b34c4b28c5 100644
--- a/lib/dns/include/dns/masterdump.h
+++ b/lib/dns/include/dns/masterdump.h
@@ -15,8 +15,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $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/types.h b/lib/dns/include/dns/types.h
index 59fe16e5aa..964d40c640 100644
--- a/lib/dns/include/dns/types.h
+++ b/lib/dns/include/dns/types.h
@@ -15,8 +15,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id$ */
-
#ifndef DNS_TYPES_H
#define DNS_TYPES_H 1
diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c
index 9efd40d0b4..9e71fd79df 100644
--- a/lib/dns/masterdump.c
+++ b/lib/dns/masterdump.c
@@ -15,8 +15,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id$ */
-
/*! \file */
#include
diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c
index b65ff7fe08..fc13bdd431 100644
--- a/lib/dns/openssl_link.c
+++ b/lib/dns/openssl_link.c
@@ -31,7 +31,6 @@
/*
* Principal Author: Brian Wellington
- * $Id$
*/
#ifdef OPENSSL
diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c
index 690dbd06b9..9aa10c20ed 100644
--- a/lib/dns/opensslrsa_link.c
+++ b/lib/dns/opensslrsa_link.c
@@ -17,7 +17,6 @@
/*
* Principal Author: Brian Wellington
- * $Id$
*/
#ifdef OPENSSL
#include
diff --git a/lib/dns/pkcs11rsa_link.c b/lib/dns/pkcs11rsa_link.c
index d856141f12..8f5d47c6df 100644
--- a/lib/dns/pkcs11rsa_link.c
+++ b/lib/dns/pkcs11rsa_link.c
@@ -14,8 +14,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id$ */
-
#ifdef PKCS11CRYPTO
#include
diff --git a/lib/dns/rdataset.c b/lib/dns/rdataset.c
index d1614ea553..ad2410dcbd 100644
--- a/lib/dns/rdataset.c
+++ b/lib/dns/rdataset.c
@@ -15,8 +15,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id$ */
-
/*! \file */
#include
diff --git a/lib/isc/include/isc/event.h b/lib/isc/include/isc/event.h
index c96e89472f..cd731ae377 100644
--- a/lib/isc/include/isc/event.h
+++ b/lib/isc/include/isc/event.h
@@ -15,8 +15,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $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/ratelimiter.c b/lib/isc/ratelimiter.c
index b5d8f0f11a..3f0e64b696 100644
--- a/lib/isc/ratelimiter.c
+++ b/lib/isc/ratelimiter.c
@@ -15,8 +15,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: ratelimiter.c,v 1.25 2007/06/19 23:47:17 tbox Exp $ */
-
/*! \file */
#include
diff --git a/util/bindkeys.pl b/util/bindkeys.pl
index 8a820c8945..6e61382248 100755
--- a/util/bindkeys.pl
+++ b/util/bindkeys.pl
@@ -14,8 +14,6 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
-# $Id: bindkeys.pl,v 1.7 2011/01/04 23:47:13 tbox Exp $
-
use strict;
use warnings;