Avoid <krb5/...> includes

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

12 files changed, 14 insertions, 18 deletions

diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog
index 9cfddf42a..e84f31e91 100644
--- a/src/lib/ChangeLog
+++ b/src/lib/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 01:33:52 1995  John Gilmore  (gnu at toad.com)
+
+	* glue4.c:  Avoid <krb5/...> includes.
+
 Thu Oct  6 20:06:06 1994  Theodore Y. Ts'o  (tytso@dcl)
 
 	* configure.in: Add recursive "make check" target.
diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog
index a9439e803..88137efd1 100644
--- a/src/lib/des425/ChangeLog
+++ b/src/lib/des425/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 28 01:30:11 1995  John Gilmore  (gnu at toad.com)
+
+	* cksum.c, des.c, des.h, enc_dec.c, pcbc_encrypt.c, quad_cksum.c,
+	read_passwd.c, string2key.c, weak_key.c:  Avoid <krb5/...> includes.
+
 Tue Feb 21 17:42:44 1995 Keith Vetter (keithv@fusion.com)
 
         * Makefile.in: made to work on the PC
diff --git a/src/lib/des425/cksum.c b/src/lib/des425/cksum.c
index 519b4ac4c..568e706af 100644
--- a/src/lib/des425/cksum.c
+++ b/src/lib/des425/cksum.c
@@ -36,7 +36,6 @@
 
 
 #include "des.h"
-#include <krb5/ext-proto.h>
 
 /*
  * This routine performs DES cipher-block-chaining checksum operation,
diff --git a/src/lib/des425/des.c b/src/lib/des425/des.c
index 93e07e65a..289061ae6 100644
--- a/src/lib/des425/des.c
+++ b/src/lib/des425/des.c
@@ -50,7 +50,6 @@
 
 
 #include "des.h"
-#include <krb5/ext-proto.h>
 
 int INTERFACE
 des_ecb_encrypt(clear, cipher, schedule, encrypt)
diff --git a/src/lib/des425/des.h b/src/lib/des425/des.h
index 7d4f61599..893f2503f 100644
--- a/src/lib/des425/des.h
+++ b/src/lib/des425/des.h
@@ -31,8 +31,7 @@
 #ifndef DES_DEFS
 #define DES_DEFS
 
-#include <krb5/krb5.h>
-#include <krb5/mit-des.h>
+#include "k5-int.h"
 
 typedef mit_des_cblock des_cblock;	/* crypto-block size */
 
diff --git a/src/lib/des425/enc_dec.c b/src/lib/des425/enc_dec.c
index a221a3483..90de9253a 100644
--- a/src/lib/des425/enc_dec.c
+++ b/src/lib/des425/enc_dec.c
@@ -37,7 +37,6 @@
 
 
 #include "des.h"
-#include <krb5/ext-proto.h>
 
 /*
  * This routine performs DES cipher-block-chaining operation, either
diff --git a/src/lib/des425/pcbc_encrypt.c b/src/lib/des425/pcbc_encrypt.c
index 06258cf8b..ea8948b7e 100644
--- a/src/lib/des425/pcbc_encrypt.c
+++ b/src/lib/des425/pcbc_encrypt.c
@@ -18,9 +18,8 @@
 /* 
  * copy of include/des.h to avoid collision with local one
  */
-#include <krb5/copyright.h>
-#include <krb5/config.h>
-#include <krb5/osconf.h>
+#include "k5-config.h"
+#include "osconf.h"
 
 #ifndef KRB_INT32
 #if (SIZEOF_LONG == 4)
diff --git a/src/lib/des425/quad_cksum.c b/src/lib/des425/quad_cksum.c
index 0a9628b48..4654a1037 100644
--- a/src/lib/des425/quad_cksum.c
+++ b/src/lib/des425/quad_cksum.c
@@ -86,8 +86,7 @@
 #include <errno.h>
 
 /* Application include files */
-#include <krb5/krb5.h>
-#include <krb5/mit-des.h>
+#include "k5-int.h"
 #include "des.h"
 /* Definitions for byte swapping */
 
diff --git a/src/lib/des425/read_passwd.c b/src/lib/des425/read_passwd.c
index d6f0c78fc..e62285978 100644
--- a/src/lib/des425/read_passwd.c
+++ b/src/lib/des425/read_passwd.c
@@ -27,10 +27,6 @@
  * echoing.
  */
 
-
-#include <krb5/krb5.h>
-#include <krb5/los-proto.h>
-
 #include "des.h"
 
 static krb5_context krb4_global_context = 0;
diff --git a/src/lib/des425/string2key.c b/src/lib/des425/string2key.c
index 826065c2b..89c816955 100644
--- a/src/lib/des425/string2key.c
+++ b/src/lib/des425/string2key.c
@@ -26,8 +26,6 @@
 
 
 #include "des.h"
-#include <krb5/ext-proto.h>
-
 #include "des_int.h"
 
 #ifdef DEBUG
diff --git a/src/lib/des425/weak_key.c b/src/lib/des425/weak_key.c
index 14f67eabd..cab80d400 100644
--- a/src/lib/des425/weak_key.c
+++ b/src/lib/des425/weak_key.c
@@ -31,7 +31,6 @@
 
 
 #include "des.h"
-#include <krb5/ext-proto.h>
 
 /*
  * mit_des_is_weak_key: returns true iff key is a [semi-]weak des key.
diff --git a/src/lib/glue4.c b/src/lib/glue4.c
index 08566f0c1..bf9bbd8a0 100644
--- a/src/lib/glue4.c
+++ b/src/lib/glue4.c
@@ -1,4 +1,4 @@
-#include <krb5/krb5.h>
+#include "krb5.h"
 
 krb5_data string_list[3] = {
 {11, "FOO.MIT.EDU"},