diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index 9d4b50f571..f2f34c86f9 100644
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: adb.c,v 1.146 2000/08/09 21:15:32 bwelling Exp $ */
+/* $Id: adb.c,v 1.147 2000/08/11 16:47:27 gson Exp $ */
 
 /*
  * Implementation notes
@@ -3263,7 +3263,7 @@ fetch_callback(isc_task_t *task, isc_event_t *ev) {
 	unsigned int address_type;
 	isc_boolean_t want_check_exit = ISC_FALSE;
 
-	(void)task;
+	UNUSED(task);
 
 	INSIST(ev->ev_type == DNS_EVENT_FETCHDONE);
 	dev = (dns_fetchevent_t *)ev;
@@ -3418,7 +3418,7 @@ fetch_callback_a6(isc_task_t *task, isc_event_t *ev) {
 	isc_result_t result;
 	isc_boolean_t want_check_exit = ISC_FALSE;
 
-	(void)task;
+	UNUSED(task);
 
 	INSIST(ev->ev_type == DNS_EVENT_FETCHDONE);
 	dev = (dns_fetchevent_t *)ev;
diff --git a/lib/dns/dbtable.c b/lib/dns/dbtable.c
index 802e115f77..89e57f18a6 100644
--- a/lib/dns/dbtable.c
+++ b/lib/dns/dbtable.c
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: dbtable.c,v 1.20 2000/08/01 01:22:17 tale Exp $
+ * $Id: dbtable.c,v 1.21 2000/08/11 16:47:29 gson Exp $
  */
 
 /*
@@ -56,7 +56,7 @@ static void
 dbdetach(void *data, void *arg) {
 	dns_db_t *db = data;
 
-	(void)arg;
+	UNUSED(arg);
 
 	dns_db_detach(&db);
 }
diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index 63c4d52a5d..36348f68df 100644
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbtdb.c,v 1.117 2000/08/10 02:02:10 bwelling Exp $ */
+/* $Id: rbtdb.c,v 1.118 2000/08/11 16:47:30 gson Exp $ */
 
 /*
  * Principal Author: Bob Halley
@@ -2018,14 +2018,14 @@ zone_findzonecut(dns_db_t *db, dns_name_t *name, unsigned int options,
 		 dns_name_t *foundname,
 		 dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset)
 {
-	(void)db;
-	(void)name;
-	(void)options;
-	(void)now;
-	(void)nodep;
-	(void)foundname;
-	(void)rdataset;
-	(void)sigrdataset;
+	UNUSED(db);
+	UNUSED(name);
+	UNUSED(options);
+	UNUSED(now);
+	UNUSED(nodep);
+	UNUSED(foundname);
+	UNUSED(rdataset);
+	UNUSED(sigrdataset);
 
 	FATAL_ERROR(__FILE__, __LINE__, "zone_findzonecut() called!");
 
@@ -2045,7 +2045,7 @@ cache_zonecut_callback(dns_rbtnode_t *node, dns_name_t *name, void *arg) {
 	/*
 	 * Keep compiler silent.
 	 */
-	(void)name;
+	UNUSED(name);
 
 	LOCK(&(search->rbtdb->node_locks[node->locknum].lock));
 
@@ -3865,8 +3865,8 @@ dns_rbtdb_create
 	dns_name_t name;
 
 	/* Keep the compiler happy. */
-	(void)argc;
-	(void)argv;
+	UNUSED(argc);
+	UNUSED(argv);
 
 	rbtdb = isc_mem_get(mctx, sizeof *rbtdb);
 	if (rbtdb == NULL)
diff --git a/lib/dns/rdataset.c b/lib/dns/rdataset.c
index e3d03bd747..9198612ae9 100644
--- a/lib/dns/rdataset.c
+++ b/lib/dns/rdataset.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdataset.c,v 1.48 2000/08/01 01:22:46 tale Exp $ */
+/* $Id: rdataset.c,v 1.49 2000/08/11 16:47:32 gson Exp $ */
 
 #include <config.h>
 
@@ -122,12 +122,13 @@ dns_rdataset_isassociated(dns_rdataset_t *rdataset) {
 
 static void
 question_disassociate(dns_rdataset_t *rdataset) {
-	(void)rdataset;
+	UNUSED(rdataset);
 }
 
 static isc_result_t
 question_cursor(dns_rdataset_t *rdataset) {
-	(void)rdataset;
+	UNUSED(rdataset);
+	
 	return (ISC_R_NOMORE);
 }
 
@@ -136,8 +137,9 @@ question_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata) {
 	/*
 	 * This routine should never be called.
 	 */
-	(void)rdataset;
-	(void)rdata;
+	UNUSED(rdataset);
+	UNUSED(rdata);
+	
 	REQUIRE(0);
 }
 
@@ -151,7 +153,7 @@ question_count(dns_rdataset_t *rdataset) {
 	/*
 	 * This routine should never be called.
 	 */
-	(void)rdataset;
+	UNUSED(rdataset);
 	REQUIRE(0);
 
 	return (0);
diff --git a/lib/dns/request.c b/lib/dns/request.c
index fc85384434..20c0884ee7 100644
--- a/lib/dns/request.c
+++ b/lib/dns/request.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: request.c,v 1.31 2000/08/01 01:22:50 tale Exp $ */
+/* $Id: request.c,v 1.32 2000/08/11 16:47:33 gson Exp $ */
 
 #include <config.h>
 
@@ -827,7 +827,7 @@ req_senddone(isc_task_t *task, isc_event_t *event) {
 
 	req_log(ISC_LOG_DEBUG(3), "req_senddone: request %p", request);
 
-	(void)task;
+	UNUSED(task);
 
 	if (sevent->result != ISC_R_SUCCESS)
 		dns_request_cancel(request);