Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -1230,10 +1230,11 @@
 ])
 
 AS_IF([test x"$enable_sockets" != x"no" -a x"$enable_threads" != x"no"], [
 	AC_SUBST(OFHTTPCLIENT_M, "OFHTTPClient.m")
 	AC_SUBST(OFHTTPCLIENTTESTS_M, "OFHTTPClientTests.m")
+	AC_SUBST(OFURLHANDLER_HTTP_M, "OFURLHandler_HTTP.m")
 
 	AS_IF([test x"$enable_files" != x"no"], [
 		AC_SUBST(OFHTTP, "ofhttp")
 	])
 ])

Index: extra.mk.in
==================================================================
--- extra.mk.in
+++ extra.mk.in
@@ -57,10 +57,11 @@
 OFKERNELEVENTOBSERVER_KQUEUE_M = @OFKERNELEVENTOBSERVER_KQUEUE_M@
 OFKERNELEVENTOBSERVER_POLL_M = @OFKERNELEVENTOBSERVER_POLL_M@
 OFKERNELEVENTOBSERVER_SELECT_M = @OFKERNELEVENTOBSERVER_SELECT_M@
 OFPROCESS_M = @OFPROCESS_M@
 OFSTDIOSTREAM_WIN32CONSOLE_M = @OFSTDIOSTREAM_WIN32CONSOLE_M@
+OFURLHANDLER_HTTP_M = @OFURLHANDLER_HTTP_M@
 OFZIP = @OFZIP@
 REEXPORT_RUNTIME = @REEXPORT_RUNTIME@
 REEXPORT_RUNTIME_FRAMEWORK = @REEXPORT_RUNTIME_FRAMEWORK@
 RUNTIME = @RUNTIME@
 RUNTIME_FRAMEWORK_LIBS = @RUNTIME_FRAMEWORK_LIBS@

Index: src/Makefile
==================================================================
--- src/Makefile
+++ src/Makefile
@@ -169,10 +169,11 @@
 	OFMutableDictionary_hashtable.m	\
 	OFMutableSet_hashtable.m	\
 	OFMutableString_UTF8.m		\
 	OFSet_hashtable.m		\
 	OFString_UTF8.m			\
+	${OFURLHANDLER_HTTP_M}		\
 	OFValue_bytes.m			\
 	OFValue_dimension.m		\
 	OFValue_nonretainedObject.m	\
 	OFValue_point.m			\
 	OFValue_pointer.m		\
@@ -186,12 +187,11 @@
 SRCS_SOCKETS += OFKernelEventObserver.m			\
 		${OFKERNELEVENTOBSERVER_EPOLL_M}	\
 		${OFKERNELEVENTOBSERVER_KQUEUE_M}	\
 		${OFKERNELEVENTOBSERVER_POLL_M}		\
 		${OFKERNELEVENTOBSERVER_SELECT_M}	\
-		OFTCPSocket+SOCKS5.m			\
-		OFURLHandler_HTTP.m
+		OFTCPSocket+SOCKS5.m
 
 OBJS_EXTRA = ${RUNTIME_RUNTIME_A}	\
 	     ${EXCEPTIONS_EXCEPTIONS_A} \
 	     ${ENCODINGS_ENCODINGS_A}	\
 	     ${FORWARDING_FORWARDING_A}	\

Index: src/OFURLHandler.m
==================================================================
--- src/OFURLHandler.m
+++ src/OFURLHandler.m
@@ -25,11 +25,11 @@
 #endif
 
 #ifdef OF_HAVE_FILES
 # import "OFURLHandler_file.h"
 #endif
-#ifdef OF_HAVE_SOCKETS
+#if defined(OF_HAVE_SOCKETS) && defined(OF_HAVE_THREADS)
 # import "OFURLHandler_HTTP.h"
 #endif
 
 static OFMutableDictionary OF_GENERIC(OFString *, OFURLHandler *) *handlers;
 #ifdef OF_HAVE_THREADS
@@ -51,11 +51,11 @@
 
 #ifdef OF_HAVE_FILES
 	[self registerClass: [OFURLHandler_file class]
 		  forScheme: @"file"];
 #endif
-#ifdef OF_HAVE_SOCKETS
+#if defined(OF_HAVE_SOCKETS) && defined(OF_HAVE_THREADS)
 	[self registerClass: [OFURLHandler_HTTP class]
 		  forScheme: @"http"];
 	[self registerClass: [OFURLHandler_HTTP class]
 		  forScheme: @"https"];
 #endif