diff --git a/Makefile b/Makefile
index 15919fc6..c6db04ce 100755
--- a/Makefile
+++ b/Makefile
@@ -680,7 +680,6 @@ CLIENT_OBJS_ := \
 	src/client/cl_download.o \
 	src/client/cl_effects.o \
 	src/client/cl_entities.o \
-	src/client/cl_http.o \
 	src/client/cl_input.o \
 	src/client/cl_inventory.o \
 	src/client/cl_keyboard.o \
@@ -693,6 +692,7 @@ CLIENT_OBJS_ := \
 	src/client/cl_screen.o \
 	src/client/cl_tempentities.o \
 	src/client/cl_view.o \
+	src/client/curl/download.o \
 	src/client/curl/qcurl.o \
 	src/client/input/sdl.o \
 	src/client/menu/menu.o \
diff --git a/src/client/cl_http.c b/src/client/curl/download.c
similarity index 99%
rename from src/client/cl_http.c
rename to src/client/curl/download.c
index c332170b..cb5370b6 100644
--- a/src/client/cl_http.c
+++ b/src/client/curl/download.c
@@ -26,8 +26,8 @@
  */
 
 #include <ctype.h>
-#include "header/client.h"
-#include "curl/header/qcurl.h"
+#include "../header/client.h"
+#include "header/qcurl.h"
 
 #ifdef USE_CURL
 
diff --git a/src/client/header/http.h b/src/client/curl/header/download.h
similarity index 100%
rename from src/client/header/http.h
rename to src/client/curl/header/download.h
diff --git a/src/client/header/client.h b/src/client/header/client.h
index a3f334c9..7c0b5f07 100644
--- a/src/client/header/client.h
+++ b/src/client/header/client.h
@@ -49,12 +49,12 @@
 
 #include "../../common/header/common.h"
 
+#include "../curl/header/download.h"
 #include "../sound/header/sound.h"
 #include "../sound/header/vorbis.h"
 #include "../vid/header/ref.h"
 #include "../vid/header/vid.h"
 
-#include "http.h"
 #include "screen.h"
 #include "keyboard.h"
 #include "console.h"