diff --git a/lib/dict.c b/lib/dict.c
index 2e3dd7ab02d6af9c3969e96edfb6b21ae285227d..6c4a608574bd70388a250277bc7297827bcf36cf 100644
--- a/lib/dict.c
+++ b/lib/dict.c
@@ -71,7 +71,7 @@
 
 #include "urldata.h"
 #include <curl/curl.h>
-#include "download.h"
+#include "transfer.h"
 #include "sendf.h"
 
 #include "progress.h"
@@ -154,7 +154,7 @@ CURLcode Curl_dict(struct connectdata *conn)
           word
           );
     
-    result = Transfer(conn, data->firstsocket, -1, FALSE, bytecount,
+    result = Curl_Transfer(conn, data->firstsocket, -1, FALSE, bytecount,
                       -1, NULL); /* no upload */
       
     if(result)
@@ -202,7 +202,7 @@ CURLcode Curl_dict(struct connectdata *conn)
           word
           );
     
-    result = Transfer(conn, data->firstsocket, -1, FALSE, bytecount,
+    result = Curl_Transfer(conn, data->firstsocket, -1, FALSE, bytecount,
                       -1, NULL); /* no upload */
       
     if(result)
@@ -226,7 +226,7 @@ CURLcode Curl_dict(struct connectdata *conn)
             "QUIT\n",
             ppath);
       
-      result = Transfer(conn, data->firstsocket, -1, FALSE, bytecount,
+      result = Curl_Transfer(conn, data->firstsocket, -1, FALSE, bytecount,
                         -1, NULL);
       
       if(result)
diff --git a/lib/easy.c b/lib/easy.c
index 0daecc6d5b5485bf3b1c0debe094157345333e74..e04c2d03a9c9912cfa09f346c9929e5b9810d52b 100644
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -72,7 +72,7 @@
 
 #include "urldata.h"
 #include <curl/curl.h>
-#include "highlevel.h"
+#include "transfer.h"
 #include <curl/types.h>
 
 #define _MPRINTF_REPLACE /* use our functions only */
diff --git a/lib/ftp.c b/lib/ftp.c
index 864dca6c1dd4a6ac84b1469659f3eaa085098c8f..464e17f8b785161c10c1e733f63727110db9f57c 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -67,7 +67,7 @@
 #include "if2ip.h"
 #include "hostip.h"
 #include "progress.h"
-#include "download.h"
+#include "transfer.h"
 #include "escape.h"
 #include "http.h" /* for HTTP proxy tunnel stuff */
 #include "ftp.h"
@@ -1110,7 +1110,7 @@ CURLcode _ftp(struct connectdata *conn)
 
     Curl_pgrsSetUploadSize(data, data->infilesize);
 
-    result = Transfer(conn, -1, -1, FALSE, NULL, /* no download */
+    result = Curl_Transfer(conn, -1, -1, FALSE, NULL, /* no download */
                       data->secondarysocket, bytecountp);
     if(result)
       return result;
@@ -1339,7 +1339,7 @@ CURLcode _ftp(struct connectdata *conn)
       infof(data, "Getting file with size: %d\n", size);
 
       /* FTP download: */
-      result=Transfer(conn, data->secondarysocket, size, FALSE,
+      result=Curl_Transfer(conn, data->secondarysocket, size, FALSE,
                       bytecountp,
                       -1, NULL); /* no upload here */
       if(result)
diff --git a/lib/http.c b/lib/http.c
index aa96ed0af68bdbc5a2cd9b1889088c7cb2048d51..c80fda551d2077a634ca7e99869bc5fb0f488bdd 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -87,7 +87,7 @@
 
 #include "urldata.h"
 #include <curl/curl.h>
-#include "download.h"
+#include "transfer.h"
 #include "sendf.h"
 #include "formdata.h"
 #include "progress.h"
@@ -616,7 +616,7 @@ CURLcode Curl_http(struct connectdata *conn)
 
       data->request_size = 
         add_buffer_send(data->firstsocket, conn, req_buffer);
-      result = Transfer(conn, data->firstsocket, -1, TRUE,
+      result = Curl_Transfer(conn, data->firstsocket, -1, TRUE,
                         &http->readbytecount,
                           data->firstsocket,
                         &http->writebytecount);
@@ -644,7 +644,7 @@ CURLcode Curl_http(struct connectdata *conn)
         add_buffer_send(data->firstsocket, conn, req_buffer);
 
       /* prepare for transfer */
-      result = Transfer(conn, data->firstsocket, -1, TRUE,
+      result = Curl_Transfer(conn, data->firstsocket, -1, TRUE,
                         &http->readbytecount,
                         data->firstsocket,
                         &http->writebytecount);
@@ -690,7 +690,7 @@ CURLcode Curl_http(struct connectdata *conn)
         add_buffer_send(data->firstsocket, conn, req_buffer);
 
       /* HTTP GET/HEAD download: */
-      result = Transfer(conn, data->firstsocket, -1, TRUE, bytecount,
+      result = Curl_Transfer(conn, data->firstsocket, -1, TRUE, bytecount,
                         -1, NULL); /* nothing to upload */
     }
     if(result)
diff --git a/lib/telnet.c b/lib/telnet.c
index 43cbb637be3aebccac4e846a3f2f78fe635c9d93..462e5956bf50d6b8b6c43d6d9084fb8fceac0c26 100644
--- a/lib/telnet.c
+++ b/lib/telnet.c
@@ -71,7 +71,7 @@
 
 #include "urldata.h"
 #include <curl/curl.h>
-#include "download.h"
+#include "transfer.h"
 #include "sendf.h"
 #include "formdata.h"
 #include "progress.h"
diff --git a/lib/url.c b/lib/url.c
index 3bd3c6ce259928caecbb98783ddea16064359969..ab50613a34a8f32445d7115384e0525746eec10c 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -85,7 +85,7 @@
 #include "ssluse.h"
 #include "hostip.h"
 #include "if2ip.h"
-#include "download.h"
+#include "transfer.h"
 #include "sendf.h"
 #include "getpass.h"
 #include "progress.h"
@@ -1063,7 +1063,7 @@ static CURLcode _connect(CURL *curl, CURLconnect **in_connect)
     conn->curl_do = file;
     /* no done() function */
 
-    result = Transfer(conn, -1, -1, FALSE, NULL, /* no download */
+    result = Curl_Transfer(conn, -1, -1, FALSE, NULL, /* no download */
                       -1, NULL); /* no upload */
 
     return CURLE_OK;