@@ -121,11 +121,11 @@
 # ifdef OF_HAVE_BLOCKS
 	of_udp_socket_async_send_block_t _block;
 # endif
 	const void *_buffer;
 	size_t _length;
-	of_udp_socket_address_t _receiver;
+	of_socket_address_t _receiver;
 }
 @end
 
 @implementation OFRunLoop_QueueItem
 - (bool)handleObject: (id)object
@@ -376,11 +376,11 @@
 
 @implementation OFRunLoop_UDPReceiveQueueItem
 - (bool)handleObject: (id)object
 {
 	size_t length;
-	of_udp_socket_address_t address;
+	of_socket_address_t address;
 	id exception = nil;
 
 	@try {
 		length = [object receiveIntoBuffer: _buffer
 					    length: _length
@@ -394,13 +394,13 @@
 	if (_block != NULL)
 		return _block(object, _buffer, length, address, exception);
 	else {
 # endif
 		bool (*func)(id, SEL, OFUDPSocket *, void *, size_t,
-		    of_udp_socket_address_t, id, id) =
+		    of_socket_address_t, id, id) =
 		    (bool (*)(id, SEL, OFUDPSocket *, void *, size_t,
-		    of_udp_socket_address_t, id, id))
+		    of_socket_address_t, id, id))
 		    [_target methodForSelector: _selector];
 
 		return func(_target, _selector, object, _buffer, length,
 		    address, _context, exception);
 # ifdef OF_HAVE_BLOCKS
@@ -438,13 +438,13 @@
 
 		return (_length > 0);
 	} else {
 # endif
 		size_t (*func)(id, SEL, OFUDPSocket *, const void *, size_t,
-		    of_udp_socket_address_t *, id, id) =
+		    of_socket_address_t *, id, id) =
 		    (size_t (*)(id, SEL, OFUDPSocket *, const void *, size_t,
-		    of_udp_socket_address_t *, id, id))
+		    of_socket_address_t *, id, id))
 		    [_target methodForSelector: _selector];
 
 		_length = func(_target, _selector, object, &_buffer,
 		    (exception == nil ? _length : 0), &_receiver, _context,
 		    exception);
@@ -625,11 +625,11 @@
 }
 
 + (void)of_addAsyncSendForUDPSocket: (OFUDPSocket *)sock
 			     buffer: (const void *)buffer
 			     length: (size_t)length
-			   receiver: (of_udp_socket_address_t)receiver
+			   receiver: (of_socket_address_t)receiver
 			     target: (id)target
 			   selector: (SEL)selector
 			    context: (id)context
 {
 	ADD_WRITE(OFRunLoop_UDPSendQueueItem, sock, {
@@ -715,11 +715,11 @@
 }
 
 + (void)of_addAsyncSendForUDPSocket: (OFUDPSocket *)sock
 			     buffer: (const void *)buffer
 			     length: (size_t)length
-			   receiver: (of_udp_socket_address_t)receiver
+			   receiver: (of_socket_address_t)receiver
 			      block: (of_udp_socket_async_send_block_t)block
 {
 	ADD_WRITE(OFRunLoop_UDPSendQueueItem, sock, {
 		queueItem->_block = [block copy];
 		queueItem->_buffer = buffer;