build: drop duplicate include `curl/curl.h` and others

- curl_range: replace `sendf.h` with direct header dependency
  `curl_trc.h`.
- drop `curl/curl.h` includes from internal sourcees in favor of the
  include made from `curl_setup.h`. Replace it with the latter where
  it's the only include.
- include `curl_setup.h` before using macros, where missing.
- drop redundant `stdlib.h`, `string.h` includes, in favor of
  `curl_setup_once.h` including them.
- drop redundant `limits.h` in favor of `curl_setup.h` including it.
- fake_addrinfo.h: fix typo in comment.
- curl_setup_once.h: drop `stdio.h` in favor of earlier include in
  `curl_setup.h`.
- drop stray, unused, `stddef.h` includes.
- memdebug.h: add missing `stddef.h` include. (relying on accidental
  includes via other headers before this patch.)
- stddef.h: document why it's included.
- strerr: drop `curl/mprintf.h` in favor of `curl/curl.h` including it
  via `curl_setup.h`.

Closes #20027

diff --git a/lib/altsvc.c b/lib/altsvc.c
index 97b4c927d0c3adeb3cc5350aa060bf93597c13a1..df6b2a05f621b1d20e2019c1890c11f9aaf58ebb 100644 (file)
--- a/lib/altsvc.c
+++ b/lib/altsvc.c
@@ -28,7 +28,6 @@
 #include "curl_setup.h"
 
 #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_ALTSVC)
-#include <curl/curl.h>
 #include "urldata.h"
 #include "altsvc.h"
 #include "curl_fopen.h"

diff --git a/lib/altsvc.h b/lib/altsvc.h
index c6f1b902c78ad9d9a138c414b518c1b0520b3bbe..b82eaa8f717d9d98ca348de5b3529c9e80935a3a 100644 (file)
--- a/lib/altsvc.h
+++ b/lib/altsvc.h
@@ -26,7 +26,6 @@
 #include "curl_setup.h"
 
 #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_ALTSVC)
-#include <curl/curl.h>
 #include "llist.h"
 
 struct althost {

diff --git a/lib/amigaos.c b/lib/amigaos.c
index d4c1c2c856056c01ab8d9f9ce1159878d8a1a2b9..4e5960b8f5e4c7e6919d0b4c99dc03a387ee2047 100644 (file)
--- a/lib/amigaos.c
+++ b/lib/amigaos.c
@@ -26,8 +26,6 @@
 
 #ifdef __AMIGA__
 
-#include <curl/curl.h>
-
 #include "hostip.h"
 #include "amigaos.h"
 

diff --git a/lib/asyn-ares.c b/lib/asyn-ares.c
index 8bf0c94820ee26aa6132f4cfb5c0eb37d05000d2..49515c8468dab3b4deaaf642439321f6ad92c7fb 100644 (file)
--- a/lib/asyn-ares.c
+++ b/lib/asyn-ares.c
@@ -32,7 +32,6 @@
  * as defined in asyn.h, nothing else belongs in this file!
  **********************************************************************/
 
-#include <limits.h>
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif

diff --git a/lib/bufq.h b/lib/bufq.h
index 112388a6bf47642e0c93e93b0577c7df0751dd7c..bcd7df2ab9ddd45a5f321254de43694f9caa642e 100644 (file)
--- a/lib/bufq.h
+++ b/lib/bufq.h
@@ -25,8 +25,6 @@
  ***************************************************************************/
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 /**
  * A chunk of bytes for reading and writing.
  * The size is fixed a creation with read and write offset

diff --git a/lib/cf-h1-proxy.c b/lib/cf-h1-proxy.c
index b00061c3d07fe57cd69482fcf04b2ac8df34b29c..c865a36122356fb7927abfa13c4df4314a6409e8 100644 (file)
--- a/lib/cf-h1-proxy.c
+++ b/lib/cf-h1-proxy.c
@@ -26,7 +26,6 @@
 
 #if !defined(CURL_DISABLE_PROXY) && !defined(CURL_DISABLE_HTTP)
 
-#include <curl/curl.h>
 #include "urldata.h"
 #include "curlx/dynbuf.h"
 #include "sendf.h"

diff --git a/lib/cf-h2-proxy.c b/lib/cf-h2-proxy.c
index 37af4e19d75b12e7806bd1de4b43bad59fb80e70..ff4e8dd9387cc6f4b8cdccaeece42b21353336e4 100644 (file)
--- a/lib/cf-h2-proxy.c
+++ b/lib/cf-h2-proxy.c
@@ -28,6 +28,7 @@
   defined(USE_NGHTTP2)
 
 #include <nghttp2/nghttp2.h>
+
 #include "urldata.h"
 #include "url.h"
 #include "cfilters.h"

diff --git a/lib/cf-haproxy.c b/lib/cf-haproxy.c
index fa934229edceb8b88d961a03082e8f70b674e593..ea35f040a33c0218009d4a28239632c7abcff968 100644 (file)
--- a/lib/cf-haproxy.c
+++ b/lib/cf-haproxy.c
@@ -26,7 +26,6 @@
 
 #ifndef CURL_DISABLE_PROXY
 
-#include <curl/curl.h>
 #include "urldata.h"
 #include "cfilters.h"
 #include "cf-haproxy.h"

diff --git a/lib/cf-haproxy.h b/lib/cf-haproxy.h
index 9190dd5b578b2864e46c46aef957a750d8ea7497..da9920fd89ddeecd7f34576a48e934632af03bd0 100644 (file)
--- a/lib/cf-haproxy.h
+++ b/lib/cf-haproxy.h
@@ -25,6 +25,7 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
+
 #include "urldata.h"
 
 #ifndef CURL_DISABLE_PROXY

diff --git a/lib/cf-https-connect.c b/lib/cf-https-connect.c
index 849b45c773cb09523cbe1e09e57a68d20870b4c2..4882f28c4b268c1b9dd4a959953cf5464106bc9a 100644 (file)
--- a/lib/cf-https-connect.c
+++ b/lib/cf-https-connect.c
@@ -27,7 +27,6 @@
 #ifndef CURL_DISABLE_HTTP
 
 #include "urldata.h"
-#include <curl/curl.h>
 #include "curl_trc.h"
 #include "cfilters.h"
 #include "connect.h"

diff --git a/lib/conncache.c b/lib/conncache.c
index 7d54042fa57ffded093cfc116ff682f121894472..87d6a12fc8a988d378310a332ad45a0448bafa2a 100644 (file)
--- a/lib/conncache.c
+++ b/lib/conncache.c
@@ -25,8 +25,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #include "urldata.h"
 #include "url.h"
 #include "cfilters.h"

diff --git a/lib/conncache.h b/lib/conncache.h
index b1a8aeaf099d1a4b8155d4586732254fa50ade49..fabb967bd0a32fc2e3e3413deea6435fc616459f 100644 (file)
--- a/lib/conncache.h
+++ b/lib/conncache.h
@@ -25,7 +25,6 @@
  *
  ***************************************************************************/
 
-#include <curl/curl.h>
 #include "curlx/timeval.h"
 
 struct connectdata;

diff --git a/lib/content_encoding.c b/lib/content_encoding.c
index f0e527e8c4d982126a831987a1f48d5e118f8f6f..50e82fab3c066ce81def08088674ee0c9f646088 100644 (file)
--- a/lib/content_encoding.c
+++ b/lib/content_encoding.c
@@ -25,8 +25,6 @@
 #include "curl_setup.h"
 
 #include "urldata.h"
-#include <curl/curl.h>
-#include <stddef.h>
 
 #ifdef HAVE_LIBZ
 #include <zlib.h>

diff --git a/lib/cookie.h b/lib/cookie.h
index 03877e509f1dec1cbfad76d51b523cbd2175b121..cbc7b748fc2bdd54a8ca181de38a588092d627b6 100644 (file)
--- a/lib/cookie.h
+++ b/lib/cookie.h
@@ -25,8 +25,6 @@
  ***************************************************************************/
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #include "llist.h"
 
 struct Cookie {

diff --git a/lib/cshutdn.c b/lib/cshutdn.c
index 4a403b261ec5dabf94c31ccca598ab698f3b1d07..89d2ba69ccf65970a7ecb9ae921dde8bf2013441 100644 (file)
--- a/lib/cshutdn.c
+++ b/lib/cshutdn.c
@@ -25,8 +25,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #include "urldata.h"
 #include "url.h"
 #include "cfilters.h"

diff --git a/lib/cshutdn.h b/lib/cshutdn.h
index 510d5bf50613c7303dd7805ea19b24c71fc68ff6..793b4c6c2c965964387d9da667092281b595f96f 100644 (file)
--- a/lib/cshutdn.h
+++ b/lib/cshutdn.h
@@ -25,7 +25,6 @@
  *
  ***************************************************************************/
 
-#include <curl/curl.h>
 #include "curlx/timeval.h"
 
 struct connectdata;

diff --git a/lib/curl_addrinfo.c b/lib/curl_addrinfo.c
index 7993631bf1f8e91573b20762dfd1419ccb6a3474..27282dd9f9fa828adcc9f393b9211eaaedf2eb6e 100644 (file)
--- a/lib/curl_addrinfo.c
+++ b/lib/curl_addrinfo.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
 #endif
@@ -47,7 +45,7 @@
 #  include <inet.h>
 #endif
 
-#include <stddef.h>
+#include <stddef.h>  /* for offsetof() */
 
 #include "curl_addrinfo.h"
 #include "fake_addrinfo.h"

diff --git a/lib/curl_fnmatch.c b/lib/curl_fnmatch.c
index 918be89d4bf1bf92baea1265318a5a5956b6805a..d61e7d43bc50517f699cdf354fbdcab1ea6733a2 100644 (file)
--- a/lib/curl_fnmatch.c
+++ b/lib/curl_fnmatch.c
@@ -24,7 +24,6 @@
 
 #include "curl_setup.h"
 #ifndef CURL_DISABLE_FTP
-#include <curl/curl.h>
 
 #include "curl_fnmatch.h"
 

diff --git a/lib/curl_gssapi.h b/lib/curl_gssapi.h
index 6df7e059d325188fc016de3c5a9cd23771b3f1c0..d4fbf5c2403cb886bda88542cb9d0e61b6c43a9d 100644 (file)
--- a/lib/curl_gssapi.h
+++ b/lib/curl_gssapi.h
@@ -25,6 +25,7 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
+
 #include "urldata.h"
 
 #ifdef HAVE_GSSAPI

diff --git a/lib/curl_hmac.h b/lib/curl_hmac.h
index 5444d62bd207dd794c28b58c7f117030ca8bce48..4759ff6ec6626e91f728ade60137ba5e573ff9e4 100644 (file)
--- a/lib/curl_hmac.h
+++ b/lib/curl_hmac.h
@@ -28,8 +28,6 @@
   !defined(CURL_DISABLE_AWS) || !defined(CURL_DISABLE_DIGEST_AUTH) ||   \
   defined(USE_LIBSSH2) || defined(USE_SSL)
 
-#include <curl/curl.h>
-
 #define HMAC_MD5_LENGTH 16
 
 typedef CURLcode (*HMAC_hinit)(void *context);

diff --git a/lib/curl_md4.h b/lib/curl_md4.h
index f103d38b41b504ce5f2e580127ef5c3bf78b7af1..9d4a12ed3d27f0deaf1733fd026e65fd8540c417 100644 (file)
--- a/lib/curl_md4.h
+++ b/lib/curl_md4.h
@@ -25,7 +25,6 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
-#include <curl/curl.h>
 
 #ifdef USE_CURL_NTLM_CORE
 

diff --git a/lib/curl_memrchr.c b/lib/curl_memrchr.c
index d8b4eef9f40b99d398513543fe617e5f49be5d6b..27f5fc01ba102153de67776281b886bef60a1d8a 100644 (file)
--- a/lib/curl_memrchr.c
+++ b/lib/curl_memrchr.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #include "curl_memrchr.h"
 
 #ifndef HAVE_MEMRCHR

diff --git a/lib/curl_memrchr.h b/lib/curl_memrchr.h
index 8e5d17708b3916b141661f37ed188c0e9314b2b7..2ee65f3c0ba0e21d4f19fb71d0dd84e47a934690 100644 (file)
--- a/lib/curl_memrchr.h
+++ b/lib/curl_memrchr.h
@@ -28,7 +28,6 @@
 
 #ifdef HAVE_MEMRCHR
 
-#include <string.h>
 #ifdef HAVE_STRINGS_H
 #  include <strings.h>
 #endif

diff --git a/lib/curl_range.c b/lib/curl_range.c
index 4f788688133bb273d3c224278c0381e0ff5b0ae9..c4118b07d9c89dbf9a944fefb943838fd45d7e60 100644 (file)
--- a/lib/curl_range.c
+++ b/lib/curl_range.c
@@ -23,9 +23,9 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
-#include <curl/curl.h>
+
 #include "curl_range.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "curlx/strparse.h"
 
 /* Only include this function if one or more of FTP, FILE are enabled. */

diff --git a/lib/curl_range.h b/lib/curl_range.h
index 77679e2b944882353a9297012f955c2a5159ad21..842ada9ab106008037b7f7c0c1b18821fbd32535 100644 (file)
--- a/lib/curl_range.h
+++ b/lib/curl_range.h
@@ -25,6 +25,7 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
+
 #include "urldata.h"
 
 CURLcode Curl_range(struct Curl_easy *data);

diff --git a/lib/curl_rtmp.c b/lib/curl_rtmp.c
index 45a50674f50bb6712ca95e0c7d6245399640f740..90f8f6bbc8f3e7460416901e9f12d0bd93835f89 100644 (file)
--- a/lib/curl_rtmp.c
+++ b/lib/curl_rtmp.c
@@ -35,7 +35,7 @@
 #include "transfer.h"
 #include "bufref.h"
 #include "curlx/warnless.h"
-#include <curl/curl.h>
+
 #include <librtmp/rtmp.h>
 
 #if defined(USE_WINSOCK) || defined(LWIP_SO_SNDRCVTIMEO_NONSTANDARD)

diff --git a/lib/curl_sasl.c b/lib/curl_sasl.c
index 054dc7c415ce8d726301021de0187217f3a487f5..67925a523cc429f726b4f3c631710a430d6a7fca 100644 (file)
--- a/lib/curl_sasl.c
+++ b/lib/curl_sasl.c
@@ -39,9 +39,7 @@
   !defined(CURL_DISABLE_POP3) || \
   (!defined(CURL_DISABLE_LDAP) && defined(USE_OPENLDAP))
 
-#include <curl/curl.h>
 #include "urldata.h"
-
 #include "curlx/base64.h"
 #include "vauth/vauth.h"
 #include "cfilters.h"

diff --git a/lib/curl_sasl.h b/lib/curl_sasl.h
index 0674d56f86500310567f2463278bbe81d119cc61..0632e09ebdd3ea1d7cdbf021ee65d468f69814b2 100644 (file)
--- a/lib/curl_sasl.h
+++ b/lib/curl_sasl.h
@@ -24,8 +24,6 @@
  *
  ***************************************************************************/
 
-#include <curl/curl.h>
-
 #include "bufref.h"
 
 struct Curl_easy;

diff --git a/lib/curl_setup.h b/lib/curl_setup.h
index d487bfdff9dfc956d68df3443ab382d49c8f9648..9a9596ea69d392219f71cfccdf1fbfcdefa9fbaf 100644 (file)
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -924,7 +924,7 @@ extern curl_calloc_callback Curl_ccalloc;
     (ptr) = NULL;          \
   } while(0)
 
-#include <curl/curl.h> /* for CURL_EXTERN, mprintf.h */
+#include <curl/curl.h> /* for CURL_EXTERN, curl_socket_t, mprintf.h */
 
 #ifdef CURLDEBUG
 #ifdef __clang__

diff --git a/lib/curl_setup_once.h b/lib/curl_setup_once.h
index 898b9a61ad965e95fd21fefb17115f85ff2e0792..06ccc98639fdd0bb2d08c7e3f0f968a9375799f4 100644 (file)
--- a/lib/curl_setup_once.h
+++ b/lib/curl_setup_once.h
@@ -28,7 +28,6 @@
  * Inclusion of common header files.
  */
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>

diff --git a/lib/curl_sha256.h b/lib/curl_sha256.h
index caa5080b3f0f5338ebdf2045942cbcc51e4b5aad..99a87b290b1b3bcb7908f5b4b6ea3b0c035cd40b 100644 (file)
--- a/lib/curl_sha256.h
+++ b/lib/curl_sha256.h
@@ -25,10 +25,11 @@
  *
  ***************************************************************************/
 
+#include "curl_setup.h"
+
 #if !defined(CURL_DISABLE_AWS) || !defined(CURL_DISABLE_DIGEST_AUTH) || \
   defined(USE_LIBSSH2) || defined(USE_SSL)
 
-#include <curl/curl.h>
 #include "curl_hmac.h"
 
 extern const struct HMAC_params Curl_HMAC_SHA256;

diff --git a/lib/curl_sha512_256.c b/lib/curl_sha512_256.c
index 78f60dfc26457a4824b44328286625b1d15f8fde..df6aa059964ad92cdffe4da93cecd904845009fc 100644 (file)
--- a/lib/curl_sha512_256.c
+++ b/lib/curl_sha512_256.c
@@ -65,7 +65,6 @@
             (__NetBSD_Version__ >= 1099000000 &&  \
              __NetBSD_Version__ <  1099001100)
 #          define NEED_NETBSD_SHA512_256_WORKAROUND 1
-#          include <string.h>
 #        endif
 #      endif
 #    endif

diff --git a/lib/curl_sha512_256.h b/lib/curl_sha512_256.h
index c22491ddc0f5548360fe359afdb3ec253b37486c..0efcb27f3bff6631a9212a660e47b68ad969afa1 100644 (file)
--- a/lib/curl_sha512_256.h
+++ b/lib/curl_sha512_256.h
@@ -24,9 +24,10 @@
  *
  ***************************************************************************/
 
+#include "curl_setup.h"
+
 #if !defined(CURL_DISABLE_DIGEST_AUTH) && !defined(CURL_DISABLE_SHA512_256)
 
-#include <curl/curl.h>
 #include "curl_hmac.h"
 
 #define CURL_HAVE_SHA512_256

diff --git a/lib/curl_share.c b/lib/curl_share.c
index 109fe76b66760e3a9f58639bb591d90cce4f1902..a458fb1a8ee7a41222068bc23b4c7660970d1642 100644 (file)
--- a/lib/curl_share.c
+++ b/lib/curl_share.c
@@ -24,7 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
 #include "urldata.h"
 #include "connect.h"
 #include "curl_share.h"

diff --git a/lib/curl_share.h b/lib/curl_share.h
index 0699356dd443ced3f7dc4630ae0ea95375ca970c..25d67ce1d92ecc5d36c284d2825b58822b4fd7e6 100644 (file)
--- a/lib/curl_share.h
+++ b/lib/curl_share.h
@@ -25,7 +25,7 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
-#include <curl/curl.h>
+
 #include "cookie.h"
 #include "psl.h"
 #include "urldata.h"

diff --git a/lib/curl_sspi.c b/lib/curl_sspi.c
index 35a9bc33e6cc45a38acc91ed187ea4e7744d0bc2..c652c9c9a44d66f363b0c960fdf4a66441d92833 100644 (file)
--- a/lib/curl_sspi.c
+++ b/lib/curl_sspi.c
@@ -26,7 +26,6 @@
 
 #ifdef USE_WINDOWS_SSPI
 
-#include <curl/curl.h>
 #include "curl_sspi.h"
 #include "strdup.h"
 #include "curlx/multibyte.h"

diff --git a/lib/curl_sspi.h b/lib/curl_sspi.h
index 89ebc9b0ba8ba60a6bb05fd640fee74e5502d654..46dc6faaa204f3270d572d3435c8ea24fd601b3e 100644 (file)
--- a/lib/curl_sspi.h
+++ b/lib/curl_sspi.h
@@ -28,8 +28,6 @@
 
 #ifdef USE_WINDOWS_SSPI
 
-#include <curl/curl.h>
-
 /*
  * When including the following three headers, it is mandatory to define either
  * SECURITY_WIN32 or SECURITY_KERNEL, indicating who is compiling the code.

diff --git a/lib/curl_threads.c b/lib/curl_threads.c
index e4536078be3994e142f02c825c82c05b901a3e07..9e4bbc96eca29f738b4ee3c5c56e8b0a6b0fdf19 100644 (file)
--- a/lib/curl_threads.c
+++ b/lib/curl_threads.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)
 #include <pthread.h>
 #endif

diff --git a/lib/curl_trc.c b/lib/curl_trc.c
index 5c15dcdc9792f457daeb908f72fdd75b27a80aef..97a4c23960d9459e3ff1a95359b1909e45885cf1 100644 (file)
--- a/lib/curl_trc.c
+++ b/lib/curl_trc.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #include "curl_trc.h"
 #include "urldata.h"
 #include "cfilters.h"

diff --git a/lib/curlx/base64.c b/lib/curlx/base64.c
index 6ea1e425b49c520eedfb17ebd7b5f1fd2d8db80c..e7d2defa03ee93162323a42908a22c7ca534b222 100644 (file)
--- a/lib/curlx/base64.c
+++ b/lib/curlx/base64.c
@@ -26,7 +26,6 @@
 
 #include "../curl_setup.h"
 
-#include <curl/curl.h>
 #include "warnless.h"
 #include "base64.h"
 

diff --git a/lib/curlx/dynbuf.h b/lib/curlx/dynbuf.h
index 683b484610bb1a0784cb015bb38942a5e2d32a6e..6f09e1322eae060af5ddfd7562ad2bc8af5e8d11 100644 (file)
--- a/lib/curlx/dynbuf.h
+++ b/lib/curlx/dynbuf.h
@@ -24,8 +24,6 @@
  *
  ***************************************************************************/
 
-#include <curl/curl.h>
-
 struct dynbuf {
   char *bufr;    /* point to a null-terminated allocated buffer */
   size_t leng;   /* number of bytes *EXCLUDING* the null-terminator */

diff --git a/lib/curlx/nonblock.h b/lib/curlx/nonblock.h
index 4a1a6151f248a617897a5782505fa976e01baa96..ee2cd286a7e9b68c479f39decf6052fa04f8aed7 100644 (file)
--- a/lib/curlx/nonblock.h
+++ b/lib/curlx/nonblock.h
@@ -24,8 +24,6 @@
  *
  ***************************************************************************/
 
-#include <curl/curl.h> /* for curl_socket_t */
-
 int curlx_nonblock(curl_socket_t sockfd,    /* operate on this */
                    int nonblock   /* TRUE or FALSE */);
 

diff --git a/lib/curlx/strerr.c b/lib/curlx/strerr.c
index 70ad1fb813e46cec3962c96b8f542a23635174b7..a971875a6985ec33b84a21e1678e011dddcbd5c4 100644 (file)
--- a/lib/curlx/strerr.c
+++ b/lib/curlx/strerr.c
@@ -32,8 +32,6 @@
 #  endif
 #endif
 
-#include <curl/curl.h>
-
 #include "winapi.h"
 #include "snprintf.h"
 #include "strerr.h"

diff --git a/lib/curlx/strparse.c b/lib/curlx/strparse.c
index c5a3ed2102e642d52e4f6753c19ae5a8017a0168..e75173c69bf4cdd5dfac5810d4d5dbcfaddbaf49 100644 (file)
--- a/lib/curlx/strparse.c
+++ b/lib/curlx/strparse.c
@@ -24,10 +24,6 @@
 
 #include "strparse.h"
 
-#ifndef WITHOUT_LIBCURL
-#include <curl/curl.h>  /* for curl_strnequal() */
-#endif
-
 void curlx_str_init(struct Curl_str *out)
 {
   out->str = NULL;

diff --git a/lib/curlx/timediff.c b/lib/curlx/timediff.c
index d8baabe63e604fe8794bf26adff9b1e84500614b..58a4dfd3033ca3b56236eb9cb303a714c9e1e62a 100644 (file)
--- a/lib/curlx/timediff.c
+++ b/lib/curlx/timediff.c
@@ -24,8 +24,6 @@
 
 #include "timediff.h"
 
-#include <limits.h>
-
 /*
  * Converts number of milliseconds into a timeval structure.
  *

diff --git a/lib/curlx/timeval.c b/lib/curlx/timeval.c
index 2f52515c28a53947e7207f6bb560fbf1a918dcd7..08cc2aba5e5bf5fa8e55d01ce7e1e1159d713279 100644 (file)
--- a/lib/curlx/timeval.c
+++ b/lib/curlx/timeval.c
@@ -26,7 +26,6 @@
 
 #ifdef _WIN32
 
-#include <curl/curl.h>
 #include "version_win32.h"
 #include "../system_win32.h"
 

diff --git a/lib/curlx/version_win32.c b/lib/curlx/version_win32.c
index 9ab72c2fd5b91a8f3230e0d3b44a2e747b7cae7c..c8d45bb1479e762f04fe1e10f27bb59f07f94bdc 100644 (file)
--- a/lib/curlx/version_win32.c
+++ b/lib/curlx/version_win32.c
@@ -26,7 +26,6 @@
 
 #ifdef _WIN32
 
-#include <curl/curl.h>
 #include "version_win32.h"
 #include "warnless.h"
 

diff --git a/lib/curlx/wait.c b/lib/curlx/wait.c
index f1dd6e7a7e273ab96f186846f648bc78759a403e..f42041961b194dde619e70cb1a25fbb9de4eb792 100644 (file)
--- a/lib/curlx/wait.c
+++ b/lib/curlx/wait.c
@@ -28,8 +28,6 @@
 #error "We cannot compile without select() support."
 #endif
 
-#include <limits.h>
-
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #elif defined(HAVE_UNISTD_H)

diff --git a/lib/curlx/warnless.c b/lib/curlx/warnless.c
index 45442bd462708964dee92d9ab0af22a6b3088c1f..1b3d88481ab0e82187b45c20e4868d93e8c38d2f 100644 (file)
--- a/lib/curlx/warnless.c
+++ b/lib/curlx/warnless.c
@@ -35,8 +35,6 @@
 
 #endif /* __INTEL_COMPILER && __unix__ */
 
-#include <limits.h>
-
 #define CURL_MASK_UCHAR   ((unsigned char)~0)
 
 #define CURL_MASK_USHORT  ((unsigned short)~0)

diff --git a/lib/curlx/warnless.h b/lib/curlx/warnless.h
index 5f324ac37592e03ae1b1a3b1e8176b5fc04c839d..31b7dcd0703779b657fcde0505377e83473ebd0e 100644 (file)
--- a/lib/curlx/warnless.h
+++ b/lib/curlx/warnless.h
@@ -26,10 +26,6 @@
 
 #include "../curl_setup.h"
 
-#ifdef USE_WINSOCK
-#include <curl/curl.h> /* for curl_socket_t */
-#endif
-
 #define CURLX_FUNCTION_CAST(target_type, func) \
   (target_type)(void (*)(void))(func)
 

diff --git a/lib/cw-out.c b/lib/cw-out.c
index 74d396000cbdf15809e4ec743b3d5d85ebb1f4eb..3ca8f5203f912a10412aa9de622f59b1de624935 100644 (file)
--- a/lib/cw-out.c
+++ b/lib/cw-out.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #include "urldata.h"
 #include "cfilters.h"
 #include "headers.h"

diff --git a/lib/cw-pause.c b/lib/cw-pause.c
index ce8b39b64d88fe5cd4c3e8a5b68b2db1bae4f244..3b5b4c6fa2d89cc96376b4d7abd3059557e288c7 100644 (file)
--- a/lib/cw-pause.c
+++ b/lib/cw-pause.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #include "urldata.h"
 #include "bufq.h"
 #include "cfilters.h"

diff --git a/lib/dict.c b/lib/dict.c
index a04bb8d4fe09f125d9e8364e83f8cd43e670dc27..2e5883770f473782b2f33af51d0ea3d18a6bf906 100644 (file)
--- a/lib/dict.c
+++ b/lib/dict.c
@@ -53,7 +53,6 @@
 #endif
 
 #include "urldata.h"
-#include <curl/curl.h>
 #include "transfer.h"
 #include "sendf.h"
 #include "escape.h"

diff --git a/lib/dynhds.c b/lib/dynhds.c
index b6654114d6925ef6ef713d72f39c761234ce1186..d0a3eb6a74c46ddbedee6bd38c8b87837711fadf 100644 (file)
--- a/lib/dynhds.c
+++ b/lib/dynhds.c
@@ -23,6 +23,7 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
+
 #include "dynhds.h"
 #include "strcase.h"
 

diff --git a/lib/dynhds.h b/lib/dynhds.h
index d405a60c219309180fa10066bacf3c78dc545f5c..170721cf78c5919b1622f81101a192259c160898 100644 (file)
--- a/lib/dynhds.h
+++ b/lib/dynhds.h
@@ -25,7 +25,6 @@
  ***************************************************************************/
 #include "curl_setup.h"
 
-#include <curl/curl.h>
 #include "curlx/dynbuf.h"
 
 struct dynbuf;

diff --git a/lib/easy.c b/lib/easy.c
index e100a36ea0cc42b94e5108eadb119797fd73a2cb..2bd91da79b614dc67d5490f5ab6b4a3d6348ba61 100644 (file)
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -45,7 +45,6 @@
 #endif
 
 #include "urldata.h"
-#include <curl/curl.h>
 #include "transfer.h"
 #include "vtls/vtls.h"
 #include "vtls/vtls_scache.h"

diff --git a/lib/easygetopt.c b/lib/easygetopt.c
index 7ac39bc634e83a504732d5fd33a284e18c56b87f..8eb96ebd1719d22c2734120228a8083ba8dbaad3 100644 (file)
--- a/lib/easygetopt.c
+++ b/lib/easygetopt.c
@@ -23,6 +23,7 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
+
 #include "easyoptions.h"
 
 #ifndef CURL_DISABLE_GETOPTIONS

diff --git a/lib/easyoptions.c b/lib/easyoptions.c
index 4bd8457f75dd76b22ab12a0acf52bbfe6f9e2bdb..4c0b4f0ce4ad0448ba1e263a76d4304060f370f8 100644 (file)
--- a/lib/easyoptions.c
+++ b/lib/easyoptions.c
@@ -25,6 +25,7 @@
 /* This source code is generated by optiontable.pl - DO NOT EDIT BY HAND */
 
 #include "curl_setup.h"
+
 #include "easyoptions.h"
 
 /* all easy setopt options listed in alphabetical order */

diff --git a/lib/easyoptions.h b/lib/easyoptions.h
index 44b6a8280a8f8effee1ad360a40480287c24a6f3..e908d15bed967272be56d9531dfe1f6eeb6a04eb 100644 (file)
--- a/lib/easyoptions.h
+++ b/lib/easyoptions.h
@@ -26,8 +26,6 @@
 
 /* should probably go into the public header */
 
-#include <curl/curl.h>
-
 /* generated table with all easy options */
 extern const struct curl_easyoption Curl_easyopts[];
 

diff --git a/lib/escape.c b/lib/escape.c
index 3e49701bcb62d71cb32fabb257e00a54bea11be7..bd1096538072786af0b3a5c5a6a70b8ea4ffb497 100644 (file)
--- a/lib/escape.c
+++ b/lib/escape.c
@@ -27,8 +27,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 struct Curl_easy;
 
 #include "urldata.h"

diff --git a/lib/fake_addrinfo.c b/lib/fake_addrinfo.c
index f771c29009a463c64ced41be6798edccd6df58f0..d4173dbaa2e81952ae966f2062c4d18d04d47b97 100644 (file)
--- a/lib/fake_addrinfo.c
+++ b/lib/fake_addrinfo.c
@@ -23,12 +23,11 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
+
 #include "fake_addrinfo.h"
 
 #ifdef USE_FAKE_GETADDRINFO
 
-#include <string.h>
-#include <stdlib.h>
 #include <ares.h>
 
 void r_freeaddrinfo(struct addrinfo *cahead)

diff --git a/lib/fake_addrinfo.h b/lib/fake_addrinfo.h
index 13b0d71dba6d59b7a31432651c7b783041139cd1..4612aa02cb1741f9fcdd1d4d6d6d5ffdc69dc09d 100644 (file)
--- a/lib/fake_addrinfo.h
+++ b/lib/fake_addrinfo.h
@@ -31,7 +31,7 @@
 #endif
 
 #if defined(CURLDEBUG) && defined(USE_ARES) && defined(HAVE_GETADDRINFO) && \
-  (ARES_VERSION >= 0x011a00) /* >= 1.26. 0 */
+  (ARES_VERSION >= 0x011a00) /* >= 1.26.0 */
 #define USE_FAKE_GETADDRINFO 1
 #endif
 

diff --git a/lib/file.c b/lib/file.c
index 9d303d4cc34cbab4621924f4d2b419bb8f715f1d..d85acb32c7a6f069c313c059d3be3ea739a3d0c0 100644 (file)
--- a/lib/file.c
+++ b/lib/file.c
@@ -55,7 +55,6 @@
 #endif
 
 #include "urldata.h"
-#include <curl/curl.h>
 #include "progress.h"
 #include "sendf.h"
 #include "escape.h"

diff --git a/lib/fileinfo.h b/lib/fileinfo.h
index 6746ee2575527dd986675c7f009e06de9531a0e2..a17b8d3426d02ab4bc5a39c9a2b0ed9b3dc26dbe 100644 (file)
--- a/lib/fileinfo.h
+++ b/lib/fileinfo.h
@@ -24,7 +24,8 @@
  *
  ***************************************************************************/
 
-#include <curl/curl.h>
+#include "curl_setup.h"
+
 #include "llist.h"
 #include "curlx/dynbuf.h"
 

diff --git a/lib/formdata.c b/lib/formdata.c
index 8f95fc3df0366dc245c3c358b3eef744f1798902..af3ff8bde5139dcb3ae8919c47f248034ad03708 100644 (file)
--- a/lib/formdata.c
+++ b/lib/formdata.c
@@ -24,11 +24,10 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 struct Curl_easy;
 
 #include "formdata.h"
+
 #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_FORM_API)
 
 #include "urldata.h" /* for struct Curl_easy */

diff --git a/lib/ftp.c b/lib/ftp.c
index f84ac839f7846fc9263cffd54c640711536b95d8..3db88a899dc14f30bdb049d71bc291dfee670b6f 100644 (file)
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -40,7 +40,6 @@
 #include <inet.h>
 #endif
 
-#include <curl/curl.h>
 #include "urldata.h"
 #include "sendf.h"
 #include "if2ip.h"

diff --git a/lib/ftplistparser.c b/lib/ftplistparser.c
index 5a1194613753c78cdf024a64b71c53850328996e..5836f1cec3b30d878b30b9cd025468c37715f353 100644 (file)
--- a/lib/ftplistparser.c
+++ b/lib/ftplistparser.c
@@ -41,8 +41,6 @@
 
 #ifndef CURL_DISABLE_FTP
 
-#include <curl/curl.h>
-
 #include "urldata.h"
 #include "fileinfo.h"
 #include "llist.h"

diff --git a/lib/getenv.c b/lib/getenv.c
index e10688adb32d3f525a0780a62fe77ff890dea6aa..1955649ace8affdd05b61460075b47ee4ff65985 100644 (file)
--- a/lib/getenv.c
+++ b/lib/getenv.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 char *curl_getenv(const char *variable)
 {
 #if defined(CURL_WINDOWS_UWP) || \

diff --git a/lib/getinfo.c b/lib/getinfo.c
index a4ea3b79314efb3c666b29ad6fe983c9d0fcac32..1f429b2227e224ac7e815a65dc0ca9ed9bc3a9f5 100644 (file)
--- a/lib/getinfo.c
+++ b/lib/getinfo.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #include "urldata.h"
 #include "getinfo.h"
 #include "cfilters.h"

diff --git a/lib/gopher.c b/lib/gopher.c
index 85ca2114667acdff87dcc845c7f5c49590c3d26b..c272d32b4678ebfc4b9ebd9dee8a7f60bcb88995 100644 (file)
--- a/lib/gopher.c
+++ b/lib/gopher.c
@@ -27,7 +27,6 @@
 #ifndef CURL_DISABLE_GOPHER
 
 #include "urldata.h"
-#include <curl/curl.h>
 #include "transfer.h"
 #include "sendf.h"
 #include "cfilters.h"

diff --git a/lib/hash.c b/lib/hash.c
index 84230121a05a732ff95497d1fcad0502b19b8c54..9ef80dffe99087b98ecaffc610ac2bf9c24106ae 100644 (file)
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #include "hash.h"
 
 /* random patterns for API verification */

diff --git a/lib/hash.h b/lib/hash.h
index 8dfef0d9122e56a070baa5ef6ef740d48dcdeae7..f669fa58013469b6a27768813387e2640e62fa82 100644 (file)
--- a/lib/hash.h
+++ b/lib/hash.h
@@ -26,8 +26,6 @@
 
 #include "curl_setup.h"
 
-#include <stddef.h>
-
 /* Hash function prototype */
 typedef size_t (*hash_function)(void *key,
                                 size_t key_length,

diff --git a/lib/hmac.c b/lib/hmac.c
index fdde19717539182f108d25ea1f948160e5f5bff6..b4ee071ad17a9b3111a6a1b1411fec32ba7d9c69 100644 (file)
--- a/lib/hmac.c
+++ b/lib/hmac.c
@@ -30,8 +30,6 @@
   !defined(CURL_DISABLE_AWS) || !defined(CURL_DISABLE_DIGEST_AUTH) ||   \
   defined(USE_SSL)
 
-#include <curl/curl.h>
-
 #include "curl_hmac.h"
 #include "curlx/warnless.h"
 

diff --git a/lib/hostip.h b/lib/hostip.h
index 8b3b962078296e012ed2a7f4714f8738ce8f1c7a..8964d29af995a22330a867f2e3881cc5b9b32891 100644 (file)
--- a/lib/hostip.h
+++ b/lib/hostip.h
@@ -25,6 +25,7 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
+
 #include "hash.h"
 #include "curl_addrinfo.h"
 #include "curlx/timeval.h" /* for timediff_t */

diff --git a/lib/hsts.c b/lib/hsts.c
index e1f527dbf9f7954b5ba38f20b61495364481c04c..2dd22a856816d42a726ad41a182a60049e6691bd 100644 (file)
--- a/lib/hsts.c
+++ b/lib/hsts.c
@@ -28,7 +28,6 @@
 #include "curl_setup.h"
 
 #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_HSTS)
-#include <curl/curl.h>
 #include "urldata.h"
 #include "llist.h"
 #include "hsts.h"

diff --git a/lib/hsts.h b/lib/hsts.h
index bd6ebba4dea448499c03bcfc99639a441ad84243..e2c9922f18ef955b590a6c07f9cca35247936ef2 100644 (file)
--- a/lib/hsts.h
+++ b/lib/hsts.h
@@ -26,7 +26,6 @@
 #include "curl_setup.h"
 
 #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_HSTS)
-#include <curl/curl.h>
 #include "llist.h"
 
 #if defined(DEBUGBUILD) || defined(UNITTESTS)

diff --git a/lib/http.c b/lib/http.c
index d0f044bf3c2057cc72385e0d8f4c4b936d3e8325..d51c1dc402872bcd7a2bc0f377e82aec61b2a16a 100644 (file)
--- a/lib/http.c
+++ b/lib/http.c
@@ -48,7 +48,6 @@
 #endif
 
 #include "urldata.h"
-#include <curl/curl.h>
 #include "transfer.h"
 #include "sendf.h"
 #include "formdata.h"

diff --git a/lib/http1.c b/lib/http1.c
index 693a0dd7ef6d832f12d75ad9c742b378cb77a141..e12dd32c5a06e2728289fef7865c1832fb1e63e4 100644 (file)
--- a/lib/http1.c
+++ b/lib/http1.c
@@ -27,7 +27,6 @@
 #ifndef CURL_DISABLE_HTTP
 
 #include "urldata.h"
-#include <curl/curl.h>
 #include "http.h"
 #include "http1.h"
 #include "urlapi-int.h"

diff --git a/lib/http2.c b/lib/http2.c
index d547cf4894f93233fe87bd1b638a062b48d74f21..442c424d748953188cc45b89ed5492be384b0a81 100644 (file)
--- a/lib/http2.c
+++ b/lib/http2.c
@@ -27,6 +27,7 @@
 #if !defined(CURL_DISABLE_HTTP) && defined(USE_NGHTTP2)
 #include <stdint.h>
 #include <nghttp2/nghttp2.h>
+
 #include "urldata.h"
 #include "bufq.h"
 #include "uint-hash.h"
@@ -3045,7 +3046,6 @@ void *Curl_nghttp2_realloc(void *ptr, size_t size, void *user_data)
 #else /* CURL_DISABLE_HTTP || !USE_NGHTTP2 */
 
 /* Satisfy external references even if http2 is not compiled in. */
-#include <curl/curl.h>
 
 char *curl_pushheader_bynum(struct curl_pushheaders *h, size_t num)
 {

diff --git a/lib/http_aws_sigv4.c b/lib/http_aws_sigv4.c
index e815dac72940949df30161f901da964f7c6429c6..7bc3af8b4236bf3f261d46445c8aa0a39bd50e8a 100644 (file)
--- a/lib/http_aws_sigv4.c
+++ b/lib/http_aws_sigv4.c
@@ -36,11 +36,10 @@
 #include "escape.h"
 #include "curlx/strparse.h"
 #include "curlx/timeval.h"
+#include "slist.h"
 
 #include <time.h>
 
-#include "slist.h"
-
 #define HMAC_SHA256(k, kl, d, dl, o)                \
   do {                                              \
     result = Curl_hmacit(&Curl_HMAC_SHA256,         \

diff --git a/lib/http_aws_sigv4.h b/lib/http_aws_sigv4.h
index ea7651896e502d014cb23aaf5560e2a038b14e78..a8aacefe5f063d935280917760d338b998540e7c 100644 (file)
--- a/lib/http_aws_sigv4.h
+++ b/lib/http_aws_sigv4.h
@@ -24,6 +24,7 @@
  *
  ***************************************************************************/
 #include "curl_setup.h"
+
 #include "curlx/dynbuf.h"
 #include "urldata.h"
 #include "curlx/strparse.h"

diff --git a/lib/http_chunks.h b/lib/http_chunks.h
index b84e479fcd61b9543b0707051e3770510e144b31..d8e5982e6d8715c9b6d9c0283170f2c2e9d3a1b9 100644 (file)
--- a/lib/http_chunks.h
+++ b/lib/http_chunks.h
@@ -23,6 +23,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
+#include "curl_setup.h"
 
 #ifndef CURL_DISABLE_HTTP
 

diff --git a/lib/http_digest.h b/lib/http_digest.h
index 5f797310fd9c507627429bebf5f4a1a596190de8..46cffb0bda19bf6762b60c2d8b806cdb9deece65 100644 (file)
--- a/lib/http_digest.h
+++ b/lib/http_digest.h
@@ -23,6 +23,7 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
+
 #include "curl_setup.h"
 
 #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_DIGEST_AUTH)

diff --git a/lib/http_negotiate.h b/lib/http_negotiate.h
index ad7c43d833ea5df4f23a0d6620767f387006992d..8e56e9dea3984ff2f5b001f203694028e6937cc0 100644 (file)
--- a/lib/http_negotiate.h
+++ b/lib/http_negotiate.h
@@ -24,6 +24,8 @@
  *
  ***************************************************************************/
 
+#include "curl_setup.h"
+
 #if !defined(CURL_DISABLE_HTTP) && defined(USE_SPNEGO)
 
 /* this is for Negotiate header input */

diff --git a/lib/http_proxy.c b/lib/http_proxy.c
index aa5d46728470a63723cb01634265363b26ecef3f..a28e832ba13720db2044c95a970b2e9adb0a5f89 100644 (file)
--- a/lib/http_proxy.c
+++ b/lib/http_proxy.c
@@ -28,7 +28,6 @@
 
 #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_PROXY)
 
-#include <curl/curl.h>
 #include "sendf.h"
 #include "http.h"
 #include "url.h"

diff --git a/lib/idn.c b/lib/idn.c
index ae781d3ca611aff5d87bed561a4148a64c3a8f56..62149cf84e7e2b2e1e719b81e2f21d1ab9ca9486 100644 (file)
--- a/lib/idn.c
+++ b/lib/idn.c
@@ -27,6 +27,7 @@
  */
 
 #include "curl_setup.h"
+
 #include "urldata.h"
 #include "idn.h"
 #include "sendf.h"

diff --git a/lib/imap.c b/lib/imap.c
index 3a317a963ff05b70565097d6742c63662cc002cd..69fe30f5aac4f23f77b45ef4aff3aea7ac243036 100644 (file)
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -36,7 +36,6 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
-#include "curlx/dynbuf.h"
 
 #ifndef CURL_DISABLE_IMAP
 
@@ -54,7 +53,7 @@
 #include <inet.h>
 #endif
 
-#include <curl/curl.h>
+#include "curlx/dynbuf.h"
 #include "urldata.h"
 #include "sendf.h"
 #include "hostip.h"

diff --git a/lib/ldap.c b/lib/ldap.c
index b94fff34d847cb1994f8fe2684bc0d23787bf130..7e8ffcae34f1c39aecc8edfd5abdbab3b6930ea6 100644 (file)
--- a/lib/ldap.c
+++ b/lib/ldap.c
@@ -77,7 +77,6 @@
 #endif
 
 #include "urldata.h"
-#include <curl/curl.h>
 #include "cfilters.h"
 #include "sendf.h"
 #include "escape.h"

diff --git a/lib/llist.c b/lib/llist.c
index 3c70905df25088aad53b5ef930c7ff5dd5cbdc1a..ce8e064280eaa746a66648cbafd576a18a954d51 100644 (file)
--- a/lib/llist.c
+++ b/lib/llist.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #include "llist.h"
 
 #ifdef DEBUGBUILD

diff --git a/lib/llist.h b/lib/llist.h
index 0a4a68516362aef32ebeb0eaa0f9feff9e85c391..d90dd68463175c16845cced5a6a22ff1262dd6f5 100644 (file)
--- a/lib/llist.h
+++ b/lib/llist.h
@@ -25,7 +25,6 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
-#include <stddef.h>
 
 typedef void (*Curl_llist_dtor)(void *user, void *elem);
 

diff --git a/lib/macos.c b/lib/macos.c
index daf2ab94f605d4fbec11524cc669214c75328c8c..8c49a07b8dd052b6a0725e0d31e8fe5f62c459fc 100644 (file)
--- a/lib/macos.c
+++ b/lib/macos.c
@@ -26,8 +26,6 @@
 
 #ifdef CURL_MACOS_CALL_COPYPROXIES
 
-#include <curl/curl.h>
-
 #include "macos.h"
 
 #include <SystemConfiguration/SCDynamicStoreCopySpecific.h>

diff --git a/lib/md4.c b/lib/md4.c
index befaeab68bcda1d7ce003503a51ff8ec09347332..044ceb066fc8272a29bd2bedc349e2fdcaf89d03 100644 (file)
--- a/lib/md4.c
+++ b/lib/md4.c
@@ -26,8 +26,6 @@
 
 #ifdef USE_CURL_NTLM_CORE
 
-#include <string.h>
-
 #include "curl_md4.h"
 #include "curlx/warnless.h"
 

diff --git a/lib/md5.c b/lib/md5.c
index e1a443c9236a5ad54c332ac5c5c9bc2134b82e44..f6c330cfc6a691b55dfa5b86a3d7b9205ff537c8 100644 (file)
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -27,9 +27,6 @@
 #if (defined(USE_CURL_NTLM_CORE) && !defined(USE_WINDOWS_SSPI)) || \
   !defined(CURL_DISABLE_DIGEST_AUTH)
 
-#include <string.h>
-#include <curl/curl.h>
-
 #include "curl_md5.h"
 #include "curl_hmac.h"
 #include "curlx/warnless.h"

diff --git a/lib/memdebug.c b/lib/memdebug.c
index 7587a1001c571efc05b13c34d20bfdd6e48a0cc2..b390e81dac0aa7ff90bafff87f1e34eb94b4ef0b 100644 (file)
--- a/lib/memdebug.c
+++ b/lib/memdebug.c
@@ -26,7 +26,7 @@
 
 #ifdef CURLDEBUG
 
-#include <curl/curl.h>
+#include <stddef.h>  /* for offsetof() */
 
 #include "urldata.h"
 #include "curl_threads.h"

diff --git a/lib/mime.c b/lib/mime.c
index 4f01086c1299016b8a442042b974945f894b3bd3..f772833d26469b3461cd491016be04e98edaec53 100644 (file)
--- a/lib/mime.c
+++ b/lib/mime.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 struct Curl_easy;
 
 #include "mime.h"

diff --git a/lib/mprintf.c b/lib/mprintf.c
index 5c58e907b4b5ad3a9bb97711677585577e6b9c5c..39f45901ed646565d6d31a73357013beeb75a06c 100644 (file)
--- a/lib/mprintf.c
+++ b/lib/mprintf.c
@@ -23,6 +23,7 @@
  */
 
 #include "curl_setup.h"
+
 #include "curlx/dynbuf.h"
 #include "curl_printf.h"
 #include "curlx/strparse.h"

diff --git a/lib/mqtt.c b/lib/mqtt.c
index 9f73f9005215352f5e321a7d622499bb6d486ea3..ae98cce258e42288cb53963e8374a4b69acf69c1 100644 (file)
--- a/lib/mqtt.c
+++ b/lib/mqtt.c
@@ -28,7 +28,6 @@
 #ifndef CURL_DISABLE_MQTT
 
 #include "urldata.h"
-#include <curl/curl.h>
 #include "transfer.h"
 #include "sendf.h"
 #include "progress.h"

diff --git a/lib/multi.c b/lib/multi.c
index af8330b392e999e9c60e56af225aee00629d31a5..22e89bb750573fd7c8e5bc4d3b40fe67f64980db 100644 (file)
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #include "urldata.h"
 #include "transfer.h"
 #include "url.h"

diff --git a/lib/multi_ev.c b/lib/multi_ev.c
index d4e219dfa223467aa189a1e1a26b31641dc77a39..8e71716d70ac4362ec21d5321438c61b06db7b94 100644 (file)
--- a/lib/multi_ev.c
+++ b/lib/multi_ev.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #include "urldata.h"
 #include "url.h"
 #include "cfilters.h"

diff --git a/lib/multi_ntfy.c b/lib/multi_ntfy.c
index 3eb3b312eaa1fa22654c05834260a0b4d55521e1..d4cdbe16c891ad6c4990b11e22b9a80ffcf65319 100644 (file)
--- a/lib/multi_ntfy.c
+++ b/lib/multi_ntfy.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #include "urldata.h"
 #include "curl_trc.h"
 #include "multihandle.h"

diff --git a/lib/netrc.c b/lib/netrc.c
index d26d194fe2d9bab4e0fa04ca463d6726883f214d..fe0380066b1bee3d8ab0d97d7f1556d572c6c780 100644 (file)
--- a/lib/netrc.c
+++ b/lib/netrc.c
@@ -23,6 +23,7 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
+
 #ifndef CURL_DISABLE_NETRC
 
 #ifdef HAVE_PWD_H
@@ -35,7 +36,6 @@
 #endif
 #endif
 
-#include <curl/curl.h>
 #include "netrc.h"
 #include "strcase.h"
 #include "curl_get_line.h"

diff --git a/lib/netrc.h b/lib/netrc.h
index 81012d0d97e6267f79b730f62fe1a223ae613a91..af07c812a5d8e0cc3fb77be0df1fce344b55891f 100644 (file)
--- a/lib/netrc.h
+++ b/lib/netrc.h
@@ -25,6 +25,7 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
+
 #ifndef CURL_DISABLE_NETRC
 #include "curlx/dynbuf.h"
 

diff --git a/lib/noproxy.c b/lib/noproxy.c
index 86acf8ba2b91d4de70f02e65d559948a452db011..5c0c58530debb755ad959ddb4da9126dc94f1d44 100644 (file)
--- a/lib/noproxy.c
+++ b/lib/noproxy.c
@@ -26,7 +26,6 @@
 
 #ifndef CURL_DISABLE_PROXY
 
-#include <curl/curl.h>  /* for curl_strnequal() */
 #include "curlx/inet_pton.h"
 #include "noproxy.h"
 #include "curlx/strparse.h"

diff --git a/lib/openldap.c b/lib/openldap.c
index a1756e4279070f9d3ec43fff638d115d579df9fe..b33e7a1d36b57dfd05cd04b36274b876c5efb985 100644 (file)
--- a/lib/openldap.c
+++ b/lib/openldap.c
@@ -42,7 +42,6 @@
 
 #include "urldata.h"
 #include "url.h"
-#include <curl/curl.h>
 #include "sendf.h"
 #include "vtls/vtls.h"
 #include "transfer.h"

diff --git a/lib/optiontable.pl b/lib/optiontable.pl
index 5e0c720f04e3f31db57dbd25f37058e476c97c82..1222536794a84af0eab410bdf7f47e1089fdee88 100755 (executable)
--- a/lib/optiontable.pl
+++ b/lib/optiontable.pl
@@ -31,6 +31,7 @@ print <<HEAD
 /* This source code is generated by optiontable.pl - DO NOT EDIT BY HAND */
 
 #include "curl_setup.h"
+
 #include "easyoptions.h"
 
 /* all easy setopt options listed in alphabetical order */

diff --git a/lib/parsedate.c b/lib/parsedate.c
index 43ac676765b9cc83a2fd67113e3124c3846cd30a..69dbfe7fc09df3612451fedcc74938103ef5f053 100644 (file)
--- a/lib/parsedate.c
+++ b/lib/parsedate.c
@@ -77,9 +77,6 @@
 
 #include "curl_setup.h"
 
-#include <limits.h>
-
-#include <curl/curl.h>
 #include "curlx/warnless.h"
 #include "parsedate.h"
 #include "curlx/strparse.h"

diff --git a/lib/pop3.c b/lib/pop3.c
index 78c060d81496d215bb00b1694401e690dec84efe..e02ed0c8b422c6854a9eaab840f78d9c6809ac56 100644 (file)
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -55,7 +55,6 @@
 #include <inet.h>
 #endif
 
-#include <curl/curl.h>
 #include "urldata.h"
 #include "sendf.h"
 #include "hostip.h"

diff --git a/lib/psl.c b/lib/psl.c
index a089402eced45ce2670f0b0374d3316bbf9eaec2..5346a57fcec65484e7b82f57d5a945075b737652 100644 (file)
--- a/lib/psl.c
+++ b/lib/psl.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #ifdef USE_LIBPSL
 
 #include "psl.h"

diff --git a/lib/rand.c b/lib/rand.c
index a5694233fcbdac1ac1faa20e899eb6d19aaf9a44..15c5a3296e370c6f98dec8f9286572003b2eb676 100644 (file)
--- a/lib/rand.c
+++ b/lib/rand.c
@@ -24,13 +24,10 @@
 
 #include "curl_setup.h"
 
-#include <limits.h>
-
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
 
-#include <curl/curl.h>
 #include "urldata.h"
 #include "vtls/vtls.h"
 #include "sendf.h"

diff --git a/lib/rename.c b/lib/rename.c
index 11cd680aa6ddc8da337e95c6f315f29746c9f165..c2f979a16f4773768d87b771fa0282f87b1e4727 100644 (file)
--- a/lib/rename.c
+++ b/lib/rename.c
@@ -22,8 +22,6 @@
  *
  ***************************************************************************/
 
-#include "rename.h"
-
 #include "curl_setup.h"
 
 #if (!defined(CURL_DISABLE_HTTP) || !defined(CURL_DISABLE_COOKIES)) || \
@@ -31,6 +29,7 @@
 
 #include "curlx/multibyte.h"
 #include "curlx/timeval.h"
+#include "rename.h"
 
 /* return 0 on success, 1 on error */
 int Curl_rename(const char *oldpath, const char *newpath)

diff --git a/lib/rtsp.c b/lib/rtsp.c
index d73ad318132cf69fb00ec832d051bcdfa0d839a1..47c993c9601b46bd7bc3f7bae14c17fdb0193674 100644 (file)
--- a/lib/rtsp.c
+++ b/lib/rtsp.c
@@ -27,7 +27,6 @@
 #ifndef CURL_DISABLE_RTSP
 
 #include "urldata.h"
-#include <curl/curl.h>
 #include "transfer.h"
 #include "sendf.h"
 #include "multiif.h"

diff --git a/lib/select.c b/lib/select.c
index 52dfa7376d0a9d14264048c7ca1b7130129d577d..0c9fce782784545542fbbb479c7907112c4d872d 100644 (file)
--- a/lib/select.c
+++ b/lib/select.c
@@ -28,16 +28,12 @@
 #error "We cannot compile without select() or poll() support."
 #endif
 
-#include <limits.h>
-
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #elif defined(HAVE_UNISTD_H)
 #include <unistd.h>
 #endif
 
-#include <curl/curl.h>
-
 #include "urldata.h"
 #include "connect.h"
 #include "select.h"

diff --git a/lib/sendf.c b/lib/sendf.c
index bf9fa17c86522cb881f0b06799a509fb743ff893..b3a7ac4f9186885693131cacdada9fd54f9b5e6c 100644 (file)
--- a/lib/sendf.c
+++ b/lib/sendf.c
@@ -34,8 +34,6 @@
 #include <netinet/tcp.h>
 #endif
 
-#include <curl/curl.h>
-
 #include "urldata.h"
 #include "sendf.h"
 #include "transfer.h"

diff --git a/lib/setopt.c b/lib/setopt.c
index 9a0fdc5e8d236a540281f4af608cb3b2dc3a56a8..dc1353dc45cabb3e09b594cea4a37381a362a746 100644 (file)
--- a/lib/setopt.c
+++ b/lib/setopt.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <limits.h>
-
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif

diff --git a/lib/slist.c b/lib/slist.c
index 9b7f11d4261996b547e4919384692d9a90433302..3be71cb728dd88cd7fd1a330866f94b56b9ad3d5 100644 (file)
--- a/lib/slist.c
+++ b/lib/slist.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #include "slist.h"
 
 /* returns last node in linked list */

diff --git a/lib/smtp.c b/lib/smtp.c
index 8c82ce6fc7192258a655533f708cabd8ef754dcd..51fb26687a9baac3d2f43872ba6e2860edfc3aa0 100644 (file)
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -57,7 +57,6 @@
 #include <inet.h>
 #endif
 
-#include <curl/curl.h>
 #include "urldata.h"
 #include "sendf.h"
 #include "hostip.h"

diff --git a/lib/socketpair.c b/lib/socketpair.c
index 0b61112044462db0957a24b385791a247fda2922..35c68c3a50777617a7ade94bc72d03d61f065a0c 100644 (file)
--- a/lib/socketpair.c
+++ b/lib/socketpair.c
@@ -111,7 +111,6 @@ int Curl_socketpair(int domain, int type, int protocol,
 /*
  * This is a socketpair() implementation for Windows.
  */
-#include <string.h>
 #ifdef HAVE_IO_H
 #include <io.h>
 #endif

diff --git a/lib/socketpair.h b/lib/socketpair.h
index 5387c09340fb7e3e06e428ce8aedfa66336897f4..a839a2c50d09480bce5a1df81521c9f290754b55 100644 (file)
--- a/lib/socketpair.h
+++ b/lib/socketpair.h
@@ -33,7 +33,6 @@
 #define wakeup_close         close
 #define wakeup_create(p, nb) Curl_eventfd(p, nb)
 
-#include <curl/curl.h>
 int Curl_eventfd(curl_socket_t socks[2], bool nonblocking);
 
 #elif defined(HAVE_PIPE)
@@ -43,7 +42,6 @@ int Curl_eventfd(curl_socket_t socks[2], bool nonblocking);
 #define wakeup_close         close
 #define wakeup_create(p, nb) Curl_pipe(p, nb)
 
-#include <curl/curl.h>
 int Curl_pipe(curl_socket_t socks[2], bool nonblocking);
 
 #else /* !USE_EVENTFD && !HAVE_PIPE */
@@ -73,8 +71,6 @@ int Curl_pipe(curl_socket_t socks[2], bool nonblocking);
 #endif /* USE_EVENTFD */
 
 #ifndef CURL_DISABLE_SOCKETPAIR
-#include <curl/curl.h>
-
 int Curl_socketpair(int domain, int type, int protocol,
                     curl_socket_t socks[2], bool nonblocking);
 #endif

diff --git a/lib/splay.h b/lib/splay.h
index 3a256b5713c8b2239ef2a8866ee673e2e7f5d0bd..9ed96f63e4eae5a81731506731b724eb25237c12 100644 (file)
--- a/lib/splay.h
+++ b/lib/splay.h
@@ -24,6 +24,7 @@
  *
  ***************************************************************************/
 #include "curl_setup.h"
+
 #include "curlx/timeval.h"
 
 /* only use function calls to access this struct */

diff --git a/lib/strcase.c b/lib/strcase.c
index e8424fa61732e71b0bc3bc773157927496d42103..f36d2b8f108f6bc3816c7b69fd29b805bf4e23d2 100644 (file)
--- a/lib/strcase.c
+++ b/lib/strcase.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #include "strcase.h"
 
 /* Mapping table to go from lowercase to uppercase for plain ASCII.*/

diff --git a/lib/strcase.h b/lib/strcase.h
index 56839c2f3eaac1bf4ea69c5e4ccf69cfb469050a..060ebba6e5a6d1423702b424c4e80e83cbd9104d 100644 (file)
--- a/lib/strcase.h
+++ b/lib/strcase.h
@@ -24,7 +24,7 @@
  *
  ***************************************************************************/
 
-#include <curl/curl.h>
+#include "curl_setup.h"
 
 char Curl_raw_toupper(char in);
 char Curl_raw_tolower(char in);

diff --git a/lib/strdup.c b/lib/strdup.c
index 375f0f50442a6568be03799d8eaebc4faa10381b..99976a5deaedec0629df97aa77abcbd1af9b9ea3 100644 (file)
--- a/lib/strdup.c
+++ b/lib/strdup.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #ifdef _WIN32
 #include <wchar.h>
 #endif

diff --git a/lib/strequal.c b/lib/strequal.c
index 17dd34b7f3af9a1ad27780c5732f5df949dc3dab..14edad7e8c28aaef4ab9b00f6b1c3f2834f013a9 100644 (file)
--- a/lib/strequal.c
+++ b/lib/strequal.c
@@ -24,7 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
 #include "strcase.h"
 
 /*

diff --git a/lib/strerror.c b/lib/strerror.c
index 899db8c61d7717be0df7a4d9784dd89add7d5f37..a15a8d01b4952b94560fca4cfa1393fb1885bcec 100644 (file)
--- a/lib/strerror.c
+++ b/lib/strerror.c
@@ -24,9 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-#include <curl/mprintf.h>
-
 #ifdef USE_WINDOWS_SSPI
 #include "curl_sspi.h"
 #endif

diff --git a/lib/strerror.h b/lib/strerror.h
index c52503ed9316878177d1d634551131cb342df877..a10164c9da0bfa24e289fe24fdc9f8bda22c0cb5 100644 (file)
--- a/lib/strerror.h
+++ b/lib/strerror.h
@@ -24,6 +24,8 @@
  *
  ***************************************************************************/
 
+#include "curl_setup.h"
+
 #ifdef USE_WINDOWS_SSPI
 const char *Curl_sspi_strerror(SECURITY_STATUS err, char *buf, size_t buflen);
 #endif

diff --git a/lib/system_win32.c b/lib/system_win32.c
index 42db33a3edfa19e1ec81ad54ddda0f5288d2b0a7..21a991eb09262c5c6e3c364394e1839b17f19b31 100644 (file)
--- a/lib/system_win32.c
+++ b/lib/system_win32.c
@@ -26,7 +26,6 @@
 
 #ifdef _WIN32
 
-#include <curl/curl.h>
 #include "system_win32.h"
 #include "curlx/version_win32.h"
 #include "curl_sspi.h"

diff --git a/lib/system_win32.h b/lib/system_win32.h
index 6bf89d3d9d77a4454a952c9364511c28b5ed6aeb..e3ed0547fed20225080015cce062802017aba983 100644 (file)
--- a/lib/system_win32.h
+++ b/lib/system_win32.h
@@ -28,8 +28,6 @@
 
 #ifdef _WIN32
 
-#include <curl/curl.h>
-
 extern LARGE_INTEGER Curl_freq;
 extern bool Curl_isVistaOrGreater;
 

diff --git a/lib/telnet.c b/lib/telnet.c
index e517b0c1384beb554252571c03fb0638ec459f8a..19b5901d84e9d6ce6273b58bbdb123e159e6370d 100644 (file)
--- a/lib/telnet.c
+++ b/lib/telnet.c
@@ -48,7 +48,6 @@
 
 #include "urldata.h"
 #include "url.h"
-#include <curl/curl.h>
 #include "transfer.h"
 #include "sendf.h"
 #include "telnet.h"

diff --git a/lib/tftp.c b/lib/tftp.c
index 82e88c5f22ad72686562e3f70c340f108f7e3ad4..d60ab52fc26f4f98756c9b9bce8661457e7870c7 100644 (file)
--- a/lib/tftp.c
+++ b/lib/tftp.c
@@ -47,7 +47,6 @@
 #endif
 
 #include "urldata.h"
-#include <curl/curl.h>
 #include "cfilters.h"
 #include "cf-socket.h"
 #include "transfer.h"

diff --git a/lib/transfer.c b/lib/transfer.c
index 6e190f46c0b663228865871ff8d367dcd989ac14..3f6a995eac6c85a1c0b744fa2a17cd735f516579 100644 (file)
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -56,9 +56,8 @@
 #endif
 
 #include "urldata.h"
-#include <curl/curl.h>
-#include "netrc.h"
 
+#include "netrc.h"
 #include "content_encoding.h"
 #include "hostip.h"
 #include "cfilters.h"

diff --git a/lib/uint-bset.h b/lib/uint-bset.h
index ff814bb5e6ad06bc2352d577a2ff4a79ae844264..7455c427df94f3a624cb820c92ff61a9044e06d5 100644 (file)
--- a/lib/uint-bset.h
+++ b/lib/uint-bset.h
@@ -25,8 +25,6 @@
  ***************************************************************************/
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 /* A bitset for unsigned int values.
  * It can hold the numbers from 0 - (nmax - 1),
  * rounded to the next 64 multiple.

diff --git a/lib/uint-hash.c b/lib/uint-hash.c
index 43de42a19c8bf6098ee9ea64cdfe71f9f525a6b1..b3fd9dea196cf9e3f3f26d70597704b89b8143ff 100644 (file)
--- a/lib/uint-hash.c
+++ b/lib/uint-hash.c
@@ -24,8 +24,6 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 #include "uint-hash.h"
 
 /* random patterns for API verification */

diff --git a/lib/uint-hash.h b/lib/uint-hash.h
index 9f322bdd10024d32cfcf1cefe2ab045c4b1c1647..e7f2ab9cbc4897f33d36c99d1ada8be1021f188c 100644 (file)
--- a/lib/uint-hash.h
+++ b/lib/uint-hash.h
@@ -26,8 +26,6 @@
 
 #include "curl_setup.h"
 
-#include <stddef.h>
-
 /* A version with uint32_t as key */
 typedef void Curl_uint32_hash_dtor(uint32_t id, void *value);
 struct uint_hash_entry;

diff --git a/lib/uint-spbset.c b/lib/uint-spbset.c
index e27f66fc7b1553108a2d952182484a38d2fcb83c..03e9efb4247cd3bc39978a5131b94744fea40cdc 100644 (file)
--- a/lib/uint-spbset.c
+++ b/lib/uint-spbset.c
@@ -23,6 +23,7 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
+
 #include "uint-bset.h"
 #include "uint-spbset.h"
 

diff --git a/lib/uint-spbset.h b/lib/uint-spbset.h
index 0220d054437854aff26c770ab0c711ab5072572e..4b105c02ed78303577790362bc68aeef6e6b5c54 100644 (file)
--- a/lib/uint-spbset.h
+++ b/lib/uint-spbset.h
@@ -25,8 +25,6 @@
  ***************************************************************************/
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 /* A "sparse" bitset for uint32_t values.
  * It can hold any uint32_t value.
  *

diff --git a/lib/uint-table.c b/lib/uint-table.c
index b4d5d94a3a3600fb8faec28ad624d43ce66a4c1d..bbfabc9edf1a5b92b710c8394e5ce6fae6f84100 100644 (file)
--- a/lib/uint-table.c
+++ b/lib/uint-table.c
@@ -23,6 +23,7 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
+
 #include "uint-table.h"
 
 #ifdef DEBUGBUILD

diff --git a/lib/uint-table.h b/lib/uint-table.h
index f3169fbc8fa2b440635ea9ffeb07f126265e1a02..3fc7e34ef436e9c53ce465f736b8cdd550cace9f 100644 (file)
--- a/lib/uint-table.h
+++ b/lib/uint-table.h
@@ -25,8 +25,6 @@
  ***************************************************************************/
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 /* Destructor for a single table entry */
 typedef void Curl_uint32_tbl_entry_dtor(uint32_t key, void *entry);
 

diff --git a/lib/url.c b/lib/url.c
index 34841bf9df7c47585f169af9c314aa2bb51c54d3..398bd5f7f621747b637035dc8b008c6a48ea4558 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -66,8 +66,6 @@
 #include <iphlpapi.h>
 #endif
 
-#include <limits.h>
-
 #include "doh.h"
 #include "urldata.h"
 #include "netrc.h"

diff --git a/lib/urldata.h b/lib/urldata.h
index 8ff5ad98b5c766c794679e7eb0510a5c0acb3a80..6ecc077e9fe7fdef6f90c4cf5bd2b4adca5e9391 100644 (file)
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -146,8 +146,6 @@ typedef unsigned int curl_prot_t;
 
 #include "curlx/timeval.h"
 
-#include <curl/curl.h>
-
 #include "http_chunks.h" /* for the structs and enum stuff */
 #include "hostip.h"
 #include "hash.h"

diff --git a/lib/vauth/cleartext.c b/lib/vauth/cleartext.c
index c0e59fd273b90ad82682bcbd042bc0d2a8b2ce8b..a9fe574d635b379bcd55d5618c39a926bd672a69 100644 (file)
--- a/lib/vauth/cleartext.c
+++ b/lib/vauth/cleartext.c
@@ -31,8 +31,6 @@
   !defined(CURL_DISABLE_POP3) ||                                  \
   (!defined(CURL_DISABLE_LDAP) && defined(USE_OPENLDAP))
 
-#include <curl/curl.h>
-
 #include "vauth.h"
 #include "../curlx/warnless.h"
 #include "../sendf.h"

diff --git a/lib/vauth/cram.c b/lib/vauth/cram.c
index 7cce86fd62b563af243f772b022e5b6bd8266cde..3251d90822b7b55ef08b2d943b6a4c293eb9fb99 100644 (file)
--- a/lib/vauth/cram.c
+++ b/lib/vauth/cram.c
@@ -28,8 +28,6 @@
 
 #ifndef CURL_DISABLE_DIGEST_AUTH
 
-#include <curl/curl.h>
-
 #include "vauth.h"
 #include "../curl_hmac.h"
 #include "../curl_md5.h"

diff --git a/lib/vauth/digest.c b/lib/vauth/digest.c
index ce3a7b36877955c461106c4bec7a086e93599c6c..e08fcc9aa37abdf01c2b6050c47a7bf8c27732f0 100644 (file)
--- a/lib/vauth/digest.c
+++ b/lib/vauth/digest.c
@@ -29,8 +29,6 @@
 
 #ifndef CURL_DISABLE_DIGEST_AUTH
 
-#include <curl/curl.h>
-
 #include "vauth.h"
 #include "digest.h"
 #include "../curlx/base64.h"

diff --git a/lib/vauth/digest.h b/lib/vauth/digest.h
index 99ce1f9138920ae30007411928a57e8536315eac..63f388bf46b0f038b925f1b8dc5d7d7081e2fea4 100644 (file)
--- a/lib/vauth/digest.h
+++ b/lib/vauth/digest.h
@@ -24,7 +24,7 @@
  *
  ***************************************************************************/
 
-#include <curl/curl.h>
+#include "../curl_setup.h"
 
 #ifndef CURL_DISABLE_DIGEST_AUTH
 

diff --git a/lib/vauth/digest_sspi.c b/lib/vauth/digest_sspi.c
index dc3afcc883571e1dd564a442f49410033a7fd5ea..812b4735566dda3234cfaac58428cad6eee8e7c6 100644 (file)
--- a/lib/vauth/digest_sspi.c
+++ b/lib/vauth/digest_sspi.c
@@ -29,8 +29,6 @@
 
 #if defined(USE_WINDOWS_SSPI) && !defined(CURL_DISABLE_DIGEST_AUTH)
 
-#include <curl/curl.h>
-
 #include "vauth.h"
 #include "digest.h"
 #include "../curlx/warnless.h"

diff --git a/lib/vauth/gsasl.c b/lib/vauth/gsasl.c
index 4c83793d788dd8b5866e04d619e31066ed8be17e..896a246932def831ea2ac1dfc76b2ec686670ea1 100644 (file)
--- a/lib/vauth/gsasl.c
+++ b/lib/vauth/gsasl.c
@@ -28,8 +28,6 @@
 
 #ifdef USE_GSASL
 
-#include <curl/curl.h>
-
 #include "vauth.h"
 #include "../sendf.h"
 

diff --git a/lib/vauth/krb5_gssapi.c b/lib/vauth/krb5_gssapi.c
index 0c069c70d69070d97832c9552723376f216a9c81..ac794184351d5b2c29a12bbf1a2785e5cbc33c04 100644 (file)
--- a/lib/vauth/krb5_gssapi.c
+++ b/lib/vauth/krb5_gssapi.c
@@ -29,8 +29,6 @@
 
 #if defined(HAVE_GSSAPI) && defined(USE_KERBEROS5)
 
-#include <curl/curl.h>
-
 #include "vauth.h"
 #include "../curl_sasl.h"
 #include "../curl_gssapi.h"

diff --git a/lib/vauth/krb5_sspi.c b/lib/vauth/krb5_sspi.c
index 32fa44cfcbb92ca8c9ff9b4b63dbaacdab4673c3..19cc3d34b0475d9f982ace1bada890c086e248cc 100644 (file)
--- a/lib/vauth/krb5_sspi.c
+++ b/lib/vauth/krb5_sspi.c
@@ -28,8 +28,6 @@
 
 #if defined(USE_WINDOWS_SSPI) && defined(USE_KERBEROS5)
 
-#include <curl/curl.h>
-
 #include "vauth.h"
 #include "../curlx/warnless.h"
 #include "../sendf.h"

diff --git a/lib/vauth/ntlm_sspi.c b/lib/vauth/ntlm_sspi.c
index dae7248f73fbb74833753c03927bd9d09eeb127a..e5e37b771f478e389a90067d4803ec6eb97ec6d9 100644 (file)
--- a/lib/vauth/ntlm_sspi.c
+++ b/lib/vauth/ntlm_sspi.c
@@ -26,8 +26,6 @@
 
 #if defined(USE_WINDOWS_SSPI) && defined(USE_NTLM)
 
-#include <curl/curl.h>
-
 #include "vauth.h"
 #include "../curl_ntlm_core.h"
 #include "../curlx/warnless.h"

diff --git a/lib/vauth/oauth2.c b/lib/vauth/oauth2.c
index c9122debffa9d7d616282e17487df9781059fec1..d9f07bba563a1c0df19c2a71417d1d8ae01802a1 100644 (file)
--- a/lib/vauth/oauth2.c
+++ b/lib/vauth/oauth2.c
@@ -30,8 +30,6 @@
   !defined(CURL_DISABLE_POP3) ||                                  \
   (!defined(CURL_DISABLE_LDAP) && defined(USE_OPENLDAP))
 
-#include <curl/curl.h>
-
 #include "vauth.h"
 #include "../curlx/warnless.h"
 

diff --git a/lib/vauth/spnego_gssapi.c b/lib/vauth/spnego_gssapi.c
index 2feafdda4b240ab772bdcd66adf42d08cf722a6e..5df8cc9ce7bbe8fb33bae07d2125e8b6ff2c426a 100644 (file)
--- a/lib/vauth/spnego_gssapi.c
+++ b/lib/vauth/spnego_gssapi.c
@@ -28,8 +28,6 @@
 
 #if defined(HAVE_GSSAPI) && defined(USE_SPNEGO)
 
-#include <curl/curl.h>
-
 #include "vauth.h"
 #include "../curlx/base64.h"
 #include "../curl_gssapi.h"

diff --git a/lib/vauth/spnego_sspi.c b/lib/vauth/spnego_sspi.c
index 31747c0a0e72b469ac3fd40163741e74293e6f24..e58957d29e0fe29c4174a1b6e8423d81f0876b65 100644 (file)
--- a/lib/vauth/spnego_sspi.c
+++ b/lib/vauth/spnego_sspi.c
@@ -28,8 +28,6 @@
 
 #if defined(USE_WINDOWS_SSPI) && defined(USE_SPNEGO)
 
-#include <curl/curl.h>
-
 #include "vauth.h"
 #include "../curlx/base64.h"
 #include "../curlx/warnless.h"

diff --git a/lib/vauth/vauth.c b/lib/vauth/vauth.c
index 25924806f2b947f97bc9b4aae803dd9d8916bcf9..bd271101b03e492977fc2d38e06936769dade7f2 100644 (file)
--- a/lib/vauth/vauth.c
+++ b/lib/vauth/vauth.c
@@ -24,8 +24,6 @@
 
 #include "../curl_setup.h"
 
-#include <curl/curl.h>
-
 #include "vauth.h"
 #include "../strdup.h"
 #include "../curlx/multibyte.h"

diff --git a/lib/vauth/vauth.h b/lib/vauth/vauth.h
index 4c98d9b1c11c4c74c0d55ca390ea7e5a733b25a7..39dc0d3995fbf4549d33992c44f2ebdddf89cbdd 100644 (file)
--- a/lib/vauth/vauth.h
+++ b/lib/vauth/vauth.h
@@ -24,7 +24,7 @@
  *
  ***************************************************************************/
 
-#include <curl/curl.h>
+#include "../curl_setup.h"
 
 #include "../bufref.h"
 #include "../curlx/dynbuf.h"

diff --git a/lib/version.c b/lib/version.c
index 246e7871db43f033a00db2043945b5553e258b62..a5be6c69cf73e82f2a94e751e0fd2b559e3a5e3d 100644 (file)
--- a/lib/version.c
+++ b/lib/version.c
@@ -28,7 +28,6 @@
 #include <nghttp2/nghttp2.h>
 #endif
 
-#include <curl/curl.h>
 #include "urldata.h"
 #include "vtls/vtls.h"
 #include "http2.h"

diff --git a/lib/vssh/libssh.c b/lib/vssh/libssh.c
index 1108d70cb256361d9ee6bd54b82b57a2a11f98e9..7635111a8d7b30cce5cc51f441ece8c6d286da0a 100644 (file)
--- a/lib/vssh/libssh.c
+++ b/lib/vssh/libssh.c
@@ -29,8 +29,6 @@
 
 #ifdef USE_LIBSSH
 
-#include <limits.h>
-
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
@@ -45,7 +43,6 @@
 #include <inet.h>
 #endif
 
-#include <curl/curl.h>
 #include "../urldata.h"
 #include "../sendf.h"
 #include "../hostip.h"

diff --git a/lib/vssh/libssh2.c b/lib/vssh/libssh2.c
index 0cabe28dbb475198d169f9b0b7c9894471d96300..6ca4caf661163dc11b7e3e1cdb4cec2264ca3013 100644 (file)
--- a/lib/vssh/libssh2.c
+++ b/lib/vssh/libssh2.c
@@ -28,8 +28,6 @@
 
 #ifdef USE_LIBSSH2
 
-#include <limits.h>
-
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
@@ -44,7 +42,6 @@
 #include <inet.h>
 #endif
 
-#include <curl/curl.h>
 #include "../urldata.h"
 #include "../sendf.h"
 #include "../hostip.h"

diff --git a/lib/vssh/vssh.c b/lib/vssh/vssh.c
index bfc0a1eb3ab6d33cbc60da8261c3a4e87498ca02..d322643eb408a65635b2f32e9028fb4932e6d7f0 100644 (file)
--- a/lib/vssh/vssh.c
+++ b/lib/vssh/vssh.c
@@ -27,7 +27,6 @@
 #ifdef USE_SSH
 
 #include "vssh.h"
-#include <curl/curl.h>
 #include "../curlx/strparse.h"
 #include "../curl_trc.h"
 #include "../escape.h"

diff --git a/lib/vssh/vssh.h b/lib/vssh/vssh.h
index 1a4e597b156d77819315983f25a4c72e0502f422..78de75c9e9254fe8d5e5f416daaab19c5be93e3f 100644 (file)
--- a/lib/vssh/vssh.h
+++ b/lib/vssh/vssh.h
@@ -25,7 +25,7 @@
  ***************************************************************************/
 
 #include "../curl_setup.h"
-#include <curl/curl.h>
+
 #include "../urldata.h"
 
 CURLcode Curl_getworkingpath(struct Curl_easy *data,

diff --git a/lib/vtls/cipher_suite.c b/lib/vtls/cipher_suite.c
index 58d755622070d5e982410ea86bddefb2f3b916d8..c026bdee91345c0d50491cde21a690fec5fb74a3 100644 (file)
--- a/lib/vtls/cipher_suite.c
+++ b/lib/vtls/cipher_suite.c
@@ -25,7 +25,6 @@
 
 #if defined(USE_MBEDTLS) || defined(USE_RUSTLS)
 #include "cipher_suite.h"
-#include <string.h>
 
 /*
  * To support the CURLOPT_SSL_CIPHER_LIST option on SSL backends

diff --git a/lib/vtls/gtls.h b/lib/vtls/gtls.h
index 4949eee2d21101775c925566a880b3607e846fbd..4ed79f63ed3909b149a644b3293151e6ed2fba79 100644 (file)
--- a/lib/vtls/gtls.h
+++ b/lib/vtls/gtls.h
@@ -25,7 +25,6 @@
  ***************************************************************************/
 
 #include "../curl_setup.h"
-#include <curl/curl.h>
 
 #ifdef USE_GNUTLS
 

diff --git a/lib/vtls/hostcheck.h b/lib/vtls/hostcheck.h
index b843d09c65edd03e7a83702892b3ea32f9782be0..ca767be3ce1d9e4895161cec28731ce9161ddb04 100644 (file)
--- a/lib/vtls/hostcheck.h
+++ b/lib/vtls/hostcheck.h
@@ -24,7 +24,7 @@
  *
  ***************************************************************************/
 
-#include <curl/curl.h>
+#include "../curl_setup.h"
 
 #if defined(USE_OPENSSL) || defined(USE_SCHANNEL)
 

diff --git a/lib/vtls/keylog.c b/lib/vtls/keylog.c
index 03dda01f8decf56548874725cbc21f6ad5391652..2c1c595bfc987445d1e1c98144c5684dd84e862f 100644 (file)
--- a/lib/vtls/keylog.c
+++ b/lib/vtls/keylog.c
@@ -31,7 +31,6 @@
   defined(USE_RUSTLS)
 
 #include "keylog.h"
-#include <curl/curl.h>
 #include "../escape.h"
 #include "../curlx/fopen.h"
 

diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 88cf373611ba0754202b9c799c6dd968a72efe17..e0a97ac121e6ea39cb2a92a97544560ab83be13e 100644 (file)
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -31,8 +31,6 @@
 
 #if defined(USE_QUICHE) || defined(USE_OPENSSL)
 
-#include <limits.h>
-
 /* Wincrypt must be included before anything that could include OpenSSL. */
 #ifdef USE_WIN32_CRYPTO
 #include <wincrypt.h>

diff --git a/lib/vtls/wolfssl.c b/lib/vtls/wolfssl.c
index a4fafb6104cbb21280774039a4b4934ccb07187b..94ada9cfff8d1466a474b1b6e0a0ba09693b0afd 100644 (file)
--- a/lib/vtls/wolfssl.c
+++ b/lib/vtls/wolfssl.c
@@ -53,8 +53,6 @@
 #endif
 #endif
 
-#include <limits.h>
-
 #include "../urldata.h"
 #include "../sendf.h"
 #include "vtls.h"

diff --git a/lib/vtls/x509asn1.c b/lib/vtls/x509asn1.c
index 81c6e3c44122c31abc40e440fc2dddc0be41231d..6dc66a9221caa64b603168d421bc7f03946b43e8 100644 (file)
--- a/lib/vtls/x509asn1.c
+++ b/lib/vtls/x509asn1.c
@@ -37,7 +37,6 @@
 #define WANT_EXTRACT_CERTINFO /* uses Curl_extract_certinfo() */
 #endif
 
-#include <curl/curl.h>
 #include "../urldata.h"
 #include "../curl_ctype.h"
 #include "hostcheck.h"

diff --git a/lib/ws.c b/lib/ws.c
index aea3bac98ce88a997b3d3e3f32a88edea53cfdf4..d4cacd98351a006c52508e41ce8743a429e62d88 100644 (file)
--- a/lib/ws.c
+++ b/lib/ws.c
@@ -22,7 +22,6 @@
  *
  ***************************************************************************/
 #include "curl_setup.h"
-#include <curl/curl.h>
 
 #if !defined(CURL_DISABLE_WEBSOCKETS) && !defined(CURL_DISABLE_HTTP)
 

diff --git a/src/tool_setup.h b/src/tool_setup.h
index f6cdffcac9ffc4d549157fe07fbfb9e4801a6859..1699e5f34f565192cc0659cf4b81370e6cc3dbad 100644 (file)
--- a/src/tool_setup.h
+++ b/src/tool_setup.h
@@ -45,8 +45,6 @@ extern FILE *tool_stderr;
  * curl tool certainly uses libcurl's external interface.
  */
 
-#include <curl/curl.h> /* external interface */
-
 #include <curlx/curlx.h>
 
 /*

diff --git a/tests/libtest/first.h b/tests/libtest/first.h
index 1753d8ea0d3abf00dd3d94df3a634a38bc0c336b..3a3af63c16e96b11385ce50c8843ed13ae102eeb 100644 (file)
--- a/tests/libtest/first.h
+++ b/tests/libtest/first.h
@@ -32,8 +32,6 @@
    knowledge about the system we are building this on */
 #include "curl_setup.h"
 
-#include <curl/curl.h>
-
 typedef CURLcode (*entry_func_t)(const char *);
 
 struct entry_s {

diff --git a/tests/server/first.h b/tests/server/first.h
index 316a7a622e8dfc77bec18b70e043283a4f1b2382..49d5b89aaa17311148d11633c7fe36b7a7815f35 100644 (file)
--- a/tests/server/first.h
+++ b/tests/server/first.h
@@ -98,8 +98,6 @@ enum {
   DOCNUMBER_404        = -1
 };
 
-#include <curl/curl.h> /* for curl_socket_t */
-
 #ifdef USE_UNIX_SOCKETS
 #ifdef HAVE_SYS_UN_H
 #include <sys/un.h> /* for sockaddr_un */