@@ -15,21 +15,20 @@
 
 #include "config.h"
 
 #include <stdbool.h>
 
-#import "once.h"
+#import "OFOnce.h"
+#if defined(OF_HAVE_THREADS) && defined(OF_HAVE_ATOMIC_OPS)
+# import "OFAtomic.h"
+# import "OFPlainMutex.h"
+#endif
 
 #ifdef OF_AMIGAOS
 # include <proto/exec.h>
 #endif
 
-#if defined(OF_HAVE_THREADS) && defined(OF_HAVE_ATOMIC_OPS)
-# import "atomic.h"
-# import "mutex.h"
-#endif
-
 void
 OFOnce(OFOnceControl *control, void (*func)(void))
 {
 #if !defined(OF_HAVE_THREADS)
 	if (*control == 0) {