dns: flatten the include tree

Closes #20106

diff --git a/lib/amigaos.c b/lib/amigaos.c
index 7ce5045851ba70c98e34d52e2e10b6f3a562afed..d2afdbf91043d9e6d4e4283789222c3efe2c7c82 100644 (file)
--- 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 84ffa39f2759370c0038b583bbdedca6f607001f..a7af7bbfbb1bca103858837ab58e347010b36a90 100644 (file)
--- 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 02797f1afb7ea97460b01e89d4c9d2446e4e1019..f35e1c988c3f683e0eea38fe13ab25c1d2d7b41f 100644 (file)
--- 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 51bd098169ea1151d43ea3786c149ea1b120a333..55f65cd5aea02c849f250714eb7825146bcbdf0d 100644 (file)
--- 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 b9610810c761bc1f13afa5ead1912c329adc83d2..12d3e1c33883c850d535b97807806c8901760b68 100644 (file)
--- 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 832b2a95b404fb86dad95256d140712bbadd9b6a..ae6721bd41258205ed29170ff8f45d5927e512ad 100644 (file)
--- 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 05e9505e2abe5b5090ae9d4d1671b6dee7afa7b3..0644c13cf8b7f89b4f919c3756a89cbdbc48bbc6 100644 (file)
--- 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 f633383b97d063505b71573a14a62e3e12661c0f..251a603db22c7164efc74ba50a7f66b8058c33c3 100644 (file)
--- 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 015a071343ad07e8eeba3604d328a8e4eedbee1c..faf38d7adc1e50309025f35cb488cb609839dfb5 100644 (file)
--- 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 43bc32346b661d6469973a37f2fbc915938aac3c..bc32e64422ac8a613b06434bfe003f6c6df51a9e 100644 (file)
--- a/lib/doh.h
+++ b/lib/doh.h
@@ -25,10 +25,8 @@
  ***************************************************************************/
 
 #include "urldata.h"
-#include "curl_addrinfo.h"
 #ifdef USE_HTTPSRR
 # include <stdint.h>
-# include "httpsrr.h"
 #endif
 
 #ifndef CURL_DISABLE_DOH

diff --git a/lib/ftp.c b/lib/ftp.c
index 71a27bc4291ad93cd14aa7ad5adf97c3e3eb771e..858fb7539cac47b8b66b352e822722d78495db13 100644 (file)
--- 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 ced2ba2547c39ffdf8d4dda380839485e11e9306..f88dfbd77f86a8cb38d43f12842c747953b46c43 100644 (file)
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -44,10 +44,12 @@
 #include <signal.h>
 
 #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 712b8eaf1b5e7d14c50db66f75fe97b6f6615943..45d63e97f3d07adc0acb571bb234dee87cb9f3c7 100644 (file)
--- 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 <stdint.h>
@@ -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 0d5942362cea8b86b3b2d0d4d00a739b43774ec5..f8cfac1fc01804b06657ebcd5bc743820d4a270e 100644 (file)
--- 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 24983efd84f1fdb9cbf7fed29dbd8e5896ca23c1..8aa1974d77dbfb0d377ddb2f14eccd0156e38175 100644 (file)
--- 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 e49e8c82205d8fefef370ae7ddc4419044fae0aa..5ad7d990159e185dafd70808f3736be6e166a20f 100644 (file)
--- 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 27533d0e0e2ed5d36bd2c23d2e3fb05e7f315211..05b0b714d87288369f2e8e64dd655b24a7669342 100644 (file)
--- 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 a41e1e62dd6b960d6ad4b4a09f2848c3a95b7a70..a7261c7aca929ebebb8fd27a5722dec16b470b7e 100644 (file)
--- 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 <netinet/in.h>
 #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 b80891f654327251e4b479f40a8c3784006768db..5e7d6a50fee59e98cf096f33dd8e660c2775dc3b 100644 (file)
--- 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 fc380b062b5584d3d272fe90930bb9ef12591feb..0751a2db7a82e88fdb59c15add191462b242a4f0 100644 (file)
--- 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 80272ea3648138616cb13989bf4210afc21ded74..5f9baed3586197bf59546ab01161ffd9caebc0b1 100644 (file)
--- 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 404d90bec9a99d41c4e62d2ffdf6b80c17d0d77e..106bc3868219a1cce87c4395026632a072d07bea 100644 (file)
--- a/tests/unit/unit1305.c
+++ b/tests/unit/unit1305.c
@@ -33,6 +33,7 @@
 #include <arpa/inet.h>
 #endif
 
+#include "curl_addrinfo.h"
 #include "hash.h"
 #include "hostip.h"
 

diff --git a/tests/unit/unit1608.c b/tests/unit/unit1608.c
index 7b5467632c5971440848ef646acd57fdbb7986ab..fdeded3d2881cfaebb743acc96f8714985093cbc 100644 (file)
--- 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 114a626c6a016810ed2a7782006d5d8682637c7b..067bd53900e1dd0ad4371979bdc9ac90e4b651b1 100644 (file)
--- 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 */