370 files changed, 1740 insertions, 2032 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad90fb0d6..e571e5561 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -769,13 +769,13 @@ if(CMAKE_COMPILER_IS_GNUCC AND APPLE)
   check_c_compiler_flag(-Wno-long-double HAVE_C_FLAG_Wno_long_double)
   if(HAVE_C_FLAG_Wno_long_double)
     # The Mac version of GCC warns about use of long double.  Disable it.
-    get_source_file_property(MPRINTF_COMPILE_FLAGS curl_mprintf.c COMPILE_FLAGS)
+    get_source_file_property(MPRINTF_COMPILE_FLAGS mprintf.c COMPILE_FLAGS)
     if(MPRINTF_COMPILE_FLAGS)
       set(MPRINTF_COMPILE_FLAGS "${MPRINTF_COMPILE_FLAGS} -Wno-long-double")
     else(MPRINTF_COMPILE_FLAGS)
       set(MPRINTF_COMPILE_FLAGS "-Wno-long-double")
     endif(MPRINTF_COMPILE_FLAGS)
-    set_source_files_properties(curl_mprintf.c PROPERTIES
+    set_source_files_properties(mprintf.c PROPERTIES
       COMPILE_FLAGS ${MPRINTF_COMPILE_FLAGS})
   endif(HAVE_C_FLAG_Wno_long_double)
 endif(CMAKE_COMPILER_IS_GNUCC AND APPLE)
diff --git a/buildconf b/buildconf
index 88b64efea..a7eb51a12 100755
--- a/buildconf
+++ b/buildconf
@@ -81,7 +81,7 @@ removethis(){
 #
 if test ! -f configure.ac ||
   test ! -f src/tool_main.c ||
-  test ! -f lib/curl_urldata.h ||
+  test ! -f lib/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!"
diff --git a/configure.ac b/configure.ac
index 19c5b2e48..a22fdeae4 100644
--- a/configure.ac
+++ b/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/curl_urldata.h])
+AC_CONFIG_SRCDIR([lib/urldata.h])
 AC_CONFIG_HEADERS(lib/curl_config.h include/curl/curlbuild.h)
 AC_CONFIG_MACRO_DIR([m4])
 AM_MAINTAINER_MODE
diff --git a/docs/INSTALL b/docs/INSTALL
index a39f19c78..0ed15ca29 100644
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -464,7 +464,7 @@ Win32
    possibilities:
 
    - Modify lib/config-win32.h
-   - Modify lib/curl_setup.h
+   - Modify lib/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.
diff --git a/docs/INTERNALS b/docs/INTERNALS
index 2d6339893..03839c33d 100644
--- a/docs/INTERNALS
+++ b/docs/INTERNALS
@@ -114,15 +114,15 @@ Library
  There are plenty of entry points to the library, namely each publicly defined
  function that libcurl offers to applications. All of those functions are
  rather small and easy-to-follow. All the ones prefixed with 'curl_easy' are
- put in the lib/curl_easy.c file.
+ put in the lib/easy.c file.
 
  curl_global_init_() and curl_global_cleanup() should be called by the
  application to initialize and clean up global stuff in the library. As of
  today, it can handle the global SSL initing if SSL is enabled and it can init
  the socket layer on windows machines. libcurl itself has no "global" scope.
 
- All printf()-style functions use the supplied clones in lib/curl_mprintf.c.
- This makes sure we stay absolutely platform independent.
+ All printf()-style functions use the supplied clones in lib/mprintf.c. This
+ makes sure we stay absolutely platform independent.
 
  curl_easy_init() allocates an internal struct and makes some initializations.
  The returned handle does not reveal internals. This is the 'SessionHandle'
@@ -137,17 +137,17 @@ Library
 
  curl_easy_perform() does a whole lot of things:
 
- It starts off in the lib/curl_easy.c file by calling Curl_perform() and the
- main work then continues in lib/curl_url.c. The flow continues with a call to
+ It starts off in the lib/easy.c file by calling Curl_perform() and the main
+ work then continues in lib/url.c. The flow continues with a call to
  Curl_connect() to connect to the remote site.
 
  o Curl_connect()
 
    ... analyzes the URL, it separates the different components and connects to
    the remote host. This may involve using a proxy and/or using SSL. The
-   Curl_resolv() function in lib/curl_hostip.c is used for looking up host
-   names (it does then use the proper underlying method, which may vary
-   between platforms and builds).
+   Curl_resolv() function in lib/hostip.c is used for looking up host names
+   (it does then use the proper underlying method, which may vary between
+   platforms and builds).
 
    When Curl_connect is done, we are connected to the remote site. Then it is
    time to tell the server to get a document/file. Curl_do() arranges this.
@@ -162,15 +162,15 @@ Library
    Curl_do() makes sure the proper protocol-specific function is called. The
    functions are named after the protocols they handle. Curl_ftp(),
    Curl_http(), Curl_dict(), etc. They all reside in their respective files
-   (curl_ftp.c, curl_http.c and curl_dict.c). HTTPS is handled by Curl_http()
-   and FTPS by Curl_ftp().
+   (ftp.c, http.c and dict.c). HTTPS is handled by Curl_http() and FTPS by
+   Curl_ftp().
 
    The protocol-specific functions of course deal with protocol-specific
    negotiations and setup. They have access to the Curl_sendf() (from
-   lib/curl_sendf.c) function to send printf-style formatted data to the
-   remote host and when they're ready to make the actual file transfer they
-   call the Curl_Transfer() function (in lib/curl_transfer.c) to setup the
-   transfer and returns.
+   lib/sendf.c) function to send printf-style formatted data to the remote
+   host and when they're ready to make the actual file transfer they call the
+   Curl_Transfer() function (in lib/transfer.c) to setup the transfer and
+   returns.
 
    If this DO function fails and the connection is being re-used, libcurl will
    then close this connection, setup a new connection and re-issue the DO
@@ -184,13 +184,13 @@ Library
 
  o Transfer()
 
-   Curl_perform() then calls Transfer() in lib/curl_transfer.c that performs
-   the entire file transfer.
+   Curl_perform() then calls Transfer() in lib/transfer.c that performs the
+   entire file transfer.
 
-   During transfer, the progress functions in lib/curl_progress.c are called
-   at a frequent interval (or at the user's choice, a specified callback
-   might get called). The speedcheck functions in lib/curl_speedcheck.c are
-   also used to verify that the transfer is as fast as required.
+   During transfer, the progress functions in lib/progress.c are called at a
+   frequent interval (or at the user's choice, a specified callback might get
+   called). The speedcheck functions in lib/speedcheck.c are also used to
+   verify that the transfer is as fast as required.
 
  o Curl_done()
 
@@ -238,11 +238,11 @@ Library
  HTTP(S)
 
  HTTP offers a lot and is the protocol in curl that uses the most lines of
- code. There is a special file (lib/curl_formdata.c) that offers all the
- multipart post functions.
+ code. There is a special file (lib/formdata.c) that offers all the multipart
+ post functions.
 
- base64-functions for user+password stuff (and more) is in (lib/curl_base64.c)
- and all functions for parsing and sending cookies in (lib/curl_cookie.c).
+ base64-functions for user+password stuff (and more) is in (lib/base64.c) and
+ all functions for parsing and sending cookies are found in (lib/cookie.c).
 
  HTTPS uses in almost every means the same procedure as HTTP, with only two
  exceptions: the connect procedure is different and the function used to read
@@ -250,8 +250,8 @@ Library
  the source by the use of Curl_read() for reading and Curl_write() for writing
  data to the remote server.
 
- curl_http_chunks.c contains functions that understands HTTP 1.1 chunked
- transfer encoding.
+ http_chunks.c contains functions that understands HTTP 1.1 chunked transfer
+ encoding.
 
  An interesting detail with the HTTP(S) request, is the Curl_add_buffer()
  series of functions we use. They append data to one single buffer, and when
@@ -261,7 +261,7 @@ Library
  FTP
 
  The Curl_if2ip() function can be used for getting the IP number of a
- specified network interface, and it resides in lib/curl_if2ip.c.
+ specified network interface, and it resides in lib/if2ip.c.
 
  Curl_ftpsendf() is used for sending FTP commands to the remote server. It was
  made a separate function to prevent us programmers from forgetting that they
@@ -270,42 +270,41 @@ Library
 
  Kerberos
 
- The kerberos support is mainly in lib/curl_krb4.c and lib/curl_security.c.
+ The kerberos support is mainly in lib/krb4.c and lib/security.c.
 
  TELNET
 
- Telnet is implemented in lib/curl_telnet.c.
+ Telnet is implemented in lib/telnet.c.
 
  FILE
 
- The file:// protocol is dealt with in lib/curl_file.c.
+ The file:// protocol is dealt with in lib/file.c.
 
  LDAP
 
- Everything LDAP is in lib/curl_ldap.c and lib/curl_openldap.c
+ Everything LDAP is in lib/ldap.c and lib/openldap.c
 
  GENERAL
 
  URL encoding and decoding, called escaping and unescaping in the source code,
- is found in lib/curl_escape.c.
+ is found in lib/escape.c.
 
  While transferring data in Transfer() a few functions might get used.
- curl_getdate() in lib/curl_parsedate.c is for HTTP date comparisons (and
- more).
+ curl_getdate() in lib/parsedate.c is for HTTP date comparisons (and more).
 
- lib/curl_getenv.c offers curl_getenv() which is for reading environment
- variables in a neat platform independent way. That's used in the client,
- but also in lib/curl_url.c when checking the proxy environment variables.
- Note that contrary to the normal unix getenv(), this returns an allocated
- buffer that must be free()ed after use.
+ lib/getenv.c offers curl_getenv() which is for reading environment variables
+ in a neat platform independent way. That's used in the client, but also in
+ lib/url.c when checking the proxy environment variables. Note that contrary
+ to the normal unix getenv(), this returns an allocated buffer that must be
+ free()ed after use.
 
- lib/curl_netrc.c holds the .netrc parser
+ lib/netrc.c holds the .netrc parser
 
- lib/curl_timeval.c features replacement functions for systems that don't have
+ lib/timeval.c features replacement functions for systems that don't have
  gettimeofday() and a few support functions for timeval conversions.
 
  A function named curl_version() that returns the full curl version string is
- found in lib/curl_version.c.
+ found in lib/version.c.
 
 Persistent Connections
 ======================
@@ -409,10 +408,10 @@ API/ABI
 Client
 ======
 
- main() resides in src/tool_main.c together with most of the client code.
+ main() resides in src/main.c together with most of the client code.
 
  src/tool_hugehelp.c is automatically generated by the mkhelp.pl perl script
- to display the complete "manual" and the src/tool_urlglob.c file holds the
+ to display the complete "manual" and the src/urlglob.c file holds the
  functions used for the URL-"globbing" support. Globbing in the sense that
  the {} and [] expansion stuff is there.
 
@@ -421,10 +420,10 @@ Client
  control after the curl_easy_perform() it cleans up the library, checks status
  and exits.
 
- When the operation is done, the ourWriteOut() function in
- src/tool_writeout.c may be called to report about the operation. That
- function is using the curl_easy_getinfo() function to extract useful
- information from the curl session.
+ When the operation is done, the ourWriteOut() function in src/writeout.c may
+ be called to report about the operation. That function is using the
+ curl_easy_getinfo() function to extract useful information from the curl
+ session.
 
  Recent versions may loop and do all this several times if many URLs were
  specified on the command line or config file.
@@ -432,12 +431,12 @@ Client
 Memory Debugging
 ================
 
- The file lib/curl_memdebug.c contains debug-versions of a few functions.
- Functions such as malloc, free, fopen, fclose, etc that somehow deal with
- resources that might give us problems if we "leak" them. The functions in
- the memory tracking system do nothing fancy, they do their normal function
- and then log information about what they just did. The logged data can then
- be analyzed after a complete session,
+ The file lib/memdebug.c contains debug-versions of a few functions. Functions
+ such as malloc, free, fopen, fclose, etc that somehow deal with resources
+ that might give us problems if we "leak" them. The functions in the memdebug
+ system do nothing fancy, they do their normal function and then log
+ information about what they just did. The logged data can then be analyzed
+ after a complete session,
 
  memanalyze.pl is the perl script present in tests/ that analyzes a log file
  generated by the memory tracking system. It detects if resources are
diff --git a/docs/TODO b/docs/TODO
index 72ca8d8ab..611b530e4 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -541,8 +541,8 @@ to provide the data to send.
 
 19.1 http-style HEAD output for ftp
 
- #undef CURL_FTP_HTTPSTYLE_HEAD in lib/curl_ftp.c to remove the HTTP-style
- headers from being output in NOBODY requests over ftp
+ #undef CURL_FTP_HTTPSTYLE_HEAD in lib/ftp.c to remove the HTTP-style headers
+ from being output in NOBODY requests over ftp
 
 19.2 combine error codes
 
diff --git a/include/curl/curlrules.h b/include/curl/curlrules.h
index 7c2ede35b..4e9c88003 100644
--- a/include/curl/curlrules.h
+++ b/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
- * curl_setup.h, without actually needing to include curl.h internally.
+ * 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.
  */
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 517ffcfed..09b976c4c 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -18,18 +18,18 @@ if(MSVC)
 endif()
 
 # SET(CSOURCES
-# # curl_memdebug.c -not used
-# # curl_nwlib.c - Not used
-# # curl_strtok.c - specify later
-# # curl_strtoofft.c - specify later
+# #  memdebug.c -not used
+# # nwlib.c - Not used
+# # strtok.c - specify later
+# # strtoofft.c - specify later
 # )
 
 # # if we have Kerberos 4, right now this is never on
 # #OPTION(CURL_KRB4 "Use Kerberos 4" OFF)
 # IF(CURL_KRB4)
 # SET(CSOURCES ${CSOURCES}
-# curl_krb4.c
-# curl_security.c
+# krb4.c
+# security.c
 # )
 # ENDIF(CURL_KRB4)
 
@@ -37,33 +37,33 @@ endif()
 # MARK_AS_ADVANCED(CURL_MALLOC_DEBUG)
 # IF(CURL_MALLOC_DEBUG)
 # SET(CSOURCES ${CSOURCES}
-# curl_memdebug.c
+# memdebug.c
 # )
 # ENDIF(CURL_MALLOC_DEBUG)
 
 # # only build compat strtoofft if we need to
 # IF(NOT HAVE_STRTOLL AND NOT HAVE__STRTOI64)
 # SET(CSOURCES ${CSOURCES}
-# curl_strtoofft.c
+# strtoofft.c
 # )
 # ENDIF(NOT HAVE_STRTOLL AND NOT HAVE__STRTOI64)
 
 if(HAVE_FEATURES_H)
   set_source_files_properties(
-    curl_cookie.c
-    curl_easy.c
-    curl_formdata.c
-    curl_getenv.c
-    curl_nonblock.c
-    curl_hash.c
-    curl_http.c
-    curl_if2ip.c
-    curl_mprintf.c
-    curl_multi.c
-    curl_sendf.c
-    curl_telnet.c
-    curl_transfer.c
-    curl_url.c
+    cookie.c
+    easy.c
+    formdata.c
+    getenv.c
+    nonblock.c
+    hash.c
+    http.c
+    if2ip.c
+    mprintf.c
+    multi.c
+    sendf.c
+    telnet.c
+    transfer.c
+    url.c
     COMPILE_FLAGS -D_BSD_SOURCE)
 endif(HAVE_FEATURES_H)
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 6b8fcdece..bb7721d0e 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2013, 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
@@ -30,47 +30,16 @@ DOCS = README.encoding README.memoryleak README.ares README.curlx	\
 
 CMAKE_DIST = CMakeLists.txt curl_config.h.cmake
 
-EXTRA_DIST = \
- $(CMAKE_DIST) \
- $(DOCS) \
- $(DSP) \
- $(VCPROJ) \
- Makefile.Watcom \
- Makefile.b32 \
- Makefile.m32 \
- Makefile.netware \
- Makefile.vc6 \
- Makefile.vxworks \
- checksrc.pl \
- config-amigaos.h \
- config-dos.h \
- config-mac.h \
- config-os400.h \
- config-riscos.h \
- config-symbian.h \
- config-tpf.h \
- config-vms.h \
- config-vxworks.h \
- config-win32.h \
- config-win32ce.h \
- config-win32ce.h \
- curl_config.h.in \
- curl_nwlib.c \
- curl_nwos.c \
- firefox-db2pem.sh \
- libcurl.plist \
- libcurl.rc \
- makefile.amiga \
- makefile.dj \
- mk-ca-bundle.pl \
- mk-ca-bundle.vbs \
- msvcproj.foot \
- msvcproj.head \
- objnames-test08.sh \
- objnames-test10.sh \
- objnames.inc \
- setup-os400.h \
- vc6libcurl.dsw
+EXTRA_DIST = Makefile.b32 Makefile.m32 Makefile.vc6 $(DSP)              \
+ vc6libcurl.dsw config-win32.h config-win32ce.h config-riscos.h         \
+ config-mac.h curl_config.h.in makefile.dj config-dos.h libcurl.plist   \
+ libcurl.rc config-amigaos.h makefile.amiga                             \
+ Makefile.netware nwlib.c nwos.c msvcproj.head msvcproj.foot		\
+ config-win32ce.h config-os400.h setup-os400.h config-symbian.h		\
+ Makefile.Watcom config-tpf.h $(DOCS) $(VCPROJ) mk-ca-bundle.pl		\
+ mk-ca-bundle.vbs firefox-db2pem.sh $(CMAKE_DIST) config-vxworks.h	\
+ Makefile.vxworks config-vms.h checksrc.pl objnames-test08.sh		\
+ objnames-test10.sh objnames.inc
 
 CLEANFILES = $(DSP) $(VCPROJ)
 
diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index 27658639e..f97ef6d0e 100644
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -7,214 +7,40 @@
 # CSRC2 = file4.c file5.c file6.c
 # CSOURCES = $(CSRC1) $(CSRC2)
 
-CSOURCES = \
-  curl_amigaos.c \
-  curl_asyn_ares.c \
-  curl_asyn_thread.c \
-  curl_axtls.c \
-  curl_base64.c \
-  curl_bundles.c \
-  curl_conncache.c \
-  curl_connect.c \
-  curl_content_encoding.c \
-  curl_cookie.c \
-  curl_addrinfo.c \
-  curl_darwinssl.c \
-  curl_fnmatch.c \
-  curl_gethostname.c \
-  curl_gssapi.c \
-  curl_memrchr.c \
-  curl_multibyte.c \
-  curl_ntlm.c \
-  curl_ntlm_core.c \
-  curl_ntlm_msgs.c \
-  curl_ntlm_wb.c \
-  curl_rand.c \
-  curl_rtmp.c \
-  curl_sasl.c \
-  curl_schannel.c \
-  curl_sspi.c \
-  curl_threads.c \
-  curl_cyassl.c \
-  curl_dict.c \
-  curl_easy.c \
-  curl_escape.c \
-  curl_file.c \
-  curl_fileinfo.c \
-  curl_formdata.c \
-  curl_ftp.c \
-  curl_ftplistparser.c \
-  curl_getenv.c \
-  curl_getinfo.c \
-  curl_gopher.c \
-  curl_gtls.c \
-  curl_hash.c \
-  curl_hmac.c \
-  curl_hostasyn.c \
-  curl_hostcheck.c \
-  curl_hostip.c \
-  curl_hostip4.c \
-  curl_hostip6.c \
-  curl_hostsyn.c \
-  curl_http.c \
-  curl_http_chunks.c \
-  curl_http_digest.c \
-  curl_http_negotiate.c \
-  curl_http_negotiate_sspi.c \
-  curl_http_proxy.c \
-  curl_idn_win32.c \
-  curl_if2ip.c \
-  curl_imap.c \
-  curl_inet_ntop.c \
-  curl_inet_pton.c \
-  curl_krb4.c \
-  curl_krb5.c \
-  curl_ldap.c \
-  curl_llist.c \
-  curl_md4.c \
-  curl_md5.c \
-  curl_memdebug.c \
-  curl_mprintf.c \
-  curl_multi.c \
-  curl_netrc.c \
-  curl_non_ascii.c \
-  curl_nonblock.c \
-  curl_nss.c \
-  curl_openldap.c \
-  curl_parsedate.c \
-  curl_pingpong.c \
-  curl_polarssl.c \
-  curl_pop3.c \
-  curl_progress.c \
-  curl_qssl.c \
-  curl_rawstr.c \
-  curl_rtsp.c \
-  curl_security.c \
-  curl_select.c \
-  curl_sendf.c \
-  curl_share.c \
-  curl_slist.c \
-  curl_smtp.c \
-  curl_socks.c \
-  curl_socks_gssapi.c \
-  curl_socks_sspi.c \
-  curl_speedcheck.c \
-  curl_splay.c \
-  curl_ssh.c \
-  curl_sslgen.c \
-  curl_ssluse.c \
-  curl_strdup.c \
-  curl_strequal.c \
-  curl_strerror.c \
-  curl_strtok.c \
-  curl_strtoofft.c \
-  curl_telnet.c \
-  curl_tftp.c \
-  curl_timeval.c \
-  curl_transfer.c \
-  curl_url.c \
-  curl_version.c \
-  curl_warnless.c \
-  curl_wildcard.c
-
-HHEADERS = \
-  curl_addrinfo.h \
-  curl_amigaos.h \
-  curl_arpa_telnet.h \
-  curl_asyn.h \
-  curl_axtls.h \
-  curl_base64.h \
-  curl_bundles.h \
-  curl_conncache.h \
-  curl_connect.h \
-  curl_content_encoding.h \
-  curl_cookie.h \
-  curl_cyassl.h \
-  curl_darwinssl.h \
-  curl_dict.h \
-  curl_easyif.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
+CSOURCES = file.c timeval.c base64.c hostip.c progress.c formdata.c	\
+  cookie.c http.c sendf.c ftp.c url.c dict.c if2ip.c speedcheck.c	\
+  ldap.c ssluse.c version.c getenv.c escape.c mprintf.c telnet.c	\
+  netrc.c getinfo.c transfer.c strequal.c easy.c security.c krb4.c	\
+  curl_fnmatch.c fileinfo.c ftplistparser.c wildcard.c krb5.c		\
+  memdebug.c http_chunks.c strtok.c connect.c llist.c hash.c multi.c	\
+  content_encoding.c share.c http_digest.c md4.c md5.c curl_rand.c	\
+  http_negotiate.c inet_pton.c strtoofft.c strerror.c amigaos.c		\
+  hostasyn.c hostip4.c hostip6.c hostsyn.c inet_ntop.c parsedate.c	\
+  select.c gtls.c sslgen.c tftp.c splay.c strdup.c socks.c ssh.c nss.c	\
+  qssl.c rawstr.c curl_addrinfo.c socks_gssapi.c socks_sspi.c		\
+  curl_sspi.c slist.c nonblock.c curl_memrchr.c imap.c pop3.c smtp.c	\
+  pingpong.c rtsp.c curl_threads.c warnless.c hmac.c polarssl.c		\
+  curl_rtmp.c openldap.c curl_gethostname.c gopher.c axtls.c		\
+  idn_win32.c http_negotiate_sspi.c cyassl.c http_proxy.c non-ascii.c	\
+  asyn-ares.c asyn-thread.c curl_gssapi.c curl_ntlm.c curl_ntlm_wb.c	\
+  curl_ntlm_core.c curl_ntlm_msgs.c curl_sasl.c curl_schannel.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	\
+  progress.h formdata.h cookie.h http.h sendf.h ftp.h url.h dict.h	\
+  if2ip.h speedcheck.h urldata.h curl_ldap.h ssluse.h escape.h telnet.h	\
+  getinfo.h strequal.h krb4.h memdebug.h http_chunks.h curl_rand.h	\
+  curl_fnmatch.h wildcard.h fileinfo.h ftplistparser.h strtok.h		\
+  connect.h llist.h hash.h content_encoding.h share.h curl_md4.h	\
+  curl_md5.h http_digest.h http_negotiate.h inet_pton.h amigaos.h	\
+  strtoofft.h strerror.h inet_ntop.h curlx.h curl_memory.h setup.h	\
+  transfer.h select.h easyif.h multiif.h parsedate.h sslgen.h gtls.h	\
+  tftp.h sockaddr.h splay.h strdup.h setup_once.h socks.h ssh.h nssg.h	\
+  curl_base64.h rawstr.h curl_addrinfo.h curl_sspi.h slist.h nonblock.h	\
+  curl_memrchr.h imap.h pop3.h smtp.h pingpong.h rtsp.h curl_threads.h	\
+  warnless.h curl_hmac.h polarssl.h curl_rtmp.h curl_gethostname.h	\
+  gopher.h axtls.h cyassl.h http_proxy.h non-ascii.h asyn.h curl_ntlm.h	\
+  curl_gssapi.h curl_ntlm_wb.h curl_ntlm_core.h curl_ntlm_msgs.h	\
+  curl_sasl.h curl_schannel.h curl_multibyte.h curl_darwinssl.h	\
+  hostcheck.h bundles.h conncache.h
diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index 70e6647ed..79c13ce24 100644
--- a/lib/Makefile.netware
+++ b/lib/Makefile.netware
@@ -315,9 +315,9 @@ endif
 # Makefile.inc provides the CSOURCES and HHEADERS defines
 include Makefile.inc
 
-OBJS	:= $(patsubst %.c,$(OBJDIR)/%.o,$(strip $(CSOURCES))) $(OBJDIR)/curl_nwos.o
+OBJS	:= $(patsubst %.c,$(OBJDIR)/%.o,$(strip $(CSOURCES))) $(OBJDIR)/nwos.o
 
-OBJL	= $(OBJS) $(OBJDIR)/curl_nwlib.o $(LDLIBS)
+OBJL	= $(OBJS) $(OBJDIR)/nwlib.o $(LDLIBS)
 
 all: lib nlm
 
diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6
index 99a158f32..a8e7741b9 100644
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___

 #                             \___|\___/|_| \_\_____|

 #

-# Copyright (C) 1999 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.

+# Copyright (C) 1999 - 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

@@ -494,14 +494,14 @@ clean:
 # A config was provided, so the library can be built.

 #

 X_OBJS= \

-	$(DIROBJ)\curl_asyn_ares.obj \

-	$(DIROBJ)\curl_asyn_thread.obj \

-	$(DIROBJ)\curl_base64.obj \

-	$(DIROBJ)\curl_bundles.obj \

-	$(DIROBJ)\curl_conncache.obj \

-	$(DIROBJ)\curl_connect.obj \

-	$(DIROBJ)\curl_content_encoding.obj \

-	$(DIROBJ)\curl_cookie.obj \

+	$(DIROBJ)\asyn-ares.obj \

+	$(DIROBJ)\asyn-thread.obj \

+	$(DIROBJ)\base64.obj \

+	$(DIROBJ)\bundles.obj \

+	$(DIROBJ)\conncache.obj \

+	$(DIROBJ)\connect.obj \

+	$(DIROBJ)\content_encoding.obj \

+	$(DIROBJ)\cookie.obj \

 	$(DIROBJ)\curl_addrinfo.obj \

 	$(DIROBJ)\curl_darwinssl.obj \

 	$(DIROBJ)\curl_fnmatch.obj \

@@ -518,78 +518,78 @@ X_OBJS= \
 	$(DIROBJ)\curl_schannel.obj \

 	$(DIROBJ)\curl_sspi.obj \

 	$(DIROBJ)\curl_threads.obj \

-	$(DIROBJ)\curl_dict.obj \

-	$(DIROBJ)\curl_easy.obj \

-	$(DIROBJ)\curl_escape.obj \

-	$(DIROBJ)\curl_file.obj \

-	$(DIROBJ)\curl_fileinfo.obj \

-	$(DIROBJ)\curl_formdata.obj \

-	$(DIROBJ)\curl_ftp.obj \

-	$(DIROBJ)\curl_ftplistparser.obj \

-	$(DIROBJ)\curl_getenv.obj \

-	$(DIROBJ)\curl_getinfo.obj \

-	$(DIROBJ)\curl_gopher.obj \

-	$(DIROBJ)\curl_gtls.obj \

-	$(DIROBJ)\curl_hash.obj \

-	$(DIROBJ)\curl_hmac.obj \

-	$(DIROBJ)\curl_hostasyn.obj \

-	$(DIROBJ)\curl_hostcheck.obj \

-	$(DIROBJ)\curl_hostip.obj \

-	$(DIROBJ)\curl_hostip4.obj \

-	$(DIROBJ)\curl_hostip6.obj \

-	$(DIROBJ)\curl_hostsyn.obj \

-	$(DIROBJ)\curl_http.obj \

-	$(DIROBJ)\curl_http_chunks.obj \

-	$(DIROBJ)\curl_http_digest.obj \

-	$(DIROBJ)\curl_http_negotiate.obj \

-	$(DIROBJ)\curl_http_negotiate_sspi.obj \

-	$(DIROBJ)\curl_http_proxy.obj \

-	$(DIROBJ)\curl_if2ip.obj \

-	$(DIROBJ)\curl_imap.obj \

-	$(DIROBJ)\curl_inet_ntop.obj \

-	$(DIROBJ)\curl_inet_pton.obj \

-	$(DIROBJ)\curl_ldap.obj \

-	$(DIROBJ)\curl_llist.obj \

-	$(DIROBJ)\curl_md4.obj \

-	$(DIROBJ)\curl_md5.obj \

-	$(DIROBJ)\curl_memdebug.obj \

-	$(DIROBJ)\curl_mprintf.obj \

-	$(DIROBJ)\curl_multi.obj \

-	$(DIROBJ)\curl_netrc.obj \

-	$(DIROBJ)\curl_nonblock.obj \

-	$(DIROBJ)\curl_openldap.obj \

-	$(DIROBJ)\curl_parsedate.obj \

-	$(DIROBJ)\curl_pingpong.obj \

-	$(DIROBJ)\curl_polarssl.obj \

-	$(DIROBJ)\curl_pop3.obj \

-	$(DIROBJ)\curl_progress.obj \

-	$(DIROBJ)\curl_rawstr.obj \

-	$(DIROBJ)\curl_rtsp.obj \

-	$(DIROBJ)\curl_select.obj \

-	$(DIROBJ)\curl_sendf.obj \

-	$(DIROBJ)\curl_share.obj \

-	$(DIROBJ)\curl_slist.obj \

-	$(DIROBJ)\curl_smtp.obj \

-	$(DIROBJ)\curl_socks.obj \

-	$(DIROBJ)\curl_socks_gssapi.obj \

-	$(DIROBJ)\curl_socks_sspi.obj \

-	$(DIROBJ)\curl_speedcheck.obj \

-	$(DIROBJ)\curl_splay.obj \

-	$(DIROBJ)\curl_ssh.obj \

-	$(DIROBJ)\curl_sslgen.obj \

-	$(DIROBJ)\curl_ssluse.obj \

-	$(DIROBJ)\curl_strequal.obj \

-	$(DIROBJ)\curl_strerror.obj \

-	$(DIROBJ)\curl_strtok.obj \

-	$(DIROBJ)\curl_strtoofft.obj \

-	$(DIROBJ)\curl_telnet.obj \

-	$(DIROBJ)\curl_tftp.obj \

-	$(DIROBJ)\curl_timeval.obj \

-	$(DIROBJ)\curl_transfer.obj \

-	$(DIROBJ)\curl_url.obj \

-	$(DIROBJ)\curl_version.obj \

-	$(DIROBJ)\curl_warnless.obj \

-	$(DIROBJ)\curl_wildcard.obj \

+	$(DIROBJ)\dict.obj \

+	$(DIROBJ)\easy.obj \

+	$(DIROBJ)\escape.obj \

+	$(DIROBJ)\file.obj \

+	$(DIROBJ)\fileinfo.obj \

+	$(DIROBJ)\formdata.obj \

+	$(DIROBJ)\ftp.obj \

+	$(DIROBJ)\ftplistparser.obj \

+	$(DIROBJ)\getenv.obj \

+	$(DIROBJ)\getinfo.obj \

+	$(DIROBJ)\gopher.obj \

+	$(DIROBJ)\gtls.obj \

+	$(DIROBJ)\hash.obj \

+	$(DIROBJ)\hmac.obj \

+	$(DIROBJ)\hostasyn.obj \

+	$(DIROBJ)\hostcheck.obj \

+	$(DIROBJ)\hostip.obj \

+	$(DIROBJ)\hostip4.obj \

+	$(DIROBJ)\hostip6.obj \

+	$(DIROBJ)\hostsyn.obj \

+	$(DIROBJ)\http.obj \

+	$(DIROBJ)\http_chunks.obj \

+	$(DIROBJ)\http_digest.obj \

+	$(DIROBJ)\http_negotiate.obj \

+	$(DIROBJ)\http_negotiate_sspi.obj \

+	$(DIROBJ)\http_proxy.obj \

+	$(DIROBJ)\if2ip.obj \

+	$(DIROBJ)\imap.obj \

+	$(DIROBJ)\inet_ntop.obj \

+	$(DIROBJ)\inet_pton.obj \

+	$(DIROBJ)\ldap.obj \

+	$(DIROBJ)\llist.obj \

+	$(DIROBJ)\md4.obj \

+	$(DIROBJ)\md5.obj \

+	$(DIROBJ)\memdebug.obj \

+	$(DIROBJ)\mprintf.obj \

+	$(DIROBJ)\multi.obj \

+	$(DIROBJ)\netrc.obj \

+	$(DIROBJ)\nonblock.obj \

+	$(DIROBJ)\openldap.obj \

+	$(DIROBJ)\parsedate.obj \

+	$(DIROBJ)\pingpong.obj \

+	$(DIROBJ)\polarssl.obj \

+	$(DIROBJ)\pop3.obj \

+	$(DIROBJ)\progress.obj \

+	$(DIROBJ)\rawstr.obj \

+	$(DIROBJ)\rtsp.obj \

+	$(DIROBJ)\select.obj \

+	$(DIROBJ)\sendf.obj \

+	$(DIROBJ)\share.obj \

+	$(DIROBJ)\slist.obj \

+	$(DIROBJ)\smtp.obj \

+	$(DIROBJ)\socks.obj \

+	$(DIROBJ)\socks_gssapi.obj \

+	$(DIROBJ)\socks_sspi.obj \

+	$(DIROBJ)\speedcheck.obj \

+	$(DIROBJ)\splay.obj \

+	$(DIROBJ)\ssh.obj \

+	$(DIROBJ)\sslgen.obj \

+	$(DIROBJ)\ssluse.obj \

+	$(DIROBJ)\strequal.obj \

+	$(DIROBJ)\strerror.obj \

+	$(DIROBJ)\strtok.obj \

+	$(DIROBJ)\strtoofft.obj \

+	$(DIROBJ)\telnet.obj \

+	$(DIROBJ)\tftp.obj \

+	$(DIROBJ)\timeval.obj \

+	$(DIROBJ)\transfer.obj \

+	$(DIROBJ)\url.obj \

+	$(DIROBJ)\version.obj \

+	$(DIROBJ)\warnless.obj \

+	$(DIROBJ)\wildcard.obj \

 	$(RESOURCE)

 

 all : $(TARGET)

diff --git a/lib/README.curlx b/lib/README.curlx
index 6d6e29ec9..5375b0d1d 100644
--- a/lib/README.curlx
+++ b/lib/README.curlx
@@ -19,7 +19,7 @@ We provide them through a single header file for easy access for apps:
 
    A macro that converts a string containing a number to a curl_off_t number.
    This might use the curlx_strtoll() function which is provided as source
-   code in curl_strtoofft.c. Note that the function is only provided if no
+   code in strtoofft.c. Note that the function is only provided if no
    strtoll() (or equivalent) function exist on your platform. If curl_off_t
    is only a 32 bit number on your platform, this macro uses strtol().
 
diff --git a/lib/README.hostip b/lib/README.hostip
index 890187187..9723b93fd 100644
--- a/lib/README.hostip
+++ b/lib/README.hostip
@@ -1,7 +1,7 @@
- curl_hostip.c explained
+ hostip.c explained
  ==================
 
- The main COMPILE-TIME DEFINES to keep in mind when reading the curl_host*.c
+ The main COMPILE-TIME DEFINES to keep in mind when reading the host*.c
  source file are these:
 
  CURLRES_IPV6 - this host has getaddrinfo() and family, and thus we use
@@ -21,15 +21,15 @@
  libcurl is not built to use an asynchronous resolver, CURLRES_SYNCH is
  defined.
 
- The curl_host*.c sources files are split up like this:
+ The host*.c sources files are split up like this:
 
- curl_hostip.c   - method-independent resolver functions and utility functions
- curl_hostasyn.c - functions for asynchronous name resolves
- curl_hostsyn.c  - functions for synchronous name resolves
- curl_hostares.c - functions for ares-using name resolves
- curl_hostthre.c - functions for threaded name resolves
- curl_hostip4.c  - ipv4-specific functions
- curl_hostip6.c  - ipv6-specific functions
+ hostip.c   - method-independent resolver functions and utility functions
+ hostasyn.c - functions for asynchronous name resolves
+ hostsyn.c  - functions for synchronous name resolves
+ hostares.c - functions for ares-using name resolves
+ hostthre.c - functions for threaded name resolves
+ hostip4.c  - ipv4-specific functions
+ hostip6.c  - ipv6-specific functions
 
- The curl_hostip.h is the single united header file for all this. It defines
- the CURLRES_* defines based on the config*.h and curl_setup.h defines.
+ The hostip.h is the single united header file for all this. It defines the
+ CURLRES_* defines based on the config*.h and setup.h defines.
diff --git a/lib/curl_amigaos.c b/lib/amigaos.c
index c726abb68..71ea704e1 100644
--- a/lib/curl_amigaos.c
+++ b/lib/amigaos.c
@@ -20,13 +20,13 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #if defined(__AMIGA__) && !defined(__ixemul__)
 
 #include <amitcp/socketbasetags.h>
 
-#include "curl_amigaos.h"
+#include "amigaos.h"
 
 struct Library *SocketBase = NULL;
 extern int errno, h_errno;
diff --git a/lib/curl_amigaos.h b/lib/amigaos.h
index 76578be86..7476a13d8 100644
--- a/lib/curl_amigaos.h
+++ b/lib/amigaos.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
 
 #if defined(__AMIGA__) && !defined(__ixemul__)
 
diff --git a/lib/curl_arpa_telnet.h b/lib/arpa_telnet.h
index 098d9a92f..098d9a92f 100644
--- a/lib/curl_arpa_telnet.h
+++ b/lib/arpa_telnet.h
diff --git a/lib/curl_asyn_ares.c b/lib/asyn-ares.c
index 6e09e9b98..44d00bdb0 100644
--- a/lib/curl_asyn_ares.c
+++ b/lib/asyn-ares.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "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 curl_asyn.h, nothing else belongs in this file!
+ * as defined in asyn.h, nothing else belongs in this file!
  **********************************************************************/
 
 #ifdef CURLRES_ARES
 
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_hostip.h"
-#include "curl_hash.h"
-#include "curl_share.h"
-#include "curl_strerror.h"
-#include "curl_url.h"
-#include "curl_multiif.h"
-#include "curl_inet_pton.h"
-#include "curl_connect.h"
-#include "curl_select.h"
-#include "curl_progress.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "hostip.h"
+#include "hash.h"
+#include "share.h"
+#include "strerror.h"
+#include "url.h"
+#include "multiif.h"
+#include "inet_pton.h"
+#include "connect.h"
+#include "select.h"
+#include "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 "curl_memdebug.h"
+#include "memdebug.h"
 
 struct ResolverResults {
   int num_pending; /* number of ares_gethostbyname() requests */
diff --git a/lib/curl_asyn_thread.c b/lib/asyn-thread.c
index 6d3667fab..0d29d5887 100644
--- a/lib/curl_asyn_thread.c
+++ b/lib/asyn-thread.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
@@ -57,16 +57,16 @@
 #  define RESOLVER_ENOMEM  ENOMEM
 #endif
 
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_hostip.h"
-#include "curl_hash.h"
-#include "curl_share.h"
-#include "curl_strerror.h"
-#include "curl_url.h"
-#include "curl_multiif.h"
-#include "curl_inet_pton.h"
-#include "curl_inet_ntop.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "hostip.h"
+#include "hash.h"
+#include "share.h"
+#include "strerror.h"
+#include "url.h"
+#include "multiif.h"
+#include "inet_pton.h"
+#include "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 "curl_memdebug.h"
+#include "memdebug.h"
 
 /***********************************************************************
  * Only for threaded name resolves builds
diff --git a/lib/curl_asyn.h b/lib/asyn.h
index 1167a3159..e7c1b886d 100644
--- a/lib/curl_asyn.h
+++ b/lib/asyn.h
@@ -7,7 +7,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
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 #include "curl_addrinfo.h"
 
 struct addrinfo;
@@ -34,8 +34,8 @@ struct Curl_dns_entry;
 /*
  * This header defines all functions in the internal asynch resolver interface.
  * All asynch resolvers need to provide these functions.
- * curl_asyn_ares.c and curl_asyn_thread.c are the current implementations of
- * asynch resolver backends.
+ * asyn-ares.c and asyn-thread.c are the current implementations of asynch
+ * resolver backends.
  */
 
 /*
diff --git a/lib/curl_axtls.c b/lib/axtls.c
index 8bd606a40..19ed73091 100644
--- a/lib/curl_axtls.c
+++ b/lib/axtls.c
@@ -5,8 +5,8 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 2010, DirecTV * contact: Eric Hu <ehu@directv.com>
- * Copyright (C) 2010 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 2010, DirecTV
+ * contact: Eric Hu <ehu@directv.com>
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -23,27 +23,27 @@
 
 /*
  * Source file for all axTLS-specific code for the TLS/SSL layer. No code
- * but curl_sslgen.c should ever call or use these functions.
+ * but sslgen.c should ever call or use these functions.
  */
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef USE_AXTLS
 #include <axTLS/ssl.h>
-#include "curl_axtls.h"
-
-#include "curl_sendf.h"
-#include "curl_inet_pton.h"
-#include "curl_sslgen.h"
-#include "curl_parsedate.h"
-#include "curl_connect.h" /* for the connect timeout */
-#include "curl_select.h"
+#include "axtls.h"
+
+#include "sendf.h"
+#include "inet_pton.h"
+#include "sslgen.h"
+#include "parsedate.h"
+#include "connect.h" /* for the connect timeout */
+#include "select.h"
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
-#include "curl_hostcheck.h"
+#include "memdebug.h"
+#include "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 curl_axtls.h.
+ * structs stored in connectdata structure.  Perhaps can move to axtls.h.
  */
   return 1;
 }
 
 int Curl_axtls_cleanup(void)
 {
-  /* axTLS has no global cleanup.  Perhaps can move this to curl_axtls.h. */
+  /* axTLS has no global cleanup.  Perhaps can move this to axtls.h. */
   return 1;
 }
 
@@ -199,7 +199,7 @@ Curl_axtls_connect(struct connectdata *conn,
       infof(data, "found certificates in %s\n", data->set.ssl.CAfile);
   }
 
-  /* curl_gtls.c tasks we're skipping for now:
+  /* gtls.c tasks we're skipping for now:
    * 1) certificate revocation list checking
    * 2) dns name assignment to host
    * 3) set protocol priority.  axTLS is TLSv1 only, so can probably ignore
@@ -255,7 +255,7 @@ Curl_axtls_connect(struct connectdata *conn,
     }
   }
 
-  /* curl_gtls.c does more here that is being left out for now
+  /* gtls.c does more here that is being left out for now
    * 1) set session credentials.  can probably ignore since axtls puts this
    *    info in the ssl_ctx struct
    * 2) setting up callbacks.  these seem gnutls specific
@@ -280,7 +280,7 @@ Curl_axtls_connect(struct connectdata *conn,
   }
   infof (data, "handshake completed successfully\n");
 
-  /* Here, curl_gtls.c gets the peer certificates and fails out depending on
+  /* Here, gtls.c gets the peer certificates and fails out depending on
    * settings in "data."  axTLS api doesn't have get cert chain fcn, so omit?
    */
 
@@ -295,10 +295,10 @@ Curl_axtls_connect(struct connectdata *conn,
   else
     infof(data, "\t server certificate verification SKIPPED\n");
 
-  /* Here, curl_gtls.c does issuer verification. axTLS has no straightforward
+  /* Here, gtls.c does issuer verification. axTLS has no straightforward
    * equivalent, so omitting for now.*/
 
-  /* Here, curl_gtls.c does the following
+  /* Here, gtls.c does the following
    * 1) x509 hostname checking per RFC2818.  axTLS doesn't support this, but
    *    it seems useful. This is now implemented, by Oscar Koeroo
    * 2) checks cert validity based on time.  axTLS does this in ssl_verify_cert
@@ -408,10 +408,10 @@ void Curl_axtls_close(struct connectdata *conn, int sockindex)
 
   infof(conn->data, "  Curl_axtls_close\n");
   if(connssl->ssl) {
-    /* line from curl_ssluse.c: (void)SSL_shutdown(connssl->ssl);
+    /* line from ssluse.c: (void)SSL_shutdown(connssl->ssl);
        axTLS compat layer does nothing for SSL_shutdown */
 
-    /* The following line is from curl_ssluse.c.  There seems to be no axTLS
+    /* The following line is from ssluse.c.  There seems to be no axTLS
        equivalent.  ssl_free and ssl_ctx_free close things.
        SSL_set_connect_state(connssl->handle); */
 
@@ -430,9 +430,8 @@ void Curl_axtls_close(struct connectdata *conn, int sockindex)
  */
 int Curl_axtls_shutdown(struct connectdata *conn, int sockindex)
 {
-  /* Outline taken from curl_ssluse.c since functions are in axTLS compat
-     layer.  axTLS's error set is much smaller, so a lot of error-handling
-     was removed.
+  /* Outline taken from ssluse.c since functions are in axTLS compat layer.
+     axTLS's error set is much smaller, so a lot of error-handling was removed.
    */
   int retval = 0;
   struct ssl_connect_data *connssl = &conn->ssl[sockindex];
@@ -522,8 +521,7 @@ static ssize_t axtls_recv(struct connectdata *conn, /* connection data */
  */
 int Curl_axtls_check_cxn(struct connectdata *conn)
 {
-  /* curl_ssluse.c line:
-     rc = SSL_peek(conn->ssl[FIRSTSOCKET].ssl, (void*)&buf, 1);
+  /* ssluse.c line: rc = SSL_peek(conn->ssl[FIRSTSOCKET].ssl, (void*)&buf, 1);
      axTLS compat layer always returns the last argument, so connection is
      always alive? */
 
@@ -535,8 +533,8 @@ void Curl_axtls_session_free(void *ptr)
 {
   (void)ptr;
   /* free the ID */
-  /* both curl_ssluse.c and curl_gtls.c do something here, but axTLS's
-     OpenSSL compatibility layer does nothing, so we do nothing too. */
+  /* both ssluse.c and gtls.c do something here, but axTLS's OpenSSL
+     compatibility layer does nothing, so we do nothing too. */
 }
 
 size_t Curl_axtls_version(char *buffer, size_t size)
diff --git a/lib/curl_axtls.h b/lib/axtls.h
index 06f78ed32..8d33b1c7a 100644
--- a/lib/curl_axtls.h
+++ b/lib/axtls.h
@@ -25,7 +25,7 @@
 
 #ifdef USE_AXTLS
 #include "curl/curl.h"
-#include "curl_urldata.h"
+#include "urldata.h"
 
 int Curl_axtls_init(void);
 int Curl_axtls_cleanup(void);
diff --git a/lib/curl_base64.c b/lib/base64.c
index 45c7a95bc..ec46c09ab 100644
--- a/lib/curl_base64.c
+++ b/lib/base64.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, 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
@@ -22,19 +22,19 @@
 
 /* Base64 encoding/decoding */
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
-#include "curl_urldata.h" /* for the SessionHandle definition */
-#include "curl_warnless.h"
+#include "urldata.h" /* for the SessionHandle definition */
+#include "warnless.h"
 #include "curl_base64.h"
 #include "curl_memory.h"
-#include "curl_non_ascii.h"
+#include "non-ascii.h"
 
-/* include curl_memdebug.h last */
-#include "curl_memdebug.h"
+/* include memdebug.h last */
+#include "memdebug.h"
 
 /* ---- Base64 Encoding/Decoding Table --- */
 static const char table64[]=
diff --git a/lib/curl_bundles.c b/lib/bundles.c
index efbaeee4f..f09ee2a35 100644
--- a/lib/curl_bundles.c
+++ b/lib/bundles.c
@@ -21,21 +21,21 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #include <curl/curl.h>
 
-#include "curl_urldata.h"
-#include "curl_url.h"
-#include "curl_progress.h"
-#include "curl_multiif.h"
-#include "curl_bundles.h"
-#include "curl_sendf.h"
-#include "curl_rawstr.h"
+#include "urldata.h"
+#include "url.h"
+#include "progress.h"
+#include "multiif.h"
+#include "bundles.h"
+#include "sendf.h"
+#include "rawstr.h"
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 static void conn_llist_dtor(void *user, void *element)
 {
diff --git a/lib/curl_bundles.h b/lib/bundles.h
index 3816c4065..3816c4065 100644
--- a/lib/curl_bundles.h
+++ b/lib/bundles.h
diff --git a/lib/curl_conncache.c b/lib/conncache.c
index bc95e07df..a3a90f879 100644
--- a/lib/curl_conncache.c
+++ b/lib/conncache.c
@@ -21,22 +21,22 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #include <curl/curl.h>
 
-#include "curl_urldata.h"
-#include "curl_url.h"
-#include "curl_progress.h"
-#include "curl_multiif.h"
-#include "curl_sendf.h"
-#include "curl_rawstr.h"
-#include "curl_bundles.h"
-#include "curl_conncache.h"
+#include "urldata.h"
+#include "url.h"
+#include "progress.h"
+#include "multiif.h"
+#include "sendf.h"
+#include "rawstr.h"
+#include "bundles.h"
+#include "conncache.h"
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 #define CONNECTION_HASH_SIZE 97
 
diff --git a/lib/curl_conncache.h b/lib/conncache.h
index 03b129d4e..03b129d4e 100644
--- a/lib/curl_conncache.h
+++ b/lib/conncache.h
diff --git a/lib/curl_connect.c b/lib/connect.c
index 85226d808..19f5b2f5b 100644
--- a/lib/curl_connect.c
+++ b/lib/connect.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "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 "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_if2ip.h"
-#include "curl_strerror.h"
-#include "curl_connect.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "if2ip.h"
+#include "strerror.h"
+#include "connect.h"
 #include "curl_memory.h"
-#include "curl_select.h"
-#include "curl_url.h"
-#include "curl_multiif.h"
-#include "curl_sockaddr.h" /* required for Curl_sockaddr_storage */
-#include "curl_inet_ntop.h"
-#include "curl_inet_pton.h"
-#include "curl_sslgen.h" /* for Curl_ssl_check_cxn() */
-#include "curl_progress.h"
-#include "curl_warnless.h"
+#include "select.h"
+#include "url.h" /* for Curl_safefree() */
+#include "multiif.h"
+#include "sockaddr.h" /* required for Curl_sockaddr_storage */
+#include "inet_ntop.h"
+#include "inet_pton.h"
+#include "sslgen.h" /* for Curl_ssl_check_cxn() */
+#include "progress.h"
+#include "warnless.h"
 
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 #ifdef __SYMBIAN32__
 /* This isn't actually supported under Symbian OS */
diff --git a/lib/curl_connect.h b/lib/connect.h
index db23b9281..f84361f2e 100644
--- a/lib/curl_connect.h
+++ b/lib/connect.h
@@ -21,10 +21,10 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
 
-#include "curl_nonblock.h"
-#include "curl_sockaddr.h"
+#include "nonblock.h" /* for curlx_nonblock(), formerly Curl_nonblock() */
+#include "sockaddr.h"
 
 CURLcode Curl_is_connected(struct connectdata *conn,
                            int sockindex,
diff --git a/lib/curl_content_encoding.c b/lib/content_encoding.c
index 6f4d1428a..3276ef988 100644
--- a/lib/curl_content_encoding.c
+++ b/lib/content_encoding.c
@@ -20,17 +20,17 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef HAVE_LIBZ
 
-#include "curl_urldata.h"
+#include "urldata.h"
 #include <curl/curl.h>
-#include "curl_sendf.h"
-#include "curl_content_encoding.h"
+#include "sendf.h"
+#include "content_encoding.h"
 #include "curl_memory.h"
 
-#include "curl_memdebug.h"
+#include "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). */
diff --git a/lib/curl_content_encoding.h b/lib/content_encoding.h
index 501f6c8ce..372da4a3b 100644
--- a/lib/curl_content_encoding.h
+++ b/lib/content_encoding.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
 
 /*
  * Comma-separated list all supported Content-Encodings ('identity' is implied)
diff --git a/lib/curl_cookie.c b/lib/cookie.c
index 90ee884bb..644b33a25 100644
--- a/lib/curl_cookie.c
+++ b/lib/cookie.c
@@ -77,26 +77,26 @@ Example set of cookies:
 ****/
 
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_COOKIES)
 
 #define _MPRINTF_REPLACE
 #include <curl/mprintf.h>
 
-#include "curl_urldata.h"
-#include "curl_cookie.h"
-#include "curl_strequal.h"
-#include "curl_strtok.h"
-#include "curl_sendf.h"
+#include "urldata.h"
+#include "cookie.h"
+#include "strequal.h"
+#include "strtok.h"
+#include "sendf.h"
 #include "curl_memory.h"
-#include "curl_share.h"
-#include "curl_strtoofft.h"
-#include "curl_rawstr.h"
+#include "share.h"
+#include "strtoofft.h"
+#include "rawstr.h"
 #include "curl_memrchr.h"
 
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 static void freecookie(struct Cookie *co)
 {
diff --git a/lib/curl_cookie.h b/lib/cookie.h
index d3b63f780..5997e4680 100644
--- a/lib/curl_cookie.h
+++ b/lib/cookie.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
 
 #include <curl/curl.h>
 
diff --git a/lib/curl_addrinfo.c b/lib/curl_addrinfo.c
index c2d5832e6..815b4ae64 100644
--- a/lib/curl_addrinfo.c
+++ b/lib/curl_addrinfo.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, 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
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #include <curl/curl.h>
 
@@ -45,15 +45,15 @@
 #endif
 
 #include "curl_addrinfo.h"
-#include "curl_inet_pton.h"
-#include "curl_warnless.h"
+#include "inet_pton.h"
+#include "warnless.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 
 /*
@@ -482,8 +482,8 @@ Curl_addrinfo *Curl_str2addr(char *address, int port)
  * curl_dofreeaddrinfo()
  *
  * This is strictly for memory tracing and are using the same style as the
- * family otherwise present in curl_memdebug.c. I put these ones here since
- * they require a bunch of structs I didn't want to include there.
+ * family otherwise present in memdebug.c. I put these ones here since they
+ * require a bunch of structs I didn't want to include in memdebug.c
  */
 
 void
@@ -502,8 +502,8 @@ curl_dofreeaddrinfo(struct addrinfo *freethis,
  * curl_dogetaddrinfo()
  *
  * This is strictly for memory tracing and are using the same style as the
- * family otherwise present in curl_memdebug.c. I put these ones here since
- * they require a bunch of structs I didn't want to include there.
+ * family otherwise present in memdebug.c. I put these ones here since they
+ * require a bunch of structs I didn't want to include in memdebug.c
  */
 
 int
diff --git a/lib/curl_addrinfo.h b/lib/curl_addrinfo.h
index 6d2b753eb..a5375cb33 100644
--- a/lib/curl_addrinfo.h
+++ b/lib/curl_addrinfo.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
diff --git a/lib/curl_darwinssl.c b/lib/curl_darwinssl.c
index b919c1680..2d56b3920 100644
--- a/lib/curl_darwinssl.c
+++ b/lib/curl_darwinssl.c
@@ -6,7 +6,7 @@
  *                             \___|\___/|_| \_\_____|
  *
  * Copyright (C) 2012, Nick Zitzmann, <nickzman@gmail.com>.
- * Copyright (C) 2012 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 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
@@ -23,11 +23,10 @@
 
 /*
  * Source file for all iOS and Mac OS X SecureTransport-specific code for the
- * TLS/SSL layer. No code but curl_sslgen.c should ever call or use these
- * functions.
+ * TLS/SSL layer. No code but sslgen.c should ever call or use these functions.
  */
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef USE_DARWINSSL
 
@@ -43,12 +42,12 @@
 #include <sys/sysctl.h>
 #endif
 
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_inet_pton.h"
-#include "curl_connect.h"
-#include "curl_select.h"
-#include "curl_sslgen.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "inet_pton.h"
+#include "connect.h"
+#include "select.h"
+#include "sslgen.h"
 #include "curl_darwinssl.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
@@ -56,7 +55,7 @@
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 /* From MacTypes.h (which we can't include because it isn't present in iOS: */
 #define ioErr -36
diff --git a/lib/curl_darwinssl.h b/lib/curl_darwinssl.h
index 183d9371c..53053edca 100644
--- a/lib/curl_darwinssl.h
+++ b/lib/curl_darwinssl.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef USE_DARWINSSL
 
diff --git a/lib/curl_fnmatch.c b/lib/curl_fnmatch.c
index b6f7dd948..e18f52eab 100644
--- a/lib/curl_fnmatch.c
+++ b/lib/curl_fnmatch.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #include "curl_fnmatch.h"
 
@@ -29,7 +29,7 @@
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 #define CURLFNM_CHARSET_LEN (sizeof(char) * 256)
 #define CURLFNM_CHSET_SIZE (CURLFNM_CHARSET_LEN + 15)
diff --git a/lib/curl_gethostname.c b/lib/curl_gethostname.c
index ded1e6f94..ddee4ba1d 100644
--- a/lib/curl_gethostname.c
+++ b/lib/curl_gethostname.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #include "curl_gethostname.h"
 
diff --git a/lib/curl_gssapi.c b/lib/curl_gssapi.c
index 2d2492ecb..b9c8ad0cf 100644
--- a/lib/curl_gssapi.c
+++ b/lib/curl_gssapi.c
@@ -20,12 +20,12 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef HAVE_GSSAPI
 
 #include "curl_gssapi.h"
-#include "curl_sendf.h"
+#include "sendf.h"
 
 OM_uint32 Curl_gss_init_sec_context(
     struct SessionHandle *data,
diff --git a/lib/curl_gssapi.h b/lib/curl_gssapi.h
index df4bcd650..fd4596b80 100644
--- a/lib/curl_gssapi.h
+++ b/lib/curl_gssapi.h
@@ -22,8 +22,8 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
-#include "curl_urldata.h"
+#include "setup.h"
+#include "urldata.h"
 
 #ifdef HAVE_GSSAPI
 
diff --git a/lib/curl_md4.h b/lib/curl_md4.h
index b0be9cf6c..6b6c16e13 100644
--- a/lib/curl_md4.h
+++ b/lib/curl_md4.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 /* NSS crypto library does not provide the MD4 hash algorithm, so that we have
  * a local implementation of it */
diff --git a/lib/curl_memrchr.c b/lib/curl_memrchr.c
index ad7f1880d..d79af9be7 100644
--- a/lib/curl_memrchr.c
+++ b/lib/curl_memrchr.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #include "curl_memrchr.h"
 
@@ -29,7 +29,7 @@
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 #ifndef HAVE_MEMRCHR
 
diff --git a/lib/curl_memrchr.h b/lib/curl_memrchr.h
index 324c73a7b..37061b608 100644
--- a/lib/curl_memrchr.h
+++ b/lib/curl_memrchr.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef HAVE_MEMRCHR
 
diff --git a/lib/curl_multibyte.c b/lib/curl_multibyte.c
index 75d6544b0..7cb9e4c60 100644
--- a/lib/curl_multibyte.c
+++ b/lib/curl_multibyte.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "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 "curl_memdebug.h"
+#include "memdebug.h"
 
 wchar_t *Curl_convert_UTF8_to_wchar(const char *str_utf8)
 {
diff --git a/lib/curl_multibyte.h b/lib/curl_multibyte.h
index 7ee5eae12..6ecccd3c9 100644
--- a/lib/curl_multibyte.h
+++ b/lib/curl_multibyte.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
 
 #if defined(USE_WIN32_IDN) || (defined(USE_WINDOWS_SSPI) && defined(UNICODE))
 
diff --git a/lib/curl_ntlm.c b/lib/curl_ntlm.c
index 470b9c62a..9c7837254 100644
--- a/lib/curl_ntlm.c
+++ b/lib/curl_ntlm.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef USE_NTLM
 
@@ -33,26 +33,26 @@
 
 #define DEBUG_ME 0
 
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_rawstr.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "rawstr.h"
 #include "curl_ntlm.h"
 #include "curl_ntlm_msgs.h"
 #include "curl_ntlm_wb.h"
-#include "curl_url.h"
+#include "url.h"
 #include "curl_memory.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #if defined(USE_NSS)
-#include "curl_nssg.h"
+#include "nssg.h"
 #elif defined(USE_WINDOWS_SSPI)
 #include "curl_sspi.h"
 #endif
 
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 #if DEBUG_ME
 # define DEBUG_OUT(x) x
diff --git a/lib/curl_ntlm.h b/lib/curl_ntlm.h
index 21a9e9e47..b2783778b 100644
--- a/lib/curl_ntlm.h
+++ b/lib/curl_ntlm.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef USE_NTLM
 
diff --git a/lib/curl_ntlm_core.c b/lib/curl_ntlm_core.c
index 9c1fdf98c..6b7d9fc46 100644
--- a/lib/curl_ntlm_core.c
+++ b/lib/curl_ntlm_core.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, 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
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "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 "curl_urldata.h"
-#include "curl_non_ascii.h"
-#include "curl_rawstr.h"
+#include "urldata.h"
+#include "non-ascii.h"
+#include "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 "curl_memdebug.h"
+#include "memdebug.h"
 
 #ifdef USE_SSLEAY
 /*
diff --git a/lib/curl_ntlm_core.h b/lib/curl_ntlm_core.h
index 9aa126bb2..5615b3504 100644
--- a/lib/curl_ntlm_core.h
+++ b/lib/curl_ntlm_core.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #if defined(USE_NTLM) && !defined(USE_WINDOWS_SSPI)
 
diff --git a/lib/curl_ntlm_msgs.c b/lib/curl_ntlm_msgs.c
index 18a7304a2..8e788d733 100644
--- a/lib/curl_ntlm_msgs.c
+++ b/lib/curl_ntlm_msgs.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, 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
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef USE_NTLM
 
@@ -33,21 +33,21 @@
 
 #define DEBUG_ME 0
 
-#include "curl_urldata.h"
-#include "curl_non_ascii.h"
-#include "curl_sendf.h"
+#include "urldata.h"
+#include "non-ascii.h"
+#include "sendf.h"
 #include "curl_base64.h"
 #include "curl_ntlm_core.h"
 #include "curl_gethostname.h"
 #include "curl_multibyte.h"
-#include "curl_warnless.h"
+#include "warnless.h"
 #include "curl_memory.h"
 
 #ifdef USE_WINDOWS_SSPI
 #  include "curl_sspi.h"
 #endif
 
-#include "curl_sslgen.h"
+#include "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 "curl_memdebug.h"
+#include "memdebug.h"
 
 /* "NTLMSSP" signature is always in ASCII regardless of the platform */
 #define NTLMSSP_SIGNATURE "\x4e\x54\x4c\x4d\x53\x53\x50"
diff --git a/lib/curl_ntlm_msgs.h b/lib/curl_ntlm_msgs.h
index e7d185dea..703fb75e1 100644
--- a/lib/curl_ntlm_msgs.h
+++ b/lib/curl_ntlm_msgs.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef USE_NTLM
 
diff --git a/lib/curl_ntlm_wb.c b/lib/curl_ntlm_wb.c
index 87ac6f48e..46a51c2c4 100644
--- a/lib/curl_ntlm_wb.c
+++ b/lib/curl_ntlm_wb.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #if defined(USE_NTLM) && defined(NTLM_WB_ENABLED)
 
@@ -40,19 +40,19 @@
 #include <signal.h>
 #endif
 
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_select.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "select.h"
 #include "curl_ntlm_wb.h"
-#include "curl_url.h"
-#include "curl_strerror.h"
+#include "url.h"
+#include "strerror.h"
 #include "curl_memory.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 #if DEBUG_ME
 # define DEBUG_OUT(x) x
diff --git a/lib/curl_ntlm_wb.h b/lib/curl_ntlm_wb.h
index db6bc16b7..e3eaffe17 100644
--- a/lib/curl_ntlm_wb.h
+++ b/lib/curl_ntlm_wb.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #if defined(USE_NTLM) && defined(NTLM_WB_ENABLED)
 
diff --git a/lib/curl_rand.c b/lib/curl_rand.c
index bfd5f1d53..047b7f345 100644
--- a/lib/curl_rand.c
+++ b/lib/curl_rand.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #include <curl/curl.h>
 
@@ -31,7 +31,7 @@
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 /* Private pseudo-random number seed. Unsigned integer >= 32bit. Threads
    mutual exclusion is not implemented to acess it since we do not require
diff --git a/lib/curl_rtmp.c b/lib/curl_rtmp.c
index b8caca0a0..b87bdf2c7 100644
--- a/lib/curl_rtmp.c
+++ b/lib/curl_rtmp.c
@@ -20,15 +20,15 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef USE_LIBRTMP
 
-#include "curl_urldata.h"
-#include "curl_nonblock.h" /* for curlx_nonblock */
-#include "curl_progress.h" /* for Curl_pgrsSetUploadSize */
-#include "curl_transfer.h"
-#include "curl_warnless.h"
+#include "urldata.h"
+#include "nonblock.h" /* for curlx_nonblock */
+#include "progress.h" /* for Curl_pgrsSetUploadSize */
+#include "transfer.h"
+#include "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 "curl_memdebug.h"
+#include "memdebug.h"
 
 #ifdef _WIN32
 #define setsockopt(a,b,c,d,e) (setsockopt)(a,b,c,(const char *)d,(int)e)
diff --git a/lib/curl_sasl.c b/lib/curl_sasl.c
index 1becc28df..ccb54a89f 100644
--- a/lib/curl_sasl.c
+++ b/lib/curl_sasl.c
@@ -24,10 +24,10 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #include <curl/curl.h>
-#include "curl_urldata.h"
+#include "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 "curl_warnless.h"
+#include "warnless.h"
 #include "curl_memory.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 #ifndef CURL_DISABLE_CRYPTO_AUTH
 /* Retrieves the value for a corresponding key from the challenge string
diff --git a/lib/curl_sasl.h b/lib/curl_sasl.h
index fa8ac84ac..469c9a1e4 100644
--- a/lib/curl_sasl.h
+++ b/lib/curl_sasl.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "curl_pingpong.h"
+#include "pingpong.h"
 
 /* Authentication mechanism flags */
 #define SASL_MECH_LOGIN         0x0001
diff --git a/lib/curl_schannel.c b/lib/curl_schannel.c
index 06095d719..8cb3af80f 100644
--- a/lib/curl_schannel.c
+++ b/lib/curl_schannel.c
@@ -7,7 +7,7 @@
  *
  * Copyright (C) 2012, Marc Hoersken, <info@marc-hoersken.de>, et al.
  * Copyright (C) 2012, Mark Salisbury, <mark.salisbury@hp.com>
- * Copyright (C) 2012 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 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
@@ -24,11 +24,21 @@
 
 /*
  * Source file for all SChannel-specific code for the TLS/SSL layer. No code
- * but curl_sslgen.c should ever call or use these functions.
+ * but sslgen.c should ever call or use these functions.
  *
  */
 
 /*
+ * 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
  * - implement custom server certificate validation
@@ -41,7 +51,7 @@
  *   http://msdn.microsoft.com/en-us/library/windows/desktop/aa380161.aspx
  */
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef USE_SCHANNEL
 
@@ -51,21 +61,21 @@
 
 #include "curl_sspi.h"
 #include "curl_schannel.h"
-#include "curl_sslgen.h"
-#include "curl_sendf.h"
-#include "curl_connect.h" /* for the connect timeout */
-#include "curl_strerror.h"
-#include "curl_select.h" /* for the socket readyness */
-#include "curl_inet_pton.h" /* for IP addr SNI check */
+#include "sslgen.h"
+#include "sendf.h"
+#include "connect.h" /* for the connect timeout */
+#include "strerror.h"
+#include "select.h" /* for the socket readyness */
+#include "inet_pton.h" /* for IP addr SNI check */
 #include "curl_multibyte.h"
-#include "curl_warnless.h"
+#include "warnless.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 /* Uncomment to force verbose output
  * #define infof(x, y, ...) printf(y, __VA_ARGS__)
diff --git a/lib/curl_schannel.h b/lib/curl_schannel.h
index 918670fe0..37126ac7d 100644
--- a/lib/curl_schannel.h
+++ b/lib/curl_schannel.h
@@ -22,11 +22,11 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef USE_SCHANNEL
 
-#include "curl_urldata.h"
+#include "urldata.h"
 
 #ifndef UNISP_NAME_A
 #define UNISP_NAME_A "Microsoft Unified Security Protocol Provider"
diff --git a/lib/curl_sspi.c b/lib/curl_sspi.c
index 40a0af1e4..c3c41ec2f 100644
--- a/lib/curl_sspi.c
+++ b/lib/curl_sspi.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef USE_WINDOWS_SSPI
 
@@ -33,7 +33,7 @@
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 /* We use our own typedef here since some headers might lack these */
 typedef PSecurityFunctionTable (APIENTRY *INITSECURITYINTERFACE_FN)(VOID);
diff --git a/lib/curl_sspi.h b/lib/curl_sspi.h
index d52582856..c3e6d9760 100644
--- a/lib/curl_sspi.h
+++ b/lib/curl_sspi.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef USE_WINDOWS_SSPI
 
diff --git a/lib/curl_threads.c b/lib/curl_threads.c
index 8bbf0af98..411ccc81d 100644
--- a/lib/curl_threads.c
+++ b/lib/curl_threads.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "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 "curl_memdebug.h"
+#include "memdebug.h"
 
 #if defined(USE_THREADS_POSIX)
 
diff --git a/lib/curl_threads.h b/lib/curl_threads.h
index d9cec6b29..ba81054a2 100644
--- a/lib/curl_threads.h
+++ b/lib/curl_threads.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
 
 #if defined(USE_THREADS_POSIX)
 #  define CURL_STDCALL
diff --git a/lib/curlx.h b/lib/curlx.h
index 42c62958d..9dc90a004 100644
--- a/lib/curlx.h
+++ b/lib/curlx.h
@@ -34,29 +34,29 @@
    functions while they still are offered publicly. They will be made library-
    private one day */
 
-#include "curl_strequal.h"
-/* "curl_strequal.h" provides the strequal protos */
+#include "strequal.h"
+/* "strequal.h" provides the strequal protos */
 
-#include "curl_strtoofft.h"
-/* "curl_strtoofft.h" provides this function: curlx_strtoofft(), returns a
+#include "strtoofft.h"
+/* "strtoofft.h" provides this function: curlx_strtoofft(), returns a
    curl_off_t number from a given string.
 */
 
-#include "curl_timeval.h"
+#include "timeval.h"
 /*
-  "curl_timeval.h" sets up a 'struct timeval' even for platforms that
-   otherwise don't have one and has protos for these functions:
+  "timeval.h" sets up a 'struct timeval' even for platforms that otherwise
+  don't have one and has protos for these functions:
 
   curlx_tvnow()
   curlx_tvdiff()
   curlx_tvdiff_secs()
 */
 
-#include "curl_nonblock.h"
-/* "curl_nonblock.h" provides curlx_nonblock() */
+#include "nonblock.h"
+/* "nonblock.h" provides curlx_nonblock() */
 
-#include "curl_warnless.h"
-/* "curl_warnless.h" provides functions:
+#include "warnless.h"
+/* "warnless.h" provides functions:
 
   curlx_ultous()
   curlx_ultouc()
diff --git a/lib/curl_cyassl.c b/lib/cyassl.c
index 32f1cfe5c..13c0d135d 100644
--- a/lib/curl_cyassl.c
+++ b/lib/cyassl.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, 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
@@ -22,11 +22,11 @@
 
 /*
  * Source file for all CyaSSL-specific code for the TLS/SSL layer. No code
- * but curl_sslgen.c should ever call or use these functions.
+ * but sslgen.c should ever call or use these functions.
  *
  */
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef USE_CYASSL
 
@@ -34,21 +34,21 @@
 #include <limits.h>
 #endif
 
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_inet_pton.h"
-#include "curl_cyassl.h"
-#include "curl_sslgen.h"
-#include "curl_parsedate.h"
-#include "curl_connect.h" /* for the connect timeout */
-#include "curl_select.h"
-#include "curl_rawstr.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "inet_pton.h"
+#include "cyassl.h"
+#include "sslgen.h"
+#include "parsedate.h"
+#include "connect.h" /* for the connect timeout */
+#include "select.h"
+#include "rawstr.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 #include <cyassl/ssl.h>
 #include <cyassl/error.h>
 
diff --git a/lib/curl_cyassl.h b/lib/cyassl.h
index 7728a0cf5..56d68066f 100644
--- a/lib/curl_cyassl.h
+++ b/lib/cyassl.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef USE_CYASSL
 
diff --git a/lib/curl_dict.c b/lib/dict.c
index 114ef7c72..ca5c362b1 100644
--- a/lib/curl_dict.c
+++ b/lib/dict.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifndef CURL_DISABLE_DICT
 
@@ -48,22 +48,22 @@
 #include <sys/select.h>
 #endif
 
-#include "curl_urldata.h"
+#include "urldata.h"
 #include <curl/curl.h>
-#include "curl_transfer.h"
-#include "curl_sendf.h"
+#include "transfer.h"
+#include "sendf.h"
 
-#include "curl_progress.h"
-#include "curl_strequal.h"
-#include "curl_dict.h"
-#include "curl_rawstr.h"
+#include "progress.h"
+#include "strequal.h"
+#include "dict.h"
+#include "rawstr.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 /*
  * Forward declarations.
diff --git a/lib/curl_dict.h b/lib/dict.h
index 44fd9d49d..44fd9d49d 100644
--- a/lib/curl_dict.h
+++ b/lib/dict.h
diff --git a/lib/curl_easy.c b/lib/easy.c
index a2181cc4d..b73bf6601 100644
--- a/lib/curl_easy.c
+++ b/lib/easy.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, 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
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
@@ -42,35 +42,35 @@
 #include <sys/param.h>
 #endif
 
-#include "curl_strequal.h"
-#include "curl_urldata.h"
+#include "strequal.h"
+#include "urldata.h"
 #include <curl/curl.h>
-#include "curl_transfer.h"
-#include "curl_sslgen.h"
-#include "curl_url.h"
-#include "curl_getinfo.h"
-#include "curl_hostip.h"
-#include "curl_share.h"
-#include "curl_strdup.h"
+#include "transfer.h"
+#include "sslgen.h"
+#include "url.h"
+#include "getinfo.h"
+#include "hostip.h"
+#include "share.h"
+#include "strdup.h"
 #include "curl_memory.h"
-#include "curl_progress.h"
-#include "curl_easyif.h"
-#include "curl_select.h"
-#include "curl_sendf.h" /* for failf function prototype */
+#include "progress.h"
+#include "easyif.h"
+#include "select.h"
+#include "sendf.h" /* for failf function prototype */
 #include "curl_ntlm.h"
-#include "curl_connect.h" /* for Curl_getconnectinfo */
-#include "curl_slist.h"
-#include "curl_amigaos.h"
+#include "connect.h" /* for Curl_getconnectinfo */
+#include "slist.h"
+#include "amigaos.h"
 #include "curl_rand.h"
-#include "curl_non_ascii.h"
-#include "curl_warnless.h"
-#include "curl_conncache.h"
+#include "non-ascii.h"
+#include "warnless.h"
+#include "conncache.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 /* win32_cleanup() is for win32 socket cleanup functionality, the opposite
    of win32_init() */
diff --git a/lib/curl_easyif.h b/lib/easyif.h
index ed744db08..1f521689f 100644
--- a/lib/curl_easyif.h
+++ b/lib/easyif.h
@@ -7,7 +7,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
@@ -23,7 +23,7 @@
  ***************************************************************************/
 
 /*
- * Prototypes for library-wide functions provided by curl_easy.c
+ * Prototypes for library-wide functions provided by easy.c
  */
 void Curl_easy_addmulti(struct SessionHandle *data, void *multi);
 
diff --git a/lib/curl_escape.c b/lib/escape.c
index c0ed571bd..0dd5a1d0a 100644
--- a/lib/curl_escape.c
+++ b/lib/escape.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
@@ -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 "curl_setup.h"
+#include "setup.h"
 
 #include <curl/curl.h>
 
 #include "curl_memory.h"
-#include "curl_urldata.h"
-#include "curl_warnless.h"
-#include "curl_non_ascii.h"
-#include "curl_escape.h"
+#include "urldata.h"
+#include "warnless.h"
+#include "non-ascii.h"
+#include "escape.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 /* Portable character check (remember EBCDIC). Do not use isalnum() because
    its behavior is altered by the current locale.
diff --git a/lib/curl_escape.h b/lib/escape.h
index 731b13655..731b13655 100644
--- a/lib/curl_escape.h
+++ b/lib/escape.h
diff --git a/lib/curl_file.c b/lib/file.c
index 6ea2bd769..886a09e24 100644
--- a/lib/curl_file.c
+++ b/lib/file.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifndef CURL_DISABLE_FILE
 
@@ -48,26 +48,26 @@
 #include <fcntl.h>
 #endif
 
-#include "curl_strtoofft.h"
-#include "curl_urldata.h"
+#include "strtoofft.h"
+#include "urldata.h"
 #include <curl/curl.h>
-#include "curl_progress.h"
-#include "curl_sendf.h"
-#include "curl_escape.h"
-#include "curl_file.h"
-#include "curl_speedcheck.h"
-#include "curl_getinfo.h"
-#include "curl_transfer.h"
-#include "curl_url.h"
+#include "progress.h"
+#include "sendf.h"
+#include "escape.h"
+#include "file.h"
+#include "speedcheck.h"
+#include "getinfo.h"
+#include "transfer.h"
+#include "url.h"
 #include "curl_memory.h"
-#include "curl_parsedate.h" /* for the week day and month names */
-#include "curl_warnless.h"
+#include "parsedate.h" /* for the week day and month names */
+#include "warnless.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 #if defined(WIN32) || defined(MSDOS) || defined(__EMX__) || \
   defined(__SYMBIAN32__)
diff --git a/lib/curl_file.h b/lib/file.h
index 997474bc7..997474bc7 100644
--- a/lib/curl_file.h
+++ b/lib/file.h
diff --git a/lib/curl_fileinfo.c b/lib/fileinfo.c
index 433c709b5..4ffcbbe29 100644
--- a/lib/curl_fileinfo.c
+++ b/lib/fileinfo.c
@@ -20,17 +20,17 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
-#include "curl_strdup.h"
-#include "curl_fileinfo.h"
+#include "strdup.h"
+#include "fileinfo.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 struct curl_fileinfo *Curl_fileinfo_alloc(void)
 {
diff --git a/lib/curl_fileinfo.h b/lib/fileinfo.h
index b0e5e59e1..b0e5e59e1 100644
--- a/lib/curl_fileinfo.h
+++ b/lib/fileinfo.h
diff --git a/lib/curl_formdata.c b/lib/formdata.c
index c7d85c4b4..7bf883941 100644
--- a/lib/curl_formdata.c
+++ b/lib/formdata.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, 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
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #include <curl/curl.h>
 
@@ -33,18 +33,18 @@
 #include <libgen.h>
 #endif
 
-#include "curl_urldata.h" /* for struct SessionHandle */
-#include "curl_formdata.h"
+#include "urldata.h" /* for struct SessionHandle */
+#include "formdata.h"
 #include "curl_rand.h"
-#include "curl_strequal.h"
+#include "strequal.h"
 #include "curl_memory.h"
-#include "curl_sendf.h"
+#include "sendf.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 #endif  /* !defined(CURL_DISABLE_HTTP) || defined(USE_SSLEAY) */
 
@@ -857,8 +857,8 @@ static CURLcode AddFormDataf(struct FormData **formp,
 }
 
 /*
- * Curl_formclean() is used from curl_http.c, this cleans a built FormData
- * linked list
+ * Curl_formclean() is used from http.c, this cleans a built FormData linked
+ * list
  */
 void Curl_formclean(struct FormData **form_ptr)
 {
diff --git a/lib/curl_formdata.h b/lib/formdata.h
index 22f504bb3..22f504bb3 100644
--- a/lib/curl_formdata.h
+++ b/lib/formdata.h
diff --git a/lib/curl_ftp.c b/lib/ftp.c
index 653e30b66..dc24d0bb5 100644
--- a/lib/curl_ftp.c
+++ b/lib/ftp.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, 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
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifndef CURL_DISABLE_FTP
 
@@ -47,47 +47,47 @@
 #endif
 
 #include <curl/curl.h>
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_if2ip.h"
-#include "curl_hostip.h"
-#include "curl_progress.h"
-#include "curl_transfer.h"
-#include "curl_escape.h"
-#include "curl_http.h" /* for HTTP proxy tunnel stuff */
-#include "curl_socks.h"
-#include "curl_ftp.h"
-#include "curl_fileinfo.h"
-#include "curl_ftplistparser.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "if2ip.h"
+#include "hostip.h"
+#include "progress.h"
+#include "transfer.h"
+#include "escape.h"
+#include "http.h" /* for HTTP proxy tunnel stuff */
+#include "socks.h"
+#include "ftp.h"
+#include "fileinfo.h"
+#include "ftplistparser.h"
 
 #if defined(HAVE_KRB4) || defined(HAVE_GSSAPI)
-#include "curl_krb4.h"
+#include "krb4.h"
 #endif
 
-#include "curl_strtoofft.h"
-#include "curl_strequal.h"
-#include "curl_sslgen.h"
-#include "curl_connect.h"
-#include "curl_strerror.h"
-#include "curl_inet_ntop.h"
-#include "curl_inet_pton.h"
-#include "curl_select.h"
-#include "curl_parsedate.h" /* for the week day and month names */
-#include "curl_sockaddr.h" /* required for Curl_sockaddr_storage */
-#include "curl_multiif.h"
-#include "curl_url.h"
-#include "curl_rawstr.h"
-#include "curl_speedcheck.h"
-#include "curl_warnless.h"
-#include "curl_http_proxy.h"
-#include "curl_non_ascii.h"
+#include "strtoofft.h"
+#include "strequal.h"
+#include "sslgen.h"
+#include "connect.h"
+#include "strerror.h"
+#include "inet_ntop.h"
+#include "inet_pton.h"
+#include "select.h"
+#include "parsedate.h" /* for the week day and month names */
+#include "sockaddr.h" /* required for Curl_sockaddr_storage */
+#include "multiif.h"
+#include "url.h"
+#include "rawstr.h"
+#include "speedcheck.h"
+#include "warnless.h"
+#include "http_proxy.h"
+#include "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 "curl_memdebug.h"
+#include "memdebug.h"
 
 #ifndef NI_MAXHOST
 #define NI_MAXHOST 1025
@@ -3109,7 +3109,7 @@ static CURLcode ftp_statemach_act(struct connectdata *conn)
 }
 
 
-/* called repeatedly until done from curl_multi.c */
+/* called repeatedly until done from multi.c */
 static CURLcode ftp_multi_statemach(struct connectdata *conn,
                                     bool *done)
 {
@@ -4461,7 +4461,7 @@ static CURLcode ftp_dophase_done(struct connectdata *conn,
   return CURLE_OK;
 }
 
-/* called from curl_multi.c while DOing */
+/* called from multi.c while DOing */
 static CURLcode ftp_doing(struct connectdata *conn,
                           bool *dophase_done)
 {
diff --git a/lib/curl_ftp.h b/lib/ftp.h
index 7e5026792..d359f28f3 100644
--- a/lib/curl_ftp.h
+++ b/lib/ftp.h
@@ -7,7 +7,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
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "curl_pingpong.h"
+#include "pingpong.h"
 
 #ifndef CURL_DISABLE_FTP
 extern const struct Curl_handler Curl_handler_ftp;
@@ -79,7 +79,7 @@ typedef enum {
   FTP_LAST  /* never used */
 } ftpstate;
 
-struct ftp_parselist_data; /* defined later in curl_ftplistparser.c */
+struct ftp_parselist_data; /* defined later in ftplistparser.c */
 
 struct ftp_wc_tmpdata {
   struct ftp_parselist_data *parser;
@@ -146,7 +146,7 @@ struct ftp_conn {
   int count1; /* general purpose counter for the state machine */
   int count2; /* general purpose counter for the state machine */
   int count3; /* general purpose counter for the state machine */
-  ftpstate state; /* always use curl_ftp.c:state() to change state! */
+  ftpstate state; /* always use ftp.c:state() to change state! */
   ftpstate state_saved; /* transfer type saved to be reloaded after
                            data connection is established */
   curl_off_t retr_size_saved; /* Size of retrieved file saved */
diff --git a/lib/curl_ftplistparser.c b/lib/ftplistparser.c
index a1a7d5187..49ee4b6a6 100644
--- a/lib/curl_ftplistparser.c
+++ b/lib/ftplistparser.c
@@ -35,19 +35,19 @@
  * 01-29-97 11:32PM <DIR> prog
  */
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifndef CURL_DISABLE_FTP
 
 #include <curl/curl.h>
 
-#include "curl_urldata.h"
-#include "curl_fileinfo.h"
-#include "curl_llist.h"
-#include "curl_strtoofft.h"
-#include "curl_rawstr.h"
-#include "curl_ftp.h"
-#include "curl_ftplistparser.h"
+#include "urldata.h"
+#include "fileinfo.h"
+#include "llist.h"
+#include "strtoofft.h"
+#include "rawstr.h"
+#include "ftp.h"
+#include "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 "curl_memdebug.h"
+#include "memdebug.h"
 
 /* allocs buffer which will contain one line of LIST command response */
 #define FTP_BUFFER_ALLOCSIZE 160
diff --git a/lib/curl_ftplistparser.h b/lib/ftplistparser.h
index 96764e2a4..8499ccda4 100644
--- a/lib/curl_ftplistparser.h
+++ b/lib/ftplistparser.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifndef CURL_DISABLE_FTP
 
diff --git a/lib/curl_getenv.c b/lib/getenv.c
index cf8b03619..a2d69830e 100644
--- a/lib/curl_getenv.c
+++ b/lib/getenv.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef __VMS
 #include <unixlib.h>
@@ -29,7 +29,7 @@
 #include <curl/curl.h>
 #include "curl_memory.h"
 
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 static
 char *GetEnv(const char *variable)
diff --git a/lib/curl_getinfo.c b/lib/getinfo.c
index 0404c28ea..221f05a4f 100644
--- a/lib/curl_getinfo.c
+++ b/lib/getinfo.c
@@ -20,20 +20,20 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #include <curl/curl.h>
 
-#include "curl_urldata.h"
-#include "curl_getinfo.h"
+#include "urldata.h"
+#include "getinfo.h"
 
 #include "curl_memory.h"
-#include "curl_sslgen.h"
-#include "curl_connect.h" /* Curl_getconnectinfo() */
-#include "curl_progress.h"
+#include "sslgen.h"
+#include "connect.h" /* Curl_getconnectinfo() */
+#include "progress.h"
 
 /* Make this the last #include */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 /*
  * This is supposed to be called in the beginning of a perform() session
diff --git a/lib/curl_getinfo.h b/lib/getinfo.h
index 3879ff73a..3879ff73a 100644
--- a/lib/curl_getinfo.h
+++ b/lib/getinfo.h
diff --git a/lib/curl_gopher.c b/lib/gopher.c
index 80fc18e8e..e8f2790fc 100644
--- a/lib/curl_gopher.c
+++ b/lib/gopher.c
@@ -20,29 +20,29 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifndef CURL_DISABLE_GOPHER
 
-#include "curl_urldata.h"
+#include "urldata.h"
 #include <curl/curl.h>
-#include "curl_transfer.h"
-#include "curl_sendf.h"
+#include "transfer.h"
+#include "sendf.h"
 
-#include "curl_progress.h"
-#include "curl_strequal.h"
-#include "curl_gopher.h"
-#include "curl_rawstr.h"
-#include "curl_select.h"
-#include "curl_url.h"
-#include "curl_warnless.h"
+#include "progress.h"
+#include "strequal.h"
+#include "gopher.h"
+#include "rawstr.h"
+#include "select.h"
+#include "url.h"
+#include "warnless.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 /*
  * Forward declarations.
diff --git a/lib/curl_gopher.h b/lib/gopher.h
index 38bbc4b73..38bbc4b73 100644
--- a/lib/curl_gopher.h
+++ b/lib/gopher.h
diff --git a/lib/curl_gtls.c b/lib/gtls.c
index 5c9d165e7..8c2a4a0c9 100644
--- a/lib/curl_gtls.c
+++ b/lib/gtls.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, 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
@@ -22,13 +22,13 @@
 
 /*
  * Source file for all GnuTLS-specific code for the TLS/SSL layer. No code
- * but curl_sslgen.c should ever call or use these functions.
+ * but sslgen.c should ever call or use these functions.
  *
  * Note: don't use the GnuTLS' *_t variable type names in this source code,
  * since they were not present in 1.0.X.
  */
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef USE_GNUTLS
 
@@ -42,21 +42,21 @@
 #include <gcrypt.h>
 #endif
 
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_inet_pton.h"
-#include "curl_gtls.h"
-#include "curl_sslgen.h"
-#include "curl_parsedate.h"
-#include "curl_connect.h" /* for the connect timeout */
-#include "curl_select.h"
-#include "curl_rawstr.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "inet_pton.h"
+#include "gtls.h"
+#include "sslgen.h"
+#include "parsedate.h"
+#include "connect.h" /* for the connect timeout */
+#include "select.h"
+#include "rawstr.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "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 sread/swrite macros as defined by curl_setup_once.h).
+ * (although here using the sread/swrite macros as defined by 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.
diff --git a/lib/curl_gtls.h b/lib/gtls.h
index 83cfac7fd..45b755a0e 100644
--- a/lib/curl_gtls.h
+++ b/lib/gtls.h
@@ -22,11 +22,11 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef USE_GNUTLS
 
-#include "curl_urldata.h"
+#include "urldata.h"
 
 int Curl_gtls_init(void);
 int Curl_gtls_cleanup(void);
diff --git a/lib/curl_hash.c b/lib/hash.c
index 732dbcf73..b59e56146 100644
--- a/lib/curl_hash.c
+++ b/lib/hash.c
@@ -20,17 +20,17 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
-#include "curl_hash.h"
-#include "curl_llist.h"
+#include "hash.h"
+#include "llist.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 static void
 hash_element_dtor(void *user, void *element)
diff --git a/lib/curl_hash.h b/lib/hash.h
index 68e7933ab..3fa621cb1 100644
--- a/lib/curl_hash.h
+++ b/lib/hash.h
@@ -22,11 +22,11 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #include <stddef.h>
 
-#include "curl_llist.h"
+#include "llist.h"
 
 /* Hash function prototype */
 typedef size_t (*hash_function) (void* key,
diff --git a/lib/curl_hmac.c b/lib/hmac.c
index 692d27940..4df6f79ad 100644
--- a/lib/curl_hmac.c
+++ b/lib/hmac.c
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifndef CURL_DISABLE_CRYPTO_AUTH
 
@@ -33,7 +33,7 @@
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 /*
  * Generic HMAC algorithm.
diff --git a/lib/curl_hostasyn.c b/lib/hostasyn.c
index 0097b6cfd..93e2c31cd 100644
--- a/lib/curl_hostasyn.c
+++ b/lib/hostasyn.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
@@ -40,20 +40,20 @@
 #include <process.h>
 #endif
 
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_hostip.h"
-#include "curl_hash.h"
-#include "curl_share.h"
-#include "curl_strerror.h"
-#include "curl_url.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "hostip.h"
+#include "hash.h"
+#include "share.h"
+#include "strerror.h"
+#include "url.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 /***********************************************************************
  * Only for builds using asynchronous name resolves
diff --git a/lib/curl_hostcheck.c b/lib/hostcheck.c
index a5bf8b02f..8affce044 100644
--- a/lib/curl_hostcheck.c
+++ b/lib/hostcheck.c
@@ -20,13 +20,13 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #if defined(USE_SSLEAY) || defined(USE_AXTLS)
 /* these two backends use functions from this file */
 
-#include "curl_hostcheck.h"
-#include "curl_rawstr.h"
+#include "hostcheck.h"
+#include "rawstr.h"
 
 /*
  * Match a hostname against a wildcard pattern.
diff --git a/lib/curl_hostcheck.h b/lib/hostcheck.h
index f4a517a8e..f4a517a8e 100644
--- a/lib/curl_hostcheck.h
+++ b/lib/hostcheck.h
diff --git a/lib/curl_hostip.c b/lib/hostip.c
index 7cc51f899..2bfb74b42 100644
--- a/lib/curl_hostip.c
+++ b/lib/hostip.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, 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
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
@@ -47,22 +47,22 @@
 #include <process.h>
 #endif
 
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_hostip.h"
-#include "curl_hash.h"
-#include "curl_share.h"
-#include "curl_strerror.h"
-#include "curl_url.h"
-#include "curl_inet_ntop.h"
-#include "curl_warnless.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "hostip.h"
+#include "hash.h"
+#include "share.h"
+#include "strerror.h"
+#include "url.h"
+#include "inet_ntop.h"
+#include "warnless.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 #if defined(CURLRES_SYNCH) && \
     defined(HAVE_ALARM) && defined(SIGALRM) && defined(HAVE_SIGSETJMP)
@@ -71,10 +71,10 @@
 #endif
 
 /*
- * curl_hostip.c explained
- * =======================
+ * hostip.c explained
+ * ==================
  *
- * The main COMPILE-TIME DEFINES to keep in mind when reading the curl_host*.c
+ * The main COMPILE-TIME DEFINES to keep in mind when reading the host*.c
  * source file are these:
  *
  * CURLRES_IPV6 - this host has getaddrinfo() and family, and thus we use
@@ -93,20 +93,20 @@
  * libcurl is not built to use an asynchronous resolver, CURLRES_SYNCH is
  * defined.
  *
- * The curl_host*.c sources files are split up like this:
+ * The host*.c sources files are split up like this:
  *
- * curl_hostip.c   - method-independent resolver and utility functions
- * curl_hostasyn.c - functions for asynchronous name resolves
- * curl_hostsyn.c  - functions for synchronous name resolves
- * curl_hostip4.c  - ipv4-specific functions
- * curl_hostip6.c  - ipv6-specific functions
+ * hostip.c   - method-independent resolver functions and utility functions
+ * hostasyn.c - functions for asynchronous name resolves
+ * hostsyn.c  - functions for synchronous name resolves
+ * hostip4.c  - ipv4-specific functions
+ * hostip6.c  - ipv6-specific functions
  *
  * The two asynchronous name resolver backends are implemented in:
- * curl_asyn_ares.c   - functions for ares-using name resolves
- * curl_asyn_thread.c - functions for threaded name resolves
+ * asyn-ares.c   - functions for ares-using name resolves
+ * asyn-thread.c - functions for threaded name resolves
 
- * The curl_hostip.h is the united header file for all this. It defines the
- * CURLRES_* defines based on the config*.h and curl_setup.h defines.
+ * The hostip.h is the united header file for all this. It defines the
+ * CURLRES_* defines based on the config*.h and setup.h defines.
  */
 
 /* These two symbols are for the global DNS cache */
diff --git a/lib/curl_hostip.h b/lib/hostip.h
index 30c738d72..de71f54f4 100644
--- a/lib/curl_hostip.h
+++ b/lib/hostip.h
@@ -7,7 +7,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, 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
@@ -22,10 +22,10 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
-#include "curl_hash.h"
+#include "setup.h"
+#include "hash.h"
 #include "curl_addrinfo.h"
-#include "curl_asyn.h"
+#include "asyn.h"
 
 #ifdef HAVE_SETJMP_H
 #include <setjmp.h>
@@ -187,7 +187,7 @@ Curl_cache_addr(struct SessionHandle *data, Curl_addrinfo *addr,
 #endif
 
 #ifdef HAVE_SIGSETJMP
-/* Forward-declaration of variable defined in curl_hostip.c. Beware this
+/* Forward-declaration of variable defined in hostip.c. Beware this
  * is a global and unique instance. This is used to store the return
  * address that we can jump back to from inside a signal handler.
  * This is not thread-safe stuff.
diff --git a/lib/curl_hostip4.c b/lib/hostip4.c
index 5b64b4673..3babe7269 100644
--- a/lib/curl_hostip4.c
+++ b/lib/hostip4.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
@@ -40,21 +40,21 @@
 #include <process.h>
 #endif
 
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_hostip.h"
-#include "curl_hash.h"
-#include "curl_share.h"
-#include "curl_strerror.h"
-#include "curl_url.h"
-#include "curl_inet_pton.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "hostip.h"
+#include "hash.h"
+#include "share.h"
+#include "strerror.h"
+#include "url.h"
+#include "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 "curl_memdebug.h"
+#include "memdebug.h"
 
 /***********************************************************************
  * Only for plain-ipv4 builds
diff --git a/lib/curl_hostip6.c b/lib/hostip6.c
index cfd6081c1..5b25d6fc4 100644
--- a/lib/curl_hostip6.c
+++ b/lib/hostip6.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, 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
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
@@ -40,22 +40,22 @@
 #include <process.h>
 #endif
 
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_hostip.h"
-#include "curl_hash.h"
-#include "curl_share.h"
-#include "curl_strerror.h"
-#include "curl_url.h"
-#include "curl_inet_pton.h"
-#include "curl_connect.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "hostip.h"
+#include "hash.h"
+#include "share.h"
+#include "strerror.h"
+#include "url.h"
+#include "inet_pton.h"
+#include "connect.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 /***********************************************************************
  * Only for ipv6-enabled builds
@@ -65,8 +65,8 @@
 
 #if defined(CURLDEBUG) && defined(HAVE_GETNAMEINFO)
 /* These are strictly for memory tracing and are using the same style as the
- * family otherwise present in curl_memdebug.c. I put these ones here since
- * they require a bunch of structs I didn't want to include there.
+ * family otherwise present in memdebug.c. I put these ones here since they
+ * require a bunch of structs I didn't want to include in memdebug.c
  */
 
 /*
diff --git a/lib/curl_hostsyn.c b/lib/hostsyn.c
index 9a26f8d44..eff2efa7b 100644
--- a/lib/curl_hostsyn.c
+++ b/lib/hostsyn.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
@@ -40,20 +40,20 @@
 #include <process.h>
 #endif
 
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_hostip.h"
-#include "curl_hash.h"
-#include "curl_share.h"
-#include "curl_strerror.h"
-#include "curl_url.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "hostip.h"
+#include "hash.h"
+#include "share.h"
+#include "strerror.h"
+#include "url.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 /***********************************************************************
  * Only for builds using synchronous name resolves
diff --git a/lib/curl_http.c b/lib/http.c
index 420361c76..0013e5065 100644
--- a/lib/curl_http.c
+++ b/lib/http.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, 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
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifndef CURL_DISABLE_HTTP
 
@@ -45,40 +45,40 @@
 #include <sys/param.h>
 #endif
 
-#include "curl_urldata.h"
+#include "urldata.h"
 #include <curl/curl.h>
-#include "curl_transfer.h"
-#include "curl_sendf.h"
-#include "curl_formdata.h"
-#include "curl_progress.h"
+#include "transfer.h"
+#include "sendf.h"
+#include "formdata.h"
+#include "progress.h"
 #include "curl_base64.h"
-#include "curl_cookie.h"
-#include "curl_strequal.h"
-#include "curl_sslgen.h"
-#include "curl_http_digest.h"
+#include "cookie.h"
+#include "strequal.h"
+#include "sslgen.h"
+#include "http_digest.h"
 #include "curl_ntlm.h"
 #include "curl_ntlm_wb.h"
-#include "curl_http_negotiate.h"
-#include "curl_url.h"
-#include "curl_share.h"
-#include "curl_hostip.h"
-#include "curl_http.h"
+#include "http_negotiate.h"
+#include "url.h"
+#include "share.h"
+#include "hostip.h"
+#include "http.h"
 #include "curl_memory.h"
-#include "curl_select.h"
-#include "curl_parsedate.h" /* for the week day and month names */
-#include "curl_strtoofft.h"
-#include "curl_multiif.h"
-#include "curl_rawstr.h"
-#include "curl_content_encoding.h"
-#include "curl_http_proxy.h"
-#include "curl_warnless.h"
-#include "curl_non_ascii.h"
+#include "select.h"
+#include "parsedate.h" /* for the week day and month names */
+#include "strtoofft.h"
+#include "multiif.h"
+#include "rawstr.h"
+#include "content_encoding.h"
+#include "http_proxy.h"
+#include "warnless.h"
+#include "non-ascii.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 /*
  * Forward declarations.
@@ -679,8 +679,8 @@ Curl_http_output_auth(struct connectdata *conn,
 
 /*
  * Curl_http_input_auth() deals with Proxy-Authenticate: and WWW-Authenticate:
- * headers. They are dealt with both in the curl_transfer.c main loop and in
- * the proxy CONNECT loop.
+ * headers. They are dealt with both in the transfer.c main loop and in the
+ * proxy CONNECT loop.
  */
 
 CURLcode Curl_http_input_auth(struct connectdata *conn,
@@ -936,7 +936,7 @@ static int http_should_fail(struct connectdata *conn)
  * readmoredata() is a "fread() emulation" to provide POST and/or request
  * data. It is used when a huge POST is to be made and the entire chunk wasn't
  * sent in the first send(). This function will then be called from the
- * curl_transfer.c loop when more data is to be sent to the peer.
+ * transfer.c loop when more data is to be sent to the peer.
  *
  * Returns the amount of bytes it filled the buffer with.
  */
@@ -1536,7 +1536,7 @@ CURLcode Curl_add_custom_headers(struct connectdata *conn,
            checkprefix("Host:", headers->data))
           ;
         else if(conn->data->set.httpreq == HTTPREQ_POST_FORM &&
-                /* this header (extended by curl_formdata.c) is sent later */
+                /* this header (extended by formdata.c) is sent later */
                 checkprefix("Content-Type:", headers->data))
           ;
         else if(conn->bits.authneg &&
@@ -1728,10 +1728,10 @@ CURLcode Curl_http(struct connectdata *conn, bool *done)
     }
   }
 
-  /* The User-Agent string might have been allocated in curl_url.c already,
-     because it might have been used in the proxy connect, but if we have
-     got a header with the user-agent string specified, we erase the
-     previously made string here. */
+  /* The User-Agent string might have been allocated in url.c already, because
+     it might have been used in the proxy connect, but if we have got a header
+     with the user-agent string specified, we erase the previously made string
+     here. */
   if(Curl_checkheaders(data, "User-Agent:") && conn->allocptr.uagent) {
     free(conn->allocptr.uagent);
     conn->allocptr.uagent=NULL;
diff --git a/lib/curl_http.h b/lib/http.h
index f654689d5..7236dd88c 100644
--- a/lib/curl_http.h
+++ b/lib/http.h
@@ -7,7 +7,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
@@ -67,12 +67,12 @@ CURLcode Curl_http(struct connectdata *conn, bool *done);
 CURLcode Curl_http_done(struct connectdata *, CURLcode, bool premature);
 CURLcode Curl_http_connect(struct connectdata *conn, bool *done);
 
-/* The following functions are defined in curl_http_chunks.c */
+/* The following functions are defined in http_chunks.c */
 void Curl_httpchunk_init(struct connectdata *conn);
 CHUNKcode Curl_httpchunk_read(struct connectdata *conn, char *datap,
                               ssize_t length, ssize_t *wrote);
 
-/* These functions are in curl_http.c */
+/* These functions are in http.c */
 void Curl_http_auth_stage(struct SessionHandle *data, int stage);
 CURLcode Curl_http_input_auth(struct connectdata *conn,
                               int httpcode, const char *header);
diff --git a/lib/curl_http_chunks.c b/lib/http_chunks.c
index 2112f72ec..d6a0bec13 100644
--- a/lib/curl_http_chunks.c
+++ b/lib/http_chunks.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
@@ -20,23 +20,23 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifndef CURL_DISABLE_HTTP
 
-#include "curl_urldata.h" /* it includes curl_http_chunks.h */
-#include "curl_sendf.h"   /* for the client write stuff */
+#include "urldata.h" /* it includes http_chunks.h */
+#include "sendf.h"   /* for the client write stuff */
 
-#include "curl_content_encoding.h"
-#include "curl_http.h"
+#include "content_encoding.h"
+#include "http.h"
 #include "curl_memory.h"
-#include "curl_non_ascii.h" /* for Curl_convert_to_network prototype */
+#include "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 "curl_memdebug.h"
+#include "memdebug.h"
 
 /*
  * Chunk format (simplified):
@@ -315,7 +315,7 @@ CHUNKcode Curl_httpchunk_read(struct connectdata *conn,
         }
       }
       else {
-        /* conn->trailer is assumed to be freed in curl_url.c on a
+        /* conn->trailer is assumed to be freed in url.c on a
            connection basis */
         if(conn->trlPos >= conn->trlMax) {
           /* we always allocate three extra bytes, just because when the full
diff --git a/lib/curl_http_chunks.h b/lib/http_chunks.h
index b999ab53b..b999ab53b 100644
--- a/lib/curl_http_chunks.h
+++ b/lib/http_chunks.h
diff --git a/lib/curl_http_digest.c b/lib/http_digest.c
index dae679903..17cc95e81 100644
--- a/lib/curl_http_digest.c
+++ b/lib/http_digest.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, 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
@@ -20,27 +20,27 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_CRYPTO_AUTH)
 
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_rawstr.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "rawstr.h"
 #include "curl_base64.h"
 #include "curl_md5.h"
-#include "curl_http_digest.h"
-#include "curl_strtok.h"
-#include "curl_url.h"
+#include "http_digest.h"
+#include "strtok.h"
+#include "url.h" /* for Curl_safefree() */
 #include "curl_memory.h"
-#include "curl_non_ascii.h" /* included for Curl_convert_... prototypes */
-#include "curl_warnless.h"
+#include "non-ascii.h" /* included for Curl_convert_... prototypes */
+#include "warnless.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 #define MAX_VALUE_LENGTH 256
 #define MAX_CONTENT_LENGTH 1024
diff --git a/lib/curl_http_digest.h b/lib/http_digest.h
index c6a4e9161..3b22ce10e 100644
--- a/lib/curl_http_digest.h
+++ b/lib/http_digest.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
 
 typedef enum {
   CURLDIGEST_NONE, /* not a digest */
diff --git a/lib/curl_http_negotiate.c b/lib/http_negotiate.c
index 446c49bb9..92c363d7c 100644
--- a/lib/curl_http_negotiate.c
+++ b/lib/http_negotiate.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef HAVE_GSSAPI
 #ifdef HAVE_OLD_GSSMIT
@@ -30,14 +30,14 @@
 
 #ifndef CURL_DISABLE_HTTP
 
-#include "curl_urldata.h"
-#include "curl_sendf.h"
+#include "urldata.h"
+#include "sendf.h"
 #include "curl_gssapi.h"
-#include "curl_rawstr.h"
+#include "rawstr.h"
 #include "curl_base64.h"
-#include "curl_http_negotiate.h"
+#include "http_negotiate.h"
 #include "curl_memory.h"
-#include "curl_url.h"
+#include "url.h"
 
 #ifdef HAVE_SPNEGO
 #  include <spnegohelp.h>
@@ -56,7 +56,7 @@
 #include <curl/mprintf.h>
 
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 static int
 get_gss_name(struct connectdata *conn, bool proxy, gss_name_t *server)
diff --git a/lib/curl_http_negotiate.h b/lib/http_negotiate.h
index e584d76fc..e584d76fc 100644
--- a/lib/curl_http_negotiate.h
+++ b/lib/http_negotiate.h
diff --git a/lib/curl_http_negotiate_sspi.c b/lib/http_negotiate_sspi.c
index d82b27110..5aa4f9433 100644
--- a/lib/curl_http_negotiate_sspi.c
+++ b/lib/http_negotiate_sspi.c
@@ -20,18 +20,18 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef USE_WINDOWS_SSPI
 
 #ifndef CURL_DISABLE_HTTP
 
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_rawstr.h"
-#include "curl_warnless.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "rawstr.h"
+#include "warnless.h"
 #include "curl_base64.h"
-#include "curl_http_negotiate.h"
+#include "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 "curl_memdebug.h"
+#include "memdebug.h"
 
 static int
 get_gss_name(struct connectdata *conn, bool proxy,
diff --git a/lib/curl_http_proxy.c b/lib/http_proxy.c
index 14ef9dc1e..d2e1aa199 100644
--- a/lib/curl_http_proxy.c
+++ b/lib/http_proxy.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, 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
@@ -20,21 +20,21 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #if !defined(CURL_DISABLE_PROXY) && !defined(CURL_DISABLE_HTTP)
 
-#include "curl_urldata.h"
+#include "urldata.h"
 #include <curl/curl.h>
-#include "curl_http_proxy.h"
-#include "curl_sendf.h"
-#include "curl_http.h"
-#include "curl_url.h"
-#include "curl_select.h"
-#include "curl_rawstr.h"
-#include "curl_progress.h"
-#include "curl_non_ascii.h"
-#include "curl_connect.h"
+#include "http_proxy.h"
+#include "sendf.h"
+#include "http.h"
+#include "url.h"
+#include "select.h"
+#include "rawstr.h"
+#include "progress.h"
+#include "non-ascii.h"
+#include "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 "curl_memdebug.h"
+#include "memdebug.h"
 
 CURLcode Curl_proxy_connect(struct connectdata *conn)
 {
diff --git a/lib/curl_http_proxy.h b/lib/http_proxy.h
index 518c09383..518c09383 100644
--- a/lib/curl_http_proxy.h
+++ b/lib/http_proxy.h
diff --git a/lib/curl_idn_win32.c b/lib/idn_win32.c
index eca225483..9bc9cb810 100644
--- a/lib/curl_idn_win32.c
+++ b/lib/idn_win32.c
@@ -24,7 +24,7 @@
   * IDN conversions using Windows kernel32 and normaliz libraries.
   */
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef USE_WIN32_IDN
 
@@ -32,7 +32,7 @@
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 #ifdef WANT_IDN_PROTOTYPES
 WINBASEAPI int WINAPI IdnToAscii(DWORD, const WCHAR *, int, WCHAR *, int);
diff --git a/lib/curl_if2ip.c b/lib/if2ip.c
index db9c78446..c1905d175 100644
--- a/lib/curl_if2ip.c
+++ b/lib/if2ip.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
@@ -50,16 +50,16 @@
 #  include <inet.h>
 #endif
 
-#include "curl_inet_ntop.h"
-#include "curl_strequal.h"
-#include "curl_if2ip.h"
+#include "inet_ntop.h"
+#include "strequal.h"
+#include "if2ip.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 /* ------------------------------------------------------------------ */
 
diff --git a/lib/curl_if2ip.h b/lib/if2ip.h
index 858ec2f5b..70842457c 100644
--- a/lib/curl_if2ip.h
+++ b/lib/if2ip.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
 
 bool Curl_if_is_interface_name(const char *interf);
 char *Curl_if2ip(int af, const char *interf, char *buf, int buf_size);
diff --git a/lib/curl_imap.c b/lib/imap.c
index 8175daa1a..ab11464fb 100644
--- a/lib/curl_imap.c
+++ b/lib/imap.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, 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
@@ -23,7 +23,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifndef CURL_DISABLE_IMAP
 
@@ -50,33 +50,33 @@
 #endif
 
 #include <curl/curl.h>
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_if2ip.h"
-#include "curl_hostip.h"
-#include "curl_progress.h"
-#include "curl_transfer.h"
-#include "curl_escape.h"
-#include "curl_http.h" /* for HTTP proxy tunnel stuff */
-#include "curl_socks.h"
-#include "curl_imap.h"
-
-#include "curl_strtoofft.h"
-#include "curl_strequal.h"
-#include "curl_sslgen.h"
-#include "curl_connect.h"
-#include "curl_strerror.h"
-#include "curl_select.h"
-#include "curl_multiif.h"
-#include "curl_url.h"
-#include "curl_rawstr.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "if2ip.h"
+#include "hostip.h"
+#include "progress.h"
+#include "transfer.h"
+#include "escape.h"
+#include "http.h" /* for HTTP proxy tunnel stuff */
+#include "socks.h"
+#include "imap.h"
+
+#include "strtoofft.h"
+#include "strequal.h"
+#include "sslgen.h"
+#include "connect.h"
+#include "strerror.h"
+#include "select.h"
+#include "multiif.h"
+#include "url.h"
+#include "rawstr.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 /* Local API functions */
 static CURLcode imap_parse_url_path(struct connectdata *conn);
@@ -718,7 +718,7 @@ static CURLcode imap_statemach_act(struct connectdata *conn)
   return result;
 }
 
-/* Called repeatedly until done from curl_multi.c */
+/* Called repeatedly until done from multi.c */
 static CURLcode imap_multi_statemach(struct connectdata *conn,
                                          bool *done)
 {
@@ -1045,7 +1045,7 @@ static CURLcode imap_dophase_done(struct connectdata *conn, bool connected)
   return CURLE_OK;
 }
 
-/* Called from curl_multi.c while DOing */
+/* Called from multi.c while DOing */
 static CURLcode imap_doing(struct connectdata *conn, bool *dophase_done)
 {
   CURLcode result = imap_multi_statemach(conn, dophase_done);
diff --git a/lib/curl_imap.h b/lib/imap.h
index 62fb126a5..4cd6bc76a 100644
--- a/lib/curl_imap.h
+++ b/lib/imap.h
@@ -7,7 +7,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 2009 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 2009 - 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
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "curl_pingpong.h"
+#include "pingpong.h"
 
 /****************************************************************************
  * IMAP unique setup
@@ -46,7 +46,7 @@ typedef enum {
 struct imap_conn {
   struct pingpong pp;
   char *mailbox;     /* Message ID to fetch */
-  imapstate state;   /* Always use curl_imap.c:state() to change state! */
+  imapstate state;   /* Always use imap.c:state() to change state! */
   int cmdid;         /* Next command ID */
   const char *idstr; /* String based response ID to wait for */
   bool ssldone;      /* Is connect() over SSL done? Only relevant in
diff --git a/lib/curl_inet_ntop.c b/lib/inet_ntop.c
index b184029f6..1ff975667 100644
--- a/lib/curl_inet_ntop.c
+++ b/lib/inet_ntop.c
@@ -18,7 +18,7 @@
  * Original code by Paul Vixie. "curlified" by Gisle Vanem.
  */
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifndef HAVE_INET_NTOP
 
@@ -35,7 +35,7 @@
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
-#include "curl_inet_ntop.h"
+#include "inet_ntop.h"
 
 #define IN6ADDRSZ       16
 #define INADDRSZ         4
diff --git a/lib/curl_inet_ntop.h b/lib/inet_ntop.h
index db28ed807..dbc146d91 100644
--- a/lib/curl_inet_ntop.h
+++ b/lib/inet_ntop.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 char *Curl_inet_ntop(int af, const void *addr, char *buf, size_t size);
 
diff --git a/lib/curl_inet_pton.c b/lib/inet_pton.c
index 175f938cd..d7fbbe957 100644
--- a/lib/curl_inet_pton.c
+++ b/lib/inet_pton.c
@@ -16,7 +16,7 @@
  * SOFTWARE.
  */
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifndef HAVE_INET_PTON
 
@@ -30,7 +30,7 @@
 #include <arpa/inet.h>
 #endif
 
-#include "curl_inet_pton.h"
+#include "inet_pton.h"
 
 #define IN6ADDRSZ       16
 #define INADDRSZ         4
diff --git a/lib/curl_inet_pton.h b/lib/inet_pton.h
index 43c549143..f991473d6 100644
--- a/lib/curl_inet_pton.h
+++ b/lib/inet_pton.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 int Curl_inet_pton(int, const char *, void *);
 
diff --git a/lib/curl_krb4.c b/lib/krb4.c
index 8ba326ed7..58354b602 100644
--- a/lib/curl_krb4.c
+++ b/lib/krb4.c
@@ -39,7 +39,7 @@
  *
  */
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifndef CURL_DISABLE_FTP
 #ifdef HAVE_KRB4
@@ -50,16 +50,16 @@
 #include <krb.h>
 #include <des.h>
 
-#include "curl_urldata.h"
+#include "urldata.h"
 #include "curl_base64.h"
-#include "curl_ftp.h"
-#include "curl_sendf.h"
-#include "curl_krb4.h"
-#include "curl_inet_ntop.h"
+#include "ftp.h"
+#include "sendf.h"
+#include "krb4.h"
+#include "inet_ntop.h"
 #include "curl_memory.h"
 
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 #define LOCAL_ADDR (&conn->local_addr)
 #define REMOTE_ADDR conn->ip_addr->ai_addr
diff --git a/lib/curl_krb4.h b/lib/krb4.h
index 3e29b2588..3e29b2588 100644
--- a/lib/curl_krb4.h
+++ b/lib/krb4.h
diff --git a/lib/curl_krb5.c b/lib/krb5.c
index d793fef02..c51041dda 100644
--- a/lib/curl_krb5.c
+++ b/lib/krb5.c
@@ -1,8 +1,8 @@
-/* GSSAPI/krb5 support for FTP - loosely based on old curl_krb4.c
+/* GSSAPI/krb5 support for FTP - loosely based on old krb4.c
  *
  * Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
- * Copyright (c) 2004 - 2013 Daniel Stenberg
+ * Copyright (c) 2004 - 2012 Daniel Stenberg
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.  */
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifndef CURL_DISABLE_FTP
 #ifdef HAVE_GSSAPI
@@ -46,20 +46,20 @@
 #include <netdb.h>
 #endif
 
-#include "curl_urldata.h"
+#include "urldata.h"
 #include "curl_base64.h"
-#include "curl_ftp.h"
+#include "ftp.h"
 #include "curl_gssapi.h"
-#include "curl_sendf.h"
-#include "curl_krb4.h"
+#include "sendf.h"
+#include "krb4.h"
 #include "curl_memory.h"
-#include "curl_warnless.h"
+#include "warnless.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 #define LOCAL_ADDR (&conn->local_addr)
 #define REMOTE_ADDR conn->ip_addr->ai_addr
diff --git a/lib/curl_ldap.c b/lib/ldap.c
index 59f3b832e..9ef31008c 100644
--- a/lib/curl_ldap.c
+++ b/lib/ldap.c
@@ -1,11 +1,11 @@
 /***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
+ *                      _   _ ____  _
+ *  Project         ___| | | |  _ \| |
+ *                 / __| | | | |_) | |
+ *                | (__| |_| |  _ <| |___
+ *                 \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, 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
@@ -20,15 +20,15 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #if !defined(CURL_DISABLE_LDAP) && !defined(USE_OPENLDAP)
 
 /*
  * Notice that USE_OPENLDAP is only a source code selection switch. When
  * libcurl is built with USE_OPENLDAP defined the libcurl source code that
- * gets compiled is the code from curl_openldap.c, otherwise the code that
- * gets compiled is the code from curl_ldap.c.
+ * gets compiled is the code from openldap.c, otherwise the code that gets
+ * compiled is the code from ldap.c.
  *
  * When USE_OPENLDAP is defined a recent version of the OpenLDAP library
  * might be required for compilation and runtime. In order to use ancient
@@ -54,23 +54,23 @@
 # endif /* HAVE_LDAP_SSL && HAVE_LDAP_SSL_H */
 #endif
 
-#include "curl_urldata.h"
+#include "urldata.h"
 #include <curl/curl.h>
-#include "curl_sendf.h"
-#include "curl_escape.h"
-#include "curl_progress.h"
-#include "curl_transfer.h"
-#include "curl_strequal.h"
-#include "curl_strtok.h"
+#include "sendf.h"
+#include "escape.h"
+#include "progress.h"
+#include "transfer.h"
+#include "strequal.h"
+#include "strtok.h"
 #include "curl_ldap.h"
 #include "curl_memory.h"
 #include "curl_base64.h"
-#include "curl_rawstr.h"
+#include "rawstr.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 #ifndef HAVE_LDAP_URL_PARSE
 
diff --git a/lib/curl_llist.c b/lib/llist.c
index 46a8d9960..a302e32d5 100644
--- a/lib/curl_llist.c
+++ b/lib/llist.c
@@ -20,13 +20,13 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
-#include "curl_llist.h"
+#include "llist.h"
 #include "curl_memory.h"
 
 /* this must be the last include file */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 /*
  * @unittest: 1300
diff --git a/lib/curl_llist.h b/lib/llist.h
index 27ddb719a..b4ca82a44 100644
--- a/lib/curl_llist.h
+++ b/lib/llist.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 #include <stddef.h>
 
 typedef void (*curl_llist_dtor)(void *, void *);
diff --git a/lib/curl_md4.c b/lib/md4.c
index d64b472ea..cf6c36023 100644
--- a/lib/curl_md4.c
+++ b/lib/md4.c
@@ -20,14 +20,14 @@
    documentation and/or software.
  */
 
-#include "curl_setup.h"
+#include "setup.h"
 
 /* NSS crypto library does not provide the MD4 hash algorithm, so that we have
  * a local implementation of it */
 #ifdef USE_NSS
 
 #include "curl_md4.h"
-#include "curl_warnless.h"
+#include "warnless.h"
 
 typedef unsigned int UINT4;
 
diff --git a/lib/curl_md5.c b/lib/md5.c
index 74f53f61b..ae5812b95 100644
--- a/lib/curl_md5.c
+++ b/lib/md5.c
@@ -20,13 +20,13 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifndef CURL_DISABLE_CRYPTO_AUTH
 
 #include "curl_md5.h"
 #include "curl_hmac.h"
-#include "curl_warnless.h"
+#include "warnless.h"
 
 #include "curl_memory.h"
 
@@ -34,7 +34,7 @@
 
 #include <nettle/md5.h>
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 typedef struct md5_ctx MD5_CTX;
 
@@ -59,7 +59,7 @@ static void MD5_Final(unsigned char digest[16], MD5_CTX * ctx)
 
 #include <gcrypt.h>
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 typedef gcry_md_hd_t MD5_CTX;
 
@@ -443,7 +443,7 @@ static void Decode (UINT4 *output,
 #endif /* CRYPTO LIBS */
 
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 const HMAC_params Curl_HMAC_MD5[] = {
   {
diff --git a/lib/curl_memdebug.c b/lib/memdebug.c
index e756126b2..c95f41fc5 100644
--- a/lib/curl_memdebug.c
+++ b/lib/memdebug.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef CURLDEBUG
 
@@ -28,11 +28,11 @@
 
 #define _MPRINTF_REPLACE
 #include <curl/mprintf.h>
-#include "curl_urldata.h"
+#include "urldata.h"
 
 #define MEMDEBUG_NODEFINES /* don't redefine the standard functions */
 #include "curl_memory.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 #ifndef HAVE_ASSERT_H
 #  define assert(x) Curl_nop_stmt
diff --git a/lib/curl_memdebug.h b/lib/memdebug.h
index fbeb61de5..1716e3598 100644
--- a/lib/curl_memdebug.h
+++ b/lib/memdebug.h
@@ -28,7 +28,7 @@
  * as well as the library. Do not mix with library internals!
  */
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #include <curl/curl.h>
 
diff --git a/lib/curl_mprintf.c b/lib/mprintf.c
index 35b9f644f..0990f4024 100644
--- a/lib/curl_mprintf.c
+++ b/lib/mprintf.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1999 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1999 - 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
@@ -35,7 +35,7 @@
  * page at http://daniel.haxx.se/trio/
  */
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #if defined(DJGPP) && (DJGPP_MINOR < 4)
 #undef _MPRINTF_REPLACE /* don't use x_was_used() here */
@@ -45,7 +45,7 @@
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 #ifndef SIZEOF_LONG_DOUBLE
 #define SIZEOF_LONG_DOUBLE 0
@@ -73,7 +73,7 @@
 #endif
 
 /*
- * Max integer data types that curl_mprintf.c is capable
+ * Max integer data types that mprintf.c is capable
  */
 
 #ifdef HAVE_LONG_LONG_TYPE
diff --git a/lib/curl_multi.c b/lib/multi.c
index 9553883cb..dae1f6b56 100644
--- a/lib/curl_multi.c
+++ b/lib/multi.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, 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
@@ -20,32 +20,32 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #include <curl/curl.h>
 
-#include "curl_urldata.h"
-#include "curl_transfer.h"
-#include "curl_url.h"
-#include "curl_connect.h"
-#include "curl_progress.h"
-#include "curl_easyif.h"
-#include "curl_multiif.h"
-#include "curl_sendf.h"
-#include "curl_timeval.h"
-#include "curl_http.h"
-#include "curl_select.h"
-#include "curl_warnless.h"
-#include "curl_speedcheck.h"
-#include "curl_conncache.h"
-#include "curl_bundles.h"
+#include "urldata.h"
+#include "transfer.h"
+#include "url.h"
+#include "connect.h"
+#include "progress.h"
+#include "easyif.h"
+#include "multiif.h"
+#include "sendf.h"
+#include "timeval.h"
+#include "http.h"
+#include "select.h"
+#include "warnless.h"
+#include "speedcheck.h"
+#include "conncache.h"
+#include "bundles.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 /*
   CURL_SOCKET_HASH_TABLE_SIZE should be a prime number. Increasing it from 97
@@ -598,7 +598,7 @@ CURLMcode curl_multi_add_handle(CURLM *multi_handle,
  *
  * Curl_hash_print(multi->sockhash, debug_print_sock_hash);
  *
- * Enable the hash print function first by editing curl_hash.c
+ * Enable the hash print function first by editing hash.c
  */
 static void debug_print_sock_hash(void *p)
 {
diff --git a/lib/curl_multiif.h b/lib/multiif.h
index 6e5881e2d..c84b6184c 100644
--- a/lib/curl_multiif.h
+++ b/lib/multiif.h
@@ -7,7 +7,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2010, 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
@@ -23,7 +23,7 @@
  ***************************************************************************/
 
 /*
- * Prototypes for library-wide functions provided by curl_multi.c
+ * Prototypes for library-wide functions provided by multi.c
  */
 void Curl_expire(struct SessionHandle *data, long milli);
 
diff --git a/lib/curl_netrc.c b/lib/netrc.c
index 10853d395..162a86caa 100644
--- a/lib/curl_netrc.c
+++ b/lib/netrc.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef HAVE_PWD_H
 #include <pwd.h>
@@ -30,18 +30,18 @@
 #endif
 
 #include <curl/curl.h>
-#include "curl_netrc.h"
+#include "netrc.h"
 
-#include "curl_strequal.h"
-#include "curl_strtok.h"
+#include "strequal.h"
+#include "strtok.h"
 #include "curl_memory.h"
-#include "curl_rawstr.h"
+#include "rawstr.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 /* Get user and password from .netrc when given a machine name */
 
diff --git a/lib/curl_netrc.h b/lib/netrc.h
index 4db764df2..4db764df2 100644
--- a/lib/curl_netrc.h
+++ b/lib/netrc.h
diff --git a/lib/curl_non_ascii.c b/lib/non-ascii.c
index 68b33a92a..8e29227c0 100644
--- a/lib/curl_non_ascii.c
+++ b/lib/non-ascii.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, 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
@@ -20,20 +20,20 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef CURL_DOES_CONVERSIONS
 
 #include <curl/curl.h>
 
-#include "curl_non_ascii.h"
-#include "curl_formdata.h"
-#include "curl_sendf.h"
-#include "curl_urldata.h"
+#include "non-ascii.h"
+#include "formdata.h"
+#include "sendf.h"
+#include "urldata.h"
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 #ifdef HAVE_ICONV
 #include <iconv.h>
@@ -314,8 +314,8 @@ void Curl_convert_close(struct SessionHandle *data)
 }
 
 /*
- * Curl_convert_form() is used from curl_http.c, this converts any form items
- * that need to be sent in the network encoding.  Returns CURLE_OK on success.
+ * Curl_convert_form() is used from http.c, this converts any form items that
+   need to be sent in the network encoding.  Returns CURLE_OK on success.
  */
 CURLcode Curl_convert_form(struct SessionHandle *data, struct FormData *form)
 {
diff --git a/lib/curl_non_ascii.h b/lib/non-ascii.h
index 552a51311..6dcbe0044 100644
--- a/lib/curl_non_ascii.h
+++ b/lib/non-ascii.h
@@ -21,11 +21,11 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef CURL_DOES_CONVERSIONS
 
-#include "curl_urldata.h"
+#include "urldata.h"
 
 /*
  * Curl_convert_clone() returns a malloced copy of the source string (if
diff --git a/lib/curl_nonblock.c b/lib/nonblock.c
index 6e6d1287f..a2722ed7f 100644
--- a/lib/curl_nonblock.c
+++ b/lib/nonblock.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
@@ -37,7 +37,7 @@
 #include <inet.h>
 #endif
 
-#include "curl_nonblock.h"
+#include "nonblock.h"
 
 /*
  * curlx_nonblock() set the given socket to either blocking or non-blocking
diff --git a/lib/curl_nonblock.h b/lib/nonblock.h
index b540ae46f..b540ae46f 100644
--- a/lib/curl_nonblock.h
+++ b/lib/nonblock.h
diff --git a/lib/curl_nss.c b/lib/nss.c
index 15e92a722..86ce6a6d5 100644
--- a/lib/curl_nss.c
+++ b/lib/nss.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, 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
@@ -22,27 +22,27 @@
 
 /*
  * Source file for all NSS-specific code for the TLS/SSL layer. No code
- * but curl_sslgen.c should ever call or use these functions.
+ * but sslgen.c should ever call or use these functions.
  */
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef USE_NSS
 
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_formdata.h" /* for the boundary function */
-#include "curl_url.h" /* for the ssl config check function */
-#include "curl_connect.h"
-#include "curl_strequal.h"
-#include "curl_select.h"
-#include "curl_sslgen.h"
-#include "curl_llist.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "formdata.h" /* for the boundary function */
+#include "url.h" /* for the ssl config check function */
+#include "connect.h"
+#include "strequal.h"
+#include "select.h"
+#include "sslgen.h"
+#include "llist.h"
 
 #define _MPRINTF_REPLACE /* use the internal *printf() functions */
 #include <curl/mprintf.h>
 
-#include "curl_nssg.h"
+#include "nssg.h"
 #include <nspr.h>
 #include <nss.h>
 #include <ssl.h>
@@ -61,11 +61,11 @@
 #include <prerror.h>
 
 #include "curl_memory.h"
-#include "curl_rawstr.h"
-#include "curl_warnless.h"
+#include "rawstr.h"
+#include "warnless.h"
 
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 #define SSL_DIR "/etc/pki/nssdb"
 
diff --git a/lib/curl_nssg.h b/lib/nssg.h
index 3ba75d351..647b7bb28 100644
--- a/lib/curl_nssg.h
+++ b/lib/nssg.h
@@ -7,7 +7,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, 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
@@ -21,15 +21,14 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef USE_NSS
 /*
- * This header should only be needed to get included by curl_sslgen.c and
- * curl_nss.c
+ * This header should only be needed to get included by sslgen.c and nss.c
  */
 
-#include "curl_urldata.h"
+#include "urldata.h"
 
 CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex);
 CURLcode Curl_nss_connect_nonblocking(struct connectdata *conn,
diff --git a/lib/curl_nwlib.c b/lib/nwlib.c
index f63f16b83..c67342a08 100644
--- a/lib/curl_nwlib.c
+++ b/lib/nwlib.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef NETWARE /* Novell NetWare */
 
@@ -34,7 +34,7 @@
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 typedef struct
 {
diff --git a/lib/curl_nwos.c b/lib/nwos.c
index 23ff2a717..dd3291155 100644
--- a/lib/curl_nwos.c
+++ b/lib/nwos.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef NETWARE /* Novell NetWare */
 
diff --git a/lib/curl_openldap.c b/lib/openldap.c
index b10d31e18..9ccfa7fae 100644
--- a/lib/curl_openldap.c
+++ b/lib/openldap.c
@@ -1,12 +1,12 @@
 /***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
+ *                      _   _ ____  _
+ *  Project         ___| | | |  _ \| |
+ *                 / __| | | | |_) | |
+ *                | (__| |_| |  _ <| |___
+ *                 \___|\___/|_| \_\_____|
  *
  * Copyright (C) 2010, Howard Chu, <hyc@openldap.org>
- * Copyright (C) 2011 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 2011 - 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
@@ -21,15 +21,15 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #if !defined(CURL_DISABLE_LDAP) && defined(USE_OPENLDAP)
 
 /*
  * Notice that USE_OPENLDAP is only a source code selection switch. When
  * libcurl is built with USE_OPENLDAP defined the libcurl source code that
- * gets compiled is the code from curl_openldap.c, otherwise the code that
- * gets compiled is the code from curl_ldap.c.
+ * gets compiled is the code from openldap.c, otherwise the code that gets
+ * compiled is the code from ldap.c.
  *
  * When USE_OPENLDAP is defined a recent version of the OpenLDAP library
  * might be required for compilation and runtime. In order to use ancient
@@ -38,11 +38,11 @@
 
 #include <ldap.h>
 
-#include "curl_urldata.h"
+#include "urldata.h"
 #include <curl/curl.h>
-#include "curl_sendf.h"
-#include "curl_sslgen.h"
-#include "curl_transfer.h"
+#include "sendf.h"
+#include "sslgen.h"
+#include "transfer.h"
 #include "curl_ldap.h"
 #include "curl_memory.h"
 #include "curl_base64.h"
@@ -50,7 +50,7 @@
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 #ifndef _LDAP_PVT_H
 extern int ldap_pvt_url_scheme2proto(const char *);
diff --git a/lib/curl_parsedate.c b/lib/parsedate.c
index a50b6074e..b6079bc8f 100644
--- a/lib/curl_parsedate.c
+++ b/lib/parsedate.c
@@ -73,16 +73,16 @@
 
 */
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
 
 #include <curl/curl.h>
-#include "curl_rawstr.h"
-#include "curl_warnless.h"
-#include "curl_parsedate.h"
+#include "rawstr.h"
+#include "warnless.h"
+#include "parsedate.h"
 
 const char * const Curl_wkday[] =
 {"Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"};
diff --git a/lib/curl_parsedate.h b/lib/parsedate.h
index ade0f4f60..ade0f4f60 100644
--- a/lib/curl_parsedate.h
+++ b/lib/parsedate.h
diff --git a/lib/curl_pingpong.c b/lib/pingpong.c
index d28e78aa2..85a7a45af 100644
--- a/lib/curl_pingpong.c
+++ b/lib/pingpong.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, 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
@@ -23,23 +23,23 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_select.h"
-#include "curl_progress.h"
-#include "curl_speedcheck.h"
-#include "curl_pingpong.h"
-#include "curl_multiif.h"
-#include "curl_non_ascii.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "select.h"
+#include "progress.h"
+#include "speedcheck.h"
+#include "pingpong.h"
+#include "multiif.h"
+#include "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 "curl_memdebug.h"
+#include "memdebug.h"
 
 #ifdef USE_PINGPONG
 
diff --git a/lib/curl_pingpong.h b/lib/pingpong.h
index 77060786a..1d104cfbc 100644
--- a/lib/curl_pingpong.h
+++ b/lib/pingpong.h
@@ -22,14 +22,14 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #if !defined(CURL_DISABLE_IMAP) || !defined(CURL_DISABLE_FTP) || \
   !defined(CURL_DISABLE_POP3) || !defined(CURL_DISABLE_SMTP)
 #define USE_PINGPONG
 #endif
 
-/* forward-declaration, this is defined in curl_urldata.h */
+/* forward-declaration, this is defined in urldata.h */
 struct connectdata;
 
 /*
diff --git a/lib/curl_polarssl.c b/lib/polarssl.c
index 81c70264f..ef074be13 100644
--- a/lib/curl_polarssl.c
+++ b/lib/polarssl.c
@@ -6,7 +6,7 @@
  *                             \___|\___/|_| \_\_____|
  *
  * Copyright (C) 2010, 2011, Hoi-Ho Chan, <hoiho.chan@gmail.com>
- * Copyright (C) 2012 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 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
@@ -23,11 +23,11 @@
 
 /*
  * Source file for all PolarSSL-specific code for the TLS/SSL layer. No code
- * but curl_sslgen.c should ever call or use these functions.
+ * but sslgen.c should ever call or use these functions.
  *
  */
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef USE_POLARSSL
 
@@ -49,21 +49,21 @@
 #define POLARSSL_ERR_NET_WANT_WRITE POLARSSL_ERR_NET_TRY_AGAIN
 #endif
 
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_inet_pton.h"
-#include "curl_polarssl.h"
-#include "curl_sslgen.h"
-#include "curl_parsedate.h"
-#include "curl_connect.h" /* for the connect timeout */
-#include "curl_select.h"
-#include "curl_rawstr.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "inet_pton.h"
+#include "polarssl.h"
+#include "sslgen.h"
+#include "parsedate.h"
+#include "connect.h" /* for the connect timeout */
+#include "select.h"
+#include "rawstr.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 /* version dependent differences */
 #if POLARSSL_VERSION_NUMBER < 0x01010000
diff --git a/lib/curl_polarssl.h b/lib/polarssl.h
index 12b3db28c..ad655465e 100644
--- a/lib/curl_polarssl.h
+++ b/lib/polarssl.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef USE_POLARSSL
 
diff --git a/lib/curl_pop3.c b/lib/pop3.c
index 0d157f00b..08c0de57e 100644
--- a/lib/curl_pop3.c
+++ b/lib/pop3.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, 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
@@ -29,7 +29,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifndef CURL_DISABLE_POP3
 
@@ -56,36 +56,36 @@
 #endif
 
 #include <curl/curl.h>
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_if2ip.h"
-#include "curl_hostip.h"
-#include "curl_progress.h"
-#include "curl_transfer.h"
-#include "curl_escape.h"
-#include "curl_http.h" /* for HTTP proxy tunnel stuff */
-#include "curl_socks.h"
-#include "curl_pop3.h"
-
-#include "curl_strtoofft.h"
-#include "curl_strequal.h"
-#include "curl_sslgen.h"
-#include "curl_connect.h"
-#include "curl_strerror.h"
-#include "curl_select.h"
-#include "curl_multiif.h"
-#include "curl_url.h"
-#include "curl_rawstr.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "if2ip.h"
+#include "hostip.h"
+#include "progress.h"
+#include "transfer.h"
+#include "escape.h"
+#include "http.h" /* for HTTP proxy tunnel stuff */
+#include "socks.h"
+#include "pop3.h"
+
+#include "strtoofft.h"
+#include "strequal.h"
+#include "sslgen.h"
+#include "connect.h"
+#include "strerror.h"
+#include "select.h"
+#include "multiif.h"
+#include "url.h"
+#include "rawstr.h"
 #include "curl_sasl.h"
 #include "curl_md5.h"
-#include "curl_warnless.h"
+#include "warnless.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 /* Local API functions */
 static CURLcode pop3_parse_url_path(struct connectdata *conn);
@@ -1207,7 +1207,7 @@ static CURLcode pop3_statemach_act(struct connectdata *conn)
   return result;
 }
 
-/* Called repeatedly until done from curl_multi.c */
+/* Called repeatedly until done from multi.c */
 static CURLcode pop3_multi_statemach(struct connectdata *conn, bool *done)
 {
   struct pop3_conn *pop3c = &conn->proto.pop3c;
@@ -1547,7 +1547,7 @@ static CURLcode pop3_dophase_done(struct connectdata *conn, bool connected)
   return CURLE_OK;
 }
 
-/* Called from curl_multi.c while DOing */
+/* Called from multi.c while DOing */
 static CURLcode pop3_doing(struct connectdata *conn, bool *dophase_done)
 {
   CURLcode result = pop3_multi_statemach(conn, dophase_done);
diff --git a/lib/curl_pop3.h b/lib/pop3.h
index 62b88fdac..1b6859955 100644
--- a/lib/curl_pop3.h
+++ b/lib/pop3.h
@@ -7,7 +7,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 2009 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 2009 - 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
@@ -62,7 +62,7 @@ struct pop3_conn {
   unsigned int authmechs; /* Accepted SASL authentication mechanisms */
   unsigned int authused;  /* SASL auth mechanism used for the connection */
   char *apoptimestamp;    /* APOP timestamp from the server greeting */
-  pop3state state;        /* Always use curl_pop3.c:state() to change state */
+  pop3state state;        /* Always use pop3.c:state() to change state! */
 };
 
 extern const struct Curl_handler Curl_handler_pop3;
diff --git a/lib/curl_progress.c b/lib/progress.c
index 88f802d0a..e73f01811 100644
--- a/lib/curl_progress.c
+++ b/lib/progress.c
@@ -20,11 +20,11 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_progress.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "progress.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
diff --git a/lib/curl_progress.h b/lib/progress.h
index e68f80416..f97fef996 100644
--- a/lib/curl_progress.h
+++ b/lib/progress.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "curl_timeval.h"
+#include "timeval.h"
 
 
 typedef enum {
diff --git a/lib/curl_qssl.c b/lib/qssl.c
index d140dc9eb..172df3141 100644
--- a/lib/curl_qssl.c
+++ b/lib/qssl.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef USE_QSOSSL
 
@@ -31,15 +31,15 @@
 #endif
 
 #include <curl/curl.h>
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_qssl.h"
-#include "curl_sslgen.h"
-#include "curl_connect.h" /* for the connect timeout */
-#include "curl_select.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "qssl.h"
+#include "sslgen.h"
+#include "connect.h" /* for the connect timeout */
+#include "select.h"
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 
 int Curl_qsossl_init(void)
diff --git a/lib/curl_qssl.h b/lib/qssl.h
index 3a7cc5045..a523cb1f3 100644
--- a/lib/curl_qssl.h
+++ b/lib/qssl.h
@@ -7,7 +7,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
@@ -21,14 +21,13 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
 
 /*
- * This header should only be needed to get included by curl_sslgen.c and
- * curl_qssl.c
+ * This header should only be needed to get included by sslgen.c and qssl.c
  */
 
-#include "curl_urldata.h"
+#include "urldata.h"
 
 #ifdef USE_QSOSSL
 int Curl_qsossl_init(void);
diff --git a/lib/curl_rawstr.c b/lib/rawstr.c
index 17fd1f3f5..2cf2fe7cb 100644
--- a/lib/curl_rawstr.c
+++ b/lib/rawstr.c
@@ -20,9 +20,9 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
-#include "curl_rawstr.h"
+#include "rawstr.h"
 
 /* Portable, consistent toupper (remember EBCDIC). Do not use toupper() because
    its behavior is altered by the current locale. */
diff --git a/lib/curl_rawstr.h b/lib/rawstr.h
index b491460d0..b491460d0 100644
--- a/lib/curl_rawstr.h
+++ b/lib/rawstr.h
diff --git a/lib/curl_rtsp.c b/lib/rtsp.c
index 71e434c47..ca9788ef7 100644
--- a/lib/curl_rtsp.c
+++ b/lib/rtsp.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, 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
@@ -20,29 +20,29 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifndef CURL_DISABLE_RTSP
 
-#include "curl_urldata.h"
+#include "urldata.h"
 #include <curl/curl.h>
-#include "curl_transfer.h"
-#include "curl_sendf.h"
-#include "curl_multiif.h"
-#include "curl_http.h"
-#include "curl_url.h"
-#include "curl_progress.h"
-#include "curl_rtsp.h"
-#include "curl_rawstr.h"
+#include "transfer.h"
+#include "sendf.h"
+#include "multiif.h"
+#include "http.h"
+#include "url.h"
+#include "progress.h"
+#include "rtsp.h"
+#include "rawstr.h"
 #include "curl_memory.h"
-#include "curl_select.h"
-#include "curl_connect.h"
+#include "select.h"
+#include "connect.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 /*
  * TODO (general)
@@ -381,10 +381,10 @@ static CURLcode rtsp_do(struct connectdata *conn, bool *done)
     }
   }
 
-  /* The User-Agent string might have been allocated in curl_url.c already,
-     because it might have been used in the proxy connect, but if we have
-     got a header with the user-agent string specified, we erase the
-     previously made string here. */
+  /* The User-Agent string might have been allocated in url.c already, because
+     it might have been used in the proxy connect, but if we have got a header
+     with the user-agent string specified, we erase the previously made string
+     here. */
   if(Curl_checkheaders(data, "User-Agent:") && conn->allocptr.uagent) {
     Curl_safefree(conn->allocptr.uagent);
     conn->allocptr.uagent = NULL;
diff --git a/lib/curl_rtsp.h b/lib/rtsp.h
index 3ffa70cc6..3ffa70cc6 100644
--- a/lib/curl_rtsp.h
+++ b/lib/rtsp.h
diff --git a/lib/curl_security.c b/lib/security.c
index b7544ffbd..b70310b89 100644
--- a/lib/curl_security.c
+++ b/lib/security.c
@@ -41,7 +41,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.  */
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifndef CURL_DISABLE_FTP
 #if defined(HAVE_KRB4) || defined(HAVE_GSSAPI)
@@ -54,17 +54,17 @@
 #include <limits.h>
 #endif
 
-#include "curl_urldata.h"
+#include "urldata.h"
 #include "curl_base64.h"
 #include "curl_memory.h"
-#include "curl_krb4.h"
-#include "curl_ftp.h"
-#include "curl_sendf.h"
-#include "curl_rawstr.h"
-#include "curl_warnless.h"
+#include "krb4.h"
+#include "ftp.h"
+#include "sendf.h"
+#include "rawstr.h"
+#include "warnless.h"
 
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 static const struct {
   enum protection_level level;
diff --git a/lib/curl_select.c b/lib/select.c
index d4519d39e..32b6fa55f 100644
--- a/lib/curl_select.c
+++ b/lib/select.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
@@ -41,10 +41,10 @@
 
 #include <curl/curl.h>
 
-#include "curl_urldata.h"
-#include "curl_connect.h"
-#include "curl_select.h"
-#include "curl_warnless.h"
+#include "urldata.h"
+#include "connect.h"
+#include "select.h"
+#include "warnless.h"
 
 /* Convenience local macros */
 
diff --git a/lib/curl_select.h b/lib/select.h
index 00789bb89..d66873fe9 100644
--- a/lib/curl_select.h
+++ b/lib/select.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef HAVE_SYS_POLL_H
 #include <sys/poll.h>
diff --git a/lib/curl_sendf.c b/lib/sendf.c
index a1ec50977..b45e43a32 100644
--- a/lib/curl_sendf.c
+++ b/lib/sendf.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, 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
@@ -20,34 +20,34 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #include <curl/curl.h>
 
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_connect.h"
-#include "curl_sslgen.h"
-#include "curl_ssh.h"
-#include "curl_multiif.h"
-#include "curl_non_ascii.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "connect.h"
+#include "sslgen.h"
+#include "ssh.h"
+#include "multiif.h"
+#include "non-ascii.h"
 
 #define _MPRINTF_REPLACE /* use the internal *printf() functions */
 #include <curl/mprintf.h>
 
 /* the krb4 functions only exists for FTP and if krb4 or gssapi is defined */
 #if !defined(CURL_DISABLE_FTP) && (defined(HAVE_KRB4) || defined(HAVE_GSSAPI))
-#include "curl_krb4.h"
+#include "krb4.h"
 #else
 #define Curl_sec_send(a,b,c,d) -1
 #define Curl_sec_read(a,b,c,d) -1
 #endif
 
 #include "curl_memory.h"
-#include "curl_strerror.h"
+#include "strerror.h"
 
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 #ifdef CURL_DO_LINEEND_CONV
 /*
@@ -385,7 +385,7 @@ static CURLcode pausewrite(struct SessionHandle *data,
 /* Curl_client_write() sends data to the write callback(s)
 
    The bit pattern defines to what "streams" to write to. Body and/or header.
-   The defines are in curl_sendf.h of course.
+   The defines are in sendf.h of course.
 
    If CURL_DO_LINEEND_CONV is enabled, data is converted IN PLACE to the
    local character encoding.  This is a problem and should be changed in
diff --git a/lib/curl_sendf.h b/lib/sendf.h
index 39489e40f..39911d016 100644
--- a/lib/curl_sendf.h
+++ b/lib/sendf.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 CURLcode Curl_sendf(curl_socket_t sockfd, struct connectdata *,
                     const char *fmt, ...);
diff --git a/lib/curl_setup.h b/lib/setup.h
index 37be5ae46..6d2dc90a8 100644
--- a/lib/curl_setup.h
+++ b/lib/setup.h
@@ -645,7 +645,9 @@ int netware_init(void);
  * Include macros and defines that should only be processed once.
  */
 
-#include "curl_setup_once.h"
+#ifndef __SETUP_ONCE_H
+#include "setup_once.h"
+#endif
 
 /*
  * Definition of our NOP statement Object-like macro
diff --git a/lib/curl_setup_once.h b/lib/setup_once.h
index 2d55c4060..2d55c4060 100644
--- a/lib/curl_setup_once.h
+++ b/lib/setup_once.h
diff --git a/lib/curl_share.c b/lib/share.c
index 182e6e99b..477c35b0b 100644
--- a/lib/curl_share.c
+++ b/lib/share.c
@@ -20,16 +20,16 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #include <curl/curl.h>
-#include "curl_urldata.h"
-#include "curl_share.h"
-#include "curl_sslgen.h"
+#include "urldata.h"
+#include "share.h"
+#include "sslgen.h"
 #include "curl_memory.h"
 
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 CURLSH *
 curl_share_init(void)
diff --git a/lib/curl_share.h b/lib/share.h
index ecf6f2a79..b9e6c2538 100644
--- a/lib/curl_share.h
+++ b/lib/share.h
@@ -22,10 +22,10 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 #include <curl/curl.h>
-#include "curl_cookie.h"
-#include "curl_urldata.h"
+#include "cookie.h"
+#include "urldata.h"
 
 /* SalfordC says "A structure member may not be volatile". Hence:
  */
diff --git a/lib/curl_slist.c b/lib/slist.c
index 2a30ea620..4ddebb609 100644
--- a/lib/curl_slist.c
+++ b/lib/slist.c
@@ -20,13 +20,13 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #include "curl_memory.h"
-#include "curl_slist.h"
+#include "slist.h"
 
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 /* returns last node in linked list */
 static struct curl_slist *slist_get_last(struct curl_slist *list)
diff --git a/lib/curl_slist.h b/lib/slist.h
index aede1f041..aede1f041 100644
--- a/lib/curl_slist.h
+++ b/lib/slist.h
diff --git a/lib/curl_smtp.c b/lib/smtp.c
index 5c4c25c6f..a1840a434 100644
--- a/lib/curl_smtp.c
+++ b/lib/smtp.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, 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
@@ -27,7 +27,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifndef CURL_DISABLE_SMTP
 
@@ -54,36 +54,36 @@
 #endif
 
 #include <curl/curl.h>
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_if2ip.h"
-#include "curl_hostip.h"
-#include "curl_progress.h"
-#include "curl_transfer.h"
-#include "curl_escape.h"
-#include "curl_http.h" /* for HTTP proxy tunnel stuff */
-#include "curl_socks.h"
-#include "curl_smtp.h"
-
-#include "curl_strtoofft.h"
-#include "curl_strequal.h"
-#include "curl_sslgen.h"
-#include "curl_connect.h"
-#include "curl_strerror.h"
-#include "curl_select.h"
-#include "curl_multiif.h"
-#include "curl_url.h"
-#include "curl_rawstr.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "if2ip.h"
+#include "hostip.h"
+#include "progress.h"
+#include "transfer.h"
+#include "escape.h"
+#include "http.h" /* for HTTP proxy tunnel stuff */
+#include "socks.h"
+#include "smtp.h"
+
+#include "strtoofft.h"
+#include "strequal.h"
+#include "sslgen.h"
+#include "connect.h"
+#include "strerror.h"
+#include "select.h"
+#include "multiif.h"
+#include "url.h"
+#include "rawstr.h"
 #include "curl_gethostname.h"
 #include "curl_sasl.h"
-#include "curl_warnless.h"
+#include "warnless.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 /* Local API functions */
 static CURLcode smtp_regular_transfer(struct connectdata *conn, bool *done);
@@ -1226,7 +1226,7 @@ static CURLcode smtp_statemach_act(struct connectdata *conn)
   return result;
 }
 
-/* Called repeatedly until done from curl_multi.c */
+/* Called repeatedly until done from multi.c */
 static CURLcode smtp_multi_statemach(struct connectdata *conn, bool *done)
 {
   struct smtp_conn *smtpc = &conn->proto.smtpc;
@@ -1584,7 +1584,7 @@ static CURLcode smtp_dophase_done(struct connectdata *conn, bool connected)
   return CURLE_OK;
 }
 
-/* Called from curl_multi.c while DOing */
+/* Called from multi.c while DOing */
 static CURLcode smtp_doing(struct connectdata *conn, bool *dophase_done)
 {
   CURLcode result = smtp_multi_statemach(conn, dophase_done);
diff --git a/lib/curl_smtp.h b/lib/smtp.h
index d92547c11..0d605628d 100644
--- a/lib/curl_smtp.h
+++ b/lib/smtp.h
@@ -7,7 +7,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 2009 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 2009 - 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
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "curl_pingpong.h"
+#include "pingpong.h"
 
 /****************************************************************************
  * SMTP unique setup
@@ -62,7 +62,7 @@ struct smtp_conn {
                               have been received so far */
   unsigned int authmechs;  /* Accepted authentication mechanisms */
   unsigned int authused;   /* Auth mechanism used for the connection */
-  smtpstate state;         /* Always use curl_smtp.c:state() to change */
+  smtpstate state;         /* Always use smtp.c:state() to change state! */
   struct curl_slist *rcpt; /* Recipient list */
   bool ssldone;            /* Is connect() over SSL done? Only relevant in
                               multi mode */
diff --git a/lib/curl_sockaddr.h b/lib/sockaddr.h
index 6a2151c9d..522a2199f 100644
--- a/lib/curl_sockaddr.h
+++ b/lib/sockaddr.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 struct Curl_sockaddr_storage {
   union {
diff --git a/lib/curl_socks.c b/lib/socks.c
index 1b70dd629..13a756a40 100644
--- a/lib/curl_socks.c
+++ b/lib/socks.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #if !defined(CURL_DISABLE_PROXY)
 
@@ -31,16 +31,16 @@
 #include <arpa/inet.h>
 #endif
 
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_strequal.h"
-#include "curl_select.h"
-#include "curl_connect.h"
-#include "curl_timeval.h"
-#include "curl_socks.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "strequal.h"
+#include "select.h"
+#include "connect.h"
+#include "timeval.h"
+#include "socks.h"
 
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 /*
  * Helper read-from-socket functions. Does the same as Curl_read() but it
diff --git a/lib/curl_socks.h b/lib/socks.h
index dc4670b24..0ce0bd044 100644
--- a/lib/curl_socks.h
+++ b/lib/socks.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef CURL_DISABLE_PROXY
 #define Curl_SOCKS4(a,b,c,d,e,f) CURLE_NOT_BUILT_IN
diff --git a/lib/curl_socks_gssapi.c b/lib/socks_gssapi.c
index 2bd3d4508..02dd485f1 100644
--- a/lib/curl_socks_gssapi.c
+++ b/lib/socks_gssapi.c
@@ -21,7 +21,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifndef CURL_DISABLE_PROXY
 
@@ -35,19 +35,19 @@
 #endif
 
 #include "curl_gssapi.h"
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_connect.h"
-#include "curl_timeval.h"
-#include "curl_socks.h"
-#include "curl_warnless.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "connect.h"
+#include "timeval.h"
+#include "socks.h"
+#include "warnless.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 static gss_ctx_id_t gss_context = GSS_C_NO_CONTEXT;
 
diff --git a/lib/curl_socks_sspi.c b/lib/socks_sspi.c
index c57610717..6e95e3c35 100644
--- a/lib/curl_socks_sspi.c
+++ b/lib/socks_sspi.c
@@ -21,26 +21,26 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #if defined(USE_WINDOWS_SSPI) && !defined(CURL_DISABLE_PROXY)
 
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_connect.h"
-#include "curl_strerror.h"
-#include "curl_timeval.h"
-#include "curl_socks.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "connect.h"
+#include "strerror.h"
+#include "timeval.h"
+#include "socks.h"
 #include "curl_sspi.h"
 #include "curl_multibyte.h"
-#include "curl_warnless.h"
+#include "warnless.h"
 
 #define _MPRINTF_REPLACE /* use the internal *printf() functions */
 #include <curl/mprintf.h>
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 /*
  * Definitions required from ntsecapi.h are directly provided below this point
diff --git a/lib/curl_speedcheck.c b/lib/speedcheck.c
index b9ce77dbf..ca2323f57 100644
--- a/lib/curl_speedcheck.c
+++ b/lib/speedcheck.c
@@ -20,13 +20,13 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #include <curl/curl.h>
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_multiif.h"
-#include "curl_speedcheck.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "multiif.h"
+#include "speedcheck.h"
 
 void Curl_speedinit(struct SessionHandle *data)
 {
diff --git a/lib/curl_speedcheck.h b/lib/speedcheck.h
index a933781c0..fc40e7d0c 100644
--- a/lib/curl_speedcheck.h
+++ b/lib/speedcheck.h
@@ -22,9 +22,9 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
-#include "curl_timeval.h"
+#include "timeval.h"
 
 void Curl_speedinit(struct SessionHandle *data);
 CURLcode Curl_speedcheck(struct SessionHandle *data,
diff --git a/lib/curl_splay.c b/lib/splay.c
index 21f1d222e..b6664e6df 100644
--- a/lib/curl_splay.c
+++ b/lib/splay.c
@@ -20,9 +20,9 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
-#include "curl_splay.h"
+#include "splay.h"
 
 /*
  * This macro compares two node keys i and j and returns:
diff --git a/lib/curl_splay.h b/lib/splay.h
index 5f9ef24cc..49a6dec41 100644
--- a/lib/curl_splay.h
+++ b/lib/splay.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
 
 struct Curl_tree {
   struct Curl_tree *smaller; /* smaller node */
diff --git a/lib/curl_ssh.c b/lib/ssh.c
index d769a041b..1cc4bcd4c 100644
--- a/lib/curl_ssh.c
+++ b/lib/ssh.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, 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
@@ -22,7 +22,7 @@
 
 /* #define CURL_LIBSSH2_DEBUG */
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef USE_LIBSSH2
 
@@ -60,36 +60,36 @@
 #endif
 
 #include <curl/curl.h>
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_hostip.h"
-#include "curl_progress.h"
-#include "curl_transfer.h"
-#include "curl_escape.h"
-#include "curl_http.h" /* for HTTP proxy tunnel stuff */
-#include "curl_ssh.h"
-#include "curl_url.h"
-#include "curl_speedcheck.h"
-#include "curl_getinfo.h"
-
-#include "curl_strequal.h"
-#include "curl_sslgen.h"
-#include "curl_connect.h"
-#include "curl_strerror.h"
-#include "curl_inet_ntop.h"
-#include "curl_parsedate.h" /* for the week day and month names */
-#include "curl_sockaddr.h" /* required for Curl_sockaddr_storage */
-#include "curl_strtoofft.h"
-#include "curl_multiif.h"
-#include "curl_select.h"
-#include "curl_warnless.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "hostip.h"
+#include "progress.h"
+#include "transfer.h"
+#include "escape.h"
+#include "http.h" /* for HTTP proxy tunnel stuff */
+#include "ssh.h"
+#include "url.h"
+#include "speedcheck.h"
+#include "getinfo.h"
+
+#include "strequal.h"
+#include "sslgen.h"
+#include "connect.h"
+#include "strerror.h"
+#include "inet_ntop.h"
+#include "parsedate.h" /* for the week day and month names */
+#include "sockaddr.h" /* required for Curl_sockaddr_storage */
+#include "strtoofft.h"
+#include "multiif.h"
+#include "select.h"
+#include "warnless.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 #ifdef WIN32
 #  undef  PATH_MAX
@@ -2620,7 +2620,7 @@ static void ssh_block2waitfor(struct connectdata *conn, bool block)
 #define ssh_block2waitfor(x,y) Curl_nop_stmt
 #endif
 
-/* called repeatedly until done from curl_multi.c */
+/* called repeatedly until done from multi.c */
 static CURLcode ssh_multi_statemach(struct connectdata *conn, bool *done)
 {
   struct ssh_conn *sshc = &conn->proto.sshc;
@@ -2844,7 +2844,7 @@ CURLcode scp_perform(struct connectdata *conn,
   return result;
 }
 
-/* called from curl_multi.c while DOing */
+/* called from multi.c while DOing */
 static CURLcode scp_doing(struct connectdata *conn,
                                bool *dophase_done)
 {
@@ -3053,7 +3053,7 @@ CURLcode sftp_perform(struct connectdata *conn,
   return result;
 }
 
-/* called from curl_multi.c while DOing */
+/* called from multi.c while DOing */
 static CURLcode sftp_doing(struct connectdata *conn,
                            bool *dophase_done)
 {
@@ -3154,7 +3154,7 @@ static ssize_t sftp_recv(struct connectdata *conn, int sockindex,
   return nread;
 }
 
-/* The get_pathname() function is being borrowed from OpenSSH-sftp.c
+/* The get_pathname() function is being borrowed from OpenSSH sftp.c
    version 4.6p1. */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
diff --git a/lib/curl_ssh.h b/lib/ssh.h
index c7f1a9c69..bf43fdf3a 100644
--- a/lib/curl_ssh.h
+++ b/lib/ssh.h
@@ -7,7 +7,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
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef HAVE_LIBSSH2_H
 #include <libssh2.h>
@@ -111,7 +111,7 @@ struct ssh_conn {
   char *rsa_pub;              /* path name */
   char *rsa;                  /* path name */
   bool authed;                /* the connection has been authenticated fine */
-  sshstate state;             /* always use curl_ssh.c:state() to change */
+  sshstate state;             /* always use ssh.c:state() to change state! */
   sshstate nextstate;         /* the state to goto after stopping */
   CURLcode actualcode;        /* the actual error code */
   struct curl_slist *quote_item; /* for the quote option */
diff --git a/lib/curl_sslgen.c b/lib/sslgen.c
index d85ba8ae6..67dd71fa6 100644
--- a/lib/curl_sslgen.c
+++ b/lib/sslgen.c
@@ -43,28 +43,28 @@
    http://httpd.apache.org/docs-2.0/ssl/ssl_intro.html
 */
 
-#include "curl_setup.h"
+#include "setup.h"
 
-#include "curl_urldata.h"
+#include "urldata.h"
 #define SSLGEN_C
-#include "curl_sslgen.h" /* generic SSL protos etc */
-#include "curl_ssluse.h" /* OpenSSL versions */
-#include "curl_gtls.h"   /* GnuTLS versions */
-#include "curl_nssg.h"   /* NSS versions */
-#include "curl_qssl.h"   /* QSOSSL versions */
-#include "curl_polarssl.h" /* PolarSSL versions */
-#include "curl_axtls.h"  /* axTLS versions */
-#include "curl_cyassl.h"  /* CyaSSL versions */
+#include "sslgen.h" /* generic SSL protos etc */
+#include "ssluse.h" /* OpenSSL versions */
+#include "gtls.h"   /* GnuTLS versions */
+#include "nssg.h"   /* NSS versions */
+#include "qssl.h"   /* QSOSSL versions */
+#include "polarssl.h" /* PolarSSL versions */
+#include "axtls.h"  /* axTLS versions */
+#include "cyassl.h"  /* CyaSSL versions */
 #include "curl_schannel.h" /* Schannel SSPI version */
 #include "curl_darwinssl.h" /* SecureTransport (Darwin) version */
-#include "curl_sendf.h"
-#include "curl_rawstr.h"
-#include "curl_url.h"
+#include "sendf.h"
+#include "rawstr.h"
+#include "url.h"
 #include "curl_memory.h"
-#include "curl_progress.h"
-#include "curl_share.h"
+#include "progress.h"
+#include "share.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 /* convenience macro to check if this handle is using a shared SSL session */
 #define SSLSESSION_SHARED(data) (data->share &&                        \
diff --git a/lib/curl_sslgen.h b/lib/sslgen.h
index 17ad8e343..2369b552c 100644
--- a/lib/curl_sslgen.h
+++ b/lib/sslgen.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifndef MD5_DIGEST_LENGTH
 #define MD5_DIGEST_LENGTH 16 /* fixed size */
diff --git a/lib/curl_ssluse.c b/lib/ssluse.c
index 0809d4614..8f9fce4c8 100644
--- a/lib/curl_ssluse.c
+++ b/lib/ssluse.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, 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
@@ -22,7 +22,7 @@
 
 /*
  * Source file for all OpenSSL-specific code for the TLS/SSL layer. No code
- * but curl_sslgen.c should ever call or use these functions.
+ * but sslgen.c should ever call or use these functions.
  */
 
 /*
@@ -30,24 +30,24 @@
  * Sampo Kellomaki 1998.
  */
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
 
-#include "curl_urldata.h"
-#include "curl_sendf.h"
-#include "curl_formdata.h" /* for the boundary function */
-#include "curl_url.h" /* for the ssl config check function */
-#include "curl_inet_pton.h"
-#include "curl_ssluse.h"
-#include "curl_connect.h"
-#include "curl_strequal.h"
-#include "curl_select.h"
-#include "curl_sslgen.h"
-#include "curl_rawstr.h"
-#include "curl_hostcheck.h"
+#include "urldata.h"
+#include "sendf.h"
+#include "formdata.h" /* for the boundary function */
+#include "url.h" /* for the ssl config check function */
+#include "inet_pton.h"
+#include "ssluse.h"
+#include "connect.h"
+#include "strequal.h"
+#include "select.h"
+#include "sslgen.h"
+#include "rawstr.h"
+#include "hostcheck.h"
 
 #define _MPRINTF_REPLACE /* use the internal *printf() functions */
 #include <curl/mprintf.h>
@@ -67,12 +67,12 @@
 #include <md5.h>
 #endif
 
-#include "curl_warnless.h"
+#include "warnless.h"
 #include "curl_memory.h"
-#include "curl_non_ascii.h" /* for Curl_convert_from_utf8 prototype */
+#include "non-ascii.h" /* for Curl_convert_from_utf8 prototype */
 
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 #ifndef OPENSSL_VERSION_NUMBER
 #error "OPENSSL_VERSION_NUMBER not defined"
diff --git a/lib/curl_ssluse.h b/lib/ssluse.h
index 669be57c1..5375a6a65 100644
--- a/lib/curl_ssluse.h
+++ b/lib/ssluse.h
@@ -7,7 +7,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, 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
@@ -22,15 +22,14 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef USE_SSLEAY
 /*
- * This header should only be needed to get included by curl_sslgen.c and
- * curl_ssluse.c
+ * This header should only be needed to get included by sslgen.c and ssluse.c
  */
 
-#include "curl_urldata.h"
+#include "urldata.h"
 
 CURLcode Curl_ossl_connect(struct connectdata *conn, int sockindex);
 CURLcode Curl_ossl_connect_nonblocking(struct connectdata *conn,
diff --git a/lib/curl_strdup.c b/lib/strdup.c
index 8dcaa67f0..27014354d 100644
--- a/lib/curl_strdup.c
+++ b/lib/strdup.c
@@ -22,9 +22,9 @@
 /*
  * This file is 'mem-include-scan' clean. See test 1132.
  */
-#include "curl_setup.h"
+#include "setup.h"
 
-#include "curl_strdup.h"
+#include "strdup.h"
 
 #ifndef HAVE_STRDUP
 char *curlx_strdup(const char *str)
diff --git a/lib/curl_strdup.h b/lib/strdup.h
index 49af9117e..4edbcd7d4 100644
--- a/lib/curl_strdup.h
+++ b/lib/strdup.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifndef HAVE_STRDUP
 extern char *curlx_strdup(const char *str);
diff --git a/lib/curl_strequal.c b/lib/strequal.c
index 5d370c854..89ad8a6e8 100644
--- a/lib/curl_strequal.c
+++ b/lib/strequal.c
@@ -20,13 +20,13 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
 
-#include "curl_strequal.h"
+#include "strequal.h"
 
 /*
  * @unittest: 1301
diff --git a/lib/curl_strequal.h b/lib/strequal.h
index 287e042f4..287e042f4 100644
--- a/lib/curl_strequal.h
+++ b/lib/strequal.h
diff --git a/lib/curl_strerror.c b/lib/strerror.c
index 27567a1ac..0c82a53e4 100644
--- a/lib/curl_strerror.c
+++ b/lib/strerror.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef HAVE_STRERROR_R
 #  if (!defined(HAVE_POSIX_STRERROR_R) && \
@@ -39,14 +39,14 @@
 #include <idna.h>
 #endif
 
-#include "curl_strerror.h"
+#include "strerror.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 const char *
 curl_easy_strerror(CURLcode error)
diff --git a/lib/curl_strerror.h b/lib/strerror.h
index 60f193f97..f1b22210a 100644
--- a/lib/curl_strerror.h
+++ b/lib/strerror.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "curl_urldata.h"
+#include "urldata.h"
 
 const char *Curl_strerror (struct connectdata *conn, int err);
 
diff --git a/lib/curl_strtok.c b/lib/strtok.c
index 33bdd96af..94eac0e64 100644
--- a/lib/curl_strtok.c
+++ b/lib/strtok.c
@@ -20,12 +20,12 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifndef HAVE_STRTOK_R
 #include <stddef.h>
 
-#include "curl_strtok.h"
+#include "strtok.h"
 
 char *
 Curl_strtok_r(char *ptr, const char *sep, char **end)
diff --git a/lib/curl_strtok.h b/lib/strtok.h
index 1147d70d3..8baf77948 100644
--- a/lib/curl_strtok.h
+++ b/lib/strtok.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
 #include <stddef.h>
 
 #ifndef HAVE_STRTOK_R
diff --git a/lib/curl_strtoofft.c b/lib/strtoofft.c
index d203d9cc7..c61459de8 100644
--- a/lib/curl_strtoofft.c
+++ b/lib/strtoofft.c
@@ -20,9 +20,9 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
-#include "curl_strtoofft.h"
+#include "strtoofft.h"
 
 /*
  * NOTE:
diff --git a/lib/curl_strtoofft.h b/lib/strtoofft.h
index b812a67a0..08b0e6d91 100644
--- a/lib/curl_strtoofft.h
+++ b/lib/strtoofft.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 /*
  * Determine which string to integral data type conversion function we use
diff --git a/lib/curl_telnet.c b/lib/telnet.c
index 54eab1c92..a64da090f 100644
--- a/lib/curl_telnet.c
+++ b/lib/telnet.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifndef CURL_DISABLE_TELNET
 
@@ -44,13 +44,13 @@
 #include <sys/param.h>
 #endif
 
-#include "curl_urldata.h"
+#include "urldata.h"
 #include <curl/curl.h>
-#include "curl_transfer.h"
-#include "curl_sendf.h"
-#include "curl_telnet.h"
-#include "curl_connect.h"
-#include "curl_progress.h"
+#include "transfer.h"
+#include "sendf.h"
+#include "telnet.h"
+#include "connect.h"
+#include "progress.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
@@ -58,15 +58,15 @@
 #define  TELOPTS
 #define  TELCMDS
 
-#include "curl_arpa_telnet.h"
+#include "arpa_telnet.h"
 #include "curl_memory.h"
-#include "curl_select.h"
-#include "curl_strequal.h"
-#include "curl_rawstr.h"
-#include "curl_warnless.h"
+#include "select.h"
+#include "strequal.h"
+#include "rawstr.h"
+#include "warnless.h"
 
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 #define SUBBUFSIZE 512
 
diff --git a/lib/curl_telnet.h b/lib/telnet.h
index ddb9e5473..ddb9e5473 100644
--- a/lib/curl_telnet.h
+++ b/lib/telnet.h
diff --git a/lib/curl_tftp.c b/lib/tftp.c
index 1af246ec0..97276ea99 100644
--- a/lib/curl_tftp.c
+++ b/lib/tftp.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, 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
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifndef CURL_DISABLE_TFTP
 
@@ -44,27 +44,27 @@
 #include <sys/param.h>
 #endif
 
-#include "curl_urldata.h"
+#include "urldata.h"
 #include <curl/curl.h>
-#include "curl_transfer.h"
-#include "curl_sendf.h"
-#include "curl_tftp.h"
-#include "curl_progress.h"
-#include "curl_connect.h"
-#include "curl_strerror.h"
-#include "curl_sockaddr.h" /* required for Curl_sockaddr_storage */
-#include "curl_multiif.h"
-#include "curl_url.h"
-#include "curl_rawstr.h"
+#include "transfer.h"
+#include "sendf.h"
+#include "tftp.h"
+#include "progress.h"
+#include "connect.h"
+#include "strerror.h"
+#include "sockaddr.h" /* required for Curl_sockaddr_storage */
+#include "multiif.h"
+#include "url.h"
+#include "rawstr.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "curl_memory.h"
-#include "curl_select.h"
+#include "select.h"
 
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 /* RFC2348 allows the block size to be negotiated */
 #define TFTP_BLKSIZE_DEFAULT 512
@@ -1371,7 +1371,7 @@ static CURLcode tftp_multi_statemach(struct connectdata *conn, bool *done)
  *
  * tftp_doing
  *
- * Called from curl_multi.c while DOing
+ * Called from multi.c while DOing
  *
  **********************************************************/
 static CURLcode tftp_doing(struct connectdata *conn, bool *dophase_done)
diff --git a/lib/curl_tftp.h b/lib/tftp.h
index 117b40f62..117b40f62 100644
--- a/lib/curl_tftp.h
+++ b/lib/tftp.h
diff --git a/lib/curl_timeval.c b/lib/timeval.c
index 8e4c7bd76..2fd720144 100644
--- a/lib/curl_timeval.c
+++ b/lib/timeval.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_timeval.h"
+#include "timeval.h"
 
 #if defined(WIN32) && !defined(MSDOS)
 
diff --git a/lib/curl_timeval.h b/lib/timeval.h
index 3f1b9ea70..b464ae406 100644
--- a/lib/curl_timeval.h
+++ b/lib/timeval.h
@@ -27,7 +27,7 @@
  * as well as the library. Do not mix with library internals!
  */
 
-#include "curl_setup.h"
+#include "setup.h"
 
 struct timeval curlx_tvnow(void);
 
diff --git a/lib/curl_transfer.c b/lib/transfer.c
index a1dee1dd0..6194908d6 100644
--- a/lib/curl_transfer.c
+++ b/lib/transfer.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, 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
@@ -20,11 +20,11 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
-#include "curl_strtoofft.h"
-#include "curl_strequal.h"
-#include "curl_rawstr.h"
+#include "strtoofft.h"
+#include "strequal.h"
+#include "rawstr.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
@@ -57,35 +57,35 @@
 #error "We can't compile without socket() support!"
 #endif
 
-#include "curl_urldata.h"
+#include "urldata.h"
 #include <curl/curl.h>
-#include "curl_netrc.h"
-
-#include "curl_content_encoding.h"
-#include "curl_hostip.h"
-#include "curl_transfer.h"
-#include "curl_sendf.h"
-#include "curl_speedcheck.h"
-#include "curl_progress.h"
-#include "curl_http.h"
-#include "curl_url.h"
-#include "curl_getinfo.h"
-#include "curl_sslgen.h"
-#include "curl_http_digest.h"
+#include "netrc.h"
+
+#include "content_encoding.h"
+#include "hostip.h"
+#include "transfer.h"
+#include "sendf.h"
+#include "speedcheck.h"
+#include "progress.h"
+#include "http.h"
+#include "url.h"
+#include "getinfo.h"
+#include "sslgen.h"
+#include "http_digest.h"
 #include "curl_ntlm.h"
-#include "curl_http_negotiate.h"
-#include "curl_share.h"
+#include "http_negotiate.h"
+#include "share.h"
 #include "curl_memory.h"
-#include "curl_select.h"
-#include "curl_multiif.h"
-#include "curl_connect.h"
-#include "curl_non_ascii.h"
+#include "select.h"
+#include "multiif.h"
+#include "connect.h"
+#include "non-ascii.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 #define CURL_TIMEOUT_EXPECT_100 1000 /* counting ms here */
 
@@ -683,7 +683,7 @@ static CURLcode readwrite_data(struct SessionHandle *data,
         if(k->badheader < HEADER_ALLBAD) {
           /* This switch handles various content encodings. If there's an
              error here, be sure to check over the almost identical code
-             in curl_http_chunks.c.
+             in http_chunks.c.
              Make sure that ALL_CONTENT_ENCODINGS contains all the
              encodings handled here. */
 #ifdef HAVE_LIBZ
@@ -1725,7 +1725,7 @@ CURLcode Curl_follow(struct SessionHandle *data,
                      char *newurl, /* this 'newurl' is the Location: string,
                                       and it must be malloc()ed before passed
                                       here */
-                     followtype type) /* see curl_transfer.h */
+                     followtype type) /* see transfer.h */
 {
 #ifdef CURL_DISABLE_HTTP
   (void)data;
diff --git a/lib/curl_transfer.h b/lib/transfer.h
index b47422a63..b47422a63 100644
--- a/lib/curl_transfer.h
+++ b/lib/transfer.h
diff --git a/lib/curl_url.c b/lib/url.c
index 52badc5d7..58befecab 100644
--- a/lib/curl_url.c
+++ b/lib/url.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, 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
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
@@ -74,61 +74,61 @@ void idn_free (void *ptr);
 int curl_win32_idn_to_ascii(const char *in, char **out);
 #endif  /* USE_LIBIDN */
 
-#include "curl_urldata.h"
-#include "curl_netrc.h"
-
-#include "curl_formdata.h"
-#include "curl_sslgen.h"
-#include "curl_hostip.h"
-#include "curl_transfer.h"
-#include "curl_sendf.h"
-#include "curl_progress.h"
-#include "curl_cookie.h"
-#include "curl_strequal.h"
-#include "curl_strerror.h"
-#include "curl_escape.h"
-#include "curl_strtok.h"
-#include "curl_share.h"
-#include "curl_content_encoding.h"
-#include "curl_http_digest.h"
-#include "curl_http_negotiate.h"
-#include "curl_select.h"
-#include "curl_multiif.h"
-#include "curl_easyif.h"
-#include "curl_speedcheck.h"
-#include "curl_rawstr.h"
-#include "curl_warnless.h"
-#include "curl_non_ascii.h"
-#include "curl_inet_pton.h"
+#include "urldata.h"
+#include "netrc.h"
+
+#include "formdata.h"
+#include "sslgen.h"
+#include "hostip.h"
+#include "transfer.h"
+#include "sendf.h"
+#include "progress.h"
+#include "cookie.h"
+#include "strequal.h"
+#include "strerror.h"
+#include "escape.h"
+#include "strtok.h"
+#include "share.h"
+#include "content_encoding.h"
+#include "http_digest.h"
+#include "http_negotiate.h"
+#include "select.h"
+#include "multiif.h"
+#include "easyif.h"
+#include "speedcheck.h"
+#include "rawstr.h"
+#include "warnless.h"
+#include "non-ascii.h"
+#include "inet_pton.h"
 
 /* And now for the protocols */
-#include "curl_ftp.h"
-#include "curl_dict.h"
-#include "curl_telnet.h"
-#include "curl_tftp.h"
-#include "curl_http.h"
-#include "curl_file.h"
+#include "ftp.h"
+#include "dict.h"
+#include "telnet.h"
+#include "tftp.h"
+#include "http.h"
+#include "file.h"
 #include "curl_ldap.h"
-#include "curl_ssh.h"
-#include "curl_imap.h"
-#include "curl_url.h"
-#include "curl_connect.h"
-#include "curl_inet_ntop.h"
+#include "ssh.h"
+#include "imap.h"
+#include "url.h"
+#include "connect.h"
+#include "inet_ntop.h"
 #include "curl_ntlm.h"
 #include "curl_ntlm_wb.h"
-#include "curl_socks.h"
+#include "socks.h"
 #include "curl_rtmp.h"
-#include "curl_gopher.h"
-#include "curl_http_proxy.h"
-#include "curl_bundles.h"
-#include "curl_conncache.h"
+#include "gopher.h"
+#include "http_proxy.h"
+#include "bundles.h"
+#include "conncache.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 /* Local static prototypes */
 static bool ConnectionKillOne(struct SessionHandle *data);
@@ -508,7 +508,7 @@ CURLcode Curl_init_userdefined(struct UserDefined *set)
   /* Set the default size of the SSL session ID cache */
   set->ssl.max_ssl_sessions = 5;
 
-  set->proxyport = CURL_DEFAULT_PROXY_PORT; /* from curl_url.h */
+  set->proxyport = CURL_DEFAULT_PROXY_PORT; /* from url.h */
   set->proxytype = CURLPROXY_HTTP; /* defaults to HTTP proxy */
   set->httpauth = CURLAUTH_BASIC;  /* defaults to basic */
   set->proxyauth = CURLAUTH_BASIC; /* defaults to basic */
@@ -2190,7 +2190,7 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option,
     break;
 
   case CURLOPT_SSH_KEYFUNCTION:
-    /* setting to NULL is fine since the curl_ssh.c functions themselves will
+    /* setting to NULL is fine since the ssh.c functions themselves will
        then rever to use the internal default */
     data->set.ssh_keyfunc = va_arg(param, curl_sshkeycallback);
     break;
@@ -3688,7 +3688,7 @@ static CURLcode parseurlandfillconn(struct SessionHandle *data,
        */
 
       /* Note: if you add a new protocol, please update the list in
-       * lib/curl_version.c too! */
+       * lib/version.c too! */
 
       if(checkprefix("FTP.", conn->host.name))
         protop = "ftp";
@@ -5356,7 +5356,7 @@ CURLcode Curl_do(struct connectdata **connp, bool *done)
     /* generic protocol-specific function pointer set in curl_connect() */
     result = conn->handler->do_it(conn, done);
 
-    /* This was formerly done in curl_transfer.c, but we better do it here */
+    /* This was formerly done in transfer.c, but we better do it here */
     if((CURLE_SEND_ERROR == result) && conn->bits.reuse) {
       /*
        * If the connection is using an easy handle, call reconnect
diff --git a/lib/curl_url.h b/lib/url.h
index cc113abdc..ab6d3d048 100644
--- a/lib/curl_url.h
+++ b/lib/url.h
@@ -7,7 +7,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
@@ -21,10 +21,10 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
 
 /*
- * Prototypes for library-wide functions provided by curl_url.c
+ * Prototypes for library-wide functions provided by url.c
  */
 
 CURLcode Curl_open(struct SessionHandle **curl);
diff --git a/lib/curl_urldata.h b/lib/urldata.h
index d9edee079..cd50f623f 100644
--- a/lib/curl_urldata.h
+++ b/lib/urldata.h
@@ -7,7 +7,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, 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
@@ -24,7 +24,7 @@
 
 /* This file is for lib internal stuff */
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #define PORT_FTP 21
 #define PORT_FTPS 990
@@ -66,8 +66,8 @@
 */
 #define RESP_TIMEOUT (1800*1000)
 
-#include "curl_cookie.h"
-#include "curl_formdata.h"
+#include "cookie.h"
+#include "formdata.h"
 
 #ifdef USE_SSLEAY
 #ifdef USE_OPENSSL
@@ -150,7 +150,7 @@
 #include <netinet/in.h>
 #endif
 
-#include "curl_timeval.h"
+#include "timeval.h"
 
 #ifdef HAVE_ZLIB_H
 #include <zlib.h>               /* for content-encoding */
@@ -162,20 +162,20 @@
 
 #include <curl/curl.h>
 
-#include "curl_http_chunks.h" /* for the structs and enum stuff */
-#include "curl_hostip.h"
-#include "curl_hash.h"
-#include "curl_splay.h"
-
-#include "curl_imap.h"
-#include "curl_pop3.h"
-#include "curl_smtp.h"
-#include "curl_ftp.h"
-#include "curl_file.h"
-#include "curl_ssh.h"
-#include "curl_http.h"
-#include "curl_rtsp.h"
-#include "curl_wildcard.h"
+#include "http_chunks.h" /* for the structs and enum stuff */
+#include "hostip.h"
+#include "hash.h"
+#include "splay.h"
+
+#include "imap.h"
+#include "pop3.h"
+#include "smtp.h"
+#include "ftp.h"
+#include "file.h"
+#include "ssh.h"
+#include "http.h"
+#include "rtsp.h"
+#include "wildcard.h"
 
 #ifdef HAVE_GSSAPI
 # ifdef HAVE_GSSGNU
@@ -664,7 +664,7 @@ struct SingleRequest {
 
   bool forbidchunk;   /* used only to explicitly forbid chunk-upload for
                          specific upload buffers. See readmoredata() in
-                         curl_http.c for details. */
+                         http.c for details. */
 };
 
 /*
@@ -731,8 +731,8 @@ struct Curl_handler {
    */
   CURLcode (*disconnect)(struct connectdata *, bool dead_connection);
 
-  /* If used, this function gets called from curl_transfer.c:readwrite_data()
-     to allow the protocol to do extra reads/writes */
+  /* If used, this function gets called from transfer.c:readwrite_data() to
+     allow the protocol to do extra reads/writes */
   CURLcode (*readwrite)(struct SessionHandle *data, struct connectdata *conn,
                         ssize_t *nread, bool *readmore);
 
@@ -1068,7 +1068,7 @@ struct Progress {
 
   bool callback;  /* set when progress callback is used */
   int width; /* screen width at download start */
-  int flags; /* see curl_progress.h */
+  int flags; /* see progress.h */
 
   double timespent;
 
@@ -1276,7 +1276,7 @@ struct UrlState {
     struct FTP *ftp;
     /* void *tftp;    not used */
     struct FILEPROTO *file;
-    void *telnet;        /* private for curl_telnet.c-eyes only */
+    void *telnet;        /* private for telnet.c-eyes only */
     void *generic;
     struct SSHPROTO *ssh;
     struct FTP *imap;
@@ -1317,8 +1317,8 @@ struct DynamicStatic {
  * the 'DynamicStatic' struct.
  * Character pointer fields point to dynamic storage, unless otherwise stated.
  */
-struct Curl_one_easy; /* declared and used only in curl_multi.c */
-struct Curl_multi;    /* declared and used only in curl_multi.c */
+struct Curl_one_easy; /* declared and used only in multi.c */
+struct Curl_multi;    /* declared and used only in multi.c */
 
 enum dupstring {
   STRING_CERT,            /* client certificate file name */
diff --git a/lib/curl_version.c b/lib/version.c
index fe1f73660..ef8353ae2 100644
--- a/lib/curl_version.c
+++ b/lib/version.c
@@ -20,11 +20,11 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #include <curl/curl.h>
-#include "curl_urldata.h"
-#include "curl_sslgen.h"
+#include "urldata.h"
+#include "sslgen.h"
 
 #define _MPRINTF_REPLACE /* use the internal *printf() functions */
 #include <curl/mprintf.h>
diff --git a/lib/curl_warnless.c b/lib/warnless.c
index 30cdbe6f0..9cc7be9d3 100644
--- a/lib/curl_warnless.c
+++ b/lib/warnless.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
 #if defined(__INTEL_COMPILER) && defined(__unix__)
 
@@ -35,7 +35,7 @@
 
 #define BUILDING_WARNLESS_C 1
 
-#include "curl_warnless.h"
+#include "warnless.h"
 
 #define CURL_MASK_SCHAR  0x7F
 #define CURL_MASK_UCHAR  0xFF
diff --git a/lib/curl_warnless.h b/lib/warnless.h
index 9d690d62c..9d690d62c 100644
--- a/lib/curl_warnless.h
+++ b/lib/warnless.h
diff --git a/lib/curl_wildcard.c b/lib/wildcard.c
index d6ba2b276..6f4c7380c 100644
--- a/lib/curl_wildcard.c
+++ b/lib/wildcard.c
@@ -20,18 +20,18 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "setup.h"
 
-#include "curl_wildcard.h"
-#include "curl_llist.h"
-#include "curl_fileinfo.h"
+#include "wildcard.h"
+#include "llist.h"
+#include "fileinfo.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
 #include "curl_memory.h"
 /* The last #include file should be: */
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 CURLcode Curl_wildcard_init(struct WildcardData *wc)
 {
diff --git a/lib/curl_wildcard.h b/lib/wildcard.h
index 8f732d106..8f732d106 100644
--- a/lib/curl_wildcard.h
+++ b/lib/wildcard.h
diff --git a/m4/curl-reentrant.m4 b/m4/curl-reentrant.m4
index f48e2f87d..2e2d868d6 100644
--- a/m4/curl-reentrant.m4
+++ b/m4/curl-reentrant.m4
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2009, 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
@@ -21,7 +21,7 @@
 #***************************************************************************
 
 # File version for 'aclocal' use. Keep it a single number.
-# serial 9
+# serial 8
 
 dnl Note 1
 dnl ------
@@ -467,7 +467,7 @@ dnl This macro ensures that configuration tests done
 dnl after this will execute with preprocessor symbol
 dnl _REENTRANT defined. This macro also ensures that
 dnl the generated config file defines NEED_REENTRANT
-dnl and that in turn curl_setup.h will define _REENTRANT.
+dnl and that in turn setup.h will define _REENTRANT.
 dnl Internal macro for CURL_CONFIGURE_REENTRANT.
 
 AC_DEFUN([CURL_CONFIGURE_FROM_NOW_ON_WITH_REENTRANT], [
@@ -487,7 +487,7 @@ dnl This macro ensures that configuration tests done
 dnl after this will execute with preprocessor symbol
 dnl _THREAD_SAFE defined. This macro also ensures that
 dnl the generated config file defines NEED_THREAD_SAFE
-dnl and that in turn curl_setup.h will define _THREAD_SAFE.
+dnl and that in turn setup.h will define _THREAD_SAFE.
 dnl Internal macro for CURL_CONFIGURE_THREAD_SAFE.
 
 AC_DEFUN([CURL_CONFIGURE_FROM_NOW_ON_WITH_THREAD_SAFE], [
diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c
index 4ef9acbf6..1baff3951 100644
--- a/packages/OS400/ccsidcurl.c
+++ b/packages/OS400/ccsidcurl.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2010, 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
@@ -32,10 +32,10 @@
 #pragma enum(int)
 
 #include "curl.h"
-#include "curl_mprintf.h"
-#include "curl_urldata.h"
-#include "curl_url.h"
-#include "curl_getinfo.h"
+#include "mprintf.h"
+#include "urldata.h"
+#include "url.h"
+#include "getinfo.h"
 #include "ccsidcurl.h"
 
 #include "os400sys.h"
diff --git a/packages/OS400/make-lib.sh b/packages/OS400/make-lib.sh
index d9c6e9e95..a9e1c3861 100644
--- a/packages/OS400/make-lib.sh
+++ b/packages/OS400/make-lib.sh
@@ -13,7 +13,7 @@ cd "${TOPDIR}/lib"
 echo '#pragma comment(user, "libcurl version '"${LIBCURL_VERSION}"'")' > os400.c
 echo '#pragma comment(user, __DATE__)' >> os400.c
 echo '#pragma comment(user, __TIME__)' >> os400.c
-echo '#pragma comment(copyright, "Copyright (C) 1998-2013 Daniel Stenberg et al. OS/400 version by P. Monnerat")' >> os400.c
+echo '#pragma comment(copyright, "Copyright (C) 1998-2012 Daniel Stenberg et al. OS/400 version by P. Monnerat")' >> os400.c
 make_module     OS400           os400.c
 LINK=                           # No need to rebuild service program yet.
 MODULES=
@@ -151,13 +151,13 @@ fi
 
 if [ "${TEST_FORMDATA}" ]
 then    MODULES=
-        make_module TFORMDATA   curl_formdata.c  "'_FORM_DEBUG' 'CURLDEBUG'"
-        make_module TSTREQUAL   curl_strequal.c  "'_FORM_DEBUG' 'CURLDEBUG'"
-        make_module TMEMDEBUG   curl_memdebug.c  "'_FORM_DEBUG' 'CURLDEBUG'"
-        make_module TMPRINTF    curl_mprintf.c   "'_FORM_DEBUG' 'CURLDEBUG'"
-        make_module TSTRERROR   curl_strerror.c  "'_FORM_DEBUG' 'CURLDEBUG'"
+        make_module TFORMDATA   formdata.c      "'_FORM_DEBUG' 'CURLDEBUG'"
+        make_module TSTREQUAL   strequal.c      "'_FORM_DEBUG' 'CURLDEBUG'"
+        make_module TMEMDEBUG   memdebug.c      "'_FORM_DEBUG' 'CURLDEBUG'"
+        make_module TMPRINTF    mprintf.c       "'_FORM_DEBUG' 'CURLDEBUG'"
+        make_module TSTRERROR   strerror.c      "'_FORM_DEBUG' 'CURLDEBUG'"
         #       The following modules should not be needed (see comment in
-        #               curl_formdata.c. However, there are some unsatisfied
+        #               formdata.c. However, there are some unsatisfied
         #               external references leading in the following
         #               modules to be (recursively) needed.
         MODULES="${MODULES} EASY STRDUP SSLGEN QSSL HOSTIP HOSTIP4 HOSTIP6"
diff --git a/packages/OS400/os400sys.c b/packages/OS400/os400sys.c
index 61ae1e0f3..5527ce720 100644
--- a/packages/OS400/os400sys.c
+++ b/packages/OS400/os400sys.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2012, 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
@@ -24,7 +24,7 @@
 /* OS/400 additional support. */
 
 #include "curlbuild.h"
-#include "config-os400.h"   /* Not curl_setup.h: we only need some defines. */
+#include "config-os400.h"       /* Not setup.h: we only need some defines. */
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/packages/Symbian/group/curl.mmp b/packages/Symbian/group/curl.mmp
index caddfeca4..28498ce7b 100644
--- a/packages/Symbian/group/curl.mmp
+++ b/packages/Symbian/group/curl.mmp
@@ -49,8 +49,7 @@ SOURCE \
 
 SOURCEPATH  ../../../lib
 SOURCE \
-    curl_nonblock.c \
-    curl_rawstr.c
+    rawstr.c nonblock.c
 
 USERINCLUDE ../../../src ../../../lib ../../../include/curl
 
diff --git a/packages/Symbian/group/libcurl.mmp b/packages/Symbian/group/libcurl.mmp
index eb920c08f..933994faa 100644
--- a/packages/Symbian/group/libcurl.mmp
+++ b/packages/Symbian/group/libcurl.mmp
@@ -21,113 +21,24 @@ MACRO       USE_SSLEAY
 
 SOURCEPATH  ../../../lib
 SOURCE \
-  curl_addrinfo.c \
-  curl_amigaos.c \
-  curl_asyn_ares.c \
-  curl_asyn_thread.c \
-  curl_axtls.c \
-  curl_base64.c \
-  curl_bundles.c \
-  curl_conncache.c \
-  curl_connect.c \
-  curl_content_encoding.c \
-  curl_cookie.c \
-  curl_cyassl.c \
-  curl_darwinssl.c \
-  curl_dict.c \
-  curl_easy.c \
-  curl_escape.c \
-  curl_file.c \
-  curl_fileinfo.c \
-  curl_fnmatch.c \
-  curl_formdata.c \
-  curl_ftp.c \
-  curl_ftplistparser.c \
-  curl_getenv.c \
-  curl_gethostname.c \
-  curl_getinfo.c \
-  curl_gopher.c \
-  curl_gssapi.c \
-  curl_gtls.c \
-  curl_hash.c \
-  curl_hmac.c \
-  curl_hostasyn.c \
-  curl_hostip.c \
-  curl_hostip4.c \
-  curl_hostip6.c \
-  curl_hostsyn.c \
-  curl_http.c \
-  curl_http_chunks.c \
-  curl_http_digest.c \
-  curl_http_negotiate.c \
-  curl_http_negotiate_sspi.c \
-  curl_http_proxy.c \
-  curl_idn_win32.c \
-  curl_if2ip.c \
-  curl_imap.c \
-  curl_inet_ntop.c \
-  curl_inet_pton.c \
-  curl_krb4.c \
-  curl_krb5.c \
-  curl_ldap.c \
-  curl_llist.c \
-  curl_md4.c \
-  curl_md5.c \
-  curl_memdebug.c \
-  curl_memrchr.c \
-  curl_mprintf.c \
-  curl_multi.c \
-  curl_multibyte.c \
-  curl_netrc.c \
-  curl_non_ascii.c \
-  curl_nonblock.c \
-  curl_nss.c \
-  curl_ntlm.c \
-  curl_ntlm_core.c \
-  curl_ntlm_msgs.c \
-  curl_ntlm_wb.c \
-  curl_openldap.c \
-  curl_parsedate.c \
-  curl_pingpong.c \
-  curl_polarssl.c \
-  curl_pop3.c \
-  curl_progress.c \
-  curl_qssl.c \
-  curl_rand.c \
-  curl_rawstr.c \
-  curl_rtmp.c \
-  curl_rtsp.c \
-  curl_sasl.c \
-  curl_schannel.c \
-  curl_security.c \
-  curl_select.c \
-  curl_sendf.c \
-  curl_share.c \
-  curl_slist.c \
-  curl_smtp.c \
-  curl_socks.c \
-  curl_socks_gssapi.c \
-  curl_socks_sspi.c \
-  curl_speedcheck.c \
-  curl_splay.c \
-  curl_ssh.c \
-  curl_sslgen.c \
-  curl_ssluse.c \
-  curl_sspi.c \
-  curl_strdup.c \
-  curl_strequal.c \
-  curl_strerror.c \
-  curl_strtok.c \
-  curl_strtoofft.c \
-  curl_telnet.c \
-  curl_tftp.c \
-  curl_threads.c \
-  curl_timeval.c \
-  curl_transfer.c \
-  curl_url.c \
-  curl_version.c \
-  curl_warnless.c \
-  curl_wildcard.c
+  file.c timeval.c base64.c hostip.c progress.c formdata.c		\
+  cookie.c http.c sendf.c ftp.c url.c dict.c if2ip.c speedcheck.c	\
+  ldap.c ssluse.c version.c getenv.c escape.c mprintf.c telnet.c	\
+  netrc.c getinfo.c transfer.c strequal.c easy.c security.c krb4.c	\
+  curl_fnmatch.c fileinfo.c ftplistparser.c wildcard.c krb5.c		\
+  memdebug.c http_chunks.c strtok.c connect.c llist.c hash.c multi.c	\
+  content_encoding.c share.c http_digest.c md4.c md5.c curl_rand.c	\
+  http_negotiate.c inet_pton.c strtoofft.c strerror.c amigaos.c		\
+  hostasyn.c hostip4.c hostip6.c hostsyn.c inet_ntop.c parsedate.c	\
+  select.c gtls.c sslgen.c tftp.c splay.c strdup.c socks.c ssh.c nss.c	\
+  qssl.c rawstr.c curl_addrinfo.c socks_gssapi.c socks_sspi.c		\
+  curl_sspi.c slist.c nonblock.c curl_memrchr.c imap.c pop3.c smtp.c	\
+  pingpong.c rtsp.c curl_threads.c warnless.c hmac.c polarssl.c		\
+  curl_rtmp.c openldap.c curl_gethostname.c gopher.c axtls.c		\
+  idn_win32.c http_negotiate_sspi.c cyassl.c http_proxy.c non-ascii.c	\
+  asyn-ares.c asyn-thread.c curl_gssapi.c curl_ntlm.c curl_ntlm_wb.c	\
+  curl_ntlm_core.c curl_ntlm_msgs.c curl_sasl.c curl_schannel.c		\
+  curl_multibyte.c curl_darwinssl.c bundles.c conncache.c
 
 USERINCLUDE   ../../../lib ../../../include/curl
 #ifdef ENABLE_SSL
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bda835779..93f86cbad 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -25,8 +25,8 @@ source_group("cURL source files" FILES ${CURL_CFILES})
 source_group("cURL header files" FILES ${CURL_HFILES})
 
 include_directories(
-  ${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_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"
   )
 
diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom
index 721ae8495..75edf488b 100644
--- a/src/Makefile.Watcom
+++ b/src/Makefile.Watcom
@@ -114,7 +114,7 @@ LINK_ARG = $(OBJ_DIR)$(DS)wlink.arg
 !endif
 # For now we still define the CURLX_ONES sources here unless we know how
 # to split off the prefixed path.
-CURLX_SOURCES = curl_rawstr.c curl_nonblock.c
+CURLX_SOURCES = rawstr.c nonblock.c
 
 OBJS = $(CURL_CFILES:.c=.obj)
 !ifdef %curl_static
diff --git a/src/Makefile.inc b/src/Makefile.inc
index 4e1d4271f..7ce30f0b6 100644
--- a/src/Makefile.inc
+++ b/src/Makefile.inc
@@ -9,11 +9,10 @@
 
 # libcurl has sources that provide functions named curlx_* that aren't part of
 # the official API, but we re-use the code here to avoid duplication.
-CURLX_ONES = \
-	$(top_srcdir)/lib/curl_nonblock.c \
-	$(top_srcdir)/lib/curl_rawstr.c \
-	$(top_srcdir)/lib/curl_strdup.c \
-	$(top_srcdir)/lib/curl_strtoofft.c
+CURLX_ONES = $(top_srcdir)/lib/strtoofft.c \
+	$(top_srcdir)/lib/strdup.c \
+	$(top_srcdir)/lib/rawstr.c \
+	$(top_srcdir)/lib/nonblock.c
 
 CURL_CFILES = \
 	tool_binmode.c \
diff --git a/src/Makefile.vc6 b/src/Makefile.vc6
index 415eec3c1..073b20d6a 100644
--- a/src/Makefile.vc6
+++ b/src/Makefile.vc6
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___

 #                             \___|\___/|_| \_\_____|

 #

-# Copyright (C) 1999 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.

+# Copyright (C) 1999 - 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

@@ -134,9 +134,9 @@ CFLAGS = $(CFLAGS) /DUSE_WINDOWS_SSPI /I$(WINDOWS_SDK_PATH)\include
 !ENDIF

 

 RELEASE_OBJS= \

-	curl_nonblockr.obj \

-	curl_rawstrr.obj \

-	curl_strtoofftr.obj \

+	nonblockr.obj \

+	rawstrr.obj \

+	strtoofftr.obj \

 	tool_binmoder.obj \

 	tool_bnamer.obj \

 	tool_cb_dbgr.obj \

@@ -178,9 +178,9 @@ RELEASE_OBJS= \
 	curlr.res

 

 DEBUG_OBJS= \

-	curl_nonblockd.obj \

-	curl_rawstrd.obj \

-	curl_strtoofftd.obj \

+	nonblockd.obj \

+	rawstrd.obj \

+	strtoofftd.obj \

 	tool_binmoded.obj \

 	tool_bnamed.obj \

 	tool_cb_dbgd.obj \

@@ -341,12 +341,12 @@ debug: $(DEBUG_OBJS)
         $(MANIFESTTOOL)

 

 ## Release

-curl_nonblockr.obj: ../lib/curl_nonblock.c

-	$(CCR) $(CFLAGS) /Fo"$@" ../lib/curl_nonblock.c

-curl_rawstrr.obj: ../lib/curl_rawstr.c

-	$(CCR) $(CFLAGS) /Fo"$@" ../lib/curl_rawstr.c

-curl_strtoofftr.obj: ../lib/curl_strtoofft.c

-	$(CCR) $(CFLAGS) /Fo"$@" ../lib/curl_strtoofft.c

+nonblockr.obj: ../lib/nonblock.c

+	$(CCR) $(CFLAGS) /Fo"$@" ../lib/nonblock.c

+rawstrr.obj: ../lib/rawstr.c

+	$(CCR) $(CFLAGS) /Fo"$@" ../lib/rawstr.c

+strtoofftr.obj: ../lib/strtoofft.c

+	$(CCR) $(CFLAGS) /Fo"$@" ../lib/strtoofft.c

 tool_binmoder.obj: tool_binmode.c

 	$(CCR) $(CFLAGS) /Fo"$@" tool_binmode.c

 tool_bnamer.obj: tool_bname.c

@@ -427,12 +427,12 @@ curlr.res : curl.rc
 	$(RCR) $(RESFLAGS) /Fo"$@" curl.rc

 

 ## Debug

-curl_nonblockd.obj: ../lib/curl_nonblock.c

-	$(CCD) $(CFLAGS) /Fo"$@" ../lib/curl_nonblock.c

-curl_rawstrd.obj: ../lib/curl_rawstr.c

-	$(CCD) $(CFLAGS) /Fo"$@" ../lib/curl_rawstr.c

-curl_strtoofftd.obj: ../lib/curl_strtoofft.c

-	$(CCD) $(CFLAGS) /Fo"$@" ../lib/curl_strtoofft.c

+nonblockd.obj: ../lib/nonblock.c

+	$(CCD) $(CFLAGS) /Fo"$@" ../lib/nonblock.c

+rawstrd.obj: ../lib/rawstr.c

+	$(CCD) $(CFLAGS) /Fo"$@" ../lib/rawstr.c

+strtoofftd.obj: ../lib/strtoofft.c

+	$(CCD) $(CFLAGS) /Fo"$@" ../lib/strtoofft.c

 tool_binmoded.obj: tool_binmode.c

 	$(CCD) $(CFLAGS) /Fo"$@" tool_binmode.c

 tool_bnamed.obj: tool_bname.c

diff --git a/src/mkhelp.pl b/src/mkhelp.pl
index df6822aae..444b669ba 100644
--- a/src/mkhelp.pl
+++ b/src/mkhelp.pl
@@ -140,7 +140,7 @@ HEAD
 if($c) {
     print <<HEAD
 #include <zlib.h>
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 static const unsigned char hugehelpgz[] = {
   /* This mumbo-jumbo is the huge help text compressed with gzip.
      Thanks to this operation, the size of this data shrunk from $gzip
diff --git a/src/tool_binmode.c b/src/tool_binmode.c
index 26b50ada2..92033ac03 100644
--- a/src/tool_binmode.c
+++ b/src/tool_binmode.c
@@ -33,7 +33,7 @@
 
 #include "tool_binmode.h"
 
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 
 void set_binmode(FILE *stream)
 {
diff --git a/src/tool_bname.c b/src/tool_bname.c
index 6a2a33165..277830546 100644
--- a/src/tool_bname.c
+++ b/src/tool_bname.c
@@ -23,7 +23,7 @@
 
 #include "tool_bname.h"
 
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 
 #ifndef HAVE_BASENAME
 
diff --git a/src/tool_cb_dbg.c b/src/tool_cb_dbg.c
index 321c66133..1850ba0c6 100644
--- a/src/tool_cb_dbg.c
+++ b/src/tool_cb_dbg.c
@@ -30,7 +30,7 @@
 #include "tool_cb_dbg.h"
 #include "tool_util.h"
 
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 
 static void dump(const char *timebuf, const char *text,
                  FILE *stream, const unsigned char *ptr, size_t size,
diff --git a/src/tool_cb_hdr.c b/src/tool_cb_hdr.c
index e6988184a..ef340f798 100644
--- a/src/tool_cb_hdr.c
+++ b/src/tool_cb_hdr.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include "curl_rawstr.h"
+#include "rawstr.h"
 
 #define ENABLE_CURLX_PRINTF
 /* use our own printf() functions */
@@ -31,7 +31,7 @@
 #include "tool_msgs.h"
 #include "tool_cb_hdr.h"
 
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 
 static char *parse_filename(const char *ptr, size_t len);
 
diff --git a/src/tool_cb_prg.c b/src/tool_cb_prg.c
index 1b8842f2a..7a701b692 100644
--- a/src/tool_cb_prg.c
+++ b/src/tool_cb_prg.c
@@ -28,7 +28,7 @@
 #include "tool_cfgable.h"
 #include "tool_cb_prg.h"
 
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 
 /*
 ** callback for CURLOPT_PROGRESSFUNCTION
diff --git a/src/tool_cb_rea.c b/src/tool_cb_rea.c
index 88dfbe852..4565a15d6 100644
--- a/src/tool_cb_rea.c
+++ b/src/tool_cb_rea.c
@@ -28,7 +28,7 @@
 #include "tool_cfgable.h"
 #include "tool_cb_rea.h"
 
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 
 /*
 ** callback for CURLOPT_READFUNCTION
diff --git a/src/tool_cb_see.c b/src/tool_cb_see.c
index 1e36f5962..2f49e1d96 100644
--- a/src/tool_cb_see.c
+++ b/src/tool_cb_see.c
@@ -28,7 +28,7 @@
 #include "tool_cfgable.h"
 #include "tool_cb_see.h"
 
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 
 /* OUR_MAX_SEEK_L has 'long' data type, OUR_MAX_SEEK_O has 'curl_off_t,
    both represent the same value. Maximum offset used here when we lseek
diff --git a/src/tool_cb_wrt.c b/src/tool_cb_wrt.c
index a055b444e..d6688110a 100644
--- a/src/tool_cb_wrt.c
+++ b/src/tool_cb_wrt.c
@@ -29,7 +29,7 @@
 #include "tool_msgs.h"
 #include "tool_cb_wrt.h"
 
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 
 /*
 ** callback for CURLOPT_WRITEFUNCTION
diff --git a/src/tool_cfgable.c b/src/tool_cfgable.c
index 6cd9d33e7..da11f4afe 100644
--- a/src/tool_cfgable.c
+++ b/src/tool_cfgable.c
@@ -23,7 +23,7 @@
 
 #include "tool_cfgable.h"
 
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 
 void free_config_fields(struct Configurable *config)
 {
diff --git a/src/tool_convert.c b/src/tool_convert.c
index 2011db0e7..ecce036a0 100644
--- a/src/tool_convert.c
+++ b/src/tool_convert.c
@@ -29,7 +29,7 @@
 
 #include "tool_convert.h"
 
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 
 #ifdef HAVE_ICONV
 
diff --git a/src/tool_dirhie.c b/src/tool_dirhie.c
index 39158edcd..4ba1c4375 100644
--- a/src/tool_dirhie.c
+++ b/src/tool_dirhie.c
@@ -33,7 +33,7 @@
 
 #include "tool_dirhie.h"
 
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 
 #ifdef NETWARE
 #  ifndef __NOVELL_LIBC__
diff --git a/src/tool_doswin.c b/src/tool_doswin.c
index 5afff1ecf..4fae91d32 100644
--- a/src/tool_doswin.c
+++ b/src/tool_doswin.c
@@ -35,7 +35,7 @@
 #include "tool_bname.h"
 #include "tool_doswin.h"
 
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 
 /*
  * Macros ALWAYS_TRUE and ALWAYS_FALSE are used to avoid compiler warnings.
diff --git a/src/tool_easysrc.c b/src/tool_easysrc.c
index 6aaa4116a..339dde563 100644
--- a/src/tool_easysrc.c
+++ b/src/tool_easysrc.c
@@ -31,7 +31,7 @@
 #include "tool_easysrc.h"
 #include "tool_msgs.h"
 
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 
 /* global variable definitions, for easy-interface source code generation */
 
diff --git a/src/tool_formparse.c b/src/tool_formparse.c
index 76a5db1fc..12b1a9d46 100644
--- a/src/tool_formparse.c
+++ b/src/tool_formparse.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include "curl_rawstr.h"
+#include "rawstr.h"
 
 #define ENABLE_CURLX_PRINTF
 /* use our own printf() functions */
@@ -32,7 +32,7 @@
 #include "tool_msgs.h"
 #include "tool_formparse.h"
 
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 
 /***************************************************************************
  *
diff --git a/src/tool_getparam.c b/src/tool_getparam.c
index 9938e24ec..297b986f5 100644
--- a/src/tool_getparam.c
+++ b/src/tool_getparam.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include "curl_rawstr.h"
+#include "rawstr.h"
 
 #define ENABLE_CURLX_PRINTF
 /* use our own printf() functions */
@@ -45,7 +45,7 @@
 #include "tool_parsecfg.h"
 #include "tool_version.h"
 
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 
 #ifdef MSDOS
 #  define USE_WATT32
diff --git a/src/tool_getpass.c b/src/tool_getpass.c
index 6a841d414..0ac7dcbe0 100644
--- a/src/tool_getpass.c
+++ b/src/tool_getpass.c
@@ -57,7 +57,7 @@
 
 #include "tool_getpass.h"
 
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 
 #ifdef __VMS
 /* VMS implementation */
diff --git a/src/tool_help.c b/src/tool_help.c
index 682fee980..124f6404d 100644
--- a/src/tool_help.c
+++ b/src/tool_help.c
@@ -24,7 +24,7 @@
 #include "tool_panykey.h"
 #include "tool_help.h"
 
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 
 #ifdef MSDOS
 #  define USE_WATT32
diff --git a/src/tool_helpers.c b/src/tool_helpers.c
index e37576464..ae8aaaf32 100644
--- a/src/tool_helpers.c
+++ b/src/tool_helpers.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include "curl_rawstr.h"
+#include "rawstr.h"
 
 #define ENABLE_CURLX_PRINTF
 /* use our own printf() functions */
@@ -32,7 +32,7 @@
 #include "tool_getparam.h"
 #include "tool_helpers.h"
 
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 
 /*
 ** Helper functions that are used from more tha one source file.
diff --git a/src/tool_homedir.c b/src/tool_homedir.c
index a6e07928f..cb90095e5 100644
--- a/src/tool_homedir.c
+++ b/src/tool_homedir.c
@@ -30,7 +30,7 @@
 
 #include "tool_homedir.h"
 
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 
 static char *GetEnv(const char *variable, char do_expand)
 {
diff --git a/src/tool_libinfo.c b/src/tool_libinfo.c
index c6013a761..81b6680c8 100644
--- a/src/tool_libinfo.c
+++ b/src/tool_libinfo.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include "curl_rawstr.h"
+#include "rawstr.h"
 
 #define ENABLE_CURLX_PRINTF
 /* use our own printf() functions */
@@ -29,7 +29,7 @@
 
 #include "tool_libinfo.h"
 
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 
 /* global variable definitions, for libcurl run-time info */
 
diff --git a/src/tool_main.c b/src/tool_main.c
index dc6d8d75d..9c0a19f3f 100644
--- a/src/tool_main.c
+++ b/src/tool_main.c
@@ -39,7 +39,7 @@
  * the library level code from this client-side is ugly, but we do this
  * anyway for convenience.
  */
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 
 #ifdef __VMS
 static int vms_show = 0;
diff --git a/src/tool_metalink.c b/src/tool_metalink.c
index ff5f19c3f..f9e9869b2 100644
--- a/src/tool_metalink.c
+++ b/src/tool_metalink.c
@@ -89,7 +89,7 @@ struct win32_crypto_hash {
 #  error "Can't compile METALINK support without a crypto library."
 #endif
 
-#include "curl_rawstr.h"
+#include "rawstr.h"
 
 #define ENABLE_CURLX_PRINTF
 /* use our own printf() functions */
@@ -101,7 +101,7 @@ struct win32_crypto_hash {
 #include "tool_metalink.h"
 #include "tool_msgs.h"
 
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 
 /* Copied from tool_getparam.c */
 #define GetStr(str,val) do { \
diff --git a/src/tool_mfiles.c b/src/tool_mfiles.c
index e0cebb109..3eda45f91 100644
--- a/src/tool_mfiles.c
+++ b/src/tool_mfiles.c
@@ -23,7 +23,7 @@
 
 #include "tool_mfiles.h"
 
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 
 static void AppendNode(struct multi_files **first,
                        struct multi_files **last,
diff --git a/src/tool_msgs.c b/src/tool_msgs.c
index 9c58afa9c..80fdf4e27 100644
--- a/src/tool_msgs.c
+++ b/src/tool_msgs.c
@@ -28,7 +28,7 @@
 #include "tool_cfgable.h"
 #include "tool_msgs.h"
 
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 
 #define WARN_PREFIX "Warning: "
 #define WARN_TEXTWIDTH (79 - (int)strlen(WARN_PREFIX))
diff --git a/src/tool_operate.c b/src/tool_operate.c
index 1f03f0726..bcbce2000 100644
--- a/src/tool_operate.c
+++ b/src/tool_operate.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2013, 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
@@ -39,7 +39,7 @@
 #  include <netinet/tcp.h>
 #endif
 
-#include "curl_rawstr.h"
+#include "rawstr.h"
 
 #define ENABLE_CURLX_PRINTF
 /* use our own printf() functions */
@@ -74,7 +74,7 @@
 #include "tool_writeout.h"
 #include "tool_xattr.h"
 
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 
 #define CURLseparator  "--_curl_--"
 
@@ -849,7 +849,7 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[])
         input.fd = infd;
         input.config = config;
         /* Note that if CURLOPT_READFUNCTION is fread (the default), then
-         * lib/curl_telnet.c will Curl_poll() on the input file descriptor
+         * lib/telnet.c will Curl_poll() on the input file descriptor
          * rather then calling the READFUNCTION at regular intervals.
          * The circumstances in which it is preferable to enable this
          * behaviour, by omitting to set the READFUNCTION & READDATA options,
diff --git a/src/tool_operhlp.c b/src/tool_operhlp.c
index 4f8cdf0c0..9078b9564 100644
--- a/src/tool_operhlp.c
+++ b/src/tool_operhlp.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include "curl_rawstr.h"
+#include "rawstr.h"
 
 #define ENABLE_CURLX_PRINTF
 /* use our own printf() functions */
@@ -37,7 +37,7 @@
 #  include "tool_metalink.h"
 #endif
 
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 
 /*
  * my_useragent: returns allocated string with default user agent
diff --git a/src/tool_panykey.c b/src/tool_panykey.c
index 632cd34bd..d8718e328 100644
--- a/src/tool_panykey.c
+++ b/src/tool_panykey.c
@@ -33,7 +33,7 @@
 
 #include "tool_panykey.h"
 
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 
 void tool_pressanykey(void)
 {
diff --git a/src/tool_paramhlp.c b/src/tool_paramhlp.c
index fe2514dfb..5d6f8bbc5 100644
--- a/src/tool_paramhlp.c
+++ b/src/tool_paramhlp.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include "curl_rawstr.h"
+#include "rawstr.h"
 
 #define ENABLE_CURLX_PRINTF
 /* use our own printf() functions */
@@ -34,7 +34,7 @@
 #include "tool_msgs.h"
 #include "tool_paramhlp.h"
 
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 
 struct getout *new_getout(struct Configurable *config)
 {
diff --git a/src/tool_parsecfg.c b/src/tool_parsecfg.c
index 21d9e90c5..561dada11 100644
--- a/src/tool_parsecfg.c
+++ b/src/tool_parsecfg.c
@@ -32,7 +32,7 @@
 #include "tool_msgs.h"
 #include "tool_parsecfg.h"
 
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 
 #define CURLRC DOT_CHAR "curlrc"
 #define ISSEP(x) (((x) == '=') || ((x) == ':'))
diff --git a/src/tool_setopt.c b/src/tool_setopt.c
index 08c1af5cb..9aefc21d5 100644
--- a/src/tool_setopt.c
+++ b/src/tool_setopt.c
@@ -31,7 +31,7 @@
 #include "tool_easysrc.h"
 #include "tool_setopt.h"
 
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 
 /* Lookup tables for converting setopt values back to symbols */
 /* For enums, values may be in any order. */
diff --git a/src/tool_setup.h b/src/tool_setup.h
index d3dab5c0b..ed3849ba3 100644
--- a/src/tool_setup.h
+++ b/src/tool_setup.h
@@ -25,15 +25,15 @@
 #define CURL_NO_OLDIES
 
 /*
- * curl_setup.h may define preprocessor macros such as _FILE_OFFSET_BITS and
+ * setup.h may define preprocessor macros such as _FILE_OFFSET_BITS and
  * _LARGE_FILES in order to support files larger than 2 GB. On platforms
  * where this happens it is mandatory that these macros are defined before
  * any system header file is included, otherwise file handling function
  * prototypes will be misdeclared and curl tool may not build properly;
- * therefore we must include curl_setup.h before curl.h when building curl.
+ * therefore we must include setup.h before curl.h when building curl.
  */
 
-#include "curl_setup.h" /* from the lib directory */
+#include "setup.h" /* from the lib directory */
 
 /*
  * curl tool certainly uses libcurl's external interface.
@@ -67,7 +67,7 @@
 #endif
 
 #ifndef HAVE_STRDUP
-#  include "curl_strdup.h"
+#  include "strdup.h"
 #  define strdup(ptr) curlx_strdup(ptr)
 #endif
 
diff --git a/src/tool_sleep.c b/src/tool_sleep.c
index e37cde4a5..49cdc71b8 100644
--- a/src/tool_sleep.c
+++ b/src/tool_sleep.c
@@ -37,7 +37,7 @@
 
 #include "tool_sleep.h"
 
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 
 void tool_go_sleep(long ms)
 {
diff --git a/src/tool_urlglob.c b/src/tool_urlglob.c
index 663370a51..2821d008d 100644
--- a/src/tool_urlglob.c
+++ b/src/tool_urlglob.c
@@ -27,7 +27,7 @@
 #include "tool_urlglob.h"
 #include "tool_vms.h"
 
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 
 typedef enum {
   GLOB_OK,
diff --git a/src/tool_util.c b/src/tool_util.c
index 0a0fa6960..00d205ebc 100644
--- a/src/tool_util.c
+++ b/src/tool_util.c
@@ -23,7 +23,7 @@
 
 #include "tool_util.h"
 
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 
 #if defined(WIN32) && !defined(MSDOS)
 
diff --git a/src/tool_vms.c b/src/tool_vms.c
index abb5d1a04..4a6a6f58e 100644
--- a/src/tool_vms.c
+++ b/src/tool_vms.c
@@ -34,7 +34,7 @@
 #include "curlmsg_vms.h"
 #include "tool_vms.h"
 
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 
 void decc$__posix_exit(int __status);
 void decc$exit(int __status);
diff --git a/src/tool_writeenv.c b/src/tool_writeenv.c
index 918a8009d..a9462d004 100644
--- a/src/tool_writeenv.c
+++ b/src/tool_writeenv.c
@@ -32,7 +32,7 @@
 
 #include "tool_writeenv.h"
 
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 
 static const struct
 {
diff --git a/src/tool_writeout.c b/src/tool_writeout.c
index e84b7ef22..3c32067e3 100644
--- a/src/tool_writeout.c
+++ b/src/tool_writeout.c
@@ -27,7 +27,7 @@
 #include "tool_cfgable.h"
 #include "tool_writeout.h"
 
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 
 typedef enum {
   VAR_NONE,       /* must be the first */
diff --git a/src/tool_xattr.c b/src/tool_xattr.c
index cc74c9da2..505bdb17a 100644
--- a/src/tool_xattr.c
+++ b/src/tool_xattr.c
@@ -27,7 +27,7 @@
 
 #include "tool_xattr.h"
 
-#include "curl_memdebug.h" /* keep this as LAST include */
+#include "memdebug.h" /* keep this as LAST include */
 
 #ifdef HAVE_FSETXATTR
 
diff --git a/src/vc6curlsrc.dsp b/src/vc6curlsrc.dsp
index 7bd3ff011..5fb7fe1d1 100644
--- a/src/vc6curlsrc.dsp
+++ b/src/vc6curlsrc.dsp
@@ -139,15 +139,15 @@ LINK32=link.exe
 # PROP Default_Filter ""

 # Begin Source File

 

-SOURCE=..\lib\curl_nonblock.c

+SOURCE=..\lib\nonblock.c

 # End Source File

 # Begin Source File

 

-SOURCE=..\lib\curl_rawstr.c

+SOURCE=..\lib\rawstr.c

 # End Source File

 # Begin Source File

 

-SOURCE=..\lib\curl_strtoofft.c

+SOURCE=..\lib\strtoofft.c

 # End Source File

 # Begin Source File

 

@@ -311,15 +311,15 @@ SOURCE=".\config-win32.h"
 # End Source File

 # Begin Source File

 

-SOURCE=..\lib\curl_nonblock.h

+SOURCE=..\lib\nonblock.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\lib\curl_rawstr.h

+SOURCE=..\lib\rawstr.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\lib\curl_strtoofft.h

+SOURCE=..\lib\strtoofft.h

 # End Source File

 # Begin Source File

 

diff --git a/tests/convsrctest.pl b/tests/convsrctest.pl
index 6c0047ef6..ee442394c 100755
--- a/tests/convsrctest.pl
+++ b/tests/convsrctest.pl
@@ -6,7 +6,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2012, 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
@@ -45,7 +45,7 @@ require "getpart.pm";
 # Boilerplate code for test tool
 my $head =
 '#include "test.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 int test(char *URL)
 {
diff --git a/tests/libtest/CMakeLists.txt b/tests/libtest/CMakeLists.txt
index 733cdd31b..896686bd8 100644
--- a/tests/libtest/CMakeLists.txt
+++ b/tests/libtest/CMakeLists.txt
@@ -5,7 +5,7 @@ function(SETUP_TEST TEST_NAME)          # ARGN are the files in the test
   string(TOUPPER ${TEST_NAME} UPPER_TEST_NAME)
 
   include_directories(
-    ${CURL_SOURCE_DIR}/lib          # To be able to reach "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"
     )
diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc
index 7de115ea2..b9789f88f 100644
--- a/tests/libtest/Makefile.inc
+++ b/tests/libtest/Makefile.inc
@@ -5,7 +5,7 @@ TESTUTIL = testutil.c testutil.h
 TSTTRACE = testtrace.c testtrace.h
 
 # files used only in some libcurl test programs
-WARNLESS = $(top_srcdir)/lib/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
diff --git a/tests/libtest/chkhostname.c b/tests/libtest/chkhostname.c
index 168294ab6..a18c92e8f 100644
--- a/tests/libtest/chkhostname.c
+++ b/tests/libtest/chkhostname.c
@@ -19,7 +19,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
 
 #include "curl_gethostname.h"
 
diff --git a/tests/libtest/first.c b/tests/libtest/first.c
index 4533548cd..253acb21d 100644
--- a/tests/libtest/first.c
+++ b/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,
diff --git a/tests/libtest/lib1500.c b/tests/libtest/lib1500.c
index 3659d55c9..784bdb2a2 100644
--- a/tests/libtest/lib1500.c
+++ b/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
 
diff --git a/tests/libtest/lib1501.c b/tests/libtest/lib1501.c
index b78f94df5..01a382e82 100644
--- a/tests/libtest/lib1501.c
+++ b/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
 
diff --git a/tests/libtest/lib1502.c b/tests/libtest/lib1502.c
index 2368eec45..2b50c4733 100644
--- a/tests/libtest/lib1502.c
+++ b/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
 
diff --git a/tests/libtest/lib500.c b/tests/libtest/lib500.c
index e782d1a3e..dda1d7f42 100644
--- a/tests/libtest/lib500.c
+++ b/tests/libtest/lib500.c
@@ -22,7 +22,7 @@
 #include "test.h"
 
 #include "testtrace.h"
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 #ifdef LIB585
 
diff --git a/tests/libtest/lib501.c b/tests/libtest/lib501.c
index 9e5d06875..26275f977 100644
--- a/tests/libtest/lib501.c
+++ b/tests/libtest/lib501.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 int test(char *URL)
 {
diff --git a/tests/libtest/lib502.c b/tests/libtest/lib502.c
index f2adf274e..554583ae2 100644
--- a/tests/libtest/lib502.c
+++ b/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
 
diff --git a/tests/libtest/lib503.c b/tests/libtest/lib503.c
index 195149329..50277f7d3 100644
--- a/tests/libtest/lib503.c
+++ b/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
 
diff --git a/tests/libtest/lib504.c b/tests/libtest/lib504.c
index 1e2584f3a..358fc98dc 100644
--- a/tests/libtest/lib504.c
+++ b/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
 
diff --git a/tests/libtest/lib505.c b/tests/libtest/lib505.c
index 6ff4e8478..99b3a0afe 100644
--- a/tests/libtest/lib505.c
+++ b/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
diff --git a/tests/libtest/lib506.c b/tests/libtest/lib506.c
index 0b4645670..4477eaa50 100644
--- a/tests/libtest/lib506.c
+++ b/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";
diff --git a/tests/libtest/lib507.c b/tests/libtest/lib507.c
index a27bf99f1..87c21defb 100644
--- a/tests/libtest/lib507.c
+++ b/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
 
diff --git a/tests/libtest/lib508.c b/tests/libtest/lib508.c
index c8fada3de..1aca064e9 100644
--- a/tests/libtest/lib508.c
+++ b/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";
 
diff --git a/tests/libtest/lib510.c b/tests/libtest/lib510.c
index 0ec8b1e58..8278631c1 100644
--- a/tests/libtest/lib510.c
+++ b/tests/libtest/lib510.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 static const char *post[]={
   "one",
diff --git a/tests/libtest/lib511.c b/tests/libtest/lib511.c
index f90804b2a..6be2d2f76 100644
--- a/tests/libtest/lib511.c
+++ b/tests/libtest/lib511.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 int test(char *URL)
 {
diff --git a/tests/libtest/lib512.c b/tests/libtest/lib512.c
index 364744481..19da18b4f 100644
--- a/tests/libtest/lib512.c
+++ b/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 */
diff --git a/tests/libtest/lib513.c b/tests/libtest/lib513.c
index efec49b0a..c013ac258 100644
--- a/tests/libtest/lib513.c
+++ b/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)
 {
diff --git a/tests/libtest/lib514.c b/tests/libtest/lib514.c
index 7e0066ce5..953e90dff 100644
--- a/tests/libtest/lib514.c
+++ b/tests/libtest/lib514.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 int test(char *URL)
 {
diff --git a/tests/libtest/lib515.c b/tests/libtest/lib515.c
index e403840de..4e96c4a8d 100644
--- a/tests/libtest/lib515.c
+++ b/tests/libtest/lib515.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 int test(char *URL)
 {
diff --git a/tests/libtest/lib516.c b/tests/libtest/lib516.c
index 96ee44114..a9590948d 100644
--- a/tests/libtest/lib516.c
+++ b/tests/libtest/lib516.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 int test(char *URL)
 {
diff --git a/tests/libtest/lib517.c b/tests/libtest/lib517.c
index e728acfa2..ba49ec41e 100644
--- a/tests/libtest/lib517.c
+++ b/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",
diff --git a/tests/libtest/lib518.c b/tests/libtest/lib518.c
index f5b4eb67a..23f7f17c6 100644
--- a/tests/libtest/lib518.c
+++ b/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
diff --git a/tests/libtest/lib519.c b/tests/libtest/lib519.c
index 43efc1753..b720c8fee 100644
--- a/tests/libtest/lib519.c
+++ b/tests/libtest/lib519.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 int test(char *URL)
 {
diff --git a/tests/libtest/lib520.c b/tests/libtest/lib520.c
index 6d70411c4..9ffaa4f92 100644
--- a/tests/libtest/lib520.c
+++ b/tests/libtest/lib520.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 int test(char *URL)
 {
diff --git a/tests/libtest/lib521.c b/tests/libtest/lib521.c
index 57d938b99..93c306864 100644
--- a/tests/libtest/lib521.c
+++ b/tests/libtest/lib521.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 int test(char *URL)
 {
diff --git a/tests/libtest/lib523.c b/tests/libtest/lib523.c
index e7004e20f..0fdc83db6 100644
--- a/tests/libtest/lib523.c
+++ b/tests/libtest/lib523.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 int test(char *URL)
 {
diff --git a/tests/libtest/lib524.c b/tests/libtest/lib524.c
index 45aee7fb8..6f56df9b0 100644
--- a/tests/libtest/lib524.c
+++ b/tests/libtest/lib524.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 int test(char *URL)
 {
diff --git a/tests/libtest/lib525.c b/tests/libtest/lib525.c
index ce7d559d4..ca128cb9c 100644
--- a/tests/libtest/lib525.c
+++ b/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
 
diff --git a/tests/libtest/lib526.c b/tests/libtest/lib526.c
index a89442684..9db04dba7 100644
--- a/tests/libtest/lib526.c
+++ b/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
 
diff --git a/tests/libtest/lib530.c b/tests/libtest/lib530.c
index ba933b335..ad84ff8a5 100644
--- a/tests/libtest/lib530.c
+++ b/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
 
diff --git a/tests/libtest/lib533.c b/tests/libtest/lib533.c
index 6b2671b51..fdc18a1eb 100644
--- a/tests/libtest/lib533.c
+++ b/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
 
diff --git a/tests/libtest/lib536.c b/tests/libtest/lib536.c
index 1f7a798d1..e3ae402b7 100644
--- a/tests/libtest/lib536.c
+++ b/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
 
diff --git a/tests/libtest/lib537.c b/tests/libtest/lib537.c
index 1c6210e84..24d252235 100644
--- a/tests/libtest/lib537.c
+++ b/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
diff --git a/tests/libtest/lib539.c b/tests/libtest/lib539.c
index 2e6396a13..923893fb2 100644
--- a/tests/libtest/lib539.c
+++ b/tests/libtest/lib539.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 int test(char *URL)
 {
diff --git a/tests/libtest/lib540.c b/tests/libtest/lib540.c
index a36693de3..ac0ebe60b 100644
--- a/tests/libtest/lib540.c
+++ b/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
 
diff --git a/tests/libtest/lib541.c b/tests/libtest/lib541.c
index 22388bdab..5fe8dd8ad 100644
--- a/tests/libtest/lib541.c
+++ b/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.
diff --git a/tests/libtest/lib542.c b/tests/libtest/lib542.c
index a5cb3e204..84f493f3e 100644
--- a/tests/libtest/lib542.c
+++ b/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
diff --git a/tests/libtest/lib543.c b/tests/libtest/lib543.c
index 35e32e6f4..b4a31ca9a 100644
--- a/tests/libtest/lib543.c
+++ b/tests/libtest/lib543.c
@@ -23,7 +23,7 @@
 
 #include "test.h"
 
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 int test(char *URL)
 {
diff --git a/tests/libtest/lib544.c b/tests/libtest/lib544.c
index adb0345fb..b766187f2 100644
--- a/tests/libtest/lib544.c
+++ b/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
diff --git a/tests/libtest/lib547.c b/tests/libtest/lib547.c
index 58d10824d..c82bc3f23 100644
--- a/tests/libtest/lib547.c
+++ b/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 */
diff --git a/tests/libtest/lib549.c b/tests/libtest/lib549.c
index 8856ef174..a1568c88f 100644
--- a/tests/libtest/lib549.c
+++ b/tests/libtest/lib549.c
@@ -26,7 +26,7 @@
 
 #include "test.h"
 
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 int test(char *URL)
 {
diff --git a/tests/libtest/lib552.c b/tests/libtest/lib552.c
index 1d3278fa8..2cc942ad4 100644
--- a/tests/libtest/lib552.c
+++ b/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 */
diff --git a/tests/libtest/lib553.c b/tests/libtest/lib553.c
index ce96cebbb..cb1cefd5e 100644
--- a/tests/libtest/lib553.c
+++ b/tests/libtest/lib553.c
@@ -26,7 +26,7 @@
 
 #include "test.h"
 
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 #define POSTLEN 40960
 
diff --git a/tests/libtest/lib554.c b/tests/libtest/lib554.c
index 1c90b9b0b..0596f3ef1 100644
--- a/tests/libtest/lib554.c
+++ b/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
diff --git a/tests/libtest/lib555.c b/tests/libtest/lib555.c
index 3c4205179..49a81bf57 100644
--- a/tests/libtest/lib555.c
+++ b/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
 
diff --git a/tests/libtest/lib556.c b/tests/libtest/lib556.c
index 1eb2e1562..98062209f 100644
--- a/tests/libtest/lib556.c
+++ b/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
diff --git a/tests/libtest/lib557.c b/tests/libtest/lib557.c
index 721338867..dc3bcae86 100644
--- a/tests/libtest/lib557.c
+++ b/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)
diff --git a/tests/libtest/lib560.c b/tests/libtest/lib560.c
index 90c07323b..e8be1c7bd 100644
--- a/tests/libtest/lib560.c
+++ b/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
 
diff --git a/tests/libtest/lib562.c b/tests/libtest/lib562.c
index b00bd83d1..a5f0ea534 100644
--- a/tests/libtest/lib562.c
+++ b/tests/libtest/lib562.c
@@ -25,7 +25,7 @@
 #include <fcntl.h>
 #endif
 
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 /*
  * From "KNOWN_BUGS" April 2009:
diff --git a/tests/libtest/lib564.c b/tests/libtest/lib564.c
index 84d0a20b6..ed00e1bf6 100644
--- a/tests/libtest/lib564.c
+++ b/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
 
diff --git a/tests/libtest/lib566.c b/tests/libtest/lib566.c
index f95872c5a..ba839d65f 100644
--- a/tests/libtest/lib566.c
+++ b/tests/libtest/lib566.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 int test(char *URL)
 {
diff --git a/tests/libtest/lib567.c b/tests/libtest/lib567.c
index 8b698394e..573529cd8 100644
--- a/tests/libtest/lib567.c
+++ b/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
diff --git a/tests/libtest/lib568.c b/tests/libtest/lib568.c
index 3e69a68f0..4b15821f2 100644
--- a/tests/libtest/lib568.c
+++ b/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)
diff --git a/tests/libtest/lib569.c b/tests/libtest/lib569.c
index c7635f19a..a434d7459 100644
--- a/tests/libtest/lib569.c
+++ b/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)
diff --git a/tests/libtest/lib570.c b/tests/libtest/lib570.c
index b9a105f08..a9fac9915 100644
--- a/tests/libtest/lib570.c
+++ b/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)
diff --git a/tests/libtest/lib571.c b/tests/libtest/lib571.c
index 977c7723e..ba0aa1ce4 100644
--- a/tests/libtest/lib571.c
+++ b/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])))
 
diff --git a/tests/libtest/lib572.c b/tests/libtest/lib572.c
index 78e5c804c..3df4d036a 100644
--- a/tests/libtest/lib572.c
+++ b/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)
diff --git a/tests/libtest/lib573.c b/tests/libtest/lib573.c
index 34fdb99bd..b49d26a5d 100644
--- a/tests/libtest/lib573.c
+++ b/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
 
diff --git a/tests/libtest/lib574.c b/tests/libtest/lib574.c
index 4f77ae394..afb2bceae 100644
--- a/tests/libtest/lib574.c
+++ b/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)
 {
diff --git a/tests/libtest/lib575.c b/tests/libtest/lib575.c
index 74d098ee1..942df68c5 100644
--- a/tests/libtest/lib575.c
+++ b/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
 
diff --git a/tests/libtest/lib576.c b/tests/libtest/lib576.c
index 7ee86c68c..61bb61325 100644
--- a/tests/libtest/lib576.c
+++ b/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;
diff --git a/tests/libtest/lib578.c b/tests/libtest/lib578.c
index eee42663b..a39b31772 100644
--- a/tests/libtest/lib578.c
+++ b/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";
diff --git a/tests/libtest/lib579.c b/tests/libtest/lib579.c
index e6c0e6f6e..c5cf603bb 100644
--- a/tests/libtest/lib579.c
+++ b/tests/libtest/lib579.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 static const char * const post[]={
   "one",
diff --git a/tests/libtest/lib582.c b/tests/libtest/lib582.c
index bd88e43aa..952efb4ed 100644
--- a/tests/libtest/lib582.c
+++ b/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
 
diff --git a/tests/libtest/lib583.c b/tests/libtest/lib583.c
index 4ef9e5a35..ad5a5cea7 100644
--- a/tests/libtest/lib583.c
+++ b/tests/libtest/lib583.c
@@ -28,7 +28,7 @@
 
 #include <sys/stat.h>
 
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 int test(char *URL)
 {
diff --git a/tests/libtest/lib586.c b/tests/libtest/lib586.c
index 34f093967..2cf04fe85 100644
--- a/tests/libtest/lib586.c
+++ b/tests/libtest/lib586.c
@@ -23,7 +23,7 @@
 
 #include <curl/mprintf.h>
 
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 #define THREADS 2
 
diff --git a/tests/libtest/lib590.c b/tests/libtest/lib590.c
index 26e88731c..68603c65e 100644
--- a/tests/libtest/lib590.c
+++ b/tests/libtest/lib590.c
@@ -34,7 +34,7 @@
   - Start the request
 */
 
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 int test(char *URL)
 {
diff --git a/tests/libtest/lib591.c b/tests/libtest/lib591.c
index 48648fb24..5cd4644e3 100644
--- a/tests/libtest/lib591.c
+++ b/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
 
diff --git a/tests/libtest/lib597.c b/tests/libtest/lib597.c
index aae6500ae..a27cefd5b 100644
--- a/tests/libtest/lib597.c
+++ b/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
 
diff --git a/tests/libtest/lib598.c b/tests/libtest/lib598.c
index 53fabd168..e9c1ad776 100644
--- a/tests/libtest/lib598.c
+++ b/tests/libtest/lib598.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "curl_memdebug.h"
+#include "memdebug.h"
 
 int test(char *URL)
 {
diff --git a/tests/libtest/lib599.c b/tests/libtest/lib599.c
index 6de586932..6b092677a 100644
--- a/tests/libtest/lib599.c
+++ b/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)
diff --git a/tests/libtest/libauthretry.c b/tests/libtest/libauthretry.c
index c5cc6cfd8..95761325a 100644
--- a/tests/libtest/libauthretry.c
+++ b/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)
diff --git a/tests/libtest/libntlmconnect.c b/tests/libtest/libntlmconnect.c
index c7cc93350..b540ebf58 100644
--- a/tests/libtest/libntlmconnect.c
+++ b/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
diff --git a/tests/libtest/sethostname.c b/tests/libtest/sethostname.c
index 9da6a6730..f131fe9fb 100644
--- a/tests/libtest/sethostname.c
+++ b/tests/libtest/sethostname.c
@@ -19,7 +19,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include "curl_setup.h"
+#include "setup.h"
 
 #include "sethostname.h"
 
diff --git a/tests/libtest/test.h b/tests/libtest/test.h
index b45e72112..fcc91ad8b 100644
--- a/tests/libtest/test.h
+++ b/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) \
diff --git a/tests/libtest/testtrace.c b/tests/libtest/testtrace.c
index 0f74d8d9f..c977d2105 100644
--- a/tests/libtest/testtrace.c
+++ b/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;
 
diff --git a/tests/libtest/testutil.c b/tests/libtest/testutil.c
index 456d799e7..3ad18c987 100644
--- a/tests/libtest/testutil.c
+++ b/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)
 
diff --git a/tests/libtest/testutil.h b/tests/libtest/testutil.h
index a236970a6..0c6be2fc4 100644
--- a/tests/libtest/testutil.h
+++ b/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);
 
diff --git a/tests/mem-include-scan.pl b/tests/mem-include-scan.pl
index 8f599ae0a..676df25e9 100644
--- a/tests/mem-include-scan.pl
+++ b/tests/mem-include-scan.pl
@@ -46,7 +46,7 @@ sub scanfile {
         if($_ =~ /(free|alloc|strdup)\(/) {
             $memfunc++;
         }
-        elsif($_ =~ /^ *# *include \"curl_memdebug.h\"/) {
+        elsif($_ =~ /^ *# *include \"memdebug.h\"/) {
             $memdebug++;
         }
         elsif($_ =~ /^ *# *include \"curl_memory.h\"/) {
@@ -70,7 +70,7 @@ sub scanfile {
         }
         else {
             if(!$memdebug) {
-                print STDERR "$file doesn't include \"curl_memdebug.h\"!\n";
+                print STDERR "$file doesn't include \"memdebug.h\"!\n";
             }
             if(!$curlmem) {
                 print STDERR "$file doesn't include \"curl_memory.h\"!\n";
diff --git a/tests/memanalyze.pl b/tests/memanalyze.pl
index 5f5bdfc2f..bf5393365 100755
--- a/tests/memanalyze.pl
+++ b/tests/memanalyze.pl
@@ -6,7 +6,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
@@ -23,9 +23,9 @@
 #
 # Example input:
 #
-# MEM curl_mprintf.c:1094 malloc(32) = e5718
-# MEM curl_mprintf.c:1103 realloc(e5718, 64) = e6118
-# MEM curl_sendf.c:232 free(f6520)
+# MEM mprintf.c:1094 malloc(32) = e5718
+# MEM mprintf.c:1103 realloc(e5718, 64) = e6118
+# MEM sendf.c:232 free(f6520)
 
 my $mallocs=0;
 my $callocs=0;
@@ -224,7 +224,7 @@ while(<FILE>) {
             print "Not recognized input line: $function\n";
         }
     }
-    # FD curl_url.c:1282 socket() = 5
+    # FD url.c:1282 socket() = 5
     elsif($_ =~ /^FD ([^ ]*):(\d*) (.*)/) {
         # generic match for the filename+linenumber
         $source = $1;
@@ -259,7 +259,7 @@ while(<FILE>) {
             }
         }
     }
-    # FILE curl_url.c:1282 fopen("blabla") = 0x5ddd
+    # FILE url.c:1282 fopen("blabla") = 0x5ddd
     elsif($_ =~ /^FILE ([^ ]*):(\d*) (.*)/) {
         # generic match for the filename+linenumber
         $source = $1;
@@ -287,12 +287,12 @@ while(<FILE>) {
             }
         }
     }
-    # GETNAME curl_url.c:1901 getnameinfo()
+    # GETNAME url.c:1901 getnameinfo()
     elsif($_ =~ /^GETNAME ([^ ]*):(\d*) (.*)/) {
         # not much to do
     }
 
-    # ADDR curl_url.c:1282 getaddrinfo() = 0x5ddd
+    # ADDR url.c:1282 getaddrinfo() = 0x5ddd
     elsif($_ =~ /^ADDR ([^ ]*):(\d*) (.*)/) {
         # generic match for the filename+linenumber
         $source = $1;
diff --git a/tests/server/CMakeLists.txt b/tests/server/CMakeLists.txt
index fc07b61d9..0401df215 100644
--- a/tests/server/CMakeLists.txt
+++ b/tests/server/CMakeLists.txt
@@ -5,8 +5,8 @@ function(SETUP_EXECUTABLE TEST_NAME)    # ARGN are the files in the test
   string(TOUPPER ${TEST_NAME} UPPER_TEST_NAME)
 
   include_directories(
-    ${CURL_SOURCE_DIR}/lib      # To be able to reach "curl_setup_once.h"
-    ${CURL_BINARY_DIR}/lib      # To be able to reach "curl_config.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"
     )
   if(CURL_USE_ARES)
@@ -56,16 +56,16 @@ endforeach()
 
 # SET(useful
 # getpart.c getpart.h
-# ${CURL_SOURCE_DIR}/lib/curl_strequal.c
-# ${CURL_SOURCE_DIR}/lib/curl_base64.c
-# ${CURL_SOURCE_DIR}/lib/curl_mprintf.c
-# ${CURL_SOURCE_DIR}/lib/curl_memdebug.c
-# ${CURL_SOURCE_DIR}/lib/curl_timeval.c
+# ${CURL_SOURCE_DIR}/lib/strequal.c
+# ${CURL_SOURCE_DIR}/lib/base64.c
+# ${CURL_SOURCE_DIR}/lib/mprintf.c
+# ${CURL_SOURCE_DIR}/lib/memdebug.c
+# ${CURL_SOURCE_DIR}/lib/timeval.c
 # )
 
 # SETUP_EXECUTABLE(sws sws.c util.c util.h ${useful})
 # SETUP_EXECUTABLE(resolve resolve.c util.c util.h ${useful})
-# SETUP_EXECUTABLE(sockfilt sockfilt.c util.c util.h ${useful} ${CURL_SOURCE_DIR}/lib/curl_inet_pton.c)
+# 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} server_tftp.h)
+# SETUP_EXECUTABLE(tftpd tftpd.c util.c util.h ${useful} tftp.h)
 
diff --git a/tests/server/Makefile.inc b/tests/server/Makefile.inc
index b0c32bdf2..4a12ea872 100644
--- a/tests/server/Makefile.inc
+++ b/tests/server/Makefile.inc
@@ -1,29 +1,29 @@
 noinst_PROGRAMS = getpart resolve rtspd sockfilt sws tftpd fake_ntlm
 
 CURLX_SRCS = \
- $(top_srcdir)/lib/curl_mprintf.c \
- $(top_srcdir)/lib/curl_nonblock.c \
- $(top_srcdir)/lib/curl_strequal.c \
- $(top_srcdir)/lib/curl_strtoofft.c \
- $(top_srcdir)/lib/curl_timeval.c \
- $(top_srcdir)/lib/curl_warnless.c
+ $(top_srcdir)/lib/mprintf.c \
+ $(top_srcdir)/lib/nonblock.c \
+ $(top_srcdir)/lib/strequal.c \
+ $(top_srcdir)/lib/strtoofft.c \
+ $(top_srcdir)/lib/timeval.c \
+ $(top_srcdir)/lib/warnless.c
 
 CURLX_HDRS = \
  $(top_srcdir)/lib/curlx.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
+ $(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
 
 USEFUL = \
  getpart.c \
  getpart.h \
  server_setup.h \
- $(top_srcdir)/lib/curl_base64.c \
+ $(top_srcdir)/lib/base64.c \
  $(top_srcdir)/lib/curl_base64.h \
- $(top_srcdir)/lib/curl_memdebug.c \
- $(top_srcdir)/lib/curl_memdebug.h
+ $(top_srcdir)/lib/memdebug.c \
+ $(top_srcdir)/lib/memdebug.h
 
 UTIL = \
  util.c \
@@ -48,21 +48,21 @@ rtspd_CFLAGS = $(AM_CFLAGS)
 sockfilt_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \
  server_sockaddr.h \
  sockfilt.c \
- $(top_srcdir)/lib/curl_inet_pton.c
+ $(top_srcdir)/lib/inet_pton.c
 sockfilt_LDADD = @CURL_NETWORK_AND_TIME_LIBS@
 sockfilt_CFLAGS = $(AM_CFLAGS)
 
 sws_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \
  server_sockaddr.h \
  sws.c \
- $(top_srcdir)/lib/curl_inet_pton.c
+ $(top_srcdir)/lib/inet_pton.c
 sws_LDADD = @CURL_NETWORK_AND_TIME_LIBS@
 sws_CFLAGS = $(AM_CFLAGS)
 
 tftpd_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \
  server_sockaddr.h \
  tftpd.c \
- server_tftp.h
+ tftp.h
 tftpd_LDADD = @CURL_NETWORK_AND_TIME_LIBS@
 tftpd_CFLAGS = $(AM_CFLAGS)
 
diff --git a/tests/server/fake_ntlm.c b/tests/server/fake_ntlm.c
index 1c10e4812..64f0675e7 100644
--- a/tests/server/fake_ntlm.c
+++ b/tests/server/fake_ntlm.c
@@ -34,8 +34,8 @@
 #include "getpart.h"
 #include "util.h"
 
-/* include curl_memdebug.h last */
-#include "curl_memdebug.h"
+/* include memdebug.h last */
+#include "memdebug.h"
 
 #ifndef DEFAULT_LOGFILE
 #define DEFAULT_LOGFILE "log/fake_ntlm.log"
diff --git a/tests/server/getpart.c b/tests/server/getpart.c
index 56719f05b..f37f88cba 100644
--- a/tests/server/getpart.c
+++ b/tests/server/getpart.c
@@ -36,8 +36,8 @@ struct SessionHandle {
 #include "curl_base64.h"
 #include "curl_memory.h"
 
-/* include curl_memdebug.h last */
-#include "curl_memdebug.h"
+/* include memdebug.h last */
+#include "memdebug.h"
 
 #define EAT_SPACE(p) while(*(p) && ISSPACE(*(p))) (p)++
 
diff --git a/tests/server/resolve.c b/tests/server/resolve.c
index a094b4d70..d0609888a 100644
--- a/tests/server/resolve.c
+++ b/tests/server/resolve.c
@@ -51,8 +51,8 @@
 #include "curlx.h" /* from the private lib dir */
 #include "util.h"
 
-/* include curl_memdebug.h last */
-#include "curl_memdebug.h"
+/* include memdebug.h last */
+#include "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 curl_memdebug.h */
+      the macro in memdebug.h */
       rc = (getaddrinfo)(host, "80", &hints, &ai);
     }
 
diff --git a/tests/server/rtspd.c b/tests/server/rtspd.c
index 65f84e6e1..3c55eff35 100644
--- a/tests/server/rtspd.c
+++ b/tests/server/rtspd.c
@@ -51,8 +51,8 @@
 #include "util.h"
 #include "server_sockaddr.h"
 
-/* include curl_memdebug.h last */
-#include "curl_memdebug.h"
+/* include memdebug.h last */
+#include "memdebug.h"
 
 #ifdef ENABLE_IPV6
 static bool use_ipv6 = FALSE;
diff --git a/tests/server/server_setup.h b/tests/server/server_setup.h
index d3efc93eb..193ad84d7 100644
--- a/tests/server/server_setup.h
+++ b/tests/server/server_setup.h
@@ -24,7 +24,6 @@
 
 #define CURL_NO_OLDIES
 
-#include "curl_setup.h" /* portability help from the lib directory */
+#include "setup.h" /* portability help from the lib directory */
 
 #endif /* HEADER_CURL_SERVER_SETUP_H */
-
diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c
index 394449ca9..93d0b5d14 100644
--- a/tests/server/sockfilt.c
+++ b/tests/server/sockfilt.c
@@ -98,12 +98,12 @@
    versions instead */
 #include "curlx.h" /* from the private lib dir */
 #include "getpart.h"
-#include "curl_inet_pton.h"
+#include "inet_pton.h"
 #include "util.h"
 #include "server_sockaddr.h"
 
-/* include curl_memdebug.h last */
-#include "curl_memdebug.h"
+/* include memdebug.h last */
+#include "memdebug.h"
 
 #define DEFAULT_PORT 8999
 
diff --git a/tests/server/sws.c b/tests/server/sws.c
index 3afbe3e83..44d899fd7 100644
--- a/tests/server/sws.c
+++ b/tests/server/sws.c
@@ -49,12 +49,12 @@
    versions instead */
 #include "curlx.h" /* from the private lib dir */
 #include "getpart.h"
-#include "curl_inet_pton.h"
+#include "inet_pton.h"
 #include "util.h"
 #include "server_sockaddr.h"
 
-/* include curl_memdebug.h last */
-#include "curl_memdebug.h"
+/* include memdebug.h last */
+#include "memdebug.h"
 
 #ifdef ENABLE_IPV6
 static bool use_ipv6 = FALSE;
diff --git a/tests/server/testpart.c b/tests/server/testpart.c
index 255bbe8d3..912096f0b 100644
--- a/tests/server/testpart.c
+++ b/tests/server/testpart.c
@@ -26,8 +26,8 @@
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
-/* include curl_memdebug.h last */
-#include "curl_memdebug.h"
+/* include memdebug.h last */
+#include "memdebug.h"
 
 int main(int argc, char **argv)
 {
diff --git a/tests/server/server_tftp.h b/tests/server/tftp.h
index 0650efe6a..0650efe6a 100644
--- a/tests/server/server_tftp.h
+++ b/tests/server/tftp.h
diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c
index c1033a5c0..e8c3c2d82 100644
--- a/tests/server/tftpd.c
+++ b/tests/server/tftpd.c
@@ -67,7 +67,7 @@
 #ifdef HAVE_ARPA_TFTP_H
 #include <arpa/tftp.h>
 #else
-#include "server_tftp.h"
+#include "tftp.h"
 #endif
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
@@ -91,8 +91,8 @@
 #include "util.h"
 #include "server_sockaddr.h"
 
-/* include curl_memdebug.h last */
-#include "curl_memdebug.h"
+/* include memdebug.h last */
+#include "memdebug.h"
 
 /*****************************************************************************
 *                      STRUCT DECLARATIONS AND DEFINES                       *
diff --git a/tests/server/util.c b/tests/server/util.c
index ef3c8f6a3..30766d80f 100644
--- a/tests/server/util.c
+++ b/tests/server/util.c
@@ -46,7 +46,7 @@
 #include "curlx.h" /* from the private lib dir */
 #include "getpart.h"
 #include "util.h"
-#include "curl_timeval.h"
+#include "timeval.h"
 
 #if defined(ENABLE_IPV6) && defined(__MINGW32__)
 const struct in6_addr in6addr_any = {{ IN6ADDR_ANY_INIT }};
diff --git a/tests/unit/unit1300.c b/tests/unit/unit1300.c
index ba27e4ecc..2b8341683 100644
--- a/tests/unit/unit1300.c
+++ b/tests/unit/unit1300.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
-#include "curl_llist.h"
+#include "llist.h"
 
 static struct curl_llist *llist;
 
diff --git a/tests/unit/unit1301.c b/tests/unit/unit1301.c
index 5baf4d5c0..47df481a8 100644
--- a/tests/unit/unit1301.c
+++ b/tests/unit/unit1301.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
-#include "curl_strequal.h"
+#include "strequal.h"
 
 static CURLcode unit_setup( void ) {return CURLE_OK;}
 static void unit_stop( void ) {}
diff --git a/tests/unit/unit1302.c b/tests/unit/unit1302.c
index e431fffca..fc50c8865 100644
--- a/tests/unit/unit1302.c
+++ b/tests/unit/unit1302.c
@@ -21,10 +21,10 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
-#include "curl_urldata.h"
-#include "curl_url.h"
+#include "urldata.h"
+#include "url.h" /* for Curl_safefree */
 #include "curl_base64.h"
-#include "curl_memdebug.h" /* LAST include file */
+#include "memdebug.h" /* LAST include file */
 
 static struct SessionHandle *data;
 
diff --git a/tests/unit/unit1303.c b/tests/unit/unit1303.c
index 7e9dbc158..2e4f23096 100644
--- a/tests/unit/unit1303.c
+++ b/tests/unit/unit1303.c
@@ -21,9 +21,9 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
-#include "curl_urldata.h"
-#include "curl_connect.h"
-#include "curl_memdebug.h" /* LAST include file */
+#include "urldata.h"
+#include "connect.h"
+#include "memdebug.h" /* LAST include file */
 
 static struct SessionHandle *data;
 
diff --git a/tests/unit/unit1304.c b/tests/unit/unit1304.c
index 3ebd89cbd..8ddd8caee 100644
--- a/tests/unit/unit1304.c
+++ b/tests/unit/unit1304.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
-#include "curl_netrc.h"
+#include "netrc.h"
 
 static char login[LOGINSIZE];
 static char password[PASSWORDSIZE];
diff --git a/tests/unit/unit1305.c b/tests/unit/unit1305.c
index a4b431114..5900c6dd5 100644
--- a/tests/unit/unit1305.c
+++ b/tests/unit/unit1305.c
@@ -34,11 +34,11 @@
 #define ENABLE_CURLX_PRINTF
 #include "curlx.h"
 
-#include "curl_hash.h"
-#include "curl_hostip.h"
+#include "hash.h"
+#include "hostip.h"
 
 #include "curl_memory.h"
-#include "curl_memdebug.h" /* LAST include file */
+#include "memdebug.h" /* LAST include file */
 
 static struct SessionHandle *data;
 static struct curl_hash *hp;
diff --git a/tests/unit/unit1309.c b/tests/unit/unit1309.c
index 4a741a19d..1304ba18e 100644
--- a/tests/unit/unit1309.c
+++ b/tests/unit/unit1309.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
-#include "curl_splay.h"
+#include "splay.h"
 
 
 static CURLcode unit_setup(void)
diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index 921fb066d..5e8b39253 100644
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -455,9 +455,9 @@ CURL_LIBCURL_LIBNAME=$(LIB_NAME_IMP)
 !ENDIF

 

 CURL_FROM_LIBCURL=$(CURL_DIROBJ)\tool_hugehelp.obj \

- $(CURL_DIROBJ)\curl_nonblock.obj \

- $(CURL_DIROBJ)\curl_rawstr.obj \

- $(CURL_DIROBJ)\curl_strtoofft.obj

+ $(CURL_DIROBJ)\nonblock.obj \

+ $(CURL_DIROBJ)\rawstr.obj \

+ $(CURL_DIROBJ)\strtoofft.obj

  

 $(PROGRAM_NAME): $(CURL_DIROBJ) $(CURL_FROM_LIBCURL) $(EXE_OBJS)

 	$(CURL_LINK) $(CURL_LFLAGS) $(CURL_LIBCURL_LIBNAME) $(WIN_LIBS) $(CURL_FROM_LIBCURL) $(EXE_OBJS)

@@ -468,12 +468,12 @@ $(PROGRAM_NAME): $(CURL_DIROBJ) $(CURL_FROM_LIBCURL) $(EXE_OBJS)
 

 $(CURL_DIROBJ)\tool_hugehelp.obj: $(CURL_SRC_DIR)\tool_hugehelp.c

 	$(CURL_CC) $(CURL_CFLAGS) /Zm200 /Fo"$@" $(CURL_SRC_DIR)\tool_hugehelp.c

-$(CURL_DIROBJ)\curl_nonblock.obj: ../lib/curl_nonblock.c

-	$(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/curl_nonblock.c

-$(CURL_DIROBJ)\curl_rawstr.obj: ../lib/curl_rawstr.c

-	$(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/curl_rawstr.c

-$(CURL_DIROBJ)\curl_strtoofft.obj: ../lib/curl_strtoofft.c

-	$(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/curl_strtoofft.c

+$(CURL_DIROBJ)\nonblock.obj: ../lib/nonblock.c

+	$(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/nonblock.c

+$(CURL_DIROBJ)\rawstr.obj: ../lib/rawstr.c

+	$(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/rawstr.c

+$(CURL_DIROBJ)\strtoofft.obj: ../lib/strtoofft.c

+	$(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/strtoofft.c

 $(CURL_DIROBJ)\curl.res: $(CURL_SRC_DIR)\curl.rc

 	rc $(CURL_RC_FLAGS)