diff --git a/cores/dynamic_dummy.c b/cores/dynamic_dummy.c
index 65d76a4c7b..9edc06d74d 100644
--- a/cores/dynamic_dummy.c
+++ b/cores/dynamic_dummy.c
@@ -67,7 +67,7 @@ void libretro_dummy_retro_init(void)
 #if defined(HAVE_MENU) && defined(HAVE_RGUI)
    settings_t *settings = config_get_ptr();
 #endif
-   uint32_t i;
+   unsigned i;
 
    /* Sensible defaults */
    frame_buf_width = 320;
@@ -95,7 +95,7 @@ void libretro_dummy_retro_init(void)
 #endif
 
    dummy_frame_buf = (uint16_t*)calloc(frame_buf_width * frame_buf_height, sizeof(uint16_t));
-   for (i = 0; i < frame_buf_width * frame_buf_height; i++)
+   for (i = 0; i < (unsigned)(frame_buf_width * frame_buf_height); i++)
       dummy_frame_buf[i] = 4 << 5;
 }
 
diff --git a/libretro-common/formats/xml/rxml.c b/libretro-common/formats/xml/rxml.c
index 7701d7c98b..430d51ceb1 100644
--- a/libretro-common/formats/xml/rxml.c
+++ b/libretro-common/formats/xml/rxml.c
@@ -146,28 +146,31 @@ static char *strdup_range_escape(const char *begin, const char *end)
 
 static struct rxml_attrib_node *rxml_parse_attrs(const char *str)
 {
-   char *copy = strdup(str);
+   const char *elem;
+   struct rxml_attrib_node *list = NULL;
+   struct rxml_attrib_node *tail = NULL;
+   char *attrib                  = NULL;
+   char *value                   = NULL;
+   char *last_char               = NULL;
+   char *save                    = NULL;
+   char *copy                    = strdup(str);
    if (!copy)
       return NULL;
 
-   char *last_char = copy + strlen(copy) - 1;
+   last_char = copy + strlen(copy) - 1;
    if (*last_char == '/')
       *last_char = '\0';
 
-   struct rxml_attrib_node *list = NULL;
-   struct rxml_attrib_node *tail = NULL;
-
-   char *attrib = NULL;
-   char *value = NULL;
-   char *save;
-   const char *elem = strtok_r(copy, " \n\t\f\v\r", &save);
+   elem = strtok_r(copy, " \n\t\f\v\r", &save);
    while (elem)
    {
+      const char *end;
+      struct rxml_attrib_node *new_node;
       const char *eq = strstr(elem, "=\"");
       if (!eq)
          goto end;
 
-      const char *end = strrchr(eq + 2, '\"');
+      end = strrchr(eq + 2, '\"');
       if (!end || end != (elem + strlen(elem) - 1))
          goto end;
 
@@ -176,15 +179,15 @@ static struct rxml_attrib_node *rxml_parse_attrs(const char *str)
       if (!attrib || !value)
          goto end;
 
-      struct rxml_attrib_node *new_node =
+      new_node =
          (struct rxml_attrib_node*)calloc(1, sizeof(*new_node));
       if (!new_node)
          goto end;
 
       new_node->attrib = attrib;
       new_node->value  = value;
-      attrib = NULL;
-      value = NULL;
+      attrib           = NULL;
+      value            = NULL;
 
       if (tail)
       {
@@ -217,10 +220,11 @@ static char *find_first_space(const char *str)
 
 static bool rxml_parse_tag(struct rxml_node *node, const char *str)
 {
+   const char *name_end;
    const char *str_ptr = str;
    rxml_skip_spaces(&str_ptr);
 
-   const char *name_end = find_first_space(str_ptr);
+   name_end = find_first_space(str_ptr);
    if (name_end)
    {
       node->name = strdup_range(str_ptr, name_end);
@@ -375,15 +379,18 @@ error:
 
 static char *purge_xml_comments(const char *str)
 {
-   size_t len = strlen(str);
+   char *copy_dest;
+   const char *copy_src;
+   size_t len    = strlen(str);
    char *new_str = (char*)malloc(len + 1);
    if (!new_str)
       return NULL;
 
-   new_str[len] = '\0';
+   new_str[len]          = '\0';
+
+   copy_dest             = new_str;
+   copy_src              = str;
 
-   char *copy_dest       = new_str;
-   const char *copy_src  = str;
    for (;;)
    {
       ptrdiff_t copy_len;
@@ -411,6 +418,7 @@ static char *purge_xml_comments(const char *str)
 
 rxml_document_t *rxml_load_document(const char *path)
 {
+   rxml_document_t *doc;
    char *memory_buffer     = NULL;
    char *new_memory_buffer = NULL;
    const char *mem_ptr     = NULL;
@@ -421,7 +429,7 @@ rxml_document_t *rxml_load_document(const char *path)
    if (!file)
       return NULL;
 
-   rxml_document_t *doc = (rxml_document_t*)calloc(1, sizeof(*doc));
+   doc = (rxml_document_t*)calloc(1, sizeof(*doc));
    if (!doc)
       goto error;
 
diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c
index eb1ba1056f..c748d96a67 100644
--- a/menu/drivers/rgui.c
+++ b/menu/drivers/rgui.c
@@ -2164,8 +2164,8 @@ static bool rgui_set_aspect_ratio(rgui_t *rgui, bool delay_update)
 
 static void *rgui_init(void **userdata, bool video_is_threaded)
 {
+   unsigned new_font_height;
    size_t fb_pitch, start;
-   unsigned fb_width, fb_height, new_font_height;
    rgui_t               *rgui = NULL;
    bool                   ret = false;
    settings_t *settings       = config_get_ptr();