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

diff --git a/src/appl/gss-sample/gss-misc.c b/src/appl/gss-sample/gss-misc.c
index 3a87fcd04235b51565a5572b45a965b486383f85..080ac4d0c620fc91f8aa0e20b3ed8596ec6211da 100644 (file)
--- a/src/appl/gss-sample/gss-misc.c
+++ b/src/appl/gss-sample/gss-misc.c
@@ -44,6 +44,8 @@
  * or implied warranty.
  */
 
+#include <autoconf.h>
+
 #include <stdio.h>
 #ifdef _WIN32
 #include <windows.h>
@@ -55,8 +57,6 @@
 #endif
 #include <errno.h>
 
-#include <autoconf.h>
-
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/src/appl/simple/client/sim_client.c b/src/appl/simple/client/sim_client.c
index 835d85f88c97ae9058d666bcf7178f983a0e0624..aaa6446c670c507003b71955e2b860887f2be71d 100644 (file)
--- a/src/appl/simple/client/sim_client.c
+++ b/src/appl/simple/client/sim_client.c
@@ -29,25 +29,20 @@
  * This program performs no useful function.
  */
 
+#include <k5-int.h>
+#include "com_err.h"
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
-#include <stdio.h>
-#include <string.h>
 #include <ctype.h>
-#include <errno.h>
-
-#include <k5-int.h>
-#include "com_err.h"
-
-#include "simple.h"
-
-#include <stdlib.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
+#include "simple.h"
+
 /* for old Unixes and friends ... */
 #ifndef MAXHOSTNAMELEN
 #define MAXHOSTNAMELEN 64

diff --git a/src/appl/user_user/client.c b/src/appl/user_user/client.c
index 3d5fc51f120e12b07c13a73235e9cbfa32aaaa65..28901a6370711a1a4a5847036a669e79bdfd68e0 100644 (file)
--- a/src/appl/user_user/client.c
+++ b/src/appl/user_user/client.c
@@ -24,17 +24,14 @@
  * or implied warranty.
  */
 
+#include "k5-int.h"
+#include "com_err.h"
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-
-#include "k5-int.h"
-#include "com_err.h"
 
 int main (int argc, char *argv[])
 {

diff --git a/src/appl/user_user/server.c b/src/appl/user_user/server.c
index dbff68e64a897199dc1d6cfee009ca7502e61e37..09ea4e0ed7490e66377c4a455409cd93caa7de5c 100644 (file)
--- a/src/appl/user_user/server.c
+++ b/src/appl/user_user/server.c
@@ -1,3 +1,4 @@
+
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /* appl/user_user/server.c - One end of user-user client-server pair */
 /*
@@ -24,20 +25,17 @@
  * or implied warranty.
  */
 
+#include "k5-int.h"
+#include "port-sockets.h"
+#include "com_err.h"
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
-#include <stdio.h>
-#include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <errno.h>
-
-#include "port-sockets.h"
-#include "k5-int.h"
-#include "com_err.h"
 
 /* fd 0 is a tcp socket used to talk to the client */
 

diff --git a/src/clients/kpasswd/kpasswd.c b/src/clients/kpasswd/kpasswd.c
index 9f4952bb82d8b4a1835b8519118a7305cf0d6264..efc596edf7ced8a37cd805fb26d921c5225b1295 100644 (file)
--- a/src/clients/kpasswd/kpasswd.c
+++ b/src/clients/kpasswd/kpasswd.c
@@ -1,8 +1,7 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+#include "k5-platform.h"
 #include <locale.h>
-#include <stdio.h>
 #include <sys/types.h>
-#include "k5-platform.h"
 
 #ifndef _WIN32
 #include <unistd.h>

diff --git a/src/clients/kpasswd/ksetpwd.c b/src/clients/kpasswd/ksetpwd.c
index 97199050623debe1d696f7ee2c4c40f0479ed5c6..5f9c982614fb5c543785e4c71d08b71fc7db7ba9 100644 (file)
--- a/src/clients/kpasswd/ksetpwd.c
+++ b/src/clients/kpasswd/ksetpwd.c
@@ -1,10 +1,8 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+#include <k5-platform.h>
 #include <krb5.h>
-#include <string.h>
 #include <unistd.h>
-#include <stdio.h>
 #include <time.h>
-#include <k5-platform.h>
 
 #define TKTTIMELEFT     60*10   /* ten minutes */
 

diff --git a/src/clients/ksu/setenv.c b/src/clients/ksu/setenv.c
index 33ac1e3030f52f31977862835c196a645a70a4fa..a7895c6b47ca191b6073106170d6a3dc3ffe241c 100644 (file)
--- a/src/clients/ksu/setenv.c
+++ b/src/clients/ksu/setenv.c
@@ -34,11 +34,11 @@
 
 /* based on @(#)setenv.c        5.2 (Berkeley) 6/27/88 */
 
+#include "autoconf.h"
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "autoconf.h"
 
 static char *_findenv(char *, int *);
 

diff --git a/src/clients/ksu/xmalloc.c b/src/clients/ksu/xmalloc.c
index 9e3e98db23235b269868b1ba360c09a83bd384e0..430a6b3bf41503ce68bbf79c27a58a7720d78e4c 100644 (file)
--- a/src/clients/ksu/xmalloc.c
+++ b/src/clients/ksu/xmalloc.c
@@ -24,9 +24,8 @@
  * or implied warranty.
  */
 
-#include "ksu.h"
-#include <stdarg.h>
 #include "k5-platform.h"
+#include "ksu.h"
 
 void *xmalloc (size_t sz)
 {

diff --git a/src/clients/kswitch/kswitch.c b/src/clients/kswitch/kswitch.c
index b64947972cd07ed7afc30c02c0c0a32a3c5c1b8b..6ad470b0997075ee16ddb82b22ba6bd9b0f4a49b 100644 (file)
--- a/src/clients/kswitch/kswitch.c
+++ b/src/clients/kswitch/kswitch.c
@@ -24,8 +24,8 @@
  * or implied warranty.
  */
 
-#include <locale.h>
 #include "k5-int.h"
+#include <locale.h>
 
 extern int optind;
 extern char *optarg;

diff --git a/src/clients/kvno/kvno.c b/src/clients/kvno/kvno.c
index 134accbd7b3badb60e407ddd3a6be9043c384912..377d4f34519a96bd1d04d303c9b9b0ac64423f6a 100644 (file)
--- a/src/clients/kvno/kvno.c
+++ b/src/clients/kvno/kvno.c
@@ -25,10 +25,8 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#include <locale.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include "k5-platform.h"
+#include <locale.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/src/kadmin/cli/keytab.c b/src/kadmin/cli/keytab.c
index cd52da58b2da9f189e05b71393ed652c12a4a907..6c0c92c221b111209582afaa427c512df7f0f5d8 100644 (file)
--- a/src/kadmin/cli/keytab.c
+++ b/src/kadmin/cli/keytab.c
@@ -32,11 +32,6 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
 #include "k5-int.h"
 #include <kadm5/admin.h>
 #include <adm_proto.h>

diff --git a/src/kadmin/cli/ss_wrapper.c b/src/kadmin/cli/ss_wrapper.c
index 54f56716bbf274199a696333c88d9ebca5901c9d..bd368a8066d965bdb45bcca676eb12a55a4e58b4 100644 (file)
--- a/src/kadmin/cli/ss_wrapper.c
+++ b/src/kadmin/cli/ss_wrapper.c
@@ -23,8 +23,8 @@
  * or implied warranty.
  */
 
-#include <krb5.h>
 #include <k5-platform.h>
+#include <krb5.h>
 #include <locale.h>
 #include <ss/ss.h>
 #include "kadmin.h"

diff --git a/src/kadmin/dbutil/dump.c b/src/kadmin/dbutil/dump.c
index acdb6791bb561c023afc793b50f3d853ed0f1eb3..9f5d26aa8fde75bdcbd39c7354e8a9bc6b4e4456 100644 (file)
--- a/src/kadmin/dbutil/dump.c
+++ b/src/kadmin/dbutil/dump.c
@@ -28,7 +28,6 @@
  * Use is subject to license terms.
  */
 
-#include <stdio.h>
 #include <k5-int.h>
 #include <kadm5/admin.h>
 #include <kadm5/server_internal.h>

diff --git a/src/kadmin/dbutil/kadm5_create.c b/src/kadmin/dbutil/kadm5_create.c
index 5d2854ad2eab601af13656bb404cf70b36cbbb6c..fffc64df18a1eef477ef06aea3672e1c20262735 100644 (file)
--- a/src/kadmin/dbutil/kadm5_create.c
+++ b/src/kadmin/dbutil/kadm5_create.c
@@ -31,11 +31,8 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
 #include <k5-int.h>
+#include <ctype.h>
 #include <kdb.h>
 #include <kadm5/admin.h>
 #include <adm_proto.h>

diff --git a/src/kadmin/dbutil/kdb5_create.c b/src/kadmin/dbutil/kdb5_create.c
index 385dfb931fb992e620e3ab3ea9a5afd3eb8a05fc..3698d57193c5f974266095793917e8dccd606c2f 100644 (file)
--- a/src/kadmin/dbutil/kdb5_create.c
+++ b/src/kadmin/dbutil/kdb5_create.c
@@ -53,7 +53,6 @@
  * Use is subject to license terms.
  */
 
-#include <stdio.h>
 #include <k5-int.h>
 #include <kdb.h>
 #include <kadm5/server_internal.h>

diff --git a/src/kadmin/dbutil/kdb5_mkey.c b/src/kadmin/dbutil/kdb5_mkey.c
index ba8716be04949867e7496e81e6f721435ffcbbd8..bc10b44ffc82c23995b78f5cc9adb9290430d141 100644 (file)
--- a/src/kadmin/dbutil/kdb5_mkey.c
+++ b/src/kadmin/dbutil/kdb5_mkey.c
@@ -4,14 +4,13 @@
  * Use is subject to license terms.
  */
 
-#include <stdio.h>
-#include <time.h>
 #include <k5-int.h>
 #include <kdb.h>
 #include <kadm5/server_internal.h>
 #include <kadm5/admin.h>
 #include <adm_proto.h>
 #include "kdb5_util.h"
+#include <time.h>
 
 #if defined(HAVE_COMPILE) && defined(HAVE_STEP)
 #define SOLARIS_REGEXPS

diff --git a/src/kadmin/dbutil/kdb5_util.c b/src/kadmin/dbutil/kdb5_util.c
index 4f04d782bc0c58ea44b373ee982e7d43ac97268b..e2bb36c895f70a9dd377dfff51113e6fd0f05580 100644 (file)
--- a/src/kadmin/dbutil/kdb5_util.c
+++ b/src/kadmin/dbutil/kdb5_util.c
@@ -53,7 +53,6 @@
  * Use is subject to license terms.
  */
 
-#include <stdio.h>
 #include <k5-int.h>
 #include <kadm5/admin.h>
 #include <locale.h>

diff --git a/src/kadmin/dbutil/ovload.c b/src/kadmin/dbutil/ovload.c
index add58c0f968a79553386fff2b5cd6d7f15bab441..15a5ab3005215bfe7e67de7b7f19a8d58ddfc31a 100644 (file)
--- a/src/kadmin/dbutil/ovload.c
+++ b/src/kadmin/dbutil/ovload.c
@@ -1,13 +1,7 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+#include    <k5-int.h>
 #include    <unistd.h>
-#include    <string.h>
-#include    <stdlib.h>
-#include    "autoconf.h"
-#ifdef HAVE_MEMORY_H
-#include    <memory.h>
-#endif
 
-#include    <k5-int.h>
 #include <kadm5/admin.h>
 #include <kadm5/server_internal.h>
 #include    <kdb.h>

diff --git a/src/kadmin/server/ipropd_svc.c b/src/kadmin/server/ipropd_svc.c
index 955acb9c475b0edeb2db93aa9f92bfb7270eb3f6..bc760fa5f83f4de6a569ff16d0523957d4546be6 100644 (file)
--- a/src/kadmin/server/ipropd_svc.c
+++ b/src/kadmin/server/ipropd_svc.c
@@ -7,14 +7,12 @@
 /* #pragma ident       "@(#)ipropd_svc.c       1.2     04/02/20 SMI" */
 
 
-#include <stdio.h>
-#include <stdlib.h> /* getenv, exit */
+#include "k5-platform.h"
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/resource.h> /* rlimit */
 #include <syslog.h>
 
-#include "k5-platform.h"
 #include <kadm5/admin.h>
 #include <kadm5/kadm_rpc.h>
 #include <kadm5/server_internal.h>

diff --git a/src/kadmin/server/ovsec_kadmd.c b/src/kadmin/server/ovsec_kadmd.c
index bc9e3c7e0dcfb8fc42d06361b1380c246fc52dc4..7318e630c0e8916e5bafed4471b1d23ef737c55b 100644 (file)
--- a/src/kadmin/server/ovsec_kadmd.c
+++ b/src/kadmin/server/ovsec_kadmd.c
@@ -30,6 +30,7 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#include <k5-platform.h>
 #include <errno.h>
 #include <locale.h>
 #include <stdio.h>

diff --git a/src/kdc/kdc_transit.c b/src/kdc/kdc_transit.c
index c540ad26cb885b857b0dcf5242a738c5baf065c7..61aef99eddfaf97d3b406619f6bedef8672d9630 100644 (file)
--- a/src/kdc/kdc_transit.c
+++ b/src/kdc/kdc_transit.c
@@ -30,8 +30,6 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stddef.h>
-
 #include "k5-int.h"
 #include "kdc_util.h"
 

diff --git a/src/kdc/main.c b/src/kdc/main.c
index c3b7b802e428e170e0097d119022dfcd7742716f..82dfc0e8631580ce076e36838a3da88718808fbf 100644 (file)
--- a/src/kdc/main.c
+++ b/src/kdc/main.c
@@ -23,16 +23,6 @@
  * or implied warranty.
  */
 
-#include <locale.h>
-#include <stdio.h>
-#include <syslog.h>
-#include <signal.h>
-#include <errno.h>
-#include <netdb.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <sys/wait.h>
-
 #include "k5-int.h"
 #include "com_err.h"
 #include <kadm5/admin.h>
@@ -47,6 +37,14 @@
 #include <netinet/in.h>
 #endif
 
+#include <locale.h>
+#include <syslog.h>
+#include <signal.h>
+#include <netdb.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <sys/wait.h>
+
 #if defined(NEED_DAEMON_PROTO)
 extern int daemon(int, int);
 #endif

diff --git a/src/lib/crypto/crypto_tests/t_pkcs5.c b/src/lib/crypto/crypto_tests/t_pkcs5.c
index 7ab078df7a50f3bf18bd5e120bc30dcbc44d5d54..8e87a802a94ff61916df24daf9f0ce5b18dcbc31 100644 (file)
--- a/src/lib/crypto/crypto_tests/t_pkcs5.c
+++ b/src/lib/crypto/crypto_tests/t_pkcs5.c
@@ -26,11 +26,6 @@
 
 /* Test vectors for PBKDF2 (from PKCS #5v2), based on RFC 3211. */
 
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-
 #include "k5-int.h"
 
 static void printhex (size_t len, const char *p)

diff --git a/src/lib/crypto/nss/hash_provider/hash_gen.h b/src/lib/crypto/nss/hash_provider/hash_gen.h
index 95e29002fec29e27f515dd0f2f5bb521b539f7a0..2b84da58cbf801c7540d0527ed1a91b934b57f19 100644 (file)
--- a/src/lib/crypto/nss/hash_provider/hash_gen.h
+++ b/src/lib/crypto/nss/hash_provider/hash_gen.h
@@ -33,8 +33,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "sechash.h"
 #include "k5-int.h"
+#include "sechash.h"
 
 krb5_error_code k5_nss_gen_hash(HASH_HashType hashType, unsigned int icount,
                                 const krb5_data *input, krb5_data *output);

diff --git a/src/lib/gssapi/krb5/k5sealiov.c b/src/lib/gssapi/krb5/k5sealiov.c
index 0b99a77e954fd0a0a592a5ced401afc0dae46ea0..a1296700ec28b2e22095c54198496c436d584729 100644 (file)
--- a/src/lib/gssapi/krb5/k5sealiov.c
+++ b/src/lib/gssapi/krb5/k5sealiov.c
@@ -24,11 +24,8 @@
  * or implied warranty.
  */
 
-#include <assert.h>
-#include "k5-platform.h"        /* for 64-bit support */
-#include "k5-int.h"          /* for zap() */
+#include "k5-int.h"
 #include "gssapiP_krb5.h"
-#include <stdarg.h>
 
 static krb5_error_code
 make_seal_token_v1_iov(krb5_context context,

diff --git a/src/lib/gssapi/krb5/k5sealv3.c b/src/lib/gssapi/krb5/k5sealv3.c
index f3ade5e79f9182afcc574a6ca4444633101bdd77..1a5c14c2713bae6a9ba171bf1d00443858d2061e 100644 (file)
--- a/src/lib/gssapi/krb5/k5sealv3.c
+++ b/src/lib/gssapi/krb5/k5sealv3.c
@@ -26,11 +26,8 @@
 
 /* draft-ietf-krb-wg-gssapi-cfx-05 */
 
-#include <assert.h>
-#include "k5-platform.h"        /* for 64-bit support */
-#include "k5-int.h"             /* for zap() */
+#include "k5-int.h"
 #include "gssapiP_krb5.h"
-#include <stdarg.h>
 
 int
 gss_krb5int_rotate_left (void *ptr, size_t bufsiz, size_t rc)

diff --git a/src/lib/gssapi/krb5/k5sealv3iov.c b/src/lib/gssapi/krb5/k5sealv3iov.c
index 960f31b7e4b2a012e80988e7e766be3ab4adb81b..a73edb6a4ffd37f5be39e75db2550b200de21fdc 100644 (file)
--- a/src/lib/gssapi/krb5/k5sealv3iov.c
+++ b/src/lib/gssapi/krb5/k5sealv3iov.c
@@ -24,11 +24,8 @@
  * or implied warranty.
  */
 
-#include <assert.h>
-#include "k5-platform.h"        /* for 64-bit support */
-#include "k5-int.h"          /* for zap() */
+#include "k5-int.h"
 #include "gssapiP_krb5.h"
-#include <stdarg.h>
 
 krb5_error_code
 gss_krb5int_make_seal_token_v3_iov(krb5_context context,

diff --git a/src/lib/gssapi/krb5/k5unsealiov.c b/src/lib/gssapi/krb5/k5unsealiov.c
index b654c66c5b814b3e1ee8b8133ae84000b052f9a2..f34d802bd93cefd6a98766a6755c9f49b8f7b8df 100644 (file)
--- a/src/lib/gssapi/krb5/k5unsealiov.c
+++ b/src/lib/gssapi/krb5/k5unsealiov.c
@@ -24,11 +24,8 @@
  * or implied warranty.
  */
 
-#include <assert.h>
-#include "k5-platform.h"        /* for 64-bit support */
-#include "k5-int.h"          /* for zap() */
+#include "k5-int.h"
 #include "gssapiP_krb5.h"
-#include <stdarg.h>
 
 static OM_uint32
 kg_unseal_v1_iov(krb5_context context,

diff --git a/src/lib/gssapi/krb5/naming_exts.c b/src/lib/gssapi/krb5/naming_exts.c
index 10dbe321a1a2da8845c069d6fff1e91a0e21b741..6062a6dd8052558cad720b48c8dd6592204f3044 100644 (file)
--- a/src/lib/gssapi/krb5/naming_exts.c
+++ b/src/lib/gssapi/krb5/naming_exts.c
@@ -24,10 +24,8 @@
  * or implied warranty.
  */
 
-#include <assert.h>
-#include "k5-int.h"          /* for zap() */
+#include "k5-int.h"
 #include "gssapiP_krb5.h"
-#include <stdarg.h>
 
 krb5_error_code
 kg_init_name(krb5_context context, krb5_principal principal,

diff --git a/src/lib/gssapi/krb5/prf.c b/src/lib/gssapi/krb5/prf.c
index bfca89b4c6ed5028e16d48de9af577a9cfd677b9..e19291f3486993411080188761f13bcd9f6f543b 100644 (file)
--- a/src/lib/gssapi/krb5/prf.c
+++ b/src/lib/gssapi/krb5/prf.c
@@ -24,10 +24,8 @@
  * or implied warranty.
  */
 
-#include <assert.h>
-#include "k5-int.h"          /* for zap() */
+#include "k5-int.h"
 #include "gssapiP_krb5.h"
-#include <stdarg.h>
 
 #ifndef MIN             /* Usually found in <sys/param.h>. */
 #define MIN(_a,_b)  ((_a)<(_b)?(_a):(_b))

diff --git a/src/lib/gssapi/krb5/store_cred.c b/src/lib/gssapi/krb5/store_cred.c
index 0a020d75735bcebe3583dca0574b6b6d5a215830..a6becf333d8c0f4258f3fa230ba8b91f111b55af 100644 (file)
--- a/src/lib/gssapi/krb5/store_cred.c
+++ b/src/lib/gssapi/krb5/store_cred.c
@@ -24,10 +24,8 @@
  * or implied warranty.
  */
 
-#include <assert.h>
-#include "k5-int.h"          /* for zap() */
+#include "k5-int.h"
 #include "gssapiP_krb5.h"
-#include <stdarg.h>
 
 static int
 has_unexpired_creds(krb5_gss_cred_id_t kcred,

diff --git a/src/lib/gssapi/spnego/spnego_mech.c b/src/lib/gssapi/spnego/spnego_mech.c
index c9c1b11653d716d02ce7deb9ad871fc8afaf768a..173c6d2939a4c0b77fc54309df831015a8605ac3 100644 (file)
--- a/src/lib/gssapi/spnego/spnego_mech.c
+++ b/src/lib/gssapi/spnego/spnego_mech.c
@@ -59,10 +59,6 @@
  */
 /* #pragma ident       "@(#)spnego_mech.c      1.7     04/09/28 SMI" */
 
-#include       <assert.h>
-#include       <stdio.h>
-#include       <stdlib.h>
-#include       <string.h>
 #include       <k5-int.h>
 #include       <krb5.h>
 #include       <mglueP.h>

diff --git a/src/lib/kadm5/alt_prof.c b/src/lib/kadm5/alt_prof.c
index 9ebcb738a54aed8091a7b5ade671d4278fd0be01..205333be4a856ffb810ae4b76a8b6f6d4efc3c7d 100644 (file)
--- a/src/lib/kadm5/alt_prof.c
+++ b/src/lib/kadm5/alt_prof.c
@@ -29,8 +29,8 @@
  */
 
 /* Implement alternate profile file handling. */
-#include "fake-addrinfo.h"
 #include "k5-int.h"
+#include "fake-addrinfo.h"
 #include <kadm5/admin.h>
 #include "adm_proto.h"
 #include <stdio.h>

diff --git a/src/lib/kadm5/chpass_util.c b/src/lib/kadm5/chpass_util.c
index 7a75136658fbf30a43314adabcc999da15dc5be3..408b0eb31fac2c19eb995ebfd374742106c996a5 100644 (file)
--- a/src/lib/kadm5/chpass_util.c
+++ b/src/lib/kadm5/chpass_util.c
@@ -4,11 +4,8 @@
  */
 
 
-#include <stdio.h>
 #include "autoconf.h"
-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#endif
+#include <stdio.h>
 #include <time.h>
 #include <string.h>
 

diff --git a/src/lib/kadm5/clnt/client_init.c b/src/lib/kadm5/clnt/client_init.c
index 48d93882a6d6aec9479a7a9a8f71ed435f6c4018..7fac2a8e7a96077133c2eaf1554cc06b9778c2d9 100644 (file)
--- a/src/lib/kadm5/clnt/client_init.c
+++ b/src/lib/kadm5/clnt/client_init.c
@@ -29,23 +29,14 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#include <stdio.h>
+#include <k5-int.h>
 #include <netdb.h>
-#include "autoconf.h"
-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#endif
-#include <string.h>
 #include <com_err.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <fake-addrinfo.h>
-#include <k5-int.h> /* for KRB5_ADM_DEFAULT_PORT */
 #include <krb5.h>
-#ifdef __STDC__
-#include <stdlib.h>
-#endif
 
 #include <kadm5/admin.h>
 #include <kadm5/kadm_rpc.h>

diff --git a/src/lib/kadm5/srv/server_acl.c b/src/lib/kadm5/srv/server_acl.c
index b2aeb7daa4e8e73a6645f0b7b18663799503f1a8..044b0e9860f8d156ba8b92845f17571e09718947 100644 (file)
--- a/src/lib/kadm5/srv/server_acl.c
+++ b/src/lib/kadm5/srv/server_acl.c
@@ -24,11 +24,10 @@
  * or implied warranty.
  */
 
-#include <stdio.h>
+#include "k5-int.h"
 #include <syslog.h>
 #include <sys/param.h>
 #include <gssapi/gssapi_generic.h>
-#include "k5-int.h"
 #include <kadm5/server_internal.h>
 #include <kadm5/admin.h>
 #include "adm_proto.h"

diff --git a/src/lib/kadm5/srv/server_init.c b/src/lib/kadm5/srv/server_init.c
index f46f89d9881cfdaa760d2e2674b26995da902a66..c0e0b78c82a282e7001400458b25b56223015223 100644 (file)
--- a/src/lib/kadm5/srv/server_init.c
+++ b/src/lib/kadm5/srv/server_init.c
@@ -10,11 +10,8 @@
  * Use is subject to license terms.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
+#include "k5-int.h"
 #include <com_err.h>
-#include "k5-int.h"             /* needed for gssapiP_krb5.h */
 #include <kadm5/admin.h>
 #include <krb5.h>
 #include <kdb_log.h>

diff --git a/src/lib/kadm5/srv/server_kdb.c b/src/lib/kadm5/srv/server_kdb.c
index 6db5229e3594a4e09e7f68d1b28a56d02370237a..f99bf5855e16f17f275cef1335080c24ca3ecf3e 100644 (file)
--- a/src/lib/kadm5/srv/server_kdb.c
+++ b/src/lib/kadm5/srv/server_kdb.c
@@ -10,8 +10,6 @@
  * Use is subject to license terms.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
 #include "k5-int.h"
 #include <kadm5/admin.h>
 #include "server_internal.h"

diff --git a/src/lib/kadm5/unit-test/setkey-test.c b/src/lib/kadm5/unit-test/setkey-test.c
index 4da236e093a8d46b92625a8fb43d9f7b1665aef0..28364b6e087159de25aa4fb1ba6bf27741a0ebe7 100644 (file)
--- a/src/lib/kadm5/unit-test/setkey-test.c
+++ b/src/lib/kadm5/unit-test/setkey-test.c
@@ -1,5 +1,4 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-#include <stdio.h>
 #include <k5-int.h>
 #include <kadm5/admin.h>
 

diff --git a/src/lib/kdb/kdb5.c b/src/lib/kdb/kdb5.c
index 4b4bb49a7e143f3cce639dba593283643738418b..7541b1ec45d57bf9fea2a194ba6902fe358b323a 100644 (file)
--- a/src/lib/kdb/kdb5.c
+++ b/src/lib/kdb/kdb5.c
@@ -37,10 +37,7 @@
  * Include files
  */
 
-#include <stdio.h>
-#include <string.h>
 #include <k5-int.h>
-#include <osconf.h>
 #include "kdb5.h"
 #include "kdb_log.h"
 #include "kdb5int.h"

diff --git a/src/lib/kdb/kdb5.h b/src/lib/kdb/kdb5.h
index 33bc49cca04922680cf1cd3a74720b656a270d47..9a43046bdd2d092a5f97435a9eab9078d97cfdfc 100644 (file)
--- a/src/lib/kdb/kdb5.h
+++ b/src/lib/kdb/kdb5.h
@@ -2,14 +2,14 @@
 #ifndef _KRB5_KDB5_H_
 #define _KRB5_KDB5_H_
 
+#include <k5-int.h>
+
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
 #include <errno.h>
 #include <utime.h>
-#include <utime.h>
-#include <k5-int.h>
 #include "kdb.h"
 
 #define KRB5_DB_GET_DB_CONTEXT(kcontext) (((kdb5_dal_handle*) (kcontext)->dal_handle)->db_context)

diff --git a/src/lib/kdb/kdb_convert.c b/src/lib/kdb/kdb_convert.c
index ee3e984ec7158cb530a6f11ef43140609fccf6c3..1370395c8d96a4503dbd85efc6b5ccafba0f0047 100644 (file)
--- a/src/lib/kdb/kdb_convert.c
+++ b/src/lib/kdb/kdb_convert.c
@@ -10,13 +10,12 @@
  * This file contains api's for conversion of the kdb_incr_update_t
  * struct(s) into krb5_db_entry struct(s) and vice-versa.
  */
+#include <k5-int.h>
 #include <sys/types.h>
 #include <com_err.h>
 #include <locale.h>
-#include <errno.h>
 #include <iprop_hdr.h>
 #include "iprop.h"
-#include <k5-int.h>
 #include <kdb.h>
 #include <kdb_log.h>
 

diff --git a/src/lib/krb5/krb/appdefault.c b/src/lib/krb5/krb/appdefault.c
index e3d14be37881ef9ae3b7c45ca90ba157230d34eb..73fd2605e82e58d5b2a39e7ea8457f405f0399d8 100644 (file)
--- a/src/lib/krb5/krb/appdefault.c
+++ b/src/lib/krb5/krb/appdefault.c
@@ -4,8 +4,6 @@
  *               handle the [appdefaults] profile section
  */
 
-#include <stdio.h>
-#include <string.h>
 #include "k5-int.h"
 
 

diff --git a/src/lib/krb5/krb/bld_princ.c b/src/lib/krb5/krb/bld_princ.c
index 3dbe3561d559ac6602f618e26db3b25eb7486c2a..ab6fed897f18eae113a4e4e3bc04336364128150 100644 (file)
--- a/src/lib/krb5/krb/bld_princ.c
+++ b/src/lib/krb5/krb/bld_princ.c
@@ -24,7 +24,6 @@
  * or implied warranty.
  */
 
-#include <stdarg.h>
 #include "k5-int.h"
 
 static krb5_error_code

diff --git a/src/lib/krb5/krb/chpw.c b/src/lib/krb5/krb/chpw.c
index b67a58831fda487effddf3b9e5d1977391d68170..463ce643e5bd61a613900a908bb9c089ca947352 100644 (file)
--- a/src/lib/krb5/krb/chpw.c
+++ b/src/lib/krb5/krb/chpw.c
@@ -2,7 +2,6 @@
 /*
 ** set password functions added by Paul W. Nelson, Thursby Software Systems, Inc.
 */
-#include <string.h>
 
 #include "k5-int.h"
 #include "k5-unicode.h"

diff --git a/src/lib/krb5/krb/deltat.c b/src/lib/krb5/krb/deltat.c
index cf6e289d17adbc2d6ca46e02a675d47d9d30eaee..0169da8e61dfe141c9748966503f20e4ccff6929 100644 (file)
--- a/src/lib/krb5/krb/deltat.c
+++ b/src/lib/krb5/krb/deltat.c
@@ -75,9 +75,8 @@
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
 
-#include <ctype.h>
-#include <errno.h>
 #include "k5-int.h"
+#include <ctype.h>
 
 struct param {
     krb5_int32 delta;

diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c
index 88bad4c09d7b10a12d58624ea205718417bee9ac..5a2b8d8b225333126b32005afc87f66b7c53181b 100644 (file)
--- a/src/lib/krb5/krb/get_in_tkt.c
+++ b/src/lib/krb5/krb/get_in_tkt.c
@@ -24,8 +24,6 @@
  * or implied warranty.
  */
 
-#include <string.h>
-
 #include "k5-int.h"
 #include "int-proto.h"
 #include "os-proto.h"

diff --git a/src/lib/krb5/krb/kerrs.c b/src/lib/krb5/krb/kerrs.c
index 16e7267e0b64e111316bf72a0e86edb6779666ba..c5d6c810104dbb908aa9a9fe4ce58e81479ef93a 100644 (file)
--- a/src/lib/krb5/krb/kerrs.c
+++ b/src/lib/krb5/krb/kerrs.c
@@ -24,7 +24,6 @@
  * or implied warranty.
  */
 
-#include <stdarg.h>
 #include "k5-int.h"
 #include "int-proto.h"
 

diff --git a/src/lib/krb5/krb/t_kerb.c b/src/lib/krb5/krb/t_kerb.c
index 0f27ce9cec1b3f727553ad5fa973d106cbd8e3cd..60cfb5b15115564b3a25b437aa6b9684d730305f 100644 (file)
--- a/src/lib/krb5/krb/t_kerb.c
+++ b/src/lib/krb5/krb/t_kerb.c
@@ -4,8 +4,8 @@
  * routines.
  */
 
-#include "krb5.h"
 #include "autoconf.h"
+#include "krb5.h"
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

diff --git a/src/lib/krb5/krb/x-deltat.y b/src/lib/krb5/krb/x-deltat.y
index 5d5f2f88797e48caeb7938c61519bc3d75f4ae6a..0fb0078ea061fdf4910357a505309977f9b8cdeb 100644 (file)
--- a/src/lib/krb5/krb/x-deltat.y
+++ b/src/lib/krb5/krb/x-deltat.y
@@ -47,9 +47,8 @@
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
 
-#include <ctype.h>
-#include <errno.h>
 #include "k5-int.h"
+#include <ctype.h>
 
 struct param {
     krb5_int32 delta;

diff --git a/src/lib/krb5/krb5_libinit.c b/src/lib/krb5/krb5_libinit.c
index f2382d1d8c084888bf7b7442bf835d088b8a1a78..b72bc58c79e83dd4305e7e11c9832f8b8a27daf7 100644 (file)
--- a/src/lib/krb5/krb5_libinit.c
+++ b/src/lib/krb5/krb5_libinit.c
@@ -1,8 +1,5 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-#include <assert.h>
 
-#include "autoconf.h"
-#include "com_err.h"
 #include "k5-int.h"
 
 #if defined(_WIN32) || defined(USE_CCAPI)

diff --git a/src/lib/krb5/os/changepw.c b/src/lib/krb5/os/changepw.c
index 0ee427d2ed34df8f2474bf364004fc1493af2b53..dde84367ef83b49de17ed568d9be74049f3df1ba 100644 (file)
--- a/src/lib/krb5/os/changepw.c
+++ b/src/lib/krb5/os/changepw.c
@@ -31,8 +31,8 @@
  *  infrastructure
  */
 
-#include "fake-addrinfo.h"
 #include "k5-int.h"
+#include "fake-addrinfo.h"
 #include "os-proto.h"
 #include "../krb/auth_con.h"
 #include "../krb/int-proto.h"

diff --git a/src/lib/krb5/os/locate_kdc.c b/src/lib/krb5/os/locate_kdc.c
index 2fade13eecb45b1afc37353f99a35ae223c5edfc..1f2039c78022c3c48a93a5a85b72c9c3599feb93 100644 (file)
--- a/src/lib/krb5/os/locate_kdc.c
+++ b/src/lib/krb5/os/locate_kdc.c
@@ -24,10 +24,9 @@
  * or implied warranty.
  */
 
-#include "fake-addrinfo.h"
 #include "k5-int.h"
+#include "fake-addrinfo.h"
 #include "os-proto.h"
-#include <stdio.h>
 #ifdef KRB5_DNS_LOOKUP
 #ifdef WSHELPER
 #include <wshelper.h>

diff --git a/src/lib/krb5/os/sendto_kdc.c b/src/lib/krb5/os/sendto_kdc.c
index a7fa4612c8d49e56a8d4b193083a6b91997e0be6..4555321f7afbd6f4ea67374ee29eab0182dbd55e 100644 (file)
--- a/src/lib/krb5/os/sendto_kdc.c
+++ b/src/lib/krb5/os/sendto_kdc.c
@@ -53,8 +53,8 @@
 /* Send packet to KDC for realm; wait for response, retransmitting
  * as necessary. */
 
-#include "fake-addrinfo.h"
 #include "k5-int.h"
+#include "fake-addrinfo.h"
 
 #include "os-proto.h"
 

diff --git a/src/lib/krb5/os/t_locate_kdc.c b/src/lib/krb5/os/t_locate_kdc.c
index dd609fda60a1f4c9bbbd1199013f5c1e52b57e03..e986ae9d9cf23750fb06f9764ba904746b9c9d57 100644 (file)
--- a/src/lib/krb5/os/t_locate_kdc.c
+++ b/src/lib/krb5/os/t_locate_kdc.c
@@ -1,8 +1,7 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
+#include "k5-platform.h"
 #include "port-sockets.h"
+#include <sys/types.h>
 #include <com_err.h>
 
 #define TEST

diff --git a/src/lib/krb5/os/t_std_conf.c b/src/lib/krb5/os/t_std_conf.c
index 6ee54d5be96287ebcd1fc164b70bf0fcd76c1ae8..72021c3626329e048f06b5d29440623f4580cae6 100644 (file)
--- a/src/lib/krb5/os/t_std_conf.c
+++ b/src/lib/krb5/os/t_std_conf.c
@@ -4,8 +4,8 @@
  *      values from the krb5 config file(s).
  */
 
-#include "fake-addrinfo.h"
 #include "k5-int.h"
+#include "fake-addrinfo.h"
 
 #include <stdio.h>
 #include <string.h>

diff --git a/src/lib/krb5/os/t_trace.c b/src/lib/krb5/os/t_trace.c
index 4cb2bd022b7ef26246bb4a56500a8723bdec8df7..5aea68e8d26456d0ea8492b9ab9e2cc8ee72a592 100644 (file)
--- a/src/lib/krb5/os/t_trace.c
+++ b/src/lib/krb5/os/t_trace.c
@@ -30,15 +30,10 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include "port-sockets.h"
-#include <com_err.h>
-
-#define TEST
 #include "k5-int.h"
+#include "port-sockets.h"
 #include "os-proto.h"
+#include <com_err.h>
 
 const char *prog;
 

diff --git a/src/lib/krb5/rcache/rc_dfl.c b/src/lib/krb5/rcache/rc_dfl.c
index 70d98c19d720f6abf6e5059c49278eb53096ed6b..8f517d0c8b450bc0bc011eb6b7d85cc70afc68fd 100644 (file)
--- a/src/lib/krb5/rcache/rc_dfl.c
+++ b/src/lib/krb5/rcache/rc_dfl.c
@@ -9,10 +9,10 @@
 /*
  * An implementation for the default replay cache type.
  */
+#include "k5-int.h"
 #include "rc_base.h"
 #include "rc_dfl.h"
 #include "rc_io.h"
-#include "k5-int.h"
 #include "rc-int.h"
 
 /*

diff --git a/src/lib/krb5/rcache/t_replay.c b/src/lib/krb5/rcache/t_replay.c
index 0e108bf4e85e78abc67ec890ebf7703cd11fc855..db273ec2f2219e6f357238de94a268bdd2c808f3 100644 (file)
--- a/src/lib/krb5/rcache/t_replay.c
+++ b/src/lib/krb5/rcache/t_replay.c
@@ -24,11 +24,6 @@
  * or implied warranty.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
 #include "k5-int.h"
 
 static void

diff --git a/src/lib/rpc/auth_unix.c b/src/lib/rpc/auth_unix.c
index c09b5248ee71780b0b17c61526a7128d7868f553..6cb998dc5a788d9cf41edf1d35d51313d23e7bd6 100644 (file)
--- a/src/lib/rpc/auth_unix.c
+++ b/src/lib/rpc/auth_unix.c
@@ -45,6 +45,7 @@ static char sccsid[] = "@(#)auth_unix.c 1.19 87/08/11 Copyr 1984 Sun Micro";
  *
  */
 
+#include "autoconf.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
@@ -54,8 +55,6 @@ static char sccsid[] = "@(#)auth_unix.c 1.19 87/08/11 Copyr 1984 Sun Micro";
 #include <gssrpc/auth.h>
 #include <gssrpc/auth_unix.h>
 
-#include "autoconf.h"
-
 /*
  * Unix authenticator operations vector
  */

diff --git a/src/lib/rpc/clnt_generic.c b/src/lib/rpc/clnt_generic.c
index da3e8e8ba7edf2e10a8c79032509384b60fb7129..595c5f2ac395e385153c78cafa328b55dbfad408 100644 (file)
--- a/src/lib/rpc/clnt_generic.c
+++ b/src/lib/rpc/clnt_generic.c
@@ -36,12 +36,12 @@
 static char sccsid[] = "@(#)clnt_generic.c 1.4 87/08/11 (C) 1987 SMI";
 #endif
 
+#include "autoconf.h"
 #include <string.h>
 #include <gssrpc/rpc.h>
 #include <sys/socket.h>
 #include <sys/errno.h>
 #include <netdb.h>
-#include "autoconf.h"
 
 /*
  * Generic client creation: takes (hostname, program-number, protocol) and

diff --git a/src/lib/rpc/clnt_perror.c b/src/lib/rpc/clnt_perror.c
index b21ea8abdfe8adebc1a64a5d06337c529cbfb863..fcc365746410720f9a3f38ea45d674072b9dd425 100644 (file)
--- a/src/lib/rpc/clnt_perror.c
+++ b/src/lib/rpc/clnt_perror.c
@@ -38,6 +38,7 @@ static char sccsid[] = "@(#)clnt_perror.c 1.15 87/10/07 Copyr 1984 Sun Micro";
 /*
  * clnt_perror.c
  */
+#include "autoconf.h"
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
@@ -46,8 +47,6 @@ static char sccsid[] = "@(#)clnt_perror.c 1.15 87/10/07 Copyr 1984 Sun Micro";
 #include <gssrpc/auth.h>
 #include <gssrpc/clnt.h>
 
-#include "autoconf.h"
-
 #ifndef HAVE_STRERROR
 #ifdef NEED_SYS_ERRLIST
 extern char *sys_errlist[];

diff --git a/src/lib/rpc/clnt_simple.c b/src/lib/rpc/clnt_simple.c
index df8f246f210162c02fd5972ca39cfba3584b27d8..4ec99edd805b6368fdba9abca8e3e14cd5b65db8 100644 (file)
--- a/src/lib/rpc/clnt_simple.c
+++ b/src/lib/rpc/clnt_simple.c
@@ -40,6 +40,7 @@ static char sccsid[] = "@(#)clnt_simple.c 1.35 87/08/11 Copyr 1984 Sun Micro";
  * Simplified front end to rpc.
  */
 
+#include "autoconf.h"
 #include <stdio.h>
 /* for close() */
 #include <unistd.h>
@@ -48,7 +49,6 @@ static char sccsid[] = "@(#)clnt_simple.c 1.35 87/08/11 Copyr 1984 Sun Micro";
 #include <netdb.h>
 #include <string.h>
 #include <port-sockets.h>
-#include "autoconf.h"
 
 static struct callrpc_private {
        CLIENT  *client;

diff --git a/src/lib/rpc/getrpcport.c b/src/lib/rpc/getrpcport.c
index 32ff739fd77aa3e2d08e1943c420a7546e8525a3..e2817544dbf68bfb07a0e4c34f4be9c9d8e5d49f 100644 (file)
--- a/src/lib/rpc/getrpcport.c
+++ b/src/lib/rpc/getrpcport.c
@@ -32,13 +32,13 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "autoconf.h"
 #include <stdio.h>
 #include <string.h>
 #include <gssrpc/rpc.h>
 #include <gssrpc/pmap_clnt.h>
 #include <netdb.h>
 #include <sys/socket.h>
-#include "autoconf.h"
 
 int
 gssrpc_getrpcport(

diff --git a/src/lib/rpc/pmap_rmt.c b/src/lib/rpc/pmap_rmt.c
index 10d9e3f62b0c1fe2a313e5896c30db8a2f98bb80..cd0b3095ae4ff1f0babbb5d800b57e29cd36f6d0 100644 (file)
--- a/src/lib/rpc/pmap_rmt.c
+++ b/src/lib/rpc/pmap_rmt.c
@@ -41,6 +41,7 @@ static char sccsid[] = "@(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro";
  * remote call and broadcast service
  */
 
+#include "k5-platform.h"
 #include <unistd.h>
 #include <gssrpc/rpc.h>
 #include <gssrpc/pmap_prot.h>
@@ -50,8 +51,6 @@ static char sccsid[] = "@(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro";
 #ifdef sun
 #include <sys/sockio.h>
 #endif
-#include <stdio.h>
-#include <errno.h>
 #ifdef OSF1
 #include <net/route.h>
 #include <sys/mbuf.h>
@@ -60,9 +59,7 @@ static char sccsid[] = "@(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro";
 #include <sys/ioctl.h>
 #include <arpa/inet.h>
 #define MAX_BROADCAST_SIZE 1400
-#include <string.h>
 #include <port-sockets.h>
-#include "k5-platform.h"       /* set_cloexec_fd */
 
 static struct timeval timeout = { 3, 0 };
 

diff --git a/src/lib/rpc/svc_auth_gss.c b/src/lib/rpc/svc_auth_gss.c
index 8da70032a1e8d5fc9ac2212ea6bb211ca72adead..09a353412fe1e47ad68311ddac9af2cc49ad3ae5 100644 (file)
--- a/src/lib/rpc/svc_auth_gss.c
+++ b/src/lib/rpc/svc_auth_gss.c
@@ -34,9 +34,7 @@
   Id: svc_auth_gss.c,v 1.28 2002/10/15 21:29:36 kwc Exp
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "k5-platform.h"
 #include <gssrpc/rpc.h>
 #include <gssrpc/auth_gssapi.h>
 #ifdef HAVE_HEIMDAL
@@ -46,7 +44,6 @@
 #include <gssapi/gssapi.h>
 #include <gssapi/gssapi_generic.h>
 #endif
-#include "k5-platform.h"       /* SIZE_MAX */
 
 #ifdef DEBUG_GSSAPI
 int svc_debug_gss = DEBUG_GSSAPI;

diff --git a/src/lib/rpc/svc_tcp.c b/src/lib/rpc/svc_tcp.c
index f05220316f177a0c877569859d01dd2847b65089..d78cf55a741960233c3ad731a4392456ce4e46cb 100644 (file)
--- a/src/lib/rpc/svc_tcp.c
+++ b/src/lib/rpc/svc_tcp.c
@@ -43,15 +43,10 @@ static char sccsid[] = "@(#)svc_tcp.c 1.21 87/08/11 Copyr 1984 Sun Micro";
  * and a record/tcp stream.
  */
 
-#include <stdio.h>
-#include <string.h>
+#include "k5-platform.h"
 #include <unistd.h>
 #include <gssrpc/rpc.h>
 #include <sys/socket.h>
-#include <errno.h>
-#include <stdlib.h>
-#include "autoconf.h"
-#include "k5-platform.h"       /* set_cloexec_fd */
 #include <port-sockets.h>
 #include <socket-utils.h>
 /*extern bool_t abort();

diff --git a/src/lib/rpc/svc_udp.c b/src/lib/rpc/svc_udp.c
index 928006164d978fbbfcdc4bf742340aa34eb73aba..f70bf0146ba10a7558f0bd2ebff6d45cdad18ffd 100644 (file)
--- a/src/lib/rpc/svc_udp.c
+++ b/src/lib/rpc/svc_udp.c
@@ -41,19 +41,15 @@ static char sccsid[] = "@(#)svc_udp.c 1.24 87/08/11 Copyr 1984 Sun Micro";
  * achieving execute-at-most-once semantics.)
  */
 
-#include <stdio.h>
-#include <string.h>
+#include "k5-platform.h"
 #include <unistd.h>
 #include <gssrpc/rpc.h>
 #include <sys/socket.h>
-#include <errno.h>
-#include "autoconf.h"
 #ifdef HAVE_SYS_UIO_H
 #include <sys/uio.h>
 #endif
 #include <port-sockets.h>
 #include <socket-utils.h>
-#include "k5-platform.h"
 
 
 #ifndef GETSOCKNAME_ARG3_TYPE

diff --git a/src/lib/rpc/unit-test/client.c b/src/lib/rpc/unit-test/client.c
index 646477f3dc8e3d9cd6fbdf8ce918ce56d906f518..06b0863f626270d9c83499c052919fba564ee1a0 100644 (file)
--- a/src/lib/rpc/unit-test/client.c
+++ b/src/lib/rpc/unit-test/client.c
@@ -5,11 +5,11 @@
  *
  */
 
+#include "autoconf.h"
 #include <stdio.h>
 #include <string.h>
 #include <netdb.h>
 #include <sys/socket.h>
-#include "autoconf.h"
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/src/plugins/audit/kdc_j_encode.c b/src/plugins/audit/kdc_j_encode.c
index da5a9d8393ad07552f39928087204696d4c64d7d..c3f913cd29a08f2c3ab178f756566ae839138204 100755 (executable)
--- a/src/plugins/audit/kdc_j_encode.c
+++ b/src/plugins/audit/kdc_j_encode.c
@@ -30,12 +30,12 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <syslog.h>
 #include <k5-int.h>
 #include <k5-json.h>
 #include "kdc_j_encode.h"
 #include "j_dict.h"
 #include <krb5/audit_plugin.h>
+#include <syslog.h>
 
 static krb5_error_code
 string_to_value(const char *in, k5_json_object obj, const char *key);

diff --git a/src/plugins/authdata/greet_client/greet.c b/src/plugins/authdata/greet_client/greet.c
index 499d0edb39c53463517e671ae5c270cf8df271d7..2aae2ddd63b3c74eb905249e105be6ba2cfaa235 100644 (file)
--- a/src/plugins/authdata/greet_client/greet.c
+++ b/src/plugins/authdata/greet_client/greet.c
@@ -23,8 +23,6 @@
  * or implied warranty.
  */
 
-#include <string.h>
-#include <errno.h>
 #include "k5-int.h"
 #include <krb5/authdata_plugin.h>
 #include <assert.h>

diff --git a/src/plugins/authdata/greet_server/greet_auth.c b/src/plugins/authdata/greet_server/greet_auth.c
index b26c8607594fbcd73b361ec5ec97ec2f6dc3df64..9d8444bb9f5670c40aa62e4fcde97d0b05570d42 100644 (file)
--- a/src/plugins/authdata/greet_server/greet_auth.c
+++ b/src/plugins/authdata/greet_server/greet_auth.c
@@ -28,8 +28,6 @@
  * Sample authorization data plugin
  */
 
-#include <string.h>
-#include <errno.h>
 #include <k5-int.h>
 #include <krb5/authdata_plugin.h>
 #include <kdb.h>

diff --git a/src/plugins/kdb/db2/adb_openclose.c b/src/plugins/kdb/db2/adb_openclose.c
index 447a395f8f4d935ff681e7ea131ba8c596791c79..9bad905055d33ab77816790730f863d5642c0516 100644 (file)
--- a/src/plugins/kdb/db2/adb_openclose.c
+++ b/src/plugins/kdb/db2/adb_openclose.c
@@ -5,10 +5,10 @@
  * $Header$
  */
 
+#include        <k5-int.h>
 #include        <sys/file.h>
 #include        <fcntl.h>
 #include        <unistd.h>
-#include        <k5-int.h>
 #include        "policy_db.h"
 #include        <stdlib.h>
 #include        <db.h>

diff --git a/src/plugins/kdb/db2/libdb2/btree/bt_open.c b/src/plugins/kdb/db2/libdb2/btree/bt_open.c
index 069b2dfde02b505252faf10a7dfe52e7c24d3ea6..2977b17f3a1dd5c7433e0932eaa4923dbced9606 100644 (file)
--- a/src/plugins/kdb/db2/libdb2/btree/bt_open.c
+++ b/src/plugins/kdb/db2/libdb2/btree/bt_open.c
@@ -46,6 +46,8 @@ static char sccsid[] = "@(#)bt_open.c 8.11 (Berkeley) 11/2/95";
  * is wholly independent of the Postgres code.
  */
 
+#include "k5-platform.h"
+
 #include <sys/param.h>
 #include <sys/stat.h>
 
@@ -58,8 +60,6 @@ static char sccsid[] = "@(#)bt_open.c 8.11 (Berkeley) 11/2/95";
 #include <string.h>
 #include <unistd.h>
 
-#include "k5-platform.h"       /* mkstemp? */
-
 #include "db-int.h"
 #include "btree.h"
 

diff --git a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_policy.c b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_policy.c
index 6ec711f55164740cea04ccc188593526f579e2c3..5de04948a5b69007f06e5c0489f9c5195f9ce702 100644 (file)
--- a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_policy.c
+++ b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_policy.c
@@ -31,8 +31,6 @@
  * Create / Delete / Modify / View / List policy objects.
  */
 
-#include <stdio.h>
-#include <time.h>
 #include <k5-int.h>
 #include <kadm5/admin.h>
 #include "kdb5_ldap_util.h"

diff --git a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c
index 7494928647867a9b4bb790072137841520bf5662..ba8c12b0d887e7955528dea9d9f8cdea8965c981 100644 (file)
--- a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c
+++ b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c
@@ -81,7 +81,6 @@
  * Create / Modify / Destroy / View / List realm(s)
  */
 
-#include <stdio.h>
 #include <k5-int.h>
 #include <kadm5/admin.h>
 #include <adm_proto.h>

diff --git a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c
index 05fac497651d5401acca089b474e1924106e1ada..64d0f917ab424e732977587b0cdc3b3a80bdb6fd 100644 (file)
--- a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c
+++ b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_services.c
@@ -36,7 +36,6 @@
  * functions manage the service objects.
  */
 
-#include <stdio.h>
 #include <k5-int.h>
 #include "kdb5_ldap_util.h"
 #include "kdb5_ldap_list.h"

diff --git a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c
index fe1b70eaa391c715324ac49340743ce4211a1954..8d6f3752d8400a13be3483cf27754ad4abab9775 100644 (file)
--- a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c
+++ b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c
@@ -75,11 +75,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <k5-int.h>
 #include <locale.h>
-#include <stdio.h>
 #include <time.h>
-
-#include <k5-int.h>
 #include <kadm5/admin.h>
 #include <adm_proto.h>
 #include "kdb5_ldap_util.h"

diff --git a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
index dcd313b91bb34b0247dab394641e94d9a2f2c866..aa8e7cef1c1d6340644d010b49e7d604d32fa2cb 100644 (file)
--- a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
+++ b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
@@ -32,6 +32,12 @@
 #ifndef _KDB_LDAP_H
 #define _KDB_LDAP_H 1
 
+#include "k5-int.h"
+#include <k5-thread.h>
+#include <kdb5.h>
+#include "ldap_krbcontainer.h"
+#include "ldap_realm.h"
+
 /* We want the interfaces marked "deprecated" in OpenLDAP.  */
 #define LDAP_DEPRECATED 1
 #include <ldap.h>
@@ -51,12 +57,6 @@
 # endif
 #endif /* BUILD_WITH_BROKEN_LDAP */
 
-#include <k5-thread.h>
-#include <kdb5.h>
-#include "k5-int.h"
-#include "ldap_krbcontainer.h"
-#include "ldap_realm.h"
-
 extern struct timeval timelimit;
 
 #define  DEFAULT_CONNS_PER_SERVER    5

diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c
index a0664bc04f1ff59028aea1a012be93c03925f031..23be4a90685683c775ed61a35598b5eadbe28c01 100644 (file)
--- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c
+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c
@@ -31,9 +31,6 @@
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
-#include <string.h>
-#include <time.h>
-#include <ctype.h>
 #include "kdb_ldap.h"
 #include "ldap_misc.h"
 #include "ldap_handle.h"
@@ -41,6 +38,8 @@
 #include "ldap_principal.h"
 #include "princ_xdr.h"
 #include "ldap_pwd_policy.h"
+#include <time.h>
+#include <ctype.h>
 
 #ifdef NEED_STRPTIME_PROTO
 extern char *strptime (const char *, const char *, struct tm *);

diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
index b9bd0590561cba98925e57784b7b7f12b9ac4c97..21ede0bc4b1c2ea441e10759858baf24261570a2 100644 (file)
--- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
@@ -32,7 +32,6 @@
  * Use is subject to license terms.
  */
 
-#include <time.h>
 #include "ldap_main.h"
 #include "kdb_ldap.h"
 #include "ldap_principal.h"
@@ -41,6 +40,7 @@
 #include "ldap_pwd_policy.h"
 #include "ldap_err.h"
 #include <kadm5/admin.h>
+#include <time.h>
 
 extern char* principal_attributes[];
 extern char* max_pwd_life_attr[];

diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_service_stash.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_service_stash.c
index fc000497a30f4ab60ed6d43c89df1c2bf7332e8d..94ad9c7d74f52285a48e3ac9834853a42bce4db0 100644 (file)
--- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_service_stash.c
+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_service_stash.c
@@ -28,10 +28,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <ctype.h>
 #include "ldap_main.h"
 #include "kdb_ldap.h"
 #include "ldap_service_stash.h"
+#include <ctype.h>
 
 /* Decode a password of the form {HEX}<hexstring>. */
 static krb5_error_code

diff --git a/src/plugins/kdb/ldap/libkdb_ldap/lockout.c b/src/plugins/kdb/ldap/libkdb_ldap/lockout.c
index 83d79e098ab3c787c9bc8ebe992486c1aa6d420a..5a225d4a9be4377b07cdb6eb5362f52cc9f9414c 100644 (file)
--- a/src/plugins/kdb/ldap/libkdb_ldap/lockout.c
+++ b/src/plugins/kdb/ldap/libkdb_ldap/lockout.c
@@ -24,9 +24,6 @@
  * or implied warranty.
  */
 
-#include <stdio.h>
-#include <errno.h>
-
 #include <k5-int.h>
 #include <kadm5/admin.h>
 #include <kdb.h>

diff --git a/src/plugins/preauth/pkinit/pkinit.h b/src/plugins/preauth/pkinit/pkinit.h
index 3ed43c052e2886484e140b2ec7ac1e2c81bbf466..83683b35276ff22769a70dd2b4cf31b82d3125dc 100644 (file)
--- a/src/plugins/preauth/pkinit/pkinit.h
+++ b/src/plugins/preauth/pkinit/pkinit.h
@@ -31,11 +31,10 @@
 #ifndef _PKINIT_H
 #define _PKINIT_H
 
+#include <k5-platform.h>
 #include <krb5/krb5.h>
 #include <krb5/preauth_plugin.h>
-#include <k5-platform.h>
 #include <k5-int-pkinit.h>
-#include <autoconf.h>
 #include <profile.h>
 #include "pkinit_accessor.h"
 #include "pkinit_trace.h"

diff --git a/src/plugins/preauth/pkinit/pkinit_clnt.c b/src/plugins/preauth/pkinit/pkinit_clnt.c
index 6c2316298e9b46afb5b75bf72fa3f98d3b9fad5d..5ad735a126d884ced4fea8e903b907931c56b3ad 100644 (file)
--- a/src/plugins/preauth/pkinit/pkinit_clnt.c
+++ b/src/plugins/preauth/pkinit/pkinit_clnt.c
@@ -29,20 +29,14 @@
  * SUCH DAMAGES.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <string.h>
-#include <ctype.h>
-#include <assert.h>
-#include <dlfcn.h>
-#include <sys/stat.h>
-
 #include "k5-int.h"
 #include "pkinit.h"
 #include "k5-json.h"
 
+#include <unistd.h>
+#include <dlfcn.h>
+#include <sys/stat.h>
+
 /**
  * Return true if we should use ContentInfo rather than SignedData. This
  * happens if we are talking to what might be an old (pre-6112) MIT KDC and

diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_nss.c b/src/plugins/preauth/pkinit/pkinit_crypto_nss.c
index bb9d6739fb5b324d232b2695be9e3411e4285d48..02261637f221792732f7776bf4dae6c0c31a30f0 100644 (file)
--- a/src/plugins/preauth/pkinit/pkinit_crypto_nss.c
+++ b/src/plugins/preauth/pkinit/pkinit_crypto_nss.c
@@ -32,16 +32,16 @@
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <errno.h>
-
 #include "k5-platform.h"
 #include "k5-buf.h"
 #include "k5-utf8.h"
 #include "krb5.h"
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <dirent.h>
+#include <errno.h>
+
 #include <prerror.h>
 #include <prmem.h>
 #include <prprf.h>

diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
index 7a0cac473466f9cf1c6eaf96faf5ad3aec88952b..246bc1b938bce80043fb72163f582f8711529649 100644 (file)
--- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
@@ -29,20 +29,13 @@
  * SUCH DAMAGES.
  */
 
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include "pkinit_crypto_openssl.h"
+#include "k5-buf.h"
 #include <dlfcn.h>
 #include <unistd.h>
 #include <dirent.h>
 #include <arpa/inet.h>
 
-#include "k5-platform.h"
-#include "k5-buf.h"
-
-#include "pkinit_crypto_openssl.h"
-
 static krb5_error_code pkinit_init_pkinit_oids(pkinit_plg_crypto_context );
 static void pkinit_fini_pkinit_oids(pkinit_plg_crypto_context );
 

diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.h b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.h
index 1e916132fcbf3840d4fdc922356d66d4668d14cd..bfe6609a893a03fa9fee0baa021c68e9eb1139e9 100644 (file)
--- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.h
+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.h
@@ -31,6 +31,8 @@
 #ifndef _PKINIT_CRYPTO_OPENSSL_H
 #define _PKINIT_CRYPTO_OPENSSL_H
 
+#include "pkinit.h"
+
 #include <openssl/bn.h>
 #include <openssl/dh.h>
 #include <openssl/x509.h>
@@ -45,8 +47,6 @@
 #include <openssl/asn1.h>
 #include <openssl/pem.h>
 
-#include "pkinit.h"
-
 #define DN_BUF_LEN  256
 #define MAX_CREDS_ALLOWED 20
 

diff --git a/src/plugins/preauth/pkinit/pkinit_kdf_constants.c b/src/plugins/preauth/pkinit/pkinit_kdf_constants.c
index 9d4f7d075e67004202e1e74142ba97c065e63267..1604f1670ac7a481198fcfe3654ab44367e7ecfe 100644 (file)
--- a/src/plugins/preauth/pkinit/pkinit_kdf_constants.c
+++ b/src/plugins/preauth/pkinit/pkinit_kdf_constants.c
@@ -30,20 +30,7 @@
  * for SHA-1, SHA-256 and SHA-512.
  */
 
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <dlfcn.h>
-#include <unistd.h>
-#include <dirent.h>
-
-#include "k5-platform.h"
-#include "krb5.h"
-#include "k5-int-pkinit.h"
-
 #include "pkinit.h"
-#include "pkinit_crypto.h"
 
 /* statically declare OID constants for all three algorithms */
 const krb5_octet krb5_pkinit_sha1_oid[8] =

diff --git a/src/plugins/preauth/pkinit/pkinit_kdf_test.c b/src/plugins/preauth/pkinit/pkinit_kdf_test.c
index 710e1ff393374974a5de7ba1467008e0df638ac6..afc6029435574df910e28ab431f69b119bf483c6 100644 (file)
--- a/src/plugins/preauth/pkinit/pkinit_kdf_test.c
+++ b/src/plugins/preauth/pkinit/pkinit_kdf_test.c
@@ -31,17 +31,8 @@
  * document, currently draft-ietf-krb-wg-pkinit-alg-agility-04.txt.
  */
 
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <dlfcn.h>
-#include <unistd.h>
-#include <dirent.h>
-
 #include "k5-platform.h"
-
-#include "pkinit_crypto_openssl.h"
+#include "pkinit.h"
 
 /**
  * Initialize a krb5_data from @a s, a constant string. Note @a s is evaluated

diff --git a/src/plugins/preauth/pkinit/pkinit_lib.c b/src/plugins/preauth/pkinit/pkinit_lib.c
index 077080afe3fbcdb2513f93ec50036093ec7d527a..2f88545da8417c1ac3c5895d1c564cd9f9a0f013 100644 (file)
--- a/src/plugins/preauth/pkinit/pkinit_lib.c
+++ b/src/plugins/preauth/pkinit/pkinit_lib.c
@@ -29,16 +29,6 @@
  * SUCH DAMAGES.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <string.h>
-#include <ctype.h>
-#include <assert.h>
-
-#include "k5-platform.h"
-
 #include "pkinit.h"
 
 #define FAKECERT

diff --git a/src/plugins/preauth/pkinit/pkinit_profile.c b/src/plugins/preauth/pkinit/pkinit_profile.c
index 6c22d7ea5dcd593ed381218f2bb2efe9a015a8db..334e54ab44fb0cdd6918895886a99b97c6ebe451 100644 (file)
--- a/src/plugins/preauth/pkinit/pkinit_profile.c
+++ b/src/plugins/preauth/pkinit/pkinit_profile.c
@@ -29,11 +29,6 @@
  * SUCH DAMAGES.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-
 #include "k5-int.h"
 #include "pkinit.h"
 

diff --git a/src/plugins/preauth/pkinit/pkinit_srv.c b/src/plugins/preauth/pkinit/pkinit_srv.c
index 190e854414963f3256818055b7bcba4e380b65ba..5639fca9519620708cb5ad1ed9144f11b2d9b50c 100644 (file)
--- a/src/plugins/preauth/pkinit/pkinit_srv.c
+++ b/src/plugins/preauth/pkinit/pkinit_srv.c
@@ -29,11 +29,6 @@
  * SUCH DAMAGES.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-
 #include <k5-int.h>
 #include "pkinit.h"
 

diff --git a/src/slave/kprop.c b/src/slave/kprop.c
index 7446c76efb68d07b17f8a8cb96ff9f2bddebd636..d28a1af40ca43572ccaca4557fdeec20dd663caa 100644 (file)
--- a/src/slave/kprop.c
+++ b/src/slave/kprop.c
@@ -24,13 +24,10 @@
  * or implied warranty.
  */
 
-#include <errno.h>
+#include "k5-int.h"
 #include <locale.h>
-#include <stdio.h>
-#include <ctype.h>
 #include <sys/file.h>
 #include <signal.h>
-#include <string.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>
@@ -40,7 +37,6 @@
 #include <netdb.h>
 #include <fcntl.h>
 
-#include "k5-int.h"
 #include "com_err.h"
 #include "fake-addrinfo.h"
 #include "kprop.h"

diff --git a/src/slave/kprop_sock.c b/src/slave/kprop_sock.c
index a439b378cfbb2104b75fb05f89f8422756595b98..1591a8b18016e4d149c0c8bc3972dc767a9c2dd5 100644 (file)
--- a/src/slave/kprop_sock.c
+++ b/src/slave/kprop_sock.c
@@ -26,13 +26,12 @@
 
 /* sockaddr2krbaddr() utility function used by kprop and kpropd */
 
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
 #include "k5-int.h"
 #include "kprop.h"
 
+#include <sys/types.h>
+#include <sys/socket.h>
+
 /*
  * Convert an IPv4 or IPv6 socket address to a newly allocated krb5_address.
  * There is similar code elsewhere in the tree, so this should possibly become

diff --git a/src/slave/kpropd.c b/src/slave/kpropd.c
index 0f4a8f000a77e4dca31188633e072b259d0305df..18a8e1d2cfe54e18c3649a05c6961cf990a82fc3 100644 (file)
--- a/src/slave/kpropd.c
+++ b/src/slave/kpropd.c
@@ -51,12 +51,14 @@
  */
 
 
+#include "k5-int.h"
+#include "com_err.h"
+#include "fake-addrinfo.h"
+
 #include <locale.h>
-#include <stdio.h>
 #include <ctype.h>
 #include <sys/file.h>
 #include <signal.h>
-#include <string.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/time.h>
@@ -69,11 +71,6 @@
 #include <netdb.h>
 #include <syslog.h>
 
-#include "k5-int.h"
-#include "com_err.h"
-#include "fake-addrinfo.h"
-#include <errno.h>
-
 #include "kprop.h"
 #include <iprop_hdr.h>
 #include "iprop.h"

diff --git a/src/slave/kproplog.c b/src/slave/kproplog.c
index ab49a0fe5e25c8355c1ea9fec21a7d0363449dc8..efa1f432d0dafe74368d44517f3a644351550657 100644 (file)
--- a/src/slave/kproplog.c
+++ b/src/slave/kproplog.c
@@ -8,15 +8,14 @@
  * This module will parse the update logs on the master or slave servers.
  */
 
+#include "k5-int.h"
 #include <locale.h>
-#include <stdio.h>
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <time.h>
 #include <limits.h>
 #include <locale.h>
 #include <syslog.h>
-#include "k5-int.h"
 #include <kdb_log.h>
 #include <kadm5/admin.h>
 

diff --git a/src/tests/asn.1/krb5_decode_leak.c b/src/tests/asn.1/krb5_decode_leak.c
index 633d16af822955cd0ee7e028168d2ccf4fd84ae1..22601c7bf34b03987c78f362d88e9ad20d37e7e5 100644 (file)
--- a/src/tests/asn.1/krb5_decode_leak.c
+++ b/src/tests/asn.1/krb5_decode_leak.c
@@ -35,14 +35,10 @@
  * decoder code paths but won't validate the results.
  */
 
-#include <stdio.h>
 #include "k5-int.h"
 #include "com_err.h"
 #include "utility.h"
-
 #include "ktest.h"
-#include <string.h>
-
 #include "debug.h"
 
 krb5_context test_context;

diff --git a/src/tests/asn.1/krb5_encode_test.c b/src/tests/asn.1/krb5_encode_test.c
index 3ba8684a4387c1ac9d18582071f4cdabe657f259..6c142a21dc73581a38b73bff715471050506ca5d 100644 (file)
--- a/src/tests/asn.1/krb5_encode_test.c
+++ b/src/tests/asn.1/krb5_encode_test.c
@@ -24,7 +24,6 @@
  * or implied warranty.
  */
 
-#include <stdio.h>
 #include "k5-int.h"
 #include "com_err.h"
 #include "utility.h"

diff --git a/src/tests/asn.1/utility.h b/src/tests/asn.1/utility.h
index a0e81cd922525cd15c00b2104226f5a8191a56ce..f1cd45804025d83552dd502649b699c53c3c8ad8 100644 (file)
--- a/src/tests/asn.1/utility.h
+++ b/src/tests/asn.1/utility.h
@@ -27,9 +27,9 @@
 #ifndef __UTILITY_H__
 #define __UTILITY_H__
 
+#include "k5-int.h"
 #include "krbasn1.h"
 #include "asn1buf.h"
-#include "k5-int.h"
 
 /* Aborts on failure.  ealloc returns zero-filled memory. */
 void *ealloc(size_t size);

diff --git a/src/tests/gss-threads/gss-client.c b/src/tests/gss-threads/gss-client.c
index cd6cd112ae37956b1006e359d1fa917c84091d2f..3878e09dae7c80d3eff8138f3d8813ebca5f4ef2 100644 (file)
--- a/src/tests/gss-threads/gss-client.c
+++ b/src/tests/gss-threads/gss-client.c
@@ -44,9 +44,7 @@
  * or implied warranty.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "k5-platform.h"
 #ifdef _WIN32
 #include <windows.h>
 #include <winsock.h>
@@ -57,7 +55,6 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
-#include <errno.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <pthread.h>
@@ -67,7 +64,6 @@
 #include "gss-misc.h"
 #include "port-sockets.h"
 #include "fake-addrinfo.h"
-#include "k5-platform.h"
 
 static int verbose = 1;
 

diff --git a/src/tests/gss-threads/gss-misc.c b/src/tests/gss-threads/gss-misc.c
index 76d9528d76e30e08e39487e9a08116aadc5639a1..5c738d3f79ec02600d90348eb8fccc698d1d624c 100644 (file)
--- a/src/tests/gss-threads/gss-misc.c
+++ b/src/tests/gss-threads/gss-misc.c
@@ -44,6 +44,7 @@
  * or implied warranty.
  */
 
+#include "autoconf.h"
 #include <stdio.h>
 #ifdef _WIN32
 #include <windows.h>
@@ -54,7 +55,6 @@
 #include <sys/socket.h>
 #endif
 #include <errno.h>
-#include "autoconf.h"
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/src/tests/gss-threads/gss-server.c b/src/tests/gss-threads/gss-server.c
index bbd1c4c078564ca3bc1a24f58662a4fd70de786c..9bae19643844306e61c464e68f08218f1bac90e5 100644 (file)
--- a/src/tests/gss-threads/gss-server.c
+++ b/src/tests/gss-threads/gss-server.c
@@ -44,6 +44,7 @@
  * or implied warranty.
  */
 
+#include "autoconf.h"
 #include <stdio.h>
 #ifdef _WIN32
 #include <windows.h>
@@ -56,7 +57,6 @@
 #include <pthread.h>
 #include <signal.h>
 #endif
-#include "autoconf.h"
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/src/tests/gssapi/t_enctypes.c b/src/tests/gssapi/t_enctypes.c
index 63ca79a8ef9fe9fbbf2fbf00a1937d1d97060719..a2ad18f47aba553c25ad75c10a8a5f201530722b 100644 (file)
--- a/src/tests/gssapi/t_enctypes.c
+++ b/src/tests/gssapi/t_enctypes.c
@@ -30,9 +30,6 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include "k5-int.h"
 #include "common.h"
 

diff --git a/src/tests/hammer/kdc5_hammer.c b/src/tests/hammer/kdc5_hammer.c
index 5869e969b20b7f5e71850ea707d50c4d27727bd3..0934f33fd3407ffaeb5d67a21210738bc4eaf122 100644 (file)
--- a/src/tests/hammer/kdc5_hammer.c
+++ b/src/tests/hammer/kdc5_hammer.c
@@ -23,11 +23,9 @@
  * or implied warranty.
  */
 
-#include <stdio.h>
-#include <sys/time.h>
-
 #include "k5-int.h"
 #include "com_err.h"
+#include <sys/time.h>
 
 #define KRB5_DEFAULT_OPTIONS 0
 #define KRB5_DEFAULT_LIFE 60*60*8 /* 8 hours */

diff --git a/src/tests/misc/test_getsockname.c b/src/tests/misc/test_getsockname.c
index 285ea60d273e5986506e7605ae3227e4ce5e145b..4fb875fac0b8a90ca4d3ab3adf552f439c3541c0 100644 (file)
--- a/src/tests/misc/test_getsockname.c
+++ b/src/tests/misc/test_getsockname.c
@@ -34,6 +34,7 @@
  * host.  On Solaris, it prints out 0.0.0.0.
  */
 
+#include "autoconf.h"
 #include <unistd.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -43,7 +44,6 @@
 #include <netdb.h>
 #include <stdio.h>
 #include <string.h>
-#include "autoconf.h"
 
 int
 main(argc, argv)

diff --git a/src/tests/resolve/addrinfo-test.c b/src/tests/resolve/addrinfo-test.c
index b5c6da9420f396f334ff91bc8683c6c18ebf96d5..e77640b62f9b8511a838e5dae858071c657e83f9 100644 (file)
--- a/src/tests/resolve/addrinfo-test.c
+++ b/src/tests/resolve/addrinfo-test.c
@@ -36,15 +36,11 @@
  *   on whether "-P" is given).
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
+#include <k5-platform.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
 #include <netinet/in.h> /* needed for IPPROTO_* on NetBSD */
-#include <k5-platform.h>
 #ifdef USE_FAKE_ADDRINFO
 #include "fake-addrinfo.h"
 #endif

diff --git a/src/tests/responder.c b/src/tests/responder.c
index d17fdaed661f802631a4ebf3a93762b8ba2a8c0b..5f53a31957c07f713add38990b7d20b828a95079 100644 (file)
--- a/src/tests/responder.c
+++ b/src/tests/responder.c
@@ -55,13 +55,11 @@
  *  Any missing data or mismatches are treated as errors.
  */
 
+#include <k5-platform.h>
+#include <k5-json.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <stdio.h>
-#include <string.h>
 #include <krb5.h>
-#include <k5-platform.h>
-#include <k5-json.h>
 
 struct responder_data {
     krb5_boolean called;

diff --git a/src/tests/shlib/t_loader.c b/src/tests/shlib/t_loader.c
index 439b724c31f353ef457e23084446d4c12c815748..869be800a0796adbdd0b1bbcb2bc9aeb31868aa3 100644 (file)
--- a/src/tests/shlib/t_loader.c
+++ b/src/tests/shlib/t_loader.c
@@ -24,13 +24,9 @@
  * or implied warranty.
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include "autoconf.h"
+#include "k5-platform.h"
 #include "krb5.h"
 #include "gssapi/gssapi.h"
-#include "k5-platform.h"
 #define HAVE_DLOPEN 1
 
 static int verbose = 1;

diff --git a/src/tests/threads/init_ctx.c b/src/tests/threads/init_ctx.c
index 7a59a1dd4e40293aa6e774a1963baf9d0cd3f3fa..42619a913e3df7dba5930e4e24bd5b4a55fad299 100644 (file)
--- a/src/tests/threads/init_ctx.c
+++ b/src/tests/threads/init_ctx.c
@@ -29,16 +29,10 @@
  * initially contributed by Ken Raeburn
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <assert.h>
+#include "k5-platform.h"
 #include <unistd.h>
 #include <pthread.h>
 #include <krb5.h>
-/* for SIZE_MAX: */
-#include "k5-platform.h"
 
 #include <sys/time.h>
 #include <sys/resource.h>

diff --git a/src/tests/threads/profread.c b/src/tests/threads/profread.c
index 3909f236e5cfb23c8a259a2944f5c0878020de54..be28ba4042f6908933a77ddfc7f3b0fd39d961c4 100644 (file)
--- a/src/tests/threads/profread.c
+++ b/src/tests/threads/profread.c
@@ -29,17 +29,11 @@
  * initially contributed by Ken Raeburn
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <assert.h>
+#include "k5-platform.h"
 #include <unistd.h>
 #include <pthread.h>
 #include <krb5.h>
 #include <profile.h>
-/* for SIZE_MAX: */
-#include "k5-platform.h"
 
 #include <sys/time.h>
 #include <sys/resource.h>

diff --git a/src/tests/threads/t_rcache.c b/src/tests/threads/t_rcache.c
index e2d3165e1e386e7beac4b1cab1de6e25004371b1..d6187f06153cdf7c21a1c8e762691419de41098d 100644 (file)
--- a/src/tests/threads/t_rcache.c
+++ b/src/tests/threads/t_rcache.c
@@ -24,10 +24,8 @@
  * or implied warranty.
  */
 
-#include <stdio.h>
-#include <com_err.h>
-
 #include "k5-int.h"
+#include <com_err.h>
 #include <krb5.h>
 #include <pthread.h>
 

diff --git a/src/util/et/error_message.c b/src/util/et/error_message.c
index c4fa5693b129f71ca111d10efac83cff38c0736d..d7069a9df41e95ee15037bd90bd2ac3287566004 100644 (file)
--- a/src/util/et/error_message.c
+++ b/src/util/et/error_message.c
@@ -20,15 +20,9 @@
  * provided "as is" without express or implied warranty.
  */
 
-#include "autoconf.h"
-#include <stdio.h>
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#include <string.h>
+#include "k5-platform.h"
 #include "com_err.h"
 #include "error_table.h"
-#include "k5-platform.h"
 
 static struct et_list *et_list;
 static k5_mutex_t et_list_lock = K5_MUTEX_PARTIAL_INITIALIZER;

diff --git a/src/util/et/test_et.c b/src/util/et/test_et.c
index ab2b2e50eaca2ea9575f80335af02496cf60e8ef..9faf10f4605920f173cc602e373053cbca00448b 100644 (file)
--- a/src/util/et/test_et.c
+++ b/src/util/et/test_et.c
@@ -1,10 +1,10 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+#include "autoconf.h"
 #include <stdio.h>
 #include <errno.h>
 #include "com_err.h"
 #include "test1.h"
 #include "test2.h"
-#include "autoconf.h"
 
 #ifdef _WIN32
 # define EXPORT_LIST

diff --git a/src/util/profile/prof_int.h b/src/util/profile/prof_int.h
index cddc1fd9ad4d3c0a375354915bd824f90e3f9f9f..38ea59a1f709eaec86e949f4a9848230fab52edc 100644 (file)
--- a/src/util/profile/prof_int.h
+++ b/src/util/profile/prof_int.h
@@ -2,17 +2,17 @@
  * prof-int.h
  */
 
+#include "k5-platform.h"
+#include "k5-thread.h"
+#include "k5-plugin.h"
+
 #include <time.h>
-#include <stdio.h>
 
 #if defined(__MACH__) && defined(__APPLE__)
 #include <TargetConditionals.h>
 #define PROFILE_SUPPORTS_FOREIGN_NEWLINES
 #endif
 
-#include "k5-thread.h"
-#include "k5-platform.h"
-#include "k5-plugin.h"
 #include "com_err.h"
 #include "profile.h"
 

diff --git a/src/util/ss/error.c b/src/util/ss/error.c
index daff8497d601e4d50ae33e408b485a83b49196fc..6d5f69a7b73c1e58147b9ef6209d28069dcad274 100644 (file)
--- a/src/util/ss/error.c
+++ b/src/util/ss/error.c
@@ -29,11 +29,9 @@
  * For copyright information, see copyright.h.
  */
 
-#include <stdio.h>
-
-#include "copyright.h"
-#include "com_err.h"
 #include "ss_internal.h"
+#include "com_err.h"
+#include "copyright.h"
 
 char * ss_name(sci_idx)
     int sci_idx;

diff --git a/src/util/ss/ss_internal.h b/src/util/ss/ss_internal.h
index 400f3126bec901b87be0906c8e4ac5ff44246b11..1f5ddfff91b56b0a8b606f90f632ff583d8453e5 100644 (file)
--- a/src/util/ss/ss_internal.h
+++ b/src/util/ss/ss_internal.h
@@ -7,15 +7,8 @@
 
 #ifndef _ss_ss_internal_h
 #define _ss_ss_internal_h __FILE__
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include "autoconf.h"
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
 #include "k5-platform.h"
+#include <unistd.h>
 
 typedef void * pointer;
 

diff --git a/src/util/support/cache-addrinfo.h b/src/util/support/cache-addrinfo.h
index d4d26b14f5a340c5f6ed0b7a7e75e2bd15d56240..a1b7fb28becbee6265310752fdcfdc86cbe33c3e 100644 (file)
--- 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 4b1cfa0622f25b218ddb96d8744466682a3e9c7f..6c4d8bdbe4f681ba06efe300cf153ab6527816c7 100644 (file)
--- 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 4824a6185c7f4eff3c96c1e18b248daaf2422d10..df1cc1dec5587ef24cd7e20e988e6ba005ebb6c6 100644 (file)
--- 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 7655364d9f4272227be59fddbf989188abf2e466..32fef4386cd46419135736ab2636cac706f4a1db 100644 (file)
--- 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 7822ce266f0963f7746684f362410f5eda36c3e3..68c3dd6ed79995559f05c493ef5dd9f23e759f97 100644 (file)
--- 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 82ef97e57c76decd0f3be4fc2c1ea7a3b3bd83cd..826390976ab8f2d31f8996dd9fcb6704a6431477 100644 (file)
--- 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 cc2f4c92ca3da6b6cd29fa8e486600d8b8c97e36..f67cd31edf5fefba651982d16ce5e4e86350b57f 100644 (file)
--- 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 a97789624ebd06aa5123eadd77935c219d16e465..3fd86ea8c2ad47f735049379882c4aa75464eafe 100644 (file)
--- 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 b8bf98969fb61cfd9228f6c941654825c82d9871..1f6cc8f6a6fe59adf7dd2479c307345094b9bc49 100644 (file)
--- 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"

diff --git a/src/util/verto/verto-k5ev.c b/src/util/verto/verto-k5ev.c
index f75e8aad6c938d56cf8953c5d1a7941a144f9821..a3a52653671d59a707fdff9275b7dfe6b53819a6 100644 (file)
--- a/src/util/verto/verto-k5ev.c
+++ b/src/util/verto/verto-k5ev.c
@@ -28,6 +28,7 @@
  * directory for reference, although it is not built here.
  */
 
+#include "autoconf.h"
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
@@ -35,7 +36,6 @@
 #include <verto.h>
 #include <verto-module.h>
 #include "rename.h"
-#include "autoconf.h"
 #define EV_STANDALONE 1
 /* Avoid using clock_gettime, which would create a dependency on librt. */
 #define EV_USE_MONOTONIC 0