diff --git a/lib/dns/include/dns/dispatch.h b/lib/dns/include/dns/dispatch.h
index b6be4564d2..89615afcf2 100644
--- a/lib/dns/include/dns/dispatch.h
+++ b/lib/dns/include/dns/dispatch.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dispatch.h,v 1.44 2001/03/13 05:48:41 marka Exp $ */
+/* $Id: dispatch.h,v 1.45 2001/04/30 18:09:28 gson Exp $ */
 
 #ifndef DNS_DISPATCH_H
 #define DNS_DISPATCH_H 1
@@ -179,33 +179,6 @@ dns_dispatchmgr_getblackhole(dns_dispatchmgr_t *mgr);
  *	A pointer to the current blackhole list, or NULL.
  */
 
-isc_result_t
-dns_dispatchmgr_find(dns_dispatchmgr_t *mgr,
-		     isc_sockaddr_t *local, isc_sockaddr_t *remote,
-		     unsigned int attributes, unsigned int mask,
-		     dns_dispatch_t **dispp);
-/*
- * Search for a dispatcher that has the attributes specified by
- *	(attributes & mask)
- *
- * Requires:
- *	"mgr" be a valid dispatchmgr.
- *
- *	dispp != NULL && *dispp == NULL.
- *
- * Ensures:
- *	The dispatcher returned into *dispp is attached on behalf of the
- *	caller.  It is required that the caller detach from it when it is
- *	no longer needed.
- *
- * Returns:
- *	ISC_R_SUCCESS	-- found.
- *
- *	ISC_R_NOTFOUND	-- no dispatcher matching the requirements found.
- *
- *	anything else	-- failure.
- */
-
 
 isc_result_t
 dns_dispatch_getudp(dns_dispatchmgr_t *mgr, isc_socketmgr_t *sockmgr,
diff --git a/lib/dns/include/dns/peer.h b/lib/dns/include/dns/peer.h
index 0b1914607c..623a30e067 100644
--- a/lib/dns/include/dns/peer.h
+++ b/lib/dns/include/dns/peer.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: peer.h,v 1.14 2001/03/06 23:54:36 bwelling Exp $ */
+/* $Id: peer.h,v 1.15 2001/04/30 18:09:29 gson Exp $ */
 
 #ifndef DNS_PEER_H
 #define DNS_PEER_H 1
@@ -126,12 +126,6 @@ dns_peer_setbogus(dns_peer_t *peer, isc_boolean_t newval);
 isc_result_t
 dns_peer_getbogus(dns_peer_t *peer, isc_boolean_t *retval);
 
-isc_result_t
-dns_peer_setsupportixfr(dns_peer_t *peer, isc_boolean_t newval);
-
-isc_result_t
-dns_peer_getsupportixfr(dns_peer_t *peer, isc_boolean_t *retval);
-
 isc_result_t
 dns_peer_setrequestixfr(dns_peer_t *peer, isc_boolean_t newval);
 
diff --git a/lib/dns/include/dns/rdata.h b/lib/dns/include/dns/rdata.h
index f679022863..66281245f0 100644
--- a/lib/dns/include/dns/rdata.h
+++ b/lib/dns/include/dns/rdata.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdata.h,v 1.50 2001/01/09 21:53:13 bwelling Exp $ */
+/* $Id: rdata.h,v 1.51 2001/04/30 18:09:30 gson Exp $ */
 
 #ifndef DNS_RDATA_H
 #define DNS_RDATA_H 1
@@ -338,41 +338,6 @@ dns_rdata_fromtext(dns_rdata_t *rdata, dns_rdataclass_t rdclass,
  *	Resource Limit: Not enough memory
  */
 
-isc_result_t
-dns_rdata_fromtextgeneric(dns_rdata_t *rdata, dns_rdataclass_t rdclass,
-                          dns_rdatatype_t type, isc_lex_t *lexer,
-                          isc_buffer_t *target,
-                          dns_rdatacallbacks_t *callbacks);
-/*
- * Convert a generic textual representation of a DNS rdata into uncompressed
- * wire form stored in the target region.  Tokens constituting the text of
- * the rdata are taken from 'lexer'.  
- *
- * Requires:
- *
- *	'rdclass' and 'type' are valid.
- *
- *	'lexer' is a valid isc_lex_t.
- *
- *	'target' is a valid region.
- *
- * Ensures:
- *	If result is success:
- *	 	If 'rdata' is not NULL, it is attached to the target.
- *
- *		The conditions dns_name_fromtext() ensures for names hold
- *		for all names in the rdata.
- *
- *		The used space in target is updated.
- *
- * Result:
- *	Success
- *	<Translated result codes from isc_lex_gettoken>
- *	<Various 'Bad Form' class failures depending on class and type>
- *	Bad Form: Input too short
- *	Resource Limit: Not enough space
- */
-
 isc_result_t
 dns_rdata_totext(dns_rdata_t *rdata, dns_name_t *origin, isc_buffer_t *target);
 /*
diff --git a/lib/dns/include/dns/zone.h b/lib/dns/include/dns/zone.h
index 6f271f4a3a..cc1e33e84c 100644
--- a/lib/dns/include/dns/zone.h
+++ b/lib/dns/include/dns/zone.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.h,v 1.101 2001/03/19 22:34:11 bwelling Exp $ */
+/* $Id: zone.h,v 1.102 2001/04/30 18:09:31 gson Exp $ */
 
 #ifndef DNS_ZONE_H
 #define DNS_ZONE_H 1
@@ -435,16 +435,6 @@ dns_zone_unload(dns_zone_t *zone);
  *	'zone' to be a valid zone.
  */
 
-void
-dns_zone_setoption(dns_zone_t *zone, unsigned int option, isc_boolean_t value);
-/*
- *	Set given options on ('value' == ISC_TRUE) or off ('value' ==
- *	ISC_FALSE).
- *
- * Require:
- *	'zone' to be a valid zone.
- */
-
 void
 dns_zone_clearoption(dns_zone_t *zone, unsigned int option);
 /*