Revert changes relative to lib/*.[ch] recent renaming

This reverts renaming and usage of lib/*.h header files done
28-12-2012, reverting 2 commits:

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

This also reverts removal of redundant include guard (redundant thanks
to changes in above commits) done 2-12-2013, reverting 1 commit:

  c087374... curl_setup.h: remove redundant include guard

This also reverts renaming and usage of lib/*.c source files done
3-12-2013, reverting 3 commits:

  13606bb... build: make use of 93 lib/*.c renamed files
  5b6e792... build: rename 93 lib/*.c files
  7d83dff... build: commit 13606bbfde follow-up 1

Start of related discussion thread:

  http://curl.haxx.se/mail/lib-2013-01/0012.html

Asking for confirmation on pushing this revertion commit:

  http://curl.haxx.se/mail/lib-2013-01/0048.html

Confirmation summary:

  http://curl.haxx.se/mail/lib-2013-01/0079.html

NOTICE: The list of 2 files that have been modified by other
intermixed commits, while renamed, and also by at least one
of the 6 commits this one reverts follows below. These 2 files
will exhibit a hole in history unless git's '--follow' option
is used when viewing logs.

  lib/curl_imap.h
  lib/curl_smtp.h

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 "curl_setup_once.h"
+    ${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_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/curl_warnless.c $(top_srcdir)/lib/curl_warnless.h
+WARNLESS = $(top_srcdir)/lib/warnless.c $(top_srcdir)/lib/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 "curl_setup.h"
+#include "setup.h"
 
 #include "curl_gethostname.h"
 

tests/libtest/first.c

@@ -27,7 +27,7 @@
 
 #ifdef CURLDEBUG
 #  define MEMDEBUG_NODEFINES
-#  include "curl_memdebug.h"
+#  include "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 "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 

tests/libtest/lib1501.c

@@ -24,8 +24,8 @@
 #include <fcntl.h>
 
 #include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
 
 #define TEST_HANG_TIMEOUT 30 * 1000
 

tests/libtest/lib1502.c

@@ -34,8 +34,8 @@
 #endif
 
 #include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 

tests/libtest/lib500.c

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

tests/libtest/lib501.c

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

tests/libtest/lib502.c

@@ -22,8 +22,8 @@
 #include "test.h"
 
 #include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 

tests/libtest/lib503.c

@@ -22,8 +22,8 @@
 #include "test.h"
 
 #include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 

tests/libtest/lib504.c

@@ -22,8 +22,8 @@
 #include "test.h"
 
 #include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 

tests/libtest/lib505.c

@@ -25,7 +25,7 @@
 #include <fcntl.h>
 #endif
 
-#include "curl_memdebug.h"
+#include "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 "curl_memdebug.h"
+#include "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 "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 

tests/libtest/lib508.c

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

tests/libtest/lib511.c

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

tests/libtest/lib512.c

@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "curl_memdebug.h"
+#include "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 "curl_memdebug.h"
+#include "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 "curl_memdebug.h"
+#include "memdebug.h"
 
 int test(char *URL)
 {

tests/libtest/lib515.c

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

tests/libtest/lib516.c

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

tests/libtest/lib517.c

@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 static const char * const dates[]={
   "Sun, 06 Nov 1994 08:49:37 GMT",

tests/libtest/lib518.c

@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2011, 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
@@ -31,8 +31,8 @@
 #include <limits.h>
 #endif
 
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
 
 #ifndef FD_SETSIZE
 #error "this test requires FD_SETSIZE"
@@ -386,7 +386,7 @@ static int rlimit(int keep_open)
    * when using select() instead of poll() we cannot test
    * libcurl functionality with a socket number equal or
    * greater than FD_SETSIZE. In any case, macro VERIFY_SOCK
-   * in lib/curl_select.c enforces this check and protects libcurl
+   * in lib/select.c enforces this check and protects libcurl
    * from a possible crash. The effect of this protection
    * is that test 518 will always fail, since the actual
    * call to select() never takes place. We skip test 518

tests/libtest/lib519.c

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

tests/libtest/lib520.c

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

tests/libtest/lib521.c

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

tests/libtest/lib523.c

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

tests/libtest/lib524.c

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

tests/libtest/lib525.c

@@ -24,8 +24,8 @@
 #include <fcntl.h>
 
 #include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 

tests/libtest/lib526.c

@@ -43,8 +43,8 @@
 #include <fcntl.h>
 
 #include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 

tests/libtest/lib530.c

@@ -22,8 +22,8 @@
 #include "test.h"
 
 #include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 

tests/libtest/lib533.c

@@ -26,8 +26,8 @@
 #include <fcntl.h>
 
 #include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 

tests/libtest/lib536.c

@@ -24,8 +24,8 @@
 #include <fcntl.h>
 
 #include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 

tests/libtest/lib537.c

@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2011, 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
@@ -31,8 +31,8 @@
 #include <limits.h>
 #endif
 
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
 
 #if !defined(HAVE_POLL_FINE)    && \
     !defined(USE_WINSOCK)       && \
@@ -389,7 +389,7 @@ static int rlimit(int keep_open)
    * when using select() instead of poll() we cannot test
    * libcurl functionality with a socket number equal or
    * greater than FD_SETSIZE. In any case, macro VERIFY_SOCK
-   * in lib/curl_select.c enforces this check and protects libcurl
+   * in lib/select.c enforces this check and protects libcurl
    * from a possible crash. The effect of this protection
    * is that test 537 will always fail, since the actual
    * call to select() never takes place. We skip test 537

tests/libtest/lib539.c

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

tests/libtest/lib540.c

@@ -35,8 +35,8 @@
 #endif
 
 #include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 

tests/libtest/lib541.c

@@ -25,7 +25,7 @@
 #include <fcntl.h>
 #endif
 
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 /*
  * Two FTP uploads, the second with no content sent.

tests/libtest/lib542.c

@@ -25,7 +25,7 @@
 #include <fcntl.h>
 #endif
 
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 /*
  * FTP get with NOBODY but no HEADER

tests/libtest/lib543.c

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

tests/libtest/lib544.c

@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 static char teststring[] =
 #ifdef CURL_DOES_CONVERSIONS

tests/libtest/lib547.c

@@ -26,7 +26,7 @@
 
 #include "test.h"
 
-#include "curl_memdebug.h"
+#include "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 "curl_memdebug.h"
+#include "memdebug.h"
 
 int test(char *URL)
 {

tests/libtest/lib552.c

@@ -25,8 +25,8 @@
 
 #include "test.h"
 
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
 
 struct data {
   char trace_ascii; /* 1 or 0 */

tests/libtest/lib553.c

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

tests/libtest/lib554.c

@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 static char data[]=
 #ifdef CURL_DOES_CONVERSIONS

tests/libtest/lib555.c

@@ -30,8 +30,8 @@
 
 #include "test.h"
 #include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 

tests/libtest/lib556.c

@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "curl_memdebug.h"
+#include "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 "curl_memdebug.h"
+#include "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 "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 

tests/libtest/lib562.c

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

tests/libtest/lib564.c

@@ -24,8 +24,8 @@
 #include <fcntl.h>
 
 #include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 

tests/libtest/lib566.c

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

tests/libtest/lib567.c

@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 /*
  * Test a simple OPTIONS request with a custom header

tests/libtest/lib568.c

@@ -30,7 +30,7 @@
 
 #include <curl/mprintf.h>
 
-#include "curl_memdebug.h"
+#include "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 "curl_memdebug.h"
+#include "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 "curl_memdebug.h"
+#include "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 "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "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 "curl_memdebug.h"
+#include "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 "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 

tests/libtest/lib574.c

@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "curl_memdebug.h"
+#include "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 "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 

tests/libtest/lib576.c

@@ -22,7 +22,7 @@
 #include "test.h"
 
 #include "testutil.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 typedef struct {
   int remains;

tests/libtest/lib578.c

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

tests/libtest/lib582.c

@@ -24,8 +24,8 @@
 #include <fcntl.h>
 
 #include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 

tests/libtest/lib583.c

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

tests/libtest/lib586.c

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

tests/libtest/lib590.c

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

tests/libtest/lib591.c

@@ -30,8 +30,8 @@
 #include <fcntl.h>
 
 #include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
 
 #define TEST_HANG_TIMEOUT 60 * 1000
 

tests/libtest/lib597.c

@@ -26,8 +26,8 @@
 #endif
 
 #include "testutil.h"
-#include "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "memdebug.h"
 
 #define TEST_HANG_TIMEOUT 5 * 1000
 

tests/libtest/lib598.c

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

tests/libtest/lib599.c

@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "curl_memdebug.h"
+#include "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 "curl_strequal.h"
-#include "curl_memdebug.h"
+#include "strequal.h"
+#include "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 "curl_warnless.h"
-#include "curl_memdebug.h"
+#include "warnless.h"
+#include "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 "curl_setup.h"
+#include "setup.h"
 
 #include "sethostname.h"
 

tests/libtest/test.h

@@ -20,14 +20,14 @@
  *
  ***************************************************************************/
 
-/* 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 */
+/* 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 */
 
 #define CURL_NO_OLDIES
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #include <curl/curl.h>
 
@@ -37,7 +37,7 @@
 #endif
 
 #ifdef TPF
-#  include "curl_select.h"
+#  include "select.h"
 #endif
 
 #define test_setopt(A,B,C) \

tests/libtest/testtrace.c

@@ -27,7 +27,7 @@
 
 #include "testutil.h"
 #include "testtrace.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 struct libtest_trace_cfg libtest_debug_config;
 

tests/libtest/testutil.c

@@ -19,10 +19,10 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
 
 #include "testutil.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 #if defined(WIN32) && !defined(MSDOS)
 

tests/libtest/testutil.h

@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
 
 struct timeval tutil_tvnow(void);