diff --git a/lib/dns/include/dns/rdataslab.h b/lib/dns/include/dns/rdataslab.h
index 7364b8d644..10a8525a1f 100644
--- a/lib/dns/include/dns/rdataslab.h
+++ b/lib/dns/include/dns/rdataslab.h
@@ -53,12 +53,6 @@ ISC_LANG_BEGINDECLS
 #define DNS_RDATASLAB_EXACT 0x2
 
 #define DNS_RDATASLAB_OFFLINE 0x01 /* RRSIG is for offline DNSKEY */
-#define DNS_RDATASLAB_WARNMASK          \
-	0x0E /*%< RRSIG(DNSKEY) expired \
-	      * warnings number mask. */
-#define DNS_RDATASLAB_WARNSHIFT               \
-	1 /*%< How many bits to shift to find \
-	   * remaining expired warning number. */
 
 /***
  *** Functions
diff --git a/lib/dns/rdataslab.c b/lib/dns/rdataslab.c
index a7e817dbe5..cf0e46be9d 100644
--- a/lib/dns/rdataslab.c
+++ b/lib/dns/rdataslab.c
@@ -70,7 +70,9 @@
 
 struct xrdata {
 	dns_rdata_t rdata;
+#if DNS_RDATASET_FIXED
 	unsigned int order;
+#endif /* if DNS_RDATASET_FIXED */
 };
 
 /*% Note: the "const void *" are just to make qsort happy.  */
@@ -122,18 +124,16 @@ dns_rdataslab_fromrdataset(dns_rdataset_t *rdataset, isc_mem_t *mctx,
 	static unsigned char removed;
 	struct xrdata *x;
 	unsigned char *rawbuf;
-#if DNS_RDATASET_FIXED
-	unsigned char *offsetbase;
-#endif /* if DNS_RDATASET_FIXED */
 	unsigned int buflen;
 	isc_result_t result;
 	unsigned int nitems;
 	unsigned int nalloc;
+	unsigned int length;
 	unsigned int i;
 #if DNS_RDATASET_FIXED
+	unsigned char *offsetbase;
 	unsigned int *offsettable;
 #endif /* if DNS_RDATASET_FIXED */
-	unsigned int length;
 
 	buflen = reservelen + 2;