diff --git a/lib/isc/include/isc/ipv6.h b/lib/isc/include/isc/ipv6.h
index ed2d39991d..7bb5d7b987 100644
--- a/lib/isc/include/isc/ipv6.h
+++ b/lib/isc/include/isc/ipv6.h
@@ -70,7 +70,7 @@ extern struct in6_addr in6addr_any;
 extern struct in6_addr in6addr_loopback;
 
 struct sockaddr_in6 {
-#ifdef ISC_NET_HAVESALEN
+#ifdef ISC_PLATFORM_HAVESALEN
 	isc_uint8_t		sin6_len;
 	isc_uint8_t		sin6_family;
 #else
@@ -82,7 +82,7 @@ struct sockaddr_in6 {
 	isc_uint32_t		sin6_scope_id;
 };
 
-#ifdef ISC_NET_HAVESALEN
+#ifdef ISC_PLATFORM_HAVESALEN
 #define SIN6_LEN 1
 #endif
 
diff --git a/lib/isc/win32/include/isc/ipv6.h b/lib/isc/win32/include/isc/ipv6.h
index ed2d39991d..7bb5d7b987 100644
--- a/lib/isc/win32/include/isc/ipv6.h
+++ b/lib/isc/win32/include/isc/ipv6.h
@@ -70,7 +70,7 @@ extern struct in6_addr in6addr_any;
 extern struct in6_addr in6addr_loopback;
 
 struct sockaddr_in6 {
-#ifdef ISC_NET_HAVESALEN
+#ifdef ISC_PLATFORM_HAVESALEN
 	isc_uint8_t		sin6_len;
 	isc_uint8_t		sin6_family;
 #else
@@ -82,7 +82,7 @@ struct sockaddr_in6 {
 	isc_uint32_t		sin6_scope_id;
 };
 
-#ifdef ISC_NET_HAVESALEN
+#ifdef ISC_PLATFORM_HAVESALEN
 #define SIN6_LEN 1
 #endif
 
diff --git a/lib/isc/win32/include/isc/net.h b/lib/isc/win32/include/isc/net.h
index 13b33b3354..7d42ddd5de 100644
--- a/lib/isc/win32/include/isc/net.h
+++ b/lib/isc/win32/include/isc/net.h
@@ -65,10 +65,10 @@
  ***/
 
 /*
- * If sockaddrs on this system have an sa_len field, ISC_NET_HAVESALEN will
- * be defined.
+ * If sockaddrs on this system have an sa_len field, ISC_PLATFORM_HAVESALEN
+ * will be defined.
  */
-#undef ISC_NET_HAVESALEN
+#undef ISC_PLATFORM_HAVESALEN
 
 /*
  * If this system has the IPv6 structure definitions, ISC_NET_HAVEIPV6