@@ -43,30 +43,30 @@
 
 static OF_INLINE void
 normalize_key(char *str_)
 {
 	uint8_t *str = (uint8_t*)str_;
-	BOOL firstLetter = YES;
+	bool firstLetter = true;
 
 	while (*str != '\0') {
 		if (!isalnum(*str)) {
-			firstLetter = YES;
+			firstLetter = true;
 			str++;
 			continue;
 		}
 
 		*str = (firstLetter ? toupper(*str) : tolower(*str));
 
-		firstLetter = NO;
+		firstLetter = false;
 		str++;
 	}
 }
 
 @interface OFHTTPClientReply: OFHTTPRequestReply
 {
 	OFTCPSocket *_socket;
-	BOOL _chunked, _atEndOfStream;
+	bool _chunked, _atEndOfStream;
 	size_t _toRead;
 }
 
 - initWithSocket: (OFTCPSocket*)socket;
 @end
@@ -143,20 +143,20 @@
 			    exceptionWithClass: [self class]];
 		}
 
 		if (_toRead == 0) {
 			[_socket close];
-			_atEndOfStream = YES;
+			_atEndOfStream = true;
 		}
 
 		objc_autoreleasePoolPop(pool);
 
 		return 0;
 	}
 }
 
-- (BOOL)lowlevelIsAtEndOfStream
+- (bool)lowlevelIsAtEndOfStream
 {
 	if (!_chunked)
 		return [_socket isAtEndOfStream];
 
 	return _atEndOfStream;
@@ -193,16 +193,16 @@
 - (id <OFHTTPClientDelegate>)delegate
 {
 	return _delegate;
 }
 
-- (void)setInsecureRedirectsAllowed: (BOOL)allowed
+- (void)setInsecureRedirectsAllowed: (bool)allowed
 {
 	_insecureRedirectsAllowed = allowed;
 }
 
-- (BOOL)insecureRedirectsAllowed
+- (bool)insecureRedirectsAllowed
 {
 	return _insecureRedirectsAllowed;
 }
 
 - (OFHTTPRequestReply*)performRequest: (OFHTTPRequest*)request
@@ -256,11 +256,11 @@
 
 	/*
 	 * Work around a bug with packet splitting in lighttpd when using
 	 * HTTPS.
 	 */
-	[socket setWriteBufferEnabled: YES];
+	[socket setWriteBufferEnabled: true];
 
 	if (requestType == OF_HTTP_REQUEST_TYPE_GET)
 		type = "GET";
 	if (requestType == OF_HTTP_REQUEST_TYPE_HEAD)
 		type = "HEAD";
@@ -310,11 +310,11 @@
 
 	[socket writeString: @"\r\n"];
 
 	/* Work around a bug in lighttpd, see above */
 	[socket flushWriteBuffer];
-	[socket setWriteBufferEnabled: NO];
+	[socket setWriteBufferEnabled: false];
 
 	if (requestType == OF_HTTP_REQUEST_TYPE_POST)
 		[socket writeBuffer: [POSTData items]
 			     length: [POSTData count] * [POSTData itemSize]];
 
@@ -373,11 +373,11 @@
 		keyC[tmp - lineC] = '\0';
 		normalize_key(keyC);
 
 		@try {
 			key = [OFString stringWithUTF8StringNoCopy: keyC
-						      freeWhenDone: YES];
+						      freeWhenDone: true];
 		} @catch (id e) {
 			free(keyC);
 			@throw e;
 		}
 
@@ -392,11 +392,11 @@
 		    [key isEqual: @"Location"]) && (_insecureRedirectsAllowed ||
 		    [scheme isEqual: @"http"] ||
 		    ![value hasPrefix: @"http://"])) {
 			OFURL *newURL;
 			OFHTTPRequest *newRequest;
-			BOOL follow = YES;
+			bool follow = true;
 
 			newURL = [OFURL URLWithString: value
 					relativeToURL: URL];
 
 			if ([_delegate respondsToSelector: