src: drop unused includes

Also replace some indirect includes with direct ones.

Closes #20096

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"

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"
 

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

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"

src/tool_dirhie.h

@@ -24,7 +24,6 @@
  *
  ***************************************************************************/
 #include "tool_setup.h"
-#include "tool_cfgable.h"
 
 CURLcode create_dir_hierarchy(const char *outfileo);
 

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"

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"

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"

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

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: "

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() */

src/tool_paramhlp.h

@@ -24,7 +24,6 @@
  *
  ***************************************************************************/
 #include "tool_setup.h"
-#include "tool_libinfo.h"
 
 struct getout *new_getout(struct OperationConfig *config);
 

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).

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

src/tool_setopt.h

@@ -25,8 +25,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include "tool_formparse.h"
-
 /*
  * Macros used in operate()
  */

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);

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"