From: Stefan Eissing <stefan@eissing.org>
Date: Tue, 4 Aug 2026 09:52:00 +0000 (+0200)
Subject: vdns: directory for all DNS related sources
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;ds=inline;p=thirdparty%2Fcurl.git

vdns: directory for all DNS related sources

Move all DNS related source files from lib to lib/vdns. Fix
include paths, no furher changes.

Closes #22482
---

diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index e00e599d6c..754275b78c 100644
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -84,6 +84,26 @@ LIB_VAUTH_HFILES =      \
   vauth/digest.h        \
   vauth/vauth.h
 
+LIB_VDNS_CFILES =           \
+  vdns/asyn-ares.c          \
+  vdns/asyn-base.c          \
+  vdns/asyn-thrdd.c         \
+  vdns/cf-dns.c             \
+  vdns/dnscache.c           \
+  vdns/doh.c                \
+  vdns/hostip.c             \
+  vdns/hostip4.c            \
+  vdns/hostip6.c            \
+  vdns/httpsrr.c
+
+LIB_VDNS_HFILES =           \
+  vdns/asyn.h               \
+  vdns/cf-dns.h             \
+  vdns/dnscache.h           \
+  vdns/doh.h                \
+  vdns/hostip.h             \
+  vdns/httpsrr.h
+
 LIB_VTLS_CFILES =           \
   vtls/apple.c              \
   vtls/cipher_suite.c       \
@@ -155,12 +175,8 @@ LIB_CFILES =         \
   altsvc.c           \
   amigaos.c          \
   api.c              \
-  asyn-ares.c        \
-  asyn-base.c        \
-  asyn-thrdd.c       \
   bufq.c             \
   bufref.c           \
-  cf-dns.c           \
   cf-h1-proxy.c      \
   cf-h2-proxy.c      \
   cf-haproxy.c       \
@@ -195,8 +211,6 @@ LIB_CFILES =         \
   cw-out.c           \
   cw-pause.c         \
   dict.c             \
-  dnscache.c         \
-  doh.c              \
   dynhds.c           \
   easy.c             \
   easygetopt.c       \
@@ -214,9 +228,6 @@ LIB_CFILES =         \
   hash.c             \
   headers.c          \
   hmac.c             \
-  hostip.c           \
-  hostip4.c          \
-  hostip6.c          \
   hsts.c             \
   http.c             \
   http1.c            \
@@ -229,7 +240,6 @@ LIB_CFILES =         \
   http_negotiate.c   \
   http_ntlm.c        \
   http_proxy.c       \
-  httpsrr.c          \
   idn.c              \
   if2ip.c            \
   imap.c             \
@@ -294,10 +304,8 @@ LIB_HFILES =         \
   amigaos.h          \
   api.h              \
   arpa_telnet.h      \
-  asyn.h             \
   bufq.h             \
   bufref.h           \
-  cf-dns.h           \
   cf-h1-proxy.h      \
   cf-h2-proxy.h      \
   cf-haproxy.h       \
@@ -340,8 +348,6 @@ LIB_HFILES =         \
   cw-out.h           \
   cw-pause.h         \
   dict.h             \
-  dnscache.h         \
-  doh.h              \
   dynhds.h           \
   easy_lock.h        \
   easyif.h           \
@@ -359,7 +365,6 @@ LIB_HFILES =         \
   gopher.h           \
   hash.h             \
   headers.h          \
-  hostip.h           \
   hsts.h             \
   http.h             \
   http1.h            \
@@ -372,7 +377,6 @@ LIB_HFILES =         \
   http_negotiate.h   \
   http_ntlm.h        \
   http_proxy.h       \
-  httpsrr.h          \
   idn.h              \
   if2ip.h            \
   imap.h             \
@@ -430,7 +434,9 @@ LIB_HFILES =         \
 
 LIB_RCFILES = libcurl.rc
 
-CSOURCES = $(LIB_CFILES) $(LIB_VAUTH_CFILES) $(LIB_VTLS_CFILES) \
-  $(LIB_VQUIC_CFILES) $(LIB_VSSH_CFILES) $(LIB_CURLX_CFILES)
-HHEADERS = $(LIB_HFILES) $(LIB_VAUTH_HFILES) $(LIB_VTLS_HFILES) \
-  $(LIB_VQUIC_HFILES) $(LIB_VSSH_HFILES) $(LIB_CURLX_HFILES)
+CSOURCES = $(LIB_CFILES) $(LIB_VAUTH_CFILES) $(LIB_VDNS_CFILES) \
+  $(LIB_VTLS_CFILES) $(LIB_VQUIC_CFILES) $(LIB_VSSH_CFILES) \
+  $(LIB_CURLX_CFILES)
+HHEADERS = $(LIB_HFILES) $(LIB_VAUTH_HFILES) $(LIB_VDNS_HFILES) \
+  $(LIB_VTLS_HFILES) $(LIB_VQUIC_HFILES) $(LIB_VSSH_HFILES) \
+  $(LIB_CURLX_HFILES)
diff --git a/lib/amigaos.c b/lib/amigaos.c
index e4f3bfb77c..3f61565183 100644
--- a/lib/amigaos.c
+++ b/lib/amigaos.c
@@ -25,7 +25,7 @@
 
 #ifdef __AMIGA__
 
-#include "hostip.h"
+#include "vdns/hostip.h"
 #include "curl_addrinfo.h"
 #include "amigaos.h"
 
diff --git a/lib/cf-https-connect.c b/lib/cf-https-connect.c
index c39f59f2ee..e1a97097ac 100644
--- a/lib/cf-https-connect.c
+++ b/lib/cf-https-connect.c
@@ -28,16 +28,16 @@
 #include "urldata.h"
 #include "curl_trc.h"
 #include "cfilters.h"
-#include "cf-dns.h"
 #include "cf-setup.h"
 #include "connect.h"
-#include "hostip.h"
-#include "httpsrr.h"
 #include "multiif.h"
 #include "cf-https-connect.h"
 #include "http2.h"
 #include "progress.h"
 #include "select.h"
+#include "vdns/cf-dns.h"
+#include "vdns/hostip.h"
+#include "vdns/httpsrr.h"
 #include "vquic/vquic.h"
 
 typedef enum {
diff --git a/lib/cf-ip-happy.c b/lib/cf-ip-happy.c
index 794d5e4cb9..c9c65bacb7 100644
--- a/lib/cf-ip-happy.c
+++ b/lib/cf-ip-happy.c
@@ -49,7 +49,6 @@
 #include "urldata.h"
 #include "connect.h"
 #include "cfilters.h"
-#include "cf-dns.h"
 #include "cf-ip-happy.h"
 #include "curl_addrinfo.h"
 #include "curl_trc.h"
@@ -57,6 +56,7 @@
 #include "progress.h"
 #include "select.h"
 #include "sockaddr.h"
+#include "vdns/cf-dns.h"
 #include "vquic/vquic.h" /* for quic cfilters */
 
 
diff --git a/lib/connect.c b/lib/connect.c
index c220475389..2a6c4f7677 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -28,7 +28,6 @@
 #include "strerror.h"
 #include "cfilters.h"
 #include "connect.h"
-#include "cf-dns.h"
 #include "cf-https-connect.h"
 #include "cf-setup.h"
 #include "multiif.h"
@@ -36,6 +35,7 @@
 #include "conncache.h"
 #include "multihandle.h"
 #include "select.h"
+#include "vdns/cf-dns.h"
 #include "curlx/strparse.h"
 
 #if !defined(CURL_DISABLE_ALTSVC) || defined(USE_HTTPSRR)
diff --git a/lib/connect.h b/lib/connect.h
index 91cd924901..33bc1cad49 100644
--- a/lib/connect.h
+++ b/lib/connect.h
@@ -25,7 +25,7 @@
  ***************************************************************************/
 #include "curl_setup.h"
 
-#include "hostip.h"
+#include "vdns/hostip.h"
 #include "curlx/timeval.h"
 
 struct Curl_peer;
diff --git a/lib/curl_trc.c b/lib/curl_trc.c
index 6fd9507a8e..44eeef88f4 100644
--- a/lib/curl_trc.c
+++ b/lib/curl_trc.c
@@ -28,7 +28,6 @@
 #include "cfilters.h"
 #include "multiif.h"
 
-#include "cf-dns.h"
 #include "cf-recvbuf.h"
 #include "cf-socket.h"
 #include "cf-setup.h"
@@ -42,6 +41,7 @@
 #include "progress.h"
 #include "socks.h"
 #include "curlx/strparse.h"
+#include "vdns/cf-dns.h"
 #include "vtls/vtls.h"
 #include "vquic/vquic.h"
 #include "curlx/strcopy.h"
diff --git a/lib/easy.c b/lib/easy.c
index 88b4c194c2..eeb2791706 100644
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -46,12 +46,12 @@
 #include "urldata.h"
 #include "api.h"
 #include "transfer.h"
+#include "vdns/hostip.h"
 #include "vtls/vtls.h"
 #include "vtls/vtls_scache.h"
 #include "vquic/vquic.h"
 #include "url.h"
 #include "getinfo.h"
-#include "hostip.h"
 #include "curlx/strdup.h"
 #include "easyif.h"
 #include "multiif.h"
diff --git a/lib/ftp.c b/lib/ftp.c
index 811e58508b..c1b05eeccb 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -44,7 +44,6 @@
 #include "curl_addrinfo.h"
 #include "curl_trc.h"
 #include "if2ip.h"
-#include "hostip.h"
 #include "progress.h"
 #include "transfer.h"
 #include "escape.h"
@@ -65,6 +64,7 @@
 #include "multiif.h"
 #include "url.h"
 #include "http_proxy.h"
+#include "vdns/hostip.h"
 #include "curlx/strdup.h"
 #include "curlx/strerr.h"
 #include "curlx/strparse.h"
diff --git a/lib/http.c b/lib/http.c
index 4feb930069..98d01c4305 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -65,7 +65,6 @@
 #include "url.h"
 #include "urlapi-int.h"
 #include "curl_share.h"
-#include "hostip.h"
 #include "dynhds.h"
 #include "http.h"
 #include "headers.h"
diff --git a/lib/imap.c b/lib/imap.c
index cb8f7e8cca..a1a4ac4363 100644
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -57,7 +57,6 @@
 #include "curlx/dynbuf.h"
 #include "sendf.h"
 #include "curl_trc.h"
-#include "hostip.h"
 #include "progress.h"
 #include "transfer.h"
 #include "escape.h"
diff --git a/lib/multihandle.h b/lib/multihandle.h
index b0c10e92c1..60d49af1e9 100644
--- a/lib/multihandle.h
+++ b/lib/multihandle.h
@@ -28,7 +28,6 @@
 #include "hash.h"
 #include "conncache.h"
 #include "cshutdn.h"
-#include "dnscache.h"
 #include "multi_ev.h"
 #include "multi_ntfy.h"
 #include "psl.h"
@@ -36,6 +35,7 @@
 #include "uint-bset.h"
 #include "uint-spbset.h"
 #include "uint-table.h"
+#include "vdns/dnscache.h"
 
 struct connectdata;
 struct Curl_easy;
diff --git a/lib/pop3.c b/lib/pop3.c
index 9ebe7ce4bf..7634dfb629 100644
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -58,7 +58,6 @@
 
 #include "sendf.h"
 #include "curl_trc.h"
-#include "hostip.h"
 #include "progress.h"
 #include "transfer.h"
 #include "escape.h"
diff --git a/lib/request.c b/lib/request.c
index 56dd2c4a15..51672bfe00 100644
--- a/lib/request.c
+++ b/lib/request.c
@@ -26,7 +26,6 @@
 #include "urldata.h"
 #include "cfilters.h"
 #include "curlx/dynbuf.h"
-#include "doh.h"
 #include "progress.h"
 #include "request.h"
 #include "sendf.h"
diff --git a/lib/setopt.c b/lib/setopt.c
index 427cce07af..ef4be53386 100644
--- a/lib/setopt.c
+++ b/lib/setopt.c
@@ -41,7 +41,6 @@
 #include "curl_share.h"
 #include "vtls/vtls.h"
 #include "curl_trc.h"
-#include "hostip.h"
 #include "setopt.h"
 #include "altsvc.h"
 #include "hsts.h"
diff --git a/lib/smtp.c b/lib/smtp.c
index 616fa8c00f..c01151e455 100644
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -60,7 +60,6 @@
 
 #include "sendf.h"
 #include "curl_trc.h"
-#include "hostip.h"
 #include "progress.h"
 #include "transfer.h"
 #include "escape.h"
diff --git a/lib/socks.c b/lib/socks.c
index 67810d3fca..4f98912a54 100644
--- a/lib/socks.c
+++ b/lib/socks.c
@@ -38,9 +38,9 @@
 #include "curl_trc.h"
 #include "select.h"
 #include "cfilters.h"
-#include "cf-dns.h"
 #include "connect.h"
 #include "socks.h"
+#include "vdns/cf-dns.h"
 #include "curlx/inet_pton.h"
 
 /* for the (SOCKS) connect state machine */
diff --git a/lib/transfer.c b/lib/transfer.c
index 3a7b6bc136..569cdeec05 100644
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -56,10 +56,8 @@
 
 #include "urldata.h"
 
-#include "hostip.h"
 #include "cfilters.h"
 #include "cw-out.h"
-#include "dnscache.h"
 #include "transfer.h"
 #include "sendf.h"
 #include "curl_trc.h"
diff --git a/lib/url.c b/lib/url.c
index a77309d372..8272a85e4e 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -70,7 +70,6 @@
 #include "bufref.h"
 #include "vtls/vtls.h"
 #include "vssh/vssh.h"
-#include "hostip.h"
 #include "transfer.h"
 #include "curl_addrinfo.h"
 #include "curl_trc.h"
diff --git a/lib/urldata.h b/lib/urldata.h
index 2b8712f8ca..ce991ac249 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -54,13 +54,11 @@
 #include "curlx/timeval.h"
 
 #include "api.h"
-#include "asyn.h"
 #include "cookie.h"
 #include "creds.h"
 #include "psl.h"
 #include "formdata.h"
 #include "http_chunks.h" /* for the structs and enum stuff */
-#include "hostip.h"
 #include "hash.h"
 #include "peer.h"
 #include "proxy.h"
@@ -71,6 +69,8 @@
 #include "request.h"
 #include "ratelimit.h"
 #include "netrc.h"
+#include "vdns/asyn.h"
+#include "vdns/hostip.h"
 #include "vtls/vtls_config.h"
 
 /* On error return, the value of `pnwritten` has no meaning */
diff --git a/lib/asyn-ares.c b/lib/vdns/asyn-ares.c
similarity index 99%
rename from lib/asyn-ares.c
rename to lib/vdns/asyn-ares.c
index a3dcd7071d..7d27c7fc8d 100644
--- a/lib/asyn-ares.c
+++ b/lib/vdns/asyn-ares.c
@@ -49,7 +49,6 @@
 #include "cfilters.h"
 #include "curl_addrinfo.h"
 #include "curl_trc.h"
-#include "hostip.h"
 #include "url.h"
 #include "multiif.h"
 #include "curlx/inet_pton.h"
@@ -57,7 +56,8 @@
 #include "select.h"
 #include "progress.h"
 #include "curlx/timediff.h"
-#include "httpsrr.h"
+#include "vdns/hostip.h"
+#include "vdns/httpsrr.h"
 #include <ares.h>
 
 #if ARES_VERSION < 0x011000
diff --git a/lib/asyn-base.c b/lib/vdns/asyn-base.c
similarity index 99%
rename from lib/asyn-base.c
rename to lib/vdns/asyn-base.c
index 28e0c671d1..fafc394850 100644
--- a/lib/asyn-base.c
+++ b/lib/vdns/asyn-base.c
@@ -45,12 +45,12 @@
 #include "connect.h"
 #include "curl_addrinfo.h"
 #include "curl_trc.h"
-#include "hostip.h"
-#include "httpsrr.h"
 #include "multiif.h"
 #include "progress.h"
 #include "select.h"
 #include "url.h"
+#include "vdns/hostip.h"
+#include "vdns/httpsrr.h"
 
 /***********************************************************************
  * Only for builds using asynchronous name resolves
diff --git a/lib/asyn-thrdd.c b/lib/vdns/asyn-thrdd.c
similarity index 99%
rename from lib/asyn-thrdd.c
rename to lib/vdns/asyn-thrdd.c
index 5e7c40eb53..13c918bd81 100644
--- a/lib/asyn-thrdd.c
+++ b/lib/vdns/asyn-thrdd.c
@@ -52,8 +52,6 @@
 #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"
@@ -61,6 +59,8 @@
 #include "rand.h"
 #include "select.h"
 #include "thrdqueue.h"
+#include "vdns/hostip.h"
+#include "vdns/httpsrr.h"
 #include "curlx/strparse.h"
 #include "curlx/wait.h"
 
diff --git a/lib/asyn.h b/lib/vdns/asyn.h
similarity index 99%
rename from lib/asyn.h
rename to lib/vdns/asyn.h
index 01611175be..7eade656a5 100644
--- a/lib/asyn.h
+++ b/lib/vdns/asyn.h
@@ -26,7 +26,7 @@
 #include "curl_setup.h"
 
 #if defined(USE_HTTPSRR) && defined(USE_ARES)
-#include "httpsrr.h"
+#include "vdns/httpsrr.h"
 #endif
 
 struct Curl_easy;
diff --git a/lib/cf-dns.c b/lib/vdns/cf-dns.c
similarity index 99%
rename from lib/cf-dns.c
rename to lib/vdns/cf-dns.c
index 984d7a404d..f02b37f126 100644
--- a/lib/cf-dns.c
+++ b/lib/vdns/cf-dns.c
@@ -27,13 +27,13 @@
 #include "curl_addrinfo.h"
 #include "cfilters.h"
 #include "connect.h"
-#include "dnscache.h"
-#include "httpsrr.h"
 #include "curl_trc.h"
 #include "multiif.h"
 #include "progress.h"
 #include "url.h"
-#include "cf-dns.h"
+#include "vdns/cf-dns.h"
+#include "vdns/dnscache.h"
+#include "vdns/httpsrr.h"
 
 
 struct cf_dns_ctx {
diff --git a/lib/cf-dns.h b/lib/vdns/cf-dns.h
similarity index 100%
rename from lib/cf-dns.h
rename to lib/vdns/cf-dns.h
diff --git a/lib/dnscache.c b/lib/vdns/dnscache.c
similarity index 99%
rename from lib/dnscache.c
rename to lib/vdns/dnscache.c
index 44db67720b..c1523af84d 100644
--- a/lib/dnscache.c
+++ b/lib/vdns/dnscache.c
@@ -44,13 +44,13 @@
 #include "curl_addrinfo.h"
 #include "curl_share.h"
 #include "curl_trc.h"
-#include "dnscache.h"
 #include "hash.h"
-#include "hostip.h"
-#include "httpsrr.h"
 #include "progress.h"
 #include "rand.h"
 #include "strcase.h"
+#include "vdns/dnscache.h"
+#include "vdns/hostip.h"
+#include "vdns/httpsrr.h"
 #include "curlx/inet_ntop.h"
 #include "curlx/inet_pton.h"
 #include "curlx/strcopy.h"
diff --git a/lib/dnscache.h b/lib/vdns/dnscache.h
similarity index 100%
rename from lib/dnscache.h
rename to lib/vdns/dnscache.h
diff --git a/lib/doh.c b/lib/vdns/doh.c
similarity index 99%
rename from lib/doh.c
rename to lib/vdns/doh.c
index d335204199..592cb07583 100644
--- a/lib/doh.c
+++ b/lib/vdns/doh.c
@@ -27,12 +27,12 @@
 
 #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"
+#include "vdns/doh.h"
+#include "vdns/httpsrr.h"
 #include "curlx/strdup.h"
 #include "curlx/dynbuf.h"
 #include "escape.h"  /* for Curl_hexencode() */
diff --git a/lib/doh.h b/lib/vdns/doh.h
similarity index 100%
rename from lib/doh.h
rename to lib/vdns/doh.h
diff --git a/lib/hostip.c b/lib/vdns/hostip.c
similarity index 99%
rename from lib/hostip.c
rename to lib/vdns/hostip.c
index 3eb85d7e3f..747acac5e5 100644
--- a/lib/hostip.c
+++ b/lib/vdns/hostip.c
@@ -46,16 +46,16 @@
 #include "urldata.h"
 #include "curl_addrinfo.h"
 #include "curl_trc.h"
-#include "dnscache.h"
-#include "hostip.h"
-#include "httpsrr.h"
 #include "url.h"
 #include "multiif.h"
 #include "progress.h"
-#include "doh.h"
 #include "select.h"
 #include "strcase.h"
 #include "easy_lock.h"
+#include "vdns/dnscache.h"
+#include "vdns/doh.h"
+#include "vdns/hostip.h"
+#include "vdns/httpsrr.h"
 #include "curlx/inet_ntop.h"
 #include "curlx/inet_pton.h"
 #include "curlx/strcopy.h"
diff --git a/lib/hostip.h b/lib/vdns/hostip.h
similarity index 100%
rename from lib/hostip.h
rename to lib/vdns/hostip.h
diff --git a/lib/hostip4.c b/lib/vdns/hostip4.c
similarity index 99%
rename from lib/hostip4.c
rename to lib/vdns/hostip4.c
index b4566c5baa..83896a82b2 100644
--- a/lib/hostip4.c
+++ b/lib/vdns/hostip4.c
@@ -45,7 +45,7 @@
 #include "urldata.h"
 #include "curl_addrinfo.h"
 #include "curl_trc.h"
-#include "hostip.h"
+#include "vdns/hostip.h"
 #include "url.h"
 
 
diff --git a/lib/hostip6.c b/lib/vdns/hostip6.c
similarity index 99%
rename from lib/hostip6.c
rename to lib/vdns/hostip6.c
index 7412f428a4..e33a154d2f 100644
--- a/lib/hostip6.c
+++ b/lib/vdns/hostip6.c
@@ -46,8 +46,8 @@
 #include "cfilters.h"
 #include "curl_addrinfo.h"
 #include "curl_trc.h"
-#include "hostip.h"
 #include "url.h"
+#include "vdns/hostip.h"
 #include "curlx/inet_pton.h"
 #include "connect.h"
 
diff --git a/lib/httpsrr.c b/lib/vdns/httpsrr.c
similarity index 99%
rename from lib/httpsrr.c
rename to lib/vdns/httpsrr.c
index 441fe350b1..29c78a333b 100644
--- a/lib/httpsrr.c
+++ b/lib/vdns/httpsrr.c
@@ -26,9 +26,9 @@
 #ifdef USE_HTTPSRR
 
 #include "urldata.h"
-#include "httpsrr.h"
 #include "connect.h"
 #include "curl_trc.h"
+#include "vdns/httpsrr.h"
 #include "curlx/strdup.h"
 #include "curlx/inet_ntop.h"
 
diff --git a/lib/httpsrr.h b/lib/vdns/httpsrr.h
similarity index 100%
rename from lib/httpsrr.h
rename to lib/vdns/httpsrr.h
diff --git a/lib/vquic/cf-ngtcp2-cmn.c b/lib/vquic/cf-ngtcp2-cmn.c
index ea214ff8b0..771b77b434 100644
--- a/lib/vquic/cf-ngtcp2-cmn.c
+++ b/lib/vquic/cf-ngtcp2-cmn.c
@@ -54,7 +54,6 @@
 #include "rand.h"
 #include "multiif.h"
 #include "cfilters.h"
-#include "cf-dns.h"
 #include "cf-socket.h"
 #include "connect.h"
 #include "progress.h"
@@ -65,6 +64,7 @@
 #include "sockaddr.h"
 #include "transfer.h"
 #include "bufref.h"
+#include "vdns/cf-dns.h"
 #include "vquic/vquic.h"
 #include "vquic/vquic_int.h"
 #include "vquic/vquic-tls.h"
diff --git a/lib/vquic/cf-ngtcp2.c b/lib/vquic/cf-ngtcp2.c
index 4d5c122183..e97a3d8271 100644
--- a/lib/vquic/cf-ngtcp2.c
+++ b/lib/vquic/cf-ngtcp2.c
@@ -32,7 +32,6 @@
 #include "rand.h"
 #include "multiif.h"
 #include "cfilters.h"
-#include "cf-dns.h"
 #include "cf-socket.h"
 #include "connect.h"
 #include "progress.h"
@@ -42,6 +41,7 @@
 #include "select.h"
 #include "transfer.h"
 #include "bufref.h"
+#include "vdns/cf-dns.h"
 #include "vquic/vquic.h"
 #include "vquic/vquic_int.h"
 #include "vquic/cf-ngtcp2-cmn.h"
diff --git a/lib/vquic/cf-quiche.c b/lib/vquic/cf-quiche.c
index bfc68adf14..fa33675497 100644
--- a/lib/vquic/cf-quiche.c
+++ b/lib/vquic/cf-quiche.c
@@ -32,7 +32,6 @@
 #include "uint-hash.h"
 #include "urldata.h"
 #include "cfilters.h"
-#include "cf-dns.h"
 #include "cf-socket.h"
 #include "curl_trc.h"
 #include "rand.h"
@@ -43,6 +42,7 @@
 #include "http.h"
 #include "http1.h"
 #include "sockaddr.h"
+#include "vdns/cf-dns.h"
 #include "vquic/vquic.h"
 #include "vquic/vquic_int.h"
 #include "vquic/vquic-tls.h"
diff --git a/lib/vquic/vquic.c b/lib/vquic/vquic.c
index 3844f4e88a..4975b8794d 100644
--- a/lib/vquic/vquic.c
+++ b/lib/vquic/vquic.c
@@ -48,7 +48,7 @@
 #include "curlx/dynbuf.h"
 #include "curlx/fopen.h"
 #include "cfilters.h"
-#include "cf-dns.h"
+#include "vdns/cf-dns.h"
 #include "vquic/cf-ngtcp2.h"
 #include "vquic/cf-ngtcp2-cmn.h"
 #include "vquic/cf-ngtcp2-proxy.h"
diff --git a/lib/vssh/libssh.c b/lib/vssh/libssh.c
index f1a206ba2d..3a72b31bc8 100644
--- a/lib/vssh/libssh.c
+++ b/lib/vssh/libssh.c
@@ -45,7 +45,6 @@
 #include "urldata.h"
 #include "sendf.h"
 #include "curl_trc.h"
-#include "hostip.h"
 #include "progress.h"
 #include "transfer.h"
 #include "vssh/ssh.h"
diff --git a/lib/vssh/libssh2.c b/lib/vssh/libssh2.c
index 940c678358..65a03ef311 100644
--- a/lib/vssh/libssh2.c
+++ b/lib/vssh/libssh2.c
@@ -44,7 +44,6 @@
 #include "urldata.h"
 #include "sendf.h"
 #include "curl_trc.h"
-#include "hostip.h"
 #include "progress.h"
 #include "transfer.h"
 #include "vssh/ssh.h"
diff --git a/lib/vtls/hostcheck.c b/lib/vtls/hostcheck.c
index ad09b83194..0af540993f 100644
--- a/lib/vtls/hostcheck.c
+++ b/lib/vtls/hostcheck.c
@@ -34,8 +34,8 @@
 #endif
 
 #include "curl_memrchr.h"
+#include "vdns/hostip.h"
 #include "vtls/hostcheck.h"
-#include "hostip.h"
 
 /* check the two input strings with given length, but do not
    assume they end in nul-bytes */
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 12903038f1..8c98d15412 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -31,13 +31,11 @@
 
 #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"
 #include "vtls/openssl.h"
 #include "connect.h"
-#include "cf-dns.h"
 #include "progress.h"
 #include "vtls/vtls.h"
 #include "vtls/vtls_int.h"
@@ -51,6 +49,8 @@
 #include "curlx/strparse.h"
 #include "curlx/strcopy.h"
 #include "curlx/strdup.h"
+#include "vdns/cf-dns.h"
+#include "vdns/httpsrr.h"
 #include "vtls/apple.h"
 #ifdef USE_ECH
 #include "curlx/base64.h"
diff --git a/lib/vtls/rustls.c b/lib/vtls/rustls.c
index 950f170212..6590adc407 100644
--- a/lib/vtls/rustls.c
+++ b/lib/vtls/rustls.c
@@ -32,9 +32,9 @@
 #include "curlx/fopen.h"
 #include "curlx/strerr.h"
 #include "urldata.h"
-#include "cf-dns.h"
 #include "curl_trc.h"
-#include "httpsrr.h"
+#include "vdns/cf-dns.h"
+#include "vdns/httpsrr.h"
 #include "vtls/vtls.h"
 #include "vtls/vtls_int.h"
 #include "vtls/rustls.h"
diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
index 952c5e5e71..4a9d9df1ce 100644
--- a/lib/vtls/vtls.c
+++ b/lib/vtls/vtls.c
@@ -42,7 +42,6 @@
 
 #include "urldata.h"
 #include "cfilters.h"
-#include "cf-dns.h"
 
 #include "vtls/vtls.h" /* generic SSL protos etc */
 #include "vtls/vtls_int.h"
@@ -68,6 +67,7 @@
 #include "connect.h"
 #include "select.h"
 #include "setopt.h"
+#include "vdns/cf-dns.h"
 #include "curlx/strdup.h"
 #include "curlx/strcopy.h"
 
diff --git a/lib/vtls/wolfssl.c b/lib/vtls/wolfssl.c
index 9fe0dc1c88..d1642f77cc 100644
--- a/lib/vtls/wolfssl.c
+++ b/lib/vtls/wolfssl.c
@@ -55,8 +55,8 @@
 
 #include "urldata.h"
 #include "curl_trc.h"
-#include "httpsrr.h"
-#include "cf-dns.h"
+#include "vdns/cf-dns.h"
+#include "vdns/httpsrr.h"
 #include "vtls/vtls.h"
 #include "vtls/vtls_int.h"
 #include "vtls/vtls_scache.h"
diff --git a/projects/Windows/generate.bat b/projects/Windows/generate.bat
index b5da6d9a79..7bfb98efd3 100644
--- a/projects/Windows/generate.bat
+++ b/projects/Windows/generate.bat
@@ -214,6 +214,10 @@ rem
       for /f "delims=" %%c in ('dir /b ..\..\lib\vauth\*.c') do call :element lib\vauth "%%c" %3
     ) else if "!var!" == "CURL_LIB_VAUTH_H_FILES" (
       for /f "delims=" %%h in ('dir /b ..\..\lib\vauth\*.h') do call :element lib\vauth "%%h" %3
+    ) else if "!var!" == "CURL_LIB_VDNS_C_FILES" (
+      for /f "delims=" %%c in ('dir /b ..\..\lib\vdns\*.c') do call :element lib\vdns "%%c" %3
+    ) else if "!var!" == "CURL_LIB_VDNS_H_FILES" (
+      for /f "delims=" %%h in ('dir /b ..\..\lib\vdns\*.h') do call :element lib\vdns "%%h" %3
     ) else if "!var!" == "CURL_LIB_VQUIC_C_FILES" (
       for /f "delims=" %%c in ('dir /b ..\..\lib\vquic\*.c') do call :element lib\vquic "%%c" %3
     ) else if "!var!" == "CURL_LIB_VQUIC_H_FILES" (
diff --git a/projects/Windows/tmpl/libcurl.vcxproj b/projects/Windows/tmpl/libcurl.vcxproj
index af141d0bd1..767256f6a5 100644
--- a/projects/Windows/tmpl/libcurl.vcxproj
+++ b/projects/Windows/tmpl/libcurl.vcxproj
@@ -2034,6 +2034,7 @@
 CURL_LIB_C_FILES
 CURL_LIB_CURLX_C_FILES
 CURL_LIB_VAUTH_C_FILES
+CURL_LIB_VDNS_C_FILES
 CURL_LIB_VQUIC_C_FILES
 CURL_LIB_VSSH_C_FILES
 CURL_LIB_VTLS_C_FILES
@@ -2042,6 +2043,7 @@ CURL_LIB_VTLS_C_FILES
 CURL_LIB_H_FILES
 CURL_LIB_CURLX_H_FILES
 CURL_LIB_VAUTH_H_FILES
+CURL_LIB_VDNS_H_FILES
 CURL_LIB_VQUIC_H_FILES
 CURL_LIB_VSSH_H_FILES
 CURL_LIB_VTLS_H_FILES
diff --git a/src/curlinfo.c b/src/curlinfo.c
index 8b4659200f..5357a36fa8 100644
--- a/src/curlinfo.c
+++ b/src/curlinfo.c
@@ -34,7 +34,7 @@
 #include "multihandle.h" /* for ENABLE_WAKEUP */
 #include "tool_xattr.h" /* for USE_XATTR */
 #include "curl_sha512_256.h" /* for CURL_HAVE_SHA512_256 */
-#include "asyn.h" /* for USE_RESOLV_ARES, USE_RESOLV_THREADED */
+#include "vdns/asyn.h" /* for USE_RESOLV_ARES, USE_RESOLV_THREADED */
 #include "fake_addrinfo.h" /* for USE_FAKE_GETADDRINFO */
 
 #include <stdio.h>
diff --git a/tests/unit/unit1305.c b/tests/unit/unit1305.c
index 93f2e7cc7b..f6bf67ed36 100644
--- a/tests/unit/unit1305.c
+++ b/tests/unit/unit1305.c
@@ -35,7 +35,7 @@
 
 #include "curl_addrinfo.h"
 #include "hash.h"
-#include "dnscache.h"
+#include "vdns/dnscache.h"
 
 static struct Curl_dnscache hp;
 static char *data_key;
diff --git a/tests/unit/unit1650.c b/tests/unit/unit1650.c
index 299a19bfd4..1e6217176d 100644
--- a/tests/unit/unit1650.c
+++ b/tests/unit/unit1650.c
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 #include "unitcheck.h"
-#include "doh.h"
+#include "vdns/doh.h"
 
 static CURLcode test_unit1650(const char *arg)
 {
diff --git a/tests/unit/unit1655.c b/tests/unit/unit1655.c
index 55e9020989..12ea149c2b 100644
--- a/tests/unit/unit1655.c
+++ b/tests/unit/unit1655.c
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 #include "unitcheck.h"
-#include "doh.h"
+#include "vdns/doh.h"
 
 static CURLcode test_unit1655(const char *arg)
 {
diff --git a/tests/unit/unit1658.c b/tests/unit/unit1658.c
index 041ced7f29..f8d2531dc0 100644
--- a/tests/unit/unit1658.c
+++ b/tests/unit/unit1658.c
@@ -25,8 +25,8 @@
 
 /* DoH + HTTPSRR are required */
 #if !defined(CURL_DISABLE_DOH) && defined(USE_HTTPSRR)
-#include "doh.h"
-#include "httpsrr.h"
+#include "vdns/doh.h"
+#include "vdns/httpsrr.h"
 
 static CURLcode t1658_setup(void)
 {