@@ -194,37 +194,37 @@
  * @brief Returns a boolean whether the object of the specified kind.
  *
  * @param class_ The class whose kind is checked
  * @return A boolean whether the object is of the specified kind
  */
-- (BOOL)isKindOfClass: (Class)class_;
+- (bool)isKindOfClass: (Class)class_;
 
 /*!
  * @brief Returns a boolean whether the object is a member of the specified
  *	  class.
  *
  * @param class_ The class for which the receiver is checked
  * @return A boolean whether the object is a member of the specified class
  */
-- (BOOL)isMemberOfClass: (Class)class_;
+- (bool)isMemberOfClass: (Class)class_;
 
 /*!
  * @brief Returns a boolean whether the object responds to the specified
  *	  selector.
  *
  * @param selector The selector which should be checked for respondance
  * @return A boolean whether the objects responds to the specified selector
  */
-- (BOOL)respondsToSelector: (SEL)selector;
+- (bool)respondsToSelector: (SEL)selector;
 
 /*!
  * @brief Checks whether the object conforms to the specified protocol.
  *
  * @param protocol The protocol which should be checked for conformance
  * @return A boolean whether the object conforms to the specified protocol
  */
-- (BOOL)conformsToProtocol: (Protocol*)protocol;
+- (bool)conformsToProtocol: (Protocol*)protocol;
 
 /*!
  * @brief Returns the implementation for the specified selector.
  *
  * @param selector The selector for which the method should be returned
@@ -283,11 +283,11 @@
  *	    return the same hash for objects which are equal!
  *
  * @param object The object which should be tested for equality
  * @return A boolean whether the object is equal to the specified object
  */
-- (BOOL)isEqual: (id)object;
+- (bool)isEqual: (id)object;
 
 /*!
  * @brief Calculates a hash for the object.
  *
  * Classes containing data (like strings, arrays, lists etc.) should reimplement
@@ -342,11 +342,11 @@
 /*!
  * @brief Returns whether the object is a proxy object.
  *
  * @return A boolean whether the object is a proxy object
  */
-- (BOOL)isProxy;
+- (bool)isProxy;
 @end
 
 /*!
  * @brief The root class for all other classes inside ObjFW.
  */
@@ -412,11 +412,11 @@
  *	  class.
  *
  * @param class_ The class which is checked for being a superclass
  * @return A boolean whether the class is a subclass of the specified class
  */
-+ (BOOL)isSubclassOfClass: (Class)class_;
++ (bool)isSubclassOfClass: (Class)class_;
 
 /*!
  * @brief Returns the superclass of the class.
  *
  * @return The superclass of the class
@@ -428,19 +428,19 @@
  *
  * @param selector The selector which should be checked for respondance
  * @return A boolean whether instances of the class respond to the specified
  *	   selector
  */
-+ (BOOL)instancesRespondToSelector: (SEL)selector;
++ (bool)instancesRespondToSelector: (SEL)selector;
 
 /*!
  * @brief Checks whether the class conforms to a given protocol.
  *
  * @param protocol The protocol which should be checked for conformance
  * @return A boolean whether the class conforms to the specified protocol
  */
-+ (BOOL)conformsToProtocol: (Protocol*)protocol;
++ (bool)conformsToProtocol: (Protocol*)protocol;
 
 /*!
  * @brief Returns the implementation of the instance method for the specified
  *	  selector.
  *
@@ -547,21 +547,21 @@
  * This method is called if a class method was not found, so that an
  * implementation can be provided at runtime.
  *
  * @return Whether the method has been added to the class
  */
-+ (BOOL)resolveClassMethod: (SEL)selector;
++ (bool)resolveClassMethod: (SEL)selector;
 
 /*!
  * @brief Try to resolve the specified instance method.
  *
  * This method is called if an instance method was not found, so that an
  * implementation can be provided at runtime.
  *
  * @return Whether the method has been added to the class
  */
-+ (BOOL)resolveInstanceMethod: (SEL)selector;
++ (bool)resolveInstanceMethod: (SEL)selector;
 
 /*!
  * @brief Initializes an already allocated object.
  *
  * Derived classes may override this, but need to do
@@ -708,11 +708,11 @@
  * @param thread The thread on which to perform the selector
  * @param waitUntilDone Whether to wait until the perform finished
  */
 - (void)performSelector: (SEL)selector
 	       onThread: (OFThread*)thread
-	  waitUntilDone: (BOOL)waitUntilDone;
+	  waitUntilDone: (bool)waitUntilDone;
 
 /*!
  * @brief Performs the specified selector on the specified thread with the
  *	  specified object.
  *
@@ -723,11 +723,11 @@
  * @param waitUntilDone Whether to wait until the perform finished
  */
 - (void)performSelector: (SEL)selector
 	       onThread: (OFThread*)thread
 	     withObject: (id)object
-	  waitUntilDone: (BOOL)waitUntilDone;
+	  waitUntilDone: (bool)waitUntilDone;
 
 /*!
  * @brief Performs the specified selector on the specified thread with the
  *	  specified objects.
  *
@@ -741,20 +741,20 @@
  */
 - (void)performSelector: (SEL)selector
 	       onThread: (OFThread*)thread
 	     withObject: (id)object1
 	     withObject: (id)object2
-	  waitUntilDone: (BOOL)waitUntilDone;
+	  waitUntilDone: (bool)waitUntilDone;
 
 /*!
  * @brief Performs the specified selector on the main thread.
  *
  * @param selector The selector to perform
  * @param waitUntilDone Whether to wait until the perform finished
  */
 - (void)performSelectorOnMainThread: (SEL)selector
-		      waitUntilDone: (BOOL)waitUntilDone;
+		      waitUntilDone: (bool)waitUntilDone;
 
 /*!
  * @brief Performs the specified selector on the main thread with the specified
  *	  object.
  *
@@ -763,11 +763,11 @@
  *		 selector
  * @param waitUntilDone Whether to wait until the perform finished
  */
 - (void)performSelectorOnMainThread: (SEL)selector
 			 withObject: (id)object
-		      waitUntilDone: (BOOL)waitUntilDone;
+		      waitUntilDone: (bool)waitUntilDone;
 
 /*!
  * @brief Performs the specified selector on the main thread with the specified
  *	  objects.
  *
@@ -779,11 +779,11 @@
  * @param waitUntilDone Whether to wait until the perform finished
  */
 - (void)performSelectorOnMainThread: (SEL)selector
 			 withObject: (id)object1
 			 withObject: (id)object2
-		      waitUntilDone: (BOOL)waitUntilDone;
+		      waitUntilDone: (bool)waitUntilDone;
 
 /*!
  * @brief Performs the specified selector on the specified thread after the
  *	  specified delay.
  *
@@ -829,11 +829,11 @@
 	     afterDelay: (double)delay;
 #endif
 
 /*!
  * @brief This method is called when @ref resolveClassMethod: or
- *	  @ref resolveInstanceMethod: returned NO. It should return a target
+ *	  @ref resolveInstanceMethod: returned false. It should return a target
  *	  to which the message should be forwarded.
  *
  * @note When the message should not be forwarded, you should not return nil,
  *	 but instead return the result of the superclass!
  *