diff --git a/lib/dns/rdata/generic/opt_41.h b/lib/dns/rdata/generic/opt_41.h
index 039cf006bc..81ec221315 100644
--- a/lib/dns/rdata/generic/opt_41.h
+++ b/lib/dns/rdata/generic/opt_41.h
@@ -18,7 +18,7 @@
 #ifndef GENERIC_OPT_41_H
 #define GENERIC_OPT_41_H 1
 
-/* $Id: opt_41.h,v 1.9 2000/06/28 19:03:23 tale Exp $ */
+/* $Id: opt_41.h,v 1.10 2000/06/28 19:07:18 tale Exp $ */
 
 /* RFC 2671 */
 
@@ -38,11 +38,10 @@ typedef struct dns_rdata_opt {
 } dns_rdata_opt_t;
 
 /*
- * isc/lang.h is included via rdatastructpre.h when gen builds rdatastruct.h.
+ * ISC_LANG_BEGINDECLS and ISC_LANG_ENDDECLS are already done
+ * via rdatastructpre.h and rdatastructsuf.h.
  */
 
-ISC_LANG_BEGINDECLS
-
 isc_result_t
 dns_rdata_opt_first(dns_rdata_opt_t *);
 
@@ -52,6 +51,4 @@ dns_rdata_opt_next(dns_rdata_opt_t *);
 isc_result_t
 dns_rdata_opt_current(dns_rdata_opt_t *, dns_rdata_opt_opcode_t *);
 
-ISC_LANG_ENDDECLS
-
 #endif /* GENERIC_OPT_41_H */
diff --git a/lib/dns/rdata/generic/txt_16.h b/lib/dns/rdata/generic/txt_16.h
index a1847c9ece..c7a942f2d7 100644
--- a/lib/dns/rdata/generic/txt_16.h
+++ b/lib/dns/rdata/generic/txt_16.h
@@ -18,7 +18,7 @@
 #ifndef GENERIC_TXT_16_H
 #define GENERIC_TXT_16_H 1
 
-/* $Id: txt_16.h,v 1.19 2000/06/28 19:03:24 tale Exp $ */
+/* $Id: txt_16.h,v 1.20 2000/06/28 19:07:19 tale Exp $ */
 
 typedef struct dns_rdata_txt_string {
                 isc_uint8_t    length;
@@ -35,11 +35,10 @@ typedef struct dns_rdata_txt {
 } dns_rdata_txt_t;
 
 /*
- * isc/lang.h is included via rdatastructpre.h when gen builds rdatastruct.h.
+ * ISC_LANG_BEGINDECLS and ISC_LANG_ENDDECLS are already done
+ * via rdatastructpre.h and rdatastructsuf.h.
  */
 
-ISC_LANG_BEGINDECLS
-
 isc_result_t
 dns_rdata_txt_first(dns_rdata_txt_t *);
 
@@ -49,6 +48,4 @@ dns_rdata_txt_next(dns_rdata_txt_t *);
 isc_result_t
 dns_rdata_txt_current(dns_rdata_txt_t *, dns_rdata_txt_string_t *);
 
-ISC_LANG_ENDDECLS
-
 #endif /* GENERIC_TXT_16_H */