diff --git a/cheat_manager.c b/cheat_manager.c
index be87cb0f34..8ff4a5d891 100644
--- a/cheat_manager.c
+++ b/cheat_manager.c
@@ -709,15 +709,15 @@ static bool cheat_manager_get_game_specific_filename(
       bool saving)
 {
    char s1[PATH_MAX_LENGTH];
-   struct retro_system_info system_info;
+   struct retro_system_info sysinfo;
    runloop_state_t *runloop_st = runloop_state_get_ptr();
    const char *core_name       = NULL;
    const char *game_name       = NULL;
 
-   if (!core_get_system_info(&system_info))
+   if (!core_get_system_info(&sysinfo))
       return false;
 
-   core_name = system_info.library_name;
+   core_name = sysinfo.library_name;
    game_name = path_basename_nocompression(runloop_st->name.cheatfile);
 
    if (     string_is_empty(path_cheat_database)
diff --git a/cheevos/cheevos.c b/cheevos/cheevos.c
index b594598ab6..659c63fc4d 100644
--- a/cheevos/cheevos.c
+++ b/cheevos/cheevos.c
@@ -1152,13 +1152,13 @@ void rcheevos_validate_config_settings(void)
 {
    int i;
    const rc_disallowed_setting_t 
-      *disallowed_settings          = NULL;
-   core_option_manager_t* coreopts  = NULL;
-   struct retro_system_info *system = 
+      *disallowed_settings           = NULL;
+   core_option_manager_t* coreopts   = NULL;
+   struct retro_system_info *sysinfo = 
       &runloop_state_get_ptr()->system.info;
    const settings_t* settings = config_get_ptr();
 
-   if (!system->library_name || !rcheevos_locals.hardcore_active)
+   if (!sysinfo->library_name || !rcheevos_locals.hardcore_active)
       return;
 
    if (!settings->bools.video_frame_delay_auto && settings->uints.video_frame_delay != 0) {
@@ -1172,7 +1172,7 @@ void rcheevos_validate_config_settings(void)
    }
 
    if (!(disallowed_settings 
-            = rc_libretro_get_disallowed_settings(system->library_name)))
+            = rc_libretro_get_disallowed_settings(sysinfo->library_name)))
       return;
 
    if (!retroarch_ctl(RARCH_CTL_CORE_OPTIONS_LIST_GET, &coreopts))
@@ -1197,14 +1197,14 @@ void rcheevos_validate_config_settings(void)
    }
 
    if (rcheevos_locals.game.console_id &&
-      !rc_libretro_is_system_allowed(system->library_name, rcheevos_locals.game.console_id))
+      !rc_libretro_is_system_allowed(sysinfo->library_name, rcheevos_locals.game.console_id))
    {
       char buffer[256];
       buffer[0] = '\0';
       /* TODO/FIXME - localize */
       snprintf(buffer, sizeof(buffer),
             "Hardcore paused. You cannot earn hardcore achievements for %s using %s",
-            rc_console_name(rcheevos_locals.game.console_id), system->library_name);
+            rc_console_name(rcheevos_locals.game.console_id), sysinfo->library_name);
       CHEEVOS_LOG(RCHEEVOS_TAG "%s\n", buffer);
       rcheevos_pause_hardcore();
 
diff --git a/cheevos/cheevos_client.c b/cheevos/cheevos_client.c
index 24844b97bf..1e8251cfbf 100644
--- a/cheevos/cheevos_client.c
+++ b/cheevos/cheevos_client.c
@@ -168,18 +168,18 @@ void rcheevos_get_user_agent(rcheevos_locals_t *locals,
       char *buffer, size_t len)
 {
    char* ptr;
-   struct retro_system_info *system = &runloop_state_get_ptr()->system.info;
+   struct retro_system_info *sysinfo = &runloop_state_get_ptr()->system.info;
 
    /* if we haven't calculated the non-changing portion yet, do so now
     * [retroarch version + os version] */
    if (!locals->user_agent_prefix[0])
    {
       const frontend_ctx_driver_t *frontend = frontend_get_ptr();
-      int major, minor;
-      char tmp[64];
 
       if (frontend && frontend->get_os)
       {
+         char tmp[64];
+         int major, minor;
          frontend->get_os(tmp, sizeof(tmp), &major, &minor);
          snprintf(locals->user_agent_prefix, sizeof(locals->user_agent_prefix),
             "RetroArch/%s (%s %d.%d)", PACKAGE_VERSION, tmp, major, minor);
@@ -193,7 +193,7 @@ void rcheevos_get_user_agent(rcheevos_locals_t *locals,
    ptr = buffer + strlcpy(buffer, locals->user_agent_prefix, len);
 
    /* if a core is loaded, append its information */
-   if (system && !string_is_empty(system->library_name))
+   if (sysinfo && !string_is_empty(sysinfo->library_name))
    {
       char* stop = buffer + len - 1;
       const char* path = path_get(RARCH_PATH_CORE);
@@ -206,12 +206,12 @@ void rcheevos_get_user_agent(rcheevos_locals_t *locals,
          ptr += strlen(ptr);
       }
       else
-         ptr += append_no_spaces(ptr, stop, system->library_name);
+         ptr += append_no_spaces(ptr, stop, sysinfo->library_name);
 
-      if (system->library_version)
+      if (sysinfo->library_version)
       {
          *ptr++ = '/';
-         ptr += append_no_spaces(ptr, stop, system->library_version);
+         ptr += append_no_spaces(ptr, stop, sysinfo->library_version);
       }
    }
 
diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c
index 417b8228e8..19123da733 100644
--- a/menu/cbs/menu_cbs_deferred_push.c
+++ b/menu/cbs/menu_cbs_deferred_push.c
@@ -444,11 +444,11 @@ static int general_push(menu_displaylist_info_t *info,
    {
       case PUSH_ARCHIVE_OPEN:
          {
-            struct retro_system_info *system = 
+            struct retro_system_info *sysinfo = 
                &runloop_state_get_ptr()->system.info;
-            if (system)
-               if (!string_is_empty(system->valid_extensions))
-                  strlcpy(newstring2, system->valid_extensions,
+            if (sysinfo)
+               if (!string_is_empty(sysinfo->valid_extensions))
+                  strlcpy(newstring2, sysinfo->valid_extensions,
                         sizeof(newstring2));
          }
          break;
@@ -458,9 +458,9 @@ static int general_push(menu_displaylist_info_t *info,
 
             if (menu_setting_get_browser_selection_type(info->setting) != ST_DIR)
             {
-               struct retro_system_info *system = &runloop_state_get_ptr()->system.info;
-               if (system && !string_is_empty(system->valid_extensions))
-                  valid_extensions = system->valid_extensions;
+               struct retro_system_info *sysinfo = &runloop_state_get_ptr()->system.info;
+               if (sysinfo && !string_is_empty(sysinfo->valid_extensions))
+                  valid_extensions = sysinfo->valid_extensions;
             }
 
             if (!valid_extensions)
@@ -493,26 +493,26 @@ static int general_push(menu_displaylist_info_t *info,
          {
             union string_list_elem_attr attr;
             char newstring[PATH_MAX_LENGTH];
-            struct string_list str_list2     = {0};
-            struct retro_system_info *system = 
+            struct string_list str_list2      = {0};
+            struct retro_system_info *sysinfo = 
                &runloop_state_get_ptr()->system.info;
-            bool filter_by_current_core      = settings->bools.filter_by_current_core;
+            bool filter_by_current_core       = settings->bools.filter_by_current_core;
 
-            newstring[0]                     = '\0';
-            attr.i                           = 0;
+            newstring[0]                      = '\0';
+            attr.i                            = 0;
 
             string_list_initialize(&str_list2);
 
-            if (system)
+            if (sysinfo)
             {
-               if (!string_is_empty(system->valid_extensions))
+               if (!string_is_empty(sysinfo->valid_extensions))
                {
                   unsigned x;
                   struct string_list  str_list    = {0};
 
                   string_list_initialize(&str_list);
                   string_split_noalloc(&str_list,
-                        system->valid_extensions, "|");
+                        sysinfo->valid_extensions, "|");
 
                   for (x = 0; x < str_list.size; x++)
                   {
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 2de8752c5d..34adcc8467 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -1214,8 +1214,8 @@ int generic_action_ok_displaylist_push(const char *path,
          break;
       case ACTION_OK_DL_REMAP_FILE:
          {
-            struct retro_system_info *system = &runloop_state_get_ptr()->system.info;
-            const char *core_name            = system ? system->library_name : NULL;
+            struct retro_system_info *sysinfo = &runloop_state_get_ptr()->system.info;
+            const char *core_name             = sysinfo ? sysinfo->library_name : NULL;
 
             if (!string_is_empty(core_name) && !string_is_empty(settings->paths.directory_input_remapping))
             {
@@ -1235,8 +1235,8 @@ int generic_action_ok_displaylist_push(const char *path,
          break;
       case ACTION_OK_DL_OVERRIDE_FILE:
          {
-            struct retro_system_info *system = &runloop_state_get_ptr()->system.info;
-            const char *core_name            = system ? system->library_name : NULL;
+            struct retro_system_info *sysinfo = &runloop_state_get_ptr()->system.info;
+            const char *core_name             = sysinfo ? sysinfo->library_name : NULL;
 
             if (!string_is_empty(core_name))
             {
@@ -2870,7 +2870,7 @@ static int action_ok_load_cdrom(const char *path,
       const char *label, unsigned type, size_t idx, size_t entry_idx)
 {
 #ifdef HAVE_CDROM
-   struct retro_system_info *system;
+   struct retro_system_info *sysinfo;
 
    if (!cdrom_drive_has_media(label[0]))
    {
@@ -2884,9 +2884,9 @@ static int action_ok_load_cdrom(const char *path,
       return -1;
    }
 
-   system = &runloop_state_get_ptr()->system.info;
+   sysinfo = &runloop_state_get_ptr()->system.info;
 
-   if (system && !string_is_empty(system->library_name))
+   if (sysinfo && !string_is_empty(sysinfo->library_name))
    {
       char cdrom_path[256] = {0};
 
@@ -5516,11 +5516,11 @@ static int action_ok_add_to_favorites(const char *path,
     * > If content path is empty, cannot do anything... */
    if (!string_is_empty(content_path))
    {
-      runloop_state_t *runloop_st      = runloop_state_get_ptr();
-      struct retro_system_info *sysinf = &runloop_st->system.info;
-      struct string_list *str_list     = NULL;
-      const char *crc32                = NULL;
-      const char *db_name              = NULL;
+      runloop_state_t *runloop_st       = runloop_state_get_ptr();
+      struct retro_system_info *sysinfo = &runloop_st->system.info;
+      struct string_list *str_list      = NULL;
+      const char *crc32                 = NULL;
+      const char *db_name               = NULL;
 
       union string_list_elem_attr attr;
       char content_label[PATH_MAX_LENGTH];
@@ -5551,7 +5551,7 @@ static int action_ok_add_to_favorites(const char *path,
                sizeof(content_label));
 
       /* > core_path + core_name */
-      if (sysinf)
+      if (sysinfo)
       {
          if (!string_is_empty(path_get(RARCH_PATH_CORE)))
          {
@@ -5570,8 +5570,8 @@ static int action_ok_add_to_favorites(const char *path,
 
          /* >> core_name (continued) */
          if (   string_is_empty(core_name) && 
-               !string_is_empty(sysinf->library_name))
-            strlcpy(core_name, sysinf->library_name, sizeof(core_name));
+               !string_is_empty(sysinfo->library_name))
+            strlcpy(core_name, sysinfo->library_name, sizeof(core_name));
       }
 
       if (string_is_empty(core_path) || string_is_empty(core_name))
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 3fb67c085d..269a273494 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -1581,13 +1581,13 @@ static unsigned menu_displaylist_parse_supported_cores(menu_displaylist_info_t *
        * it is impossible for RetroArch to populate a
        * core_info list */
 #if !defined(LOAD_WITHOUT_CORE_INFO)
-      if (!frontend_driver_get_core_extension(exts, sizeof(exts)) ||
-          string_is_empty(exts))
+      if (  !frontend_driver_get_core_extension(exts, sizeof(exts))
+          || string_is_empty(exts))
 #endif
       {
-         struct retro_system_info *sysinf = &runloop_state_get_ptr()->system.info;
-         const char *core_path            = core_path_current;
-         const char *core_name            = sysinf ? sysinf->library_name : NULL;
+         struct retro_system_info *sysinfo = &runloop_state_get_ptr()->system.info;
+         const char *core_path             = core_path_current;
+         const char *core_name             = sysinfo ? sysinfo->library_name : NULL;
 
          if (!string_is_empty(core_path))
          {
@@ -3924,15 +3924,15 @@ static int menu_displaylist_parse_horizontal_content_actions(
 
 static unsigned menu_displaylist_parse_information_list(file_list_t *info_list)
 {
-   unsigned count                   = 0;
-   core_info_t   *core_info         = NULL;
-   struct retro_system_info *sysinf = &runloop_state_get_ptr()->system.info;
+   unsigned count                    = 0;
+   core_info_t   *core_info          = NULL;
+   struct retro_system_info *sysinfo = &runloop_state_get_ptr()->system.info;
 
    core_info_get_current_core(&core_info);
 
-   if (      sysinf
-         && (!string_is_empty(sysinf->library_name)
-         &&  !string_is_equal(sysinf->library_name,
+   if (      sysinfo
+         && (!string_is_empty(sysinfo->library_name)
+         &&  !string_is_equal(sysinfo->library_name,
              msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_CORE))
          )
          && core_info
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index bb2c94ca7a..ae5b7d814a 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -3015,12 +3015,12 @@ static bool menu_shader_manager_operate_auto_preset(
    char file[PATH_MAX_LENGTH];
    settings_t *settings                           = config_get_ptr();
    bool video_shader_preset_save_reference_enable = settings->bools.video_shader_preset_save_reference_enable;
-   struct retro_system_info *system               = &runloop_state_get_ptr()->system.info;
+   struct retro_system_info *sysinfo              = &runloop_state_get_ptr()->system.info;
    static enum rarch_shader_type shader_types[]   =
    {
       RARCH_SHADER_GLSL, RARCH_SHADER_SLANG, RARCH_SHADER_CG
    };
-   const char *core_name            = system ? system->library_name : NULL;
+   const char *core_name            = sysinfo ? sysinfo->library_name : NULL;
    const char *rarch_path_basename  = path_get(RARCH_PATH_BASENAME);
    const char *auto_preset_dirs[3]  = {0};
    bool has_content                 = !string_is_empty(rarch_path_basename);
@@ -4528,14 +4528,14 @@ static const char * msvc_vercode_to_str(const unsigned vercode)
  * (shown at the top of the UI). */
 void menu_entries_get_core_title(char *s, size_t len)
 {
-   struct retro_system_info *system  = &runloop_state_get_ptr()->system.info;
+   struct retro_system_info *sysinfo = &runloop_state_get_ptr()->system.info;
    const char *core_name             = 
-       (system && !string_is_empty(system->library_name))
-      ? system->library_name
+       (sysinfo && !string_is_empty(sysinfo->library_name))
+      ? sysinfo->library_name
       : msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_CORE);
    const char *core_version          = 
-      (system && system->library_version) 
-      ? system->library_version 
+      (sysinfo && sysinfo->library_version) 
+      ? sysinfo->library_version 
       : "";
    size_t _len = strlcpy(s, PACKAGE_VERSION, len);
 #if defined(_MSC_VER)
diff --git a/network/netplay/netplay_frontend.c b/network/netplay/netplay_frontend.c
index b11e913549..01576fcf6b 100644
--- a/network/netplay/netplay_frontend.c
+++ b/network/netplay/netplay_frontend.c
@@ -518,12 +518,12 @@ static bool netplay_lan_ad_server(netplay_t *netplay)
    {
       char frontend_architecture_tmp[24];
       const frontend_ctx_driver_t *frontend_drv;
-      uint32_t has_password             = 0;
-      struct ad_packet ad_packet_buffer = {0};
-      struct retro_system_info *system  =
+      uint32_t has_password              = 0;
+      struct ad_packet ad_packet_buffer  = {0};
+      struct retro_system_info *sysinfo  =
          &runloop_state_get_ptr()->system.info;
-      struct string_list *subsystem     = path_get_subsystem_list();
-      settings_t *settings              = config_get_ptr();
+      struct string_list *subsystem      = path_get_subsystem_list();
+      settings_t *settings               = config_get_ptr();
 
       /* Make sure it's a valid query */
       if (ntohl(header) != DISCOVERY_QUERY_MAGIC)
@@ -557,9 +557,9 @@ static bool netplay_lan_ad_server(netplay_t *netplay)
          strlcpy(ad_packet_buffer.frontend, "N/A",
             sizeof(ad_packet_buffer.frontend));
 
-      strlcpy(ad_packet_buffer.core, system->library_name,
+      strlcpy(ad_packet_buffer.core, sysinfo->library_name,
          sizeof(ad_packet_buffer.core));
-      strlcpy(ad_packet_buffer.core_version, system->library_version,
+      strlcpy(ad_packet_buffer.core_version, sysinfo->library_version,
          sizeof(ad_packet_buffer.core_version));
 
       strlcpy(ad_packet_buffer.retroarch_version, PACKAGE_VERSION,
diff --git a/retroarch.c b/retroarch.c
index 359ca7221c..0124eb70ee 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2468,9 +2468,9 @@ bool command_event(enum event_command cmd, void *data)
          break;
       case CMD_EVENT_LOAD_CORE_PERSIST:
          {
-            rarch_system_info_t *sys_info    = &runloop_st->system;
-            struct retro_system_info *system = &sys_info->info;
-            const char *core_path            = path_get(RARCH_PATH_CORE);
+            rarch_system_info_t *sys_info     = &runloop_st->system;
+            struct retro_system_info *sysinfo = &sys_info->info;
+            const char *core_path             = path_get(RARCH_PATH_CORE);
 
 #if defined(HAVE_DYNAMIC)
             if (string_is_empty(core_path))
@@ -2479,7 +2479,7 @@ bool command_event(enum event_command cmd, void *data)
 
             if (!libretro_get_system_info(
                      core_path,
-                     system,
+                     sysinfo,
                      &sys_info->load_no_content))
                return false;
 
@@ -5048,15 +5048,15 @@ libretro_find_controller_description(
  *
  * Frees system information.
  **/
-void libretro_free_system_info(struct retro_system_info *info)
+void libretro_free_system_info(struct retro_system_info *sysinfo)
 {
-   if (!info)
+   if (!sysinfo)
       return;
 
-   free((void*)info->library_name);
-   free((void*)info->library_version);
-   free((void*)info->valid_extensions);
-   memset(info, 0, sizeof(*info));
+   free((void*)sysinfo->library_name);
+   free((void*)sysinfo->library_version);
+   free((void*)sysinfo->valid_extensions);
+   memset(sysinfo, 0, sizeof(*sysinfo));
 }
 
 static void retroarch_print_features(void)
diff --git a/runloop.c b/runloop.c
index 8bdbd57d10..cc4b3ddbce 100644
--- a/runloop.c
+++ b/runloop.c
@@ -594,7 +594,7 @@ static dylib_t load_dynamic_core(const char *path, char *buf,
 }
 
 static dylib_t libretro_get_system_info_lib(const char *path,
-      struct retro_system_info *info, bool *load_no_content)
+      struct retro_system_info *sysinfo, bool *load_no_content)
 {
    dylib_t lib = dylib_load(path);
    void (*proc)(struct retro_system_info*);
@@ -611,7 +611,7 @@ static dylib_t libretro_get_system_info_lib(const char *path,
       return NULL;
    }
 
-   proc(info);
+   proc(sysinfo);
 
    if (load_no_content)
    {
@@ -3506,7 +3506,7 @@ bool runloop_environment_cb(unsigned cmd, void *data)
 
 bool libretro_get_system_info(
       const char *path,
-      struct retro_system_info *info,
+      struct retro_system_info *sysinfo,
       bool *load_no_content)
 {
    struct retro_system_info dummy_info;
@@ -3557,10 +3557,10 @@ bool libretro_get_system_info(
    retro_get_system_info(&dummy_info);
 #endif
 
-   memcpy(info, &dummy_info, sizeof(*info));
+   memcpy(sysinfo, &dummy_info, sizeof(*sysinfo));
 
-   runloop_st->current_library_name[0]    = '\0';
-   runloop_st->current_library_version[0] = '\0';
+   runloop_st->current_library_name[0]     = '\0';
+   runloop_st->current_library_version[0]  = '\0';
    runloop_st->current_valid_extensions[0] = '\0';
 
    if (!string_is_empty(dummy_info.library_name))
@@ -3577,9 +3577,9 @@ bool libretro_get_system_info(
             dummy_info.valid_extensions,
             sizeof(runloop_st->current_valid_extensions));
 
-   info->library_name     = runloop_st->current_library_name;
-   info->library_version  = runloop_st->current_library_version;
-   info->valid_extensions = runloop_st->current_valid_extensions;
+   sysinfo->library_name     = runloop_st->current_library_name;
+   sysinfo->library_version  = runloop_st->current_library_version;
+   sysinfo->valid_extensions = runloop_st->current_valid_extensions;
 
 #ifdef HAVE_DYNAMIC
    dylib_close(lib);
@@ -7626,12 +7626,12 @@ bool core_load_game(retro_ctx_load_content_info_t *load_info)
    return false;
 }
 
-bool core_get_system_info(struct retro_system_info *system)
+bool core_get_system_info(struct retro_system_info *sysinfo)
 {
    runloop_state_t *runloop_st  = &runloop_state;
-   if (!system)
+   if (!sysinfo)
       return false;
-   runloop_st->current_core.retro_get_system_info(system);
+   runloop_st->current_core.retro_get_system_info(sysinfo);
    return true;
 }
 
@@ -7874,7 +7874,7 @@ void runloop_path_set_redirect(settings_t *settings,
    char new_savefile_dir[PATH_MAX_LENGTH];
    char new_savestate_dir[PATH_MAX_LENGTH];
    runloop_state_t *runloop_st                 = &runloop_state;
-   struct retro_system_info *system            = &runloop_st->system.info;
+   struct retro_system_info *sysinfo           = &runloop_st->system.info;
    bool sort_savefiles_enable                  = settings->bools.sort_savefiles_enable;
    bool sort_savefiles_by_content_enable       = settings->bools.sort_savefiles_by_content_enable;
    bool sort_savestates_enable                 = settings->bools.sort_savestates_enable;
@@ -7898,10 +7898,10 @@ void runloop_path_set_redirect(settings_t *settings,
             runloop_st->runtime_content_path_basename,
             sizeof(content_dir_name));
 
-   if (system && !string_is_empty(system->library_name))
+   if (sysinfo && !string_is_empty(sysinfo->library_name))
    {
 #ifdef HAVE_MENU
-      if (!string_is_equal(system->library_name,
+      if (!string_is_equal(sysinfo->library_name,
                msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_CORE)))
 #endif
       {
@@ -7923,7 +7923,7 @@ void runloop_path_set_redirect(settings_t *settings,
                fill_pathname_join(
                      new_savefile_dir,
                      new_savefile_dir,
-                     system->library_name,
+                     sysinfo->library_name,
                      sizeof(new_savefile_dir));
 
             /* If path doesn't exist, try to create it,
@@ -7956,7 +7956,7 @@ void runloop_path_set_redirect(settings_t *settings,
                fill_pathname_join(
                      new_savestate_dir,
                      new_savestate_dir,
-                     system->library_name,
+                     sysinfo->library_name,
                      sizeof(new_savestate_dir));
 
             /* If path doesn't exist, try to create it.
@@ -8018,7 +8018,7 @@ void runloop_path_set_redirect(settings_t *settings,
    }
 #endif
 
-   if (system && !string_is_empty(system->library_name))
+   if (sysinfo && !string_is_empty(sysinfo->library_name))
    {
       bool savefile_is_dir  = path_is_directory(new_savefile_dir);
       bool savestate_is_dir = path_is_directory(new_savestate_dir);
@@ -8043,7 +8043,7 @@ void runloop_path_set_redirect(settings_t *settings,
          fill_pathname_dir(runloop_st->name.savefile,
                !string_is_empty(runloop_st->runtime_content_path_basename)
                ? runloop_st->runtime_content_path_basename
-               : system->library_name,
+               : sysinfo->library_name,
                FILE_PATH_SRM_EXTENSION,
                sizeof(runloop_st->name.savefile));
          RARCH_LOG("[Overrides]: %s \"%s\".\n",
@@ -8056,13 +8056,13 @@ void runloop_path_set_redirect(settings_t *settings,
          fill_pathname_dir(runloop_st->name.savestate,
                !string_is_empty(runloop_st->runtime_content_path_basename)
                ? runloop_st->runtime_content_path_basename
-               : system->library_name,
+               : sysinfo->library_name,
                FILE_PATH_STATE_EXTENSION,
                sizeof(runloop_st->name.savestate));
          fill_pathname_dir(runloop_st->name.replay,
                !string_is_empty(runloop_st->runtime_content_path_basename)
                ? runloop_st->runtime_content_path_basename
-               : system->library_name,
+               : sysinfo->library_name,
                FILE_PATH_BSV_EXTENSION,
                sizeof(runloop_st->name.replay));
          RARCH_LOG("[Overrides]: %s \"%s\".\n",
@@ -8076,7 +8076,7 @@ void runloop_path_set_redirect(settings_t *settings,
          fill_pathname_dir(runloop_st->name.cheatfile,
                !string_is_empty(runloop_st->runtime_content_path_basename)
                ? runloop_st->runtime_content_path_basename
-               : system->library_name,
+               : sysinfo->library_name,
                FILE_PATH_CHT_EXTENSION,
                sizeof(runloop_st->name.cheatfile));
          RARCH_LOG("[Overrides]: %s \"%s\".\n",
diff --git a/tasks/task_content.c b/tasks/task_content.c
index af1b44c787..14de793d57 100644
--- a/tasks/task_content.c
+++ b/tasks/task_content.c
@@ -1561,8 +1561,8 @@ static void task_push_to_history_list(
          || (flags & CONTENT_ST_FLAG_CORE_DOES_NOT_NEED_CONTENT))
    {
       char tmp[PATH_MAX_LENGTH];
-      const char *path_content       = path_get(RARCH_PATH_CONTENT);
-      struct retro_system_info *info = &runloop_st->system.info;
+      const char *path_content          = path_get(RARCH_PATH_CONTENT);
+      struct retro_system_info *sysinfo = &runloop_st->system.info;
 
       if (!string_is_empty(path_content))
       {
@@ -1581,7 +1581,7 @@ static void task_push_to_history_list(
          menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUICK_MENU, NULL);
 #endif
 
-      if (info && !string_is_empty(tmp))
+      if (sysinfo && !string_is_empty(tmp))
       {
          const char *core_path      = NULL;
          const char *core_name      = NULL;
@@ -1627,7 +1627,7 @@ static void task_push_to_history_list(
                   core_name         = core_info->display_name;
 
                if (string_is_empty(core_name))
-                  core_name         = info->library_name;
+                  core_name         = sysinfo->library_name;
 
                if (launched_from_companion_ui)
                {
@@ -2530,19 +2530,19 @@ static bool task_load_content_internal(
 
    if (sys_info)
    {
-      struct retro_system_info *system        = &runloop_st->system.info;
+      struct retro_system_info *sysinfo       = &runloop_st->system.info;
 
       if (set_supports_no_game_enable)
          content_ctx.flags |= CONTENT_INFO_FLAG_SET_SUPPORTS_NO_GAME_ENABLE;
 
       if (!string_is_empty(path_dir_cache))
          content_ctx.directory_cache          = strdup(path_dir_cache);
-      if (!string_is_empty(system->valid_extensions))
-         content_ctx.valid_extensions         = strdup(system->valid_extensions);
+      if (!string_is_empty(sysinfo->valid_extensions))
+         content_ctx.valid_extensions         = strdup(sysinfo->valid_extensions);
 
-      if (system->block_extract)
+      if (sysinfo->block_extract)
          content_ctx.flags |= CONTENT_INFO_FLAG_BLOCK_EXTRACT;
-      if (system->need_fullpath)
+      if (sysinfo->need_fullpath)
          content_ctx.flags |= CONTENT_INFO_FLAG_NEED_FULLPATH;
 
       content_ctx.subsystem.data              = sys_info->subsystem.data;
@@ -3040,7 +3040,7 @@ bool content_init(void)
 
    if (sys_info)
    {
-      struct retro_system_info *system = &runloop_st->system.info;
+      struct retro_system_info *sysinfo = &runloop_st->system.info;
 
       if (set_supports_no_game_enable)
          content_ctx.flags            |= CONTENT_INFO_FLAG_SET_SUPPORTS_NO_GAME_ENABLE;
@@ -3049,12 +3049,12 @@ bool content_init(void)
          content_ctx.directory_system  = strdup(path_dir_system);
       if (!string_is_empty(path_dir_cache))
          content_ctx.directory_cache   = strdup(path_dir_cache);
-      if (!string_is_empty(system->valid_extensions))
-         content_ctx.valid_extensions  = strdup(system->valid_extensions);
+      if (!string_is_empty(sysinfo->valid_extensions))
+         content_ctx.valid_extensions  = strdup(sysinfo->valid_extensions);
 
-      if (system->block_extract)
+      if (sysinfo->block_extract)
          content_ctx.flags            |= CONTENT_INFO_FLAG_BLOCK_EXTRACT;
-      if (system->need_fullpath)
+      if (sysinfo->need_fullpath)
          content_ctx.flags            |= CONTENT_INFO_FLAG_NEED_FULLPATH;
 
       content_ctx.subsystem.data       = sys_info->subsystem.data;
diff --git a/tasks/task_netplay_find_content.c b/tasks/task_netplay_find_content.c
index 08cfee0f15..2bf46cbca2 100644
--- a/tasks/task_netplay_find_content.c
+++ b/tasks/task_netplay_find_content.c
@@ -751,7 +751,7 @@ bool task_push_netplay_crc_scan(uint32_t crc, const char *content,
    const char *pbasename, *pcontent, *psubsystem;
    core_info_list_t         *coreinfos = NULL;
    settings_t               *settings  = config_get_ptr();
-   struct retro_system_info *system    = &runloop_state_get_ptr()->system.info;
+   struct retro_system_info *sysinfo    = &runloop_state_get_ptr()->system.info;
 
    /* Do not run more than one CRC scan task at a time. */
    if (scan_state.running)
@@ -841,7 +841,7 @@ bool task_push_netplay_crc_scan(uint32_t crc, const char *content,
          string_list_clone(path_get_subsystem_list());
 
    data->current.core_loaded =
-      string_is_equal_case_insensitive(system->library_name, core);
+      string_is_equal_case_insensitive(sysinfo->library_name, core);
 
    scan_state.state   = STATE_NONE;
    scan_state.running = true;
diff --git a/tasks/task_screenshot.c b/tasks/task_screenshot.c
index f32d363913..80bcdbe692 100644
--- a/tasks/task_screenshot.c
+++ b/tasks/task_screenshot.c
@@ -233,7 +233,6 @@ static bool screenshot_dump(
       bool use_thread,
       unsigned pixel_format_type)
 {
-   struct retro_system_info system_info;
    uint8_t *buf                   = NULL;
    settings_t *settings           = config_get_ptr();
    bool history_list_enable       = settings->bools.history_list_enable;
@@ -310,16 +309,17 @@ static bool screenshot_dump(
 
             if (path_is_empty(RARCH_PATH_CONTENT))
             {
-               if (!core_get_system_info(&system_info))
+               struct retro_system_info sysinfo;
+               if (!core_get_system_info(&sysinfo))
                {
                   free(state);
                   return false;
                }
 
-               if (string_is_empty(system_info.library_name))
+               if (string_is_empty(sysinfo.library_name))
                   screenshot_name = "RetroArch";
                else
-                  screenshot_name = system_info.library_name;
+                  screenshot_name = sysinfo.library_name;
             }
             else
                screenshot_name = path_basename_nocompression(name_base);
diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m
index 6a38b60784..213cade792 100644
--- a/ui/drivers/ui_cocoa.m
+++ b/ui/drivers/ui_cocoa.m
@@ -840,9 +840,9 @@ static ui_application_t ui_application_cocoa = {
 {
    if ((filenames.count == 1) && [filenames objectAtIndex:0])
    {
-      struct retro_system_info *system = &runloop_state_get_ptr()->system.info;
-      NSString *__core                 = [filenames objectAtIndex:0];
-      const char *core_name            = system->library_name;
+      struct retro_system_info *sysinfo = &runloop_state_get_ptr()->system.info;
+      NSString *__core                  = [filenames objectAtIndex:0];
+      const char *core_name             = sysinfo->library_name;
 
       if (core_name)
       {
@@ -907,8 +907,8 @@ static void open_core_handler(ui_browser_window_state_t *state, bool result)
 static void open_document_handler(
       ui_browser_window_state_t *state, bool result)
 {
-   struct retro_system_info *system = &runloop_state_get_ptr()->system.info;
-   const char            *core_name = system ? system->library_name : NULL;
+   struct retro_system_info *sysinfo = &runloop_state_get_ptr()->system.info;
+   const char            *core_name  = sysinfo ? sysinfo->library_name : NULL;
 
    if (!state || string_is_empty(state->result))
       return;
diff --git a/ui/drivers/ui_qt.cpp b/ui/drivers/ui_qt.cpp
index cd6d5337ac..6fd692f3a4 100644
--- a/ui/drivers/ui_qt.cpp
+++ b/ui/drivers/ui_qt.cpp
@@ -3600,10 +3600,10 @@ void MainWindow::onStopClicked()
 
 void MainWindow::setCurrentCoreLabel()
 {
-   bool update                      = false;
-   struct retro_system_info *system = &runloop_state_get_ptr()->system.info;
-   QString libraryName              = system->library_name;
-   const char *no_core_str          = msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_CORE);
+   bool update                       = false;
+   struct retro_system_info *sysinfo = &runloop_state_get_ptr()->system.info;
+   QString libraryName               = sysinfo->library_name;
+   const char *no_core_str           = msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_CORE);
 
    if (     (m_statusLabel->text().isEmpty())
          || (m_currentCore != no_core_str && libraryName.isEmpty())
@@ -3617,8 +3617,8 @@ void MainWindow::setCurrentCoreLabel()
    {
       if (m_currentCore != libraryName && !libraryName.isEmpty())
       {
-         m_currentCore        = system->library_name;
-         m_currentCoreVersion = (string_is_empty(system->library_version) ? "" : system->library_version);
+         m_currentCore        = sysinfo->library_name;
+         m_currentCoreVersion = (string_is_empty(sysinfo->library_version) ? "" : sysinfo->library_version);
          update = true;
       }
    }