diff --git a/Source/GSFFIInvocation.m b/Source/GSFFIInvocation.m
index 7199c78f8..f962e6fab 100644
--- a/Source/GSFFIInvocation.m
+++ b/Source/GSFFIInvocation.m
@@ -33,6 +33,9 @@
 #import <pthread.h>
 #import "cifframe.h"
 #import "GSPrivate.h"
+#ifdef __GNUSTEP_RUNTIME__
+#include <objc/hooks.h>
+#endif
 
 #ifndef INLINE
 #define INLINE inline
@@ -301,7 +304,8 @@ static id gs_objc_proxy_lookup(id receiver, SEL op)
 {
 #ifdef __GNUSTEP_RUNTIME__
   pthread_key_create(&thread_slot_key, free);
-  objc_msg_forward3 = gs_objc_msg_forward3;
+  __objc_msg_forward3 = gs_objc_msg_forward3;
+  __objc_msg_forward2 = gs_objc_msg_forward2;
   objc_proxy_lookup = gs_objc_proxy_lookup;
 #else
 #if	HAVE_FORWARD2