diff --git a/audio/librsound.c b/audio/librsound.c
index fb23914180..0eaa106ce0 100644
--- a/audio/librsound.c
+++ b/audio/librsound.c
@@ -700,11 +700,11 @@ static ssize_t rsnd_recv_chunk(int socket, void *buf, size_t size, int blocking)
 
 static int rsnd_poll(struct pollfd *fd, int numfd, int timeout)
 {
-   for(;;)
+   for (;;)
    {
-      if ( socketpoll(fd, numfd, timeout) < 0 )
+      if (socketpoll(fd, numfd, timeout) < 0)
       {
-         if ( errno == EINTR )
+         if (errno == EINTR)
             continue;
 
          perror("poll");
@@ -938,15 +938,15 @@ static int rsnd_close_ctl(rsound_t *rd)
    int index = 0;
    char buf[RSD_PROTO_MAXSIZE*2] = {0};
 
-   for(;;)
+   for (;;)
    {
-      if ( rsnd_poll(&fd, 1, 2000) < 0 )
+      if (rsnd_poll(&fd, 1, 2000) < 0)
          return -1;
 
-      if ( fd.revents & POLLHUP )
+      if (fd.revents & POLLHUP)
          break;
 
-      else if ( fd.revents & POLLIN )
+      if (fd.revents & POLLIN)
       {
          const char *subchar;
 
@@ -1102,7 +1102,7 @@ static void rsnd_thread ( void * thread_data )
    /* Two (;;) for loops! :3 Beware! */
    for (;;)
    {
-      for(;;)
+      for (;;)
       {
          _TEST_CANCEL();
 
diff --git a/ctr/gpu_old.c b/ctr/gpu_old.c
index 249418387e..c6688b4a05 100644
--- a/ctr/gpu_old.c
+++ b/ctr/gpu_old.c
@@ -219,19 +219,19 @@ void GPU_SetAttributeBuffers(
 	param[0x1] = attributeFormats & 0xFFFFFFFF;
 	param[0x2] = ((totalAttributes-1) << 28) | ((attributeMask & 0xFFF) << 16) | ((attributeFormats >> 32) & 0xFFFF);
 
-	for(i = 0; i < totalAttributes; i++)
+	for (i = 0; i < totalAttributes; i++)
 	{
 		u8 v               = attributeFormats & 0xF;
 		sizeTable[i]       = GPU_FORMATSIZE[v & 3]*((v>>2)+1);
 		attributeFormats >>= 4;
 	}
 
-	for(i=0;i<numBuffers;i++)
+	for (i = 0; i < numBuffers; i++)
 	{
 		u16 stride       = 0;
 		param[3*(i+1)+0] = bufferOffsets[i];
 		param[3*(i+1)+1] = bufferPermutations[i] & 0xFFFFFFFF;
-		for(j = 0; j < bufferNumAttributes[i]; j++)
+		for (j = 0; j < bufferNumAttributes[i]; j++)
          stride += sizeTable[(bufferPermutations[i]>>(4*j)) & 0xF];
 
 		param[3*(i+1)+2] = (bufferNumAttributes[i] << 28) | ((stride & 0xFFF)<< 16) | ((bufferPermutations[i] >> 32) & 0xFFFF);
diff --git a/frontend/drivers/platform_ps3.c b/frontend/drivers/platform_ps3.c
index 7dbc14bc9b..15ccfdb498 100644
--- a/frontend/drivers/platform_ps3.c
+++ b/frontend/drivers/platform_ps3.c
@@ -457,7 +457,7 @@ static int frontend_ps3_exec_exitspawn(const char *path,
    SceNpDrmKey *license_data = NULL;
 #endif
 
-   for(i = 0; i < sizeof(spawn_data); ++i)
+   for (i = 0; i < sizeof(spawn_data); ++i)
       spawn_data[i] = i & 0xff;
 
 #ifndef __PSL1GHT__
diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c
index 4fd6df514a..6c886d28f1 100644
--- a/gfx/drivers/gl.c
+++ b/gfx/drivers/gl.c
@@ -4228,7 +4228,7 @@ unsigned *height_p, size_t *pitch_p)
    {
       unsigned i;
 
-      for(i = 0; i < height ; i++)
+      for (i = 0; i < height ; i++)
          memcpy((uint8_t*)buffer + i * pitch,
             (uint8_t*)buffer_texture + (height - 1 - i) * pitch, pitch);
 
diff --git a/gfx/drivers/sdl2_gfx.c b/gfx/drivers/sdl2_gfx.c
index c82d8fc427..259366cc94 100644
--- a/gfx/drivers/sdl2_gfx.c
+++ b/gfx/drivers/sdl2_gfx.c
@@ -395,7 +395,7 @@ static void *sdl2_gfx_init(const video_info_t *video,
    }
 
    RARCH_LOG("[SDL2]: Available displays:\n");
-   for(i = 0; i < SDL_GetNumVideoDisplays(); ++i)
+   for (i = 0; i < SDL_GetNumVideoDisplays(); ++i)
    {
       SDL_DisplayMode mode;
 
diff --git a/gfx/drivers/switch_gfx.c b/gfx/drivers/switch_gfx.c
index 2efacecf50..e5b5cb48d1 100644
--- a/gfx/drivers/switch_gfx.c
+++ b/gfx/drivers/switch_gfx.c
@@ -170,11 +170,9 @@ static bool switch_frame(void *data, const void *frame,
    centery                = (720-tgth)/2;
 
    /* clear image to black */
-   for(y = 0; y < 720; y++)
-   {
-      for(x = 0; x < 1280; x++)
+   for (y = 0; y < 720; y++)
+      for (x = 0; x < 1280; x++)
          sw->image[y*1280+x] = 0xFF000000;
-   }
 
    if(width > 0 && height > 0)
    {
diff --git a/gfx/drivers/vga_gfx.c b/gfx/drivers/vga_gfx.c
index bb2dfa370b..67d1000b16 100644
--- a/gfx/drivers/vga_gfx.c
+++ b/gfx/drivers/vga_gfx.c
@@ -339,17 +339,17 @@ static void vga_set_texture_frame(void *data,
       {
          unsigned short *video_frame = (unsigned short*)frame;
 
-         for(y = 0; y < VGA_HEIGHT; y++)
+         for (y = 0; y < VGA_HEIGHT; y++)
          {
-            for(x = 0; x < VGA_WIDTH; x++)
+            for (x = 0; x < VGA_WIDTH; x++)
             {
                /* scale incoming frame to fit the screen */
-               unsigned scaled_x = (width * x) / VGA_WIDTH;
-               unsigned scaled_y = (height * y) / VGA_HEIGHT;
+               unsigned scaled_x    = (width * x) / VGA_WIDTH;
+               unsigned scaled_y    = (height * y) / VGA_HEIGHT;
                unsigned short pixel = video_frame[width * scaled_y + scaled_x];
-               unsigned r = ((pixel & 0xF000) >> 13);
-               unsigned g = ((pixel & 0xF00) >> 9);
-               unsigned b = ((pixel & 0xF0) >> 6);
+               unsigned r           = ((pixel & 0xF000) >> 13);
+               unsigned g           = ((pixel & 0xF00) >> 9);
+               unsigned b           = ((pixel & 0xF0) >> 6);
                vga->vga_menu_frame[VGA_WIDTH * y + x] = (b << 6) | (g << 3) | r;
             }
          }
diff --git a/gfx/drivers_display/gfx_display_vita2d.c b/gfx/drivers_display/gfx_display_vita2d.c
index f2c1f443eb..8b72490fa9 100644
--- a/gfx/drivers_display/gfx_display_vita2d.c
+++ b/gfx/drivers_display/gfx_display_vita2d.c
@@ -87,39 +87,40 @@ static void gfx_display_vita2d_viewport(gfx_display_ctx_draw_t *draw,
 static void gfx_display_vita2d_draw(gfx_display_ctx_draw_t *draw,
       void *data, unsigned video_width, unsigned video_height)
 {
-    unsigned i;
-    struct vita2d_texture *texture   = NULL;
-    const float *vertex              = NULL;
-    const float *tex_coord           = NULL;
-    const float *color               = NULL;
-    vita_video_t             *vita2d = (vita_video_t*)data;
+   unsigned i;
+   struct vita2d_texture *texture   = NULL;
+   const float *vertex              = NULL;
+   const float *tex_coord           = NULL;
+   const float *color               = NULL;
+   vita_video_t             *vita2d = (vita_video_t*)data;
 
-    if (!vita2d || !draw)
+   if (!vita2d || !draw)
       return;
 
-    texture            = (struct vita2d_texture*)draw->texture;
-    vertex             = draw->coords->vertex;
-    tex_coord          = draw->coords->tex_coord;
-    color              = draw->coords->color;
+   texture            = (struct vita2d_texture*)draw->texture;
+   vertex             = draw->coords->vertex;
+   tex_coord          = draw->coords->tex_coord;
+   color              = draw->coords->color;
 
-    if (!vertex)
-       vertex          = gfx_display_vita2d_get_default_vertices();
-    if (!tex_coord)
-       tex_coord       = gfx_display_vita2d_get_default_tex_coords();
-    if (!draw->coords->lut_tex_coord)
-       draw->coords->lut_tex_coord = gfx_display_vita2d_get_default_tex_coords();
-    if (!texture)
-       return;
-    if (!color)
-       color           = gfx_display_vita2d_get_default_color();
+   if (!vertex)
+      vertex          = gfx_display_vita2d_get_default_vertices();
+   if (!tex_coord)
+      tex_coord       = gfx_display_vita2d_get_default_tex_coords();
+   if (!draw->coords->lut_tex_coord)
+      draw->coords->lut_tex_coord = gfx_display_vita2d_get_default_tex_coords();
+   if (!texture)
+      return;
+   if (!color)
+      color           = gfx_display_vita2d_get_default_color();
 
-    gfx_display_vita2d_viewport(draw, vita2d);
-   
-    vita2d_texture_tint_vertex *vertices = (vita2d_texture_tint_vertex *)vita2d_pool_memalign(
-	   draw->coords->vertices * sizeof(vita2d_texture_tint_vertex),
-		sizeof(vita2d_texture_tint_vertex));
+   gfx_display_vita2d_viewport(draw, vita2d);
 
-    for(i = 0; i < draw->coords->vertices; i++){
+   vita2d_texture_tint_vertex *vertices = (vita2d_texture_tint_vertex *)vita2d_pool_memalign(
+         draw->coords->vertices * sizeof(vita2d_texture_tint_vertex),
+         sizeof(vita2d_texture_tint_vertex));
+
+   for (i = 0; i < draw->coords->vertices; i++)
+   {
       vertices[i].x = *vertex++;
       vertices[i].y = *vertex++;
       vertices[i].z = 1.0f;
@@ -129,16 +130,16 @@ static void gfx_display_vita2d_draw(gfx_display_ctx_draw_t *draw,
       vertices[i].g = *color++;
       vertices[i].b = *color++;
       vertices[i].a = *color++;
-    }
+   }
 
    switch (draw->pipeline_id)
    {
-     default:
-     {
-        vita2d_draw_array_textured_mat(texture, vertices, draw->coords->vertices, gfx_display_vita2d_get_default_mvp(vita2d));
-        break;
-     }
-  }
+      default:
+         {
+            vita2d_draw_array_textured_mat(texture, vertices, draw->coords->vertices, gfx_display_vita2d_get_default_mvp(vita2d));
+            break;
+         }
+   }
 }
 
 static void gfx_display_vita2d_draw_pipeline(gfx_display_ctx_draw_t *draw,
@@ -155,9 +156,9 @@ static void gfx_display_vita2d_clear_color(
    if (!clearcolor)
       return;
    vita2d_set_clear_color(RGBA8((int)(clearcolor->r*255.f),
-                                (int)(clearcolor->g*255.f),
-                                (int)(clearcolor->b*255.f),
-                                (int)(clearcolor->a*255.f)));
+            (int)(clearcolor->g*255.f),
+            (int)(clearcolor->b*255.f),
+            (int)(clearcolor->a*255.f)));
    vita2d_draw_rectangle(0,0,PSP_FB_WIDTH,PSP_FB_HEIGHT, vita2d_get_clear_color());
 }
 
@@ -167,7 +168,7 @@ static bool gfx_display_vita2d_font_init_first(
       bool is_threaded)
 {
    font_data_t **handle = (font_data_t**)font_handle;
-   *handle = font_driver_init_first(video_data,
+   *handle              = font_driver_init_first(video_data,
          font_path, font_size, true,
          is_threaded,
          FONT_DRIVER_RENDER_VITA2D);
diff --git a/gfx/drivers_display/gfx_display_wiiu.c b/gfx/drivers_display/gfx_display_wiiu.c
index 60b9cf12b2..17e075a051 100644
--- a/gfx/drivers_display/gfx_display_wiiu.c
+++ b/gfx/drivers_display/gfx_display_wiiu.c
@@ -92,6 +92,7 @@ static void gfx_display_wiiu_draw(gfx_display_ctx_draw_t *draw,
    /* TODO come up with a better check for "not all vertexes are the same color" */
    else if (draw->coords->vertex || draw->coords->color[0] != draw->coords->color[12])
    {
+      int i;
       if (wiiu->vertex_cache_tex.current + 4 > wiiu->vertex_cache_tex.size)
          return;
 
@@ -157,7 +158,7 @@ static void gfx_display_wiiu_draw(gfx_display_ctx_draw_t *draw,
          v[3].coord.v = draw->coords->tex_coord[7];
       }
 
-      for(int i = 0; i < 4; i++)
+      for (i = 0; i < 4; i++)
       {
          v[i].color.r = draw->coords->color[(i << 2) + 0];
          v[i].color.g = draw->coords->color[(i << 2) + 1];
diff --git a/gfx/video_filters/lq2x.c b/gfx/video_filters/lq2x.c
index e00be0d29b..f406b3d8ab 100644
--- a/gfx/video_filters/lq2x.c
+++ b/gfx/video_filters/lq2x.c
@@ -111,22 +111,21 @@ static void lq2x_generic_rgb565(unsigned width, unsigned height,
    uint16_t *out0 = (uint16_t*)dst;
    uint16_t *out1 = (uint16_t*)(dst + dst_stride);
 
-   for(y = 0; y < height; y++)
+   for (y = 0; y < height; y++)
    {
       int prevline = (y == 0 ? 0 : src_stride);
       int nextline = (y == height - 1 || last) ? 0 : src_stride;
 
-      for(x = 0; x < width; x++)
+      for (x = 0; x < width; x++)
       {
-         uint16_t A, B, C, D, E, c;
-         A = *(src - prevline);
-         B = (x > 0) ? *(src - 1) : *src;
-         C = *src;
-         D = (x < width - 1) ? *(src + 1) : *src;
-         E = *(src++ + nextline);
-         c = C;
+         uint16_t A = *(src - prevline);
+         uint16_t B = (x > 0) ? *(src - 1) : *src;
+         uint16_t C = *src;
+         uint16_t D = (x < width - 1) ? *(src + 1) : *src;
+         uint16_t E = *(src++ + nextline);
+         uint16_t c = C;
 
-         if(A != E && B != D)
+         if (A != E && B != D)
          {
             *out0++ = (A == B ? ((C + A - ((C ^ A) & 0x0821)) >> 1) : c);
             *out0++ = (A == D ? ((C + A - ((C ^ A) & 0x0821)) >> 1) : c);
@@ -142,7 +141,7 @@ static void lq2x_generic_rgb565(unsigned width, unsigned height,
          }
       }
 
-      src += src_stride - width;
+      src  += src_stride - width;
       out0 += dst_stride + dst_stride - (width << 1);
       out1 += dst_stride + dst_stride - (width << 1);
    }
@@ -156,12 +155,12 @@ static void lq2x_generic_xrgb8888(unsigned width, unsigned height,
    uint32_t *out0 = (uint32_t*)dst;
    uint32_t *out1 = (uint32_t*)(dst + dst_stride);
 
-   for(y = 0; y < height; y++)
+   for (y = 0; y < height; y++)
    {
       int prevline = (y == 0 ? 0 : src_stride);
       int nextline = (y == height - 1 || last) ? 0 : src_stride;
 
-      for(x = 0; x < width; x++)
+      for (x = 0; x < width; x++)
       {
          uint32_t A = *(src - prevline);
          uint32_t B = (x > 0) ? *(src - 1) : *src;
@@ -170,7 +169,7 @@ static void lq2x_generic_xrgb8888(unsigned width, unsigned height,
          uint32_t E = *(src++ + nextline);
          uint32_t c = C;
 
-         if(A != E && B != D)
+         if (A != E && B != D)
          {
             *out0++ = (A == B ? (C + A - ((C ^ A) & 0x0421)) >> 1 : c);
             *out0++ = (A == D ? (C + A - ((C ^ A) & 0x0421)) >> 1 : c);
diff --git a/input/common/hid/device_ds3.c b/input/common/hid/device_ds3.c
index 199dcb44c9..ad254dc4ac 100644
--- a/input/common/hid/device_ds3.c
+++ b/input/common/hid/device_ds3.c
@@ -98,7 +98,7 @@ static void ds3_update_pad_state(ds3_instance_t *instance)
                   (instance->data[3] << 8) |
                   ((instance->data[4] & 0x01) << 16);
 
-   for(i = 0; i < 17; i++)
+   for (i = 0; i < 17; i++)
      instance->buttons |= (pressed_keys & (1 << i)) ?
         (1 << button_mapping[i]) : 0;
 }
@@ -109,7 +109,7 @@ static void ds3_update_analog_state(ds3_instance_t *instance)
    int16_t interpolated;
    unsigned stick, axis;
 
-   for(pad_axis = 0; pad_axis < 4; pad_axis++)
+   for (pad_axis = 0; pad_axis < 4; pad_axis++)
    {
       axis         = pad_axis % 2 ? 0 : 1;
       stick        = pad_axis / 2;
diff --git a/input/drivers/gx_input.c b/input/drivers/gx_input.c
index dd3f05e4dd..a66959ab77 100644
--- a/input/drivers/gx_input.c
+++ b/input/drivers/gx_input.c
@@ -233,6 +233,7 @@ static void gx_input_poll_mouse(gx_input_t *gx)
 
    if (gx && count > 0)
    {
+      unsigned i;
       if (count != gx->mouse_max)
       {
          gx_input_mouse_t* tmp = NULL;
@@ -255,7 +256,7 @@ static void gx_input_poll_mouse(gx_input_t *gx)
          }
       }
       
-      for(unsigned i=0; i<gx->mouse_max; i++)
+      for (i = 0; i < gx->mouse_max; i++)
       {
          gx->mouse[i].x_last = gx->mouse[i].x_abs;
          gx->mouse[i].y_last = gx->mouse[i].y_abs;
diff --git a/input/drivers/qnx_input.c b/input/drivers/qnx_input.c
index 897dea31a0..80e1098108 100644
--- a/input/drivers/qnx_input.c
+++ b/input/drivers/qnx_input.c
@@ -340,10 +340,8 @@ static int qnx_discover_controllers(qnx_input_t *qnx)
    }
 
    /* Scan the list for gamepad and joystick devices. */
-   for(i = 0; i < qnx->pads_connected; ++i)
-   {
+   for (i = 0; i < qnx->pads_connected; ++i)
       qnx_init_controller(qnx, &qnx->devices[i]);
-   }
 
    qnx->pads_connected = 0;
 
@@ -423,7 +421,7 @@ static void qnx_process_touch_event(
    {
       case SCREEN_EVENT_MTOUCH_TOUCH:
          /* Find a free touch struct. */
-         for(i = 0; i < MAX_TOUCH; ++i)
+         for (i = 0; i < MAX_TOUCH; ++i)
          {
             if(qnx->pointer[i].contact_id == -1)
             {
@@ -460,7 +458,7 @@ static void qnx_process_touch_event(
          break;
 
       case SCREEN_EVENT_MTOUCH_RELEASE:
-         for(i = 0; i < MAX_TOUCH; ++i)
+         for (i = 0; i < MAX_TOUCH; ++i)
          {
             if(qnx->pointer[i].contact_id == contact_id)
             {
@@ -470,7 +468,7 @@ static void qnx_process_touch_event(
                /* Remove pointer from map and shift
                 * remaining valid ones to the front. */
                qnx->touch_map[qnx->pointer[i].map] = -1;
-               for(j = qnx->pointer[i].map; j < qnx->pointer_count; ++j)
+               for (j = qnx->pointer[i].map; j < qnx->pointer_count; ++j)
                {
                   qnx->touch_map[j] = qnx->touch_map[j+1];
                   qnx->pointer[qnx->touch_map[j+1]].map = j;
@@ -490,7 +488,7 @@ static void qnx_process_touch_event(
 
       case SCREEN_EVENT_MTOUCH_MOVE:
          /* Find the finger we're tracking and update. */
-         for(i = 0; i < qnx->pointer_count; ++i)
+         for (i = 0; i < qnx->pointer_count; ++i)
          {
             if(qnx->pointer[i].contact_id == contact_id)
             {
diff --git a/input/drivers/switch_input.c b/input/drivers/switch_input.c
index 76eabeac0f..0422d92467 100644
--- a/input/drivers/switch_input.c
+++ b/input/drivers/switch_input.c
@@ -804,9 +804,9 @@ static void switch_input_free_input(void *data)
       if(sw->joypad)
          sw->joypad->destroy();
 
-      for(i = 0; i < DEFAULT_MAX_PADS; i++)
-         if(sw->sixaxis_handles_count[i] > 0)
-            for(j = 0; j < sw->sixaxis_handles_count[i]; j++)
+      for (i = 0; i < DEFAULT_MAX_PADS; i++)
+         if (sw->sixaxis_handles_count[i] > 0)
+            for (j = 0; j < sw->sixaxis_handles_count[i]; j++)
                hidStopSixAxisSensor(sw->sixaxis_handles[i][j]);
 
       free(sw);
@@ -856,7 +856,7 @@ static void* switch_input_init(const char *joypad_driver)
    for (i = 0; i < 2; i++)
       sw->simulated_click_start_time[i] = 0;
 
-   for(i = 0; i < DEFAULT_MAX_PADS; i++)
+   for (i = 0; i < DEFAULT_MAX_PADS; i++)
       sw->sixaxis_handles_count[i]      = 0;
 #endif
 
@@ -940,13 +940,10 @@ static bool switch_input_set_sensor_state(void *data, unsigned port,
                handles_count = 4;
             }
             else
-            {
                handles_count = 3;
-            }
 
-            for(i = 0; i < handles_count; i++) {
+            for (i = 0; i < handles_count; i++)
                hidStartSixAxisSensor(sw->sixaxis_handles[port][i]);
-            }
 
             sw->sixaxis_handles_count[port] = handles_count;
          }
@@ -966,9 +963,10 @@ static float switch_input_get_sensor_input(void *data,
    float f;
    SixAxisSensorValues sixaxis;
 
-   if(id >= RETRO_SENSOR_ACCELEROMETER_X && id <= RETRO_SENSOR_GYROSCOPE_Z)
+   if (id >= RETRO_SENSOR_ACCELEROMETER_X && id <= RETRO_SENSOR_GYROSCOPE_Z)
    {
-      hidSixAxisSensorValuesRead(&sixaxis, port == 0 ? CONTROLLER_P1_AUTO : port, 1);
+      hidSixAxisSensorValuesRead(&sixaxis,
+            port == 0 ? CONTROLLER_P1_AUTO : port, 1);
 
       switch(id)
       {
@@ -985,7 +983,6 @@ static float switch_input_get_sensor_input(void *data,
          case RETRO_SENSOR_GYROSCOPE_Z:
             return sixaxis.gyroscope.z;
       }
-
    }
 
    if(id == RETRO_SENSOR_ILLUMINANCE)
diff --git a/input/drivers_hid/libusb_hid.c b/input/drivers_hid/libusb_hid.c
index d9b78ed250..78d3190bed 100644
--- a/input/drivers_hid/libusb_hid.c
+++ b/input/drivers_hid/libusb_hid.c
@@ -177,7 +177,7 @@ static void libusb_get_description(struct libusb_device *device,
    {
       const struct libusb_interface *inter = &config->interface[i];
 
-      for(j = 0; j < inter->num_altsetting; j++)
+      for (j = 0; j < inter->num_altsetting; j++)
       {
          const struct libusb_interface_descriptor *interdesc =
             &inter->altsetting[j];
@@ -188,7 +188,7 @@ static void libusb_get_description(struct libusb_device *device,
          {
             adapter->interface_number = (int)interdesc->bInterfaceNumber;
 
-            for(k = 0; k < (int)interdesc->bNumEndpoints; k++)
+            for (k = 0; k < (int)interdesc->bNumEndpoints; k++)
             {
                const struct libusb_endpoint_descriptor *epdesc =
                   &interdesc->endpoint[k];
diff --git a/input/drivers_joypad/wiiu/kpad_driver.c b/input/drivers_joypad/wiiu/kpad_driver.c
index bf797aef49..ef80d7c09e 100644
--- a/input/drivers_joypad/wiiu/kpad_driver.c
+++ b/input/drivers_joypad/wiiu/kpad_driver.c
@@ -55,7 +55,7 @@ static int to_wiimote_channel(unsigned pad)
 {
    unsigned i;
 
-   for(i = 0; i < WIIU_WIIMOTE_CHANNELS; i++)
+   for (i = 0; i < WIIU_WIIMOTE_CHANNELS; i++)
       if (channel_slot_map[i] == pad)
          return i;
 
diff --git a/led/drivers/led_rpi.c b/led/drivers/led_rpi.c
index 3b5e1bdf04..f0e65b17cf 100644
--- a/led/drivers/led_rpi.c
+++ b/led/drivers/led_rpi.c
@@ -37,7 +37,7 @@ static void rpi_init(void)
    if (!settings)
       return;
 
-   for(i = 0; i < MAX_LEDS; i++)
+   for (i = 0; i < MAX_LEDS; i++)
    {
       cur->setup[i] = 0;
       cur->map[i]   = settings->uints.led_map[i];
diff --git a/libretro-common/encodings/encoding_crc32.c b/libretro-common/encodings/encoding_crc32.c
index 62d8e64fc0..8b1f76e787 100644
--- a/libretro-common/encodings/encoding_crc32.c
+++ b/libretro-common/encodings/encoding_crc32.c
@@ -117,7 +117,7 @@ uint32_t file_crc32(uint32_t crc, const char *path)
    if (!buf)
       goto error;
 
-   for(i = 0; i < CRC32_MAX_MB; i++)
+   for (i = 0; i < CRC32_MAX_MB; i++)
    {
       int64_t nread = filestream_read(file, buf, CRC32_BUFFER_SIZE);
       if (nread < 0)		
diff --git a/libretro-common/formats/bmp/rbmp.c b/libretro-common/formats/bmp/rbmp.c
index 84cf98bae5..1d3f489a1e 100644
--- a/libretro-common/formats/bmp/rbmp.c
+++ b/libretro-common/formats/bmp/rbmp.c
@@ -105,40 +105,40 @@ static unsigned char *rbmp_convert_format(
       switch (((img_n)*8+(req_comp)))
       {
          case 10:
-            for(i = x-1; i >= 0; --i, src += 1, dest += 2)
+            for (i = x-1; i >= 0; --i, src += 1, dest += 2)
             {
                dest[0]=src[0];
                dest[1]=255;
             }
             break;
          case 11:
-            for(i = x-1; i >= 0; --i, src += 1, dest += 3)
+            for (i = x-1; i >= 0; --i, src += 1, dest += 3)
                dest[0]=dest[1]=dest[2]=src[0];
             break;
          case 12:
-            for(i = x-1; i >= 0; --i, src += 1, dest += 4)
+            for (i = x-1; i >= 0; --i, src += 1, dest += 4)
             {
                dest[0]=dest[1]=dest[2]=src[0];
                dest[3]=255;
             }
             break;
          case 17:
-            for(i = x-1; i >= 0; --i, src += 2, dest += 1)
+            for (i = x-1; i >= 0; --i, src += 2, dest += 1)
                dest[0]=src[0];
             break;
          case 19:
-            for(i = x-1; i >= 0; --i, src += 2, dest += 3)
+            for (i = x-1; i >= 0; --i, src += 2, dest += 3)
                dest[0]=dest[1]=dest[2]=src[0];
             break;
          case 20:
-            for(i = x-1; i >= 0; --i, src += 2, dest += 4)
+            for (i = x-1; i >= 0; --i, src += 2, dest += 4)
             {
                dest[0]=dest[1]=dest[2]=src[0];
                dest[3]=src[1];
             }
             break;
          case 28:
-            for(i = x-1; i >= 0; --i, src += 3, dest += 4)
+            for (i = x-1; i >= 0; --i, src += 3, dest += 4)
             {
                dest[0]=src[0];
                dest[1]=src[1];
@@ -147,29 +147,29 @@ static unsigned char *rbmp_convert_format(
             }
             break;
          case 25:
-            for(i = x-1; i >= 0; --i, src += 3, dest += 1)
+            for (i = x-1; i >= 0; --i, src += 3, dest += 1)
                dest[0] = RBMP_COMPUTE_Y(src[0],src[1],src[2]);
             break;
          case 26:
-            for(i = x-1; i >= 0; --i, src += 3, dest += 2)
+            for (i = x-1; i >= 0; --i, src += 3, dest += 2)
             {
                dest[0] = RBMP_COMPUTE_Y(src[0],src[1],src[2]);
                dest[1] = 255;
             }
             break;
          case 33:
-            for(i = x-1; i >= 0; --i, src += 4, dest += 1)
+            for (i = x-1; i >= 0; --i, src += 4, dest += 1)
                dest[0] = RBMP_COMPUTE_Y(src[0],src[1],src[2]);
             break;
          case 34:
-            for(i = x-1; i >= 0; --i, src += 4, dest += 2)
+            for (i = x-1; i >= 0; --i, src += 4, dest += 2)
             {
                dest[0] = RBMP_COMPUTE_Y(src[0],src[1],src[2]);
                dest[1] = src[3];
             }
             break;
          case 35:
-            for(i = x-1; i >= 0; --i, src += 4, dest += 3)
+            for (i = x-1; i >= 0; --i, src += 4, dest += 3)
             {
                dest[0]=src[0];
                dest[1]=src[1];
diff --git a/libretro-common/formats/tga/rtga.c b/libretro-common/formats/tga/rtga.c
index 51a8735bd8..7271f7b31f 100644
--- a/libretro-common/formats/tga/rtga.c
+++ b/libretro-common/formats/tga/rtga.c
@@ -100,40 +100,40 @@ static unsigned char *rtga_convert_format(
       switch (((img_n)*8+(req_comp)))
       {
          case ((1)*8+(2)):
-            for(i=x-1; i >= 0; --i, src += 1, dest += 2)
+            for (i=x-1; i >= 0; --i, src += 1, dest += 2)
             {
                dest[0]=src[0];
                dest[1]=255;
             }
             break;
          case ((1)*8+(3)):
-            for(i=x-1; i >= 0; --i, src += 1, dest += 3)
+            for (i=x-1; i >= 0; --i, src += 1, dest += 3)
                dest[0]=dest[1]=dest[2]=src[0];
             break;
          case ((1)*8+(4)):
-            for(i=x-1; i >= 0; --i, src += 1, dest += 4)
+            for (i=x-1; i >= 0; --i, src += 1, dest += 4)
             {
                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)
+            for (i=x-1; i >= 0; --i, src += 2, dest += 1)
                dest[0]=src[0];
             break;
          case ((2)*8+(3)):
-            for(i=x-1; i >= 0; --i, src += 2, dest += 3)
+            for (i=x-1; i >= 0; --i, src += 2, dest += 3)
                dest[0]=dest[1]=dest[2]=src[0];
             break;
          case ((2)*8+(4)):
-            for(i=x-1; i >= 0; --i, src += 2, dest += 4)
+            for (i=x-1; i >= 0; --i, src += 2, dest += 4)
             {
                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)
+            for (i=x-1; i >= 0; --i, src += 3, dest += 4)
             {
                dest[0]=src[0];
                dest[1]=src[1];
@@ -142,29 +142,29 @@ static unsigned char *rtga_convert_format(
             }
             break;
          case ((3)*8+(1)):
-            for(i=x-1; i >= 0; --i, src += 3, dest += 1)
+            for (i=x-1; i >= 0; --i, src += 3, dest += 1)
                dest[0] = RTGA_COMPUTE_Y(src[0],src[1],src[2]);
             break;
          case ((3)*8+(2)):
-            for(i=x-1; i >= 0; --i, src += 3, dest += 2)
+            for (i=x-1; i >= 0; --i, src += 3, dest += 2)
             {
                dest[0] = RTGA_COMPUTE_Y(src[0],src[1],src[2]);
                dest[1] = 255;
             }
             break;
          case ((4)*8+(1)):
-            for(i=x-1; i >= 0; --i, src += 4, dest += 1)
+            for (i=x-1; i >= 0; --i, src += 4, dest += 1)
                dest[0] = RTGA_COMPUTE_Y(src[0],src[1],src[2]);
             break;
          case ((4)*8+(2)):
-            for(i=x-1; i >= 0; --i, src += 4, dest += 2)
+            for (i=x-1; i >= 0; --i, src += 4, dest += 2)
             {
                dest[0] = RTGA_COMPUTE_Y(src[0],src[1],src[2]);
                dest[1] = src[3];
             }
             break;
          case ((4)*8+(3)):
-            for(i=x-1; i >= 0; --i, src += 4, dest += 3)
+            for (i=x-1; i >= 0; --i, src += 4, dest += 3)
             {
                dest[0]=src[0];
                dest[1]=src[1];
diff --git a/libretro-common/formats/xml/rxml.c b/libretro-common/formats/xml/rxml.c
index f13981a940..5fd2ee1a22 100644
--- a/libretro-common/formats/xml/rxml.c
+++ b/libretro-common/formats/xml/rxml.c
@@ -285,7 +285,7 @@ rxml_document_t *rxml_load_document_string(const char *str)
             break;
 
          case YXML_ATTRVAL:
-            for(c = 0; c < sizeof(x.data) && x.data[c]; ++c)
+            for (c = 0; c < sizeof(x.data) && x.data[c]; ++c)
             {
                *valptr = x.data[c];
                ++valptr;
diff --git a/libretro-common/hash/rhash.c b/libretro-common/hash/rhash.c
index 26d9dfc725..05e46c5fc8 100644
--- a/libretro-common/hash/rhash.c
+++ b/libretro-common/hash/rhash.c
@@ -356,7 +356,7 @@ static void SHA1ProcessMessageBlock(struct sha1_context *context)
    unsigned    A, B, C, D, E;      /* Word buffers                 */
 
    /* Initialize the first 16 words in the array W */
-   for(t = 0; t < 16; t++)
+   for (t = 0; t < 16; t++)
    {
       W[t] = ((unsigned) context->Message_Block[t * 4]) << 24;
       W[t] |= ((unsigned) context->Message_Block[t * 4 + 1]) << 16;
@@ -364,7 +364,7 @@ static void SHA1ProcessMessageBlock(struct sha1_context *context)
       W[t] |= ((unsigned) context->Message_Block[t * 4 + 3]);
    }
 
-   for(t = 16; t < 80; t++)
+   for (t = 16; t < 80; t++)
       W[t] = SHA1CircularShift(1,W[t-3] ^ W[t-8] ^ W[t-14] ^ W[t-16]);
 
    A = context->Message_Digest[0];
@@ -373,7 +373,7 @@ static void SHA1ProcessMessageBlock(struct sha1_context *context)
    D = context->Message_Digest[3];
    E = context->Message_Digest[4];
 
-   for(t = 0; t < 20; t++)
+   for (t = 0; t < 20; t++)
    {
       temp  =  SHA1CircularShift(5,A) +
          ((B & C) | ((~B) & D)) + E + W[t] + K[0];
@@ -385,7 +385,7 @@ static void SHA1ProcessMessageBlock(struct sha1_context *context)
       A     = temp;
    }
 
-   for(t = 20; t < 40; t++)
+   for (t = 20; t < 40; t++)
    {
       temp  = SHA1CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[1];
       temp &= 0xFFFFFFFF;
@@ -396,7 +396,7 @@ static void SHA1ProcessMessageBlock(struct sha1_context *context)
       A     = temp;
    }
 
-   for(t = 40; t < 60; t++)
+   for (t = 40; t < 60; t++)
    {
       temp  = SHA1CircularShift(5,A) +
          ((B & C) | (B & D) | (C & D)) + E + W[t] + K[2];
@@ -408,7 +408,7 @@ static void SHA1ProcessMessageBlock(struct sha1_context *context)
       A     = temp;
    }
 
-   for(t = 60; t < 80; t++)
+   for (t = 60; t < 80; t++)
    {
       temp = SHA1CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[3];
       temp &= 0xFFFFFFFF;
diff --git a/libretro-common/include/fastcpy.h b/libretro-common/include/fastcpy.h
index 9dbe1e9b2c..7ecd460f7c 100644
--- a/libretro-common/include/fastcpy.h
+++ b/libretro-common/include/fastcpy.h
@@ -45,49 +45,48 @@ static INLINE void* memcpy64(void* dst,void* src,size_t size)
 
 static INLINE void* memset16(void* dst,uint16_t val,size_t size)
 {
-   uint16_t* typedptr = (uint16_t*)dst;
+   uint16_t *typedptr = (uint16_t*)dst;
    std::fill(typedptr, typedptr + size, val);
    return dst;
 }
 
 static INLINE void* memset32(void* dst,uint32_t val,size_t size)
 {
-   uint32_t* typedptr = (uint32_t*)dst;
+   uint32_t *typedptr = (uint32_t*)dst;
    std::fill(typedptr, typedptr + size, val);
    return dst;
 }
 
 static INLINE void* memset64(void* dst,uint64_t val,size_t size)
 {
-   uint64_t* typedptr = (uint64_t*)dst;
+   uint64_t *typedptr = (uint64_t*)dst;
    std::fill(typedptr, typedptr + size, val);
    return dst;
 }
 #else
-
-static INLINE void* memset16(void* dst,uint16_t val,size_t size)
+static INLINE void *memset16(void* dst,uint16_t val,size_t size)
 {
    size_t i;
-   uint16_t* typedptr = (uint16_t*)dst;
-   for(i = 0;i < size;i++)
+   uint16_t *typedptr = (uint16_t*)dst;
+   for (i = 0;i < size;i++)
       typedptr[i] = val;
    return dst;
 }
 
-static INLINE void* memset32(void* dst,uint32_t val,size_t size)
+static INLINE void *memset32(void* dst,uint32_t val,size_t size)
 {
    size_t i;
-   uint32_t* typedptr = (uint32_t*)dst;
-   for(i = 0;i < size;i++)
+   uint32_t *typedptr = (uint32_t*)dst;
+   for (i = 0; i < size; i++)
       typedptr[i] = val;
    return dst;
 }
 
-static INLINE void* memset64(void* dst,uint64_t val,size_t size)
+static INLINE void *memset64(void* dst,uint64_t val,size_t size)
 {
    size_t i;
-   uint64_t* typedptr = (uint64_t*)dst;
-   for(i = 0;i < size;i++)
+   uint64_t *typedptr = (uint64_t*)dst;
+   for (i = 0; i < size;i++)
       typedptr[i] = val;
    return dst;
 }
diff --git a/libretro-common/include/gfx/math/vector_2.h b/libretro-common/include/gfx/math/vector_2.h
index 340364414b..6efbf2818e 100644
--- a/libretro-common/include/gfx/math/vector_2.h
+++ b/libretro-common/include/gfx/math/vector_2.h
@@ -54,7 +54,7 @@ static INLINE float overflow(void)
    unsigned i;
    volatile float f = 1e10;
 
-   for(i = 0; i < 10; ++i)
+   for (i = 0; i < 10; ++i)
       f *= f;
    return f;
 }
diff --git a/libretro-common/samples/utils/sha1_main.c b/libretro-common/samples/utils/sha1_main.c
index 55b0e0c4e3..ba9c58da62 100644
--- a/libretro-common/samples/utils/sha1_main.c
+++ b/libretro-common/samples/utils/sha1_main.c
@@ -88,7 +88,7 @@ int main(int argc, char *argv[])
     *  For each filename passed in on the command line, calculate the
     *  SHA-1 value and display it.
     */
-   for(i = 0; i < argc; i++)
+   for (i = 0; i < argc; i++)
    {
       /*
        *  We start the counter at 0 to guarantee entry into the for
diff --git a/libretro-common/utils/sha1.c b/libretro-common/utils/sha1.c
index 419b3f0c47..3c743cb857 100644
--- a/libretro-common/utils/sha1.c
+++ b/libretro-common/utils/sha1.c
@@ -277,7 +277,7 @@ void SHA1ProcessMessageBlock(SHA1Context *context)
    /*
     *  Initialize the first 16 words in the array W
     */
-   for(t = 0; t < 16; t++)
+   for (t = 0; t < 16; t++)
    {
       W[t] = ((unsigned) context->Message_Block[t * 4]) << 24;
       W[t] |= ((unsigned) context->Message_Block[t * 4 + 1]) << 16;
@@ -285,10 +285,8 @@ void SHA1ProcessMessageBlock(SHA1Context *context)
       W[t] |= ((unsigned) context->Message_Block[t * 4 + 3]);
    }
 
-   for(t = 16; t < 80; t++)
-   {
+   for (t = 16; t < 80; t++)
       W[t] = SHA1CircularShift(1,W[t-3] ^ W[t-8] ^ W[t-14] ^ W[t-16]);
-   }
 
    A = context->Message_Digest[0];
    B = context->Message_Digest[1];
@@ -296,7 +294,7 @@ void SHA1ProcessMessageBlock(SHA1Context *context)
    D = context->Message_Digest[3];
    E = context->Message_Digest[4];
 
-   for(t = 0; t < 20; t++)
+   for (t = 0; t < 20; t++)
    {
       temp =  SHA1CircularShift(5,A) +
          ((B & C) | ((~B) & D)) + E + W[t] + K[0];
@@ -308,7 +306,7 @@ void SHA1ProcessMessageBlock(SHA1Context *context)
       A = temp;
    }
 
-   for(t = 20; t < 40; t++)
+   for (t = 20; t < 40; t++)
    {
       temp = SHA1CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[1];
       temp &= 0xFFFFFFFF;
@@ -319,7 +317,7 @@ void SHA1ProcessMessageBlock(SHA1Context *context)
       A = temp;
    }
 
-   for(t = 40; t < 60; t++)
+   for (t = 40; t < 60; t++)
    {
       temp = SHA1CircularShift(5,A) +
          ((B & C) | (B & D) | (C & D)) + E + W[t] + K[2];
@@ -331,7 +329,7 @@ void SHA1ProcessMessageBlock(SHA1Context *context)
       A = temp;
    }
 
-   for(t = 60; t < 80; t++)
+   for (t = 60; t < 80; t++)
    {
       temp = SHA1CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[3];
       temp &= 0xFFFFFFFF;
diff --git a/libretro-db/lua/lua_common.c b/libretro-db/lua/lua_common.c
index 9b80712bae..f86c41968d 100644
--- a/libretro-db/lua/lua_common.c
+++ b/libretro-db/lua/lua_common.c
@@ -134,10 +134,10 @@ set_nil:
       "sha1",
       "serial"
    };
-   for(i = 0; i < (sizeof(ordered_keys)/sizeof(char*)); i++)
+   for (i = 0; i < (sizeof(ordered_keys)/sizeof(char*)); i++)
    {
       int j;
-      for(j = 0; j < out->val.map.len; j++)
+      for (j = 0; j < out->val.map.len; j++)
       {
          if(string_is_equal(ordered_keys[i], out->val.map.items[j].key.val.string.buff))
          {
diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c
index ea433d43c5..94deec30fd 100644
--- a/menu/cbs/menu_cbs_sublabel.c
+++ b/menu/cbs/menu_cbs_sublabel.c
@@ -888,7 +888,7 @@ static int action_bind_sublabel_systeminfo_controller_entry(
    char tmp[4096];
    unsigned controller;
 
-   for(controller = 0; controller < MAX_USERS; controller++)
+   for (controller = 0; controller < MAX_USERS; controller++)
    {
       if (input_config_get_device_autoconfigured(controller))
       {
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index bbcea650e6..6515f9b4ad 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -4575,7 +4575,7 @@ static void xmb_frame(void *data, video_frame_info_t *video_info)
       /* skip 25 utf8 multi-byte chars */
       char *end = title_truncated;
 
-      for(i = 0; i < 25 && *end; i++)
+      for (i = 0; i < 25 && *end; i++)
       {
          end++;
          while ((*end & 0xC0) == 0x80)
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 1e36a363ac..4c27bc7455 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -6751,7 +6751,7 @@ unsigned menu_displaylist_build_list(
             {
                unsigned user;
                unsigned max_users          = *(input_driver_get_uint(INPUT_ACTION_MAX_USERS));
-               for(user = 0; user < max_users; user++)
+               for (user = 0; user < max_users; user++)
                {
                   if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
                            (enum msg_hash_enums)(
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index b303485c7e..98ec0a8391 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -17098,7 +17098,7 @@ static bool setting_append_list(
 
             {
                unsigned max_users        = *(input_driver_get_uint(INPUT_ACTION_MAX_USERS));
-               for(user = 0; user < max_users; user++)
+               for (user = 0; user < max_users; user++)
                {
                   char s1[64], s2[64];
 
diff --git a/retroarch.c b/retroarch.c
index 0101723d49..e880bf9b9e 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -27754,11 +27754,11 @@ static void input_config_reindex_device_names(void)
    unsigned name_index;
 
    /* Reset device name indices */
-   for(i = 0; i < MAX_INPUT_DEVICES; i++)
+   for (i = 0; i < MAX_INPUT_DEVICES; i++)
       input_config_set_device_name_index(i, 0);
 
    /* Scan device names */
-   for(i = 0; i < MAX_INPUT_DEVICES; i++)
+   for (i = 0; i < MAX_INPUT_DEVICES; i++)
    {
       const char *device_name = input_config_get_device_name(i);
 
@@ -27777,7 +27777,7 @@ static void input_config_reindex_device_names(void)
 
       /* Loop over all devices following the current
        * selection */
-      for(j = i + 1; j < MAX_INPUT_DEVICES; j++)
+      for (j = i + 1; j < MAX_INPUT_DEVICES; j++)
       {
          const char *next_device_name = input_config_get_device_name(j);