diff --git a/configuration.c b/configuration.c
index 1c0f258af7..22c225e8d7 100644
--- a/configuration.c
+++ b/configuration.c
@@ -2319,8 +2319,8 @@ bool config_load_override(void)
    runloop_msg_queue_push("Configuration override loaded.", 1, 100, true);
 
    /* Reset save paths. */
-   retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_STATE_PATH);
-   retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_SAVE_PATH);
+   retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_STATE_PATH, NULL);
+   retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_SAVE_PATH, NULL);
 
    path_clear(RARCH_PATH_CONFIG_APPEND);
 
@@ -2348,8 +2348,8 @@ bool config_unload_override(void)
       RARCH_LOG("[overrides] configuration overrides unloaded, original configuration restored.\n");
 
       /* Reset save paths */
-      retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_STATE_PATH);
-      retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_SAVE_PATH);
+      retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_STATE_PATH, NULL);
+      retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_SAVE_PATH, NULL);
 
       return true;
    }
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 9396021bf8..fff7702cb3 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -1599,7 +1599,7 @@ void general_write_handler(void *data)
                verbosity_disable();
 
             if (setting && *setting->value.target.boolean)
-               retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_VERBOSITY);
+               retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_VERBOSITY, NULL);
             else
                retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_VERBOSITY);
          }
@@ -1648,7 +1648,7 @@ void general_write_handler(void *data)
          {
             bool val = (!string_is_empty(setting->value.target.string));
             if (val)
-               retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_NETPLAY_IP_ADDRESS);
+               retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_NETPLAY_IP_ADDRESS, NULL);
             else
                retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_NETPLAY_IP_ADDRESS);
          }
@@ -1658,7 +1658,7 @@ void general_write_handler(void *data)
 #ifdef HAVE_NETWORKING
          if (!global->netplay.is_client)
             path_clear(RARCH_PATH_SERVER);
-         retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_NETPLAY_MODE);
+         retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_NETPLAY_MODE, NULL);
 #endif
          break;
       case MENU_ENUM_LABEL_NETPLAY_SPECTATOR_MODE_ENABLE:
@@ -1673,7 +1673,7 @@ void general_write_handler(void *data)
             bool val = (global->netplay.sync_frames > 0);
             
             if (val)
-               retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_NETPLAY_DELAY_FRAMES);
+               retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_NETPLAY_DELAY_FRAMES, NULL);
             else
                retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_NETPLAY_DELAY_FRAMES);
          }
@@ -1685,7 +1685,7 @@ void general_write_handler(void *data)
             bool val = (global->netplay.check_frames > 0);
 
             if (val)
-               retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_NETPLAY_CHECK_FRAMES);
+               retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_NETPLAY_CHECK_FRAMES, NULL);
             else
                retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_NETPLAY_CHECK_FRAMES);
          }
diff --git a/retroarch.c b/retroarch.c
index 46c9d42fcf..a85234f487 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -555,7 +555,7 @@ static void retroarch_parse_input(int argc, char *argv[])
          case 's':
             path_set(RARCH_PATH_SAVEFILE, optarg);
             retroarch_override_setting_set(
-                  RARCH_OVERRIDE_SETTING_SAVE_PATH);
+                  RARCH_OVERRIDE_SETTING_SAVE_PATH, NULL);
             break;
 
          case 'f':
@@ -565,13 +565,13 @@ static void retroarch_parse_input(int argc, char *argv[])
          case 'S':
             path_set(RARCH_PATH_SAVESTATE, optarg);
             retroarch_override_setting_set(
-                  RARCH_OVERRIDE_SETTING_STATE_PATH);
+                  RARCH_OVERRIDE_SETTING_STATE_PATH, NULL);
             break;
 
          case 'v':
             verbosity_enable();
             retroarch_override_setting_set(
-                  RARCH_OVERRIDE_SETTING_VERBOSITY);
+                  RARCH_OVERRIDE_SETTING_VERBOSITY, NULL);
             break;
 
          case 'N':
@@ -609,8 +609,8 @@ static void retroarch_parse_input(int argc, char *argv[])
                strlcpy(settings->directory.libretro, optarg,
                      sizeof(settings->directory.libretro));
 
-               retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_LIBRETRO);
-               retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_LIBRETRO_DIRECTORY);
+               retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_LIBRETRO, NULL);
+               retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_LIBRETRO_DIRECTORY, NULL);
                RARCH_WARN("Using old --libretro behavior. "
                      "Setting libretro_directory to \"%s\" instead.\n",
                      optarg);
@@ -618,7 +618,7 @@ static void retroarch_parse_input(int argc, char *argv[])
             else if (path_file_exists(optarg))
             {
                runloop_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, optarg);
-               retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_LIBRETRO);
+               retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_LIBRETRO, NULL);
 
                /* We requested explicit core, so use PLAIN core type. */
                retroarch_set_current_core_type(CORE_TYPE_PLAIN, false);
@@ -667,14 +667,14 @@ static void retroarch_parse_input(int argc, char *argv[])
 #ifdef HAVE_NETWORKING
          case 'H':
             retroarch_override_setting_set(
-                  RARCH_OVERRIDE_SETTING_NETPLAY_IP_ADDRESS);
+                  RARCH_OVERRIDE_SETTING_NETPLAY_IP_ADDRESS, NULL);
             global->netplay.enable = true;
             path_clear(RARCH_PATH_SERVER);
             break;
 
          case 'C':
             retroarch_override_setting_set(
-                  RARCH_OVERRIDE_SETTING_NETPLAY_IP_ADDRESS);
+                  RARCH_OVERRIDE_SETTING_NETPLAY_IP_ADDRESS, NULL);
             global->netplay.enable = true;
             path_set(RARCH_PATH_SERVER, optarg);
             break;
@@ -682,24 +682,24 @@ static void retroarch_parse_input(int argc, char *argv[])
          case 'F':
             global->netplay.sync_frames = strtol(optarg, NULL, 0);
             retroarch_override_setting_set(
-                  RARCH_OVERRIDE_SETTING_NETPLAY_DELAY_FRAMES);
+                  RARCH_OVERRIDE_SETTING_NETPLAY_DELAY_FRAMES, NULL);
             break;
 
          case RA_OPT_CHECK_FRAMES:
             retroarch_override_setting_set(
-                  RARCH_OVERRIDE_SETTING_NETPLAY_CHECK_FRAMES);
+                  RARCH_OVERRIDE_SETTING_NETPLAY_CHECK_FRAMES, NULL);
             global->netplay.check_frames = strtoul(optarg, NULL, 0);
             break;
 
          case RA_OPT_PORT:
             retroarch_override_setting_set(
-                  RARCH_OVERRIDE_SETTING_NETPLAY_IP_PORT);
+                  RARCH_OVERRIDE_SETTING_NETPLAY_IP_PORT, NULL);
             global->netplay.port = strtoul(optarg, NULL, 0);
             break;
 
          case RA_OPT_SPECTATE:
             retroarch_override_setting_set(
-                  RARCH_OVERRIDE_SETTING_NETPLAY_MODE);
+                  RARCH_OVERRIDE_SETTING_NETPLAY_MODE, NULL);
             global->netplay.is_spectate = true;
             break;
 
@@ -717,19 +717,19 @@ static void retroarch_parse_input(int argc, char *argv[])
          case RA_OPT_BPS:
             path_set(RARCH_PATH_BPS, optarg);
             rarch_ctl(RARCH_CTL_SET_BPS_PREF, NULL);
-            retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_BPS_PREF);
+            retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_BPS_PREF, NULL);
             break;
 
          case 'U':
             path_set(RARCH_PATH_UPS, optarg);
             rarch_ctl(RARCH_CTL_SET_UPS_PREF, NULL);
-            retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_UPS_PREF);
+            retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_UPS_PREF, NULL);
             break;
 
          case RA_OPT_IPS:
             path_set(RARCH_PATH_IPS, optarg);
             rarch_ctl(RARCH_CTL_SET_IPS_PREF, NULL);
-            retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_IPS_PREF);
+            retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_IPS_PREF, NULL);
             break;
 
          case RA_OPT_NO_PATCH:
@@ -950,7 +950,7 @@ static void retroarch_main_init_media(void)
          if (settings->multimedia.builtin_mediaplayer_enable)
          {
 #ifdef HAVE_FFMPEG
-            retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_LIBRETRO);
+            retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_LIBRETRO, NULL);
             retroarch_set_current_core_type(CORE_TYPE_FFMPEG, false);
 #endif
          }
@@ -959,7 +959,7 @@ static void retroarch_main_init_media(void)
       case RARCH_CONTENT_IMAGE:
          if (settings->multimedia.builtin_imageviewer_enable)
          {
-            retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_LIBRETRO);
+            retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_LIBRETRO, NULL);
             retroarch_set_current_core_type(CORE_TYPE_IMAGEVIEWER, false);
          }
          break;
@@ -1329,7 +1329,7 @@ bool retroarch_override_setting_is_set(enum rarch_override_setting enum_idx)
    return false;
 }
 
-void retroarch_override_setting_set(enum rarch_override_setting enum_idx)
+void retroarch_override_setting_set(enum rarch_override_setting enum_idx, void *data)
 {
    switch (enum_idx)
    {
diff --git a/retroarch.h b/retroarch.h
index 6c2cbb3b34..0f5190b3e4 100644
--- a/retroarch.h
+++ b/retroarch.h
@@ -157,7 +157,7 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data);
 int retroarch_get_capabilities(enum rarch_capabilities type,
       char *s, size_t len);
 
-void retroarch_override_setting_set(enum rarch_override_setting enum_idx);
+void retroarch_override_setting_set(enum rarch_override_setting enum_idx, void *data);
 
 void retroarch_override_setting_unset(enum rarch_override_setting enum_idx);