diff --git a/cores/libretro-ffmpeg/Makefile.common b/cores/libretro-ffmpeg/Makefile.common
index dab3380c0e..7765635244 100644
--- a/cores/libretro-ffmpeg/Makefile.common
+++ b/cores/libretro-ffmpeg/Makefile.common
@@ -73,7 +73,7 @@ ifeq ($(INTERNAL_LIBVORBIS),0)
 	HAVE_LIBVORBIS = 1
 else
 	LIBVORBIS_DIR = $(DEPS_DIR)/libvorbis
-	INCFLAGS += -I$(LIBVORBIS_DIR) -I$(LIBVORBIS_DIR)/lib
+	INCFLAGS += -I$(LIBVORBIS_DIR)/include -I$(LIBVORBIS_DIR)/lib
 	DEFINES += -DOV_EXCLUDE_STATIC_CALLBACKS
 	HAVE_LIBVORBIS = 1
 	DEPS_SOURCE += $(LIBVORBIS_DIR)/lib/analysis.c \
@@ -126,7 +126,7 @@ else
 	LIBOGG_DIR=$(DEPS_DIR)/libogg
 	DEFINES += -DOV_EXCLUDE_STATIC_CALLBACKS
 	HAVE_LIBOGG = 1
-	INCFLAGS    += $(LIBOGG_DIR)/include
+	INCFLAGS    += -I$(LIBOGG_DIR)/include
 
 	DEPS_SOURCE += $(LIBOGG_DIR)/src/bitwise.c \
 						$(LIBOGG_DIR)/src/framing.c
diff --git a/cores/libretro-ffmpeg/ffmpeg_core.c b/cores/libretro-ffmpeg/ffmpeg_core.c
index e7f1f5aff7..7f7f1a13a8 100644
--- a/cores/libretro-ffmpeg/ffmpeg_core.c
+++ b/cores/libretro-ffmpeg/ffmpeg_core.c
@@ -717,7 +717,7 @@ void CORE_PREFIX(retro_run)(void)
                media.width, media.height, media.width * sizeof(uint32_t));
       }
    }
-#ifdef HAVE_GL_FFT
+#if defined(HAVE_GL_FFT) && (defined(HAVE_OPENGL) || defined(HAVE_OPENGLES))
    else if (fft)
    {
       unsigned       frames = to_read_frames;