@@ -53,11 +53,11 @@
 default_hash(void *value)
 {
 	return (uint32_t)(uintptr_t)value;
 }
 
-static BOOL
+static bool
 default_equal(void *value1, void *value2)
 {
 	return (value1 == value2);
 }
 
@@ -180,35 +180,35 @@
 	}
 
 	[super dealloc];
 }
 
-- (BOOL)isEqual: (id)object
+- (bool)isEqual: (id)object
 {
 	OFMapTable *mapTable;
 	uint32_t i;
 
 	if (![object isKindOfClass: [OFMapTable class]])
-		return NO;
+		return false;
 
 	mapTable = object;
 
 	if (mapTable->_count != _count ||
 	    mapTable->_keyFunctions.equal != _keyFunctions.equal ||
 	    mapTable->_valueFunctions.equal != _valueFunctions.equal)
-		return NO;
+		return false;
 
 	for (i = 0; i < _capacity; i++) {
 		if (_buckets[i] != NULL && _buckets[i] != &deleted) {
 			void *value = [mapTable valueForKey: _buckets[i]->key];
 
 			if (!_valueFunctions.equal(value, _buckets[i]->value))
-				return NO;
+				return false;
 		}
 	}
 
-	return YES;
+	return true;
 }
 
 - (uint32_t)hash
 {
 	uint32_t i, hash = 0;
@@ -502,38 +502,38 @@
 			return;
 		}
 	}
 }
 
-- (BOOL)containsValue: (void*)value
+- (bool)containsValue: (void*)value
 {
 	uint32_t i;
 
 	if (value == NULL || _count == 0)
-		return NO;
+		return false;
 
 	for (i = 0; i < _capacity; i++)
 		if (_buckets[i] != NULL && _buckets[i] != &deleted)
 			if (_valueFunctions.equal(_buckets[i]->value, value))
-				return YES;
+				return true;
 
-	return NO;
+	return false;
 }
 
-- (BOOL)containsValueIdenticalTo: (void*)value
+- (bool)containsValueIdenticalTo: (void*)value
 {
 	uint32_t i;
 
 	if (value == NULL || _count == 0)
-		return NO;
+		return false;
 
 	for (i = 0; i < _capacity; i++)
 		if (_buckets[i] != NULL && _buckets[i] != &deleted)
 			if (_buckets[i]->value == value)
-				return YES;
+				return true;
 
-	return NO;
+	return false;
 }
 
 - (OFMapTableEnumerator*)keyEnumerator
 {
 	return [[[OFMapTableKeyEnumerator alloc]
@@ -580,11 +580,11 @@
 #ifdef OF_HAVE_BLOCKS
 - (void)enumerateKeysAndValuesUsingBlock:
     (of_map_table_enumeration_block_t)block
 {
 	size_t i;
-	BOOL stop = NO;
+	bool stop = false;
 	unsigned long mutations = _mutations;
 
 	for (i = 0; i < _capacity && !stop; i++) {
 		if (_mutations != mutations)
 			@throw [OFEnumerationMutationException
@@ -597,11 +597,11 @@
 }
 
 - (void)replaceValuesUsingBlock: (of_map_table_replace_block_t)block
 {
 	size_t i;
-	BOOL stop = NO;
+	bool stop = false;
 	unsigned long mutations = _mutations;
 
 	for (i = 0; i < _capacity && !stop; i++) {
 		if (_mutations != mutations)
 			@throw [OFEnumerationMutationException