diff --git a/deps/glslang/glslang/SPIRV/GlslangToSpv.cpp b/deps/glslang/glslang/SPIRV/GlslangToSpv.cpp
index 0d64834e55..14dd24cb33 100755
--- a/deps/glslang/glslang/SPIRV/GlslangToSpv.cpp
+++ b/deps/glslang/glslang/SPIRV/GlslangToSpv.cpp
@@ -1901,7 +1901,7 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
         // Map the operation to a binary
         binOp = node->getOp();
         reduceComparison = false;
-        switch (node->getOp()) {
+        switch (binOp) {
         case glslang::EOpVectorEqual:     binOp = glslang::EOpVectorEqual;      break;
         case glslang::EOpVectorNotEqual:  binOp = glslang::EOpVectorNotEqual;   break;
         default:                          binOp = node->getOp();                break;
diff --git a/deps/glslang/glslang/hlsl/hlslParseables.cpp b/deps/glslang/glslang/hlsl/hlslParseables.cpp
index cc847ae22f..8470ca0de5 100755
--- a/deps/glslang/glslang/hlsl/hlslParseables.cpp
+++ b/deps/glslang/glslang/hlsl/hlslParseables.cpp
@@ -376,7 +376,6 @@ glslang::TString& AppendTypeName(glslang::TString& s, const char* argOrder, cons
 inline bool IsValid(const char* cname, char retOrder, char retType, char argOrder, char argType, int dim0, int dim1)
 {
     const bool isVec = (argOrder == 'V');
-    const bool isMat = (argOrder == 'M');
 
     const std::string name(cname);
 
@@ -387,10 +386,10 @@ inline bool IsValid(const char* cname, char retOrder, char retType, char argOrde
     if (!IsTextureType(argOrder) && (isVec && dim0 == 1)) // avoid vec1
         return false;
 
-    if (UseHlslTypes) {
-        // NO further restrictions for HLSL
-    } else {
+    if (!UseHlslTypes)
+    {
         // GLSL parser restrictions
+        const bool isMat = (argOrder == 'M');
         if ((isMat && (argType == 'I' || argType == 'U' || argType == 'B')) ||
             (retOrder == 'M' && (retType == 'I' || retType == 'U' || retType == 'B')))
             return false;
diff --git a/deps/rcheevos/src/rcheevos/condset.c b/deps/rcheevos/src/rcheevos/condset.c
index c7c7e6dd6b..07cd06a2b9 100644
--- a/deps/rcheevos/src/rcheevos/condset.c
+++ b/deps/rcheevos/src/rcheevos/condset.c
@@ -185,7 +185,6 @@ static int rc_test_condset_internal(rc_condset_t* self, int processing_pause, rc
   measured_value.type = RC_VALUE_TYPE_NONE;
   measured_from_hits = 0;
   can_measure = 1;
-  total_hits = 0;
 
   eval_state->primed = 1;
   set_valid = 1;
diff --git a/gfx/video_shader_parse.c b/gfx/video_shader_parse.c
index 780704ba94..d6e9352c7a 100644
--- a/gfx/video_shader_parse.c
+++ b/gfx/video_shader_parse.c
@@ -1621,7 +1621,6 @@ static bool override_shader_values(config_file_t *override_conf,
 {
    unsigned i;
    bool return_val                     = false;
-   struct config_entry_list *entry     = NULL;
 
    if (!shader || !override_conf) 
       return 0;
@@ -1634,7 +1633,7 @@ static bool override_shader_values(config_file_t *override_conf,
       for (i = 0; i < shader->num_parameters; i++)
       {
          /* If the parameter is in the reference config */
-         if ((entry = config_get_entry(
+         if ((config_get_entry(
                      override_conf, shader->parameters[i].id)))
          {
             struct video_shader_parameter *parameter = 
@@ -1675,7 +1674,7 @@ static bool override_shader_values(config_file_t *override_conf,
       for (i = 0; i < shader->luts; i++)
       {
          /* If the texture is defined in the reference config */
-         if ((entry = config_get_entry(override_conf, shader->lut[i].id)))
+         if (config_get_entry(override_conf, shader->lut[i].id))
          {
             /* Texture path from shader the config */
             config_get_path(override_conf, shader->lut[i].id,
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index dd7775794d..c3372f777f 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -4577,13 +4577,10 @@ static int action_ok_core_updater_list(const char *path,
 static void cb_net_generic_subdir(retro_task_t *task,
       void *task_data, void *user_data, const char *err)
 {
+   http_transfer_data_t *data   = (http_transfer_data_t*)task_data;
 #if 0
    char subdir_path[PATH_MAX_LENGTH];
-#endif
-   http_transfer_data_t *data   = (http_transfer_data_t*)task_data;
    file_transfer_t *state       = (file_transfer_t*)user_data;
-
-#if 0
    subdir_path[0]               = '\0';
 #endif
 
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index c91802d24d..129d837cfe 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -5188,7 +5188,6 @@ static void xmb_frame(void *data, video_frame_info_t *video_info)
    float pseudo_font_length                = 0.0f;
    xmb_handle_t *xmb                       = (xmb_handle_t*)data;
    settings_t *settings                    = config_get_ptr();
-   unsigned xmb_system_tab                 = xmb_get_system_tab(xmb, (unsigned)xmb->categories_selection_ptr);
    bool fade_tab_icons                     = false;
    float fade_tab_icons_x_threshold        = 0.0f;
    bool menu_core_enable                   = settings->bools.menu_core_enable;
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 2727a86c7e..63adef38ec 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -2390,7 +2390,6 @@ static int menu_displaylist_parse_database_entry(menu_handle_t *menu,
    database_info_list_t *db_info       = NULL;
    bool show_advanced_settings         = settings->bools.menu_show_advanced_settings;
    const char *dir_playlist            = settings->paths.directory_playlist;
-   const char *menu_driver             = menu_driver_ident();
 
    playlist_config.capacity            = COLLECTION_SIZE;
    playlist_config.old_format          = settings->bools.playlist_use_old_format;
diff --git a/retroarch.c b/retroarch.c
index 7c4e48ea2d..ba09b3ee07 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -1744,19 +1744,16 @@ bool command_event(enum event_command cmd, void *data)
          }
          break;
       case CMD_EVENT_LOAD_CORE:
-         {
-            bool success                        = false;
-            runloop_st->subsystem_current_count = 0;
-            content_clear_subsystem();
+         runloop_st->subsystem_current_count = 0;
+         content_clear_subsystem();
 #ifdef HAVE_DYNAMIC
-            if (!(command_event(CMD_EVENT_LOAD_CORE_PERSIST, NULL)))
-               return false;
+         if (!(command_event(CMD_EVENT_LOAD_CORE_PERSIST, NULL)))
+            return false;
 #else
-            command_event(CMD_EVENT_LOAD_CORE_PERSIST, NULL);
-            command_event(CMD_EVENT_QUIT, NULL);
+         command_event(CMD_EVENT_LOAD_CORE_PERSIST, NULL);
+         command_event(CMD_EVENT_QUIT, NULL);
 #endif
-            break;
-         }
+         break;
 #if defined(HAVE_RUNAHEAD) && (defined(HAVE_DYNAMIC) || defined(HAVE_DYLIB))
       case CMD_EVENT_LOAD_SECOND_CORE:
          if (!runloop_st->core_running ||
diff --git a/tasks/task_database.c b/tasks/task_database.c
index f835ab3791..6df5c3ef1c 100644
--- a/tasks/task_database.c
+++ b/tasks/task_database.c
@@ -257,11 +257,10 @@ static int task_database_cue_get_serial(const char *name, char* serial)
    char track_path[PATH_MAX_LENGTH];
    uint64_t offset                  = 0;
    uint64_t size                    = 0;
-   int rv                           = 0;
 
    track_path[0]                    = '\0';
 
-   if ((rv = cue_find_track(name, true, &offset, &size, track_path, sizeof(track_path))) < 0)
+   if ((cue_find_track(name, true, &offset, &size, track_path, sizeof(track_path))) < 0)
    {
 #ifdef DEBUG
       RARCH_LOG("%s: %s\n",