From 854d0238dbc2908490197984b3b9d558008a53df Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 5 May 1999 00:19:04 +0000
Subject: [PATCH] 	Adjust #ifdef *_H -> #ifdef *_C to reflect new file
 names.

---
 lib/dns/rdata/any_255/tsig_250.c   | 8 ++++----
 lib/dns/rdata/generic/afsdb_18.c   | 8 ++++----
 lib/dns/rdata/generic/cert_37.c    | 8 ++++----
 lib/dns/rdata/generic/cname_5.c    | 8 ++++----
 lib/dns/rdata/generic/dname_39.c   | 8 ++++----
 lib/dns/rdata/generic/gpos_27.c    | 8 ++++----
 lib/dns/rdata/generic/hinfo_13.c   | 8 ++++----
 lib/dns/rdata/generic/isdn_20.c    | 6 +++---
 lib/dns/rdata/generic/key_25.c     | 8 ++++----
 lib/dns/rdata/generic/loc_29.c     | 8 ++++----
 lib/dns/rdata/generic/mb_7.c       | 8 ++++----
 lib/dns/rdata/generic/md_3.c       | 8 ++++----
 lib/dns/rdata/generic/mf_4.c       | 8 ++++----
 lib/dns/rdata/generic/mg_8.c       | 8 ++++----
 lib/dns/rdata/generic/minfo_14.c   | 8 ++++----
 lib/dns/rdata/generic/mr_9.c       | 8 ++++----
 lib/dns/rdata/generic/mx_15.c      | 8 ++++----
 lib/dns/rdata/generic/ns_2.c       | 8 ++++----
 lib/dns/rdata/generic/null_10.c    | 8 ++++----
 lib/dns/rdata/generic/nxt_30.c     | 8 ++++----
 lib/dns/rdata/generic/proforma.c   | 8 ++++----
 lib/dns/rdata/generic/ptr_12.c     | 8 ++++----
 lib/dns/rdata/generic/rp_17.c      | 8 ++++----
 lib/dns/rdata/generic/rt_21.c      | 8 ++++----
 lib/dns/rdata/generic/sig_24.c     | 8 ++++----
 lib/dns/rdata/generic/soa_6.c      | 8 ++++----
 lib/dns/rdata/generic/tkey_249.c   | 8 ++++----
 lib/dns/rdata/generic/txt_16.c     | 8 ++++----
 lib/dns/rdata/generic/unspec_103.c | 8 ++++----
 lib/dns/rdata/generic/x25_19.c     | 8 ++++----
 lib/dns/rdata/in_1/a6_38.c         | 8 ++++----
 lib/dns/rdata/in_1/a_1.c           | 8 ++++----
 lib/dns/rdata/in_1/aaaa_28.c       | 8 ++++----
 lib/dns/rdata/in_1/kx_36.c         | 8 ++++----
 lib/dns/rdata/in_1/naptr_35.c      | 8 ++++----
 lib/dns/rdata/in_1/nsap-ptr_23.c   | 8 ++++----
 lib/dns/rdata/in_1/nsap_22.c       | 8 ++++----
 lib/dns/rdata/in_1/px_26.c         | 8 ++++----
 lib/dns/rdata/in_1/srv_33.c        | 8 ++++----
 lib/dns/rdata/in_1/wks_11.c        | 8 ++++----
 40 files changed, 159 insertions(+), 159 deletions(-)

diff --git a/lib/dns/rdata/any_255/tsig_250.c b/lib/dns/rdata/any_255/tsig_250.c
index 6f78521814..7e996a2644 100644
--- a/lib/dns/rdata/any_255/tsig_250.c
+++ b/lib/dns/rdata/any_255/tsig_250.c
@@ -15,12 +15,12 @@
  * SOFTWARE.
  */
 
- /* $Id: tsig_250.c,v 1.7 1999/02/24 06:31:32 marka Exp $ */
+ /* $Id: tsig_250.c,v 1.8 1999/05/05 00:18:59 marka Exp $ */
 
  /* draft-ietf-dnsind-tsig-07.txt */
 
-#ifndef RDATA_ANY_255_TSIG_250_H
-#define RDATA_ANY_255_TSIG_250_H
+#ifndef RDATA_ANY_255_TSIG_250_C
+#define RDATA_ANY_255_TSIG_250_C
 #include <isc/str.h>
 
 static dns_result_t
@@ -303,4 +303,4 @@ tostruct_any_tsig(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_ANY_255_TSIG_250_H */
+#endif	/* RDATA_ANY_255_TSIG_250_C */
diff --git a/lib/dns/rdata/generic/afsdb_18.c b/lib/dns/rdata/generic/afsdb_18.c
index 4e09c63207..01de7756fb 100644
--- a/lib/dns/rdata/generic/afsdb_18.c
+++ b/lib/dns/rdata/generic/afsdb_18.c
@@ -15,12 +15,12 @@
  * SOFTWARE.
  */
 
- /* $Id: afsdb_18.c,v 1.5 1999/02/24 06:31:32 marka Exp $ */
+ /* $Id: afsdb_18.c,v 1.6 1999/05/05 00:18:59 marka Exp $ */
 
  /* RFC 1183 */
 
-#ifndef RDATA_GENERIC_AFSDB_18_H
-#define RDATA_GENERIC_AFSDB_18_H
+#ifndef RDATA_GENERIC_AFSDB_18_C
+#define RDATA_GENERIC_AFSDB_18_C
 
 static dns_result_t
 fromtext_afsdb(dns_rdataclass_t class, dns_rdatatype_t type,
@@ -187,4 +187,4 @@ tostruct_afsdb(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_GENERIC_AFSDB_18_H */
+#endif	/* RDATA_GENERIC_AFSDB_18_C */
diff --git a/lib/dns/rdata/generic/cert_37.c b/lib/dns/rdata/generic/cert_37.c
index 5e045699d4..1743062133 100644
--- a/lib/dns/rdata/generic/cert_37.c
+++ b/lib/dns/rdata/generic/cert_37.c
@@ -15,12 +15,12 @@
  * SOFTWARE.
  */
 
- /* $Id: cert_37.c,v 1.5 1999/02/16 22:42:24 marka Exp $ */
+ /* $Id: cert_37.c,v 1.6 1999/05/05 00:19:00 marka Exp $ */
 
  /* draft-ietf-dnssec-certs-04.txt */
 
-#ifndef RDATA_GENERIC_CERT_37_H
-#define RDATA_GENERIC_CERT_37_H
+#ifndef RDATA_GENERIC_CERT_37_C
+#define RDATA_GENERIC_CERT_37_C
 
 static dns_result_t
 fromtext_cert(dns_rdataclass_t class, dns_rdatatype_t type,
@@ -177,4 +177,4 @@ tostruct_cert(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_GENERIC_CERT_37_H */
+#endif	/* RDATA_GENERIC_CERT_37_C */
diff --git a/lib/dns/rdata/generic/cname_5.c b/lib/dns/rdata/generic/cname_5.c
index 76c56d6824..b478a02e3d 100644
--- a/lib/dns/rdata/generic/cname_5.c
+++ b/lib/dns/rdata/generic/cname_5.c
@@ -15,10 +15,10 @@
  * SOFTWARE.
  */
 
- /* $Id: cname_5.c,v 1.11 1999/02/24 06:31:32 marka Exp $ */
+ /* $Id: cname_5.c,v 1.12 1999/05/05 00:19:00 marka Exp $ */
 
-#ifndef RDATA_GENERIC_CNAME_5_H
-#define RDATA_GENERIC_CNAME_5_H
+#ifndef RDATA_GENERIC_CNAME_5_C
+#define RDATA_GENERIC_CNAME_5_C
 
 static dns_result_t
 fromtext_cname(dns_rdataclass_t class, dns_rdatatype_t type,
@@ -148,4 +148,4 @@ tostruct_cname(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_GENERIC_CNAME_5_H */
+#endif	/* RDATA_GENERIC_CNAME_5_C */
diff --git a/lib/dns/rdata/generic/dname_39.c b/lib/dns/rdata/generic/dname_39.c
index 3c4ee5cb11..06948f31d3 100644
--- a/lib/dns/rdata/generic/dname_39.c
+++ b/lib/dns/rdata/generic/dname_39.c
@@ -15,12 +15,12 @@
  * SOFTWARE.
  */
 
- /* $Id: dname_39.c,v 1.4 1999/02/24 06:31:32 marka Exp $ */
+ /* $Id: dname_39.c,v 1.5 1999/05/05 00:19:00 marka Exp $ */
 
  /* draft-ietf-dnsind-dname-02.txt */
 
-#ifndef RDATA_GENERIC_DNAME_39_H
-#define RDATA_GENERIC_DNAME_39_H
+#ifndef RDATA_GENERIC_DNAME_39_C
+#define RDATA_GENERIC_DNAME_39_C
 
 static dns_result_t
 fromtext_dname(dns_rdataclass_t class, dns_rdatatype_t type,
@@ -148,4 +148,4 @@ tostruct_dname(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_GENERIC_DNAME_39_H */
+#endif	/* RDATA_GENERIC_DNAME_39_C */
diff --git a/lib/dns/rdata/generic/gpos_27.c b/lib/dns/rdata/generic/gpos_27.c
index f212f216b3..5f0517b31c 100644
--- a/lib/dns/rdata/generic/gpos_27.c
+++ b/lib/dns/rdata/generic/gpos_27.c
@@ -15,12 +15,12 @@
  * SOFTWARE.
  */
 
- /* $Id: gpos_27.c,v 1.2 1999/02/16 22:42:24 marka Exp $ */
+ /* $Id: gpos_27.c,v 1.3 1999/05/05 00:19:00 marka Exp $ */
 
  /* RFC 1712 */
 
-#ifndef RDATA_GENERIC_GPOS_27_H
-#define RDATA_GENERIC_GPOS_27_H
+#ifndef RDATA_GENERIC_GPOS_27_C
+#define RDATA_GENERIC_GPOS_27_C
 
 static dns_result_t
 fromtext_gpos(dns_rdataclass_t class, dns_rdatatype_t type,
@@ -130,4 +130,4 @@ tostruct_gpos(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_GENERIC_GPOS_27_H */
+#endif	/* RDATA_GENERIC_GPOS_27_C */
diff --git a/lib/dns/rdata/generic/hinfo_13.c b/lib/dns/rdata/generic/hinfo_13.c
index d7ffe600ff..0240238dd5 100644
--- a/lib/dns/rdata/generic/hinfo_13.c
+++ b/lib/dns/rdata/generic/hinfo_13.c
@@ -15,10 +15,10 @@
  * SOFTWARE.
  */
 
- /* $Id: hinfo_13.c,v 1.10 1999/02/16 22:51:18 marka Exp $ */
+ /* $Id: hinfo_13.c,v 1.11 1999/05/05 00:19:00 marka Exp $ */
 
-#ifndef RDATA_GENERIC_HINFO_13_H
-#define RDATA_GENERIC_HINFO_13_H
+#ifndef RDATA_GENERIC_HINFO_13_C
+#define RDATA_GENERIC_HINFO_13_C
 
 static dns_result_t
 fromtext_hinfo(dns_rdataclass_t class, dns_rdatatype_t type,
@@ -120,4 +120,4 @@ tostruct_hinfo(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_GENERIC_HINFO_13_H */
+#endif	/* RDATA_GENERIC_HINFO_13_C */
diff --git a/lib/dns/rdata/generic/isdn_20.c b/lib/dns/rdata/generic/isdn_20.c
index 6b60e42c2f..e445cffdc3 100644
--- a/lib/dns/rdata/generic/isdn_20.c
+++ b/lib/dns/rdata/generic/isdn_20.c
@@ -19,8 +19,8 @@
 
  /* RFC 1183 */
 
-#ifndef RDATA_GENERIC_ISDN_20_H
-#define RDATA_GENERIC_ISDN_20_H
+#ifndef RDATA_GENERIC_ISDN_20_C
+#define RDATA_GENERIC_ISDN_20_C
 
 static dns_result_t
 fromtext_isdn(dns_rdataclass_t class, dns_rdatatype_t type,
@@ -130,4 +130,4 @@ tostruct_isdn(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_GENERIC_ISDN_20_H */
+#endif	/* RDATA_GENERIC_ISDN_20_C */
diff --git a/lib/dns/rdata/generic/key_25.c b/lib/dns/rdata/generic/key_25.c
index bdce597aea..d20584e2bf 100644
--- a/lib/dns/rdata/generic/key_25.c
+++ b/lib/dns/rdata/generic/key_25.c
@@ -15,12 +15,12 @@
  * SOFTWARE.
  */
 
- /* $Id: key_25.c,v 1.3 1999/02/16 22:42:25 marka Exp $ */
+ /* $Id: key_25.c,v 1.4 1999/05/05 00:19:00 marka Exp $ */
 
  /* RFC 2065 */
 
-#ifndef RDATA_GENERIC_KEY_25_H
-#define RDATA_GENERIC_KEY_25_H
+#ifndef RDATA_GENERIC_KEY_25_C
+#define RDATA_GENERIC_KEY_25_C
 
 static dns_result_t
 fromtext_key(dns_rdataclass_t class, dns_rdatatype_t type,
@@ -172,4 +172,4 @@ tostruct_key(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_GENERIC_KEY_25_H */
+#endif	/* RDATA_GENERIC_KEY_25_C */
diff --git a/lib/dns/rdata/generic/loc_29.c b/lib/dns/rdata/generic/loc_29.c
index c44c75380f..237a77565c 100644
--- a/lib/dns/rdata/generic/loc_29.c
+++ b/lib/dns/rdata/generic/loc_29.c
@@ -15,12 +15,12 @@
  * SOFTWARE.
  */
 
- /* $Id: loc_29.c,v 1.2 1999/02/11 14:00:29 marka Exp $ */
+ /* $Id: loc_29.c,v 1.3 1999/05/05 00:19:00 marka Exp $ */
 
  /* RFC 1876 */
 
-#ifndef RDATA_GENERIC_LOC_29_H
-#define RDATA_GENERIC_LOC_29_H
+#ifndef RDATA_GENERIC_LOC_29_C
+#define RDATA_GENERIC_LOC_29_C
 
 static dns_result_t
 fromtext_loc(dns_rdataclass_t class, dns_rdatatype_t type,
@@ -584,4 +584,4 @@ tostruct_loc(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_GENERIC_LOC_29_H */
+#endif	/* RDATA_GENERIC_LOC_29_C */
diff --git a/lib/dns/rdata/generic/mb_7.c b/lib/dns/rdata/generic/mb_7.c
index 505c5263f6..969b36c196 100644
--- a/lib/dns/rdata/generic/mb_7.c
+++ b/lib/dns/rdata/generic/mb_7.c
@@ -15,10 +15,10 @@
  * SOFTWARE.
  */
 
- /* $Id: mb_7.c,v 1.11 1999/02/24 06:31:32 marka Exp $ */
+ /* $Id: mb_7.c,v 1.12 1999/05/05 00:19:01 marka Exp $ */
 
-#ifndef RDATA_GENERIC_MB_7_H
-#define RDATA_GENERIC_MB_7_H
+#ifndef RDATA_GENERIC_MB_7_C
+#define RDATA_GENERIC_MB_7_C
 
 static dns_result_t
 fromtext_mb(dns_rdataclass_t class, dns_rdatatype_t type,
@@ -148,4 +148,4 @@ tostruct_mb(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_GENERIC_MB_7_H */
+#endif	/* RDATA_GENERIC_MB_7_C */
diff --git a/lib/dns/rdata/generic/md_3.c b/lib/dns/rdata/generic/md_3.c
index aaa5315abb..2e04238e21 100644
--- a/lib/dns/rdata/generic/md_3.c
+++ b/lib/dns/rdata/generic/md_3.c
@@ -15,10 +15,10 @@
  * SOFTWARE.
  */
 
- /* $Id: md_3.c,v 1.11 1999/02/24 06:31:32 marka Exp $ */
+ /* $Id: md_3.c,v 1.12 1999/05/05 00:19:01 marka Exp $ */
 
-#ifndef RDATA_GENERIC_MD_3_H
-#define RDATA_GENERIC_MD_3_H
+#ifndef RDATA_GENERIC_MD_3_C
+#define RDATA_GENERIC_MD_3_C
 
 static dns_result_t
 fromtext_md(dns_rdataclass_t class, dns_rdatatype_t type,
@@ -146,4 +146,4 @@ tostruct_md(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_GENERIC_MD_3_H */
+#endif	/* RDATA_GENERIC_MD_3_C */
diff --git a/lib/dns/rdata/generic/mf_4.c b/lib/dns/rdata/generic/mf_4.c
index 147a8b7d51..f983d515a5 100644
--- a/lib/dns/rdata/generic/mf_4.c
+++ b/lib/dns/rdata/generic/mf_4.c
@@ -15,10 +15,10 @@
  * SOFTWARE.
  */
 
- /* $Id: mf_4.c,v 1.10 1999/02/24 06:31:33 marka Exp $ */
+ /* $Id: mf_4.c,v 1.11 1999/05/05 00:19:01 marka Exp $ */
 
-#ifndef RDATA_GENERIC_MF_4_H
-#define RDATA_GENERIC_MF_4_H
+#ifndef RDATA_GENERIC_MF_4_C
+#define RDATA_GENERIC_MF_4_C
 
 static dns_result_t
 fromtext_mf(dns_rdataclass_t class, dns_rdatatype_t type,
@@ -146,4 +146,4 @@ tostruct_mf(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_GENERIC_MF_4_H */
+#endif	/* RDATA_GENERIC_MF_4_C */
diff --git a/lib/dns/rdata/generic/mg_8.c b/lib/dns/rdata/generic/mg_8.c
index 382acb1ebc..9b9c5aad6b 100644
--- a/lib/dns/rdata/generic/mg_8.c
+++ b/lib/dns/rdata/generic/mg_8.c
@@ -15,10 +15,10 @@
  * SOFTWARE.
  */
 
- /* $Id: mg_8.c,v 1.10 1999/02/24 06:31:33 marka Exp $ */
+ /* $Id: mg_8.c,v 1.11 1999/05/05 00:19:01 marka Exp $ */
 
-#ifndef RDATA_GENERIC_MG_8_H
-#define RDATA_GENERIC_MG_8_H
+#ifndef RDATA_GENERIC_MG_8_C
+#define RDATA_GENERIC_MG_8_C
 
 static dns_result_t
 fromtext_mg(dns_rdataclass_t class, dns_rdatatype_t type,
@@ -148,4 +148,4 @@ tostruct_mg(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_GENERIC_MG_8_H */
+#endif	/* RDATA_GENERIC_MG_8_C */
diff --git a/lib/dns/rdata/generic/minfo_14.c b/lib/dns/rdata/generic/minfo_14.c
index 7dc05c007f..906469ed19 100644
--- a/lib/dns/rdata/generic/minfo_14.c
+++ b/lib/dns/rdata/generic/minfo_14.c
@@ -15,10 +15,10 @@
  * SOFTWARE.
  */
 
- /* $Id: minfo_14.c,v 1.11 1999/02/24 06:31:33 marka Exp $ */
+ /* $Id: minfo_14.c,v 1.12 1999/05/05 00:19:01 marka Exp $ */
 
-#ifndef RDATA_GENERIC_MINFO_14_H
-#define RDATA_GENERIC_MINFO_14_H
+#ifndef RDATA_GENERIC_MINFO_14_C
+#define RDATA_GENERIC_MINFO_14_C
 
 static dns_result_t
 fromtext_minfo(dns_rdataclass_t class, dns_rdatatype_t type,
@@ -194,4 +194,4 @@ tostruct_minfo(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_GENERIC_MINFO_14_H */
+#endif	/* RDATA_GENERIC_MINFO_14_C */
diff --git a/lib/dns/rdata/generic/mr_9.c b/lib/dns/rdata/generic/mr_9.c
index d556064bcf..911c0a47e4 100644
--- a/lib/dns/rdata/generic/mr_9.c
+++ b/lib/dns/rdata/generic/mr_9.c
@@ -15,10 +15,10 @@
  * SOFTWARE.
  */
 
- /* $Id: mr_9.c,v 1.10 1999/02/24 06:31:33 marka Exp $ */
+ /* $Id: mr_9.c,v 1.11 1999/05/05 00:19:01 marka Exp $ */
 
-#ifndef RDATA_GENERIC_MR_9_H
-#define RDATA_GENERIC_MR_9_H
+#ifndef RDATA_GENERIC_MR_9_C
+#define RDATA_GENERIC_MR_9_C
 
 static dns_result_t
 fromtext_mr(dns_rdataclass_t class, dns_rdatatype_t type,
@@ -148,4 +148,4 @@ tostruct_mr(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_GENERIC_MR_9_H */
+#endif	/* RDATA_GENERIC_MR_9_C */
diff --git a/lib/dns/rdata/generic/mx_15.c b/lib/dns/rdata/generic/mx_15.c
index 08c0be3ce0..413cf52781 100644
--- a/lib/dns/rdata/generic/mx_15.c
+++ b/lib/dns/rdata/generic/mx_15.c
@@ -15,10 +15,10 @@
  * SOFTWARE.
  */
 
- /* $Id: mx_15.c,v 1.13 1999/02/24 06:31:33 marka Exp $ */
+ /* $Id: mx_15.c,v 1.14 1999/05/05 00:19:01 marka Exp $ */
 
-#ifndef RDATA_GENERIC_MX_15_H
-#define RDATA_GENERIC_MX_15_H
+#ifndef RDATA_GENERIC_MX_15_C
+#define RDATA_GENERIC_MX_15_C
 
 static dns_result_t
 fromtext_mx(dns_rdataclass_t class, dns_rdatatype_t type,
@@ -185,4 +185,4 @@ tostruct_mx(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_GENERIC_MX_15_H */
+#endif	/* RDATA_GENERIC_MX_15_C */
diff --git a/lib/dns/rdata/generic/ns_2.c b/lib/dns/rdata/generic/ns_2.c
index 134268258f..fc63b26184 100644
--- a/lib/dns/rdata/generic/ns_2.c
+++ b/lib/dns/rdata/generic/ns_2.c
@@ -15,10 +15,10 @@
  * SOFTWARE.
  */
 
- /* $Id: ns_2.c,v 1.10 1999/02/24 06:31:33 marka Exp $ */
+ /* $Id: ns_2.c,v 1.11 1999/05/05 00:19:02 marka Exp $ */
 
-#ifndef RDATA_GENERIC_NS_2_H
-#define RDATA_GENERIC_NS_2_H
+#ifndef RDATA_GENERIC_NS_2_C
+#define RDATA_GENERIC_NS_2_C
 
 static dns_result_t
 fromtext_ns(dns_rdataclass_t class, dns_rdatatype_t type,
@@ -148,4 +148,4 @@ tostruct_ns(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_GENERIC_NS_2_H */
+#endif	/* RDATA_GENERIC_NS_2_C */
diff --git a/lib/dns/rdata/generic/null_10.c b/lib/dns/rdata/generic/null_10.c
index a7c4ce1c8b..7fc838a2df 100644
--- a/lib/dns/rdata/generic/null_10.c
+++ b/lib/dns/rdata/generic/null_10.c
@@ -15,10 +15,10 @@
  * SOFTWARE.
  */
 
- /* $Id: null_10.c,v 1.7 1999/02/16 22:51:18 marka Exp $ */
+ /* $Id: null_10.c,v 1.8 1999/05/05 00:19:02 marka Exp $ */
 
-#ifndef RDATA_GENERIC_NULL_10_H
-#define RDATA_GENERIC_NULL_10_H
+#ifndef RDATA_GENERIC_NULL_10_C
+#define RDATA_GENERIC_NULL_10_C
 
 static dns_result_t
 fromtext_null(dns_rdataclass_t class, dns_rdatatype_t type,
@@ -113,4 +113,4 @@ tostruct_null(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_GENERIC_NULL_10_H */
+#endif	/* RDATA_GENERIC_NULL_10_C */
diff --git a/lib/dns/rdata/generic/nxt_30.c b/lib/dns/rdata/generic/nxt_30.c
index 1cb1141d41..ad0677285d 100644
--- a/lib/dns/rdata/generic/nxt_30.c
+++ b/lib/dns/rdata/generic/nxt_30.c
@@ -15,12 +15,12 @@
  * SOFTWARE.
  */
 
- /* $Id: nxt_30.c,v 1.7 1999/02/24 06:31:33 marka Exp $ */
+ /* $Id: nxt_30.c,v 1.8 1999/05/05 00:19:02 marka Exp $ */
 
  /* RFC 2065 */
 
-#ifndef RDATA_GENERIC_NXT_30_H
-#define RDATA_GENERIC_NXT_30_H
+#ifndef RDATA_GENERIC_NXT_30_C
+#define RDATA_GENERIC_NXT_30_C
 
 static dns_result_t
 fromtext_nxt(dns_rdataclass_t class, dns_rdatatype_t type,
@@ -214,4 +214,4 @@ tostruct_nxt(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_GENERIC_NXT_30_H */
+#endif	/* RDATA_GENERIC_NXT_30_C */
diff --git a/lib/dns/rdata/generic/proforma.c b/lib/dns/rdata/generic/proforma.c
index f598295256..fbfa1d7554 100644
--- a/lib/dns/rdata/generic/proforma.c
+++ b/lib/dns/rdata/generic/proforma.c
@@ -15,10 +15,10 @@
  * SOFTWARE.
  */
 
- /* $Id: proforma.c,v 1.8 1999/02/24 06:31:33 marka Exp $ */
+ /* $Id: proforma.c,v 1.9 1999/05/05 00:19:02 marka Exp $ */
 
-#ifndef RDATA_GENERIC_#_#_H
-#define RDATA_GENERIC_#_#_H
+#ifndef RDATA_GENERIC_#_#_C
+#define RDATA_GENERIC_#_#_C
 
 static dns_result_t
 fromtext_#(dns_rdataclass_t class, dns_rdatatype_t type,
@@ -106,4 +106,4 @@ tostruct_#(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_GENERIC_#_#_H */
+#endif	/* RDATA_GENERIC_#_#_C */
diff --git a/lib/dns/rdata/generic/ptr_12.c b/lib/dns/rdata/generic/ptr_12.c
index 20ee3bc8b8..451c3aa7f1 100644
--- a/lib/dns/rdata/generic/ptr_12.c
+++ b/lib/dns/rdata/generic/ptr_12.c
@@ -15,10 +15,10 @@
  * SOFTWARE.
  */
 
- /* $Id: ptr_12.c,v 1.11 1999/02/24 06:31:34 marka Exp $ */
+ /* $Id: ptr_12.c,v 1.12 1999/05/05 00:19:02 marka Exp $ */
 
-#ifndef RDATA_GENERIC_PTR_12_H
-#define RDATA_GENERIC_PTR_12_H
+#ifndef RDATA_GENERIC_PTR_12_C
+#define RDATA_GENERIC_PTR_12_C
 
 static dns_result_t
 fromtext_ptr(dns_rdataclass_t class, dns_rdatatype_t type,
@@ -148,4 +148,4 @@ tostruct_ptr(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_GENERIC_PTR_12_H */
+#endif	/* RDATA_GENERIC_PTR_12_C */
diff --git a/lib/dns/rdata/generic/rp_17.c b/lib/dns/rdata/generic/rp_17.c
index 189a795d6d..32fbc80238 100644
--- a/lib/dns/rdata/generic/rp_17.c
+++ b/lib/dns/rdata/generic/rp_17.c
@@ -15,12 +15,12 @@
  * SOFTWARE.
  */
 
- /* $Id: rp_17.c,v 1.5 1999/02/24 06:31:34 marka Exp $ */
+ /* $Id: rp_17.c,v 1.6 1999/05/05 00:19:02 marka Exp $ */
 
  /* RFC 1183 */
 
-#ifndef RDATA_GENERIC_RP_17_H
-#define RDATA_GENERIC_RP_17_H
+#ifndef RDATA_GENERIC_RP_17_C
+#define RDATA_GENERIC_RP_17_C
 
 static dns_result_t
 fromtext_rp(dns_rdataclass_t class, dns_rdatatype_t type,
@@ -196,4 +196,4 @@ tostruct_rp(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_GENERIC_RP_17_H */
+#endif	/* RDATA_GENERIC_RP_17_C */
diff --git a/lib/dns/rdata/generic/rt_21.c b/lib/dns/rdata/generic/rt_21.c
index f0b9176d05..07739d78c6 100644
--- a/lib/dns/rdata/generic/rt_21.c
+++ b/lib/dns/rdata/generic/rt_21.c
@@ -15,12 +15,12 @@
  * SOFTWARE.
  */
 
- /* $Id: rt_21.c,v 1.5 1999/02/24 06:31:34 marka Exp $ */
+ /* $Id: rt_21.c,v 1.6 1999/05/05 00:19:02 marka Exp $ */
 
  /* RFC 1183 */
 
-#ifndef RDATA_GENERIC_RT_21_H
-#define RDATA_GENERIC_RT_21_H
+#ifndef RDATA_GENERIC_RT_21_C
+#define RDATA_GENERIC_RT_21_C
 
 static dns_result_t
 fromtext_rt(dns_rdataclass_t class, dns_rdatatype_t type,
@@ -186,4 +186,4 @@ tostruct_rt(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_GENERIC_RT_21_H */
+#endif	/* RDATA_GENERIC_RT_21_C */
diff --git a/lib/dns/rdata/generic/sig_24.c b/lib/dns/rdata/generic/sig_24.c
index 027e13df80..c4d4ee5e6b 100644
--- a/lib/dns/rdata/generic/sig_24.c
+++ b/lib/dns/rdata/generic/sig_24.c
@@ -15,12 +15,12 @@
  * SOFTWARE.
  */
 
- /* $Id: sig_24.c,v 1.9 1999/02/24 06:31:34 marka Exp $ */
+ /* $Id: sig_24.c,v 1.10 1999/05/05 00:19:02 marka Exp $ */
 
  /* RFC 2065 */
 
-#ifndef RDATA_GENERIC_SIG_24_H
-#define RDATA_GENERIC_SIG_24_H
+#ifndef RDATA_GENERIC_SIG_24_C
+#define RDATA_GENERIC_SIG_24_C
 
 static dns_result_t
 fromtext_sig(dns_rdataclass_t class, dns_rdatatype_t type,
@@ -313,4 +313,4 @@ tostruct_sig(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_GENERIC_SIG_24_H */
+#endif	/* RDATA_GENERIC_SIG_24_C */
diff --git a/lib/dns/rdata/generic/soa_6.c b/lib/dns/rdata/generic/soa_6.c
index 370a6a4dfb..f77b0efbdf 100644
--- a/lib/dns/rdata/generic/soa_6.c
+++ b/lib/dns/rdata/generic/soa_6.c
@@ -15,10 +15,10 @@
  * SOFTWARE.
  */
 
- /* $Id: soa_6.c,v 1.14 1999/02/24 06:31:34 marka Exp $ */
+ /* $Id: soa_6.c,v 1.15 1999/05/05 00:19:03 marka Exp $ */
 
-#ifndef RDATA_GENERIC_SOA_6_H
-#define RDATA_GENERIC_SOA_6_H
+#ifndef RDATA_GENERIC_SOA_6_C
+#define RDATA_GENERIC_SOA_6_C
 
 static dns_result_t
 fromtext_soa(dns_rdataclass_t class, dns_rdatatype_t type,
@@ -241,4 +241,4 @@ tostruct_soa(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_GENERIC_SOA_6_H */
+#endif	/* RDATA_GENERIC_SOA_6_C */
diff --git a/lib/dns/rdata/generic/tkey_249.c b/lib/dns/rdata/generic/tkey_249.c
index d020e2825e..08e049edef 100644
--- a/lib/dns/rdata/generic/tkey_249.c
+++ b/lib/dns/rdata/generic/tkey_249.c
@@ -15,12 +15,12 @@
  * SOFTWARE.
  */
 
- /* $Id: tkey_249.c,v 1.7 1999/02/24 06:31:34 marka Exp $ */
+ /* $Id: tkey_249.c,v 1.8 1999/05/05 00:19:03 marka Exp $ */
 
  /* draft-ietf-dnssec-tkey-01.txt */
 
-#ifndef RDATA_GENERIC_TKEY_249_H
-#define RDATA_GENERIC_TKEY_249_H
+#ifndef RDATA_GENERIC_TKEY_249_C
+#define RDATA_GENERIC_TKEY_249_C
 
 static dns_result_t
 fromtext_tkey(dns_rdataclass_t class, dns_rdatatype_t type,
@@ -293,4 +293,4 @@ tostruct_tkey(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_GENERIC_TKEY_249_H */
+#endif	/* RDATA_GENERIC_TKEY_249_C */
diff --git a/lib/dns/rdata/generic/txt_16.c b/lib/dns/rdata/generic/txt_16.c
index 9943c26431..9035beb07e 100644
--- a/lib/dns/rdata/generic/txt_16.c
+++ b/lib/dns/rdata/generic/txt_16.c
@@ -15,10 +15,10 @@
  * SOFTWARE.
  */
 
- /* $Id: txt_16.c,v 1.9 1999/02/16 22:42:30 marka Exp $ */
+ /* $Id: txt_16.c,v 1.10 1999/05/05 00:19:03 marka Exp $ */
 
-#ifndef RDATA_GENERIC_TXT_16_H
-#define RDATA_GENERIC_TXT_16_H
+#ifndef RDATA_GENERIC_TXT_16_C
+#define RDATA_GENERIC_TXT_16_C
 
 static dns_result_t
 fromtext_txt(dns_rdataclass_t class, dns_rdatatype_t type,
@@ -141,4 +141,4 @@ tostruct_txt(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_GENERIC_TXT_16_H */
+#endif	/* RDATA_GENERIC_TXT_16_C */
diff --git a/lib/dns/rdata/generic/unspec_103.c b/lib/dns/rdata/generic/unspec_103.c
index 20d286431d..cfd2fca47c 100644
--- a/lib/dns/rdata/generic/unspec_103.c
+++ b/lib/dns/rdata/generic/unspec_103.c
@@ -15,10 +15,10 @@
  * SOFTWARE.
  */
 
- /* $Id: unspec_103.c,v 1.2 1999/02/16 22:42:30 marka Exp $ */
+ /* $Id: unspec_103.c,v 1.3 1999/05/05 00:19:03 marka Exp $ */
 
-#ifndef RDATA_GENERIC_UNSPEC_103_H
-#define RDATA_GENERIC_UNSPEC_103_H
+#ifndef RDATA_GENERIC_UNSPEC_103_C
+#define RDATA_GENERIC_UNSPEC_103_C
 
 static dns_result_t
 fromtext_unspec(dns_rdataclass_t class, dns_rdatatype_t type,
@@ -111,4 +111,4 @@ tostruct_unspec(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_GENERIC_UNSPEC_103_H */
+#endif	/* RDATA_GENERIC_UNSPEC_103_C */
diff --git a/lib/dns/rdata/generic/x25_19.c b/lib/dns/rdata/generic/x25_19.c
index a15e2aaab1..7a08d8c420 100644
--- a/lib/dns/rdata/generic/x25_19.c
+++ b/lib/dns/rdata/generic/x25_19.c
@@ -15,12 +15,12 @@
  * SOFTWARE.
  */
 
- /* $Id: x25_19.c,v 1.2 1999/02/16 22:42:31 marka Exp $ */
+ /* $Id: x25_19.c,v 1.3 1999/05/05 00:19:03 marka Exp $ */
 
  /* RFC 1183 */
 
-#ifndef RDATA_GENERIC_X25_19_H
-#define RDATA_GENERIC_X25_19_H
+#ifndef RDATA_GENERIC_X25_19_C
+#define RDATA_GENERIC_X25_19_C
 
 #include <ctype.h>
 
@@ -127,4 +127,4 @@ tostruct_x25(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_GENERIC_X25_19_H */
+#endif	/* RDATA_GENERIC_X25_19_C */
diff --git a/lib/dns/rdata/in_1/a6_38.c b/lib/dns/rdata/in_1/a6_38.c
index 5751bd9a57..1749d791a0 100644
--- a/lib/dns/rdata/in_1/a6_38.c
+++ b/lib/dns/rdata/in_1/a6_38.c
@@ -15,12 +15,12 @@
  * SOFTWARE.
  */
 
- /* $Id: a6_38.c,v 1.7 1999/02/24 06:31:34 marka Exp $ */
+ /* $Id: a6_38.c,v 1.8 1999/05/05 00:19:03 marka Exp $ */
 
  /* draft-ietf-ipngwg-dns-lookups-03.txt */
 
-#ifndef RDATA_IN_1_A6_28_H
-#define RDATA_IN_1_A6_28_H
+#ifndef RDATA_IN_1_A6_28_C
+#define RDATA_IN_1_A6_28_C
 
 #include <string.h>
 
@@ -272,4 +272,4 @@ tostruct_in_a6(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_IN_1_A6_38_H */
+#endif	/* RDATA_IN_1_A6_38_C */
diff --git a/lib/dns/rdata/in_1/a_1.c b/lib/dns/rdata/in_1/a_1.c
index 08f53280f9..11bc579a5e 100644
--- a/lib/dns/rdata/in_1/a_1.c
+++ b/lib/dns/rdata/in_1/a_1.c
@@ -15,10 +15,10 @@
  * SOFTWARE.
  */
 
- /* $Id: a_1.c,v 1.12 1999/02/16 22:42:31 marka Exp $ */
+ /* $Id: a_1.c,v 1.13 1999/05/05 00:19:03 marka Exp $ */
 
-#ifndef RDATA_IN_1_A_1_H
-#define RDATA_IN_1_A_1_H
+#ifndef RDATA_IN_1_A_1_C
+#define RDATA_IN_1_A_1_C
 
 #include <string.h>
 
@@ -161,4 +161,4 @@ tostruct_in_a(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_IN_1_A_1_H */
+#endif	/* RDATA_IN_1_A_1_C */
diff --git a/lib/dns/rdata/in_1/aaaa_28.c b/lib/dns/rdata/in_1/aaaa_28.c
index 9a97f2cb29..02508f2707 100644
--- a/lib/dns/rdata/in_1/aaaa_28.c
+++ b/lib/dns/rdata/in_1/aaaa_28.c
@@ -15,12 +15,12 @@
  * SOFTWARE.
  */
 
- /* $Id: aaaa_28.c,v 1.6 1999/02/16 22:42:31 marka Exp $ */
+ /* $Id: aaaa_28.c,v 1.7 1999/05/05 00:19:04 marka Exp $ */
 
  /* RFC 1886 */
 
-#ifndef RDATA_IN_1_AAAA_28_H
-#define RDATA_IN_1_AAAA_28_H
+#ifndef RDATA_IN_1_AAAA_28_C
+#define RDATA_IN_1_AAAA_28_C
 
 #include <string.h>
 
@@ -163,4 +163,4 @@ tostruct_in_aaaa(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_IN_1_AAAA_28_H */
+#endif	/* RDATA_IN_1_AAAA_28_C */
diff --git a/lib/dns/rdata/in_1/kx_36.c b/lib/dns/rdata/in_1/kx_36.c
index ca29f10ec3..b9793850e1 100644
--- a/lib/dns/rdata/in_1/kx_36.c
+++ b/lib/dns/rdata/in_1/kx_36.c
@@ -15,12 +15,12 @@
  * SOFTWARE.
  */
 
- /* $Id: kx_36.c,v 1.5 1999/02/24 06:31:35 marka Exp $ */
+ /* $Id: kx_36.c,v 1.6 1999/05/05 00:19:04 marka Exp $ */
 
  /* RFC 2230 */
 
-#ifndef RDATA_GENERIC_KX_36_H
-#define RDATA_GENERIC_KX_36_H
+#ifndef RDATA_GENERIC_KX_36_C
+#define RDATA_GENERIC_KX_36_C
 
 static dns_result_t
 fromtext_in_kx(dns_rdataclass_t class, dns_rdatatype_t type,
@@ -177,4 +177,4 @@ tostruct_in_kx(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_GENERIC_KX_15_H */
+#endif	/* RDATA_GENERIC_KX_15_C */
diff --git a/lib/dns/rdata/in_1/naptr_35.c b/lib/dns/rdata/in_1/naptr_35.c
index fdd44a8b7f..ac57b22fd6 100644
--- a/lib/dns/rdata/in_1/naptr_35.c
+++ b/lib/dns/rdata/in_1/naptr_35.c
@@ -15,12 +15,12 @@
  * SOFTWARE.
  */
 
- /* $Id: naptr_35.c,v 1.5 1999/02/24 06:31:35 marka Exp $ */
+ /* $Id: naptr_35.c,v 1.6 1999/05/05 00:19:04 marka Exp $ */
 
  /* RFC 2168 */
 
-#ifndef RDATA_IN_1_NAPTR_35_H
-#define RDATA_IN_1_NAPTR_35_H
+#ifndef RDATA_IN_1_NAPTR_35_C
+#define RDATA_IN_1_NAPTR_35_C
 
 static dns_result_t
 fromtext_in_naptr(dns_rdataclass_t class, dns_rdatatype_t type,
@@ -263,4 +263,4 @@ tostruct_in_naptr(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_IN_1_NAPTR_35_H */
+#endif	/* RDATA_IN_1_NAPTR_35_C */
diff --git a/lib/dns/rdata/in_1/nsap-ptr_23.c b/lib/dns/rdata/in_1/nsap-ptr_23.c
index 2ef858fe5d..5ff01bca0d 100644
--- a/lib/dns/rdata/in_1/nsap-ptr_23.c
+++ b/lib/dns/rdata/in_1/nsap-ptr_23.c
@@ -15,12 +15,12 @@
  * SOFTWARE.
  */
 
- /* $Id: nsap-ptr_23.c,v 1.4 1999/02/24 06:31:35 marka Exp $ */
+ /* $Id: nsap-ptr_23.c,v 1.5 1999/05/05 00:19:04 marka Exp $ */
 
  /* RFC 1348 */
 
-#ifndef RDATA_IN_1_NSAP_PTR_23_H
-#define RDATA_IN_1_NSAP_PTR_23_H
+#ifndef RDATA_IN_1_NSAP_PTR_23_C
+#define RDATA_IN_1_NSAP_PTR_23_C
 
 static dns_result_t
 fromtext_in_nsap_ptr(dns_rdataclass_t class, dns_rdatatype_t type,
@@ -155,4 +155,4 @@ tostruct_in_nsap_ptr(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_IN_1_NSAP_PTR_23_H */
+#endif	/* RDATA_IN_1_NSAP_PTR_23_C */
diff --git a/lib/dns/rdata/in_1/nsap_22.c b/lib/dns/rdata/in_1/nsap_22.c
index 94eba3c417..a017235307 100644
--- a/lib/dns/rdata/in_1/nsap_22.c
+++ b/lib/dns/rdata/in_1/nsap_22.c
@@ -15,12 +15,12 @@
  * SOFTWARE.
  */
 
- /* $Id: nsap_22.c,v 1.2 1999/02/16 22:42:32 marka Exp $ */
+ /* $Id: nsap_22.c,v 1.3 1999/05/05 00:19:04 marka Exp $ */
 
  /* RFC 1706 */
 
-#ifndef RDATA_IN_1_NSAP_22_H
-#define RDATA_IN_1_NSAP_22_H
+#ifndef RDATA_IN_1_NSAP_22_C
+#define RDATA_IN_1_NSAP_22_C
 
 #include <string.h>
 
@@ -163,4 +163,4 @@ tostruct_in_nsap(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_IN_1_NSAP_22_H */
+#endif	/* RDATA_IN_1_NSAP_22_C */
diff --git a/lib/dns/rdata/in_1/px_26.c b/lib/dns/rdata/in_1/px_26.c
index 78f2a9c7f1..35a58a21e9 100644
--- a/lib/dns/rdata/in_1/px_26.c
+++ b/lib/dns/rdata/in_1/px_26.c
@@ -15,12 +15,12 @@
  * SOFTWARE.
  */
 
- /* $Id: px_26.c,v 1.4 1999/02/24 06:31:35 marka Exp $ */
+ /* $Id: px_26.c,v 1.5 1999/05/05 00:19:04 marka Exp $ */
 
  /* RFC 2163 */
 
-#ifndef RDATA_IN_1_PX_26_H
-#define RDATA_IN_1_PX_26_H
+#ifndef RDATA_IN_1_PX_26_C
+#define RDATA_IN_1_PX_26_C
 
 static dns_result_t
 fromtext_in_px(dns_rdataclass_t class, dns_rdatatype_t type,
@@ -219,4 +219,4 @@ tostruct_in_px(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_IN_1_PX_26_H */
+#endif	/* RDATA_IN_1_PX_26_C */
diff --git a/lib/dns/rdata/in_1/srv_33.c b/lib/dns/rdata/in_1/srv_33.c
index 0e403ab75d..53e594b6e0 100644
--- a/lib/dns/rdata/in_1/srv_33.c
+++ b/lib/dns/rdata/in_1/srv_33.c
@@ -15,12 +15,12 @@
  * SOFTWARE.
  */
 
- /* $Id: srv_33.c,v 1.4 1999/02/24 06:31:35 marka Exp $ */
+ /* $Id: srv_33.c,v 1.5 1999/05/05 00:19:04 marka Exp $ */
 
  /* RFC 2052 bis */
 
-#ifndef RDATA_IN_1_SRV_33_H
-#define RDATA_IN_1_SRV_33_H
+#ifndef RDATA_IN_1_SRV_33_C
+#define RDATA_IN_1_SRV_33_C
 
 static dns_result_t
 fromtext_in_srv(dns_rdataclass_t class, dns_rdatatype_t type,
@@ -208,4 +208,4 @@ tostruct_in_srv(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_IN_1_SRV_33_H */
+#endif	/* RDATA_IN_1_SRV_33_C */
diff --git a/lib/dns/rdata/in_1/wks_11.c b/lib/dns/rdata/in_1/wks_11.c
index 2842fe86cb..29d3422138 100644
--- a/lib/dns/rdata/in_1/wks_11.c
+++ b/lib/dns/rdata/in_1/wks_11.c
@@ -15,10 +15,10 @@
  * SOFTWARE.
  */
 
- /* $Id: wks_11.c,v 1.8 1999/02/16 22:42:33 marka Exp $ */
+ /* $Id: wks_11.c,v 1.9 1999/05/05 00:19:04 marka Exp $ */
 
-#ifndef RDATA_IN_1_WKS_11_H
-#define RDATA_IN_1_WKS_11_H
+#ifndef RDATA_IN_1_WKS_11_C
+#define RDATA_IN_1_WKS_11_C
 
 #include <limits.h>
 #include <netdb.h>
@@ -235,4 +235,4 @@ tostruct_in_wks(dns_rdata_t *rdata, void *target) {
 
 	return (DNS_R_NOTIMPLEMENTED);
 }
-#endif	/* RDATA_IN_1_WKS_11_H */
+#endif	/* RDATA_IN_1_WKS_11_C */