diff --git a/libretro-common/formats/bmp/rbmp.c b/libretro-common/formats/bmp/rbmp.c
index 1e7eaa9349..96ea616509 100644
--- a/libretro-common/formats/bmp/rbmp.c
+++ b/libretro-common/formats/bmp/rbmp.c
@@ -113,7 +113,10 @@ static unsigned char *rbmp__convert_format(
       {
          case ((1)*8+(2)):
             for(i=x-1; i >= 0; --i, src += 1, dest += 2)
-               dest[0]=src[0], dest[1]=255;
+            {
+               dest[0]=src[0];
+               dest[1]=255;
+            }
             break;
          case ((1)*8+(3)):
             for(i=x-1; i >= 0; --i, src += 1, dest += 3)
@@ -121,7 +124,10 @@ static unsigned char *rbmp__convert_format(
             break;
          case ((1)*8+(4)):
             for(i=x-1; i >= 0; --i, src += 1, dest += 4)
-               dest[0]=dest[1]=dest[2]=src[0], dest[3]=255;
+            {
+               dest[0]=dest[1]=dest[2]=src[0];
+               dest[3]=255;
+            }
             break;
          case ((2)*8+(1)):
             for(i=x-1; i >= 0; --i, src += 2, dest += 1)
@@ -133,11 +139,19 @@ static unsigned char *rbmp__convert_format(
             break;
          case ((2)*8+(4)):
             for(i=x-1; i >= 0; --i, src += 2, dest += 4)
-               dest[0]=dest[1]=dest[2]=src[0], dest[3]=src[1];
+            {
+               dest[0]=dest[1]=dest[2]=src[0];
+               dest[3]=src[1];
+            }
             break;
          case ((3)*8+(4)):
             for(i=x-1; i >= 0; --i, src += 3, dest += 4)
-               dest[0]=src[0],dest[1]=src[1],dest[2]=src[2],dest[3]=255;
+            {
+               dest[0]=src[0];
+               dest[1]=src[1];
+               dest[2]=src[2];
+               dest[3]=255;
+            }
             break;
          case ((3)*8+(1)):
             for(i=x-1; i >= 0; --i, src += 3, dest += 1)
@@ -157,7 +171,11 @@ static unsigned char *rbmp__convert_format(
             break;
          case ((4)*8+(3)):
             for(i=x-1; i >= 0; --i, src += 4, dest += 3)
-               dest[0]=src[0],dest[1]=src[1],dest[2]=src[2];
+            {
+               dest[0]=src[0];
+               dest[1]=src[1];
+               dest[2]=src[2];
+            }
             break;
          default:
             break;
@@ -176,11 +194,31 @@ static int rbmp__high_bit(unsigned int z)
    int n=0;
    if (z == 0)
       return -1;
-   if (z >= 0x10000) n += 16, z >>= 16;
-   if (z >= 0x00100) n +=  8, z >>=  8;
-   if (z >= 0x00010) n +=  4, z >>=  4;
-   if (z >= 0x00004) n +=  2, z >>=  2;
-   if (z >= 0x00002) n +=  1, z >>=  1;
+   if (z >= 0x10000)
+   {
+      n += 16;
+      z >>= 16;
+   }
+   if (z >= 0x00100)
+   {
+      n +=  8;
+      z >>=  8;
+   }
+   if (z >= 0x00010)
+   {
+      n +=  4;
+      z >>=  4;
+   }
+   if (z >= 0x00004)
+   {
+      n +=  2;
+      z >>=  2;
+   }
+   if (z >= 0x00002)
+   {
+      n +=  1;
+      z >>=  1;
+   }
    return n;
 }
 
@@ -525,7 +563,9 @@ static unsigned char *rbmp__bmp_load(rbmp__context *s, unsigned *x, unsigned *y,
          unsigned char *p2 = out + (s->img_y-1-j)*s->img_x*target;
          for (i=0; i < (int) s->img_x*target; ++i)
          {
-            t = p1[i], p1[i] = p2[i], p2[i] = t;
+            t     = p1[i];
+            p1[i] = p2[i];
+            p2[i] = t;
          }
       }
    }
diff --git a/libretro-common/formats/jpeg/rjpeg.c b/libretro-common/formats/jpeg/rjpeg.c
index 0b1f7ea2c6..9ef95e4f08 100644
--- a/libretro-common/formats/jpeg/rjpeg.c
+++ b/libretro-common/formats/jpeg/rjpeg.c
@@ -2523,7 +2523,10 @@ static uint8_t *rjpeg_load_jpeg_image(rjpeg__jpeg *z,
                out[i] = y[i];
          else
             for (i=0; i < z->s->img_x; ++i)
-               *out++ = y[i], *out++ = 255;
+            {
+               *out++ = y[i];
+               *out++ = 255;
+            }
       }
    }
 
diff --git a/libretro-common/formats/tga/rtga.c b/libretro-common/formats/tga/rtga.c
index c96e7ba8f4..f66b2926e0 100644
--- a/libretro-common/formats/tga/rtga.c
+++ b/libretro-common/formats/tga/rtga.c
@@ -117,7 +117,10 @@ static unsigned char *rtga__convert_format(
       {
          case ((1)*8+(2)):
             for(i=x-1; i >= 0; --i, src += 1, dest += 2)
-               dest[0]=src[0], dest[1]=255;
+            {
+               dest[0]=src[0];
+               dest[1]=255;
+            }
             break;
          case ((1)*8+(3)):
             for(i=x-1; i >= 0; --i, src += 1, dest += 3)
@@ -141,7 +144,12 @@ static unsigned char *rtga__convert_format(
             break;
          case ((3)*8+(4)):
             for(i=x-1; i >= 0; --i, src += 3, dest += 4)
-               dest[0]=src[0],dest[1]=src[1],dest[2]=src[2],dest[3]=255;
+            {
+               dest[0]=src[0];
+               dest[1]=src[1];
+               dest[2]=src[2];
+               dest[3]=255;
+            }
             break;
          case ((3)*8+(1)):
             for(i=x-1; i >= 0; --i, src += 3, dest += 1)
@@ -161,7 +169,11 @@ static unsigned char *rtga__convert_format(
             break;
          case ((4)*8+(3)):
             for(i=x-1; i >= 0; --i, src += 4, dest += 3)
-               dest[0]=src[0],dest[1]=src[1],dest[2]=src[2];
+            {
+               dest[0]=src[0];
+               dest[1]=src[1];
+               dest[2]=src[2];
+            }
             break;
          default:
             break;
diff --git a/libretro-common/string/stdstring.c b/libretro-common/string/stdstring.c
index 6e1555dbfe..71b2ea2442 100644
--- a/libretro-common/string/stdstring.c
+++ b/libretro-common/string/stdstring.c
@@ -109,7 +109,10 @@ char *string_trim_whitespace_left(char *const s)
       char *cur  = s;
 
       while(*cur && isspace((unsigned char)*cur))
-         ++cur, --len;
+      {
+         ++cur;
+         --len;
+      }
 
       if(s != cur)
          memmove(s, cur, len + 1);
@@ -128,7 +131,10 @@ char *string_trim_whitespace_right(char *const s)
       char  *cur = s + len - 1;
 
       while(cur != s && isspace((unsigned char)*cur))
-         --cur, --len;
+      {
+         --cur;
+         --len;
+      }
 
       cur[isspace((unsigned char)*cur) ? 0 : 1] = '\0';
    }