diff --git a/intl/msg_hash_ar.c b/intl/msg_hash_ar.c
index 028fd0d0b7..06a2b0ddc7 100644
--- a/intl/msg_hash_ar.c
+++ b/intl/msg_hash_ar.c
@@ -33,7 +33,7 @@
 #pragma warning(disable:4566)
 #endif
 
-int menu_hash_get_help_ar_enum(enum msg_hash_enums msg, char *s, size_t len)
+int msg_hash_get_help_ar_enum(enum msg_hash_enums msg, char *s, size_t len)
 {
     settings_t *settings = config_get_ptr();
 
diff --git a/intl/msg_hash_ast.c b/intl/msg_hash_ast.c
index f7935a6a53..e82db85a69 100644
--- a/intl/msg_hash_ast.c
+++ b/intl/msg_hash_ast.c
@@ -25,7 +25,7 @@
 #pragma warning(disable:4566)
 #endif
 
-int menu_hash_get_help_ast_enum(enum msg_hash_enums msg, char *s, size_t len)
+int msg_hash_get_help_ast_enum(enum msg_hash_enums msg, char *s, size_t len)
 {
    int ret = 0;
 
diff --git a/intl/msg_hash_chs.c b/intl/msg_hash_chs.c
index fc40f16f21..afa21e3758 100644
--- a/intl/msg_hash_chs.c
+++ b/intl/msg_hash_chs.c
@@ -32,7 +32,7 @@
 #pragma warning(disable:4566)
 #endif
 
-int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len)
+int msg_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len)
 {
    settings_t      *settings = config_get_ptr();
 
diff --git a/intl/msg_hash_cht.c b/intl/msg_hash_cht.c
index 93317531ba..9e1fd3b895 100644
--- a/intl/msg_hash_cht.c
+++ b/intl/msg_hash_cht.c
@@ -32,7 +32,7 @@
 #pragma warning(disable:4566)
 #endif
 
-int menu_hash_get_help_cht_enum(enum msg_hash_enums msg, char *s, size_t len)
+int msg_hash_get_help_cht_enum(enum msg_hash_enums msg, char *s, size_t len)
 {
    settings_t      *settings = config_get_ptr();
 
diff --git a/intl/msg_hash_de.c b/intl/msg_hash_de.c
index 3da859ca4f..d157ef8914 100644
--- a/intl/msg_hash_de.c
+++ b/intl/msg_hash_de.c
@@ -34,7 +34,7 @@
 #pragma warning(disable:4566)
 #endif
 
-int menu_hash_get_help_de_enum(enum msg_hash_enums msg, char *s, size_t len)
+int msg_hash_get_help_de_enum(enum msg_hash_enums msg, char *s, size_t len)
 {
    settings_t *settings = config_get_ptr();
 
diff --git a/intl/msg_hash_el.c b/intl/msg_hash_el.c
index 73d86ad189..400959a646 100644
--- a/intl/msg_hash_el.c
+++ b/intl/msg_hash_el.c
@@ -35,7 +35,7 @@
 #pragma warning(disable:4566)
 #endif
 
-int menu_hash_get_help_el_enum(enum msg_hash_enums msg, char *s, size_t len)
+int msg_hash_get_help_el_enum(enum msg_hash_enums msg, char *s, size_t len)
 {
     settings_t *settings = config_get_ptr();
 
diff --git a/intl/msg_hash_eo.c b/intl/msg_hash_eo.c
index 445ab74c2d..9b0d983a3a 100644
--- a/intl/msg_hash_eo.c
+++ b/intl/msg_hash_eo.c
@@ -30,7 +30,7 @@
 #pragma warning(disable:4566)
 #endif
 
-int menu_hash_get_help_eo_enum(enum msg_hash_enums msg, char *s, size_t len)
+int msg_hash_get_help_eo_enum(enum msg_hash_enums msg, char *s, size_t len)
 {
    switch (msg)
    {
diff --git a/intl/msg_hash_es.c b/intl/msg_hash_es.c
index 710c18b9e2..4c9013e053 100644
--- a/intl/msg_hash_es.c
+++ b/intl/msg_hash_es.c
@@ -44,7 +44,7 @@
 #pragma warning(disable:4566)
 #endif
 
-int menu_hash_get_help_es_enum(enum msg_hash_enums msg, char *s, size_t len)
+int msg_hash_get_help_es_enum(enum msg_hash_enums msg, char *s, size_t len)
 {
     settings_t *settings = config_get_ptr();
 
diff --git a/intl/msg_hash_fa.c b/intl/msg_hash_fa.c
index 0a3f6ee6f9..b04335f8ec 100644
--- a/intl/msg_hash_fa.c
+++ b/intl/msg_hash_fa.c
@@ -25,7 +25,7 @@
 #pragma warning(disable:4566)
 #endif
 
-int menu_hash_get_help_fa_enum(enum msg_hash_enums msg, char *s, size_t len)
+int msg_hash_get_help_fa_enum(enum msg_hash_enums msg, char *s, size_t len)
 {
    int ret = 0;
 
diff --git a/intl/msg_hash_fr.c b/intl/msg_hash_fr.c
index ad14ff125e..5adc7aec6d 100644
--- a/intl/msg_hash_fr.c
+++ b/intl/msg_hash_fr.c
@@ -37,7 +37,7 @@
 #pragma warning(disable:4566)
 #endif
 
-int menu_hash_get_help_fr_enum(enum msg_hash_enums msg, char *s, size_t len)
+int msg_hash_get_help_fr_enum(enum msg_hash_enums msg, char *s, size_t len)
 {
     settings_t *settings = config_get_ptr();
 
diff --git a/intl/msg_hash_he.c b/intl/msg_hash_he.c
index 6f062dc104..e3e52874da 100644
--- a/intl/msg_hash_he.c
+++ b/intl/msg_hash_he.c
@@ -25,7 +25,7 @@
 #pragma warning(disable:4566)
 #endif
 
-int menu_hash_get_help_he_enum(enum msg_hash_enums msg, char *s, size_t len)
+int msg_hash_get_help_he_enum(enum msg_hash_enums msg, char *s, size_t len)
 {
    int ret = 0;
 
diff --git a/intl/msg_hash_it.c b/intl/msg_hash_it.c
index ff314dd0e6..bf9bccaf64 100644
--- a/intl/msg_hash_it.c
+++ b/intl/msg_hash_it.c
@@ -31,7 +31,7 @@
 #pragma warning(disable:4566)
 #endif
 
-int menu_hash_get_help_it_enum(enum msg_hash_enums msg, char *s, size_t len)
+int msg_hash_get_help_it_enum(enum msg_hash_enums msg, char *s, size_t len)
 {
    settings_t      *settings = config_get_ptr();
 
diff --git a/intl/msg_hash_ja.c b/intl/msg_hash_ja.c
index e09391a5ee..5763d40b80 100644
--- a/intl/msg_hash_ja.c
+++ b/intl/msg_hash_ja.c
@@ -35,7 +35,7 @@
 #ifdef RARCH_INTERNAL
 #include "../configuration.h"
 
-int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len)
+int msg_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len)
 {
    settings_t *settings = config_get_ptr();
 
diff --git a/intl/msg_hash_ko.c b/intl/msg_hash_ko.c
index c99e31fc63..9dabb59c81 100644
--- a/intl/msg_hash_ko.c
+++ b/intl/msg_hash_ko.c
@@ -35,7 +35,7 @@
 #pragma warning(disable:4566)
 #endif
 
-int menu_hash_get_help_ko_enum(enum msg_hash_enums msg, char *s, size_t len)
+int msg_hash_get_help_ko_enum(enum msg_hash_enums msg, char *s, size_t len)
 {
     settings_t *settings = config_get_ptr();
 
diff --git a/intl/msg_hash_nl.c b/intl/msg_hash_nl.c
index 2ad85b0cdd..2e7e4387bd 100644
--- a/intl/msg_hash_nl.c
+++ b/intl/msg_hash_nl.c
@@ -29,7 +29,7 @@
 #pragma warning(disable:4566)
 #endif
 
-int menu_hash_get_help_nl_enum(enum msg_hash_enums msg, char *s, size_t len)
+int msg_hash_get_help_nl_enum(enum msg_hash_enums msg, char *s, size_t len)
 {
    int ret = 0;
 
diff --git a/intl/msg_hash_pl.c b/intl/msg_hash_pl.c
index 4f2ca4a1fe..70108000d8 100644
--- a/intl/msg_hash_pl.c
+++ b/intl/msg_hash_pl.c
@@ -25,7 +25,7 @@
 #pragma warning(disable:4566)
 #endif
 
-int menu_hash_get_help_pl_enum(enum msg_hash_enums msg, char *s, size_t len)
+int msg_hash_get_help_pl_enum(enum msg_hash_enums msg, char *s, size_t len)
 {
    int ret = 0;
 
diff --git a/intl/msg_hash_pt_br.c b/intl/msg_hash_pt_br.c
index 5af79d77f5..8c3e6420fc 100644
--- a/intl/msg_hash_pt_br.c
+++ b/intl/msg_hash_pt_br.c
@@ -35,7 +35,7 @@
 #pragma warning(disable:4566)
 #endif
 
-int menu_hash_get_help_pt_br_enum(enum msg_hash_enums msg, char *s, size_t len)
+int msg_hash_get_help_pt_br_enum(enum msg_hash_enums msg, char *s, size_t len)
 {
     settings_t *settings = config_get_ptr();
 
diff --git a/intl/msg_hash_pt_pt.c b/intl/msg_hash_pt_pt.c
index 37dddeb42b..f3346f9f0d 100644
--- a/intl/msg_hash_pt_pt.c
+++ b/intl/msg_hash_pt_pt.c
@@ -31,7 +31,7 @@
 #pragma warning(disable:4566)
 #endif
 
-int menu_hash_get_help_pt_pt_enum(enum msg_hash_enums msg, char *s, size_t len)
+int msg_hash_get_help_pt_pt_enum(enum msg_hash_enums msg, char *s, size_t len)
 {
    settings_t      *settings = config_get_ptr();
 
diff --git a/intl/msg_hash_sk.c b/intl/msg_hash_sk.c
index cb0fb90621..b9ec2f83f3 100644
--- a/intl/msg_hash_sk.c
+++ b/intl/msg_hash_sk.c
@@ -25,7 +25,7 @@
 #pragma warning(disable:4566)
 #endif
 
-int menu_hash_get_help_sk_enum(enum msg_hash_enums msg, char *s, size_t len)
+int msg_hash_get_help_sk_enum(enum msg_hash_enums msg, char *s, size_t len)
 {
    int ret = 0;
 
diff --git a/intl/msg_hash_tr.c b/intl/msg_hash_tr.c
index 851fc295f7..778cf44890 100644
--- a/intl/msg_hash_tr.c
+++ b/intl/msg_hash_tr.c
@@ -35,7 +35,7 @@
 #pragma warning(disable:4566)
 #endif
 
-int menu_hash_get_help_tr_enum(enum msg_hash_enums msg, char *s, size_t len)
+int msg_hash_get_help_tr_enum(enum msg_hash_enums msg, char *s, size_t len)
 {
     settings_t *settings = config_get_ptr();
 
diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c
index 3ac2835683..4aba897a6f 100644
--- a/intl/msg_hash_us.c
+++ b/intl/msg_hash_us.c
@@ -27,7 +27,7 @@
 #ifdef RARCH_INTERNAL
 #include "../configuration.h"
 
-int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len)
+int msg_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len)
 {
     settings_t *settings = config_get_ptr();
 
diff --git a/intl/msg_hash_vn.c b/intl/msg_hash_vn.c
index a840f09e1a..c77c6cbdea 100644
--- a/intl/msg_hash_vn.c
+++ b/intl/msg_hash_vn.c
@@ -33,7 +33,7 @@
 #pragma warning(disable:4566)
 #endif
 
-int menu_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len)
+int msg_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len)
 {
    settings_t      *settings = config_get_ptr();
 
diff --git a/menu/widgets/menu_dialog.c b/menu/widgets/menu_dialog.c
index 3245a2b4c0..193e4f255e 100644
--- a/menu/widgets/menu_dialog.c
+++ b/menu/widgets/menu_dialog.c
@@ -36,22 +36,6 @@
 #include "../../input/input_driver.h"
 #include "../../performance_counters.h"
 
-struct menu_dialog
-{
-   bool                  pending_push;
-   unsigned              current_id;
-   enum menu_dialog_type current_type;
-};
-
-typedef struct menu_dialog menu_dialog_t;
-
-static menu_dialog_t *dialog_get_ptr(void)
-{
-   /* TODO/FIXME - static public global variables */
-   static menu_dialog_t dialog;
-   return &dialog;
-}
-
 int menu_dialog_iterate(char *s, size_t len,
       retro_time_t current_time)
 {
@@ -73,7 +57,7 @@ int menu_dialog_iterate(char *s, size_t len,
 
             rarch_timer_tick(&timer, current_time);
 
-            menu_hash_get_help_enum(
+            msg_hash_get_help_enum(
                   MENU_ENUM_LABEL_WELCOME_TO_RETROARCH,
                   s, len);
 
@@ -119,7 +103,8 @@ int menu_dialog_iterate(char *s, size_t len,
 
             s2[0] = '\0';
 
-            menu_hash_get_help_enum(MENU_ENUM_LABEL_VALUE_MENU_ENUM_CONTROLS_PROLOG,
+            msg_hash_get_help_enum(
+                  MENU_ENUM_LABEL_VALUE_MENU_ENUM_CONTROLS_PROLOG,
                   s2, sizeof(s2));
 
             snprintf(s, len,
@@ -198,30 +183,30 @@ int menu_dialog_iterate(char *s, size_t len,
 #endif
 
       case MENU_DIALOG_HELP_WHAT_IS_A_CORE:
-         menu_hash_get_help_enum(MENU_ENUM_LABEL_VALUE_WHAT_IS_A_CORE_DESC,
+         msg_hash_get_help_enum(MENU_ENUM_LABEL_VALUE_WHAT_IS_A_CORE_DESC,
                s, len);
          break;
       case MENU_DIALOG_HELP_LOADING_CONTENT:
-         menu_hash_get_help_enum(MENU_ENUM_LABEL_LOAD_CONTENT_LIST,
+         msg_hash_get_help_enum(MENU_ENUM_LABEL_LOAD_CONTENT_LIST,
                s, len);
          break;
       case MENU_DIALOG_HELP_CHANGE_VIRTUAL_GAMEPAD:
-         menu_hash_get_help_enum(
+         msg_hash_get_help_enum(
                MENU_ENUM_LABEL_VALUE_HELP_CHANGE_VIRTUAL_GAMEPAD_DESC,
                s, len);
          break;
       case MENU_DIALOG_HELP_AUDIO_VIDEO_TROUBLESHOOTING:
-         menu_hash_get_help_enum(
+         msg_hash_get_help_enum(
                MENU_ENUM_LABEL_VALUE_HELP_AUDIO_VIDEO_TROUBLESHOOTING_DESC,
                s, len);
          break;
       case MENU_DIALOG_HELP_SEND_DEBUG_INFO:
-         menu_hash_get_help_enum(
+         msg_hash_get_help_enum(
                MENU_ENUM_LABEL_VALUE_HELP_SEND_DEBUG_INFO_DESC,
                s, len);
          break;
       case MENU_DIALOG_HELP_SCANNING_CONTENT:
-         menu_hash_get_help_enum(MENU_ENUM_LABEL_VALUE_HELP_SCANNING_CONTENT_DESC,
+         msg_hash_get_help_enum(MENU_ENUM_LABEL_VALUE_HELP_SCANNING_CONTENT_DESC,
                s, len);
          break;
       case MENU_DIALOG_HELP_EXTRACT:
@@ -229,7 +214,7 @@ int menu_dialog_iterate(char *s, size_t len,
             settings_t *settings      = config_get_ptr();
             bool bundle_finished      = settings->bools.bundle_finished;
 
-            menu_hash_get_help_enum(
+            msg_hash_get_help_enum(
                   MENU_ENUM_LABEL_VALUE_EXTRACTING_PLEASE_WAIT,
                   s, len);
 
@@ -247,7 +232,7 @@ int menu_dialog_iterate(char *s, size_t len,
       case MENU_DIALOG_QUESTION:
       case MENU_DIALOG_WARNING:
       case MENU_DIALOG_ERROR:
-         menu_hash_get_help_enum(MSG_UNKNOWN,
+         msg_hash_get_help_enum(MSG_UNKNOWN,
                s, len);
          break;
       case MENU_DIALOG_NONE:
diff --git a/menu/widgets/menu_dialog.h b/menu/widgets/menu_dialog.h
index 0ce8c588ec..41e701c6e1 100644
--- a/menu/widgets/menu_dialog.h
+++ b/menu/widgets/menu_dialog.h
@@ -48,8 +48,19 @@ enum menu_dialog_type
    MENU_DIALOG_LAST
 };
 
+struct menu_dialog
+{
+   bool                  pending_push;
+   unsigned              current_id;
+   enum menu_dialog_type current_type;
+};
+
+typedef struct menu_dialog menu_dialog_t;
+
 RETRO_BEGIN_DECLS
 
+menu_dialog_t *dialog_get_ptr(void);
+
 bool menu_dialog_push_pending(
       bool push, enum menu_dialog_type type);
 
diff --git a/msg_hash.c b/msg_hash.c
index 6b5e94145e..a625e7dac6 100644
--- a/msg_hash.c
+++ b/msg_hash.c
@@ -30,76 +30,75 @@
 /* TODO/FIXME - static public global variable */
 static unsigned uint_user_language;
 
-int menu_hash_get_help_enum(enum msg_hash_enums msg, char *s, size_t len)
+int msg_hash_get_help_enum(enum msg_hash_enums msg, char *s, size_t len)
 {
-#ifdef HAVE_MENU
    int ret = -1;
 
 #ifdef HAVE_LANGEXTRA
    switch (uint_user_language)
    {
       case RETRO_LANGUAGE_FRENCH:
-         ret = menu_hash_get_help_fr_enum(msg, s, len);
+         ret = msg_hash_get_help_fr_enum(msg, s, len);
          break;
       case RETRO_LANGUAGE_GERMAN:
-         ret = menu_hash_get_help_de_enum(msg, s, len);
+         ret = msg_hash_get_help_de_enum(msg, s, len);
          break;
       case RETRO_LANGUAGE_SPANISH:
-         ret = menu_hash_get_help_es_enum(msg, s, len);
+         ret = msg_hash_get_help_es_enum(msg, s, len);
          break;
       case RETRO_LANGUAGE_ITALIAN:
-         ret = menu_hash_get_help_it_enum(msg, s, len);
+         ret = msg_hash_get_help_it_enum(msg, s, len);
          break;
       case RETRO_LANGUAGE_PORTUGUESE_BRAZIL:
-         ret = menu_hash_get_help_pt_br_enum(msg, s, len);
+         ret = msg_hash_get_help_pt_br_enum(msg, s, len);
          break;
       case RETRO_LANGUAGE_PORTUGUESE_PORTUGAL:
-         ret = menu_hash_get_help_pt_pt_enum(msg, s, len);
+         ret = msg_hash_get_help_pt_pt_enum(msg, s, len);
          break;
       case RETRO_LANGUAGE_DUTCH:
-         ret = menu_hash_get_help_nl_enum(msg, s, len);
+         ret = msg_hash_get_help_nl_enum(msg, s, len);
          break;
       case RETRO_LANGUAGE_ESPERANTO:
-         ret = menu_hash_get_help_eo_enum(msg, s, len);
+         ret = msg_hash_get_help_eo_enum(msg, s, len);
          break;
       case RETRO_LANGUAGE_POLISH:
-         ret = menu_hash_get_help_pl_enum(msg, s, len);
+         ret = msg_hash_get_help_pl_enum(msg, s, len);
          break;
       case RETRO_LANGUAGE_JAPANESE:
-         ret = menu_hash_get_help_jp_enum(msg, s, len);
+         ret = msg_hash_get_help_jp_enum(msg, s, len);
          break;
       case RETRO_LANGUAGE_KOREAN:
-         ret = menu_hash_get_help_ko_enum(msg, s, len);
+         ret = msg_hash_get_help_ko_enum(msg, s, len);
          break;
       case RETRO_LANGUAGE_VIETNAMESE:
-         ret = menu_hash_get_help_vn_enum(msg, s, len);
+         ret = msg_hash_get_help_vn_enum(msg, s, len);
          break;
       case RETRO_LANGUAGE_CHINESE_SIMPLIFIED:
-         ret = menu_hash_get_help_chs_enum(msg, s, len);
+         ret = msg_hash_get_help_chs_enum(msg, s, len);
          break;
       case RETRO_LANGUAGE_CHINESE_TRADITIONAL:
-         ret = menu_hash_get_help_cht_enum(msg, s, len);
+         ret = msg_hash_get_help_cht_enum(msg, s, len);
          break;
       case RETRO_LANGUAGE_ARABIC:
-         ret = menu_hash_get_help_ar_enum(msg, s, len);
+         ret = msg_hash_get_help_ar_enum(msg, s, len);
          break;
       case RETRO_LANGUAGE_GREEK:
-         ret = menu_hash_get_help_el_enum(msg, s, len);
+         ret = msg_hash_get_help_el_enum(msg, s, len);
          break;
       case RETRO_LANGUAGE_TURKISH:
-         ret = menu_hash_get_help_tr_enum(msg, s, len);
+         ret = msg_hash_get_help_tr_enum(msg, s, len);
          break;
       case RETRO_LANGUAGE_SLOVAK:
-         ret = menu_hash_get_help_sk_enum(msg, s, len);
+         ret = msg_hash_get_help_sk_enum(msg, s, len);
          break;
       case RETRO_LANGUAGE_PERSIAN:
-         ret = menu_hash_get_help_fa_enum(msg, s, len);
+         ret = msg_hash_get_help_fa_enum(msg, s, len);
          break;
       case RETRO_LANGUAGE_HEBREW:
-         ret = menu_hash_get_help_he_enum(msg, s, len);
+         ret = msg_hash_get_help_he_enum(msg, s, len);
          break;
       case RETRO_LANGUAGE_ASTURIAN:
-         ret = menu_hash_get_help_ast_enum(msg, s, len);
+         ret = msg_hash_get_help_ast_enum(msg, s, len);
          break;
       default:
          break;
@@ -109,10 +108,7 @@ int menu_hash_get_help_enum(enum msg_hash_enums msg, char *s, size_t len)
    if (ret == 0)
       return ret;
 
-   return menu_hash_get_help_us_enum(msg, s, len);
-#else
-   return 0;
-#endif
+   return msg_hash_get_help_us_enum(msg, s, len);
 }
 
 const char *get_user_language_iso639_1(bool limit)
diff --git a/msg_hash.h b/msg_hash.h
index 27b0f1a174..5937fef032 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -2895,74 +2895,74 @@ enum msg_hash_enums
 const char *msg_hash_to_str(enum msg_hash_enums msg);
 
 const char *msg_hash_to_str_fr(enum msg_hash_enums msg);
-int menu_hash_get_help_fr_enum(enum msg_hash_enums msg, char *s, size_t len);
+int msg_hash_get_help_fr_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_ru(enum msg_hash_enums msg);
 
 const char *msg_hash_to_str_de(enum msg_hash_enums msg);
-int menu_hash_get_help_de_enum(enum msg_hash_enums msg, char *s, size_t len);
+int msg_hash_get_help_de_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_es(enum msg_hash_enums msg);
-int menu_hash_get_help_es_enum(enum msg_hash_enums msg, char *s, size_t len);
+int msg_hash_get_help_es_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_eo(enum msg_hash_enums msg);
-int menu_hash_get_help_eo_enum(enum msg_hash_enums msg, char *s, size_t len);
+int msg_hash_get_help_eo_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_it(enum msg_hash_enums msg);
-int menu_hash_get_help_it_enum(enum msg_hash_enums msg, char *s, size_t len);
+int msg_hash_get_help_it_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_jp(enum msg_hash_enums msg);
-int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len);
+int msg_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_ko(enum msg_hash_enums msg);
-int menu_hash_get_help_ko_enum(enum msg_hash_enums msg, char *s, size_t len);
+int msg_hash_get_help_ko_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_pt_br(enum msg_hash_enums msg);
-int menu_hash_get_help_pt_br_enum(enum msg_hash_enums msg, char *s, size_t len);
+int msg_hash_get_help_pt_br_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_pt_pt(enum msg_hash_enums msg);
-int menu_hash_get_help_pt_pt_enum(enum msg_hash_enums msg, char *s, size_t len);
+int msg_hash_get_help_pt_pt_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_pl(enum msg_hash_enums msg);
-int menu_hash_get_help_pl_enum(enum msg_hash_enums msg, char *s, size_t len);
+int msg_hash_get_help_pl_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_nl(enum msg_hash_enums msg);
-int menu_hash_get_help_nl_enum(enum msg_hash_enums msg, char *s, size_t len);
+int msg_hash_get_help_nl_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_vn(enum msg_hash_enums msg);
-int menu_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len);
+int msg_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_chs(enum msg_hash_enums msg);
-int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len);
+int msg_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_cht(enum msg_hash_enums msg);
-int menu_hash_get_help_cht_enum(enum msg_hash_enums msg, char *s, size_t len);
+int msg_hash_get_help_cht_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_us(enum msg_hash_enums msg);
-int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len);
+int msg_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_ar(enum msg_hash_enums msg);
-int menu_hash_get_help_ar_enum(enum msg_hash_enums msg, char *s, size_t len);
+int msg_hash_get_help_ar_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_el(enum msg_hash_enums msg);
-int menu_hash_get_help_el_enum(enum msg_hash_enums msg, char *s, size_t len);
+int msg_hash_get_help_el_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_tr(enum msg_hash_enums msg);
-int menu_hash_get_help_tr_enum(enum msg_hash_enums msg, char *s, size_t len);
+int msg_hash_get_help_tr_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_sk(enum msg_hash_enums msg);
-int menu_hash_get_help_sk_enum(enum msg_hash_enums msg, char *s, size_t len);
+int msg_hash_get_help_sk_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_fa(enum msg_hash_enums msg);
-int menu_hash_get_help_fa_enum(enum msg_hash_enums msg, char *s, size_t len);
+int msg_hash_get_help_fa_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_he(enum msg_hash_enums msg);
-int menu_hash_get_help_he_enum(enum msg_hash_enums msg, char *s, size_t len);
+int msg_hash_get_help_he_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_ast(enum msg_hash_enums msg);
-int menu_hash_get_help_ast_enum(enum msg_hash_enums msg, char *s, size_t len);
+int msg_hash_get_help_ast_enum(enum msg_hash_enums msg, char *s, size_t len);
 
-int menu_hash_get_help_enum(enum msg_hash_enums msg, char *s, size_t len);
+int msg_hash_get_help_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 enum msg_file_type msg_hash_to_file_type(uint32_t hash);
 
diff --git a/retroarch.c b/retroarch.c
index 3648c3999d..9dcebeb0c8 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2171,7 +2171,9 @@ struct rarch_state
 #ifdef HAVE_GFX_WIDGETS
    dispgfx_widget_t dispwidget_st;
 #endif
-
+#ifdef HAVE_MENU
+   menu_dialog_t dialog_st;
+#endif
    videocrt_switch_t crt_switch_st;
 
    gfx_thumbnail_state_t gfx_thumb_state;
@@ -2723,6 +2725,14 @@ char **input_event_get_osk_grid(void)
    return p_rarch->osk_grid;
 }
 
+#ifdef HAVE_MENU
+menu_dialog_t *dialog_get_ptr(void)
+{
+   struct rarch_state   *p_rarch  = &rarch_st;
+   return &p_rarch->dialog_st;
+}
+#endif
+
 gfx_thumbnail_state_t *gfx_thumb_get_ptr(void)
 {
    struct rarch_state   *p_rarch  = &rarch_st;
@@ -3269,7 +3279,7 @@ static int generic_menu_iterate(
                      }
                      break;
                   default:
-                     ret = menu_hash_get_help_enum(cbs->enum_idx,
+                     ret = msg_hash_get_help_enum(cbs->enum_idx,
                            menu->menu_state_msg, sizeof(menu->menu_state_msg));
                      break;
                }
@@ -3367,7 +3377,7 @@ static int generic_menu_iterate(
                }
 
                if (enum_idx != MSG_UNKNOWN)
-                  ret = menu_hash_get_help_enum(enum_idx,
+                  ret = msg_hash_get_help_enum(enum_idx,
                         menu->menu_state_msg, sizeof(menu->menu_state_msg));
 
             }
diff --git a/ui/drivers/qt/settingswidgets.cpp b/ui/drivers/qt/settingswidgets.cpp
index 3845c85d91..271cc5bfaf 100644
--- a/ui/drivers/qt/settingswidgets.cpp
+++ b/ui/drivers/qt/settingswidgets.cpp
@@ -38,7 +38,7 @@ static inline void add_sublabel_and_whats_this(
 
    widget->setToolTip(tmp);
 
-   menu_hash_get_help_enum(setting->enum_idx, tmp, sizeof(tmp));
+   msg_hash_get_help_enum(setting->enum_idx, tmp, sizeof(tmp));
 
    if (!string_is_equal(tmp, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE)))
       widget->setWhatsThis(tmp);