Rearrange header includes

audio/audio_thread_wrapper.c

@@ -21,7 +21,6 @@
 #include <rthreads/rthreads.h>
 
 #include "audio_thread_wrapper.h"
-#include "../general.h"
 #include "../performance.h"
 #include "../verbosity.h"
 

audio/audio_thread_wrapper.h

@@ -17,9 +17,10 @@
 #ifndef RARCH_AUDIO_THREAD_H__
 #define RARCH_AUDIO_THREAD_H__
 
-#include "../driver.h"
 #include <boolean.h>
 
+#include "audio_driver.h"
+
 /**
  * rarch_threaded_audio_init:
  * @out_driver                : output driver

audio/drivers/alsa.c

@@ -17,8 +17,8 @@
 
 #include <alsa/asoundlib.h>
 
-#include "../../driver.h"
-#include "../../general.h"
+#include "../audio_driver.h"
+#include "../../configuration.h"
 #include "../../verbosity.h"
 
 typedef struct alsa

audio/drivers/alsa_qsa.c

@@ -18,8 +18,8 @@
 #define ALSA_PCM_NEW_SW_PARAMS_API
 #include <sys/asoundlib.h>
 
-#include "../../general.h"
-#include "../../driver.h"
+#include "../audio_driver.h"
+#include "../../configuration.h"
 
 #define MAX_FRAG_SIZE 3072
 #define DEFAULT_RATE 48000

audio/drivers/alsathread.c

@@ -21,8 +21,8 @@
 #include <rthreads/rthreads.h>
 #include <queues/fifo_buffer.h>
 
-#include "../../driver.h"
-#include "../../general.h"
+#include "../audio_driver.h"
+#include "../../configuration.h"
 #include "../../verbosity.h"
 
 #define TRY_ALSA(x) if (x < 0) { \

audio/drivers/coreaudio.c

@@ -31,8 +31,8 @@
 #include <rthreads/rthreads.h>
 #include <retro_endianness.h>
 
-#include "../../driver.h"
-#include "../../general.h"
+#include "../audio_driver.h"
+#include "../configuration.h"
 #include "../../verbosity.h"
 
 #if defined(__powerpc__) || defined(__ppc__) || defined(__POWERPC__)

audio/drivers/ctr_csnd_audio.c

@@ -14,8 +14,9 @@
  */
 
 #include <3ds.h>
-#include "../../general.h"
-#include "../../driver.h"
+
+#include "../audio_driver.h"
+#include "../../configuration.h"
 #include "../../performance.h"
 
 typedef struct

audio/drivers/ctr_dsp_audio.c

@@ -14,8 +14,9 @@
  */
 
 #include <3ds.h>
-#include "../../general.h"
-#include "../../driver.h"
+
+#include "../audio_driver.h"
+#include "../../configuration.h"
 #include "../../performance.h"
 
 

audio/drivers/dsound.c

@@ -34,8 +34,8 @@
 #include <rthreads/rthreads.h>
 #include <queues/fifo_buffer.h>
 
-#include "../../driver.h"
-#include "../../general.h"
+#include "../audio_driver.h"
+#include "../configuration.h"
 #include "../../verbosity.h"
 
 #ifdef _XBOX

audio/drivers/gx_audio.c

@@ -27,8 +27,8 @@
 #include <boolean.h>
 #include <retro_inline.h>
 
-#include "../../driver.h"
-#include "../../general.h"
+#include "../audio_driver.h"
+#include "../../configuration.h"
 #include "../../defines/gx_defines.h"
 
 #define CHUNK_FRAMES 64

audio/drivers/jack.c

@@ -26,8 +26,8 @@
 #include <boolean.h>
 #include <rthreads/rthreads.h>
 
-#include "../../driver.h"
-#include "../../general.h"
+#include "../audio_driver.h"
+#include "../../configuration.h"
 #include "../../verbosity.h"
 
 #define FRAMES(x) (x / (sizeof(float) * 2))

audio/drivers/nullaudio.c

@@ -13,8 +13,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../general.h"
-#include "../../driver.h"
+#include "../audio_driver.h"
 
 static void *null_audio_init(const char *device, unsigned rate, unsigned latency)
 {

audio/drivers/openal.c

@@ -28,8 +28,8 @@
 #include <windows.h>
 #endif
 
-#include "../../driver.h"
-#include "../../general.h"
+#include "../audio_driver.h"
+#include "../../configuration.h"
 #include "../../verbosity.h"
 
 #define BUFSIZE 1024

audio/drivers/opensl.c

@@ -21,8 +21,8 @@
 
 #include <rthreads/rthreads.h>
 
-#include "../../driver.h"
-#include "../../general.h"
+#include "../audio_driver.h"
+#include "../../configuration.h"
 
 /* Helper macros, COM-style. */
 #define SLObjectItf_Realize(a, ...) ((*(a))->Realize(a, __VA_ARGS__))

audio/drivers/oss.c

@@ -31,8 +31,8 @@
 #include "config.h"
 #endif
 
-#include "../../driver.h"
-#include "../../general.h"
+#include "../audio_driver.h"
+#include "../../configuration.h"
 #include "../../verbosity.h"
 
 #ifdef HAVE_OSS_BSD

audio/drivers/ps3_audio.c

@@ -19,8 +19,8 @@
 
 #include <queues/fifo_buffer.h>
 
-#include "../driver.h"
-#include "../general.h"
+#include "../audio_driver.h"
+#include "../../configuration.h"
 
 #include "../../defines/ps3_defines.h"
 

audio/drivers/psp_audio.c

@@ -28,8 +28,8 @@
 #include <pspaudio.h>
 #endif
 
-#include "../../general.h"
-#include "../../driver.h"
+#include "../audio_driver.h"
+#include "../../configuration.h"
 
 typedef struct psp_audio
 {

audio/drivers/pulse.c

@@ -21,8 +21,8 @@
 #include <boolean.h>
 #include <retro_endianness.h>
 
-#include "../../driver.h"
-#include "../../general.h"
+#include "../audio_driver.h"
+#include "../../configuration.h"
 #include "../../verbosity.h"
 
 typedef struct

audio/drivers/roar.c

@@ -22,8 +22,8 @@
 
 #include <boolean.h>
 
-#include "../../driver.h"
-#include "../../general.h"
+#include "../audio_driver.h"
+#include "../../configuration.h"
 
 typedef struct
 {

audio/drivers/rwebaudio.c

@@ -17,8 +17,8 @@
 #include <unistd.h>
 #include <boolean.h>
 
-#include "../../driver.h"
-#include "../../general.h"
+#include "../audio_driver.h"
+#include "../../configuration.h"
 
 /* forward declarations */
 unsigned RWebAudioSampleRate(void);

audio/drivers/sdl_audio.c

@@ -26,8 +26,8 @@
 #include <queues/fifo_buffer.h>
 #include <retro_inline.h>
 
-#include "../../driver.h"
-#include "../../general.h"
+#include "../audio_driver.h"
+#include "../../configuration.h"
 #include "../../verbosity.h"
 
 typedef struct sdl_audio

audio/drivers/xaudio.cpp

@@ -24,8 +24,8 @@
 
 #include "xaudio.h"
 
-#include "../../driver.h"
-#include "../../general.h"
+#include "../audio_driver.h"
+#include "../../configuration.h"
 #include "../../verbosity.h"
 
 typedef struct xaudio2 xaudio2_t;

audio/drivers/xenon360_audio.c

@@ -21,8 +21,8 @@
 
 #include <retro_inline.h>
 
-#include "../../driver.h"
-#include "../../general.h"
+#include "../audio_driver.h"
+#include "../../configuration.h"
 
 #define SOUND_FREQUENCY 48000
 #define MAX_BUFFER 2048

command_event.c

@@ -19,6 +19,7 @@
 
 #include "command_event.h"
 
+#include "audio/audio_driver.h"
 #include "general.h"
 #include "performance.h"
 #include "dynamic.h"

configuration.c

@@ -22,6 +22,7 @@
 #include <compat/posix_string.h>
 #include <retro_stat.h>
 
+#include "audio/audio_driver.h"
 #include "config.def.h"
 #include "input/input_common.h"
 #include "input/input_keymaps.h"

driver.c

@@ -21,6 +21,7 @@
 
 #include "msg_hash.h"
 #include "verbosity.h"
+#include "audio/audio_driver.h"
 
 #ifdef HAVE_MENU
 #include "menu/menu.h"

driver.h

@@ -30,7 +30,6 @@
 #include "ui/ui_companion_driver.h"
 #include "gfx/video_driver.h"
 #include "gfx/font_renderer_driver.h"
-#include "audio/audio_driver.h"
 
 #include "camera/camera_driver.h"
 #include "location/location_driver.h"

dynamic.c

@@ -29,6 +29,7 @@
 
 #include "performance.h"
 
+#include "audio/audio_driver.h"
 #include "libretro_private.h"
 #include "cores/internal_cores.h"
 #include "retroarch.h"

libretro_version_1.c

@@ -32,6 +32,7 @@
 #include "rewind.h"
 #include "performance.h"
 #include "input/input_remapping.h"
+#include "audio/audio_driver.h"
 #include "record/record_driver.h"
 #include "verbosity.h"
 

menu/menu_setting.c

@@ -38,6 +38,7 @@
 #include "../driver.h"
 #include "../general.h"
 #include "../dynamic.h"
+#include "../audio/audio_driver.h"
 #include "../input/input_common.h"
 #include "../input/input_autodetect.h"
 #include "../config.def.h"

rewind.c

@@ -26,6 +26,7 @@
 #include "rewind.h"
 #include "performance.h"
 #include "verbosity.h"
+#include "audio/audio_driver.h"
 
 /* This makes Valgrind throw errors if a core overflows its savestate size. */
 /* Keep it off unless you're chasing a core bug, it slows things down. */

runloop.c

@@ -29,6 +29,7 @@
 #include "retroarch.h"
 #include "runloop.h"
 #include "runloop_data.h"
+#include "audio/audio_driver.h"
 
 #include "msg_hash.h"