@@ -66,16 +66,16 @@
 		}
 	}
 
 	self = [super init];
 
-	_blocking = YES;
+	_blocking = true;
 
 	return self;
 }
 
-- (BOOL)lowlevelIsAtEndOfStream
+- (bool)lowlevelIsAtEndOfStream
 {
 	[self doesNotRecognizeSelector: _cmd];
 	abort();
 }
 
@@ -96,14 +96,14 @@
 - copy
 {
 	return [self retain];
 }
 
-- (BOOL)isAtEndOfStream
+- (bool)isAtEndOfStream
 {
 	if (_readBufferLength > 0)
-		return NO;
+		return false;
 
 	return [self lowlevelIsAtEndOfStream];
 }
 
 - (size_t)readIntoBuffer: (void*)buffer
@@ -593,11 +593,11 @@
 
 				[self freeMemory: _readBuffer];
 				_readBuffer = readBuffer;
 				_readBufferLength -= i + 1;
 
-				_waitingForDelimiter = NO;
+				_waitingForDelimiter = false;
 				return ret;
 			}
 		}
 	}
 
@@ -606,11 +606,11 @@
 	buffer = [self allocMemoryWithSize: pageSize];
 
 	@try {
 		if ([self lowlevelIsAtEndOfStream]) {
 			if (_readBuffer == NULL) {
-				_waitingForDelimiter = NO;
+				_waitingForDelimiter = false;
 				return nil;
 			}
 
 			retLength = _readBufferLength;
 
@@ -623,11 +623,11 @@
 
 			[self freeMemory: _readBuffer];
 			_readBuffer = NULL;
 			_readBufferLength = 0;
 
-			_waitingForDelimiter = NO;
+			_waitingForDelimiter = false;
 			return ret;
 		}
 
 		bufferLength = [self lowlevelReadIntoBuffer: buffer
 						     length: pageSize];
@@ -688,11 +688,11 @@
 
 				[self freeMemory: _readBuffer];
 				_readBuffer = readBuffer;
 				_readBufferLength = bufferLength - i - 1;
 
-				_waitingForDelimiter = NO;
+				_waitingForDelimiter = false;
 				return ret;
 			}
 		}
 
 		/* There was no newline or \0 */
@@ -711,11 +711,11 @@
 		_readBufferLength += bufferLength;
 	} @finally {
 		[self freeMemory: buffer];
 	}
 
-	_waitingForDelimiter = YES;
+	_waitingForDelimiter = true;
 	return nil;
 }
 
 - (OFString*)readLine
 {
@@ -812,11 +812,11 @@
 
 				[self freeMemory: _readBuffer];
 				_readBuffer = readBuffer;
 				_readBufferLength -= i + 1;
 
-				_waitingForDelimiter = NO;
+				_waitingForDelimiter = false;
 				return ret;
 			}
 		}
 	}
 
@@ -825,11 +825,11 @@
 	buffer = [self allocMemoryWithSize: pageSize];
 
 	@try {
 		if ([self lowlevelIsAtEndOfStream]) {
 			if (_readBuffer == NULL) {
-				_waitingForDelimiter = NO;
+				_waitingForDelimiter = false;
 				return nil;
 			}
 
 			ret = [OFString stringWithCString: _readBuffer
 						 encoding: encoding
@@ -837,11 +837,11 @@
 
 			[self freeMemory: _readBuffer];
 			_readBuffer = NULL;
 			_readBufferLength = 0;
 
-			_waitingForDelimiter = NO;
+			_waitingForDelimiter = false;
 			return ret;
 		}
 
 		bufferLength = [self lowlevelReadIntoBuffer: buffer
 						     length: pageSize];
@@ -891,11 +891,11 @@
 
 				[self freeMemory: _readBuffer];
 				_readBuffer = readBuffer;
 				_readBufferLength = bufferLength - i - 1;
 
-				_waitingForDelimiter = NO;
+				_waitingForDelimiter = false;
 				return ret;
 			}
 		}
 
 		/* Neither the delimiter nor \0 was found */
@@ -914,11 +914,11 @@
 		_readBufferLength += bufferLength;
 	} @finally {
 		[self freeMemory: buffer];
 	}
 
-	_waitingForDelimiter = YES;
+	_waitingForDelimiter = true;
 	return nil;
 }
 
 
 - (OFString*)readTillDelimiter: (OFString*)delimiter
@@ -945,16 +945,16 @@
 {
 	return [self tryReadTillDelimiter: delimiter
 				 encoding: OF_STRING_ENCODING_UTF_8];
 }
 
-- (BOOL)isWriteBufferEnabled
+- (bool)isWriteBufferEnabled
 {
 	return _writeBufferEnabled;
 }
 
-- (void)setWriteBufferEnabled: (BOOL)enable
+- (void)setWriteBufferEnabled: (bool)enable
 {
 	_writeBufferEnabled = enable;
 }
 
 - (void)flushWriteBuffer
@@ -1467,26 +1467,26 @@
 - (size_t)numberOfBytesInReadBuffer
 {
 	return _readBufferLength;
 }
 
-- (BOOL)isBlocking
+- (bool)isBlocking
 {
 	return _blocking;
 }
 
-- (void)setBlocking: (BOOL)enable
+- (void)setBlocking: (bool)enable
 {
 #ifndef _WIN32
-	BOOL readImplemented = NO, writeImplemented = NO;
+	bool readImplemented = false, writeImplemented = false;
 
 	@try {
 		int readFlags;
 
 		readFlags = fcntl([self fileDescriptorForReading], F_GETFL);
 
-		readImplemented = YES;
+		readImplemented = true;
 
 		if (readFlags == -1)
 			@throw [OFSetOptionFailedException
 			    exceptionWithClass: [self class]
 					stream: self];
@@ -1507,11 +1507,11 @@
 	@try {
 		int writeFlags;
 
 		writeFlags = fcntl([self fileDescriptorForWriting], F_GETFL);
 
-		writeImplemented = YES;
+		writeImplemented = true;
 
 		if (writeFlags == -1)
 			@throw [OFSetOptionFailedException
 			    exceptionWithClass: [self class]
 					stream: self];
@@ -1562,10 +1562,10 @@
 {
 	[self doesNotRecognizeSelector: _cmd];
 	abort();
 }
 
-- (BOOL)OF_isWaitingForDelimiter
+- (bool)OF_isWaitingForDelimiter
 {
 	return _waitingForDelimiter;
 }
 @end