diff --git a/configure.ac b/configure.ac
index 83b8f48f..7fac081b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,6 @@ CC_CHECK_FLAGS_APPEND([WARN_CFLAGS], [CFLAGS], [\
         -Werror=incompatible-pointer-types \
         -Werror=misleading-indentation \
 	-Werror=missing-include-dirs -Werror=aggregate-return \
-	-Werror=declaration-after-statement \
 ])
 AC_SUBST(WARN_CFLAGS)
 
diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index dc0eb575..71604480 100644
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -4309,16 +4309,14 @@ find_keyring (OstreeRepo          *self,
               OstreeRemote        *remote,
               GCancellable        *cancellable)
 {
-  g_autoptr(GFile) remotes_d = NULL;
-  g_autoptr(GFile) file = NULL;
-  file = g_file_get_child (self->repodir, remote->keyring);
+  g_autoptr(GFile) file = g_file_get_child (self->repodir, remote->keyring);
 
   if (g_file_query_exists (file, cancellable))
     {
       return g_steal_pointer (&file);
     }
 
-  remotes_d = get_remotes_d_dir (self);
+  g_autoptr(GFile) remotes_d = get_remotes_d_dir (self);
   if (remotes_d)
     {
       g_autoptr(GFile) file2 = g_file_get_child (remotes_d, remote->keyring);