diff --git a/command.c b/command.c
index da5f13955f..ff92fcc46c 100644
--- a/command.c
+++ b/command.c
@@ -1395,7 +1395,7 @@ static bool command_event_init_core(enum rarch_core_type *data)
       config_load_remap();
 
    /* Per-core saves: reset redirection paths */
-   rarch_ctl(RARCH_CTL_SET_PATHS_REDIRECT, NULL);
+   path_set_redirect();
 
    if (!core_init())
       return false;
diff --git a/configuration.c b/configuration.c
index 3e64ac695c..41155502c1 100644
--- a/configuration.c
+++ b/configuration.c
@@ -1507,7 +1507,7 @@ static void config_set_defaults(void)
 #endif
    settings->floats.video_scale                = scale;
 
-   if (rarch_ctl(RARCH_CTL_IS_FORCE_FULLSCREEN, NULL))
+   if (retroarch_is_forced_fullscreen())
    {
       configuration_set_bool(settings, settings->bools.video_fullscreen, true);
    }
@@ -2245,7 +2245,7 @@ static bool config_load_file(const char *path, bool set_defaults,
          *bool_settings[i].ptr = tmp;
    }
 
-   if (!rarch_ctl(RARCH_CTL_IS_FORCE_FULLSCREEN, NULL))
+   if (!retroarch_is_forced_fullscreen())
       CONFIG_GET_BOOL_BASE(conf, settings, bools.video_fullscreen, "video_fullscreen");
 
 #ifdef HAVE_NETWORKGAMEPAD
diff --git a/retroarch.c b/retroarch.c
index f0fe9c3963..7a9a478ed7 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -1436,15 +1436,6 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
          runloop_ctl(RUNLOOP_CTL_HTTPSERVER_INIT, NULL);
          retroarch_msg_queue_init();
          break;
-      case RARCH_CTL_SET_PATHS_REDIRECT:
-         {
-            bool contentless = false;
-            bool is_inited   = false;
-            content_get_status(&contentless, &is_inited);
-
-            path_set_redirect();
-         }
-         break;
       case RARCH_CTL_IS_SRAM_LOAD_DISABLED:
          return rarch_is_sram_load_disabled;
       case RARCH_CTL_SET_SRAM_LOAD_DISABLED:
@@ -1478,8 +1469,6 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
       case RARCH_CTL_UNSET_SRAM_ENABLE:
          rarch_use_sram = false;
          break;
-      case RARCH_CTL_IS_FORCE_FULLSCREEN:
-         return rarch_force_fullscreen;
       case RARCH_CTL_SET_BLOCK_CONFIG_READ:
          rarch_block_config_read = true;
          break;
@@ -1496,6 +1485,10 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
    return true;
 }
 
+bool retroarch_is_forced_fullscreen(void)
+{
+   return rarch_force_fullscreen;
+}
 
 bool retroarch_override_setting_is_set(enum rarch_override_setting enum_idx, void *data)
 {
diff --git a/retroarch.h b/retroarch.h
index 6a108031b3..1edc42b5f1 100644
--- a/retroarch.h
+++ b/retroarch.h
@@ -49,8 +49,6 @@ enum rarch_ctl_state
 
    RARCH_CTL_DESTROY,
 
-   RARCH_CTL_SET_PATHS_REDIRECT,
-
    RARCH_CTL_IS_BPS_PREF,
    RARCH_CTL_UNSET_BPS_PREF,
 
@@ -77,9 +75,6 @@ enum rarch_ctl_state
    RARCH_CTL_SET_SRAM_SAVE_DISABLED,
    RARCH_CTL_UNSET_SRAM_SAVE_DISABLED,
 
-   /* Force fullscreen */
-   RARCH_CTL_IS_FORCE_FULLSCREEN,
-
    /* Block config read */
    RARCH_CTL_SET_BLOCK_CONFIG_READ,
    RARCH_CTL_UNSET_BLOCK_CONFIG_READ,
@@ -298,6 +293,8 @@ bool retroarch_override_setting_is_set(enum rarch_override_setting enum_idx, voi
 
 bool retroarch_validate_game_options(char *s, size_t len, bool mkdir);
 
+bool retroarch_is_forced_fullscreen(void);
+
 void retroarch_set_current_core_type(enum rarch_core_type type, bool explicitly_set);
 
 /**