diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 70197c19ae..5dee6c3108 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -1653,7 +1653,7 @@ static int action_ok_video_resolution(const char *path,
       global->console.screen.resolutions.height = height;
 
       snprintf(msg, sizeof(msg),"Applying: %dx%d\n START to reset",width, height);
-      rarch_main_msg_queue_push(msg, 1, 100, true);
+      menu_display_msg_queue_push(msg, 1, 100, true);
    }
 #endif
 
diff --git a/menu/cbs/menu_cbs_start.c b/menu/cbs/menu_cbs_start.c
index b53324f130..191706c0fd 100644
--- a/menu/cbs/menu_cbs_start.c
+++ b/menu/cbs/menu_cbs_start.c
@@ -16,6 +16,7 @@
 #include "../menu.h"
 #include "../menu_cbs.h"
 #include "../menu_input.h"
+#include "../menu_display.h"
 #include "../menu_setting.h"
 #include "../menu_shader.h"
 #include "../menu_hash.h"
@@ -277,7 +278,7 @@ static int action_start_video_resolution(
       global->console.screen.resolutions.height = height;
 
       snprintf(msg, sizeof(msg),"Resetting to: %dx%d",width, height);
-      rarch_main_msg_queue_push(msg, 1, 100, true);
+      menu_display_msg_queue_push(msg, 1, 100, true);
    }
 
    return 0;
diff --git a/menu/menu.c b/menu/menu.c
index c49b7cb625..30fa9e382f 100644
--- a/menu/menu.c
+++ b/menu/menu.c
@@ -59,12 +59,12 @@ static void menu_push_to_history_playlist(void)
 
    if (*global->path.fullpath)
    {
-      char tmp[PATH_MAX_LENGTH] = {0};
-      char str[PATH_MAX_LENGTH] = {0};
+      char tmp[PATH_MAX_LENGTH];
+      char str[PATH_MAX_LENGTH];
 
       fill_pathname_base(tmp, global->path.fullpath, sizeof(tmp));
       snprintf(str, sizeof(str), "INFO - Loading %s ...", tmp);
-      rarch_main_msg_queue_push(str, 1, 1, false);
+      menu_display_msg_queue_push(str, 1, 1, false);
    }
 
    content_playlist_push(g_defaults.history,
@@ -106,7 +106,7 @@ bool menu_load_content(enum rarch_core_type type)
 
       fill_pathname_base(name, global->path.fullpath, sizeof(name));
       snprintf(msg, sizeof(msg), "Failed to load %s.\n", name);
-      rarch_main_msg_queue_push(msg, 1, 90, false);
+      menu_display_msg_queue_push(msg, 1, 90, false);
 
       if (disp)
          disp->msg_force = true;
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 0475120ae0..89a0512638 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -29,6 +29,7 @@
 #include "menu_setting.h"
 
 #include "menu.h"
+#include "menu_display.h"
 #include "menu_input.h"
 #include "menu_hash.h"
 
@@ -982,9 +983,9 @@ static int setting_action_ok_bind_all_save_autoconfig(void *data, bool wraparoun
       return -1;
 
    if(config_save_autoconf_profile(settings->input.device_names[setting->index_offset], setting->index_offset))
-      rarch_main_msg_queue_push("Autoconf file saved successfully", 1, 100, true);
+      menu_display_msg_queue_push("Autoconf file saved successfully", 1, 100, true);
    else
-      rarch_main_msg_queue_push("Error saving autoconf file", 1, 100, true);
+      menu_display_msg_queue_push("Error saving autoconf file", 1, 100, true);
 
    return 0;
 }