@@ -34,11 +34,11 @@
 
 @implementation OFTimer
 + (instancetype)scheduledTimerWithTimeInterval: (double)interval
 					target: (id)target
 				      selector: (SEL)selector
-				       repeats: (BOOL)repeats
+				       repeats: (bool)repeats
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFDate *fireDate = [OFDate dateWithTimeIntervalSinceNow: interval];
 	id timer = [[[self alloc] initWithFireDate: fireDate
 					  interval: interval
@@ -56,11 +56,11 @@
 
 + (instancetype)scheduledTimerWithTimeInterval: (double)interval
 					target: (id)target
 				      selector: (SEL)selector
 					object: (id)object
-				       repeats: (BOOL)repeats
+				       repeats: (bool)repeats
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFDate *fireDate = [OFDate dateWithTimeIntervalSinceNow: interval];
 	id timer = [[[self alloc] initWithFireDate: fireDate
 					  interval: interval
@@ -80,11 +80,11 @@
 + (instancetype)scheduledTimerWithTimeInterval: (double)interval
 					target: (id)target
 				      selector: (SEL)selector
 					object: (id)object1
 					object: (id)object2
-				       repeats: (BOOL)repeats
+				       repeats: (bool)repeats
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFDate *fireDate = [OFDate dateWithTimeIntervalSinceNow: interval];
 	id timer = [[[self alloc] initWithFireDate: fireDate
 					  interval: interval
@@ -102,11 +102,11 @@
 	return [timer autorelease];
 }
 
 #ifdef OF_HAVE_BLOCKS
 + (instancetype)scheduledTimerWithTimeInterval: (double)interval
-				       repeats: (BOOL)repeats
+				       repeats: (bool)repeats
 					 block: (of_timer_block_t)block
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFDate *fireDate = [OFDate dateWithTimeIntervalSinceNow: interval];
 	id timer = [[[self alloc] initWithFireDate: fireDate
@@ -124,11 +124,11 @@
 #endif
 
 + (instancetype)timerWithTimeInterval: (double)interval
 			       target: (id)target
 			     selector: (SEL)selector
-			      repeats: (BOOL)repeats
+			      repeats: (bool)repeats
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFDate *fireDate = [OFDate dateWithTimeIntervalSinceNow: interval];
 	id timer = [[[self alloc] initWithFireDate: fireDate
 					  interval: interval
@@ -144,11 +144,11 @@
 
 + (instancetype)timerWithTimeInterval: (double)interval
 			       target: (id)target
 			     selector: (SEL)selector
 			       object: (id)object
-			      repeats: (BOOL)repeats
+			      repeats: (bool)repeats
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFDate *fireDate = [OFDate dateWithTimeIntervalSinceNow: interval];
 	id timer = [[[self alloc] initWithFireDate: fireDate
 					  interval: interval
@@ -166,11 +166,11 @@
 + (instancetype)timerWithTimeInterval: (double)interval
 			       target: (id)target
 			     selector: (SEL)selector
 			       object: (id)object1
 			       object: (id)object2
-			      repeats: (BOOL)repeats
+			      repeats: (bool)repeats
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFDate *fireDate = [OFDate dateWithTimeIntervalSinceNow: interval];
 	id timer = [[[self alloc] initWithFireDate: fireDate
 					  interval: interval
@@ -186,11 +186,11 @@
 	return [timer autorelease];
 }
 
 #ifdef OF_HAVE_BLOCKS
 + (instancetype)timerWithTimeInterval: (double)interval
-			      repeats: (BOOL)repeats
+			      repeats: (bool)repeats
 				block: (of_timer_block_t)block
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFDate *fireDate = [OFDate dateWithTimeIntervalSinceNow: interval];
 	id timer = [[[self alloc] initWithFireDate: fireDate
@@ -222,11 +222,11 @@
 	       target: (id)target
 	     selector: (SEL)selector
 	       object: (id)object1
 	       object: (id)object2
 	    arguments: (uint8_t)arguments
-	      repeats: (BOOL)repeats
+	      repeats: (bool)repeats
 {
 	self = [super init];
 
 	@try {
 		_fireDate = [fireDate retain];
@@ -235,11 +235,11 @@
 		_selector = selector;
 		_object1 = [object1 retain];
 		_object2 = [object2 retain];
 		_arguments = arguments;
 		_repeats = repeats;
-		_valid = YES;
+		_valid = true;
 #ifdef OF_HAVE_THREADS
 		_condition = [[OFCondition alloc] init];
 #endif
 	} @catch (id e) {
 		[self release];
@@ -251,11 +251,11 @@
 
 - initWithFireDate: (OFDate*)fireDate
 	  interval: (double)interval
 	    target: (id)target
 	  selector: (SEL)selector
-	   repeats: (BOOL)repeats
+	   repeats: (bool)repeats
 {
 	return [self OF_initWithFireDate: fireDate
 				interval: interval
 				  target: target
 				selector: selector
@@ -268,11 +268,11 @@
 - initWithFireDate: (OFDate*)fireDate
 	  interval: (double)interval
 	    target: (id)target
 	  selector: (SEL)selector
 	    object: (id)object
-	   repeats: (BOOL)repeats
+	   repeats: (bool)repeats
 {
 	return [self OF_initWithFireDate: fireDate
 				interval: interval
 				  target: target
 				selector: selector
@@ -286,11 +286,11 @@
 	  interval: (double)interval
 	    target: (id)target
 	  selector: (SEL)selector
 	    object: (id)object1
 	    object: (id)object2
-	   repeats: (BOOL)repeats
+	   repeats: (bool)repeats
 {
 	return [self OF_initWithFireDate: fireDate
 				interval: interval
 				  target: target
 				selector: selector
@@ -301,21 +301,21 @@
 }
 
 #ifdef OF_HAVE_BLOCKS
 - initWithFireDate: (OFDate*)fireDate
 	   interval: (double)interval
-	    repeats: (BOOL)repeats
+	    repeats: (bool)repeats
 	      block: (of_timer_block_t)block
 {
 	self = [super init];
 
 	@try {
 		_fireDate = [fireDate retain];
 		_interval = interval;
 		_repeats = repeats;
 		_block = [block copy];
-		_valid = YES;
+		_valid = true;
 # ifdef OF_HAVE_THREADS
 		_condition = [[OFCondition alloc] init];
 # endif
 	} @catch (id e) {
 		[self release];
@@ -390,11 +390,11 @@
 #endif
 
 #ifdef OF_HAVE_THREADS
 	[_condition lock];
 	@try {
-		_done = YES;
+		_done = true;
 		[_condition signal];
 	} @finally {
 		[_condition unlock];
 	}
 #endif
@@ -410,21 +410,21 @@
 		[self invalidate];
 }
 
 - (OFDate*)fireDate
 {
-	OF_GETTER(_fireDate, YES)
+	OF_GETTER(_fireDate, true)
 }
 
 - (void)setFireDate: (OFDate*)fireDate
 {
 	[self retain];
 	@try {
 		@synchronized (self) {
 			[_inRunLoop OF_removeTimer: self];
 
-			OF_SETTER(_fireDate, fireDate, YES, 0)
+			OF_SETTER(_fireDate, fireDate, true, 0)
 
 			[_inRunLoop addTimer: self];
 		}
 	} @finally {
 		[self release];
@@ -436,17 +436,17 @@
 	return _interval;
 }
 
 - (void)invalidate
 {
-	_valid = NO;
+	_valid = false;
 
 	[_target release];
 	_target = nil;
 }
 
-- (BOOL)isValid
+- (bool)isValid
 {
 	return _valid;
 }
 
 #ifdef OF_HAVE_THREADS
@@ -453,11 +453,11 @@
 - (void)waitUntilDone
 {
 	[_condition lock];
 	@try {
 		if (_done) {
-			_done = NO;
+			_done = false;
 			return;
 		}
 
 		[_condition wait];
 	} @finally {
@@ -466,8 +466,8 @@
 }
 #endif
 
 - (void)OF_setInRunLoop: (OFRunLoop*)inRunLoop
 {
-	OF_SETTER(_inRunLoop, inRunLoop, YES, 0)
+	OF_SETTER(_inRunLoop, inRunLoop, true, 0)
 }
 @end