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.

buildconf

@@ -81,7 +81,7 @@ removethis(){
 #
 if test ! -f configure.ac ||
   test ! -f src/tool_main.c ||
-  test ! -f lib/urldata.h ||
+  test ! -f lib/curl_urldata.h ||
   test ! -f include/curl/curl.h ||
   test ! -f m4/curl-functions.m4; then
   echo "Can not run buildconf from outside of curl's source subdirectory!"

configure.ac

@@ -34,7 +34,7 @@ AC_COPYRIGHT([Copyright (c) 1998 - 2012 Daniel Stenberg, <daniel@haxx.se>
 This configure script may be copied, distributed and modified under the
 terms of the curl license; see COPYING for more details])
 
-AC_CONFIG_SRCDIR([lib/urldata.h])
+AC_CONFIG_SRCDIR([lib/curl_urldata.h])
 AM_CONFIG_HEADER(lib/curl_config.h include/curl/curlbuild.h)
 AC_CONFIG_MACRO_DIR([m4])
 AM_MAINTAINER_MODE

docs/INSTALL

@@ -467,7 +467,7 @@ Win32
    possibilities:
 
    - Modify lib/config-win32.h
-   - Modify lib/setup.h
+   - Modify lib/curl_setup.h
    - Modify lib/Makefile.vc6
    - Add defines to Project/Settings/C/C++/General/Preprocessor Definitions
      in the vc6libcurl.dsw/vc6libcurl.dsp Visual C++ 6 IDE project.

include/curl/curlrules.h

@@ -190,7 +190,7 @@ typedef char
  * CURL_ISOCPP and CURL_OFF_T_C definitions are done here in order to allow
  * these to be visible and exported by the external libcurl interface API,
  * while also making them visible to the library internals, simply including
- * setup.h, without actually needing to include curl.h internally.
+ * curl_setup.h, without actually needing to include curl.h internally.
  * If some day this section would grow big enough, all this should be moved
  * to its own header file.
  */

lib/Makefile.inc

@@ -27,20 +27,104 @@ CSOURCES = file.c timeval.c base64.c hostip.c progress.c formdata.c	\
   curl_multibyte.c curl_darwinssl.c hostcheck.c                         \
   bundles.c conncache.c
 
-HHEADERS = arpa_telnet.h netrc.h file.h timeval.h qssl.h hostip.h	\
+HHEADERS = \
-  progress.h formdata.h cookie.h http.h sendf.h ftp.h url.h dict.h	\
+  curl_addrinfo.h \
-  if2ip.h speedcheck.h urldata.h curl_ldap.h ssluse.h escape.h telnet.h	\
+  curl_amigaos.h \
-  getinfo.h strequal.h krb4.h memdebug.h http_chunks.h curl_rand.h	\
+  curl_arpa_telnet.h \
-  curl_fnmatch.h wildcard.h fileinfo.h ftplistparser.h strtok.h		\
+  curl_asyn.h \
-  connect.h llist.h hash.h content_encoding.h share.h curl_md4.h	\
+  curl_axtls.h \
-  curl_md5.h http_digest.h http_negotiate.h inet_pton.h amigaos.h	\
+  curl_base64.h \
-  strtoofft.h strerror.h inet_ntop.h curlx.h curl_memory.h setup.h	\
+  curl_bundles.h \
-  transfer.h select.h easyif.h multiif.h parsedate.h sslgen.h gtls.h	\
+  curl_conncache.h \
-  tftp.h sockaddr.h splay.h strdup.h setup_once.h socks.h ssh.h nssg.h	\
+  curl_connect.h \
-  curl_base64.h rawstr.h curl_addrinfo.h curl_sspi.h slist.h nonblock.h	\
+  curl_content_encoding.h \
-  curl_memrchr.h imap.h pop3.h smtp.h pingpong.h rtsp.h curl_threads.h	\
+  curl_cookie.h \
-  warnless.h curl_hmac.h polarssl.h curl_rtmp.h curl_gethostname.h	\
+  curl_cyassl.h \
-  gopher.h axtls.h cyassl.h http_proxy.h non-ascii.h asyn.h curl_ntlm.h	\
+  curl_darwinssl.h \
-  curl_gssapi.h curl_ntlm_wb.h curl_ntlm_core.h curl_ntlm_msgs.h	\
+  curl_dict.h \
-  curl_sasl.h curl_schannel.h curl_multibyte.h curl_darwinssl.h	\
+  curl_easyif.h \
-  hostcheck.h bundles.h conncache.h
+  curl_escape.h \
+  curl_file.h \
+  curl_fileinfo.h \
+  curl_fnmatch.h \
+  curl_formdata.h \
+  curl_ftp.h \
+  curl_ftplistparser.h \
+  curl_gethostname.h \
+  curl_getinfo.h \
+  curl_gopher.h \
+  curl_gssapi.h \
+  curl_gtls.h \
+  curl_hash.h \
+  curl_hmac.h \
+  curl_hostcheck.h \
+  curl_hostip.h \
+  curl_http.h \
+  curl_http_chunks.h \
+  curl_http_digest.h \
+  curl_http_negotiate.h \
+  curl_http_proxy.h \
+  curl_if2ip.h \
+  curl_imap.h \
+  curl_inet_ntop.h \
+  curl_inet_pton.h \
+  curl_krb4.h \
+  curl_ldap.h \
+  curl_llist.h \
+  curl_md4.h \
+  curl_md5.h \
+  curl_memdebug.h \
+  curl_memory.h \
+  curl_memrchr.h \
+  curl_multibyte.h \
+  curl_multiif.h \
+  curl_netrc.h \
+  curl_non-ascii.h \
+  curl_nonblock.h \
+  curl_nssg.h \
+  curl_ntlm.h \
+  curl_ntlm_core.h \
+  curl_ntlm_msgs.h \
+  curl_ntlm_wb.h \
+  curl_parsedate.h \
+  curl_pingpong.h \
+  curl_polarssl.h \
+  curl_pop3.h \
+  curl_progress.h \
+  curl_qssl.h \
+  curl_rand.h \
+  curl_rawstr.h \
+  curl_rtmp.h \
+  curl_rtsp.h \
+  curl_sasl.h \
+  curl_schannel.h \
+  curl_select.h \
+  curl_sendf.h \
+  curl_setup.h \
+  curl_setup_once.h \
+  curl_share.h \
+  curl_slist.h \
+  curl_smtp.h \
+  curl_sockaddr.h \
+  curl_socks.h \
+  curl_speedcheck.h \
+  curl_splay.h \
+  curl_ssh.h \
+  curl_sslgen.h \
+  curl_ssluse.h \
+  curl_sspi.h \
+  curl_strdup.h \
+  curl_strequal.h \
+  curl_strerror.h \
+  curl_strtok.h \
+  curl_strtoofft.h \
+  curl_telnet.h \
+  curl_tftp.h \
+  curl_threads.h \
+  curl_timeval.h \
+  curl_transfer.h \
+  curl_url.h \
+  curl_urldata.h \
+  curl_wildcard.h \
+  curlx.h
+

lib/README.hostip

@@ -31,5 +31,5 @@
  hostip4.c  - ipv4-specific functions
  hostip6.c  - ipv6-specific functions
 
- The hostip.h is the single united header file for all this. It defines the
+ The curl_hostip.h is the single united header file for all this. It defines
- CURLRES_* defines based on the config*.h and setup.h defines.
+ the CURLRES_* defines based on the config*.h and curl_setup.h defines.

lib/amigaos.c

@@ -20,13 +20,13 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #if defined(__AMIGA__) && !defined(__ixemul__)
 
 #include <amitcp/socketbasetags.h>
 
-#include "amigaos.h"
+#include "curl_amigaos.h"
 
 struct Library *SocketBase = NULL;
 extern int errno, h_errno;

lib/amigaos.h

@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 #if defined(__AMIGA__) && !defined(__ixemul__)
 

lib/asyn-ares.c

@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
@@ -51,23 +51,23 @@
 /***********************************************************************
  * Only for ares-enabled builds
  * And only for functions that fulfill the asynch resolver backend API
- * as defined in asyn.h, nothing else belongs in this file!
+ * as defined in curl_asyn.h, nothing else belongs in this file!
  **********************************************************************/
 
 #ifdef CURLRES_ARES
 
-#include "urldata.h"
+#include "curl_urldata.h"
-#include "sendf.h"
+#include "curl_sendf.h"
-#include "hostip.h"
+#include "curl_hostip.h"
-#include "hash.h"
+#include "curl_hash.h"
-#include "share.h"
+#include "curl_share.h"
-#include "strerror.h"
+#include "curl_strerror.h"
-#include "url.h"
+#include "curl_url.h"
-#include "multiif.h"
+#include "curl_multiif.h"
-#include "inet_pton.h"
+#include "curl_inet_pton.h"
-#include "connect.h"
+#include "curl_connect.h"
-#include "select.h"
+#include "curl_select.h"
-#include "progress.h"
+#include "curl_progress.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
@@ -87,7 +87,7 @@
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 struct ResolverResults {
   int num_pending; /* number of ares_gethostbyname() requests */

lib/asyn-thread.c

@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
@@ -57,16 +57,16 @@
 #  define RESOLVER_ENOMEM  ENOMEM
 #endif
 
-#include "urldata.h"
+#include "curl_urldata.h"
-#include "sendf.h"
+#include "curl_sendf.h"
-#include "hostip.h"
+#include "curl_hostip.h"
-#include "hash.h"
+#include "curl_hash.h"
-#include "share.h"
+#include "curl_share.h"
-#include "strerror.h"
+#include "curl_strerror.h"
-#include "url.h"
+#include "curl_url.h"
-#include "multiif.h"
+#include "curl_multiif.h"
-#include "inet_pton.h"
+#include "curl_inet_pton.h"
-#include "inet_ntop.h"
+#include "curl_inet_ntop.h"
 #include "curl_threads.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
@@ -74,7 +74,7 @@
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 /***********************************************************************
  * Only for threaded name resolves builds

lib/asyn.h

@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 #include "curl_addrinfo.h"
 
 struct addrinfo;

lib/axtls.c

@@ -26,24 +26,24 @@
  * but sslgen.c should ever call or use these functions.
  */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_AXTLS
 #include <axTLS/ssl.h>
-#include "axtls.h"
+#include "curl_axtls.h"
 
-#include "sendf.h"
+#include "curl_sendf.h"
-#include "inet_pton.h"
+#include "curl_inet_pton.h"
-#include "sslgen.h"
+#include "curl_sslgen.h"
-#include "parsedate.h"
+#include "curl_parsedate.h"
-#include "connect.h" /* for the connect timeout */
+#include "curl_connect.h" /* for the connect timeout */
-#include "select.h"
+#include "curl_select.h"
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
-#include "hostcheck.h"
+#include "curl_hostcheck.h"
 
 
 /* SSL_read is opied from axTLS compat layer */
@@ -65,14 +65,14 @@ static int SSL_read(SSL *ssl, void *buf, int num)
 int Curl_axtls_init(void)
 {
 /* axTLS has no global init.  Everything is done through SSL and SSL_CTX
- * structs stored in connectdata structure.  Perhaps can move to axtls.h.
+ * structs stored in connectdata structure.  Perhaps can move to curl_axtls.h.
  */
   return 1;
 }
 
 int Curl_axtls_cleanup(void)
 {
-  /* axTLS has no global cleanup.  Perhaps can move this to axtls.h. */
+  /* axTLS has no global cleanup.  Perhaps can move this to curl_axtls.h. */
   return 1;
 }
 

lib/axtls.h

@@ -25,7 +25,7 @@
 
 #ifdef USE_AXTLS
 #include "curl/curl.h"
-#include "urldata.h"
+#include "curl_urldata.h"
 
 int Curl_axtls_init(void);
 int Curl_axtls_cleanup(void);

lib/base64.c

@@ -22,19 +22,19 @@
 
 /* Base64 encoding/decoding */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
-#include "urldata.h" /* for the SessionHandle definition */
+#include "curl_urldata.h" /* for the SessionHandle definition */
-#include "warnless.h"
+#include "curl_warnless.h"
 #include "curl_base64.h"
 #include "curl_memory.h"
-#include "non-ascii.h"
+#include "curl_non-ascii.h"
 
-/* include memdebug.h last */
+/* include curl_memdebug.h last */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 /* ---- Base64 Encoding/Decoding Table --- */
 static const char table64[]=

lib/bundles.c

@@ -21,21 +21,21 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include <curl/curl.h>
 
-#include "urldata.h"
+#include "curl_urldata.h"
-#include "url.h"
+#include "curl_url.h"
-#include "progress.h"
+#include "curl_progress.h"
-#include "multiif.h"
+#include "curl_multiif.h"
-#include "bundles.h"
+#include "curl_bundles.h"
-#include "sendf.h"
+#include "curl_sendf.h"
-#include "rawstr.h"
+#include "curl_rawstr.h"
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 static void conn_llist_dtor(void *user, void *element)
 {

lib/conncache.c

@@ -21,22 +21,22 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include <curl/curl.h>
 
-#include "urldata.h"
+#include "curl_urldata.h"
-#include "url.h"
+#include "curl_url.h"
-#include "progress.h"
+#include "curl_progress.h"
-#include "multiif.h"
+#include "curl_multiif.h"
-#include "sendf.h"
+#include "curl_sendf.h"
-#include "rawstr.h"
+#include "curl_rawstr.h"
-#include "bundles.h"
+#include "curl_bundles.h"
-#include "conncache.h"
+#include "curl_conncache.h"
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 #define CONNECTION_HASH_SIZE 97
 

lib/connect.c

@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h> /* <netinet/tcp.h> may need it */
@@ -59,24 +59,24 @@
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
-#include "urldata.h"
+#include "curl_urldata.h"
-#include "sendf.h"
+#include "curl_sendf.h"
-#include "if2ip.h"
+#include "curl_if2ip.h"
-#include "strerror.h"
+#include "curl_strerror.h"
-#include "connect.h"
+#include "curl_connect.h"
 #include "curl_memory.h"
-#include "select.h"
+#include "curl_select.h"
-#include "url.h" /* for Curl_safefree() */
+#include "curl_url.h"
-#include "multiif.h"
+#include "curl_multiif.h"
-#include "sockaddr.h" /* required for Curl_sockaddr_storage */
+#include "curl_sockaddr.h" /* required for Curl_sockaddr_storage */
-#include "inet_ntop.h"
+#include "curl_inet_ntop.h"
-#include "inet_pton.h"
+#include "curl_inet_pton.h"
-#include "sslgen.h" /* for Curl_ssl_check_cxn() */
+#include "curl_sslgen.h" /* for Curl_ssl_check_cxn() */
-#include "progress.h"
+#include "curl_progress.h"
-#include "warnless.h"
+#include "curl_warnless.h"
 
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 #ifdef __SYMBIAN32__
 /* This isn't actually supported under Symbian OS */

lib/connect.h

@@ -21,10 +21,10 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
-#include "nonblock.h" /* for curlx_nonblock(), formerly Curl_nonblock() */
+#include "curl_nonblock.h"
-#include "sockaddr.h"
+#include "curl_sockaddr.h"
 
 CURLcode Curl_is_connected(struct connectdata *conn,
                            int sockindex,

lib/content_encoding.c

@@ -20,17 +20,17 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_LIBZ
 
-#include "urldata.h"
+#include "curl_urldata.h"
 #include <curl/curl.h>
-#include "sendf.h"
+#include "curl_sendf.h"
-#include "content_encoding.h"
+#include "curl_content_encoding.h"
 #include "curl_memory.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 /* Comment this out if zlib is always going to be at least ver. 1.2.0.4
    (doing so will reduce code size slightly). */

lib/content_encoding.h

@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 /*
  * Comma-separated list all supported Content-Encodings ('identity' is implied)

lib/cookie.c

@@ -77,26 +77,26 @@ Example set of cookies:
 ****/
 
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_COOKIES)
 
 #define _MPRINTF_REPLACE
 #include <curl/mprintf.h>
 
-#include "urldata.h"
+#include "curl_urldata.h"
-#include "cookie.h"
+#include "curl_cookie.h"
-#include "strequal.h"
+#include "curl_strequal.h"
-#include "strtok.h"
+#include "curl_strtok.h"
-#include "sendf.h"
+#include "curl_sendf.h"
 #include "curl_memory.h"
-#include "share.h"
+#include "curl_share.h"
-#include "strtoofft.h"
+#include "curl_strtoofft.h"
-#include "rawstr.h"
+#include "curl_rawstr.h"
 #include "curl_memrchr.h"
 
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 static void freecookie(struct Cookie *co)
 {

lib/cookie.h

@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 #include <curl/curl.h>
 

lib/curl_addrinfo.c

@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include <curl/curl.h>
 
@@ -45,15 +45,15 @@
 #endif
 
 #include "curl_addrinfo.h"
-#include "inet_pton.h"
+#include "curl_inet_pton.h"
-#include "warnless.h"
+#include "curl_warnless.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 
 /*

lib/curl_addrinfo.h

@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>

lib/curl_darwinssl.c

@@ -26,7 +26,7 @@
  * TLS/SSL layer. No code but sslgen.c should ever call or use these functions.
  */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_DARWINSSL
 
@@ -42,12 +42,12 @@
 #include <sys/sysctl.h>
 #endif
 
-#include "urldata.h"
+#include "curl_urldata.h"
-#include "sendf.h"
+#include "curl_sendf.h"
-#include "inet_pton.h"
+#include "curl_inet_pton.h"
-#include "connect.h"
+#include "curl_connect.h"
-#include "select.h"
+#include "curl_select.h"
-#include "sslgen.h"
+#include "curl_sslgen.h"
 #include "curl_darwinssl.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
@@ -55,7 +55,7 @@
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 /* From MacTypes.h (which we can't include because it isn't present in iOS: */
 #define ioErr -36

lib/curl_darwinssl.h

@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_DARWINSSL
 

lib/curl_fnmatch.c

@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include "curl_fnmatch.h"
 
@@ -29,7 +29,7 @@
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 #define CURLFNM_CHARSET_LEN (sizeof(char) * 256)
 #define CURLFNM_CHSET_SIZE (CURLFNM_CHARSET_LEN + 15)

lib/curl_gethostname.c

@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include "curl_gethostname.h"
 

lib/curl_gssapi.c

@@ -20,12 +20,12 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_GSSAPI
 
 #include "curl_gssapi.h"
-#include "sendf.h"
+#include "curl_sendf.h"
 
 OM_uint32 Curl_gss_init_sec_context(
     struct SessionHandle *data,

lib/curl_gssapi.h

@@ -22,8 +22,8 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
-#include "urldata.h"
+#include "curl_urldata.h"
 
 #ifdef HAVE_GSSAPI
 

lib/curl_md4.h

@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 /* NSS crypto library does not provide the MD4 hash algorithm, so that we have
  * a local implementation of it */

lib/curl_memrchr.c

@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include "curl_memrchr.h"
 
@@ -29,7 +29,7 @@
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 #ifndef HAVE_MEMRCHR
 

lib/curl_memrchr.h

@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_MEMRCHR
 

lib/curl_multibyte.c

@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #if defined(USE_WIN32_IDN) || (defined(USE_WINDOWS_SSPI) && defined(UNICODE))
 
@@ -35,7 +35,7 @@
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 wchar_t *Curl_convert_UTF8_to_wchar(const char *str_utf8)
 {

lib/curl_multibyte.h

@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 #if defined(USE_WIN32_IDN) || (defined(USE_WINDOWS_SSPI) && defined(UNICODE))
 

lib/curl_ntlm.c

@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_NTLM
 
@@ -33,26 +33,26 @@
 
 #define DEBUG_ME 0
 
-#include "urldata.h"
+#include "curl_urldata.h"
-#include "sendf.h"
+#include "curl_sendf.h"
-#include "rawstr.h"
+#include "curl_rawstr.h"
 #include "curl_ntlm.h"
 #include "curl_ntlm_msgs.h"
 #include "curl_ntlm_wb.h"
-#include "url.h"
+#include "curl_url.h"
 #include "curl_memory.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #if defined(USE_NSS)
-#include "nssg.h"
+#include "curl_nssg.h"
 #elif defined(USE_WINDOWS_SSPI)
 #include "curl_sspi.h"
 #endif
 
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 #if DEBUG_ME
 # define DEBUG_OUT(x) x

lib/curl_ntlm.h

@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_NTLM
 

lib/curl_ntlm_core.c

@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #if defined(USE_NTLM) && !defined(USE_WINDOWS_SSPI)
 
@@ -91,9 +91,9 @@
 #  error "Can't compile NTLM support without a crypto library."
 #endif
 
-#include "urldata.h"
+#include "curl_urldata.h"
-#include "non-ascii.h"
+#include "curl_non-ascii.h"
-#include "rawstr.h"
+#include "curl_rawstr.h"
 #include "curl_memory.h"
 #include "curl_ntlm_core.h"
 
@@ -101,7 +101,7 @@
 #include <curl/mprintf.h>
 
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 #ifdef USE_SSLEAY
 /*

lib/curl_ntlm_core.h

@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #if defined(USE_NTLM) && !defined(USE_WINDOWS_SSPI)
 

lib/curl_ntlm_msgs.c

@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_NTLM
 
@@ -33,21 +33,21 @@
 
 #define DEBUG_ME 0
 
-#include "urldata.h"
+#include "curl_urldata.h"
-#include "non-ascii.h"
+#include "curl_non-ascii.h"
-#include "sendf.h"
+#include "curl_sendf.h"
 #include "curl_base64.h"
 #include "curl_ntlm_core.h"
 #include "curl_gethostname.h"
 #include "curl_multibyte.h"
-#include "warnless.h"
+#include "curl_warnless.h"
 #include "curl_memory.h"
 
 #ifdef USE_WINDOWS_SSPI
 #  include "curl_sspi.h"
 #endif
 
-#include "sslgen.h"
+#include "curl_sslgen.h"
 
 #define BUILDING_CURL_NTLM_MSGS_C
 #include "curl_ntlm_msgs.h"
@@ -56,7 +56,7 @@
 #include <curl/mprintf.h>
 
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 /* "NTLMSSP" signature is always in ASCII regardless of the platform */
 #define NTLMSSP_SIGNATURE "\x4e\x54\x4c\x4d\x53\x53\x50"

lib/curl_ntlm_msgs.h

@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_NTLM
 

lib/curl_ntlm_wb.c

@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #if defined(USE_NTLM) && defined(NTLM_WB_ENABLED)
 
@@ -40,19 +40,19 @@
 #include <signal.h>
 #endif
 
-#include "urldata.h"
+#include "curl_urldata.h"
-#include "sendf.h"
+#include "curl_sendf.h"
-#include "select.h"
+#include "curl_select.h"
 #include "curl_ntlm_wb.h"
-#include "url.h"
+#include "curl_url.h"
-#include "strerror.h"
+#include "curl_strerror.h"
 #include "curl_memory.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 #if DEBUG_ME
 # define DEBUG_OUT(x) x

lib/curl_ntlm_wb.h

@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #if defined(USE_NTLM) && defined(NTLM_WB_ENABLED)
 

lib/curl_rand.c

@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include <curl/curl.h>
 
@@ -31,7 +31,7 @@
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 /* Private pseudo-random number seed. Unsigned integer >= 32bit. Threads
    mutual exclusion is not implemented to acess it since we do not require

lib/curl_rtmp.c

@@ -20,15 +20,15 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_LIBRTMP
 
-#include "urldata.h"
+#include "curl_urldata.h"
-#include "nonblock.h" /* for curlx_nonblock */
+#include "curl_nonblock.h" /* for curlx_nonblock */
-#include "progress.h" /* for Curl_pgrsSetUploadSize */
+#include "curl_progress.h" /* for Curl_pgrsSetUploadSize */
-#include "transfer.h"
+#include "curl_transfer.h"
-#include "warnless.h"
+#include "curl_warnless.h"
 #include <curl/curl.h>
 #include <librtmp/rtmp.h>
 
@@ -37,7 +37,7 @@
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 #ifdef _WIN32
 #define setsockopt(a,b,c,d,e) (setsockopt)(a,b,c,(const char *)d,(int)e)

lib/curl_sasl.c

@@ -24,10 +24,10 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include <curl/curl.h>
-#include "urldata.h"
+#include "curl_urldata.h"
 
 #include "curl_base64.h"
 #include "curl_md5.h"
@@ -35,14 +35,14 @@
 #include "curl_hmac.h"
 #include "curl_ntlm_msgs.h"
 #include "curl_sasl.h"
-#include "warnless.h"
+#include "curl_warnless.h"
 #include "curl_memory.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 #ifndef CURL_DISABLE_CRYPTO_AUTH
 /* Retrieves the value for a corresponding key from the challenge string

lib/curl_sasl.h

@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "pingpong.h"
+#include "curl_pingpong.h"
 
 /* Authentication mechanism flags */
 #define SASL_MECH_LOGIN         0x0001

lib/curl_schannel.c

@@ -28,16 +28,6 @@
  *
  */
 
-/*
- * Based upon the PolarSSL implementation in polarssl.c and polarssl.h:
- *   Copyright (C) 2010, 2011, Hoi-Ho Chan, <hoiho.chan@gmail.com>
- *
- * Based upon the CyaSSL implementation in cyassl.c and cyassl.h:
- *   Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * Thanks for code and inspiration!
- */
-
 /*
  * TODO list for TLS/SSL implementation:
  * - implement client certificate authentication
@@ -51,7 +41,7 @@
  *   http://msdn.microsoft.com/en-us/library/windows/desktop/aa380161.aspx
  */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_SCHANNEL
 
@@ -61,21 +51,21 @@
 
 #include "curl_sspi.h"
 #include "curl_schannel.h"
-#include "sslgen.h"
+#include "curl_sslgen.h"
-#include "sendf.h"
+#include "curl_sendf.h"
-#include "connect.h" /* for the connect timeout */
+#include "curl_connect.h" /* for the connect timeout */
-#include "strerror.h"
+#include "curl_strerror.h"
-#include "select.h" /* for the socket readyness */
+#include "curl_select.h" /* for the socket readyness */
-#include "inet_pton.h" /* for IP addr SNI check */
+#include "curl_inet_pton.h" /* for IP addr SNI check */
 #include "curl_multibyte.h"
-#include "warnless.h"
+#include "curl_warnless.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 /* Uncomment to force verbose output
  * #define infof(x, y, ...) printf(y, __VA_ARGS__)

lib/curl_schannel.h

@@ -22,11 +22,11 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_SCHANNEL
 
-#include "urldata.h"
+#include "curl_urldata.h"
 
 #ifndef UNISP_NAME_A
 #define UNISP_NAME_A "Microsoft Unified Security Protocol Provider"

lib/curl_sspi.c

@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_WINDOWS_SSPI
 
@@ -33,7 +33,7 @@
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 /* We use our own typedef here since some headers might lack these */
 typedef PSecurityFunctionTable (APIENTRY *INITSECURITYINTERFACE_FN)(VOID);

lib/curl_sspi.h

@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_WINDOWS_SSPI
 

lib/curl_threads.c

@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #if defined(USE_THREADS_POSIX)
 #  ifdef HAVE_PTHREAD_H
@@ -39,7 +39,7 @@
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 #if defined(USE_THREADS_POSIX)
 

lib/curl_threads.h

@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 #if defined(USE_THREADS_POSIX)
 #  define CURL_STDCALL

lib/curlx.h

@@ -34,29 +34,29 @@
    functions while they still are offered publicly. They will be made library-
    private one day */
 
-#include "strequal.h"
+#include "curl_strequal.h"
-/* "strequal.h" provides the strequal protos */
+/* "curl_strequal.h" provides the strequal protos */
 
-#include "strtoofft.h"
+#include "curl_strtoofft.h"
-/* "strtoofft.h" provides this function: curlx_strtoofft(), returns a
+/* "curl_strtoofft.h" provides this function: curlx_strtoofft(), returns a
    curl_off_t number from a given string.
 */
 
-#include "timeval.h"
+#include "curl_timeval.h"
 /*
-  "timeval.h" sets up a 'struct timeval' even for platforms that otherwise
+  "curl_timeval.h" sets up a 'struct timeval' even for platforms that
-  don't have one and has protos for these functions:
+   otherwise don't have one and has protos for these functions:
 
   curlx_tvnow()
   curlx_tvdiff()
   curlx_tvdiff_secs()
 */
 
-#include "nonblock.h"
+#include "curl_nonblock.h"
-/* "nonblock.h" provides curlx_nonblock() */
+/* "curl_nonblock.h" provides curlx_nonblock() */
 
-#include "warnless.h"
+#include "curl_warnless.h"
-/* "warnless.h" provides functions:
+/* "curl_warnless.h" provides functions:
 
   curlx_ultous()
   curlx_ultouc()

lib/cyassl.c

@@ -26,7 +26,7 @@
  *
  */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_CYASSL
 
@@ -34,21 +34,21 @@
 #include <limits.h>
 #endif
 
-#include "urldata.h"
+#include "curl_urldata.h"
-#include "sendf.h"
+#include "curl_sendf.h"
-#include "inet_pton.h"
+#include "curl_inet_pton.h"
-#include "cyassl.h"
+#include "curl_cyassl.h"
-#include "sslgen.h"
+#include "curl_sslgen.h"
-#include "parsedate.h"
+#include "curl_parsedate.h"
-#include "connect.h" /* for the connect timeout */
+#include "curl_connect.h" /* for the connect timeout */
-#include "select.h"
+#include "curl_select.h"
-#include "rawstr.h"
+#include "curl_rawstr.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 #include <cyassl/ssl.h>
 #include <cyassl/error.h>
 

lib/cyassl.h

@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_CYASSL
 

lib/dict.c

@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef CURL_DISABLE_DICT
 
@@ -48,22 +48,22 @@
 #include <sys/select.h>
 #endif
 
-#include "urldata.h"
+#include "curl_urldata.h"
 #include <curl/curl.h>
-#include "transfer.h"
+#include "curl_transfer.h"
-#include "sendf.h"
+#include "curl_sendf.h"
 
-#include "progress.h"
+#include "curl_progress.h"
-#include "strequal.h"
+#include "curl_strequal.h"
-#include "dict.h"
+#include "curl_dict.h"
-#include "rawstr.h"
+#include "curl_rawstr.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 /*
  * Forward declarations.

lib/easy.c

@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
@@ -42,35 +42,35 @@
 #include <sys/param.h>
 #endif
 
-#include "strequal.h"
+#include "curl_strequal.h"
-#include "urldata.h"
+#include "curl_urldata.h"
 #include <curl/curl.h>
-#include "transfer.h"
+#include "curl_transfer.h"
-#include "sslgen.h"
+#include "curl_sslgen.h"
-#include "url.h"
+#include "curl_url.h"
-#include "getinfo.h"
+#include "curl_getinfo.h"
-#include "hostip.h"
+#include "curl_hostip.h"
-#include "share.h"
+#include "curl_share.h"
-#include "strdup.h"
+#include "curl_strdup.h"
 #include "curl_memory.h"
-#include "progress.h"
+#include "curl_progress.h"
-#include "easyif.h"
+#include "curl_easyif.h"
-#include "select.h"
+#include "curl_select.h"
-#include "sendf.h" /* for failf function prototype */
+#include "curl_sendf.h" /* for failf function prototype */
 #include "curl_ntlm.h"
-#include "connect.h" /* for Curl_getconnectinfo */
+#include "curl_connect.h" /* for Curl_getconnectinfo */
-#include "slist.h"
+#include "curl_slist.h"
-#include "amigaos.h"
+#include "curl_amigaos.h"
 #include "curl_rand.h"
-#include "non-ascii.h"
+#include "curl_non-ascii.h"
-#include "warnless.h"
+#include "curl_warnless.h"
-#include "conncache.h"
+#include "curl_conncache.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 /* win32_cleanup() is for win32 socket cleanup functionality, the opposite
    of win32_init() */

lib/escape.c

@@ -23,21 +23,21 @@
 /* Escape and unescape URL encoding in strings. The functions return a new
  * allocated string or NULL if an error occurred.  */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include <curl/curl.h>
 
 #include "curl_memory.h"
-#include "urldata.h"
+#include "curl_urldata.h"
-#include "warnless.h"
+#include "curl_warnless.h"
-#include "non-ascii.h"
+#include "curl_non-ascii.h"
-#include "escape.h"
+#include "curl_escape.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 /* Portable character check (remember EBCDIC). Do not use isalnum() because
    its behavior is altered by the current locale.

lib/file.c

@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef CURL_DISABLE_FILE
 
@@ -48,26 +48,26 @@
 #include <fcntl.h>
 #endif
 
-#include "strtoofft.h"
+#include "curl_strtoofft.h"
-#include "urldata.h"
+#include "curl_urldata.h"
 #include <curl/curl.h>
-#include "progress.h"
+#include "curl_progress.h"
-#include "sendf.h"
+#include "curl_sendf.h"
-#include "escape.h"
+#include "curl_escape.h"
-#include "file.h"
+#include "curl_file.h"
-#include "speedcheck.h"
+#include "curl_speedcheck.h"
-#include "getinfo.h"
+#include "curl_getinfo.h"
-#include "transfer.h"
+#include "curl_transfer.h"
-#include "url.h"
+#include "curl_url.h"
 #include "curl_memory.h"
-#include "parsedate.h" /* for the week day and month names */
+#include "curl_parsedate.h" /* for the week day and month names */
-#include "warnless.h"
+#include "curl_warnless.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 #if defined(WIN32) || defined(MSDOS) || defined(__EMX__) || \
   defined(__SYMBIAN32__)

lib/fileinfo.c

@@ -20,17 +20,17 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
-#include "strdup.h"
+#include "curl_strdup.h"
-#include "fileinfo.h"
+#include "curl_fileinfo.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 struct curl_fileinfo *Curl_fileinfo_alloc(void)
 {

lib/formdata.c

@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include <curl/curl.h>
 
@@ -33,18 +33,18 @@
 #include <libgen.h>
 #endif
 
-#include "urldata.h" /* for struct SessionHandle */
+#include "curl_urldata.h" /* for struct SessionHandle */
-#include "formdata.h"
+#include "curl_formdata.h"
 #include "curl_rand.h"
-#include "strequal.h"
+#include "curl_strequal.h"
 #include "curl_memory.h"
-#include "sendf.h"
+#include "curl_sendf.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 #endif  /* !defined(CURL_DISABLE_HTTP) || defined(USE_SSLEAY) */
 

lib/ftp.c

@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef CURL_DISABLE_FTP
 
@@ -47,47 +47,47 @@
 #endif
 
 #include <curl/curl.h>
-#include "urldata.h"
+#include "curl_urldata.h"
-#include "sendf.h"
+#include "curl_sendf.h"
-#include "if2ip.h"
+#include "curl_if2ip.h"
-#include "hostip.h"
+#include "curl_hostip.h"
-#include "progress.h"
+#include "curl_progress.h"
-#include "transfer.h"
+#include "curl_transfer.h"
-#include "escape.h"
+#include "curl_escape.h"
-#include "http.h" /* for HTTP proxy tunnel stuff */
+#include "curl_http.h" /* for HTTP proxy tunnel stuff */
-#include "socks.h"
+#include "curl_socks.h"
-#include "ftp.h"
+#include "curl_ftp.h"
-#include "fileinfo.h"
+#include "curl_fileinfo.h"
-#include "ftplistparser.h"
+#include "curl_ftplistparser.h"
 
 #if defined(HAVE_KRB4) || defined(HAVE_GSSAPI)
-#include "krb4.h"
+#include "curl_krb4.h"
 #endif
 
-#include "strtoofft.h"
+#include "curl_strtoofft.h"
-#include "strequal.h"
+#include "curl_strequal.h"
-#include "sslgen.h"
+#include "curl_sslgen.h"
-#include "connect.h"
+#include "curl_connect.h"
-#include "strerror.h"
+#include "curl_strerror.h"
-#include "inet_ntop.h"
+#include "curl_inet_ntop.h"
-#include "inet_pton.h"
+#include "curl_inet_pton.h"
-#include "select.h"
+#include "curl_select.h"
-#include "parsedate.h" /* for the week day and month names */
+#include "curl_parsedate.h" /* for the week day and month names */
-#include "sockaddr.h" /* required for Curl_sockaddr_storage */
+#include "curl_sockaddr.h" /* required for Curl_sockaddr_storage */
-#include "multiif.h"
+#include "curl_multiif.h"
-#include "url.h"
+#include "curl_url.h"
-#include "rawstr.h"
+#include "curl_rawstr.h"
-#include "speedcheck.h"
+#include "curl_speedcheck.h"
-#include "warnless.h"
+#include "curl_warnless.h"
-#include "http_proxy.h"
+#include "curl_http_proxy.h"
-#include "non-ascii.h"
+#include "curl_non-ascii.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 #ifndef NI_MAXHOST
 #define NI_MAXHOST 1025

lib/ftp.h

@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "pingpong.h"
+#include "curl_pingpong.h"
 
 #ifndef CURL_DISABLE_FTP
 extern const struct Curl_handler Curl_handler_ftp;

lib/ftplistparser.c

@@ -35,19 +35,19 @@
  * 01-29-97 11:32PM <DIR> prog
  */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef CURL_DISABLE_FTP
 
 #include <curl/curl.h>
 
-#include "urldata.h"
+#include "curl_urldata.h"
-#include "fileinfo.h"
+#include "curl_fileinfo.h"
-#include "llist.h"
+#include "curl_llist.h"
-#include "strtoofft.h"
+#include "curl_strtoofft.h"
-#include "rawstr.h"
+#include "curl_rawstr.h"
-#include "ftp.h"
+#include "curl_ftp.h"
-#include "ftplistparser.h"
+#include "curl_ftplistparser.h"
 #include "curl_fnmatch.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
@@ -55,7 +55,7 @@
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 /* allocs buffer which will contain one line of LIST command response */
 #define FTP_BUFFER_ALLOCSIZE 160

lib/ftplistparser.h

@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef CURL_DISABLE_FTP
 

lib/getenv.c

@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef __VMS
 #include <unixlib.h>
@@ -29,7 +29,7 @@
 #include <curl/curl.h>
 #include "curl_memory.h"
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 static
 char *GetEnv(const char *variable)

lib/getinfo.c

@@ -20,20 +20,20 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include <curl/curl.h>
 
-#include "urldata.h"
+#include "curl_urldata.h"
-#include "getinfo.h"
+#include "curl_getinfo.h"
 
 #include "curl_memory.h"
-#include "sslgen.h"
+#include "curl_sslgen.h"
-#include "connect.h" /* Curl_getconnectinfo() */
+#include "curl_connect.h" /* Curl_getconnectinfo() */
-#include "progress.h"
+#include "curl_progress.h"
 
 /* Make this the last #include */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 /*
  * This is supposed to be called in the beginning of a perform() session

lib/gopher.c

@@ -20,29 +20,29 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef CURL_DISABLE_GOPHER
 
-#include "urldata.h"
+#include "curl_urldata.h"
 #include <curl/curl.h>
-#include "transfer.h"
+#include "curl_transfer.h"
-#include "sendf.h"
+#include "curl_sendf.h"
 
-#include "progress.h"
+#include "curl_progress.h"
-#include "strequal.h"
+#include "curl_strequal.h"
-#include "gopher.h"
+#include "curl_gopher.h"
-#include "rawstr.h"
+#include "curl_rawstr.h"
-#include "select.h"
+#include "curl_select.h"
-#include "url.h"
+#include "curl_url.h"
-#include "warnless.h"
+#include "curl_warnless.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 /*
  * Forward declarations.

lib/gtls.c

@@ -28,7 +28,7 @@
  * since they were not present in 1.0.X.
  */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_GNUTLS
 
@@ -42,21 +42,21 @@
 #include <gcrypt.h>
 #endif
 
-#include "urldata.h"
+#include "curl_urldata.h"
-#include "sendf.h"
+#include "curl_sendf.h"
-#include "inet_pton.h"
+#include "curl_inet_pton.h"
-#include "gtls.h"
+#include "curl_gtls.h"
-#include "sslgen.h"
+#include "curl_sslgen.h"
-#include "parsedate.h"
+#include "curl_parsedate.h"
-#include "connect.h" /* for the connect timeout */
+#include "curl_connect.h" /* for the connect timeout */
-#include "select.h"
+#include "curl_select.h"
-#include "rawstr.h"
+#include "curl_rawstr.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 /*
  Some hackish cast macros based on:
@@ -94,7 +94,7 @@ static bool gtls_inited = FALSE;
 /*
  * Custom push and pull callback functions used by GNU TLS to read and write
  * to the socket.  These functions are simple wrappers to send() and recv()
- * (although here using the sread/swrite macros as defined by setup_once.h).
+ * (although here using sread/swrite macros as defined by curl_setup_once.h).
  * We use custom functions rather than the GNU TLS defaults because it allows
  * us to get specific about the fourth "flags" argument, and to use arbitrary
  * private data with gnutls_transport_set_ptr if we wish.

lib/gtls.h

@@ -22,11 +22,11 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_GNUTLS
 
-#include "urldata.h"
+#include "curl_urldata.h"
 
 int Curl_gtls_init(void);
 int Curl_gtls_cleanup(void);

lib/hash.c

@@ -20,17 +20,17 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
-#include "hash.h"
+#include "curl_hash.h"
-#include "llist.h"
+#include "curl_llist.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 static void
 hash_element_dtor(void *user, void *element)

lib/hash.h

@@ -22,11 +22,11 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #include <stddef.h>
 
-#include "llist.h"
+#include "curl_llist.h"
 
 /* Hash function prototype */
 typedef size_t (*hash_function) (void* key,

lib/hmac.c

@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef CURL_DISABLE_CRYPTO_AUTH
 
@@ -33,7 +33,7 @@
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 /*
  * Generic HMAC algorithm.

lib/hostasyn.c

@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
@@ -40,20 +40,20 @@
 #include <process.h>
 #endif
 
-#include "urldata.h"
+#include "curl_urldata.h"
-#include "sendf.h"
+#include "curl_sendf.h"
-#include "hostip.h"
+#include "curl_hostip.h"
-#include "hash.h"
+#include "curl_hash.h"
-#include "share.h"
+#include "curl_share.h"
-#include "strerror.h"
+#include "curl_strerror.h"
-#include "url.h"
+#include "curl_url.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 /***********************************************************************
  * Only for builds using asynchronous name resolves

lib/hostcheck.c

@@ -20,13 +20,13 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #if defined(USE_SSLEAY) || defined(USE_AXTLS)
 /* these two backends use functions from this file */
 
-#include "hostcheck.h"
+#include "curl_hostcheck.h"
-#include "rawstr.h"
+#include "curl_rawstr.h"
 
 /*
  * Match a hostname against a wildcard pattern.

lib/hostip.c

@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
@@ -47,22 +47,22 @@
 #include <process.h>
 #endif
 
-#include "urldata.h"
+#include "curl_urldata.h"
-#include "sendf.h"
+#include "curl_sendf.h"
-#include "hostip.h"
+#include "curl_hostip.h"
-#include "hash.h"
+#include "curl_hash.h"
-#include "share.h"
+#include "curl_share.h"
-#include "strerror.h"
+#include "curl_strerror.h"
-#include "url.h"
+#include "curl_url.h"
-#include "inet_ntop.h"
+#include "curl_inet_ntop.h"
-#include "warnless.h"
+#include "curl_warnless.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 #if defined(CURLRES_SYNCH) && \
     defined(HAVE_ALARM) && defined(SIGALRM) && defined(HAVE_SIGSETJMP)
@@ -105,8 +105,8 @@
  * asyn-ares.c   - functions for ares-using name resolves
  * asyn-thread.c - functions for threaded name resolves
 
- * The hostip.h is the united header file for all this. It defines the
+ * The curl_hostip.h is the united header file for all this. It defines the
- * CURLRES_* defines based on the config*.h and setup.h defines.
+ * CURLRES_* defines based on the config*.h and curl_setup.h defines.
  */
 
 /* These two symbols are for the global DNS cache */

lib/hostip.h

@@ -22,10 +22,10 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
-#include "hash.h"
+#include "curl_hash.h"
 #include "curl_addrinfo.h"
-#include "asyn.h"
+#include "curl_asyn.h"
 
 #ifdef HAVE_SETJMP_H
 #include <setjmp.h>

lib/hostip4.c

@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
@@ -40,21 +40,21 @@
 #include <process.h>
 #endif
 
-#include "urldata.h"
+#include "curl_urldata.h"
-#include "sendf.h"
+#include "curl_sendf.h"
-#include "hostip.h"
+#include "curl_hostip.h"
-#include "hash.h"
+#include "curl_hash.h"
-#include "share.h"
+#include "curl_share.h"
-#include "strerror.h"
+#include "curl_strerror.h"
-#include "url.h"
+#include "curl_url.h"
-#include "inet_pton.h"
+#include "curl_inet_pton.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 /***********************************************************************
  * Only for plain-ipv4 builds

lib/hostip6.c

@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
@@ -40,22 +40,22 @@
 #include <process.h>
 #endif
 
-#include "urldata.h"
+#include "curl_urldata.h"
-#include "sendf.h"
+#include "curl_sendf.h"
-#include "hostip.h"
+#include "curl_hostip.h"
-#include "hash.h"
+#include "curl_hash.h"
-#include "share.h"
+#include "curl_share.h"
-#include "strerror.h"
+#include "curl_strerror.h"
-#include "url.h"
+#include "curl_url.h"
-#include "inet_pton.h"
+#include "curl_inet_pton.h"
-#include "connect.h"
+#include "curl_connect.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 /***********************************************************************
  * Only for ipv6-enabled builds

lib/hostsyn.c

@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
@@ -40,20 +40,20 @@
 #include <process.h>
 #endif
 
-#include "urldata.h"
+#include "curl_urldata.h"
-#include "sendf.h"
+#include "curl_sendf.h"
-#include "hostip.h"
+#include "curl_hostip.h"
-#include "hash.h"
+#include "curl_hash.h"
-#include "share.h"
+#include "curl_share.h"
-#include "strerror.h"
+#include "curl_strerror.h"
-#include "url.h"
+#include "curl_url.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 /***********************************************************************
  * Only for builds using synchronous name resolves

lib/http.c

@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef CURL_DISABLE_HTTP
 
@@ -45,40 +45,40 @@
 #include <sys/param.h>
 #endif
 
-#include "urldata.h"
+#include "curl_urldata.h"
 #include <curl/curl.h>
-#include "transfer.h"
+#include "curl_transfer.h"
-#include "sendf.h"
+#include "curl_sendf.h"
-#include "formdata.h"
+#include "curl_formdata.h"
-#include "progress.h"
+#include "curl_progress.h"
 #include "curl_base64.h"
-#include "cookie.h"
+#include "curl_cookie.h"
-#include "strequal.h"
+#include "curl_strequal.h"
-#include "sslgen.h"
+#include "curl_sslgen.h"
-#include "http_digest.h"
+#include "curl_http_digest.h"
 #include "curl_ntlm.h"
 #include "curl_ntlm_wb.h"
-#include "http_negotiate.h"
+#include "curl_http_negotiate.h"
-#include "url.h"
+#include "curl_url.h"
-#include "share.h"
+#include "curl_share.h"
-#include "hostip.h"
+#include "curl_hostip.h"
-#include "http.h"
+#include "curl_http.h"
 #include "curl_memory.h"
-#include "select.h"
+#include "curl_select.h"
-#include "parsedate.h" /* for the week day and month names */
+#include "curl_parsedate.h" /* for the week day and month names */
-#include "strtoofft.h"
+#include "curl_strtoofft.h"
-#include "multiif.h"
+#include "curl_multiif.h"
-#include "rawstr.h"
+#include "curl_rawstr.h"
-#include "content_encoding.h"
+#include "curl_content_encoding.h"
-#include "http_proxy.h"
+#include "curl_http_proxy.h"
-#include "warnless.h"
+#include "curl_warnless.h"
-#include "non-ascii.h"
+#include "curl_non-ascii.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 /*
  * Forward declarations.

lib/http_chunks.c

@@ -20,23 +20,23 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef CURL_DISABLE_HTTP
 
-#include "urldata.h" /* it includes http_chunks.h */
+#include "curl_urldata.h" /* it includes curl_http_chunks.h */
-#include "sendf.h"   /* for the client write stuff */
+#include "curl_sendf.h"   /* for the client write stuff */
 
-#include "content_encoding.h"
+#include "curl_content_encoding.h"
-#include "http.h"
+#include "curl_http.h"
 #include "curl_memory.h"
-#include "non-ascii.h" /* for Curl_convert_to_network prototype */
+#include "curl_non-ascii.h" /* for Curl_convert_to_network prototype */
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 /*
  * Chunk format (simplified):

lib/http_digest.c

@@ -20,27 +20,27 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_CRYPTO_AUTH)
 
-#include "urldata.h"
+#include "curl_urldata.h"
-#include "sendf.h"
+#include "curl_sendf.h"
-#include "rawstr.h"
+#include "curl_rawstr.h"
 #include "curl_base64.h"
 #include "curl_md5.h"
-#include "http_digest.h"
+#include "curl_http_digest.h"
-#include "strtok.h"
+#include "curl_strtok.h"
-#include "url.h" /* for Curl_safefree() */
+#include "curl_url.h"
 #include "curl_memory.h"
-#include "non-ascii.h" /* included for Curl_convert_... prototypes */
+#include "curl_non-ascii.h" /* included for Curl_convert_... prototypes */
-#include "warnless.h"
+#include "curl_warnless.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 #define MAX_VALUE_LENGTH 256
 #define MAX_CONTENT_LENGTH 1024

lib/http_digest.h

@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 typedef enum {
   CURLDIGEST_NONE, /* not a digest */

lib/http_negotiate.c

@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_GSSAPI
 #ifdef HAVE_OLD_GSSMIT
@@ -30,14 +30,14 @@
 
 #ifndef CURL_DISABLE_HTTP
 
-#include "urldata.h"
+#include "curl_urldata.h"
-#include "sendf.h"
+#include "curl_sendf.h"
 #include "curl_gssapi.h"
-#include "rawstr.h"
+#include "curl_rawstr.h"
 #include "curl_base64.h"
-#include "http_negotiate.h"
+#include "curl_http_negotiate.h"
 #include "curl_memory.h"
-#include "url.h"
+#include "curl_url.h"
 
 #ifdef HAVE_SPNEGO
 #  include <spnegohelp.h>
@@ -56,7 +56,7 @@
 #include <curl/mprintf.h>
 
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 static int
 get_gss_name(struct connectdata *conn, bool proxy, gss_name_t *server)

lib/http_negotiate_sspi.c

@@ -20,18 +20,18 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_WINDOWS_SSPI
 
 #ifndef CURL_DISABLE_HTTP
 
-#include "urldata.h"
+#include "curl_urldata.h"
-#include "sendf.h"
+#include "curl_sendf.h"
-#include "rawstr.h"
+#include "curl_rawstr.h"
-#include "warnless.h"
+#include "curl_warnless.h"
 #include "curl_base64.h"
-#include "http_negotiate.h"
+#include "curl_http_negotiate.h"
 #include "curl_memory.h"
 #include "curl_multibyte.h"
 
@@ -39,7 +39,7 @@
 #include <curl/mprintf.h>
 
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 static int
 get_gss_name(struct connectdata *conn, bool proxy,

lib/http_proxy.c

@@ -20,21 +20,21 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #if !defined(CURL_DISABLE_PROXY) && !defined(CURL_DISABLE_HTTP)
 
-#include "urldata.h"
+#include "curl_urldata.h"
 #include <curl/curl.h>
-#include "http_proxy.h"
+#include "curl_http_proxy.h"
-#include "sendf.h"
+#include "curl_sendf.h"
-#include "http.h"
+#include "curl_http.h"
-#include "url.h"
+#include "curl_url.h"
-#include "select.h"
+#include "curl_select.h"
-#include "rawstr.h"
+#include "curl_rawstr.h"
-#include "progress.h"
+#include "curl_progress.h"
-#include "non-ascii.h"
+#include "curl_non-ascii.h"
-#include "connect.h"
+#include "curl_connect.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
@@ -43,7 +43,7 @@
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 CURLcode Curl_proxy_connect(struct connectdata *conn)
 {

lib/idn_win32.c

@@ -24,7 +24,7 @@
   * IDN conversions using Windows kernel32 and normaliz libraries.
   */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef USE_WIN32_IDN
 
@@ -32,7 +32,7 @@
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 #ifdef WANT_IDN_PROTOTYPES
 WINBASEAPI int WINAPI IdnToAscii(DWORD, const WCHAR *, int, WCHAR *, int);

lib/if2ip.c

@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
@@ -50,16 +50,16 @@
 #  include <inet.h>
 #endif
 
-#include "inet_ntop.h"
+#include "curl_inet_ntop.h"
-#include "strequal.h"
+#include "curl_strequal.h"
-#include "if2ip.h"
+#include "curl_if2ip.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 /* ------------------------------------------------------------------ */
 

lib/if2ip.h

@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
 
 bool Curl_if_is_interface_name(const char *interf);
 char *Curl_if2ip(int af, const char *interf, char *buf, int buf_size);

lib/imap.c

@@ -23,7 +23,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef CURL_DISABLE_IMAP
 
@@ -50,33 +50,33 @@
 #endif
 
 #include <curl/curl.h>
-#include "urldata.h"
+#include "curl_urldata.h"
-#include "sendf.h"
+#include "curl_sendf.h"
-#include "if2ip.h"
+#include "curl_if2ip.h"
-#include "hostip.h"
+#include "curl_hostip.h"
-#include "progress.h"
+#include "curl_progress.h"
-#include "transfer.h"
+#include "curl_transfer.h"
-#include "escape.h"
+#include "curl_escape.h"
-#include "http.h" /* for HTTP proxy tunnel stuff */
+#include "curl_http.h" /* for HTTP proxy tunnel stuff */
-#include "socks.h"
+#include "curl_socks.h"
-#include "imap.h"
+#include "curl_imap.h"
 
-#include "strtoofft.h"
+#include "curl_strtoofft.h"
-#include "strequal.h"
+#include "curl_strequal.h"
-#include "sslgen.h"
+#include "curl_sslgen.h"
-#include "connect.h"
+#include "curl_connect.h"
-#include "strerror.h"
+#include "curl_strerror.h"
-#include "select.h"
+#include "curl_select.h"
-#include "multiif.h"
+#include "curl_multiif.h"
-#include "url.h"
+#include "curl_url.h"
-#include "rawstr.h"
+#include "curl_rawstr.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 /* Local API functions */
 static CURLcode imap_parse_url_path(struct connectdata *conn);

lib/imap.h

@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "pingpong.h"
+#include "curl_pingpong.h"
 
 /****************************************************************************
  * IMAP unique setup

lib/inet_ntop.c

@@ -18,7 +18,7 @@
  * Original code by Paul Vixie. "curlified" by Gisle Vanem.
  */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef HAVE_INET_NTOP
 
@@ -35,7 +35,7 @@
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
-#include "inet_ntop.h"
+#include "curl_inet_ntop.h"
 
 #define IN6ADDRSZ       16
 #define INADDRSZ         4

lib/inet_ntop.h

@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 char *Curl_inet_ntop(int af, const void *addr, char *buf, size_t size);
 

lib/inet_pton.c

@@ -16,7 +16,7 @@
  * SOFTWARE.
  */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef HAVE_INET_PTON
 
@@ -30,7 +30,7 @@
 #include <arpa/inet.h>
 #endif
 
-#include "inet_pton.h"
+#include "curl_inet_pton.h"
 
 #define IN6ADDRSZ       16
 #define INADDRSZ         4

lib/inet_pton.h

@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 int Curl_inet_pton(int, const char *, void *);
 

lib/krb4.c

@@ -39,7 +39,7 @@
  *
  */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef CURL_DISABLE_FTP
 #ifdef HAVE_KRB4
@@ -50,16 +50,16 @@
 #include <krb.h>
 #include <des.h>
 
-#include "urldata.h"
+#include "curl_urldata.h"
 #include "curl_base64.h"
-#include "ftp.h"
+#include "curl_ftp.h"
-#include "sendf.h"
+#include "curl_sendf.h"
-#include "krb4.h"
+#include "curl_krb4.h"
-#include "inet_ntop.h"
+#include "curl_inet_ntop.h"
 #include "curl_memory.h"
 
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 #define LOCAL_ADDR (&conn->local_addr)
 #define REMOTE_ADDR conn->ip_addr->ai_addr

lib/krb5.c

@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.  */
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #ifndef CURL_DISABLE_FTP
 #ifdef HAVE_GSSAPI
@@ -46,20 +46,20 @@
 #include <netdb.h>
 #endif
 
-#include "urldata.h"
+#include "curl_urldata.h"
 #include "curl_base64.h"
-#include "ftp.h"
+#include "curl_ftp.h"
 #include "curl_gssapi.h"
-#include "sendf.h"
+#include "curl_sendf.h"
-#include "krb4.h"
+#include "curl_krb4.h"
 #include "curl_memory.h"
-#include "warnless.h"
+#include "curl_warnless.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 /* The last #include file should be: */
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 #define LOCAL_ADDR (&conn->local_addr)
 #define REMOTE_ADDR conn->ip_addr->ai_addr

lib/ldap.c

@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "setup.h"
+#include "curl_setup.h"
 
 #if !defined(CURL_DISABLE_LDAP) && !defined(USE_OPENLDAP)
 
@@ -54,23 +54,23 @@
 # endif /* HAVE_LDAP_SSL && HAVE_LDAP_SSL_H */
 #endif
 
-#include "urldata.h"
+#include "curl_urldata.h"
 #include <curl/curl.h>
-#include "sendf.h"
+#include "curl_sendf.h"
-#include "escape.h"
+#include "curl_escape.h"
-#include "progress.h"
+#include "curl_progress.h"
-#include "transfer.h"
+#include "curl_transfer.h"
-#include "strequal.h"
+#include "curl_strequal.h"
-#include "strtok.h"
+#include "curl_strtok.h"
 #include "curl_ldap.h"
 #include "curl_memory.h"
 #include "curl_base64.h"
-#include "rawstr.h"
+#include "curl_rawstr.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
-#include "memdebug.h"
+#include "curl_memdebug.h"
 
 #ifndef HAVE_LDAP_URL_PARSE