@@ -32,12 +32,12 @@
 
 @class OFArray;
 
 #ifdef OF_HAVE_BLOCKS
 typedef void (^of_dictionary_enumeration_block_t)(id key, id object,
-     BOOL *stop);
-typedef BOOL (^of_dictionary_filter_block_t)(id key, id object);
+     bool *stop);
+typedef bool (^of_dictionary_filter_block_t)(id key, id object);
 typedef id (^of_dictionary_map_block_t)(id key, id object);
 #endif
 
 /*!
  * @brief An abstract class for storing objects in a dictionary.
@@ -186,11 +186,11 @@
  *
  * @param object The object which is checked for being in the dictionary
  * @return A boolean whether the dictionary contains an object with the
  *	   specified address.
  */
-- (BOOL)containsObjectIdenticalTo: (id)object;
+- (bool)containsObjectIdenticalTo: (id)object;
 
 /*!
  * @brief Returns an array of all keys.
  *
  * @return An array of all keys
@@ -229,11 +229,11 @@
  */
 - (OFDictionary*)mappedDictionaryUsingBlock: (of_dictionary_map_block_t)block;
 
 /*!
  * @brief Creates a new dictionary, only containing the objects for which the
- *	  block returns YES.
+ *	  block returns true.
  *
  * @param block A block which determines if the object should be in the new
  *		dictionary
  * @return A new autoreleased OFDictionary
  */