diff --git a/cores/libretro-test-gl/Makefile b/cores/libretro-test-gl/Makefile
index c82aca23f3..b492df3a31 100644
--- a/cores/libretro-test-gl/Makefile
+++ b/cores/libretro-test-gl/Makefile
@@ -123,7 +123,7 @@ else
    CFLAGS += -std=gnu99
 endif
 
-OBJECTS := libretro-test.o ../libretro-common/glsym/rglgen.o
+OBJECTS := libretro-test.o ../../libretro-common/glsym/rglgen.o
 CFLAGS += -Wall -pedantic $(fpic)
 
 ifeq ($(GLES), 1)
@@ -134,9 +134,9 @@ ifeq ($(GLES), 1)
       CFLAGS += -DHAVE_OPENGLES3 -DGLES3
    endif
    LIBS += -lGLESv2 # Still link against GLESv2 when using GLES3 API, at least on desktop Linux.
-   OBJECTS += ../libretro-common/glsym/glsym_es2.o
+   OBJECTS += ../../libretro-common/glsym/glsym_es2.o
 else
-   OBJECTS += ../libretro-common/glsym/glsym_gl.o
+   OBJECTS += ../../libretro-common/glsym/glsym_gl.o
    LIBS += $(GL_LIB)
 endif
 
@@ -150,7 +150,7 @@ $(TARGET): $(OBJECTS)
 	$(CC) $(fpic) $(SHARED) $(INCLUDES) -o $@ $(OBJECTS) $(LIBS) -lm $(EXTRA_GL_LIBS)
 
 %.o: %.c
-	$(CC) -I../libretro-common/include $(CFLAGS) -c -o $@ $<
+	$(CC) -I../../libretro-common/include $(CFLAGS) -c -o $@ $<
 
 clean:
 	rm -f $(OBJECTS) $(TARGET)
diff --git a/cores/libretro-test-gl/jni/Android.mk b/cores/libretro-test-gl/jni/Android.mk
index c3bcbe0791..1691f74985 100644
--- a/cores/libretro-test-gl/jni/Android.mk
+++ b/cores/libretro-test-gl/jni/Android.mk
@@ -24,8 +24,8 @@ else
    GLES_LIB := -lGLESv2
 endif
 
-LOCAL_SRC_FILES += $(addprefix ../,$(wildcard *.c) ../gfx/glsym/rglgen.c ../gfx/glsym/glsym_es2.c)
-LOCAL_CFLAGS += -O2 -Wall -std=gnu99 -ffast-math -DGLES -DHAVE_OPENGLES2
+LOCAL_SRC_FILES += $(addprefix ../,$(wildcard *.c) ../../../libretro-common/glsym/rglgen.c ../../../libretro-common/glsym/glsym_es2.c)
+LOCAL_CFLAGS += -O2 -Wall -std=gnu99 -ffast-math -DGLES -DHAVE_OPENGLES2 -I../../../libretro-common/include
 LOCAL_LDLIBS += $(GLES_LIB)
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/cores/libretro-test-gl/libretro-test.c b/cores/libretro-test-gl/libretro-test.c
index 147d448b24..4d900ce6a5 100644
--- a/cores/libretro-test-gl/libretro-test.c
+++ b/cores/libretro-test-gl/libretro-test.c
@@ -1,4 +1,4 @@
-#include "../libretro.h"
+#include "../../libretro.h"
 #include <stdint.h>
 #include <string.h>
 #include <math.h>
@@ -8,7 +8,7 @@
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
 static struct retro_hw_render_callback hw_render;
 
-#include "../libretro-common/include/glsym/glsym.h"
+#include <glsym/glsym.h>
 
 #if defined(HAVE_PSGL)
 #define RARCH_GL_FRAMEBUFFER GL_FRAMEBUFFER_OES
diff --git a/cores/libretro-test/libretro-test.c b/cores/libretro-test/libretro-test.c
index 72616f2937..6e70d7d1d7 100644
--- a/cores/libretro-test/libretro-test.c
+++ b/cores/libretro-test/libretro-test.c
@@ -1,4 +1,4 @@
-#include "../libretro.h"
+#include "../../libretro.h"
 #include <stdint.h>
 #include <string.h>
 #include <math.h>