diff --git a/playlist.c b/playlist.c
index 33e4936333..40a566439c 100644
--- a/playlist.c
+++ b/playlist.c
@@ -2148,7 +2148,7 @@ json_cleanup:
       /* > Exclude trailing newline */
       metadata_char = filestream_getc(file);
 
-      while((metadata_char == '\n') ||
+      while ((metadata_char == '\n') ||
             (metadata_char == '\r'))
       {
          filestream_seek(file, -2, SEEK_CUR);
diff --git a/retroarch.c b/retroarch.c
index 310c656750..cddcda053c 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -986,7 +986,7 @@ static const camera_driver_t *camera_drivers[] = {
 #define FAIL_CPU(simd_type) do { \
    RARCH_ERR(simd_type " code is compiled in, but CPU does not support this feature. Cannot continue.\n"); \
    retroarch_fail(1, "validate_cpu_features()"); \
-} while(0)
+}while(0)
 
 #ifdef HAVE_ZLIB
 #define DEFAULT_EXT "zip"
@@ -3841,7 +3841,7 @@ static bool command_get_status(const char* arg)
 
        core_info_get_current_core(&core_info);
 
-	   if( runloop_paused )
+	   if (runloop_paused)
           status                = "PAUSED";
        if (core_info)
           system_id             = core_info->system_id;
@@ -4648,7 +4648,7 @@ static void handle_translation_cb(
             do
             {
                retval = rpng_process_image(rpng, &raw_image_data_alpha, new_image_size, &image_width, &image_height);
-            } while(retval == IMAGE_PROCESS_NEXT);
+            }while(retval == IMAGE_PROCESS_NEXT);
 
             /* Returned output from the png processor is an upside down RGBA
              * image, so we have to change that to RGB first.  This should
@@ -5897,7 +5897,7 @@ static bool command_event_init_core(enum rarch_core_type type)
 
 #ifdef HAVE_CONFIGFILE
    /* auto overrides: apply overrides */
-   if(settings->bools.auto_overrides_enable)
+   if (settings->bools.auto_overrides_enable)
       runloop_overrides_active = config_load_override();
 #endif
 
@@ -5915,7 +5915,7 @@ static bool command_event_init_core(enum rarch_core_type type)
 
 #ifdef HAVE_CONFIGFILE
    /* Auto-remap: apply remap files */
-   if(settings->bools.auto_remaps_enable)
+   if (settings->bools.auto_remaps_enable)
       config_load_remap(settings->paths.directory_input_remapping);
 #endif