@@ -18,12 +18,21 @@
 #import "OFBlock.h"
 #import "OFAutoreleasePool.h"
 
 #if defined(OF_GNU_RUNTIME) || defined(OF_OBJFW_RUNTIME)
 struct objc_abi_class {
-	struct objc_abi_class *metaclass;
+	struct objc_abi_metaclass *metaclass;
 	const char *superclass, *name;
+	unsigned long version, info, instance_size;
+	void *ivars, *methodlist, *dtable, *subclass_list, *sibling_class;
+	void *protocols, *gc_object_type;
+	long abi_version;
+	void *ivar_offsets, *properties;
+};
+
+struct objc_abi_metaclass {
+	const char *metaclass, *superclass, *name;
 	unsigned long version, info, instance_size;
 	void *ivars, *methodlist, *dtable, *subclass_list, *sibling_class;
 	void *protocols, *gc_object_type;
 	long abi_version;
 	void *ivar_offsets, *properties;
@@ -35,33 +44,33 @@
 };
 
 extern void __objc_exec_class(void*);
 
 /* Begin of ObjC module */
-static struct objc_abi_class _NSConcreteStackBlock_metaclass = {
-	&_NSConcreteStackBlock_metaclass, "OFBlock", "OFStackBlock", 8,
-	OBJC_CLASS_INFO_METACLASS, sizeof(struct objc_class), NULL, NULL
+static struct objc_abi_metaclass _NSConcreteStackBlock_metaclass = {
+	"OFBlock", "OFBlock", "OFStackBlock", 8, OBJC_CLASS_INFO_METACLASS,
+	sizeof(struct objc_class), NULL, NULL
 };
 
 struct objc_abi_class _NSConcreteStackBlock = {
 	&_NSConcreteStackBlock_metaclass, "OFBlock", "OFStackBlock", 8,
 	OBJC_CLASS_INFO_CLASS, sizeof(of_block_literal_t), NULL, NULL
 };
 
-static struct objc_abi_class _NSConcreteGlobalBlock_metaclass = {
-	&_NSConcreteGlobalBlock_metaclass, "OFBlock", "OFGlobalBlock",
-	8, OBJC_CLASS_INFO_METACLASS, sizeof(struct objc_class), NULL, NULL
+static struct objc_abi_metaclass _NSConcreteGlobalBlock_metaclass = {
+	"OFBlock", "OFBlock", "OFGlobalBlock", 8, OBJC_CLASS_INFO_METACLASS,
+	sizeof(struct objc_class), NULL, NULL
 };
 
 struct objc_abi_class _NSConcreteGlobalBlock = {
 	&_NSConcreteGlobalBlock_metaclass, "OFBlock", "OFGlobalBlock",
 	8, OBJC_CLASS_INFO_CLASS, sizeof(of_block_literal_t), NULL, NULL
 };
 
-static struct objc_abi_class _NSConcreteMallocBlock_metaclass = {
-	&_NSConcreteMallocBlock_metaclass, "OFBlock", "OFMallocBlock",
-	8, OBJC_CLASS_INFO_METACLASS, sizeof(struct objc_class), NULL, NULL
+static struct objc_abi_metaclass _NSConcreteMallocBlock_metaclass = {
+	"OFBlock", "OFBlock", "OFMallocBlock", 8, OBJC_CLASS_INFO_METACLASS,
+	sizeof(struct objc_class), NULL, NULL
 };
 
 struct objc_abi_class _NSConcreteMallocBlock = {
 	&_NSConcreteMallocBlock_metaclass, "OFBlock", "OFMallocBlock",
 	8, OBJC_CLASS_INFO_CLASS, sizeof(of_block_literal_t), NULL, NULL