diff --git a/common/dns.c b/common/dns.c
index ddc917b5..7423728a 100644
--- a/common/dns.c
+++ b/common/dns.c
@@ -22,7 +22,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: dns.c,v 1.15 2000/02/01 03:19:38 mellon Exp $ Copyright (c) 1997 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: dns.c,v 1.16 2000/02/03 03:43:51 mellon Exp $ Copyright (c) 1997 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -444,7 +444,7 @@ void dns_packet (protocol)
 	u_int16_t class;
 	TIME ttl;
 	u_int16_t rdlength;
-	socklen_t len;
+	SOCKLEN_T len;
 	int status;
 	int i;
 	struct dns_query *query;
diff --git a/common/icmp.c b/common/icmp.c
index c510055a..3f55dd14 100644
--- a/common/icmp.c
+++ b/common/icmp.c
@@ -23,7 +23,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: icmp.c,v 1.20 2000/02/01 18:25:07 mellon Exp $ Copyright (c) 1997, 1998 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: icmp.c,v 1.21 2000/02/03 03:43:51 mellon Exp $ Copyright (c) 1997, 1998 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -163,7 +163,7 @@ isc_result_t icmp_echoreply (h)
 	struct sockaddr_in from;
 	unsigned char icbuf [1500];
 	int status;
-	socklen_t sl;
+	SOCKLEN_T sl;
 	int hlen, len;
 	struct iaddr ia;
 	struct icmp_state *state;
diff --git a/common/socket.c b/common/socket.c
index 9a64677b..72a6da13 100644
--- a/common/socket.c
+++ b/common/socket.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: socket.c,v 1.44 2000/02/01 03:19:39 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: socket.c,v 1.45 2000/02/03 03:43:51 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -213,7 +213,7 @@ ssize_t receive_packet (interface, buf, len, from, hfrom)
 	struct sockaddr_in *from;
 	struct hardware *hfrom;
 {
-	socklen_t flen = sizeof *from;
+	SOCKLEN_T flen = sizeof *from;
 	int result;
 
 #ifdef IGNORE_HOSTUNREACH
@@ -240,7 +240,7 @@ isc_result_t fallback_discard (object)
 {
 	char buf [1540];
 	struct sockaddr_in from;
-	socklen_t flen = sizeof from;
+	SOCKLEN_T flen = sizeof from;
 	int status;
 	struct interface_info *interface;
 
diff --git a/minires/res_send.c b/minires/res_send.c
index 7f341113..cbfa4914 100644
--- a/minires/res_send.c
+++ b/minires/res_send.c
@@ -70,7 +70,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)res_send.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_send.c,v 1.2 2000/02/02 19:59:16 mellon Exp $";
+static const char rcsid[] = "$Id: res_send.c,v 1.3 2000/02/03 03:43:50 mellon Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -312,7 +312,7 @@ res_nsend(res_state statp,
 			if (statp->_sock >= 0 &&
 			    (statp->_flags & RES_F_VC) != 0) {
 				struct sockaddr_in peer;
-				socklen_t size = sizeof(peer);
+				SOCKLEN_T size = sizeof(peer);
 
 				if (getpeername(statp->_sock,
 						(struct sockaddr *)&peer,
@@ -478,7 +478,7 @@ res_nsend(res_state statp,
 			int start, timeout, finish;
 			fd_set dsmask;
 			struct sockaddr_in from;
-			socklen_t fromlen;
+			SOCKLEN_T fromlen;
 			int seconds;
 
 			if (statp->_sock < 0 ||
@@ -558,7 +558,7 @@ res_nsend(res_state statp,
 						       sizeof no_addr);
 #else
 					struct sockaddr_in local_addr;
-					socklen_t len;
+					SOCKLEN_T len;
 					int result, s1;
 
 					len = sizeof(local_addr);
diff --git a/omapip/connection.c b/omapip/connection.c
index 71e0b1e3..d0fc6762 100644
--- a/omapip/connection.c
+++ b/omapip/connection.c
@@ -32,7 +32,7 @@ isc_result_t omapi_connect (omapi_object_t *c,
 	isc_result_t status;
 	omapi_connection_object_t *obj;
 	int flag;
-	socklen_t sl;
+	SOCKLEN_T sl;
 
 	obj = (omapi_connection_object_t *)dmalloc (sizeof *obj, MDL);
 	if (!obj)
diff --git a/omapip/listener.c b/omapip/listener.c
index 9ba5d03f..db31d8c7 100644
--- a/omapip/listener.c
+++ b/omapip/listener.c
@@ -125,7 +125,7 @@ int omapi_listener_readfd (omapi_object_t *h)
 isc_result_t omapi_accept (omapi_object_t *h)
 {
 	isc_result_t status;
-	socklen_t len;
+	SOCKLEN_T len;
 	omapi_connection_object_t *obj;
 	omapi_listener_object_t *listener;