#include "setup.h" moved first of all includes

21 files changed, 42 insertions, 27 deletions

diff --git a/lib/cookie.c b/lib/cookie.c
index 8038dafe3..e21e88b40 100644
--- a/lib/cookie.c
+++ b/lib/cookie.c
@@ -55,12 +55,13 @@ Example set of cookies:
     13-Jun-1988 03:04:55 GMT; domain=.fidelity.com; path=/; secure
 ****/
 
+#include "setup.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 
 #include "cookie.h"
-#include "setup.h"
 #include "getdate.h"
 #include "strequal.h"
 
diff --git a/lib/dict.c b/lib/dict.c
index c76553556..b592266cd 100644
--- a/lib/dict.c
+++ b/lib/dict.c
@@ -38,6 +38,8 @@
  * ------------------------------------------------------------
  ****************************************************************************/
 
+#include "setup.h"
+
 /* -- WIN32 approved -- */
 #include <stdio.h>
 #include <string.h>
@@ -49,8 +51,6 @@
 
 #include <errno.h>
 
-#include "setup.h"
-
 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
 #include <winsock.h>
 #include <time.h>
diff --git a/lib/download.c b/lib/download.c
index b837638cc..cec37313f 100644
--- a/lib/download.c
+++ b/lib/download.c
@@ -38,12 +38,12 @@
  * ------------------------------------------------------------
  ****************************************************************************/
 
+#include "setup.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
-#include "setup.h"
-
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
diff --git a/lib/easy.c b/lib/easy.c
index b49345cbe..f45132b9d 100644
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -38,6 +38,8 @@
  * ------------------------------------------------------------
  ****************************************************************************/
 
+#include "setup.h"
+
 /* -- WIN32 approved -- */
 #include <stdio.h>
 #include <string.h>
@@ -49,7 +51,6 @@
 
 #include <errno.h>
 
-#include "setup.h"
 #include "strequal.h"
 
 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
diff --git a/lib/file.c b/lib/file.c
index 53e704f6b..46827f0a2 100644
--- a/lib/file.c
+++ b/lib/file.c
@@ -38,6 +38,8 @@
  * ------------------------------------------------------------
  ****************************************************************************/
 
+#include "setup.h"
+
 /* -- WIN32 approved -- */
 #include <stdio.h>
 #include <string.h>
@@ -49,8 +51,6 @@
 
 #include <errno.h>
 
-#include "setup.h"
-
 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
 #include <winsock.h>
 #include <time.h>
diff --git a/lib/formdata.c b/lib/formdata.c
index 989ea1e7a..625b84ff3 100644
--- a/lib/formdata.c
+++ b/lib/formdata.c
@@ -49,6 +49,8 @@
 
  */
 
+#include "setup.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -56,7 +58,6 @@
 
 #include <time.h>
 
-#include "setup.h"
 #include <curl/curl.h>
 #include "formdata.h"
 
diff --git a/lib/highlevel.c b/lib/highlevel.c
index 18c3c8728..107b6ee1c 100644
--- a/lib/highlevel.c
+++ b/lib/highlevel.c
@@ -38,6 +38,8 @@
  * ------------------------------------------------------------
  ****************************************************************************/
 
+#include "setup.h"
+
 /* -- WIN32 approved -- */
 #include <stdio.h>
 #include <string.h>
@@ -49,7 +51,6 @@
 
 #include <errno.h>
 
-#include "setup.h"
 #include "strequal.h"
 
 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
diff --git a/lib/hostip.c b/lib/hostip.c
index ecfb59de3..6a2d30761 100644
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -38,12 +38,12 @@
  * ------------------------------------------------------------
  ****************************************************************************/
 
+#include "setup.h"
+
 #include <string.h>
 #include <malloc.h>
 #include <errno.h>
 
-#include "setup.h"
-
 #define _REENTRANT
 
 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
diff --git a/lib/http.c b/lib/http.c
index 5e3f1b10c..1ee8b4519 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -38,6 +38,8 @@
  * ------------------------------------------------------------
  ****************************************************************************/
 
+#include "setup.h"
+
 /* -- WIN32 approved -- */
 #include <stdio.h>
 #include <string.h>
@@ -49,7 +51,6 @@
 
 #include <errno.h>
 
-#include "setup.h"
 
 #ifdef NEED_REENTRANT
 #define _REENTRANT /* Necessary to use in Solaris, since the silly guys at Sun
diff --git a/lib/if2ip.c b/lib/if2ip.c
index 25b2c40c2..bba8161c0 100644
--- a/lib/if2ip.c
+++ b/lib/if2ip.c
@@ -38,11 +38,12 @@
  * ------------------------------------------------------------
  ****************************************************************************/
 
+#include "setup.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "setup.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
diff --git a/lib/ldap.c b/lib/ldap.c
index af69b94e9..18b590546 100644
--- a/lib/ldap.c
+++ b/lib/ldap.c
@@ -38,6 +38,8 @@
  * ------------------------------------------------------------
  ****************************************************************************/
 
+#include "setup.h"
+
 /* -- WIN32 approved -- */
 #include <stdio.h>
 #include <string.h>
@@ -48,8 +50,6 @@
 #include <sys/stat.h>
 #include <errno.h>
 
-#include "setup.h"
-
 #if defined(WIN32) && !defined(__GNUC__)
 #else
 # ifdef HAVE_UNISTD_H
diff --git a/lib/netrc.c b/lib/netrc.c
index 80cb81ff5..a5bb4a503 100644
--- a/lib/netrc.c
+++ b/lib/netrc.c
@@ -50,11 +50,12 @@
  * ------------------------------------------------------------
  ****************************************************************************/
 
+#include "setup.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "setup.h"
 #include "getenv.h"
 #include "strequal.h"
 
diff --git a/lib/progress.c b/lib/progress.c
index d2c46cab8..75defbad3 100644
--- a/lib/progress.c
+++ b/lib/progress.c
@@ -38,9 +38,10 @@
  * ------------------------------------------------------------
  ****************************************************************************/
 
-#include <string.h>
 #include "setup.h"
 
+#include <string.h>
+
 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
 #if defined(__MINGW32__)
 #include <winsock.h>
diff --git a/lib/sendf.c b/lib/sendf.c
index e048637be..7d238a974 100644
--- a/lib/sendf.c
+++ b/lib/sendf.c
@@ -38,12 +38,12 @@
  * ------------------------------------------------------------
  ****************************************************************************/
 
+#include "setup.h"
+
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
 
-#include "setup.h"
-
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
diff --git a/lib/speedcheck.c b/lib/speedcheck.c
index 36fb75c03..125f077ac 100644
--- a/lib/speedcheck.c
+++ b/lib/speedcheck.c
@@ -38,6 +38,8 @@
  * ------------------------------------------------------------
  ****************************************************************************/
 
+#include "setup.h"
+
 #include <stdio.h>
 #if defined(__MINGW32__)
 #include <winsock.h>
diff --git a/lib/ssluse.c b/lib/ssluse.c
index 1130aad0c..37374101a 100644
--- a/lib/ssluse.c
+++ b/lib/ssluse.c
@@ -43,7 +43,7 @@
  * Linas Vepstas <linas@linas.org> and Sampo Kellomaki <sampo@iki.fi>
  */
 
-
+#include "setup.h"
 #include <string.h>
 #include <stdlib.h>
 
diff --git a/lib/strequal.c b/lib/strequal.c
index d69e536bd..4aec362b3 100644
--- a/lib/strequal.c
+++ b/lib/strequal.c
@@ -38,10 +38,10 @@
  * ------------------------------------------------------------
  ****************************************************************************/
 
-#include <string.h>
-
 #include "setup.h"
 
+#include <string.h>
+
 int strequal(const char *first, const char *second)
 {
 #if defined(HAVE_STRCASECMP)
diff --git a/lib/telnet.c b/lib/telnet.c
index 133a744f1..486d69ded 100644
--- a/lib/telnet.c
+++ b/lib/telnet.c
@@ -46,6 +46,8 @@
  *
  ****************************************************************************/
 
+#include "setup.h"
+
 /* -- WIN32 approved -- */
 #include <stdio.h>
 #include <string.h>
@@ -57,8 +59,6 @@
 
 #include <errno.h>
 
-#include "setup.h"
-
 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
 #include <winsock.h>
 #include <time.h>
diff --git a/lib/url.c b/lib/url.c
index e74bb4568..cc123fee4 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -39,6 +39,9 @@
  ****************************************************************************/
 
 /* -- WIN32 approved -- */
+
+#include "setup.h"
+
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
@@ -49,7 +52,6 @@
 
 #include <errno.h>
 
-#include "setup.h"
 
 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
 #include <winsock.h>
diff --git a/lib/version.c b/lib/version.c
index be14e6551..475edd129 100644
--- a/lib/version.c
+++ b/lib/version.c
@@ -38,10 +38,11 @@
  * ------------------------------------------------------------
  ****************************************************************************/
 
+#include "setup.h"
+
 #include <string.h>
 #include <stdio.h>
 
-#include "setup.h"
 #include <curl/curl.h>
 #include "urldata.h"
 
diff --git a/lib/writeout.c b/lib/writeout.c
index f37cc7cb3..21603d0cb 100644
--- a/lib/writeout.c
+++ b/lib/writeout.c
@@ -38,6 +38,8 @@
  * ------------------------------------------------------------
  ****************************************************************************/
 
+#include "setup.h"
+
 #include <stdio.h>
 #include <string.h>