diff --git a/lib/hdb/hdb.h b/lib/hdb/hdb.h
index 6dc3f6be4..10f184bff 100644
--- a/lib/hdb/hdb.h
+++ b/lib/hdb/hdb.h
@@ -43,28 +43,7 @@
 
 #include <hdb_err.h>
 
-typedef struct hdb_entry{
-    krb5_principal principal;	/* Principal */
-    int kvno;			/* Key version number */
-    krb5_keyblock keyblock;	/* Key matching vno */
-    time_t max_life;		/* Max ticket lifetime */
-    time_t max_renew;		/* Max renewable ticket */
-    time_t last_change;		/* Time of last update */
-    krb5_principal changed_by;	/* Who did last update */
-    time_t expires;		/* Time when principal expires */
-    union {
-	int i;
-	struct {
-	    unsigned initial:1;	/* Require AS_REQ */
-	    unsigned forwardable:1;	/* Ticket may be forwardable */
-	    unsigned renewable:1;	/* Ticket may be renewable */
-	    unsigned allow_postdate:1; /* Ticket may be postdated */
-	    unsigned server:1;	/* Principal may be server */
-	    unsigned locked:1;	/* Principal is locked */
-	    unsigned v4:1;	/* Version 4 salted key */
-	}b;
-    }flags;
-}hdb_entry;
+#include <hdb_asn1.h>
 
 typedef struct HDB{
     void *db;
@@ -83,7 +62,7 @@ krb5_error_code hdb_ndbm_open(krb5_context, HDB**, const char*, int, mode_t);
 krb5_error_code hdb_open(krb5_context, HDB**, const char*, int, mode_t);
 
 krb5_error_code hdb_etype2key(krb5_context, hdb_entry*, 
-			      krb5_enctype, krb5_keyblock**);
+			      krb5_enctype, Key**);
 
 #define HDB_DEFAULT_DB "heimdal"