From 7ec3c5080d102cb4eb849f121ac4605124837008 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 5 Sep 2015 21:11:12 +0200
Subject: [PATCH] Cleanups

---
 decompress/7zip_support.c        |  2 --
 decompress/zip_support.c         |  2 --
 libretro-common/file/file_list.c |  1 +
 record/drivers/record_ffmpeg.c   | 31 ++++++++++++++++++-------------
 record/drivers/record_null.c     |  9 +++++----
 5 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/decompress/7zip_support.c b/decompress/7zip_support.c
index f0c92247d9..3efacda7e7 100644
--- a/decompress/7zip_support.c
+++ b/decompress/7zip_support.c
@@ -26,8 +26,6 @@
 #include <file/file_path.h>
 #include <string/string_list.h>
 
-#include "7zip_support.h"
-
 #include "../deps/7zip/7z.h"
 #include "../deps/7zip/7zAlloc.h"
 #include "../deps/7zip/7zCrc.h"
diff --git a/decompress/zip_support.c b/decompress/zip_support.c
index 247a212806..c7efe6316a 100644
--- a/decompress/zip_support.c
+++ b/decompress/zip_support.c
@@ -25,8 +25,6 @@
 #include <retro_miscellaneous.h>
 #include <file/file_path.h>
 
-#include "zip_support.h"
-
 #include "../deps/zlib/unzip.h"
 
 /* Undefined at the end of the file
diff --git a/libretro-common/file/file_list.c b/libretro-common/file/file_list.c
index deb4697083..51c31832fe 100644
--- a/libretro-common/file/file_list.c
+++ b/libretro-common/file/file_list.c
@@ -22,6 +22,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+
 #include <file/file_list.h>
 #include <compat/strcasestr.h>
 #include <compat/posix_string.h>
diff --git a/record/drivers/record_ffmpeg.c b/record/drivers/record_ffmpeg.c
index 8bad2f4767..b7ede1655c 100644
--- a/record/drivers/record_ffmpeg.c
+++ b/record/drivers/record_ffmpeg.c
@@ -20,9 +20,26 @@
 #include "../../config.h"
 #endif
 
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <assert.h>
+
+#ifdef FFEMU_PERF
+#include <time.h>
+#endif
+
+#include <boolean.h>
+#include <queues/fifo_buffer.h>
+#include <rthreads/rthreads.h>
+#include <gfx/scaler/scaler.h>
+#include <file/config_file.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
+
 #include <libavcodec/avcodec.h>
 #include <libavutil/mathematics.h>
 #include <libavutil/avutil.h>
@@ -36,26 +53,14 @@ extern "C" {
 #include <libavutil/avconfig.h>
 #include <libavutil/pixdesc.h>
 #include <libswscale/swscale.h>
+
 #ifdef __cplusplus
 }
 #endif
 
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <boolean.h>
-#include <queues/fifo_buffer.h>
-#include <rthreads/rthreads.h>
 #include "../../general.h"
-#include <gfx/scaler/scaler.h>
-#include <file/config_file.h>
 #include "../../audio/audio_utils.h"
 #include "../record_driver.h"
-#include <assert.h>
-
-#ifdef FFEMU_PERF
-#include <time.h>
-#endif
 
 #if LIBAVUTIL_VERSION_INT <= AV_VERSION_INT(52, 9, 0)
 #define av_frame_alloc avcodec_alloc_frame
diff --git a/record/drivers/record_null.c b/record/drivers/record_null.c
index 252752cb80..468914e38b 100644
--- a/record/drivers/record_null.c
+++ b/record/drivers/record_null.c
@@ -14,16 +14,17 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <boolean.h>
 #include <compat/msvc.h>
 
 #ifdef HAVE_CONFIG_H
 #include "../../config.h"
 #endif
 
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <boolean.h>
 #include "../record_driver.h"
 
 static void record_null_free(void *data)