diff --git a/cheevos/cheevos.c b/cheevos/cheevos.c
index 6f4ae6d4da..2c461c4d3e 100644
--- a/cheevos/cheevos.c
+++ b/cheevos/cheevos.c
@@ -549,7 +549,6 @@ static bool rcheevos_timer_check(void* userdata)
 
 bool rcheevos_unload(void)
 {
-   bool running          = false;
    settings_t* settings  = config_get_ptr();
 
 #ifdef HAVE_THREADS
@@ -639,7 +638,7 @@ static void rcheevos_toggle_hardcore_achievements(rcheevos_locals_t *locals)
    }
 }
 
-static void rcheevos_activate_leaderboards()
+static void rcheevos_activate_leaderboards(void)
 {
    rcheevos_ralboard_t* leaderboard = rcheevos_locals.game.leaderboards;
    const settings_t* settings = config_get_ptr();
@@ -782,7 +781,7 @@ static void rcheevos_toggle_hardcore_active(rcheevos_locals_t* locals)
 
          /* Reactivate leaderboards */
          if (locals->leaderboards_enabled)
-            rcheevos_activate_leaderboards(locals);
+            rcheevos_activate_leaderboards();
 
          /* reset the game */
          command_event(CMD_EVENT_RESET, NULL);
@@ -811,7 +810,7 @@ static void rcheevos_toggle_hardcore_active(rcheevos_locals_t* locals)
          CHEEVOS_LOG(RCHEEVOS_TAG "Hardcore paused\n");
 
          /* deactivate leaderboards */
-         rcheevos_deactivate_leaderboards(locals);
+         rcheevos_deactivate_leaderboards();
       }
 
       /* re-init rewind */
diff --git a/cheevos/cheevos_client.c b/cheevos/cheevos_client.c
index 26675434fb..571fa7aac0 100644
--- a/cheevos/cheevos_client.c
+++ b/cheevos/cheevos_client.c
@@ -587,7 +587,6 @@ static void rcheevos_client_login(const char* username, const char* password, co
    }
    else
    {
-      const rcheevos_locals_t* rcheevos_locals = get_rcheevos_locals();
       rc_api_login_request_t api_params;
 
       memset(&api_params, 0, sizeof(api_params));
@@ -649,7 +648,6 @@ void rcheevos_client_identify_game(const char* hash, rcheevos_client_callback ca
    }
    else
    {
-      const rcheevos_locals_t* rcheevos_locals = get_rcheevos_locals();
       rc_api_resolve_hash_request_t api_params;
 
       memset(&api_params, 0, sizeof(api_params));
diff --git a/cheevos/cheevos_menu.c b/cheevos/cheevos_menu.c
index 5d3c4230ab..741b86e459 100644
--- a/cheevos/cheevos_menu.c
+++ b/cheevos/cheevos_menu.c
@@ -431,7 +431,6 @@ void rcheevos_menu_populate(void* data)
    menu_displaylist_info_t* info            = (menu_displaylist_info_t*)data;
    rcheevos_locals_t* rcheevos_locals       = get_rcheevos_locals();
    const settings_t* settings               = config_get_ptr();
-   const bool cheevos_test_unofficial       = settings->bools.cheevos_test_unofficial;
    unsigned num_locked                      = 0;
    unsigned num_unlocked                    = 0;
    unsigned num_recently_unlocked           = 0;