@@ -178,19 +178,19 @@
 	OFHTTPServer *_server;
 	OFHTTPRequest *_request;
 	bool _chunked, _headersSent;
 }
 
-- initWithSocket: (OFTCPSocket *)socket
-	  server: (OFHTTPServer *)server
-	 request: (OFHTTPRequest *)request;
+- (instancetype)initWithSocket: (OFTCPSocket *)socket
+			server: (OFHTTPServer *)server
+		       request: (OFHTTPRequest *)request;
 @end
 
 @implementation OFHTTPServerResponse
-- initWithSocket: (OFTCPSocket *)socket
-	  server: (OFHTTPServer *)server
-	 request: (OFHTTPRequest *)request
+- (instancetype)initWithSocket: (OFTCPSocket *)socket
+			server: (OFHTTPServer *)server
+		       request: (OFHTTPRequest *)request
 {
 	self = [super init];
 
 	_statusCode = 500;
 	_socket = [socket retain];
@@ -339,12 +339,12 @@
 	OFMutableDictionary *_headers;
 	size_t _contentLength;
 	OFMutableData *_body;
 }
 
-- initWithSocket: (OFTCPSocket *)socket
-	  server: (OFHTTPServer *)server;
+- (instancetype)initWithSocket: (OFTCPSocket *)socket
+			server: (OFHTTPServer *)server;
 - (bool)socket: (OFTCPSocket *)socket
    didReadLine: (OFString *)line
        context: (id)context
      exception: (id)exception;
 - (bool)parseProlog: (OFString *)line;
@@ -357,12 +357,12 @@
 - (bool)sendErrorAndClose: (short)statusCode;
 - (void)createResponse;
 @end
 
 @implementation OFHTTPServer_Connection
-- initWithSocket: (OFTCPSocket *)socket
-	  server: (OFHTTPServer *)server
+- (instancetype)initWithSocket: (OFTCPSocket *)socket
+			server: (OFHTTPServer *)server
 {
 	self = [super init];
 
 	@try {
 		_socket = [socket retain];
@@ -695,11 +695,11 @@
 + (instancetype)server
 {
 	return [[[self alloc] init] autorelease];
 }
 
-- init
+- (instancetype)init
 {
 	self = [super init];
 
 	_name = @"OFHTTPServer (ObjFW's HTTP server class "
 	    @"<https://heap.zone/objfw/>)";