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.

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)
 {

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"
     )

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

tests/libtest/chkhostname.c

@@ -19,7 +19,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 #include "curl_gethostname.h"
 

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,

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
 

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
 

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
 

tests/libtest/lib500.c

@@ -22,7 +22,7 @@
 #include "test.h"
 
 #include "testtrace.h"
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 #ifdef LIB585
 

tests/libtest/lib501.c

@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 int test(char *URL)
 {

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
 

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
 

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
 

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

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";

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
 

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";
 

tests/libtest/lib510.c

@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 static const char *post[]={
   "one",

tests/libtest/lib511.c

@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 int test(char *URL)
 {

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 */

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)
 {

tests/libtest/lib514.c

@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 int test(char *URL)
 {

tests/libtest/lib515.c

@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 int test(char *URL)
 {

tests/libtest/lib516.c

@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 int test(char *URL)
 {

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",

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"

tests/libtest/lib519.c

@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 int test(char *URL)
 {

tests/libtest/lib520.c

@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 int test(char *URL)
 {

tests/libtest/lib521.c

@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 int test(char *URL)
 {

tests/libtest/lib523.c

@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 int test(char *URL)
 {

tests/libtest/lib524.c

@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 int test(char *URL)
 {

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
 

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
 

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
 

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
 

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
 

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)       && \

tests/libtest/lib539.c

@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 int test(char *URL)
 {

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
 

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.

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

tests/libtest/lib543.c

@@ -23,7 +23,7 @@
 
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 int test(char *URL)
 {

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

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 */

tests/libtest/lib549.c

@@ -26,7 +26,7 @@
 
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 int test(char *URL)
 {

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 */

tests/libtest/lib553.c

@@ -26,7 +26,7 @@
 
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 #define POSTLEN 40960
 

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

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
 

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

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)

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
 

tests/libtest/lib562.c

@@ -25,7 +25,7 @@
 #include <fcntl.h>
 #endif
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 /*
  * From "KNOWN_BUGS" April 2009:

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
 

tests/libtest/lib566.c

@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 int test(char *URL)
 {

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

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)

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)

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)

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])))
 

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)

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
 

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)
 {

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
 

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;

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";

tests/libtest/lib579.c

@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 static const char * const post[]={
   "one",

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
 

tests/libtest/lib583.c

@@ -28,7 +28,7 @@
 
 #include <sys/stat.h>
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 int test(char *URL)
 {

tests/libtest/lib586.c

@@ -23,7 +23,7 @@
 
 #include <curl/mprintf.h>
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 #define THREADS 2
 

tests/libtest/lib590.c

@@ -34,7 +34,7 @@
   - Start the request
 */
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 int test(char *URL)
 {

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
 

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
 

tests/libtest/lib598.c

@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 int test(char *URL)
 {

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)

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)

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

tests/libtest/sethostname.c

@@ -19,7 +19,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 #include "sethostname.h"
 

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) \

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;
 

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)
 

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);
 

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";

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)
 

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)
 

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"

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)++
 

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);
     }
 

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;

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 */
+

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
 

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;

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)
 {

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                       *

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 }};

tests/unit/unit1300.c

@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
-#include "llist.h"
+#include "curl_llist.h"
 
 static struct curl_llist *llist;
 

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 ) {}

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;
 

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;