diff --git a/Makefile.ctr b/Makefile.ctr
index ba6139c5be..5c6ed2669b 100644
--- a/Makefile.ctr
+++ b/Makefile.ctr
@@ -86,14 +86,14 @@ else
 	OBJ += gfx/video_filters/blargg_ntsc_snes.o
 	OBJ += gfx/video_filters/lq2x.o
 	OBJ += gfx/video_filters/phosphor2x.o
-	OBJ += audio/audio_filters/echo.o
-	OBJ += audio/audio_filters/eq.o
-	OBJ += audio/audio_filters/chorus.o
-	OBJ += audio/audio_filters/iir.o
-	OBJ += audio/audio_filters/panning.o
-	OBJ += audio/audio_filters/phaser.o
-	OBJ += audio/audio_filters/reverb.o
-	OBJ += audio/audio_filters/wahwah.o
+	OBJ += libretro-common/audio/dsp_filters/echo.o
+	OBJ += libretro-common/audio/dsp_filters/eq.o
+	OBJ += libretro-common/audio/dsp_filters/chorus.o
+	OBJ += libretro-common/audio/dsp_filters/iir.o
+	OBJ += libretro-common/audio/dsp_filters/panning.o
+	OBJ += libretro-common/audio/dsp_filters/phaser.o
+	OBJ += libretro-common/audio/dsp_filters/reverb.o
+	OBJ += libretro-common/audio/dsp_filters/wahwah.o
 endif
 
 
diff --git a/Makefile.emscripten b/Makefile.emscripten
index 1b420651c7..908072621f 100644
--- a/Makefile.emscripten
+++ b/Makefile.emscripten
@@ -63,14 +63,14 @@ OBJ += gfx/video_filters/blargg_ntsc_snes.o
 OBJ += gfx/video_filters/lq2x.o
 OBJ += gfx/video_filters/phosphor2x.o
 
-OBJ += audio/audio_filters/echo.o
-OBJ += audio/audio_filters/eq.o
-OBJ += audio/audio_filters/chorus.o
-OBJ += audio/audio_filters/iir.o
-OBJ += audio/audio_filters/panning.o
-OBJ += audio/audio_filters/phaser.o
-OBJ += audio/audio_filters/reverb.o
-OBJ += audio/audio_filters/wahwah.o
+OBJ += libretro-common/audio/dsp_filters/echo.o
+OBJ += libretro-common/audio/dsp_filters/eq.o
+OBJ += libretro-common/audio/dsp_filters/chorus.o
+OBJ += libretro-common/audio/dsp_filters/iir.o
+OBJ += libretro-common/audio/dsp_filters/panning.o
+OBJ += libretro-common/audio/dsp_filters/phaser.o
+OBJ += libretro-common/audio/dsp_filters/reverb.o
+OBJ += libretro-common/audio/dsp_filters/wahwah.o
 
 CFLAGS += -Ideps/zlib/
 libretro = libretro_emscripten.bc
diff --git a/Makefile.wiiu b/Makefile.wiiu
index 835497458f..90ff8d0619 100644
--- a/Makefile.wiiu
+++ b/Makefile.wiiu
@@ -60,14 +60,14 @@ else
 	OBJ += gfx/video_filters/blargg_ntsc_snes.o
 	OBJ += gfx/video_filters/lq2x.o
 	OBJ += gfx/video_filters/phosphor2x.o
-	OBJ += audio/audio_filters/echo.o
-	OBJ += audio/audio_filters/eq.o
-	OBJ += audio/audio_filters/chorus.o
-	OBJ += audio/audio_filters/iir.o
-	OBJ += audio/audio_filters/panning.o
-	OBJ += audio/audio_filters/phaser.o
-	OBJ += audio/audio_filters/reverb.o
-	OBJ += audio/audio_filters/wahwah.o
+	OBJ += libretro-common/audio/dsp_filters/echo.o
+	OBJ += libretro-common/audio/dsp_filters/eq.o
+	OBJ += libretro-common/audio/dsp_filters/chorus.o
+	OBJ += libretro-common/audio/dsp_filters/iir.o
+	OBJ += libretro-common/audio/dsp_filters/panning.o
+	OBJ += libretro-common/audio/dsp_filters/phaser.o
+	OBJ += libretro-common/audio/dsp_filters/reverb.o
+	OBJ += libretro-common/audio/dsp_filters/wahwah.o
 endif
 
 
diff --git a/pkg/debian/rules b/pkg/debian/rules
index 8ac765d0d0..1663c57718 100755
--- a/pkg/debian/rules
+++ b/pkg/debian/rules
@@ -41,7 +41,7 @@ override_dh_auto_build:
 	# SoftFilters
 	dh_auto_build -- -C gfx/video_filters/
 	# Audio DSP plugins
-	dh_auto_build -- -C audio/audio_filters/
+	dh_auto_build -- -C libretro-common/audio/dsp_filters/
 
 override_dh_auto_install:
 	# Add here commands to install the package into debian/retroarch.
@@ -56,7 +56,7 @@ endif
 		cp *.so $(CURDIR)/debian/retroarch/usr/lib/retroarch/filters/video/ && \
 		cp *.filt $(CURDIR)/debian/retroarch/usr/lib/retroarch/filters/video/
 	# Audio DSP plugins
-	cd $(CURDIR)/audio/audio_filters/ && \
+	cd $(CURDIR)/dsp_filters/ && \
 		cp *.so $(CURDIR)/debian/retroarch/usr/lib/retroarch/filters/audio/ && \
 		cp *.dsp $(CURDIR)/debian/retroarch/usr/lib/retroarch/filters/audio/
 
@@ -64,4 +64,4 @@ override_dh_auto_clean:
 	touch config.mk
 	dh_auto_clean --
 	dh_auto_clean -- -C gfx/video_filters/ clean
-	dh_auto_clean -- -C audio/audio_filters/ clean
+	dh_auto_clean -- -C libretro-common/audio/dsp_filters/ clean