@@ -225,11 +225,11 @@
 
 		enumerator = [arguments objectEnumerator];
 		while ((argument = [enumerator nextObject]) != nil) {
 			OFMutableString *tmp =
 			    [[argument mutableCopy] autorelease];
-			BOOL containsSpaces = [tmp containsString: @" "];
+			bool containsSpaces = [tmp containsString: @" "];
 
 			[argumentsString appendString: @" "];
 
 			if (containsSpaces)
 				[argumentsString appendString: @"\""];
@@ -357,18 +357,18 @@
 
 	return [env items];
 }
 #endif
 
-- (BOOL)lowlevelIsAtEndOfStream
+- (bool)lowlevelIsAtEndOfStream
 {
 #ifndef _WIN32
 	if (_readPipe[0] == -1)
 #else
 	if (_readPipe[0] == NULL)
 #endif
-		return YES;
+		return true;
 
 	return _atEndOfStream;
 }
 
 - (size_t)lowlevelReadIntoBuffer: (void*)buffer
@@ -385,11 +385,11 @@
 	    (ret = read(_readPipe[0], buffer, length)) < 0) {
 #else
 	if (_readPipe[0] == NULL || _atEndOfStream ||
 	    !ReadFile(_readPipe[0], buffer, length, &ret, NULL)) {
 		if (GetLastError() == ERROR_BROKEN_PIPE) {
-			_atEndOfStream = YES;
+			_atEndOfStream = true;
 			return 0;
 		}
 
 #endif
 		@throw [OFReadFailedException exceptionWithClass: [self class]
@@ -396,11 +396,11 @@
 							  stream: self
 						 requestedLength: length];
 	}
 
 	if (ret == 0)
-		_atEndOfStream = YES;
+		_atEndOfStream = true;
 
 	return ret;
 }
 
 - (void)lowlevelWriteBuffer: (const void*)buffer