diff --git a/lib/hdb/hdb.c b/lib/hdb/hdb.c
index 28ef98496..6518fb00f 100644
--- a/lib/hdb/hdb.c
+++ b/lib/hdb/hdb.c
@@ -42,7 +42,7 @@ hdb_entry2value(krb5_context context, hdb_entry *ent, krb5_data *value)
     krb5_store_int32(sp, ent->last_change);
     krb5_store_principal(sp, ent->changed_by);
     krb5_store_int32(sp, ent->expires);
-    krb5_store_int32(sp, ent->u.flags);
+    krb5_store_int32(sp, ent->flags.i);
     krb5_storage_to_data(sp, value);
     krb5_storage_free(sp);
 }
@@ -67,7 +67,7 @@ hdb_value2entry(krb5_context context, krb5_data *value, hdb_entry *ent)
     krb5_ret_int32(sp, &tmp);
     ent->expires = tmp;
     krb5_ret_int32(sp, &tmp);
-    ent->u.flags = tmp;
+    ent->flags.i = tmp;
     krb5_storage_free(sp);
 }
 
diff --git a/lib/hdb/hdb.h b/lib/hdb/hdb.h
index fa76d9aa6..bcde15e17 100644
--- a/lib/hdb/hdb.h
+++ b/lib/hdb/hdb.h
@@ -15,7 +15,7 @@ typedef struct hdb_entry{
     krb5_principal changed_by;	/* Who did last update */
     time_t expires;		/* Time when principal expires */
     union {
-	int flags;
+	int i;
 	struct {
 	    int initial:1;	/* Require AS_REQ */
 	    int forwardable:1;	/* Ticket may be forwardable */
@@ -23,8 +23,8 @@ typedef struct hdb_entry{
 	    int allow_postdate:1; /* Ticket may be postdated */
 	    int server:1;	/* Principal may be server */
 	    int locked:1;	/* Principal is locked */
-	}s;
-    }u;
+	}b;
+    }flags;
 }hdb_entry;
 
 typedef struct HDB{