@@ -54,14 +54,14 @@
 	OFString *_version;
 	int _status;
 	OFMutableDictionary OF_GENERIC(OFString *, OFString *) *_serverHeaders;
 }
 
-- initWithClient: (OFHTTPClient *)client
-	 request: (OFHTTPRequest *)request
-       redirects: (unsigned int)redirects
-	 context: (id)context;
+- (instancetype)initWithClient: (OFHTTPClient *)client
+		       request: (OFHTTPRequest *)request
+		     redirects: (unsigned int)redirects
+		       context: (id)context;
 - (void)start;
 - (void)closeAndReconnect;
 @end
 
 @interface OFHTTPClientResponse: OFHTTPResponse
@@ -71,11 +71,11 @@
 	size_t _toRead;
 }
 
 @property (nonatomic, setter=of_setKeepAlive:) bool of_keepAlive;
 
-- initWithSocket: (OFTCPSocket *)socket;
+- (instancetype)initWithSocket: (OFTCPSocket *)socket;
 @end
 
 static OFString *
 constructRequestString(OFHTTPRequest *request)
 {
@@ -203,14 +203,14 @@
 		str++;
 	}
 }
 
 @implementation OFHTTPClientRequestHandler
-- initWithClient: (OFHTTPClient *)client
-	 request: (OFHTTPRequest *)request
-       redirects: (unsigned int)redirects
-	 context: (id)context
+- (instancetype)initWithClient: (OFHTTPClient *)client
+		       request: (OFHTTPRequest *)request
+		     redirects: (unsigned int)redirects
+		       context: (id)context
 {
 	self = [super init];
 
 	@try {
 		_client = [client retain];
@@ -728,11 +728,11 @@
 @end
 
 @implementation OFHTTPClientResponse
 @synthesize of_keepAlive = _keepAlive;
 
-- initWithSocket: (OFTCPSocket *)socket
+- (instancetype)initWithSocket: (OFTCPSocket *)socket
 {
 	self = [super init];
 
 	_socket = [socket retain];