diff --git a/src/test-buffer-serialize.cc b/src/test-buffer-serialize.cc
index 827b0513b..2287b9406 100644
--- a/src/test-buffer-serialize.cc
+++ b/src/test-buffer-serialize.cc
@@ -61,7 +61,7 @@ main (int argc, char **argv)
     GMappedFile *mf = g_mapped_file_new (argv[1], false, NULL);
     font_data = g_mapped_file_get_contents (mf);
     len = g_mapped_file_get_length (mf);
-    destroy = (hb_destroy_func_t) g_mapped_file_unref;
+    destroy = (hb_destroy_func_t) g_mapped_file_free;
     user_data = (void *) mf;
     mm = HB_MEMORY_MODE_READONLY_MAY_MAKE_WRITABLE;
 #else
diff --git a/src/test-size-params.cc b/src/test-size-params.cc
index 947b5669a..7463599a1 100644
--- a/src/test-size-params.cc
+++ b/src/test-size-params.cc
@@ -59,7 +59,7 @@ main (int argc, char **argv)
     GMappedFile *mf = g_mapped_file_new (argv[1], false, NULL);
     font_data = g_mapped_file_get_contents (mf);
     len = g_mapped_file_get_length (mf);
-    destroy = (hb_destroy_func_t) g_mapped_file_unref;
+    destroy = (hb_destroy_func_t) g_mapped_file_free;
     user_data = (void *) mf;
     mm = HB_MEMORY_MODE_READONLY_MAY_MAKE_WRITABLE;
 #else
diff --git a/src/test-would-substitute.cc b/src/test-would-substitute.cc
index 4731e2656..6864c223e 100644
--- a/src/test-would-substitute.cc
+++ b/src/test-would-substitute.cc
@@ -63,7 +63,7 @@ main (int argc, char **argv)
     GMappedFile *mf = g_mapped_file_new (argv[1], false, NULL);
     font_data = g_mapped_file_get_contents (mf);
     len = g_mapped_file_get_length (mf);
-    destroy = (hb_destroy_func_t) g_mapped_file_unref;
+    destroy = (hb_destroy_func_t) g_mapped_file_free;
     user_data = (void *) mf;
     mm = HB_MEMORY_MODE_READONLY_MAY_MAKE_WRITABLE;
 #else
diff --git a/src/test.cc b/src/test.cc
index 1acb6ead7..0546fb766 100644
--- a/src/test.cc
+++ b/src/test.cc
@@ -62,7 +62,7 @@ main (int argc, char **argv)
     GMappedFile *mf = g_mapped_file_new (argv[1], false, NULL);
     font_data = g_mapped_file_get_contents (mf);
     len = g_mapped_file_get_length (mf);
-    destroy = (hb_destroy_func_t) g_mapped_file_unref;
+    destroy = (hb_destroy_func_t) g_mapped_file_free;
     user_data = (void *) mf;
     mm = HB_MEMORY_MODE_READONLY_MAY_MAKE_WRITABLE;
 #else
diff --git a/util/options.cc b/util/options.cc
index 66b5e151c..aa969a69f 100644
--- a/util/options.cc
+++ b/util/options.cc
@@ -436,11 +436,11 @@ font_options_t::get_font (void) const
 	font_data = g_mapped_file_get_contents (mf);
 	len = g_mapped_file_get_length (mf);
 	if (len) {
-	  destroy = (hb_destroy_func_t) g_mapped_file_unref;
+	  destroy = (hb_destroy_func_t) g_mapped_file_free;
 	  user_data = (void *) mf;
 	  mm = HB_MEMORY_MODE_READONLY_MAY_MAKE_WRITABLE;
 	} else
-	  g_mapped_file_unref (mf);
+	  g_mapped_file_free (mf);
       } else {
 	fail (false, "%s", error->message);
 	//g_error_free (error);