From 884b5ea921f2e6b4e9c6e5b6d47de25006f8c6e8 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Sun, 21 Dec 2025 00:40:32 +0100
Subject: [PATCH] lib: include `curlx/warnless.h` from `curl_setup.h`

To make it available for all files. Drop includes from individual
sources. This header was already included from most sources and not
specific to any internal subsystem.

Also to ensure that two system symbol redefines on Windows (`read()` and
`write()`) get applied to all sources. Move them to `curl_setup.h`.

Closes #20056
---
 lib/altsvc.c              |  1 -
 lib/cf-h2-proxy.c         |  1 -
 lib/cf-socket.c           |  1 -
 lib/cfilters.c            |  1 -
 lib/connect.c             |  1 -
 lib/curl_addrinfo.c       |  1 -
 lib/curl_ntlm_core.c      |  1 -
 lib/curl_rtmp.c           |  1 -
 lib/curl_sasl.c           |  1 -
 lib/curl_setup.h          | 12 ++++++++++++
 lib/curl_sha512_256.c     |  1 -
 lib/curl_sspi.c           |  1 -
 lib/curlx/base64.c        |  1 -
 lib/curlx/curlx.h         |  8 --------
 lib/curlx/version_win32.c |  1 -
 lib/curlx/warnless.h      |  7 -------
 lib/easy.c                |  1 -
 lib/escape.c              |  1 -
 lib/file.c                |  1 -
 lib/formdata.c            |  1 -
 lib/ftp.c                 |  1 -
 lib/gopher.c              |  1 -
 lib/hmac.c                |  1 -
 lib/hostip.c              |  1 -
 lib/http.c                |  1 -
 lib/http2.c               |  1 -
 lib/http_chunks.c         |  1 -
 lib/idn.c                 |  1 -
 lib/imap.c                |  1 -
 lib/md4.c                 |  1 -
 lib/md5.c                 |  1 -
 lib/mime.c                |  1 -
 lib/mqtt.c                |  1 -
 lib/multi.c               |  1 -
 lib/multi_ev.c            |  1 -
 lib/parsedate.c           |  1 -
 lib/pop3.c                |  1 -
 lib/select.c              |  1 -
 lib/sendf.c               |  1 -
 lib/setopt.c              |  1 -
 lib/sha256.c              |  1 -
 lib/smtp.c                |  1 -
 lib/socks_gssapi.c        |  1 -
 lib/socks_sspi.c          |  1 -
 lib/system_win32.c        |  1 -
 lib/telnet.c              |  1 -
 lib/transfer.c            |  1 -
 lib/uint-bset.c           |  1 +
 lib/url.c                 |  1 -
 lib/vauth/cleartext.c     |  1 -
 lib/vauth/cram.c          |  1 -
 lib/vauth/digest.c        |  1 -
 lib/vauth/digest_sspi.c   |  1 -
 lib/vauth/krb5_sspi.c     |  1 -
 lib/vauth/ntlm.c          |  1 -
 lib/vauth/ntlm_sspi.c     |  1 -
 lib/vauth/oauth2.c        |  1 -
 lib/vauth/spnego_gssapi.c |  1 -
 lib/vauth/spnego_sspi.c   |  1 -
 lib/vquic/curl_ngtcp2.c   |  2 --
 lib/vquic/curl_osslq.c    |  1 -
 lib/vquic/curl_quiche.c   |  1 -
 lib/vquic/vquic.c         |  1 -
 lib/vssh/libssh.c         |  1 -
 lib/vssh/libssh2.c        |  1 -
 lib/vtls/gtls.c           |  1 -
 lib/vtls/openssl.c        |  2 --
 lib/vtls/schannel.c       |  1 -
 lib/vtls/vtls.c           |  1 -
 lib/vtls/vtls_scache.c    |  1 -
 lib/ws.c                  |  1 -
 71 files changed, 13 insertions(+), 84 deletions(-)

diff --git a/lib/altsvc.c b/lib/altsvc.c
index 855ebf8121..3aa88c2cdb 100644
--- a/lib/altsvc.c
+++ b/lib/altsvc.c
@@ -34,7 +34,6 @@
 #include "curl_get_line.h"
 #include "parsedate.h"
 #include "sendf.h"
-#include "curlx/warnless.h"
 #include "curlx/inet_pton.h"
 #include "curlx/strparse.h"
 #include "curlx/timeval.h"
diff --git a/lib/cf-h2-proxy.c b/lib/cf-h2-proxy.c
index ff4e8dd938..cc9a1672d0 100644
--- a/lib/cf-h2-proxy.c
+++ b/lib/cf-h2-proxy.c
@@ -43,7 +43,6 @@
 #include "multiif.h"
 #include "sendf.h"
 #include "select.h"
-#include "curlx/warnless.h"
 #include "cf-h2-proxy.h"
 
 #define PROXY_H2_CHUNK_SIZE  (16 * 1024)
diff --git a/lib/cf-socket.c b/lib/cf-socket.c
index f4794eb6c3..28326ee78f 100644
--- a/lib/cf-socket.c
+++ b/lib/cf-socket.c
@@ -66,7 +66,6 @@
 #include "multiif.h"
 #include "curlx/inet_pton.h"
 #include "progress.h"
-#include "curlx/warnless.h"
 #include "conncache.h"
 #include "multihandle.h"
 #include "rand.h"
diff --git a/lib/cfilters.c b/lib/cfilters.c
index a02e4bffd9..495ba078ba 100644
--- a/lib/cfilters.c
+++ b/lib/cfilters.c
@@ -32,7 +32,6 @@
 #include "sendf.h"
 #include "progress.h"
 #include "select.h"
-#include "curlx/warnless.h"
 #include "curlx/strparse.h"
 
 static void cf_cntrl_update_info(struct Curl_easy *data,
diff --git a/lib/connect.c b/lib/connect.c
index bf38c8f111..3e1cda561b 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -64,7 +64,6 @@
 #include "curlx/strparse.h"
 #include "vtls/vtls.h" /* for vtsl cfilters */
 #include "progress.h"
-#include "curlx/warnless.h"
 #include "conncache.h"
 #include "multihandle.h"
 #include "http_proxy.h"
diff --git a/lib/curl_addrinfo.c b/lib/curl_addrinfo.c
index 27282dd9f9..43dcfd25c7 100644
--- a/lib/curl_addrinfo.c
+++ b/lib/curl_addrinfo.c
@@ -50,7 +50,6 @@
 #include "curl_addrinfo.h"
 #include "fake_addrinfo.h"
 #include "curlx/inet_pton.h"
-#include "curlx/warnless.h"
 
 /*
  * Curl_freeaddrinfo()
diff --git a/lib/curl_ntlm_core.c b/lib/curl_ntlm_core.c
index b7d67598ee..36778ecae7 100644
--- a/lib/curl_ntlm_core.c
+++ b/lib/curl_ntlm_core.c
@@ -114,7 +114,6 @@
 #include "curl_ntlm_core.h"
 #include "curl_md5.h"
 #include "curl_hmac.h"
-#include "curlx/warnless.h"
 #include "curl_md4.h"
 #include "vauth/vauth.h"
 
diff --git a/lib/curl_rtmp.c b/lib/curl_rtmp.c
index fd0bfe5f4f..36f81464a4 100644
--- a/lib/curl_rtmp.c
+++ b/lib/curl_rtmp.c
@@ -34,7 +34,6 @@
 #include "progress.h" /* for Curl_pgrsSetUploadSize */
 #include "transfer.h"
 #include "bufref.h"
-#include "curlx/warnless.h"
 
 #include <librtmp/rtmp.h>
 
diff --git a/lib/curl_sasl.c b/lib/curl_sasl.c
index 864344da6a..22acd23411 100644
--- a/lib/curl_sasl.c
+++ b/lib/curl_sasl.c
@@ -44,7 +44,6 @@
 #include "vauth/vauth.h"
 #include "cfilters.h"
 #include "curl_sasl.h"
-#include "curlx/warnless.h"
 #include "sendf.h"
 
 /* Supported mechanisms */
diff --git a/lib/curl_setup.h b/lib/curl_setup.h
index 9a9596ea69..e3903f475a 100644
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -779,6 +779,18 @@
 #include "curl_setup_once.h"
 #endif
 
+/*
+ * Macros and functions to safely suppress warnings
+ */
+#include "curlx/warnless.h"
+
+#ifdef _WIN32
+#  undef  read
+#  define read(fd, buf, count)  (ssize_t)_read(fd, buf, curlx_uztoui(count))
+#  undef  write
+#  define write(fd, buf, count) (ssize_t)_write(fd, buf, curlx_uztoui(count))
+#endif
+
 /*
  * Definition of our NOP statement Object-like macro
  */
diff --git a/lib/curl_sha512_256.c b/lib/curl_sha512_256.c
index df6aa05996..aff0ce0a47 100644
--- a/lib/curl_sha512_256.c
+++ b/lib/curl_sha512_256.c
@@ -27,7 +27,6 @@
 #if !defined(CURL_DISABLE_DIGEST_AUTH) && !defined(CURL_DISABLE_SHA512_256)
 
 #include "curl_sha512_256.h"
-#include "curlx/warnless.h"
 
 /* The recommended order of the TLS backends:
  * 1. OpenSSL
diff --git a/lib/curl_sspi.c b/lib/curl_sspi.c
index ce0ff40160..93a68e56c5 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 "curlx/warnless.h"
 
 /* Pointer to SSPI dispatch table */
 PSecurityFunctionTable Curl_pSecFn = NULL;
diff --git a/lib/curlx/base64.c b/lib/curlx/base64.c
index e7d2defa03..6635fc328c 100644
--- a/lib/curlx/base64.c
+++ b/lib/curlx/base64.c
@@ -26,7 +26,6 @@
 
 #include "../curl_setup.h"
 
-#include "warnless.h"
 #include "base64.h"
 
 /* ---- Base64 Encoding/Decoding Table --- */
diff --git a/lib/curlx/curlx.h b/lib/curlx/curlx.h
index af46fae671..67219603f9 100644
--- a/lib/curlx/curlx.h
+++ b/lib/curlx/curlx.h
@@ -37,14 +37,6 @@
 #include "nonblock.h"
 /* "nonblock.h" provides curlx_nonblock() */
 
-#include "warnless.h"
-/* "warnless.h" provides functions:
-
-  curlx_ultous()
-  curlx_ultouc()
-  curlx_uztosi()
-*/
-
 #include "multibyte.h"
 /* "multibyte.h" provides these functions and macros:
 
diff --git a/lib/curlx/version_win32.c b/lib/curlx/version_win32.c
index c8d45bb147..be5b13c9de 100644
--- a/lib/curlx/version_win32.c
+++ b/lib/curlx/version_win32.c
@@ -27,7 +27,6 @@
 #ifdef _WIN32
 
 #include "version_win32.h"
-#include "warnless.h"
 
 /* This Unicode version struct works for VerifyVersionInfoW (OSVERSIONINFOEXW)
    and RtlVerifyVersionInfo (RTLOSVERSIONINFOEXW) */
diff --git a/lib/curlx/warnless.h b/lib/curlx/warnless.h
index 31b7dcd070..290aaac28d 100644
--- a/lib/curlx/warnless.h
+++ b/lib/curlx/warnless.h
@@ -73,11 +73,4 @@ bool curlx_sotouz_fits(curl_off_t sonum, size_t *puznum);
  * and set 0 */
 bool curlx_sltouz(long sznum, size_t *puznum);
 
-#ifdef _WIN32
-#undef  read
-#define read(fd, buf, count)  (ssize_t)_read(fd, buf, curlx_uztoui(count))
-#undef  write
-#define write(fd, buf, count) (ssize_t)_write(fd, buf, curlx_uztoui(count))
-#endif
-
 #endif /* HEADER_CURL_WARNLESS_H */
diff --git a/lib/easy.c b/lib/easy.c
index 2bd91da79b..3e3ac4cff8 100644
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -64,7 +64,6 @@
 #include "mime.h"
 #include "amigaos.h"
 #include "macos.h"
-#include "curlx/warnless.h"
 #include "curlx/wait.h"
 #include "sigpipe.h"
 #include "vssh/ssh.h"
diff --git a/lib/escape.c b/lib/escape.c
index bd10965380..f9f69a8000 100644
--- a/lib/escape.c
+++ b/lib/escape.c
@@ -30,7 +30,6 @@
 struct Curl_easy;
 
 #include "urldata.h"
-#include "curlx/warnless.h"
 #include "escape.h"
 #include "curlx/strparse.h"
 #include "curl_printf.h"
diff --git a/lib/file.c b/lib/file.c
index d85acb32c7..be2f354f60 100644
--- a/lib/file.c
+++ b/lib/file.c
@@ -65,7 +65,6 @@
 #include "parsedate.h" /* for the week day and month names */
 #include "curlx/fopen.h"
 #include "curlx/timeval.h"
-#include "curlx/warnless.h"
 #include "curl_range.h"
 
 #if defined(_WIN32) || defined(MSDOS)
diff --git a/lib/formdata.c b/lib/formdata.c
index 208d1d7f47..358bb4c498 100644
--- a/lib/formdata.c
+++ b/lib/formdata.c
@@ -36,7 +36,6 @@ struct Curl_easy;
 #include "strdup.h"
 #include "bufref.h"
 #include "curlx/fopen.h"
-#include "curlx/warnless.h"
 
 
 #define HTTPPOST_PTRNAME     CURL_HTTPPOST_PTRNAME
diff --git a/lib/ftp.c b/lib/ftp.c
index 3df55de7bb..94735d22f5 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -64,7 +64,6 @@
 #include "sockaddr.h" /* required for Curl_sockaddr_storage */
 #include "multiif.h"
 #include "url.h"
-#include "curlx/warnless.h"
 #include "http_proxy.h"
 #include "strdup.h"
 #include "curlx/strerr.h"
diff --git a/lib/gopher.c b/lib/gopher.c
index e83d9cfc46..348e675561 100644
--- a/lib/gopher.c
+++ b/lib/gopher.c
@@ -35,7 +35,6 @@
 #include "select.h"
 #include "url.h"
 #include "escape.h"
-#include "curlx/warnless.h"
 
 /*
  * Forward declarations.
diff --git a/lib/hmac.c b/lib/hmac.c
index b4ee071ad1..f9248b0977 100644
--- a/lib/hmac.c
+++ b/lib/hmac.c
@@ -31,7 +31,6 @@
   defined(USE_SSL)
 
 #include "curl_hmac.h"
-#include "curlx/warnless.h"
 
 /*
  * Generic HMAC algorithm.
diff --git a/lib/hostip.c b/lib/hostip.c
index b18e5e0bd4..aa10839c20 100644
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -56,7 +56,6 @@
 #include "curlx/inet_pton.h"
 #include "multiif.h"
 #include "doh.h"
-#include "curlx/warnless.h"
 #include "progress.h"
 #include "select.h"
 #include "strcase.h"
diff --git a/lib/http.c b/lib/http.c
index 202808f1f2..69361b88ec 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -74,7 +74,6 @@
 #include "strcase.h"
 #include "content_encoding.h"
 #include "http_proxy.h"
-#include "curlx/warnless.h"
 #include "http2.h"
 #include "cfilters.h"
 #include "connect.h"
diff --git a/lib/http2.c b/lib/http2.c
index 931640e93f..29ca95cb09 100644
--- a/lib/http2.c
+++ b/lib/http2.c
@@ -46,7 +46,6 @@
 #include "transfer.h"
 #include "bufref.h"
 #include "curlx/dynbuf.h"
-#include "curlx/warnless.h"
 #include "headers.h"
 
 #if (NGHTTP2_VERSION_NUM < 0x010c00)
diff --git a/lib/http_chunks.c b/lib/http_chunks.c
index 8ec04987ad..a12d2dce72 100644
--- a/lib/http_chunks.c
+++ b/lib/http_chunks.c
@@ -33,7 +33,6 @@
 #include "http.h"
 #include "multiif.h"
 #include "curlx/strparse.h"
-#include "curlx/warnless.h"
 
 /*
  * Chunk format (simplified):
diff --git a/lib/idn.c b/lib/idn.c
index 62149cf84e..1907a224bf 100644
--- a/lib/idn.c
+++ b/lib/idn.c
@@ -31,7 +31,6 @@
 #include "urldata.h"
 #include "idn.h"
 #include "sendf.h"
-#include "curlx/warnless.h"
 
 #ifdef USE_LIBIDN2
 #include <idn2.h>
diff --git a/lib/imap.c b/lib/imap.c
index 5ec30e6dc6..b826b67bde 100644
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -72,7 +72,6 @@
 #include "url.h"
 #include "bufref.h"
 #include "curl_sasl.h"
-#include "curlx/warnless.h"
 
 
 /* meta key for storing protocol meta at easy handle */
diff --git a/lib/md4.c b/lib/md4.c
index 044ceb066f..5353695795 100644
--- a/lib/md4.c
+++ b/lib/md4.c
@@ -27,7 +27,6 @@
 #ifdef USE_CURL_NTLM_CORE
 
 #include "curl_md4.h"
-#include "curlx/warnless.h"
 
 #ifdef USE_OPENSSL
 #include <openssl/opensslv.h>
diff --git a/lib/md5.c b/lib/md5.c
index f6c330cfc6..12997d175d 100644
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -29,7 +29,6 @@
 
 #include "curl_md5.h"
 #include "curl_hmac.h"
-#include "curlx/warnless.h"
 
 #ifdef USE_OPENSSL
   #include <openssl/opensslconf.h>
diff --git a/lib/mime.c b/lib/mime.c
index f772833d26..31b5306bf1 100644
--- a/lib/mime.c
+++ b/lib/mime.c
@@ -27,7 +27,6 @@
 struct Curl_easy;
 
 #include "mime.h"
-#include "curlx/warnless.h"
 #include "urldata.h"
 #include "sendf.h"
 #include "transfer.h"
diff --git a/lib/mqtt.c b/lib/mqtt.c
index ae98cce258..27b1633178 100644
--- a/lib/mqtt.c
+++ b/lib/mqtt.c
@@ -35,7 +35,6 @@
 #include "select.h"
 #include "url.h"
 #include "escape.h"
-#include "curlx/warnless.h"
 #include "rand.h"
 
 /* first byte is command.
diff --git a/lib/multi.c b/lib/multi.c
index 2c4eb86c7b..710df8548d 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -38,7 +38,6 @@
 #include "curlx/timeval.h"
 #include "http.h"
 #include "select.h"
-#include "curlx/warnless.h"
 #include "curlx/wait.h"
 #include "conncache.h"
 #include "multihandle.h"
diff --git a/lib/multi_ev.c b/lib/multi_ev.c
index 51481704e3..5d55ed8ebc 100644
--- a/lib/multi_ev.c
+++ b/lib/multi_ev.c
@@ -34,7 +34,6 @@
 #include "select.h"
 #include "uint-bset.h"
 #include "uint-spbset.h"
-#include "curlx/warnless.h"
 #include "multihandle.h"
 
 
diff --git a/lib/parsedate.c b/lib/parsedate.c
index 69dbfe7fc0..b622b5ad90 100644
--- a/lib/parsedate.c
+++ b/lib/parsedate.c
@@ -77,7 +77,6 @@
 
 #include "curl_setup.h"
 
-#include "curlx/warnless.h"
 #include "parsedate.h"
 #include "curlx/strparse.h"
 
diff --git a/lib/pop3.c b/lib/pop3.c
index 8a80d55321..a1321125b9 100644
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -72,7 +72,6 @@
 #include "bufref.h"
 #include "curl_sasl.h"
 #include "curl_md5.h"
-#include "curlx/warnless.h"
 #include "strdup.h"
 
 /* Authentication type flags */
diff --git a/lib/select.c b/lib/select.c
index 0c9fce7827..5761084242 100644
--- a/lib/select.c
+++ b/lib/select.c
@@ -40,7 +40,6 @@
 #include "curl_trc.h"
 #include "curlx/timediff.h"
 #include "curlx/wait.h"
-#include "curlx/warnless.h"
 
 #ifndef HAVE_POLL
 /*
diff --git a/lib/sendf.c b/lib/sendf.c
index 209514f449..b2b5d0f9fe 100644
--- a/lib/sendf.c
+++ b/lib/sendf.c
@@ -45,7 +45,6 @@
 #include "strerror.h"
 #include "http2.h"
 #include "progress.h"
-#include "curlx/warnless.h"
 
 
 static CURLcode do_init_writer_stack(struct Curl_easy *data);
diff --git a/lib/setopt.c b/lib/setopt.c
index dc1353dc45..f6e1d7643f 100644
--- a/lib/setopt.c
+++ b/lib/setopt.c
@@ -41,7 +41,6 @@
 #include "strcase.h"
 #include "curl_share.h"
 #include "vtls/vtls.h"
-#include "curlx/warnless.h"
 #include "sendf.h"
 #include "hostip.h"
 #include "http2.h"
diff --git a/lib/sha256.c b/lib/sha256.c
index 910f65e1c0..b653100d5d 100644
--- a/lib/sha256.c
+++ b/lib/sha256.c
@@ -28,7 +28,6 @@
 #if !defined(CURL_DISABLE_AWS) || !defined(CURL_DISABLE_DIGEST_AUTH) || \
   defined(USE_LIBSSH2) || defined(USE_SSL)
 
-#include "curlx/warnless.h"
 #include "curl_sha256.h"
 
 #ifdef USE_MBEDTLS
diff --git a/lib/smtp.c b/lib/smtp.c
index ebed05d2e5..f868179bed 100644
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -74,7 +74,6 @@
 #include "curl_gethostname.h"
 #include "bufref.h"
 #include "curl_sasl.h"
-#include "curlx/warnless.h"
 #include "idn.h"
 #include "curlx/strparse.h"
 
diff --git a/lib/socks_gssapi.c b/lib/socks_gssapi.c
index 4df1fc1d20..9523d936dd 100644
--- a/lib/socks_gssapi.c
+++ b/lib/socks_gssapi.c
@@ -35,7 +35,6 @@
 #include "curlx/nonblock.h"
 #include "curlx/timeval.h"
 #include "socks.h"
-#include "curlx/warnless.h"
 #include "strdup.h"
 
 #if defined(__GNUC__) && defined(__APPLE__)
diff --git a/lib/socks_sspi.c b/lib/socks_sspi.c
index 7d6ac253c3..560df24205 100644
--- a/lib/socks_sspi.c
+++ b/lib/socks_sspi.c
@@ -37,7 +37,6 @@
 #include "socks.h"
 #include "curl_sspi.h"
 #include "curlx/multibyte.h"
-#include "curlx/warnless.h"
 
 /*
  * Helper sspi error functions.
diff --git a/lib/system_win32.c b/lib/system_win32.c
index 21a991eb09..a53f61724e 100644
--- a/lib/system_win32.c
+++ b/lib/system_win32.c
@@ -29,7 +29,6 @@
 #include "system_win32.h"
 #include "curlx/version_win32.h"
 #include "curl_sspi.h"
-#include "curlx/warnless.h"
 
 #ifndef HAVE_IF_NAMETOINDEX
 /* Handle of iphlpapp.dll */
diff --git a/lib/telnet.c b/lib/telnet.c
index cdf33b97de..03a5bb7f45 100644
--- a/lib/telnet.c
+++ b/lib/telnet.c
@@ -55,7 +55,6 @@
 #include "progress.h"
 #include "arpa_telnet.h"
 #include "select.h"
-#include "curlx/warnless.h"
 #include "curlx/strparse.h"
 
 #define SUBBUFSIZE 512
diff --git a/lib/transfer.c b/lib/transfer.c
index 10a6097017..30ca3cb4de 100644
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -74,7 +74,6 @@
 #include "setopt.h"
 #include "headers.h"
 #include "bufref.h"
-#include "curlx/warnless.h"
 
 #if !defined(CURL_DISABLE_HTTP) || !defined(CURL_DISABLE_SMTP) || \
   !defined(CURL_DISABLE_IMAP)
diff --git a/lib/uint-bset.c b/lib/uint-bset.c
index d41d982b3a..32aebe7cda 100644
--- a/lib/uint-bset.c
+++ b/lib/uint-bset.c
@@ -23,6 +23,7 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
+
 #include "uint-bset.h"
 
 #ifdef DEBUGBUILD
diff --git a/lib/url.c b/lib/url.c
index c8ba6a0772..d605adb3a0 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -82,7 +82,6 @@
 #include "curl_share.h"
 #include "http_digest.h"
 #include "multiif.h"
-#include "curlx/warnless.h"
 #include "getinfo.h"
 #include "pop3.h"
 #include "urlapi-int.h"
diff --git a/lib/vauth/cleartext.c b/lib/vauth/cleartext.c
index a9fe574d63..90e9178491 100644
--- a/lib/vauth/cleartext.c
+++ b/lib/vauth/cleartext.c
@@ -32,7 +32,6 @@
   (!defined(CURL_DISABLE_LDAP) && defined(USE_OPENLDAP))
 
 #include "vauth.h"
-#include "../curlx/warnless.h"
 #include "../sendf.h"
 
 /*
diff --git a/lib/vauth/cram.c b/lib/vauth/cram.c
index 3251d90822..8aa4055231 100644
--- a/lib/vauth/cram.c
+++ b/lib/vauth/cram.c
@@ -31,7 +31,6 @@
 #include "vauth.h"
 #include "../curl_hmac.h"
 #include "../curl_md5.h"
-#include "../curlx/warnless.h"
 
 
 /*
diff --git a/lib/vauth/digest.c b/lib/vauth/digest.c
index ceb2d8523b..c67be1dd84 100644
--- a/lib/vauth/digest.c
+++ b/lib/vauth/digest.c
@@ -35,7 +35,6 @@
 #include "../curl_md5.h"
 #include "../curl_sha256.h"
 #include "../curl_sha512_256.h"
-#include "../curlx/warnless.h"
 #include "../curlx/strparse.h"
 #include "../rand.h"
 
diff --git a/lib/vauth/digest_sspi.c b/lib/vauth/digest_sspi.c
index 812b473556..46377d22b2 100644
--- a/lib/vauth/digest_sspi.c
+++ b/lib/vauth/digest_sspi.c
@@ -31,7 +31,6 @@
 
 #include "vauth.h"
 #include "digest.h"
-#include "../curlx/warnless.h"
 #include "../curlx/multibyte.h"
 #include "../sendf.h"
 #include "../strdup.h"
diff --git a/lib/vauth/krb5_sspi.c b/lib/vauth/krb5_sspi.c
index 19cc3d34b0..8159c88aec 100644
--- a/lib/vauth/krb5_sspi.c
+++ b/lib/vauth/krb5_sspi.c
@@ -29,7 +29,6 @@
 #if defined(USE_WINDOWS_SSPI) && defined(USE_KERBEROS5)
 
 #include "vauth.h"
-#include "../curlx/warnless.h"
 #include "../sendf.h"
 
 /*
diff --git a/lib/vauth/ntlm.c b/lib/vauth/ntlm.c
index 82edbe6b1b..c5b2263622 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 "../curlx/warnless.h"
 #include "../rand.h"
 #include "../strdup.h"
 #include "../curl_endian.h"
diff --git a/lib/vauth/ntlm_sspi.c b/lib/vauth/ntlm_sspi.c
index e5e37b771f..eea18281e5 100644
--- a/lib/vauth/ntlm_sspi.c
+++ b/lib/vauth/ntlm_sspi.c
@@ -28,7 +28,6 @@
 
 #include "vauth.h"
 #include "../curl_ntlm_core.h"
-#include "../curlx/warnless.h"
 #include "../sendf.h"
 #include "../strdup.h"
 
diff --git a/lib/vauth/oauth2.c b/lib/vauth/oauth2.c
index d9f07bba56..fc89cba49f 100644
--- a/lib/vauth/oauth2.c
+++ b/lib/vauth/oauth2.c
@@ -31,7 +31,6 @@
   (!defined(CURL_DISABLE_LDAP) && defined(USE_OPENLDAP))
 
 #include "vauth.h"
-#include "../curlx/warnless.h"
 
 /*
  * Curl_auth_create_oauth_bearer_message()
diff --git a/lib/vauth/spnego_gssapi.c b/lib/vauth/spnego_gssapi.c
index 5df8cc9ce7..a1c92612c6 100644
--- a/lib/vauth/spnego_gssapi.c
+++ b/lib/vauth/spnego_gssapi.c
@@ -31,7 +31,6 @@
 #include "vauth.h"
 #include "../curlx/base64.h"
 #include "../curl_gssapi.h"
-#include "../curlx/warnless.h"
 #include "../sendf.h"
 
 #if defined(__GNUC__) && defined(__APPLE__)
diff --git a/lib/vauth/spnego_sspi.c b/lib/vauth/spnego_sspi.c
index e58957d29e..68adb8591b 100644
--- a/lib/vauth/spnego_sspi.c
+++ b/lib/vauth/spnego_sspi.c
@@ -30,7 +30,6 @@
 
 #include "vauth.h"
 #include "../curlx/base64.h"
-#include "../curlx/warnless.h"
 #include "../sendf.h"
 #include "../strerror.h"
 
diff --git a/lib/vquic/curl_ngtcp2.c b/lib/vquic/curl_ngtcp2.c
index fd7f9a3324..167e68aa33 100644
--- a/lib/vquic/curl_ngtcp2.c
+++ b/lib/vquic/curl_ngtcp2.c
@@ -69,8 +69,6 @@
 #include "../vtls/vtls_scache.h"
 #include "curl_ngtcp2.h"
 
-#include "../curlx/warnless.h"
-
 
 #define QUIC_MAX_STREAMS       (256 * 1024)
 #define QUIC_HANDSHAKE_TIMEOUT (10 * NGTCP2_SECONDS)
diff --git a/lib/vquic/curl_osslq.c b/lib/vquic/curl_osslq.c
index a3dc088e31..0afae1a25a 100644
--- a/lib/vquic/curl_osslq.c
+++ b/lib/vquic/curl_osslq.c
@@ -52,7 +52,6 @@
 #include "curl_osslq.h"
 #include "../url.h"
 #include "../bufref.h"
-#include "../curlx/warnless.h"
 #include "../curlx/strerr.h"
 
 /* A stream window is the maximum amount we need to buffer for
diff --git a/lib/vquic/curl_quiche.c b/lib/vquic/curl_quiche.c
index c06b091a0d..454de658ce 100644
--- a/lib/vquic/curl_quiche.c
+++ b/lib/vquic/curl_quiche.c
@@ -47,7 +47,6 @@
 #include "../transfer.h"
 #include "../url.h"
 #include "../bufref.h"
-#include "../curlx/warnless.h"
 #include "../vtls/openssl.h"
 #include "../vtls/keylog.h"
 #include "../vtls/vtls.h"
diff --git a/lib/vquic/vquic.c b/lib/vquic/vquic.c
index 3bc6835184..5869e70bbc 100644
--- a/lib/vquic/vquic.c
+++ b/lib/vquic/vquic.c
@@ -34,7 +34,6 @@
 #include "../bufq.h"
 #include "../curlx/dynbuf.h"
 #include "../curlx/fopen.h"
-#include "../curlx/warnless.h"
 #include "../cfilters.h"
 #include "../curl_trc.h"
 #include "curl_ngtcp2.h"
diff --git a/lib/vssh/libssh.c b/lib/vssh/libssh.c
index 2ed89c0c9b..b9cffa4b97 100644
--- a/lib/vssh/libssh.c
+++ b/lib/vssh/libssh.c
@@ -57,7 +57,6 @@
 #include "../curlx/strparse.h"
 #include "../multiif.h"
 #include "../select.h"
-#include "../curlx/warnless.h"
 #include "vssh.h"
 
 #ifdef HAVE_UNISTD_H
diff --git a/lib/vssh/libssh2.c b/lib/vssh/libssh2.c
index 284a095340..b448d9ea34 100644
--- a/lib/vssh/libssh2.c
+++ b/lib/vssh/libssh2.c
@@ -56,7 +56,6 @@
 #include "../multiif.h"
 #include "../select.h"
 #include "../curlx/fopen.h"
-#include "../curlx/warnless.h"
 #include "vssh.h"
 #include "../curlx/strparse.h"
 #include "../curlx/base64.h" /* for base64 encoding/decoding */
diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c
index 6ecb1deb43..62e81556dd 100644
--- a/lib/vtls/gtls.c
+++ b/lib/vtls/gtls.c
@@ -55,7 +55,6 @@
 #include "../strdup.h"
 #include "../curlx/fopen.h"
 #include "../curlx/timeval.h"
-#include "../curlx/warnless.h"
 #include "x509asn1.h"
 
 /* Enable GnuTLS debugging by defining GTLSDEBUG */
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 7201ecb724..de747926fa 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -119,8 +119,6 @@ static void ossl_provider_cleanup(struct Curl_easy *data);
 #define HAVE_SSL_CTX_SET_DEFAULT_READ_BUFFER_LEN 1
 #endif
 
-#include "../curlx/warnless.h"
-
 #if defined(USE_OPENSSL_ENGINE) || defined(OPENSSL_HAS_PROVIDERS)
 #include <openssl/ui.h>
 #endif
diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c
index 289f10d66f..823844e7e5 100644
--- a/lib/vtls/schannel.c
+++ b/lib/vtls/schannel.c
@@ -49,7 +49,6 @@
 #include "../select.h" /* for the socket readiness */
 #include "../curlx/fopen.h"
 #include "../curlx/multibyte.h"
-#include "../curlx/warnless.h"
 #include "x509asn1.h"
 #include "../system_win32.h"
 #include "../curlx/version_win32.h"
diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
index 88741e6013..3375e33c27 100644
--- a/lib/vtls/vtls.c
+++ b/lib/vtls/vtls.c
@@ -66,7 +66,6 @@
 #include "../curlx/fopen.h"
 #include "../curlx/timeval.h"
 #include "../curl_sha256.h"
-#include "../curlx/warnless.h"
 #include "../curlx/base64.h"
 #include "../curlx/inet_pton.h"
 #include "../connect.h"
diff --git a/lib/vtls/vtls_scache.c b/lib/vtls/vtls_scache.c
index b968d8b8f3..ea4ea4e68e 100644
--- a/lib/vtls/vtls_scache.c
+++ b/lib/vtls/vtls_scache.c
@@ -45,7 +45,6 @@
 #include "../curl_trc.h"
 #include "../curl_sha256.h"
 #include "../rand.h"
-#include "../curlx/warnless.h"
 
 
 static bool cf_ssl_peer_key_is_global(const char *peer_key);
diff --git a/lib/ws.c b/lib/ws.c
index 6bb4a7d742..0884ac58ef 100644
--- a/lib/ws.c
+++ b/lib/ws.c
@@ -39,7 +39,6 @@
 #include "transfer.h"
 #include "select.h"
 #include "curlx/strparse.h"
-#include "curlx/warnless.h"
 
 /***
     RFC 6455 Section 5.2