@@ -46,10 +46,13 @@
 # include <3ds/svc.h>
 #endif
 
 #import "OFThread.h"
 #import "OFThread+Private.h"
+#ifdef OF_HAVE_ATOMIC_OPS
+# import "OFAtomic.h"
+#endif
 #import "OFDate.h"
 #import "OFDictionary.h"
 #ifdef OF_HAVE_SOCKETS
 # import "OFDNSResolver.h"
 #endif
@@ -75,18 +78,14 @@
 # import "OFThreadJoinFailedException.h"
 # import "OFThreadStartFailedException.h"
 # import "OFThreadStillRunningException.h"
 #endif
 
-#ifdef OF_HAVE_ATOMIC_OPS
-# import "atomic.h"
-#endif
-
 #if defined(OF_HAVE_THREADS)
-# import "tlskey.h"
+# import "OFTLSKey.h"
 # if defined(OF_AMIGAOS) && defined(OF_HAVE_SOCKETS)
-#  import "socket.h"
+#  import "OFSocket.h"
 # endif
 
 static OFTLSKey threadSelfKey;
 static OFThread *mainThread;
 #elif defined(OF_HAVE_SOCKETS)