@@ -73,11 +73,11 @@
 {
 	OFURL *_URL;
 	of_http_request_method_t _method;
 	of_http_request_protocol_version_t _protocolVersion;
 	OFDictionary OF_GENERIC(OFString *, OFString *) *_Nullable _headers;
-	of_socket_address_t _remoteAddress;
+	OFSocketAddress _remoteAddress;
 	bool _hasRemoteAddress;
 	OF_RESERVE_IVARS(OFHTTPRequest, 4)
 }
 
 /**
@@ -109,12 +109,11 @@
 /**
  * @brief The remote address from which the request originates.
  *
  * @note The setter creates a copy of the remote address.
  */
-@property OF_NULLABLE_PROPERTY (nonatomic)
-    const of_socket_address_t *remoteAddress;
+@property OF_NULLABLE_PROPERTY (nonatomic) const OFSocketAddress *remoteAddress;
 
 /**
  * @brief Creates a new OFHTTPRequest.
  *
  * @return A new, autoreleased OFHTTPRequest