@@ -198,16 +198,16 @@
 #ifdef OF_HAVE_SOCKETS
 - (void)asyncReadIntoBuffer: (void *)buffer length: (size_t)length
 {
 	[self asyncReadIntoBuffer: buffer
 			   length: length
-		      runLoopMode: of_run_loop_mode_default];
+		      runLoopMode: OFDefaultRunLoopMode];
 }
 
 - (void)asyncReadIntoBuffer: (void *)buffer
 		     length: (size_t)length
-		runLoopMode: (of_run_loop_mode_t)runLoopMode
+		runLoopMode: (OFRunLoopMode)runLoopMode
 {
 	OFStream <OFReadyForReadingObserving> *stream =
 	    (OFStream <OFReadyForReadingObserving> *)self;
 
 	[OFRunLoop of_addAsyncReadForStream: stream
@@ -222,16 +222,16 @@
 
 - (void)asyncReadIntoBuffer: (void *)buffer exactLength: (size_t)length
 {
 	[self asyncReadIntoBuffer: buffer
 		      exactLength: length
-		      runLoopMode: of_run_loop_mode_default];
+		      runLoopMode: OFDefaultRunLoopMode];
 }
 
 - (void)asyncReadIntoBuffer: (void *)buffer
 		exactLength: (size_t)length
-		runLoopMode: (of_run_loop_mode_t)runLoopMode
+		runLoopMode: (OFRunLoopMode)runLoopMode
 {
 	OFStream <OFReadyForReadingObserving> *stream =
 	    (OFStream <OFReadyForReadingObserving> *)self;
 
 	[OFRunLoop of_addAsyncReadForStream: stream
@@ -249,17 +249,17 @@
 		     length: (size_t)length
 		      block: (OFStreamAsyncReadBlock)block
 {
 	[self asyncReadIntoBuffer: buffer
 			   length: length
-		      runLoopMode: of_run_loop_mode_default
+		      runLoopMode: OFDefaultRunLoopMode
 			    block: block];
 }
 
 - (void)asyncReadIntoBuffer: (void *)buffer
 		     length: (size_t)length
-		runLoopMode: (of_run_loop_mode_t)runLoopMode
+		runLoopMode: (OFRunLoopMode)runLoopMode
 		      block: (OFStreamAsyncReadBlock)block
 {
 	OFStream <OFReadyForReadingObserving> *stream =
 	    (OFStream <OFReadyForReadingObserving> *)self;
 
@@ -275,17 +275,17 @@
 		exactLength: (size_t)length
 		      block: (OFStreamAsyncReadBlock)block
 {
 	[self asyncReadIntoBuffer: buffer
 		      exactLength: length
-		      runLoopMode: of_run_loop_mode_default
+		      runLoopMode: OFDefaultRunLoopMode
 			    block: block];
 }
 
 - (void)asyncReadIntoBuffer: (void *)buffer
 		exactLength: (size_t)length
-		runLoopMode: (of_run_loop_mode_t)runLoopMode
+		runLoopMode: (OFRunLoopMode)runLoopMode
 		      block: (OFStreamAsyncReadBlock)block
 {
 	OFStream <OFReadyForReadingObserving> *stream =
 	    (OFStream <OFReadyForReadingObserving> *)self;
 
@@ -807,21 +807,21 @@
 
 #ifdef OF_HAVE_SOCKETS
 - (void)asyncReadLine
 {
 	[self asyncReadLineWithEncoding: OFStringEncodingUTF8
-			    runLoopMode: of_run_loop_mode_default];
+			    runLoopMode: OFDefaultRunLoopMode];
 }
 
 - (void)asyncReadLineWithEncoding: (OFStringEncoding)encoding
 {
 	[self asyncReadLineWithEncoding: encoding
-			    runLoopMode: of_run_loop_mode_default];
+			    runLoopMode: OFDefaultRunLoopMode];
 }
 
 - (void)asyncReadLineWithEncoding: (OFStringEncoding)encoding
-		      runLoopMode: (of_run_loop_mode_t)runLoopMode
+		      runLoopMode: (OFRunLoopMode)runLoopMode
 {
 	OFStream <OFReadyForReadingObserving> *stream =
 	    (OFStream <OFReadyForReadingObserving> *)self;
 
 	[OFRunLoop of_addAsyncReadLineForStream: stream
@@ -835,24 +835,24 @@
 
 # ifdef OF_HAVE_BLOCKS
 - (void)asyncReadLineWithBlock: (OFStreamAsyncReadLineBlock)block
 {
 	[self asyncReadLineWithEncoding: OFStringEncodingUTF8
-			    runLoopMode: of_run_loop_mode_default
+			    runLoopMode: OFDefaultRunLoopMode
 				  block: block];
 }
 
 - (void)asyncReadLineWithEncoding: (OFStringEncoding)encoding
 			    block: (OFStreamAsyncReadLineBlock)block
 {
 	[self asyncReadLineWithEncoding: encoding
-			    runLoopMode: of_run_loop_mode_default
+			    runLoopMode: OFDefaultRunLoopMode
 				  block: block];
 }
 
 - (void)asyncReadLineWithEncoding: (OFStringEncoding)encoding
-		      runLoopMode: (of_run_loop_mode_t)runLoopMode
+		      runLoopMode: (OFRunLoopMode)runLoopMode
 			    block: (OFStreamAsyncReadLineBlock)block
 {
 	OFStream <OFReadyForReadingObserving> *stream =
 	    (OFStream <OFReadyForReadingObserving> *)self;
 
@@ -1094,15 +1094,14 @@
 }
 
 #ifdef OF_HAVE_SOCKETS
 - (void)asyncWriteData: (OFData *)data
 {
-	[self asyncWriteData: data runLoopMode: of_run_loop_mode_default];
+	[self asyncWriteData: data runLoopMode: OFDefaultRunLoopMode];
 }
 
-- (void)asyncWriteData: (OFData *)data
-	   runLoopMode: (of_run_loop_mode_t)runLoopMode
+- (void)asyncWriteData: (OFData *)data runLoopMode: (OFRunLoopMode)runLoopMode
 {
 	OFStream <OFReadyForWritingObserving> *stream =
 	    (OFStream <OFReadyForWritingObserving> *)self;
 
 	[OFRunLoop of_addAsyncWriteForStream: stream
@@ -1116,24 +1115,24 @@
 
 - (void)asyncWriteString: (OFString *)string
 {
 	[self asyncWriteString: string
 		      encoding: OFStringEncodingUTF8
-		   runLoopMode: of_run_loop_mode_default];
+		   runLoopMode: OFDefaultRunLoopMode];
 }
 
 - (void)asyncWriteString: (OFString *)string
 		encoding: (OFStringEncoding)encoding
 {
 	[self asyncWriteString: string
 		      encoding: encoding
-		   runLoopMode: of_run_loop_mode_default];
+		   runLoopMode: OFDefaultRunLoopMode];
 }
 
 - (void)asyncWriteString: (OFString *)string
 		encoding: (OFStringEncoding)encoding
-	     runLoopMode: (of_run_loop_mode_t)runLoopMode
+	     runLoopMode: (OFRunLoopMode)runLoopMode
 {
 	OFStream <OFReadyForWritingObserving> *stream =
 	    (OFStream <OFReadyForWritingObserving> *)self;
 
 	[OFRunLoop of_addAsyncWriteForStream: stream
@@ -1148,16 +1147,16 @@
 
 # ifdef OF_HAVE_BLOCKS
 - (void)asyncWriteData: (OFData *)data block: (OFStreamAsyncWriteDataBlock)block
 {
 	[self asyncWriteData: data
-		 runLoopMode: of_run_loop_mode_default
+		 runLoopMode: OFDefaultRunLoopMode
 		       block: block];
 }
 
 - (void)asyncWriteData: (OFData *)data
-	   runLoopMode: (of_run_loop_mode_t)runLoopMode
+	   runLoopMode: (OFRunLoopMode)runLoopMode
 		 block: (OFStreamAsyncWriteDataBlock)block
 {
 	OFStream <OFReadyForWritingObserving> *stream =
 	    (OFStream <OFReadyForWritingObserving> *)self;
 
@@ -1171,27 +1170,27 @@
 - (void)asyncWriteString: (OFString *)string
 		   block: (OFStreamAsyncWriteStringBlock)block
 {
 	[self asyncWriteString: string
 		      encoding: OFStringEncodingUTF8
-		   runLoopMode: of_run_loop_mode_default
+		   runLoopMode: OFDefaultRunLoopMode
 			 block: block];
 }
 
 - (void)asyncWriteString: (OFString *)string
 		encoding: (OFStringEncoding)encoding
 		   block: (OFStreamAsyncWriteStringBlock)block
 {
 	[self asyncWriteString: string
 		      encoding: encoding
-		   runLoopMode: of_run_loop_mode_default
+		   runLoopMode: OFDefaultRunLoopMode
 			 block: block];
 }
 
 - (void)asyncWriteString: (OFString *)string
 		encoding: (OFStringEncoding)encoding
-	     runLoopMode: (of_run_loop_mode_t)runLoopMode
+	     runLoopMode: (OFRunLoopMode)runLoopMode
 		   block: (OFStreamAsyncWriteStringBlock)block
 {
 	OFStream <OFReadyForWritingObserving> *stream =
 	    (OFStream <OFReadyForWritingObserving> *)self;
 
@@ -1729,11 +1728,11 @@
 
 #ifdef OF_HAVE_SOCKETS
 - (void)cancelAsyncRequests
 {
 	[OFRunLoop of_cancelAsyncRequestsForObject: self
-					      mode: of_run_loop_mode_default];
+					      mode: OFDefaultRunLoopMode];
 }
 #endif
 
 - (void)unreadFromBuffer: (const void *)buffer length: (size_t)length
 {