Index: src/OFDatagramSocket.h
==================================================================
--- src/OFDatagramSocket.h
+++ src/OFDatagramSocket.h
@@ -106,11 +106,11 @@
  *	    was called to create one "instance" for every thread!
  */
 @interface OFDatagramSocket: OFObject <OFCopying, OFReadyForReadingObserving,
     OFReadyForWritingObserving>
 {
-	of_socket_t _socket;
+	OFSocketHandle _socket;
 	bool _canBlock;
 #ifdef OF_WII
 	bool _canSendToBroadcastAddresses;
 #endif
 	id <OFDatagramSocketDelegate> _Nullable _delegate;

Index: src/OFKernelEventObserver.h
==================================================================
--- src/OFKernelEventObserver.h
+++ src/OFKernelEventObserver.h
@@ -126,11 +126,11 @@
 	struct Task *_waitingTask;
 	ULONG _cancelSignal;
 #elif defined(OF_HAVE_PIPE)
 	int _cancelFD[2];
 #else
-	of_socket_t _cancelFD[2];
+	OFSocketHandle _cancelFD[2];
 	struct sockaddr_in _cancelAddr;
 #endif
 #ifdef OF_AMIGAOS
 	ULONG _execSignalMask;
 #endif

Index: src/OFSelectKernelEventObserver.m
==================================================================
--- src/OFSelectKernelEventObserver.m
+++ src/OFSelectKernelEventObserver.m
@@ -97,11 +97,11 @@
 #endif
 
 	if (fd > _maxFD)
 		_maxFD = fd;
 
-	FD_SET((of_socket_t)fd, &_readFDs);
+	FD_SET((OFSocketHandle)fd, &_readFDs);
 
 	[super addObjectForReading: object];
 }
 
 - (void)addObjectForWriting: (id <OFReadyForWritingObserving>)object
@@ -121,11 +121,11 @@
 #endif
 
 	if (fd > _maxFD)
 		_maxFD = fd;
 
-	FD_SET((of_socket_t)fd, &_writeFDs);
+	FD_SET((OFSocketHandle)fd, &_writeFDs);
 
 	[super addObjectForWriting: object];
 }
 
 - (void)removeObjectForReading: (id <OFReadyForReadingObserving>)object
@@ -141,11 +141,11 @@
 #ifndef OF_WINDOWS
 	if (fd >= (int)FD_SETSIZE)
 		@throw [OFOutOfRangeException exception];
 #endif
 
-	FD_CLR((of_socket_t)fd, &_readFDs);
+	FD_CLR((OFSocketHandle)fd, &_readFDs);
 
 	[super removeObjectForReading: object];
 }
 
 - (void)removeObjectForWriting: (id <OFReadyForWritingObserving>)object
@@ -162,11 +162,11 @@
 #ifndef OF_WINDOWS
 	if (fd >= (int)FD_SETSIZE)
 		@throw [OFOutOfRangeException exception];
 #endif
 
-	FD_CLR((of_socket_t)fd, &_writeFDs);
+	FD_CLR((OFSocketHandle)fd, &_writeFDs);
 
 	[super removeObjectForWriting: object];
 }
 
 - (void)observeForTimeInterval: (OFTimeInterval)timeInterval
@@ -258,11 +258,11 @@
 	for (id <OFReadyForReadingObserving> object in
 	    [[_readObjects copy] autorelease]) {
 		void *pool2 = objc_autoreleasePoolPush();
 		int fd = object.fileDescriptorForReading;
 
-		if (FD_ISSET((of_socket_t)fd, &readFDs) &&
+		if (FD_ISSET((OFSocketHandle)fd, &readFDs) &&
 		    [_delegate respondsToSelector:
 		    @selector(objectIsReadyForReading:)])
 			[_delegate objectIsReadyForReading: object];
 
 		objc_autoreleasePoolPop(pool2);
@@ -271,11 +271,11 @@
 	for (id <OFReadyForWritingObserving> object in
 	    [[_writeObjects copy] autorelease]) {
 		void *pool2 = objc_autoreleasePoolPush();
 		int fd = object.fileDescriptorForWriting;
 
-		if (FD_ISSET((of_socket_t)fd, &writeFDs) &&
+		if (FD_ISSET((OFSocketHandle)fd, &writeFDs) &&
 		    [_delegate respondsToSelector:
 		    @selector(objectIsReadyForWriting:)])
 			[_delegate objectIsReadyForWriting: object];
 
 		objc_autoreleasePoolPop(pool2);

Index: src/OFSequencedPacketSocket.h
==================================================================
--- src/OFSequencedPacketSocket.h
+++ src/OFSequencedPacketSocket.h
@@ -125,11 +125,11 @@
  *	    was called to create one "instance" for every thread!
  */
 @interface OFSequencedPacketSocket: OFObject <OFCopying,
     OFReadyForReadingObserving, OFReadyForWritingObserving>
 {
-	of_socket_t _socket;
+	OFSocketHandle _socket;
 	bool _canBlock, _listening;
 	of_socket_address_t _remoteAddress;
 	id _Nullable _delegate;
 	OF_RESERVE_IVARS(OFSequencedPacketSocket, 4)
 }

Index: src/OFStreamSocket.h
==================================================================
--- src/OFStreamSocket.h
+++ src/OFStreamSocket.h
@@ -64,11 +64,11 @@
  * @brief A class which provides methods to create and use stream sockets.
  */
 @interface OFStreamSocket: OFStream <OFReadyForReadingObserving,
     OFReadyForWritingObserving>
 {
-	of_socket_t _socket;
+	OFSocketHandle _socket;
 	bool _atEndOfStream, _listening;
 	of_socket_address_t _remoteAddress;
 	OF_RESERVE_IVARS(OFStreamSocket, 4)
 }
 

Index: src/socket.h
==================================================================
--- src/socket.h
+++ src/socket.h
@@ -62,13 +62,13 @@
 #endif
 
 OF_ASSUME_NONNULL_BEGIN
 
 #ifndef OF_WINDOWS
-typedef int of_socket_t;
+typedef int OFSocketHandle;
 #else
-typedef SOCKET of_socket_t;
+typedef SOCKET OFSocketHandle;
 #endif
 
 #ifdef OF_WII
 typedef u8 sa_family_t;
 #endif
@@ -286,11 +286,11 @@
 #if defined(OF_HAVE_THREADS) && defined(OF_AMIGAOS) && !defined(OF_MORPHOS)
 extern void of_socket_deinit(void);
 #endif
 extern int of_socket_errno(void);
 #if !defined(OF_WII) && !defined(OF_NINTENDO_3DS)
-extern int of_getsockname(of_socket_t sock, struct sockaddr *restrict addr,
+extern int of_getsockname(OFSocketHandle sock, struct sockaddr *restrict addr,
     socklen_t *restrict addrLen);
 #endif
 
 #if defined(OF_HAVE_THREADS) && defined(OF_AMIGAOS) && !defined(OF_MORPHOS)
 extern of_tlskey_t of_socket_base_key;

Index: src/socket.m
==================================================================
--- src/socket.m
+++ src/socket.m
@@ -329,11 +329,11 @@
 #endif
 }
 
 #ifndef OF_WII
 int
-of_getsockname(of_socket_t sock, struct sockaddr *restrict addr,
+of_getsockname(OFSocketHandle sock, struct sockaddr *restrict addr,
     socklen_t *restrict addrLen)
 {
 	int ret;
 
 # if defined(OF_HAVE_THREADS) && (!defined(OF_AMIGAOS) || defined(OF_MORPHOS))