diff --git a/libretro-common/formats/cdfs/cdfs.c b/libretro-common/formats/cdfs/cdfs.c
index 96cc9b9386..f826dcd482 100644
--- a/libretro-common/formats/cdfs/cdfs.c
+++ b/libretro-common/formats/cdfs/cdfs.c
@@ -111,8 +111,9 @@ void cdfs_seek_sector(cdfs_file_t* file, unsigned int sector)
 
 static int cdfs_find_file(cdfs_file_t* file, const char* path)
 {
+   size_t path_length;
+   int sector;
    uint8_t buffer[2048], *tmp;
-   int sector, path_length;
    const char* slash = strrchr(path, '\\');
 
    if (slash)
diff --git a/libretro-common/formats/png/rpng.c b/libretro-common/formats/png/rpng.c
index 3d8ced1c13..7bdc435aee 100644
--- a/libretro-common/formats/png/rpng.c
+++ b/libretro-common/formats/png/rpng.c
@@ -144,7 +144,6 @@ static INLINE uint32_t dword_be(const uint8_t *buf)
 #if defined(DEBUG) || defined(RPNG_TEST)
 static bool png_process_ihdr(struct png_ihdr *ihdr)
 {
-   unsigned i;
    uint8_t ihdr_depth = ihdr->depth;
 
    switch (ihdr->color_type)
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index f8d5d1080b..46bbf1e028 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -5997,7 +5997,7 @@ static int action_ok_push_dropdown_item_video_shader_num_pass(const char *path,
    if (!shader)
       return menu_cbs_exit();
 
-   shader->passes              = idx;
+   shader->passes              = (unsigned)idx;
 
    video_shader_resolve_parameters(shader);
 
diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c
index b86bf4335a..30874ba9de 100644
--- a/menu/cbs/menu_cbs_sublabel.c
+++ b/menu/cbs/menu_cbs_sublabel.c
@@ -1373,7 +1373,7 @@ static int action_bind_sublabel_playlist_entry(
    /* Check whether runtime info is valid */
    if (entry->runtime_status == PLAYLIST_RUNTIME_VALID)
    {
-      int n = 0;
+      size_t n = 0;
       char tmp[64];
 
       tmp[0  ] = '\n';
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index c194be6be8..c3216f2dda 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -6682,8 +6682,10 @@ static int xmb_list_push(void *data, void *userdata,
    bool menu_show_dump_disc        = settings->bools.menu_show_dump_disc;
    bool menu_show_shutdown         = settings->bools.menu_show_shutdown;
    bool menu_show_reboot           = settings->bools.menu_show_reboot;
+#if !defined(IOS)
    bool menu_show_quit_retroarch   = settings->bools.menu_show_quit_retroarch;
    bool menu_show_restart_ra       = settings->bools.menu_show_restart_retroarch;
+#endif
    bool menu_show_information      = settings->bools.menu_show_information;
    bool menu_show_help             = settings->bools.menu_show_help;
    bool kiosk_mode_enable          = settings->bools.kiosk_mode_enable;
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 0b8565f1f0..7809127804 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -3696,7 +3696,7 @@ static unsigned menu_displaylist_parse_content_information(
    bool content_loaded                 = false;
    bool playlist_valid                 = false;
    unsigned count                      = 0;
-   int n                               = 0;
+   size_t n                            = 0;
    char core_name[PATH_MAX_LENGTH];
    char tmp[8192];
 
diff --git a/runtime_file.c b/runtime_file.c
index 491e011db2..a3fff4d1a2 100644
--- a/runtime_file.c
+++ b/runtime_file.c
@@ -659,7 +659,7 @@ void runtime_log_get_last_played_str(runtime_log_t *runtime_log,
    char tmp[64];
    bool has_am_pm         = false;
    const char *format_str = "";
-   int n                  = 0;
+   size_t n               = 0;
 
    tmp[0] = '\0';