@@ -66,11 +66,11 @@
 @interface OFStreamSocket: OFStream <OFReadyForReadingObserving,
     OFReadyForWritingObserving>
 {
 	OFSocketHandle _socket;
 	bool _atEndOfStream, _listening;
-	of_socket_address_t _remoteAddress;
+	OFSocketAddress _remoteAddress;
 	OF_RESERVE_IVARS(OFStreamSocket, 4)
 }
 
 /**
  * @brief Whether the socket is a listening socket.
@@ -80,11 +80,11 @@
 /**
  * @brief The remote address.
  *
  * @note This only works for accepted sockets!
  */
-@property (readonly, nonatomic) const of_socket_address_t *remoteAddress;
+@property (readonly, nonatomic) const OFSocketAddress *remoteAddress;
 
 /**
  * @brief The delegate for asynchronous operations on the socket.
  *
  * @note The delegate is retained for as long as asynchronous operations are