@@ -18,12 +18,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 
 #import "ObjFWRT.h"
 #import "private.h"
-#import "mutex.h"
-#import "once.h"
+
+#import "OFOnce.h"
+#import "OFPlainMutex.h"
 
 static OFPlainRecursiveMutex globalMutex;
 
 static void
 init(void)