@@ -97,11 +97,11 @@
 			if (sel_isEqual((SEL)&ml->methods[i].sel, selector))
 				((void(*)(id, SEL))ml->methods[i].imp)(cls,
 				    selector);
 }
 
-static BOOL
+static bool
 has_load(Class cls)
 {
 	struct objc_method_list *ml;
 	SEL selector;
 	unsigned int i;
@@ -109,13 +109,13 @@
 	selector = sel_registerName("load");
 
 	for (ml = cls->isa->methodlist; ml != NULL; ml = ml->next)
 		for (i = 0; i < ml->count; i++)
 			if (sel_isEqual((SEL)&ml->methods[i].sel, selector))
-				return YES;
+				return true;
 
-	return NO;
+	return false;
 }
 
 static void
 call_load(Class cls)
 {
@@ -404,11 +404,11 @@
 objc_get_class(const char *name)
 {
 	return objc_getRequiredClass(name);
 }
 
-BOOL
+bool
 class_isMetaClass(Class cls)
 {
 	return (cls->info & OBJC_CLASS_INFO_METACLASS);
 }
 
@@ -422,20 +422,20 @@
 class_getSuperclass(Class cls)
 {
 	return cls->superclass;
 }
 
-BOOL
+bool
 class_isKindOfClass(Class cls1, Class cls2)
 {
 	Class iter;
 
 	for (iter = cls1; iter != Nil; iter = iter->superclass)
 		if (iter == cls2)
-			return YES;
+			return true;
 
-	return NO;
+	return false;
 }
 
 unsigned long
 class_getInstanceSize(Class cls)
 {