@@ -12,13 +12,12 @@
  * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
  * file.
  */
 
 #import "OFObject.h"
-
 #ifdef OF_HAVE_SOCKETS
-# import "socket.h"
+# import "OFSocket.h"
 #endif
 
 #ifdef OF_AMIGAOS
 # include <exec/types.h>
 # include <exec/tasks.h>
@@ -126,11 +125,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
@@ -211,11 +210,11 @@
  * @brief Observes all objects until an event happens on an object or the
  *	  timeout is reached.
  *
  * @param timeInterval The time to wait for an event, in seconds
  */
-- (void)observeForTimeInterval: (of_time_interval_t)timeInterval;
+- (void)observeForTimeInterval: (OFTimeInterval)timeInterval;
 
 /**
  * @brief Observes all objects until an event happens on an object or the
  *	  specified date is reached.
  *