@@ -178,16 +178,16 @@
 
 - (void)asyncReceiveIntoBuffer: (void *)buffer length: (size_t)length
 {
 	[self asyncReceiveIntoBuffer: buffer
 			      length: length
-			 runLoopMode: of_run_loop_mode_default];
+			 runLoopMode: OFDefaultRunLoopMode];
 }
 
 - (void)asyncReceiveIntoBuffer: (void *)buffer
 			length: (size_t)length
-		   runLoopMode: (of_run_loop_mode_t)runLoopMode
+		   runLoopMode: (OFRunLoopMode)runLoopMode
 {
 	[OFRunLoop of_addAsyncReceiveForSequencedPacketSocket: self
 						       buffer: buffer
 						       length: length
 							 mode: runLoopMode
@@ -202,18 +202,18 @@
 			length: (size_t)length
 			 block: (OFSequencedPacketSocketAsyncReceiveBlock)block
 {
 	[self asyncReceiveIntoBuffer: buffer
 			      length: length
-			 runLoopMode: of_run_loop_mode_default
+			 runLoopMode: OFDefaultRunLoopMode
 			       block: block];
 }
 
 - (void)
     asyncReceiveIntoBuffer: (void *)buffer
 		    length: (size_t)length
-	       runLoopMode: (of_run_loop_mode_t)runLoopMode
+	       runLoopMode: (OFRunLoopMode)runLoopMode
 		     block: (OFSequencedPacketSocketAsyncReceiveBlock)block
 {
 	[OFRunLoop of_addAsyncReceiveForSequencedPacketSocket: self
 						       buffer: buffer
 						       length: length
@@ -261,15 +261,14 @@
 							     errNo: 0];
 }
 
 - (void)asyncSendData: (OFData *)data
 {
-	[self asyncSendData: data runLoopMode: of_run_loop_mode_default];
+	[self asyncSendData: data runLoopMode: OFDefaultRunLoopMode];
 }
 
-- (void)asyncSendData: (OFData *)data
-	  runLoopMode: (of_run_loop_mode_t)runLoopMode
+- (void)asyncSendData: (OFData *)data runLoopMode: (OFRunLoopMode)runLoopMode
 {
 	[OFRunLoop of_addAsyncSendForSequencedPacketSocket: self
 						      data: data
 						      mode: runLoopMode
 # ifdef OF_HAVE_BLOCKS
@@ -281,16 +280,16 @@
 #ifdef OF_HAVE_BLOCKS
 - (void)asyncSendData: (OFData *)data
 		block: (OFSequencedPacketSocketAsyncSendDataBlock)block
 {
 	[self asyncSendData: data
-		runLoopMode: of_run_loop_mode_default
+		runLoopMode: OFDefaultRunLoopMode
 		      block: block];
 }
 
 - (void)asyncSendData: (OFData *)data
-	  runLoopMode: (of_run_loop_mode_t)runLoopMode
+	  runLoopMode: (OFRunLoopMode)runLoopMode
 		block: (OFSequencedPacketSocketAsyncSendDataBlock)block
 {
 	[OFRunLoop of_addAsyncSendForSequencedPacketSocket: self
 						      data: data
 						      mode: runLoopMode
@@ -386,14 +385,14 @@
 	return client;
 }
 
 - (void)asyncAccept
 {
-	[self asyncAcceptWithRunLoopMode: of_run_loop_mode_default];
+	[self asyncAcceptWithRunLoopMode: OFDefaultRunLoopMode];
 }
 
-- (void)asyncAcceptWithRunLoopMode: (of_run_loop_mode_t)runLoopMode
+- (void)asyncAcceptWithRunLoopMode: (OFRunLoopMode)runLoopMode
 {
 	[OFRunLoop of_addAsyncAcceptForSocket: self
 					 mode: runLoopMode
 					block: NULL
 				     delegate: _delegate];
@@ -400,16 +399,15 @@
 }
 
 #ifdef OF_HAVE_BLOCKS
 - (void)asyncAcceptWithBlock: (OFSequencedPacketSocketAsyncAcceptBlock)block
 {
-	[self asyncAcceptWithRunLoopMode: of_run_loop_mode_default
-				   block: block];
+	[self asyncAcceptWithRunLoopMode: OFDefaultRunLoopMode block: block];
 }
 
 - (void)
-    asyncAcceptWithRunLoopMode: (of_run_loop_mode_t)runLoopMode
+    asyncAcceptWithRunLoopMode: (OFRunLoopMode)runLoopMode
 			 block: (OFSequencedPacketSocketAsyncAcceptBlock)block
 {
 	[OFRunLoop of_addAsyncAcceptForSocket: self
 					 mode: runLoopMode
 					block: block
@@ -432,11 +430,11 @@
 }
 
 - (void)cancelAsyncRequests
 {
 	[OFRunLoop of_cancelAsyncRequestsForObject: self
-					      mode: of_run_loop_mode_default];
+					      mode: OFDefaultRunLoopMode];
 }
 
 - (int)fileDescriptorForReading
 {
 #ifndef OF_WINDOWS