@@ -24,12 +24,10 @@
 #include <proto/exec.h>
 #include <proto/intuition.h>
 
 struct ObjFWRTBase;
 
-#import "inline.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 
 #if defined(OF_AMIGAOS_M68K)
 # include <stabs.h>
@@ -65,10 +63,12 @@
 extern void __deregister_frame(void *);
 #endif
 
 struct Library *ObjFWRTBase;
 void *__objc_class_name_Protocol;
+
+extern bool objc_init(unsigned int version, struct objc_libc *libc);
 
 static void
 error(const char *string, ULONG arg)
 {
 	struct Library *IntuitionBase = OpenLibrary("intuition.library", 0);
@@ -140,11 +140,11 @@
 	if ((ObjFWRTBase = OpenLibrary(OBJFWRT_AMIGA_LIB,
 	    OBJFWRT_LIB_MINOR)) == NULL)
 		error("Failed to open " OBJFWRT_AMIGA_LIB " version %lu!",
 		    OBJFWRT_LIB_MINOR);
 
-	if (!glue_objc_init(1, &libc))
+	if (!objc_init(1, &libc))
 		error("Failed to initialize " OBJFWRT_AMIGA_LIB "!", 0);
 
 	initialized = true;
 }
 
@@ -181,10 +181,10 @@
 __gnu_objc_personality_v0(
 #endif
     int version, int actions, uint64_t exClass, void *ex, void *ctx)
 {
 #ifdef OF_AMIGAOS_M68K
-	return glue___gnu_objc_personality(version, actions, &exClass, ex, ctx);
+	return __gnu_objc_personality(version, actions, &exClass, ex, ctx);
 #else
-	return glue___gnu_objc_personality(version, actions, exClass, ex, ctx);
+	return __gnu_objc_personality(version, actions, &exClass, ex, ctx);
 #endif
 }