diff --git a/Makefile-libpriv.am b/Makefile-libpriv.am
index 6267928f..b3d54f50 100644
--- a/Makefile-libpriv.am
+++ b/Makefile-libpriv.am
@@ -44,7 +44,7 @@ librpmostreepriv_sources = \
 	src/libpriv/rpmostree-rpm-util.h \
 	src/libpriv/rpmostree-importer.c \
 	src/libpriv/rpmostree-importer.h \
-	src/libpriv/rpmostree-unpacker-core.c \
+	src/libpriv/rpmostree-unpacker-core.cxx \
 	src/libpriv/rpmostree-unpacker-core.h \
 	src/libpriv/rpmostree-output.cxx \
 	src/libpriv/rpmostree-output.h \
diff --git a/src/libpriv/rpmostree-unpacker-core.c b/src/libpriv/rpmostree-unpacker-core.cxx
similarity index 98%
rename from src/libpriv/rpmostree-unpacker-core.c
rename to src/libpriv/rpmostree-unpacker-core.cxx
index 060eb0ba..753fcd9c 100644
--- a/src/libpriv/rpmostree-unpacker-core.c
+++ b/src/libpriv/rpmostree-unpacker-core.cxx
@@ -99,7 +99,7 @@ rpmostree_unpack_rpm2cpio (int fd, GError **error)
   success = TRUE;
  out:
   if (success)
-    return g_steal_pointer (&ret);
+    return util::move_nullify (ret);
   else
     {
       if (ret)