From ab64daf5aa66d1824d1b501dcd68604f1bb51425 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 5 Feb 2016 13:51:30 +0100
Subject: [PATCH] Cleanups

---
 configuration.c                   | 1 +
 dynamic.c                         | 4 ++--
 general.h                         | 2 --
 gfx/drivers_shader/shader_gl_cg.c | 1 +
 gfx/drivers_shader/shader_glsl.c  | 1 +
 input/input_keymaps.c             | 2 ++
 menu/cbs/menu_cbs_ok.c            | 1 +
 retroarch.c                       | 1 +
 8 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/configuration.c b/configuration.c
index 897546153c..a9f418c654 100644
--- a/configuration.c
+++ b/configuration.c
@@ -21,6 +21,7 @@
 #include <compat/strl.h>
 #include <compat/posix_string.h>
 #include <retro_stat.h>
+#include <retro_assert.h>
 #include <string/stdstring.h>
 
 #include "audio/audio_driver.h"
diff --git a/dynamic.c b/dynamic.c
index 2d4a694571..daded27148 100644
--- a/dynamic.c
+++ b/dynamic.c
@@ -17,13 +17,13 @@
 #include <string.h>
 #include <ctype.h>
 
+#include <boolean.h>
 #include <file/file_path.h>
 #include <compat/strl.h>
 #include <compat/posix_string.h>
 #include <dynamic/dylib.h>
 #include <string/stdstring.h>
-
-#include <boolean.h>
+#include <retro_assert.h>
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/general.h b/general.h
index fc7ec02bd5..5c8bf9b6a0 100644
--- a/general.h
+++ b/general.h
@@ -19,10 +19,8 @@
 
 #include <stdint.h>
 
-#include <boolean.h>
 #include <compat/strl.h>
 #include <compat/posix_string.h>
-#include <retro_assert.h>
 
 #include "runloop.h"
 #include "verbosity.h"
diff --git a/gfx/drivers_shader/shader_gl_cg.c b/gfx/drivers_shader/shader_gl_cg.c
index 1e02a163da..79585e4cc7 100644
--- a/gfx/drivers_shader/shader_gl_cg.c
+++ b/gfx/drivers_shader/shader_gl_cg.c
@@ -32,6 +32,7 @@
 #include <compat/posix_string.h>
 #include <file/config_file.h>
 #include <file/file_path.h>
+#include <retro_assert.h>
 #include <rhash.h>
 #include <string/stdstring.h>
 
diff --git a/gfx/drivers_shader/shader_glsl.c b/gfx/drivers_shader/shader_glsl.c
index 175668e544..56a17a8255 100644
--- a/gfx/drivers_shader/shader_glsl.c
+++ b/gfx/drivers_shader/shader_glsl.c
@@ -19,6 +19,7 @@
 #include <compat/strl.h>
 #include <compat/posix_string.h>
 #include <file/file_path.h>
+#include <retro_assert.h>
 #include <retro_file.h>
 #include <string/stdstring.h>
 
diff --git a/input/input_keymaps.c b/input/input_keymaps.c
index 66b83e6667..90b40f00be 100644
--- a/input/input_keymaps.c
+++ b/input/input_keymaps.c
@@ -18,6 +18,8 @@
 #include <stdlib.h>
 #include <ctype.h>
 
+#include <retro_assert.h>
+
 #ifdef ANDROID
 #include <android/keycodes.h>
 #include "drivers_keyboard/keyboard_event_android.h"
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 166ae63877..049458705c 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -14,6 +14,7 @@
  */
 
 #include <file/file_path.h>
+#include <retro_assert.h>
 #include <retro_stat.h>
 #include <retro_file.h>
 #include <string/stdstring.h>
diff --git a/retroarch.c b/retroarch.c
index 701950c706..7c4f753e05 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -40,6 +40,7 @@
 #include <compat/posix_string.h>
 #include <file/file_path.h>
 #include <retro_stat.h>
+#include <retro_assert.h>
 
 #include "content.h"
 #include "core_info.h"