diff --git a/audio/audio_driver.c b/audio/audio_driver.c
index bd6ebaddd2..8b49829783 100644
--- a/audio/audio_driver.c
+++ b/audio/audio_driver.c
@@ -21,6 +21,7 @@
 #include <lists/string_list.h>
 #include <audio/conversion/float_to_s16.h>
 #include <audio/conversion/s16_to_float.h>
+#include <audio/audio_resampler.h>
 #include <audio/dsp_filter.h>
 #include <file/file_path.h>
 #include <lists/dir_list.h>
@@ -224,7 +225,7 @@ static void audio_mixer_menu_stop_cb(
 #define audio_driver_unlock()
 #endif
 
-enum resampler_quality audio_driver_get_resampler_quality(void)
+static enum resampler_quality audio_driver_get_resampler_quality(void)
 {
    settings_t *settings = config_get_ptr();
 
diff --git a/audio/audio_driver.h b/audio/audio_driver.h
index d6649e6c4b..ca47d8d917 100644
--- a/audio/audio_driver.h
+++ b/audio/audio_driver.h
@@ -22,10 +22,10 @@
 #include <sys/types.h>
 
 #include <boolean.h>
-#include <audio/audio_mixer.h>
-#include <audio/audio_resampler.h>
 #include <retro_common_api.h>
 
+#include <audio/audio_mixer.h>
+
 RETRO_BEGIN_DECLS
 
 #define AUDIO_CHUNK_SIZE_BLOCKING      512
@@ -340,8 +340,6 @@ void audio_driver_mixer_set_stream_volume(unsigned i, float vol);
 
 void audio_driver_mixer_remove_stream(unsigned i);
 
-enum resampler_quality audio_driver_get_resampler_quality(void);
-
 enum audio_mixer_state audio_driver_mixer_get_stream_state(unsigned i);
 
 const char *audio_driver_mixer_get_stream_name(unsigned i);
diff --git a/driver.c b/driver.c
index 3877683bfd..5881d1a63f 100644
--- a/driver.c
+++ b/driver.c
@@ -22,6 +22,8 @@
 #include "config.h"
 #endif
 
+#include <audio/audio_resampler.h>
+
 #ifdef HAVE_MENU
 #include "menu/menu_driver.h"
 #endif
diff --git a/gfx/video_driver.h b/gfx/video_driver.h
index 2e5340ffbf..26a738cf0c 100644
--- a/gfx/video_driver.h
+++ b/gfx/video_driver.h
@@ -37,7 +37,6 @@
 #include "video_coord_array.h"
 #include "video_filter.h"
 #include "video_shader_parse.h"
-#include "video_state_tracker.h"
 
 #include "../input/input_driver.h"
 
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index 81282c1d4d..2148e928ad 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -33,7 +33,6 @@
 #include "menu_entries.h"
 
 #include "../audio/audio_driver.h"
-#include "../gfx/video_driver.h"
 #include "../file_path_special.h"
 #include "../gfx/font_driver.h"
 #include "../gfx/video_coord_array.h"