@@ -698,11 +698,11 @@
 {
 	_settings->_configReloadInterval = configReloadInterval;
 }
 
 - (void)of_sendQueryForContext: (OFDNSResolverContext *)context
-		   runLoopMode: (of_run_loop_mode_t)runLoopMode
+		   runLoopMode: (OFRunLoopMode)runLoopMode
 {
 	OFUDPSocket *sock;
 	OFString *nameServer;
 
 	[_queries setObject: context forKey: context->_ID];
@@ -784,16 +784,16 @@
 
 - (void)asyncPerformQuery: (OFDNSQuery *)query
 		 delegate: (id <OFDNSResolverQueryDelegate>)delegate
 {
 	[self asyncPerformQuery: query
-		    runLoopMode: of_run_loop_mode_default
+		    runLoopMode: OFDefaultRunLoopMode
 		       delegate: delegate];
 }
 
 - (void)asyncPerformQuery: (OFDNSQuery *)query
-	      runLoopMode: (of_run_loop_mode_t)runLoopMode
+	      runLoopMode: (OFRunLoopMode)runLoopMode
 		 delegate: (id <OFDNSResolverQueryDelegate>)delegate
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFNumber *ID;
 	OFDNSResolverContext *context;
@@ -827,11 +827,11 @@
 	objc_autoreleasePoolPop(pool);
 }
 
 - (void)of_contextTimedOut: (OFDNSResolverContext *)context
 {
-	of_run_loop_mode_t runLoopMode = [OFRunLoop currentRunLoop].currentMode;
+	OFRunLoopMode runLoopMode = [OFRunLoop currentRunLoop].currentMode;
 	OFDNSQueryFailedException *exception;
 
 	if (context->_TCPSocket != nil) {
 		context->_TCPSocket.delegate = nil;
 		[context->_TCPSocket cancelAsyncRequests];
@@ -936,11 +936,11 @@
 		if ((buffer[2] & 0x78) != (queryDataBuffer[2] & 0x78))
 			@throw [OFInvalidServerReplyException exception];
 
 		/* TC */
 		if (buffer[2] & 0x02) {
-			of_run_loop_mode_t runLoopMode;
+			OFRunLoopMode runLoopMode;
 
 			if (context->_settings->_usesTCP)
 				@throw [OFTruncatedDataException exception];
 
 			context->_settings->_usesTCP = true;
@@ -979,11 +979,11 @@
 		}
 
 		if (tryNextNameServer) {
 			if (context->_nameServersIndex + 1 <
 			    context->_settings->_nameServers.count) {
-				of_run_loop_mode_t runLoopMode =
+				OFRunLoopMode runLoopMode =
 				    [OFRunLoop currentRunLoop].currentMode;
 
 				context->_nameServersIndex++;
 
 				[self of_sendQueryForContext: context
@@ -1180,27 +1180,27 @@
 - (void)asyncResolveAddressesForHost: (OFString *)host
 			    delegate: (id <OFDNSResolverHostDelegate>)delegate
 {
 	[self asyncResolveAddressesForHost: host
 			     addressFamily: OF_SOCKET_ADDRESS_FAMILY_ANY
-			       runLoopMode: of_run_loop_mode_default
+			       runLoopMode: OFDefaultRunLoopMode
 				  delegate: delegate];
 }
 
 - (void)asyncResolveAddressesForHost: (OFString *)host
 		       addressFamily: (of_socket_address_family_t)addressFamily
 			    delegate: (id <OFDNSResolverHostDelegate>)delegate
 {
 	[self asyncResolveAddressesForHost: host
 			     addressFamily: addressFamily
-			       runLoopMode: of_run_loop_mode_default
+			       runLoopMode: OFDefaultRunLoopMode
 				  delegate: delegate];
 }
 
 - (void)asyncResolveAddressesForHost: (OFString *)host
 		       addressFamily: (of_socket_address_family_t)addressFamily
-			 runLoopMode: (of_run_loop_mode_t)runLoopMode
+			 runLoopMode: (OFRunLoopMode)runLoopMode
 			    delegate: (id <OFDNSResolverHostDelegate>)delegate
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFHostAddressResolver *resolver = [[[OFHostAddressResolver alloc]
 	    initWithHost: host