*.c: Avoid <krb5/...> includes

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

22 files changed, 28 insertions, 73 deletions

diff --git a/src/lib/krb5/keytab/ChangeLog b/src/lib/krb5/keytab/ChangeLog
index 5d25cae4a..aa393c882 100644
--- a/src/lib/krb5/keytab/ChangeLog
+++ b/src/lib/krb5/keytab/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 00:59:22 1995  John Gilmore  (gnu at toad.com)
+
+	* *.c:  Avoid <krb5/...> includes.
+
 Wed Feb 22 01:38:54 1995 Keith Vetter (keithv@fusion.com)
 
 	* Makefile.in: made to work on the PC
diff --git a/src/lib/krb5/keytab/file/ChangeLog b/src/lib/krb5/keytab/file/ChangeLog
index 2da51ef57..b0090abd4 100644
--- a/src/lib/krb5/keytab/file/ChangeLog
+++ b/src/lib/krb5/keytab/file/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 01:01:15 1995  John Gilmore  (gnu at toad.com)
+
+	* *.c:  Avoid <krb5/...> includes.
+
 Wed Feb 22 01:27:05 1995 Keith Vetter (keithv@fusion.com)
 
         * Makefile.in: made to work on the PC
diff --git a/src/lib/krb5/keytab/file/ktf_add.c b/src/lib/krb5/keytab/file/ktf_add.c
index 2a2f15dd8..a1cad2a3f 100644
--- a/src/lib/krb5/keytab/file/ktf_add.c
+++ b/src/lib/krb5/keytab/file/ktf_add.c
@@ -24,10 +24,7 @@
  * krb5_ktfile_add()
  */
 
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-
+#include "k5-int.h"
 #include "ktfile.h"
 
 krb5_error_code INTERFACE
diff --git a/src/lib/krb5/keytab/file/ktf_close.c b/src/lib/krb5/keytab/file/ktf_close.c
index d051933f0..a59a796cc 100644
--- a/src/lib/krb5/keytab/file/ktf_close.c
+++ b/src/lib/krb5/keytab/file/ktf_close.c
@@ -25,10 +25,7 @@
  * free memory hidden in the structures.
  */
 
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-
+#include "k5-int.h"
 #include "ktfile.h"
 
 krb5_error_code INTERFACE
diff --git a/src/lib/krb5/keytab/file/ktf_defops.c b/src/lib/krb5/keytab/file/ktf_defops.c
index 5e1f1452c..315860b07 100644
--- a/src/lib/krb5/keytab/file/ktf_defops.c
+++ b/src/lib/krb5/keytab/file/ktf_defops.c
@@ -24,9 +24,7 @@
  * krb5_kt_dfl_ops
  */
 
-
-#include <krb5/krb5.h>
-
+#include "k5-int.h"
 #include "ktfile.h"
 
 krb5_kt_ops krb5_kt_dfl_ops = {
diff --git a/src/lib/krb5/keytab/file/ktf_endget.c b/src/lib/krb5/keytab/file/ktf_endget.c
index e733af713..714e4b7b7 100644
--- a/src/lib/krb5/keytab/file/ktf_endget.c
+++ b/src/lib/krb5/keytab/file/ktf_endget.c
@@ -24,10 +24,7 @@
  * krb5_ktfile_end_get()
  */
 
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-
+#include "k5-int.h"
 #include "ktfile.h"
 
 krb5_error_code INTERFACE
diff --git a/src/lib/krb5/keytab/file/ktf_g_ent.c b/src/lib/krb5/keytab/file/ktf_g_ent.c
index a56e45133..591a887ab 100644
--- a/src/lib/krb5/keytab/file/ktf_g_ent.c
+++ b/src/lib/krb5/keytab/file/ktf_g_ent.c
@@ -26,10 +26,7 @@
  * an error.
  */
 
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-
+#include "k5-int.h"
 #include "ktfile.h"
 
 krb5_error_code INTERFACE
diff --git a/src/lib/krb5/keytab/file/ktf_g_name.c b/src/lib/krb5/keytab/file/ktf_g_name.c
index 293bf13dc..86f6159e9 100644
--- a/src/lib/krb5/keytab/file/ktf_g_name.c
+++ b/src/lib/krb5/keytab/file/ktf_g_name.c
@@ -24,10 +24,7 @@
  * Get the name of the file containing a file-based keytab.
  */
 
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-
+#include "k5-int.h"
 #include "ktfile.h"
 
 krb5_error_code INTERFACE
diff --git a/src/lib/krb5/keytab/file/ktf_next.c b/src/lib/krb5/keytab/file/ktf_next.c
index 991231526..eb3ecc35a 100644
--- a/src/lib/krb5/keytab/file/ktf_next.c
+++ b/src/lib/krb5/keytab/file/ktf_next.c
@@ -24,10 +24,7 @@
  * krb5_ktfile_get_next()
  */
 
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-
+#include "k5-int.h"
 #include "ktfile.h"
 
 krb5_error_code INTERFACE
diff --git a/src/lib/krb5/keytab/file/ktf_ops.c b/src/lib/krb5/keytab/file/ktf_ops.c
index dbed1893c..9883de938 100644
--- a/src/lib/krb5/keytab/file/ktf_ops.c
+++ b/src/lib/krb5/keytab/file/ktf_ops.c
@@ -24,9 +24,7 @@
  * krb5_ktf_ops
  */
 
-
-#include <krb5/krb5.h>
-
+#include "k5-int.h"
 #include "ktfile.h"
 
 struct _krb5_kt_ops krb5_ktf_ops = {
diff --git a/src/lib/krb5/keytab/file/ktf_remove.c b/src/lib/krb5/keytab/file/ktf_remove.c
index 8f2f64b96..b3ddd75b1 100644
--- a/src/lib/krb5/keytab/file/ktf_remove.c
+++ b/src/lib/krb5/keytab/file/ktf_remove.c
@@ -24,10 +24,7 @@
  * krb5_ktfile_add()
  */
 
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-
+#include "k5-int.h"
 #include "ktfile.h"
 
 krb5_error_code INTERFACE
diff --git a/src/lib/krb5/keytab/file/ktf_resolv.c b/src/lib/krb5/keytab/file/ktf_resolv.c
index 4f52eb902..bd304d943 100644
--- a/src/lib/krb5/keytab/file/ktf_resolv.c
+++ b/src/lib/krb5/keytab/file/ktf_resolv.c
@@ -25,10 +25,7 @@
  * initialized with file keytab routines.
  */
 
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-
+#include "k5-int.h"
 #include "ktfile.h"
 
 krb5_error_code INTERFACE
diff --git a/src/lib/krb5/keytab/file/ktf_ssget.c b/src/lib/krb5/keytab/file/ktf_ssget.c
index aa9304910..b00a3f8c3 100644
--- a/src/lib/krb5/keytab/file/ktf_ssget.c
+++ b/src/lib/krb5/keytab/file/ktf_ssget.c
@@ -24,10 +24,7 @@
  * krb5_ktfile_start_seq_get()
  */
 
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-
+#include "k5-int.h"
 #include "ktfile.h"
 
 krb5_error_code INTERFACE
diff --git a/src/lib/krb5/keytab/file/ktf_util.c b/src/lib/krb5/keytab/file/ktf_util.c
index 301abbb9c..84466efc4 100644
--- a/src/lib/krb5/keytab/file/ktf_util.c
+++ b/src/lib/krb5/keytab/file/ktf_util.c
@@ -65,16 +65,9 @@
  * sizeof(krb5_octet) bytes for the key version number
  * sizeof(krb5_int16) bytes for the keytype
  * sizeof(krb5_int32) bytes for the key length, followed by the key
- *
  */
 
-
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/libos.h>
-#include <krb5/los-proto.h>
-#include <krb5/osconf.h>
+#include "k5-int.h"
 #include <stdio.h>
 
 #include "ktfile.h"
diff --git a/src/lib/krb5/keytab/file/ktf_wops.c b/src/lib/krb5/keytab/file/ktf_wops.c
index bc2ff2999..98edcbf87 100644
--- a/src/lib/krb5/keytab/file/ktf_wops.c
+++ b/src/lib/krb5/keytab/file/ktf_wops.c
@@ -24,9 +24,7 @@
  * krb5_ktf_writable_ops
  */
 
-
-#include <krb5/krb5.h>
-
+#include "k5-int.h"
 #include "ktfile.h"
 
 struct _krb5_kt_ops krb5_ktf_writable_ops = {
diff --git a/src/lib/krb5/keytab/file/ktf_wreslv.c b/src/lib/krb5/keytab/file/ktf_wreslv.c
index cb716d760..7845a6b58 100644
--- a/src/lib/krb5/keytab/file/ktf_wreslv.c
+++ b/src/lib/krb5/keytab/file/ktf_wreslv.c
@@ -25,10 +25,7 @@
  * initialized with file keytab routines.
  */
 
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-
+#include "k5-int.h"
 #include "ktfile.h"
 
 krb5_error_code INTERFACE
diff --git a/src/lib/krb5/keytab/ktadd.c b/src/lib/krb5/keytab/ktadd.c
index 42a6c4b44..7656c7e95 100644
--- a/src/lib/krb5/keytab/ktadd.c
+++ b/src/lib/krb5/keytab/ktadd.c
@@ -24,8 +24,7 @@
  * krb5_kt_add_entry()
  */
 
-
-#include <krb5/krb5.h>
+#include "k5-int.h"
 
 krb5_error_code INTERFACE
 krb5_kt_add_entry (context, id, entry)
diff --git a/src/lib/krb5/keytab/ktbase.c b/src/lib/krb5/keytab/ktbase.c
index c12642189..97ea1a03e 100644
--- a/src/lib/krb5/keytab/ktbase.c
+++ b/src/lib/krb5/keytab/ktbase.c
@@ -24,9 +24,7 @@
  * Registration functions for keytab.
  */
 
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
+#include "k5-int.h"
 
 struct krb5_kt_typelist
  {
diff --git a/src/lib/krb5/keytab/ktdefault.c b/src/lib/krb5/keytab/ktdefault.c
index dc53abbea..195d0ca03 100644
--- a/src/lib/krb5/keytab/ktdefault.c
+++ b/src/lib/krb5/keytab/ktdefault.c
@@ -24,8 +24,7 @@
  * Get a default keytab.
  */
 
-
-#include <krb5/krb5.h>
+#include "k5-int.h"
 #include <stdio.h>
 
 krb5_error_code INTERFACE
diff --git a/src/lib/krb5/keytab/ktfr_entry.c b/src/lib/krb5/keytab/ktfr_entry.c
index c7bb1241f..e573d4031 100644
--- a/src/lib/krb5/keytab/ktfr_entry.c
+++ b/src/lib/krb5/keytab/ktfr_entry.c
@@ -24,9 +24,7 @@
  * krb5_kt_free_entry()
  */
 
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
+#include "k5-int.h"
 
 krb5_error_code INTERFACE
 krb5_kt_free_entry (context, entry)
diff --git a/src/lib/krb5/keytab/ktremove.c b/src/lib/krb5/keytab/ktremove.c
index e8b433ca4..928d6aa85 100644
--- a/src/lib/krb5/keytab/ktremove.c
+++ b/src/lib/krb5/keytab/ktremove.c
@@ -24,8 +24,7 @@
  * krb5_kt_remove_entry()
  */
 
-
-#include <krb5/krb5.h>
+#include "k5-int.h"
 
 krb5_error_code INTERFACE
 krb5_kt_remove_entry (context, id, entry)
diff --git a/src/lib/krb5/keytab/read_servi.c b/src/lib/krb5/keytab/read_servi.c
index 77db43d86..90315dda1 100644
--- a/src/lib/krb5/keytab/read_servi.c
+++ b/src/lib/krb5/keytab/read_servi.c
@@ -27,10 +27,7 @@
  * internally. 
  */
 
-
-#include <krb5/krb5.h>
-
-#include <krb5/ext-proto.h>
+#include "k5-int.h"
 
 #define KSUCCESS 0