diff --git a/legacy/evas/configure.ac b/legacy/evas/configure.ac
index c4cf192164..f76c784b9b 100644
--- a/legacy/evas/configure.ac
+++ b/legacy/evas/configure.ac
@@ -62,6 +62,8 @@ AC_SUBST(version_info)
 AC_SUBST(release_info)
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
+VMAJ=v_maj
+AC_SUBST(VMAJ)
 
 EFL_CHECK_PATH_MAX
 
diff --git a/legacy/evas/evas.pc.in b/legacy/evas/evas.pc.in
index f443bae42d..70755edfd1 100644
--- a/legacy/evas/evas.pc.in
+++ b/legacy/evas/evas.pc.in
@@ -9,4 +9,4 @@ Description: Evas canvas display library
 Version: @VERSION@
 Libs: -L${libdir} -levas
 Libs.private: @EFL_FNMATCH_LIBS@ @pthread_libs@
-Cflags: -I${includedir}
+Cflags: -I${includedir}/evas-@VMAJ@
diff --git a/legacy/evas/src/lib/Makefile.am b/legacy/evas/src/lib/Makefile.am
index d357f4e4d5..d80c8b87ef 100644
--- a/legacy/evas/src/lib/Makefile.am
+++ b/legacy/evas/src/lib/Makefile.am
@@ -176,7 +176,8 @@ AM_CFLAGS = @WIN32_CFLAGS@
 
 lib_LTLIBRARIES = libevas.la
 
-include_HEADERS = Evas.h
+includes_HEADERS = Evas.h
+includesdir = $(includedir)/evas-@VMAJ@
 
 libevas_la_SOURCES = main.c
 
diff --git a/legacy/evas/src/modules/engines/buffer/Makefile.am b/legacy/evas/src/modules/engines/buffer/Makefile.am
index 371eabd4a0..45d92cd714 100644
--- a/legacy/evas/src/modules/engines/buffer/Makefile.am
+++ b/legacy/evas/src/modules/engines/buffer/Makefile.am
@@ -19,7 +19,8 @@ evas_outbuf.c
 
 pkgdir = $(libdir)/evas/modules/engines/buffer/$(MODULE_ARCH)
 
-include_HEADERS = Evas_Engine_Buffer.h
+includes_HEADERS = Evas_Engine_Buffer.h
+includesdir = $(includedir)/evas-@VMAJ@
 
 if !EVAS_STATIC_BUILD_BUFFER
 
diff --git a/legacy/evas/src/modules/engines/cairo_x11/Makefile.am b/legacy/evas/src/modules/engines/cairo_x11/Makefile.am
index e861db2d94..33153ffcd9 100644
--- a/legacy/evas/src/modules/engines/cairo_x11/Makefile.am
+++ b/legacy/evas/src/modules/engines/cairo_x11/Makefile.am
@@ -20,7 +20,8 @@ CAIRO_X11_LIBADD = @evas_engine_cairo_x11_libs@ $(top_builddir)/src/modules/engi
 
 pkgdir = $(libdir)/evas/modules/engines/cairo_x11/$(MODULE_ARCH)
 
-include_HEADERS = Evas_Engine_Cairo_X11.h
+includes_HEADERS = Evas_Engine_Cairo_X11.h
+includesdir = $(includedir)/evas-@VMAJ@
 
 if !EVAS_STATIC_BUILD_CAIRO_X11
 
diff --git a/legacy/evas/src/modules/engines/direct3d/Makefile.am b/legacy/evas/src/modules/engines/direct3d/Makefile.am
index 6b1412d95b..58474947a5 100644
--- a/legacy/evas/src/modules/engines/direct3d/Makefile.am
+++ b/legacy/evas/src/modules/engines/direct3d/Makefile.am
@@ -31,7 +31,8 @@ DIRECT3D_LIBADD = @evas_engine_direct3d_libs@
 
 pkgdir = $(libdir)/evas/modules/engines/direct3d/$(MODULE_ARCH)
 
-include_HEADERS = Evas_Engine_Direct3D.h
+includes_HEADERS = Evas_Engine_Direct3D.h
+includesdir = $(includedir)/evas-@VMAJ@
 
 if !EVAS_STATIC_BUILD_DIRECT3D
 
diff --git a/legacy/evas/src/modules/engines/directfb/Makefile.am b/legacy/evas/src/modules/engines/directfb/Makefile.am
index c4b7a5e0c2..ff571b564d 100644
--- a/legacy/evas/src/modules/engines/directfb/Makefile.am
+++ b/legacy/evas/src/modules/engines/directfb/Makefile.am
@@ -19,7 +19,8 @@ DIRECTFB_LIBADD = @evas_engine_directfb_libs@
 
 pkgdir = $(libdir)/evas/modules/engines/directfb/$(MODULE_ARCH)
 
-include_HEADERS = Evas_Engine_DirectFB.h
+includes_HEADERS = Evas_Engine_DirectFB.h
+includesdir = $(includedir)/evas-@VMAJ@
 
 if !EVAS_STATIC_BUILD_DIRECTFB
 
diff --git a/legacy/evas/src/modules/engines/fb/Makefile.am b/legacy/evas/src/modules/engines/fb/Makefile.am
index 677977387d..58c70ca4a2 100644
--- a/legacy/evas/src/modules/engines/fb/Makefile.am
+++ b/legacy/evas/src/modules/engines/fb/Makefile.am
@@ -21,7 +21,8 @@ FB_LIBADD = @evas_engine_fb_libs@
 
 pkgdir = $(libdir)/evas/modules/engines/fb/$(MODULE_ARCH)
 
-include_HEADERS = Evas_Engine_FB.h
+includes_HEADERS = Evas_Engine_FB.h
+includesdir = $(includedir)/evas-@VMAJ@
 
 if !EVAS_STATIC_BUILD_FB
 
diff --git a/legacy/evas/src/modules/engines/gl_glew/Makefile.am b/legacy/evas/src/modules/engines/gl_glew/Makefile.am
index 938429a341..2042b4a64d 100644
--- a/legacy/evas/src/modules/engines/gl_glew/Makefile.am
+++ b/legacy/evas/src/modules/engines/gl_glew/Makefile.am
@@ -20,7 +20,8 @@ GL_GLEW_LIBADD = @evas_engine_gl_glew_libs@ $(top_builddir)/src/modules/engines/
 
 pkgdir = $(libdir)/evas/modules/engines/gl_glew/$(MODULE_ARCH)
 
-include_HEADERS = Evas_Engine_GL_Glew.h
+includes_HEADERS = Evas_Engine_GL_Glew.h
+includesdir = $(includedir)/evas-@VMAJ@
 
 if !EVAS_STATIC_BUILD_GL_GLEW
 
diff --git a/legacy/evas/src/modules/engines/gl_sdl/Makefile.am b/legacy/evas/src/modules/engines/gl_sdl/Makefile.am
index b275538d87..4af0ed5534 100644
--- a/legacy/evas/src/modules/engines/gl_sdl/Makefile.am
+++ b/legacy/evas/src/modules/engines/gl_sdl/Makefile.am
@@ -19,7 +19,8 @@ GL_SDL_LIBADD = @evas_engine_gl_sdl_libs@ $(top_builddir)/src/modules/engines/gl
 
 pkgdir = $(libdir)/evas/modules/engines/gl_sdl/$(MODULE_ARCH)
 
-include_HEADERS = Evas_Engine_GL_SDL.h
+includes_HEADERS = Evas_Engine_GL_SDL.h
+includesdir = $(includedir)/evas-@VMAJ@
 
 if !EVAS_STATIC_BUILD_GL_SDL
 
diff --git a/legacy/evas/src/modules/engines/gl_x11/Makefile.am b/legacy/evas/src/modules/engines/gl_x11/Makefile.am
index 7421af217e..de391da991 100644
--- a/legacy/evas/src/modules/engines/gl_x11/Makefile.am
+++ b/legacy/evas/src/modules/engines/gl_x11/Makefile.am
@@ -20,7 +20,8 @@ GL_X11_LIBADD = @evas_engine_gl_x11_libs@ $(top_builddir)/src/modules/engines/gl
 
 pkgdir = $(libdir)/evas/modules/engines/gl_x11/$(MODULE_ARCH)
 
-include_HEADERS = Evas_Engine_GL_X11.h
+includes_HEADERS = Evas_Engine_GL_X11.h
+includesdir = $(includedir)/evas-@VMAJ@
 
 if !EVAS_STATIC_BUILD_GL_X11
 
diff --git a/legacy/evas/src/modules/engines/quartz/Makefile.am b/legacy/evas/src/modules/engines/quartz/Makefile.am
index 597e45498a..df92e177e2 100644
--- a/legacy/evas/src/modules/engines/quartz/Makefile.am
+++ b/legacy/evas/src/modules/engines/quartz/Makefile.am
@@ -16,7 +16,8 @@ QUARTZ_LIBADD = @evas_engine_quartz_libs@
 
 pkgdir = $(libdir)/evas/modules/engines/quartz/$(MODULE_ARCH)
 
-include_HEADERS = Evas_Engine_Quartz.h
+includes_HEADERS = Evas_Engine_Quartz.h
+includesdir = $(includedir)/evas-@VMAJ@
 
 if !EVAS_STATIC_BUILD_QUARTZ
 
diff --git a/legacy/evas/src/modules/engines/software_16_ddraw/Makefile.am b/legacy/evas/src/modules/engines/software_16_ddraw/Makefile.am
index 321227cca5..c07569144a 100644
--- a/legacy/evas/src/modules/engines/software_16_ddraw/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_16_ddraw/Makefile.am
@@ -22,7 +22,8 @@ SOFTWARE_16_DDRAW_LIBADD = @evas_engine_software_16_ddraw_libs@
 
 pkgdir = $(libdir)/evas/modules/engines/software_16_ddraw/$(MODULE_ARCH)
 
-include_HEADERS = Evas_Engine_Software_16_DDraw.h
+includes_HEADERS = Evas_Engine_Software_16_DDraw.h
+includesdir = $(includedir)/evas-@VMAJ@
 
 if !EVAS_STATIC_BUILD_SOFTWARE_16_DDRAW
 
diff --git a/legacy/evas/src/modules/engines/software_16_sdl/Makefile.am b/legacy/evas/src/modules/engines/software_16_sdl/Makefile.am
index 75ee7091f5..bcaa15b953 100644
--- a/legacy/evas/src/modules/engines/software_16_sdl/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_16_sdl/Makefile.am
@@ -12,7 +12,8 @@ evas_engine.h
 
 pkgdir = $(libdir)/evas/modules/engines/software_16_sdl/$(MODULE_ARCH)
 
-include_HEADERS = Evas_Engine_SDL_16.h
+includes_HEADERS = Evas_Engine_SDL_16.h
+includesdir = $(includedir)/evas-@VMAJ@
 
 if !EVAS_STATIC_BUILD_SOFTWARE_SDL
 
diff --git a/legacy/evas/src/modules/engines/software_16_wince/Makefile.am b/legacy/evas/src/modules/engines/software_16_wince/Makefile.am
index 8c7d780ca2..984b418337 100644
--- a/legacy/evas/src/modules/engines/software_16_wince/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_16_wince/Makefile.am
@@ -24,7 +24,8 @@ SOFTWARE_16_WINCE_LIBADD = @evas_engine_software_16_wince_libs@
 
 pkgdir = $(libdir)/evas/modules/engines/software_16_wince/$(MODULE_ARCH)
 
-include_HEADERS = Evas_Engine_Software_16_WinCE.h
+includes_HEADERS = Evas_Engine_Software_16_WinCE.h
+includesdir = $(includedir)/evas-@VMAJ@
 
 if !EVAS_STATIC_BUILD_SOFTWARE_16_WINCE
 
diff --git a/legacy/evas/src/modules/engines/software_16_x11/Makefile.am b/legacy/evas/src/modules/engines/software_16_x11/Makefile.am
index 45106ed34b..979f31578d 100644
--- a/legacy/evas/src/modules/engines/software_16_x11/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_16_x11/Makefile.am
@@ -21,7 +21,8 @@ SOFTWARE_16_X11_LIBADD = @evas_engine_software_16_x11_libs@
 
 pkgdir = $(libdir)/evas/modules/engines/software_16_x11/$(MODULE_ARCH)
 
-include_HEADERS = Evas_Engine_Software_16_X11.h
+includes_HEADERS = Evas_Engine_Software_16_X11.h
+includesdir = $(includedir)/evas-@VMAJ@
 
 if !EVAS_STATIC_BUILD_SOFTWARE_16_X11
 
diff --git a/legacy/evas/src/modules/engines/software_ddraw/Makefile.am b/legacy/evas/src/modules/engines/software_ddraw/Makefile.am
index 5a3a2664ee..440e291b88 100644
--- a/legacy/evas/src/modules/engines/software_ddraw/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_ddraw/Makefile.am
@@ -22,7 +22,8 @@ SOFTWARE_DDRAW_LIBADD = @evas_engine_software_ddraw_libs@
 
 pkgdir = $(libdir)/evas/modules/engines/software_ddraw/$(MODULE_ARCH)
 
-include_HEADERS = Evas_Engine_Software_DDraw.h
+includes_HEADERS = Evas_Engine_Software_DDraw.h
+includesdir = $(includedir)/evas-@VMAJ@
 
 if !EVAS_STATIC_BUILD_SOFTWARE_DDRAW
 
diff --git a/legacy/evas/src/modules/engines/software_gdi/Makefile.am b/legacy/evas/src/modules/engines/software_gdi/Makefile.am
index 35c4bc89f0..dfebabe522 100644
--- a/legacy/evas/src/modules/engines/software_gdi/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_gdi/Makefile.am
@@ -22,7 +22,8 @@ SOFTWARE_GDI_LIBADD = @evas_engine_software_gdi_libs@
 
 pkgdir = $(libdir)/evas/modules/engines/software_gdi/$(MODULE_ARCH)
 
-include_HEADERS = Evas_Engine_Software_Gdi.h
+includes_HEADERS = Evas_Engine_Software_Gdi.h
+includesdir = $(includedir)/evas-@VMAJ@
 
 if !EVAS_STATIC_BUILD_SOFTWARE_GDI
 
diff --git a/legacy/evas/src/modules/engines/software_qtopia/Makefile.am b/legacy/evas/src/modules/engines/software_qtopia/Makefile.am
index a8ac9000d4..a4202a9b53 100644
--- a/legacy/evas/src/modules/engines/software_qtopia/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_qtopia/Makefile.am
@@ -23,7 +23,8 @@ SOFTWARE_QTOPIA_LIBADD = @evas_engine_software_qtopia_libs@
 
 pkgdir = $(libdir)/evas/modules/engines/software_qtopia/$(MODULE_ARCH)
 
-include_HEADERS = Evas_Engine_Software_Qtopia.h
+includes_HEADERS = Evas_Engine_Software_Qtopia.h
+includesdir = $(includedir)/evas-@VMAJ@
 
 if !EVAS_STATIC_BUILD_SOFTWARE_QTOPIA
 
diff --git a/legacy/evas/src/modules/engines/software_sdl/Makefile.am b/legacy/evas/src/modules/engines/software_sdl/Makefile.am
index 8f075c34dc..4e3e386ecd 100644
--- a/legacy/evas/src/modules/engines/software_sdl/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_sdl/Makefile.am
@@ -19,7 +19,8 @@ SOFTWARE_SDL_LIBADD = @evas_engine_software_sdl_libs@
 
 pkgdir = $(libdir)/evas/modules/engines/software_sdl/$(MODULE_ARCH)
 
-include_HEADERS = Evas_Engine_SDL.h
+includes_HEADERS = Evas_Engine_SDL.h
+includesdir = $(includedir)/evas-@VMAJ@
 
 if !EVAS_STATIC_BUILD_SOFTWARE_SDL
 
diff --git a/legacy/evas/src/modules/engines/software_x11/Makefile.am b/legacy/evas/src/modules/engines/software_x11/Makefile.am
index 8d7ae13bf6..7e20f2dd2e 100644
--- a/legacy/evas/src/modules/engines/software_x11/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_x11/Makefile.am
@@ -39,7 +39,8 @@ endif
 
 pkgdir = $(libdir)/evas/modules/engines/software_x11/$(MODULE_ARCH)
 
-include_HEADERS = Evas_Engine_Software_X11.h
+includes_HEADERS = Evas_Engine_Software_X11.h
+includesdir = $(includedir)/evas-@VMAJ@
 
 if !EVAS_STATIC_BUILD_SOFTWARE_X11
 
diff --git a/legacy/evas/src/modules/engines/xrender_x11/Makefile.am b/legacy/evas/src/modules/engines/xrender_x11/Makefile.am
index 83d1a7739e..54ba3c0841 100644
--- a/legacy/evas/src/modules/engines/xrender_x11/Makefile.am
+++ b/legacy/evas/src/modules/engines/xrender_x11/Makefile.am
@@ -36,7 +36,8 @@ XRENDER_X11_LIBADD = @evas_engine_xrender_xcb_libs@ @evas_engine_xrender_x11_lib
 
 pkgdir = $(libdir)/evas/modules/engines/xrender_x11/$(MODULE_ARCH)
 
-include_HEADERS = Evas_Engine_XRender_X11.h
+includes_HEADERS = Evas_Engine_XRender_X11.h
+includesdir = $(includedir)/evas-@VMAJ@
 
 if !EVAS_STATIC_BUILD_XRENDER_X11