diff --git a/lib/dns/include/dns/peer.h b/lib/dns/include/dns/peer.h
index 03185cf0fb..12e86b7640 100644
--- a/lib/dns/include/dns/peer.h
+++ b/lib/dns/include/dns/peer.h
@@ -41,56 +41,6 @@
 #define DNS_PEERLIST_VALID(ptr) ISC_MAGIC_VALID(ptr, DNS_PEERLIST_MAGIC)
 #define DNS_PEER_VALID(ptr)	ISC_MAGIC_VALID(ptr, DNS_PEER_MAGIC)
 
-/***
- *** Types
- ***/
-
-struct dns_peerlist {
-	unsigned int   magic;
-	isc_refcount_t refs;
-
-	isc_mem_t *mem;
-
-	ISC_LIST(dns_peer_t) elements;
-};
-
-struct dns_peer {
-	unsigned int   magic;
-	isc_refcount_t refs;
-
-	isc_mem_t *mem;
-
-	isc_netaddr_t	      address;
-	unsigned int	      prefixlen;
-	bool		      bogus;
-	dns_transfer_format_t transfer_format;
-	uint32_t	      transfers;
-	bool		      support_ixfr;
-	bool		      provide_ixfr;
-	bool		      request_ixfr;
-	bool		      support_edns;
-	bool		      request_nsid;
-	bool		      send_cookie;
-	bool		      request_expire;
-	bool		      force_tcp;
-	bool		      tcp_keepalive;
-	dns_name_t *	      key;
-	isc_sockaddr_t *      transfer_source;
-	isc_dscp_t	      transfer_dscp;
-	isc_sockaddr_t *      notify_source;
-	isc_dscp_t	      notify_dscp;
-	isc_sockaddr_t *      query_source;
-	isc_dscp_t	      query_dscp;
-	uint16_t	      udpsize;	   /* receive size */
-	uint16_t	      maxudp;	   /* transmit size */
-	uint16_t	      padding;	   /* pad block size */
-	uint8_t		      ednsversion; /* edns version */
-
-	uint32_t bitflags;
-
-	ISC_LINK(dns_peer_t) next;
-};
-
 /***
  *** Functions
  ***/
diff --git a/lib/dns/peer.c b/lib/dns/peer.c
index c78fab27f6..3f22b51d7c 100644
--- a/lib/dns/peer.c
+++ b/lib/dns/peer.c
@@ -24,6 +24,57 @@
 #include <dns/name.h>
 #include <dns/peer.h>
 
+/***
+ *** Types
+ ***/
+
+struct dns_peerlist {
+	unsigned int magic;
+	isc_refcount_t refs;
+
+	isc_mem_t *mem;
+
+	ISC_LIST(dns_peer_t) elements;
+};
+
+struct dns_peer {
+	unsigned int magic;
+	isc_refcount_t refs;
+
+	isc_mem_t *mem;
+
+	isc_netaddr_t address;
+	unsigned int prefixlen;
+	bool bogus;
+	dns_transfer_format_t transfer_format;
+	uint32_t transfers;
+	bool support_ixfr;
+	bool provide_ixfr;
+	bool request_ixfr;
+	bool support_edns;
+	bool request_nsid;
+	bool send_cookie;
+	bool request_expire;
+	bool force_tcp;
+	bool tcp_keepalive;
+	bool check_axfr_id;
+	dns_name_t *key;
+	isc_sockaddr_t *transfer_source;
+	isc_dscp_t transfer_dscp;
+	isc_sockaddr_t *notify_source;
+	isc_dscp_t notify_dscp;
+	isc_sockaddr_t *query_source;
+	isc_dscp_t query_dscp;
+	uint16_t udpsize;    /* receive size */
+	uint16_t maxudp;     /* transmit size */
+	uint16_t padding;    /* pad block size */
+	uint8_t ednsversion; /* edns version */
+
+	uint32_t bitflags;
+
+	ISC_LINK(dns_peer_t) next;
+};
+
 /*%
  * Bit positions in the dns_peer_t structure flags field
  */