build: make use of 76 lib/*.h renamed files

76 private header files renamed to use our standard naming scheme.

This change affects 322 files in libcurl's source tree.

103 files changed, 164 insertions, 163 deletions

diff --git a/tests/convsrctest.pl b/tests/convsrctest.pl
index ee442394c..6c0047ef6 100755
--- a/tests/convsrctest.pl
+++ b/tests/convsrctest.pl
@@ -6,7 +6,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -45,7 +45,7 @@ require "getpart.pm";
 # Boilerplate code for test tool
 my $head =
 '#include "test.h"
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 int test(char *URL)
 {
diff --git a/tests/libtest/CMakeLists.txt b/tests/libtest/CMakeLists.txt
index 896686bd8..733cdd31b 100644
--- a/tests/libtest/CMakeLists.txt
+++ b/tests/libtest/CMakeLists.txt
@@ -5,7 +5,7 @@ function(SETUP_TEST TEST_NAME)          # ARGN are the files in the test
   string(TOUPPER ${TEST_NAME} UPPER_TEST_NAME)
 
   include_directories(
-    ${CURL_SOURCE_DIR}/lib          # To be able to reach "setup_once.h"
+    ${CURL_SOURCE_DIR}/lib          # To be able to reach "curl_setup_once.h"
     ${CURL_BINARY_DIR}/lib          # To be able to reach "curl_config.h"
     ${CURL_BINARY_DIR}/include      # To be able to reach "curl/curlbuild.h"
     )
diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc
index b9789f88f..0c45fea73 100644
--- a/tests/libtest/Makefile.inc
+++ b/tests/libtest/Makefile.inc
@@ -5,7 +5,7 @@ TESTUTIL = testutil.c testutil.h
 TSTTRACE = testtrace.c testtrace.h
 
 # files used only in some libcurl test programs
-WARNLESS = $(top_srcdir)/lib/warnless.c $(top_srcdir)/lib/warnless.h
+WARNLESS = $(top_srcdir)/lib/warnless.c $(top_srcdir)/lib/curl_warnless.h
 
 # these files are used in every single test program below
 SUPPORTFILES = first.c test.h
diff --git a/tests/libtest/chkhostname.c b/tests/libtest/chkhostname.c
index a18c92e8f..168294ab6 100644
--- a/tests/libtest/chkhostname.c
+++ b/tests/libtest/chkhostname.c
@@ -19,7 +19,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 #include "curl_gethostname.h"
 
diff --git a/tests/libtest/first.c b/tests/libtest/first.c
index 253acb21d..4533548cd 100644
--- a/tests/libtest/first.c
+++ b/tests/libtest/first.c
@@ -27,7 +27,7 @@
 
 #ifdef CURLDEBUG
 #  define MEMDEBUG_NODEFINES
-#  include "memdebug.h"
+#  include "curl_memdebug.h"
 #endif
 
 int select_wrapper(int nfds, fd_set *rd, fd_set *wr, fd_set *exc,
diff --git a/tests/libtest/lib1500.c b/tests/libtest/lib1500.c
index 784bdb2a2..3659d55c9 100644
--- a/tests/libtest/lib1500.c
+++ b/tests/libtest/lib1500.c
@@ -22,8 +22,8 @@
 #include "test.h"
 
 #include "testutil.h"
-#include "warnless.h"
-#include "memdebug.h"
+#include "curl_warnless.h"
+#include "curl_memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 
diff --git a/tests/libtest/lib1501.c b/tests/libtest/lib1501.c
index 01a382e82..b78f94df5 100644
--- a/tests/libtest/lib1501.c
+++ b/tests/libtest/lib1501.c
@@ -24,8 +24,8 @@
 #include <fcntl.h>
 
 #include "testutil.h"
-#include "warnless.h"
-#include "memdebug.h"
+#include "curl_warnless.h"
+#include "curl_memdebug.h"
 
 #define TEST_HANG_TIMEOUT 30 * 1000
 
diff --git a/tests/libtest/lib1502.c b/tests/libtest/lib1502.c
index 2b50c4733..2368eec45 100644
--- a/tests/libtest/lib1502.c
+++ b/tests/libtest/lib1502.c
@@ -34,8 +34,8 @@
 #endif
 
 #include "testutil.h"
-#include "warnless.h"
-#include "memdebug.h"
+#include "curl_warnless.h"
+#include "curl_memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 
diff --git a/tests/libtest/lib500.c b/tests/libtest/lib500.c
index dda1d7f42..e782d1a3e 100644
--- a/tests/libtest/lib500.c
+++ b/tests/libtest/lib500.c
@@ -22,7 +22,7 @@
 #include "test.h"
 
 #include "testtrace.h"
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 #ifdef LIB585
 
diff --git a/tests/libtest/lib501.c b/tests/libtest/lib501.c
index 26275f977..9e5d06875 100644
--- a/tests/libtest/lib501.c
+++ b/tests/libtest/lib501.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 int test(char *URL)
 {
diff --git a/tests/libtest/lib502.c b/tests/libtest/lib502.c
index 554583ae2..f2adf274e 100644
--- a/tests/libtest/lib502.c
+++ b/tests/libtest/lib502.c
@@ -22,8 +22,8 @@
 #include "test.h"
 
 #include "testutil.h"
-#include "warnless.h"
-#include "memdebug.h"
+#include "curl_warnless.h"
+#include "curl_memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 
diff --git a/tests/libtest/lib503.c b/tests/libtest/lib503.c
index 50277f7d3..195149329 100644
--- a/tests/libtest/lib503.c
+++ b/tests/libtest/lib503.c
@@ -22,8 +22,8 @@
 #include "test.h"
 
 #include "testutil.h"
-#include "warnless.h"
-#include "memdebug.h"
+#include "curl_warnless.h"
+#include "curl_memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 
diff --git a/tests/libtest/lib504.c b/tests/libtest/lib504.c
index 358fc98dc..1e2584f3a 100644
--- a/tests/libtest/lib504.c
+++ b/tests/libtest/lib504.c
@@ -22,8 +22,8 @@
 #include "test.h"
 
 #include "testutil.h"
-#include "warnless.h"
-#include "memdebug.h"
+#include "curl_warnless.h"
+#include "curl_memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 
diff --git a/tests/libtest/lib505.c b/tests/libtest/lib505.c
index 99b3a0afe..6ff4e8478 100644
--- a/tests/libtest/lib505.c
+++ b/tests/libtest/lib505.c
@@ -25,7 +25,7 @@
 #include <fcntl.h>
 #endif
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 /*
  * This example shows an FTP upload, with a rename of the file just after
diff --git a/tests/libtest/lib506.c b/tests/libtest/lib506.c
index 4477eaa50..0b4645670 100644
--- a/tests/libtest/lib506.c
+++ b/tests/libtest/lib506.c
@@ -23,7 +23,7 @@
 
 #include <curl/mprintf.h>
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 static const char *HOSTHEADER = "Host: www.host.foo.com";
 static const char *JAR = "log/jar506";
diff --git a/tests/libtest/lib507.c b/tests/libtest/lib507.c
index 87c21defb..a27bf99f1 100644
--- a/tests/libtest/lib507.c
+++ b/tests/libtest/lib507.c
@@ -22,8 +22,8 @@
 #include "test.h"
 
 #include "testutil.h"
-#include "warnless.h"
-#include "memdebug.h"
+#include "curl_warnless.h"
+#include "curl_memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 
diff --git a/tests/libtest/lib508.c b/tests/libtest/lib508.c
index 1aca064e9..c8fada3de 100644
--- a/tests/libtest/lib508.c
+++ b/tests/libtest/lib508.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 static char data[]="this is what we post to the silly web server\n";
 
diff --git a/tests/libtest/lib510.c b/tests/libtest/lib510.c
index 8278631c1..0ec8b1e58 100644
--- a/tests/libtest/lib510.c
+++ b/tests/libtest/lib510.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 static const char *post[]={
   "one",
diff --git a/tests/libtest/lib511.c b/tests/libtest/lib511.c
index 6be2d2f76..f90804b2a 100644
--- a/tests/libtest/lib511.c
+++ b/tests/libtest/lib511.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 int test(char *URL)
 {
diff --git a/tests/libtest/lib512.c b/tests/libtest/lib512.c
index 19da18b4f..364744481 100644
--- a/tests/libtest/lib512.c
+++ b/tests/libtest/lib512.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 /* Test case code based on source in a bug report filed by James Bursa on
    28 Apr 2004 */
diff --git a/tests/libtest/lib513.c b/tests/libtest/lib513.c
index c013ac258..efec49b0a 100644
--- a/tests/libtest/lib513.c
+++ b/tests/libtest/lib513.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *userp)
 {
diff --git a/tests/libtest/lib514.c b/tests/libtest/lib514.c
index 953e90dff..7e0066ce5 100644
--- a/tests/libtest/lib514.c
+++ b/tests/libtest/lib514.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 int test(char *URL)
 {
diff --git a/tests/libtest/lib515.c b/tests/libtest/lib515.c
index 4e96c4a8d..e403840de 100644
--- a/tests/libtest/lib515.c
+++ b/tests/libtest/lib515.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 int test(char *URL)
 {
diff --git a/tests/libtest/lib516.c b/tests/libtest/lib516.c
index a9590948d..96ee44114 100644
--- a/tests/libtest/lib516.c
+++ b/tests/libtest/lib516.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 int test(char *URL)
 {
diff --git a/tests/libtest/lib517.c b/tests/libtest/lib517.c
index ba49ec41e..e728acfa2 100644
--- a/tests/libtest/lib517.c
+++ b/tests/libtest/lib517.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 static const char * const dates[]={
   "Sun, 06 Nov 1994 08:49:37 GMT",
diff --git a/tests/libtest/lib518.c b/tests/libtest/lib518.c
index 23f7f17c6..b6b1e1d7c 100644
--- a/tests/libtest/lib518.c
+++ b/tests/libtest/lib518.c
@@ -31,8 +31,8 @@
 #include <limits.h>
 #endif
 
-#include "warnless.h"
-#include "memdebug.h"
+#include "curl_warnless.h"
+#include "curl_memdebug.h"
 
 #ifndef FD_SETSIZE
 #error "this test requires FD_SETSIZE"
diff --git a/tests/libtest/lib519.c b/tests/libtest/lib519.c
index b720c8fee..43efc1753 100644
--- a/tests/libtest/lib519.c
+++ b/tests/libtest/lib519.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 int test(char *URL)
 {
diff --git a/tests/libtest/lib520.c b/tests/libtest/lib520.c
index 9ffaa4f92..6d70411c4 100644
--- a/tests/libtest/lib520.c
+++ b/tests/libtest/lib520.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 int test(char *URL)
 {
diff --git a/tests/libtest/lib521.c b/tests/libtest/lib521.c
index 93c306864..57d938b99 100644
--- a/tests/libtest/lib521.c
+++ b/tests/libtest/lib521.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 int test(char *URL)
 {
diff --git a/tests/libtest/lib523.c b/tests/libtest/lib523.c
index 0fdc83db6..e7004e20f 100644
--- a/tests/libtest/lib523.c
+++ b/tests/libtest/lib523.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 int test(char *URL)
 {
diff --git a/tests/libtest/lib524.c b/tests/libtest/lib524.c
index 6f56df9b0..45aee7fb8 100644
--- a/tests/libtest/lib524.c
+++ b/tests/libtest/lib524.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 int test(char *URL)
 {
diff --git a/tests/libtest/lib525.c b/tests/libtest/lib525.c
index ca128cb9c..ce7d559d4 100644
--- a/tests/libtest/lib525.c
+++ b/tests/libtest/lib525.c
@@ -24,8 +24,8 @@
 #include <fcntl.h>
 
 #include "testutil.h"
-#include "warnless.h"
-#include "memdebug.h"
+#include "curl_warnless.h"
+#include "curl_memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 
diff --git a/tests/libtest/lib526.c b/tests/libtest/lib526.c
index 9db04dba7..a89442684 100644
--- a/tests/libtest/lib526.c
+++ b/tests/libtest/lib526.c
@@ -43,8 +43,8 @@
 #include <fcntl.h>
 
 #include "testutil.h"
-#include "warnless.h"
-#include "memdebug.h"
+#include "curl_warnless.h"
+#include "curl_memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 
diff --git a/tests/libtest/lib530.c b/tests/libtest/lib530.c
index ad84ff8a5..ba933b335 100644
--- a/tests/libtest/lib530.c
+++ b/tests/libtest/lib530.c
@@ -22,8 +22,8 @@
 #include "test.h"
 
 #include "testutil.h"
-#include "warnless.h"
-#include "memdebug.h"
+#include "curl_warnless.h"
+#include "curl_memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 
diff --git a/tests/libtest/lib533.c b/tests/libtest/lib533.c
index fdc18a1eb..6b2671b51 100644
--- a/tests/libtest/lib533.c
+++ b/tests/libtest/lib533.c
@@ -26,8 +26,8 @@
 #include <fcntl.h>
 
 #include "testutil.h"
-#include "warnless.h"
-#include "memdebug.h"
+#include "curl_warnless.h"
+#include "curl_memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 
diff --git a/tests/libtest/lib536.c b/tests/libtest/lib536.c
index e3ae402b7..1f7a798d1 100644
--- a/tests/libtest/lib536.c
+++ b/tests/libtest/lib536.c
@@ -24,8 +24,8 @@
 #include <fcntl.h>
 
 #include "testutil.h"
-#include "warnless.h"
-#include "memdebug.h"
+#include "curl_warnless.h"
+#include "curl_memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 
diff --git a/tests/libtest/lib537.c b/tests/libtest/lib537.c
index 24d252235..2d55d480d 100644
--- a/tests/libtest/lib537.c
+++ b/tests/libtest/lib537.c
@@ -31,8 +31,8 @@
 #include <limits.h>
 #endif
 
-#include "warnless.h"
-#include "memdebug.h"
+#include "curl_warnless.h"
+#include "curl_memdebug.h"
 
 #if !defined(HAVE_POLL_FINE)    && \
     !defined(USE_WINSOCK)       && \
diff --git a/tests/libtest/lib539.c b/tests/libtest/lib539.c
index 923893fb2..2e6396a13 100644
--- a/tests/libtest/lib539.c
+++ b/tests/libtest/lib539.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 int test(char *URL)
 {
diff --git a/tests/libtest/lib540.c b/tests/libtest/lib540.c
index ac0ebe60b..a36693de3 100644
--- a/tests/libtest/lib540.c
+++ b/tests/libtest/lib540.c
@@ -35,8 +35,8 @@
 #endif
 
 #include "testutil.h"
-#include "warnless.h"
-#include "memdebug.h"
+#include "curl_warnless.h"
+#include "curl_memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 
diff --git a/tests/libtest/lib541.c b/tests/libtest/lib541.c
index 5fe8dd8ad..22388bdab 100644
--- a/tests/libtest/lib541.c
+++ b/tests/libtest/lib541.c
@@ -25,7 +25,7 @@
 #include <fcntl.h>
 #endif
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 /*
  * Two FTP uploads, the second with no content sent.
diff --git a/tests/libtest/lib542.c b/tests/libtest/lib542.c
index 84f493f3e..a5cb3e204 100644
--- a/tests/libtest/lib542.c
+++ b/tests/libtest/lib542.c
@@ -25,7 +25,7 @@
 #include <fcntl.h>
 #endif
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 /*
  * FTP get with NOBODY but no HEADER
diff --git a/tests/libtest/lib543.c b/tests/libtest/lib543.c
index b4a31ca9a..35e32e6f4 100644
--- a/tests/libtest/lib543.c
+++ b/tests/libtest/lib543.c
@@ -23,7 +23,7 @@
 
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 int test(char *URL)
 {
diff --git a/tests/libtest/lib544.c b/tests/libtest/lib544.c
index b766187f2..adb0345fb 100644
--- a/tests/libtest/lib544.c
+++ b/tests/libtest/lib544.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 static char teststring[] =
 #ifdef CURL_DOES_CONVERSIONS
diff --git a/tests/libtest/lib547.c b/tests/libtest/lib547.c
index c82bc3f23..58d10824d 100644
--- a/tests/libtest/lib547.c
+++ b/tests/libtest/lib547.c
@@ -26,7 +26,7 @@
 
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 #ifdef CURL_DOES_CONVERSIONS
    /* ASCII representation with escape sequences for non-ASCII platforms */
diff --git a/tests/libtest/lib549.c b/tests/libtest/lib549.c
index a1568c88f..8856ef174 100644
--- a/tests/libtest/lib549.c
+++ b/tests/libtest/lib549.c
@@ -26,7 +26,7 @@
 
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 int test(char *URL)
 {
diff --git a/tests/libtest/lib552.c b/tests/libtest/lib552.c
index 2cc942ad4..1d3278fa8 100644
--- a/tests/libtest/lib552.c
+++ b/tests/libtest/lib552.c
@@ -25,8 +25,8 @@
 
 #include "test.h"
 
-#include "warnless.h"
-#include "memdebug.h"
+#include "curl_warnless.h"
+#include "curl_memdebug.h"
 
 struct data {
   char trace_ascii; /* 1 or 0 */
diff --git a/tests/libtest/lib553.c b/tests/libtest/lib553.c
index cb1cefd5e..ce96cebbb 100644
--- a/tests/libtest/lib553.c
+++ b/tests/libtest/lib553.c
@@ -26,7 +26,7 @@
 
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 #define POSTLEN 40960
 
diff --git a/tests/libtest/lib554.c b/tests/libtest/lib554.c
index 0596f3ef1..1c90b9b0b 100644
--- a/tests/libtest/lib554.c
+++ b/tests/libtest/lib554.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 static char data[]=
 #ifdef CURL_DOES_CONVERSIONS
diff --git a/tests/libtest/lib555.c b/tests/libtest/lib555.c
index 49a81bf57..3c4205179 100644
--- a/tests/libtest/lib555.c
+++ b/tests/libtest/lib555.c
@@ -30,8 +30,8 @@
 
 #include "test.h"
 #include "testutil.h"
-#include "warnless.h"
-#include "memdebug.h"
+#include "curl_warnless.h"
+#include "curl_memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 
diff --git a/tests/libtest/lib556.c b/tests/libtest/lib556.c
index 98062209f..1eb2e1562 100644
--- a/tests/libtest/lib556.c
+++ b/tests/libtest/lib556.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 /* For Windows, mainly (may be moved in a config file?) */
 #ifndef STDIN_FILENO
diff --git a/tests/libtest/lib557.c b/tests/libtest/lib557.c
index dc3bcae86..721338867 100644
--- a/tests/libtest/lib557.c
+++ b/tests/libtest/lib557.c
@@ -29,7 +29,7 @@
 
 #include <curl/mprintf.h>
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 
 #if (CURL_SIZEOF_CURL_OFF_T > CURL_SIZEOF_LONG)
diff --git a/tests/libtest/lib560.c b/tests/libtest/lib560.c
index e8be1c7bd..90c07323b 100644
--- a/tests/libtest/lib560.c
+++ b/tests/libtest/lib560.c
@@ -22,8 +22,8 @@
 #include "test.h"
 
 #include "testutil.h"
-#include "warnless.h"
-#include "memdebug.h"
+#include "curl_warnless.h"
+#include "curl_memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 
diff --git a/tests/libtest/lib562.c b/tests/libtest/lib562.c
index a5f0ea534..b00bd83d1 100644
--- a/tests/libtest/lib562.c
+++ b/tests/libtest/lib562.c
@@ -25,7 +25,7 @@
 #include <fcntl.h>
 #endif
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 /*
  * From "KNOWN_BUGS" April 2009:
diff --git a/tests/libtest/lib564.c b/tests/libtest/lib564.c
index ed00e1bf6..84d0a20b6 100644
--- a/tests/libtest/lib564.c
+++ b/tests/libtest/lib564.c
@@ -24,8 +24,8 @@
 #include <fcntl.h>
 
 #include "testutil.h"
-#include "warnless.h"
-#include "memdebug.h"
+#include "curl_warnless.h"
+#include "curl_memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 
diff --git a/tests/libtest/lib566.c b/tests/libtest/lib566.c
index ba839d65f..f95872c5a 100644
--- a/tests/libtest/lib566.c
+++ b/tests/libtest/lib566.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 int test(char *URL)
 {
diff --git a/tests/libtest/lib567.c b/tests/libtest/lib567.c
index 573529cd8..8b698394e 100644
--- a/tests/libtest/lib567.c
+++ b/tests/libtest/lib567.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 /*
  * Test a simple OPTIONS request with a custom header
diff --git a/tests/libtest/lib568.c b/tests/libtest/lib568.c
index 4b15821f2..3e69a68f0 100644
--- a/tests/libtest/lib568.c
+++ b/tests/libtest/lib568.c
@@ -30,7 +30,7 @@
 
 #include <curl/mprintf.h>
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 /* build request url */
 static char *suburl(const char *base, int i)
diff --git a/tests/libtest/lib569.c b/tests/libtest/lib569.c
index a434d7459..c7635f19a 100644
--- a/tests/libtest/lib569.c
+++ b/tests/libtest/lib569.c
@@ -23,7 +23,7 @@
 
 #include <curl/mprintf.h>
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 /* build request url */
 static char *suburl(const char *base, int i)
diff --git a/tests/libtest/lib570.c b/tests/libtest/lib570.c
index a9fac9915..b9a105f08 100644
--- a/tests/libtest/lib570.c
+++ b/tests/libtest/lib570.c
@@ -23,7 +23,7 @@
 
 #include <curl/mprintf.h>
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 /* build request url */
 static char *suburl(const char *base, int i)
diff --git a/tests/libtest/lib571.c b/tests/libtest/lib571.c
index ba0aa1ce4..977c7723e 100644
--- a/tests/libtest/lib571.c
+++ b/tests/libtest/lib571.c
@@ -39,8 +39,8 @@
 
 #include <curl/mprintf.h>
 
-#include "warnless.h"
-#include "memdebug.h"
+#include "curl_warnless.h"
+#include "curl_memdebug.h"
 
 #define RTP_PKT_CHANNEL(p)   ((int)((unsigned char)((p)[1])))
 
diff --git a/tests/libtest/lib572.c b/tests/libtest/lib572.c
index 3df4d036a..78e5c804c 100644
--- a/tests/libtest/lib572.c
+++ b/tests/libtest/lib572.c
@@ -30,7 +30,7 @@
 
 #include <curl/mprintf.h>
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 /* build request url */
 static char *suburl(const char *base, int i)
diff --git a/tests/libtest/lib573.c b/tests/libtest/lib573.c
index b49d26a5d..34fdb99bd 100644
--- a/tests/libtest/lib573.c
+++ b/tests/libtest/lib573.c
@@ -23,8 +23,8 @@
 
 #include "testtrace.h"
 #include "testutil.h"
-#include "warnless.h"
-#include "memdebug.h"
+#include "curl_warnless.h"
+#include "curl_memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 
diff --git a/tests/libtest/lib574.c b/tests/libtest/lib574.c
index afb2bceae..4f77ae394 100644
--- a/tests/libtest/lib574.c
+++ b/tests/libtest/lib574.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 static int new_fnmatch(const char *pattern, const char *string)
 {
diff --git a/tests/libtest/lib575.c b/tests/libtest/lib575.c
index 942df68c5..74d098ee1 100644
--- a/tests/libtest/lib575.c
+++ b/tests/libtest/lib575.c
@@ -24,8 +24,8 @@
 #include <fcntl.h>
 
 #include "testutil.h"
-#include "warnless.h"
-#include "memdebug.h"
+#include "curl_warnless.h"
+#include "curl_memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 
diff --git a/tests/libtest/lib576.c b/tests/libtest/lib576.c
index 61bb61325..7ee86c68c 100644
--- a/tests/libtest/lib576.c
+++ b/tests/libtest/lib576.c
@@ -22,7 +22,7 @@
 #include "test.h"
 
 #include "testutil.h"
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 typedef struct {
   int remains;
diff --git a/tests/libtest/lib578.c b/tests/libtest/lib578.c
index a39b31772..eee42663b 100644
--- a/tests/libtest/lib578.c
+++ b/tests/libtest/lib578.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 /* The size of data should be kept below MAX_INITIAL_POST_SIZE! */
 static char data[]="this is a short string.\n";
diff --git a/tests/libtest/lib579.c b/tests/libtest/lib579.c
index c5cf603bb..e6c0e6f6e 100644
--- a/tests/libtest/lib579.c
+++ b/tests/libtest/lib579.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 static const char * const post[]={
   "one",
diff --git a/tests/libtest/lib582.c b/tests/libtest/lib582.c
index 952efb4ed..bd88e43aa 100644
--- a/tests/libtest/lib582.c
+++ b/tests/libtest/lib582.c
@@ -24,8 +24,8 @@
 #include <fcntl.h>
 
 #include "testutil.h"
-#include "warnless.h"
-#include "memdebug.h"
+#include "curl_warnless.h"
+#include "curl_memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 
diff --git a/tests/libtest/lib583.c b/tests/libtest/lib583.c
index ad5a5cea7..4ef9e5a35 100644
--- a/tests/libtest/lib583.c
+++ b/tests/libtest/lib583.c
@@ -28,7 +28,7 @@
 
 #include <sys/stat.h>
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 int test(char *URL)
 {
diff --git a/tests/libtest/lib586.c b/tests/libtest/lib586.c
index 2cf04fe85..34f093967 100644
--- a/tests/libtest/lib586.c
+++ b/tests/libtest/lib586.c
@@ -23,7 +23,7 @@
 
 #include <curl/mprintf.h>
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 #define THREADS 2
 
diff --git a/tests/libtest/lib590.c b/tests/libtest/lib590.c
index 68603c65e..26e88731c 100644
--- a/tests/libtest/lib590.c
+++ b/tests/libtest/lib590.c
@@ -34,7 +34,7 @@
   - Start the request
 */
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 int test(char *URL)
 {
diff --git a/tests/libtest/lib591.c b/tests/libtest/lib591.c
index 5cd4644e3..48648fb24 100644
--- a/tests/libtest/lib591.c
+++ b/tests/libtest/lib591.c
@@ -30,8 +30,8 @@
 #include <fcntl.h>
 
 #include "testutil.h"
-#include "warnless.h"
-#include "memdebug.h"
+#include "curl_warnless.h"
+#include "curl_memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 
diff --git a/tests/libtest/lib597.c b/tests/libtest/lib597.c
index a27cefd5b..aae6500ae 100644
--- a/tests/libtest/lib597.c
+++ b/tests/libtest/lib597.c
@@ -26,8 +26,8 @@
 #endif
 
 #include "testutil.h"
-#include "warnless.h"
-#include "memdebug.h"
+#include "curl_warnless.h"
+#include "curl_memdebug.h"
 
 #define TEST_HANG_TIMEOUT 5 * 1000
 
diff --git a/tests/libtest/lib598.c b/tests/libtest/lib598.c
index e9c1ad776..53fabd168 100644
--- a/tests/libtest/lib598.c
+++ b/tests/libtest/lib598.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 int test(char *URL)
 {
diff --git a/tests/libtest/lib599.c b/tests/libtest/lib599.c
index 6b092677a..6de586932 100644
--- a/tests/libtest/lib599.c
+++ b/tests/libtest/lib599.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 static int progress_callback(void *clientp, double dltotal,
                              double dlnow, double ultotal, double ulnow)
diff --git a/tests/libtest/libauthretry.c b/tests/libtest/libauthretry.c
index 95761325a..c5cc6cfd8 100644
--- a/tests/libtest/libauthretry.c
+++ b/tests/libtest/libauthretry.c
@@ -25,8 +25,8 @@
  */
 
 #include "test.h"
-#include "strequal.h"
-#include "memdebug.h"
+#include "curl_strequal.h"
+#include "curl_memdebug.h"
 
 static CURLcode send_request(CURL *curl, const char *url, int seq,
                              long auth_scheme, const char *userpwd)
diff --git a/tests/libtest/libntlmconnect.c b/tests/libtest/libntlmconnect.c
index b540ebf58..c7cc93350 100644
--- a/tests/libtest/libntlmconnect.c
+++ b/tests/libtest/libntlmconnect.c
@@ -27,8 +27,8 @@
 #include <assert.h>
 
 #include "testutil.h"
-#include "warnless.h"
-#include "memdebug.h"
+#include "curl_warnless.h"
+#include "curl_memdebug.h"
 
 #define TEST_HANG_TIMEOUT 5 * 1000
 #define MAX_EASY_HANDLES 3
diff --git a/tests/libtest/sethostname.c b/tests/libtest/sethostname.c
index f131fe9fb..9da6a6730 100644
--- a/tests/libtest/sethostname.c
+++ b/tests/libtest/sethostname.c
@@ -19,7 +19,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 #include "sethostname.h"
 
diff --git a/tests/libtest/test.h b/tests/libtest/test.h
index fcc91ad8b..b45e72112 100644
--- a/tests/libtest/test.h
+++ b/tests/libtest/test.h
@@ -20,14 +20,14 @@
  *
  ***************************************************************************/
 
-/* Now include the setup.h file from libcurl's private libdir (the source
-   version, but that might include "curl_config.h" from the build dir so we
-   need both of them in the include path), so that we get good in-depth
-   knowledge about the system we're building this on */
+/* Now include the curl_setup.h file from libcurl's private libdir (the
+   source version, but that might include "curl_config.h" from the build
+   dir so we need both of them in the include path), so that we get good
+   in-depth knowledge about the system we're building this on */
 
 #define CURL_NO_OLDIES
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include <curl/curl.h>
 
@@ -37,7 +37,7 @@
 #endif
 
 #ifdef TPF
-#  include "select.h"
+#  include "curl_select.h"
 #endif
 
 #define test_setopt(A,B,C) \
diff --git a/tests/libtest/testtrace.c b/tests/libtest/testtrace.c
index c977d2105..0f74d8d9f 100644
--- a/tests/libtest/testtrace.c
+++ b/tests/libtest/testtrace.c
@@ -27,7 +27,7 @@
 
 #include "testutil.h"
 #include "testtrace.h"
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 struct libtest_trace_cfg libtest_debug_config;
 
diff --git a/tests/libtest/testutil.c b/tests/libtest/testutil.c
index 3ad18c987..456d799e7 100644
--- a/tests/libtest/testutil.c
+++ b/tests/libtest/testutil.c
@@ -19,10 +19,10 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 #include "testutil.h"
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 #if defined(WIN32) && !defined(MSDOS)
 
diff --git a/tests/libtest/testutil.h b/tests/libtest/testutil.h
index 0c6be2fc4..a236970a6 100644
--- a/tests/libtest/testutil.h
+++ b/tests/libtest/testutil.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 struct timeval tutil_tvnow(void);
 
diff --git a/tests/mem-include-scan.pl b/tests/mem-include-scan.pl
index 676df25e9..8f599ae0a 100644
--- a/tests/mem-include-scan.pl
+++ b/tests/mem-include-scan.pl
@@ -46,7 +46,7 @@ sub scanfile {
         if($_ =~ /(free|alloc|strdup)\(/) {
             $memfunc++;
         }
-        elsif($_ =~ /^ *# *include \"memdebug.h\"/) {
+        elsif($_ =~ /^ *# *include \"curl_memdebug.h\"/) {
             $memdebug++;
         }
         elsif($_ =~ /^ *# *include \"curl_memory.h\"/) {
@@ -70,7 +70,7 @@ sub scanfile {
         }
         else {
             if(!$memdebug) {
-                print STDERR "$file doesn't include \"memdebug.h\"!\n";
+                print STDERR "$file doesn't include \"curl_memdebug.h\"!\n";
             }
             if(!$curlmem) {
                 print STDERR "$file doesn't include \"curl_memory.h\"!\n";
diff --git a/tests/server/CMakeLists.txt b/tests/server/CMakeLists.txt
index 0401df215..2e82c1133 100644
--- a/tests/server/CMakeLists.txt
+++ b/tests/server/CMakeLists.txt
@@ -5,8 +5,8 @@ function(SETUP_EXECUTABLE TEST_NAME)    # ARGN are the files in the test
   string(TOUPPER ${TEST_NAME} UPPER_TEST_NAME)
 
   include_directories(
-    ${CURL_SOURCE_DIR}/lib              # To be able to reach "setup_once.h"
-    ${CURL_BINARY_DIR}/lib              # To be able to reach "curl_config.h"
+    ${CURL_SOURCE_DIR}/lib      # To be able to reach "curl_setup_once.h"
+    ${CURL_BINARY_DIR}/lib      # To be able to reach "curl_config.h"
     ${CURL_BINARY_DIR}/include  # To be able to reach "curl/curlbuild.h"
     )
   if(CURL_USE_ARES)
@@ -67,5 +67,5 @@ endforeach()
 # SETUP_EXECUTABLE(resolve resolve.c util.c util.h ${useful})
 # SETUP_EXECUTABLE(sockfilt sockfilt.c util.c util.h ${useful} ${CURL_SOURCE_DIR}/lib/inet_pton.c)
 # SETUP_EXECUTABLE(getpart testpart.c ${useful})
-# SETUP_EXECUTABLE(tftpd tftpd.c util.c util.h ${useful} tftp.h)
+# SETUP_EXECUTABLE(tftpd tftpd.c util.c util.h ${useful} server_tftp.h)
 
diff --git a/tests/server/Makefile.inc b/tests/server/Makefile.inc
index 4a12ea872..2dbbf2660 100644
--- a/tests/server/Makefile.inc
+++ b/tests/server/Makefile.inc
@@ -10,11 +10,11 @@ CURLX_SRCS = \
 
 CURLX_HDRS = \
  $(top_srcdir)/lib/curlx.h \
- $(top_srcdir)/lib/nonblock.h \
- $(top_srcdir)/lib/strequal.h \
- $(top_srcdir)/lib/strtoofft.h \
- $(top_srcdir)/lib/timeval.h \
- $(top_srcdir)/lib/warnless.h
+ $(top_srcdir)/lib/curl_nonblock.h \
+ $(top_srcdir)/lib/curl_strequal.h \
+ $(top_srcdir)/lib/curl_strtoofft.h \
+ $(top_srcdir)/lib/curl_timeval.h \
+ $(top_srcdir)/lib/curl_warnless.h
 
 USEFUL = \
  getpart.c \
@@ -23,7 +23,7 @@ USEFUL = \
  $(top_srcdir)/lib/base64.c \
  $(top_srcdir)/lib/curl_base64.h \
  $(top_srcdir)/lib/memdebug.c \
- $(top_srcdir)/lib/memdebug.h
+ $(top_srcdir)/lib/curl_memdebug.h
 
 UTIL = \
  util.c \
@@ -62,7 +62,7 @@ sws_CFLAGS = $(AM_CFLAGS)
 tftpd_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \
  server_sockaddr.h \
  tftpd.c \
- tftp.h
+ server_tftp.h
 tftpd_LDADD = @CURL_NETWORK_AND_TIME_LIBS@
 tftpd_CFLAGS = $(AM_CFLAGS)
 
diff --git a/tests/server/fake_ntlm.c b/tests/server/fake_ntlm.c
index 64f0675e7..1c10e4812 100644
--- a/tests/server/fake_ntlm.c
+++ b/tests/server/fake_ntlm.c
@@ -34,8 +34,8 @@
 #include "getpart.h"
 #include "util.h"
 
-/* include memdebug.h last */
-#include "memdebug.h"
+/* include curl_memdebug.h last */
+#include "curl_memdebug.h"
 
 #ifndef DEFAULT_LOGFILE
 #define DEFAULT_LOGFILE "log/fake_ntlm.log"
diff --git a/tests/server/getpart.c b/tests/server/getpart.c
index f37f88cba..56719f05b 100644
--- a/tests/server/getpart.c
+++ b/tests/server/getpart.c
@@ -36,8 +36,8 @@ struct SessionHandle {
 #include "curl_base64.h"
 #include "curl_memory.h"
 
-/* include memdebug.h last */
-#include "memdebug.h"
+/* include curl_memdebug.h last */
+#include "curl_memdebug.h"
 
 #define EAT_SPACE(p) while(*(p) && ISSPACE(*(p))) (p)++
 
diff --git a/tests/server/resolve.c b/tests/server/resolve.c
index d0609888a..a094b4d70 100644
--- a/tests/server/resolve.c
+++ b/tests/server/resolve.c
@@ -51,8 +51,8 @@
 #include "curlx.h" /* from the private lib dir */
 #include "util.h"
 
-/* include memdebug.h last */
-#include "memdebug.h"
+/* include curl_memdebug.h last */
+#include "curl_memdebug.h"
 
 static bool use_ipv6 = FALSE;
 static const char *ipv_inuse = "IPv4";
@@ -136,7 +136,7 @@ int main(int argc, char *argv[])
       hints.ai_socktype = SOCK_STREAM;
       hints.ai_flags = AI_CANONNAME;
       /* Use parenthesis around function to stop it from being replaced by
-      the macro in memdebug.h */
+      the macro in curl_memdebug.h */
       rc = (getaddrinfo)(host, "80", &hints, &ai);
     }
 
diff --git a/tests/server/rtspd.c b/tests/server/rtspd.c
index 3c55eff35..65f84e6e1 100644
--- a/tests/server/rtspd.c
+++ b/tests/server/rtspd.c
@@ -51,8 +51,8 @@
 #include "util.h"
 #include "server_sockaddr.h"
 
-/* include memdebug.h last */
-#include "memdebug.h"
+/* include curl_memdebug.h last */
+#include "curl_memdebug.h"
 
 #ifdef ENABLE_IPV6
 static bool use_ipv6 = FALSE;
diff --git a/tests/server/server_setup.h b/tests/server/server_setup.h
index 193ad84d7..d3efc93eb 100644
--- a/tests/server/server_setup.h
+++ b/tests/server/server_setup.h
@@ -24,6 +24,7 @@
 
 #define CURL_NO_OLDIES
 
-#include "setup.h" /* portability help from the lib directory */
+#include "curl_setup.h" /* portability help from the lib directory */
 
 #endif /* HEADER_CURL_SERVER_SETUP_H */
+
diff --git a/tests/server/tftp.h b/tests/server/server_tftp.h
index 0650efe6a..0650efe6a 100644
--- a/tests/server/tftp.h
+++ b/tests/server/server_tftp.h
diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c
index 93d0b5d14..394449ca9 100644
--- a/tests/server/sockfilt.c
+++ b/tests/server/sockfilt.c
@@ -98,12 +98,12 @@
    versions instead */
 #include "curlx.h" /* from the private lib dir */
 #include "getpart.h"
-#include "inet_pton.h"
+#include "curl_inet_pton.h"
 #include "util.h"
 #include "server_sockaddr.h"
 
-/* include memdebug.h last */
-#include "memdebug.h"
+/* include curl_memdebug.h last */
+#include "curl_memdebug.h"
 
 #define DEFAULT_PORT 8999
 
diff --git a/tests/server/sws.c b/tests/server/sws.c
index 44d899fd7..3afbe3e83 100644
--- a/tests/server/sws.c
+++ b/tests/server/sws.c
@@ -49,12 +49,12 @@
    versions instead */
 #include "curlx.h" /* from the private lib dir */
 #include "getpart.h"
-#include "inet_pton.h"
+#include "curl_inet_pton.h"
 #include "util.h"
 #include "server_sockaddr.h"
 
-/* include memdebug.h last */
-#include "memdebug.h"
+/* include curl_memdebug.h last */
+#include "curl_memdebug.h"
 
 #ifdef ENABLE_IPV6
 static bool use_ipv6 = FALSE;
diff --git a/tests/server/testpart.c b/tests/server/testpart.c
index 912096f0b..255bbe8d3 100644
--- a/tests/server/testpart.c
+++ b/tests/server/testpart.c
@@ -26,8 +26,8 @@
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
-/* include memdebug.h last */
-#include "memdebug.h"
+/* include curl_memdebug.h last */
+#include "curl_memdebug.h"
 
 int main(int argc, char **argv)
 {
diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c
index e8c3c2d82..c1033a5c0 100644
--- a/tests/server/tftpd.c
+++ b/tests/server/tftpd.c
@@ -67,7 +67,7 @@
 #ifdef HAVE_ARPA_TFTP_H
 #include <arpa/tftp.h>
 #else
-#include "tftp.h"
+#include "server_tftp.h"
 #endif
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
@@ -91,8 +91,8 @@
 #include "util.h"
 #include "server_sockaddr.h"
 
-/* include memdebug.h last */
-#include "memdebug.h"
+/* include curl_memdebug.h last */
+#include "curl_memdebug.h"
 
 /*****************************************************************************
 *                      STRUCT DECLARATIONS AND DEFINES                       *
diff --git a/tests/server/util.c b/tests/server/util.c
index 30766d80f..ef3c8f6a3 100644
--- a/tests/server/util.c
+++ b/tests/server/util.c
@@ -46,7 +46,7 @@
 #include "curlx.h" /* from the private lib dir */
 #include "getpart.h"
 #include "util.h"
-#include "timeval.h"
+#include "curl_timeval.h"
 
 #if defined(ENABLE_IPV6) && defined(__MINGW32__)
 const struct in6_addr in6addr_any = {{ IN6ADDR_ANY_INIT }};
diff --git a/tests/unit/unit1300.c b/tests/unit/unit1300.c
index 2b8341683..ba27e4ecc 100644
--- a/tests/unit/unit1300.c
+++ b/tests/unit/unit1300.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
-#include "llist.h"
+#include "curl_llist.h"
 
 static struct curl_llist *llist;
 
diff --git a/tests/unit/unit1301.c b/tests/unit/unit1301.c
index 47df481a8..5baf4d5c0 100644
--- a/tests/unit/unit1301.c
+++ b/tests/unit/unit1301.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
-#include "strequal.h"
+#include "curl_strequal.h"
 
 static CURLcode unit_setup( void ) {return CURLE_OK;}
 static void unit_stop( void ) {}
diff --git a/tests/unit/unit1302.c b/tests/unit/unit1302.c
index fc50c8865..e431fffca 100644
--- a/tests/unit/unit1302.c
+++ b/tests/unit/unit1302.c
@@ -21,10 +21,10 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
-#include "urldata.h"
-#include "url.h" /* for Curl_safefree */
+#include "curl_urldata.h"
+#include "curl_url.h"
 #include "curl_base64.h"
-#include "memdebug.h" /* LAST include file */
+#include "curl_memdebug.h" /* LAST include file */
 
 static struct SessionHandle *data;
 
diff --git a/tests/unit/unit1303.c b/tests/unit/unit1303.c
index 2e4f23096..7e9dbc158 100644
--- a/tests/unit/unit1303.c
+++ b/tests/unit/unit1303.c
@@ -21,9 +21,9 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
-#include "urldata.h"
-#include "connect.h"
-#include "memdebug.h" /* LAST include file */
+#include "curl_urldata.h"
+#include "curl_connect.h"
+#include "curl_memdebug.h" /* LAST include file */
 
 static struct SessionHandle *data;
 
diff --git a/tests/unit/unit1304.c b/tests/unit/unit1304.c
index 8ddd8caee..3ebd89cbd 100644
--- a/tests/unit/unit1304.c
+++ b/tests/unit/unit1304.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
-#include "netrc.h"
+#include "curl_netrc.h"
 
 static char login[LOGINSIZE];
 static char password[PASSWORDSIZE];
diff --git a/tests/unit/unit1305.c b/tests/unit/unit1305.c
index 5900c6dd5..a4b431114 100644
--- a/tests/unit/unit1305.c
+++ b/tests/unit/unit1305.c
@@ -34,11 +34,11 @@
 #define ENABLE_CURLX_PRINTF
 #include "curlx.h"
 
-#include "hash.h"
-#include "hostip.h"
+#include "curl_hash.h"
+#include "curl_hostip.h"
 
 #include "curl_memory.h"
-#include "memdebug.h" /* LAST include file */
+#include "curl_memdebug.h" /* LAST include file */
 
 static struct SessionHandle *data;
 static struct curl_hash *hp;
diff --git a/tests/unit/unit1309.c b/tests/unit/unit1309.c
index 1304ba18e..4a741a19d 100644
--- a/tests/unit/unit1309.c
+++ b/tests/unit/unit1309.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
-#include "splay.h"
+#include "curl_splay.h"
 
 
 static CURLcode unit_setup(void)