@@ -26,10 +26,12 @@
 #import "OFOutOfRangeException.h"
 #import "OFTruncatedDataException.h"
 #import "OFUnsupportedVersionException.h"
 
 @implementation OFHTTPResponse
+@synthesize statusCode = _statusCode, headers = _headers;
+
 - init
 {
 	self = [super init];
 
 	_protocolVersion.major = 1;
@@ -89,30 +91,10 @@
 {
 	return [OFString stringWithFormat: @"%u.%u", _protocolVersion.major,
 					   _protocolVersion.minor];
 }
 
-- (short)statusCode
-{
-	return _statusCode;
-}
-
-- (void)setStatusCode: (short)statusCode
-{
-	_statusCode = statusCode;
-}
-
-- (OFDictionary*)headers
-{
-	OF_GETTER(_headers, true)
-}
-
-- (void)setHeaders: (OFDictionary*)headers
-{
-	OF_SETTER(_headers, headers, true, 1)
-}
-
 - (OFString*)string
 {
 	return [self stringWithEncoding: OF_STRING_ENCODING_AUTODETECT];
 }