From: Viktor Szakats <commit@vsz.me>
Date: Sun, 21 Dec 2025 01:40:10 +0000 (+0100)
Subject: lib: drop, or replace `sendf.h` with `curl_trc.h` where possible
X-Git-Tag: rc-8_18_0-3~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8415a8296f76c0f030b09f79eb75ebf8d71b8b8;p=thirdparty%2Fcurl.git

lib: drop, or replace `sendf.h` with `curl_trc.h` where possible

- replace `sendf.h` with `curl_trc.h` where it was included just for it.
- drop unused `curl_trc.h` includes.
- easy: delete obsolete comment about `send.h` include reason.

Also:
- move out `curl_trc.h` include from `sendf.h` and include it directly
  in users, where not done already. To flatten the include tree and
  to less rely on indirect includes.
- stop including `sendf.h` from other headers, replace it with forward
  declaration of `Curl_easy`, as done already elsewhere.

Verified with an all non-unity CI run.

Closes #20061
---

diff --git a/lib/altsvc.c b/lib/altsvc.c
index 3aa88c2cdb..b4bb875438 100644
--- a/lib/altsvc.c
+++ b/lib/altsvc.c
@@ -33,7 +33,7 @@
 #include "curl_fopen.h"
 #include "curl_get_line.h"
 #include "parsedate.h"
-#include "sendf.h"
+#include "curl_trc.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 396ebe65e1..d723de9873 100644
--- a/lib/asyn-ares.c
+++ b/lib/asyn-ares.c
@@ -48,7 +48,7 @@
 
 #include "urldata.h"
 #include "cfilters.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "hostip.h"
 #include "url.h"
 #include "multiif.h"
diff --git a/lib/asyn-base.c b/lib/asyn-base.c
index 4eb6979177..398e41dffd 100644
--- a/lib/asyn-base.c
+++ b/lib/asyn-base.c
@@ -46,7 +46,6 @@
 
 #include "urldata.h"
 #include "asyn.h"
-#include "sendf.h"
 #include "hostip.h"
 #include "multiif.h"
 #include "select.h"
diff --git a/lib/asyn-thrdd.c b/lib/asyn-thrdd.c
index b7fffa5a79..64251ae57e 100644
--- a/lib/asyn-thrdd.c
+++ b/lib/asyn-thrdd.c
@@ -56,7 +56,7 @@
 
 #include "urldata.h"
 #include "cfilters.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "hostip.h"
 #include "url.h"
 #include "multiif.h"
diff --git a/lib/cf-socket.c b/lib/cf-socket.c
index 28326ee78f..ab28bc40aa 100644
--- a/lib/cf-socket.c
+++ b/lib/cf-socket.c
@@ -57,7 +57,7 @@
 
 #include "urldata.h"
 #include "bufq.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "if2ip.h"
 #include "cfilters.h"
 #include "cf-socket.h"
diff --git a/lib/cfilters.c b/lib/cfilters.c
index 495ba078ba..5f3e511117 100644
--- a/lib/cfilters.c
+++ b/lib/cfilters.c
@@ -29,7 +29,7 @@
 #include "cfilters.h"
 #include "connect.h"
 #include "url.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "progress.h"
 #include "select.h"
 #include "curlx/strparse.h"
diff --git a/lib/conncache.c b/lib/conncache.c
index 7556193171..7fccde05e1 100644
--- a/lib/conncache.c
+++ b/lib/conncache.c
@@ -30,7 +30,7 @@
 #include "cfilters.h"
 #include "progress.h"
 #include "multiif.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "cshutdn.h"
 #include "conncache.h"
 #include "curl_share.h"
diff --git a/lib/connect.c b/lib/connect.c
index 3e1cda561b..bb51701d0c 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -51,7 +51,7 @@
 #endif
 
 #include "urldata.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "strerror.h"
 #include "cfilters.h"
 #include "connect.h"
diff --git a/lib/content_encoding.c b/lib/content_encoding.c
index 50e82fab3c..3139c5384c 100644
--- a/lib/content_encoding.c
+++ b/lib/content_encoding.c
@@ -47,6 +47,7 @@
 #endif
 
 #include "sendf.h"
+#include "curl_trc.h"
 #include "http.h"
 #include "content_encoding.h"
 
diff --git a/lib/cookie.c b/lib/cookie.c
index 05a49f2d5e..cb81c8e6cc 100644
--- a/lib/cookie.c
+++ b/lib/cookie.c
@@ -29,7 +29,7 @@
 #include "urldata.h"
 #include "cookie.h"
 #include "psl.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "slist.h"
 #include "curl_share.h"
 #include "strcase.h"
diff --git a/lib/cshutdn.c b/lib/cshutdn.c
index 34aacf949b..c7f2d6610a 100644
--- a/lib/cshutdn.c
+++ b/lib/cshutdn.c
@@ -31,7 +31,7 @@
 #include "progress.h"
 #include "multiif.h"
 #include "multi_ev.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "cshutdn.h"
 #include "sigpipe.h"
 #include "connect.h"
diff --git a/lib/curl_gssapi.c b/lib/curl_gssapi.c
index 31addb8fbc..efd293f15e 100644
--- a/lib/curl_gssapi.c
+++ b/lib/curl_gssapi.c
@@ -27,7 +27,7 @@
 #ifdef HAVE_GSSAPI
 
 #include "curl_gssapi.h"
-#include "sendf.h"
+#include "curl_trc.h"
 
 #ifdef DEBUGBUILD
 #if defined(HAVE_GSSGNU) || !defined(_WIN32)
diff --git a/lib/curl_sasl.c b/lib/curl_sasl.c
index 22acd23411..f71c909a68 100644
--- a/lib/curl_sasl.c
+++ b/lib/curl_sasl.c
@@ -44,7 +44,7 @@
 #include "vauth/vauth.h"
 #include "cfilters.h"
 #include "curl_sasl.h"
-#include "sendf.h"
+#include "curl_trc.h"
 
 /* Supported mechanisms */
 static const struct {
diff --git a/lib/cw-out.c b/lib/cw-out.c
index e0cf54b814..ad880504a8 100644
--- a/lib/cw-out.c
+++ b/lib/cw-out.c
@@ -28,6 +28,7 @@
 #include "cfilters.h"
 #include "multiif.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "transfer.h"
 #include "cw-out.h"
 #include "cw-pause.h"
diff --git a/lib/cw-out.h b/lib/cw-out.h
index 89b9985bb5..fce868d4e4 100644
--- a/lib/cw-out.h
+++ b/lib/cw-out.h
@@ -26,7 +26,7 @@
 
 #include "curl_setup.h"
 
-#include "sendf.h"
+struct Curl_easy;
 
 /**
  * The client writer type "cw-out" that does the actual writing to
diff --git a/lib/cw-pause.c b/lib/cw-pause.c
index 4b8cf4ec1e..69fd675c38 100644
--- a/lib/cw-pause.c
+++ b/lib/cw-pause.c
@@ -28,6 +28,7 @@
 #include "bufq.h"
 #include "cfilters.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "cw-pause.h"
 
 
diff --git a/lib/cw-pause.h b/lib/cw-pause.h
index 5421bfd663..4f436059ce 100644
--- a/lib/cw-pause.h
+++ b/lib/cw-pause.h
@@ -26,7 +26,7 @@
 
 #include "curl_setup.h"
 
-#include "sendf.h"
+struct Curl_easy;
 
 /**
  * The client writer type "cw-pause" that buffers writes for
diff --git a/lib/dict.c b/lib/dict.c
index 2e5883770f..38d79db057 100644
--- a/lib/dict.c
+++ b/lib/dict.c
@@ -54,7 +54,7 @@
 
 #include "urldata.h"
 #include "transfer.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "escape.h"
 #include "dict.h"
 
diff --git a/lib/doh.c b/lib/doh.c
index 610469222a..d7d25694c8 100644
--- a/lib/doh.c
+++ b/lib/doh.c
@@ -30,7 +30,7 @@
 #include "curl_addrinfo.h"
 #include "doh.h"
 
-#include "sendf.h"
+#include "curl_trc.h"
 #include "multiif.h"
 #include "url.h"
 #include "connect.h"
diff --git a/lib/easy.c b/lib/easy.c
index 3e3ac4cff8..8926422780 100644
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -58,7 +58,8 @@
 #include "multi_ev.h"
 #include "select.h"
 #include "cfilters.h"
-#include "sendf.h" /* for failf function prototype */
+#include "sendf.h"
+#include "curl_trc.h"
 #include "connect.h" /* for Curl_getconnectinfo */
 #include "slist.h"
 #include "mime.h"
diff --git a/lib/file.c b/lib/file.c
index be2f354f60..a8617c213a 100644
--- a/lib/file.c
+++ b/lib/file.c
@@ -57,6 +57,7 @@
 #include "urldata.h"
 #include "progress.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "escape.h"
 #include "file.h"
 #include "multiif.h"
diff --git a/lib/formdata.c b/lib/formdata.c
index 358bb4c498..576b644496 100644
--- a/lib/formdata.c
+++ b/lib/formdata.c
@@ -32,7 +32,6 @@ struct Curl_easy;
 
 #include "urldata.h" /* for struct Curl_easy */
 #include "mime.h"
-#include "sendf.h"
 #include "strdup.h"
 #include "bufref.h"
 #include "curlx/fopen.h"
diff --git a/lib/ftp.c b/lib/ftp.c
index 94735d22f5..a402dde5d8 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -42,6 +42,7 @@
 
 #include "urldata.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "if2ip.h"
 #include "hostip.h"
 #include "progress.h"
diff --git a/lib/gopher.c b/lib/gopher.c
index 348e675561..826de91512 100644
--- a/lib/gopher.c
+++ b/lib/gopher.c
@@ -29,6 +29,7 @@
 #include "urldata.h"
 #include "transfer.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "cfilters.h"
 #include "connect.h"
 #include "gopher.h"
diff --git a/lib/headers.c b/lib/headers.c
index 3ce3e01483..5ad73dad01 100644
--- a/lib/headers.c
+++ b/lib/headers.c
@@ -26,6 +26,7 @@
 
 #include "urldata.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "headers.h"
 
 #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_HEADERS_API)
diff --git a/lib/hostip.c b/lib/hostip.c
index aa10839c20..2cf8d4bb1e 100644
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -45,7 +45,7 @@
 #include <signal.h>
 
 #include "urldata.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "connect.h"
 #include "hostip.h"
 #include "hash.h"
diff --git a/lib/hostip4.c b/lib/hostip4.c
index 40f709fdc0..785ca24933 100644
--- a/lib/hostip4.c
+++ b/lib/hostip4.c
@@ -44,7 +44,7 @@
 #endif
 
 #include "urldata.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "hostip.h"
 #include "url.h"
 
diff --git a/lib/hostip6.c b/lib/hostip6.c
index 2eabf753f4..d0d67196c4 100644
--- a/lib/hostip6.c
+++ b/lib/hostip6.c
@@ -45,7 +45,7 @@
 
 #include "urldata.h"
 #include "cfilters.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "hostip.h"
 #include "url.h"
 #include "curlx/inet_pton.h"
diff --git a/lib/hsts.c b/lib/hsts.c
index d9b9f916b1..393572a6c2 100644
--- a/lib/hsts.c
+++ b/lib/hsts.c
@@ -33,7 +33,6 @@
 #include "hsts.h"
 #include "curl_fopen.h"
 #include "curl_get_line.h"
-#include "sendf.h"
 #include "parsedate.h"
 #include "curl_share.h"
 #include "curlx/strparse.h"
diff --git a/lib/http.c b/lib/http.c
index 69361b88ec..bf38d35dde 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -50,6 +50,7 @@
 #include "urldata.h"
 #include "transfer.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "formdata.h"
 #include "mime.h"
 #include "progress.h"
diff --git a/lib/http2.c b/lib/http2.c
index 29ca95cb09..061c4d67fb 100644
--- a/lib/http2.c
+++ b/lib/http2.c
@@ -35,6 +35,7 @@
 #include "http2.h"
 #include "http.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "select.h"
 #include "curlx/base64.h"
 #include "multiif.h"
diff --git a/lib/http_aws_sigv4.c b/lib/http_aws_sigv4.c
index 7bc3af8b42..d2493b0b0e 100644
--- a/lib/http_aws_sigv4.c
+++ b/lib/http_aws_sigv4.c
@@ -32,7 +32,7 @@
 #include "http_aws_sigv4.h"
 #include "curl_sha256.h"
 #include "transfer.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "escape.h"
 #include "curlx/strparse.h"
 #include "curlx/timeval.h"
diff --git a/lib/http_negotiate.c b/lib/http_negotiate.c
index 2929f7980a..a8e715a7b9 100644
--- a/lib/http_negotiate.c
+++ b/lib/http_negotiate.c
@@ -28,7 +28,7 @@
 
 #include "urldata.h"
 #include "cfilters.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "http_negotiate.h"
 #include "vauth/vauth.h"
 #include "vtls/vtls.h"
diff --git a/lib/http_ntlm.c b/lib/http_ntlm.c
index 62a33021ba..e5c97269b1 100644
--- a/lib/http_ntlm.c
+++ b/lib/http_ntlm.c
@@ -34,7 +34,7 @@
  */
 
 #include "urldata.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "strcase.h"
 #include "http_ntlm.h"
 #include "curl_ntlm_core.h"
diff --git a/lib/http_proxy.c b/lib/http_proxy.c
index 3101f5f0a9..088954f230 100644
--- a/lib/http_proxy.c
+++ b/lib/http_proxy.c
@@ -28,7 +28,7 @@
 
 #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_PROXY)
 
-#include "sendf.h"
+#include "curl_trc.h"
 #include "http.h"
 #include "url.h"
 #include "cfilters.h"
diff --git a/lib/httpsrr.c b/lib/httpsrr.c
index 25abd80e11..7013be5b66 100644
--- a/lib/httpsrr.c
+++ b/lib/httpsrr.c
@@ -29,7 +29,7 @@
 #include "urldata.h"
 #include "httpsrr.h"
 #include "connect.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "strdup.h"
 
 static CURLcode httpsrr_decode_alpn(const uint8_t *cp, size_t len,
diff --git a/lib/idn.c b/lib/idn.c
index 1907a224bf..b3618c2de3 100644
--- a/lib/idn.c
+++ b/lib/idn.c
@@ -30,7 +30,6 @@
 
 #include "urldata.h"
 #include "idn.h"
-#include "sendf.h"
 
 #ifdef USE_LIBIDN2
 #include <idn2.h>
diff --git a/lib/imap.c b/lib/imap.c
index b826b67bde..20455a957a 100644
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -56,6 +56,7 @@
 #include "curlx/dynbuf.h"
 #include "urldata.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "hostip.h"
 #include "progress.h"
 #include "transfer.h"
diff --git a/lib/ldap.c b/lib/ldap.c
index 7e8ffcae34..cad6203eeb 100644
--- a/lib/ldap.c
+++ b/lib/ldap.c
@@ -79,6 +79,7 @@
 #include "urldata.h"
 #include "cfilters.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "escape.h"
 #include "progress.h"
 #include "transfer.h"
diff --git a/lib/mime.c b/lib/mime.c
index 31b5306bf1..393d709ed5 100644
--- a/lib/mime.c
+++ b/lib/mime.c
@@ -29,6 +29,7 @@ struct Curl_easy;
 #include "mime.h"
 #include "urldata.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "transfer.h"
 #include "strdup.h"
 #include "curlx/fopen.h"
diff --git a/lib/mqtt.c b/lib/mqtt.c
index 27b1633178..bc9671cc17 100644
--- a/lib/mqtt.c
+++ b/lib/mqtt.c
@@ -30,6 +30,7 @@
 #include "urldata.h"
 #include "transfer.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "progress.h"
 #include "mqtt.h"
 #include "select.h"
diff --git a/lib/multi.c b/lib/multi.c
index 710df8548d..7c03de20a2 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -35,6 +35,7 @@
 #include "multiif.h"
 #include "multi_ev.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "curlx/timeval.h"
 #include "http.h"
 #include "select.h"
diff --git a/lib/openldap.c b/lib/openldap.c
index b33e7a1d36..e78080ab83 100644
--- a/lib/openldap.c
+++ b/lib/openldap.c
@@ -43,6 +43,7 @@
 #include "urldata.h"
 #include "url.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "vtls/vtls.h"
 #include "transfer.h"
 #include "curl_ldap.h"
diff --git a/lib/pingpong.c b/lib/pingpong.c
index 5b10bd6164..8c5cf05fc2 100644
--- a/lib/pingpong.c
+++ b/lib/pingpong.c
@@ -31,6 +31,7 @@
 #include "cfilters.h"
 #include "connect.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "select.h"
 #include "progress.h"
 #include "pingpong.h"
diff --git a/lib/pop3.c b/lib/pop3.c
index a1321125b9..f0216db25a 100644
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -57,6 +57,7 @@
 
 #include "urldata.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "hostip.h"
 #include "progress.h"
 #include "transfer.h"
diff --git a/lib/progress.c b/lib/progress.c
index ed842cefcd..18dde19163 100644
--- a/lib/progress.c
+++ b/lib/progress.c
@@ -25,7 +25,7 @@
 #include "curl_setup.h"
 
 #include "urldata.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "multiif.h"
 #include "progress.h"
 #include "transfer.h"
diff --git a/lib/rand.c b/lib/rand.c
index 15c5a3296e..4689a04b00 100644
--- a/lib/rand.c
+++ b/lib/rand.c
@@ -30,7 +30,7 @@
 
 #include "urldata.h"
 #include "vtls/vtls.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "curlx/timeval.h"
 #include "rand.h"
 #include "escape.h"
diff --git a/lib/request.c b/lib/request.c
index fd916768ad..c8781b70bf 100644
--- a/lib/request.c
+++ b/lib/request.c
@@ -31,6 +31,7 @@
 #include "progress.h"
 #include "request.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "transfer.h"
 #include "url.h"
 #include "curlx/strparse.h"
diff --git a/lib/rtsp.c b/lib/rtsp.c
index 47c993c960..063ab7eb92 100644
--- a/lib/rtsp.c
+++ b/lib/rtsp.c
@@ -29,6 +29,7 @@
 #include "urldata.h"
 #include "transfer.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "multiif.h"
 #include "http.h"
 #include "url.h"
diff --git a/lib/sendf.c b/lib/sendf.c
index b2b5d0f9fe..b50e3dcac1 100644
--- a/lib/sendf.c
+++ b/lib/sendf.c
@@ -36,6 +36,7 @@
 
 #include "urldata.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "transfer.h"
 #include "cfilters.h"
 #include "connect.h"
diff --git a/lib/sendf.h b/lib/sendf.h
index 7b983c5271..a11010d8ad 100644
--- a/lib/sendf.h
+++ b/lib/sendf.h
@@ -26,8 +26,6 @@
 
 #include "curl_setup.h"
 
-#include "curl_trc.h"
-
 /**
  * Type of data that is being written to the client (application)
  * - data written can be either BODY or META data
@@ -55,6 +53,7 @@
 /* Forward declarations */
 struct Curl_creader;
 struct Curl_cwriter;
+struct Curl_easy;
 
 /**
  * Write `len` bytes at `prt` to the client. `type` indicates what
diff --git a/lib/setopt.c b/lib/setopt.c
index f6e1d7643f..2bdb6a3473 100644
--- a/lib/setopt.c
+++ b/lib/setopt.c
@@ -41,7 +41,7 @@
 #include "strcase.h"
 #include "curl_share.h"
 #include "vtls/vtls.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "hostip.h"
 #include "http2.h"
 #include "setopt.h"
diff --git a/lib/smb.c b/lib/smb.c
index 45f9ca9e0b..d9eeec83a5 100644
--- a/lib/smb.c
+++ b/lib/smb.c
@@ -31,6 +31,7 @@
 #include "urldata.h"
 #include "url.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "cfilters.h"
 #include "connect.h"
 #include "progress.h"
diff --git a/lib/smtp.c b/lib/smtp.c
index f868179bed..031dcc9bda 100644
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -59,6 +59,7 @@
 
 #include "urldata.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "hostip.h"
 #include "progress.h"
 #include "transfer.h"
diff --git a/lib/socks.c b/lib/socks.c
index 21c9aa6369..5306214557 100644
--- a/lib/socks.c
+++ b/lib/socks.c
@@ -35,7 +35,7 @@
 
 #include "urldata.h"
 #include "bufq.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "select.h"
 #include "cfilters.h"
 #include "connect.h"
diff --git a/lib/socks_gssapi.c b/lib/socks_gssapi.c
index 9523d936dd..ce493c0393 100644
--- a/lib/socks_gssapi.c
+++ b/lib/socks_gssapi.c
@@ -29,7 +29,7 @@
 
 #include "curl_gssapi.h"
 #include "urldata.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "cfilters.h"
 #include "connect.h"
 #include "curlx/nonblock.h"
diff --git a/lib/socks_sspi.c b/lib/socks_sspi.c
index 560df24205..4a206a06ad 100644
--- a/lib/socks_sspi.c
+++ b/lib/socks_sspi.c
@@ -28,7 +28,7 @@
 #if defined(USE_WINDOWS_SSPI) && !defined(CURL_DISABLE_PROXY)
 
 #include "urldata.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "cfilters.h"
 #include "connect.h"
 #include "strerror.h"
diff --git a/lib/telnet.c b/lib/telnet.c
index 03a5bb7f45..b4589158e9 100644
--- a/lib/telnet.c
+++ b/lib/telnet.c
@@ -50,6 +50,7 @@
 #include "url.h"
 #include "transfer.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "telnet.h"
 #include "connect.h"
 #include "progress.h"
diff --git a/lib/tftp.c b/lib/tftp.c
index d60ab52fc2..d457611662 100644
--- a/lib/tftp.c
+++ b/lib/tftp.c
@@ -51,6 +51,7 @@
 #include "cf-socket.h"
 #include "transfer.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "tftp.h"
 #include "progress.h"
 #include "connect.h"
diff --git a/lib/transfer.c b/lib/transfer.c
index 30ca3cb4de..c365d0896d 100644
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -62,6 +62,7 @@
 #include "cw-out.h"
 #include "transfer.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "progress.h"
 #include "http.h"
 #include "url.h"
diff --git a/lib/url.c b/lib/url.c
index d605adb3a0..7f439b5449 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -74,7 +74,7 @@
 #include "vtls/vtls.h"
 #include "hostip.h"
 #include "transfer.h"
-#include "sendf.h"
+#include "curl_trc.h"
 #include "progress.h"
 #include "cookie.h"
 #include "strcase.h"
diff --git a/lib/vauth/cleartext.c b/lib/vauth/cleartext.c
index 90e9178491..a3e83d74f4 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 "../sendf.h"
 
 /*
  * Curl_auth_create_plain_message()
diff --git a/lib/vauth/digest_sspi.c b/lib/vauth/digest_sspi.c
index 46377d22b2..bc681d13dc 100644
--- a/lib/vauth/digest_sspi.c
+++ b/lib/vauth/digest_sspi.c
@@ -32,7 +32,7 @@
 #include "vauth.h"
 #include "digest.h"
 #include "../curlx/multibyte.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 #include "../strdup.h"
 #include "../strcase.h"
 #include "../strerror.h"
diff --git a/lib/vauth/gsasl.c b/lib/vauth/gsasl.c
index 896a246932..2f82254608 100644
--- a/lib/vauth/gsasl.c
+++ b/lib/vauth/gsasl.c
@@ -29,7 +29,7 @@
 #ifdef USE_GSASL
 
 #include "vauth.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 
 #include <gsasl.h>
 
diff --git a/lib/vauth/krb5_gssapi.c b/lib/vauth/krb5_gssapi.c
index ac79418435..64797190ce 100644
--- a/lib/vauth/krb5_gssapi.c
+++ b/lib/vauth/krb5_gssapi.c
@@ -32,7 +32,7 @@
 #include "vauth.h"
 #include "../curl_sasl.h"
 #include "../curl_gssapi.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 
 #if defined(__GNUC__) && defined(__APPLE__)
 #pragma GCC diagnostic push
diff --git a/lib/vauth/krb5_sspi.c b/lib/vauth/krb5_sspi.c
index 8159c88aec..d88ee79bde 100644
--- a/lib/vauth/krb5_sspi.c
+++ b/lib/vauth/krb5_sspi.c
@@ -29,7 +29,7 @@
 #if defined(USE_WINDOWS_SSPI) && defined(USE_KERBEROS5)
 
 #include "vauth.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 
 /*
  * Curl_auth_is_gssapi_supported()
diff --git a/lib/vauth/ntlm.c b/lib/vauth/ntlm.c
index c5b2263622..620f2a5c84 100644
--- a/lib/vauth/ntlm.c
+++ b/lib/vauth/ntlm.c
@@ -36,7 +36,7 @@
 #define DEBUG_ME 0
 
 #include "vauth.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 #include "../curl_ntlm_core.h"
 #include "../rand.h"
 #include "../strdup.h"
diff --git a/lib/vauth/ntlm_sspi.c b/lib/vauth/ntlm_sspi.c
index eea18281e5..3d6712766e 100644
--- a/lib/vauth/ntlm_sspi.c
+++ b/lib/vauth/ntlm_sspi.c
@@ -28,7 +28,7 @@
 
 #include "vauth.h"
 #include "../curl_ntlm_core.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 #include "../strdup.h"
 
 /*
diff --git a/lib/vauth/spnego_gssapi.c b/lib/vauth/spnego_gssapi.c
index a1c92612c6..08689fe5e0 100644
--- a/lib/vauth/spnego_gssapi.c
+++ b/lib/vauth/spnego_gssapi.c
@@ -31,7 +31,7 @@
 #include "vauth.h"
 #include "../curlx/base64.h"
 #include "../curl_gssapi.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 
 #if defined(__GNUC__) && defined(__APPLE__)
 #pragma GCC diagnostic push
diff --git a/lib/vauth/spnego_sspi.c b/lib/vauth/spnego_sspi.c
index 68adb8591b..280753e396 100644
--- a/lib/vauth/spnego_sspi.c
+++ b/lib/vauth/spnego_sspi.c
@@ -30,7 +30,7 @@
 
 #include "vauth.h"
 #include "../curlx/base64.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 #include "../strerror.h"
 
 /*
diff --git a/lib/vquic/curl_ngtcp2.c b/lib/vquic/curl_ngtcp2.c
index 167e68aa33..20b9240f09 100644
--- a/lib/vquic/curl_ngtcp2.c
+++ b/lib/vquic/curl_ngtcp2.c
@@ -49,7 +49,7 @@
 #include "../urldata.h"
 #include "../url.h"
 #include "../uint-hash.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 #include "../rand.h"
 #include "../multiif.h"
 #include "../cfilters.h"
diff --git a/lib/vquic/curl_osslq.c b/lib/vquic/curl_osslq.c
index 0afae1a25a..b2394d287c 100644
--- a/lib/vquic/curl_osslq.c
+++ b/lib/vquic/curl_osslq.c
@@ -33,7 +33,7 @@
 #include <nghttp3/nghttp3.h>
 
 #include "../urldata.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 #include "../multiif.h"
 #include "../cfilters.h"
 #include "../cf-socket.h"
diff --git a/lib/vquic/curl_quiche.c b/lib/vquic/curl_quiche.c
index 454de658ce..c85336cd02 100644
--- a/lib/vquic/curl_quiche.c
+++ b/lib/vquic/curl_quiche.c
@@ -33,7 +33,7 @@
 #include "../urldata.h"
 #include "../cfilters.h"
 #include "../cf-socket.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 #include "../rand.h"
 #include "../multiif.h"
 #include "../connect.h"
diff --git a/lib/vquic/vquic-tls.c b/lib/vquic/vquic-tls.c
index 1edbbd54e6..204a722249 100644
--- a/lib/vquic/vquic-tls.c
+++ b/lib/vquic/vquic-tls.c
@@ -45,7 +45,6 @@
 #endif
 
 #include "../urldata.h"
-#include "../curl_trc.h"
 #include "../cfilters.h"
 #include "../vtls/keylog.h"
 #include "../vtls/vtls.h"
diff --git a/lib/vssh/libssh.c b/lib/vssh/libssh.c
index b9cffa4b97..327f3ee661 100644
--- a/lib/vssh/libssh.c
+++ b/lib/vssh/libssh.c
@@ -45,6 +45,7 @@
 
 #include "../urldata.h"
 #include "../sendf.h"
+#include "../curl_trc.h"
 #include "../hostip.h"
 #include "../progress.h"
 #include "../transfer.h"
diff --git a/lib/vssh/libssh2.c b/lib/vssh/libssh2.c
index b448d9ea34..3f81dbd853 100644
--- a/lib/vssh/libssh2.c
+++ b/lib/vssh/libssh2.c
@@ -44,6 +44,7 @@
 
 #include "../urldata.h"
 #include "../sendf.h"
+#include "../curl_trc.h"
 #include "../hostip.h"
 #include "../progress.h"
 #include "../transfer.h"
diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c
index 62e81556dd..dbc72c521d 100644
--- a/lib/vtls/gtls.c
+++ b/lib/vtls/gtls.c
@@ -41,7 +41,7 @@
 #include <nettle/sha2.h>
 
 #include "../urldata.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 #include "keylog.h"
 #include "gtls.h"
 #include "vtls.h"
diff --git a/lib/vtls/mbedtls.c b/lib/vtls/mbedtls.c
index 6ef267f639..46bfa0967e 100644
--- a/lib/vtls/mbedtls.c
+++ b/lib/vtls/mbedtls.c
@@ -60,7 +60,7 @@
 #endif
 #include "cipher_suite.h"
 #include "../urldata.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 #include "mbedtls.h"
 #include "vtls.h"
 #include "vtls_int.h"
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index de747926fa..99ee20974c 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -44,7 +44,7 @@
 #endif
 
 #include "../urldata.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 #include "../formdata.h" /* for the boundary function */
 #include "../url.h" /* for the ssl config check function */
 #include "../curlx/inet_pton.h"
diff --git a/lib/vtls/rustls.c b/lib/vtls/rustls.c
index ae03311d12..014f11b4f0 100644
--- a/lib/vtls/rustls.c
+++ b/lib/vtls/rustls.c
@@ -33,7 +33,7 @@
 #include "../curlx/fopen.h"
 #include "../curlx/strerr.h"
 #include "../urldata.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 #include "vtls.h"
 #include "vtls_int.h"
 #include "rustls.h"
diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c
index 823844e7e5..2575a9f8f9 100644
--- a/lib/vtls/schannel.c
+++ b/lib/vtls/schannel.c
@@ -42,7 +42,7 @@
 #include "vtls.h"
 #include "vtls_int.h"
 #include "vtls_scache.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 #include "../connect.h" /* for the connect timeout */
 #include "../strdup.h"
 #include "../strerror.h"
diff --git a/lib/vtls/schannel_verify.c b/lib/vtls/schannel_verify.c
index bb8a30919b..e3525a1105 100644
--- a/lib/vtls/schannel_verify.c
+++ b/lib/vtls/schannel_verify.c
@@ -43,7 +43,7 @@
 #include "../curlx/inet_pton.h"
 #include "vtls.h"
 #include "vtls_int.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 #include "../strerror.h"
 #include "../curlx/winapi.h"
 #include "../curlx/multibyte.h"
diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
index 3375e33c27..ed63842b36 100644
--- a/lib/vtls/vtls.c
+++ b/lib/vtls/vtls.c
@@ -59,7 +59,7 @@
 #include "rustls.h"         /* Rustls versions */
 
 #include "../slist.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 #include "../strcase.h"
 #include "../url.h"
 #include "../progress.h"
diff --git a/lib/vtls/wolfssl.c b/lib/vtls/wolfssl.c
index b5c78a56b5..9f75b54df3 100644
--- a/lib/vtls/wolfssl.c
+++ b/lib/vtls/wolfssl.c
@@ -54,7 +54,7 @@
 #endif
 
 #include "../urldata.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 #include "vtls.h"
 #include "vtls_int.h"
 #include "vtls_scache.h"
diff --git a/lib/vtls/x509asn1.c b/lib/vtls/x509asn1.c
index c8752b848e..e23331e9d6 100644
--- a/lib/vtls/x509asn1.c
+++ b/lib/vtls/x509asn1.c
@@ -39,7 +39,7 @@
 
 #include "../urldata.h"
 #include "vtls.h"
-#include "../sendf.h"
+#include "../curl_trc.h"
 #include "../curlx/base64.h"
 #include "x509asn1.h"
 #include "../curlx/dynbuf.h"
diff --git a/lib/ws.c b/lib/ws.c
index 0884ac58ef..c97586ec02 100644
--- a/lib/ws.c
+++ b/lib/ws.c
@@ -33,6 +33,7 @@
 #include "curlx/base64.h"
 #include "connect.h"
 #include "sendf.h"
+#include "curl_trc.h"
 #include "multiif.h"
 #include "ws.h"
 #include "easyif.h"
diff --git a/tests/unit/unit1652.c b/tests/unit/unit1652.c
index aa4de802d6..da0df33b4d 100644
--- a/tests/unit/unit1652.c
+++ b/tests/unit/unit1652.c
@@ -24,7 +24,7 @@
 #include "unitcheck.h"
 
 #include "urldata.h"
-#include "sendf.h"
+#include "curl_trc.h"
 
 /*
  * This test hardcodes the knowledge of the buffer size which is internal to