alpha1 release autofoo/build tree work to pass distcheck and actually workv1.8.0-alpha1

76 files changed, 155 insertions, 110 deletions

diff --git a/Makefile.am b/Makefile.am
index 161a091a01..85c1fa0835 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,7 @@
 ACLOCAL_AMFLAGS = -I m4
 AM_MAKEFLAGS = --no-print-directory
 AM_DISTCHECK_CONFIGURE_FLAGS = \
---with-tests=regular \
---enable-always-build-examples \
---enable-xine \
---enable-sdl \
---enable-harfbuzz
+--with-tests=regular
 
 SUBDIRS = src data doc
 
diff --git a/configure.ac b/configure.ac
index 663fd638fd..78f6848b86 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
-EFL_VERSION([1], [7], [99], [dev])
-AC_INIT([efl], [efl_version], [enlightenment-devel@lists.sourceforge.net])
+EFL_VERSION([1], [8], [0], [dev])
+AC_INIT([efl], [efl_version-alpha1], [enlightenment-devel@lists.sourceforge.net])
 
 AC_PREREQ([2.60])
 AC_CONFIG_SRCDIR([configure.ac])
@@ -173,6 +173,11 @@ case "$host_os" in
    ;;
 esac
 
+EFL_VERSION_MAJOR="v_maj"
+EFL_VERSION_MINOR="v_min"
+AC_SUBST(EFL_VERSION_MAJOR)
+AC_SUBST(EFL_VERSION_MINOR)
+
 want_systemd="no"
 have_wince="no"
 have_win32="no"
diff --git a/m4/efl.m4 b/m4/efl.m4
index 4b55c00ecd..5cf6054266 100644
--- a/m4/efl.m4
+++ b/m4/efl.m4
@@ -29,7 +29,8 @@ m4_define([dev_version], m4_esyscmd([(git rev-list --count HEAD 2>/dev/null || e
 m4_define([v_rev], m4_if($4, dev, [dev_version], [0]))dnl
 m4_define([v_rel], m4_if($4, dev, [], m4_ifblank($4, [], [-release $4])))dnl
 m4_define([def_build_profile], m4_if($4, dev, [dev], [release]))dnl
-m4_define([efl_version], m4_if($4, dev, [v_maj.v_min.v_mic.v_rev], [v_maj.v_min.v_mic]))dnl
+dnl m4_define([efl_version], m4_if($4, dev, [v_maj.v_min.v_mic.v_rev], [v_maj.v_min.v_mic]))dnl
+m4_define([efl_version], [v_maj.v_min.v_mic])dnl
 ])
 
 dnl EFL_COLOR
diff --git a/pc/ecore-audio.pc.in b/pc/ecore-audio.pc.in
index 1d48e7d8d7..31d1eaba26 100644
--- a/pc/ecore-audio.pc.in
+++ b/pc/ecore-audio.pc.in
@@ -9,4 +9,4 @@ Requires.private: @requirements_pc_ecore_audio@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_audio
 Libs.private: @requirements_libs_ecore_audio@
-Cflags: -I${includedir}/ecore-audio-@VMAJ@
+Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/efl-@VMAJ@ -I${includedir}/ecore-audio-@VMAJ@
diff --git a/pc/ecore-cocoa.pc.in b/pc/ecore-cocoa.pc.in
index 15af0ebae9..55ecca92ab 100644
--- a/pc/ecore-cocoa.pc.in
+++ b/pc/ecore-cocoa.pc.in
@@ -9,4 +9,4 @@ Requires.private: @requirements_pc_ecore_cocoa@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_cocoa
 Libs.private: @requirements_libs_ecore_cocoa@
-Cflags: -I${includedir}/ecore-cocoa-@VMAJ@
+Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/efl-@VMAJ@ -I${includedir}/ecore-cocoa-@VMAJ@
diff --git a/pc/ecore-con.pc.in b/pc/ecore-con.pc.in
index c2acbcaae6..11fd8a5fb7 100644
--- a/pc/ecore-con.pc.in
+++ b/pc/ecore-con.pc.in
@@ -9,4 +9,4 @@ Requires.private: @requirements_pc_ecore_con@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_con
 Libs.private: @requirements_libs_ecore_con@
-Cflags: -I${includedir}/ecore-con-@VMAJ@
+Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/ecore-con-@VMAJ@
diff --git a/pc/ecore-evas.pc.in b/pc/ecore-evas.pc.in
index 53c85f8721..d3ca75b137 100644
--- a/pc/ecore-evas.pc.in
+++ b/pc/ecore-evas.pc.in
@@ -9,4 +9,4 @@ Requires.private: @requirements_pc_ecore_evas@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_evas
 Libs.private: @requirements_libs_ecore_evas@
-Cflags: -I${includedir}/ecore-evas-@VMAJ@
+Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/ecore-evas-@VMAJ@
diff --git a/pc/ecore-fb.pc.in b/pc/ecore-fb.pc.in
index 4efda16ee1..ae006246bc 100644
--- a/pc/ecore-fb.pc.in
+++ b/pc/ecore-fb.pc.in
@@ -9,4 +9,4 @@ Requires.private: @requirements_pc_ecore_fb@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_fb
 Libs.private: @requirements_libs_ecore_fb@
-Cflags: -I${includedir}/ecore-fb-@VMAJ@
+Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/ecore-fb-@VMAJ@
diff --git a/pc/ecore-file.pc.in b/pc/ecore-file.pc.in
index 820c587dad..e4dcd1e186 100644
--- a/pc/ecore-file.pc.in
+++ b/pc/ecore-file.pc.in
@@ -9,4 +9,4 @@ Requires.private: @requirements_pc_ecore_file@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_file
 Libs.private: @requirements_libs_ecore_file@
-Cflags: -I${includedir}/ecore-file-@VMAJ@
+Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/ecore-file-@VMAJ@
diff --git a/pc/ecore-imf-evas.pc.in b/pc/ecore-imf-evas.pc.in
index 5e5748f976..de109059f9 100644
--- a/pc/ecore-imf-evas.pc.in
+++ b/pc/ecore-imf-evas.pc.in
@@ -8,4 +8,4 @@ Description: E core library, IMF Evas module
 Version: @VERSION@
 Requires.private: @requirements_pc_ecore_imf_evas@
 Libs: -L${libdir} -lecore_imf_evas
-Cflags: -I${includedir}/ecore-imf-evas-@VMAJ@
+Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/ecore-imf-evas-@VMAJ@
diff --git a/pc/ecore-imf.pc.in b/pc/ecore-imf.pc.in
index 6aae05f502..dd7ffff250 100644
--- a/pc/ecore-imf.pc.in
+++ b/pc/ecore-imf.pc.in
@@ -10,4 +10,4 @@ Description: E core library, IMF module
 Version: @VERSION@
 Requires.private: @requirements_pc_ecore_imf@
 Libs: -L${libdir} -lecore_imf
-Cflags: -I${includedir}/ecore-imf-@VMAJ@
+Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/ecore-imf-@VMAJ@
diff --git a/pc/ecore-input-evas.pc.in b/pc/ecore-input-evas.pc.in
index 53b1e299e8..ff6159f31a 100644
--- a/pc/ecore-input-evas.pc.in
+++ b/pc/ecore-input-evas.pc.in
@@ -9,4 +9,4 @@ Requires.private: @requirements_pc_ecore_input_evas@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_input_evas
 Libs.private: @requirements_libs_ecore_input_evas@
-Cflags: -I${includedir}/ecore-input-evas-@VMAJ@
+Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/ecore-input-evas-@VMAJ@
diff --git a/pc/ecore-input.pc.in b/pc/ecore-input.pc.in
index d445ced8b8..bc4ba9fb58 100644
--- a/pc/ecore-input.pc.in
+++ b/pc/ecore-input.pc.in
@@ -9,4 +9,4 @@ Requires.private: @requirements_pc_ecore_input@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_input
 Libs.private: @requirements_libs_ecore_input@
-Cflags: -I${includedir}/ecore-input-@VMAJ@
+Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/ecore-input-@VMAJ@
diff --git a/pc/ecore-ipc.pc.in b/pc/ecore-ipc.pc.in
index 1381490bd2..01c4021c17 100644
--- a/pc/ecore-ipc.pc.in
+++ b/pc/ecore-ipc.pc.in
@@ -9,4 +9,4 @@ Requires.private: @requirements_pc_ecore_ipc@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_ipc
 Libs.private: @requirements_libs_ecore_ipc@
-Cflags: -I${includedir}/ecore-ipc-@VMAJ@
+Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/ecore-ipc-@VMAJ@
diff --git a/pc/ecore-psl1ght.pc.in b/pc/ecore-psl1ght.pc.in
index c7f5166c93..6a8b97e2f3 100644
--- a/pc/ecore-psl1ght.pc.in
+++ b/pc/ecore-psl1ght.pc.in
@@ -9,4 +9,4 @@ Requires.private: @requirements_pc_ecore_psl1ght@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_psl1ght
 Libs.private: @requirements_libs_ecore_psl1ght@
-Cflags: -I${includedir}/ecore-psl1ght-@VMAJ@
+Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/ecore-psl1ght-@VMAJ@
diff --git a/pc/ecore-sdl.pc.in b/pc/ecore-sdl.pc.in
index 589c8a05a6..630a9c10fe 100644
--- a/pc/ecore-sdl.pc.in
+++ b/pc/ecore-sdl.pc.in
@@ -8,4 +8,4 @@ Description: E core library, SDL module
 Version: @VERSION@
 Requires.private: @requirements_pc_ecore_sdl@
 Libs: -L${libdir} -lecore_sdl
-Cflags: -I${includedir}/ecore-sdl-@VMAJ@
+Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/ecore-sdl-@VMAJ@
diff --git a/pc/ecore-wayland.pc.in b/pc/ecore-wayland.pc.in
index 8321897cf0..b469a10dba 100644
--- a/pc/ecore-wayland.pc.in
+++ b/pc/ecore-wayland.pc.in
@@ -9,4 +9,4 @@ Requires.private: @requirements_pc_ecore_wayland@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_wayland
 Libs.private: @requirements_libs_ecore_wayland@
-Cflags: -I${includedir}/ecore-wayland-@VMAJ@
+Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/ecore-wayland-@VMAJ@
diff --git a/pc/ecore-win32.pc.in b/pc/ecore-win32.pc.in
index 108b30a5f9..2a1bfad1e3 100644
--- a/pc/ecore-win32.pc.in
+++ b/pc/ecore-win32.pc.in
@@ -9,4 +9,4 @@ Requires.private: @requirements_pc_ecore_win32@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_win32
 Libs.private: @requirements_libs_ecore_win32@
-Cflags: -I${includedir}/ecore-win32-@VMAJ@
+Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/ecore-win32-@VMAJ@
diff --git a/pc/ecore-wince.pc.in b/pc/ecore-wince.pc.in
index e782033150..299243990b 100644
--- a/pc/ecore-wince.pc.in
+++ b/pc/ecore-wince.pc.in
@@ -9,4 +9,4 @@ Requires.private: @requirements_pc_ecore_wince@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_wince
 Libs.private: @requirements_libs_ecore_wince@
-Cflags: -I${includedir}/ecore-wince-@VMAJ@
+Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/ecore-wince-@VMAJ@
diff --git a/pc/ecore-x.pc.in b/pc/ecore-x.pc.in
index 2eb1eb204b..f2c4649f4d 100644
--- a/pc/ecore-x.pc.in
+++ b/pc/ecore-x.pc.in
@@ -9,4 +9,4 @@ Requires.private: @requirements_pc_ecore_x@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_x
 Libs.private: @requirements_libs_ecore_x@
-Cflags: -I${includedir}/ecore-x-@VMAJ@
+Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/ecore-x-@VMAJ@
diff --git a/pc/ecore.pc.in b/pc/ecore.pc.in
index ab7004a420..b6b5516450 100644
--- a/pc/ecore.pc.in
+++ b/pc/ecore.pc.in
@@ -11,4 +11,4 @@ Requires.private: @requirements_pc_ecore@
 Version: @VERSION@
 Libs: -L${libdir} -lecore
 Libs.private: @requirements_libs_ecore@
-Cflags: -I${includedir}/ecore-@VMAJ@ -I${includedir}/efl-@VMAJ@
+Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/ecore-@VMAJ@
diff --git a/pc/edje.pc.in b/pc/edje.pc.in
index 51c109c0ff..3776fe898b 100644
--- a/pc/edje.pc.in
+++ b/pc/edje.pc.in
@@ -18,4 +18,4 @@ Requires.private: @requirements_pc_edje@
 Version: @VERSION@
 Libs: -L${libdir} -ledje
 Libs.private: @requirements_libs_edje@
-Cflags: -I${includedir}/edje-@VMAJ@
+Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/edje-@VMAJ@
diff --git a/pc/eet.pc.in b/pc/eet.pc.in
index f932978dc9..5ce226b18a 100644
--- a/pc/eet.pc.in
+++ b/pc/eet.pc.in
@@ -9,4 +9,4 @@ Version: @VERSION@
 Requires.private: @requirements_pc_eet@
 Libs: -L${libdir} -leet
 Libs.private: @requirements_libs_eet@
-Cflags: -I${includedir}/eet-@VMAJ@
+Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/eet-@VMAJ@
diff --git a/pc/eeze.pc.in b/pc/eeze.pc.in
index 099c1fc07d..abeaa927d4 100644
--- a/pc/eeze.pc.in
+++ b/pc/eeze.pc.in
@@ -8,4 +8,4 @@ Description: device convenience library for efl
 Requires.private: @requirements_pc_eeze@
 Version: @VERSION@
 Libs: -L${libdir} -leeze
-Cflags: -I${includedir}/eeze-@VMAJ@
+Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/eeze-@VMAJ@
diff --git a/pc/efreet-mime.pc.in b/pc/efreet-mime.pc.in
index b14b593829..506c18fe63 100644
--- a/pc/efreet-mime.pc.in
+++ b/pc/efreet-mime.pc.in
@@ -8,4 +8,4 @@ Description: Freedesktop Shared Mime Info standard implementation for the EFL
 Version: @VERSION@
 Requires.private: @requirements_pc_efreet@
 Libs: -L${libdir} -lefreet_mime
-Cflags: -I${includedir}/efreet-@VMAJ@
+Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/efreet-@VMAJ@
diff --git a/pc/efreet-trash.pc.in b/pc/efreet-trash.pc.in
index 9886ffa487..4025dbb239 100644
--- a/pc/efreet-trash.pc.in
+++ b/pc/efreet-trash.pc.in
@@ -8,4 +8,4 @@ Description: Freedesktop Shared Trash implementation for the EFL
 Version: @VERSION@
 Requires.private: @requirements_pc_efreet@
 Libs: -L${libdir} -lefreet_trash
-Cflags: -I${includedir}/efreet-@VMAJ@
+Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/efreet-@VMAJ@
diff --git a/pc/efreet.pc.in b/pc/efreet.pc.in
index 358c9903d9..994b771620 100644
--- a/pc/efreet.pc.in
+++ b/pc/efreet.pc.in
@@ -8,4 +8,4 @@ Description: Freedesktop standards implementation for the EFL
 Version: @VERSION@
 Requires.private: @requirements_pc_efreet@
 Libs: -L${libdir} -lefreet
-Cflags: -I${includedir}/efreet-@VMAJ@
+Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/efreet-@VMAJ@
diff --git a/pc/eina.pc.in b/pc/eina.pc.in
index e904c9ede9..b5b828eb37 100644
--- a/pc/eina.pc.in
+++ b/pc/eina.pc.in
@@ -9,4 +9,4 @@ Requires.private: @requirements_pc_eina@
 Version: @VERSION@
 Libs: -L${libdir} -leina @requirements_public_libs_eina@
 Libs.private: @requirements_libs_eina@
-Cflags: -I${includedir}/eina-@VMAJ@ -I${includedir}/eina-@VMAJ@/eina
+Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/eina-@VMAJ@ -I${includedir}/eina-@VMAJ@/eina
diff --git a/pc/eio.pc.in b/pc/eio.pc.in
index b599f78cf2..4f89e7acaa 100644
--- a/pc/eio.pc.in
+++ b/pc/eio.pc.in
@@ -9,4 +9,4 @@ Requires.private: @requirements_pc_eio@
 Version: @VERSION@
 Libs: -L${libdir} -leio
 Libs.private: @requirements_libs_eio@
-Cflags: -I${includedir}/eio-@VMAJ@
+Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/eio-@VMAJ@
diff --git a/pc/eldbus.pc.in b/pc/eldbus.pc.in
index 94997fc0f8..4c2a4c8385 100644
--- a/pc/eldbus.pc.in
+++ b/pc/eldbus.pc.in
@@ -9,5 +9,5 @@ Requires.private: @requirements_pc_eldbus@
 Version: @VERSION@
 Libs: -L${libdir} -leldbus
 Libs.private: @requirements_libs_eldbus@
-Cflags: -I${includedir}/eldbus-@VMAJ@
+Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/eldbus-@VMAJ@
 
diff --git a/pc/embryo.pc.in b/pc/embryo.pc.in
index 9d7e121ffc..45cc9870f9 100644
--- a/pc/embryo.pc.in
+++ b/pc/embryo.pc.in
@@ -12,4 +12,4 @@ Version: @VERSION@
 Requires.private: @requirements_pc_embryo@
 Libs: -L${libdir} -lembryo
 Libs.private: @requirements_libs_embryo@
-Cflags: -I${includedir}/embryo-@VMAJ@
+Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/embryo-@VMAJ@
diff --git a/pc/emotion.pc.in b/pc/emotion.pc.in
index fdb38eb3fd..7b8932137d 100644
--- a/pc/emotion.pc.in
+++ b/pc/emotion.pc.in
@@ -11,4 +11,4 @@ Description: Emotion evas based multimedia library
 Version: @VERSION@
 Requires.private: @requirements_pc_emotion@
 Libs: -L${libdir} -lemotion
-Cflags: -I${includedir}/emotion-@VMAJ@
+Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/emotion-@VMAJ@
diff --git a/pc/eo.pc.in b/pc/eo.pc.in
index a58711bd4b..99750978f7 100644
--- a/pc/eo.pc.in
+++ b/pc/eo.pc.in
@@ -9,4 +9,4 @@ Version: @PACKAGE_VERSION@
 Requires.private: @requirements_pc_eo@
 Libs: -L${libdir} -leo
 Libs.private:
-Cflags: -I${includedir}/eo-@VMAJ@
+Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/eo-@VMAJ@
diff --git a/pc/ephysics.pc.in b/pc/ephysics.pc.in
index 38632b0fa3..dd853033a2 100644
--- a/pc/ephysics.pc.in
+++ b/pc/ephysics.pc.in
@@ -9,4 +9,4 @@ Description: EPhysics is a wrapper for physics engine.
 Requires.private: @requirements_pc_ephysics@
 Version: @VERSION@
 Libs: -L${libdir} -lephysics
-Cflags: -I${includedir}/ephysics-@VMAJ@
+Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/ephysics-@VMAJ@
diff --git a/pc/escape.pc.in b/pc/escape.pc.in
index b021b69e68..ec33538054 100644
--- a/pc/escape.pc.in
+++ b/pc/escape.pc.in
@@ -8,4 +8,4 @@ Description: Library that ports on the PS3 some specific Unix functions.
 Version: @VERSION@
 Libs: -L${libdir} -lescape
 Libs.private: @requirements_libs_escape@
-Cflags: -I${includedir}/escape-@VMAJ@
+Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/escape-@VMAJ@
diff --git a/pc/ethumb.pc.in b/pc/ethumb.pc.in
index b2d935b24d..cc145444e6 100644
--- a/pc/ethumb.pc.in
+++ b/pc/ethumb.pc.in
@@ -10,4 +10,4 @@ Description: Thumbnail Generator Library
 Version: @VERSION@
 Requires.private: @requirements_pc_ethumb@
 Libs: -L${libdir} -lethumb
-Cflags: -I${includedir}/ethumb-@VMAJ@
+Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/ethumb-@VMAJ@
diff --git a/pc/ethumb_client.pc.in b/pc/ethumb_client.pc.in
index 25e5e25244..55fbdb1ecd 100644
--- a/pc/ethumb_client.pc.in
+++ b/pc/ethumb_client.pc.in
@@ -8,4 +8,4 @@ Description: Thumbnail Client Library
 Version: @VERSION@
 Requires.private: @requirements_pc_ethumb_client@
 Libs: -L${libdir} -lethumb_client
-Cflags: -I${includedir}/ethumb-client-@VMAJ@
+Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/ethumb-client-@VMAJ@
diff --git a/pc/evas.pc.in b/pc/evas.pc.in
index 22617f187f..4ca02758f4 100644
--- a/pc/evas.pc.in
+++ b/pc/evas.pc.in
@@ -9,4 +9,4 @@ Requires.private: @requirements_pc_evas@
 Version: @VERSION@
 Libs: -L${libdir} -levas
 Libs.private: @requirements_libs_evas@
-Cflags: -I${includedir}/evas-@VMAJ@ -I${includedir}/efl-@VMAJ@
+Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/evas-@VMAJ@
diff --git a/pc/evil.pc.in b/pc/evil.pc.in
index 2331c27068..f35f51285f 100644
--- a/pc/evil.pc.in
+++ b/pc/evil.pc.in
@@ -10,4 +10,4 @@ Description: Library that ports on Windows some specific Unix functions.
 Version: @VERSION@
 Libs: -L${libdir} -levil
 Libs.private:
-Cflags: -I${includedir}/evil-@VMAJ@ @EFL_WINDOWS_VERSION_CFLAGS@ -mms-bitfields -D__USE_MINGW_ANSI_STDIO
+Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/evil-@VMAJ@ @EFL_WINDOWS_VERSION_CFLAGS@ -mms-bitfields -D__USE_MINGW_ANSI_STDIO
diff --git a/po/ca.po b/po/ca.po
index 5f4e5d10e6..4b0d155fe9 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Efl\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-09-30 14:26+0900\n"
+"POT-Creation-Date: 2013-11-04 15:41+0900\n"
 "PO-Revision-Date: 2013-02-01 09:52+0100\n"
 "Last-Translator: Joan Coll <jcoll2@gmail.com>\n"
 "Language-Team: Catalan\n"
diff --git a/po/cs.po b/po/cs.po
index 155fc80a33..b1dee55712 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Efl\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-09-30 14:26+0900\n"
+"POT-Creation-Date: 2013-11-04 15:41+0900\n"
 "PO-Revision-Date: 2012-12-13 12:06+0100\n"
 "Last-Translator: Tomáš Čech <sleep_walker@suse.cz>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
diff --git a/po/de.po b/po/de.po
index 389cd651e7..82dfa012b5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Efl\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-11-01 08:28+0900\n"
+"POT-Creation-Date: 2013-11-04 15:41+0900\n"
 "PO-Revision-Date: 2012-06-24 17:10+0900\n"
 "Last-Translator: Jerome Pinot <ngc891@gmail.com>\n"
 "Language-Team: Enlightenment Team\n"
diff --git a/po/el.po b/po/el.po
index 8fc0a6cc62..8db9bb42c6 100644
--- a/po/el.po
+++ b/po/el.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Efl\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-11-01 08:28+0900\n"
+"POT-Creation-Date: 2013-11-04 15:41+0900\n"
 "PO-Revision-Date: 2012-12-01 18:26+0200\n"
 "Last-Translator: Efstathios Iosifidis <iosifidis@opensuse.org>\n"
 "Language-Team: Ελληνικά, Σύγχρονα <opensuse-translation-el@opensuse.org>\n"
diff --git a/po/eo.po b/po/eo.po
index 62b48f254f..91df55028e 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-11-01 08:28+0900\n"
+"POT-Creation-Date: 2013-11-04 15:41+0900\n"
 "PO-Revision-Date: 2013-02-21 15:24+0000\n"
 "Last-Translator: Michael Moroni <michael.moroni@mailoo.org>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
diff --git a/po/es.po b/po/es.po
index bb8352d403..93ef73cebb 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Efl\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-11-01 08:28+0900\n"
+"POT-Creation-Date: 2013-11-04 15:41+0900\n"
 "PO-Revision-Date: 2013-01-04 23:53+0100\n"
 "Last-Translator: Adrián Arévalo <adri58@gmail.com>\n"
 "Language-Team: Enlightenment Team\n"
diff --git a/po/fr.po b/po/fr.po
index 38ac0da195..6ce3811418 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Efl\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-11-01 08:28+0900\n"
+"POT-Creation-Date: 2013-11-04 15:41+0900\n"
 "PO-Revision-Date: 2013-02-05 22:51+0000\n"
 "Last-Translator: ilLogict <illogict@online.fr>\n"
 "Language-Team: Enlightenment French Team <enlightenment-intl@lists."
diff --git a/po/gl.po b/po/gl.po
index bb808f1858..10986b0185 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Efl\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-11-01 08:28+0900\n"
+"POT-Creation-Date: 2013-11-04 15:41+0900\n"
 "PO-Revision-Date: 2012-11-07 22:52+0100\n"
 "Last-Translator: Aníbal Garrido <khany@member.trisquel.info>\n"
 "Language-Team: http://trasno.net/ <proxecto@trasno.net>\n"
diff --git a/po/it.po b/po/it.po
index bbeeb656c2..b1fc5749f5 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Efl\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-09-30 14:26+0900\n"
+"POT-Creation-Date: 2013-11-04 15:41+0900\n"
 "PO-Revision-Date: 2013-01-05 20:49+0100\n"
 "Last-Translator: Massimo Maiurana <maiurana@gmail.com>\n"
 "Language-Team: none\n"
diff --git a/po/ja.po b/po/ja.po
index 2c605ed91c..db2ff44284 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Efl\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-11-01 08:28+0900\n"
+"POT-Creation-Date: 2013-11-04 15:41+0900\n"
 "PO-Revision-Date: 2012-06-24 17:10+0900\n"
 "Last-Translator: Jerome Pinot <ngc891@gmail.com>\n"
 "Language-Team: Enlightenment Team\n"
diff --git a/po/ko.po b/po/ko.po
index e79196ee43..328445cc18 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Efl\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-09-30 14:26+0900\n"
+"POT-Creation-Date: 2013-11-04 15:41+0900\n"
 "PO-Revision-Date: 2013-01-02 07:33+0900\n"
 "Last-Translator: Daniel Juyung Seo <seojuyung2@gmali.com>\n"
 "Language-Team: Enlightenment Team\n"
diff --git a/po/lt.po b/po/lt.po
index 8de05cd4ef..cbe15d4153 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-11-01 08:28+0900\n"
+"POT-Creation-Date: 2013-11-04 15:41+0900\n"
 "PO-Revision-Date: 2013-01-05 21:52+0000\n"
 "Last-Translator: Mantas Kriaučiūnas <mantas@akl.lt>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
diff --git a/po/nl.po b/po/nl.po
index d1924c6d36..7215312f51 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Efl\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-09-30 14:26+0900\n"
+"POT-Creation-Date: 2013-11-04 15:41+0900\n"
 "PO-Revision-Date: 2012-06-24 17:10+0900\n"
 "Last-Translator: Jerome Pinot <ngc891@gmail.com>\n"
 "Language-Team: Enlightenment Team\n"
diff --git a/po/pt.po b/po/pt.po
index 68964061d6..f08911ab8a 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Efl\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-09-30 14:26+0900\n"
+"POT-Creation-Date: 2013-11-04 15:41+0900\n"
 "PO-Revision-Date: 2012-10-10 00:21+0100\n"
 "Last-Translator: Sérgio Marques <smarquespt@gmail.com>\n"
 "Language-Team: Enlightenment Team\n"
diff --git a/po/ru.po b/po/ru.po
index 2980f0d153..0e67856e1e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Efl\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-11-01 08:28+0900\n"
+"POT-Creation-Date: 2013-11-04 15:41+0900\n"
 "PO-Revision-Date: 2012-06-24 17:10+0900\n"
 "Last-Translator: Jerome Pinot <ngc891@gmail.com>\n"
 "Language-Team: Enlightenment Team\n"
diff --git a/po/sl.po b/po/sl.po
index 22ff5ad020..4a43ba1909 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Efl\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-11-01 08:28+0900\n"
+"POT-Creation-Date: 2013-11-04 15:41+0900\n"
 "PO-Revision-Date: 2012-06-24 17:10+0900\n"
 "Last-Translator: Jerome Pinot <ngc891@gmail.com>\n"
 "Language-Team: Enlightenment Team\n"
diff --git a/po/sr.po b/po/sr.po
index 671d4849ad..18999c8cfb 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-11-01 08:28+0900\n"
+"POT-Creation-Date: 2013-11-04 15:41+0900\n"
 "PO-Revision-Date: 2013-06-20 04:43+0000\n"
 "Last-Translator: Саша Петровић <salepetronije@gmail.com>\n"
 "Language-Team: српски <српски <xfce-i18n@xfce.org>>\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4b8cb27c8c..8a683130ae 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Efl\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-09-30 14:26+0900\n"
+"POT-Creation-Date: 2013-11-04 15:41+0900\n"
 "PO-Revision-Date: 2012-12-22 03:45+0800\n"
 "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Language-Team: Chinese (simplified)\n"
diff --git a/src/Makefile.am b/src/Makefile.am
index f4f49a8ccd..6ceedd2153 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,7 +15,7 @@ check_PROGRAMS =
 TESTS =
 EXTRA_DIST =
 
-EFL_INSTALL_DATA_HOOK=
+EFL_INSTALL_EXEC_HOOK=
 
 include Makefile_Efl.am
 
@@ -102,9 +102,5 @@ clean-local:
         find . -type f -name '*.gcda' -delete
         find . -type f -name check-results.xml -delete
 
-install-data-hook:
-        $(EFL_INSTALL_DATA_HOOK)
-        for i in $(lib_LTLIBRARIES); do \
-                export file=`basename $$i`; \
-                sed -e "s/-luuid//" $(DESTDIR)${libdir}/$$file > $(DESTDIR)${libdir}/$$file.tmp && mv $(DESTDIR)${libdir}/$$file.tmp $(DESTDIR)${libdir}/$$file; \
-        done
+install-exec-hook:
+        $(EFL_INSTALL_EXEC_HOOK)
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index 6c1daf939e..6b4cad4849 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -210,7 +210,35 @@ bin/edje/edje_convert.c \
 bin/edje/edje_data_convert.c \
 bin/edje/edje_convert_main.c \
 lib/edje/edje_convert.c \
-tests/edje/edje_tests_helpers.h
+tests/edje/edje_tests_helpers.h \
+tests/edje/data/complex_layout.edc \
+tests/edje/data/test_layout.edc \
+tests/emotion/data/theme.edc \
+tests/emotion/data/icon.edc \
+tests/emotion/data/bpause.png \
+tests/emotion/data/bplay.png \
+tests/emotion/data/bstop.png \
+tests/emotion/data/e_logo.png \
+tests/emotion/data/fr1.png \
+tests/emotion/data/fr2.png \
+tests/emotion/data/fr3.png \
+tests/emotion/data/fr4.png \
+tests/emotion/data/fr5.png \
+tests/emotion/data/fr6.png \
+tests/emotion/data/fr7.png \
+tests/emotion/data/h_slider.png \
+tests/emotion/data/knob.png \
+tests/emotion/data/orb.png \
+tests/emotion/data/pnl.png \
+tests/emotion/data/sl.png \
+tests/emotion/data/tiles.png \
+tests/emotion/data/video_frame_bottom.png \
+tests/emotion/data/video_frame_left.png \
+tests/emotion/data/video_frame_right.png \
+tests/emotion/data/video_frame_top.png \
+tests/emotion/data/whb.png \
+tests/emotion/data/window_inner_shadow.png
+
 
 bin_SCRIPTS += bin/edje/edje_recc
 
diff --git a/src/Makefile_Eeze.am b/src/Makefile_Eeze.am
index eaa41d7a56..499193d4dd 100644
--- a/src/Makefile_Eeze.am
+++ b/src/Makefile_Eeze.am
@@ -134,7 +134,7 @@ bin_eeze_eeze_scanner_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
 
 setuid_root_mode = a=rx,u+xs
 
-EFL_INSTALL_DATA_HOOK+=@chmod $(setuid_root_mode) $(DESTDIR)$(bindir)/eeze_scanner$(EXEEXT) || true;
+EFL_INSTALL_EXEC_HOOK+=@chmod $(setuid_root_mode) $(DESTDIR)$(bindir)/eeze_scanner$(EXEEXT) || true;
 
 
 ### Unit tests
diff --git a/src/lib/ecore/Ecore_Common.h b/src/lib/ecore/Ecore_Common.h
index 83307f2fd5..eceb4ed34e 100644
--- a/src/lib/ecore/Ecore_Common.h
+++ b/src/lib/ecore/Ecore_Common.h
@@ -2,6 +2,8 @@
 extern "C" {
 #endif
 
+#include <Efl_Config.h>
+
 /**
  * @defgroup Ecore_Init_Group Ecore initialization, shutdown functions and reset on fork.
  * @ingroup Ecore
@@ -30,8 +32,8 @@ EAPI int ecore_shutdown(void);
  * @{
  */
 
-#define ECORE_VERSION_MAJOR 1
-#define ECORE_VERSION_MINOR 8
+#define ECORE_VERSION_MAJOR EFL_VERSION_MAJOR
+#define ECORE_VERSION_MINOR EFL_VERSION_MINOR
 
 typedef struct _Ecore_Version
 {
diff --git a/src/lib/ecore_x/Ecore_X.h b/src/lib/ecore_x/Ecore_X.h
index e0e24ae98c..4341711682 100644
--- a/src/lib/ecore_x/Ecore_X.h
+++ b/src/lib/ecore_x/Ecore_X.h
@@ -2,6 +2,7 @@
 #define _ECORE_X_H
 
 #include <Eina.h>
+#include <Efl_Config.h>
 
 #ifdef EAPI
 # undef EAPI
@@ -25,6 +26,19 @@
 # endif // ifdef __GNUC__
 #endif // ifdef _MSC_VER
 
+#define ECORE_X_VERSION_MAJOR EFL_VERSION_MAJOR
+#define ECORE_X_VERSION_MINOR EFL_VERSION_MINOR
+
+typedef struct _Ecore_X_Version
+{
+      int major;
+      int minor;
+      int micro;
+      int revision;
+} Ecore_X_Version;
+
+EAPI extern Ecore_X_Version *ecore_x_version;
+
 #include "ecore_x_version.h"
 
 #include <sys/types.h>
diff --git a/src/lib/ecore_x/ecore_x_version.h.in b/src/lib/ecore_x/ecore_x_version.h.in
index 24de5f86fd..98f1d6a9db 100644
--- a/src/lib/ecore_x/ecore_x_version.h.in
+++ b/src/lib/ecore_x/ecore_x_version.h.in
@@ -1,19 +1,6 @@
 #ifndef _ECORE_X_VERSION_H_
 #define _ECORE_X_VERSION_H_ 1
 
-#define ECORE_X_VERSION_MAJOR @VMAJ@
-#define ECORE_X_VERSION_MINOR @VMIN@
-
-typedef struct _Ecore_X_Version
-{
-   int major;
-   int minor;
-   int micro;
-   int revision;
-} Ecore_X_Version;
-
-EAPI extern Ecore_X_Version *ecore_x_version;
-
 #ifndef @HAVE_ECORE_X_BACKEND@
 #define @HAVE_ECORE_X_BACKEND@ 1
 #endif
diff --git a/src/lib/edje/Edje.h b/src/lib/edje/Edje.h
index 8a460e9ab7..015dcad432 100644
--- a/src/lib/edje/Edje.h
+++ b/src/lib/edje/Edje.h
@@ -214,6 +214,7 @@ param in edje programs
 
 #include <Evas.h>
 #include <Eo.h>
+#include <Efl_Config.h>
 
 #ifdef EAPI
 # undef EAPI
@@ -245,8 +246,8 @@ param in edje programs
 extern "C" {
 #endif
 
-#define EDJE_VERSION_MAJOR 1
-#define EDJE_VERSION_MINOR 8
+#define EDJE_VERSION_MAJOR EFL_VERSION_MAJOR
+#define EDJE_VERSION_MINOR EFL_VERSION_MINOR
 
 #include "Edje_Common.h"
 #ifndef EFL_NOLEGACY_API_SUPPORT
diff --git a/src/lib/eet/Eet.h b/src/lib/eet/Eet.h
index de57e4a3d7..ab907335cc 100644
--- a/src/lib/eet/Eet.h
+++ b/src/lib/eet/Eet.h
@@ -97,6 +97,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <Eina.h>
+#include <Efl_Config.h>
 
 #ifdef EAPI
 # undef EAPI
@@ -136,8 +137,8 @@ extern "C" {
  *
  */
 
-#define EET_VERSION_MAJOR 1
-#define EET_VERSION_MINOR 8
+#define EET_VERSION_MAJOR EFL_VERSION_MAJOR
+#define EET_VERSION_MINOR EFL_VERSION_MINOR
 /**
  * @typedef Eet_Version
  *
diff --git a/src/lib/eeze/Eeze.h b/src/lib/eeze/Eeze.h
index 82ef11ae82..55d2230884 100644
--- a/src/lib/eeze/Eeze.h
+++ b/src/lib/eeze/Eeze.h
@@ -73,6 +73,7 @@
 #define EEZE_UDEV_H
 
 #include <Eina.h>
+#include <Efl_Config.h>
 
 #ifdef EAPI
 # undef EAPI
@@ -270,8 +271,8 @@ struct Eeze_Udev_Watch;
  */
 typedef struct Eeze_Udev_Watch Eeze_Udev_Watch;
 
-#define EEZE_VERSION_MAJOR 1
-#define EEZE_VERSION_MINOR 8
+#define EEZE_VERSION_MAJOR EFL_VERSION_MAJOR
+#define EEZE_VERSION_MINOR EFL_VERSION_MINOR
 
    typedef struct _Eeze_Version
      {
diff --git a/src/lib/efl/Efl_Config.h.in b/src/lib/efl/Efl_Config.h.in
index 5bf7f6a004..ad17684a3d 100644
--- a/src/lib/efl/Efl_Config.h.in
+++ b/src/lib/efl/Efl_Config.h.in
@@ -13,4 +13,7 @@
 /* @EFL_API_EO_DEF@ */
 #endif
 
+#define EFL_VERSION_MAJOR @EFL_VERSION_MAJOR@
+#define EFL_VERSION_MINOR @EFL_VERSION_MINOR@
+
 #endif
diff --git a/src/lib/efreet/Efreet.h b/src/lib/efreet/Efreet.h
index ae1ec188b8..e2360ee0e7 100644
--- a/src/lib/efreet/Efreet.h
+++ b/src/lib/efreet/Efreet.h
@@ -72,6 +72,7 @@
  */
 
 #include <Eina.h>
+#include <Efl_Config.h>
 
 #ifdef EAPI
 # undef EAPI
@@ -103,8 +104,8 @@
 extern "C" {
 #endif
 
-#define EFREET_VERSION_MAJOR 1
-#define EFREET_VERSION_MINOR 8
+#define EFREET_VERSION_MAJOR EFL_VERSION_MAJOR
+#define EFREET_VERSION_MINOR EFL_VERSION_MINOR
    
    typedef struct _Efreet_Version
      {
diff --git a/src/lib/eina/eina_main.h b/src/lib/eina/eina_main.h
index 41ea2a5b57..d7a7f0b01f 100644
--- a/src/lib/eina/eina_main.h
+++ b/src/lib/eina/eina_main.h
@@ -19,6 +19,8 @@
 #ifndef EINA_MAIN_H_
 #define EINA_MAIN_H_
 
+#include <Efl_Config.h>
+
 #include "eina_types.h"
 
 /**
@@ -44,13 +46,13 @@
  * @def EINA_VERSION_MAJOR
  * @brief Major version of Eina
  */
-#define EINA_VERSION_MAJOR 1
+#define EINA_VERSION_MAJOR EFL_VERSION_MAJOR
 
 /**
  * @def EINA_VERSION_MINOR
  * @brief Minor version of Eina
  */
-#define EINA_VERSION_MINOR 8
+#define EINA_VERSION_MINOR EFL_VERSION_MINOR
 
 /**
  * @typedef Eina_Version
diff --git a/src/lib/eio/Eio.h b/src/lib/eio/Eio.h
index fde08d1071..7c9bd06b2e 100644
--- a/src/lib/eio/Eio.h
+++ b/src/lib/eio/Eio.h
@@ -30,6 +30,7 @@
 
 #include <Eina.h>
 #include <Eet.h>
+#include <Efl_Config.h>
 
 #ifdef EAPI
 # undef EAPI
@@ -62,8 +63,8 @@
 extern "C" {
 #endif
 
-#define EIO_VERSION_MAJOR 1
-#define EIO_VERSION_MINOR 8
+#define EIO_VERSION_MAJOR EFL_VERSION_MAJOR
+#define EIO_VERSION_MINOR EFL_VERSION_MINOR
 
     /**
     * @typedef Eio_Version
diff --git a/src/lib/eldbus/Eldbus.h b/src/lib/eldbus/Eldbus.h
index cc069a0594..478fcea92f 100644
--- a/src/lib/eldbus/Eldbus.h
+++ b/src/lib/eldbus/Eldbus.h
@@ -78,6 +78,7 @@
 
 #include <Eina.h>
 #include <stdarg.h>
+#include <Efl_Config.h>
 
 #ifdef EAPI
 # undef EAPI
@@ -115,8 +116,8 @@ extern "C" {
  *
  * @{
  */
-#define ELDBUS_VERSION_MAJOR 1
-#define ELDBUS_VERSION_MINOR 8
+#define ELDBUS_VERSION_MAJOR EFL_VERSION_MAJOR
+#define ELDBUS_VERSION_MINOR EFL_VERSION_MINOR
 
 #define ELDBUS_FDO_BUS "org.freedesktop.DBus"
 #define ELDBUS_FDO_PATH "/org/freedesktop/DBus"
diff --git a/src/lib/embryo/Embryo.h b/src/lib/embryo/Embryo.h
index e9020d4ced..923afe73aa 100644
--- a/src/lib/embryo/Embryo.h
+++ b/src/lib/embryo/Embryo.h
@@ -336,6 +336,8 @@ This is the @e only file you need to include.
 #ifndef _EMBRYO_H
 #define _EMBRYO_H
 
+#include <Efl_Config.h>
+
 #ifdef EAPI
 # undef EAPI
 #endif
@@ -366,8 +368,8 @@ This is the @e only file you need to include.
 extern "C" {
 #endif
 
-#define EMBRYO_VERSION_MAJOR 1
-#define EMBRYO_VERSION_MINOR 8
+#define EMBRYO_VERSION_MAJOR EFL_VERSION_MAJOR
+#define EMBRYO_VERSION_MINOR EFL_VERSION_MINOR
    
    typedef struct _Embryo_Version
      {
diff --git a/src/lib/emotion/Emotion.h b/src/lib/emotion/Emotion.h
index 34d1cc3af0..7240d2f251 100644
--- a/src/lib/emotion/Emotion.h
+++ b/src/lib/emotion/Emotion.h
@@ -92,6 +92,7 @@
  */
 
 #include <Evas.h>
+#include <Efl_Config.h>
 
 #ifdef EAPI
 # undef EAPI
@@ -262,8 +263,8 @@ typedef enum _Emotion_Aspect    Emotion_Aspect; /**< Aspect ratio option. */
 extern "C" {
 #endif
 
-#define EMOTION_VERSION_MAJOR 1
-#define EMOTION_VERSION_MINOR 8
+#define EMOTION_VERSION_MAJOR EFL_VERSION_MAJOR
+#define EMOTION_VERSION_MINOR EFL_VERSION_MINOR
    
    typedef struct _Emotion_Version
      {
diff --git a/src/lib/ephysics/EPhysics.h b/src/lib/ephysics/EPhysics.h
index 90ea09f046..f3716f9d00 100644
--- a/src/lib/ephysics/EPhysics.h
+++ b/src/lib/ephysics/EPhysics.h
@@ -65,6 +65,7 @@
  */
 
 #include <Evas.h>
+#include <Efl_Config.h>
 
 #ifdef EAPI
 # undef EAPI
@@ -96,8 +97,8 @@
 extern "C" {
 #endif
 
-#define EPHYSICS_VERSION_MAJOR 0
-#define EPHYSICS_VERSION_MINOR 1
+#define EPHYSICS_VERSION_MAJOR EFL_VERSION_MAJOR
+#define EPHYSICS_VERSION_MINOR EFL_VERSION_MINOR
 
 /**
  * @file
diff --git a/src/lib/ethumb/Ethumb.h b/src/lib/ethumb/Ethumb.h
index fd4dff708a..4f91433588 100644
--- a/src/lib/ethumb/Ethumb.h
+++ b/src/lib/ethumb/Ethumb.h
@@ -2,6 +2,7 @@
 #define __ETHUMB_H__ 1
 
 #include <Eina.h>
+#include <Efl_Config.h>
 
 #ifdef EAPI
 # undef EAPI
@@ -33,8 +34,8 @@
 extern "C" {
 #endif
 
-#define ETHUMB_VERSION_MAJOR 1
-#define ETHUMB_VERSION_MINOR 8
+#define ETHUMB_VERSION_MAJOR EFL_VERSION_MAJOR
+#define ETHUMB_VERSION_MINOR EFL_VERSION_MINOR
    
    typedef struct _Ethumb_Version
      {
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index 007c0acf8f..3dbe604794 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -2,8 +2,8 @@
 # error You shall not include this header directly
 #endif
 
-#define EVAS_VERSION_MAJOR 1
-#define EVAS_VERSION_MINOR 8
+#define EVAS_VERSION_MAJOR EFL_VERSION_MAJOR
+#define EVAS_VERSION_MINOR EFL_VERSION_MINOR
 
 typedef struct _Evas_Version
 {