diff --git a/src/libostree/ostree-gpg-verifier.c b/src/libostree/ostree-gpg-verifier.c
index 77594d9b..680c410b 100644
--- a/src/libostree/ostree-gpg-verifier.c
+++ b/src/libostree/ostree-gpg-verifier.c
@@ -95,8 +95,8 @@ _ostree_gpg_verifier_check_signature (OstreeGpgVerifier  *self,
 {
   GLNX_AUTO_PREFIX_ERROR("GPG", error);
   gpgme_error_t gpg_error = 0;
-  ot_auto_gpgme_data gpgme_data_t data_buffer = NULL;
-  ot_auto_gpgme_data gpgme_data_t signature_buffer = NULL;
+  g_auto(gpgme_data_t) data_buffer = NULL;
+  g_auto(gpgme_data_t) signature_buffer = NULL;
   g_autofree char *tmp_dir = NULL;
   g_autoptr(GOutputStream) target_stream = NULL;
   OstreeGpgVerifyResult *result = NULL;
@@ -165,7 +165,7 @@ _ostree_gpg_verifier_check_signature (OstreeGpgVerifier  *self,
         {
           const char *path = self->key_ascii_files->pdata[i];
           glnx_fd_close int fd = -1;
-          ot_auto_gpgme_data gpgme_data_t kdata = NULL;
+          g_auto(gpgme_data_t) kdata = NULL;
 
           if (!glnx_openat_rdonly (AT_FDCWD, path, TRUE, &fd, error))
             goto out;
diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index 896c57bc..5730b11e 100644
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -1331,9 +1331,9 @@ ostree_repo_remote_gpg_import (OstreeRepo         *self,
                                GError            **error)
 {
   OstreeRemote *remote;
-  ot_auto_gpgme_ctx gpgme_ctx_t source_context = NULL;
-  ot_auto_gpgme_ctx gpgme_ctx_t target_context = NULL;
-  ot_auto_gpgme_data gpgme_data_t data_buffer = NULL;
+  g_auto(gpgme_ctx_t) source_context = NULL;
+  g_auto(gpgme_ctx_t) target_context = NULL;
+  g_auto(gpgme_data_t) data_buffer = NULL;
   gpgme_import_result_t import_result;
   gpgme_import_status_t import_status;
   g_autofree char *source_tmp_dir = NULL;
diff --git a/src/libotutil/ot-gpg-utils.c b/src/libotutil/ot-gpg-utils.c
index 001daa0a..99f4879e 100644
--- a/src/libotutil/ot-gpg-utils.c
+++ b/src/libotutil/ot-gpg-utils.c
@@ -413,7 +413,7 @@ ot_gpgme_new_ctx (const char *homedir,
                   GError    **error)
 {
   gpgme_error_t err;
-  ot_auto_gpgme_ctx gpgme_ctx_t context = NULL;
+  g_auto(gpgme_ctx_t) context = NULL;
 
   if ((err = gpgme_new (&context)) != GPG_ERR_NO_ERROR)
     {
diff --git a/src/libotutil/ot-gpg-utils.h b/src/libotutil/ot-gpg-utils.h
index 184a8d64..9545e14b 100644
--- a/src/libotutil/ot-gpg-utils.h
+++ b/src/libotutil/ot-gpg-utils.h
@@ -26,10 +26,8 @@
 
 G_BEGIN_DECLS
 
-GLNX_DEFINE_CLEANUP_FUNCTION0(gpgme_data_t, ot_cleanup_gpgme_data, gpgme_data_release)
-#define ot_auto_gpgme_data __attribute__((cleanup(ot_cleanup_gpgme_data)))
-GLNX_DEFINE_CLEANUP_FUNCTION0(gpgme_ctx_t, ot_cleanup_gpgme_ctx, gpgme_release)
-#define ot_auto_gpgme_ctx __attribute__((cleanup(ot_cleanup_gpgme_ctx)))
+G_DEFINE_AUTO_CLEANUP_FREE_FUNC(gpgme_data_t, gpgme_data_release, NULL);
+G_DEFINE_AUTO_CLEANUP_FREE_FUNC(gpgme_ctx_t, gpgme_release, NULL);
 
 void ot_gpgme_error_to_gio_error (gpgme_error_t gpg_error, GError **error);