From: Viktor Szakats <commit@vsz.me>
Date: Sat, 20 Dec 2025 23:08:44 +0000 (+0100)
Subject: tidy-up: `curlx/nonblock.h` includes
X-Git-Tag: rc-8_18_0-3~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4298603b5754fd8cfa1c68862b7ff26d5c64695;p=thirdparty%2Fcurl.git

tidy-up: `curlx/nonblock.h` includes

Delete where unused, include where to used to avoid relying on
side-effect of other headers.

Also: delete "for curlx_nonblock" comments. That's the only symbol
offered by this header.

Closes #20055
---

diff --git a/lib/cf-ip-happy.h b/lib/cf-ip-happy.h
index 4129ec5610..71f212250f 100644
--- a/lib/cf-ip-happy.h
+++ b/lib/cf-ip-happy.h
@@ -25,8 +25,6 @@
  ***************************************************************************/
 #include "curl_setup.h"
 
-#include "curlx/nonblock.h" /* for curlx_nonblock() */
-
 /**
  * Create a cfilter for making an "ip" connection to the
  * given address, using parameters from `conn`. The "ip" connection
diff --git a/lib/cf-socket.c b/lib/cf-socket.c
index 051c0e3407..f4794eb6c3 100644
--- a/lib/cf-socket.c
+++ b/lib/cf-socket.c
@@ -72,6 +72,7 @@
 #include "rand.h"
 #include "strdup.h"
 #include "system_win32.h"
+#include "curlx/nonblock.h"
 #include "curlx/version_win32.h"
 #include "curlx/strerr.h"
 #include "curlx/strparse.h"
diff --git a/lib/cf-socket.h b/lib/cf-socket.h
index 26a1fc1017..9db492e1c3 100644
--- a/lib/cf-socket.h
+++ b/lib/cf-socket.h
@@ -25,7 +25,6 @@
  ***************************************************************************/
 #include "curl_setup.h"
 
-#include "curlx/nonblock.h" /* for curlx_nonblock() */
 #include "sockaddr.h" /* required for Curl_sockaddr_storage */
 
 struct Curl_addrinfo;
diff --git a/lib/connect.h b/lib/connect.h
index d0596f5ce9..01e9dfc029 100644
--- a/lib/connect.h
+++ b/lib/connect.h
@@ -25,7 +25,6 @@
  ***************************************************************************/
 #include "curl_setup.h"
 
-#include "curlx/nonblock.h" /* for curlx_nonblock() */
 #include "curlx/timeval.h"
 
 struct Curl_dns_entry;
diff --git a/lib/curl_rtmp.c b/lib/curl_rtmp.c
index 90f8f6bbc8..fd0bfe5f4f 100644
--- a/lib/curl_rtmp.c
+++ b/lib/curl_rtmp.c
@@ -30,7 +30,7 @@
 #include "curl_rtmp.h"
 #include "urldata.h"
 #include "url.h"
-#include "curlx/nonblock.h" /* for curlx_nonblock */
+#include "curlx/nonblock.h"
 #include "progress.h" /* for Curl_pgrsSetUploadSize */
 #include "transfer.h"
 #include "bufref.h"
diff --git a/lib/socketpair.c b/lib/socketpair.c
index 5a9ccb4aed..756fd7f181 100644
--- a/lib/socketpair.c
+++ b/lib/socketpair.c
@@ -23,9 +23,11 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
+
 #include "socketpair.h"
 #include "urldata.h"
 #include "rand.h"
+#include "curlx/nonblock.h"
 
 #ifdef USE_EVENTFD
 
@@ -122,7 +124,6 @@ int Curl_socketpair(int domain, int type, int protocol,
 #define INADDR_LOOPBACK 0x7f000001
 #endif
 
-#include "curlx/nonblock.h" /* for curlx_nonblock */
 #include "curlx/timeval.h"  /* needed before select.h */
 #include "select.h"   /* for Curl_poll */
 
diff --git a/lib/socks_gssapi.c b/lib/socks_gssapi.c
index 3bee643e41..4df1fc1d20 100644
--- a/lib/socks_gssapi.c
+++ b/lib/socks_gssapi.c
@@ -32,6 +32,7 @@
 #include "sendf.h"
 #include "cfilters.h"
 #include "connect.h"
+#include "curlx/nonblock.h"
 #include "curlx/timeval.h"
 #include "socks.h"
 #include "curlx/warnless.h"
diff --git a/lib/socks_sspi.c b/lib/socks_sspi.c
index 84d530151c..7d6ac253c3 100644
--- a/lib/socks_sspi.c
+++ b/lib/socks_sspi.c
@@ -32,6 +32,7 @@
 #include "cfilters.h"
 #include "connect.h"
 #include "strerror.h"
+#include "curlx/nonblock.h"
 #include "curlx/timeval.h"
 #include "socks.h"
 #include "curl_sspi.h"
diff --git a/lib/ws.c b/lib/ws.c
index 7cba8fe094..6bb4a7d742 100644
--- a/lib/ws.c
+++ b/lib/ws.c
@@ -38,7 +38,6 @@
 #include "easyif.h"
 #include "transfer.h"
 #include "select.h"
-#include "curlx/nonblock.h"
 #include "curlx/strparse.h"
 #include "curlx/warnless.h"