fix include files

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

50 files changed, 50 insertions, 150 deletions

diff --git a/src/lib/krb5/asn.1/adat2kadat.c b/src/lib/krb5/asn.1/adat2kadat.c
index 117d849f3..4456aeb7b 100644
--- a/src/lib/krb5/asn.1/adat2kadat.c
+++ b/src/lib/krb5/asn.1/adat2kadat.c
@@ -20,9 +20,7 @@ static char rcsid_adat2kadat_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/addr2kaddr.c b/src/lib/krb5/asn.1/addr2kaddr.c
index 8d9888fad..0e965e4dd 100644
--- a/src/lib/krb5/asn.1/addr2kaddr.c
+++ b/src/lib/krb5/asn.1/addr2kaddr.c
@@ -20,9 +20,7 @@ static char rcsid_addr2kaddr_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/adr2kadr.c b/src/lib/krb5/asn.1/adr2kadr.c
index 9e0d32933..bca9c6a5c 100644
--- a/src/lib/krb5/asn.1/adr2kadr.c
+++ b/src/lib/krb5/asn.1/adr2kadr.c
@@ -20,9 +20,7 @@ static char rcsid_adr2kadr_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/aprp2kaprp.c b/src/lib/krb5/asn.1/aprp2kaprp.c
index 06ad2167d..f32410409 100644
--- a/src/lib/krb5/asn.1/aprp2kaprp.c
+++ b/src/lib/krb5/asn.1/aprp2kaprp.c
@@ -20,9 +20,7 @@ static char rcsid_aprp2kaprp_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/aprq2kaprq.c b/src/lib/krb5/asn.1/aprq2kaprq.c
index 22985da02..f1efb6b3c 100644
--- a/src/lib/krb5/asn.1/aprq2kaprq.c
+++ b/src/lib/krb5/asn.1/aprq2kaprq.c
@@ -20,9 +20,7 @@ static char rcsid_aprq2kaprq_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/arep2karep.c b/src/lib/krb5/asn.1/arep2karep.c
index 4eff572fb..4f4158d96 100644
--- a/src/lib/krb5/asn.1/arep2karep.c
+++ b/src/lib/krb5/asn.1/arep2karep.c
@@ -20,9 +20,7 @@ static char rcsid_arep2karep_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/auth2kauth.c b/src/lib/krb5/asn.1/auth2kauth.c
index 606023d12..5af621198 100644
--- a/src/lib/krb5/asn.1/auth2kauth.c
+++ b/src/lib/krb5/asn.1/auth2kauth.c
@@ -20,9 +20,7 @@ static char rcsid_auth2kauth_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/ck2kck.c b/src/lib/krb5/asn.1/ck2kck.c
index 823cba386..4237253aa 100644
--- a/src/lib/krb5/asn.1/ck2kck.c
+++ b/src/lib/krb5/asn.1/ck2kck.c
@@ -20,9 +20,7 @@ static char rcsid_ck2kck_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/cvt_flags.c b/src/lib/krb5/asn.1/cvt_flags.c
index 62d466e24..2e24ccc92 100644
--- a/src/lib/krb5/asn.1/cvt_flags.c
+++ b/src/lib/krb5/asn.1/cvt_flags.c
@@ -20,9 +20,7 @@ static char rcsid_cvt_flags_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/decode.c b/src/lib/krb5/asn.1/decode.c
index 4a6e084ba..bc6db5b3c 100644
--- a/src/lib/krb5/asn.1/decode.c
+++ b/src/lib/krb5/asn.1/decode.c
@@ -17,10 +17,8 @@ static char rcsid_decode_c[] =
 
 #include <krb5/copyright.h>
 #include <isode/psap.h>
-#include "KRB5-types.h"
 #include <krb5/krb5.h>
-#include "encode.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/edat2kedat.c b/src/lib/krb5/asn.1/edat2kedat.c
index c5d2f3f8c..29b0be326 100644
--- a/src/lib/krb5/asn.1/edat2kedat.c
+++ b/src/lib/krb5/asn.1/edat2kedat.c
@@ -20,9 +20,7 @@ static char rcsid_edat2kedat_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/ekrp2kekrp.c b/src/lib/krb5/asn.1/ekrp2kekrp.c
index 65474dc80..d3d71d333 100644
--- a/src/lib/krb5/asn.1/ekrp2kekrp.c
+++ b/src/lib/krb5/asn.1/ekrp2kekrp.c
@@ -20,9 +20,7 @@ static char rcsid_ekrp2kekrp_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/enck2kkey.c b/src/lib/krb5/asn.1/enck2kkey.c
index a23852584..c1158860b 100644
--- a/src/lib/krb5/asn.1/enck2kkey.c
+++ b/src/lib/krb5/asn.1/enck2kkey.c
@@ -20,9 +20,7 @@ static char rcsid_enck2kkey_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/encode.c b/src/lib/krb5/asn.1/encode.c
index 0f2f44a71..f6d899f1d 100644
--- a/src/lib/krb5/asn.1/encode.c
+++ b/src/lib/krb5/asn.1/encode.c
@@ -17,10 +17,8 @@ static char rcsid_encode_c[] =
 
 #include <krb5/copyright.h>
 #include <isode/psap.h>
-#include "KRB5-types.h"
 #include <krb5/krb5.h>
-#include "encode.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/err2kerr.c b/src/lib/krb5/asn.1/err2kerr.c
index 655021af0..1834fe91b 100644
--- a/src/lib/krb5/asn.1/err2kerr.c
+++ b/src/lib/krb5/asn.1/err2kerr.c
@@ -20,9 +20,7 @@ static char rcsid_err2kerr_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/etpt2ketpt.c b/src/lib/krb5/asn.1/etpt2ketpt.c
index 8f743ad11..371b94e66 100644
--- a/src/lib/krb5/asn.1/etpt2ketpt.c
+++ b/src/lib/krb5/asn.1/etpt2ketpt.c
@@ -20,9 +20,7 @@ static char rcsid_etpt2ketpt_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/g2unix.c b/src/lib/krb5/asn.1/g2unix.c
index fed12d0b0..5a6bdee00 100644
--- a/src/lib/krb5/asn.1/g2unix.c
+++ b/src/lib/krb5/asn.1/g2unix.c
@@ -20,9 +20,7 @@ static char rcsid_g2unix_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/kadat2adat.c b/src/lib/krb5/asn.1/kadat2adat.c
index 689f7dbd9..9b563307e 100644
--- a/src/lib/krb5/asn.1/kadat2adat.c
+++ b/src/lib/krb5/asn.1/kadat2adat.c
@@ -20,9 +20,7 @@ static char rcsid_kadat2adat_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/kaddr2addr.c b/src/lib/krb5/asn.1/kaddr2addr.c
index 51a60cb0a..7fa770cca 100644
--- a/src/lib/krb5/asn.1/kaddr2addr.c
+++ b/src/lib/krb5/asn.1/kaddr2addr.c
@@ -20,9 +20,7 @@ static char rcsid_kaddr2addr_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/kadr2adr.c b/src/lib/krb5/asn.1/kadr2adr.c
index 4394923f3..30a622f74 100644
--- a/src/lib/krb5/asn.1/kadr2adr.c
+++ b/src/lib/krb5/asn.1/kadr2adr.c
@@ -20,9 +20,7 @@ static char rcsid_kadr2adr_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/kaprp2aprp.c b/src/lib/krb5/asn.1/kaprp2aprp.c
index 074a26ba7..b7f308a84 100644
--- a/src/lib/krb5/asn.1/kaprp2aprp.c
+++ b/src/lib/krb5/asn.1/kaprp2aprp.c
@@ -20,9 +20,7 @@ static char rcsid_kaprp2aprp_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/kaprq2aprq.c b/src/lib/krb5/asn.1/kaprq2aprq.c
index 798ca81a4..791e91422 100644
--- a/src/lib/krb5/asn.1/kaprq2aprq.c
+++ b/src/lib/krb5/asn.1/kaprq2aprq.c
@@ -20,9 +20,7 @@ static char rcsid_kaprq2aprq_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/karep2arep.c b/src/lib/krb5/asn.1/karep2arep.c
index 9cc449354..d8d958d9d 100644
--- a/src/lib/krb5/asn.1/karep2arep.c
+++ b/src/lib/krb5/asn.1/karep2arep.c
@@ -20,9 +20,7 @@ static char rcsid_karep2arep_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/kauth2auth.c b/src/lib/krb5/asn.1/kauth2auth.c
index 44c63621a..df2809e0f 100644
--- a/src/lib/krb5/asn.1/kauth2auth.c
+++ b/src/lib/krb5/asn.1/kauth2auth.c
@@ -20,9 +20,7 @@ static char rcsid_kauth2auth_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/kck2ck.c b/src/lib/krb5/asn.1/kck2ck.c
index e7da9970f..d2cfe3a8a 100644
--- a/src/lib/krb5/asn.1/kck2ck.c
+++ b/src/lib/krb5/asn.1/kck2ck.c
@@ -20,9 +20,7 @@ static char rcsid_kck2ck_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/kdcr2kkdcr.c b/src/lib/krb5/asn.1/kdcr2kkdcr.c
index 191c59da0..6f8caf3a7 100644
--- a/src/lib/krb5/asn.1/kdcr2kkdcr.c
+++ b/src/lib/krb5/asn.1/kdcr2kkdcr.c
@@ -20,9 +20,7 @@ static char rcsid_kdcr2kkdcr_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/kdcr2ktgsr.c b/src/lib/krb5/asn.1/kdcr2ktgsr.c
index a24edf2d3..521151956 100644
--- a/src/lib/krb5/asn.1/kdcr2ktgsr.c
+++ b/src/lib/krb5/asn.1/kdcr2ktgsr.c
@@ -20,9 +20,7 @@ static char rcsid_kdcr2ktgsr_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/kedat2edat.c b/src/lib/krb5/asn.1/kedat2edat.c
index c154a7d93..0b487dec2 100644
--- a/src/lib/krb5/asn.1/kedat2edat.c
+++ b/src/lib/krb5/asn.1/kedat2edat.c
@@ -20,9 +20,7 @@ static char rcsid_kedat2edat_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/kekrp2ekrp.c b/src/lib/krb5/asn.1/kekrp2ekrp.c
index 16585a2b3..b98ccec48 100644
--- a/src/lib/krb5/asn.1/kekrp2ekrp.c
+++ b/src/lib/krb5/asn.1/kekrp2ekrp.c
@@ -20,9 +20,7 @@ static char rcsid_kekrp2ekrp_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/kerr2err.c b/src/lib/krb5/asn.1/kerr2err.c
index 8eaf0aecb..36bbf852c 100644
--- a/src/lib/krb5/asn.1/kerr2err.c
+++ b/src/lib/krb5/asn.1/kerr2err.c
@@ -20,9 +20,7 @@ static char rcsid_kerr2err_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/ketpt2etpt.c b/src/lib/krb5/asn.1/ketpt2etpt.c
index 9aebf7b2f..c5aaef923 100644
--- a/src/lib/krb5/asn.1/ketpt2etpt.c
+++ b/src/lib/krb5/asn.1/ketpt2etpt.c
@@ -20,9 +20,7 @@ static char rcsid_ketpt2etpt_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/kkdcr2kdcr.c b/src/lib/krb5/asn.1/kkdcr2kdcr.c
index 176cd1259..bf9e66c84 100644
--- a/src/lib/krb5/asn.1/kkdcr2kdcr.c
+++ b/src/lib/krb5/asn.1/kkdcr2kdcr.c
@@ -19,9 +19,7 @@ static char rcsid_kkdcr2kdcr_c[] =
 #include <krb5/krb5.h>
 
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/kkey2enck.c b/src/lib/krb5/asn.1/kkey2enck.c
index 11a55d482..1de21acdd 100644
--- a/src/lib/krb5/asn.1/kkey2enck.c
+++ b/src/lib/krb5/asn.1/kkey2enck.c
@@ -20,9 +20,7 @@ static char rcsid_kkey2enck_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/klsrq2lsrq.c b/src/lib/krb5/asn.1/klsrq2lsrq.c
index 3e63086db..12127465d 100644
--- a/src/lib/krb5/asn.1/klsrq2lsrq.c
+++ b/src/lib/krb5/asn.1/klsrq2lsrq.c
@@ -20,9 +20,7 @@ static char rcsid_klsrq2lsrq_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/kprep2prep.c b/src/lib/krb5/asn.1/kprep2prep.c
index a78588029..cef82ba0f 100644
--- a/src/lib/krb5/asn.1/kprep2prep.c
+++ b/src/lib/krb5/asn.1/kprep2prep.c
@@ -20,9 +20,7 @@ static char rcsid_kprep2prep_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/kprin2prin.c b/src/lib/krb5/asn.1/kprin2prin.c
index 33500c672..3cae50c16 100644
--- a/src/lib/krb5/asn.1/kprin2prin.c
+++ b/src/lib/krb5/asn.1/kprin2prin.c
@@ -20,9 +20,7 @@ static char rcsid_kprin2prin_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/kpriv2priv.c b/src/lib/krb5/asn.1/kpriv2priv.c
index 21749d4c5..d32d32473 100644
--- a/src/lib/krb5/asn.1/kpriv2priv.c
+++ b/src/lib/krb5/asn.1/kpriv2priv.c
@@ -20,9 +20,7 @@ static char rcsid_kpriv2priv_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/ksafe2safe.c b/src/lib/krb5/asn.1/ksafe2safe.c
index 41489f85f..3461735ab 100644
--- a/src/lib/krb5/asn.1/ksafe2safe.c
+++ b/src/lib/krb5/asn.1/ksafe2safe.c
@@ -20,9 +20,7 @@ static char rcsid_ksafe2safe_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/ktgrq2tgrq.c b/src/lib/krb5/asn.1/ktgrq2tgrq.c
index c14be7acf..467879880 100644
--- a/src/lib/krb5/asn.1/ktgrq2tgrq.c
+++ b/src/lib/krb5/asn.1/ktgrq2tgrq.c
@@ -20,9 +20,7 @@ static char rcsid_ktgrq2tgrq_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/ktgsr2kdcr.c b/src/lib/krb5/asn.1/ktgsr2kdcr.c
index 348453c2d..99f674173 100644
--- a/src/lib/krb5/asn.1/ktgsr2kdcr.c
+++ b/src/lib/krb5/asn.1/ktgsr2kdcr.c
@@ -20,9 +20,7 @@ static char rcsid_ktgsr2kdcr_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/ktkt2tkt.c b/src/lib/krb5/asn.1/ktkt2tkt.c
index f368ee0b0..bb0d0a09c 100644
--- a/src/lib/krb5/asn.1/ktkt2tkt.c
+++ b/src/lib/krb5/asn.1/ktkt2tkt.c
@@ -20,9 +20,7 @@ static char rcsid_ktkt2tkt_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/lsrq2klsrq.c b/src/lib/krb5/asn.1/lsrq2klsrq.c
index 81fb27c2f..718acea5f 100644
--- a/src/lib/krb5/asn.1/lsrq2klsrq.c
+++ b/src/lib/krb5/asn.1/lsrq2klsrq.c
@@ -20,9 +20,7 @@ static char rcsid_lsrq2klsrq_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/prep2kprep.c b/src/lib/krb5/asn.1/prep2kprep.c
index 63c2cc458..7d272694f 100644
--- a/src/lib/krb5/asn.1/prep2kprep.c
+++ b/src/lib/krb5/asn.1/prep2kprep.c
@@ -20,9 +20,7 @@ static char rcsid_prep2kprep_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/prin2kprin.c b/src/lib/krb5/asn.1/prin2kprin.c
index d7a31765e..76cd35ca5 100644
--- a/src/lib/krb5/asn.1/prin2kprin.c
+++ b/src/lib/krb5/asn.1/prin2kprin.c
@@ -20,9 +20,7 @@ static char rcsid_prin2kprin_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/priv2kpriv.c b/src/lib/krb5/asn.1/priv2kpriv.c
index 793e033d8..d6dc1f85f 100644
--- a/src/lib/krb5/asn.1/priv2kpriv.c
+++ b/src/lib/krb5/asn.1/priv2kpriv.c
@@ -20,9 +20,7 @@ static char rcsid_priv2kpriv_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/qbuf2data.c b/src/lib/krb5/asn.1/qbuf2data.c
index cc81ba0d8..a6fc34e7c 100644
--- a/src/lib/krb5/asn.1/qbuf2data.c
+++ b/src/lib/krb5/asn.1/qbuf2data.c
@@ -20,9 +20,7 @@ static char rcsid_qbuf2data_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/safe2ksafe.c b/src/lib/krb5/asn.1/safe2ksafe.c
index 3db3fa68c..7784109ad 100644
--- a/src/lib/krb5/asn.1/safe2ksafe.c
+++ b/src/lib/krb5/asn.1/safe2ksafe.c
@@ -20,9 +20,7 @@ static char rcsid_safe2ksafe_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/tgrq2ktgrq.c b/src/lib/krb5/asn.1/tgrq2ktgrq.c
index f4967a41f..7f137ec18 100644
--- a/src/lib/krb5/asn.1/tgrq2ktgrq.c
+++ b/src/lib/krb5/asn.1/tgrq2ktgrq.c
@@ -20,9 +20,7 @@ static char rcsid_tgrq2ktgrq_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/tkt2ktkt.c b/src/lib/krb5/asn.1/tkt2ktkt.c
index cda06a550..99dd18b51 100644
--- a/src/lib/krb5/asn.1/tkt2ktkt.c
+++ b/src/lib/krb5/asn.1/tkt2ktkt.c
@@ -20,9 +20,7 @@ static char rcsid_tkt2ktkt_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>
 
diff --git a/src/lib/krb5/asn.1/u2gen.c b/src/lib/krb5/asn.1/u2gen.c
index 3e26b3f88..86ff06506 100644
--- a/src/lib/krb5/asn.1/u2gen.c
+++ b/src/lib/krb5/asn.1/u2gen.c
@@ -20,9 +20,7 @@ static char rcsid_u2gen_c[] =
 
 /*#include <time.h> */
 #include <isode/psap.h>
-#include "KRB5-types.h"
-#include "asn1glue.h"
-#include "asn1defs.h"
+#include <krb5/asn1.h>
 
 #include <krb5/ext-proto.h>