@@ -21,12 +21,13 @@
 
 #import "runtime.h"
 #import "runtime-private.h"
 #import "threading.h"
 
-static of_rmutex_t global_mutex;
-static of_once_t once_control = OF_ONCE_INIT;
+#import "globals.h"
+#define global_mutex objc_globals.global_mutex
+#define global_once_control objc_globals.global_once_control
 
 static void
 init(void)
 {
 	if (!of_rmutex_new(&global_mutex))
@@ -34,11 +35,11 @@
 }
 
 void
 objc_global_mutex_lock(void)
 {
-	of_once(&once_control, init);
+	of_once(&global_once_control, init);
 
 	if (!of_rmutex_lock(&global_mutex))
 		OBJC_ERROR("Failed to lock global mutex!");
 }