@@ -70,19 +70,17 @@
 		[_socket setCanBlock: true];
 
 #ifdef OF_HAVE_BLOCKS
 	if (_block != NULL) {
 		if ([_socket isKindOfClass: [OFTCPSocket class]])
-			((of_tcp_socket_async_connect_block_t)_block)(
-			    _exception);
+			((OFTCPSocketAsyncConnectBlock)_block)(_exception);
 # ifdef OF_HAVE_SCTP
 		else if ([_socket isKindOfClass: [OFSCTPSocket class]])
-			((of_sctp_socket_async_connect_block_t)_block)(
-			    _exception);
+			((OFSCTPSocketAsyncConnectBlock)_block)(_exception);
 # endif
 		else
-			OF_ENSURE(0);
+			OFEnsure(0);
 	} else {
 #endif
 		if ([_delegate respondsToSelector:
 		    @selector(socket:didConnectToHost:port:exception:)])
 			[_delegate socket: _socket
@@ -139,17 +137,17 @@
 							 port: _port
 						       socket: _socket
 							errNo: errNo];
 }
 
-- (void)tryNextAddressWithRunLoopMode: (of_run_loop_mode_t)runLoopMode
+- (void)tryNextAddressWithRunLoopMode: (OFRunLoopMode)runLoopMode
 {
-	of_socket_address_t address = *(const of_socket_address_t *)
+	OFSocketAddress address = *(const OFSocketAddress *)
 	    [_socketAddresses itemAtIndex: _socketAddressesIndex++];
 	int errNo;
 
-	of_socket_address_set_port(&address, _port);
+	OFSocketAddressSetPort(&address, _port);
 
 	if (![_socket of_createSocketForAddress: &address errNo: &errNo]) {
 		if (_socketAddressesIndex >= _socketAddresses.count) {
 			_exception = [[OFConnectionFailedException alloc]
 			    initWithHost: _host
@@ -230,15 +228,14 @@
 
 	[self tryNextAddressWithRunLoopMode:
 	    [OFRunLoop currentRunLoop].currentMode];
 }
 
-- (void)startWithRunLoopMode: (of_run_loop_mode_t)runLoopMode
+- (void)startWithRunLoopMode: (OFRunLoopMode)runLoopMode
 {
 	@try {
-		of_socket_address_t address =
-		    of_socket_address_parse_ip(_host, _port);
+		OFSocketAddress address = OFSocketAddressParseIP(_host, _port);
 
 		_socketAddresses = [[OFData alloc]
 		    initWithItems: &address
 			    count: 1
 			 itemSize: sizeof(address)];
@@ -248,10 +245,10 @@
 	} @catch (OFInvalidFormatException *e) {
 	}
 
 	[[OFThread DNSResolver]
 	    asyncResolveAddressesForHost: _host
-			   addressFamily: OF_SOCKET_ADDRESS_FAMILY_ANY
+			   addressFamily: OFSocketAddressFamilyAny
 			     runLoopMode: runLoopMode
 				delegate: self];
 }
 @end