diff --git a/lib/krb5/digest.c b/lib/krb5/digest.c
index 8cf8c7a90..964a1445b 100644
--- a/lib/krb5/digest.c
+++ b/lib/krb5/digest.c
@@ -35,7 +35,7 @@
 RCSID("$Id$");
 #include "digest_asn1.h"
 
-struct krb5_digest {
+struct krb5_digest_data {
     char *cbtype;
     char *cbbinding;
 
@@ -812,7 +812,7 @@ krb5_digest_get_session_key(krb5_context context,
     return ret;
 }
 
-struct krb5_ntlm {
+struct krb5_ntlm_data {
     NTLMInit init;
     NTLMInitReply initReply;
     NTLMRequest request;
diff --git a/lib/krb5/krb5.h b/lib/krb5/krb5.h
index b6554296c..df715c389 100644
--- a/lib/krb5/krb5.h
+++ b/lib/krb5/krb5.h
@@ -75,10 +75,10 @@ typedef struct krb5_crypto_data *krb5_crypto;
 struct krb5_get_creds_opt_data;
 typedef struct krb5_get_creds_opt_data *krb5_get_creds_opt;
 
-struct krb5_digest;
-typedef struct krb5_digest *krb5_digest;
-struct krb5_ntlm;
-typedef struct krb5_ntlm *krb5_ntlm;
+struct krb5_digest_data;
+typedef struct krb5_digest_data *krb5_digest;
+struct krb5_ntlm_data;
+typedef struct krb5_ntlm_data *krb5_ntlm;
 
 typedef struct krb5_pac *krb5_pac;