Include autoconf.h before system headers

Include autoconf.h (either directly or via proxy) before system
headers, so that feature test macros defined there can affect the
system namespace.  Where include order was changed, eliminate some
redundant or unnecessary includes.

ticket: 7961

9 files changed, 10 insertions, 32 deletions

diff --git a/src/util/support/cache-addrinfo.h b/src/util/support/cache-addrinfo.h
index d4d26b14f..a1b7fb28b 100644
--- a/src/util/support/cache-addrinfo.h
+++ b/src/util/support/cache-addrinfo.h
@@ -100,11 +100,10 @@
  *   these functions, and throw all this away.  Pleeease?  :-)
  */
 
-#include "port-sockets.h"
-#include "socket-utils.h"
 #include "k5-platform.h"
 #include "k5-thread.h"
-
+#include "port-sockets.h"
+#include "socket-utils.h"
 #include "fake-addrinfo.h"
 
 #if defined (__APPLE__) && defined (__MACH__) && 0
diff --git a/src/util/support/errors.c b/src/util/support/errors.c
index 4b1cfa062..6c4d8bdbe 100644
--- a/src/util/support/errors.c
+++ b/src/util/support/errors.c
@@ -4,14 +4,9 @@
  * needs to be generated with error tables, after util/et, which builds after
  * this directory.
  */
-#include <stdarg.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
+#include "k5-platform.h"
 #include "k5-err.h"
-
 #include "k5-thread.h"
-#include "k5-platform.h"
 #include "supp-int.h"
 
 /*
diff --git a/src/util/support/fake-addrinfo.c b/src/util/support/fake-addrinfo.c
index 4824a6185..df1cc1dec 100644
--- a/src/util/support/fake-addrinfo.c
+++ b/src/util/support/fake-addrinfo.c
@@ -101,15 +101,12 @@
  *   these functions, and throw all this away.  Pleeease?  :-)
  */
 
-#include "port-sockets.h"
-#include "socket-utils.h"
 #include "k5-platform.h"
 #include "k5-thread.h"
+#include "port-sockets.h"
+#include "socket-utils.h"
 #include "supp-int.h"
 
-#include <stdio.h>
-#include <errno.h>
-
 #define IMPLEMENT_FAKE_GETADDRINFO
 #include "fake-addrinfo.h"
 
diff --git a/src/util/support/gmt_mktime.c b/src/util/support/gmt_mktime.c
index 7655364d9..32fef4386 100644
--- a/src/util/support/gmt_mktime.c
+++ b/src/util/support/gmt_mktime.c
@@ -1,8 +1,8 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /* This code placed in the public domain by Mark W. Eichin */
 
-#include <stdio.h>
 #include "autoconf.h"
+#include <stdio.h>
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/src/util/support/init-addrinfo.c b/src/util/support/init-addrinfo.c
index 7822ce266..68c3dd6ed 100644
--- a/src/util/support/init-addrinfo.c
+++ b/src/util/support/init-addrinfo.c
@@ -46,13 +46,10 @@
    require pulling in socket/nsl/whatever libraries for code not using
    getaddrinfo.  */
 
-#include "port-sockets.h"
-#include "socket-utils.h"
 #include "k5-platform.h"
 #include "k5-thread.h"
-
-#include <stdio.h>
-#include <errno.h>
+#include "port-sockets.h"
+#include "socket-utils.h"
 
 #define IMPLEMENT_FAKE_GETADDRINFO
 #include "fake-addrinfo.h"
diff --git a/src/util/support/plugins.c b/src/util/support/plugins.c
index 82ef97e57..826390976 100644
--- a/src/util/support/plugins.c
+++ b/src/util/support/plugins.c
@@ -24,11 +24,11 @@
  * or implied warranty.
  */
 
+#include "k5-platform.h"
 #include "k5-plugin.h"
 #if USE_DLOPEN
 #include <dlfcn.h>
 #endif
-#include <stdio.h>
 #include <sys/types.h>
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
@@ -36,15 +36,10 @@
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
-#include "k5-platform.h"
-
 #if USE_DLOPEN
 #ifdef RTLD_GROUP
 #define GROUP RTLD_GROUP
diff --git a/src/util/support/t_unal.c b/src/util/support/t_unal.c
index cc2f4c92c..f67cd31ed 100644
--- a/src/util/support/t_unal.c
+++ b/src/util/support/t_unal.c
@@ -1,6 +1,5 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 #undef NDEBUG
-#include <assert.h>
 #include "k5-platform.h"
 
 int main ()
diff --git a/src/util/support/threads.c b/src/util/support/threads.c
index a97789624..3fd86ea8c 100644
--- a/src/util/support/threads.c
+++ b/src/util/support/threads.c
@@ -24,12 +24,9 @@
  * or implied warranty.
  */
 
-#include <assert.h>
-#include <stdlib.h>
-#include <errno.h>
 #define THREAD_SUPPORT_IMPL
-#include "k5-thread.h"
 #include "k5-platform.h"
+#include "k5-thread.h"
 #include "supp-int.h"
 
 MAKE_INIT_FUNCTION(krb5int_thread_support_init);
diff --git a/src/util/support/utf8_conv.c b/src/util/support/utf8_conv.c
index b8bf98969..1f6cc8f6a 100644
--- a/src/util/support/utf8_conv.c
+++ b/src/util/support/utf8_conv.c
@@ -59,7 +59,6 @@
  * All functions return -1 if the character or string cannot be converted.
  */
 
-#include <assert.h>
 #include "k5-platform.h"
 #include "k5-utf8.h"
 #include "supp-int.h"