@@ -85,11 +85,11 @@
 #import "OFAlreadyConnectedException.h"
 #import "OFBindFailedException.h"
 #import "OFChangeDirectoryFailedException.h"
 #import "OFChangeFileModeFailedException.h"
 #import "OFChangeFileOwnerFailedException.h"
-#ifdef OF_THREADS
+#ifdef OF_HAVE_THREADS
 # import "OFConditionBroadcastFailedException.h"
 # import "OFConditionSignalFailedException.h"
 # import "OFConditionStillWaitingException.h"
 # import "OFConditionWaitFailedException.h"
 #endif
@@ -122,11 +122,11 @@
 #import "OFRenameFileFailedException.h"
 #import "OFSeekFailedException.h"
 #import "OFSetOptionFailedException.h"
 #import "OFStillLockedException.h"
 #import "OFSymlinkFailedException.h"
-#ifdef OF_THREADS
+#ifdef OF_HAVE_THREADS
 # import "OFThreadJoinFailedException.h"
 # import "OFThreadStartFailedException.h"
 # import "OFThreadStillRunningException.h"
 #endif
 #import "OFTruncatedDataException.h"
@@ -135,20 +135,20 @@
 #import "OFUnsupportedProtocolException.h"
 #import "OFWriteFailedException.h"
 
 #import "macros.h"
 
-#ifdef OF_PLUGINS
+#ifdef OF_HAVE_PLUGINS
 # import "OFPlugin.h"
 #endif
 
-#ifdef OF_ATOMIC_OPS
+#ifdef OF_HAVE_ATOMIC_OPS
 # import "atomic.h"
 #endif
 
 #import "OFLocking.h"
-#ifdef OF_THREADS
+#ifdef OF_HAVE_THREADS
 # import "threading.h"
 # import "OFThread.h"
 # import "OFThreadPool.h"
 # import "OFTLSKey.h"
 # import "OFMutex.h"