@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2008-2021 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2008-2022 Jonathan Schleifer <js@nil.im>
  *
  * All rights reserved.
  *
  * This file is part of ObjFW. It may be distributed under the terms of the
  * Q Public License 1.0, which can be found in the file LICENSE.QPL included in
@@ -51,12 +51,10 @@
 #import "OFSetOptionFailedException.h"
 
 static const OFRunLoopMode connectRunLoopMode =
     @"OFTCPSocketConnectRunLoopMode";
 
-Class OFTLSSocketClass = Nil;
-
 static OFString *defaultSOCKS5Host = nil;
 static uint16_t defaultSOCKS5Port = 1080;
 
 @interface OFTCPSocket () <OFIPSocketAsyncConnecting>
 @end
@@ -143,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;
 	}
 
@@ -164,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;
 	}
 
@@ -187,26 +186,26 @@
 	id <OFTCPSocketDelegate> delegate = _delegate;
 	OFTCPSocketConnectDelegate *connectDelegate =
 	    [[[OFTCPSocketConnectDelegate alloc] init] autorelease];
 	OFRunLoop *runLoop = [OFRunLoop currentRunLoop];
 
-	self.delegate = connectDelegate;
+	_delegate = connectDelegate;
 	[self asyncConnectToHost: host
 			    port: port
 		     runLoopMode: connectRunLoopMode];
 
 	while (!connectDelegate->_done)
 		[runLoop runMode: connectRunLoopMode beforeDate: nil];
 
 	/* Cleanup */
 	[runLoop runMode: connectRunLoopMode beforeDate: [OFDate date]];
+
+	_delegate = delegate;
 
 	if (connectDelegate->_exception != nil)
 		@throw connectDelegate->_exception;
 
-	self.delegate = delegate;
-
 	objc_autoreleasePoolPop(pool);
 }
 
 - (void)asyncConnectToHost: (OFString *)host port: (uint16_t)port
 {
@@ -318,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
@@ -339,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;
@@ -362,11 +362,12 @@
 			while (rnd < 1024)
 				rnd = (uint16_t)rand();
 
 			OFSocketAddressSetPort(&address, rnd);
 
-			if ((ret = bind(_socket, &address.sockaddr.sockaddr,
+			if ((ret = bind(_socket,
+			    (struct sockaddr *)&address.sockaddr,
 			    address.length)) == 0) {
 				port = rnd;
 				break;
 			}
 
@@ -393,11 +394,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;
@@ -406,17 +407,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