diff --git a/lib/dns/rdata/generic/afsdb_18.h b/lib/dns/rdata/generic/afsdb_18.h
index cc88bfd16c..ab95751a56 100644
--- a/lib/dns/rdata/generic/afsdb_18.h
+++ b/lib/dns/rdata/generic/afsdb_18.h
@@ -15,11 +15,13 @@
  * SOFTWARE.
  */
 
-/* $Id: afsdb_18.h,v 1.10 2000/03/16 00:52:59 explorer Exp $ */
+/* $Id: afsdb_18.h,v 1.11 2000/04/28 21:48:37 marka Exp $ */
 
 /* RFC 1183 */
 
 typedef struct dns_rdata_afsdb {
 	dns_rdatacommon_t	common;
-	/*XXX*/
+	isc_mem_t		*mctx;
+	isc_uint16_t		subtype;
+	dns_name_t		server;
 } dns_rdata_afsdb_t;
diff --git a/lib/dns/rdata/generic/cert_37.h b/lib/dns/rdata/generic/cert_37.h
index 2422bb2244..df4b8caf43 100644
--- a/lib/dns/rdata/generic/cert_37.h
+++ b/lib/dns/rdata/generic/cert_37.h
@@ -15,7 +15,16 @@
  * SOFTWARE.
  */
 
-/* $Id: cert_37.h,v 1.10 2000/03/20 22:48:58 gson Exp $ */
+/* $Id: cert_37.h,v 1.11 2000/04/28 21:48:38 marka Exp $ */
 
-/* draft-ietf-dnssec-certs-04.txt */
+/* RFC 2538 */
 
+typedef struct dns_rdata_cert {
+	dns_rdatacommon_t	common;
+	isc_mem_t		*mctx;
+	isc_uint16_t		type;
+	isc_uint16_t		key_tag;
+	isc_uint8_t		algorithm;
+	isc_uint16_t		length;
+	unsigned char		*certificate;
+} dns_rdata_cert_t;
diff --git a/lib/dns/rdata/generic/gpos_27.h b/lib/dns/rdata/generic/gpos_27.h
index 6242292312..9b60bbcb25 100644
--- a/lib/dns/rdata/generic/gpos_27.h
+++ b/lib/dns/rdata/generic/gpos_27.h
@@ -15,7 +15,17 @@
  * SOFTWARE.
  */
 
-/* $Id: gpos_27.h,v 1.7 2000/03/20 22:57:11 gson Exp $ */
+/* $Id: gpos_27.h,v 1.8 2000/04/28 21:48:39 marka Exp $ */
 
 /* RFC 1712 */
 
+typedef struct dns_rdata_gpos {
+	dns_rdatacommon_t	common;
+	isc_mem_t		*mctx;
+	char			*longitude;
+	char			*latitude;
+	char			*altitude;
+	isc_uint8_t		long_len;
+	isc_uint8_t		lat_len;
+	isc_uint8_t		alt_len;
+} dns_rdata_gpos_t;
diff --git a/lib/dns/rdata/generic/hinfo_13.h b/lib/dns/rdata/generic/hinfo_13.h
index 300be1e4df..19b82f22de 100644
--- a/lib/dns/rdata/generic/hinfo_13.h
+++ b/lib/dns/rdata/generic/hinfo_13.h
@@ -15,5 +15,13 @@
  * SOFTWARE.
  */
 
-/* $Id: hinfo_13.h,v 1.15 2000/03/20 22:57:12 gson Exp $ */
+/* $Id: hinfo_13.h,v 1.16 2000/04/28 21:48:40 marka Exp $ */
 
+typedef struct dns_rdata_hinfo {
+	dns_rdatacommon_t	common;
+	isc_mem_t		*mctx;
+	char			*cpu;
+	char			*os;
+	isc_int8_t		cpu_len;
+	isc_int8_t		os_len;
+} dns_rdata_hinfo_t;
diff --git a/lib/dns/rdata/generic/isdn_20.h b/lib/dns/rdata/generic/isdn_20.h
index 9ea2723b55..2b96d6fe82 100644
--- a/lib/dns/rdata/generic/isdn_20.h
+++ b/lib/dns/rdata/generic/isdn_20.h
@@ -15,7 +15,15 @@
  * SOFTWARE.
  */
 
-/* $Id: isdn_20.h,v 1.7 2000/03/20 22:57:12 gson Exp $ */
+/* $Id: isdn_20.h,v 1.8 2000/04/28 21:48:41 marka Exp $ */
 
 /* RFC 1183 */
 
+typedef struct dns_rdata_isdn {
+	dns_rdatacommon_t	common;
+	isc_mem_t		*mctx;
+	char			*isdn;
+	char			*sa;
+	isc_int8_t		isdn_len;
+	isc_int8_t		sa_len;
+} dns_rdata_isdn_t;
diff --git a/lib/dns/rdata/generic/loc_29.h b/lib/dns/rdata/generic/loc_29.h
index b1d90fa85c..61c6e908a9 100644
--- a/lib/dns/rdata/generic/loc_29.h
+++ b/lib/dns/rdata/generic/loc_29.h
@@ -15,7 +15,12 @@
  * SOFTWARE.
  */
 
-/* $Id: loc_29.h,v 1.7 2000/03/16 02:18:16 explorer Exp $ */
+/* $Id: loc_29.h,v 1.8 2000/04/28 21:48:43 marka Exp $ */
 
 /* RFC 1876 */
 
+typedef struct dns_rdata_loc {
+	dns_rdatacommon_t	common;
+	isc_mem_t		*mctx;
+	dns_name_t		loc;
+} dns_rdata_loc_t;
diff --git a/lib/dns/rdata/generic/md_3.h b/lib/dns/rdata/generic/md_3.h
index 10244f77e2..bff63fcfca 100644
--- a/lib/dns/rdata/generic/md_3.h
+++ b/lib/dns/rdata/generic/md_3.h
@@ -15,5 +15,13 @@
  * SOFTWARE.
  */
 
-/* $Id: md_3.h,v 1.16 2000/03/20 22:57:12 gson Exp $ */
+/* $Id: md_3.h,v 1.17 2000/04/28 21:48:44 marka Exp $ */
+
+#include <dns/name.h>
+
+typedef struct dns_rdata_md {
+	dns_rdatacommon_t	common;
+	isc_mem_t		*mctx;
+	dns_name_t		md;
+} dns_rdata_md_t;
 
diff --git a/lib/dns/rdata/generic/mf_4.h b/lib/dns/rdata/generic/mf_4.h
index 3220b92738..c86be9e107 100644
--- a/lib/dns/rdata/generic/mf_4.h
+++ b/lib/dns/rdata/generic/mf_4.h
@@ -15,5 +15,12 @@
  * SOFTWARE.
  */
 
-/* $Id: mf_4.h,v 1.14 2000/03/20 22:57:12 gson Exp $ */
+/* $Id: mf_4.h,v 1.15 2000/04/28 21:48:45 marka Exp $ */
 
+#include <dns/name.h>
+
+typedef struct dns_rdata_mf {
+	dns_rdatacommon_t	common;
+	isc_mem_t		*mctx;
+	dns_name_t		mf;
+} dns_rdata_mf_t;
diff --git a/lib/dns/rdata/generic/mg_8.h b/lib/dns/rdata/generic/mg_8.h
index f692b561b6..4ab2d6abcb 100644
--- a/lib/dns/rdata/generic/mg_8.h
+++ b/lib/dns/rdata/generic/mg_8.h
@@ -15,5 +15,12 @@
  * SOFTWARE.
  */
 
-/* $Id: mg_8.h,v 1.14 2000/03/20 22:57:13 gson Exp $ */
+/* $Id: mg_8.h,v 1.15 2000/04/28 21:48:46 marka Exp $ */
 
+#include <dns/name.h>
+
+typedef struct dns_rdata_mg {
+	dns_rdatacommon_t	common;
+	isc_mem_t		*mctx;
+	dns_name_t		mg;
+} dns_rdata_mg_t;
diff --git a/lib/dns/rdata/generic/minfo_14.h b/lib/dns/rdata/generic/minfo_14.h
index 956de03014..00cdafc1ed 100644
--- a/lib/dns/rdata/generic/minfo_14.h
+++ b/lib/dns/rdata/generic/minfo_14.h
@@ -15,5 +15,13 @@
  * SOFTWARE.
  */
 
-/* $Id: minfo_14.h,v 1.15 2000/03/20 22:57:13 gson Exp $ */
+/* $Id: minfo_14.h,v 1.16 2000/04/28 21:48:47 marka Exp $ */
 
+#include <dns/name.h>
+
+typedef struct dns_rdata_minfo {
+	dns_rdatacommon_t	common;
+	isc_mem_t		*mctx;
+	dns_name_t		rmailbox;
+	dns_name_t		emailbox;
+} dns_rdata_minfo_t;
diff --git a/lib/dns/rdata/generic/mr_9.h b/lib/dns/rdata/generic/mr_9.h
index fc814bc134..9ca7fd45ba 100644
--- a/lib/dns/rdata/generic/mr_9.h
+++ b/lib/dns/rdata/generic/mr_9.h
@@ -15,5 +15,12 @@
  * SOFTWARE.
  */
 
-/* $Id: mr_9.h,v 1.14 2000/03/20 22:57:13 gson Exp $ */
+/* $Id: mr_9.h,v 1.15 2000/04/28 21:48:48 marka Exp $ */
 
+#include <dns/name.h>
+
+typedef struct dns_rdata_mr {
+	dns_rdatacommon_t	common;
+	isc_mem_t		*mctx;
+	dns_name_t		mr;
+} dns_rdata_mr_t;
diff --git a/lib/dns/rdata/generic/mx_15.h b/lib/dns/rdata/generic/mx_15.h
index 3049c25905..4d06d830e7 100644
--- a/lib/dns/rdata/generic/mx_15.h
+++ b/lib/dns/rdata/generic/mx_15.h
@@ -15,5 +15,13 @@
  * SOFTWARE.
  */
 
-/* $Id: mx_15.h,v 1.17 2000/03/20 22:57:13 gson Exp $ */
+/* $Id: mx_15.h,v 1.18 2000/04/28 21:48:49 marka Exp $ */
 
+#include <dns/name.h>
+
+typedef struct dns_rdata_mx {
+	dns_rdatacommon_t	common;
+	isc_mem_t		*mctx;
+	isc_uint16_t		pref;
+	dns_name_t		mx;
+} dns_rdata_mx_t;
diff --git a/lib/dns/rdata/generic/null_10.h b/lib/dns/rdata/generic/null_10.h
index 300aa7fe57..79155ab3ff 100644
--- a/lib/dns/rdata/generic/null_10.h
+++ b/lib/dns/rdata/generic/null_10.h
@@ -15,4 +15,12 @@
  * SOFTWARE.
  */
 
-/* $Id: null_10.h,v 1.13 2000/03/20 22:57:13 gson Exp $ */
+/* $Id: null_10.h,v 1.14 2000/04/28 21:48:51 marka Exp $ */
+
+typedef struct dns_rdata_null {
+	dns_rdatacommon_t	common;
+	isc_mem_t		*mctx;
+	isc_int16_t		length;
+	unsigned char		*data;
+} dns_rdata_null_t;
+
diff --git a/lib/dns/rdata/generic/nxt_30.h b/lib/dns/rdata/generic/nxt_30.h
index 9b33b57468..3a97fc1bf5 100644
--- a/lib/dns/rdata/generic/nxt_30.h
+++ b/lib/dns/rdata/generic/nxt_30.h
@@ -15,11 +15,13 @@
  * SOFTWARE.
  */
 
-/* $Id: nxt_30.h,v 1.12 2000/03/20 22:57:14 gson Exp $ */
+/* $Id: nxt_30.h,v 1.13 2000/04/28 21:48:52 marka Exp $ */
 
 /* RFC 2065 */
 
 typedef struct dns_rdata_nxt {
 	dns_rdatacommon_t	common;
-	/*XXX*/
+	isc_mem_t		*mctx;
+	isc_uint16_t		len;
+	unsigned char		*nxt;
 } dns_rdata_nxt_t;
diff --git a/lib/dns/rdata/generic/opt_41.h b/lib/dns/rdata/generic/opt_41.h
index d3a194bdee..8bd277bd31 100644
--- a/lib/dns/rdata/generic/opt_41.h
+++ b/lib/dns/rdata/generic/opt_41.h
@@ -15,12 +15,31 @@
  * SOFTWARE.
  */
 
-/* $Id: opt_41.h,v 1.4 2000/03/16 22:42:31 gson Exp $ */
+/* $Id: opt_41.h,v 1.5 2000/04/28 21:48:53 marka Exp $ */
 
 /* RFC 2671 */
 
+typedef struct dns_rdata_opt_opcode {
+		isc_uint16_t	opcode;
+		isc_uint16_t	length;
+		unsigned char	*data;
+} dns_rdata_opt_opcode_t;
+
 typedef struct dns_rdata_opt {
 	dns_rdatacommon_t	common;
-	isc_mem_t		*mctx;	/* if required */
-	/* XXXRTH Not implemented. */
+	isc_mem_t		*mctx;
+	unsigned char		*options;
+	isc_uint16_t		length;
+	/* private */
+	isc_uint16_t		offset;
 } dns_rdata_opt_t;
+
+#include <isc/lang.h>
+
+ISC_LANG_BEGINDECLS
+
+isc_result_t dns_rdata_opt_first(dns_rdata_opt_t *);
+isc_result_t 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
diff --git a/lib/dns/rdata/generic/ptr_12.h b/lib/dns/rdata/generic/ptr_12.h
index da8bf279f8..3697082bb3 100644
--- a/lib/dns/rdata/generic/ptr_12.h
+++ b/lib/dns/rdata/generic/ptr_12.h
@@ -15,5 +15,13 @@
  * SOFTWARE.
  */
 
-/* $Id: ptr_12.h,v 1.15 2000/03/20 22:57:14 gson Exp $ */
+/* $Id: ptr_12.h,v 1.16 2000/04/28 21:48:55 marka Exp $ */
 
+
+#include <dns/name.h>
+
+typedef struct dns_rdata_ptr {
+        dns_rdatacommon_t       common;
+        isc_mem_t               *mctx;
+        dns_name_t              ptr;
+} dns_rdata_ptr_t;
diff --git a/lib/dns/rdata/generic/rp_17.h b/lib/dns/rdata/generic/rp_17.h
index afb78099d8..875cbe8e3d 100644
--- a/lib/dns/rdata/generic/rp_17.h
+++ b/lib/dns/rdata/generic/rp_17.h
@@ -15,7 +15,16 @@
  * SOFTWARE.
  */
 
-/* $Id: rp_17.h,v 1.10 2000/03/20 22:57:14 gson Exp $ */
+/* $Id: rp_17.h,v 1.11 2000/04/28 21:48:56 marka Exp $ */
 
 /* RFC 1183 */
 
+#include <dns/name.h>
+
+typedef struct dns_rdata_rp {
+        dns_rdatacommon_t       common;
+        isc_mem_t               *mctx;
+        dns_name_t              mail;
+        dns_name_t              text;
+} dns_rdata_rp_t;
+
diff --git a/lib/dns/rdata/generic/rt_21.h b/lib/dns/rdata/generic/rt_21.h
index 94b49f6185..952359dde4 100644
--- a/lib/dns/rdata/generic/rt_21.h
+++ b/lib/dns/rdata/generic/rt_21.h
@@ -15,7 +15,15 @@
  * SOFTWARE.
  */
 
-/* $Id: rt_21.h,v 1.10 2000/03/20 22:57:14 gson Exp $ */
+/* $Id: rt_21.h,v 1.11 2000/04/28 21:48:57 marka Exp $ */
 
 /* RFC 1183 */
 
+#include <dns/name.h>
+
+typedef struct dns_rdata_rt {
+	dns_rdatacommon_t	common;
+	isc_mem_t		*mctx;
+	isc_uint16_t		preference;
+	dns_name_t		host;
+} dns_rdata_rt_t;
diff --git a/lib/dns/rdata/generic/unspec_103.h b/lib/dns/rdata/generic/unspec_103.h
index 5ebc11f88d..d6d368204f 100644
--- a/lib/dns/rdata/generic/unspec_103.h
+++ b/lib/dns/rdata/generic/unspec_103.h
@@ -15,5 +15,11 @@
  * SOFTWARE.
  */
 
- /* $Id: unspec_103.h,v 1.6 2000/02/03 23:43:09 halley Exp $ */
+ /* $Id: unspec_103.h,v 1.7 2000/04/28 21:48:58 marka Exp $ */
 
+typedef struct dns_rdata_unspec_t {
+	dns_rdatacommon_t	common;
+	isc_mem_t		*mctx;
+	unsigned char		*data;
+	isc_uint16_t		datalen;
+} dns_rdata_unspec_t;
diff --git a/lib/dns/rdata/generic/x25_19.h b/lib/dns/rdata/generic/x25_19.h
index 3b48a76bd2..9978b99e9f 100644
--- a/lib/dns/rdata/generic/x25_19.h
+++ b/lib/dns/rdata/generic/x25_19.h
@@ -15,7 +15,13 @@
  * SOFTWARE.
  */
 
-/* $Id: x25_19.h,v 1.7 2000/03/20 22:57:14 gson Exp $ */
+/* $Id: x25_19.h,v 1.8 2000/04/28 21:48:59 marka Exp $ */
 
 /* RFC 1183 */
 
+typedef struct dns_rdata_x25 {
+        dns_rdatacommon_t       common;
+        isc_mem_t               *mctx;
+        unsigned char           *x25;
+        isc_uint16_t            x25_len;
+} dns_rdata_x25_t;
diff --git a/lib/dns/rdata/in_1/naptr_35.h b/lib/dns/rdata/in_1/naptr_35.h
index d604e0ef19..aa9df182a4 100644
--- a/lib/dns/rdata/in_1/naptr_35.h
+++ b/lib/dns/rdata/in_1/naptr_35.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: naptr_35.h,v 1.11 2000/03/20 22:57:15 gson Exp $ */
+/* $Id: naptr_35.h,v 1.12 2000/04/28 21:49:01 marka Exp $ */
 
 /* RFC 2168 */
 
@@ -25,7 +25,10 @@ typedef struct dns_rdata_in_naptr {
 	isc_uint16_t		order;
 	isc_uint16_t		preference;
 	char			*flags;
+	isc_uint16_t		flags_len;
 	char			*service;
+	isc_uint16_t		service_len;
 	char			*regexp;
+	isc_uint16_t		regexp_len;
 	dns_name_t		replacement;
 } dns_rdata_in_naptr_t;
diff --git a/lib/dns/rdata/in_1/nsap_22.h b/lib/dns/rdata/in_1/nsap_22.h
index 1fb0621e4a..c970483e98 100644
--- a/lib/dns/rdata/in_1/nsap_22.h
+++ b/lib/dns/rdata/in_1/nsap_22.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: nsap_22.h,v 1.8 2000/03/17 19:35:25 gson Exp $ */
+/* $Id: nsap_22.h,v 1.9 2000/04/28 21:49:02 marka Exp $ */
 
 /* RFC 1706 */
 
@@ -23,5 +23,5 @@ typedef struct dns_rdata_in_nsap {
 	dns_rdatacommon_t	common;
 	isc_mem_t		*mctx;
 	unsigned char		*nsap;
-	isc_uint16_t		length;
+	isc_uint16_t		nsap_len;
 } dns_rdata_in_nsap_t;
diff --git a/lib/dns/rdata/in_1/wks_11.h b/lib/dns/rdata/in_1/wks_11.h
index 86e733dde1..67a13815bc 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.14 2000/03/20 22:57:15 gson Exp $ */
+/* $Id: wks_11.h,v 1.15 2000/04/28 21:49:03 marka Exp $ */
 
 typedef	struct dns_rdata_in_wks {
 	dns_rdatacommon_t	common;
@@ -23,5 +23,5 @@ typedef	struct dns_rdata_in_wks {
 	struct in_addr		in_addr;
 	isc_uint16_t		protocol;
 	unsigned char		*map;
-	isc_uint16_t		length;
+	isc_uint16_t		map_len;
 } dns_rdata_in_wks_t;