@@ -35,18 +35,18 @@
 	OFDate *_fireDate;
 	double _interval;
 	id _target, _object1, _object2;
 	SEL _selector;
 	uint8_t _arguments;
-	BOOL _repeats;
+	bool _repeats;
 #ifdef OF_HAVE_BLOCKS
 	of_timer_block_t _block;
 #endif
-	BOOL _valid;
+	bool _valid;
 #ifdef OF_HAVE_THREADS
 	OFCondition *_condition;
-	BOOL _done;
+	bool _done;
 #endif
 	OFRunLoop *_inRunLoop;
 }
 
 #ifdef OF_HAVE_PROPERTIES
@@ -64,11 +64,11 @@
  * @return A new, autoreleased timer
  */
 + (instancetype)scheduledTimerWithTimeInterval: (double)interval
 					target: (id)target
 				      selector: (SEL)selector
-				       repeats: (BOOL)repeats;
+				       repeats: (bool)repeats;
 
 /*!
  * @brief Creates and schedules a new timer with the specified time interval.
  *
  * @param interval The time interval after which the timer should be executed
@@ -81,11 +81,11 @@
  */
 + (instancetype)scheduledTimerWithTimeInterval: (double)interval
 					target: (id)target
 				      selector: (SEL)selector
 					object: (id)object
-				       repeats: (BOOL)repeats;
+				       repeats: (bool)repeats;
 
 /*!
  * @brief Creates and schedules a new timer with the specified time interval.
  *
  * @param interval The time interval after which the timer should be executed
@@ -102,11 +102,11 @@
 + (instancetype)scheduledTimerWithTimeInterval: (double)interval
 					target: (id)target
 				      selector: (SEL)selector
 					object: (id)object1
 					object: (id)object2
-				       repeats: (BOOL)repeats;
+				       repeats: (bool)repeats;
 
 #ifdef OF_HAVE_BLOCKS
 /*!
  * @brief Creates and schedules a new timer with the specified time interval.
  *
@@ -115,11 +115,11 @@
  * @param repeats Whether the timer repeats after it has been executed
  * @param block The block to invoke when the timer fires
  * @return A new, autoreleased timer
  */
 + (instancetype)scheduledTimerWithTimeInterval: (double)interval
-				       repeats: (BOOL)repeats
+				       repeats: (bool)repeats
 					 block: (of_timer_block_t)block;
 #endif
 
 /*!
  * @brief Creates a new timer with the specified time interval.
@@ -132,11 +132,11 @@
  * @return A new, autoreleased timer
  */
 + (instancetype)timerWithTimeInterval: (double)interval
 			       target: (id)target
 			     selector: (SEL)selector
-			      repeats: (BOOL)repeats;
+			      repeats: (bool)repeats;
 
 /*!
  * @brief Creates a new timer with the specified time interval.
  *
  * @param interval The time interval after which the timer should be executed
@@ -149,11 +149,11 @@
  */
 + (instancetype)timerWithTimeInterval: (double)interval
 			       target: (id)target
 			     selector: (SEL)selector
 			       object: (id)object
-			      repeats: (BOOL)repeats;
+			      repeats: (bool)repeats;
 
 /*!
  * @brief Creates a new timer with the specified time interval.
  *
  * @param interval The time interval after which the timer should be executed
@@ -170,11 +170,11 @@
 + (instancetype)timerWithTimeInterval: (double)interval
 			       target: (id)target
 			     selector: (SEL)selector
 			       object: (id)object1
 			       object: (id)object2
-			      repeats: (BOOL)repeats;
+			      repeats: (bool)repeats;
 
 #ifdef OF_HAVE_BLOCKS
 /*!
  * @brief Creates a new timer with the specified time interval.
  *
@@ -183,11 +183,11 @@
  * @param repeats Whether the timer repeats after it has been executed
  * @param block The block to invoke when the timer fires
  * @return A new, autoreleased timer
  */
 + (instancetype)timerWithTimeInterval: (double)interval
-			      repeats: (BOOL)repeats
+			      repeats: (bool)repeats
 				block: (of_timer_block_t)block;
 #endif
 
 /*!
  * @brief Initializes an already allocated timer with the specified time
@@ -203,11 +203,11 @@
  */
 - initWithFireDate: (OFDate*)fireDate
 	  interval: (double)interval
 	    target: (id)target
 	  selector: (SEL)selector
-	   repeats: (BOOL)repeats;
+	   repeats: (bool)repeats;
 
 /*!
  * @brief Initializes an already allocated timer with the specified time
  *	  interval.
  *
@@ -223,11 +223,11 @@
 - initWithFireDate: (OFDate*)fireDate
 	  interval: (double)interval
 	    target: (id)target
 	  selector: (SEL)selector
 	    object: (id)object
-	   repeats: (BOOL)repeats;
+	   repeats: (bool)repeats;
 
 /*!
  * @brief Initializes an already allocated timer with the specified time
  *	  interval.
  *
@@ -247,11 +247,11 @@
 	  interval: (double)interval
 	    target: (id)target
 	  selector: (SEL)selector
 	    object: (id)object1
 	    object: (id)object2
-	   repeats: (BOOL)repeats;
+	   repeats: (bool)repeats;
 
 #ifdef OF_HAVE_BLOCKS
 /*!
  * @brief Initializes an already allocated timer with the specified time
  *	  interval.
@@ -263,11 +263,11 @@
  * @param block The block to invoke when the timer fires
  * @return An initialized timer
  */
 - initWithFireDate: (OFDate*)fireDate
 	  interval: (double)interval
-	   repeats: (BOOL)repeats
+	   repeats: (bool)repeats
 	     block: (of_timer_block_t)block;
 #endif
 
 /*!
  * @brief Fires the timer, meaning it will execute the specified selector on the
@@ -302,11 +302,11 @@
 /*!
  * @brief Returns whether the timer is valid.
  *
  * @return Whether the timer is valid
  */
-- (BOOL)isValid;
+- (bool)isValid;
 
 /*!
  * @brief Returns the time interval in which the timer will repeat, if it is a
  *	  repeating timer.
  *