diff --git a/src/util/virstorageencryption.h b/src/util/virstorageencryption.h
index bf83d341fd9b0daf8c2c2b40cdfa9fa94f05729b..f146249e66e860851f54491ad01a3f9a479c3bec 100644
--- a/src/util/virstorageencryption.h
+++ b/src/util/virstorageencryption.h
@@ -39,23 +39,23 @@ VIR_ENUM_DECL(virStorageEncryptionSecretType)
 typedef struct _virStorageEncryptionSecret virStorageEncryptionSecret;
 typedef virStorageEncryptionSecret *virStorageEncryptionSecretPtr;
 struct _virStorageEncryptionSecret {
-    int type;                   /* enum virStorageEncryptionSecretType */
+    virStorageEncryptionSecretType type;
     unsigned char uuid[VIR_UUID_BUFLEN];
 };
 
-enum virStorageEncryptionFormat {
+typedef enum {
     /* "default" is only valid for volume creation */
     VIR_STORAGE_ENCRYPTION_FORMAT_DEFAULT = 0,
     VIR_STORAGE_ENCRYPTION_FORMAT_QCOW, /* Both qcow and qcow2 */
 
     VIR_STORAGE_ENCRYPTION_FORMAT_LAST,
-};
+} virStorageEncryptionFormatType;
 VIR_ENUM_DECL(virStorageEncryptionFormat)
 
 typedef struct _virStorageEncryption virStorageEncryption;
 typedef virStorageEncryption *virStorageEncryptionPtr;
 struct _virStorageEncryption {
-    int format;            /* enum virStorageEncryptionFormat */
+    virStorageEncryptionFormatType format;
 
     size_t nsecrets;
     virStorageEncryptionSecretPtr *secrets;