@@ -36,11 +36,11 @@
 # include <exec/semaphores.h>
 typedef struct SignalSemaphore OFPlainMutex;
 #endif
 
 #if defined(OF_HAVE_ATOMIC_OPS)
-# import "atomic.h"
+# import "OFAtomic.h"
 typedef volatile int OFSpinlock;
 # define OF_SPINCOUNT 10
 #elif defined(OF_HAVE_PTHREAD_SPINLOCKS)
 typedef pthread_spinlock_t OFSpinlock;
 #else
@@ -53,11 +53,11 @@
 
 #if defined(OF_HAVE_RECURSIVE_PTHREAD_MUTEXES) || defined(OF_WINDOWS) || \
     defined(OF_AMIGAOS)
 # define OFPlainRecursiveMutex OFPlainMutex
 #else
-# import "tlskey.h"
+# import "OFTLSKey.h"
 typedef struct {
 	OFPlainMutex mutex;
 	OFTLSKey count;
 } OFPlainRecursiveMutex;
 #endif