diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index ecf5dc9674..c3d958defe 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -260,7 +260,7 @@ add_type(dns_message_t *message, dns_name_t *name, dns_rdataclass_t rdclass,
 	ISC_LIST_APPEND(name->list, rdataset, link);
 }
 
-void
+static void
 followup_lookup(dns_message_t *msg, dig_query_t *query) {
 	dig_lookup_t *lookup = NULL;
 	dig_server_t *srv = NULL;
@@ -403,7 +403,6 @@ setup_lookup(dig_lookup_t *lookup) {
 	dig_query_t *query;
 	isc_textregion_t r;
 	isc_buffer_t b;
-	ISC_LIST(dig_server_t) *sl;
 	
 #ifdef DEBUG
 	fprintf(stderr, "Setting up for looking up %s @%ld->%ld\n", 
@@ -486,11 +485,10 @@ setup_lookup(dig_lookup_t *lookup) {
 	lookup->pending = ISC_FALSE;
 
 	if (lookup->use_my_server_list)
-		sl = &lookup->my_server_list;
+		serv = ISC_LIST_HEAD(lookup->my_server_list);
 	else
-		sl = &server_list;
-	for (serv = ISC_LIST_HEAD(*sl);
-	     serv != NULL;
+		serv = ISC_LIST_HEAD(server_list);
+	for (; serv != NULL;
 	     serv = ISC_LIST_NEXT(serv, link)) {
 		query = isc_mem_allocate(mctx, sizeof(dig_query_t));
 		if (query == NULL)
diff --git a/bin/dig/host.c b/bin/dig/host.c
index 3bc051a2c2..6e9141aa0a 100644
--- a/bin/dig/host.c
+++ b/bin/dig/host.c
@@ -365,6 +365,8 @@ printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) {
 	dns_name_t *tsigname;
 	isc_result_t result = ISC_R_SUCCESS;
 
+	UNUSED (headers);
+
 	if (msg->rcode != 0) {
 		printf ("Host not found: %d(%s)\n",
 			msg->rcode, rcodetext[msg->rcode]);
@@ -470,13 +472,14 @@ parse_args(isc_boolean_t is_batchfile, int argc, char **argv) {
 		recursion=ISC_TRUE,
 		xfr_mode=ISC_FALSE;
 	char hostname[MXNAME];
-	char servname[MXNAME];
 	char querytype[32]="";
 	char queryclass[32]="";
 	dig_server_t *srv;
 	dig_lookup_t *lookup;
 	int c;
 
+	UNUSED(is_batchfile);
+
 	while ((c = isc_commandline_parse(argc, argv,"lvwrdt:aTC")) != EOF) {
 		switch (c) {
 		case 'l':