diff --git a/audio/audio_driver.h b/audio/audio_driver.h
index 91fc2a8139..003baff5fd 100644
--- a/audio/audio_driver.h
+++ b/audio/audio_driver.h
@@ -21,6 +21,7 @@
 #include <stddef.h>
 #include <sys/types.h>
 #include <boolean.h>
+#include "audio_dsp_filter.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/general.h b/general.h
index f3d0c3e7f0..318c4ca1b9 100644
--- a/general.h
+++ b/general.h
@@ -27,12 +27,10 @@
 #include "movie.h"
 #include "autosave.h"
 #include "cheats.h"
-#include "audio/audio_dsp_filter.h"
 #include <compat/strl.h>
 #include "core_options.h"
 #include "core_info.h"
 #include <retro_miscellaneous.h>
-#include "gfx/video_filter.h"
 
 #include "playlist.h"
 
diff --git a/gfx/video_driver.h b/gfx/video_driver.h
index 09b0aa13a0..9f60cb4e5e 100644
--- a/gfx/video_driver.h
+++ b/gfx/video_driver.h
@@ -22,11 +22,12 @@
 #include <sys/types.h>
 #include <boolean.h>
 #include <gfx/scaler/scaler.h>
-#include "../libretro.h"
+#include "video_filter.h"
+#include "video_shader_parse.h"
 
+#include "../libretro.h"
 #include "../input/input_driver.h"
 
-#include "video_shader_parse.h"
 
 #ifdef __cplusplus
 extern "C" {