@@ -22,11 +22,11 @@
 
 #include <assert.h>
 
 #if defined(OF_APPLE_RUNTIME) && !defined(__OBJC2__)
 # import <objc/runtime.h>
-#elif defined(OBJFW_RUNTIME)
+#elif defined(OF_OBJFW_RUNTIME)
 # import "runtime-private.h"
 #endif
 
 #import "OFBlock.h"
 
@@ -84,33 +84,33 @@
 
 #if defined(OF_OBJFW_RUNTIME)
 extern void __objc_exec_class(void*);
 
 /* Begin of ObjC module */
-static struct objc_abi_metaclass _NSConcreteStackBlock_metaclass = {
-	"OFBlock", "OFBlock", "OFStackBlock", 8, OBJC_CLASS_INFO_METACLASS,
-	sizeof(struct objc_abi_class), NULL, NULL
+static struct objc_abi_class _NSConcreteStackBlock_metaclass = {
+	(struct objc_abi_class*)"OFBlock", "OFBlock", "OFStackBlock", 8,
+	OBJC_CLASS_INFO_METACLASS, sizeof(struct objc_abi_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_metaclass _NSConcreteGlobalBlock_metaclass = {
-	"OFBlock", "OFBlock", "OFGlobalBlock", 8, OBJC_CLASS_INFO_METACLASS,
-	sizeof(struct objc_abi_class), NULL, NULL
+static struct objc_abi_class _NSConcreteGlobalBlock_metaclass = {
+	(struct objc_abi_class*)"OFBlock", "OFBlock", "OFGlobalBlock", 8,
+	OBJC_CLASS_INFO_METACLASS, sizeof(struct objc_abi_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_metaclass _NSConcreteMallocBlock_metaclass = {
-	"OFBlock", "OFBlock", "OFMallocBlock", 8, OBJC_CLASS_INFO_METACLASS,
-	sizeof(struct objc_abi_class), NULL, NULL
+static struct objc_abi_class _NSConcreteMallocBlock_metaclass = {
+	(struct objc_abi_class*)"OFBlock", "OFBlock", "OFMallocBlock", 8,
+	OBJC_CLASS_INFO_METACLASS, sizeof(struct objc_abi_class), NULL, NULL
 };
 
 struct objc_abi_class _NSConcreteMallocBlock = {
 	&_NSConcreteMallocBlock_metaclass, "OFBlock", "OFMallocBlock",
 	8, OBJC_CLASS_INFO_CLASS, sizeof(of_block_literal_t), NULL, NULL
@@ -119,20 +119,21 @@
 static struct {
 	unsigned int unknown;
 	struct objc_abi_selector *sel_refs;
 	uint16_t cls_def_cnt, cat_def_cnt;
 	void *defs[4];
-} symtab = { 0, NULL, 3, 0, {
-	&_NSConcreteStackBlock, &_NSConcreteGlobalBlock,
-	&_NSConcreteMallocBlock, NULL
-}};
-
-static struct {
-	unsigned long version, size;
-	const char *name;
-	void *symtab;
-} module = { 8, sizeof(module), NULL, &symtab };
+} symtab = {
+	0, NULL, 3, 0,
+	{
+		&_NSConcreteStackBlock, &_NSConcreteGlobalBlock,
+		&_NSConcreteMallocBlock, NULL
+	}
+};
+
+static struct objc_abi_module module = {
+	8, sizeof(module), NULL, (struct objc_abi_symtab*)&symtab
+};
 
 static void __attribute__((constructor))
 constructor(void)
 {
 	__objc_exec_class(&module);