Avoid <krb5/...> and <com_err.h> includes

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

7 files changed, 15 insertions, 42 deletions

diff --git a/src/admin/edit/ChangeLog b/src/admin/edit/ChangeLog
index ec2ec45e6..60baab178 100644
--- a/src/admin/edit/ChangeLog
+++ b/src/admin/edit/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 28 02:06:26 1995  John Gilmore  (gnu at toad.com)
+
+	* dump.c, dumpv4.c, kdb5_edit.c, ss_wrapper.c, tcl_wrapper.c,
+	util.c: Avoid <krb5/...> includes.
+
 Thu Feb 23 19:52:35 1995  Mark Eichin  (eichin@cygnus.com)
 
 	* kdb5_edit.c: add struct timeb and sys/timeb includes from
diff --git a/src/admin/edit/dump.c b/src/admin/edit/dump.c
index 90fb78156..2f888c450 100644
--- a/src/admin/edit/dump.c
+++ b/src/admin/edit/dump.c
@@ -24,20 +24,10 @@
  * Dump a KDC database
  */
 
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
-#include <krb5/los-proto.h>
-#include <krb5/asn1.h>
-#include <krb5/config.h>
-#include <krb5/sysincl.h>		/* for MAXPATHLEN */
-#include <krb5/ext-proto.h>
-#include <krb5/func-proto.h>
-
-#include <com_err.h>
-#include <stdio.h>
-
+#include "k5-int.h"
+#include "com_err.h"
 #include "kdb5_edit.h"
+#include <stdio.h>
 
 struct dump_record {
 	char	*comerr_name;
diff --git a/src/admin/edit/dumpv4.c b/src/admin/edit/dumpv4.c
index eec85f52d..3924f0f56 100644
--- a/src/admin/edit/dumpv4.c
+++ b/src/admin/edit/dumpv4.c
@@ -32,19 +32,9 @@
 /* MKEYFILE is now defined in kdc.h */
 #include <kdc.h>
 
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
-#include <krb5/los-proto.h>
-#include <krb5/asn1.h>
-#include <krb5/config.h>
-#include <krb5/sysincl.h>		/* for MAXPATHLEN */
-#include <krb5/ext-proto.h>
-#include <krb5/func-proto.h>
-
-#include <com_err.h>
+#include "k5-int.h"
+#include "com_err.h"
 #include <stdio.h>
-
 #include "kdb5_edit.h"
 
 struct dump_record {
diff --git a/src/admin/edit/kdb5_edit.c b/src/admin/edit/kdb5_edit.c
index c734eef4c..545daf8d3 100644
--- a/src/admin/edit/kdb5_edit.c
+++ b/src/admin/edit/kdb5_edit.c
@@ -24,16 +24,8 @@
  * Edit a KDC database.
  */
 
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
-#include <krb5/los-proto.h>
-#include <krb5/asn1.h>
-#include <krb5/config.h>
-#include <krb5/sysincl.h>		/* for MAXPATHLEN */
-#include <krb5/ext-proto.h>
-
-#include <com_err.h>
+#include "k5-int.h"
+#include "com_err.h"
 #include <stdio.h>
 #include <time.h>
 /* timeb is part of the interface to get_date. */
diff --git a/src/admin/edit/ss_wrapper.c b/src/admin/edit/ss_wrapper.c
index 3f86c45a4..4ac58eee0 100644
--- a/src/admin/edit/ss_wrapper.c
+++ b/src/admin/edit/ss_wrapper.c
@@ -24,7 +24,7 @@
  * ss wrapper for kdb5_edit
  */
 
-#include <krb5/krb5.h>
+#include "k5-int.h"
 #include "kdb5_edit.h"
 #include <ss/ss.h>
 #include <stdio.h>
diff --git a/src/admin/edit/tcl_wrapper.c b/src/admin/edit/tcl_wrapper.c
index 55b08d4e8..a8f0722cc 100644
--- a/src/admin/edit/tcl_wrapper.c
+++ b/src/admin/edit/tcl_wrapper.c
@@ -24,7 +24,7 @@
  * Tcl wrapper for kdb5_edit
  */
 
-#include <krb5/krb5.h>
+#include "k5-int.h"
 #include "kdb5_edit.h"
 #include <tcl.h>
 
diff --git a/src/admin/edit/util.c b/src/admin/edit/util.c
index cc9597e48..3a23c9a84 100644
--- a/src/admin/edit/util.c
+++ b/src/admin/edit/util.c
@@ -30,11 +30,7 @@
  * 
  */
 
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-#include <krb5/los-proto.h>
-#include <krb5/ext-proto.h>
-
+#include "k5-int.h"
 #include "./kdb5_edit.h"
 
 #if defined(sysvimp) || ( defined(mips) && defined(SYSTYPE_BSD43)) || (defined(vax) && !defined(ultrix))