@@ -337,16 +337,16 @@
 			return i;
 
 	return OF_NOT_FOUND;
 }
 
-- (BOOL)containsObject: (id)object
+- (bool)containsObject: (id)object
 {
 	return ([self indexOfObject: object] != OF_NOT_FOUND);
 }
 
-- (BOOL)containsObjectIdenticalTo: (id)object
+- (bool)containsObjectIdenticalTo: (id)object
 {
 	return ([self indexOfObjectIdenticalTo: object] != OF_NOT_FOUND);
 }
 
 - (id)firstObject
@@ -445,32 +445,32 @@
 	objc_autoreleasePoolPop(pool);
 
 	return ret;
 }
 
-- (BOOL)isEqual: (id)object
+- (bool)isEqual: (id)object
 {
 	/* FIXME: Optimize (for example, buffer of 16 for each) */
 	OFArray *otherArray;
 	size_t i, count;
 
 	if (![object isKindOfClass: [OFArray class]])
-		return NO;
+		return false;
 
 	otherArray = object;
 
 	count = [self count];
 
 	if (count != [otherArray count])
-		return NO;
+		return false;
 
 	for (i = 0; i < count; i++)
 		if (![[self objectAtIndex: i] isEqual:
 		    [otherArray objectAtIndex: i]])
-			return NO;
+			return false;
 
-	return YES;
+	return true;
 }
 
 - (uint32_t)hash
 {
 	id *objects = [self objects];
@@ -702,11 +702,11 @@
 
 #if defined(OF_HAVE_BLOCKS) && defined(OF_HAVE_FAST_ENUMERATION)
 - (void)enumerateObjectsUsingBlock: (of_array_enumeration_block_t)block
 {
 	size_t i = 0;
-	BOOL stop = NO;
+	bool stop = false;
 
 	for (id object in self) {
 		block(object, i++, &stop);
 
 		if (stop)
@@ -759,11 +759,11 @@
 	id *tmp = [self allocMemoryWithSize: sizeof(id)
 				      count: count];
 
 	@try {
 		[self enumerateObjectsUsingBlock: ^ (id object, size_t index,
-		    BOOL *stop) {
+		    bool *stop) {
 			tmp[index] = block(object, index);
 		}];
 
 		ret = [OFArray arrayWithObjects: tmp
 					  count: count];
@@ -783,11 +783,11 @@
 
 	@try {
 		__block size_t i = 0;
 
 		[self enumerateObjectsUsingBlock: ^ (id object, size_t index,
-		    BOOL *stop) {
+		    bool *stop) {
 			if (block(object, index))
 				tmp[i++] = object;
 		}];
 
 		ret = [OFArray arrayWithObjects: tmp
@@ -808,11 +808,11 @@
 		return nil;
 	if (count == 1)
 		return [[[self firstObject] retain] autorelease];
 
 	[self enumerateObjectsUsingBlock: ^ (id object, size_t index,
-	    BOOL *stop) {
+	    bool *stop) {
 		id new;
 
 		if (index == 0) {
 			current = [object retain];
 			return;