@@ -72,11 +72,11 @@
 	OFDNSResolverSettings *_settings;
 	size_t _nameServersIndex;
 	unsigned int _attempt;
 	id <OFDNSResolverQueryDelegate> _delegate;
 	OFData *_queryData;
-	of_socket_address_t _usedNameServer;
+	OFSocketAddress _usedNameServer;
 	OFTCPSocket *_TCPSocket;
 	OFMutableData *_TCPQueryData;
 	void *_TCPBuffer;
 	size_t _responseLength;
 	OFTimer *_cancelTimer;
@@ -171,17 +171,17 @@
 parseResourceRecord(OFString *name, of_dns_class_t DNSClass,
     of_dns_record_type_t recordType, uint32_t TTL, const unsigned char *buffer,
     size_t length, size_t i, uint16_t dataLength)
 {
 	if (recordType == OF_DNS_RECORD_TYPE_A && DNSClass == OF_DNS_CLASS_IN) {
-		of_socket_address_t address;
+		OFSocketAddress address;
 
 		if (dataLength != 4)
 			@throw [OFInvalidServerReplyException exception];
 
 		memset(&address, 0, sizeof(address));
-		address.family = OF_SOCKET_ADDRESS_FAMILY_IPV4;
+		address.family = OFSocketAddressFamilyIPv4;
 		address.length = sizeof(address.sockaddr.in);
 
 		address.sockaddr.in.sin_family = AF_INET;
 		memcpy(&address.sockaddr.in.sin_addr.s_addr, buffer + i, 4);
 
@@ -358,17 +358,17 @@
 			  mailbox: mailbox
 		    TXTDomainName: TXTDomainName
 			      TTL: TTL] autorelease];
 	} else if (recordType == OF_DNS_RECORD_TYPE_AAAA &&
 	    DNSClass == OF_DNS_CLASS_IN) {
-		of_socket_address_t address;
+		OFSocketAddress address;
 
 		if (dataLength != 16)
 			@throw [OFInvalidServerReplyException exception];
 
 		memset(&address, 0, sizeof(address));
-		address.family = OF_SOCKET_ADDRESS_FAMILY_IPV6;
+		address.family = OFSocketAddressFamilyIPv6;
 		address.length = sizeof(address.sockaddr.in6);
 
 #ifdef AF_INET6
 		address.sockaddr.in6.sin6_family = AF_INET6;
 #else
@@ -735,18 +735,18 @@
 						   port: 53
 					    runLoopMode: runLoopMode];
 		return;
 	}
 
-	context->_usedNameServer = of_socket_address_parse_ip(nameServer, 53);
+	context->_usedNameServer = OFSocketAddressParseIP(nameServer, 53);
 
 	switch (context->_usedNameServer.family) {
 #ifdef OF_HAVE_IPV6
-	case OF_SOCKET_ADDRESS_FAMILY_IPV6:
+	case OFSocketAddressFamilyIPv6:
 		if (_IPv6Socket == nil) {
-			of_socket_address_t address =
-			    of_socket_address_parse_ip(@"::", 0);
+			OFSocketAddress address =
+			    OFSocketAddressParseIPv6(@"::", 0);
 
 			_IPv6Socket = [[OFUDPSocket alloc] init];
 			[_IPv6Socket of_bindToAddress: &address
 					    extraType: SOCK_DNS];
 			_IPv6Socket.canBlock = false;
@@ -754,14 +754,14 @@
 		}
 
 		sock = _IPv6Socket;
 		break;
 #endif
-	case OF_SOCKET_ADDRESS_FAMILY_IPV4:
+	case OFSocketAddressFamilyIPv4:
 		if (_IPv4Socket == nil) {
-			of_socket_address_t address =
-			    of_socket_address_parse_ip(@"0.0.0.0", 0);
+			OFSocketAddress address =
+			    OFSocketAddressParseIPv4(@"0.0.0.0", 0);
 
 			_IPv4Socket = [[OFUDPSocket alloc] init];
 			[_IPv4Socket of_bindToAddress: &address
 					    extraType: SOCK_DNS];
 			_IPv4Socket.canBlock = false;
@@ -879,11 +879,11 @@
 			   exception: exception];
 }
 
 - (bool)of_handleResponseBuffer: (unsigned char *)buffer
 			 length: (size_t)length
-			 sender: (const of_socket_address_t *)sender
+			 sender: (const OFSocketAddress *)sender
 {
 	OFDictionary *answerRecords = nil, *authorityRecords = nil;
 	OFDictionary *additionalRecords = nil;
 	OFDNSResponse *response = nil;
 	id exception = nil;
@@ -901,11 +901,11 @@
 		return true;
 
 	if (context->_TCPSocket != nil) {
 		if ([_TCPQueries objectForKey: context->_TCPSocket] != context)
 			return true;
-	} else if (!of_socket_address_equal(sender, &context->_usedNameServer))
+	} else if (!OFSocketAddressEqual(sender, &context->_usedNameServer))
 		return true;
 
 	[context->_cancelTimer invalidate];
 	[context->_cancelTimer release];
 	context->_cancelTimer = nil;
@@ -1041,11 +1041,11 @@
 }
 
 -	  (bool)socket: (OFDatagramSocket *)sock
   didReceiveIntoBuffer: (void *)buffer
 		length: (size_t)length
-		sender: (const of_socket_address_t *)sender
+		sender: (const OFSocketAddress *)sender
 	     exception: (id)exception
 {
 	if (exception != nil)
 		return true;
 
@@ -1179,11 +1179,11 @@
 
 - (void)asyncResolveAddressesForHost: (OFString *)host
 			    delegate: (id <OFDNSResolverHostDelegate>)delegate
 {
 	[self asyncResolveAddressesForHost: host
-			     addressFamily: OF_SOCKET_ADDRESS_FAMILY_ANY
+			     addressFamily: OFSocketAddressFamilyAny
 			       runLoopMode: OFDefaultRunLoopMode
 				  delegate: delegate];
 }
 
 - (void)asyncResolveAddressesForHost: (OFString *)host