Cleanup more header includes

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;

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"

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"

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"
-
+#include "../../runloop.h"
-#ifdef HAVE_CONFIG_H
+#include "../../verbosity.h"
-#include "config.h"
-#endif
 
 #ifdef HAVE_MENU
 #include "../../menu/menu_driver.h"

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;

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

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

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

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