diff --git a/lib/dns/rdata/generic/cname_5.h b/lib/dns/rdata/generic/cname_5.h
index bd900f926b..83b7967a67 100644
--- a/lib/dns/rdata/generic/cname_5.h
+++ b/lib/dns/rdata/generic/cname_5.h
@@ -15,5 +15,5 @@
  * SOFTWARE.
  */
 
- /* $Id: cname_5.h,v 1.15 2000/02/03 23:42:58 halley Exp $ */
+/* $Id: cname_5.h,v 1.16 2000/03/20 22:57:11 gson Exp $ */
 
diff --git a/lib/dns/rdata/generic/gpos_27.h b/lib/dns/rdata/generic/gpos_27.h
index 0987163506..6242292312 100644
--- a/lib/dns/rdata/generic/gpos_27.h
+++ b/lib/dns/rdata/generic/gpos_27.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: gpos_27.h,v 1.6 2000/02/03 23:42:59 halley Exp $ */
+/* $Id: gpos_27.h,v 1.7 2000/03/20 22:57:11 gson Exp $ */
 
- /* RFC 1712 */
+/* RFC 1712 */
 
diff --git a/lib/dns/rdata/generic/hinfo_13.h b/lib/dns/rdata/generic/hinfo_13.h
index fecb2173ae..300be1e4df 100644
--- a/lib/dns/rdata/generic/hinfo_13.h
+++ b/lib/dns/rdata/generic/hinfo_13.h
@@ -15,5 +15,5 @@
  * SOFTWARE.
  */
 
- /* $Id: hinfo_13.h,v 1.14 2000/02/03 23:42:59 halley Exp $ */
+/* $Id: hinfo_13.h,v 1.15 2000/03/20 22:57:12 gson Exp $ */
 
diff --git a/lib/dns/rdata/generic/isdn_20.h b/lib/dns/rdata/generic/isdn_20.h
index ce272801ee..9ea2723b55 100644
--- a/lib/dns/rdata/generic/isdn_20.h
+++ b/lib/dns/rdata/generic/isdn_20.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id*/
+/* $Id: isdn_20.h,v 1.7 2000/03/20 22:57:12 gson Exp $ */
 
- /* RFC 1183 */
+/* RFC 1183 */
 
diff --git a/lib/dns/rdata/generic/key_25.h b/lib/dns/rdata/generic/key_25.h
index f127a64ee3..864c3b54cc 100644
--- a/lib/dns/rdata/generic/key_25.h
+++ b/lib/dns/rdata/generic/key_25.h
@@ -15,9 +15,9 @@
  * SOFTWARE.
  */
 
- /* $Id: key_25.h,v 1.8 2000/02/03 23:43:00 halley Exp $ */
+/* $Id: key_25.h,v 1.9 2000/03/20 22:57:12 gson Exp $ */
 
- /* RFC 2535 */
+/* RFC 2535 */
 
 typedef struct dns_rdata_generic_key_t {
         dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/generic/mb_7.h b/lib/dns/rdata/generic/mb_7.h
index f3191b3f2e..e8aea9eb66 100644
--- a/lib/dns/rdata/generic/mb_7.h
+++ b/lib/dns/rdata/generic/mb_7.h
@@ -15,5 +15,5 @@
  * SOFTWARE.
  */
 
- /* $Id: mb_7.h,v 1.14 2000/02/03 23:43:01 halley Exp $ */
+/* $Id: mb_7.h,v 1.15 2000/03/20 22:57:12 gson Exp $ */
 
diff --git a/lib/dns/rdata/generic/md_3.h b/lib/dns/rdata/generic/md_3.h
index f34cf1b6da..10244f77e2 100644
--- a/lib/dns/rdata/generic/md_3.h
+++ b/lib/dns/rdata/generic/md_3.h
@@ -15,5 +15,5 @@
  * SOFTWARE.
  */
 
- /* $Id: md_3.h,v 1.15 2000/02/03 23:43:01 halley Exp $ */
+/* $Id: md_3.h,v 1.16 2000/03/20 22:57:12 gson Exp $ */
 
diff --git a/lib/dns/rdata/generic/mf_4.h b/lib/dns/rdata/generic/mf_4.h
index 1fd5ca4de1..3220b92738 100644
--- a/lib/dns/rdata/generic/mf_4.h
+++ b/lib/dns/rdata/generic/mf_4.h
@@ -15,5 +15,5 @@
  * SOFTWARE.
  */
 
- /* $Id: mf_4.h,v 1.13 2000/02/03 23:43:02 halley Exp $ */
+/* $Id: mf_4.h,v 1.14 2000/03/20 22:57:12 gson Exp $ */
 
diff --git a/lib/dns/rdata/generic/mg_8.h b/lib/dns/rdata/generic/mg_8.h
index 6f81265b88..f692b561b6 100644
--- a/lib/dns/rdata/generic/mg_8.h
+++ b/lib/dns/rdata/generic/mg_8.h
@@ -15,5 +15,5 @@
  * SOFTWARE.
  */
 
- /* $Id: mg_8.h,v 1.13 2000/02/03 23:43:02 halley Exp $ */
+/* $Id: mg_8.h,v 1.14 2000/03/20 22:57:13 gson Exp $ */
 
diff --git a/lib/dns/rdata/generic/minfo_14.h b/lib/dns/rdata/generic/minfo_14.h
index 6c238a7eb4..956de03014 100644
--- a/lib/dns/rdata/generic/minfo_14.h
+++ b/lib/dns/rdata/generic/minfo_14.h
@@ -15,5 +15,5 @@
  * SOFTWARE.
  */
 
- /* $Id: minfo_14.h,v 1.14 2000/02/03 23:43:02 halley Exp $ */
+/* $Id: minfo_14.h,v 1.15 2000/03/20 22:57:13 gson Exp $ */
 
diff --git a/lib/dns/rdata/generic/mr_9.h b/lib/dns/rdata/generic/mr_9.h
index c6850bf10b..fc814bc134 100644
--- a/lib/dns/rdata/generic/mr_9.h
+++ b/lib/dns/rdata/generic/mr_9.h
@@ -15,5 +15,5 @@
  * SOFTWARE.
  */
 
- /* $Id: mr_9.h,v 1.13 2000/02/03 23:43:03 halley Exp $ */
+/* $Id: mr_9.h,v 1.14 2000/03/20 22:57:13 gson Exp $ */
 
diff --git a/lib/dns/rdata/generic/mx_15.h b/lib/dns/rdata/generic/mx_15.h
index 749f7518f1..3049c25905 100644
--- a/lib/dns/rdata/generic/mx_15.h
+++ b/lib/dns/rdata/generic/mx_15.h
@@ -15,5 +15,5 @@
  * SOFTWARE.
  */
 
- /* $Id: mx_15.h,v 1.16 2000/02/03 23:43:03 halley Exp $ */
+/* $Id: mx_15.h,v 1.17 2000/03/20 22:57:13 gson Exp $ */
 
diff --git a/lib/dns/rdata/generic/ns_2.h b/lib/dns/rdata/generic/ns_2.h
index f4c07781d3..6671291d47 100644
--- a/lib/dns/rdata/generic/ns_2.h
+++ b/lib/dns/rdata/generic/ns_2.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: ns_2.h,v 1.15 2000/02/03 23:43:04 halley Exp $ */
+/* $Id: ns_2.h,v 1.16 2000/03/20 22:57:13 gson Exp $ */
 
 #include <dns/fixedname.h>
 
diff --git a/lib/dns/rdata/generic/null_10.h b/lib/dns/rdata/generic/null_10.h
index 58f1cadb78..300aa7fe57 100644
--- a/lib/dns/rdata/generic/null_10.h
+++ b/lib/dns/rdata/generic/null_10.h
@@ -15,4 +15,4 @@
  * SOFTWARE.
  */
 
- /* $Id: null_10.h,v 1.12 2000/03/16 21:49:42 bwelling Exp $ */
+/* $Id: null_10.h,v 1.13 2000/03/20 22:57:13 gson Exp $ */
diff --git a/lib/dns/rdata/generic/nxt_30.h b/lib/dns/rdata/generic/nxt_30.h
index a22a96c8fd..9b33b57468 100644
--- a/lib/dns/rdata/generic/nxt_30.h
+++ b/lib/dns/rdata/generic/nxt_30.h
@@ -15,9 +15,9 @@
  * SOFTWARE.
  */
 
- /* $Id: nxt_30.h,v 1.11 2000/02/03 23:43:04 halley Exp $ */
+/* $Id: nxt_30.h,v 1.12 2000/03/20 22:57:14 gson Exp $ */
 
- /* RFC 2065 */
+/* RFC 2065 */
 
 typedef struct dns_rdata_nxt {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/generic/proforma.h b/lib/dns/rdata/generic/proforma.h
index 5682f41b7e..ea4a5e3c52 100644
--- a/lib/dns/rdata/generic/proforma.h
+++ b/lib/dns/rdata/generic/proforma.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: proforma.h,v 1.12 2000/02/03 23:43:05 halley Exp $ */
+/* $Id: proforma.h,v 1.13 2000/03/20 22:57:14 gson Exp $ */
 
 typedef struct dns_rdata_# {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/generic/ptr_12.h b/lib/dns/rdata/generic/ptr_12.h
index 6dcb198012..da8bf279f8 100644
--- a/lib/dns/rdata/generic/ptr_12.h
+++ b/lib/dns/rdata/generic/ptr_12.h
@@ -15,5 +15,5 @@
  * SOFTWARE.
  */
 
- /* $Id: ptr_12.h,v 1.14 2000/02/03 23:43:05 halley Exp $ */
+/* $Id: ptr_12.h,v 1.15 2000/03/20 22:57:14 gson Exp $ */
 
diff --git a/lib/dns/rdata/generic/rp_17.h b/lib/dns/rdata/generic/rp_17.h
index 0b83845bd8..afb78099d8 100644
--- a/lib/dns/rdata/generic/rp_17.h
+++ b/lib/dns/rdata/generic/rp_17.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: rp_17.h,v 1.9 2000/02/03 23:43:06 halley Exp $ */
+/* $Id: rp_17.h,v 1.10 2000/03/20 22:57:14 gson Exp $ */
 
- /* RFC 1183 */
+/* RFC 1183 */
 
diff --git a/lib/dns/rdata/generic/rt_21.h b/lib/dns/rdata/generic/rt_21.h
index 3a28ea9842..94b49f6185 100644
--- a/lib/dns/rdata/generic/rt_21.h
+++ b/lib/dns/rdata/generic/rt_21.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: rt_21.h,v 1.9 2000/02/03 23:43:06 halley Exp $ */
+/* $Id: rt_21.h,v 1.10 2000/03/20 22:57:14 gson Exp $ */
 
- /* RFC 1183 */
+/* RFC 1183 */
 
diff --git a/lib/dns/rdata/generic/tkey_249.h b/lib/dns/rdata/generic/tkey_249.h
index 1db1df3e3c..b962fbe860 100644
--- a/lib/dns/rdata/generic/tkey_249.h
+++ b/lib/dns/rdata/generic/tkey_249.h
@@ -15,9 +15,9 @@
  * SOFTWARE.
  */
 
- /* $Id: tkey_249.h,v 1.12 2000/02/03 23:43:08 halley Exp $ */
+/* $Id: tkey_249.h,v 1.13 2000/03/20 22:57:14 gson Exp $ */
 
- /* draft-ietf-dnsind-tkey-00.txt */
+/* draft-ietf-dnsind-tkey-00.txt */
 
 typedef struct dns_rdata_generic_tkey {
         dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/generic/x25_19.h b/lib/dns/rdata/generic/x25_19.h
index ed95f74889..3b48a76bd2 100644
--- a/lib/dns/rdata/generic/x25_19.h
+++ b/lib/dns/rdata/generic/x25_19.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: x25_19.h,v 1.6 2000/02/03 23:43:09 halley Exp $ */
+/* $Id: x25_19.h,v 1.7 2000/03/20 22:57:14 gson Exp $ */
 
- /* RFC 1183 */
+/* RFC 1183 */
 
diff --git a/lib/dns/rdata/hs_4/a_1.h b/lib/dns/rdata/hs_4/a_1.h
index e00fa9877e..6e539ac8df 100644
--- a/lib/dns/rdata/hs_4/a_1.h
+++ b/lib/dns/rdata/hs_4/a_1.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: a_1.h,v 1.2 2000/02/03 23:43:25 halley Exp $ */
+/* $Id: a_1.h,v 1.3 2000/03/20 22:57:15 gson Exp $ */
 
 typedef struct dns_rdata_hs_a {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/in_1/a_1.h b/lib/dns/rdata/in_1/a_1.h
index 478527262c..cf215fa280 100644
--- a/lib/dns/rdata/in_1/a_1.h
+++ b/lib/dns/rdata/in_1/a_1.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: a_1.h,v 1.17 2000/02/03 23:43:17 halley Exp $ */
+/* $Id: a_1.h,v 1.18 2000/03/20 22:57:15 gson Exp $ */
 
 typedef struct dns_rdata_in_a {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/in_1/aaaa_28.h b/lib/dns/rdata/in_1/aaaa_28.h
index 5ef4521b17..c96e0e6219 100644
--- a/lib/dns/rdata/in_1/aaaa_28.h
+++ b/lib/dns/rdata/in_1/aaaa_28.h
@@ -15,9 +15,9 @@
  * SOFTWARE.
  */
 
- /* $Id: aaaa_28.h,v 1.11 2000/02/03 23:43:17 halley Exp $ */
+/* $Id: aaaa_28.h,v 1.12 2000/03/20 22:57:15 gson Exp $ */
 
- /* RFC 1886 */
+/* RFC 1886 */
 
 typedef struct dns_rdata_in_aaaa {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/in_1/kx_36.h b/lib/dns/rdata/in_1/kx_36.h
index 90c96b2795..a27d368c1f 100644
--- a/lib/dns/rdata/in_1/kx_36.h
+++ b/lib/dns/rdata/in_1/kx_36.h
@@ -15,9 +15,9 @@
  * SOFTWARE.
  */
 
- /* $Id: kx_36.h,v 1.10 2000/02/03 23:43:17 halley Exp $ */
+/* $Id: kx_36.h,v 1.11 2000/03/20 22:57:15 gson Exp $ */
 
- /* RFC 2230 */
+/* RFC 2230 */
 
 typedef struct dns_rdata_in_kx {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/in_1/naptr_35.h b/lib/dns/rdata/in_1/naptr_35.h
index 85b3afc4ee..d604e0ef19 100644
--- a/lib/dns/rdata/in_1/naptr_35.h
+++ b/lib/dns/rdata/in_1/naptr_35.h
@@ -15,9 +15,9 @@
  * SOFTWARE.
  */
 
- /* $Id: naptr_35.h,v 1.10 2000/02/03 23:43:18 halley Exp $ */
+/* $Id: naptr_35.h,v 1.11 2000/03/20 22:57:15 gson Exp $ */
 
- /* RFC 2168 */
+/* RFC 2168 */
 
 typedef struct dns_rdata_in_naptr {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/in_1/wks_11.h b/lib/dns/rdata/in_1/wks_11.h
index b3f1b8c34a..86e733dde1 100644
--- a/lib/dns/rdata/in_1/wks_11.h
+++ b/lib/dns/rdata/in_1/wks_11.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: wks_11.h,v 1.13 2000/02/03 23:43:20 halley Exp $ */
+/* $Id: wks_11.h,v 1.14 2000/03/20 22:57:15 gson Exp $ */
 
 typedef	struct dns_rdata_in_wks {
 	dns_rdatacommon_t	common;