diff --git a/libretro-common/formats/json/jsonsax.c b/libretro-common/formats/json/jsonsax.c
index d51ea5c845..420c6a590b 100644
--- a/libretro-common/formats/json/jsonsax.c
+++ b/libretro-common/formats/json/jsonsax.c
@@ -92,10 +92,11 @@ static void jsonx_parse_object( state_t* state )
 
    while ( *state->json != '}' )
    {
+      const char *name = NULL;
       if ( *state->json != '"' )
          longjmp( state->env, JSONSAX_MISSING_KEY );
 
-      const char* name = ++state->json;
+      name = ++state->json;
 
       for ( ;; )
       {
diff --git a/menu/menu_input.h b/menu/menu_input.h
index e7dce6185a..e4a8e6c820 100644
--- a/menu/menu_input.h
+++ b/menu/menu_input.h
@@ -43,6 +43,17 @@ enum menu_action
    MENU_ACTION_SCROLL_UP,
    MENU_ACTION_TOGGLE
 };
+
+enum menu_mouse_action
+{
+   MOUSE_ACTION_NONE = 0,
+   MOUSE_ACTION_BUTTON_L,
+   MOUSE_ACTION_BUTTON_L_TOGGLE,
+   MOUSE_ACTION_BUTTON_L_SET_NAVIGATION,
+   MOUSE_ACTION_BUTTON_R,
+   MOUSE_ACTION_WHEEL_UP,
+   MOUSE_ACTION_WHEEL_DOWN
+};
  
 enum menu_input_pointer_state
 {
@@ -79,16 +90,6 @@ enum menu_input_ctl_state
    MENU_INPUT_CTL_SEARCH_START
 };
 
-enum mouse_action
-{
-   MOUSE_ACTION_NONE = 0,
-   MOUSE_ACTION_BUTTON_L,
-   MOUSE_ACTION_BUTTON_L_TOGGLE,
-   MOUSE_ACTION_BUTTON_L_SET_NAVIGATION,
-   MOUSE_ACTION_BUTTON_R,
-   MOUSE_ACTION_WHEEL_UP,
-   MOUSE_ACTION_WHEEL_DOWN
-};
 
 enum menu_input_bind_mode
 {