@@ -67,11 +67,11 @@
 
 /* FIXME */
 #define OF_STRING_ENCODING_NATIVE OF_STRING_ENCODING_UTF_8
 
 #ifdef OF_HAVE_BLOCKS
-typedef void (^of_string_line_enumeration_block_t)(OFString *line, BOOL *stop);
+typedef void (^of_string_line_enumeration_block_t)(OFString *line, bool *stop);
 #endif
 
 @class OFArray;
 @class OFURL;
 
@@ -118,11 +118,11 @@
  * @param freeWhenDone Whether to free the C string when the OFString gets
  *		       deallocated
  * @return A new autoreleased OFString
  */
 + (instancetype)stringWithUTF8StringNoCopy: (char*)UTF8String
-			      freeWhenDone: (BOOL)freeWhenDone;
+			      freeWhenDone: (bool)freeWhenDone;
 
 /*!
  * @brief Creates a new OFString from a C string with the specified encoding.
  *
  * @param cString A C string to initialize the OFString with
@@ -346,11 +346,11 @@
  * @param freeWhenDone Whether to free the C string when it is not needed
  *		       anymore
  * @return An initialized OFString
  */
 - initWithUTF8StringNoCopy: (char*)UTF8String
-	      freeWhenDone: (BOOL)freeWhenDone;
+	      freeWhenDone: (bool)freeWhenDone;
 
 /*!
  * @brief Initializes an already allocated OFString from a C string with the
  *	  specified encoding.
  *
@@ -705,11 +705,11 @@
  * @brief Returns whether the string contains the specified string.
  *
  * @param string The string to search
  * @return Whether the string contains the specified string
  */
-- (BOOL)containsString: (OFString*)string;
+- (bool)containsString: (OFString*)string;
 
 /*!
  * @brief Creates a substring with the specified range.
  *
  * @param range The range of the substring
@@ -838,19 +838,19 @@
  * @brief Checks whether the string has the specified prefix.
  *
  * @param prefix The prefix to check for
  * @return A boolean whether the string has the specified prefix
  */
-- (BOOL)hasPrefix: (OFString*)prefix;
+- (bool)hasPrefix: (OFString*)prefix;
 
 /*!
  * @brief Checks whether the string has the specified suffix.
  *
  * @param suffix The suffix to check for
  * @return A boolean whether the string has the specified suffix
  */
-- (BOOL)hasSuffix: (OFString*)suffix;
+- (bool)hasSuffix: (OFString*)suffix;
 
 /*!
  * @brief Separates an OFString into an OFArray of OFStrings.
  *
  * @param delimiter The delimiter for separating