diff --git a/lib/kafs/afskrb.c b/lib/kafs/afskrb.c
index 7432df9f1..eab60d400 100644
--- a/lib/kafs/afskrb.c
+++ b/lib/kafs/afskrb.c
@@ -42,7 +42,7 @@ struct krb_kafs_data {
 };
 
 static int
-get_cred(kafs_data *data, const char *name, const char *inst, 
+get_cred(struct kafs_data *data, const char *name, const char *inst, 
 	 const char *realm, uid_t uid, struct kafs_token *kt)
 {
     CREDENTIALS c;
@@ -60,7 +60,7 @@ get_cred(kafs_data *data, const char *name, const char *inst,
 }
 
 static int
-afslog_uid_int(kafs_data *data,
+afslog_uid_int(struct kafs_data *data,
 	       const char *cell,
 	       const char *realm_hint,
 	       uid_t uid,
@@ -93,7 +93,7 @@ afslog_uid_int(kafs_data *data,
 }
 
 static char *
-get_realm(kafs_data *data, const char *host)
+get_realm(struct kafs_data *data, const char *host)
 {
     char *r = krb_realmofhost(host);
     if(r != NULL)
@@ -106,7 +106,7 @@ int
 krb_afslog_uid_home(const char *cell, const char *realm_hint, uid_t uid,
 		    const char *homedir)
 {
-    kafs_data kd;
+    struct kafs_data kd;
 
     kd.name = "krb4";
     kd.afslog_uid = afslog_uid_int;
@@ -141,7 +141,7 @@ krb_afslog_home(const char *cell, const char *realm_hint, const char *homedir)
 int
 krb_realm_of_cell(const char *cell, char **realm)
 {
-    kafs_data kd;
+    struct kafs_data kd;
 
     kd.name = "krb4";
     kd.get_realm = get_realm;
diff --git a/lib/kafs/afskrb5.c b/lib/kafs/afskrb5.c
index 4b857649a..7972ac423 100644
--- a/lib/kafs/afskrb5.c
+++ b/lib/kafs/afskrb5.c
@@ -159,7 +159,7 @@ v5_convert(krb5_context context, krb5_ccache id,
  */
 
 static int
-get_cred(kafs_data *data, const char *name, const char *inst, 
+get_cred(struct kafs_data *data, const char *name, const char *inst, 
 	 const char *realm, uid_t uid, struct kafs_token *kt)
 {
     krb5_error_code ret;
@@ -191,8 +191,8 @@ get_cred(kafs_data *data, const char *name, const char *inst,
 }
 
 static krb5_error_code
-afslog_uid_int(kafs_data *data, const char *cell, const char *rh, uid_t uid,
-	       const char *homedir)
+afslog_uid_int(struct kafs_data *data, const char *cell, const char *rh,
+	       uid_t uid, const char *homedir)
 {
     krb5_error_code ret;
     struct kafs_token kt;
@@ -221,7 +221,7 @@ afslog_uid_int(kafs_data *data, const char *cell, const char *rh, uid_t uid,
 }
 
 static char *
-get_realm(kafs_data *data, const char *host)
+get_realm(struct kafs_data *data, const char *host)
 {
     struct krb5_kafs_data *d = data->data;
     krb5_realm *realms;
@@ -241,7 +241,7 @@ krb5_afslog_uid_home(krb5_context context,
 		     uid_t uid,
 		     const char *homedir)
 {
-    kafs_data kd;
+    struct kafs_data kd;
     struct krb5_kafs_data d;
     krb5_error_code ret;
 
@@ -308,7 +308,7 @@ krb5_afslog_home(krb5_context context,
 krb5_error_code
 krb5_realm_of_cell(const char *cell, char **realm)
 {
-    kafs_data kd;
+    struct kafs_data kd;
 
     kd.name = "krb5";
     kd.get_realm = get_realm;
diff --git a/lib/kafs/common.c b/lib/kafs/common.c
index e3f709fe1..e97753bfc 100644
--- a/lib/kafs/common.c
+++ b/lib/kafs/common.c
@@ -242,7 +242,7 @@ find_cells(const char *file, char ***cells, int *index)
  * Get tokens for all cells[]
  */
 static int
-afslog_cells(kafs_data *data, char **cells, int max, uid_t uid,
+afslog_cells(struct kafs_data *data, char **cells, int max, uid_t uid,
 	     const char *homedir)
 {
     int ret = 0;
@@ -256,7 +256,8 @@ afslog_cells(kafs_data *data, char **cells, int max, uid_t uid,
 }
 
 int
-_kafs_afslog_all_local_cells(kafs_data *data, uid_t uid, const char *homedir)
+_kafs_afslog_all_local_cells(struct kafs_data *data,
+			     uid_t uid, const char *homedir)
 {
     int ret;
     char **cells = NULL;
@@ -291,7 +292,8 @@ _kafs_afslog_all_local_cells(kafs_data *data, uid_t uid, const char *homedir)
 
 
 static int
-file_find_cell(kafs_data *data, const char *cell, char **realm, int exact)
+file_find_cell(struct kafs_data *data, 
+	       const char *cell, char **realm, int exact)
 {
     FILE *F;
     char buf[1024];
@@ -351,7 +353,8 @@ file_find_cell(kafs_data *data, const char *cell, char **realm, int exact)
    */
 
 int
-_kafs_realm_of_cell(kafs_data *data, const char *cell, char **realm)
+_kafs_realm_of_cell(struct kafs_data *data,
+		    const char *cell, char **realm)
 {
     char buf[1024];
     int ret;
@@ -368,7 +371,7 @@ _kafs_realm_of_cell(kafs_data *data, const char *cell, char **realm)
 }
 
 static int
-_kafs_try_get_cred(kafs_data *data, const char *user, const char *cell,
+_kafs_try_get_cred(struct kafs_data *data, const char *user, const char *cell,
 		   const char *realm, uid_t uid, struct kafs_token *kt)
 {
     int ret;
@@ -388,7 +391,7 @@ _kafs_try_get_cred(kafs_data *data, const char *user, const char *cell,
 
 
 int
-_kafs_get_cred(kafs_data *data,
+_kafs_get_cred(struct kafs_data *data,
 	       const char *cell, 
 	       const char *realm_hint,
 	       const char *realm,
diff --git a/lib/kafs/kafs_locl.h b/lib/kafs/kafs_locl.h
index 825ef2269..7a7639639 100644
--- a/lib/kafs/kafs_locl.h
+++ b/lib/kafs/kafs_locl.h
@@ -119,13 +119,13 @@ typedef int (*get_cred_func_t)(struct kafs_data*, const char*, const char*,
 
 typedef char* (*get_realm_func_t)(struct kafs_data*, const char*);
 
-typedef struct kafs_data {
+struct kafs_data {
     const char *name;
     afslog_uid_func_t afslog_uid;
     get_cred_func_t get_cred;
     get_realm_func_t get_realm;
     void *data;
-} kafs_data;
+};
 
 struct kafs_token {
     struct ClearToken ct;
@@ -135,13 +135,13 @@ struct kafs_token {
 
 void _kafs_foldup(char *, const char *);
 
-int _kafs_afslog_all_local_cells(kafs_data*, uid_t, const char*);
+int _kafs_afslog_all_local_cells(struct kafs_data*, uid_t, const char*);
 
-int _kafs_get_cred(kafs_data*, const char*, const char*, const char *, 
+int _kafs_get_cred(struct kafs_data*, const char*, const char*, const char *, 
 		   uid_t, struct kafs_token *);
 
 int
-_kafs_realm_of_cell(kafs_data *, const char *, char **);
+_kafs_realm_of_cell(struct kafs_data *, const char *, char **);
 
 int
 _kafs_v4_to_kt(CREDENTIALS *, uid_t, struct kafs_token *);