diff --git a/retroarch.c b/retroarch.c
index aeb8f77dbb..c8eebf9b2f 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -278,6 +278,57 @@
 #include "lakka.h"
 #endif
 
+static struct rarch_state         rarch_st;
+
+#ifdef HAVE_THREAD_STORAGE
+static const void *MAGIC_POINTER                                 = (void*)(uintptr_t)0x0DEFACED;
+#endif
+
+#ifdef HAVE_LIBNX
+/* TODO/FIXME - public global variable */
+extern u32 __nx_applet_type;
+#endif
+
+static const video_display_server_t *current_display_server      = &dispserv_null;
+
+struct aspect_ratio_elem aspectratio_lut[ASPECT_RATIO_END] = {
+   { 1.3333f,         "4:3"           },
+   { 1.7778f,         "16:9"          },
+   { 1.6f,            "16:10"         },
+   { 16.0f / 15.0f,   "16:15"         },
+   { 21.0f / 9.0f,    "21:9"          },
+   { 1.0f,            "1:1"           },
+   { 2.0f,            "2:1"           },
+   { 1.5f,            "3:2"           },
+   { 0.75f,           "3:4"           },
+   { 4.0f,            "4:1"           },
+   { 0.5625f,         "9:16"          },
+   { 1.25f,           "5:4"           },
+   { 1.2f,            "6:5"           },
+   { 0.7777f,         "7:9"           },
+   { 2.6666f,         "8:3"           },
+   { 1.1428f,         "8:7"           },
+   { 1.5833f,         "19:12"         },
+   { 1.3571f,         "19:14"         },
+   { 1.7647f,         "30:17"         },
+   { 3.5555f,         "32:9"          },
+   { 0.0f,            "Config"        },
+   { 1.0f,            "Square pixel"  },
+   { 1.0f,            "Core provided" },
+   { 0.0f,            "Custom"        },
+   { 1.3333f,         "Full" }
+};
+
+/* TODO/FIXME - turn these into static global variable */
+#ifdef HAVE_DISCORD
+bool discord_is_inited                                          = false;
+#endif
+uint64_t lifecycle_state                                        = 0;
+unsigned subsystem_current_count                                = 0;
+struct retro_keybind input_config_binds[MAX_USERS][RARCH_BIND_LIST_END];
+struct retro_keybind input_autoconf_binds[MAX_USERS][RARCH_BIND_LIST_END];
+struct retro_subsystem_info subsystem_data[SUBSYSTEM_MAX_SUBSYSTEMS];
+
 static runloop_core_status_msg_t runloop_core_status_msg         =
 {
    0,
@@ -23162,7 +23213,7 @@ bool video_context_driver_get_refresh_rate(float *refresh_rate)
                    p_rarch->video_context_data);
 
       /* Fix for incorrect interlacing detection --
-       * HARD SET VSNC TO REQUIRED REFRESH FOR CRT*/
+       * HARD SET VSYNC TO REQUIRED REFRESH FOR CRT*/
       if (refresh_holder != p_rarch->video_driver_core_hz)
          *refresh_rate          = p_rarch->video_driver_core_hz;
    }
diff --git a/retroarch_data.h b/retroarch_data.h
index 5c9a342058..927da780aa 100644
--- a/retroarch_data.h
+++ b/retroarch_data.h
@@ -1543,54 +1543,3 @@ struct rarch_state
    bool audio_mixer_active;
 #endif
 };
-
-static struct rarch_state         rarch_st;
-
-#ifdef HAVE_THREAD_STORAGE
-static const void *MAGIC_POINTER                                 = (void*)(uintptr_t)0x0DEFACED;
-#endif
-
-#ifdef HAVE_LIBNX
-/* TODO/FIXME - public global variable */
-extern u32 __nx_applet_type;
-#endif
-
-static const video_display_server_t *current_display_server      = &dispserv_null;
-
-struct aspect_ratio_elem aspectratio_lut[ASPECT_RATIO_END] = {
-   { 1.3333f,         "4:3"           },
-   { 1.7778f,         "16:9"          },
-   { 1.6f,            "16:10"         },
-   { 16.0f / 15.0f,   "16:15"         },
-   { 21.0f / 9.0f,    "21:9"          },
-   { 1.0f,            "1:1"           },
-   { 2.0f,            "2:1"           },
-   { 1.5f,            "3:2"           },
-   { 0.75f,           "3:4"           },
-   { 4.0f,            "4:1"           },
-   { 0.5625f,         "9:16"          },
-   { 1.25f,           "5:4"           },
-   { 1.2f,            "6:5"           },
-   { 0.7777f,         "7:9"           },
-   { 2.6666f,         "8:3"           },
-   { 1.1428f,         "8:7"           },
-   { 1.5833f,         "19:12"         },
-   { 1.3571f,         "19:14"         },
-   { 1.7647f,         "30:17"         },
-   { 3.5555f,         "32:9"          },
-   { 0.0f,            "Config"        },
-   { 1.0f,            "Square pixel"  },
-   { 1.0f,            "Core provided" },
-   { 0.0f,            "Custom"        },
-   { 1.3333f,         "Full" }
-};
-
-/* TODO/FIXME - turn these into static global variable */
-#ifdef HAVE_DISCORD
-bool discord_is_inited                                          = false;
-#endif
-uint64_t lifecycle_state                                        = 0;
-unsigned subsystem_current_count                                = 0;
-struct retro_keybind input_config_binds[MAX_USERS][RARCH_BIND_LIST_END];
-struct retro_keybind input_autoconf_binds[MAX_USERS][RARCH_BIND_LIST_END];
-struct retro_subsystem_info subsystem_data[SUBSYSTEM_MAX_SUBSYSTEMS];