@@ -326,24 +326,24 @@
 - mutableCopy
 {
 	return [[OFMutableDictionary alloc] initWithDictionary: self];
 }
 
-- (BOOL)isEqual: (id)object
+- (bool)isEqual: (id)object
 {
 	OFDictionary *otherDictionary;
 	void *pool;
 	OFEnumerator *enumerator;
 	id key;
 
 	if (![object isKindOfClass: [OFDictionary class]])
-		return NO;
+		return false;
 
 	otherDictionary = object;
 
 	if ([otherDictionary count] != [self count])
-		return NO;
+		return false;
 
 	pool = objc_autoreleasePoolPush();
 
 	enumerator = [self keyEnumerator];
 	while ((key = [enumerator nextObject]) != nil) {
@@ -350,65 +350,65 @@
 		id object = [otherDictionary objectForKey: key];
 
 		if (object == nil ||
 		    ![object isEqual: [self objectForKey: key]]) {
 			objc_autoreleasePoolPop(pool);
-			return NO;
+			return false;
 		}
 	}
 
 	objc_autoreleasePoolPop(pool);
 
-	return YES;
+	return true;
 }
 
-- (BOOL)containsObject: (id)object
+- (bool)containsObject: (id)object
 {
 	void *pool;
 	OFEnumerator *enumerator;
 	id currentObject;
 
 	if (object == nil)
-		return NO;
+		return false;
 
 	pool = objc_autoreleasePoolPush();
 	enumerator = [self objectEnumerator];
 
 	while ((currentObject = [enumerator nextObject]) != nil) {
 		if ([currentObject isEqual: object]) {
 			objc_autoreleasePoolPop(pool);
-			return YES;
+			return true;
 		}
 	}
 
 	objc_autoreleasePoolPop(pool);
 
-	return NO;
+	return false;
 }
 
-- (BOOL)containsObjectIdenticalTo: (id)object
+- (bool)containsObjectIdenticalTo: (id)object
 {
 	void *pool;
 	OFEnumerator *enumerator;
 	id currentObject;
 
 	if (object == nil)
-		return NO;
+		return false;
 
 	pool = objc_autoreleasePoolPush();
 	enumerator = [self objectEnumerator];
 
 	while ((currentObject = [enumerator nextObject]) != nil) {
 		if (currentObject == object) {
 			objc_autoreleasePoolPop(pool);
-			return YES;
+			return true;
 		}
 	}
 
 	objc_autoreleasePoolPop(pool);
 
-	return NO;
+	return false;
 }
 
 - (OFArray*)allKeys
 {
 	void *pool = objc_autoreleasePoolPush();
@@ -487,11 +487,11 @@
 
 #if defined(OF_HAVE_BLOCKS) && defined(OF_HAVE_FAST_ENUMERATION)
 - (void)enumerateKeysAndObjectsUsingBlock:
     (of_dictionary_enumeration_block_t)block
 {
-	BOOL stop = NO;
+	bool stop = false;
 
 	for (id key in self) {
 		block(key, [self objectForKey: key], &stop);
 
 		if (stop)
@@ -504,11 +504,11 @@
 - (OFDictionary*)mappedDictionaryUsingBlock: (of_dictionary_map_block_t)block
 {
 	OFMutableDictionary *new = [OFMutableDictionary dictionary];
 
 	[self enumerateKeysAndObjectsUsingBlock: ^ (id key, id object,
-	    BOOL *stop) {
+	    bool *stop) {
 		[new setObject: block(key, object)
 			forKey: key];
 	}];
 
 	[new makeImmutable];
@@ -520,11 +520,11 @@
     (of_dictionary_filter_block_t)block
 {
 	OFMutableDictionary *new = [OFMutableDictionary dictionary];
 
 	[self enumerateKeysAndObjectsUsingBlock: ^ (id key, id object,
-	    BOOL *stop) {
+	    bool *stop) {
 		if (block(key, object))
 			[new setObject: object
 				forKey: key];
 	}];