diff --git a/lib/dns/config/confacl.c b/lib/dns/config/confacl.c
index 882651c0f7..c7fb674af7 100644
--- a/lib/dns/config/confacl.c
+++ b/lib/dns/config/confacl.c
@@ -17,6 +17,8 @@
 
 #include <config.h>
 
+#include <string.h>
+
 #include <isc/assertions.h>
 
 #include <dns/log.h>
diff --git a/lib/dns/config/confcommon.c b/lib/dns/config/confcommon.c
index d103b9969a..e07c3814b6 100644
--- a/lib/dns/config/confcommon.c
+++ b/lib/dns/config/confcommon.c
@@ -17,11 +17,12 @@
 
 #include <config.h>
 
-#include <sys/types.h>
+#include <sys/types.h>	/* XXXRTH */
 
 #include <limits.h>
-#include <syslog.h>
+#include <syslog.h>	/* XXXRTH */
 #include <ctype.h>
+#include <string.h>
 
 #include <isc/assertions.h>
 #include <isc/buffer.h>
diff --git a/lib/dns/config/confctx.c b/lib/dns/config/confctx.c
index 4159f536f7..a11d3b7ca0 100644
--- a/lib/dns/config/confctx.c
+++ b/lib/dns/config/confctx.c
@@ -17,7 +17,8 @@
 
 #include <config.h>
 
-#include <syslog.h>
+#include <syslog.h>	/* XXXRTH */
+#include <string.h>
 
 #include <isc/assertions.h>
 #include <isc/error.h>
diff --git a/lib/dns/config/confip.c b/lib/dns/config/confip.c
index f521ec98ca..a48bd36acf 100644
--- a/lib/dns/config/confip.c
+++ b/lib/dns/config/confip.c
@@ -17,6 +17,8 @@
 
 #include <config.h>
 
+#include <string.h>
+
 #include <isc/assertions.h>
 #include <isc/error.h>
 
diff --git a/lib/dns/config/confkeys.c b/lib/dns/config/confkeys.c
index 9b08f8c093..ffc420f155 100644
--- a/lib/dns/config/confkeys.c
+++ b/lib/dns/config/confkeys.c
@@ -17,6 +17,8 @@
 
 #include <config.h>
 
+#include <string.h>
+
 #include <isc/assertions.h>
 
 #include <dns/result.h>
diff --git a/lib/dns/config/conflog.c b/lib/dns/config/conflog.c
index d8e20bb499..52b30ead68 100644
--- a/lib/dns/config/conflog.c
+++ b/lib/dns/config/conflog.c
@@ -17,6 +17,8 @@
 
 #include <config.h>
 
+#include <string.h>
+
 #include <isc/assertions.h>
 
 #include <dns/conflog.h>
diff --git a/lib/dns/config/confserv.c b/lib/dns/config/confserv.c
index 0f3bdbfe7e..be800ed86e 100644
--- a/lib/dns/config/confserv.c
+++ b/lib/dns/config/confserv.c
@@ -17,7 +17,9 @@
 
 #include <config.h>
 
-#include <sys/types.h>
+#include <sys/types.h>	/* XXXRTH */
+
+#include <string.h>
 
 #include <isc/assertions.h>
 #include <isc/net.h>
diff --git a/lib/dns/gen.c b/lib/dns/gen.c
index 041ad7f990..8e46366344 100644
--- a/lib/dns/gen.c
+++ b/lib/dns/gen.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: gen.c,v 1.24 1999/08/31 22:08:19 halley Exp $ */
+ /* $Id: gen.c,v 1.25 1999/10/05 19:50:09 halley Exp $ */
 
 #include <config.h>
 
@@ -554,5 +554,5 @@ main(int argc, char **argv) {
 	if (ferror(stdout) != 0)
 		exit(1);
 
-	exit(0);
+	return (0);
 }
diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c
index e40677cb72..3218609912 100644
--- a/lib/dns/masterdump.c
+++ b/lib/dns/masterdump.c
@@ -155,10 +155,10 @@ dns_masterfile_style_debug = {
 
 
 #define N_SPACES 10
-char spaces[N_SPACES] = "          ";
+char spaces[N_SPACES+1] = "          ";
 
 #define N_TABS 10
-char tabs[N_TABS] = "\t\t\t\t\t\t\t\t\t\t";
+char tabs[N_TABS+1] = "\t\t\t\t\t\t\t\t\t\t";
 
 
 
diff --git a/lib/dns/time.c b/lib/dns/time.c
index a451255f8e..fb84811061 100644
--- a/lib/dns/time.c
+++ b/lib/dns/time.c
@@ -15,11 +15,12 @@
  * SOFTWARE.
  */
 
- /* $Id: time.c,v 1.2 1999/09/15 23:57:41 explorer Exp $ */
+ /* $Id: time.c,v 1.3 1999/10/05 19:50:10 halley Exp $ */
 
 #include <config.h>
 
 #include <stdio.h>
+#include <string.h>
 #include <time.h>
 
 #include <isc/assertions.h>
diff --git a/lib/dns/tsig.c b/lib/dns/tsig.c
index 7e903bc802..355c8882a4 100644
--- a/lib/dns/tsig.c
+++ b/lib/dns/tsig.c
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: tsig.c,v 1.12 1999/09/10 20:26:17 explorer Exp $
+ * $Id: tsig.c,v 1.13 1999/10/05 19:50:10 halley Exp $
  * Principal Author: Brian Wellington
  */
 
@@ -24,6 +24,7 @@
 #include <config.h>
 
 #include <stdlib.h>
+#include <string.h>
 
 #include <isc/assertions.h>
 #include <isc/buffer.h>
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index e79bd1030e..a61a269b8c 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,10 +15,12 @@
  * SOFTWARE.
  */
 
- /* $Id: zone.c,v 1.15 1999/10/02 21:15:20 brister Exp $ */
+ /* $Id: zone.c,v 1.16 1999/10/05 19:50:10 halley Exp $ */
 
 #include <config.h>
 
+#include <string.h>
+
 #include <isc/assertions.h>
 #include <isc/error.h>
 #include <../isc/util.h> /* XXX MPA */
diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 1a22e42628..640ebdc80e 100644
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -957,15 +957,11 @@ isc_socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type,
 		case ENFILE:
 		case ENOBUFS:
 			return (ISC_R_NORESOURCES);
-			/* NOTREACHED */
-			break;
 		default:
 			UNEXPECTED_ERROR(__FILE__, __LINE__,
 					 "socket() failed: %s",
 					 strerror(errno));
 			return (ISC_R_UNEXPECTED);
-			/* NOTREACHED */
-			break;
 		}
 	}
 
@@ -1417,7 +1413,6 @@ internal_recv(isc_task_t *me, isc_event_t *ev)
 		switch (doio_recv(sock, dev)) {
 		case DOIO_SOFT:
 			goto poke;
-			break;
 
 		case DOIO_EOF:
 			/*
@@ -1432,7 +1427,6 @@ internal_recv(isc_task_t *me, isc_event_t *ev)
 				dev = ISC_LIST_HEAD(sock->recv_list);
 			} while (dev != NULL);
 			goto poke;
-			break;
 
 		case DOIO_UNEXPECTED:
 		case DOIO_SUCCESS:
@@ -1511,7 +1505,6 @@ internal_send(isc_task_t *me, isc_event_t *ev)
 		switch (doio_send(sock, dev)) {
 		case DOIO_SOFT:
 			goto poke;
-			break;
 
 		case DOIO_HARD:
 		case DOIO_UNEXPECTED:
@@ -1998,20 +1991,17 @@ isc_socket_recvv(isc_socket_t *sock, isc_bufferlist_t *buflist,
 	switch (doio_recv(sock, dev)) {
 	case DOIO_SOFT:
 		goto queue;
-		break;
 
 	case DOIO_EOF:
 		send_recvdone_event(sock, &dev, ISC_R_EOF);
 		UNLOCK(&sock->lock);
 		return (ISC_R_SUCCESS);
-		break;
 
 	case DOIO_HARD:
 	case DOIO_UNEXPECTED:
 	case DOIO_SUCCESS:
 		UNLOCK(&sock->lock);
 		return (ISC_R_SUCCESS);
-		break;
 	}
 
  queue:
@@ -2099,20 +2089,17 @@ isc_socket_recv(isc_socket_t *sock, isc_region_t *region, unsigned int minimum,
 	switch (doio_recv(sock, dev)) {
 	case DOIO_SOFT:
 		goto queue;
-		break;
 
 	case DOIO_EOF:
 		send_recvdone_event(sock, &dev, ISC_R_EOF);
 		UNLOCK(&sock->lock);
 		return (ISC_R_SUCCESS);
-		break;
 
 	case DOIO_HARD:
 	case DOIO_UNEXPECTED:
 	case DOIO_SUCCESS:
 		UNLOCK(&sock->lock);
 		return (ISC_R_SUCCESS);
-		break;
 	}
 
  queue:
@@ -2197,14 +2184,12 @@ isc_socket_sendto(isc_socket_t *sock, isc_region_t *region,
 	switch (doio_send(sock, dev)) {
 	case DOIO_SOFT:
 		goto queue;
-		break;
 
 	case DOIO_HARD:
 	case DOIO_UNEXPECTED:
 	case DOIO_SUCCESS:
 		UNLOCK(&sock->lock);
 		return (ISC_R_SUCCESS);
-		break;
 	}
 
  queue:
@@ -2305,14 +2290,12 @@ isc_socket_sendtov(isc_socket_t *sock, isc_bufferlist_t *buflist,
 	switch (doio_send(sock, dev)) {
 	case DOIO_SOFT:
 		goto queue;
-		break;
 
 	case DOIO_HARD:
 	case DOIO_UNEXPECTED:
 	case DOIO_SUCCESS:
 		UNLOCK(&sock->lock);
 		return (ISC_R_SUCCESS);
-		break;
 	}
 
  queue:
@@ -2356,26 +2339,16 @@ isc_socket_bind(isc_socket_t *sock, isc_sockaddr_t *sockaddr)
 		switch (errno) {
 		case EACCES:
 			return (ISC_R_NOPERM);
-			/* NOTREACHED */
-			break;
 		case EADDRNOTAVAIL:
 			return (ISC_R_ADDRNOTAVAIL);
-			/* NOTREACHED */
-			break;
 		case EADDRINUSE:
 			return (ISC_R_ADDRINUSE);
-			/* NOTREACHED */
-			break;
 		case EINVAL:
 			return (ISC_R_BOUND);
-			/* NOTREACHED */
-			break;
 		default:
 			UNEXPECTED_ERROR(__FILE__, __LINE__,
 					 "bind: %s", strerror(errno));
 			return (ISC_R_UNEXPECTED);
-			/* NOTREACHED */
-			break;
 		}
 	}
 
@@ -2681,7 +2654,6 @@ internal_connect(isc_task_t *me, isc_event_t *ev)
 			UNEXPECTED_ERROR(__FILE__, __LINE__,
 					 "internal_connect: connect() %s",
 					 strerror(errno));
-			break;
 		}
 	} else
 		dev->result = ISC_R_SUCCESS;