diff --git a/frontend/menu/backend/menu_common_backend.c b/frontend/menu/backend/menu_common_backend.c
index 6598f2b3bd..6ebe187f87 100644
--- a/frontend/menu/backend/menu_common_backend.c
+++ b/frontend/menu/backend/menu_common_backend.c
@@ -38,6 +38,11 @@
 #define HAVE_SHADER_MANAGER
 #endif
 
+#ifdef GEKKO
+extern unsigned menu_gx_resolutions[GX_RESOLUTIONS_LAST][2];
+extern unsigned menu_current_gx_resolution;
+#endif
+
 // FIXME: Ugly hack, nees to be refactored badly
 static size_t hack_shader_pass = 0;
 
@@ -1177,6 +1182,8 @@ static int menu_action_ok(const char *menu_path,
    rarch_setting_t *setting = (rarch_setting_t*)
       setting_data_find_setting(setting_data, menu_label);
 
+   (void)hack_shader_pass;
+
    if (file_list_get_size(driver.menu->selection_buf) == 0)
       return 0;
 
diff --git a/settings_data.c b/settings_data.c
index fa4f57f277..3ef16bcc61 100644
--- a/settings_data.c
+++ b/settings_data.c
@@ -1764,7 +1764,7 @@ int setting_data_get_description(const char *label, char *msg,
 }
 
 #ifdef GEKKO
-static unsigned menu_gx_resolutions[GX_RESOLUTIONS_LAST][2] = {
+unsigned menu_gx_resolutions[GX_RESOLUTIONS_LAST][2] = {
    { 512, 192 },
    { 598, 200 },
    { 640, 200 },
@@ -1805,7 +1805,7 @@ static unsigned menu_gx_resolutions[GX_RESOLUTIONS_LAST][2] = {
    { 640, 480 },
 };
 
-static unsigned menu_current_gx_resolution = GX_RESOLUTIONS_640_480;
+unsigned menu_current_gx_resolution = GX_RESOLUTIONS_640_480;
 #endif
 
 static void menu_common_setting_set_label_perf(char *type_str,