diff --git a/CHANGES b/CHANGES
index 1556955716..2b22a19b72 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2234.   [port]          Correct some compiler warnings on SCO OSr5 [RT #17134]
+  
 2233.   [func]          Add support for O(1) ACL processing, based on
                         radix tree code originally written by kevin
                         brintnall. [RT #16288]
diff --git a/bin/check/check-tool.c b/bin/check/check-tool.c
index 3edcfc9f80..85067ddb25 100644
--- a/bin/check/check-tool.c
+++ b/bin/check/check-tool.c
@@ -15,27 +15,26 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: check-tool.c,v 1.30 2007/08/06 01:06:49 marka Exp $ */
+/* $Id: check-tool.c,v 1.31 2007/09/13 04:45:18 each Exp $ */
 
 /*! \file */
 
 #include <config.h>
 
 #include <stdio.h>
-#include <string.h>
 
 #include "check-tool.h"
-#include <isc/util.h>
-
 #include <isc/buffer.h>
 #include <isc/log.h>
-#include <isc/net.h>
+#include <isc/mem.h>
 #include <isc/netdb.h>
+#include <isc/net.h>
 #include <isc/region.h>
 #include <isc/stdio.h>
+#include <isc/string.h>
 #include <isc/symtab.h>
 #include <isc/types.h>
-#include <isc/mem.h>
+#include <isc/util.h>
 
 #include <dns/fixedname.h>
 #include <dns/log.h>
diff --git a/bin/named/config.c b/bin/named/config.c
index 993c948f3e..23d97e6554 100644
--- a/bin/named/config.c
+++ b/bin/named/config.c
@@ -15,14 +15,13 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: config.c,v 1.79 2007/06/18 23:47:18 tbox Exp $ */
+/* $Id: config.c,v 1.80 2007/09/13 04:45:18 each Exp $ */
 
 /*! \file */
 
 #include <config.h>
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <isc/buffer.h>
 #include <isc/log.h>
@@ -31,6 +30,7 @@
 #include <isc/region.h>
 #include <isc/result.h>
 #include <isc/sockaddr.h>
+#include <isc/string.h>
 #include <isc/util.h>
 
 #include <isccfg/namedconf.h>
diff --git a/bin/named/control.c b/bin/named/control.c
index 3567a1c59d..8bd8f6ce36 100644
--- a/bin/named/control.c
+++ b/bin/named/control.c
@@ -15,17 +15,17 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: control.c,v 1.32 2007/06/18 23:47:18 tbox Exp $ */
+/* $Id: control.c,v 1.33 2007/09/13 04:45:18 each Exp $ */
 
 /*! \file */
 
 #include <config.h>
 
-#include <string.h>
 
 #include <isc/app.h>
 #include <isc/event.h>
 #include <isc/mem.h>
+#include <isc/string.h>
 #include <isc/timer.h>
 #include <isc/util.h>
 
diff --git a/bin/tests/system/lwresd/lwtest.c b/bin/tests/system/lwresd/lwtest.c
index 76fa618df0..263acb3994 100644
--- a/bin/tests/system/lwresd/lwtest.c
+++ b/bin/tests/system/lwresd/lwtest.c
@@ -15,15 +15,15 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwtest.c,v 1.28 2007/06/19 23:47:04 tbox Exp $ */
+/* $Id: lwtest.c,v 1.29 2007/09/13 04:45:18 each Exp $ */
 
 #include <config.h>
 
 #include <assert.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include <isc/net.h>
+#include <isc/string.h>
 
 #include <lwres/lwres.h>
 #include <lwres/netdb.h>
diff --git a/configure.in b/configure.in
index 2a0d0e36d5..52ae0ba48a 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
 
-AC_REVISION($Revision: 1.430 $)
+AC_REVISION($Revision: 1.431 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.59)
@@ -2059,6 +2059,13 @@ case "$hack_shutup_stdargcast" in
 		;;
 esac
 
+AC_CHECK_HEADERS(strings.h,
+  ISC_PLATFORM_HAVESTRINGSH="#define ISC_PLATFORM_HAVESTRINGSH 1"
+,
+  ISC_PLATFORM_HAVESTRINGSH="#undef ISC_PLATFORM_HAVESTRINGSH"
+)
+AC_SUBST(ISC_PLATFORM_HAVESTRINGSH)
+
 #
 # Check for if_nametoindex() for IPv6 scoped addresses support
 #
diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index 7d20a003b4..0ef51ba40a 100644
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -15,14 +15,13 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: check.c,v 1.82 2007/09/12 01:09:08 each Exp $ */
+/* $Id: check.c,v 1.83 2007/09/13 04:45:18 each Exp $ */
 
 /*! \file */
 
 #include <config.h>
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <isc/buffer.h>
 #include <isc/log.h>
@@ -32,6 +31,7 @@
 #include <isc/region.h>
 #include <isc/result.h>
 #include <isc/sockaddr.h>
+#include <isc/string.h>
 #include <isc/symtab.h>
 #include <isc/util.h>
 
diff --git a/lib/isc/include/isc/platform.h.in b/lib/isc/include/isc/platform.h.in
index 6e20b14452..8f3c5920c2 100644
--- a/lib/isc/include/isc/platform.h.in
+++ b/lib/isc/include/isc/platform.h.in
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: platform.h.in,v 1.44 2007/06/18 23:47:44 tbox Exp $ */
+/* $Id: platform.h.in,v 1.45 2007/09/13 04:45:18 each Exp $ */
 
 #ifndef ISC_PLATFORM_H
 #define ISC_PLATFORM_H 1
@@ -263,6 +263,11 @@
  */
 @ISC_PLATFORM_USESTDASM@
 
+/*
+ * Define if the platform has <strings.h>.
+ */
+@ISC_PLATFORM_HAVESTRINGSH@
+
 /***
  ***	Windows dll support.
  ***/
diff --git a/lib/isc/include/isc/string.h b/lib/isc/include/isc/string.h
index a6848ea76a..7994cd94b7 100644
--- a/lib/isc/include/isc/string.h
+++ b/lib/isc/include/isc/string.h
@@ -15,21 +15,25 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: string.h,v 1.21 2007/09/02 23:06:59 marka Exp $ */
+/* $Id: string.h,v 1.22 2007/09/13 04:45:18 each Exp $ */
 
 #ifndef ISC_STRING_H
 #define ISC_STRING_H 1
 
 /*! \file isc/string.h */
 
-#include <string.h>
-
 #include <isc/formatcheck.h>
 #include <isc/int.h>
 #include <isc/lang.h>
 #include <isc/platform.h>
 #include <isc/types.h>
 
+#include <string.h>
+
+#ifdef ISC_PLATFORM_HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
 #define ISC_STRING_MAGIC 0x5e
 
 ISC_LANG_BEGINDECLS