diff --git a/file_ops.c b/file_ops.c
index 3a050f16d9..5c54df7827 100644
--- a/file_ops.c
+++ b/file_ops.c
@@ -88,7 +88,8 @@ static bool utf16_to_char_string(const uint16_t *in, char *s, size_t len)
 
 /* Extract the relative path (needle) from a 7z archive 
  * (path) and allocate a buf for it to write it in.
- * If optional_outfile is set, extract to that instead and don't alloc buffer.
+ * If optional_outfile is set, extract to that instead 
+ * and don't allocate buffer.
  */
 static int read_7zip_file(
       const char *path,
diff --git a/retroarch.h b/retroarch.h
index b036751249..2a294e8c32 100644
--- a/retroarch.h
+++ b/retroarch.h
@@ -187,7 +187,8 @@ void rarch_main_deinit(void);
 
 void rarch_set_paths(const char *path);
 
-int rarch_info_get_capabilities(enum rarch_capabilities type, char *s, size_t len);
+int rarch_info_get_capabilities(enum rarch_capabilities type,
+      char *s, size_t len);
 
 enum rarch_content_type rarch_path_is_media_type(const char *path);
 
diff --git a/rewind.c b/rewind.c
index a6c2c44d84..78378af319 100644
--- a/rewind.c
+++ b/rewind.c
@@ -504,7 +504,8 @@ static bool state_manager_pop(state_manager_t *state, const void **data)
    compressed = state->data + start + sizeof(size_t);
    out = state->thisblock;
 
-   state_manager_raw_decompress(compressed, state->maxcompsize, out, state->blocksize);
+   state_manager_raw_decompress(compressed,
+         state->maxcompsize, out, state->blocksize);
 
    state->entries--;
    *data = state->thisblock;
@@ -571,7 +572,8 @@ recheckcapacity:;
       newb = state->nextblock;
       compressed = state->head + sizeof(size_t);
 
-      compressed += state_manager_raw_compress(oldb, newb, state->blocksize, compressed);
+      compressed += state_manager_raw_compress(oldb, newb,
+            state->blocksize, compressed);
 
       if (compressed - state->data + state->maxcompsize > state->capacity)
       {
@@ -707,7 +709,8 @@ void state_manager_check_rewind(bool pressed)
          audio_driver_ctl(RARCH_AUDIO_CTL_SETUP_REWIND, NULL);
 
          runloop_msg_queue_push_new(MSG_REWINDING, 0,
-               runloop_ctl(RUNLOOP_CTL_IS_PAUSED, NULL) ? 1 : 30, true);
+               runloop_ctl(RUNLOOP_CTL_IS_PAUSED, NULL) 
+               ? 1 : 30, true);
          core.retro_unserialize(buf, rewind_state.size);
 
          if (bsv_movie_ctl(BSV_MOVIE_CTL_IS_INITED, NULL))