Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -933,5 +933,18 @@
 	printf "  ** To get optimal performance and be able to use all "
 	echo "features, you should "
 	echo "  ** install Clang >= 3.2."
 	echo
 ])
+
+AS_IF([test x"$enable_threads" != x"no" -a x"$atomic_ops" = x"none" \
+    -a x"ac_cv_func_pthread_spin_lock" != x"yes"], [
+	echo
+	printf "  ** Warning: You have enabled threads, but neither atomic "
+	echo "operations nor"
+	printf "  ** spinlocks are available. Expect *very* poor performance, "
+	echo "as a mutex will"
+	printf "  ** be locked for every retain and release! If you don't "
+	echo "need threads, try"
+	echo "  ** --disable-threads to work around this problem."
+	echo
+])

Index: src/exceptions/OFException.m
==================================================================
--- src/exceptions/OFException.m
+++ src/exceptions/OFException.m
@@ -28,11 +28,11 @@
 #import "OFString.h"
 #import "OFArray.h"
 
 #import "autorelease.h"
 
-#ifdef _WIN32
+#if defined(_WIN32) && defined(OF_HAVE_SOCKETS)
 # include <errno.h>
 # include <winerror.h>
 #endif
 
 struct _Unwind_Context;