diff --git a/configuration.c b/configuration.c
index bbad0dce67..0da74b1174 100644
--- a/configuration.c
+++ b/configuration.c
@@ -3331,7 +3331,6 @@ static bool config_load_file(global_t *global,
 {
    unsigned i;
    char tmp_str[PATH_MAX_LENGTH];
-   bool tmp_bool                                   = false;
    static bool first_load                          = true;
    unsigned msg_color                              = 0;
    char *save                                      = NULL;
@@ -3439,7 +3438,8 @@ static bool config_load_file(global_t *global,
    for (i = 0; i < MAX_USERS; i++)
    {
       char tmp[64];
-      size_t _len = strlcpy(tmp, "network_remote_enable_user_p", sizeof(tmp));
+      bool tmp_bool = false;
+      size_t _len   = strlcpy(tmp, "network_remote_enable_user_p", sizeof(tmp));
       snprintf(tmp + _len, sizeof(tmp) - _len, "%u", i + 1);
 
       if (config_get_bool(conf, tmp, &tmp_bool))
diff --git a/intl/msg_hash_ja.c b/intl/msg_hash_ja.c
index 98a0019c95..245b28eccf 100644
--- a/intl/msg_hash_ja.c
+++ b/intl/msg_hash_ja.c
@@ -22,7 +22,6 @@
 #include <string/stdstring.h>
 
 #include "../msg_hash.h"
-#include "../configuration.h"
 #include "../verbosity.h"
 
 #if defined(_MSC_VER) && !defined(_XBOX)
@@ -35,8 +34,6 @@
 
 int msg_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len)
 {
-   settings_t *settings = config_get_ptr();
-
    if (msg <= MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_END &&
          msg >= MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_BEGIN)
    {
diff --git a/intl/msg_hash_ko.c b/intl/msg_hash_ko.c
index 2dff284814..b32c08713d 100644
--- a/intl/msg_hash_ko.c
+++ b/intl/msg_hash_ko.c
@@ -22,7 +22,6 @@
 #include <string/stdstring.h>
 
 #include "../msg_hash.h"
-#include "../configuration.h"
 #include "../verbosity.h"
 
 #if defined(_MSC_VER) && !defined(_XBOX)
@@ -35,8 +34,6 @@
 
 int msg_hash_get_help_ko_enum(enum msg_hash_enums msg, char *s, size_t len)
 {
-    settings_t *settings = config_get_ptr();
-
     if (msg <= MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_END &&
         msg >= MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_BEGIN)
     {
diff --git a/intl/msg_hash_pl.c b/intl/msg_hash_pl.c
index 3cca07cfdc..78eb948fa8 100644
--- a/intl/msg_hash_pl.c
+++ b/intl/msg_hash_pl.c
@@ -21,7 +21,6 @@
 #include <string/stdstring.h>
 
 #include "../msg_hash.h"
-#include "../configuration.h"
 #include "../verbosity.h"
 
 #if defined(_MSC_VER) && !defined(_XBOX) && (_MSC_VER >= 1500 && _MSC_VER < 1900)
diff --git a/runahead.c b/runahead.c
index ca5884f985..0a544e6f02 100644
--- a/runahead.c
+++ b/runahead.c
@@ -1137,10 +1137,10 @@ void runahead_run(void *data,
    bool suspended_frame    = false;
 #if defined(HAVE_DYNAMIC) || defined(HAVE_DYLIB)
    const bool have_dynamic = true;
+   settings_t *settings    = config_get_ptr();
 #else
    const bool have_dynamic = false;
 #endif
-   settings_t *settings    = config_get_ptr();
    video_driver_state_t 
       *video_st            = video_state_get_ptr();
    uint64_t frame_count    = video_st->frame_count;
diff --git a/runloop.c b/runloop.c
index 47bb35af38..c15853dabe 100644
--- a/runloop.c
+++ b/runloop.c
@@ -3446,8 +3446,8 @@ bool runloop_init_libretro_symbols(
 #ifdef HAVE_DYNAMIC
    /* the library handle for use with the SYMBOL macro */
    dylib_t lib_handle_local;
-#endif
    runloop_state_t *runloop_st = (runloop_state_t*)data;
+#endif
 
    switch (type)
    {