@@ -249,11 +249,11 @@
 {
 	[self doesNotRecognizeSelector: _cmd];
 	abort();
 }
 
-- (BOOL)containsObject: (id)object
+- (bool)containsObject: (id)object
 {
 	[self doesNotRecognizeSelector: _cmd];
 	abort();
 }
 
@@ -269,21 +269,21 @@
 {
 	[self doesNotRecognizeSelector: _cmd];
 	abort();
 }
 
-- (BOOL)isEqual: (id)object
+- (bool)isEqual: (id)object
 {
 	OFSet *otherSet;
 
 	if (![object isKindOfClass: [OFSet class]])
-		return NO;
+		return false;
 
 	otherSet = object;
 
 	if ([otherSet count] != [self count])
-		return NO;
+		return false;
 
 	return [otherSet isSubsetOfSet: self];
 }
 
 - (uint32_t)hash
@@ -347,46 +347,46 @@
 - mutableCopy
 {
 	return [[OFMutableSet alloc] initWithSet: self];
 }
 
-- (BOOL)isSubsetOfSet: (OFSet*)set
+- (bool)isSubsetOfSet: (OFSet*)set
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFEnumerator *enumerator;
 	id object;
 
 	enumerator = [self objectEnumerator];
 	while ((object = [enumerator nextObject]) != nil) {
 		if (![set containsObject: object]) {
 			objc_autoreleasePoolPop(pool);
-			return NO;
+			return false;
 		}
 	}
 
 	objc_autoreleasePoolPop(pool);
 
-	return YES;
+	return true;
 }
 
-- (BOOL)intersectsSet: (OFSet*)set
+- (bool)intersectsSet: (OFSet*)set
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFEnumerator *enumerator;
 	id object;
 
 	enumerator = [self objectEnumerator];
 	while ((object = [enumerator nextObject]) != nil) {
 		if ([set containsObject: object]) {
 			objc_autoreleasePoolPop(pool);
-			return YES;
+			return true;
 		}
 	}
 
 	objc_autoreleasePoolPop(pool);
 
-	return NO;
+	return false;
 }
 
 - (OFXMLElement*)XMLElementBySerializing
 {
 	void *pool = objc_autoreleasePoolPush();
@@ -455,11 +455,11 @@
 }
 
 #if defined(OF_HAVE_BLOCKS) && defined(OF_HAVE_FAST_ENUMERATION)
 - (void)enumerateObjectsUsingBlock: (of_set_enumeration_block_t)block
 {
-	BOOL stop = NO;
+	bool stop = false;
 
 	for (id object in self) {
 		block(object, &stop);
 
 		if (stop)
@@ -471,11 +471,11 @@
 #ifdef OF_HAVE_BLOCKS
 - (OFSet*)filteredSetUsingBlock: (of_set_filter_block_t)block
 {
 	OFMutableSet *ret = [OFMutableSet set];
 
-	[self enumerateObjectsUsingBlock: ^ (id object, BOOL *stop) {
+	[self enumerateObjectsUsingBlock: ^ (id object, bool *stop) {
 		if (block(object))
 			[ret addObject: object];
 	}];
 
 	[ret makeImmutable];