diff --git a/playback/player/android/jni/Android.mk b/playback/player/android/jni/Android.mk
index 378685fd02..39ad84ee4f 100644
--- a/playback/player/android/jni/Android.mk
+++ b/playback/player/android/jni/Android.mk
@@ -3,7 +3,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE    := gstplayer
-LOCAL_SRC_FILES := player.c ../../lib/gstplayer.c
+LOCAL_SRC_FILES := player.c ../../lib/gst/player/gstplayer.c
 LOCAL_SHARED_LIBRARIES := gstreamer_android
 LOCAL_LDLIBS := -llog -landroid
 include $(BUILD_SHARED_LIBRARY)
diff --git a/playback/player/android/jni/player.c b/playback/player/android/jni/player.c
index b77d170ab0..e0e2d22913 100644
--- a/playback/player/android/jni/player.c
+++ b/playback/player/android/jni/player.c
@@ -25,7 +25,7 @@
 #include <android/native_window.h>
 #include <android/native_window_jni.h>
 
-#include "../../lib/gstplayer.h"
+#include "../../lib/gst/player/gstplayer.h"
 
 GST_DEBUG_CATEGORY_STATIC (debug_category);
 #define GST_CAT_DEFAULT debug_category
diff --git a/playback/player/gst-play/Makefile b/playback/player/gst-play/Makefile
index 6044c42880..ff88941a52 100644
--- a/playback/player/gst-play/Makefile
+++ b/playback/player/gst-play/Makefile
@@ -10,11 +10,11 @@ clean:
 SOURCES = \
 	  gst-play.c \
 	  gst-play-kb.c \
-	  ../lib/gstplayer.c
+	  ../lib/gst/player/gstplayer.c
 
 HEADERS = \
 	  gst-play-kb.h \
-	  ../lib/gstplayer.h
+	  ../lib/gst/player/gstplayer.h
 
 gst-play: $(SOURCES) $(HEADERS)
 	$(CC) -o $@ $(SOURCES) $(CFLAGS) $(LIBS) -I../lib
diff --git a/playback/player/gst-play/gst-play.c b/playback/player/gst-play/gst-play.c
index 7981146549..5154d7ac37 100644
--- a/playback/player/gst-play/gst-play.c
+++ b/playback/player/gst-play/gst-play.c
@@ -29,7 +29,7 @@
 #include <math.h>
 
 #include "gst-play-kb.h"
-#include "gstplayer.h"
+#include <gst/player/gstplayer.h>
 
 #define VOLUME_STEPS 20
 
diff --git a/playback/player/gtk/Makefile b/playback/player/gtk/Makefile
index 0fffb372d4..a17c45ed30 100644
--- a/playback/player/gtk/Makefile
+++ b/playback/player/gtk/Makefile
@@ -9,10 +9,10 @@ clean:
 
 SOURCES = \
 	  gtk-play.c \
-	  ../lib/gstplayer.c
+	  ../lib/gst/player/gstplayer.c
 
 HEADERS = \
-	  ../lib/gstplayer.h
+	  ../lib/gst/player/gstplayer.h
 
 gtk-play: $(SOURCES) $(HEADERS)
 	$(CC) -o $@ $(SOURCES) $(CFLAGS) $(LIBS) -I../lib
diff --git a/playback/player/gtk/gtk-play.c b/playback/player/gtk/gtk-play.c
index 437fc36772..7bbc7a809f 100644
--- a/playback/player/gtk/gtk-play.c
+++ b/playback/player/gtk/gtk-play.c
@@ -14,7 +14,7 @@
 
 #include <gtk/gtk.h>
 
-#include "../lib/gstplayer.h"
+#include <gst/player/gstplayer.h>
 
 typedef struct
 {