@@ -29,17 +29,16 @@
 
 #include <sys/time.h>
 
 #import "OFSelectKernelEventObserver.h"
 #import "OFArray.h"
+#import "OFSocket+Private.h"
 
 #import "OFInitializationFailedException.h"
 #import "OFObserveFailedException.h"
 #import "OFOutOfRangeException.h"
 
-#import "socket_helpers.h"
-
 #ifdef OF_AMIGAOS
 # include <proto/exec.h>
 #endif
 
 #ifdef OF_HPUX
@@ -97,11 +96,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 +120,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 +140,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,16 +161,16 @@
 #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: (of_time_interval_t)timeInterval
+- (void)observeForTimeInterval: (OFTimeInterval)timeInterval
 {
 	fd_set readFDs;
 	fd_set writeFDs;
 	struct timeval timeout;
 	int events;
@@ -232,11 +231,11 @@
 #endif
 
 	if (events < 0)
 		@throw [OFObserveFailedException
 		    exceptionWithObserver: self
-				    errNo: of_socket_errno()];
+				    errNo: OFSocketErrNo()];
 
 #ifdef OF_AMIGAOS
 	if (execSignalMask != 0 &&
 	    [_delegate respondsToSelector: @selector(execSignalWasReceived:)])
 		[_delegate execSignalWasReceived: execSignalMask];
@@ -243,13 +242,13 @@
 #else
 	if (FD_ISSET(_cancelFD[0], &readFDs)) {
 		char buffer;
 
 # ifdef OF_HAVE_PIPE
-		OF_ENSURE(read(_cancelFD[0], &buffer, 1) == 1);
+		OFEnsure(read(_cancelFD[0], &buffer, 1) == 1);
 # else
-		OF_ENSURE(recvfrom(_cancelFD[0], (void *)&buffer, 1, 0, NULL,
+		OFEnsure(recvfrom(_cancelFD[0], (void *)&buffer, 1, 0, NULL,
 		    NULL) == 1);
 # endif
 	}
 #endif
 
@@ -258,11 +257,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 +270,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);