diff --git a/lib/krb5/krb5.h b/lib/krb5/krb5.h
index f846a882b..1636ce8cd 100644
--- a/lib/krb5/krb5.h
+++ b/lib/krb5/krb5.h
@@ -43,7 +43,7 @@
 #include <krb5_err.h>
 #include <heim_err.h>
 
-#include <asn1.h>
+#include <krb5_asn1.h>
 
 /* simple constants */
 
@@ -72,44 +72,29 @@ typedef CKSUMTYPE krb5_cksumtype;
 
 typedef Checksum krb5_checksum;
 
-typedef enum krb5_enctype {
-    ETYPE_NULL			= 0,
-    ENCTYPE_NULL			= ETYPE_NULL,
-    ETYPE_DES_CBC_CRC		= 1,
+typedef ENCTYPE krb5_enctype;
+
+/* alternative names */
+enum {
+    ENCTYPE_NULL		= ETYPE_NULL,
     ENCTYPE_DES_CBC_CRC		= ETYPE_DES_CBC_CRC,
-    ETYPE_DES_CBC_MD4		= 2,
     ENCTYPE_DES_CBC_MD4		= ETYPE_DES_CBC_MD4,
-    ETYPE_DES_CBC_MD5		= 3,
     ENCTYPE_DES_CBC_MD5		= ETYPE_DES_CBC_MD5,
-    ETYPE_DES3_CBC_MD5		= 5,
-    ENCTYPE_DES3_CBC_MD5		= ETYPE_DES3_CBC_MD5,
-    ETYPE_OLD_DES3_CBC_SHA1	= 7,
+    ENCTYPE_DES3_CBC_MD5	= ETYPE_DES3_CBC_MD5,
     ENCTYPE_OLD_DES3_CBC_SHA1	= ETYPE_OLD_DES3_CBC_SHA1,
-    ETYPE_SIGN_DSA_GENERATE	= 8,
     ENCTYPE_SIGN_DSA_GENERATE	= ETYPE_SIGN_DSA_GENERATE,
-    ETYPE_ENCRYPT_RSA_PRIV		= 9,
     ENCTYPE_ENCRYPT_RSA_PRIV	= ETYPE_ENCRYPT_RSA_PRIV,
-    ETYPE_ENCRYPT_RSA_PUB		= 10,
     ENCTYPE_ENCRYPT_RSA_PUB	= ETYPE_ENCRYPT_RSA_PUB,
-    ETYPE_DES3_CBC_SHA1		= 16, /* with key derivation */
-    ENCTYPE_DES3_CBC_SHA1		= ETYPE_DES3_CBC_SHA1,
-    ETYPE_ARCFOUR_HMAC_MD5		= 23,
+    ENCTYPE_DES3_CBC_SHA1	= ETYPE_DES3_CBC_SHA1,
     ENCTYPE_ARCFOUR_HMAC_MD5	= ETYPE_ARCFOUR_HMAC_MD5,
-    ETYPE_ARCFOUR_HMAC_MD5_56	= 24,
     ENCTYPE_ARCFOUR_HMAC_MD5_56	= ETYPE_ARCFOUR_HMAC_MD5_56,
-    ETYPE_ENCTYPE_PK_CROSS		= 48,
     ENCTYPE_ENCTYPE_PK_CROSS	= ETYPE_ENCTYPE_PK_CROSS,
-    ETYPE_DES_CBC_NONE		= -0x1000,
-    ENCTYPE_DES_CBC_NONE		= ETYPE_DES_CBC_NONE,
-    ETYPE_DES3_CBC_NONE		= -0x1001,
-    ENCTYPE_DES3_CBC_NONE		= ETYPE_DES3_CBC_NONE,
-    ETYPE_DES_CFB64_NONE		= -0x1002,
-    ENCTYPE_DES_CFB64_NONE		= ETYPE_DES_CFB64_NONE,
-    ETYPE_DES_PCBC_NONE		= -0x1003,
-    ENCTYPE_DES_PCBC_NONE		= ETYPE_DES_PCBC_NONE,
-    ETYPE_DES3_CBC_NONE_IVEC	= -0x1004,
+    ENCTYPE_DES_CBC_NONE	= ETYPE_DES_CBC_NONE,
+    ENCTYPE_DES3_CBC_NONE	= ETYPE_DES3_CBC_NONE,
+    ENCTYPE_DES_CFB64_NONE	= ETYPE_DES_CFB64_NONE,
+    ENCTYPE_DES_PCBC_NONE	= ETYPE_DES_PCBC_NONE,
     ENCTYPE_DES3_CBC_NONE_IVEC	= ETYPE_DES3_CBC_NONE_IVEC
-} krb5_enctype;
+};
 
 typedef PADATA_TYPE krb5_preauthtype;