* *.c: Avoid <krb5/...> and <com_err.h> includes

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

diff --git a/src/kadmin/client/ChangeLog b/src/kadmin/client/ChangeLog
index de9ac3bd3e65a4bafa87dcbc0fd21ccf02fdc316..c3a1175b1ec39b28d85a4cb172077c0c31115379 100644 (file)
--- a/src/kadmin/client/ChangeLog
+++ b/src/kadmin/client/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 02:18:37 1995  John Gilmore  (gnu at toad.com)
+
+       * *.c:  Avoid <krb5/...> and <com_err.h> includes.
+
 Tue Feb 14 15:30:55 1995 Chris Provenzano  (proven@mit.edu)
 
         * kadmin.c Call krb5_sendauth() with new calling convention

diff --git a/src/kadmin/client/kadmin.c b/src/kadmin/client/kadmin.c
index d5bdec417c59ab1e59441adc7b6171bc9cc86ae5..93ce5e9eda153586bb47b075b1e07f2a144cde54 100644 (file)
--- a/src/kadmin/client/kadmin.c
+++ b/src/kadmin/client/kadmin.c
@@ -29,19 +29,13 @@
 #include <signal.h>
 #include <string.h>
 #include <pwd.h>
-#include <com_err.h>
+#include "com_err.h"
 
 #ifndef MAXPATHLEN
 #define MAXPATHLEN 1024
 #endif
 
-#include <krb5/adm_defs.h>
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
+#include "k5-int.h"
 
 static krb5_error_code get_first_ticket 
        PROTOTYPE((krb5_context,

diff --git a/src/kadmin/client/kadmin_add.c b/src/kadmin/client/kadmin_add.c
index 354814ea0862e2dda466de8938ffac3e6cced34c..b8f15eba228d379775efcca5ade2b2c01dc4189c 100644 (file)
--- a/src/kadmin/client/kadmin_add.c
+++ b/src/kadmin/client/kadmin_add.c
@@ -26,17 +26,10 @@
 #include <netinet/in.h>
 #include <netdb.h>
 #include <string.h>
-#include <com_err.h>
+#include "com_err.h"
 
 #include <sys/param.h>
-
-#include <krb5/adm_defs.h>
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
+#include "k5-int.h"
 
 void decode_kadmind_reply();
 int print_status_message();

diff --git a/src/kadmin/client/kadmin_adr.c b/src/kadmin/client/kadmin_adr.c
index 8d5c4fcf9359cf38dac3361d2d09aa122f46247b..7f9d75b0ea28c7494faa5f812c4a12b5329dc20b 100644 (file)
--- a/src/kadmin/client/kadmin_adr.c
+++ b/src/kadmin/client/kadmin_adr.c
@@ -26,17 +26,9 @@
 #include <netinet/in.h>
 #include <netdb.h>
 #include <string.h>
-#include <com_err.h>
-
+#include "com_err.h"
 #include <sys/param.h>
-
-#include <krb5/adm_defs.h>
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
+#include "k5-int.h"
 
 void decode_kadmind_reply();
 int print_status_message();

diff --git a/src/kadmin/client/kadmin_cpr.c b/src/kadmin/client/kadmin_cpr.c
index c974aaf5f4790eadbcae07434f045da7150468e9..fec738ebd3ed9f1f681cadd3c1a2b63cee92b7c3 100644 (file)
--- a/src/kadmin/client/kadmin_cpr.c
+++ b/src/kadmin/client/kadmin_cpr.c
@@ -27,17 +27,11 @@
 #include <netdb.h>
 #include <signal.h>
 #include <string.h>
-#include <com_err.h>
+#include "com_err.h"
 
 #include <sys/param.h>
 
-#include <krb5/adm_defs.h>
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
+#include "k5-int.h"
 
 void decode_kadmind_reply();
 int print_status_message();

diff --git a/src/kadmin/client/kadmin_cpw.c b/src/kadmin/client/kadmin_cpw.c
index 02d1e117fcc9d222a82c6690931e81d2ac1ae670..194e0f98b4fecb52c26d7927e92c2376bdb9ece5 100644 (file)
--- a/src/kadmin/client/kadmin_cpw.c
+++ b/src/kadmin/client/kadmin_cpw.c
@@ -27,17 +27,11 @@
 #include <netdb.h>
 #include <signal.h>
 #include <string.h>
-#include <com_err.h>
+#include "com_err.h"
 
 #include <sys/param.h>
 
-#include <krb5/adm_defs.h>
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
+#include "k5-int.h"
 
 void decode_kadmind_reply();
 int print_status_message();

diff --git a/src/kadmin/client/kadmin_del.c b/src/kadmin/client/kadmin_del.c
index f96db1a7f949048be8f59c0552d53cb0754e3f39..be4c9a91dadb2f544da6d3b9ed206ffa44c3d9ce 100644 (file)
--- a/src/kadmin/client/kadmin_del.c
+++ b/src/kadmin/client/kadmin_del.c
@@ -26,15 +26,8 @@
 #include <netinet/in.h>
 #include <netdb.h>
 #include <string.h>
-#include <com_err.h>
-
-#include <krb5/adm_defs.h>
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
+#include "com_err.h"
+#include "k5-int.h"
 
 void decode_kadmind_reply();
 int print_status_message();

diff --git a/src/kadmin/client/kadmin_done.c b/src/kadmin/client/kadmin_done.c
index 5e9af2b2ccdaf8c4db806e896fb2a2c595764f9f..a9585851dc5f1b75b094040c0518ec30c4cca781 100644 (file)
--- a/src/kadmin/client/kadmin_done.c
+++ b/src/kadmin/client/kadmin_done.c
@@ -26,15 +26,9 @@
 #include <netinet/in.h>
 #include <netdb.h>
 #include <string.h>
-#include <com_err.h>
+#include "com_err.h"
 
-#include <krb5/adm_defs.h>
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
+#include "k5-int.h"
 
 krb5_error_code
 kadm_done(context, my_creds, rep_ret, local_addr, foreign_addr, 

diff --git a/src/kadmin/client/kadmin_inq.c b/src/kadmin/client/kadmin_inq.c
index 13f3bb6e638e87fd6f86b0dead868eb7639a2df4..aa46cadfec1ff33da92be52b1793a5ece372dfb2 100644 (file)
--- a/src/kadmin/client/kadmin_inq.c
+++ b/src/kadmin/client/kadmin_inq.c
@@ -27,15 +27,9 @@
 #include <netdb.h>
 #include <signal.h>
 #include <string.h>
-#include <com_err.h>
+#include "com_err.h"
 
-#include <krb5/adm_defs.h>
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
+#include "k5-int.h"
 
 void decode_kadmind_reply();
 int print_status_message();

diff --git a/src/kadmin/client/kadmin_mod.c b/src/kadmin/client/kadmin_mod.c
index 6bb9c22b949c757a26f10c5747967d0eadd44b8d..d955e27aed4d5faa18e6997363c82d7e2241c2d4 100644 (file)
--- a/src/kadmin/client/kadmin_mod.c
+++ b/src/kadmin/client/kadmin_mod.c
@@ -27,15 +27,8 @@
 #include <netdb.h>
 #include <signal.h>
 #include <string.h>
-#include <com_err.h>
-
-#include <krb5/adm_defs.h>
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
+#include "k5-int.h"
+#include "com_err.h"
 
 void decode_kadmind_reply();
 int print_status_message();

diff --git a/src/kadmin/client/kadmin_msnd.c b/src/kadmin/client/kadmin_msnd.c
index 7435ccdff7019e1e7acdaa3cdcfdaad89fbc2a55..c106e284136ac96b20825e94c1750bb2866897e7 100644 (file)
--- a/src/kadmin/client/kadmin_msnd.c
+++ b/src/kadmin/client/kadmin_msnd.c
@@ -28,27 +28,14 @@
 #include <netdb.h>
 #include <signal.h>
 #include <string.h>
-#include <com_err.h>
+#include "com_err.h"
 
 #include <sys/param.h>
 #include <pwd.h>
 
-#include <krb5/adm_defs.h>
-
 #include <sys/stat.h>
 
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/asn1.h>
-#include <krb5/config.h>
-#include <krb5/base-defs.h>
-#include <krb5/adm_err.h>
-#include <krb5/errors.h>
-#include <krb5/kdb5_err.h>
-#include <krb5/krb5_err.h>
+#include "k5-int.h"
 
 #ifndef MAXPATHLEN
 #define MAXPATHLEN 1024

diff --git a/src/kadmin/server/ChangeLog b/src/kadmin/server/ChangeLog
index 856cf89479d87a6ac544a1a84317dbd1b9bd0997..8a4a74f5cce8f0e5032852c7d1763391af0701e2 100644 (file)
--- a/src/kadmin/server/ChangeLog
+++ b/src/kadmin/server/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 02:23:46 1995  John Gilmore  (gnu at toad.com)
+
+       * *.c:  Avoid <krb5/...> and <com_err.h> includes.
+
 Fri Feb  3 07:50:14 1995  Theodore Y. Ts'o  (tytso@dcl)
 
        * adm_v4_pwd.c: Don't use BITS64, use SIZEOF_LONG

diff --git a/src/kadmin/server/adm_adm_func.c b/src/kadmin/server/adm_adm_func.c
index 6c23dd80b270df916ba18a657fdf819e4740303d..7da1dd3c3fdb18be5d05b4a11cb2241b01db14c1 100644 (file)
--- a/src/kadmin/server/adm_adm_func.c
+++ b/src/kadmin/server/adm_adm_func.c
@@ -30,7 +30,7 @@
 
 #include <sys/types.h>
 #include <syslog.h>
-#include <com_err.h>
+#include "com_err.h"
 
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -38,13 +38,7 @@
 #include <arpa/inet.h>
 #endif
 
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
-
-#include <krb5/adm_defs.h>
+#include "k5-int.h"
 #include "adm_extern.h"
 
 #ifdef SANDIA

diff --git a/src/kadmin/server/adm_check.c b/src/kadmin/server/adm_check.c
index b36c03df5facc727eb76e43091bb8898fcadcd15..67cd24bde82e538058ca2a776d4385e59c494078 100644 (file)
--- a/src/kadmin/server/adm_check.c
+++ b/src/kadmin/server/adm_check.c
@@ -31,7 +31,7 @@
 #include <ctype.h>
 #include <stdio.h>
 #include <syslog.h>
-#include <com_err.h>
+#include "com_err.h"
 
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -39,12 +39,8 @@
 #include <arpa/inet.h>
 #endif
 
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/adm_defs.h>
-#include <krb5/adm_err.h>
-#include <krb5/kdb.h>
+#include "k5-int.h"
+#include "adm_err.h"
 #include "adm_extern.h"
 
 krb5_error_code

diff --git a/src/kadmin/server/adm_extern.c b/src/kadmin/server/adm_extern.c
index 98b21fe8cbae62975b2f80457abd30dd238b769a..ca27149e69db5b32660b8f1c463ddaed58d04b42 100644 (file)
--- a/src/kadmin/server/adm_extern.c
+++ b/src/kadmin/server/adm_extern.c
@@ -27,13 +27,7 @@
  * allocations of adm_extern stuff
  */
 
-
-#include <krb5/copyright.h>
-
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
-#include <krb5/osconf.h>
+#include "k5-int.h"
 
 /* real declarations of KDC's externs */
 krb5_encrypt_block master_encblock;

diff --git a/src/kadmin/server/adm_extern.h b/src/kadmin/server/adm_extern.h
index 1b8ae365f04eacc03ec6d48fbe77805f593c30e6..fb43d37f09e57f7755beb1ef901d7ef38c04c6b6 100644 (file)
--- a/src/kadmin/server/adm_extern.h
+++ b/src/kadmin/server/adm_extern.h
@@ -26,8 +26,6 @@
  * <<< Description >>>
  */
 
-#include <krb5/copyright.h>
-
 #ifndef __ADM_EXTERN__
 #define __ADM_EXTERN__
 

diff --git a/src/kadmin/server/adm_fmt_inq.c b/src/kadmin/server/adm_fmt_inq.c
index 9914b6abc13c47e4be7fc4f5cf9228a624d4ece5..40c79a1feded580e0857164dafaa1534e89317fe 100644 (file)
--- a/src/kadmin/server/adm_fmt_inq.c
+++ b/src/kadmin/server/adm_fmt_inq.c
@@ -27,13 +27,7 @@
  *     Administrative Display Routine
  */
 
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
-
+#include "k5-int.h"
 #include <stdio.h>
 
 #ifdef HAVE_SYS_TIME_H

diff --git a/src/kadmin/server/adm_funcs.c b/src/kadmin/server/adm_funcs.c
index 6951954b086e8270ce29964acadbe0064fd6e921..5f86e1c24398efea4b5daa807a531e71371caeec 100644 (file)
--- a/src/kadmin/server/adm_funcs.c
+++ b/src/kadmin/server/adm_funcs.c
@@ -27,8 +27,7 @@
  * Modify the Kerberos Database
  */
 
-
-#include <com_err.h>
+#include "com_err.h"
 #include <sys/types.h>
  
 #include <sys/socket.h>
@@ -37,21 +36,10 @@
 #include <arpa/inet.h>
 #endif
 
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
-#include <krb5/asn1.h>
-
-#include <krb5/adm_defs.h>
+#include "k5-int.h"
+#include "adm_err.h"
 #include "adm_extern.h"
 
-#include <krb5/adm_err.h>
-#include <krb5/errors.h>
-#include <krb5/kdb5_err.h>
-#include <krb5/krb5_err.h>
-
 struct saltblock {
     int salttype;
     krb5_data saltdata;

diff --git a/src/kadmin/server/adm_kadmin.c b/src/kadmin/server/adm_kadmin.c
index a499e557e003cb90cdf9709fa308af0bdfffdb15..e58774b541a5f1190364a2ad623bd80167f4a3b5 100644 (file)
--- a/src/kadmin/server/adm_kadmin.c
+++ b/src/kadmin/server/adm_kadmin.c
@@ -21,7 +21,7 @@
 
 #include <sys/types.h>
 #include <syslog.h>
-#include <com_err.h>
+#include "com_err.h"
 
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -29,11 +29,7 @@
 #include <arpa/inet.h>
 #endif
  
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/kdb.h>
-#include <krb5/adm_defs.h>
+#include "k5-int.h"
 #include "adm_extern.h"
  
 krb5_error_code

diff --git a/src/kadmin/server/adm_kpasswd.c b/src/kadmin/server/adm_kpasswd.c
index ce7b308bf4f5de04c02842f95755b51c7bd629f1..033533e5532ce31dff5f3ef0f52f0d6addadf192 100644 (file)
--- a/src/kadmin/server/adm_kpasswd.c
+++ b/src/kadmin/server/adm_kpasswd.c
@@ -23,7 +23,7 @@
 #include <syslog.h>
 #include <sys/wait.h>
 #include <stdio.h>
-#include <com_err.h>
+#include "com_err.h"
 
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -31,11 +31,7 @@
 #include <arpa/inet.h>
 #endif
  
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/adm_defs.h>
+#include "k5-int.h"
 #include "adm_extern.h"
  
 extern krb5_encrypt_block master_encblock;

diff --git a/src/kadmin/server/adm_listen.c b/src/kadmin/server/adm_listen.c
index 803a64fc2991e20b0e3f6a03dc180bff22237fa8..d1b8d9a55a37505e4c4c6873cdbfda849b994226 100644 (file)
--- a/src/kadmin/server/adm_listen.c
+++ b/src/kadmin/server/adm_listen.c
@@ -24,16 +24,11 @@
 #include <sys/select.h>
 #endif
 
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/adm_defs.h>
-#include <krb5/sysincl.h>
-#include <krb5/kdb.h>
+#include "k5-int.h"
 
 #include <syslog.h>
 #include <signal.h>
-#include <com_err.h>
+#include "com_err.h"
 
 #ifndef sigmask
 #define sigmask(m)    (1 <<((m)-1))

diff --git a/src/kadmin/server/adm_nego.c b/src/kadmin/server/adm_nego.c
index a6edff3f285c6c1b1f96fb03899f24a5ca375d3f..d7c09b63345b650c3987db2f6be6bfbbd7b280e3 100644 (file)
--- a/src/kadmin/server/adm_nego.c
+++ b/src/kadmin/server/adm_nego.c
@@ -28,7 +28,7 @@
  */
 
 
-#include <com_err.h>
+#include "com_err.h"
 #include <sys/types.h>
 
 #include <sys/socket.h>
@@ -39,13 +39,7 @@
 
 #include <stdio.h>
 
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/asn1.h>
-
-#include <krb5/adm_defs.h>
-#include <krb5/kdb.h>
+#include "k5-int.h"
 #include "adm_extern.h"
 
 krb5_error_code

diff --git a/src/kadmin/server/adm_network.c b/src/kadmin/server/adm_network.c
index 6d31f8b09aa1dabd211ef1d345a7bf291f37353a..58cc9fc5ab2852fddcd41ef4cee9ade0e39a121b 100644 (file)
--- a/src/kadmin/server/adm_network.c
+++ b/src/kadmin/server/adm_network.c
@@ -22,7 +22,7 @@
  */
 
 #include <stdio.h>
-#include <com_err.h>
+#include "com_err.h"
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/param.h>
@@ -39,11 +39,7 @@
 #endif
 #include <netdb.h>
 
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/adm_defs.h>
-#include <krb5/kdb.h>
+#include "k5-int.h"
 #include "adm_extern.h"
 
 extern int errno;

diff --git a/src/kadmin/server/adm_parse.c b/src/kadmin/server/adm_parse.c
index aaf7b31d4521cd42690e1ffca49e4ac5fc8a24ad..305807b47e61d3a48f967c3673fb3fff9f25388d 100644 (file)
--- a/src/kadmin/server/adm_parse.c
+++ b/src/kadmin/server/adm_parse.c
@@ -27,7 +27,6 @@
  *
  * Edit a KDC database.
  */
-
  
 #include <syslog.h>
 #include <stdio.h>
@@ -41,9 +40,7 @@
 #include <time.h>
 #endif  /* aux20 */
 
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
+#include "k5-int.h"
 
 void
 kadmin_parse_and_set(input_string)

diff --git a/src/kadmin/server/adm_process.c b/src/kadmin/server/adm_process.c
index 59f95117c87dac05187ed344f93a2454a3c43683..786c6898c03e825ddf9d695b93a3209c75d77b16 100644 (file)
--- a/src/kadmin/server/adm_process.c
+++ b/src/kadmin/server/adm_process.c
@@ -23,7 +23,7 @@
 #include <syslog.h>
 #include <sys/wait.h>
 #include <stdio.h>
-#include <com_err.h>
+#include "com_err.h"
 
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -31,11 +31,7 @@
 #include <arpa/inet.h>
 #endif
 
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/kdb.h>
-#include <krb5/adm_defs.h>
+#include "k5-int.h"
 #include "adm_extern.h"
 
 extern krb5_encrypt_block master_encblock;

diff --git a/src/kadmin/server/adm_server.c b/src/kadmin/server/adm_server.c
index d29599ba56f5b5ac1f528a7b8480401d9a3a427a..33020eb5afe8d02b80309614f01b819c0a066e05 100644 (file)
--- a/src/kadmin/server/adm_server.c
+++ b/src/kadmin/server/adm_server.c
@@ -25,7 +25,7 @@
 #include <sys/types.h>
 #include <syslog.h>
 #include <string.h>
-#include <com_err.h>
+#include "com_err.h"
 
 #include <signal.h>
 #ifndef sigmask
@@ -42,15 +42,7 @@
 #include <varargs.h>
 #endif
 
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-#include <krb5/dbm.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/mit-des.h>
-#include <krb5/kdb_dbm.h>
-
-#include <krb5/adm_defs.h>
+#include "k5-int.h"
 #include "adm_extern.h"
 
 char prog[32];

diff --git a/src/kadmin/server/adm_v4_pwd.c b/src/kadmin/server/adm_v4_pwd.c
index 26ba0e635119fb7567f800d2043acb1fc2e88846..b74d923726ef48111a9cb92f0147f77cee516f57 100644 (file)
--- a/src/kadmin/server/adm_v4_pwd.c
+++ b/src/kadmin/server/adm_v4_pwd.c
@@ -83,14 +83,7 @@ typedef struct {
 } V4_Principal;
 
         /* V5 Definitions */
-#include <krb5/adm_defs.h>
-#include <krb5/krb5.h>
-#include <krb5/osconf.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
-#include <krb5/encryption.h>
-#include <krb5/mit-des.h>
-
+#include "k5-int.h"
 #include "adm_extern.h"
 
 struct saltblock {