diff --git a/Makefile.common b/Makefile.common
index 0fa20520a1..8b31d3fe0c 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -141,7 +141,7 @@ OBJ += frontend/frontend.o \
 		gfx/font_renderer_driver.o \
 		gfx/video_filter.o \
 		audio/audio_resampler_driver.o \
-		audio/dsp_filter.o \
+		audio/audio_dsp_filter.o \
 		audio/drivers_resampler/sinc.o \
 		audio/drivers_resampler/nearest.o \
 		audio/drivers_resampler/cc_resampler.o \
diff --git a/audio/dsp_filter.c b/audio/audio_dsp_filter.c
similarity index 99%
rename from audio/dsp_filter.c
rename to audio/audio_dsp_filter.c
index 946b8260d3..fc74b1ca24 100644
--- a/audio/dsp_filter.c
+++ b/audio/audio_dsp_filter.c
@@ -16,7 +16,7 @@
 
 #include "../performance.h"
 
-#include "dsp_filter.h"
+#include "audio_dsp_filter.h"
 #include "../dynamic.h"
 #include <file/config_file_userdata.h>
 #include "audio_filters/dspfilter.h"
diff --git a/audio/dsp_filter.h b/audio/audio_dsp_filter.h
similarity index 95%
rename from audio/dsp_filter.h
rename to audio/audio_dsp_filter.h
index 4a401d2456..6532328e8e 100644
--- a/audio/dsp_filter.h
+++ b/audio/audio_dsp_filter.h
@@ -14,8 +14,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef RARCH_DSP_FILTER_H__
-#define RARCH_DSP_FILTER_H__
+#ifndef __AUDIO_DSP_FILTER_H__
+#define __AUDIO_DSP_FILTER_H__
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/general.h b/general.h
index 11b5063ad8..b72f5209a3 100644
--- a/general.h
+++ b/general.h
@@ -27,7 +27,7 @@
 #include "movie.h"
 #include "autosave.h"
 #include "cheats.h"
-#include "audio/dsp_filter.h"
+#include "audio/audio_dsp_filter.h"
 #include <compat/strl.h>
 #include "core_options.h"
 #include "core_info.h"
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 74182bfc16..0b1bbbe80d 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -545,7 +545,7 @@ DYNAMIC
 #include "../dynamic.c"
 #include "../dynamic_dummy.c"
 #include "../gfx/video_filter.c"
-#include "../audio/dsp_filter.c"
+#include "../audio/audio_dsp_filter.c"
 
 
 /*============================================================