@@ -80,14 +80,16 @@
 #import "OFAlreadyConnectedException.h"
 #import "OFBindFailedException.h"
 #import "OFChangeDirectoryFailedException.h"
 #import "OFChangeFileModeFailedException.h"
 #import "OFChangeFileOwnerFailedException.h"
-#import "OFConditionBroadcastFailedException.h"
-#import "OFConditionSignalFailedException.h"
-#import "OFConditionStillWaitingException.h"
-#import "OFConditionWaitFailedException.h"
+#ifdef OF_THREADS
+# import "OFConditionBroadcastFailedException.h"
+# import "OFConditionSignalFailedException.h"
+# import "OFConditionStillWaitingException.h"
+# import "OFConditionWaitFailedException.h"
+#endif
 #import "OFConnectionFailedException.h"
 #import "OFCopyFileFailedException.h"
 #import "OFCreateDirectoryFailedException.h"
 #import "OFDeleteDirectoryFailedException.h"
 #import "OFDeleteFileFailedException.h"
@@ -102,13 +104,15 @@
 #import "OFInvalidServerReplyException.h"
 #import "OFLinkFailedException.h"
 #import "OFListenFailedException.h"
 #import "OFMalformedXMLException.h"
 #import "OFMemoryNotPartOfObjectException.h"
-#import "OFMutexLockFailedException.h"
-#import "OFMutexStillLockedException.h"
-#import "OFMutexUnlockFailedException.h"
+#ifdef OF_THREADS
+# import "OFMutexLockFailedException.h"
+# import "OFMutexStillLockedException.h"
+# import "OFMutexUnlockFailedException.h"
+#endif
 #import "OFNotConnectedException.h"
 #import "OFNotImplementedException.h"
 #import "OFOpenFileFailedException.h"
 #import "OFOutOfMemoryException.h"
 #import "OFOutOfRangeException.h"
@@ -116,13 +120,15 @@
 #import "OFReadOrWriteFailedException.h"
 #import "OFRenameFileFailedException.h"
 #import "OFSeekFailedException.h"
 #import "OFSetOptionFailedException.h"
 #import "OFSymlinkFailedException.h"
-#import "OFThreadJoinFailedException.h"
-#import "OFThreadStartFailedException.h"
-#import "OFThreadStillRunningException.h"
+#ifdef OF_THREADS
+# import "OFThreadJoinFailedException.h"
+# import "OFThreadStartFailedException.h"
+# import "OFThreadStillRunningException.h"
+#endif
 #import "OFTruncatedDataException.h"
 #import "OFUnboundNamespaceException.h"
 #import "OFUnsupportedProtocolException.h"
 #import "OFWriteFailedException.h"
 
@@ -135,15 +141,19 @@
 #ifdef OF_ATOMIC_OPS
 # import "atomic.h"
 #endif
 
 #ifdef OF_THREADS
+# import "threading.h"
 # import "OFThread.h"
 # import "OFThreadPool.h"
-# import "threading.h"
+# import "OFTLSKey.h"
+# import "OFMutex.h"
+# import "OFRecursiveMutex.h"
+# import "OFCondition.h"
 #endif
 
 #import "autorelease.h"
 #import "asprintf.h"
 #import "base64.h"
 #import "of_asprintf.h"
 #import "of_strptime.h"