@@ -29,13 +29,20 @@
 # include <sys/random.h>
 #endif
 
 #import "OFObject.h"
 #import "OFArray.h"
+#ifdef OF_HAVE_ATOMIC_OPS
+# import "OFAtomic.h"
+#endif
 #import "OFLocale.h"
 #import "OFMethodSignature.h"
 #import "OFRunLoop.h"
+#if !defined(OF_HAVE_ATOMIC_OPS) && defined(OF_HAVE_THREADS)
+# import "OFPlainMutex.h"	/* For OFSpinlock */
+#endif
+#import "OFString.h"
 #import "OFThread.h"
 #import "OFTimer.h"
 
 #import "OFAllocFailedException.h"
 #import "OFEnumerationMutationException.h"
@@ -58,18 +65,10 @@
 
 #ifdef OF_AMIGAOS
 # include <proto/exec.h>
 #endif
 
-#import "OFString.h"
-
-#if defined(OF_HAVE_ATOMIC_OPS)
-# import "atomic.h"
-#elif defined(OF_HAVE_THREADS)
-# import "mutex.h"
-#endif
-
 #ifdef OF_APPLE_RUNTIME
 extern id _Nullable _objc_rootAutorelease(id _Nullable object);
 #endif
 #if defined(OF_HAVE_FORWARDING_TARGET_FOR_SELECTOR)
 extern id OFForward(id, SEL, ...);