diff --git a/frontend/frontend.c b/frontend/frontend.c
index 51effd5f18..68a8c94cf5 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -243,6 +243,7 @@ void main_exit(args_type() args)
       driver.menu_data_own = false; // Do not want menu context to live any more.
       rarch_main_deinit();
    }
+
    rarch_deinit_msg_queue();
 
    rarch_perf_log();
@@ -360,7 +361,6 @@ returntype main_entry(signature())
       driver.frontend_ctx->init(args);
 
    rarch_main_clear_state();
-   rarch_init_msg_queue();
 
    if (!(ret = (main_load_content(argc, argv, driver.frontend_ctx->environment_get,
          driver.frontend_ctx->process_args))))
diff --git a/general.h b/general.h
index d93801f6d4..f47453c024 100644
--- a/general.h
+++ b/general.h
@@ -775,7 +775,6 @@ bool rarch_main_iterate(void);
 void rarch_main_deinit(void);
 void rarch_main_deinit_core(void);
 void rarch_render_cached_frame(void);
-void rarch_init_msg_queue(void);
 void rarch_deinit_msg_queue(void);
 void rarch_input_poll(void);
 void rarch_check_overlay(void);
@@ -790,9 +789,6 @@ void rarch_disk_control_append_image(const char *path);
 bool rarch_set_rumble_state(unsigned port, enum retro_rumble_effect effect, bool enable);
 void rarch_init_autosave(void);
 void rarch_deinit_autosave(void);
-void rarch_take_screenshot(void);
-void rarch_state_slot_increase(void);
-void rarch_state_slot_decrease(void);
 
 #ifdef HAVE_RECORD
 void rarch_init_recording(void);
diff --git a/retroarch.c b/retroarch.c
index 775e6259b7..19cdb9c080 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -140,7 +140,7 @@ static bool take_screenshot_raw(void)
          width, height, -pitch, false);
 }
 
-void rarch_take_screenshot(void)
+static void rarch_take_screenshot(void)
 {
    if ((!*g_settings.screenshot_directory) && (!*g_extern.basename)) // No way to infer screenshot directory.
       return;
@@ -1461,7 +1461,7 @@ void rarch_deinit_recording(void)
 }
 #endif
 
-void rarch_init_msg_queue(void)
+static void rarch_init_msg_queue(void)
 {
    if (!g_extern.msg_queue)
       rarch_assert(g_extern.msg_queue = msg_queue_new(8));
@@ -2039,7 +2039,7 @@ bool rarch_check_fullscreen(void)
    return toggle;
 }
 
-void rarch_state_slot_increase(void)
+static void rarch_state_slot_increase(void)
 {
    g_settings.state_slot++;
 
@@ -2055,7 +2055,7 @@ void rarch_state_slot_increase(void)
    RARCH_LOG("%s\n", msg);
 }
 
-void rarch_state_slot_decrease(void)
+static void rarch_state_slot_decrease(void)
 {
    if (g_settings.state_slot > 0)
       g_settings.state_slot--;
@@ -2827,6 +2827,8 @@ void rarch_main_clear_state(void)
 
    for (i = 0; i < MAX_PLAYERS; i++)
       g_settings.input.libretro_device[i] = RETRO_DEVICE_JOYPAD;
+
+   rarch_init_msg_queue();
 }
 
 #ifdef HAVE_ZLIB