@@ -15,11 +15,11 @@
  */
 
 #import "OFStream.h"
 #import "OFHTTPRequest.h"
 
-@class OFDictionary;
+@class OFDictionary OF_GENERIC(KeyType, ObjectType);
 
 /*!
  * @class OFHTTPResponse OFHTTPResponse.h ObjFW/OFHTTPResponse.h
  *
  * @brief A class for representing an HTTP request reply as a stream.
@@ -26,17 +26,17 @@
  */
 @interface OFHTTPResponse: OFStream
 {
 	of_http_request_protocol_version_t _protocolVersion;
 	short _statusCode;
-	OFDictionary *_headers;
+	OFDictionary OF_GENERIC(OFString*, OFString*) *_headers;
 }
 
 #ifdef OF_HAVE_PROPERTIES
 @property of_http_request_protocol_version_t protocolVersion;
 @property short statusCode;
-@property (copy) OFDictionary *headers;
+@property (copy) OFDictionary OF_GENERIC(OFString*, OFString*) *headers;
 #endif
 
 /*!
  * @brief Sets the protocol version of the HTTP request reply.
  *
@@ -83,18 +83,18 @@
 /*!
  * @brief Returns the headers of the reply to the HTTP request.
  *
  * @return The headers of the reply to the HTTP request
  */
-- (OFDictionary*)headers;
+- (OFDictionary OF_GENERIC(OFString*, OFString*)*)headers;
 
 /*!
  * @brief Returns the headers of the reply to the HTTP request.
  *
  * @param headers The headers of the reply to the HTTP request
  */
-- (void)setHeaders: (OFDictionary*)headers;
+- (void)setHeaders: (OFDictionary OF_GENERIC(OFString*, OFString*)*)headers;
 
 /*!
  * @brief Returns the reply as a string, trying to detect the encoding.
  *
  * @return The reply as a string