src: drop unused includes

Also replace some indirect includes with direct ones.

Closes #20096

diff --git a/src/config2setopts.c b/src/config2setopts.c
index 89a003cc96acb576e0d20a868c86953d2d9ae43f..6ecabe5cc813b566e941818c606bbcd5ddabb289 100644 (file)
--- a/src/config2setopts.c
+++ b/src/config2setopts.c
@@ -26,6 +26,7 @@
 #include "tool_cfgable.h"
 #include "tool_setopt.h"
 #include "tool_findfile.h"
+#include "tool_formparse.h"
 #include "tool_msgs.h"
 #include "tool_libinfo.h"
 #include "tool_cb_soc.h"

diff --git a/src/tool_cb_prg.c b/src/tool_cb_prg.c
index 8d9302f2e1887128809c6a14d8863c74bc9dde29..aebebb5e049e24ac5c10270a388b37579b12c9a5 100644 (file)
--- a/src/tool_cb_prg.c
+++ b/src/tool_cb_prg.c
@@ -25,7 +25,6 @@
 
 #include "tool_cfgable.h"
 #include "tool_cb_prg.h"
-#include "tool_util.h"
 #include "tool_operate.h"
 #include "terminal.h"
 

diff --git a/src/tool_cb_rea.c b/src/tool_cb_rea.c
index 1de2277cd0848400cb968002222640bf0863e023..e896e35cdad19b74fcee7ce4e9973fb3f0a49753 100644 (file)
--- a/src/tool_cb_rea.c
+++ b/src/tool_cb_rea.c
@@ -35,7 +35,6 @@
 #include "tool_cfgable.h"
 #include "tool_cb_rea.h"
 #include "tool_operate.h"
-#include "tool_util.h"
 #include "tool_msgs.h"
 
 #ifndef _WIN32

diff --git a/src/tool_cfgable.c b/src/tool_cfgable.c
index ab4892b0657821eaf45994ad7064d8b332c4e094..b907b246c31e740d41106d464eb3eb5818b3cc6b 100644 (file)
--- a/src/tool_cfgable.c
+++ b/src/tool_cfgable.c
@@ -25,6 +25,7 @@
 
 #include "tool_cfgable.h"
 #include "tool_formparse.h"
+#include "tool_libinfo.h"
 #include "tool_paramhlp.h"
 #include "tool_main.h"
 #include "tool_msgs.h"

diff --git a/src/tool_dirhie.h b/src/tool_dirhie.h
index cb59208d9f3913e7f53a39a2f1bf3128f4889e6b..8503f5e4f3050ec7f939f06841af1636e4211452 100644 (file)
--- a/src/tool_dirhie.h
+++ b/src/tool_dirhie.h
@@ -24,7 +24,6 @@
  *
  ***************************************************************************/
 #include "tool_setup.h"
-#include "tool_cfgable.h"
 
 CURLcode create_dir_hierarchy(const char *outfileo);
 

diff --git a/src/tool_doswin.c b/src/tool_doswin.c
index 855ce0897ca105c81de106868d3ac29341f00c88..c6cfb14c89da4a69ee54d65ed0d69de4b203c3b1 100644 (file)
--- a/src/tool_doswin.c
+++ b/src/tool_doswin.c
@@ -33,7 +33,6 @@
 #  include <stdlib.h>
 #  include <tlhelp32.h>
 #  include "tool_cfgable.h"
-#  include "tool_libinfo.h"
 #endif
 
 #include "tool_bname.h"

diff --git a/src/tool_formparse.c b/src/tool_formparse.c
index 31b381d7e0f1fbe13e330fe5eff4c6ddc90a38e6..659f6e35a4f0b82e8369b9502adb262ab86546e2 100644 (file)
--- a/src/tool_formparse.c
+++ b/src/tool_formparse.c
@@ -25,7 +25,6 @@
 
 #include "tool_cfgable.h"
 #include "tool_msgs.h"
-#include "tool_getparam.h"
 #include "tool_paramhlp.h"
 #include "tool_formparse.h"
 #include "tool_parsecfg.h"

diff --git a/src/tool_help.c b/src/tool_help.c
index 7355d2a7822fc80768aac7161863f9750ae62751..d743fe395344a5d8094d9afb1401cf747491ef34 100644 (file)
--- a/src/tool_help.c
+++ b/src/tool_help.c
@@ -27,7 +27,6 @@
 #include "tool_libinfo.h"
 #include "tool_util.h"
 #include "tool_version.h"
-#include "tool_cb_prg.h"
 #include "tool_hugehelp.h"
 #include "tool_getparam.h"
 #include "tool_cfgable.h"

diff --git a/src/tool_main.c b/src/tool_main.c
index e4a5467de76d0703caf10502a4a57ad71f15e2d0..bd978c46f62afc059413bc90a1b98e8583be7b6a 100644 (file)
--- a/src/tool_main.c
+++ b/src/tool_main.c
@@ -39,7 +39,6 @@
 #include "tool_operate.h"
 #include "tool_vms.h"
 #include "tool_main.h"
-#include "tool_libinfo.h"
 #include "tool_stderr.h"
 
 #ifdef __VMS

diff --git a/src/tool_msgs.c b/src/tool_msgs.c
index 2f943aecff6355642ace282cc83a67e4464195c8..18e014950df5f52f71acb18808086f3b6f29fc97 100644 (file)
--- a/src/tool_msgs.c
+++ b/src/tool_msgs.c
@@ -25,7 +25,6 @@
 
 #include "tool_cfgable.h"
 #include "tool_msgs.h"
-#include "tool_cb_prg.h"
 #include "terminal.h"
 
 #define WARN_PREFIX  "Warning: "

diff --git a/src/tool_operate.c b/src/tool_operate.c
index 7af3fc3f156a073f00c4b16e46a701fdc9c5d548..8318c27116b8c213d9335fd4416687fea7223b74 100644 (file)
--- a/src/tool_operate.c
+++ b/src/tool_operate.c
@@ -51,12 +51,8 @@
 #endif
 
 #include "tool_cfgable.h"
-#include "tool_cb_dbg.h"
 #include "tool_cb_hdr.h"
 #include "tool_cb_prg.h"
-#include "tool_cb_rea.h"
-#include "tool_cb_see.h"
-#include "tool_cb_soc.h"
 #include "tool_cb_wrt.h"
 #include "tool_dirhie.h"
 #include "tool_doswin.h"
@@ -64,7 +60,6 @@
 #include "tool_filetime.h"
 #include "tool_getparam.h"
 #include "tool_helpers.h"
-#include "tool_findfile.h"
 #include "tool_libinfo.h"
 #include "tool_main.h"
 #include "tool_msgs.h"
@@ -84,6 +79,7 @@
 #include "tool_progress.h"
 #include "tool_ipfs.h"
 #include "config2setopts.h"
+#include "var.h"
 
 #ifdef DEBUGBUILD
 /* libcurl's debug-only curl_easy_perform_ev() */

diff --git a/src/tool_paramhlp.h b/src/tool_paramhlp.h
index f7c743b7e26274b0d38eab65c104c83678a3e739..192d242d181d2495bc836f17b572fdd5a24dccd0 100644 (file)
--- a/src/tool_paramhlp.h
+++ b/src/tool_paramhlp.h
@@ -24,7 +24,6 @@
  *
  ***************************************************************************/
 #include "tool_setup.h"
-#include "tool_libinfo.h"
 
 struct getout *new_getout(struct OperationConfig *config);
 

diff --git a/src/tool_progress.c b/src/tool_progress.c
index 5ed038917e17467eb04d6f3adf7f86c30c775982..f7ffe558f244979683318f95abad753b9f849109 100644 (file)
--- a/src/tool_progress.c
+++ b/src/tool_progress.c
@@ -24,7 +24,6 @@
 #include "tool_setup.h"
 #include "tool_operate.h"
 #include "tool_progress.h"
-#include "tool_util.h"
 
 /* The point of this function would be to return a string of the input data,
    but never longer than 5 columns (+ one zero byte).

diff --git a/src/tool_setopt.c b/src/tool_setopt.c
index 837f66c9c319cc6bf844d0d3c10beeffe28b42ab..b50f1a6f817bc95d97b9f0da172345910dcac3cb 100644 (file)
--- a/src/tool_setopt.c
+++ b/src/tool_setopt.c
@@ -25,6 +25,7 @@
 
 #include "tool_cfgable.h"
 #include "tool_easysrc.h"
+#include "tool_formparse.h"
 #include "tool_setopt.h"
 
 #ifndef CURL_DISABLE_LIBCURL_OPTION

diff --git a/src/tool_setopt.h b/src/tool_setopt.h
index fcd56382a75fc1d3200cae29fc5b9c8c851b7000..e990f08a81a3b4624d7280010f2de7f865ff2216 100644 (file)
--- a/src/tool_setopt.h
+++ b/src/tool_setopt.h
@@ -25,8 +25,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include "tool_formparse.h"
-
 /*
  * Macros used in operate()
  */

diff --git a/src/tool_ssls.h b/src/tool_ssls.h
index c06e9427cf4a8a1e622bd228b0fecfed1c1f1fc2..42d10d2c62c6057c12d9b19d8913388755f82daa 100644 (file)
--- a/src/tool_ssls.h
+++ b/src/tool_ssls.h
@@ -24,7 +24,6 @@
  *
  ***************************************************************************/
 #include "tool_setup.h"
-#include "tool_operate.h"
 
 CURLcode tool_ssls_load(struct OperationConfig *config,
                         CURLSH *share, const char *filename);

diff --git a/src/var.c b/src/var.c
index e224bf01d54901a1e0a7de9f086351fe22f6c045..f796aa7ed76b630c560d31a21acfee8cf016a475 100644 (file)
--- a/src/var.c
+++ b/src/var.c
@@ -25,10 +25,7 @@
 
 #include "tool_cfgable.h"
 #include "tool_getparam.h"
-#include "tool_helpers.h"
-#include "tool_findfile.h"
 #include "tool_msgs.h"
-#include "tool_parsecfg.h"
 #include "tool_paramhlp.h"
 #include "tool_writeout_json.h"
 #include "tool_strdup.h"