@@ -165,11 +165,11 @@
 #endif
 }
 
 - (size_t)receiveIntoBuffer: (void *)buffer
 		     length: (size_t)length
-		     sender: (of_socket_address_t *)sender
+		     sender: (OFSocketAddress *)sender
 {
 	ssize_t ret;
 
 	if (_socket == INVALID_SOCKET)
 		@throw [OFNotOpenException exceptionWithObject: self];
@@ -195,24 +195,24 @@
 				  errNo: of_socket_errno()];
 #endif
 
 	switch (sender->sockaddr.sockaddr.sa_family) {
 	case AF_INET:
-		sender->family = OF_SOCKET_ADDRESS_FAMILY_IPV4;
+		sender->family = OFSocketAddressFamilyIPv4;
 		break;
 #ifdef OF_HAVE_IPV6
 	case AF_INET6:
-		sender->family = OF_SOCKET_ADDRESS_FAMILY_IPV6;
+		sender->family = OFSocketAddressFamilyIPv6;
 		break;
 #endif
 #ifdef OF_HAVE_IPX
 	case AF_IPX:
-		sender->family = OF_SOCKET_ADDRESS_FAMILY_IPX;
+		sender->family = OFSocketAddressFamilyIPX;
 		break;
 #endif
 	default:
-		sender->family = OF_SOCKET_ADDRESS_FAMILY_UNKNOWN;
+		sender->family = OFSocketAddressFamilyUnknown;
 		break;
 	}
 
 	return ret;
 }
@@ -263,11 +263,11 @@
 }
 #endif
 
 - (void)sendBuffer: (const void *)buffer
 	    length: (size_t)length
-	  receiver: (const of_socket_address_t *)receiver
+	  receiver: (const OFSocketAddress *)receiver
 {
 	if (_socket == INVALID_SOCKET)
 		@throw [OFNotOpenException exceptionWithObject: self];
 
 #ifndef OF_WINDOWS
@@ -305,19 +305,19 @@
 						      bytesWritten: bytesWritten
 							     errNo: 0];
 }
 
 - (void)asyncSendData: (OFData *)data
-	     receiver: (const of_socket_address_t *)receiver
+	     receiver: (const OFSocketAddress *)receiver
 {
 	[self asyncSendData: data
 		   receiver: receiver
 		runLoopMode: OFDefaultRunLoopMode];
 }
 
 - (void)asyncSendData: (OFData *)data
-	     receiver: (const of_socket_address_t *)receiver
+	     receiver: (const OFSocketAddress *)receiver
 	  runLoopMode: (OFRunLoopMode)runLoopMode
 {
 	[OFRunLoop of_addAsyncSendForDatagramSocket: self
 					       data: data
 					   receiver: receiver
@@ -328,21 +328,21 @@
 					   delegate: _delegate];
 }
 
 #ifdef OF_HAVE_BLOCKS
 - (void)asyncSendData: (OFData *)data
-	     receiver: (const of_socket_address_t *)receiver
+	     receiver: (const OFSocketAddress *)receiver
 		block: (OFDatagramSocketAsyncSendDataBlock)block
 {
 	[self asyncSendData: data
 		   receiver: receiver
 		runLoopMode: OFDefaultRunLoopMode
 		      block: block];
 }
 
 - (void)asyncSendData: (OFData *)data
-	     receiver: (const of_socket_address_t *)receiver
+	     receiver: (const OFSocketAddress *)receiver
 	  runLoopMode: (OFRunLoopMode)runLoopMode
 		block: (OFDatagramSocketAsyncSendDataBlock)block
 {
 	[OFRunLoop of_addAsyncSendForDatagramSocket: self
 					       data: data