From a354cc866472400958a28b75e333579980261f28 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Sat, 20 Dec 2025 17:16:10 +0100
Subject: [PATCH] lib: drop includes unused or duplicate

Closes #20051
---
 lib/altsvc.c           |  1 -
 lib/asyn-ares.c        |  1 -
 lib/asyn-base.c        |  1 -
 lib/asyn-thrdd.c       |  1 -
 lib/cf-ip-happy.h      |  1 -
 lib/cf-socket.c        |  2 --
 lib/cf-socket.h        |  2 +-
 lib/cfilters.c         |  1 -
 lib/conncache.c        |  3 ---
 lib/connect.c          |  4 ----
 lib/connect.h          |  1 -
 lib/cshutdn.c          |  2 --
 lib/curl_sasl.c        |  1 -
 lib/curl_share.c       |  1 -
 lib/curl_sspi.c        |  1 -
 lib/curlx/inet_pton.c  |  2 +-
 lib/cw-out.c           |  1 -
 lib/cw-pause.c         |  1 -
 lib/escape.h           |  2 --
 lib/ftp.c              |  1 -
 lib/headers.c          |  1 -
 lib/hostip4.c          |  1 -
 lib/hostip6.c          |  1 -
 lib/hsts.c             |  1 -
 lib/http.c             |  1 -
 lib/http.h             |  1 -
 lib/http_chunks.c      |  1 -
 lib/http_proxy.c       |  1 -
 lib/httpsrr.c          |  1 -
 lib/imap.c             |  2 --
 lib/multi.c            |  2 --
 lib/multi_ev.c         |  2 --
 lib/pop3.c             |  1 -
 lib/sendf.c            |  3 ---
 lib/sha256.c           |  1 -
 lib/smtp.c             |  1 -
 lib/telnet.c           |  1 -
 lib/transfer.c         |  3 ---
 lib/url.c              | 26 +++++++++++---------------
 lib/urlapi.c           |  1 -
 lib/vauth/digest.c     |  1 -
 lib/vauth/ntlm.c       |  1 -
 lib/vauth/vauth.c      |  1 -
 lib/vquic/curl_osslq.c |  1 -
 lib/vssh/libssh.c      |  1 -
 lib/vssh/libssh2.c     |  1 -
 lib/vtls/gtls.c        |  1 -
 lib/vtls/mbedtls.c     |  2 --
 lib/vtls/openssl.c     |  1 -
 lib/vtls/vtls_int.h    |  2 ++
 lib/vtls/wolfssl.c     |  1 -
 lib/vtls/x509asn1.c    |  1 -
 52 files changed, 15 insertions(+), 81 deletions(-)

diff --git a/lib/altsvc.c b/lib/altsvc.c
index d40b9d0e46..855ebf8121 100644
--- a/lib/altsvc.c
+++ b/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"
diff --git a/lib/asyn-ares.c b/lib/asyn-ares.c
index 49515c8468..396ebe65e1 100644
--- a/lib/asyn-ares.c
+++ b/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"
diff --git a/lib/asyn-base.c b/lib/asyn-base.c
index c34af9d076..4eb6979177 100644
--- a/lib/asyn-base.c
+++ b/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"
diff --git a/lib/asyn-thrdd.c b/lib/asyn-thrdd.c
index 036abe5f76..b7fffa5a79 100644
--- a/lib/asyn-thrdd.c
+++ b/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"
diff --git a/lib/cf-ip-happy.h b/lib/cf-ip-happy.h
index 2930f21418..4129ec5610 100644
--- a/lib/cf-ip-happy.h
+++ b/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
diff --git a/lib/cf-socket.c b/lib/cf-socket.c
index 94cd33b8ff..051c0e3407 100644
--- a/lib/cf-socket.c
+++ b/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"
diff --git a/lib/cf-socket.h b/lib/cf-socket.h
index fe5ff2fa47..26a1fc1017 100644
--- a/lib/cf-socket.h
+++ b/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;
diff --git a/lib/cfilters.c b/lib/cfilters.c
index 450edfaa73..a02e4bffd9 100644
--- a/lib/cfilters.c
+++ b/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"
diff --git a/lib/conncache.c b/lib/conncache.c
index 87d6a12fc8..7556193171 100644
--- a/lib/conncache.c
+++ b/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)
diff --git a/lib/connect.c b/lib/connect.c
index 1afeb8c808..bf38c8f111 100644
--- a/lib/connect.c
+++ b/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 */
diff --git a/lib/connect.h b/lib/connect.h
index 5b59c6cf25..d0596f5ce9 100644
--- a/lib/connect.h
+++ b/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;
diff --git a/lib/cshutdn.c b/lib/cshutdn.c
index 89d2ba69cc..34aacf949b 100644
--- a/lib/cshutdn.c
+++ b/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"
diff --git a/lib/curl_sasl.c b/lib/curl_sasl.c
index 67925a523c..43d217ef35 100644
--- a/lib/curl_sasl.c
+++ b/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"
diff --git a/lib/curl_share.c b/lib/curl_share.c
index a458fb1a8e..60ea78bf7f 100644
--- a/lib/curl_share.c
+++ b/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"
diff --git a/lib/curl_sspi.c b/lib/curl_sspi.c
index c652c9c9a4..ce0ff40160 100644
--- a/lib/curl_sspi.c
+++ b/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 */
diff --git a/lib/curlx/inet_pton.c b/lib/curlx/inet_pton.c
index 7b4a404306..5d8d3be8b7 100644
--- a/lib/curlx/inet_pton.c
+++ b/lib/curlx/inet_pton.c
@@ -19,7 +19,7 @@
  */
 
 #include "../curl_setup.h"
-#include "../curl_ctype.h"
+
 #include "strparse.h"
 
 #ifndef HAVE_INET_PTON
diff --git a/lib/cw-out.c b/lib/cw-out.c
index 3ca8f5203f..e0cf54b814 100644
--- a/lib/cw-out.c
+++ b/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"
diff --git a/lib/cw-pause.c b/lib/cw-pause.c
index 3b5b4c6fa2..4b8cf4ec1e 100644
--- a/lib/cw-pause.c
+++ b/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"
 
diff --git a/lib/escape.h b/lib/escape.h
index a43fc38ed3..2ea06c444f 100644
--- a/lib/escape.h
+++ b/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,
diff --git a/lib/ftp.c b/lib/ftp.c
index 4411bb1239..3df55de7bb 100644
--- a/lib/ftp.c
+++ b/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"
diff --git a/lib/headers.c b/lib/headers.c
index 0cafcaa270..b640059c5f 100644
--- a/lib/headers.c
+++ b/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"
diff --git a/lib/hostip4.c b/lib/hostip4.c
index 8c8553e4f6..40f709fdc0 100644
--- a/lib/hostip4.c
+++ b/lib/hostip4.c
@@ -46,7 +46,6 @@
 #include "urldata.h"
 #include "sendf.h"
 #include "hostip.h"
-#include "hash.h"
 #include "url.h"
 
 
diff --git a/lib/hostip6.c b/lib/hostip6.c
index c8528fbd04..2eabf753f4 100644
--- a/lib/hostip6.c
+++ b/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"
diff --git a/lib/hsts.c b/lib/hsts.c
index e757574f51..d9b9f916b1 100644
--- a/lib/hsts.c
+++ b/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"
 
diff --git a/lib/http.c b/lib/http.c
index 94c22bbc8b..09f152a4ab 100644
--- a/lib/http.c
+++ b/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"
 
diff --git a/lib/http.h b/lib/http.h
index b193a1dfc8..7f944ea33b 100644
--- a/lib/http.h
+++ b/lib/http.h
@@ -27,7 +27,6 @@
 
 #include "bufq.h"
 #include "dynhds.h"
-#include "ws.h"
 
 typedef enum {
   HTTPREQ_GET,
diff --git a/lib/http_chunks.c b/lib/http_chunks.c
index 76aab85ce2..8ec04987ad 100644
--- a/lib/http_chunks.c
+++ b/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"
diff --git a/lib/http_proxy.c b/lib/http_proxy.c
index a28e832ba1..31b3519f73 100644
--- a/lib/http_proxy.c
+++ b/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"
diff --git a/lib/httpsrr.c b/lib/httpsrr.c
index 3acb16ac3a..25abd80e11 100644
--- a/lib/httpsrr.c
+++ b/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"
diff --git a/lib/imap.c b/lib/imap.c
index 69fe30f5aa..5ec30e6dc6 100644
--- a/lib/imap.c
+++ b/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 */
diff --git a/lib/multi.c b/lib/multi.c
index a24e511adc..2c4eb86c7b 100644
--- a/lib/multi.c
+++ b/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 */
diff --git a/lib/multi_ev.c b/lib/multi_ev.c
index 8e71716d70..51481704e3 100644
--- a/lib/multi_ev.c
+++ b/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)
diff --git a/lib/pop3.c b/lib/pop3.c
index e02ed0c8b4..8a80d55321 100644
--- a/lib/pop3.c
+++ b/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"
diff --git a/lib/sendf.c b/lib/sendf.c
index b3a7ac4f91..f97b44e653 100644
--- a/lib/sendf.c
+++ b/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);
diff --git a/lib/sha256.c b/lib/sha256.c
index 9c3b60ec18..910f65e1c0 100644
--- a/lib/sha256.c
+++ b/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>
diff --git a/lib/smtp.c b/lib/smtp.c
index 51fb26687a..ebed05d2e5 100644
--- a/lib/smtp.c
+++ b/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"
diff --git a/lib/telnet.c b/lib/telnet.c
index 19b5901d84..cdf33b97de 100644
--- a/lib/telnet.c
+++ b/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"
diff --git a/lib/transfer.c b/lib/transfer.c
index 3f6a995eac..646a2cc0f8 100644
--- a/lib/transfer.c
+++ b/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"
diff --git a/lib/url.c b/lib/url.c
index 398bd5f7f6..c8ba6a0772 100644
--- a/lib/url.c
+++ b/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);
diff --git a/lib/urlapi.c b/lib/urlapi.c
index b8814cf852..f84ee2ed09 100644
--- a/lib/urlapi.c
+++ b/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"
diff --git a/lib/vauth/digest.c b/lib/vauth/digest.c
index e08fcc9aa3..200f9dca9f 100644
--- a/lib/vauth/digest.c
+++ b/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"
diff --git a/lib/vauth/ntlm.c b/lib/vauth/ntlm.c
index 70d080f5a4..9d28ce259c 100644
--- a/lib/vauth/ntlm.c
+++ b/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"
diff --git a/lib/vauth/vauth.c b/lib/vauth/vauth.c
index bd271101b0..61f79037a3 100644
--- a/lib/vauth/vauth.c
+++ b/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"
 
diff --git a/lib/vquic/curl_osslq.c b/lib/vquic/curl_osslq.c
index dc1f0bf02e..a3dc088e31 100644
--- a/lib/vquic/curl_osslq.c
+++ b/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"
diff --git a/lib/vssh/libssh.c b/lib/vssh/libssh.c
index 9879d44c7a..c7e59d6719 100644
--- a/lib/vssh/libssh.c
+++ b/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"
diff --git a/lib/vssh/libssh2.c b/lib/vssh/libssh2.c
index 6ca4caf661..a3672b4b60 100644
--- a/lib/vssh/libssh2.c
+++ b/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"
diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c
index 1bfd096df7..6ecb1deb43 100644
--- a/lib/vtls/gtls.c
+++ b/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"
diff --git a/lib/vtls/mbedtls.c b/lib/vtls/mbedtls.c
index 672f02857b..6ef267f639 100644
--- a/lib/vtls/mbedtls.c
+++ b/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"
 
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 02cc49a39b..7201ecb724 100644
--- a/lib/vtls/openssl.c
+++ b/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"
diff --git a/lib/vtls/vtls_int.h b/lib/vtls/vtls_int.h
index 0a184f88c1..cdb07b5f2b 100644
--- a/lib/vtls/vtls_int.h
+++ b/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"
 
diff --git a/lib/vtls/wolfssl.c b/lib/vtls/wolfssl.c
index 94ada9cfff..b5c78a56b5 100644
--- a/lib/vtls/wolfssl.c
+++ b/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"
 
diff --git a/lib/vtls/x509asn1.c b/lib/vtls/x509asn1.c
index 6dc66a9221..63c49796db 100644
--- a/lib/vtls/x509asn1.c
+++ b/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"