@@ -133,11 +133,11 @@
 	if (class_isMetaClass(object_getClass(obj))) {
 		if ([obj respondsToSelector: @selector(resolveClassMethod:)] &&
 		    [obj resolveClassMethod: sel]) {
 			if (![obj respondsToSelector: sel]) {
 				fprintf(stderr, "Runtime error: [%s "
-				    "resolveClassMethod: %s] returned YES "
+				    "resolveClassMethod: %s] returned true "
 				    "without adding the method!\n",
 				    class_getName(obj), sel_getName(sel));
 				abort();
 			}
 
@@ -148,11 +148,11 @@
 
 		if ([c respondsToSelector: @selector(resolveInstanceMethod:)] &&
 		    [c resolveInstanceMethod: sel]) {
 			if (![obj respondsToSelector: sel]) {
 				fprintf(stderr, "Runtime error: [%s "
-				    "resolveInstanceMethod: %s] returned YES "
+				    "resolveInstanceMethod: %s] returned true "
 				    "without adding the method!\n",
 				    class_getName(object_getClass(obj)),
 				    sel_getName(sel));
 				abort();
 			}
@@ -292,40 +292,40 @@
 {
 	return [OFString stringWithCString: class_getName(self)
 				  encoding: OF_STRING_ENCODING_ASCII];
 }
 
-+ (BOOL)isSubclassOfClass: (Class)class
++ (bool)isSubclassOfClass: (Class)class
 {
 	Class iter;
 
 	for (iter = self; iter != Nil; iter = class_getSuperclass(iter))
 		if (iter == class)
-			return YES;
+			return true;
 
-	return NO;
+	return false;
 }
 
 + (Class)superclass
 {
 	return class_getSuperclass(self);
 }
 
-+ (BOOL)instancesRespondToSelector: (SEL)selector
++ (bool)instancesRespondToSelector: (SEL)selector
 {
 	return class_respondsToSelector(self, selector);
 }
 
-+ (BOOL)conformsToProtocol: (Protocol*)protocol
++ (bool)conformsToProtocol: (Protocol*)protocol
 {
 	Class c;
 
 	for (c = self; c != Nil; c = class_getSuperclass(c))
 		if (class_conformsToProtocol(c, protocol))
-			return YES;
+			return true;
 
-	return NO;
+	return false;
 }
 
 + (IMP)instanceMethodForSelector: (SEL)selector
 {
 	return class_getMethodImplementation(self, selector);
@@ -489,18 +489,18 @@
 #endif
 
 	[self inheritMethodsFromClass: [class superclass]];
 }
 
-+ (BOOL)resolveClassMethod: (SEL)selector
++ (bool)resolveClassMethod: (SEL)selector
 {
-	return NO;
+	return false;
 }
 
-+ (BOOL)resolveInstanceMethod: (SEL)selector
++ (bool)resolveInstanceMethod: (SEL)selector
 {
-	return NO;
+	return false;
 }
 
 - init
 {
 	return self;
@@ -515,33 +515,33 @@
 {
 	return [OFString stringWithCString: object_getClassName(self)
 				  encoding: OF_STRING_ENCODING_ASCII];
 }
 
-- (BOOL)isKindOfClass: (Class)class
+- (bool)isKindOfClass: (Class)class
 {
 	Class iter;
 
 	for (iter = object_getClass(self); iter != Nil;
 	    iter = class_getSuperclass(iter))
 		if (iter == class)
-			return YES;
+			return true;
 
-	return NO;
+	return false;
 }
 
-- (BOOL)isMemberOfClass: (Class)class
+- (bool)isMemberOfClass: (Class)class
 {
 	return (object_getClass(self) == class);
 }
 
-- (BOOL)respondsToSelector: (SEL)selector
+- (bool)respondsToSelector: (SEL)selector
 {
 	return class_respondsToSelector(object_getClass(self), selector);
 }
 
-- (BOOL)conformsToProtocol: (Protocol*)protocol
+- (bool)conformsToProtocol: (Protocol*)protocol
 {
 	return [object_getClass(self) conformsToProtocol: protocol];
 }
 
 - (IMP)methodForSelector: (SEL)selector
@@ -590,11 +590,11 @@
 	void *pool = objc_autoreleasePoolPush();
 
 	[OFTimer scheduledTimerWithTimeInterval: delay
 					 target: self
 				       selector: selector
-					repeats: NO];
+					repeats: false];
 
 	objc_autoreleasePoolPop(pool);
 }
 
 - (void)performSelector: (SEL)selector
@@ -605,11 +605,11 @@
 
 	[OFTimer scheduledTimerWithTimeInterval: delay
 					 target: self
 				       selector: selector
 					 object: object
-					repeats: NO];
+					repeats: false];
 
 	objc_autoreleasePoolPop(pool);
 }
 
 - (void)performSelector: (SEL)selector
@@ -622,25 +622,25 @@
 	[OFTimer scheduledTimerWithTimeInterval: delay
 					 target: self
 				       selector: selector
 					 object: object1
 					 object: object2
-					repeats: NO];
+					repeats: false];
 
 	objc_autoreleasePoolPop(pool);
 }
 
 #ifdef OF_HAVE_THREADS
 - (void)performSelector: (SEL)selector
 	       onThread: (OFThread*)thread
-	  waitUntilDone: (BOOL)waitUntilDone
+	  waitUntilDone: (bool)waitUntilDone
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFTimer *timer = [OFTimer timerWithTimeInterval: 0
 						 target: self
 					       selector: selector
-						repeats: NO];
+						repeats: false];
 	[[thread runLoop] addTimer: timer];
 
 	if (waitUntilDone)
 		[timer waitUntilDone];
 
@@ -648,18 +648,18 @@
 }
 
 - (void)performSelector: (SEL)selector
 	       onThread: (OFThread*)thread
 	     withObject: (id)object
-	  waitUntilDone: (BOOL)waitUntilDone
+	  waitUntilDone: (bool)waitUntilDone
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFTimer *timer = [OFTimer timerWithTimeInterval: 0
 						 target: self
 					       selector: selector
 						 object: object
-						repeats: NO];
+						repeats: false];
 	[[thread runLoop] addTimer: timer];
 
 	if (waitUntilDone)
 		[timer waitUntilDone];
 
@@ -668,35 +668,35 @@
 
 - (void)performSelector: (SEL)selector
 	       onThread: (OFThread*)thread
 	     withObject: (id)object1
 	     withObject: (id)object2
-	  waitUntilDone: (BOOL)waitUntilDone
+	  waitUntilDone: (bool)waitUntilDone
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFTimer *timer = [OFTimer timerWithTimeInterval: 0
 						 target: self
 					       selector: selector
 						 object: object1
 						 object: object2
-						repeats: NO];
+						repeats: false];
 	[[thread runLoop] addTimer: timer];
 
 	if (waitUntilDone)
 		[timer waitUntilDone];
 
 	objc_autoreleasePoolPop(pool);
 }
 
 - (void)performSelectorOnMainThread: (SEL)selector
-		      waitUntilDone: (BOOL)waitUntilDone
+		      waitUntilDone: (bool)waitUntilDone
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFTimer *timer = [OFTimer timerWithTimeInterval: 0
 						 target: self
 					       selector: selector
-						repeats: NO];
+						repeats: false];
 	[[OFRunLoop mainRunLoop] addTimer: timer];
 
 	if (waitUntilDone)
 		[timer waitUntilDone];
 
@@ -703,18 +703,18 @@
 	objc_autoreleasePoolPop(pool);
 }
 
 - (void)performSelectorOnMainThread: (SEL)selector
 			 withObject: (id)object
-		      waitUntilDone: (BOOL)waitUntilDone
+		      waitUntilDone: (bool)waitUntilDone
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFTimer *timer = [OFTimer timerWithTimeInterval: 0
 						 target: self
 					       selector: selector
 						 object: object
-						repeats: NO];
+						repeats: false];
 	[[OFRunLoop mainRunLoop] addTimer: timer];
 
 	if (waitUntilDone)
 		[timer waitUntilDone];
 
@@ -722,19 +722,19 @@
 }
 
 - (void)performSelectorOnMainThread: (SEL)selector
 			 withObject: (id)object1
 			 withObject: (id)object2
-		      waitUntilDone: (BOOL)waitUntilDone
+		      waitUntilDone: (bool)waitUntilDone
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFTimer *timer = [OFTimer timerWithTimeInterval: 0
 						 target: self
 					       selector: selector
 						 object: object1
 						 object: object2
-						repeats: NO];
+						repeats: false];
 	[[OFRunLoop mainRunLoop] addTimer: timer];
 
 	if (waitUntilDone)
 		[timer waitUntilDone];
 
@@ -748,11 +748,11 @@
 	void *pool = objc_autoreleasePoolPush();
 
 	[[thread runLoop] addTimer: [OFTimer timerWithTimeInterval: delay
 							    target: self
 							  selector: selector
-							   repeats: NO]];
+							   repeats: false]];
 
 	objc_autoreleasePoolPop(pool);
 }
 
 - (void)performSelector: (SEL)selector
@@ -764,11 +764,11 @@
 
 	[[thread runLoop] addTimer: [OFTimer timerWithTimeInterval: delay
 							    target: self
 							  selector: selector
 							    object: object
-							   repeats: NO]];
+							   repeats: false]];
 
 	objc_autoreleasePoolPop(pool);
 }
 
 - (void)performSelector: (SEL)selector
@@ -782,11 +782,11 @@
 	[[thread runLoop] addTimer: [OFTimer timerWithTimeInterval: delay
 							    target: self
 							  selector: selector
 							    object: object1
 							    object: object2
-							   repeats: NO]];
+							   repeats: false]];
 
 	objc_autoreleasePoolPop(pool);
 }
 #endif
 
@@ -803,11 +803,11 @@
 
 	return method_getTypeEncoding(m);
 #endif
 }
 
-- (BOOL)isEqual: (id)object
+- (bool)isEqual: (id)object
 {
 	return (self == object);
 }
 
 - (uint32_t)hash
@@ -1014,13 +1014,13 @@
 - self
 {
 	return self;
 }
 
-- (BOOL)isProxy
+- (bool)isProxy
 {
-	return NO;
+	return false;
 }
 
 - (void)dealloc
 {
 	struct pre_mem *iter;