add a global Efl_Config.h for everyone.

* ned to replicate changes in other .pc.in files
* need to replicate changes in other E*.h installed header files

41 files changed, 180 insertions, 165 deletions

diff --git a/.gitignore b/.gitignore
index d24538e6d..483b9165f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,6 +72,7 @@ tags
 /src/bin/evas/evas_cserve2_usage
 /src/lib/eina/eina_config.h
 /src/lib/ecore_x/ecore_x_version.h
+/src/lib/efl/Efl_Config.h
 /src/bin/eldbus/eldbus-codegen
 /src/bin/efreet/efreet_desktop_cache_create
 /src/bin/efreet/efreet_icon_cache_create
@@ -332,4 +333,4 @@ tags
 /src/tests/evas/check-results.xml
 /coverage
 /data/eo/libeo-gdb.py
-/data/libeo.so.*-gdb.py
\ No newline at end of file
+/data/libeo.so.*-gdb.py
diff --git a/configure.ac b/configure.ac
index a64251aec..f8d1d9f9c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3669,6 +3669,7 @@ src/examples/emotion/Makefile
 src/examples/ethumb_client/Makefile
 src/lib/eina/eina_config.h
 src/lib/ecore_x/ecore_x_version.h
+src/lib/efl/Efl_Config.h
 spec/efl.spec
 pkgbuild/PKGBUILD
 pc/evil.pc
diff --git a/pc/ecore.pc.in b/pc/ecore.pc.in
index 0fbe8f7d7..2f0de2a90 100644
--- a/pc/ecore.pc.in
+++ b/pc/ecore.pc.in
@@ -9,4 +9,4 @@ Requires.private: @requirements_pc_ecore@
 Version: @VERSION@
 Libs: -L${libdir} -lecore
 Libs.private: @requirements_libs_ecore@
-Cflags: -I${includedir}/ecore-@VMAJ@
+Cflags: -I${includedir}/ecore-@VMAJ@ -I${includedir}/efl-@VMAJ@
diff --git a/src/Makefile.am b/src/Makefile.am
index 4821ebf93..7021ff341 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,6 +15,8 @@ check_PROGRAMS =
 TESTS =
 EXTRA_DIST =
 
+include Makefile_Efl.am
+
 include Makefile_Evil.am
 include Makefile_Escape.am
 
diff --git a/src/Makefile_EPhysics.am b/src/Makefile_EPhysics.am
index 33748effe..708248a61 100644
--- a/src/Makefile_EPhysics.am
+++ b/src/Makefile_EPhysics.am
@@ -21,7 +21,7 @@ lib/ephysics/ephysics_quaternion.cpp \
 lib/ephysics/ephysics_shape.cpp \
 lib/ephysics/ephysics_world.cpp
 
-lib_ephysics_libephysics_la_CPPFLAGS = @EPHYSICS_CFLAGS@
+lib_ephysics_libephysics_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EPHYSICS_CFLAGS@
 lib_ephysics_libephysics_la_LIBADD = @EPHYSICS_LIBS@
 lib_ephysics_libephysics_la_DEPENDENCIES = @EPHYSICS_INTERNAL_LIBS@
 lib_ephysics_libephysics_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index d5c0b1c8a..c3728ba33 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -52,7 +52,7 @@ lib_ecore_libecore_la_SOURCES += lib/ecore/ecore_signal.c lib/ecore/ecore_exe.c
 endif
 endif
 
-lib_ecore_libecore_la_CPPFLAGS = @ECORE_CFLAGS@
+lib_ecore_libecore_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_CFLAGS@
 lib_ecore_libecore_la_LIBADD = @ECORE_LIBS@
 lib_ecore_libecore_la_DEPENDENCIES = @ECORE_INTERNAL_LIBS@
 lib_ecore_libecore_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
@@ -75,7 +75,7 @@ tests/ecore/ecore_test_timer.c \
 tests/ecore/ecore_test_ecore_evas.c \
 tests/ecore/ecore_suite.h
 
-tests_ecore_ecore_suite_CPPFLAGS = \
+tests_ecore_ecore_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ecore\" \
 -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/ecore\" \
 @CHECK_CFLAGS@ \
diff --git a/src/Makefile_Ecore_Audio.am b/src/Makefile_Ecore_Audio.am
index 06a3e0397..b224906e2 100644
--- a/src/Makefile_Ecore_Audio.am
+++ b/src/Makefile_Ecore_Audio.am
@@ -22,7 +22,7 @@ lib/ecore_audio/ecore_audio_obj_out.c \
 lib/ecore_audio/ecore_audio_obj_in_tone.c \
 lib/ecore_audio/ecore_audio_private.h
 
-lib_ecore_audio_libecore_audio_la_CPPFLAGS = @ECORE_AUDIO_CFLAGS@
+lib_ecore_audio_libecore_audio_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_AUDIO_CFLAGS@
 lib_ecore_audio_libecore_audio_la_LIBADD = @ECORE_AUDIO_LIBS@
 lib_ecore_audio_libecore_audio_la_DEPENDENCIES = @ECORE_AUDIO_INTERNAL_LIBS@
 lib_ecore_audio_libecore_audio_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Cocoa.am b/src/Makefile_Ecore_Cocoa.am
index 5b11277c3..56e454995 100644
--- a/src/Makefile_Ecore_Cocoa.am
+++ b/src/Makefile_Ecore_Cocoa.am
@@ -14,7 +14,7 @@ lib/ecore_cocoa/ecore_cocoa.m \
 lib/ecore_cocoa/ecore_cocoa_window.m \
 lib/ecore_cocoa/ecore_cocoa_private.h
 
-lib_ecore_cocoa_libecore_cocoa_la_CPPFLAGS = @ECORE_COCOA_CFLAGS@
+lib_ecore_cocoa_libecore_cocoa_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_COCOA_CFLAGS@
 lib_ecore_cocoa_libecore_cocoa_la_LIBADD = @ECORE_COCOA_LIBS@
 lib_ecore_cocoa_libecore_cocoa_la_DEPENDENCIES = @ECORE_COCOA_INTERNAL_LIBS@
 lib_ecore_cocoa_libecore_cocoa_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am
index b973fbee6..06ea5201a 100644
--- a/src/Makefile_Ecore_Con.am
+++ b/src/Makefile_Ecore_Con.am
@@ -33,7 +33,7 @@ lib_ecore_con_libecore_con_la_SOURCES += lib/ecore_con/ecore_con_info.c
 endif
 endif
 
-lib_ecore_con_libecore_con_la_CPPFLAGS = @ECORE_CON_CFLAGS@
+lib_ecore_con_libecore_con_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_CON_CFLAGS@
 lib_ecore_con_libecore_con_la_LIBADD = @ECORE_CON_LIBS@
 lib_ecore_con_libecore_con_la_DEPENDENCIES = @ECORE_CON_INTERNAL_LIBS@
 lib_ecore_con_libecore_con_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Evas.am b/src/Makefile_Ecore_Evas.am
index a71064350..4f8c34a30 100644
--- a/src/Makefile_Ecore_Evas.am
+++ b/src/Makefile_Ecore_Evas.am
@@ -22,7 +22,7 @@ lib/ecore_evas/ecore_evas_win32.h \
 lib/ecore_evas/ecore_evas_x11.h \
 lib/ecore_evas/ecore_evas_util.c
 
-lib_ecore_evas_libecore_evas_la_CPPFLAGS = \
+lib_ecore_evas_libecore_evas_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/modules/evas/engines/buffer \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
@@ -41,7 +41,7 @@ modules/ecore_evas/engines/extn/ecore_evas_extn_buf.c
 ecoreevasengineextnpkgdir = $(libdir)/ecore_evas/engines/extn/$(MODULE_ARCH)
 ecoreevasengineextnpkg_LTLIBRARIES = modules/ecore_evas/engines/extn/module.la
 modules_ecore_evas_engines_extn_module_la_SOURCES = $(EXTNSOURCES)
-modules_ecore_evas_engines_extn_module_la_CPPFLAGS = \
+modules_ecore_evas_engines_extn_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 @ECORE_EVAS_CFLAGS@ \
 @ECORE_IPC_CFLAGS@ \
 -I$(top_srcdir)/src/modules/evas/engines/buffer \
@@ -62,7 +62,7 @@ XSOURCES = modules/ecore_evas/engines/x/ecore_evas_x.c
 ecoreevasenginexpkgdir = $(libdir)/ecore_evas/engines/x/$(MODULE_ARCH)
 ecoreevasenginexpkg_LTLIBRARIES = modules/ecore_evas/engines/x/module.la
 modules_ecore_evas_engines_x_module_la_SOURCES = $(XSOURCES)
-modules_ecore_evas_engines_x_module_la_CPPFLAGS = \
+modules_ecore_evas_engines_x_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 @ECORE_EVAS_CFLAGS@ \
 @ECORE_X_CFLAGS@ \
 -I$(top_srcdir)/src/modules/evas/engines/software_x11 \
@@ -82,7 +82,7 @@ COCOASOURCES = modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c
 ecoreevasenginecocoapkgdir = $(libdir)/ecore_evas/engines/cocoa/$(MODULE_ARCH)
 ecoreevasenginecocoapkg_LTLIBRARIES = modules/ecore_evas/engines/cocoa/module.la
 modules_ecore_evas_engines_cocoa_module_la_SOURCES = $(COCOASOURCES)
-modules_ecore_evas_engines_cocoa_module_la_CPPFLAGS = \
+modules_ecore_evas_engines_cocoa_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 @ECORE_EVAS_CFLAGS@ \
 @ECORE_COCOA_CFLAGS@ \
 -I$(top_srcdir)/src/modules/evas/engines/gl_cocoa
@@ -101,7 +101,7 @@ FBSOURCES = modules/ecore_evas/engines/fb/ecore_evas_fb.c
 ecoreevasenginefbpkgdir = $(libdir)/ecore_evas/engines/fb/$(MODULE_ARCH)
 ecoreevasenginefbpkg_LTLIBRARIES = modules/ecore_evas/engines/fb/module.la
 modules_ecore_evas_engines_fb_module_la_SOURCES = $(FBSOURCES)
-modules_ecore_evas_engines_fb_module_la_CPPFLAGS = \
+modules_ecore_evas_engines_fb_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 @ECORE_EVAS_CFLAGS@ \
 @ECORE_FB_CFLAGS@ \
 -I$(top_srcdir)/src/modules/evas/engines/fb
@@ -120,7 +120,7 @@ PSL1GHTSOURCES = modules/ecore_evas/engines/psl1ght/ecore_evas_psl1ght.c
 ecoreevasenginepsl1ghtpkgdir = $(libdir)/ecore_evas/engines/psl1ght/$(MODULE_ARCH)
 ecoreevasenginepsl1ghtpkg_LTLIBRARIES = modules/ecore_evas/engines/psl1ght/module.la
 modules_ecore_evas_engines_psl1ght_module_la_SOURCES = $(PSL1GHTSOURCES)
-modules_ecore_evas_engines_psl1ght_module_la_CPPFLAGS = \
+modules_ecore_evas_engines_psl1ght_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 @ECORE_EVAS_CFLAGS@ \
 @ECORE_PSL1GHT_CFLAGS@ \
 -I$(top_srcdir)/src/modules/evas/engines/psl1ght
@@ -143,7 +143,7 @@ modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h
 ecoreevasenginewaylandpkgdir = $(libdir)/ecore_evas/engines/wayland/$(MODULE_ARCH)
 ecoreevasenginewaylandpkg_LTLIBRARIES = modules/ecore_evas/engines/wayland/module.la
 modules_ecore_evas_engines_wayland_module_la_SOURCES = $(WAYLANDSOURCES)
-modules_ecore_evas_engines_wayland_module_la_CPPFLAGS = \
+modules_ecore_evas_engines_wayland_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 @ECORE_EVAS_CFLAGS@ \
 @ECORE_WAYLAND_CFLAGS@ \
 -I$(top_srcdir)/src/modules/evas/engines/wayland_shm \
@@ -165,7 +165,7 @@ modules/ecore_evas/engines/sdl/ecore_evas_sdl.c
 ecoreevasenginesdlpkgdir = $(libdir)/ecore_evas/engines/sdl/$(MODULE_ARCH)
 ecoreevasenginesdlpkg_LTLIBRARIES = modules/ecore_evas/engines/sdl/module.la
 modules_ecore_evas_engines_sdl_module_la_SOURCES = $(SDLSOURCES)
-modules_ecore_evas_engines_sdl_module_la_CPPFLAGS = \
+modules_ecore_evas_engines_sdl_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 @ECORE_EVAS_CFLAGS@ \
 @ECORE_SDL_CFLAGS@ \
 -I$(top_srcdir)/src/modules/evas/engines/buffer \
@@ -186,7 +186,7 @@ modules/ecore_evas/engines/win32/ecore_evas_win32.c
 ecoreevasengineswin32pkgdir = $(libdir)/ecore_evas/engines/win32/$(MODULE_ARCH)
 ecoreevasengineswin32pkg_LTLIBRARIES = modules/ecore_evas/engines/win32/module.la
 modules_ecore_evas_engines_win32_module_la_SOURCES = $(WIN32SOURCES)
-modules_ecore_evas_engines_win32_module_la_CPPFLAGS = \
+modules_ecore_evas_engines_win32_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 @ECORE_EVAS_CFLAGS@ \
 @ECORE_WIN32_CFLAGS@ \
 -I$(top_srcdir)/src/modules/evas/engines/software_ddraw \
diff --git a/src/Makefile_Ecore_FB.am b/src/Makefile_Ecore_FB.am
index 6cae6ecec..1035e257b 100644
--- a/src/Makefile_Ecore_FB.am
+++ b/src/Makefile_Ecore_FB.am
@@ -16,7 +16,7 @@ lib/ecore_fb/ecore_fb_vt.c \
 lib/ecore_fb/ecore_fb_keytable.h \
 lib/ecore_fb/ecore_fb_private.h
 
-lib_ecore_fb_libecore_fb_la_CPPFLAGS = @ECORE_FB_CFLAGS@
+lib_ecore_fb_libecore_fb_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_FB_CFLAGS@
 lib_ecore_fb_libecore_fb_la_LIBADD = @ECORE_FB_LIBS@
 lib_ecore_fb_libecore_fb_la_DEPENDENCIES = @ECORE_FB_INTERNAL_LIBS@
 lib_ecore_fb_libecore_fb_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_File.am b/src/Makefile_Ecore_File.am
index 3ce0a617c..a31431508 100644
--- a/src/Makefile_Ecore_File.am
+++ b/src/Makefile_Ecore_File.am
@@ -27,7 +27,7 @@ lib/ecore_file/ecore_file_monitor_poll.c
 endif
 endif
 
-lib_ecore_file_libecore_file_la_CPPFLAGS = @ECORE_FILE_CFLAGS@
+lib_ecore_file_libecore_file_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_FILE_CFLAGS@
 lib_ecore_file_libecore_file_la_LIBADD = @ECORE_FILE_LIBS@
 lib_ecore_file_libecore_file_la_DEPENDENCIES = @ECORE_FILE_INTERNAL_LIBS@
 lib_ecore_file_libecore_file_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_IMF.am b/src/Makefile_Ecore_IMF.am
index 783181de0..cb6176986 100644
--- a/src/Makefile_Ecore_IMF.am
+++ b/src/Makefile_Ecore_IMF.am
@@ -14,7 +14,7 @@ lib/ecore_imf/ecore_imf_context.c \
 lib/ecore_imf/ecore_imf_module.c \
 lib/ecore_imf/ecore_imf_private.h
 
-lib_ecore_imf_libecore_imf_la_CPPFLAGS = \
+lib_ecore_imf_libecore_imf_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/ecore_imf\" \
@@ -35,7 +35,7 @@ modules_ecore_imf_ibus_module_la_SOURCES = \
 modules/ecore_imf/ibus/ibus_module.c \
 modules/ecore_imf/ibus/ibus_imcontext.c \
 modules/ecore_imf/ibus/ibus_imcontext.h
-modules_ecore_imf_ibus_module_la_CPPFLAGS = \
+modules_ecore_imf_ibus_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 @ECORE_IMF_CFLAGS@ \
 @ECORE_EVAS_CFLAGS@ \
 @ECORE_X_CFLAGS@ \
@@ -62,7 +62,7 @@ modules_ecore_imf_scim_module_la_SOURCES = \
 modules/ecore_imf/scim/scim_module.cpp \
 modules/ecore_imf/scim/scim_imcontext.cpp \
 modules/ecore_imf/scim/scim_imcontext.h
-modules_ecore_imf_scim_module_la_CPPFLAGS = \
+modules_ecore_imf_scim_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 @ECORE_IMF_CFLAGS@ \
 @ECORE_EVAS_CFLAGS@ \
 @ECORE_X_CFLAGS@ \
@@ -87,7 +87,7 @@ ecoreimfximpkgdir = $(libdir)/ecore_imf/modules/xim/$(MODULE_ARCH)
 ecoreimfximpkg_LTLIBRARIES = modules/ecore_imf/xim/module.la
 modules_ecore_imf_xim_module_la_SOURCES = \
 modules/ecore_imf/xim/ecore_imf_xim.c
-modules_ecore_imf_xim_module_la_CPPFLAGS = \
+modules_ecore_imf_xim_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 @ECORE_IMF_CFLAGS@ \
 @ECORE_X_CFLAGS@ \
 @ecore_imf_xim_cflags@
diff --git a/src/Makefile_Ecore_IMF_Evas.am b/src/Makefile_Ecore_IMF_Evas.am
index bd5756b6e..abb3d57ae 100644
--- a/src/Makefile_Ecore_IMF_Evas.am
+++ b/src/Makefile_Ecore_IMF_Evas.am
@@ -9,7 +9,7 @@ lib_LTLIBRARIES += \
 lib/ecore_imf_evas/libecore_imf_evas.la
 
 lib_ecore_imf_evas_libecore_imf_evas_la_SOURCES = lib/ecore_imf_evas/ecore_imf_evas.c
-lib_ecore_imf_evas_libecore_imf_evas_la_CPPFLAGS = @ECORE_IMF_EVAS_CFLAGS@
+lib_ecore_imf_evas_libecore_imf_evas_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_IMF_EVAS_CFLAGS@
 lib_ecore_imf_evas_libecore_imf_evas_la_LIBADD = @ECORE_IMF_EVAS_LIBS@
 lib_ecore_imf_evas_libecore_imf_evas_la_DEPENDENCIES = @ECORE_IMF_EVAS_INTERNAL_LIBS@
 lib_ecore_imf_evas_libecore_imf_evas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Input.am b/src/Makefile_Ecore_Input.am
index 3ce4dd16a..2b7aaba30 100644
--- a/src/Makefile_Ecore_Input.am
+++ b/src/Makefile_Ecore_Input.am
@@ -14,7 +14,7 @@ lib/ecore_input/ecore_input_compose.c \
 lib/ecore_input/ecore_input_compose.h \
 lib/ecore_input/ecore_input_private.h
 
-lib_ecore_input_libecore_input_la_CPPFLAGS = @ECORE_INPUT_CFLAGS@
+lib_ecore_input_libecore_input_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_INPUT_CFLAGS@
 lib_ecore_input_libecore_input_la_LIBADD = @ECORE_INPUT_LIBS@
 lib_ecore_input_libecore_input_la_DEPENDENCIES = @ECORE_INPUT_INTERNAL_LIBS@
 lib_ecore_input_libecore_input_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Input_Evas.am b/src/Makefile_Ecore_Input_Evas.am
index 91749bb5e..b56efc374 100644
--- a/src/Makefile_Ecore_Input_Evas.am
+++ b/src/Makefile_Ecore_Input_Evas.am
@@ -12,7 +12,7 @@ lib_ecore_input_evas_libecore_input_evas_la_SOURCES = \
 lib/ecore_input_evas/ecore_input_evas.c \
 lib/ecore_input_evas/ecore_input_evas_private.h
 
-lib_ecore_input_evas_libecore_input_evas_la_CPPFLAGS = @ECORE_INPUT_EVAS_CFLAGS@
+lib_ecore_input_evas_libecore_input_evas_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_INPUT_EVAS_CFLAGS@
 lib_ecore_input_evas_libecore_input_evas_la_LIBADD = @ECORE_INPUT_EVAS_LIBS@
 lib_ecore_input_evas_libecore_input_evas_la_DEPENDENCIES = @ECORE_INPUT_EVAS_INTERNAL_LIBS@
 lib_ecore_input_evas_libecore_input_evas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Ipc.am b/src/Makefile_Ecore_Ipc.am
index 00e57ef3a..1d41e054c 100644
--- a/src/Makefile_Ecore_Ipc.am
+++ b/src/Makefile_Ecore_Ipc.am
@@ -11,7 +11,7 @@ lib_ecore_ipc_libecore_ipc_la_SOURCES = \
 lib/ecore_ipc/ecore_ipc.c \
 lib/ecore_ipc/ecore_ipc_private.h
 
-lib_ecore_ipc_libecore_ipc_la_CPPFLAGS = @ECORE_IPC_CFLAGS@
+lib_ecore_ipc_libecore_ipc_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_IPC_CFLAGS@
 lib_ecore_ipc_libecore_ipc_la_LIBADD = @ECORE_IPC_LIBS@
 lib_ecore_ipc_libecore_ipc_la_DEPENDENCIES = @ECORE_IPC_INTERNAL_LIBS@
 lib_ecore_ipc_libecore_ipc_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Psl1ght.am b/src/Makefile_Ecore_Psl1ght.am
index ab87287e8..8c1f7fdfc 100644
--- a/src/Makefile_Ecore_Psl1ght.am
+++ b/src/Makefile_Ecore_Psl1ght.am
@@ -17,7 +17,7 @@ lib/ecore_psl1ght/spursutil.h \
 lib/ecore_psl1ght/Ecore_Psl1ght_Keys.h \
 lib/ecore_psl1ght/ecore_psl1ght_private.h
 
-lib_ecore_psl1ght_libecore_psl1ght_la_CPPFLAGS = @ECORE_PSL1GHT_CFLAGS@
+lib_ecore_psl1ght_libecore_psl1ght_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_PSL1GHT_CFLAGS@
 lib_ecore_psl1ght_libecore_psl1ght_la_LIBADD = @ECORE_PSL1GHT_LIBS@
 lib_ecore_psl1ght_libecore_psl1ght_la_DEPENDENCIES = @ECORE_PSL1GHT_INTERNAL_LIBS@
 lib_ecore_psl1ght_libecore_psl1ght_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_SDL.am b/src/Makefile_Ecore_SDL.am
index 21b54d6ce..7262c2b32 100644
--- a/src/Makefile_Ecore_SDL.am
+++ b/src/Makefile_Ecore_SDL.am
@@ -13,7 +13,7 @@ lib/ecore_sdl/ecore_sdl.c \
 lib/ecore_sdl/Ecore_Sdl_Keys.h \
 lib/ecore_sdl/ecore_sdl_private.h
 
-lib_ecore_sdl_libecore_sdl_la_CPPFLAGS = @ECORE_SDL_CFLAGS@
+lib_ecore_sdl_libecore_sdl_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_SDL_CFLAGS@
 lib_ecore_sdl_libecore_sdl_la_LIBADD = @ECORE_SDL_LIBS@
 lib_ecore_sdl_libecore_sdl_la_DEPENDENCIES = @ECORE_SDL_INTERNAL_LIBS@
 lib_ecore_sdl_libecore_sdl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Wayland.am b/src/Makefile_Ecore_Wayland.am
index d60171355..aaf08f50f 100644
--- a/src/Makefile_Ecore_Wayland.am
+++ b/src/Makefile_Ecore_Wayland.am
@@ -16,7 +16,7 @@ lib/ecore_wayland/ecore_wl_output.c \
 lib/ecore_wayland/ecore_wl_window.c \
 lib/ecore_wayland/ecore_wl_private.h
 
-lib_ecore_wayland_libecore_wayland_la_CPPFLAGS = @ECORE_WAYLAND_CFLAGS@
+lib_ecore_wayland_libecore_wayland_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_WAYLAND_CFLAGS@
 lib_ecore_wayland_libecore_wayland_la_LIBADD = @ECORE_WAYLAND_LIBS@
 lib_ecore_wayland_libecore_wayland_la_DEPENDENCIES = @ECORE_WAYLAND_INTERNAL_LIBS@
 lib_ecore_wayland_libecore_wayland_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Win32.am b/src/Makefile_Ecore_Win32.am
index 1b2621907..d1944a885 100644
--- a/src/Makefile_Ecore_Win32.am
+++ b/src/Makefile_Ecore_Win32.am
@@ -24,7 +24,7 @@ lib/ecore_win32/ecore_win32_dnd_data_object.h \
 lib/ecore_win32/ecore_win32_dnd_drop_source.h \
 lib/ecore_win32/ecore_win32_dnd_drop_target.h
 
-lib_ecore_win32_libecore_win32_la_CPPFLAGS = @ECORE_WIN32_CFLAGS@
+lib_ecore_win32_libecore_win32_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_WIN32_CFLAGS@
 lib_ecore_win32_libecore_win32_la_LIBADD = @ECORE_WIN32_LIBS@
 lib_ecore_win32_libecore_win32_la_DEPENDENCIES = @ECORE_WIN32_INTERNAL_LIBS@
 lib_ecore_win32_libecore_win32_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_WinCE.am b/src/Makefile_Ecore_WinCE.am
index 45fb42651..1f5cac68c 100644
--- a/src/Makefile_Ecore_WinCE.am
+++ b/src/Makefile_Ecore_WinCE.am
@@ -14,7 +14,7 @@ lib/ecore_wince/ecore_wince_event.c \
 lib/ecore_wince/ecore_wince_window.c \
 lib/ecore_wince/ecore_wince_private.h
 
-lib_ecore_wince_libecore_wince_la_CPPFLAGS = @ECORE_WINCE_CFLAGS@
+lib_ecore_wince_libecore_wince_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_WINCE_CFLAGS@
 lib_ecore_wince_libecore_wince_la_LIBADD = @ECORE_WINCE_LIBS@
 lib_ecore_wince_libecore_wince_la_DEPENDENCIES = @ECORE_WINCE_INTERNAL_LIBS@
 lib_ecore_wince_libecore_wince_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_X.am b/src/Makefile_Ecore_X.am
index 7457a542b..31c9f3735 100644
--- a/src/Makefile_Ecore_X.am
+++ b/src/Makefile_Ecore_X.am
@@ -91,7 +91,7 @@ lib/ecore_x/xlib/ecore_x_gesture.c \
 lib/ecore_x/xlib/ecore_x_private.h
 endif
 
-lib_ecore_x_libecore_x_la_CPPFLAGS = @ECORE_X_CFLAGS@
+lib_ecore_x_libecore_x_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_X_CFLAGS@
 lib_ecore_x_libecore_x_la_LIBADD = @ECORE_X_LIBS@
 lib_ecore_x_libecore_x_la_DEPENDENCIES = @ECORE_X_INTERNAL_LIBS@
 lib_ecore_x_libecore_x_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index 718c71029..950a8145f 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -3,7 +3,7 @@
 
 lib_LTLIBRARIES += lib/edje/libedje.la
 
-EDJE_COMMON_CPPFLAGS = \
+EDJE_COMMON_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_builddir) \
 -I$(top_srcdir)/src/lib/edje \
 -I$(top_builddir)/src/lib/edje \
@@ -52,7 +52,7 @@ lib/edje/edje_util.c \
 lib/edje/edje_var.c \
 lib/edje/edje_signal.c
 
-lib_edje_libedje_la_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
+lib_edje_libedje_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EDJE_COMMON_CPPFLAGS)
 lib_edje_libedje_la_LIBADD = @EDJE_LIBS@
 lib_edje_libedje_la_DEPENDENCIES = @EDJE_INTERNAL_LIBS@
 lib_edje_libedje_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
@@ -62,7 +62,7 @@ if ENABLE_MULTISENSE
 # edjemoduleXXX_LTLIBRARIES = modules/edje/XXX/module.la
 #
 # modules_edje_XXX_module_la_SOURCES = modules/edje/XXX/XXX.c
-# modules_edje_XXX_module_la_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) @XXX_LIBS@
+# modules_edje_XXX_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EDJE_COMMON_CPPFLAGS) @XXX_LIBS@
 # modules_edje_XXX_module_la_LIBADD = $(EDJE_COMMON_USER_LIBADD)
 # modules_edje_XXX_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
 # modules_edje_XXX_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -72,7 +72,7 @@ if ENABLE_MULTISENSE
 #
 # modules_edje_multisense_factory_module_la_SOURCES = \
 # modules/edje/multisense_factory/multisense_factory.c
-# modules_edje_multisense_factory_module_la_CPPFLAGS = \
+# modules_edje_multisense_factory_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 # $(EDJE_COMMON_CPPFLAGS) \
 # @REMIX_CFLAGS@
 # modules_edje_multisense_factory_module_la_LIBADD = \
@@ -111,7 +111,7 @@ bin/edje/edje_cc_mem.c \
 bin/edje/edje_cc_handlers.c \
 bin/edje/edje_cc_sources.c \
 bin/edje/edje_multisense_convert.c
-bin_edje_edje_cc_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
+bin_edje_edje_cc_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EDJE_COMMON_CPPFLAGS)
 bin_edje_edje_cc_LDADD =  $(USE_EDJE_BIN_LIBS)
 bin_edje_edje_cc_DEPENDENCIES = \
 @USE_EDJE_INTERNAL_LIBS@ \
@@ -122,37 +122,37 @@ bin/edje/edje_decc.c \
 bin/edje/edje_decc.h \
 bin/edje/edje_cc_mem.c \
 bin/edje/edje_cc_sources.c
-bin_edje_edje_decc_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
+bin_edje_edje_decc_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EDJE_COMMON_CPPFLAGS)
 bin_edje_edje_decc_LDADD =  $(USE_EDJE_BIN_LIBS)
 bin_edje_edje_decc_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
 
 bin_edje_edje_player_SOURCES = bin/edje/edje_player.c
-bin_edje_edje_player_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
+bin_edje_edje_player_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EDJE_COMMON_CPPFLAGS)
 bin_edje_edje_player_LDADD =  $(USE_EDJE_BIN_LIBS)
 bin_edje_edje_player_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
 
 bin_edje_edje_inspector_SOURCES = bin/edje/edje_inspector.c
-bin_edje_edje_inspector_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
+bin_edje_edje_inspector_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EDJE_COMMON_CPPFLAGS)
 bin_edje_edje_inspector_LDADD =  $(USE_EDJE_BIN_LIBS)
 bin_edje_edje_inspector_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
 
 bin_edje_edje_external_inspector_SOURCES = bin/edje/edje_external_inspector.c
-bin_edje_edje_external_inspector_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
+bin_edje_edje_external_inspector_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EDJE_COMMON_CPPFLAGS)
 bin_edje_edje_external_inspector_LDADD =  $(USE_EDJE_BIN_LIBS)
 bin_edje_edje_external_inspector_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
 
 bin_edje_edje_codegen_SOURCES = bin/edje/edje_codegen.c
-bin_edje_edje_codegen_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
+bin_edje_edje_codegen_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EDJE_COMMON_CPPFLAGS)
 bin_edje_edje_codegen_LDADD =  $(USE_EDJE_BIN_LIBS)
 bin_edje_edje_codegen_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
 
 bin_edje_edje_pick_SOURCES = bin/edje/edje_pick.c
-bin_edje_edje_pick_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
+bin_edje_edje_pick_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EDJE_COMMON_CPPFLAGS)
 bin_edje_edje_pick_LDADD =  $(USE_EDJE_BIN_LIBS)
 bin_edje_edje_pick_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
 
 bin_edje_edje_watch_SOURCES = bin/edje/edje_watch.c
-bin_edje_edje_watch_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
+bin_edje_edje_watch_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EDJE_COMMON_CPPFLAGS)
 bin_edje_edje_watch_LDADD =  $(USE_EDJE_BIN_LIBS)
 bin_edje_edje_watch_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
 
@@ -170,7 +170,7 @@ bin/edje/epp/cpplib.c \
 bin/edje/epp/cppmain.c
 
 # Note: eina is included only because of EINA_UNUSED
-bin_edje_epp_epp_CPPFLAGS = \
+bin_edje_epp_epp_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_builddir) \
 -I$(top_srcdir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eina \
@@ -226,7 +226,7 @@ tests/edje/edje_suite.c \
 tests/edje/edje_test_edje.c \
 tests/edje/edje_suite.h
 
-tests_edje_edje_suite_CPPFLAGS = \
+tests_edje_edje_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 $(EDJE_COMMON_CPPFLAGS) \
 -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/edje\" \
 @CHECK_CFLAGS@
diff --git a/src/Makefile_Eet.am b/src/Makefile_Eet.am
index 164029931..05e9acb19 100644
--- a/src/Makefile_Eet.am
+++ b/src/Makefile_Eet.am
@@ -22,7 +22,7 @@ static_libs/lz4/lz4.h \
 static_libs/lz4/lz4hc.c \
 static_libs/lz4/lz4hc.h
 
-lib_eet_libeet_la_CPPFLAGS = \
+lib_eet_libeet_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/static_libs/lz4 \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
@@ -40,7 +40,7 @@ bin_PROGRAMS += bin/eet/eet
 
 bin_eet_eet_SOURCES = bin/eet/eet_main.c
 
-bin_eet_eet_CPPFLAGS = \
+bin_eet_eet_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \
@@ -65,7 +65,7 @@ tests/eet/eet_suite.c \
 tests/eet/eet_data_suite.c \
 tests/eet/eet_suite.h
 
-tests_eet_eet_suite_CPPFLAGS = \
+tests_eet_eet_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -DTESTS_WD=\"`pwd`\" \
 -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eet\" \
 -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eet\" \
diff --git a/src/Makefile_Eeze.am b/src/Makefile_Eeze.am
index 938925d94..81c173473 100644
--- a/src/Makefile_Eeze.am
+++ b/src/Makefile_Eeze.am
@@ -45,7 +45,7 @@ else
 lib_eeze_libeeze_la_SOURCES += lib/eeze/eeze_disk_dummy.c
 endif
 
-lib_eeze_libeeze_la_CPPFLAGS = \
+lib_eeze_libeeze_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/eeze\" \
@@ -60,7 +60,7 @@ eezemodulesensortizendir = $(libdir)/eeze/modules/sensor/tizen/$(MODULE_ARCH)
 eezemodulesensortizen_LTLIBRARIES = modules/eeze/sensor/tizen/module.la
 modules_eeze_sensor_tizen_module_la_SOURCES = \
 modules/eeze/sensor/tizen/tizen.c
-modules_eeze_sensor_tizen_module_la_CPPFLAGS = \
+modules_eeze_sensor_tizen_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 @EEZE_CFLAGS@ \
 @TIZEN_SENSOR_CFLAGS@
 modules_eeze_sensor_tizen_module_la_LIBADD = \
@@ -73,7 +73,7 @@ else
 eezemodulesensorfakedir = $(libdir)/eeze/modules/sensor/fake/$(MODULE_ARCH)
 eezemodulesensorfake_LTLIBRARIES = modules/eeze/sensor/fake/module.la
 modules_eeze_sensor_fake_module_la_SOURCES = modules/eeze/sensor/fake/fake.c
-modules_eeze_sensor_fake_module_la_CPPFLAGS = @EEZE_CFLAGS@
+modules_eeze_sensor_fake_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
 modules_eeze_sensor_fake_module_la_LIBADD = @USE_EEZE_LIBS@
 modules_eeze_sensor_fake_module_la_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
 modules_eeze_sensor_fake_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
@@ -82,7 +82,7 @@ endif
 eezemodulesensorudevdir = $(libdir)/eeze/modules/sensor/udev/$(MODULE_ARCH)
 eezemodulesensorudev_LTLIBRARIES = modules/eeze/sensor/udev/module.la
 modules_eeze_sensor_udev_module_la_SOURCES = modules/eeze/sensor/udev/udev.c
-modules_eeze_sensor_udev_module_la_CPPFLAGS = @EEZE_CFLAGS@
+modules_eeze_sensor_udev_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
 modules_eeze_sensor_udev_module_la_LIBADD = @USE_EEZE_LIBS@
 modules_eeze_sensor_udev_module_la_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
 modules_eeze_sensor_udev_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
@@ -95,12 +95,12 @@ bin/eeze/eeze_udev_test \
 bin/eeze/eeze_sensor_test
 
 bin_eeze_eeze_udev_test_SOURCES = bin/eeze/eeze_udev_test.c
-bin_eeze_eeze_udev_test_CPPFLAGS = @EEZE_CFLAGS@
+bin_eeze_eeze_udev_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
 bin_eeze_eeze_udev_test_LDADD = @USE_EEZE_LIBS@
 bin_eeze_eeze_udev_test_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
 
 bin_eeze_eeze_sensor_test_SOURCES = bin/eeze/eeze_sensor_test.c
-bin_eeze_eeze_sensor_test_CPPFLAGS = @EEZE_CFLAGS@
+bin_eeze_eeze_sensor_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
 bin_eeze_eeze_sensor_test_LDADD = @USE_EEZE_LIBS@
 bin_eeze_eeze_sensor_test_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
 
@@ -111,24 +111,24 @@ bin/eeze/eeze_disk_ls \
 bin/eeze/eeze_scanner
 
 bin_eeze_eeze_mount_SOURCES = bin/eeze/eeze_mount.c
-bin_eeze_eeze_mount_CPPFLAGS = @EEZE_CFLAGS@
+bin_eeze_eeze_mount_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
 bin_eeze_eeze_mount_LDADD = @USE_EEZE_LIBS@
 bin_eeze_eeze_mount_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
 
 bin_eeze_eeze_umount_SOURCES = bin/eeze/eeze_umount.c
-bin_eeze_eeze_umount_CPPFLAGS = @EEZE_CFLAGS@
+bin_eeze_eeze_umount_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
 bin_eeze_eeze_umount_LDADD = @USE_EEZE_LIBS@
 bin_eeze_eeze_umount_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
 
 bin_eeze_eeze_disk_ls_SOURCES = bin/eeze/eeze_disk_ls.c
-bin_eeze_eeze_disk_ls_CPPFLAGS = @EEZE_CFLAGS@
+bin_eeze_eeze_disk_ls_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
 bin_eeze_eeze_disk_ls_LDADD = @USE_EEZE_LIBS@
 bin_eeze_eeze_disk_ls_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
 
 bin_eeze_eeze_scanner_SOURCES = \
 bin/eeze/eeze_scanner.c \
 bin/eeze/eeze_scanner.h
-bin_eeze_eeze_scanner_CPPFLAGS = @EEZE_CFLAGS@
+bin_eeze_eeze_scanner_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
 bin_eeze_eeze_scanner_LDADD = @USE_EEZE_LIBS@
 bin_eeze_eeze_scanner_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
 
@@ -145,7 +145,7 @@ check_PROGRAMS += tests/eeze/eeze_suite
 TESTS += tests/eeze/eeze_suite
 
 tests_eeze_eeze_suite_SOURCES = tests/eeze/eeze_suite.c
-tests_eeze_eeze_suite_CPPFLAGS = \
+tests_eeze_eeze_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 @EEZE_CFLAGS@ \
 -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eeze\" \
 -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eeze\" \
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
new file mode 100644
index 000000000..c5fe87fd7
--- /dev/null
+++ b/src/Makefile_Efl.am
@@ -0,0 +1,3 @@
+installed_eflheadersdir = $(includedir)/efl-@VMAJ@
+dist_installed_eflheaders_DATA = \
+lib/efl/Efl_Config.h
diff --git a/src/Makefile_Efreet.am b/src/Makefile_Efreet.am
index e608a46da..725760a82 100644
--- a/src/Makefile_Efreet.am
+++ b/src/Makefile_Efreet.am
@@ -6,7 +6,7 @@ lib/efreet/libefreet.la \
 lib/efreet/libefreet_mime.la \
 lib/efreet/libefreet_trash.la
 
-EFREET_COMMON_CPPFLAGS = \
+EFREET_COMMON_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/efreet\" \
@@ -45,21 +45,21 @@ lib/efreet/efreet_private.h \
 lib/efreet/efreet_xml.h \
 lib/efreet/efreet_cache_private.h
 
-lib_efreet_libefreet_la_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
+lib_efreet_libefreet_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
 lib_efreet_libefreet_la_LIBADD = @EFREET_LIBS@
 lib_efreet_libefreet_la_DEPENDENCIES = @EFREET_INTERNAL_LIBS@
 lib_efreet_libefreet_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
 
 # libefreet_mime.la
 lib_efreet_libefreet_mime_la_SOURCES = lib/efreet/efreet_mime.c
-lib_efreet_libefreet_mime_la_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
+lib_efreet_libefreet_mime_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
 lib_efreet_libefreet_mime_la_LIBADD = @USE_EFREET_LIBS@
 lib_efreet_libefreet_mime_la_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
 lib_efreet_libefreet_mime_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
 
 # libefreet_trash.la
 lib_efreet_libefreet_trash_la_SOURCES = lib/efreet/efreet_trash.c
-lib_efreet_libefreet_trash_la_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
+lib_efreet_libefreet_trash_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
 lib_efreet_libefreet_trash_la_LIBADD = @USE_EFREET_LIBS@
 lib_efreet_libefreet_trash_la_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
 lib_efreet_libefreet_trash_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
@@ -83,7 +83,7 @@ bin/efreet/efreetd_dbus.c \
 bin/efreet/efreetd_cache.h \
 bin/efreet/efreetd_cache.c
 
-bin_efreet_efreetd_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
+bin_efreet_efreetd_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
 bin_efreet_efreetd_LDADD = $(USE_EFREET_BIN_LIBS)
 bin_efreet_efreetd_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
 
@@ -92,12 +92,12 @@ efreetinternal_bin_PROGRAMS = \
 bin/efreet/efreet_desktop_cache_create \
 bin/efreet/efreet_icon_cache_create
 
-bin_efreet_efreet_desktop_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
+bin_efreet_efreet_desktop_cache_create_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
 bin_efreet_efreet_desktop_cache_create_LDADD = $(USE_EFREET_BIN_LIBS)
 bin_efreet_efreet_desktop_cache_create_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
 bin_efreet_efreet_desktop_cache_create_SOURCES = bin/efreet/efreet_desktop_cache_create.c
 
-bin_efreet_efreet_icon_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
+bin_efreet_efreet_icon_cache_create_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
 bin_efreet_efreet_icon_cache_create_LDADD = $(USE_EFREET_BIN_LIBS)
 bin_efreet_efreet_icon_cache_create_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
 bin_efreet_efreet_icon_cache_create_SOURCES = bin/efreet/efreet_icon_cache_create.c
@@ -117,7 +117,7 @@ tests/efreet/compare/efreet_menu_alloc
 
 
 # efreet_test
-tests_efreet_efreet_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
+tests_efreet_efreet_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
 tests_efreet_efreet_test_LDADD = \
 @USE_EFREET_LIBS@ \
 lib/efreet/libefreet_mime.la
@@ -138,31 +138,31 @@ tests/efreet/ef_utils.c \
 tests/efreet/main.c
 
 # efreet_spec_test
-tests_efreet_efreet_spec_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
+tests_efreet_efreet_spec_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
 tests_efreet_efreet_spec_test_LDADD = @USE_EFREET_LIBS@
 tests_efreet_efreet_spec_test_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
 tests_efreet_efreet_spec_test_SOURCES = tests/efreet/efreet_spec_test.c
 
 # efreet_cache_test
-tests_efreet_efreet_cache_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
+tests_efreet_efreet_cache_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
 tests_efreet_efreet_cache_test_LDADD = @USE_EFREET_LIBS@
 tests_efreet_efreet_cache_test_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
 tests_efreet_efreet_cache_test_SOURCES = tests/efreet/ef_cache.c
 
 # efreet_icon_cache_dump
-tests_efreet_efreet_icon_cache_dump_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
+tests_efreet_efreet_icon_cache_dump_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
 tests_efreet_efreet_icon_cache_dump_LDADD = @USE_EFREET_LIBS@
 tests_efreet_efreet_icon_cache_dump_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
 tests_efreet_efreet_icon_cache_dump_SOURCES = tests/efreet/efreet_icon_cache_dump.c
 
 # efreet_user_dir
-tests_efreet_efreet_user_dir_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
+tests_efreet_efreet_user_dir_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
 tests_efreet_efreet_user_dir_LDADD = @USE_EFREET_LIBS@
 tests_efreet_efreet_user_dir_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
 tests_efreet_efreet_user_dir_SOURCES = tests/efreet/efreet_user_dir.c
 
 # efreet_alloc
-tests_efreet_compare_efreet_alloc_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
+tests_efreet_compare_efreet_alloc_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
 tests_efreet_compare_efreet_alloc_LDADD = @USE_EFREET_LIBS@
 tests_efreet_compare_efreet_alloc_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
 tests_efreet_compare_efreet_alloc_SOURCES = \
@@ -170,7 +170,7 @@ tests/efreet/compare/efreet_alloc.c \
 tests/efreet/compare/comp.h
 
 # efreet_menu_alloc
-tests_efreet_compare_efreet_menu_alloc_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
+tests_efreet_compare_efreet_menu_alloc_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
 tests_efreet_compare_efreet_menu_alloc_LDADD = @USE_EFREET_LIBS@
 tests_efreet_compare_efreet_menu_alloc_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
 tests_efreet_compare_efreet_menu_alloc_SOURCES = \
@@ -204,7 +204,7 @@ tests/efreet/efreet_suite.h \
 tests/efreet/efreet_test_efreet.c \
 tests/efreet/efreet_test_efreet_cache.c
 
-tests_efreet_efreet_suite_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) @CHECK_CFLAGS@ \
+tests_efreet_efreet_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS) @CHECK_CFLAGS@ \
 -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/efreet\"
 tests_efreet_efreet_suite_LDADD = @CHECK_LIBS@ @USE_EFREET_LIBS@
 tests_efreet_efreet_suite_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am
index 1080b5832..7e40749d1 100644
--- a/src/Makefile_Eina.am
+++ b/src/Makefile_Eina.am
@@ -205,7 +205,7 @@ modules_eina_mp_pass_through_pass_through_module_la_LIBTOOLFLAGS = --tag=disable
 modules_eina_mp_pass_through_pass_through_module_la_SOURCES = modules/eina/mp/pass_through/eina_pass_through.c
 endif
 
-lib_eina_libeina_la_CPPFLAGS = \
+lib_eina_libeina_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 @EINA_CFLAGS@ \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
@@ -270,7 +270,7 @@ tests/eina/eina_test_barrier.c \
 tests/eina/eina_test_tmpstr.c
 # tests/eina/eina_test_model.c
 
-tests_eina_eina_suite_CPPFLAGS = \
+tests_eina_eina_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -DTESTS_WD=\"`pwd`\" \
 -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eina\" \
 -DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/src/tests/eina\" \
@@ -281,14 +281,14 @@ tests_eina_eina_suite_LDADD = @CHECK_LIBS@ @USE_EINA_LIBS@
 tests_eina_eina_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
 
 tests_eina_cxx_compile_test_SOURCES = tests/eina/cxx_compile_test.cxx
-tests_eina_cxx_compile_test_CPPFLAGS = @EINA_CFLAGS@
+tests_eina_cxx_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EINA_CFLAGS@
 tests_eina_cxx_compile_test_LDADD = @USE_EINA_LIBS@
 tests_eina_cxx_compile_test_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
 
 check_LTLIBRARIES = tests/eina/module_dummy.la
 
 tests_eina_module_dummy_la_SOURCES = tests/eina/eina_test_module_dummy.c
-tests_eina_module_dummy_la_CPPFLAGS = \
+tests_eina_module_dummy_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/src/tests/eina\" \
 @CHECK_CFLAGS@ \
 @EINA_CFLAGS@
diff --git a/src/Makefile_Eio.am b/src/Makefile_Eio.am
index 8d4738ad9..ff0f442be 100644
--- a/src/Makefile_Eio.am
+++ b/src/Makefile_Eio.am
@@ -26,7 +26,7 @@ lib_eio_libeio_la_SOURCES += lib/eio/eio_monitor_win32.c
 endif
 endif
 
-lib_eio_libeio_la_CPPFLAGS = @EIO_CFLAGS@
+lib_eio_libeio_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EIO_CFLAGS@
 lib_eio_libeio_la_LIBADD = @EIO_LIBS@
 lib_eio_libeio_la_DEPENDENCIES = @EIO_INTERNAL_LIBS@
 lib_eio_libeio_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Eldbus.am b/src/Makefile_Eldbus.am
index b736e9930..66ca2bf91 100644
--- a/src/Makefile_Eldbus.am
+++ b/src/Makefile_Eldbus.am
@@ -32,7 +32,7 @@ lib/eldbus/eldbus_message_helper.c \
 lib/eldbus/eldbus_message_to_eina_value.c \
 lib/eldbus/eldbus_message_from_eina_value.c
 
-lib_eldbus_libeldbus_la_CPPFLAGS = \
+lib_eldbus_libeldbus_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -include $(top_builddir)/config.h \
 @ELDBUS_CFLAGS@
 lib_eldbus_libeldbus_la_LIBADD = @ELDBUS_LIBS@
@@ -51,7 +51,7 @@ bin/eldbus/dbus.c \
 bin/eldbus/source_client.c \
 bin/eldbus/client.c
 
-bin_eldbus_eldbus_codegen_CPPFLAGS = \
+bin_eldbus_eldbus_codegen_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/eldbus\" \
@@ -76,7 +76,7 @@ tests/eldbus/eldbus_suite.c \
 tests/eldbus/eldbus_test_eldbus_init.c \
 tests/eldbus/eldbus_suite.h
 
-tests_eldbus_eldbus_suite_CPPFLAGS = @CHECK_CFLAGS@ @ELDBUS_CFLAGS@ \
+tests_eldbus_eldbus_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl @CHECK_CFLAGS@ @ELDBUS_CFLAGS@ \
 -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eldbus\"
 
 tests_eldbus_eldbus_suite_LDADD = @CHECK_LIBS@ @USE_ELDBUS_LIBS@
diff --git a/src/Makefile_Embryo.am b/src/Makefile_Embryo.am
index 907f328bf..54ca3b971 100644
--- a/src/Makefile_Embryo.am
+++ b/src/Makefile_Embryo.am
@@ -16,7 +16,7 @@ lib/embryo/embryo_str.c \
 lib/embryo/embryo_time.c \
 lib/embryo/embryo_private.h
 
-lib_embryo_libembryo_la_CPPFLAGS = \
+lib_embryo_libembryo_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
@@ -46,7 +46,7 @@ bin/embryo/embryo_cc_scvars.c \
 bin/embryo/embryo_cc_prefix.c \
 bin/embryo/embryo_cc_prefix.h
 
-bin_embryo_embryo_cc_CPPFLAGS = \
+bin_embryo_embryo_cc_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
diff --git a/src/Makefile_Emotion.am b/src/Makefile_Emotion.am
index ca94a5675..2323fb624 100644
--- a/src/Makefile_Emotion.am
+++ b/src/Makefile_Emotion.am
@@ -15,7 +15,7 @@ lib/emotion/emotion_webcam.c \
 lib/emotion/emotion_modules.c \
 lib/emotion/emotion_main.c
 
-lib_emotion_libemotion_la_CPPFLAGS = \
+lib_emotion_libemotion_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/emotion\" \
@@ -40,7 +40,7 @@ if EMOTION_BUILD_XINE
 emotionmodulexinedir = $(libdir)/emotion/modules/xine/$(MODULE_ARCH)
 emotionmodulexine_LTLIBRARIES = modules/emotion/xine/module.la
 modules_emotion_xine_module_la_SOURCES = $(EMOTION_XINE_SOURCES)
-modules_emotion_xine_module_la_CPPFLAGS = \
+modules_emotion_xine_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 @EMOTION_CFLAGS@ \
 @EMOTION_MODULE_XINE_CFLAGS@
 modules_emotion_xine_module_la_LIBADD = \
@@ -68,7 +68,7 @@ if EMOTION_BUILD_GSTREAMER
 emotionmodulegstreamerdir = $(libdir)/emotion/modules/gstreamer/$(MODULE_ARCH)
 emotionmodulegstreamer_LTLIBRARIES = modules/emotion/gstreamer/module.la
 modules_emotion_gstreamer_module_la_SOURCES = $(EMOTION_GSTREAMER_SOURCES)
-modules_emotion_gstreamer_module_la_CPPFLAGS = \
+modules_emotion_gstreamer_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 @EMOTION_CFLAGS@ \
 @EMOTION_MODULE_GSTREAMER_CFLAGS@
 modules_emotion_gstreamer_module_la_LIBADD = \
@@ -97,7 +97,7 @@ if EMOTION_BUILD_GENERIC
 emotionmodulegenericdir = $(libdir)/emotion/modules/generic/$(MODULE_ARCH)
 emotionmodulegeneric_LTLIBRARIES = modules/emotion/generic/module.la
 modules_emotion_generic_module_la_SOURCES = $(EMOTION_GENERIC_SOURCES)
-modules_emotion_generic_module_la_CPPFLAGS = \
+modules_emotion_generic_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 @EMOTION_CFLAGS@ \
 @EMOTION_MODULE_GENERIC_CFLAGS@ \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
@@ -124,7 +124,7 @@ emotionedjeexternal_LTLIBRARIES = edje_external/emotion/module.la
 
 edje_external_emotion_module_la_SOURCES = \
 edje_external/emotion/emotion.c
-edje_external_emotion_module_la_CPPFLAGS = \
+edje_external_emotion_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 @EDJE_CFLAGS@ \
 @EMOTION_CFLAGS@ \
 -DPACKAGE_DATA_DIR=\"$(datadir)/emotion\"
@@ -148,7 +148,7 @@ bin_PROGRAMS += tests/emotion/emotion_test
 tests_emotion_emotion_test_SOURCES = \
 tests/emotion/emotion_test_main.c
 
-tests_emotion_emotion_test_CPPFLAGS = \
+tests_emotion_emotion_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/emotion\" \
diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am
index 2b69aabf6..1e200f3e9 100644
--- a/src/Makefile_Eo.am
+++ b/src/Makefile_Eo.am
@@ -13,7 +13,7 @@ lib/eo/eo_ptr_indirection.h \
 lib/eo/eo_base_class.c \
 lib/eo/eo_private.h
 
-lib_eo_libeo_la_CPPFLAGS = @EO_CFLAGS@
+lib_eo_libeo_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EO_CFLAGS@
 lib_eo_libeo_la_LIBADD = @EO_LIBS@
 lib_eo_libeo_la_DEPENDENCIES = @EO_INTERNAL_LIBS@
 lib_eo_libeo_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
@@ -38,7 +38,7 @@ tests/eo/access/access_main.c \
 tests/eo/access/access_simple.c \
 tests/eo/access/access_simple.h \
 tests/eo/access/access_simple_protected.h
-tests_eo_test_access_CPPFLAGS = @EO_CFLAGS@
+tests_eo_test_access_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EO_CFLAGS@
 tests_eo_test_access_LDADD = @USE_EO_LIBS@
 tests_eo_test_access_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
 TESTS += tests/eo/test_access
@@ -49,7 +49,7 @@ tests/eo/composite_objects/composite_objects_comp.h \
 tests/eo/composite_objects/composite_objects_main.c \
 tests/eo/composite_objects/composite_objects_simple.c \
 tests/eo/composite_objects/composite_objects_simple.h
-tests_eo_test_composite_objects_CPPFLAGS = @EO_CFLAGS@
+tests_eo_test_composite_objects_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EO_CFLAGS@
 tests_eo_test_composite_objects_LDADD = @USE_EO_LIBS@
 tests_eo_test_composite_objects_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
 TESTS += tests/eo/test_composite_objects
@@ -72,7 +72,7 @@ tests/eo/constructors/constructors_simple6.c \
 tests/eo/constructors/constructors_simple6.h \
 tests/eo/constructors/constructors_simple7.c \
 tests/eo/constructors/constructors_simple7.h
-tests_eo_test_constructors_CPPFLAGS = @EO_CFLAGS@
+tests_eo_test_constructors_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EO_CFLAGS@
 tests_eo_test_constructors_LDADD = @USE_EO_LIBS@
 tests_eo_test_constructors_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
 TESTS += tests/eo/test_constructors
@@ -85,7 +85,7 @@ tests/eo/suite/eo_suite.h \
 tests/eo/suite/eo_test_class_errors.c \
 tests/eo/suite/eo_test_general.c \
 tests/eo/suite/eo_test_init.c
-tests_eo_eo_suite_CPPFLAGS = \
+tests_eo_eo_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eo\" \
 @CHECK_CFLAGS@ \
 @EO_CFLAGS@
@@ -104,7 +104,7 @@ tests/eo/function_overrides/function_overrides_inherit3.h \
 tests/eo/function_overrides/function_overrides_main.c \
 tests/eo/function_overrides/function_overrides_simple.c \
 tests/eo/function_overrides/function_overrides_simple.h
-tests_eo_test_function_overrides_CPPFLAGS = @EO_CFLAGS@
+tests_eo_test_function_overrides_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EO_CFLAGS@
 tests_eo_test_function_overrides_LDADD = @USE_EO_LIBS@
 tests_eo_test_function_overrides_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
 TESTS += tests/eo/test_function_overrides
@@ -117,7 +117,7 @@ tests/eo/interface/interface_interface2.h \
 tests/eo/interface/interface_main.c \
 tests/eo/interface/interface_simple.c \
 tests/eo/interface/interface_simple.h
-tests_eo_test_interface_CPPFLAGS = @EO_CFLAGS@
+tests_eo_test_interface_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EO_CFLAGS@
 tests_eo_test_interface_LDADD = @USE_EO_LIBS@
 tests_eo_test_interface_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
 TESTS += tests/eo/test_interface
@@ -136,7 +136,7 @@ tests/eo/mixin/mixin_mixin4.c \
 tests/eo/mixin/mixin_mixin4.h \
 tests/eo/mixin/mixin_simple.c \
 tests/eo/mixin/mixin_simple.h
-tests_eo_test_mixin_CPPFLAGS = @EO_CFLAGS@
+tests_eo_test_mixin_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EO_CFLAGS@
 tests_eo_test_mixin_LDADD = @USE_EO_LIBS@
 tests_eo_test_mixin_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
 TESTS += tests/eo/test_mixin
@@ -145,7 +145,7 @@ tests_eo_test_signals_SOURCES = \
 tests/eo/signals/signals_main.c \
 tests/eo/signals/signals_simple.c \
 tests/eo/signals/signals_simple.h
-tests_eo_test_signals_CPPFLAGS = @EO_CFLAGS@
+tests_eo_test_signals_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EO_CFLAGS@
 tests_eo_test_signals_LDADD = @USE_EO_LIBS@
 tests_eo_test_signals_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
 TESTS += tests/eo/test_signals
diff --git a/src/Makefile_Escape.am b/src/Makefile_Escape.am
index c9399c9c2..6a2062bc0 100644
--- a/src/Makefile_Escape.am
+++ b/src/Makefile_Escape.am
@@ -19,7 +19,7 @@ lib/escape/escape_libgen.c \
 lib/escape/escape_mman.c \
 lib/escape/escape_unistd.c
 
-lib_escape_libescape_la_CPPFLAGS = @ESCAPE_CFLAGS@
+lib_escape_libescape_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ESCAPE_CFLAGS@
 lib_escape_libescape_la_LIBADD = @ESCAPE_LIBS@
 lib_escape_libescape_la_DEPENDENCIES = @ESCAPE_INTERNAL_LIBS@
 lib_escape_libescape_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ethumb.am b/src/Makefile_Ethumb.am
index 6dd14067e..50f873ca1 100644
--- a/src/Makefile_Ethumb.am
+++ b/src/Makefile_Ethumb.am
@@ -14,7 +14,7 @@ lib/ethumb/md5.h \
 lib/ethumb/ethumb.c \
 lib/ethumb/md5.c
 
-lib_ethumb_libethumb_la_CPPFLAGS = \
+lib_ethumb_libethumb_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/ethumb\" \
@@ -31,7 +31,7 @@ ethumbmoduleemotiondir = $(libdir)/ethumb/modules/emotion/$(MODULE_ARCH)
 ethumbmoduleemotion_LTLIBRARIES = modules/ethumb/emotion/module.la
 modules_ethumb_emotion_module_la_SOURCES = \
 modules/ethumb/emotion/emotion.c
-modules_ethumb_emotion_module_la_CPPFLAGS = \
+modules_ethumb_emotion_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/ethumb\" \
@@ -65,7 +65,7 @@ bin_PROGRAMS += \
 bin/ethumb/ethumb
 
 bin_ethumb_ethumb_SOURCES = bin/ethumb/ethumb.c
-bin_ethumb_ethumb_CPPFLAGS = @ETHUMB_CFLAGS@
+bin_ethumb_ethumb_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ETHUMB_CFLAGS@
 if HAVE_WIN32
 bin_ethumb_ethumb_LDADD = -L$(top_builddir)/src/lib/evil @USE_ETHUMB_LIBS@
 else
diff --git a/src/Makefile_Ethumb_Client.am b/src/Makefile_Ethumb_Client.am
index b0e2088ad..851b35f68 100644
--- a/src/Makefile_Ethumb_Client.am
+++ b/src/Makefile_Ethumb_Client.am
@@ -9,7 +9,7 @@ lib/ethumb_client/Ethumb_Client.h
 
 # libethumb_client.la
 lib_ethumb_client_libethumb_client_la_SOURCES = lib/ethumb_client/ethumb_client.c
-lib_ethumb_client_libethumb_client_la_CPPFLAGS = @ETHUMB_CLIENT_CFLAGS@
+lib_ethumb_client_libethumb_client_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ETHUMB_CLIENT_CFLAGS@
 lib_ethumb_client_libethumb_client_la_LIBADD = @ETHUMB_CLIENT_LIBS@
 lib_ethumb_client_libethumb_client_la_DEPENDENCIES = @ETHUMB_CLIENT_INTERNAL_LIBS@
 lib_ethumb_client_libethumb_client_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
@@ -34,7 +34,7 @@ bin/ethumb_client/ethumbd_slave
 bin_ethumb_client_ethumbd_SOURCES = \
 bin/ethumb_client/ethumbd_private.h \
 bin/ethumb_client/ethumbd.c
-bin_ethumb_client_ethumbd_CPPFLAGS = \
+bin_ethumb_client_ethumbd_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/ethumb_client\" \
@@ -44,7 +44,7 @@ bin_ethumb_client_ethumbd_LDADD = $(USE_ETHUMB_CLIENT_BIN_LIBS)
 bin_ethumb_client_ethumbd_DEPENDENCIES = @USE_ETHUMB_CLIENT_INTERNAL_LIBS@
 
 bin_ethumb_client_ethumbd_client_SOURCES = bin/ethumb_client/ethumbd_client.c
-bin_ethumb_client_ethumbd_client_CPPFLAGS = @ETHUMB_CLIENT_CFLAGS@
+bin_ethumb_client_ethumbd_client_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ETHUMB_CLIENT_CFLAGS@
 bin_ethumb_client_ethumbd_client_LDADD = $(USE_ETHUMB_CLIENT_BIN_LIBS)
 bin_ethumb_client_ethumbd_client_DEPENDENCIES = @USE_ETHUMB_CLIENT_INTERNAL_LIBS@
 
@@ -52,6 +52,6 @@ bin_ethumb_client_ethumbd_client_DEPENDENCIES = @USE_ETHUMB_CLIENT_INTERNAL_LIBS
 bin_ethumb_client_ethumbd_slave_SOURCES = \
 bin/ethumb_client/ethumbd_private.h \
 bin/ethumb_client/ethumbd_slave.c
-bin_ethumb_client_ethumbd_slave_CPPFLAGS = @ETHUMB_CFLAGS@
+bin_ethumb_client_ethumbd_slave_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ETHUMB_CFLAGS@
 bin_ethumb_client_ethumbd_slave_LDADD = $(USE_ETHUMB_CLIENT_BIN_LIBS)
 bin_ethumb_client_ethumbd_slave_DEPENDENCIES = @USE_ETHUMB_CLIENT_INTERNAL_LIBS@ @USE_ETHUMB_INTERNAL_LIBS@
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index ae87ce7a3..6b791ae91 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -190,7 +190,7 @@ lib/evas/common/language/evas_script_table.h \
 lib/evas/common/evas_text_utils.h \
 lib/evas/common/evas_font_ot.h
 
-lib_evas_libevas_la_CPPFLAGS = \
+lib_evas_libevas_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/common \
 -I$(top_srcdir)/src/lib/evas/cserve2 \
 -I$(top_srcdir)/src/lib/evas/file \
@@ -210,7 +210,7 @@ noinst_LTLIBRARIES += lib/evas/common/libevas_op_blend_sse3.la
 lib_evas_common_libevas_op_blend_sse3_la_SOURCES = \
 lib/evas/common/evas_op_blend/op_blend_master_sse3.c
 
-lib_evas_common_libevas_op_blend_sse3_la_CPPFLAGS = \
+lib_evas_common_libevas_op_blend_sse3_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 $(lib_evas_libevas_la_CPPFLAGS) \
 @SSE3_CFLAGS@
 
@@ -360,7 +360,7 @@ else
 enginesoftwaregenericpkgdir = $(libdir)/evas/modules/engines/software_generic/$(MODULE_ARCH)
 enginesoftwaregenericpkg_LTLIBRARIES = modules/evas/engines/software_generic/module.la
 modules_evas_engines_software_generic_module_la_SOURCES = modules/evas/engines/software_generic/evas_engine.c
-modules_evas_engines_software_generic_module_la_CPPFLAGS = \
+modules_evas_engines_software_generic_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 -I$(top_srcdir)/src/lib/evas/cserve2 \
 @EVAS_CFLAGS@
@@ -382,7 +382,7 @@ else
 enginebufferpkgdir = $(libdir)/evas/modules/engines/buffer/$(MODULE_ARCH)
 enginebufferpkg_LTLIBRARIES = modules/evas/engines/buffer/module.la
 modules_evas_engines_buffer_module_la_SOURCES = $(BUFFER_SOURCES)
-modules_evas_engines_buffer_module_la_CPPFLAGS = \
+modules_evas_engines_buffer_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 -I$(top_srcdir)/src/lib/evas/cserve2 \
 @EVAS_CFLAGS@
@@ -409,7 +409,7 @@ else
 enginefbpkgdir = $(libdir)/evas/modules/engines/fb/$(MODULE_ARCH)
 enginefbpkg_LTLIBRARIES = modules/evas/engines/fb/module.la
 modules_evas_engines_fb_module_la_SOURCES = $(FB_SOURCES)
-modules_evas_engines_fb_module_la_CPPFLAGS = \
+modules_evas_engines_fb_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 -I$(top_srcdir)/src/lib/evas/cserve2 \
 @evas_engine_fb_cflags@ \
@@ -602,7 +602,7 @@ lib_evas_libevas_la_LIBADD += @evas_engine_gl_common_libs@
 else
 noinst_LTLIBRARIES += modules/evas/engines/gl_common/libevas_engine_gl_common.la
 modules_evas_engines_gl_common_libevas_engine_gl_common_la_SOURCES = $(GL_COMMON_SOURCES)
-modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS = \
+modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 -I$(top_srcdir)/src/lib/evas/cserve2 \
 @EVAS_CFLAGS@
@@ -632,7 +632,7 @@ else
 engineglcocoapkgdir = $(libdir)/evas/modules/engines/gl_cocoa/$(MODULE_ARCH)
 engineglcocoapkg_LTLIBRARIES = modules/evas/engines/gl_cocoa/module.la
 modules_evas_engines_gl_cocoa_module_la_SOURCES = $(GL_COCOA_SOURCES)
-modules_evas_engines_gl_cocoa_module_la_CPPFLAGS = \
+modules_evas_engines_gl_cocoa_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 -I$(top_srcdir)/src/lib/evas/cserve2 \
 -I$(top_srcdir)/src/modules/evas/engines/gl_common \
@@ -667,7 +667,7 @@ else
 engineglsdlpkgdir = $(libdir)/evas/modules/engines/gl_sdl/$(MODULE_ARCH)
 engineglsdlpkg_LTLIBRARIES = modules/evas/engines/gl_sdl/module.la
 modules_evas_engines_gl_sdl_module_la_SOURCES = $(GL_SDL_SOURCES)
-modules_evas_engines_gl_sdl_module_la_CPPFLAGS = \
+modules_evas_engines_gl_sdl_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 -I$(top_srcdir)/src/lib/evas/cserve2 \
 -I$(top_srcdir)/src/modules/evas/engines/gl_common \
@@ -706,7 +706,7 @@ else
 engineglx11pkgdir = $(libdir)/evas/modules/engines/gl_x11/$(MODULE_ARCH)
 engineglx11pkg_LTLIBRARIES = modules/evas/engines/gl_x11/module.la
 modules_evas_engines_gl_x11_module_la_SOURCES = $(GL_X11_SOURCES)
-modules_evas_engines_gl_x11_module_la_CPPFLAGS = \
+modules_evas_engines_gl_x11_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 -I$(top_srcdir)/src/lib/evas/cserve2 \
 -I$(top_srcdir)/src/modules/evas/engines/gl_common \
@@ -745,7 +745,7 @@ else
 enginepsl1ghtpkgdir = $(libdir)/evas/modules/engines/psl1ght/$(MODULE_ARCH)
 enginepsl1ghtpkg_LTLIBRARIES = modules/evas/engines/psl1ght/module.la
 modules_evas_engines_psl1ght_module_la_SOURCES = $(PSL1GHT_SOURCES)
-modules_evas_engines_psl1ght_module_la_CPPFLAGS = \
+modules_evas_engines_psl1ght_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 -I$(top_srcdir)/src/lib/evas/cserve2 \
 @EVAS_CFLAGS@ \
@@ -776,7 +776,7 @@ else
 enginesoftwareddrawpkgdir = $(libdir)/evas/modules/engines/software_ddraw/$(MODULE_ARCH)
 enginesoftwareddrawpkg_LTLIBRARIES = modules/evas/engines/software_ddraw/module.la
 modules_evas_engines_software_ddraw_module_la_SOURCES = $(SOFTWARE_DDRAW_SOURCES)
-modules_evas_engines_software_ddraw_module_la_CPPFLAGS = \
+modules_evas_engines_software_ddraw_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 -I$(top_srcdir)/src/lib/evas/cserve2 \
 @EVAS_CFLAGS@ \
@@ -807,7 +807,7 @@ else
 enginesoftwaregdipkgdir = $(libdir)/evas/modules/engines/software_gdi/$(MODULE_ARCH)
 enginesoftwaregdipkg_LTLIBRARIES = modules/evas/engines/software_gdi/module.la
 modules_evas_engines_software_gdi_module_la_SOURCES = $(SOFTWARE_GDI_SOURCES)
-modules_evas_engines_software_gdi_module_la_CPPFLAGS = \
+modules_evas_engines_software_gdi_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 -I$(top_srcdir)/src/lib/evas/cserve2 \
 @EVAS_CFLAGS@ \
@@ -828,7 +828,7 @@ modules/evas/engines/software_x11/evas_engine.c \
 modules/evas/engines/software_x11/evas_engine.h \
 modules/evas/engines/software_x11/evas_x_egl.c \
 modules/evas/engines/software_x11/evas_x_egl.h
-SOFTWARE_X11_CPPFLAGS = \
+SOFTWARE_X11_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 -I$(top_srcdir)/src/lib/evas/cserve2 \
 @EVAS_CFLAGS@
@@ -871,7 +871,7 @@ else
 enginesoftwarex11pkgdir = $(libdir)/evas/modules/engines/software_x11/$(MODULE_ARCH)
 enginesoftwarex11pkg_LTLIBRARIES = modules/evas/engines/software_x11/module.la
 modules_evas_engines_software_x11_module_la_SOURCES = $(SOFTWARE_X11_SOURCES)
-modules_evas_engines_software_x11_module_la_CPPFLAGS = $(SOFTWARE_X11_CPPFLAGS)
+modules_evas_engines_software_x11_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(SOFTWARE_X11_CPPFLAGS)
 modules_evas_engines_software_x11_module_la_LIBADD = @USE_EVAS_LIBS@ $(SOFTWARE_X11_LIBADD)
 modules_evas_engines_software_x11_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
 modules_evas_engines_software_x11_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
@@ -895,7 +895,7 @@ else
 enginewaylandeglpkgdir = $(libdir)/evas/modules/engines/wayland_egl/$(MODULE_ARCH)
 enginewaylandeglpkg_LTLIBRARIES = modules/evas/engines/wayland_egl/module.la
 modules_evas_engines_wayland_egl_module_la_SOURCES = $(WAYLAND_EGL_SOURCES)
-modules_evas_engines_wayland_egl_module_la_CPPFLAGS = \
+modules_evas_engines_wayland_egl_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 -I$(top_srcdir)/src/lib/evas/cserve2 \
 -I$(top_srcdir)/src/modules/evas/engines/gl_common \
@@ -931,7 +931,7 @@ else
 enginewaylandshmpkgdir = $(libdir)/evas/modules/engines/wayland_shm/$(MODULE_ARCH)
 enginewaylandshmpkg_LTLIBRARIES = modules/evas/engines/wayland_shm/module.la
 modules_evas_engines_wayland_shm_module_la_SOURCES = $(WAYLAND_SHM_SOURCES)
-modules_evas_engines_wayland_shm_module_la_CPPFLAGS = \
+modules_evas_engines_wayland_shm_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 -I$(top_srcdir)/src/lib/evas/cserve2 \
 @EVAS_CFLAGS@ \
@@ -956,7 +956,7 @@ else
 loaderbmppkgdir = $(libdir)/evas/modules/loaders/bmp/$(MODULE_ARCH)
 loaderbmppkg_LTLIBRARIES = modules/evas/loaders/bmp/module.la
 modules_evas_loaders_bmp_module_la_SOURCES = modules/evas/loaders/bmp/evas_image_load_bmp.c
-modules_evas_loaders_bmp_module_la_CPPFLAGS = \
+modules_evas_loaders_bmp_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 @EVAS_CFLAGS@ \
 @evas_image_loader_bmp_cflags@
@@ -978,7 +978,7 @@ else
 loadereetpkgdir = $(libdir)/evas/modules/loaders/eet/$(MODULE_ARCH)
 loadereetpkg_LTLIBRARIES = modules/evas/loaders/eet/module.la
 modules_evas_loaders_eet_module_la_SOURCES = modules/evas/loaders/eet/evas_image_load_eet.c
-modules_evas_loaders_eet_module_la_CPPFLAGS = \
+modules_evas_loaders_eet_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 @EVAS_CFLAGS@ \
 @evas_image_loader_eet_cflags@
@@ -1000,7 +1000,7 @@ else
 loadergenericpkgdir = $(libdir)/evas/modules/loaders/generic/$(MODULE_ARCH)
 loadergenericpkg_LTLIBRARIES = modules/evas/loaders/generic/module.la
 modules_evas_loaders_generic_module_la_SOURCES = modules/evas/loaders/generic/evas_image_load_generic.c
-modules_evas_loaders_generic_module_la_CPPFLAGS = \
+modules_evas_loaders_generic_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 @EVAS_CFLAGS@ \
 @evas_image_loader_generic_cflags@
@@ -1022,7 +1022,7 @@ else
 loadergifpkgdir = $(libdir)/evas/modules/loaders/gif/$(MODULE_ARCH)
 loadergifpkg_LTLIBRARIES = modules/evas/loaders/gif/module.la
 modules_evas_loaders_gif_module_la_SOURCES = modules/evas/loaders/gif/evas_image_load_gif.c
-modules_evas_loaders_gif_module_la_CPPFLAGS = \
+modules_evas_loaders_gif_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 @EVAS_CFLAGS@ \
 @evas_image_loader_gif_cflags@
@@ -1044,7 +1044,7 @@ else
 loadericopkgdir = $(libdir)/evas/modules/loaders/ico/$(MODULE_ARCH)
 loadericopkg_LTLIBRARIES = modules/evas/loaders/ico/module.la
 modules_evas_loaders_ico_module_la_SOURCES = modules/evas/loaders/ico/evas_image_load_ico.c
-modules_evas_loaders_ico_module_la_CPPFLAGS = \
+modules_evas_loaders_ico_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 @EVAS_CFLAGS@ \
 @evas_image_loader_ico_cflags@
@@ -1069,7 +1069,7 @@ else
 loaderjpegpkgdir = $(libdir)/evas/modules/loaders/jpeg/$(MODULE_ARCH)
 loaderjpegpkg_LTLIBRARIES = modules/evas/loaders/jpeg/module.la
 modules_evas_loaders_jpeg_module_la_SOURCES = modules/evas/loaders/jpeg/evas_image_load_jpeg.c
-modules_evas_loaders_jpeg_module_la_CPPFLAGS = \
+modules_evas_loaders_jpeg_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 @EVAS_CFLAGS@ \
 @evas_image_loader_jpeg_cflags@
@@ -1083,7 +1083,7 @@ if BUILD_SAVER_JPEG
 saverjpegpkgdir = $(libdir)/evas/modules/savers/jpeg/$(MODULE_ARCH)
 saverjpegpkg_LTLIBRARIES = modules/evas/savers/jpeg/module.la
 modules_evas_savers_jpeg_module_la_SOURCES = modules/evas/savers/jpeg/evas_image_save_jpeg.c
-modules_evas_savers_jpeg_module_la_CPPFLAGS = \
+modules_evas_savers_jpeg_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 @EVAS_CFLAGS@ \
 @evas_image_loader_jpeg_cflags@
@@ -1106,7 +1106,7 @@ else
 loaderpmapspkgdir = $(libdir)/evas/modules/loaders/pmaps/$(MODULE_ARCH)
 loaderpmapspkg_LTLIBRARIES = modules/evas/loaders/pmaps/module.la
 modules_evas_loaders_pmaps_module_la_SOURCES = modules/evas/loaders/pmaps/evas_image_load_pmaps.c
-modules_evas_loaders_pmaps_module_la_CPPFLAGS = \
+modules_evas_loaders_pmaps_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 @EVAS_CFLAGS@ \
 @evas_image_loader_pmaps_cflags@
@@ -1128,7 +1128,7 @@ else
 loaderpngpkgdir = $(libdir)/evas/modules/loaders/png/$(MODULE_ARCH)
 loaderpngpkg_LTLIBRARIES = modules/evas/loaders/png/module.la
 modules_evas_loaders_png_module_la_SOURCES = modules/evas/loaders/png/evas_image_load_png.c
-modules_evas_loaders_png_module_la_CPPFLAGS = \
+modules_evas_loaders_png_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 @EVAS_CFLAGS@ \
 @evas_image_loader_png_cflags@
@@ -1142,7 +1142,7 @@ modules_evas_loaders_png_module_la_LIBTOOLFLAGS = --tag=disable-static
 saverpngpkgdir = $(libdir)/evas/modules/savers/png/$(MODULE_ARCH)
 saverpngpkg_LTLIBRARIES = modules/evas/savers/png/module.la
 modules_evas_savers_png_module_la_SOURCES = modules/evas/savers/png/evas_image_save_png.c
-modules_evas_savers_png_module_la_CPPFLAGS = \
+modules_evas_savers_png_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 @EVAS_CFLAGS@ \
 @evas_image_loader_png_cflags@
@@ -1164,7 +1164,7 @@ else
 loaderpsdpkgdir = $(libdir)/evas/modules/loaders/psd/$(MODULE_ARCH)
 loaderpsdpkg_LTLIBRARIES = modules/evas/loaders/psd/module.la
 modules_evas_loaders_psd_module_la_SOURCES = modules/evas/loaders/psd/evas_image_load_psd.c
-modules_evas_loaders_psd_module_la_CPPFLAGS = \
+modules_evas_loaders_psd_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 @EVAS_CFLAGS@ \
 @evas_image_loader_psd_cflags@
@@ -1186,7 +1186,7 @@ else
 loadersvgpkgdir = $(libdir)/evas/modules/loaders/svg/$(MODULE_ARCH)
 loadersvgpkg_LTLIBRARIES = modules/evas/loaders/svg/module.la
 modules_evas_loaders_svg_module_la_SOURCES = modules/evas/loaders/svg/evas_image_load_esvg.c
-modules_evas_loaders_svg_module_la_CPPFLAGS = \
+modules_evas_loaders_svg_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 @EVAS_CFLAGS@ \
 @evas_image_loader_svg_cflags@
@@ -1208,7 +1208,7 @@ else
 loadertgapkgdir = $(libdir)/evas/modules/loaders/tga/$(MODULE_ARCH)
 loadertgapkg_LTLIBRARIES = modules/evas/loaders/tga/module.la
 modules_evas_loaders_tga_module_la_SOURCES = modules/evas/loaders/tga/evas_image_load_tga.c
-modules_evas_loaders_tga_module_la_CPPFLAGS = \
+modules_evas_loaders_tga_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 @EVAS_CFLAGS@ \
 @evas_image_loader_tga_cflags@
@@ -1230,7 +1230,7 @@ else
 loadertiffpkgdir = $(libdir)/evas/modules/loaders/tiff/$(MODULE_ARCH)
 loadertiffpkg_LTLIBRARIES = modules/evas/loaders/tiff/module.la
 modules_evas_loaders_tiff_module_la_SOURCES = modules/evas/loaders/tiff/evas_image_load_tiff.c
-modules_evas_loaders_tiff_module_la_CPPFLAGS = \
+modules_evas_loaders_tiff_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 @EVAS_CFLAGS@ \
 @evas_image_loader_tiff_cflags@
@@ -1244,7 +1244,7 @@ modules_evas_loaders_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static
 savertiffpkgdir = $(libdir)/evas/modules/savers/tiff/$(MODULE_ARCH)
 savertiffpkg_LTLIBRARIES = modules/evas/savers/tiff/module.la
 modules_evas_savers_tiff_module_la_SOURCES = modules/evas/savers/tiff/evas_image_save_tiff.c
-modules_evas_savers_tiff_module_la_CPPFLAGS = \
+modules_evas_savers_tiff_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 @EVAS_CFLAGS@ \
 @evas_image_loader_tiff_cflags@
@@ -1266,7 +1266,7 @@ else
 loaderwbmppkgdir = $(libdir)/evas/modules/loaders/wbmp/$(MODULE_ARCH)
 loaderwbmppkg_LTLIBRARIES = modules/evas/loaders/wbmp/module.la
 modules_evas_loaders_wbmp_module_la_SOURCES = modules/evas/loaders/wbmp/evas_image_load_wbmp.c
-modules_evas_loaders_wbmp_module_la_CPPFLAGS = \
+modules_evas_loaders_wbmp_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 @EVAS_CFLAGS@ \
 @evas_image_loader_wbmp_cflags@
@@ -1288,7 +1288,7 @@ else
 loaderwebppkgdir = $(libdir)/evas/modules/loaders/webp/$(MODULE_ARCH)
 loaderwebppkg_LTLIBRARIES = modules/evas/loaders/webp/module.la
 modules_evas_loaders_webp_module_la_SOURCES = modules/evas/loaders/webp/evas_image_load_webp.c
-modules_evas_loaders_webp_module_la_CPPFLAGS = \
+modules_evas_loaders_webp_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 @EVAS_CFLAGS@ \
 @evas_image_loader_webp_cflags@
@@ -1302,7 +1302,7 @@ modules_evas_loaders_webp_module_la_LIBTOOLFLAGS = --tag=disable-static
 saverwebppkgdir = $(libdir)/evas/modules/savers/webp/$(MODULE_ARCH)
 saverwebppkg_LTLIBRARIES = modules/evas/savers/webp/module.la
 modules_evas_savers_webp_module_la_SOURCES = modules/evas/savers/webp/evas_image_save_webp.c
-modules_evas_savers_webp_module_la_CPPFLAGS = \
+modules_evas_savers_webp_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 @EVAS_CFLAGS@ \
 @evas_image_loader_webp_cflags@
@@ -1324,7 +1324,7 @@ else
 loaderxpmpkgdir = $(libdir)/evas/modules/loaders/xpm/$(MODULE_ARCH)
 loaderxpmpkg_LTLIBRARIES = modules/evas/loaders/xpm/module.la
 modules_evas_loaders_xpm_module_la_SOURCES = modules/evas/loaders/xpm/evas_image_load_xpm.c
-modules_evas_loaders_xpm_module_la_CPPFLAGS = \
+modules_evas_loaders_xpm_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 @EVAS_CFLAGS@ \
 @evas_image_loader_xpm_cflags@
@@ -1369,7 +1369,7 @@ bin/evas/evas_cserve2_main_loop_linux.c \
 lib/evas/cserve2/evas_cs2_utils.h \
 lib/evas/cserve2/evas_cs2_utils.c
 
-bin_evas_evas_cserve2_CPPFLAGS = \
+bin_evas_evas_cserve2_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 -I$(top_srcdir)/src/lib/evas/cserve2 \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
@@ -1382,7 +1382,7 @@ bin_evas_evas_cserve2_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
 
 bin_evas_evas_cserve2_client_SOURCES = \
 bin/evas/evas_cserve2_client.c
-bin_evas_evas_cserve2_client_CPPFLAGS = \
+bin_evas_evas_cserve2_client_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/cserve2 \
 @EINA_CFLAGS@
 bin_evas_evas_cserve2_client_LDADD = @USE_EINA_LIBS@
@@ -1390,7 +1390,7 @@ bin_evas_evas_cserve2_client_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
 
 bin_evas_evas_cserve2_usage_SOURCES = \
 bin/evas/evas_cserve2_usage.c
-bin_evas_evas_cserve2_usage_CPPFLAGS = \
+bin_evas_evas_cserve2_usage_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/cserve2 \
 @EINA_CFLAGS@
 bin_evas_evas_cserve2_usage_LDADD = @USE_EINA_LIBS@
@@ -1398,7 +1398,7 @@ bin_evas_evas_cserve2_usage_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
 
 bin_evas_evas_cserve2_debug_SOURCES = \
 bin/evas/evas_cserve2_debug.c
-bin_evas_evas_cserve2_debug_CPPFLAGS = \
+bin_evas_evas_cserve2_debug_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/cserve2 \
 @EINA_CFLAGS@
 bin_evas_evas_cserve2_debug_LDADD = @USE_EINA_LIBS@
@@ -1408,7 +1408,7 @@ bin_evas_evas_cserve2_slave_SOURCES = \
 bin/evas/evas_cserve2_slave.c \
 bin/evas/evas_cserve2_utils.c
 
-bin_evas_evas_cserve2_slave_CPPFLAGS = \
+bin_evas_evas_cserve2_slave_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 -I$(top_srcdir)/src/lib/evas/cserve2 \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
@@ -1423,7 +1423,7 @@ bin_evas_evas_cserve2_slave_LDFLAGS = -export-dynamic
 bin_evas_dummy_slave_SOURCES = \
 bin/evas/dummy_slave.c
 
-bin_evas_dummy_slave_CPPFLAGS = \
+bin_evas_dummy_slave_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 -I$(top_srcdir)/src/lib/evas/cserve2 \
 @EVAS_CFLAGS@
@@ -1438,7 +1438,7 @@ if BUILD_LOADER_BMP
 cserve2bmppkgdir = $(libdir)/evas/cserve2/loaders/bmp/$(MODULE_ARCH)
 cserve2bmppkg_LTLIBRARIES = bin/evas/loaders/bmp/module.la
 bin_evas_loaders_bmp_module_la_SOURCES = bin/evas/loaders/bmp/evas_image_load_bmp.c
-bin_evas_loaders_bmp_module_la_CPPFLAGS = \
+bin_evas_loaders_bmp_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 -I$(top_srcdir)/src/lib/evas/cserve2 \
 -I$(top_srcdir)/src/bin/evas \
@@ -1454,7 +1454,7 @@ if BUILD_LOADER_EET
 cserve2eetpkgdir = $(libdir)/evas/cserve2/loaders/eet/$(MODULE_ARCH)
 cserve2eetpkg_LTLIBRARIES = bin/evas/loaders/eet/module.la
 bin_evas_loaders_eet_module_la_SOURCES = bin/evas/loaders/eet/evas_image_load_eet.c
-bin_evas_loaders_eet_module_la_CPPFLAGS = \
+bin_evas_loaders_eet_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 -I$(top_srcdir)/src/lib/evas/cserve2 \
 -I$(top_srcdir)/src/bin/evas \
@@ -1475,7 +1475,7 @@ if BUILD_LOADER_ICO
 cserve2icopkgdir = $(libdir)/evas/cserve2/loaders/ico/$(MODULE_ARCH)
 cserve2icopkg_LTLIBRARIES = bin/evas/loaders/ico/module.la
 bin_evas_loaders_ico_module_la_SOURCES = bin/evas/loaders/ico/evas_image_load_ico.c
-bin_evas_loaders_ico_module_la_CPPFLAGS = \
+bin_evas_loaders_ico_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 -I$(top_srcdir)/src/lib/evas/cserve2 \
 -I$(top_srcdir)/src/bin/evas \
@@ -1491,7 +1491,7 @@ if BUILD_LOADER_JPEG
 cserve2jpegpkgdir = $(libdir)/evas/cserve2/loaders/jpeg/$(MODULE_ARCH)
 cserve2jpegpkg_LTLIBRARIES = bin/evas/loaders/jpeg/module.la
 bin_evas_loaders_jpeg_module_la_SOURCES = bin/evas/loaders/jpeg/evas_image_load_jpeg.c
-bin_evas_loaders_jpeg_module_la_CPPFLAGS = \
+bin_evas_loaders_jpeg_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 -I$(top_srcdir)/src/lib/evas/cserve2 \
 -I$(top_srcdir)/src/bin/evas \
@@ -1507,7 +1507,7 @@ if BUILD_LOADER_PMAPS
 cserve2pmapspkgdir = $(libdir)/evas/cserve2/loaders/pmaps/$(MODULE_ARCH)
 cserve2pmapspkg_LTLIBRARIES = bin/evas/loaders/pmaps/module.la
 bin_evas_loaders_pmaps_module_la_SOURCES = bin/evas/loaders/pmaps/evas_image_load_pmaps.c
-bin_evas_loaders_pmaps_module_la_CPPFLAGS = \
+bin_evas_loaders_pmaps_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/bin/evas \
 -I$(top_srcdir)/src/lib/evas/include \
 -I$(top_srcdir)/src/lib/evas/cserve2 \
@@ -1523,7 +1523,7 @@ if BUILD_LOADER_PNG
 cserve2pngpkgdir = $(libdir)/evas/cserve2/loaders/png/$(MODULE_ARCH)
 cserve2pngpkg_LTLIBRARIES = bin/evas/loaders/png/module.la
 bin_evas_loaders_png_module_la_SOURCES = bin/evas/loaders/png/evas_image_load_png.c
-bin_evas_loaders_png_module_la_CPPFLAGS = \
+bin_evas_loaders_png_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 -I$(top_srcdir)/src/lib/evas/cserve2 \
 -I$(top_srcdir)/src/bin/evas \
@@ -1539,7 +1539,7 @@ if BUILD_LOADER_PSD
 cserve2psdpkgdir = $(libdir)/evas/cserve2/loaders/psd/$(MODULE_ARCH)
 cserve2psdpkg_LTLIBRARIES = bin/evas/loaders/psd/module.la
 bin_evas_loaders_psd_module_la_SOURCES = bin/evas/loaders/psd/evas_image_load_psd.c
-bin_evas_loaders_psd_module_la_CPPFLAGS = \
+bin_evas_loaders_psd_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 -I$(top_srcdir)/src/lib/evas/cserve2 \
 -I$(top_srcdir)/src/bin/evas \
@@ -1555,7 +1555,7 @@ if BUILD_LOADER_TGA
 cserve2tgapkgdir = $(libdir)/evas/cserve2/loaders/tga/$(MODULE_ARCH)
 cserve2tgapkg_LTLIBRARIES = bin/evas/loaders/tga/module.la
 bin_evas_loaders_tga_module_la_SOURCES = bin/evas/loaders/tga/evas_image_load_tga.c
-bin_evas_loaders_tga_module_la_CPPFLAGS = \
+bin_evas_loaders_tga_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 -I$(top_srcdir)/src/lib/evas/cserve2 \
 -I$(top_srcdir)/src/bin/evas \
@@ -1571,7 +1571,7 @@ if BUILD_LOADER_TIFF
 cserve2tiffpkgdir = $(libdir)/evas/cserve2/loaders/tiff/$(MODULE_ARCH)
 cserve2tiffpkg_LTLIBRARIES = bin/evas/loaders/tiff/module.la
 bin_evas_loaders_tiff_module_la_SOURCES = bin/evas/loaders/tiff/evas_image_load_tiff.c
-bin_evas_loaders_tiff_module_la_CPPFLAGS = \
+bin_evas_loaders_tiff_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 -I$(top_srcdir)/src/lib/evas/cserve2 \
 -I$(top_srcdir)/src/bin/evas \
@@ -1587,7 +1587,7 @@ if BUILD_LOADER_WBMP
 cserve2wbmppkgdir = $(libdir)/evas/cserve2/loaders/wbmp/$(MODULE_ARCH)
 cserve2wbmppkg_LTLIBRARIES = bin/evas/loaders/wbmp/module.la
 bin_evas_loaders_wbmp_module_la_SOURCES = bin/evas/loaders/wbmp/evas_image_load_wbmp.c
-bin_evas_loaders_wbmp_module_la_CPPFLAGS = \
+bin_evas_loaders_wbmp_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 -I$(top_srcdir)/src/lib/evas/cserve2 \
 -I$(top_srcdir)/src/bin/evas \
@@ -1603,7 +1603,7 @@ if BUILD_LOADER_WEBP
 cserve2webppkgdir = $(libdir)/evas/cserve2/loaders/webp/$(MODULE_ARCH)
 cserve2webppkg_LTLIBRARIES = bin/evas/loaders/webp/module.la
 bin_evas_loaders_webp_module_la_SOURCES = bin/evas/loaders/webp/evas_image_load_webp.c
-bin_evas_loaders_webp_module_la_CPPFLAGS = \
+bin_evas_loaders_webp_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 -I$(top_srcdir)/src/lib/evas/cserve2 \
 -I$(top_srcdir)/src/bin/evas \
@@ -1619,7 +1619,7 @@ if BUILD_LOADER_XPM
 cserve2xpmpkgdir = $(libdir)/evas/cserve2/loaders/xpm/$(MODULE_ARCH)
 cserve2xpmpkg_LTLIBRARIES = bin/evas/loaders/xpm/module.la
 bin_evas_loaders_xpm_module_la_SOURCES = bin/evas/loaders/xpm/evas_image_load_xpm.c
-bin_evas_loaders_xpm_module_la_CPPFLAGS = \
+bin_evas_loaders_xpm_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \
 -I$(top_srcdir)/src/lib/evas/cserve2 \
 -I$(top_srcdir)/src/bin/evas \
@@ -1650,7 +1650,7 @@ tests/evas/evas_test_render_engines.c \
 tests/evas/evas_tests_helpers.h \
 tests/evas/evas_suite.h
 
-tests_evas_evas_suite_CPPFLAGS = \
+tests_evas_evas_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/evas\" \
 -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/evas\" \
 @CHECK_CFLAGS@ \
diff --git a/src/Makefile_Evil.am b/src/Makefile_Evil.am
index 8a8944e62..af8512b85 100644
--- a/src/Makefile_Evil.am
+++ b/src/Makefile_Evil.am
@@ -108,7 +108,7 @@ endif
 
 lib_evil_libdl_la_SOURCES = lib/evil/dlfcn.c
 
-lib_evil_libdl_la_CPPFLAGS = \
+lib_evil_libdl_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
 @EVIL_CFLAGS@ \
 @EVIL_DLFCN_CPPFLAGS@
 lib_evil_libdl_la_LIBADD = \
@@ -150,7 +150,7 @@ bin_evil_evil_suite_SOURCES +=  bin/evil/memcpy_glibc_arm.S
 #suite_SOURCES +=  bin/evil/memcpy_glibc_i686.S # see EXTRA_DIST below!
 endif
 
-bin_evil_evil_suite_CPPFLAGS = @EVIL_CFLAGS@
+bin_evil_evil_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EVIL_CFLAGS@
 bin_evil_evil_suite_LDADD = @USE_EVIL_LIBS@ @DL_LIBS@ -lm
 
 bin_evil_test_evil_SOURCES = bin/evil/test_evil.c
diff --git a/src/lib/ecore/Ecore.h b/src/lib/ecore/Ecore.h
index 5f6f8bdb9..1dad67965 100644
--- a/src/lib/ecore/Ecore.h
+++ b/src/lib/ecore/Ecore.h
@@ -281,6 +281,8 @@
 #ifndef _ECORE_H
 #define _ECORE_H
 
+#include <Efl_Config.h>
+
 #ifdef _MSC_VER
 # include <Evil.h>
 #endif
diff --git a/src/lib/efl/Efl_Config.h.in b/src/lib/efl/Efl_Config.h.in
new file mode 100644
index 000000000..30c18aef2
--- /dev/null
+++ b/src/lib/efl/Efl_Config.h.in
@@ -0,0 +1,6 @@
+#ifndef EFL_CONFIG_H
+#define EFL_CONFIG_H
+
+#define XYXYXY 1
+
+#endif