@@ -13,16 +13,15 @@
  * Public License, either version 2 or 3, which can be found in the file
  * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
  * file.
  */
 
-#define OF_THREAD_M
+#include "config.h"
+
 #define _POSIX_TIMERS
 #define __NO_EXT_QNX
 
-#include "config.h"
-
 #include <errno.h>
 
 #include <stdlib.h>
 #include <math.h>
 #include <time.h>
@@ -90,11 +89,16 @@
 #  import "socket.h"
 # endif
 
 static of_tlskey_t threadSelfKey;
 static OFThread *mainThread;
+#elif defined(OF_HAVE_SOCKETS)
+static OFDNSResolver *DNSResolver;
+#endif
 
+@implementation OFThread
+#ifdef OF_HAVE_THREADS
 static void
 callMain(id object)
 {
 	OFThread *thread = (OFThread *)object;
 	OFString *name;
@@ -143,16 +147,11 @@
 
 	thread->_running = OF_THREAD_WAITING_FOR_JOIN;
 
 	[thread release];
 }
-#elif defined(OF_HAVE_SOCKETS)
-static OFDNSResolver *DNSResolver;
-#endif
 
-@implementation OFThread
-#ifdef OF_HAVE_THREADS
 @synthesize name = _name;
 # ifdef OF_HAVE_BLOCKS
 @synthesize threadBlock = _threadBlock;
 # endif