@@ -70,34 +70,34 @@
 @end
 
 #ifdef OF_OBJFW_RUNTIME
 /* Begin of ObjC module */
 static struct objc_class _NSConcreteStackBlock_metaclass = {
-	(Class)(void *)"OFObject", (Class)(void *)"OFBlock", "OFStackBlock", 8,
-	OBJC_CLASS_INFO_METACLASS, sizeof(struct objc_class), NULL, NULL
+	Nil, Nil, "OFStackBlock", 8, OBJC_CLASS_INFO_METACLASS,
+	sizeof(_NSConcreteStackBlock_metaclass), NULL, NULL
 };
 
 struct objc_class _NSConcreteStackBlock = {
 	&_NSConcreteStackBlock_metaclass, (Class)(void *)"OFBlock",
 	"OFStackBlock", 8, OBJC_CLASS_INFO_CLASS, sizeof(of_block_literal_t),
 	NULL, NULL
 };
 
 static struct objc_class _NSConcreteGlobalBlock_metaclass = {
-	(Class)(void *)"OFObject", (Class)(void *)"OFBlock", "OFGlobalBlock", 8,
-	OBJC_CLASS_INFO_METACLASS, sizeof(struct objc_class), NULL, NULL
+	Nil, Nil, "OFGlobalBlock", 8, OBJC_CLASS_INFO_METACLASS,
+	sizeof(_NSConcreteGlobalBlock_metaclass), NULL, NULL
 };
 
 struct objc_class _NSConcreteGlobalBlock = {
 	&_NSConcreteGlobalBlock_metaclass, (Class)(void *)"OFBlock",
 	"OFGlobalBlock", 8, OBJC_CLASS_INFO_CLASS, sizeof(of_block_literal_t),
 	NULL, NULL
 };
 
 static struct objc_class _NSConcreteMallocBlock_metaclass = {
-	(Class)(void *)"OFObject", (Class)(void *)"OFBlock", "OFMallocBlock", 8,
-	OBJC_CLASS_INFO_METACLASS, sizeof(struct objc_class), NULL, NULL
+	Nil, Nil, "OFMallocBlock", 8, OBJC_CLASS_INFO_METACLASS,
+	sizeof(_NSConcreteMallocBlock_metaclass), NULL, NULL
 };
 
 struct objc_class _NSConcreteMallocBlock = {
 	&_NSConcreteMallocBlock_metaclass, (Class)(void *)"OFBlock",
 	"OFMallocBlock", 8, OBJC_CLASS_INFO_CLASS, sizeof(of_block_literal_t),