diff --git a/legacy/evas/src/lib/engines/common/evas_font_ot.c b/legacy/evas/src/lib/engines/common/evas_font_ot.c
index 54812a383a..5f37ffed6a 100644
--- a/legacy/evas/src/lib/engines/common/evas_font_ot.c
+++ b/legacy/evas/src/lib/engines/common/evas_font_ot.c
@@ -263,7 +263,7 @@ _evas_common_font_ot_hb_get_kerning(hb_font_t *font, hb_face_t *face,
 
 /* End of harfbuzz font funcs */
 
-static hb_font_funcs_t *
+static inline hb_font_funcs_t *
 _evas_common_font_ot_font_funcs_get(void)
 {
    static hb_font_funcs_t *font_funcs = NULL;
@@ -286,6 +286,18 @@ _evas_common_font_ot_font_funcs_get(void)
    return font_funcs;
 }
 
+static inline hb_unicode_funcs_t *
+_evas_common_font_ot_unicode_funcs_get(void)
+{
+   static hb_unicode_funcs_t *unicode_funcs = NULL;
+   if (!unicode_funcs)
+     {
+        unicode_funcs = hb_unicode_funcs_get_default();
+     }
+
+   return unicode_funcs;
+}
+
 static void
 _evas_common_font_ot_shape(hb_buffer_t *buffer, RGBA_Font_Int *fi)
 {
@@ -345,7 +357,7 @@ evas_common_font_ot_populate_text_props(void *_fn, const Eina_Unicode *text,
      }
 
    buffer = hb_buffer_create(slen);
-   hb_buffer_set_unicode_funcs(buffer, evas_common_language_unicode_funcs_get());
+   hb_buffer_set_unicode_funcs(buffer, _evas_common_font_ot_unicode_funcs_get());
    hb_buffer_set_language(buffer, hb_language_from_string(
             evas_common_language_from_locale_get()));
    hb_buffer_set_script(buffer, _evas_script_to_harfbuzz[props->script]);
diff --git a/legacy/evas/src/lib/engines/common/language/evas_language_utils.c b/legacy/evas/src/lib/engines/common/language/evas_language_utils.c
index 7c7855da1a..bf48be27e7 100644
--- a/legacy/evas/src/lib/engines/common/language/evas_language_utils.c
+++ b/legacy/evas/src/lib/engines/common/language/evas_language_utils.c
@@ -25,16 +25,6 @@
 
 #include "evas_script_table.h"
 
-/* FIXME: rename and move */
-void *
-evas_common_language_unicode_funcs_get(void)
-{
-#if defined(USE_HARFBUZZ)
-   return hb_unicode_funcs_get_default();
-#endif
-   return NULL;
-}
-
 static Evas_Script_Type
 _evas_common_language_char_script_search(Eina_Unicode unicode)
 {
diff --git a/legacy/evas/src/lib/engines/common/language/evas_language_utils.h b/legacy/evas/src/lib/engines/common/language/evas_language_utils.h
index 2f0ff6b324..fa795eca43 100644
--- a/legacy/evas/src/lib/engines/common/language/evas_language_utils.h
+++ b/legacy/evas/src/lib/engines/common/language/evas_language_utils.h
@@ -128,8 +128,5 @@ evas_common_language_char_script_get(Eina_Unicode unicode);
 
 const char *
 evas_common_language_from_locale_get(void);
-
-void *
-evas_common_language_unicode_funcs_get(void);
 #endif