diff --git a/menu/menu_display.c b/menu/menu_display.c
index 6c8e8e2747..c22f0f5a3a 100644
--- a/menu/menu_display.c
+++ b/menu/menu_display.c
@@ -45,12 +45,25 @@
 #include "menu_animation.h"
 #include "menu_display.h"
 
-
+#define PARTICLES_COUNT            100
 
 uintptr_t menu_display_white_texture;
 
 static enum menu_toggle_reason menu_display_toggle_reason = MENU_TOGGLE_REASON_NONE;
 
+static video_coord_array_t menu_disp_ca;
+
+static unsigned menu_display_framebuf_width      = 0;
+static unsigned menu_display_framebuf_height     = 0;
+static size_t menu_display_framebuf_pitch        = 0;
+static unsigned menu_display_header_height       = 0;
+static bool menu_display_msg_force               = false;
+static bool menu_display_font_alloc_framebuf     = false;
+static bool menu_display_framebuf_dirty          = false;
+static const uint8_t *menu_display_font_framebuf = NULL;
+static msg_queue_t *menu_display_msg_queue       = NULL;
+static menu_display_ctx_driver_t *menu_disp      = NULL;
+
 static menu_display_ctx_driver_t *menu_display_ctx_drivers[] = {
 #ifdef HAVE_D3D
    &menu_display_ctx_d3d,
@@ -161,18 +174,6 @@ void menu_display_timedate(menu_display_ctx_datetime_t *datetime)
    }
 }
 
-static video_coord_array_t menu_disp_ca;
-static unsigned menu_display_framebuf_width      = 0;
-static unsigned menu_display_framebuf_height     = 0;
-static size_t menu_display_framebuf_pitch        = 0;
-static unsigned menu_display_header_height       = 0;
-static bool menu_display_msg_force               = false;
-static bool menu_display_font_alloc_framebuf     = false;
-static bool menu_display_framebuf_dirty          = false;
-static const uint8_t *menu_display_font_framebuf = NULL;
-static msg_queue_t *menu_display_msg_queue       = NULL;
-static menu_display_ctx_driver_t *menu_disp      = NULL;
-
 void menu_display_blend_begin(void)
 {
    if (!menu_disp || !menu_disp->blend_begin)
@@ -779,8 +780,6 @@ void menu_display_push_quad(
    video_coord_array_append(ca, &coords, 3);
 }
 
-#define PARTICLES_COUNT            100
-
 void menu_display_snow(int width, int height)
 {
    struct display_particle
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index e0a7ddec3d..9da96c472b 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -90,7 +90,7 @@ static menu_handle_t *menu_driver_data          = NULL;
 static const menu_ctx_driver_t *menu_driver_ctx = NULL;
 static void *menu_userdata                      = NULL;
 
-bool menu_driver_is_binding_state()
+bool menu_driver_is_binding_state(void)
 {
    return menu_driver_is_binding;
 }
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index c53985519d..1645f3e21f 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -382,7 +382,8 @@ const char *menu_driver_ident(void);
 
 bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data);
 
-bool menu_driver_is_binding_state();
+bool menu_driver_is_binding_state(void);
+
 void menu_driver_set_binding_state(bool on);
 
 extern menu_ctx_driver_t menu_ctx_xui;