@@ -21,17 +21,17 @@
 #include <stdlib.h>
 
 #import "ObjFWRT.h"
 #import "private.h"
 
-static struct objc_abi_static_instances **staticInstancesList = NULL;
+static struct objc_static_instances **staticInstancesList = NULL;
 static size_t staticInstancesCount = 0;
 
 void
-objc_init_static_instances(struct objc_abi_symtab *symtab)
+objc_init_static_instances(struct objc_symtab *symtab)
 {
-	struct objc_abi_static_instances **staticInstances;
+	struct objc_static_instances **staticInstances;
 
 	/* Check if the class for a static instance became available */
 	for (size_t i = 0; i < staticInstancesCount; i++) {
 		Class class = objc_lookUpClass(
 		    staticInstancesList[i]->className);
@@ -51,11 +51,11 @@
 
 			staticInstancesList[i] =
 			    staticInstancesList[staticInstancesCount];
 
 			staticInstancesList = realloc(staticInstancesList,
-			    sizeof(struct objc_abi_static_instances *) *
+			    sizeof(*staticInstancesList) *
 			    staticInstancesCount);
 
 			if (staticInstancesList == NULL)
 				OBJC_ERROR("Not enough memory for list of "
 				    "static instances!");
@@ -66,11 +66,11 @@
 			 */
 			i--;
 		}
 	}
 
-	staticInstances = (struct objc_abi_static_instances **)
+	staticInstances = (struct objc_static_instances **)
 	    symtab->defs[symtab->classDefsCount + symtab->categoryDefsCount];
 
 	if (staticInstances == NULL)
 		return;
 
@@ -81,11 +81,11 @@
 			for (id *instances = (*staticInstances)->instances;
 			    *instances != nil; instances++)
 				object_setClass(*instances, class);
 		} else {
 			staticInstancesList = realloc(staticInstancesList,
-			    sizeof(struct objc_abi_static_instances *) *
+			    sizeof(*staticInstancesList) *
 			    (staticInstancesCount + 1));
 
 			if (staticInstancesList == NULL)
 				OBJC_ERROR("Not enough memory for list of "
 				    "static instances!");