@@ -34,13 +34,13 @@
 #endif
 
 #define SPX_PACKET_TYPE 5
 
 @interface OFSPXSocket ()
-- (int)of_createSocketForAddress: (const of_socket_address_t *)address
+- (int)of_createSocketForAddress: (const OFSocketAddress *)address
 			   errNo: (int *)errNo;
-- (bool)of_connectSocketToAddress: (const of_socket_address_t *)address
+- (bool)of_connectSocketToAddress: (const OFSocketAddress *)address
 			    errNo: (int *)errNo;
 - (void)of_closeSocket;
 @end
 
 OF_DIRECT_MEMBERS
@@ -103,12 +103,12 @@
 	[super dealloc];
 }
 
 - (void)startWithRunLoopMode: (OFRunLoopMode)runLoopMode
 {
-	of_socket_address_t address =
-	    of_socket_address_ipx(_node, _network, _port);
+	OFSocketAddress address =
+	    OFSocketAddressMakeIPX(_node, _network, _port);
 	id exception = nil;
 	int errNo;
 
 	if (![_socket of_createSocketForAddress: &address errNo: &errNo]) {
 		exception = [self of_connectionFailedExceptionForErrNo: errNo];
@@ -172,11 +172,11 @@
 @end
 
 @implementation OFSPXSocket
 @dynamic delegate;
 
-- (int)of_createSocketForAddress: (const of_socket_address_t *)address
+- (int)of_createSocketForAddress: (const OFSocketAddress *)address
 			   errNo: (int *)errNo
 {
 #if SOCK_CLOEXEC == 0 && defined(HAVE_FCNTL) && defined(FD_CLOEXEC)
 	int flags;
 #endif
@@ -196,11 +196,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];
 
@@ -221,12 +221,11 @@
 
 - (void)connectToNode: (unsigned char [_Nonnull IPX_NODE_LEN])node
 	      network: (uint32_t)network
 		 port: (uint16_t)port
 {
-	of_socket_address_t address =
-	    of_socket_address_ipx(node, network, port);
+	OFSocketAddress address = OFSocketAddressMakeIPX(node, network, port);
 	int errNo;
 
 	if (![self of_createSocketForAddress: &address errNo: &errNo])
 		@throw [OFConnectionFailedException
 		    exceptionWithNode: node
@@ -308,22 +307,22 @@
 
 	objc_autoreleasePoolPop(pool);
 }
 #endif
 
-- (of_socket_address_t)bindToPort: (uint16_t)port
+- (OFSocketAddress)bindToPort: (uint16_t)port
 {
 	const unsigned char zeroNode[IPX_NODE_LEN] = { 0 };
-	of_socket_address_t address;
+	OFSocketAddress address;
 #if SOCK_CLOEXEC == 0 && defined(HAVE_FCNTL_H) && defined(FD_CLOEXEC)
 	int flags;
 #endif
 
 	if (_socket != INVALID_SOCKET)
 		@throw [OFAlreadyConnectedException exceptionWithSocket: self];
 
-	address = of_socket_address_ipx(zeroNode, 0, port);
+	address = OFSocketAddressMakeIPX(zeroNode, 0, port);
 
 	if ((_socket = socket(address.sockaddr.sockaddr.sa_family,
 	    SOCK_SEQPACKET | SOCK_CLOEXEC, NSPROTO_SPX)) == INVALID_SOCKET)
 		@throw [OFBindFailedException
 		    exceptionWithPort: port
@@ -349,11 +348,11 @@
 							 socket: self
 							  errNo: errNo];
 	}
 
 	memset(&address, 0, sizeof(address));
-	address.family = OF_SOCKET_ADDRESS_FAMILY_IPX;
+	address.family = OFSocketAddressFamilyIPX;
 	address.length = (socklen_t)sizeof(address.sockaddr);
 
 	if (of_getsockname(_socket, &address.sockaddr.sockaddr,
 	    &address.length) != 0) {
 		int errNo = of_socket_errno();