From 467451fccc02a9ef09710f170c43f888d2f00ebf Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 1 Sep 2016 18:18:55 +0200
Subject: [PATCH] Cleanup more header includes

---
 gfx/common/vulkan_common.c                        |  1 +
 gfx/common/vulkan_common.h                        |  2 +-
 .../gl_renderchains/render_chain_gl_legacy.c      | 10 +++++-----
 gfx/drivers/vulkan.c                              | 10 +++++-----
 gfx/drivers_font/vulkan_raster_font.c             |  3 +++
 gfx/drivers_font_renderer/freetype.c              |  2 +-
 gfx/drivers_font_renderer/stb.c                   |  2 +-
 input/drivers_hid/null_hid.c                      |  2 +-
 record/drivers/record_ffmpeg.c                    | 15 +++++++++------
 9 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/gfx/common/vulkan_common.c b/gfx/common/vulkan_common.c
index f1ac4bc3bf..85099fa2a9 100644
--- a/gfx/common/vulkan_common.c
+++ b/gfx/common/vulkan_common.c
@@ -28,6 +28,7 @@
 #include <string/stdstring.h>
 
 #include "vulkan_common.h"
+#include "../../configuration.h"
 #include "../../performance_counters.h"
 
 static dylib_t vulkan_library;
diff --git a/gfx/common/vulkan_common.h b/gfx/common/vulkan_common.h
index ca8a60bcf4..9e1602d10a 100644
--- a/gfx/common/vulkan_common.h
+++ b/gfx/common/vulkan_common.h
@@ -43,8 +43,8 @@
 #include <libretro_vulkan.h>
 
 #include "../../driver.h"
-#include "../../general.h"
 #include "../../retroarch.h"
+#include "../../verbosity.h"
 #include "../font_driver.h"
 #include "../video_context_driver.h"
 #include "../drivers_shader/shader_vulkan.h"
diff --git a/gfx/drivers/gl_renderchains/render_chain_gl_legacy.c b/gfx/drivers/gl_renderchains/render_chain_gl_legacy.c
index 3472b2f7d6..cb04148357 100644
--- a/gfx/drivers/gl_renderchains/render_chain_gl_legacy.c
+++ b/gfx/drivers/gl_renderchains/render_chain_gl_legacy.c
@@ -24,6 +24,10 @@
 #include <math.h>
 #include <string.h>
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <compat/strl.h>
 #include <gfx/scaler/scaler.h>
 #include <gfx/math/matrix_4x4.h>
@@ -34,10 +38,10 @@
 #include <libretro.h>
 
 #include "../../../driver.h"
+#include "../../../configuration.h"
 #include "../../../record/record_driver.h"
 #include "../../../performance_counters.h"
 
-#include "../../../general.h"
 #include "../../../retroarch.h"
 #include "../../../verbosity.h"
 #include "../../common/gl_common.h"
@@ -48,10 +52,6 @@
 #include "../../video_thread_wrapper.h"
 #endif
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "../../font_driver.h"
 #include "../../video_context_driver.h"
 #include "../../video_frame.h"
diff --git a/gfx/drivers/vulkan.c b/gfx/drivers/vulkan.c
index 9ca4867836..bc2cd4d003 100644
--- a/gfx/drivers/vulkan.c
+++ b/gfx/drivers/vulkan.c
@@ -18,6 +18,9 @@
 #include <math.h>
 #include <string.h>
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <compat/strl.h>
 #include <gfx/scaler/scaler.h>
@@ -33,12 +36,9 @@
 #include "../../record/record_driver.h"
 #include "../../performance_counters.h"
 
-#include "../../general.h"
 #include "../../retroarch.h"
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "../../runloop.h"
+#include "../../verbosity.h"
 
 #ifdef HAVE_MENU
 #include "../../menu/menu_driver.h"
diff --git a/gfx/drivers_font/vulkan_raster_font.c b/gfx/drivers_font/vulkan_raster_font.c
index 26a82b3101..f8633f090e 100644
--- a/gfx/drivers_font/vulkan_raster_font.c
+++ b/gfx/drivers_font/vulkan_raster_font.c
@@ -14,8 +14,11 @@
  */
 
 #include "../common/vulkan_common.h"
+
 #include "../font_driver.h"
 
+#include "../../configuration.h"
+
 typedef struct
 {
    vk_t *vk;
diff --git a/gfx/drivers_font_renderer/freetype.c b/gfx/drivers_font_renderer/freetype.c
index 5c2e7c90e6..cd2a58c162 100644
--- a/gfx/drivers_font_renderer/freetype.c
+++ b/gfx/drivers_font_renderer/freetype.c
@@ -21,11 +21,11 @@
 #include <ft2build.h>
 
 #include <file/file_path.h>
+#include <retro_miscellaneous.h>
 
 #include FT_FREETYPE_H
 
 #include "../font_driver.h"
-#include "../../general.h"
 
 #define FT_ATLAS_ROWS 16
 #define FT_ATLAS_COLS 16
diff --git a/gfx/drivers_font_renderer/stb.c b/gfx/drivers_font_renderer/stb.c
index 502fc72e44..fd0f839a94 100644
--- a/gfx/drivers_font_renderer/stb.c
+++ b/gfx/drivers_font_renderer/stb.c
@@ -18,9 +18,9 @@
 
 #include <file/file_path.h>
 #include <streams/file_stream.h>
+#include <retro_miscellaneous.h>
 
 #include "../font_driver.h"
-#include "../../general.h"
 #include "../../verbosity.h"
 
 #define STB_TRUETYPE_IMPLEMENTATION
diff --git a/input/drivers_hid/null_hid.c b/input/drivers_hid/null_hid.c
index 7c6937d3c5..1ce26033a3 100644
--- a/input/drivers_hid/null_hid.c
+++ b/input/drivers_hid/null_hid.c
@@ -14,7 +14,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../general.h"
+#include "../../runloop.h"
 #include "../input_hid_driver.h"
 
 typedef struct null_hid
diff --git a/record/drivers/record_ffmpeg.c b/record/drivers/record_ffmpeg.c
index fccaafe5c1..b4b65d3136 100644
--- a/record/drivers/record_ffmpeg.c
+++ b/record/drivers/record_ffmpeg.c
@@ -15,9 +15,6 @@
  */
 
 
-#ifdef HAVE_CONFIG_H
-#include "../../config.h"
-#endif
 
 #include <stdint.h>
 #include <stdio.h>
@@ -25,6 +22,10 @@
 
 #include <assert.h>
 
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#endif
+
 #ifdef FFEMU_PERF
 #include <time.h>
 #endif
@@ -62,11 +63,13 @@ extern "C" {
 #include <conversion/float_to_s16.h>
 #include <conversion/s16_to_float.h>
 
-#include "../../general.h"
-#include "../../verbosity.h"
-#include "../../audio/audio_resampler_driver.h"
 #include "../record_driver.h"
 
+#include "../../configuration.h"
+#include "../../gfx/video_driver.h"
+#include "../../audio/audio_resampler_driver.h"
+#include "../../verbosity.h"
+
 #include "../../gfx/video_frame.h"
 
 #ifndef PIX_FMT_RGB32