lib: drop includes unused or duplicate

Closes #20051

lib/altsvc.c

@@ -35,7 +35,6 @@
 #include "parsedate.h"
 #include "sendf.h"
 #include "curlx/warnless.h"
-#include "strdup.h"
 #include "curlx/inet_pton.h"
 #include "curlx/strparse.h"
 #include "curlx/timeval.h"

lib/asyn-ares.c

@@ -50,7 +50,6 @@
 #include "cfilters.h"
 #include "sendf.h"
 #include "hostip.h"
-#include "hash.h"
 #include "url.h"
 #include "multiif.h"
 #include "curlx/inet_pton.h"

lib/asyn-base.c

@@ -48,7 +48,6 @@
 #include "asyn.h"
 #include "sendf.h"
 #include "hostip.h"
-#include "hash.h"
 #include "multiif.h"
 #include "select.h"
 #include "url.h"

lib/asyn-thrdd.c

@@ -58,7 +58,6 @@
 #include "cfilters.h"
 #include "sendf.h"
 #include "hostip.h"
-#include "hash.h"
 #include "url.h"
 #include "multiif.h"
 #include "curl_threads.h"

lib/cf-ip-happy.h

@@ -26,7 +26,6 @@
 #include "curl_setup.h"
 
 #include "curlx/nonblock.h" /* for curlx_nonblock() */
-#include "sockaddr.h"
 
 /**
  * Create a cfilter for making an "ip" connection to the

lib/cf-socket.c

@@ -63,9 +63,7 @@
 #include "cf-socket.h"
 #include "connect.h"
 #include "select.h"
-#include "url.h" /* for Curl_safefree() */
 #include "multiif.h"
-#include "sockaddr.h" /* required for Curl_sockaddr_storage */
 #include "curlx/inet_pton.h"
 #include "progress.h"
 #include "curlx/warnless.h"

lib/cf-socket.h

@@ -26,7 +26,7 @@
 #include "curl_setup.h"
 
 #include "curlx/nonblock.h" /* for curlx_nonblock() */
-#include "sockaddr.h"
+#include "sockaddr.h" /* required for Curl_sockaddr_storage */
 
 struct Curl_addrinfo;
 struct Curl_cfilter;

lib/cfilters.c

@@ -30,7 +30,6 @@
 #include "connect.h"
 #include "url.h"
 #include "sendf.h"
-#include "sockaddr.h" /* required for Curl_sockaddr_storage */
 #include "progress.h"
 #include "select.h"
 #include "curlx/warnless.h"

lib/conncache.c

@@ -33,14 +33,11 @@
 #include "sendf.h"
 #include "cshutdn.h"
 #include "conncache.h"
-#include "http_negotiate.h"
-#include "http_ntlm.h"
 #include "curl_share.h"
 #include "sigpipe.h"
 #include "connect.h"
 #include "select.h"
 #include "curlx/strparse.h"
-#include "uint-table.h"
 
 
 #define CPOOL_IS_LOCKED(c)    ((c) && (c)->locked)

lib/connect.c

@@ -52,7 +52,6 @@
 
 #include "urldata.h"
 #include "sendf.h"
-#include "if2ip.h"
 #include "strerror.h"
 #include "cfilters.h"
 #include "connect.h"
@@ -60,10 +59,7 @@
 #include "cf-https-connect.h"
 #include "cf-ip-happy.h"
 #include "cf-socket.h"
-#include "select.h"
-#include "url.h" /* for Curl_safefree() */
 #include "multiif.h"
-#include "sockaddr.h" /* required for Curl_sockaddr_storage */
 #include "curlx/inet_ntop.h"
 #include "curlx/strparse.h"
 #include "vtls/vtls.h" /* for vtsl cfilters */

lib/connect.h

@@ -26,7 +26,6 @@
 #include "curl_setup.h"
 
 #include "curlx/nonblock.h" /* for curlx_nonblock() */
-#include "sockaddr.h"
 #include "curlx/timeval.h"
 
 struct Curl_dns_entry;

lib/cshutdn.c

@@ -33,8 +33,6 @@
 #include "multi_ev.h"
 #include "sendf.h"
 #include "cshutdn.h"
-#include "http_negotiate.h"
-#include "http_ntlm.h"
 #include "sigpipe.h"
 #include "connect.h"
 #include "select.h"

lib/curl_sasl.c

@@ -44,7 +44,6 @@
 #include "vauth/vauth.h"
 #include "cfilters.h"
 #include "vtls/vtls.h"
-#include "curl_hmac.h"
 #include "curl_sasl.h"
 #include "curlx/warnless.h"
 #include "sendf.h"

lib/curl_share.c

@@ -27,7 +27,6 @@
 #include "urldata.h"
 #include "connect.h"
 #include "curl_share.h"
-#include "psl.h"
 #include "vtls/vtls.h"
 #include "vtls/vtls_scache.h"
 #include "hsts.h"

lib/curl_sspi.c

@@ -29,7 +29,6 @@
 #include "curl_sspi.h"
 #include "strdup.h"
 #include "curlx/multibyte.h"
-#include "system_win32.h"
 #include "curlx/warnless.h"
 
 /* Pointer to SSPI dispatch table */

lib/curlx/inet_pton.c

@@ -19,7 +19,7 @@
  */
 
 #include "../curl_setup.h"
-#include "../curl_ctype.h"
+
 #include "strparse.h"
 
 #ifndef HAVE_INET_PTON

lib/cw-out.c

@@ -26,7 +26,6 @@
 
 #include "urldata.h"
 #include "cfilters.h"
-#include "headers.h"
 #include "multiif.h"
 #include "sendf.h"
 #include "transfer.h"

lib/cw-pause.c

@@ -27,7 +27,6 @@
 #include "urldata.h"
 #include "bufq.h"
 #include "cfilters.h"
-#include "headers.h"
 #include "sendf.h"
 #include "cw-pause.h"
 

lib/escape.h

@@ -26,8 +26,6 @@
 /* Escape and unescape URL encoding in strings. The functions return a new
  * allocated string or NULL if an error occurred.  */
 
-#include "curl_ctype.h"
-
 enum urlreject {
   REJECT_NADA = 2,
   REJECT_CTRL,

lib/ftp.c

@@ -66,7 +66,6 @@
 #include "url.h"
 #include "curlx/warnless.h"
 #include "http_proxy.h"
-#include "socks.h"
 #include "strdup.h"
 #include "curlx/strerr.h"
 #include "curlx/strparse.h"

lib/headers.c

@@ -25,7 +25,6 @@
 #include "curl_setup.h"
 
 #include "urldata.h"
-#include "strdup.h"
 #include "sendf.h"
 #include "headers.h"
 #include "curlx/strparse.h"

lib/hostip4.c

@@ -46,7 +46,6 @@
 #include "urldata.h"
 #include "sendf.h"
 #include "hostip.h"
-#include "hash.h"
 #include "url.h"
 
 

lib/hostip6.c

@@ -47,7 +47,6 @@
 #include "cfilters.h"
 #include "sendf.h"
 #include "hostip.h"
-#include "hash.h"
 #include "url.h"
 #include "curlx/inet_pton.h"
 #include "connect.h"

lib/hsts.c

@@ -36,7 +36,6 @@
 #include "sendf.h"
 #include "parsedate.h"
 #include "curl_share.h"
-#include "strdup.h"
 #include "curlx/strparse.h"
 #include "curlx/timeval.h"
 

lib/http.c

@@ -84,7 +84,6 @@
 #include "hsts.h"
 #include "ws.h"
 #include "bufref.h"
-#include "curl_ctype.h"
 #include "curlx/strparse.h"
 #include "curlx/timeval.h"
 

lib/http.h

@@ -27,7 +27,6 @@
 
 #include "bufq.h"
 #include "dynhds.h"
-#include "ws.h"
 
 typedef enum {
   HTTPREQ_GET,

lib/http_chunks.c

@@ -30,7 +30,6 @@
 #include "curl_trc.h"
 #include "sendf.h"   /* for the client write stuff */
 #include "curlx/dynbuf.h"
-#include "content_encoding.h"
 #include "http.h"
 #include "multiif.h"
 #include "curlx/strparse.h"

lib/http_proxy.c

@@ -31,7 +31,6 @@
 #include "sendf.h"
 #include "http.h"
 #include "url.h"
-#include "select.h"
 #include "cfilters.h"
 #include "cf-h1-proxy.h"
 #include "cf-h2-proxy.h"

lib/httpsrr.c

@@ -27,7 +27,6 @@
 #ifdef USE_HTTPSRR
 
 #include "urldata.h"
-#include "curl_addrinfo.h"
 #include "httpsrr.h"
 #include "connect.h"
 #include "sendf.h"

lib/imap.c

@@ -61,7 +61,6 @@
 #include "transfer.h"
 #include "escape.h"
 #include "http.h" /* for HTTP proxy tunnel stuff */
-#include "socks.h"
 #include "imap.h"
 #include "mime.h"
 #include "curlx/strparse.h"
@@ -74,7 +73,6 @@
 #include "bufref.h"
 #include "curl_sasl.h"
 #include "curlx/warnless.h"
-#include "curl_ctype.h"
 
 
 /* meta key for storing protocol meta at easy handle */

lib/multi.c

@@ -48,8 +48,6 @@
 #include "http_proxy.h"
 #include "http2.h"
 #include "socketpair.h"
-#include "socks.h"
-#include "urlapi-int.h"
 #include "bufref.h"
 
 /* initial multi->xfers table size for a full multi */

lib/multi_ev.c

@@ -34,10 +34,8 @@
 #include "select.h"
 #include "uint-bset.h"
 #include "uint-spbset.h"
-#include "uint-table.h"
 #include "curlx/warnless.h"
 #include "multihandle.h"
-#include "socks.h"
 
 
 static void mev_in_callback(struct Curl_multi *multi, bool value)

lib/pop3.c

@@ -62,7 +62,6 @@
 #include "transfer.h"
 #include "escape.h"
 #include "http.h" /* for HTTP proxy tunnel stuff */
-#include "socks.h"
 #include "pingpong.h"
 #include "pop3.h"
 #include "vtls/vtls.h"

lib/sendf.c

@@ -39,18 +39,15 @@
 #include "transfer.h"
 #include "cfilters.h"
 #include "connect.h"
-#include "content_encoding.h"
 #include "cw-out.h"
 #include "cw-pause.h"
 #include "vtls/vtls.h"
 #include "vssh/ssh.h"
 #include "multiif.h"
 #include "strerror.h"
-#include "select.h"
 #include "http2.h"
 #include "progress.h"
 #include "curlx/warnless.h"
-#include "ws.h"
 
 
 static CURLcode do_init_writer_stack(struct Curl_easy *data);

lib/sha256.c

@@ -30,7 +30,6 @@
 
 #include "curlx/warnless.h"
 #include "curl_sha256.h"
-#include "curl_hmac.h"
 
 #ifdef USE_MBEDTLS
   #include <mbedtls/version.h>

lib/smtp.c

@@ -65,7 +65,6 @@
 #include "escape.h"
 #include "http.h" /* for HTTP proxy tunnel stuff */
 #include "mime.h"
-#include "socks.h"
 #include "smtp.h"
 #include "vtls/vtls.h"
 #include "cfilters.h"

lib/telnet.c

@@ -53,7 +53,6 @@
 #include "telnet.h"
 #include "connect.h"
 #include "progress.h"
-#include "system_win32.h"
 #include "arpa_telnet.h"
 #include "select.h"
 #include "curlx/warnless.h"

lib/transfer.c

@@ -57,8 +57,6 @@
 
 #include "urldata.h"
 
-#include "netrc.h"
-#include "content_encoding.h"
 #include "hostip.h"
 #include "cfilters.h"
 #include "cw-out.h"
@@ -70,7 +68,6 @@
 #include "getinfo.h"
 #include "vtls/vtls.h"
 #include "vquic/vquic.h"
-#include "select.h"
 #include "multiif.h"
 #include "connect.h"
 #include "http2.h"

lib/url.c

@@ -68,7 +68,6 @@
 
 #include "doh.h"
 #include "urldata.h"
-#include "netrc.h"
 #include "formdata.h"
 #include "mime.h"
 #include "bufref.h"
@@ -81,10 +80,7 @@
 #include "strcase.h"
 #include "escape.h"
 #include "curl_share.h"
-#include "content_encoding.h"
 #include "http_digest.h"
-#include "http_negotiate.h"
-#include "select.h"
 #include "multiif.h"
 #include "curlx/warnless.h"
 #include "getinfo.h"
@@ -95,6 +91,16 @@
 #include "noproxy.h"
 #include "cfilters.h"
 #include "idn.h"
+#include "http_proxy.h"
+#include "conncache.h"
+#include "multihandle.h"
+#include "strdup.h"
+#include "setopt.h"
+#include "altsvc.h"
+#include "curlx/dynbuf.h"
+#include "headers.h"
+#include "curlx/strerr.h"
+#include "curlx/strparse.h"
 
 /* And now for the protocols */
 #include "ftp.h"
@@ -109,20 +115,10 @@
 #include "imap.h"
 #include "url.h"
 #include "connect.h"
-#include "http_ntlm.h"
 #include "curl_rtmp.h"
 #include "gopher.h"
 #include "mqtt.h"
-#include "http_proxy.h"
-#include "conncache.h"
-#include "multihandle.h"
-#include "strdup.h"
-#include "setopt.h"
-#include "altsvc.h"
-#include "curlx/dynbuf.h"
-#include "headers.h"
-#include "curlx/strerr.h"
-#include "curlx/strparse.h"
+#include "ws.h"
 
 #ifdef USE_NGHTTP2
 static void data_priority_cleanup(struct Curl_easy *data);

lib/urlapi.c

@@ -29,7 +29,6 @@
 #include "strcase.h"
 #include "url.h"
 #include "escape.h"
-#include "curl_ctype.h"
 #include "curlx/inet_pton.h"
 #include "curlx/inet_ntop.h"
 #include "strdup.h"

lib/vauth/digest.c

@@ -32,7 +32,6 @@
 #include "vauth.h"
 #include "digest.h"
 #include "../curlx/base64.h"
-#include "../curl_hmac.h"
 #include "../curl_md5.h"
 #include "../curl_sha256.h"
 #include "../curl_sha512_256.h"

lib/vauth/ntlm.c

@@ -38,7 +38,6 @@
 #include "vauth.h"
 #include "../sendf.h"
 #include "../curl_ntlm_core.h"
-#include "../curl_gethostname.h"
 #include "../curlx/warnless.h"
 #include "../rand.h"
 #include "../vtls/vtls.h"

lib/vauth/vauth.c

@@ -25,7 +25,6 @@
 #include "../curl_setup.h"
 
 #include "vauth.h"
-#include "../strdup.h"
 #include "../curlx/multibyte.h"
 #include "../url.h"
 

lib/vquic/curl_osslq.c

@@ -33,7 +33,6 @@
 #include <nghttp3/nghttp3.h>
 
 #include "../urldata.h"
-#include "../hash.h"
 #include "../sendf.h"
 #include "../multiif.h"
 #include "../cfilters.h"

lib/vssh/libssh.c

@@ -55,7 +55,6 @@
 #include "../cfilters.h"
 #include "../connect.h"
 #include "../parsedate.h"          /* for the week day and month names */
-#include "../sockaddr.h"           /* required for Curl_sockaddr_storage */
 #include "../curlx/strparse.h"
 #include "../multiif.h"
 #include "../select.h"

lib/vssh/libssh2.c

@@ -54,7 +54,6 @@
 #include "../cfilters.h"
 #include "../connect.h"
 #include "../parsedate.h" /* for the week day and month names */
-#include "../sockaddr.h" /* required for Curl_sockaddr_storage */
 #include "../multiif.h"
 #include "../select.h"
 #include "../curlx/fopen.h"

lib/vtls/gtls.c

@@ -52,7 +52,6 @@
 #include "../parsedate.h"
 #include "../connect.h" /* for the connect timeout */
 #include "../progress.h"
-#include "../select.h"
 #include "../strdup.h"
 #include "../curlx/fopen.h"
 #include "../curlx/timeval.h"

lib/vtls/mbedtls.c

@@ -67,8 +67,6 @@
 #include "vtls_scache.h"
 #include "x509asn1.h"
 #include "../connect.h" /* for the connect timeout */
-#include "../select.h"
-#include "../multiif.h"
 #include "../strdup.h"
 #include "../curl_sha256.h"
 

lib/vtls/openssl.c

@@ -51,7 +51,6 @@
 #include "openssl.h"
 #include "../connect.h"
 #include "../progress.h"
-#include "../select.h"
 #include "vtls.h"
 #include "vtls_int.h"
 #include "vtls_scache.h"

lib/vtls/vtls_int.h

@@ -24,7 +24,9 @@
  *
  ***************************************************************************/
 #include "../curl_setup.h"
+
 #include "../cfilters.h"
+#include "../select.h"
 #include "../urldata.h"
 #include "vtls.h"
 

lib/vtls/wolfssl.c

@@ -61,7 +61,6 @@
 #include "keylog.h"
 #include "../connect.h" /* for the connect timeout */
 #include "../progress.h"
-#include "../select.h"
 #include "../strdup.h"
 #include "x509asn1.h"
 

lib/vtls/x509asn1.c

@@ -38,7 +38,6 @@
 #endif
 
 #include "../urldata.h"
-#include "../curl_ctype.h"
 #include "hostcheck.h"
 #include "vtls.h"
 #include "vtls_int.h"