@@ -134,11 +134,11 @@
 	[_SOCKS5Host release];
 
 	[super dealloc];
 }
 
-- (bool)of_createSocketForAddress: (const of_socket_address_t *)address
+- (bool)of_createSocketForAddress: (const OFSocketAddress *)address
 			    errNo: (int *)errNo
 {
 #if SOCK_CLOEXEC == 0 && defined(HAVE_FCNTL) && defined(FD_CLOEXEC)
 	int flags;
 #endif
@@ -158,11 +158,11 @@
 #endif
 
 	return true;
 }
 
-- (bool)of_connectSocketToAddress: (const of_socket_address_t *)address
+- (bool)of_connectSocketToAddress: (const OFSocketAddress *)address
 			    errNo: (int *)errNo
 {
 	if (_socket == INVALID_SOCKET)
 		@throw [OFNotOpenException exceptionWithObject: self];
 
@@ -300,11 +300,11 @@
 - (uint16_t)bindToHost: (OFString *)host port: (uint16_t)port
 {
 	const int one = 1;
 	void *pool = objc_autoreleasePoolPush();
 	OFData *socketAddresses;
-	of_socket_address_t address;
+	OFSocketAddress address;
 #if SOCK_CLOEXEC == 0 && defined(HAVE_FCNTL) && defined(FD_CLOEXEC)
 	int flags;
 #endif
 
 	if (_socket != INVALID_SOCKET)
@@ -314,14 +314,14 @@
 		@throw [OFNotImplementedException exceptionWithSelector: _cmd
 								 object: self];
 
 	socketAddresses = [[OFThread DNSResolver]
 	    resolveAddressesForHost: host
-		      addressFamily: OF_SOCKET_ADDRESS_FAMILY_ANY];
+		      addressFamily: OFSocketAddressFamilyAny];
 
-	address = *(of_socket_address_t *)[socketAddresses itemAtIndex: 0];
-	of_socket_address_set_port(&address, port);
+	address = *(OFSocketAddress *)[socketAddresses itemAtIndex: 0];
+	OFSocketAddressSetPort(&address, port);
 
 	if ((_socket = socket(address.sockaddr.sockaddr.sa_family,
 	    SOCK_STREAM | SOCK_CLOEXEC, 0)) == INVALID_SOCKET)
 		@throw [OFBindFailedException
 		    exceptionWithHost: host
@@ -361,11 +361,11 @@
 			int ret;
 
 			while (rnd < 1024)
 				rnd = (uint16_t)rand();
 
-			of_socket_address_set_port(&address, rnd);
+			OFSocketAddressSetPort(&address, rnd);
 
 			if ((ret = bind(_socket, &address.sockaddr.sockaddr,
 			    address.length)) == 0) {
 				port = rnd;
 				break;