From f88575633e538401ad7947ad2a512a2862eeb144 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 5 Sep 2015 20:34:22 +0200
Subject: [PATCH] Cleanups

---
 audio/audio_driver.c                      |  7 ++-----
 frontend/frontend.c                       |  2 --
 frontend/frontend_driver.c                |  4 ++--
 gfx/common/x11_common.c                   |  6 ++++--
 gfx/video_viewport.c                      |  1 -
 libretro-common/file/dir_list.c           |  3 ++-
 libretro-common/formats/png/rpng_decode.c | 11 ++++++-----
 libretro-common/formats/png/rpng_fbio.c   |  1 +
 libretro-common/gfx/math/matrix_4x4.c     |  3 ++-
 libretro-common/gfx/scaler/pixconv.c      |  6 ++++--
 libretro-common/gfx/scaler/scaler.c       | 11 +++++------
 libretro-common/gfx/scaler/scaler_int.c   |  1 +
 record/record_driver.c                    |  7 +------
 tasks/task_database.c                     |  1 -
 tasks/task_overlay.c                      |  1 -
 ui/ui_companion_driver.c                  |  4 ++--
 16 files changed, 32 insertions(+), 37 deletions(-)

diff --git a/audio/audio_driver.c b/audio/audio_driver.c
index 4da3311a1a..2158f27efd 100644
--- a/audio/audio_driver.c
+++ b/audio/audio_driver.c
@@ -15,15 +15,12 @@
  */
 
 #include <string.h>
+
 #include <string/string_list.h>
-#include "audio_driver.h"
-#include "audio_monitor.h"
+
 #include "audio_utils.h"
 #include "audio_thread_wrapper.h"
-#include "../driver.h"
 #include "../general.h"
-#include "../retroarch.h"
-#include "../performance.h"
 
 #ifndef AUDIO_BUFFER_FREE_SAMPLES_COUNT
 #define AUDIO_BUFFER_FREE_SAMPLES_COUNT (8 * 1024)
diff --git a/frontend/frontend.c b/frontend/frontend.c
index e9a3283853..f5cd38a581 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -24,8 +24,6 @@
 #include "../runloop.h"
 #include "../runloop_data.h"
 
-#include "frontend.h"
-
 #define MAX_ARGS 32
 
 /**
diff --git a/frontend/frontend_driver.c b/frontend/frontend_driver.c
index ba8c1ef707..97dd6411e4 100644
--- a/frontend/frontend_driver.c
+++ b/frontend/frontend_driver.c
@@ -14,10 +14,10 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "frontend_driver.h"
-#include "../driver.h"
 #include <string.h>
 
+#include "../driver.h"
+
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
 #endif
diff --git a/gfx/common/x11_common.c b/gfx/common/x11_common.c
index 0239f9a3be..458c4d06a2 100644
--- a/gfx/common/x11_common.c
+++ b/gfx/common/x11_common.c
@@ -14,13 +14,15 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "x11_common.h"
 #include <stdlib.h>
 #include <string.h>
-#include <X11/Xatom.h>
 #include <math.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+
+#include <X11/Xatom.h>
+
+#include "x11_common.h"
 #include "../../general.h"
 
 static void x11_hide_mouse(Display *dpy, Window win)
diff --git a/gfx/video_viewport.c b/gfx/video_viewport.c
index 1573239e15..4cb94c2055 100644
--- a/gfx/video_viewport.c
+++ b/gfx/video_viewport.c
@@ -14,7 +14,6 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "video_viewport.h"
 #include "../general.h"
 
 static video_viewport_t video_viewport_custom;
diff --git a/libretro-common/file/dir_list.c b/libretro-common/file/dir_list.c
index e9d8a81aaa..0e50fe34c4 100644
--- a/libretro-common/file/dir_list.c
+++ b/libretro-common/file/dir_list.c
@@ -22,8 +22,9 @@
 
 #include <stdlib.h>
 
-#include <file/dir_list.h>
 #include <file/file_path.h>
+#include <string/string_list.h>
+
 #include <compat/strl.h>
 #include <compat/posix_string.h>
 #include <retro_dirent.h>
diff --git a/libretro-common/formats/png/rpng_decode.c b/libretro-common/formats/png/rpng_decode.c
index b929630780..e4c7f217b6 100644
--- a/libretro-common/formats/png/rpng_decode.c
+++ b/libretro-common/formats/png/rpng_decode.c
@@ -20,19 +20,20 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <file/file_extract.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "rpng_internal.h"
-#include "rpng_decode.h"
-
 #ifdef GEKKO
 #include <malloc.h>
 #endif
 
+#include <file/file_extract.h>
+
+#include "rpng_internal.h"
+#include "rpng_decode.h"
+
+
 enum png_chunk_type png_chunk_type(const struct png_chunk *chunk)
 {
    unsigned i;
diff --git a/libretro-common/formats/png/rpng_fbio.c b/libretro-common/formats/png/rpng_fbio.c
index 9b027cecbb..2a2673e2d4 100644
--- a/libretro-common/formats/png/rpng_fbio.c
+++ b/libretro-common/formats/png/rpng_fbio.c
@@ -24,6 +24,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include <boolean.h>
 
 #include "rpng_internal.h"
diff --git a/libretro-common/gfx/math/matrix_4x4.c b/libretro-common/gfx/math/matrix_4x4.c
index 15846ba17a..6960cc0a01 100644
--- a/libretro-common/gfx/math/matrix_4x4.c
+++ b/libretro-common/gfx/math/matrix_4x4.c
@@ -20,10 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <gfx/math/matrix_4x4.h>
 #include <string.h>
 #include <math.h>
 
+#include <gfx/math/matrix_4x4.h>
+
 /*
  * Sets mat to an identity matrix
  */
diff --git a/libretro-common/gfx/scaler/pixconv.c b/libretro-common/gfx/scaler/pixconv.c
index bce176b326..59d35a2cb3 100644
--- a/libretro-common/gfx/scaler/pixconv.c
+++ b/libretro-common/gfx/scaler/pixconv.c
@@ -20,13 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <gfx/scaler/pixconv.h>
+#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
+
 #include <retro_inline.h>
 
+#include <gfx/scaler/pixconv.h>
+
 #ifdef SCALER_NO_SIMD
 #undef __SSE2__
 #endif
diff --git a/libretro-common/gfx/scaler/scaler.c b/libretro-common/gfx/scaler/scaler.c
index 0fcdeadeca..5e41ac7ddb 100644
--- a/libretro-common/gfx/scaler/scaler.c
+++ b/libretro-common/gfx/scaler/scaler.c
@@ -20,16 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
 #include <gfx/scaler/scaler.h>
 #include <gfx/scaler/scaler_int.h>
 #include <gfx/scaler/filter.h>
 #include <gfx/scaler/pixconv.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <math.h>
-
-/* In case aligned allocs are needed later. */
 
 /**
  * scaler_alloc:
diff --git a/libretro-common/gfx/scaler/scaler_int.c b/libretro-common/gfx/scaler/scaler_int.c
index 32e9e39594..5e72f81ec1 100644
--- a/libretro-common/gfx/scaler/scaler_int.c
+++ b/libretro-common/gfx/scaler/scaler_int.c
@@ -21,6 +21,7 @@
  */
 
 #include <gfx/scaler/scaler_int.h>
+
 #include <retro_inline.h>
 
 #ifdef SCALER_NO_SIMD
diff --git a/record/record_driver.c b/record/record_driver.c
index 9b3b5d4e96..4497f11fe7 100644
--- a/record/record_driver.c
+++ b/record/record_driver.c
@@ -15,16 +15,11 @@
  */
 
 #include <string.h>
+
 #include <file/file_path.h>
-#include "record_driver.h"
 
 #include "../driver.h"
-#include "../dynamic.h"
 #include "../general.h"
-#include "../retroarch.h"
-#include "../runloop.h"
-#include "../gfx/video_driver.h"
-#include "../gfx/video_viewport.h"
 #include "../msg_hash.h"
 
 #ifdef HAVE_CONFIG_H
diff --git a/tasks/task_database.c b/tasks/task_database.c
index 5b251d61f1..41acf7a3e2 100644
--- a/tasks/task_database.c
+++ b/tasks/task_database.c
@@ -24,7 +24,6 @@
 #include "../file_ops.h"
 #include "../msg_hash.h"
 #include "../general.h"
-#include "tasks.h"
 
 #define CB_DB_SCAN_FILE    0x70ce56d2U
 #define CB_DB_SCAN_FOLDER  0xde2bef8eU
diff --git a/tasks/task_overlay.c b/tasks/task_overlay.c
index b50463e621..9f2618b33e 100644
--- a/tasks/task_overlay.c
+++ b/tasks/task_overlay.c
@@ -19,7 +19,6 @@
 #endif
 
 #include "../input/input_overlay.h"
-#include "tasks.h"
 
 #ifdef HAVE_THREADS
 static slock_t *overlay_lock;
diff --git a/ui/ui_companion_driver.c b/ui/ui_companion_driver.c
index e5ffd18a69..dac529b8a4 100644
--- a/ui/ui_companion_driver.c
+++ b/ui/ui_companion_driver.c
@@ -13,12 +13,12 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ui_companion_driver.h"
-#include "../driver.h"
 #include <string.h>
 
 #include <boolean.h>
 
+#include "../driver.h"
+
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
 #endif