diff --git a/Makefile-rpm-ostree.am b/Makefile-rpm-ostree.am
index 282ea013..217748b5 100644
--- a/Makefile-rpm-ostree.am
+++ b/Makefile-rpm-ostree.am
@@ -28,7 +28,7 @@ rpm_ostree_SOURCES = src/app/main.cxx \
 	src/app/rpmostree-builtin-rebase.cxx \
 	src/app/rpmostree-builtin-cancel.cxx \
 	src/app/rpmostree-builtin-cliwrap.cxx \
-	src/app/rpmostree-builtin-cleanup.c \
+	src/app/rpmostree-builtin-cleanup.cxx \
 	src/app/rpmostree-builtin-initramfs.c \
 	src/app/rpmostree-builtin-initramfs-etc.c \
 	src/app/rpmostree-builtin-livefs.cxx \
diff --git a/src/app/rpmostree-builtin-cleanup.c b/src/app/rpmostree-builtin-cleanup.cxx
similarity index 94%
rename from src/app/rpmostree-builtin-cleanup.c
rename to src/app/rpmostree-builtin-cleanup.cxx
index 1bd78291..59f08324 100644
--- a/src/app/rpmostree-builtin-cleanup.c
+++ b/src/app/rpmostree-builtin-cleanup.cxx
@@ -78,13 +78,13 @@ rpmostree_builtin_cleanup (int             argc,
     }
 
   if (opt_base)
-    g_ptr_array_add (cleanup_types, "base");
+    g_ptr_array_add (cleanup_types, (char*)"base");
   if (opt_pending)
-    g_ptr_array_add (cleanup_types, "pending-deploy");
+    g_ptr_array_add (cleanup_types, (char*)"pending-deploy");
   if (opt_rollback)
-    g_ptr_array_add (cleanup_types, "rollback-deploy");
+    g_ptr_array_add (cleanup_types, (char*)"rollback-deploy");
   if (opt_repomd)
-    g_ptr_array_add (cleanup_types, "repomd");
+    g_ptr_array_add (cleanup_types, (char*)"repomd");
   if (cleanup_types->len == 0)
     {
       glnx_throw (error, "At least one cleanup option must be specified");