diff --git a/frontend/menu/rmenu.c b/frontend/menu/rmenu.c
index a6b81a654c..1dbff8371f 100644
--- a/frontend/menu/rmenu.c
+++ b/frontend/menu/rmenu.c
@@ -1129,7 +1129,7 @@ static int set_setting_action(uint8_t menu_type, unsigned switchvalue, uint64_t
          if (input & (1ULL << DEVICE_NAV_START))
             settings_set(1ULL << S_DEF_INFO_MSG);
          break;
-      case INGAME_MENU_REWIND_ENABLED:
+      case SETTING_REWIND_ENABLED:
          if ((input & (1ULL << DEVICE_NAV_LEFT)) || (input & (1ULL << DEVICE_NAV_RIGHT)) || (input & (1ULL << DEVICE_NAV_B)))
          {
             settings_set(1ULL << S_REWIND);
@@ -1149,7 +1149,7 @@ static int set_setting_action(uint8_t menu_type, unsigned switchvalue, uint64_t
             }
          }
          break;
-      case INGAME_MENU_REWIND_GRANULARITY:
+      case SETTING_REWIND_GRANULARITY:
          if (input & (1ULL << DEVICE_NAV_LEFT))
          {
             if (g_settings.rewind_granularity > 1)
@@ -1937,7 +1937,7 @@ static int select_setting(void *data, uint64_t input)
             snprintf(setting_text, sizeof(setting_text), (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) ? "ON" : "OFF");
             strlcpy(comment, "INFO - Show onscreen info messages in the menu.", sizeof(comment));
             break;
-         case INGAME_MENU_REWIND_ENABLED:
+         case SETTING_REWIND_ENABLED:
             strlcpy(text, "Rewind", sizeof(text));
             if (g_settings.rewind_enable)
             {
@@ -1952,7 +1952,7 @@ static int select_setting(void *data, uint64_t input)
                      sizeof(comment));
             }
             break;
-         case INGAME_MENU_REWIND_GRANULARITY:
+         case SETTING_REWIND_GRANULARITY:
             strlcpy(text, "Rewind Granularity", sizeof(text));
             snprintf(setting_text, sizeof(setting_text), "%d", g_settings.rewind_granularity);
             strlcpy(comment, "INFO - Set the amount of frames to 'rewind'.", sizeof(comment));
diff --git a/frontend/menu/rmenu.h b/frontend/menu/rmenu.h
index ac874ebc64..54287462d2 100644
--- a/frontend/menu/rmenu.h
+++ b/frontend/menu/rmenu.h
@@ -72,6 +72,8 @@ enum
 #ifndef HAVE_RMENU_XUI
 enum
 {
+   SETTING_REWIND_ENABLED,
+   SETTING_REWIND_GRANULARITY,
    SETTING_FONT_SIZE,
    SETTING_EMU_SHOW_DEBUG_INFO_MSG,
    SETTING_EMU_SHOW_INFO_MSG,
@@ -131,8 +133,6 @@ enum
    INGAME_MENU_SCREENSHOT_MODE,
    INGAME_MENU_RETURN_TO_GAME,
    INGAME_MENU_RESET,
-   INGAME_MENU_REWIND_ENABLED,
-   INGAME_MENU_REWIND_GRANULARITY,
    INGAME_MENU_FRAME_ADVANCE,
 #ifdef HAVE_MULTIMAN
    INGAME_MENU_RETURN_TO_MULTIMAN,
diff --git a/gfx/gl.c b/gfx/gl.c
index 572b973c4f..fd3ab5f6d2 100644
--- a/gfx/gl.c
+++ b/gfx/gl.c
@@ -1142,8 +1142,10 @@ static void gl_init_textures(void *data, const video_info_t *video)
 #endif
 
    GLenum internal_fmt = gl->internal_fmt;
+#ifndef HAVE_PSGL
    GLenum texture_type = gl->texture_type;
    GLenum texture_fmt  = gl->texture_fmt;
+#endif
 
    // GLES is picky about which format we use here.
    // Without extensions, we can *only* render to 16-bit FBOs.