diff --git a/lib/dns/master.c b/lib/dns/master.c
index 0bf22f0430..2bfd00c514 100644
--- a/lib/dns/master.c
+++ b/lib/dns/master.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: master.c,v 1.184 2012/02/13 23:46:24 marka Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c
index 9bda235f68..b41ab850ef 100644
--- a/lib/dns/masterdump.c
+++ b/lib/dns/masterdump.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: masterdump.c,v 1.113 2011/12/20 00:06:53 marka Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/name.c b/lib/dns/name.c
index 7640315e76..fb0f67420d 100644
--- a/lib/dns/name.c
+++ b/lib/dns/name.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: name.c,v 1.175 2011/03/11 06:11:23 marka Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/ncache.c b/lib/dns/ncache.c
index abecb87787..45b55f4764 100644
--- a/lib/dns/ncache.c
+++ b/lib/dns/ncache.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ncache.c,v 1.54 2011/06/08 22:13:50 each Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/nsec.c b/lib/dns/nsec.c
index 06137aa1dd..35ed7dbf6a 100644
--- a/lib/dns/nsec.c
+++ b/lib/dns/nsec.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsec.c,v 1.16 2011/06/10 01:51:09 each Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/nsec3.c b/lib/dns/nsec3.c
index 747acb861d..44cc652791 100644
--- a/lib/dns/nsec3.c
+++ b/lib/dns/nsec3.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsec3.c,v 1.26 2012/01/27 23:46:58 tbox Exp $ */
+/* $Id$ */
 
 #include <config.h>
 
diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c
index 568f7fd5ad..ecdebc1ec5 100644
--- a/lib/dns/openssl_link.c
+++ b/lib/dns/openssl_link.c
@@ -31,7 +31,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: openssl_link.c,v 1.31 2011/03/12 04:59:48 tbox Exp $
+ * $Id$
  */
 #ifdef OPENSSL
 
diff --git a/lib/dns/openssldsa_link.c b/lib/dns/openssldsa_link.c
index e9bb9fb100..048f98e03c 100644
--- a/lib/dns/openssldsa_link.c
+++ b/lib/dns/openssldsa_link.c
@@ -29,7 +29,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: openssldsa_link.c,v 1.21 2011/03/11 06:11:24 marka Exp $ */
+/* $Id$ */
 
 #ifdef OPENSSL
 #ifndef USE_EVP
diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c
index e80333863d..5683d3feb3 100644
--- a/lib/dns/opensslrsa_link.c
+++ b/lib/dns/opensslrsa_link.c
@@ -17,7 +17,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: opensslrsa_link.c,v 1.41 2011/03/11 02:59:37 marka Exp $
+ * $Id$
  */
 #ifdef OPENSSL
 #include <config.h>
diff --git a/lib/dns/private.c b/lib/dns/private.c
index 311f0f7c8c..0d15747d6d 100644
--- a/lib/dns/private.c
+++ b/lib/dns/private.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: private.c,v 1.7 2011/10/28 06:20:06 each Exp $ */
+/* $Id$ */
 
 #include "config.h"
 
diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c
index 3664d318ce..7de2fd45d3 100644
--- a/lib/dns/rbt.c
+++ b/lib/dns/rbt.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbt.c,v 1.149 2011/08/25 05:56:50 marka Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/rbtdb.h b/lib/dns/rbtdb.h
index 7ba9288c02..d7610edf8b 100644
--- a/lib/dns/rbtdb.h
+++ b/lib/dns/rbtdb.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbtdb.h,v 1.20 2011/03/03 23:47:32 tbox Exp $ */
+/* $Id$ */
 
 #ifndef DNS_RBTDB_H
 #define DNS_RBTDB_H 1
diff --git a/lib/dns/rcode.c b/lib/dns/rcode.c
index 491d14287f..2386297074 100644
--- a/lib/dns/rcode.c
+++ b/lib/dns/rcode.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rcode.c,v 1.18 2011/02/21 23:47:45 tbox Exp $ */
+/* $Id$ */
 
 #include <config.h>
 #include <ctype.h>
diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c
index f7c1f0e6f8..614bafa9ac 100644
--- a/lib/dns/rdata.c
+++ b/lib/dns/rdata.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdata.c,v 1.215 2011/12/22 07:41:29 marka Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/rdata/any_255/tsig_250.c b/lib/dns/rdata/any_255/tsig_250.c
index b68f672e24..9cdb66ca44 100644
--- a/lib/dns/rdata/any_255/tsig_250.c
+++ b/lib/dns/rdata/any_255/tsig_250.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tsig_250.c,v 1.67 2011/03/05 23:52:30 tbox Exp $ */
+/* $Id$ */
 
 /* Reviewed: Thu Mar 16 13:39:43 PST 2000 by gson */
 
diff --git a/lib/dns/rdata/generic/cert_37.c b/lib/dns/rdata/generic/cert_37.c
index 02122a9ecb..329c8d8b95 100644
--- a/lib/dns/rdata/generic/cert_37.c
+++ b/lib/dns/rdata/generic/cert_37.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: cert_37.c,v 1.54 2011/03/05 23:52:30 tbox Exp $ */
+/* $Id$ */
 
 /* Reviewed: Wed Mar 15 21:14:32 EST 2000 by tale */
 
diff --git a/lib/dns/rdata/generic/dlv_32769.c b/lib/dns/rdata/generic/dlv_32769.c
index 44b4336875..eea81d6d20 100644
--- a/lib/dns/rdata/generic/dlv_32769.c
+++ b/lib/dns/rdata/generic/dlv_32769.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dlv_32769.c,v 1.12 2011/03/05 23:52:31 tbox Exp $ */
+/* $Id$ */
 
 /* draft-ietf-dnsext-delegation-signer-05.txt */
 
diff --git a/lib/dns/rdata/generic/dnskey_48.c b/lib/dns/rdata/generic/dnskey_48.c
index 42db8b3196..84ab15652e 100644
--- a/lib/dns/rdata/generic/dnskey_48.c
+++ b/lib/dns/rdata/generic/dnskey_48.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnskey_48.c,v 1.12 2011/03/05 23:52:31 tbox Exp $ */
+/* $Id$ */
 
 /*
  * Reviewed: Wed Mar 15 16:47:10 PST 2000 by halley.
diff --git a/lib/dns/rdata/generic/ds_43.c b/lib/dns/rdata/generic/ds_43.c
index 72906909b5..cb018a8b12 100644
--- a/lib/dns/rdata/generic/ds_43.c
+++ b/lib/dns/rdata/generic/ds_43.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ds_43.c,v 1.18 2011/03/05 23:52:31 tbox Exp $ */
+/* $Id$ */
 
 /* draft-ietf-dnsext-delegation-signer-05.txt */
 
diff --git a/lib/dns/rdata/generic/ipseckey_45.c b/lib/dns/rdata/generic/ipseckey_45.c
index 82b506707d..eff25354d6 100644
--- a/lib/dns/rdata/generic/ipseckey_45.c
+++ b/lib/dns/rdata/generic/ipseckey_45.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ipseckey_45.c,v 1.12 2011/03/05 19:39:07 each Exp $ */
+/* $Id$ */
 
 #ifndef RDATA_GENERIC_IPSECKEY_45_C
 #define RDATA_GENERIC_IPSECKEY_45_C
diff --git a/lib/dns/rdata/generic/key_25.c b/lib/dns/rdata/generic/key_25.c
index dfdc650995..0d9a5cd10d 100644
--- a/lib/dns/rdata/generic/key_25.c
+++ b/lib/dns/rdata/generic/key_25.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: key_25.c,v 1.55 2011/03/05 23:52:31 tbox Exp $ */
+/* $Id$ */
 
 /*
  * Reviewed: Wed Mar 15 16:47:10 PST 2000 by halley.
diff --git a/lib/dns/rdata/generic/keydata_65533.c b/lib/dns/rdata/generic/keydata_65533.c
index 82edb5ab0c..285955c997 100644
--- a/lib/dns/rdata/generic/keydata_65533.c
+++ b/lib/dns/rdata/generic/keydata_65533.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keydata_65533.c,v 1.5 2011/03/05 23:52:31 tbox Exp $ */
+/* $Id$ */
 
 #ifndef GENERIC_KEYDATA_65533_C
 #define GENERIC_KEYDATA_65533_C 1
diff --git a/lib/dns/rdata/generic/naptr_35.c b/lib/dns/rdata/generic/naptr_35.c
index 8fc99d4aa1..a5882efd1f 100644
--- a/lib/dns/rdata/generic/naptr_35.c
+++ b/lib/dns/rdata/generic/naptr_35.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: naptr_35.c,v 1.2 2011/08/16 23:46:36 tbox Exp $ */
+/* $Id$ */
 
 /* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */
 
diff --git a/lib/dns/rdata/generic/naptr_35.h b/lib/dns/rdata/generic/naptr_35.h
index 49cd83ed9a..137c44f09d 100644
--- a/lib/dns/rdata/generic/naptr_35.h
+++ b/lib/dns/rdata/generic/naptr_35.h
@@ -18,7 +18,7 @@
 #ifndef GENERIC_NAPTR_35_H
 #define GENERIC_NAPTR_35_H 1
 
-/* $Id: naptr_35.h,v 1.2 2011/08/16 23:46:36 tbox Exp $ */
+/* $Id$ */
 
 /*!
  *  \brief Per RFC2915 */
diff --git a/lib/dns/rdata/generic/nsec3_50.c b/lib/dns/rdata/generic/nsec3_50.c
index ad10a59376..3865433bda 100644
--- a/lib/dns/rdata/generic/nsec3_50.c
+++ b/lib/dns/rdata/generic/nsec3_50.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsec3_50.c,v 1.11 2011/10/05 03:47:59 marka Exp $ */
+/* $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 a81c2fa741..02d77a143f 100644
--- a/lib/dns/rdata/generic/nsec3_50.h
+++ b/lib/dns/rdata/generic/nsec3_50.h
@@ -18,7 +18,7 @@
 #ifndef GENERIC_NSEC3_50_H
 #define GENERIC_NSEC3_50_H 1
 
-/* $Id: nsec3_50.h,v 1.6 2011/06/10 23:47:32 tbox Exp $ */
+/* $Id$ */
 
 /*!
  * \brief Per RFC 5155 */
diff --git a/lib/dns/rdata/generic/null_10.c b/lib/dns/rdata/generic/null_10.c
index b9540f7a9a..eefa632f88 100644
--- a/lib/dns/rdata/generic/null_10.c
+++ b/lib/dns/rdata/generic/null_10.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: null_10.c,v 1.46 2011/11/02 23:46:24 tbox Exp $ */
+/* $Id$ */
 
 /* Reviewed: Thu Mar 16 13:57:50 PST 2000 by explorer */
 
diff --git a/lib/dns/rdata/generic/opt_41.c b/lib/dns/rdata/generic/opt_41.c
index e597b53019..11e2c87d2a 100644
--- a/lib/dns/rdata/generic/opt_41.c
+++ b/lib/dns/rdata/generic/opt_41.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: opt_41.c,v 1.37 2011/03/05 23:52:31 tbox Exp $ */
+/* $Id$ */
 
 /* Reviewed: Thu Mar 16 14:06:44 PST 2000 by gson */
 
diff --git a/lib/dns/rdata/generic/rrsig_46.c b/lib/dns/rdata/generic/rrsig_46.c
index 9234e28429..bb81e88af2 100644
--- a/lib/dns/rdata/generic/rrsig_46.c
+++ b/lib/dns/rdata/generic/rrsig_46.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rrsig_46.c,v 1.15 2011/03/05 19:39:07 each Exp $ */
+/* $Id$ */
 
 /* Reviewed: Fri Mar 17 09:05:02 PST 2000 by gson */
 
diff --git a/lib/dns/rdata/generic/sig_24.c b/lib/dns/rdata/generic/sig_24.c
index 7988eaa271..6fa0ab0f9b 100644
--- a/lib/dns/rdata/generic/sig_24.c
+++ b/lib/dns/rdata/generic/sig_24.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sig_24.c,v 1.70 2011/03/05 23:52:31 tbox Exp $ */
+/* $Id$ */
 
 /* Reviewed: Fri Mar 17 09:05:02 PST 2000 by gson */
 
diff --git a/lib/dns/rdata/generic/soa_6.c b/lib/dns/rdata/generic/soa_6.c
index 8491181dcc..0fc4b3b0d6 100644
--- a/lib/dns/rdata/generic/soa_6.c
+++ b/lib/dns/rdata/generic/soa_6.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: soa_6.c,v 1.66 2011/03/05 23:52:31 tbox Exp $ */
+/* $Id$ */
 
 /* Reviewed: Thu Mar 16 15:18:32 PST 2000 by explorer */
 
diff --git a/lib/dns/rdata/generic/sshfp_44.c b/lib/dns/rdata/generic/sshfp_44.c
index 5b1bbb6ba1..70fd469a50 100644
--- a/lib/dns/rdata/generic/sshfp_44.c
+++ b/lib/dns/rdata/generic/sshfp_44.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sshfp_44.c,v 1.11 2011/03/05 23:52:31 tbox Exp $ */
+/* $Id$ */
 
 /* RFC 4255 */
 
diff --git a/lib/dns/rdata/generic/tkey_249.c b/lib/dns/rdata/generic/tkey_249.c
index e3c40afe35..6b8f8715fa 100644
--- a/lib/dns/rdata/generic/tkey_249.c
+++ b/lib/dns/rdata/generic/tkey_249.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tkey_249.c,v 1.61 2011/03/05 23:52:31 tbox Exp $ */
+/* $Id$ */
 
 /*
  * Reviewed: Thu Mar 16 17:35:30 PST 2000 by halley.
diff --git a/lib/dns/rdata/generic/uri_256.c b/lib/dns/rdata/generic/uri_256.c
index 3197540a37..c4ed597344 100644
--- a/lib/dns/rdata/generic/uri_256.c
+++ b/lib/dns/rdata/generic/uri_256.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: uri_256.c,v 1.2 2011/03/03 14:10:27 fdupont Exp $ */
+/* $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 9433dfa199..d338b1d2eb 100644
--- a/lib/dns/rdata/generic/uri_256.h
+++ b/lib/dns/rdata/generic/uri_256.h
@@ -17,7 +17,7 @@
 #ifndef GENERIC_URI_256_H
 #define GENERIC_URI_256_H 1
 
-/* $Id: uri_256.h,v 1.2 2011/03/03 14:10:27 fdupont Exp $ */
+/* $Id$ */
 
 typedef struct dns_rdata_uri {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/in_1/dhcid_49.c b/lib/dns/rdata/in_1/dhcid_49.c
index 8810d4e933..60fd55ca1e 100644
--- a/lib/dns/rdata/in_1/dhcid_49.c
+++ b/lib/dns/rdata/in_1/dhcid_49.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dhcid_49.c,v 1.9 2011/03/05 23:52:31 tbox Exp $ */
+/* $Id$ */
 
 /* RFC 4701 */
 
diff --git a/lib/dns/rdata/in_1/wks_11.c b/lib/dns/rdata/in_1/wks_11.c
index 21831f0770..5a33d26aec 100644
--- a/lib/dns/rdata/in_1/wks_11.c
+++ b/lib/dns/rdata/in_1/wks_11.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: wks_11.c,v 1.59 2011/11/30 23:46:25 tbox Exp $ */
+/* $Id$ */
 
 /* Reviewed: Fri Mar 17 15:01:49 PST 2000 by explorer */
 
diff --git a/lib/dns/rdatalist.c b/lib/dns/rdatalist.c
index 57861ac3fd..256ebf5668 100644
--- a/lib/dns/rdatalist.c
+++ b/lib/dns/rdatalist.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdatalist.c,v 1.42 2011/02/21 23:47:45 tbox Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/rdataset.c b/lib/dns/rdataset.c
index c17f661fca..9e8f5476d5 100644
--- a/lib/dns/rdataset.c
+++ b/lib/dns/rdataset.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdataset.c,v 1.91 2011/08/25 06:28:11 marka Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/rdataslab.c b/lib/dns/rdataslab.c
index 51e5a3cd19..3a967d8304 100644
--- a/lib/dns/rdataslab.c
+++ b/lib/dns/rdataslab.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdataslab.c,v 1.55 2011/12/20 00:55:01 marka Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/request.c b/lib/dns/request.c
index f5a62a7619..58c0103f4c 100644
--- a/lib/dns/request.c
+++ b/lib/dns/request.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: request.c,v 1.91 2012/02/07 23:47:24 tbox Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/result.c b/lib/dns/result.c
index e0b9cee5b8..b425541f75 100644
--- a/lib/dns/result.c
+++ b/lib/dns/result.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: result.c,v 1.133 2011/03/21 07:22:13 each Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/rpz.c b/lib/dns/rpz.c
index b41f1fe057..11b0c24ec5 100644
--- a/lib/dns/rpz.c
+++ b/lib/dns/rpz.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rpz.c,v 1.8 2011/10/13 01:32:34 vjs Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/rriterator.c b/lib/dns/rriterator.c
index 7f75c3122a..fbfbebe374 100644
--- a/lib/dns/rriterator.c
+++ b/lib/dns/rriterator.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rriterator.c,v 1.4 2011/11/01 23:47:00 tbox Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/sdb.c b/lib/dns/sdb.c
index ed99ea0e2a..da2abbc166 100644
--- a/lib/dns/sdb.c
+++ b/lib/dns/sdb.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sdb.c,v 1.79 2011/10/11 00:09:03 each Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/sdlz.c b/lib/dns/sdlz.c
index 12b734ef1f..83196a710e 100644
--- a/lib/dns/sdlz.c
+++ b/lib/dns/sdlz.c
@@ -50,7 +50,7 @@
  * USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sdlz.c,v 1.35 2011/12/22 07:15:05 marka Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/spnego.c b/lib/dns/spnego.c
index d05e156e9a..2210085e9c 100644
--- a/lib/dns/spnego.c
+++ b/lib/dns/spnego.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: spnego.c,v 1.20 2011/08/29 04:15:50 marka Exp $ */
+/* $Id$ */
 
 /*! \file
  * \brief
diff --git a/lib/dns/ssu_external.c b/lib/dns/ssu_external.c
index 701c673e0f..0ce580f8aa 100644
--- a/lib/dns/ssu_external.c
+++ b/lib/dns/ssu_external.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ssu_external.c,v 1.8 2011/03/21 19:54:03 each Exp $ */
+/* $Id$ */
 
 /*
  * This implements external update-policy rules.  This allows permission
diff --git a/lib/dns/tests/Makefile.in b/lib/dns/tests/Makefile.in
index 2126a33610..90b8824854 100644
--- a/lib/dns/tests/Makefile.in
+++ b/lib/dns/tests/Makefile.in
@@ -12,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.14 2012/01/27 23:46:58 tbox Exp $
+# $Id$
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/dns/tests/dbdiff_test.c b/lib/dns/tests/dbdiff_test.c
index 6254d8ec29..66891edd5a 100644
--- a/lib/dns/tests/dbdiff_test.c
+++ b/lib/dns/tests/dbdiff_test.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dbdiff_test.c,v 1.2 2011/12/04 23:48:12 marka Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/tests/dbiterator_test.c b/lib/dns/tests/dbiterator_test.c
index 5de57437ae..13e453597f 100644
--- a/lib/dns/tests/dbiterator_test.c
+++ b/lib/dns/tests/dbiterator_test.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dbiterator_test.c,v 1.6 2011/12/04 23:48:12 marka Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/tests/dbversion_test.c b/lib/dns/tests/dbversion_test.c
index 3b1f795d9c..d193f891fb 100644
--- a/lib/dns/tests/dbversion_test.c
+++ b/lib/dns/tests/dbversion_test.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dbversion_test.c,v 1.5 2011/10/13 22:48:24 tbox Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/tests/dnstest.c b/lib/dns/tests/dnstest.c
index 5c38cdf5b9..3cfaf64839 100644
--- a/lib/dns/tests/dnstest.c
+++ b/lib/dns/tests/dnstest.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnstest.c,v 1.11 2011/12/05 23:46:35 tbox Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/tests/dnstest.h b/lib/dns/tests/dnstest.h
index cb6e323953..2c49240bd4 100644
--- a/lib/dns/tests/dnstest.h
+++ b/lib/dns/tests/dnstest.h
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnstest.h,v 1.6 2011/12/05 23:46:35 tbox Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/tests/master_test.c b/lib/dns/tests/master_test.c
index 22ca62e007..bc9cddfb14 100644
--- a/lib/dns/tests/master_test.c
+++ b/lib/dns/tests/master_test.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: master_test.c,v 1.10 2012/02/01 00:20:09 marka Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/tests/mkraw.pl b/lib/dns/tests/mkraw.pl
index 5290fd0de7..2feec3ec91 100644
--- a/lib/dns/tests/mkraw.pl
+++ b/lib/dns/tests/mkraw.pl
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: mkraw.pl,v 1.2 2011/12/08 16:07:22 each Exp $
+# $Id$
 
 # Convert a hexdump to binary format.
 #
diff --git a/lib/dns/tests/nsec3_test.c b/lib/dns/tests/nsec3_test.c
index 3a01ed53c0..99e222c740 100644
--- a/lib/dns/tests/nsec3_test.c
+++ b/lib/dns/tests/nsec3_test.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsec3_test.c,v 1.2 2012/01/27 00:49:42 marka Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/tests/private_test.c b/lib/dns/tests/private_test.c
index 7ca2e16089..d2540903a9 100644
--- a/lib/dns/tests/private_test.c
+++ b/lib/dns/tests/private_test.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: private_test.c,v 1.2 2011/10/28 06:20:07 each Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/tests/testdata/dbiterator/zone1.data b/lib/dns/tests/testdata/dbiterator/zone1.data
index bde515d3e7..089a49c214 100644
--- a/lib/dns/tests/testdata/dbiterator/zone1.data
+++ b/lib/dns/tests/testdata/dbiterator/zone1.data
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: zone1.data,v 1.3 2011/08/23 23:54:00 tbox Exp $
+; $Id$
 
 $TTL 600
 @		in	soa	localhost. postmaster.localhost. (
diff --git a/lib/dns/tests/testdata/diff/zone1.data b/lib/dns/tests/testdata/diff/zone1.data
index ae936477b6..302dc6b589 100644
--- a/lib/dns/tests/testdata/diff/zone1.data
+++ b/lib/dns/tests/testdata/diff/zone1.data
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: zone1.data,v 1.3 2011/12/06 23:46:31 tbox Exp $
+; $Id$
 
 @ 	0	SOA . . 0 0 0 0 0
 @	0	NS @
diff --git a/lib/dns/tests/testdata/diff/zone2.data b/lib/dns/tests/testdata/diff/zone2.data
index 628a2da250..bbf1e33049 100644
--- a/lib/dns/tests/testdata/diff/zone2.data
+++ b/lib/dns/tests/testdata/diff/zone2.data
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: zone2.data,v 1.3 2011/12/06 23:46:32 tbox Exp $
+; $Id$
 
 @ 	0	SOA . . 0 0 0 0 0
 @	0	NS @
diff --git a/lib/dns/tests/testdata/diff/zone3.data b/lib/dns/tests/testdata/diff/zone3.data
index 08ff200b35..1ba40f0130 100644
--- a/lib/dns/tests/testdata/diff/zone3.data
+++ b/lib/dns/tests/testdata/diff/zone3.data
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: zone3.data,v 1.3 2011/12/06 23:46:32 tbox Exp $
+; $Id$
 
 @ 	0	SOA . . 0 0 0 0 0
 @	0	NS @
diff --git a/lib/dns/tests/testdata/nsec3/1024.db b/lib/dns/tests/testdata/nsec3/1024.db
index d5138449fe..3451672090 100644
--- a/lib/dns/tests/testdata/nsec3/1024.db
+++ b/lib/dns/tests/testdata/nsec3/1024.db
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: 1024.db,v 1.3 2012/01/27 23:46:58 tbox Exp $
+; $Id$
 
 $TTL 0
 test. SOA . . 0 0 0 0 0
diff --git a/lib/dns/tests/testdata/nsec3/2048.db b/lib/dns/tests/testdata/nsec3/2048.db
index 391ab0ab85..62e7ae7b9a 100644
--- a/lib/dns/tests/testdata/nsec3/2048.db
+++ b/lib/dns/tests/testdata/nsec3/2048.db
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: 2048.db,v 1.3 2012/01/27 23:46:58 tbox Exp $
+; $Id$
 
 $TTL 0
 test. SOA . . 0 0 0 0 0
diff --git a/lib/dns/tests/testdata/nsec3/4096.db b/lib/dns/tests/testdata/nsec3/4096.db
index fe84a88a70..e014b519d2 100644
--- a/lib/dns/tests/testdata/nsec3/4096.db
+++ b/lib/dns/tests/testdata/nsec3/4096.db
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: 4096.db,v 1.3 2012/01/27 23:46:58 tbox Exp $
+; $Id$
 
 $TTL 0
 test. SOA . . 0 0 0 0 0
diff --git a/lib/dns/tests/testdata/nsec3/min-1024.db b/lib/dns/tests/testdata/nsec3/min-1024.db
index 7baccd6aaf..725f6fd0c1 100644
--- a/lib/dns/tests/testdata/nsec3/min-1024.db
+++ b/lib/dns/tests/testdata/nsec3/min-1024.db
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: min-1024.db,v 1.3 2012/01/27 23:46:58 tbox Exp $
+; $Id$
 
 $TTL 0
 test. SOA . . 0 0 0 0 0
diff --git a/lib/dns/tests/testdata/nsec3/min-2048.db b/lib/dns/tests/testdata/nsec3/min-2048.db
index 096e185d6d..c75e022a42 100644
--- a/lib/dns/tests/testdata/nsec3/min-2048.db
+++ b/lib/dns/tests/testdata/nsec3/min-2048.db
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: min-2048.db,v 1.3 2012/01/27 23:46:58 tbox Exp $
+; $Id$
 
 $TTL 0
 test. SOA . . 0 0 0 0 0
diff --git a/lib/dns/tests/testdata/zt/zone1.db b/lib/dns/tests/testdata/zt/zone1.db
index 01c33369bb..43f04fde31 100644
--- a/lib/dns/tests/testdata/zt/zone1.db
+++ b/lib/dns/tests/testdata/zt/zone1.db
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: zone1.db,v 1.3 2011/09/02 23:46:32 tbox Exp $
+; $Id$
 
 $TTL 1000
 @		in	soa	localhost. postmaster.localhost. (
diff --git a/lib/dns/tests/time_test.c b/lib/dns/tests/time_test.c
index 53dbd21429..c7b759d1aa 100644
--- a/lib/dns/tests/time_test.c
+++ b/lib/dns/tests/time_test.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: time_test.c,v 1.3 2011/07/06 01:36:32 each Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/tests/update_test.c b/lib/dns/tests/update_test.c
index 270c2b7bc3..720cb14dec 100644
--- a/lib/dns/tests/update_test.c
+++ b/lib/dns/tests/update_test.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: update_test.c,v 1.6 2011/10/12 23:09:35 marka Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/tests/zonemgr_test.c b/lib/dns/tests/zonemgr_test.c
index 77a2b91bb1..0612ee70f3 100644
--- a/lib/dns/tests/zonemgr_test.c
+++ b/lib/dns/tests/zonemgr_test.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zonemgr_test.c,v 1.4 2011/11/04 05:51:02 each Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/tests/zt_test.c b/lib/dns/tests/zt_test.c
index 3de6c15d73..cc7858032a 100644
--- a/lib/dns/tests/zt_test.c
+++ b/lib/dns/tests/zt_test.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zt_test.c,v 1.5 2011/09/03 16:15:08 each Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/time.c b/lib/dns/time.c
index 1fe43db4a6..0f245a246a 100644
--- a/lib/dns/time.c
+++ b/lib/dns/time.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: time.c,v 1.39 2012/01/27 23:46:58 tbox Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/tkey.c b/lib/dns/tkey.c
index b33da7bfe8..50eddb837d 100644
--- a/lib/dns/tkey.c
+++ b/lib/dns/tkey.c
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: tkey.c,v 1.101 2011/03/11 06:11:24 marka Exp $
+ * $Id$
  */
 /*! \file */
 #include <config.h>
diff --git a/lib/dns/tsig.c b/lib/dns/tsig.c
index 4f3665f6b9..cc1faec43c 100644
--- a/lib/dns/tsig.c
+++ b/lib/dns/tsig.c
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: tsig.c,v 1.151 2011/11/02 19:41:02 each Exp $
+ * $Id$
  */
 /*! \file */
 #include <config.h>
diff --git a/lib/dns/ttl.c b/lib/dns/ttl.c
index 2a8b8c2509..5a1fd78805 100644
--- a/lib/dns/ttl.c
+++ b/lib/dns/ttl.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ttl.c,v 1.31 2011/03/12 04:59:48 tbox Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/update.c b/lib/dns/update.c
index 46fd90e708..85d988a62d 100644
--- a/lib/dns/update.c
+++ b/lib/dns/update.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: update.c,v 1.6 2011/11/03 02:54:47 each Exp $ */
+/* $Id$ */
 
 #include <config.h>
 
diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index 16557b80ab..3f9aae7f39 100644
--- a/lib/dns/validator.c
+++ b/lib/dns/validator.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: validator.c,v 1.210 2012/02/15 21:19:59 tbox Exp $ */
+/* $Id$ */
 
 #include <config.h>
 
diff --git a/lib/dns/view.c b/lib/dns/view.c
index 0c6c615189..e1db7f0bd0 100644
--- a/lib/dns/view.c
+++ b/lib/dns/view.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: view.c,v 1.184 2011/09/06 22:29:33 smann Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/dns/zt.c b/lib/dns/zt.c
index 091f705922..e999ebc384 100644
--- a/lib/dns/zt.c
+++ b/lib/dns/zt.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zt.c,v 1.59 2011/12/10 22:09:41 marka Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/export/dns/Makefile.in b/lib/export/dns/Makefile.in
index 434d70b84d..0cde291b23 100644
--- a/lib/export/dns/Makefile.in
+++ b/lib/export/dns/Makefile.in
@@ -12,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.10 2011/05/16 23:47:40 tbox Exp $
+# $Id$
 
 top_srcdir =	@top_srcdir@
 srcdir =	@top_srcdir@/lib/dns
diff --git a/lib/export/irs/Makefile.in b/lib/export/irs/Makefile.in
index 38aa9a6246..b32c11236c 100644
--- a/lib/export/irs/Makefile.in
+++ b/lib/export/irs/Makefile.in
@@ -12,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.6 2011/05/16 23:47:40 tbox Exp $
+# $Id$
 
 top_srcdir =	@top_srcdir@
 srcdir =	@top_srcdir@/lib/irs
diff --git a/lib/export/irs/include/Makefile.in b/lib/export/irs/include/Makefile.in
index 6e5cf13144..fb372a5169 100644
--- a/lib/export/irs/include/Makefile.in
+++ b/lib/export/irs/include/Makefile.in
@@ -12,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.4 2011/12/20 23:46:27 tbox Exp $
+# $Id$
 
 srcdir =	@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/export/isc/include/Makefile.in b/lib/export/isc/include/Makefile.in
index 146ab26e3d..6ed935b90e 100644
--- a/lib/export/isc/include/Makefile.in
+++ b/lib/export/isc/include/Makefile.in
@@ -12,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.4 2011/12/20 23:46:27 tbox Exp $
+# $Id$
 
 srcdir =	@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/export/isc/nothreads/include/Makefile.in b/lib/export/isc/nothreads/include/Makefile.in
index 146ab26e3d..6ed935b90e 100644
--- a/lib/export/isc/nothreads/include/Makefile.in
+++ b/lib/export/isc/nothreads/include/Makefile.in
@@ -12,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.4 2011/12/20 23:46:27 tbox Exp $
+# $Id$
 
 srcdir =	@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/export/isc/pthreads/include/Makefile.in b/lib/export/isc/pthreads/include/Makefile.in
index 146ab26e3d..6ed935b90e 100644
--- a/lib/export/isc/pthreads/include/Makefile.in
+++ b/lib/export/isc/pthreads/include/Makefile.in
@@ -12,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.4 2011/12/20 23:46:27 tbox Exp $
+# $Id$
 
 srcdir =	@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/export/isc/unix/include/Makefile.in b/lib/export/isc/unix/include/Makefile.in
index 146ab26e3d..6ed935b90e 100644
--- a/lib/export/isc/unix/include/Makefile.in
+++ b/lib/export/isc/unix/include/Makefile.in
@@ -12,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.4 2011/12/20 23:46:27 tbox Exp $
+# $Id$
 
 srcdir =	@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/export/isccfg/Makefile.in b/lib/export/isccfg/Makefile.in
index 9f76efcdfa..b8bf804dc8 100644
--- a/lib/export/isccfg/Makefile.in
+++ b/lib/export/isccfg/Makefile.in
@@ -12,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.6 2011/05/16 23:47:41 tbox Exp $
+# $Id$
 
 top_srcdir =	@top_srcdir@
 srcdir =	@top_srcdir@/lib/isccfg
diff --git a/lib/export/isccfg/include/Makefile.in b/lib/export/isccfg/include/Makefile.in
index 4c53afcb02..6388b62564 100644
--- a/lib/export/isccfg/include/Makefile.in
+++ b/lib/export/isccfg/include/Makefile.in
@@ -12,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.4 2011/12/20 23:46:29 tbox Exp $
+# $Id$
 
 srcdir =	@srcdir@
 top_srcdir =	@top_srcdir@
diff --git a/lib/export/samples/nsprobe.c b/lib/export/samples/nsprobe.c
index 167732d872..b878148fab 100644
--- a/lib/export/samples/nsprobe.c
+++ b/lib/export/samples/nsprobe.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsprobe.c,v 1.10 2011/04/05 06:33:50 marka Exp $ */
+/* $Id$ */
 
 #include <config.h>
 
diff --git a/lib/irs/getnameinfo.c b/lib/irs/getnameinfo.c
index 262c6030e1..acf43078d4 100644
--- a/lib/irs/getnameinfo.c
+++ b/lib/irs/getnameinfo.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: getnameinfo.c,v 1.6 2011/03/12 04:59:48 tbox Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/irs/resconf.c b/lib/irs/resconf.c
index 9370ba1239..35efc92a40 100644
--- a/lib/irs/resconf.c
+++ b/lib/irs/resconf.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resconf.c,v 1.5 2011/03/12 04:59:48 tbox Exp $ */
+/* $Id$ */
 
 /*! \file resconf.c */
 
diff --git a/lib/isc/Makefile.in b/lib/isc/Makefile.in
index 6780be4cbf..f05295a324 100644
--- a/lib/isc/Makefile.in
+++ b/lib/isc/Makefile.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.111 2011/07/07 23:47:49 tbox Exp $
+# $Id$
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/isc/heap.c b/lib/isc/heap.c
index 6401aacbb9..0cba2cb559 100644
--- a/lib/isc/heap.c
+++ b/lib/isc/heap.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: heap.c,v 1.41 2011/03/03 23:47:32 tbox Exp $ */
+/* $Id$ */
 
 /*! \file
  * Heap implementation of priority queues adapted from the following:
diff --git a/lib/isc/hmacsha.c b/lib/isc/hmacsha.c
index 0ada7377f9..4c28b52f69 100644
--- a/lib/isc/hmacsha.c
+++ b/lib/isc/hmacsha.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: hmacsha.c,v 1.12 2011/10/24 23:46:14 tbox Exp $ */
+/* $Id$ */
 
 /*
  * This code implements the HMAC-SHA1, HMAC-SHA224, HMAC-SHA256, HMAC-SHA384
diff --git a/lib/isc/httpd.c b/lib/isc/httpd.c
index a55a67b014..b66e79e272 100644
--- a/lib/isc/httpd.c
+++ b/lib/isc/httpd.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: httpd.c,v 1.23 2011/03/11 06:11:25 marka Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/include/isc/file.h b/lib/isc/include/isc/file.h
index 6d8a50ddb6..a9673a2c21 100644
--- a/lib/isc/include/isc/file.h
+++ b/lib/isc/include/isc/file.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: file.h,v 1.41 2011/03/04 23:47:47 tbox Exp $ */
+/* $Id$ */
 
 #ifndef ISC_FILE_H
 #define ISC_FILE_H 1
diff --git a/lib/isc/include/isc/list.h b/lib/isc/include/isc/list.h
index 5cf611d585..24ca01a067 100644
--- a/lib/isc/include/isc/list.h
+++ b/lib/isc/include/isc/list.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: list.h,v 1.26 2011/09/02 23:46:33 tbox Exp $ */
+/* $Id$ */
 
 #ifndef ISC_LIST_H
 #define ISC_LIST_H 1
diff --git a/lib/isc/include/isc/mem.h b/lib/isc/include/isc/mem.h
index 3bf280d547..838a2080e9 100644
--- a/lib/isc/include/isc/mem.h
+++ b/lib/isc/include/isc/mem.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mem.h,v 1.91 2011/08/09 23:46:39 tbox Exp $ */
+/* $Id$ */
 
 #ifndef ISC_MEM_H
 #define ISC_MEM_H 1
diff --git a/lib/isc/include/isc/namespace.h b/lib/isc/include/isc/namespace.h
index ee5723e7ae..5308921ab6 100644
--- a/lib/isc/include/isc/namespace.h
+++ b/lib/isc/include/isc/namespace.h
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: namespace.h,v 1.13 2011/09/02 21:15:38 each Exp $ */
+/* $Id$ */
 
 #ifndef ISCAPI_NAMESPACE_H
 #define ISCAPI_NAMESPACE_H 1
diff --git a/lib/isc/include/isc/queue.h b/lib/isc/include/isc/queue.h
index d2bd9577e4..798172947a 100644
--- a/lib/isc/include/isc/queue.h
+++ b/lib/isc/include/isc/queue.h
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: queue.h,v 1.2 2011/10/10 22:57:13 each Exp $ */
+/* $Id$ */
 
 /*
  * This is a generic implementation of a two-lock concurrent queue.
diff --git a/lib/isc/include/isc/result.h b/lib/isc/include/isc/result.h
index 1491ca732a..dcd457b3d1 100644
--- a/lib/isc/include/isc/result.h
+++ b/lib/isc/include/isc/result.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: result.h,v 1.75 2012/01/27 23:46:59 tbox Exp $ */
+/* $Id$ */
 
 #ifndef ISC_RESULT_H
 #define ISC_RESULT_H 1
diff --git a/lib/isc/include/isc/socket.h b/lib/isc/include/isc/socket.h
index 5749f8272f..40f193f202 100644
--- a/lib/isc/include/isc/socket.h
+++ b/lib/isc/include/isc/socket.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.h,v 1.98 2011/08/24 23:17:52 marka Exp $ */
+/* $Id$ */
 
 #ifndef ISC_SOCKET_H
 #define ISC_SOCKET_H 1
diff --git a/lib/isc/include/isc/stats.h b/lib/isc/include/isc/stats.h
index d61afcc6cf..0c8a25bab2 100644
--- a/lib/isc/include/isc/stats.h
+++ b/lib/isc/include/isc/stats.h
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: stats.h,v 1.4 2009/01/29 01:03:56 jinmei Exp $ */
+/* $Id$ */
 
 #ifndef ISC_STATS_H
 #define ISC_STATS_H 1
diff --git a/lib/isc/include/isc/symtab.h b/lib/isc/include/isc/symtab.h
index 4f1ccec2ac..d3932577fc 100644
--- a/lib/isc/include/isc/symtab.h
+++ b/lib/isc/include/isc/symtab.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: symtab.h,v 1.28 2011/11/30 23:46:25 tbox Exp $ */
+/* $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 90c44fec41..9000b27a76 100644
--- a/lib/isc/include/isc/task.h
+++ b/lib/isc/include/isc/task.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: task.h,v 1.73 2011/09/02 23:46:33 tbox Exp $ */
+/* $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 4d106ada2f..cfd6ecf922 100644
--- a/lib/isc/include/isc/taskpool.h
+++ b/lib/isc/include/isc/taskpool.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: taskpool.h,v 1.18 2011/09/02 21:15:38 each Exp $ */
+/* $Id$ */
 
 #ifndef ISC_TASKPOOL_H
 #define ISC_TASKPOOL_H 1
diff --git a/lib/isc/include/isc/types.h b/lib/isc/include/isc/types.h
index 019023152c..9a020aab1d 100644
--- a/lib/isc/include/isc/types.h
+++ b/lib/isc/include/isc/types.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: types.h,v 1.52 2009/12/05 23:31:41 each Exp $ */
+/* $Id$ */
 
 #ifndef ISC_TYPES_H
 #define ISC_TYPES_H 1
diff --git a/lib/isc/include/isc/util.h b/lib/isc/include/isc/util.h
index 12a0440e1d..7dc36a829a 100644
--- a/lib/isc/include/isc/util.h
+++ b/lib/isc/include/isc/util.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: util.h,v 1.35 2011/09/05 18:00:22 each Exp $ */
+/* $Id$ */
 
 #ifndef ISC_UTIL_H
 #define ISC_UTIL_H 1
diff --git a/lib/isc/log.c b/lib/isc/log.c
index db9105d3ee..28f640ad2c 100644
--- a/lib/isc/log.c
+++ b/lib/isc/log.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: log.c,v 1.101 2011/03/12 04:59:48 tbox Exp $ */
+/* $Id$ */
 
 /*! \file
  * \author  Principal Authors: DCL */
diff --git a/lib/isc/mem.c b/lib/isc/mem.c
index 9dbd3e1811..caca38df60 100644
--- a/lib/isc/mem.c
+++ b/lib/isc/mem.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mem.c,v 1.160 2010/12/08 02:46:16 marka Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/mutexblock.c b/lib/isc/mutexblock.c
index 86e8d76dc4..9aaa1a8bb1 100644
--- a/lib/isc/mutexblock.c
+++ b/lib/isc/mutexblock.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mutexblock.c,v 1.22 2011/11/01 23:47:00 tbox Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/netaddr.c b/lib/isc/netaddr.c
index 6cb1c73981..ba8e27cfe7 100644
--- a/lib/isc/netaddr.c
+++ b/lib/isc/netaddr.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: netaddr.c,v 1.44 2011/03/11 06:11:26 marka Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/powerpc/include/isc/atomic.h b/lib/isc/powerpc/include/isc/atomic.h
index cec5d9cc65..3d1599d576 100644
--- a/lib/isc/powerpc/include/isc/atomic.h
+++ b/lib/isc/powerpc/include/isc/atomic.h
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: atomic.h,v 1.11 2011/03/08 00:52:42 marka Exp $ */
+/* $Id$ */
 
 #ifndef ISC_ATOMIC_H
 #define ISC_ATOMIC_H 1
diff --git a/lib/isc/radix.c b/lib/isc/radix.c
index 24011ac293..69f0060f83 100644
--- a/lib/isc/radix.c
+++ b/lib/isc/radix.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: radix.c,v 1.25 2011/03/12 04:59:48 tbox Exp $ */
+/* $Id$ */
 
 /*
  * This source was adapted from MRT's RCS Ids:
diff --git a/lib/isc/result.c b/lib/isc/result.c
index f3bcbc251d..a9405fddf0 100644
--- a/lib/isc/result.c
+++ b/lib/isc/result.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: result.c,v 1.73 2012/01/27 23:46:59 tbox Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/rwlock.c b/lib/isc/rwlock.c
index 23752b4dbd..37dee59be2 100644
--- a/lib/isc/rwlock.c
+++ b/lib/isc/rwlock.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rwlock.c,v 1.48 2011/03/12 04:59:49 tbox Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/sha1.c b/lib/isc/sha1.c
index c15a23f04b..f98e6ea32f 100644
--- a/lib/isc/sha1.c
+++ b/lib/isc/sha1.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sha1.c,v 1.22 2011/03/12 04:59:49 tbox Exp $ */
+/* $Id$ */
 
 /*	$NetBSD: sha1.c,v 1.5 2000/01/22 22:19:14 mycroft Exp $	*/
 /*	$OpenBSD: sha1.c,v 1.9 1997/07/23 21:12:32 kstailey Exp $	*/
diff --git a/lib/isc/sha2.c b/lib/isc/sha2.c
index b5ecbec3aa..73747aad67 100644
--- a/lib/isc/sha2.c
+++ b/lib/isc/sha2.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sha2.c,v 1.21 2011/10/24 22:51:29 mgraff Exp $ */
+/* $Id$ */
 
 /*	$FreeBSD: src/sys/crypto/sha2/sha2.c,v 1.2.2.2 2002/03/05 08:36:47 ume Exp $	*/
 /*	$KAME: sha2.c,v 1.8 2001/11/08 01:07:52 itojun Exp $	*/
diff --git a/lib/isc/sockaddr.c b/lib/isc/sockaddr.c
index 5d3c3a3dc1..973470ce7c 100644
--- a/lib/isc/sockaddr.c
+++ b/lib/isc/sockaddr.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sockaddr.c,v 1.75 2011/02/21 23:47:45 tbox Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/socket_api.c b/lib/isc/socket_api.c
index e2afe05f04..52ec7a1c2d 100644
--- a/lib/isc/socket_api.c
+++ b/lib/isc/socket_api.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket_api.c,v 1.8 2011/08/24 23:17:52 marka Exp $ */
+/* $Id$ */
 
 #include <config.h>
 
diff --git a/lib/isc/stats.c b/lib/isc/stats.c
index 35e8f8437d..a36efe4602 100644
--- a/lib/isc/stats.c
+++ b/lib/isc/stats.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: stats.c,v 1.3 2009/01/27 23:47:54 tbox Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/string.c b/lib/isc/string.c
index 4f8f6bca1c..29d35e81b1 100644
--- a/lib/isc/string.c
+++ b/lib/isc/string.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: string.c,v 1.22 2011/03/12 04:59:49 tbox Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/symtab.c b/lib/isc/symtab.c
index 0c6c3abda3..1931faf7bf 100644
--- a/lib/isc/symtab.c
+++ b/lib/isc/symtab.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: symtab.c,v 1.34 2011/12/01 01:33:27 marka Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/task.c b/lib/isc/task.c
index 7923834eb5..385b7fae38 100644
--- a/lib/isc/task.c
+++ b/lib/isc/task.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: task.c,v 1.122 2011/09/03 16:27:51 each Exp $ */
+/* $Id$ */
 
 /*! \file
  * \author Principal Author: Bob Halley
diff --git a/lib/isc/task_api.c b/lib/isc/task_api.c
index a53857c30a..98b2227a7f 100644
--- a/lib/isc/task_api.c
+++ b/lib/isc/task_api.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: task_api.c,v 1.9 2011/09/02 23:46:32 tbox Exp $ */
+/* $Id$ */
 
 #include <config.h>
 
diff --git a/lib/isc/task_p.h b/lib/isc/task_p.h
index 5b417388e3..f67697c2d6 100644
--- a/lib/isc/task_p.h
+++ b/lib/isc/task_p.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: task_p.h,v 1.15 2011/09/02 23:46:32 tbox Exp $ */
+/* $Id$ */
 
 #ifndef ISC_TASK_P_H
 #define ISC_TASK_P_H
diff --git a/lib/isc/taskpool.c b/lib/isc/taskpool.c
index a22bd1c3a4..b4d8fc1e25 100644
--- a/lib/isc/taskpool.c
+++ b/lib/isc/taskpool.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: taskpool.c,v 1.21 2011/09/02 21:15:38 each Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/tests/Makefile.in b/lib/isc/tests/Makefile.in
index 87a6167e6b..a5c8f4e4ae 100644
--- a/lib/isc/tests/Makefile.in
+++ b/lib/isc/tests/Makefile.in
@@ -12,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.9 2011/11/30 04:27:17 each Exp $
+# $Id$
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/isc/tests/hash_test.c b/lib/isc/tests/hash_test.c
index 41eb98dae2..4c7a52afea 100644
--- a/lib/isc/tests/hash_test.c
+++ b/lib/isc/tests/hash_test.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: hash_test.c,v 1.3 2011/07/29 23:47:52 tbox Exp $ */
+/* $Id$ */
 
 /* ! \file */
 
diff --git a/lib/isc/tests/isctest.c b/lib/isc/tests/isctest.c
index 0aea1bdc82..18cdb06c25 100644
--- a/lib/isc/tests/isctest.c
+++ b/lib/isc/tests/isctest.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: isctest.c,v 1.4 2011/09/02 21:15:38 each Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/tests/isctest.h b/lib/isc/tests/isctest.h
index 42ef888a43..2de9627f87 100644
--- a/lib/isc/tests/isctest.h
+++ b/lib/isc/tests/isctest.h
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: isctest.h,v 1.5 2011/11/30 06:10:44 each Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/tests/queue_test.c b/lib/isc/tests/queue_test.c
index 4bd588ed83..f5bc537c7a 100644
--- a/lib/isc/tests/queue_test.c
+++ b/lib/isc/tests/queue_test.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: queue_test.c,v 1.3 2011/10/12 02:17:53 marka Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/tests/socket_test.c b/lib/isc/tests/socket_test.c
index 4245ecb0db..2bd9a1c1ae 100644
--- a/lib/isc/tests/socket_test.c
+++ b/lib/isc/tests/socket_test.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket_test.c,v 1.5 2011/11/29 01:03:47 marka Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/tests/symtab_test.c b/lib/isc/tests/symtab_test.c
index e06c383fa0..5a010dd1b4 100644
--- a/lib/isc/tests/symtab_test.c
+++ b/lib/isc/tests/symtab_test.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: symtab_test.c,v 1.3 2011/11/30 06:09:41 marka Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/tests/task_test.c b/lib/isc/tests/task_test.c
index dee3823bf9..6743ee7721 100644
--- a/lib/isc/tests/task_test.c
+++ b/lib/isc/tests/task_test.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: task_test.c,v 1.6 2011/12/01 22:30:37 marka Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/tests/taskpool_test.c b/lib/isc/tests/taskpool_test.c
index 7b9f7ed455..b9d6876407 100644
--- a/lib/isc/tests/taskpool_test.c
+++ b/lib/isc/tests/taskpool_test.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: taskpool_test.c,v 1.4 2011/09/02 21:15:38 each Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/timer.c b/lib/isc/timer.c
index 2a5c8d9ac4..c04a217de9 100644
--- a/lib/isc/timer.c
+++ b/lib/isc/timer.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: timer.c,v 1.98 2011/03/11 06:11:26 marka Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/unix/dir.c b/lib/isc/unix/dir.c
index c3e66df2b5..284e196b94 100644
--- a/lib/isc/unix/dir.c
+++ b/lib/isc/unix/dir.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dir.c,v 1.31 2011/03/12 04:59:49 tbox Exp $ */
+/* $Id$ */
 
 /*! \file
  * \author  Principal Authors: DCL */
diff --git a/lib/isc/unix/errno2result.c b/lib/isc/unix/errno2result.c
index 47169ce93d..2809a254df 100644
--- a/lib/isc/unix/errno2result.c
+++ b/lib/isc/unix/errno2result.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: errno2result.c,v 1.19 2011/12/02 23:46:56 tbox Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/unix/errno2result.h b/lib/isc/unix/errno2result.h
index 83fc7f5c3d..1fffe3bd92 100644
--- a/lib/isc/unix/errno2result.h
+++ b/lib/isc/unix/errno2result.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: errno2result.h,v 1.14 2011/12/02 23:46:56 tbox Exp $ */
+/* $Id$ */
 
 #ifndef UNIX_ERRNO2RESULT_H
 #define UNIX_ERRNO2RESULT_H 1
diff --git a/lib/isc/unix/file.c b/lib/isc/unix/file.c
index 85cc819ce2..52b430bd7a 100644
--- a/lib/isc/unix/file.c
+++ b/lib/isc/unix/file.c
@@ -48,7 +48,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: file.c,v 1.58 2011/03/04 14:07:03 smann Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/unix/include/isc/net.h b/lib/isc/unix/include/isc/net.h
index 2f70ae0ef0..136d68907b 100644
--- a/lib/isc/unix/include/isc/net.h
+++ b/lib/isc/unix/include/isc/net.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: net.h,v 1.50 2008/12/01 04:14:54 marka Exp $ */
+/* $Id$ */
 
 #ifndef ISC_NET_H
 #define ISC_NET_H 1
diff --git a/lib/isc/unix/include/isc/stdtime.h b/lib/isc/unix/include/isc/stdtime.h
index 2e4883a98a..d2cf5e52bd 100644
--- a/lib/isc/unix/include/isc/stdtime.h
+++ b/lib/isc/unix/include/isc/stdtime.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: stdtime.h,v 1.16 2011/03/18 23:47:36 tbox Exp $ */
+/* $Id$ */
 
 #ifndef ISC_STDTIME_H
 #define ISC_STDTIME_H 1
diff --git a/lib/isc/unix/net.c b/lib/isc/unix/net.c
index b2fb30e4ed..8dbd055068 100644
--- a/lib/isc/unix/net.c
+++ b/lib/isc/unix/net.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: net.c,v 1.40 2008/07/04 05:52:31 each Exp $ */
+/* $Id$ */
 
 #include <config.h>
 
diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index bce726d9ff..5fed888a11 100644
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.351 2012/01/27 23:46:59 tbox Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/unix/time.c b/lib/isc/unix/time.c
index 440be5708d..6bf2e9858e 100644
--- a/lib/isc/unix/time.c
+++ b/lib/isc/unix/time.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: time.c,v 1.58 2011/03/12 04:59:49 tbox Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isc/win32/dir.c b/lib/isc/win32/dir.c
index 1e5b202479..6cf5b9a788 100644
--- a/lib/isc/win32/dir.c
+++ b/lib/isc/win32/dir.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dir.c,v 1.20 2011/03/12 04:59:49 tbox Exp $ */
+/* $Id$ */
 
 /* Principal Authors: DCL */
 
diff --git a/lib/isc/win32/file.c b/lib/isc/win32/file.c
index 25a7cda4a0..8e31e4d2c0 100644
--- a/lib/isc/win32/file.c
+++ b/lib/isc/win32/file.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: file.c,v 1.40 2011/03/04 14:07:03 smann Exp $ */
+/* $Id$ */
 
 #include <config.h>
 
diff --git a/lib/isc/win32/include/isc/ipv6.h b/lib/isc/win32/include/isc/ipv6.h
index b9e5c121e0..22bf3d8952 100644
--- a/lib/isc/win32/include/isc/ipv6.h
+++ b/lib/isc/win32/include/isc/ipv6.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ipv6.h,v 1.21 2011/02/03 12:18:12 tbox Exp $ */
+/* $Id$ */
 
 #ifndef ISC_IPV6_H
 #define ISC_IPV6_H 1
diff --git a/lib/isc/win32/include/isc/net.h b/lib/isc/win32/include/isc/net.h
index ba8402e07f..94e7093f82 100644
--- a/lib/isc/win32/include/isc/net.h
+++ b/lib/isc/win32/include/isc/net.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: net.h,v 1.31 2008/12/01 03:51:47 marka Exp $ */
+/* $Id$ */
 
 #ifndef ISC_NET_H
 #define ISC_NET_H 1
diff --git a/lib/isc/win32/include/isc/stdtime.h b/lib/isc/win32/include/isc/stdtime.h
index 215aaba6b0..fb36b6415c 100644
--- a/lib/isc/win32/include/isc/stdtime.h
+++ b/lib/isc/win32/include/isc/stdtime.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: stdtime.h,v 1.14 2011/03/18 23:47:36 tbox Exp $ */
+/* $Id$ */
 
 #ifndef ISC_STDTIME_H
 #define ISC_STDTIME_H 1
diff --git a/lib/isc/win32/net.c b/lib/isc/win32/net.c
index 08c981f14e..1ed9c27ee7 100644
--- a/lib/isc/win32/net.c
+++ b/lib/isc/win32/net.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: net.c,v 1.22 2011/10/31 23:46:56 tbox Exp $ */
+/* $Id$ */
 
 #include <config.h>
 
diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c
index 593ccd44db..ffcefb0606 100644
--- a/lib/isc/win32/socket.c
+++ b/lib/isc/win32/socket.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.95 2012/02/06 23:46:49 tbox Exp $ */
+/* $Id$ */
 
 /* This code uses functions which are only available on Server 2003 and
  * higher, and Windows XP and higher.
diff --git a/lib/isccc/Makefile.in b/lib/isccc/Makefile.in
index 75971db694..4ade745f08 100644
--- a/lib/isccc/Makefile.in
+++ b/lib/isccc/Makefile.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.14 2011/02/19 23:47:38 tbox Exp $
+# $Id$
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/isccfg/Makefile.in b/lib/isccfg/Makefile.in
index 883f5d5bb0..4de892bb8f 100644
--- a/lib/isccfg/Makefile.in
+++ b/lib/isccfg/Makefile.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.24 2011/03/10 04:36:16 each Exp $
+# $Id$
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/isccfg/aclconf.c b/lib/isccfg/aclconf.c
index f362c68132..6d2e1364bb 100644
--- a/lib/isccfg/aclconf.c
+++ b/lib/isccfg/aclconf.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: aclconf.c,v 1.32 2011/08/26 04:49:14 marka Exp $ */
+/* $Id$ */
 
 #include <config.h>
 
diff --git a/lib/isccfg/include/isccfg/aclconf.h b/lib/isccfg/include/isccfg/aclconf.h
index e053ae68ec..8b7c9d619f 100644
--- a/lib/isccfg/include/isccfg/aclconf.h
+++ b/lib/isccfg/include/isccfg/aclconf.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: aclconf.h,v 1.14 2011/06/17 23:47:49 tbox Exp $ */
+/* $Id$ */
 
 #ifndef ISCCFG_ACLCONF_H
 #define ISCCFG_ACLCONF_H 1
diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index 90f87a4ebc..873d9aa5dd 100644
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: namedconf.c,v 1.143 2011/11/07 00:14:11 marka Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c
index 402fdca4e7..115877aa91 100644
--- a/lib/isccfg/parser.c
+++ b/lib/isccfg/parser.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: parser.c,v 1.142 2011/11/03 05:15:09 each Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/lwres/assert_p.h b/lib/lwres/assert_p.h
index 6722c8ca50..4016afefee 100644
--- a/lib/lwres/assert_p.h
+++ b/lib/lwres/assert_p.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: assert_p.h,v 1.16 2011/03/12 04:59:49 tbox Exp $ */
+/* $Id$ */
 
 #ifndef LWRES_ASSERT_P_H
 #define LWRES_ASSERT_P_H 1
diff --git a/lib/lwres/getnameinfo.c b/lib/lwres/getnameinfo.c
index 4adf08b73f..10cf09e80a 100644
--- a/lib/lwres/getnameinfo.c
+++ b/lib/lwres/getnameinfo.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: getnameinfo.c,v 1.41 2011/08/30 23:46:53 tbox Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/lwres/herror.c b/lib/lwres/herror.c
index 0725e90ca0..ba67fe7e32 100644
--- a/lib/lwres/herror.c
+++ b/lib/lwres/herror.c
@@ -72,7 +72,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)herror.c	8.1 (Berkeley) 6/4/93";
 static const char rcsid[] =
-	"$Id: herror.c,v 1.19 2011/03/12 04:59:49 tbox Exp $";
+	"$Id$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <config.h>
diff --git a/lib/lwres/lwconfig.c b/lib/lwres/lwconfig.c
index 3527058fb2..ef5090ade9 100644
--- a/lib/lwres/lwconfig.c
+++ b/lib/lwres/lwconfig.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwconfig.c,v 1.50 2011/03/12 04:59:49 tbox Exp $ */
+/* $Id$ */
 
 /*! \file */
 
diff --git a/lib/lwres/lwinetpton.c b/lib/lwres/lwinetpton.c
index bb010f046c..54a2a3d552 100644
--- a/lib/lwres/lwinetpton.c
+++ b/lib/lwres/lwinetpton.c
@@ -19,7 +19,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id: lwinetpton.c,v 1.14 2011/08/29 23:46:44 tbox Exp $";
+static char rcsid[] = "$Id$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <config.h>
diff --git a/lib/lwres/print.c b/lib/lwres/print.c
index 2eb6f008f6..4c8fa910b6 100644
--- a/lib/lwres/print.c
+++ b/lib/lwres/print.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: print.c,v 1.12 2011/03/12 04:59:49 tbox Exp $ */
+/* $Id$ */
 
 #include <config.h>
 
diff --git a/make/rules.in b/make/rules.in
index eeb1a34572..cd4cf4f79e 100644
--- a/make/rules.in
+++ b/make/rules.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: rules.in,v 1.74 2012/01/31 23:47:33 tbox Exp $
+# $Id$
 
 ###
 ### Common Makefile rules for BIND 9.
diff --git a/unit/Makefile.in b/unit/Makefile.in
index 3b16792c9a..f03cfce84f 100644
--- a/unit/Makefile.in
+++ b/unit/Makefile.in
@@ -12,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2011/02/26 02:26:12 each Exp $
+# $Id$
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@