@@ -15,10 +15,12 @@
  * file.
  */
 
 #import "OFObject.h"
 #import "OFString.h"
+
+#import "socket.h"
 
 OF_ASSUME_NONNULL_BEGIN
 
 @class OFURL;
 @class OFDictionary OF_GENERIC(KeyType, ObjectType);
@@ -71,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;
-	OFString *_Nullable _remoteAddress;
+	of_socket_address_t _remoteAddress;
 }
 
 /*!
  * @brief The URL of the HTTP request.
  */
@@ -103,11 +105,12 @@
     OFDictionary OF_GENERIC(OFString *, OFString *) *headers;
 
 /*!
  * @brief The remote address from which the request originates.
  */
-@property OF_NULLABLE_PROPERTY (copy, nonatomic) OFString *remoteAddress;
+@property OF_NULLABLE_PROPERTY (nonatomic)
+    const of_socket_address_t *remoteAddress;
 
 /*!
  * @brief Creates a new OFHTTPRequest.
  *
  * @return A new, autoreleased OFHTTPRequest