From: Viktor Szakats Date: Sun, 28 Dec 2025 15:48:32 +0000 (+0100) Subject: dns: flatten the include tree X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57ff2d6c918d0bb444e5a8a53405217aec116b1b;p=thirdparty%2Fcurl.git dns: flatten the include tree Closes #20106 --- diff --git a/lib/amigaos.c b/lib/amigaos.c index 7ce5045851..d2afdbf910 100644 --- a/lib/amigaos.c +++ b/lib/amigaos.c @@ -26,6 +26,7 @@ #ifdef __AMIGA__ #include "hostip.h" +#include "curl_addrinfo.h" #include "amigaos.h" #ifdef HAVE_PROTO_BSDSOCKET_H diff --git a/lib/asyn-ares.c b/lib/asyn-ares.c index 84ffa39f27..a7af7bbfbb 100644 --- a/lib/asyn-ares.c +++ b/lib/asyn-ares.c @@ -47,6 +47,7 @@ #include "urldata.h" #include "cfilters.h" +#include "curl_addrinfo.h" #include "curl_trc.h" #include "hostip.h" #include "url.h" diff --git a/lib/asyn-base.c b/lib/asyn-base.c index 02797f1afb..f35e1c988c 100644 --- a/lib/asyn-base.c +++ b/lib/asyn-base.c @@ -43,7 +43,6 @@ #endif #include "urldata.h" -#include "asyn.h" #include "hostip.h" #include "multiif.h" #include "select.h" diff --git a/lib/asyn-thrdd.c b/lib/asyn-thrdd.c index 51bd098169..55f65cd5ae 100644 --- a/lib/asyn-thrdd.c +++ b/lib/asyn-thrdd.c @@ -56,8 +56,10 @@ #include "urldata.h" #include "cfilters.h" +#include "curl_addrinfo.h" #include "curl_trc.h" #include "hostip.h" +#include "httpsrr.h" #include "url.h" #include "multiif.h" #include "curl_threads.h" diff --git a/lib/asyn.h b/lib/asyn.h index b9610810c7..12d3e1c338 100644 --- a/lib/asyn.h +++ b/lib/asyn.h @@ -25,15 +25,17 @@ ***************************************************************************/ #include "curl_setup.h" +#if defined(USE_HTTPSRR) && defined(USE_ARES) +#include "httpsrr.h" +#endif + struct Curl_easy; struct Curl_dns_entry; #ifdef CURLRES_ASYNCH #include "curl_addrinfo.h" -#include "httpsrr.h" -struct addrinfo; struct hostent; struct connectdata; struct easy_pollset; diff --git a/lib/cf-https-connect.c b/lib/cf-https-connect.c index 832b2a95b4..ae6721bd41 100644 --- a/lib/cf-https-connect.c +++ b/lib/cf-https-connect.c @@ -30,6 +30,7 @@ #include "cfilters.h" #include "connect.h" #include "hostip.h" +#include "httpsrr.h" #include "multiif.h" #include "cf-https-connect.h" #include "http2.h" diff --git a/lib/cf-ip-happy.c b/lib/cf-ip-happy.c index 05e9505e2a..0644c13cf8 100644 --- a/lib/cf-ip-happy.c +++ b/lib/cf-ip-happy.c @@ -50,6 +50,7 @@ #include "connect.h" #include "cfilters.h" #include "cf-ip-happy.h" +#include "curl_addrinfo.h" #include "curl_trc.h" #include "multiif.h" #include "progress.h" diff --git a/lib/cf-socket.c b/lib/cf-socket.c index f633383b97..251a603db2 100644 --- a/lib/cf-socket.c +++ b/lib/cf-socket.c @@ -61,6 +61,7 @@ #include "cfilters.h" #include "cf-socket.h" #include "connect.h" +#include "curl_addrinfo.h" #include "select.h" #include "multiif.h" #include "curlx/inet_pton.h" diff --git a/lib/doh.c b/lib/doh.c index 015a071343..faf38d7adc 100644 --- a/lib/doh.c +++ b/lib/doh.c @@ -28,8 +28,8 @@ #include "urldata.h" #include "curl_addrinfo.h" #include "doh.h" - #include "curl_trc.h" +#include "httpsrr.h" #include "multiif.h" #include "url.h" #include "connect.h" diff --git a/lib/doh.h b/lib/doh.h index 43bc32346b..bc32e64422 100644 --- a/lib/doh.h +++ b/lib/doh.h @@ -25,10 +25,8 @@ ***************************************************************************/ #include "urldata.h" -#include "curl_addrinfo.h" #ifdef USE_HTTPSRR # include -# include "httpsrr.h" #endif #ifndef CURL_DISABLE_DOH diff --git a/lib/ftp.c b/lib/ftp.c index 71a27bc429..858fb7539c 100644 --- a/lib/ftp.c +++ b/lib/ftp.c @@ -41,6 +41,7 @@ #include "urldata.h" #include "sendf.h" +#include "curl_addrinfo.h" #include "curl_trc.h" #include "if2ip.h" #include "hostip.h" diff --git a/lib/hostip.c b/lib/hostip.c index ced2ba2547..f88dfbd77f 100644 --- a/lib/hostip.c +++ b/lib/hostip.c @@ -44,10 +44,12 @@ #include #include "urldata.h" +#include "curl_addrinfo.h" #include "curl_trc.h" #include "connect.h" #include "hostip.h" #include "hash.h" +#include "httpsrr.h" #include "rand.h" #include "curl_share.h" #include "url.h" diff --git a/lib/hostip.h b/lib/hostip.h index 712b8eaf1b..45d63e97f3 100644 --- a/lib/hostip.h +++ b/lib/hostip.h @@ -26,10 +26,7 @@ #include "curl_setup.h" #include "hash.h" -#include "curl_addrinfo.h" #include "curlx/timeval.h" /* for curltime, timediff_t */ -#include "asyn.h" -#include "httpsrr.h" #ifdef USE_HTTPSRR # include @@ -50,6 +47,7 @@ struct hostent; struct Curl_easy; struct connectdata; struct easy_pollset; +struct Curl_https_rrinfo; enum alpnid { ALPN_none = 0, diff --git a/lib/hostip4.c b/lib/hostip4.c index 0d5942362c..f8cfac1fc0 100644 --- a/lib/hostip4.c +++ b/lib/hostip4.c @@ -43,6 +43,7 @@ #endif #include "urldata.h" +#include "curl_addrinfo.h" #include "curl_trc.h" #include "hostip.h" #include "url.h" diff --git a/lib/hostip6.c b/lib/hostip6.c index 24983efd84..8aa1974d77 100644 --- a/lib/hostip6.c +++ b/lib/hostip6.c @@ -44,6 +44,7 @@ #include "urldata.h" #include "cfilters.h" +#include "curl_addrinfo.h" #include "curl_trc.h" #include "hostip.h" #include "url.h" diff --git a/lib/socks.c b/lib/socks.c index e49e8c8220..5ad7d99015 100644 --- a/lib/socks.c +++ b/lib/socks.c @@ -34,6 +34,7 @@ #include "urldata.h" #include "bufq.h" +#include "curl_addrinfo.h" #include "curl_trc.h" #include "select.h" #include "cfilters.h" diff --git a/lib/url.c b/lib/url.c index 27533d0e0e..05b0b714d8 100644 --- a/lib/url.c +++ b/lib/url.c @@ -73,6 +73,7 @@ #include "vtls/vtls.h" #include "hostip.h" #include "transfer.h" +#include "curl_addrinfo.h" #include "curl_trc.h" #include "progress.h" #include "cookie.h" diff --git a/lib/urldata.h b/lib/urldata.h index a41e1e62dd..a7261c7aca 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -131,10 +131,6 @@ typedef uint32_t curl_prot_t; input easier and better. */ #define CURL_MAX_INPUT_LENGTH 8000000 -#include "cookie.h" -#include "psl.h" -#include "formdata.h" - #ifdef HAVE_NETINET_IN_H #include #endif @@ -144,6 +140,10 @@ typedef uint32_t curl_prot_t; #include "curlx/timeval.h" +#include "asyn.h" +#include "cookie.h" +#include "psl.h" +#include "formdata.h" #include "http_chunks.h" /* for the structs and enum stuff */ #include "hostip.h" #include "hash.h" diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c index b80891f654..5e7d6a50fe 100644 --- a/lib/vtls/openssl.c +++ b/lib/vtls/openssl.c @@ -43,6 +43,7 @@ #include "../urldata.h" #include "../curl_trc.h" +#include "../httpsrr.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 fc380b062b..0751a2db7a 100644 --- a/lib/vtls/rustls.c +++ b/lib/vtls/rustls.c @@ -33,6 +33,7 @@ #include "../curlx/strerr.h" #include "../urldata.h" #include "../curl_trc.h" +#include "../httpsrr.h" #include "vtls.h" #include "vtls_int.h" #include "rustls.h" diff --git a/lib/vtls/wolfssl.c b/lib/vtls/wolfssl.c index 80272ea364..5f9baed358 100644 --- a/lib/vtls/wolfssl.c +++ b/lib/vtls/wolfssl.c @@ -53,6 +53,7 @@ #include "../urldata.h" #include "../curl_trc.h" +#include "../httpsrr.h" #include "vtls.h" #include "vtls_int.h" #include "vtls_scache.h" diff --git a/tests/unit/unit1305.c b/tests/unit/unit1305.c index 404d90bec9..106bc38682 100644 --- a/tests/unit/unit1305.c +++ b/tests/unit/unit1305.c @@ -33,6 +33,7 @@ #include #endif +#include "curl_addrinfo.h" #include "hash.h" #include "hostip.h" diff --git a/tests/unit/unit1608.c b/tests/unit/unit1608.c index 7b5467632c..fdeded3d28 100644 --- a/tests/unit/unit1608.c +++ b/tests/unit/unit1608.c @@ -23,10 +23,11 @@ ***************************************************************************/ #include "unitcheck.h" -#include "hostip.h" - #ifndef CURL_DISABLE_SHUFFLE_DNS +#include "urldata.h" +#include "curl_addrinfo.h" + CURLcode Curl_shuffle_addr(struct Curl_easy *data, struct Curl_addrinfo **addr); diff --git a/tests/unit/unit1658.c b/tests/unit/unit1658.c index 114a626c6a..067bd53900 100644 --- a/tests/unit/unit1658.c +++ b/tests/unit/unit1658.c @@ -23,11 +23,12 @@ ***************************************************************************/ #include "unitcheck.h" -#include "doh.h" - /* DoH + HTTPSRR are required */ #if !defined(CURL_DISABLE_DOH) && defined(USE_HTTPSRR) +#include "doh.h" +#include "httpsrr.h" + static CURLcode t1658_setup(void) { /* whatever you want done first */