fix up include files

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@915 dc483132-0cff-0310-8789-dd5450dbe970

10 files changed, 10 insertions, 30 deletions

diff --git a/src/lib/krb5/os/an_to_ln.c b/src/lib/krb5/os/an_to_ln.c
index be822395a..2e42f0627 100644
--- a/src/lib/krb5/os/an_to_ln.c
+++ b/src/lib/krb5/os/an_to_ln.c
@@ -20,15 +20,12 @@ static char rcsid_an_to_ln_c[] =
 #include <krb5/osconf.h>
 
 #include <krb5/krb5.h>
-#include <krb5/krb5_err.h>
-#include <errno.h>
-#include <stdio.h>
 #include <krb5/libos-proto.h>
 #include <krb5/ext-proto.h>
 
 #ifdef USE_DBM_LNAME
 #include <krb5/dbm.h>
-#include <sys/file.h>
+#include <krb5/sysincl.h>
 #endif
 
 #ifndef min
diff --git a/src/lib/krb5/os/def_realm.c b/src/lib/krb5/os/def_realm.c
index 72b88465e..1c21d7ffc 100644
--- a/src/lib/krb5/os/def_realm.c
+++ b/src/lib/krb5/os/def_realm.c
@@ -16,12 +16,10 @@ static char rcsid_def_realm_c[] =
 #endif	/* !lint & !SABER */
 
 #include <krb5/copyright.h>
-
 #include <krb5/krb5.h>
-#include <krb5/krb5_err.h>
+#include <krb5/ext-proto.h>
 
 #include <stdio.h>
-#include <krb5/ext-proto.h>
 
 /*
  Retrieves the default realm to be used if no user-specified realm is
diff --git a/src/lib/krb5/os/get_krbhst.c b/src/lib/krb5/os/get_krbhst.c
index c04b94883..120dcc876 100644
--- a/src/lib/krb5/os/get_krbhst.c
+++ b/src/lib/krb5/os/get_krbhst.c
@@ -18,11 +18,8 @@ static char get_krbhst_c [] =
 #include <krb5/copyright.h>
 
 #include <krb5/krb5.h>
-#include <krb5/krb5_err.h>
-#include <errno.h>
-
-#include <stdio.h>
 #include <krb5/ext-proto.h>
+#include <stdio.h>
 
 /*
  Figures out the Kerberos server names for the given realm, filling in a
diff --git a/src/lib/krb5/os/hst_realm.c b/src/lib/krb5/os/hst_realm.c
index 92540d631..0c6cb0e4a 100644
--- a/src/lib/krb5/os/hst_realm.c
+++ b/src/lib/krb5/os/hst_realm.c
@@ -56,13 +56,12 @@ static char rcsid_hst_realm_c[] =
 
 
 #include <krb5/krb5.h>
-#include <krb5/krb5_err.h>
 #include <krb5/ext-proto.h>
-#include <stdio.h>
 #include <krb5/libos-proto.h>
-#include <errno.h>
+#include <krb5/sysincl.h>
 #include <ctype.h>
-#include <sys/param.h>
+
+#include <stdio.h>
 
 /* for old Unixes and friends ... */
 #ifndef MAXHOSTNAMELEN
diff --git a/src/lib/krb5/os/ktdefname.c b/src/lib/krb5/os/ktdefname.c
index 167167e35..014540eb4 100644
--- a/src/lib/krb5/os/ktdefname.c
+++ b/src/lib/krb5/os/ktdefname.c
@@ -17,10 +17,8 @@ static char rcsid_ktdefname_c[] =
 
 #include <krb5/copyright.h>
 #include <krb5/krb5.h>
-#include <krb5/krb5_err.h>
 #include <krb5/osconf.h>
 
-#include <stdio.h>
 #include <krb5/ext-proto.h>
 
 extern char *krb5_defkeyname;
diff --git a/src/lib/krb5/os/kuserok.c b/src/lib/krb5/os/kuserok.c
index c08397c54..eb26f1c75 100644
--- a/src/lib/krb5/os/kuserok.c
+++ b/src/lib/krb5/os/kuserok.c
@@ -18,12 +18,10 @@ static char rcsid_kuserok_c [] =
 #include <krb5/copyright.h>
 #include <krb5/krb5.h>
 #include <krb5/ext-proto.h>
-#include <stdio.h>
 #include <krb5/libos-proto.h>
-#include <sys/types.h>
-#include <sys/param.h>			/* for MAXPATHLEN */
-#include <sys/file.h>
-#include <sys/stat.h>
+#include <krb5/sysincl.h>
+
+#include <stdio.h>
 #include <pwd.h>
 
 #define MAX_USERNAME 10
diff --git a/src/lib/krb5/os/lock_file.c b/src/lib/krb5/os/lock_file.c
index e15e38fdd..25b283951 100644
--- a/src/lib/krb5/os/lock_file.c
+++ b/src/lib/krb5/os/lock_file.c
@@ -18,7 +18,6 @@ static char rcsid_lock_file_c [] =
 #include <krb5/copyright.h>
 
 #include <krb5/krb5.h>
-#include <krb5/krb5_err.h>
 #include <krb5/libos.h>
 
 #include <stdio.h>
diff --git a/src/lib/krb5/os/read_pwd.c b/src/lib/krb5/os/read_pwd.c
index 50f613aab..388256160 100644
--- a/src/lib/krb5/os/read_pwd.c
+++ b/src/lib/krb5/os/read_pwd.c
@@ -18,7 +18,6 @@ static char rcsid_read_pwd_c[] =
 #include <krb5/copyright.h>
 
 #include <krb5/krb5.h>
-#include <krb5/krb5_err.h>
 
 #include <stdio.h>
 #include <errno.h>
diff --git a/src/lib/krb5/os/sendto_kdc.c b/src/lib/krb5/os/sendto_kdc.c
index 7c7dc294d..555e56dbc 100644
--- a/src/lib/krb5/os/sendto_kdc.c
+++ b/src/lib/krb5/os/sendto_kdc.c
@@ -19,15 +19,12 @@ static char rcsid_sendto_kdc_c[] =
 #include <krb5/copyright.h>
 
 #include <krb5/krb5.h>
-#include <krb5/krb5_err.h>
-#include <errno.h>
 #include <krb5/ext-proto.h>
 
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 
-#include <stdio.h>
 #include <krb5/libos-proto.h>
 #include "os-proto.h"
 
diff --git a/src/lib/krb5/os/ustime.c b/src/lib/krb5/os/ustime.c
index 059b57fc6..6af86375e 100644
--- a/src/lib/krb5/os/ustime.c
+++ b/src/lib/krb5/os/ustime.c
@@ -17,12 +17,10 @@ static char rcsid_mstime_c[] =
 
 #include <krb5/copyright.h>
 
-#include <sys/time.h>			/* for timeval */
-#include <stdio.h>			/* needed for libos-proto.h */
-
 #include <krb5/config.h>
 #include <krb5/krb5.h>
 #include <krb5/libos-proto.h>
+#include <krb5/sysincl.h>
 
 extern int errno;