@@ -14,12 +14,11 @@
  */
 
 #import "OFObject.h"
 #import "OFDNSResolver.h"
 #import "OFRunLoop.h"
-
-#import "socket.h"
+#import "OFSocket.h"
 
 OF_ASSUME_NONNULL_BEGIN
 
 @class OFDNSResolverSettings;
 @class OFDNSResourceRecord;
@@ -28,27 +27,27 @@
 @class OFString;
 
 @interface OFHostAddressResolver: OFObject <OFDNSResolverQueryDelegate>
 {
 	OFString *_host;
-	of_socket_address_family_t _addressFamily;
+	OFSocketAddressFamily _addressFamily;
 	OFDNSResolver *_resolver;
 	OFDNSResolverSettings *_settings;
-	of_run_loop_mode_t _Nullable _runLoopMode;
+	OFRunLoopMode _Nullable _runLoopMode;
 	id <OFDNSResolverHostDelegate> _Nullable _delegate;
 	bool _isFQDN;
 	size_t _searchDomainIndex;
 	unsigned int _numExpectedResponses;
 	OFMutableData *_addresses;
 }
 
 - (instancetype)initWithHost: (OFString *)host
-	       addressFamily: (of_socket_address_family_t)addressFamily
+	       addressFamily: (OFSocketAddressFamily)addressFamily
 		    resolver: (OFDNSResolver *)resolver
 		    settings: (OFDNSResolverSettings *)settings
-		 runLoopMode: (nullable of_run_loop_mode_t)runLoopMode
+		 runLoopMode: (nullable OFRunLoopMode)runLoopMode
 		    delegate: (nullable id <OFDNSResolverHostDelegate>)delegate;
 - (void)asyncResolve;
 - (OFData *)resolve;
 @end
 
 OF_ASSUME_NONNULL_END