diff --git a/src/hb-ft.cc b/src/hb-ft.cc
index c58cd87c2eff3d0fe9bec520178263f2f5b3a9ce..5ac9a3e93c4c917c564327b1b9558a3c21e184a2 100644
--- a/src/hb-ft.cc
+++ b/src/hb-ft.cc
@@ -454,7 +454,7 @@ static struct hb_ft_font_funcs_lazy_loader_t : hb_font_funcs_lazy_loader_t<hb_ft
 static
 void free_static_ft_funcs (void)
 {
-  static_ft_funcs.fini ();
+  static_ft_funcs.free ();
 }
 #endif
 
diff --git a/src/hb-glib.cc b/src/hb-glib.cc
index a5a82d47f62be121b879a478d497f47ae58794c9..6ce9a3512b4881ac8e1a7c06737e18049fc4e707 100644
--- a/src/hb-glib.cc
+++ b/src/hb-glib.cc
@@ -394,7 +394,7 @@ static struct hb_glib_unicode_funcs_lazy_loader_t : hb_unicode_funcs_lazy_loader
 static
 void free_static_glib_funcs (void)
 {
-  static_glib_funcs.fini ();
+  static_glib_funcs.free ();
 }
 #endif
 
diff --git a/src/hb-icu.cc b/src/hb-icu.cc
index 99e3d2cb0c7afb35b039f9fbcb1f9fa2036b1b5c..0442d92a1be07a15da04bdaa8436499fa7aa1baf 100644
--- a/src/hb-icu.cc
+++ b/src/hb-icu.cc
@@ -373,7 +373,7 @@ static struct hb_icu_unicode_funcs_lazy_loader_t : hb_unicode_funcs_lazy_loader_
 static
 void free_static_icu_funcs (void)
 {
-  static_icu_funcs.fini ();
+  static_icu_funcs.free ();
 }
 #endif
 
diff --git a/src/hb-machinery-private.hh b/src/hb-machinery-private.hh
index b26ca710e651e1012263aad32658a5d5189ae320..6221fe59c6eed2c5618f50bf5e4b7f888ac30028 100644
--- a/src/hb-machinery-private.hh
+++ b/src/hb-machinery-private.hh
@@ -627,6 +627,10 @@ struct hb_lazy_loader_t : hb_data_wrapper_t<Data, WheresData>
   inline void init0 (void) {} /* Init, when memory is already set to 0. No-op for us. */
   inline void init (void) { instance.set_relaxed (nullptr); }
   inline void fini (void)
+  {
+    do_destroy (instance.get ());
+  }
+  inline void free (void)
   {
   retry:
     Stored *p = instance.get ();
diff --git a/src/hb-ot-font.cc b/src/hb-ot-font.cc
index 1fb18c4873fd452861ffc007ebb50cf73c12e2f7..f181b0762ae5ec61c3e27e39a339a7b326d1173d 100644
--- a/src/hb-ot-font.cc
+++ b/src/hb-ot-font.cc
@@ -264,7 +264,7 @@ static struct hb_ot_font_funcs_lazy_loader_t : hb_font_funcs_lazy_loader_t<hb_ot
 static
 void free_static_ot_funcs (void)
 {
-  static_ot_funcs.fini ();
+  static_ot_funcs.free ();
 }
 #endif
 
diff --git a/src/hb-ucdn.cc b/src/hb-ucdn.cc
index c58db05a79050942ef864e1b700929689b950608..1945a1cff9a88c31e7e3def4900c487a8c913c3e 100644
--- a/src/hb-ucdn.cc
+++ b/src/hb-ucdn.cc
@@ -267,7 +267,7 @@ static struct hb_ucdn_unicode_funcs_lazy_loader_t : hb_unicode_funcs_lazy_loader
 static
 void free_static_ucdn_funcs (void)
 {
-  static_ucdn_funcs.fini ();
+  static_ucdn_funcs.free ();
 }
 #endif