diff --git a/Makefile-rpm-ostree.am b/Makefile-rpm-ostree.am
index 25c324c3..9f4b91c3 100644
--- a/Makefile-rpm-ostree.am
+++ b/Makefile-rpm-ostree.am
@@ -67,7 +67,7 @@ rpm_ostree_SOURCES = src/app/main.cxx \
 if BUILDOPT_ROJIG
 rpm_ostree_SOURCES += \
 	src/app/rpmostree-ex-builtin-commit2rojig.cxx \
-	src/app/rpmostree-ex-builtin-rojig2commit.c \
+	src/app/rpmostree-ex-builtin-rojig2commit.cxx \
 	src/app/rpmostree-compose-builtin-rojig.c \
 	$(NULL)
 endif
diff --git a/src/app/rpmostree-ex-builtin-rojig2commit.c b/src/app/rpmostree-ex-builtin-rojig2commit.cxx
similarity index 99%
rename from src/app/rpmostree-ex-builtin-rojig2commit.c
rename to src/app/rpmostree-ex-builtin-rojig2commit.cxx
index 4a8ab1f1..7b232abb 100644
--- a/src/app/rpmostree-ex-builtin-rojig2commit.c
+++ b/src/app/rpmostree-ex-builtin-rojig2commit.cxx
@@ -97,7 +97,7 @@ rpm_ostree_rojig2commit_context_new (RpmOstreeRojig2CommitContext **out_context,
   if (opt_rpmmd_reposdir)
     dnf_context_set_repo_dir (dnfctx, opt_rpmmd_reposdir);
 
-  *out_context = g_steal_pointer (&self);
+  *out_context = util::move_nullify (self);
   return TRUE;
 }