@@ -70,11 +70,11 @@
 	struct objc_abi_method_list *ml;
 
 	for (ml = cls->methodlist; ml != NULL; ml = ml->next)
 		for (unsigned int i = 0; i < ml->count; i++)
 			objc_register_selector(
-			    (struct objc_abi_selector*)&ml->methods[i]);
+			    (struct objc_abi_selector *)&ml->methods[i]);
 }
 
 Class
 objc_classname_to_class(const char *name, bool cache)
 {
@@ -133,11 +133,11 @@
 
 	for (struct objc_method_list *ml = cls->isa->methodlist;
 	    ml != NULL; ml = ml->next)
 		for (unsigned int i = 0; i < ml->count; i++)
 			if (sel_isEqual((SEL)&ml->methods[i].sel, selector))
-				((void(*)(id, SEL))ml->methods[i].imp)(cls,
+				((void (*)(id, SEL))ml->methods[i].imp)(cls,
 				    selector);
 }
 
 static bool
 has_load(Class cls)
@@ -270,11 +270,11 @@
 	const char *superclass;
 
 	if (cls->info & OBJC_CLASS_INFO_SETUP)
 		return;
 
-	if ((superclass = ((struct objc_abi_class*)cls)->superclass) != NULL) {
+	if ((superclass = ((struct objc_abi_class *)cls)->superclass) != NULL) {
 		Class super = objc_classname_to_class(superclass, false);
 
 		if (super == Nil)
 			return;
 
@@ -383,11 +383,11 @@
 void
 objc_register_all_classes(struct objc_abi_symtab *symtab)
 {
 	for (uint16_t i = 0; i < symtab->cls_def_cnt; i++) {
 		struct objc_abi_class *cls =
-		    (struct objc_abi_class*)symtab->defs[i];
+		    (struct objc_abi_class *)symtab->defs[i];
 
 		register_class(cls);
 		register_selectors(cls);
 		register_selectors(cls->metaclass);
 	}
@@ -454,11 +454,11 @@
 void
 objc_registerClassPair(Class cls)
 {
 	objc_global_mutex_lock();
 
-	register_class((struct objc_abi_class*)cls);
+	register_class((struct objc_abi_class *)cls);
 
 	if (cls->superclass != Nil) {
 		add_subclass(cls);
 		add_subclass(cls->isa);
 	}
@@ -566,11 +566,11 @@
 	objc_global_mutex_unlock();
 
 	return j;
 }
 
-Class*
+Class *
 objc_copyClassList(unsigned int *len)
 {
 	Class *ret;
 	unsigned int count;
 
@@ -599,11 +599,11 @@
 		return false;
 
 	return (cls->info & OBJC_CLASS_INFO_METACLASS);
 }
 
-const char*
+const char *
 class_getName(Class cls)
 {
 	if (cls == Nil)
 		return "";
 
@@ -668,11 +668,11 @@
 
 	dummy.isa = cls;
 	return objc_msg_lookup_stret((id)&dummy, sel);
 }
 
-static struct objc_method*
+static struct objc_method *
 get_method(Class cls, SEL sel)
 {
 	struct objc_method_list *ml;
 	struct objc_category **cats;
 
@@ -717,11 +717,11 @@
 	cls->methodlist = ml;
 
 	objc_update_dtable(cls);
 }
 
-const char*
+const char *
 class_getMethodTypeEncoding(Class cls, SEL sel)
 {
 	struct objc_method *method;
 
 	if (cls == Nil)
@@ -789,11 +789,11 @@
 	struct objc_object *obj;
 
 	if (obj_ == nil)
 		return Nil;
 
-	obj = (struct objc_object*)obj_;
+	obj = (struct objc_object *)obj_;
 
 	return obj->isa;
 }
 
 Class
@@ -803,28 +803,28 @@
 	Class old;
 
 	if (obj_ == nil)
 		return Nil;
 
-	obj = (struct objc_object*)obj_;
+	obj = (struct objc_object *)obj_;
 
 	old = obj->isa;
 	obj->isa = cls;
 
 	return old;
 }
 
-const char*
+const char *
 object_getClassName(id obj)
 {
 	return class_getName(object_getClass(obj));
 }
 
 static void
 unregister_class(Class rcls)
 {
-	struct objc_abi_class *cls = (struct objc_abi_class*)rcls;
+	struct objc_abi_class *cls = (struct objc_abi_class *)rcls;
 
 	if ((rcls->info & OBJC_CLASS_INFO_SETUP) &&
 	    rcls->superclass != Nil &&
 	    rcls->superclass->subclass_list != NULL) {
 		size_t i = SIZE_MAX, count = 0;