diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index abe7857013..4b38cfe0da 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dighost.c,v 1.206 2001/07/09 22:02:12 gson Exp $ */
+/* $Id: dighost.c,v 1.207 2001/07/22 06:03:04 mayer Exp $ */
 
 /*
  * Notice to programmers:  Do not use this code as an example of how to
@@ -70,11 +70,13 @@
 #ifdef HAVE_GETADDRINFO
 #ifdef HAVE_GAISTRERROR
 #define USE_GETADDRINFO
+#define HAVE_H_ERRNO
 #endif
 #endif
 #endif
 
-#ifndef USE_GETADDRINFO
+#ifndef HAVE_H_ERRNO
+#define HAVE_H_ERRNO
 extern int h_errno;
 #endif
 
@@ -2257,6 +2259,12 @@ check_for_more_data(dig_query_t *query, dns_message_t *msg,
 	launch_next_query(query, ISC_FALSE);
 	return (ISC_FALSE);
  doexit:
+	/*
+	 * XXXPDM. This needs to be reviewed as the variable b is not
+	 * used anywhere in this function.  set the value of used to 0
+	 * for now to stop the compiler complaining about unused variables.
+	 */
+	b.used = 0;
 	received(b.used, &sevent->address, query);
 	return (ISC_TRUE);
 }
diff --git a/bin/dig/host.c b/bin/dig/host.c
index 3272da01ff..f535d319b4 100644
--- a/bin/dig/host.c
+++ b/bin/dig/host.c
@@ -15,13 +15,16 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: host.c,v 1.66 2001/03/14 18:08:17 bwelling Exp $ */
+/* $Id: host.c,v 1.67 2001/07/22 06:03:05 mayer Exp $ */
 
 #include <config.h>
 #include <stdlib.h>
 #include <limits.h>
 
+#ifndef HAVE_H_ERRNO
+#define HAVE_H_ERRNO
 extern int h_errno;
+#endif
 
 #include <isc/app.h>
 #include <isc/commandline.h>
@@ -240,7 +243,7 @@ received(int bytes, isc_sockaddr_t *from, dig_query_t *query)
 		isc_sockaddr_format(from, fromtext, sizeof(fromtext));
 		result = isc_time_now(&now);
 		check_result(result, "isc_time_now");
-		diff = isc_time_microdiff(&now, &query->time_sent);
+		diff = (int) isc_time_microdiff(&now, &query->time_sent);
 		printf("Received %u bytes from %s in %d ms\n",
 		       bytes, fromtext, diff/1000);
 	}
diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c
index 4a874187e4..33def77232 100644
--- a/bin/dig/nslookup.c
+++ b/bin/dig/nslookup.c
@@ -15,13 +15,16 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nslookup.c,v 1.82 2001/03/16 22:13:41 bwelling Exp $ */
+/* $Id: nslookup.c,v 1.83 2001/07/22 06:03:06 mayer Exp $ */
 
 #include <config.h>
 
 #include <stdlib.h>
 
+#ifndef HAVE_H_ERRNO
+#define HAVE_H_ERRNO
 extern int h_errno;
+#endif
 
 #include <isc/app.h>
 #include <isc/buffer.h>