diff --git a/Makefile.common b/Makefile.common
index f762715bb9..7bbdfdbc49 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -133,7 +133,7 @@ OBJ += frontend/frontend.o \
 		libretro-sdk/gfx/scaler/scaler_filter.o \
 		gfx/image/image_rpng.o \
 		gfx/fonts/fonts.o \
-		gfx/filter.o \
+		gfx/video_filter.o \
 		audio/resamplers/resampler.o \
 		audio/dsp_filter.o \
 		audio/resamplers/sinc.o \
diff --git a/general.h b/general.h
index 6cc4ac400e..c587737d83 100644
--- a/general.h
+++ b/general.h
@@ -32,7 +32,7 @@
 #include "core_options.h"
 #include "core_info.h"
 #include <retro_miscellaneous.h>
-#include "gfx/filter.h"
+#include "gfx/video_filter.h"
 
 #include "playlist.h"
 
diff --git a/gfx/filter.c b/gfx/video_filter.c
similarity index 99%
rename from gfx/filter.c
rename to gfx/video_filter.c
index 1fae4b2365..d83fbb8d06 100644
--- a/gfx/filter.c
+++ b/gfx/video_filter.c
@@ -13,7 +13,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "filter.h"
+#include "video_filter.h"
 #include "video_filters/softfilter.h"
 #include "../dynamic.h"
 #include <file/config_file_userdata.h>
diff --git a/gfx/filter.h b/gfx/video_filter.h
similarity index 100%
rename from gfx/filter.h
rename to gfx/video_filter.h