@@ -123,11 +123,11 @@
 	     OFSettings.m		\
 	     OFString+PathAdditions.m
 SRCS_PLUGINS = OFPlugin.m
 SRCS_SOCKETS = OFDNSResolver.m			\
 	       OFDNSResourceRecord.m		\
-	       ${OFHTTPCLIENT_M}		\
+	       OFHTTPClient.m			\
 	       OFHTTPCookie.m			\
 	       OFHTTPCookieManager.m		\
 	       OFHTTPRequest.m			\
 	       OFHTTPResponse.m			\
 	       OFHTTPServer.m			\
@@ -183,11 +183,10 @@
 	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		\
@@ -201,11 +200,12 @@
 SRCS_SOCKETS += OFKernelEventObserver.m			\
 		${OFKERNELEVENTOBSERVER_EPOLL_M}	\
 		${OFKERNELEVENTOBSERVER_KQUEUE_M}	\
 		${OFKERNELEVENTOBSERVER_POLL_M}		\
 		${OFKERNELEVENTOBSERVER_SELECT_M}	\
-		OFTCPSocket+SOCKS5.m
+		OFTCPSocket+SOCKS5.m			\
+		OFURLHandler_HTTP.m
 
 OBJS_EXTRA = ${RUNTIME_RUNTIME_A}	\
 	     ${EXCEPTIONS_EXCEPTIONS_A} \
 	     ${ENCODINGS_ENCODINGS_A}	\
 	     ${FORWARDING_FORWARDING_A}	\