diff --git a/frontend/menu/menu_action.c b/frontend/menu/menu_action.c
index 5110e68258..b77cc0a2cf 100644
--- a/frontend/menu/menu_action.c
+++ b/frontend/menu/menu_action.c
@@ -194,94 +194,6 @@ static int menu_action_handle_setting(rarch_setting_t *setting,
    return 0;
 }
 
-#ifdef GEKKO
-enum
-{
-   GX_RESOLUTIONS_512_192 = 0,
-   GX_RESOLUTIONS_598_200,
-   GX_RESOLUTIONS_640_200,
-   GX_RESOLUTIONS_384_224,
-   GX_RESOLUTIONS_448_224,
-   GX_RESOLUTIONS_480_224,
-   GX_RESOLUTIONS_512_224,
-   GX_RESOLUTIONS_576_224,
-   GX_RESOLUTIONS_608_224,
-   GX_RESOLUTIONS_640_224,
-   GX_RESOLUTIONS_340_232,
-   GX_RESOLUTIONS_512_232,
-   GX_RESOLUTIONS_512_236,
-   GX_RESOLUTIONS_336_240,
-   GX_RESOLUTIONS_352_240,
-   GX_RESOLUTIONS_384_240,
-   GX_RESOLUTIONS_512_240,
-   GX_RESOLUTIONS_530_240,
-   GX_RESOLUTIONS_640_240,
-   GX_RESOLUTIONS_512_384,
-   GX_RESOLUTIONS_598_400,
-   GX_RESOLUTIONS_640_400,
-   GX_RESOLUTIONS_384_448,
-   GX_RESOLUTIONS_448_448,
-   GX_RESOLUTIONS_480_448,
-   GX_RESOLUTIONS_512_448,
-   GX_RESOLUTIONS_576_448,
-   GX_RESOLUTIONS_608_448,
-   GX_RESOLUTIONS_640_448,
-   GX_RESOLUTIONS_340_464,
-   GX_RESOLUTIONS_512_464,
-   GX_RESOLUTIONS_512_472,
-   GX_RESOLUTIONS_352_480,
-   GX_RESOLUTIONS_384_480,
-   GX_RESOLUTIONS_512_480,
-   GX_RESOLUTIONS_530_480,
-   GX_RESOLUTIONS_608_480,
-   GX_RESOLUTIONS_640_480,
-   GX_RESOLUTIONS_LAST,
-};
-
-unsigned menu_gx_resolutions[GX_RESOLUTIONS_LAST][2] = {
-   { 512, 192 },
-   { 598, 200 },
-   { 640, 200 },
-   { 384, 224 },
-   { 448, 224 },
-   { 480, 224 },
-   { 512, 224 },
-   { 576, 224 },
-   { 608, 224 },
-   { 640, 224 },
-   { 340, 232 },
-   { 512, 232 },
-   { 512, 236 },
-   { 336, 240 },
-   { 352, 240 },
-   { 384, 240 },
-   { 512, 240 },
-   { 530, 240 },
-   { 640, 240 },
-   { 512, 384 },
-   { 598, 400 },
-   { 640, 400 },
-   { 384, 448 },
-   { 448, 448 },
-   { 480, 448 },
-   { 512, 448 },
-   { 576, 448 },
-   { 608, 448 },
-   { 640, 448 },
-   { 340, 464 },
-   { 512, 464 },
-   { 512, 472 },
-   { 352, 480 },
-   { 384, 480 },
-   { 512, 480 },
-   { 530, 480 },
-   { 608, 480 },
-   { 640, 480 },
-};
-
-unsigned menu_current_gx_resolution = GX_RESOLUTIONS_640_480;
-#endif
-
 int menu_action_setting_set(unsigned type, const char *label,
       unsigned action)
 {
diff --git a/frontend/menu/menu_entries_cbs.c b/frontend/menu/menu_entries_cbs.c
index edc963b69b..6b702ce1f3 100644
--- a/frontend/menu/menu_entries_cbs.c
+++ b/frontend/menu/menu_entries_cbs.c
@@ -24,6 +24,94 @@
 #include "../../config.def.h"
 #include "../../performance.h"
 
+#ifdef GEKKO
+enum
+{
+   GX_RESOLUTIONS_512_192 = 0,
+   GX_RESOLUTIONS_598_200,
+   GX_RESOLUTIONS_640_200,
+   GX_RESOLUTIONS_384_224,
+   GX_RESOLUTIONS_448_224,
+   GX_RESOLUTIONS_480_224,
+   GX_RESOLUTIONS_512_224,
+   GX_RESOLUTIONS_576_224,
+   GX_RESOLUTIONS_608_224,
+   GX_RESOLUTIONS_640_224,
+   GX_RESOLUTIONS_340_232,
+   GX_RESOLUTIONS_512_232,
+   GX_RESOLUTIONS_512_236,
+   GX_RESOLUTIONS_336_240,
+   GX_RESOLUTIONS_352_240,
+   GX_RESOLUTIONS_384_240,
+   GX_RESOLUTIONS_512_240,
+   GX_RESOLUTIONS_530_240,
+   GX_RESOLUTIONS_640_240,
+   GX_RESOLUTIONS_512_384,
+   GX_RESOLUTIONS_598_400,
+   GX_RESOLUTIONS_640_400,
+   GX_RESOLUTIONS_384_448,
+   GX_RESOLUTIONS_448_448,
+   GX_RESOLUTIONS_480_448,
+   GX_RESOLUTIONS_512_448,
+   GX_RESOLUTIONS_576_448,
+   GX_RESOLUTIONS_608_448,
+   GX_RESOLUTIONS_640_448,
+   GX_RESOLUTIONS_340_464,
+   GX_RESOLUTIONS_512_464,
+   GX_RESOLUTIONS_512_472,
+   GX_RESOLUTIONS_352_480,
+   GX_RESOLUTIONS_384_480,
+   GX_RESOLUTIONS_512_480,
+   GX_RESOLUTIONS_530_480,
+   GX_RESOLUTIONS_608_480,
+   GX_RESOLUTIONS_640_480,
+   GX_RESOLUTIONS_LAST,
+};
+
+unsigned menu_gx_resolutions[GX_RESOLUTIONS_LAST][2] = {
+   { 512, 192 },
+   { 598, 200 },
+   { 640, 200 },
+   { 384, 224 },
+   { 448, 224 },
+   { 480, 224 },
+   { 512, 224 },
+   { 576, 224 },
+   { 608, 224 },
+   { 640, 224 },
+   { 340, 232 },
+   { 512, 232 },
+   { 512, 236 },
+   { 336, 240 },
+   { 352, 240 },
+   { 384, 240 },
+   { 512, 240 },
+   { 530, 240 },
+   { 640, 240 },
+   { 512, 384 },
+   { 598, 400 },
+   { 640, 400 },
+   { 384, 448 },
+   { 448, 448 },
+   { 480, 448 },
+   { 512, 448 },
+   { 576, 448 },
+   { 608, 448 },
+   { 640, 448 },
+   { 340, 464 },
+   { 512, 464 },
+   { 512, 472 },
+   { 352, 480 },
+   { 384, 480 },
+   { 512, 480 },
+   { 530, 480 },
+   { 608, 480 },
+   { 640, 480 },
+};
+
+unsigned menu_current_gx_resolution = GX_RESOLUTIONS_640_480;
+#endif
+
 static void common_load_content(void)
 {
    rarch_main_command(RARCH_CMD_LOAD_CONTENT);