diff --git a/cores/libretro-ffmpeg/Makefile b/cores/libretro-ffmpeg/Makefile
index 0d8f0412ec..5a07733917 100644
--- a/cores/libretro-ffmpeg/Makefile
+++ b/cores/libretro-ffmpeg/Makefile
@@ -232,12 +232,13 @@ ifeq ($(HAVE_SSA), 1)
 endif
 
 LIBRETROCOMM_DIR := ../../libretro-common
+DEPS_DIR         := ../../deps
 
 LIBAVCODEC_SOURCE :=
 LIBAVFORMAT_SOURCE :=
 LIBAVUTIL_SOURCE :=
 LIBRETRO_SOURCE := ffmpeg_core.c \
-						 $(LIBRETROCOMM_DIR)/queues/fifo_buffer.c \
+						 $(LIBRETROCOMM_DIR)/queues/fifo_queue.c \
 						 $(LIBRETROCOMM_DIR)/rthreads/rthreads.c
 DEPS_SOURCE :=
 
@@ -2165,7 +2166,7 @@ else
 	CFLAGS += -DHAVE_INTRINSICS_NEON=0
 endif
 
-CFLAGS += -Ilibretro-common/include 
+CFLAGS += -I$(LIBRETROCOMM_DIR)/include -I$(DEPS_DIR)
 
 OBJECTS := $(DEPS_SOURCE:.c=.o) $(LIBRETRO_SOURCE:.c=.o) $(FFT_SOURCE:.cpp=.o) $(LIBAVUTIL_SOURCE:.c=.o) $(LIBAVFORMAT_SOURCE:.c=.o) $(LIBSWSCALE_SOURCE:.c=.o) $(LIBAVCODEC_SOURCE:.c=.o) $(LIBSWRESAMPLE_SOURCE:.c=.o)
 
diff --git a/cores/libretro-ffmpeg/fft/fft.cpp b/cores/libretro-ffmpeg/fft/fft.cpp
index db4995a14c..af1d383b21 100644
--- a/cores/libretro-ffmpeg/fft/fft.cpp
+++ b/cores/libretro-ffmpeg/fft/fft.cpp
@@ -4,13 +4,13 @@
 #include <math.h>
 
 #include <glsym/glsym.h>
-#include "../libretro.h"
+#include <libretro.h>
 
 #define GLM_SWIZZLE
 #define GLM_FORCE_RADIANS
-#include "glm/glm.hpp"
-#include "glm/gtc/matrix_transform.hpp"
-#include "glm/gtc/type_ptr.hpp"
+#include <glm/glm.hpp>
+#include <glm/gtc/matrix_transform.hpp>
+#include <glm/gtc/type_ptr.hpp>
 using namespace glm;
 
 #define GL_DEBUG 0
diff --git a/cores/libretro-ffmpeg/fft/fft.h b/cores/libretro-ffmpeg/fft/fft.h
index 5af215d8b8..e788530e62 100644
--- a/cores/libretro-ffmpeg/fft/fft.h
+++ b/cores/libretro-ffmpeg/fft/fft.h
@@ -1,7 +1,7 @@
 #ifndef FFT_H__
 #define FFT_H__
 
-#include "../glsym/glsym.h"
+#include <glsym/glsym.h>
 
 #ifdef __cplusplus
 extern "C" {