diff --git a/src/cairo-debug.c b/src/cairo-debug.c
index 3fe6cae01..5100a855d 100644
--- a/src/cairo-debug.c
+++ b/src/cairo-debug.c
@@ -61,6 +61,8 @@ cairo_debug_reset_static_data (void)
 {
     CAIRO_MUTEX_INITIALIZE ();
 
+    _cairo_scaled_font_map_destroy ();
+
     _cairo_toy_font_face_reset_static_data ();
 
 #if CAIRO_HAS_FT_FONT
diff --git a/src/cairo-scaled-font.c b/src/cairo-scaled-font.c
index 8df6d91ac..8ffbcb494 100644
--- a/src/cairo-scaled-font.c
+++ b/src/cairo-scaled-font.c
@@ -352,7 +352,7 @@ _cairo_scaled_font_map_unlock (void)
    CAIRO_MUTEX_UNLOCK (_cairo_scaled_font_map_mutex);
 }
 
-static void
+void
 _cairo_scaled_font_map_destroy (void)
 {
     cairo_scaled_font_map_t *font_map;
@@ -957,8 +957,6 @@ _cairo_scaled_font_reset_static_data (void)
 {
     int status;
 
-    _cairo_scaled_font_map_destroy ();
-
     CAIRO_MUTEX_LOCK (_cairo_scaled_font_error_mutex);
     for (status = CAIRO_STATUS_SUCCESS;
 	 status <= CAIRO_STATUS_LAST_STATUS;
diff --git a/src/cairoint.h b/src/cairoint.h
index 882cfe493..f72c5cc61 100644
--- a/src/cairoint.h
+++ b/src/cairoint.h
@@ -1706,6 +1706,9 @@ _cairo_scaled_glyph_lookup (cairo_scaled_font_t *scaled_font,
 cairo_private double
 _cairo_scaled_font_get_max_scale (cairo_scaled_font_t *scaled_font);
 
+cairo_private void
+_cairo_scaled_font_map_destroy (void);
+
 /* cairo-stroke-style.c */
 
 cairo_private void