@@ -141,11 +141,12 @@
 #endif
 
 	if (_socket != OFInvalidSocketHandle)
 		@throw [OFAlreadyConnectedException exceptionWithSocket: self];
 
-	if ((_socket = socket(address->sockaddr.sockaddr.sa_family,
+	if ((_socket = socket(
+	    ((struct sockaddr *)&address->sockaddr)->sa_family,
 	    SOCK_STREAM | SOCK_CLOEXEC, 0)) == OFInvalidSocketHandle) {
 		*errNo = OFSocketErrNo();
 		return false;
 	}
 
@@ -162,11 +163,11 @@
 {
 	if (_socket == OFInvalidSocketHandle)
 		@throw [OFNotOpenException exceptionWithObject: self];
 
 	/* Cast needed for AmigaOS, where the argument is declared non-const */
-	if (connect(_socket, (struct sockaddr *)&address->sockaddr.sockaddr,
+	if (connect(_socket, (struct sockaddr *)&address->sockaddr,
 	    address->length) != 0) {
 		*errNo = OFSocketErrNo();
 		return false;
 	}
 
@@ -316,11 +317,12 @@
 		      addressFamily: OFSocketAddressFamilyAny];
 
 	address = *(OFSocketAddress *)[socketAddresses itemAtIndex: 0];
 	OFSocketAddressSetPort(&address, port);
 
-	if ((_socket = socket(address.sockaddr.sockaddr.sa_family,
+	if ((_socket = socket(
+	    ((struct sockaddr *)&address.sockaddr)->sa_family,
 	    SOCK_STREAM | SOCK_CLOEXEC, 0)) == OFInvalidSocketHandle)
 		@throw [OFBindFailedException
 		    exceptionWithHost: host
 				 port: port
 			       socket: self
@@ -337,11 +339,11 @@
 	    (char *)&one, (socklen_t)sizeof(one));
 
 #if defined(OF_HPUX) || defined(OF_WII) || defined(OF_NINTENDO_3DS)
 	if (port != 0) {
 #endif
-		if (bind(_socket, &address.sockaddr.sockaddr,
+		if (bind(_socket, (struct sockaddr *)&address.sockaddr,
 		    address.length) != 0) {
 			int errNo = OFSocketErrNo();
 
 			closesocket(_socket);
 			_socket = OFInvalidSocketHandle;
@@ -360,11 +362,11 @@
 			while (rnd < 1024)
 				rnd = (uint16_t)rand();
 
 			OFSocketAddressSetPort(&address, rnd);
 
-			if ((ret = bind(_socket, &address.sockaddr.sockaddr,
+			if ((ret = bind(_socket, &address.sockaddr,
 			    address.length)) == 0) {
 				port = rnd;
 				break;
 			}
 
@@ -391,11 +393,11 @@
 
 #if !defined(OF_HPUX) && !defined(OF_WII) && !defined(OF_NINTENDO_3DS)
 	memset(&address, 0, sizeof(address));
 
 	address.length = (socklen_t)sizeof(address.sockaddr);
-	if (OFGetSockName(_socket, &address.sockaddr.sockaddr,
+	if (OFGetSockName(_socket, (struct sockaddr *)&address.sockaddr,
 	    &address.length) != 0) {
 		int errNo = OFSocketErrNo();
 
 		closesocket(_socket);
 		_socket = OFInvalidSocketHandle;
@@ -404,17 +406,18 @@
 							   port: port
 							 socket: self
 							  errNo: errNo];
 	}
 
-	if (address.sockaddr.sockaddr.sa_family == AF_INET)
+	switch (((struct sockaddr *)&address.sockaddr)->sa_family) {
+	case AF_INET:
 		return OFFromBigEndian16(address.sockaddr.in.sin_port);
 # ifdef OF_HAVE_IPV6
-	else if (address.sockaddr.sockaddr.sa_family == AF_INET6)
+	case AF_INET6:
 		return OFFromBigEndian16(address.sockaddr.in6.sin6_port);
 # endif
-	else {
+	default:
 		closesocket(_socket);
 		_socket = OFInvalidSocketHandle;
 
 		@throw [OFBindFailedException exceptionWithHost: host
 							   port: port