diff --git a/deps/7zip/Bcj2.c b/deps/7zip/Bcj2.c
index 9a0046a650..576f19eac8 100644
--- a/deps/7zip/Bcj2.c
+++ b/deps/7zip/Bcj2.c
@@ -8,8 +8,10 @@
 
 #define CProb UInt16
 
+#undef  kTopValue
 #define kTopValue ((UInt32)1 << 24)
 #define kNumModelBits 11
+#undef  kBitModelTotal
 #define kBitModelTotal (1 << kNumModelBits)
 #define kNumMoveBits 5
 
diff --git a/deps/7zip/LzmaEnc.c b/deps/7zip/LzmaEnc.c
index ab544877aa..add67fd9f2 100644
--- a/deps/7zip/LzmaEnc.c
+++ b/deps/7zip/LzmaEnc.c
@@ -973,7 +973,8 @@ MY_NO_INLINE static void MY_FAST_CALL LenPriceEnc_UpdateTables(
   printf("\n MovePos %u", num);
   #endif
 */
-  
+
+#undef  MOVE_POS
 #define MOVE_POS(p, num) { \
     p->additionalOffset += (num); \
     p->matchFinder.Skip(p->matchFinderObj, (UInt32)(num)); }
diff --git a/gfx/drivers_font/gdi_font.c b/gfx/drivers_font/gdi_font.c
index aad33f5c5b..324e627b4b 100644
--- a/gfx/drivers_font/gdi_font.c
+++ b/gfx/drivers_font/gdi_font.c
@@ -89,6 +89,7 @@ static void gdi_render_msg(
       const char *msg,
       const struct font_params *params)
 {
+   char* msg_local;
    float x, y, scale, drop_mod, drop_alpha;
    int drop_x, drop_y, msg_strlen;
    unsigned i;
@@ -142,8 +143,7 @@ static void gdi_render_msg(
       blue       = video_msg_color_b * 255.0f;
    }
 
-   char* msg_local = utf8_to_local_string_alloc(msg);
-
+   msg_local  = utf8_to_local_string_alloc(msg);
    msg_strlen = strlen(msg_local);
 
    GetTextExtentPoint32(font->gdi->memDC, msg_local, msg_strlen, &textSize);
diff --git a/gfx/widgets/gfx_widget_leaderboard_display.c b/gfx/widgets/gfx_widget_leaderboard_display.c
index c548eb9419..ad86d2066f 100644
--- a/gfx/widgets/gfx_widget_leaderboard_display.c
+++ b/gfx/widgets/gfx_widget_leaderboard_display.c
@@ -108,7 +108,7 @@ static void gfx_widget_leaderboard_display_frame(void* data, void* userdata)
       gfx_display_set_alpha(p_dispwidget->backdrop_orig, DEFAULT_BACKDROP);
       gfx_display_set_alpha(pure_white, 1.0f);
 
-      for (i = 0; i < state->count; ++i)
+      for (i = 0; i < (unsigned)state->count; ++i)
       {
          const unsigned widget_width = state->info[i].width;
          x                           = video_width - widget_width - spacing;
diff --git a/runtime_file.c b/runtime_file.c
index 69cca281bb..18df986cad 100644
--- a/runtime_file.c
+++ b/runtime_file.c
@@ -1138,7 +1138,6 @@ bool runtime_log_has_last_played(runtime_log_t *runtime_log)
 /* Saves specified runtime log to disk */
 void runtime_log_save(runtime_log_t *runtime_log)
 {
-   int n;
    char value_string[64]; /* 64 characters should be
                              enough for a very long runtime... :) */
    RFILE *file            = NULL;