diff --git a/configure.ac b/configure.ac
index e348bc8ba5..a1d1f883da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4996,9 +4996,7 @@ fi
 ### Check availability
 
 ## Generic player
-EFL_DEPEND_PKG([GENERIC_VLC], [VLC], [libvlc >= 2.0])
-EFL_INTERNAL_DEPEND_PKG([GENERIC_VLC], [eina])
-EFL_INTERNAL_DEPEND_PKG([GENERIC_VLC], [ecore])
+EMOTION_GENERIC_PLAYER([GENERIC_VLC], [VLC], [libvlc >= 2.0])
 EFL_ADD_FEATURE([EMOTION], [generic_vlc], [${with_generic_vlc}])
 
 EFL_LIB_END([Emotion])
diff --git a/src/Makefile_Emotion.am b/src/Makefile_Emotion.am
index 8e6a443ba6..a4746c77ae 100644
--- a/src/Makefile_Emotion.am
+++ b/src/Makefile_Emotion.am
@@ -365,6 +365,10 @@ if HAVE_GENERIC_VLC
 emotiongenericplayers_PROGRAMS += generic/emotion/vlc/vlc
 generic_emotion_vlc_vlc_SOURCES = generic/emotion/vlc/emotion_generic_vlc.c
 generic_emotion_vlc_vlc_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/ecore \
 -I$(top_srcdir)/src/modules/emotion/generic \
 -I$(top_builddir)/src/lib/efl \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
@@ -373,6 +377,6 @@ generic_emotion_vlc_vlc_CPPFLAGS = \
 -DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
 -DEMOTION_GENERIC_PLAYERS_DIR=\"$(libdir)/emotion/generic_players/$(MODULE_ARCH)\" \
 @GENERIC_VLC_CFLAGS@
-generic_emotion_vlc_vlc_LDADD = @GENERIC_VLC_LIBS@
-
+generic_emotion_vlc_vlc_LDADD = @GENERIC_VLC_LIBS@ @USE_EINA_LIBS@ @USE_ECORE_LIBS@
+generic_emotion_vlc_vlc_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_ECORE_INTERNAL_LIBS@
 endif