diff --git a/general.h b/general.h
index 41a843442e..8ac6b85cfa 100644
--- a/general.h
+++ b/general.h
@@ -461,6 +461,12 @@ struct runloop
          unsigned count;
          unsigned max;
       } video;
+
+      struct
+      {
+         retro_time_t minimum_time;
+         retro_time_t last_time;
+      } limit;
    } frames;
 
    struct
@@ -558,11 +564,6 @@ struct global
       unsigned windowed_scale;
    } pending;
 
-   struct
-   {
-      retro_time_t minimum_frame_time;
-      retro_time_t last_frame_time;
-   } frame_limit;
 
    struct
    {
diff --git a/retroarch.c b/retroarch.c
index e11089bc80..d4c4383b12 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -1761,7 +1761,7 @@ static void validate_cpu_features(void)
 static void init_system_av_info(void)
 {
    pretro_get_system_av_info(&g_extern.system.av_info);
-   g_extern.frame_limit.last_frame_time = rarch_get_time_usec();
+   g_runloop.frames.limit.last_time = rarch_get_time_usec();
 }
 
 static void deinit_core(void)
diff --git a/runloop.c b/runloop.c
index 0b19c327a8..95467bde47 100644
--- a/runloop.c
+++ b/runloop.c
@@ -698,23 +698,23 @@ static void limit_frame_time(void)
       * g_settings.fastforward_ratio;
    mft_f         = 1000000.0f / effective_fps;
 
-   g_extern.frame_limit.minimum_frame_time = (retro_time_t) roundf(mft_f);
+   g_runloop.frames.limit.minimum_time = (retro_time_t) roundf(mft_f);
 
-   target        = g_extern.frame_limit.last_frame_time + 
-                   g_extern.frame_limit.minimum_frame_time;
+   target        = g_runloop.frames.limit.last_time + 
+                   g_runloop.frames.limit.minimum_time;
    to_sleep_ms   = (target - current) / 1000;
 
    if (to_sleep_ms <= 0)
    {
-      g_extern.frame_limit.last_frame_time = rarch_get_time_usec();
+      g_runloop.frames.limit.last_time = rarch_get_time_usec();
       return;
    }
 
    rarch_sleep((unsigned int)to_sleep_ms);
 
    /* Combat jitter a bit. */
-   g_extern.frame_limit.last_frame_time += 
-      g_extern.frame_limit.minimum_frame_time;
+   g_runloop.frames.limit.last_time += 
+      g_runloop.frames.limit.minimum_time;
 }
 
 /**