Index: src/OFApplication.m
==================================================================
--- src/OFApplication.m
+++ src/OFApplication.m
@@ -25,13 +25,11 @@
 #import "OFApplication.h"
 #import "OFString.h"
 #import "OFArray.h"
 #import "OFDictionary.h"
 #import "OFRunLoop.h"
-#ifdef OF_HAVE_THREADS
-# import "OFThread.h"
-#endif
+#import "OFThread.h"
 
 #import "autorelease.h"
 #import "macros.h"
 
 #if defined(__MACH__) && !defined(OF_IOS)

Index: src/OFObject.m
==================================================================
--- src/OFObject.m
+++ src/OFObject.m
@@ -25,14 +25,11 @@
 #include <sys/time.h>
 
 #import "OFObject.h"
 #import "OFTimer.h"
 #import "OFRunLoop.h"
-#ifdef OF_HAVE_THREADS
-# import "OFThread.h"
-#endif
-#import "OFAutoreleasePool.h"
+#import "OFThread.h"
 
 #import "OFAllocFailedException.h"
 #import "OFEnumerationMutationException.h"
 #import "OFInitializationFailedException.h"
 #import "OFInvalidArgumentException.h"

Index: src/OFTCPSocket.m
==================================================================
--- src/OFTCPSocket.m
+++ src/OFTCPSocket.m
@@ -38,13 +38,11 @@
 #endif
 
 #import "OFTCPSocket.h"
 #import "OFTCPSocket+SOCKS5.h"
 #import "OFString.h"
-#ifdef OF_HAVE_THREADS
-# import "OFThread.h"
-#endif
+#import "OFThread.h"
 #import "OFTimer.h"
 #import "OFRunLoop.h"
 
 #import "OFAcceptFailedException.h"
 #import "OFAlreadyConnectedException.h"