diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index 45495a4577..83da12d829 100644
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -15,24 +15,22 @@
  * SOFTWARE.
  */
 
-/* $Id: dig.c,v 1.46 2000/06/21 01:40:38 mws Exp $ */
+/* $Id: dig.c,v 1.47 2000/06/21 17:48:26 mws Exp $ */
 
 #include <config.h>
-
 #include <stdlib.h>
 
 extern int h_errno;
 
-#include <isc/app.h>
-#include <isc/string.h>
-#include <isc/util.h>
-
+#include <dns/message.h>
 #include <dns/message.h>
 #include <dns/name.h>
 #include <dns/rdata.h>
 #include <dns/rdataset.h>
 #include <dns/rdatatype.h>
-#include <dns/message.h>
+#include <isc/app.h>
+#include <isc/string.h>
+#include <isc/util.h>
 
 #include <dig/dig.h>
 
diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index b6a293804a..1bd159f6d9 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: dighost.c,v 1.54 2000/06/21 01:40:40 mws Exp $ */
+/* $Id: dighost.c,v 1.55 2000/06/21 17:48:27 mws Exp $ */
 
 /*
  * Notice to programmers:  Do not use this code as an example of how to
@@ -27,7 +27,6 @@
  */
 
 #include <config.h>
-
 #include <stdlib.h>
 #include <unistd.h>
 #if defined(HAVE_ADDRINFO) && defined(HAVE_GETADDRINFO)
@@ -37,30 +36,28 @@
 extern int h_errno;
 #endif
 
-#include <isc/app.h>
-#include <isc/netdb.h>
-#include <isc/string.h>
-#include <isc/task.h>
-#include <isc/timer.h>
-#include <isc/util.h>
-#include <isc/base64.h>
-#include <isc/lex.h>
-#include <isc/lang.h>
-#include <isc/types.h>
-#include <isc/entropy.h>
-
 #include <dns/message.h>
 #include <dns/name.h>
 #include <dns/rdata.h>
 #include <dns/rdataclass.h>
-#include <dns/rdataset.h>
-#include <dns/rdatatype.h>
 #include <dns/rdatalist.h>
-#include <dns/result.h>
+#include <dns/rdataset.h>
 #include <dns/rdatastruct.h>
+#include <dns/rdatatype.h>
+#include <dns/result.h>
 #include <dns/tsig.h>
-
 #include <dst/dst.h>
+#include <isc/app.h>
+#include <isc/base64.h>
+#include <isc/entropy.h>
+#include <isc/lang.h>
+#include <isc/lex.h>
+#include <isc/netdb.h>
+#include <isc/string.h>
+#include <isc/task.h>
+#include <isc/timer.h>
+#include <isc/types.h>
+#include <isc/util.h>
 
 #include <dig/dig.h>
 
diff --git a/bin/dig/host.c b/bin/dig/host.c
index 46f49ca7c5..885035dd65 100644
--- a/bin/dig/host.c
+++ b/bin/dig/host.c
@@ -15,23 +15,21 @@
  * SOFTWARE.
  */
 
-/* $Id: host.c,v 1.27 2000/06/21 01:40:41 mws Exp $ */
+/* $Id: host.c,v 1.28 2000/06/21 17:48:29 mws Exp $ */
 
 #include <config.h>
-
 #include <stdlib.h>
 
 extern int h_errno;
 
-#include <isc/app.h>
-#include <isc/commandline.h>
-#include <isc/string.h>
-#include <isc/util.h>
-
 #include <dns/message.h>
 #include <dns/name.h>
 #include <dns/rdata.h>
 #include <dns/rdataset.h>
+#include <isc/app.h>
+#include <isc/commandline.h>
+#include <isc/string.h>
+#include <isc/util.h>
 
 #include <dig/dig.h>
 
diff --git a/bin/dig/include/dig/dig.h b/bin/dig/include/dig/dig.h
index b462ad84fe..e10c907d9c 100644
--- a/bin/dig/include/dig/dig.h
+++ b/bin/dig/include/dig/dig.h
@@ -15,23 +15,22 @@
  * SOFTWARE.
  */
 
-/* $Id: dig.h,v 1.23 2000/06/16 18:00:05 mws Exp $ */
+/* $Id: dig.h,v 1.24 2000/06/21 17:48:32 mws Exp $ */
 
 #ifndef DIG_H
 #define DIG_H
 
-#define SDIG_BUFFER_SIZE 2048
-#include <isc/lang.h>
-#include <isc/socket.h>
-#include <isc/buffer.h>
-#include <isc/bufferlist.h>
-#include <isc/sockaddr.h>
-#include <isc/boolean.h>
-#include <isc/mem.h>
-#include <isc/list.h>
-#include <isc/print.h>
 #include <dns/rdatalist.h>
 #include <dst/dst.h>
+#include <isc/boolean.h>
+#include <isc/buffer.h>
+#include <isc/bufferlist.h>
+#include <isc/lang.h>
+#include <isc/list.h>
+#include <isc/mem.h>
+#include <isc/print.h>
+#include <isc/sockaddr.h>
+#include <isc/socket.h>
 
 #define MXSERV 4
 #define MXNAME 256
diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c
index 61c1e6b50f..575b4293cd 100644
--- a/bin/dig/nslookup.c
+++ b/bin/dig/nslookup.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: nslookup.c,v 1.19 2000/06/21 01:40:42 mws Exp $ */
+/* $Id: nslookup.c,v 1.20 2000/06/21 17:48:30 mws Exp $ */
 
 #include <config.h>
 
@@ -23,20 +23,19 @@
 
 extern int h_errno;
 
-#include <isc/app.h>
-#include <isc/string.h>
-#include <isc/util.h>
-#include <isc/mutex.h>
-#include <isc/condition.h>
-#include <isc/commandline.h>
-#include <isc/timer.h>
-#include <isc/buffer.h>
-
 #include <dns/message.h>
+#include <dns/name.h>
 #include <dns/rdata.h>
 #include <dns/rdataset.h>
 #include <dns/rdatatype.h>
-#include <dns/name.h>
+#include <isc/app.h>
+#include <isc/buffer.h>
+#include <isc/commandline.h>
+#include <isc/condition.h>
+#include <isc/mutex.h>
+#include <isc/string.h>
+#include <isc/timer.h>
+#include <isc/util.h>
 
 #include <dig/dig.h>
 
diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index da537a19c2..27622ceea6 100644
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -15,38 +15,36 @@
  * SOFTWARE.
  */
 
-/* $Id: nsupdate.c,v 1.6 2000/06/20 22:50:13 mws Exp $ */
+/* $Id: nsupdate.c,v 1.7 2000/06/21 17:43:27 mws Exp $ */
 
 #include <config.h>
+#include <netdb.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <netdb.h>
-
-#include <isc/app.h>
-#include <isc/mutex.h>
-#include <isc/condition.h>
-#include <isc/mem.h>
-#include <isc/socket.h>
-#include <isc/sockaddr.h>
-#include <isc/buffer.h>
-#include <isc/region.h>
-#include <isc/task.h>
-#include <isc/util.h>
-#include <isc/string.h>
-#include <isc/lex.h>
-#include <isc/timer.h>
-
-#include <dns/dispatch.h>
-#include <dns/request.h>
-#include <dns/message.h>
-#include <dns/rdata.h>
-#include <dns/rdataset.h>
-#include <dns/rdatalist.h>
-#include <dns/rdatatype.h>
 #include <dns/callbacks.h>
-#include <dns/rdatastruct.h>
+#include <dns/dispatch.h>
 #include <dns/events.h>
+#include <dns/message.h>
 #include <dns/name.h>
+#include <dns/rdata.h>
+#include <dns/rdatalist.h>
+#include <dns/rdataset.h>
+#include <dns/rdatastruct.h>
+#include <dns/rdatatype.h>
+#include <dns/request.h>
+#include <isc/app.h>
+#include <isc/buffer.h>
+#include <isc/condition.h>
+#include <isc/lex.h>
+#include <isc/mem.h>
+#include <isc/mutex.h>
+#include <isc/region.h>
+#include <isc/sockaddr.h>
+#include <isc/socket.h>
+#include <isc/string.h>
+#include <isc/task.h>
+#include <isc/timer.h>
+#include <isc/util.h>
 
 #define MXNAME 256
 #define MAXCMD 256