diff --git a/command.c b/command.c
index a378a97de9..5eaccec478 100644
--- a/command.c
+++ b/command.c
@@ -1899,9 +1899,10 @@ bool command_event(enum event_command cmd, void *data)
          break;
       case CMD_EVENT_LOAD_CORE:
       {
+	 bool success   = false;
          subsystem_size = 0;
          content_clear_subsystem();
-         bool success = command_event(CMD_EVENT_LOAD_CORE_PERSIST, NULL);
+         success = command_event(CMD_EVENT_LOAD_CORE_PERSIST, NULL);
          (void)success;
 
 #ifndef HAVE_DYNAMIC
diff --git a/dynamic.c b/dynamic.c
index bacbefde07..fda8622334 100644
--- a/dynamic.c
+++ b/dynamic.c
@@ -185,6 +185,7 @@ static bool environ_cb_get_system_info(unsigned cmd, void *data)
       case RETRO_ENVIRONMENT_SET_SUBSYSTEM_INFO:
       {
          unsigned i, j;
+         unsigned size = i;
          const struct retro_subsystem_info *info =
             (const struct retro_subsystem_info*)data;
          subsystem_size = 0;
@@ -206,7 +207,6 @@ static bool environ_cb_get_system_info(unsigned cmd, void *data)
          }
 
          RARCH_LOG("Subsystems: %d\n", i);
-         unsigned size = i;
 
          if (system)
          {