diff --git a/extensions/extb_hostmask.c b/extensions/extb_hostmask.c
index fcdee731d..9bffe26b8 100644
--- a/extensions/extb_hostmask.c
+++ b/extensions/extb_hostmask.c
@@ -56,7 +56,7 @@ eb_hostmask(const char *banstr, struct Client *client_p, struct Channel *chptr,
 
 #ifdef RB_IPV6
 	/* handle Teredo if necessary */
-	if (client_p->localClient->ip.ss_family == AF_INET6 && ipv4_from_ipv6((const struct sockaddr_in6 *) &client_p->localClient->ip, &ip4))
+	if (GET_SS_FAMILY(&client_p->localClient->ip) == AF_INET6 && ipv4_from_ipv6((const struct sockaddr_in6 *) &client_p->localClient->ip, &ip4))
 	{
 		sprintf(src_ip4host, "%s!%s@", client_p->name, client_p->username);
 		s4 = src_ip4host + strlen(src_ip4host);
diff --git a/modules/m_etrace.c b/modules/m_etrace.c
index 3a0f5e18d..7e5e3c049 100644
--- a/modules/m_etrace.c
+++ b/modules/m_etrace.c
@@ -165,8 +165,8 @@ do_etrace(struct Client *source_p, int ipv4, int ipv6)
 		target_p = ptr->data;
 
 #ifdef RB_IPV6
-		if((!ipv4 && target_p->localClient->ip.ss_family == AF_INET) ||
-		   (!ipv6 && target_p->localClient->ip.ss_family == AF_INET6))
+		if((!ipv4 && GET_SS_FAMILY(&target_p->localClient->ip) == AF_INET) ||
+		   (!ipv6 && GET_SS_FAMILY(&target_p->localClient->ip) == AF_INET6))
 			continue;
 #endif
 
diff --git a/modules/m_whois.c b/modules/m_whois.c
index 39b048148..3caf1330d 100644
--- a/modules/m_whois.c
+++ b/modules/m_whois.c
@@ -367,7 +367,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 					   target_p->name, target_p->sockhost);
 
 #ifdef RB_IPV6
-		if (target_p->localClient->ip.ss_family == AF_INET6 &&
+		if (GET_SS_FAMILY(&target_p->localClient->ip) == AF_INET6 &&
 				(show_ip(source_p, target_p) ||
 				 (source_p == target_p && !IsIPSpoof(target_p))) &&
 				ipv4_from_ipv6((struct sockaddr_in6 *)&target_p->localClient->ip, &ip4))