diff --git a/src/rr-iter.c b/src/rr-iter.c
index 773e450e..abbd274a 100644
--- a/src/rr-iter.c
+++ b/src/rr-iter.c
@@ -34,8 +34,8 @@
 #include <gldns/pkthdr.h>
 #include <gldns/gbuffer.h>
 
-static getdns_rr_iter *
-find_rrtype(getdns_rr_iter *i)
+static priv_getdns_rr_iter *
+find_rrtype(priv_getdns_rr_iter *i)
 {
 	size_t dlen;
 	uint8_t *pos;
@@ -78,8 +78,8 @@ find_rrtype(getdns_rr_iter *i)
 	return NULL;
 }
 
-getdns_rr_iter *
-priv_getdns_rr_iter_init(getdns_rr_iter *i, uint8_t *pkt, size_t pkt_len)
+priv_getdns_rr_iter *
+priv_getdns_rr_iter_init(priv_getdns_rr_iter *i, uint8_t *pkt, size_t pkt_len)
 {
 	if (pkt_len < GLDNS_HEADER_SIZE + 5)
 		return NULL;
@@ -93,8 +93,8 @@ priv_getdns_rr_iter_init(getdns_rr_iter *i, uint8_t *pkt, size_t pkt_len)
 }
 
 
-getdns_rr_iter *
-priv_getdns_rr_iter_next(getdns_rr_iter *i)
+priv_getdns_rr_iter *
+priv_getdns_rr_iter_next(priv_getdns_rr_iter *i)
 {
 	size_t dlen;
 
diff --git a/src/rr-iter.h b/src/rr-iter.h
index 1179c027..a07dae3e 100644
--- a/src/rr-iter.h
+++ b/src/rr-iter.h
@@ -34,18 +34,18 @@
 
 #include "getdns/getdns.h"
 
-typedef struct getdns_rr_iter {
+typedef struct priv_getdns_rr_iter {
 	uint8_t *pkt;
 	size_t   pkt_len;
 	size_t   n; /* Which RR are we currently at */
 	uint8_t *pos;
 	uint8_t *rr_type;
-} getdns_rr_iter;
+} priv_getdns_rr_iter;
 
-getdns_rr_iter *priv_getdns_rr_iter_init(getdns_rr_iter *i,
+priv_getdns_rr_iter *priv_getdns_rr_iter_init(priv_getdns_rr_iter *i,
     uint8_t *pkt, size_t pkt_len);
 
-getdns_rr_iter *priv_getdns_rr_iter_next(getdns_rr_iter *i);
+priv_getdns_rr_iter *priv_getdns_rr_iter_next(priv_getdns_rr_iter *i);
 
 #endif
 
diff --git a/src/util-internal.c b/src/util-internal.c
index afefa331..05fe1383 100644
--- a/src/util-internal.c
+++ b/src/util-internal.c
@@ -505,7 +505,7 @@ create_getdns_response(getdns_dns_req *completed_request)
 	/* info (bools) about dns_req */
 	int dnssec_return_status;
 	char *str_pkt;
-	getdns_rr_iter rr_iter_storage, *rr_iter;
+	priv_getdns_rr_iter rr_iter_storage, *rr_iter;
 
     	for ( netreq_p = completed_request->netreqs
 	    ; ! r && (netreq = *netreq_p)