@@ -69,11 +69,11 @@
 		if (self.class == [OFStreamSocket class]) {
 			[self doesNotRecognizeSelector: _cmd];
 			abort();
 		}
 
-		_socket = INVALID_SOCKET;
+		_socket = OFInvalidSocketHandle;
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}
 
@@ -80,29 +80,29 @@
 	return self;
 }
 
 - (void)dealloc
 {
-	if (_socket != INVALID_SOCKET)
+	if (_socket != OFInvalidSocketHandle)
 		[self close];
 
 	[super dealloc];
 }
 
 - (bool)lowlevelIsAtEndOfStream
 {
-	if (_socket == INVALID_SOCKET)
+	if (_socket == OFInvalidSocketHandle)
 		@throw [OFNotOpenException exceptionWithObject: self];
 
 	return _atEndOfStream;
 }
 
 - (size_t)lowlevelReadIntoBuffer: (void *)buffer length: (size_t)length
 {
 	ssize_t ret;
 
-	if (_socket == INVALID_SOCKET)
+	if (_socket == OFInvalidSocketHandle)
 		@throw [OFNotOpenException exceptionWithObject: self];
 
 #ifndef OF_WINDOWS
 	if ((ret = recv(_socket, buffer, length, 0)) < 0)
 		@throw [OFReadFailedException
@@ -126,11 +126,11 @@
 	return ret;
 }
 
 - (size_t)lowlevelWriteBuffer: (const void *)buffer length: (size_t)length
 {
-	if (_socket == INVALID_SOCKET)
+	if (_socket == OFInvalidSocketHandle)
 		@throw [OFNotOpenException exceptionWithObject: self];
 
 #ifndef OF_WINDOWS
 	ssize_t bytesWritten;
 
@@ -181,11 +181,11 @@
 - (int)fileDescriptorForReading
 {
 #ifndef OF_WINDOWS
 	return _socket;
 #else
-	if (_socket == INVALID_SOCKET)
+	if (_socket == OFInvalidSocketHandle)
 		return -1;
 
 	if (_socket > INT_MAX)
 		@throw [OFOutOfRangeException exception];
 
@@ -196,11 +196,11 @@
 - (int)fileDescriptorForWriting
 {
 #ifndef OF_WINDOWS
 	return _socket;
 #else
-	if (_socket == INVALID_SOCKET)
+	if (_socket == OFInvalidSocketHandle)
 		return -1;
 
 	if (_socket > INT_MAX)
 		@throw [OFOutOfRangeException exception];
 
@@ -227,11 +227,11 @@
 	[self listenWithBacklog: SOMAXCONN];
 }
 
 - (void)listenWithBacklog: (int)backlog
 {
-	if (_socket == INVALID_SOCKET)
+	if (_socket == OFInvalidSocketHandle)
 		@throw [OFNotOpenException exceptionWithObject: self];
 
 	if (listen(_socket, backlog) == -1)
 		@throw [OFListenFailedException
 		    exceptionWithSocket: self
@@ -255,25 +255,26 @@
 
 #if defined(HAVE_PACCEPT) && defined(SOCK_CLOEXEC)
 	if ((client->_socket = paccept(_socket,
 	    &client->_remoteAddress.sockaddr.sockaddr,
 	    &client->_remoteAddress.length, NULL, SOCK_CLOEXEC)) ==
-	    INVALID_SOCKET)
+	    OFInvalidSocketHandle)
 		@throw [OFAcceptFailedException
 		    exceptionWithSocket: self
 				  errNo: OFSocketErrNo()];
 #elif defined(HAVE_ACCEPT4) && defined(SOCK_CLOEXEC)
 	if ((client->_socket = accept4(_socket,
 	    &client->_remoteAddress.sockaddr.sockaddr,
-	    &client->_remoteAddress.length, SOCK_CLOEXEC)) == INVALID_SOCKET)
+	    &client->_remoteAddress.length, SOCK_CLOEXEC)) ==
+	    OFInvalidSocketHandle)
 		@throw [OFAcceptFailedException
 		    exceptionWithSocket: self
 				  errNo: OFSocketErrNo()];
 #else
 	if ((client->_socket = accept(_socket,
 	    &client->_remoteAddress.sockaddr.sockaddr,
-	    &client->_remoteAddress.length)) == INVALID_SOCKET)
+	    &client->_remoteAddress.length)) == OFInvalidSocketHandle)
 		@throw [OFAcceptFailedException
 		    exceptionWithSocket: self
 				  errNo: OFSocketErrNo()];
 
 # if defined(HAVE_FCNTL) && defined(FD_CLOEXEC)
@@ -336,11 +337,11 @@
 }
 #endif
 
 - (const OFSocketAddress *)remoteAddress
 {
-	if (_socket == INVALID_SOCKET)
+	if (_socket == OFInvalidSocketHandle)
 		@throw [OFNotOpenException exceptionWithObject: self];
 
 	if (_remoteAddress.length == 0)
 		@throw [OFInvalidArgumentException exception];
 
@@ -350,19 +351,19 @@
 	return &_remoteAddress;
 }
 
 - (void)close
 {
-	if (_socket == INVALID_SOCKET)
+	if (_socket == OFInvalidSocketHandle)
 		@throw [OFNotOpenException exceptionWithObject: self];
 
 	_listening = false;
 	memset(&_remoteAddress, 0, sizeof(_remoteAddress));
 
 	closesocket(_socket);
-	_socket = INVALID_SOCKET;
+	_socket = OFInvalidSocketHandle;
 
 	_atEndOfStream = false;
 
 	[super close];
 }
 @end