diff --git a/config.h.in b/config.h.in
index 35ffb1141d..c6e6ff1779 100644
--- a/config.h.in
+++ b/config.h.in
@@ -639,8 +639,11 @@ int sigwait(const unsigned int *set, int *sig);
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
-/* Define to empty if your compiler does not support "static inline". */
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
 #undef inline
+#endif
 
 /* Define to `unsigned int' if <sys/types.h> does not define. */
 #undef size_t
diff --git a/configure b/configure
index 548e569f8a..32875c8c8e 100755
--- a/configure
+++ b/configure
@@ -755,13 +755,11 @@ ISC_ISCIPV6_O
 ISC_IPV6_O
 ISC_IPV6_H
 ISC_PLATFORM_HAVESOCKADDRSTORAGE
-ISC_PLATFORM_FIXIN6ISADDR
 ISC_PLATFORM_HAVEIN6PKTINFO
 ISC_PLATFORM_NEEDIN6ADDRLOOPBACK
 ISC_PLATFORM_NEEDIN6ADDRANY
 ISC_PLATFORM_HAVEINADDR6
 ISC_PLATFORM_NEEDNETINET6IN6H
-ISC_PLATFORM_NEEDNETINETIN6H
 ISC_PLATFORM_HAVEIPV6
 BIND9_CO_RULE
 LIBTOOL_IN_MAIN
@@ -13908,43 +13906,6 @@ fi
 done
 
 
-#
-# UnixWare 7.1.1 with the feature supplement to the UDK compiler
-# is reported to not support "static inline" (RT #1212).
-#
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for static inline breakage" >&5
-$as_echo_n "checking for static inline breakage... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-	static inline int foo1() {
-		return 0;
-	}
-
-	static inline int foo2() {
-		return foo1();
-	}
-
-int
-main ()
-{
-foo1();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define inline /**/" >>confdefs.h
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
 ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
 if test "x$ac_cv_type_size_t" = xyes; then :
 
@@ -15791,13 +15752,6 @@ if test "x$ac_cv_func_pthread_setconcurrency" = xyes; then :
 
 fi
 
-		;;
-	#
-	# UnixWare does things its own way.
-	#
-	*-sco-sysv*uw*|*-*-sysv*UnixWare*|*-*-sysv*OpenUNIX*)
-		$as_echo "#define HAVE_UNIXWARE_SIGWAIT 1" >>confdefs.h
-
 		;;
 esac
 
@@ -17614,10 +17568,6 @@ else
 	*-solaris*)
 		MKDEPCFLAGS="-xM"
 		;;
-	*-sco-sysv*uw*|*-*-sysv*UnixWare*|*-*-sysv*OpenUNIX*)
-		# UnixWare
-		CC="$CC -w"
-		;;
 	esac
 fi
 
@@ -18099,23 +18049,6 @@ case "$host" in
 esac
 
 
-#
-# This is similar to the netinet6/in6.h issue.
-#
-case "$host" in
-*-sco-sysv*uw*|*-*-sysv*UnixWare*|*-*-sysv*OpenUNIX*)
-	# UnixWare
-	ISC_PLATFORM_NEEDNETINETIN6H="#define ISC_PLATFORM_NEEDNETINETIN6H 1"
-	ISC_PLATFORM_FIXIN6ISADDR="#define ISC_PLATFORM_FIXIN6ISADDR 1"
-	isc_netinetin6_hack="#include <netinet/in6.h>"
-	;;
-*)
-	ISC_PLATFORM_NEEDNETINETIN6H="#undef ISC_PLATFORM_NEEDNETINETIN6H"
-	ISC_PLATFORM_FIXIN6ISADDR="#undef ISC_PLATFORM_FIXIN6ISADDR"
-	isc_netinetin6_hack=""
-	;;
-esac
-
 #
 # Now delve deeper into the suitability of the IPv6 support.
 #
@@ -18131,7 +18064,6 @@ $as_echo_n "checking for in6_addr... " >&6; }
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-$isc_netinetin6_hack
 $isc_netinet6in6_hack
 
 int
@@ -18163,7 +18095,6 @@ $as_echo_n "checking for in6addr_any... " >&6; }
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-$isc_netinetin6_hack
 $isc_netinet6in6_hack
 $isc_in_addr6_hack
 
@@ -18195,7 +18126,6 @@ $as_echo_n "checking for in6addr_loopback... " >&6; }
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-$isc_netinetin6_hack
 $isc_netinet6in6_hack
 $isc_in_addr6_hack
 
@@ -18227,7 +18157,6 @@ $as_echo_n "checking for sin6_scope_id in struct sockaddr_in6... " >&6; }
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-$isc_netinetin6_hack
 $isc_netinet6in6_hack
 
 int
@@ -18257,7 +18186,6 @@ $as_echo_n "checking for in6_pktinfo... " >&6; }
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-$isc_netinetin6_hack
 $isc_netinet6in6_hack
 
 int
@@ -18298,7 +18226,6 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 
 #include <sys/types.h>
 #include <sys/socket.h>
-$isc_netinetin6_hack
 $isc_netinet6in6_hack
 
 int
@@ -18333,8 +18260,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct if_laddrreq" >&5
 $as_echo_n "checking for struct if_laddrreq... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
diff --git a/configure.in b/configure.in
index da283583a8..5c94dae572 100644
--- a/configure.in
+++ b/configure.in
@@ -520,24 +520,6 @@ AC_CHECK_FUNCS(mmap)
 AC_CHECK_FUNCS(seteuid setresuid)
 AC_CHECK_FUNCS(setegid setresgid)
 
-#
-# UnixWare 7.1.1 with the feature supplement to the UDK compiler
-# is reported to not support "static inline" (RT #1212).
-#
-AC_MSG_CHECKING(for static inline breakage)
-AC_TRY_COMPILE([
-	static inline int foo1() {
-		return 0;
-	}
-
-	static inline int foo2() {
-		return foo1();
-	}
-	], [foo1();],
-	[AC_MSG_RESULT(no)],
-	[AC_MSG_RESULT(yes)
-	 AC_DEFINE(inline, ,[Define to empty if your compiler does not support "static inline".])])
-
 AC_TYPE_SIZE_T
 AC_TYPE_SSIZE_T
 AC_TYPE_UINTPTR_T
@@ -950,12 +932,6 @@ case "$host" in
 		AC_CHECK_FUNC(pthread_setconcurrency,
 			      AC_DEFINE(CALL_PTHREAD_SETCONCURRENCY))
 		;;
-	#
-	# UnixWare does things its own way.
-	#
-	*-sco-sysv*uw*|*-*-sysv*UnixWare*|*-*-sysv*OpenUNIX*)
-		AC_DEFINE(HAVE_UNIXWARE_SIGWAIT)
-		;;
 esac
 
 # Look for functions relating to thread naming
@@ -1848,10 +1824,6 @@ else
 	*-solaris*)
 		MKDEPCFLAGS="-xM"
 		;;
-	*-sco-sysv*uw*|*-*-sysv*UnixWare*|*-*-sysv*OpenUNIX*)
-		# UnixWare
-		CC="$CC -w"
-		;;
 	esac
 fi
 
@@ -2134,23 +2106,6 @@ case "$host" in
 esac
 changequote([, ])
 
-#
-# This is similar to the netinet6/in6.h issue.
-#
-case "$host" in
-*-sco-sysv*uw*|*-*-sysv*UnixWare*|*-*-sysv*OpenUNIX*)
-	# UnixWare
-	ISC_PLATFORM_NEEDNETINETIN6H="#define ISC_PLATFORM_NEEDNETINETIN6H 1"
-	ISC_PLATFORM_FIXIN6ISADDR="#define ISC_PLATFORM_FIXIN6ISADDR 1"
-	isc_netinetin6_hack="#include <netinet/in6.h>"
-	;;
-*)
-	ISC_PLATFORM_NEEDNETINETIN6H="#undef ISC_PLATFORM_NEEDNETINETIN6H"
-	ISC_PLATFORM_FIXIN6ISADDR="#undef ISC_PLATFORM_FIXIN6ISADDR"
-	isc_netinetin6_hack=""
-	;;
-esac
-
 #
 # Now delve deeper into the suitability of the IPv6 support.
 #
@@ -2163,7 +2118,6 @@ case "$found_ipv6" in
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-$isc_netinetin6_hack
 $isc_netinet6in6_hack
 ],
 [struct in6_addr in6; return (0);],
@@ -2179,7 +2133,6 @@ $isc_netinet6in6_hack
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-$isc_netinetin6_hack
 $isc_netinet6in6_hack
 $isc_in_addr6_hack
 ],
@@ -2194,7 +2147,6 @@ $isc_in_addr6_hack
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-$isc_netinetin6_hack
 $isc_netinet6in6_hack
 $isc_in_addr6_hack
 ],
@@ -2209,7 +2161,6 @@ $isc_in_addr6_hack
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-$isc_netinetin6_hack
 $isc_netinet6in6_hack
 ],
 		[struct sockaddr_in6 xyzzy; xyzzy.sin6_scope_id = 0; return (0);],
@@ -2223,7 +2174,6 @@ $isc_netinet6in6_hack
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-$isc_netinetin6_hack
 $isc_netinet6in6_hack
 ],
 		[struct in6_pktinfo xyzzy; return (0);],
@@ -2248,7 +2198,6 @@ AC_MSG_CHECKING(for struct sockaddr_storage)
 AC_TRY_COMPILE([
 #include <sys/types.h>
 #include <sys/socket.h>
-$isc_netinetin6_hack
 $isc_netinet6in6_hack
 ],
 [struct sockaddr_storage storage; return (0);],
@@ -2258,13 +2207,11 @@ ISC_PLATFORM_HAVESOCKADDRSTORAGE="#define ISC_PLATFORM_HAVESOCKADDRSTORAGE 1"],
 ISC_PLATFORM_HAVESOCKADDRSTORAGE="#undef ISC_PLATFORM_HAVESOCKADDRSTORAGE"])
 
 AC_SUBST(ISC_PLATFORM_HAVEIPV6)
-AC_SUBST(ISC_PLATFORM_NEEDNETINETIN6H)
 AC_SUBST(ISC_PLATFORM_NEEDNETINET6IN6H)
 AC_SUBST(ISC_PLATFORM_HAVEINADDR6)
 AC_SUBST(ISC_PLATFORM_NEEDIN6ADDRANY)
 AC_SUBST(ISC_PLATFORM_NEEDIN6ADDRLOOPBACK)
 AC_SUBST(ISC_PLATFORM_HAVEIN6PKTINFO)
-AC_SUBST(ISC_PLATFORM_FIXIN6ISADDR)
 AC_SUBST(ISC_PLATFORM_HAVESOCKADDRSTORAGE)
 AC_SUBST(ISC_IPV6_H)
 AC_SUBST(ISC_IPV6_O)
diff --git a/lib/isc/include/isc/platform.h.in b/lib/isc/include/isc/platform.h.in
index dfc06e48bb..ce3f1a6f13 100644
--- a/lib/isc/include/isc/platform.h.in
+++ b/lib/isc/include/isc/platform.h.in
@@ -30,12 +30,6 @@
  *** Network.
  ***/
 
-/*! \brief
- * Define if this system needs the <netinet/in6.h> header file included
- * for full IPv6 support (pretty much only UnixWare).
- */
-@ISC_PLATFORM_NEEDNETINETIN6H@
-
 /*! \brief
  * Define if this system needs the <netinet6/in6.h> header file included
  * to support in6_pkinfo (pretty much only BSD/OS).
@@ -125,12 +119,6 @@
  */
 @ISC_PLATFORM_HAVEIFNAMETOINDEX@
 
-/*! \brief
- * Define on some UnixWare systems to fix erroneous definitions of various
- * IN6_IS_ADDR_* macros.
- */
-@ISC_PLATFORM_FIXIN6ISADDR@
-
 /*! \brief
  * Define if the system has struct sockaddr_storage.
  */
diff --git a/lib/isc/unix/include/isc/net.h b/lib/isc/unix/include/isc/net.h
index a30e7ef84e..f66c3818b9 100644
--- a/lib/isc/unix/include/isc/net.h
+++ b/lib/isc/unix/include/isc/net.h
@@ -76,9 +76,6 @@
 
 #include <netinet/in.h>		/* Contractual promise. */
 #include <arpa/inet.h>		/* Contractual promise. */
-#ifdef ISC_PLATFORM_NEEDNETINETIN6H
-#include <netinet/in6.h>	/* Required on UnixWare. */
-#endif
 #ifdef ISC_PLATFORM_NEEDNETINET6IN6H
 #include <netinet6/in6.h>	/* Required on BSD/OS for in6_pktinfo. */
 #endif
@@ -237,27 +234,6 @@ extern const struct in6_addr isc_net_in6addrloop;
 #define in6addr_loopback isc_net_in6addrloop
 #endif
 
-#ifdef ISC_PLATFORM_FIXIN6ISADDR
-#undef  IN6_IS_ADDR_GEOGRAPHIC
-/*!
- * \brief
- * Fix UnixWare 7.1.1's broken IN6_IS_ADDR_* definitions.
- */
-#define IN6_IS_ADDR_GEOGRAPHIC(a) (((a)->S6_un.S6_l[0] & 0xE0) == 0x80)
-#undef  IN6_IS_ADDR_IPX
-#define IN6_IS_ADDR_IPX(a)        (((a)->S6_un.S6_l[0] & 0xFE) == 0x04)
-#undef  IN6_IS_ADDR_LINKLOCAL
-#define IN6_IS_ADDR_LINKLOCAL(a)  (((a)->S6_un.S6_l[0] & 0xC0FF) == 0x80FE)
-#undef  IN6_IS_ADDR_MULTICAST
-#define IN6_IS_ADDR_MULTICAST(a)  (((a)->S6_un.S6_l[0] & 0xFF) == 0xFF)
-#undef  IN6_IS_ADDR_NSAP
-#define IN6_IS_ADDR_NSAP(a)       (((a)->S6_un.S6_l[0] & 0xFE) == 0x02)
-#undef  IN6_IS_ADDR_PROVIDER
-#define IN6_IS_ADDR_PROVIDER(a)   (((a)->S6_un.S6_l[0] & 0xE0) == 0x40)
-#undef  IN6_IS_ADDR_SITELOCAL
-#define IN6_IS_ADDR_SITELOCAL(a)  (((a)->S6_un.S6_l[0] & 0xC0FF) == 0xC0FE)
-#endif /* ISC_PLATFORM_FIXIN6ISADDR */
-
 #ifdef ISC_PLATFORM_NEEDPORTT
 /*%
  * Ensure type in_port_t is defined.