curl tool: make curl.h first header included in tool_setup.h

28 files changed, 2 insertions, 53 deletions

diff --git a/src/tool_cb_dbg.c b/src/tool_cb_dbg.c
index e3bee1bdb..1850ba0c6 100644
--- a/src/tool_cb_dbg.c
+++ b/src/tool_cb_dbg.c
@@ -21,8 +21,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curl/curl.h>
-
 #define ENABLE_CURLX_PRINTF
 /* use our own printf() functions */
 #include "curlx.h"
diff --git a/src/tool_cb_hdr.c b/src/tool_cb_hdr.c
index d222bbe24..e96331177 100644
--- a/src/tool_cb_hdr.c
+++ b/src/tool_cb_hdr.c
@@ -21,8 +21,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curl/curl.h>
-
 #include "rawstr.h"
 
 #define ENABLE_CURLX_PRINTF
diff --git a/src/tool_cb_prg.c b/src/tool_cb_prg.c
index 5c8a4ad57..809b4d487 100644
--- a/src/tool_cb_prg.c
+++ b/src/tool_cb_prg.c
@@ -21,8 +21,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curl/curl.h>
-
 #define ENABLE_CURLX_PRINTF
 /* use our own printf() functions */
 #include "curlx.h"
diff --git a/src/tool_cb_rea.c b/src/tool_cb_rea.c
index ab03096a7..5320cdb30 100644
--- a/src/tool_cb_rea.c
+++ b/src/tool_cb_rea.c
@@ -21,8 +21,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curl/curl.h>
-
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 #endif
diff --git a/src/tool_cb_see.c b/src/tool_cb_see.c
index b44677eef..00afcb400 100644
--- a/src/tool_cb_see.c
+++ b/src/tool_cb_see.c
@@ -21,8 +21,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curl/curl.h>
-
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 #endif
diff --git a/src/tool_cb_wrt.c b/src/tool_cb_wrt.c
index df055471b..fa47dd3f3 100644
--- a/src/tool_cb_wrt.c
+++ b/src/tool_cb_wrt.c
@@ -21,8 +21,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curl/curl.h>
-
 #define ENABLE_CURLX_PRINTF
 /* use our own printf() functions */
 #include "curlx.h"
diff --git a/src/tool_cfgable.c b/src/tool_cfgable.c
index a17db0bb0..da11f4afe 100644
--- a/src/tool_cfgable.c
+++ b/src/tool_cfgable.c
@@ -21,8 +21,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curl/curl.h>
-
 #include "tool_cfgable.h"
 
 #include "memdebug.h" /* keep this as LAST include */
diff --git a/src/tool_convert.c b/src/tool_convert.c
index 93552ace4..ecce036a0 100644
--- a/src/tool_convert.c
+++ b/src/tool_convert.c
@@ -27,8 +27,6 @@
 #  include <iconv.h>
 #endif
 
-#include <curl/curl.h>
-
 #include "tool_convert.h"
 
 #include "memdebug.h" /* keep this as LAST include */
diff --git a/src/tool_dirhie.c b/src/tool_dirhie.c
index dae0937fb..d21dc97c6 100644
--- a/src/tool_dirhie.c
+++ b/src/tool_dirhie.c
@@ -21,8 +21,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curl/curl.h>
-
 #include <sys/stat.h>
 
 #ifdef HAVE_UNISTD_H
diff --git a/src/tool_doswin.c b/src/tool_doswin.c
index 02957dbb9..c1ba48ea9 100644
--- a/src/tool_doswin.c
+++ b/src/tool_doswin.c
@@ -28,7 +28,6 @@
 #endif
 
 #ifdef WIN32
-#  include <curl/curl.h>
 #  include "tool_cfgable.h"
 #  include "tool_libinfo.h"
 #endif
diff --git a/src/tool_easysrc.c b/src/tool_easysrc.c
index 24073d14e..555ab0a18 100644
--- a/src/tool_easysrc.c
+++ b/src/tool_easysrc.c
@@ -21,8 +21,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curl/curl.h>
-
 #ifndef CURL_DISABLE_LIBCURL_OPTION
 
 #define ENABLE_CURLX_PRINTF
diff --git a/src/tool_formparse.c b/src/tool_formparse.c
index 14003e7cc..e83f7eda1 100644
--- a/src/tool_formparse.c
+++ b/src/tool_formparse.c
@@ -21,8 +21,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curl/curl.h>
-
 #include "rawstr.h"
 
 #define ENABLE_CURLX_PRINTF
diff --git a/src/tool_getparam.c b/src/tool_getparam.c
index 642f5d286..5a24cc8a9 100644
--- a/src/tool_getparam.c
+++ b/src/tool_getparam.c
@@ -21,8 +21,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curl/curl.h>
-
 #include "rawstr.h"
 
 #define ENABLE_CURLX_PRINTF
diff --git a/src/tool_helpers.c b/src/tool_helpers.c
index 3faed6f4a..87d7c609d 100644
--- a/src/tool_helpers.c
+++ b/src/tool_helpers.c
@@ -21,8 +21,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curl/curl.h>
-
 #include "rawstr.h"
 
 #define ENABLE_CURLX_PRINTF
diff --git a/src/tool_libinfo.c b/src/tool_libinfo.c
index ba2f44325..81b6680c8 100644
--- a/src/tool_libinfo.c
+++ b/src/tool_libinfo.c
@@ -21,8 +21,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curl/curl.h>
-
 #include "rawstr.h"
 
 #define ENABLE_CURLX_PRINTF
diff --git a/src/tool_main.c b/src/tool_main.c
index 23d7df5e8..be1b3fcaa 100644
--- a/src/tool_main.c
+++ b/src/tool_main.c
@@ -21,8 +21,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curl/curl.h>
-
 #include <sys/stat.h>
 
 #ifdef HAVE_UNISTD_H
diff --git a/src/tool_mfiles.c b/src/tool_mfiles.c
index b609b6e80..3eda45f91 100644
--- a/src/tool_mfiles.c
+++ b/src/tool_mfiles.c
@@ -21,8 +21,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curl/curl.h>
-
 #include "tool_mfiles.h"
 
 #include "memdebug.h" /* keep this as LAST include */
diff --git a/src/tool_operate.c b/src/tool_operate.c
index 38df6d2ca..ed581e89e 100644
--- a/src/tool_operate.c
+++ b/src/tool_operate.c
@@ -21,8 +21,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curl/curl.h>
-
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 #endif
diff --git a/src/tool_operhlp.c b/src/tool_operhlp.c
index 8b31f54aa..7a98e350b 100644
--- a/src/tool_operhlp.c
+++ b/src/tool_operhlp.c
@@ -21,8 +21,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curl/curl.h>
-
 #include "rawstr.h"
 
 #define ENABLE_CURLX_PRINTF
diff --git a/src/tool_paramhlp.c b/src/tool_paramhlp.c
index b09b33cd0..4d1d17a52 100644
--- a/src/tool_paramhlp.c
+++ b/src/tool_paramhlp.c
@@ -21,8 +21,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curl/curl.h>
-
 #include "rawstr.h"
 
 #define ENABLE_CURLX_PRINTF
diff --git a/src/tool_parsecfg.c b/src/tool_parsecfg.c
index 8bcc00744..561dada11 100644
--- a/src/tool_parsecfg.c
+++ b/src/tool_parsecfg.c
@@ -21,8 +21,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curl/curl.h>
-
 #define ENABLE_CURLX_PRINTF
 /* use our own printf() functions */
 #include "curlx.h"
diff --git a/src/tool_setopt.c b/src/tool_setopt.c
index d387af181..0b6207be4 100644
--- a/src/tool_setopt.c
+++ b/src/tool_setopt.c
@@ -23,8 +23,6 @@
 
 #ifndef CURL_DISABLE_LIBCURL_OPTION
 
-#include <curl/curl.h>
-
 #define ENABLE_CURLX_PRINTF
 /* use our own printf() functions */
 #include "curlx.h"
diff --git a/src/tool_setup.h b/src/tool_setup.h
index c5c552c86..648b0f226 100644
--- a/src/tool_setup.h
+++ b/src/tool_setup.h
@@ -24,6 +24,8 @@
 
 #define CURL_NO_OLDIES
 
+#include <curl/curl.h> /* external interface */
+
 #include "setup.h" /* from the lib directory */
 
 #if defined(macintosh) && defined(__MRC__)
diff --git a/src/tool_urlglob.c b/src/tool_urlglob.c
index de815dce4..5e73f1476 100644
--- a/src/tool_urlglob.c
+++ b/src/tool_urlglob.c
@@ -21,8 +21,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curl/curl.h>
-
 #define _MPRINTF_REPLACE /* we want curl-functions instead of native ones */
 #include <curl/mprintf.h>
 
diff --git a/src/tool_vms.c b/src/tool_vms.c
index 9d9bcc1d4..4a6a6f58e 100644
--- a/src/tool_vms.c
+++ b/src/tool_vms.c
@@ -28,8 +28,6 @@
 #include <unixlib.h>
 #endif
 
-#include <curl/curl.h>
-
 #define ENABLE_CURLX_PRINTF
 #include "curlx.h"
 
diff --git a/src/tool_writeenv.c b/src/tool_writeenv.c
index 166e6d97f..a9462d004 100644
--- a/src/tool_writeenv.c
+++ b/src/tool_writeenv.c
@@ -27,8 +27,6 @@
 #  include <kernel.h>
 #endif
 
-#include <curl/curl.h>
-
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
diff --git a/src/tool_writeout.c b/src/tool_writeout.c
index 760d4bfb8..6038a210a 100644
--- a/src/tool_writeout.c
+++ b/src/tool_writeout.c
@@ -21,8 +21,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curl/curl.h>
-
 #define _MPRINTF_REPLACE /* we want curl-functions instead of native ones */
 #include <curl/mprintf.h>
 
diff --git a/src/tool_xattr.c b/src/tool_xattr.c
index 9c7e7049c..505bdb17a 100644
--- a/src/tool_xattr.c
+++ b/src/tool_xattr.c
@@ -25,8 +25,6 @@
 #  include <sys/xattr.h> /* header from libc, not from libattr */
 #endif
 
-#include <curl/curl.h>
-
 #include "tool_xattr.h"
 
 #include "memdebug.h" /* keep this as LAST include */