include file fix-ups

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

7 files changed, 4 insertions, 33 deletions

diff --git a/src/lib/kdb/decrypt_key.c b/src/lib/kdb/decrypt_key.c
index 683c34bedb..95c92d9f5c 100644
--- a/src/lib/kdb/decrypt_key.c
+++ b/src/lib/kdb/decrypt_key.c
@@ -17,9 +17,7 @@ static char rcsid_decrypt_key_c [] =
 
 #include <krb5/copyright.h>
 #include <krb5/krb5.h>
-#include <krb5/kdb5_err.h>
 #include <krb5/ext-proto.h>
-#include <errno.h>
 
 
 /*
diff --git a/src/lib/kdb/encrypt_key.c b/src/lib/kdb/encrypt_key.c
index b607524335..f2c2c5e1b8 100644
--- a/src/lib/kdb/encrypt_key.c
+++ b/src/lib/kdb/encrypt_key.c
@@ -17,9 +17,7 @@ static char rcsid_encrypt_key_c [] =
 
 #include <krb5/copyright.h>
 #include <krb5/krb5.h>
-#include <krb5/kdb5_err.h>
 #include <krb5/ext-proto.h>
-#include <errno.h>
 
 /*
  * Encrypt a key for storage in the database.  "eblock" is used
diff --git a/src/lib/kdb/fetch_mkey.c b/src/lib/kdb/fetch_mkey.c
index 809f417f31..43e28f303c 100644
--- a/src/lib/kdb/fetch_mkey.c
+++ b/src/lib/kdb/fetch_mkey.c
@@ -18,15 +18,11 @@ static char rcsid_fetch_mkey_c[] =
 
 #include <krb5/copyright.h>
 #include <krb5/krb5.h>
-#include <krb5/krb5_err.h>
-#include <krb5/kdb5_err.h>
 #include <krb5/kdb.h>
-#include <errno.h>
-#include <stdio.h>
 #include <krb5/libos-proto.h>
 #include <krb5/ext-proto.h>
+#include <krb5/sysincl.h>		/* for MAXPATHLEN */
 #include "kdbint.h"
-#include <sys/param.h>			/* XXX for MAXPATHLEN */
 
 /* these are available to other funcs, and the pointers may be reassigned */
 
diff --git a/src/lib/kdb/kdb_dbm.c b/src/lib/kdb/kdb_dbm.c
index af0182040c..355e1c7eb2 100644
--- a/src/lib/kdb/kdb_dbm.c
+++ b/src/lib/kdb/kdb_dbm.c
@@ -14,24 +14,12 @@ static char rcsid_krb_dbm_c[] =
 #endif	/* lint */
 
 #include <krb5/copyright.h>
-
-#include <krb5/dbm.h>
-
-#include <stdio.h>
-
-/* XXX these should go into a central system include file */
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-#include <sys/file.h>
-#include <errno.h>
-
 #include <krb5/krb5.h>
+#include <krb5/dbm.h>
 #include <krb5/kdb.h>
 #include <krb5/kdb_dbm.h>
-#include <krb5/kdb5_err.h>
-
 #include <krb5/ext-proto.h>
+#include <krb5/sysincl.h>
 
 #define KRB5_DBM_MAX_RETRY 5
 
diff --git a/src/lib/kdb/setup_mkey.c b/src/lib/kdb/setup_mkey.c
index 451221a9c7..182a6ede3d 100644
--- a/src/lib/kdb/setup_mkey.c
+++ b/src/lib/kdb/setup_mkey.c
@@ -19,7 +19,6 @@ static char rcsid_setup_mkey_c[] =
 #include <krb5/krb5.h>
 #include <krb5/kdb.h>
 #include <krb5/ext-proto.h>
-#include <errno.h>
 
 /*
  * Given a key name and a realm name, construct a principal which can be used
diff --git a/src/lib/kdb/store_mkey.c b/src/lib/kdb/store_mkey.c
index f3f99a4b3e..70eb35cc8d 100644
--- a/src/lib/kdb/store_mkey.c
+++ b/src/lib/kdb/store_mkey.c
@@ -19,15 +19,10 @@ static char rcsid_store_mkey_c[] =
 #include <krb5/copyright.h>
 #include <krb5/krb5.h>
 #include <krb5/kdb.h>
-#include <errno.h>
-#include <stdio.h>
 #include <krb5/libos-proto.h>
 #include <krb5/ext-proto.h>
 #include "kdbint.h"
-#include <sys/param.h>			/* XXX for MAXPATHLEN */
-#ifdef unix
-#include <sys/file.h>			/* XX for umask prototype */
-#endif
+#include <krb5/sysincl.h>		/* for MAXPATHLEN */
 
 /*
  * Put the KDC database master key into a file.  If keyfile is NULL,
diff --git a/src/lib/kdb/verify_mky.c b/src/lib/kdb/verify_mky.c
index 912e99f1fb..5b0872bd56 100644
--- a/src/lib/kdb/verify_mky.c
+++ b/src/lib/kdb/verify_mky.c
@@ -18,9 +18,6 @@ static char rcsid_verify_mky_c[] =
 #include <krb5/copyright.h>
 #include <krb5/krb5.h>
 #include <krb5/kdb.h>
-#include <krb5/krb5_err.h>
-#include <krb5/kdb5_err.h>
-#include <errno.h>
 #include <krb5/ext-proto.h>
 
 /*