diff --git a/legacy/eina/configure.ac b/legacy/eina/configure.ac
index 54383e24fb..dc6f6e69e2 100644
--- a/legacy/eina/configure.ac
+++ b/legacy/eina/configure.ac
@@ -28,6 +28,8 @@ AC_SUBST(version_info)
 
 ### Needed information
 
+requirement_eina=""
+
 release="ver-pre-svn-04"
 case "$host_os" in
    mingw32ce* | cegcc*)
@@ -192,6 +194,14 @@ AC_PROG_CC
 # pkg-config
 PKG_PROG_PKG_CONFIG
 
+# Check whether pkg-config supports Requires.private
+if $PKG_CONFIG --atleast-pkgconfig-version 0.22; then
+   pkgconfig_requires_private="Requires.private"
+else
+   pkgconfig_requires_private="Requires"
+fi
+AC_SUBST(pkgconfig_requires_private)
+
 # doxygen program for documentation building
 
 EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
@@ -201,12 +211,16 @@ EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
 
 # Evil library for compilation on Windows CE
 
+EFL_EINA_BUILD=""
 case "$host_os" in
    mingw* | cegcc*)
-   PKG_CHECK_MODULES([EVIL], [evil])
-   AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if evil package is installed])
+      PKG_CHECK_MODULES([EVIL], [evil])
+      AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if evil package is installed])
+      requirement_eina="evil"
+      EFL_EINA_BUILD="-DEFL_EINA_BUILD"
    ;;
 esac
+AC_SUBST(EFL_EINA_BUILD)
 
 # Check ememoa memory pool library
 
@@ -313,7 +327,6 @@ EINA_LIBS=
 lt_enable_auto_import=""
 case "${host_os}" in
    mingw* | cegcc*)
-      AC_DEFINE(EFL_EINA_BUILD, 1, [Define to mention that eina is built])
       EINA_LIBS="-ldl ${EVIL_LIBS} -lm"
       lt_enable_auto_import="-Wl,--enable-auto-import"
    ;;
diff --git a/legacy/eina/eina-0.pc.in b/legacy/eina/eina-0.pc.in
index 28108a634e..e28741a0c2 100644
--- a/legacy/eina/eina-0.pc.in
+++ b/legacy/eina/eina-0.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: Eina
 Description: A Library that implements fast data types and miscellaneous tools
-Requires:
+@pkgconfig_requires_private@: @requirement_eina@
 Version: @VERSION@
 Libs: -L${exec_prefix}/lib -leina
 Libs.private: -ldl
diff --git a/legacy/eina/eina.pc.in b/legacy/eina/eina.pc.in
index 0548fe4d7e..6089ac6bce 100644
--- a/legacy/eina/eina.pc.in
+++ b/legacy/eina/eina.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: Eina
 Description: Eina
-Requires: 
+@pkgconfig_requires_private@: @requirement_eina@
 Version: @VERSION@
 Libs: -L${libdir} -leina
 Libs.private: -ldl
diff --git a/legacy/eina/src/lib/Makefile.am b/legacy/eina/src/lib/Makefile.am
index 01d73caf73..fa39609c4e 100644
--- a/legacy/eina/src/lib/Makefile.am
+++ b/legacy/eina/src/lib/Makefile.am
@@ -7,7 +7,8 @@ AM_CPPFLAGS = \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-@EINA_CPPFLAGS@
+@EINA_CPPFLAGS@ \
+@EFL_EINA_BUILD@
 
 base_sources = \
 eina_error.c \
diff --git a/legacy/eina/src/modules/mp/chained_pool/Makefile.am b/legacy/eina/src/modules/mp/chained_pool/Makefile.am
index ffcea5bff0..f14f7e34bd 100644
--- a/legacy/eina/src/modules/mp/chained_pool/Makefile.am
+++ b/legacy/eina/src/modules/mp/chained_pool/Makefile.am
@@ -4,7 +4,8 @@ AM_CPPFLAGS = \
 -I. \
 -I$(top_srcdir)/src/include \
 -I$(top_builddir)/src/include \
-@EINA_CPPFLAGS@
+@EINA_CPPFLAGS@ \
+@EFL_EINA_BUILD@
 
 if EINA_BUILD_CHAINED_POOL
 if !EINA_STATIC_BUILD_CHAINED_POOL
diff --git a/legacy/eina/src/modules/mp/ememoa_fixed/Makefile.am b/legacy/eina/src/modules/mp/ememoa_fixed/Makefile.am
index 9d264fda21..ff5b57f3a9 100644
--- a/legacy/eina/src/modules/mp/ememoa_fixed/Makefile.am
+++ b/legacy/eina/src/modules/mp/ememoa_fixed/Makefile.am
@@ -6,7 +6,8 @@ AM_CPPFLAGS = \
 -I$(top_builddir)/src/include \
 @EINA_CPPFLAGS@ \
 @EINA_CFLAGS@ \
-@EMEMOA_CFLAGS@
+@EMEMOA_CFLAGS@ \
+@EFL_EINA_BUILD@
 
 if EINA_BUILD_EMEMOA_FIXED
 if !EINA_STATIC_BUILD_EMEMOA_FIXED
diff --git a/legacy/eina/src/modules/mp/ememoa_unknown/Makefile.am b/legacy/eina/src/modules/mp/ememoa_unknown/Makefile.am
index d593d90a20..879d8ce644 100644
--- a/legacy/eina/src/modules/mp/ememoa_unknown/Makefile.am
+++ b/legacy/eina/src/modules/mp/ememoa_unknown/Makefile.am
@@ -6,7 +6,8 @@ AM_CPPFLAGS = \
 -I$(top_builddir)/src/include \
 @EINA_CPPFLAGS@ \
 @EINA_CFLAGS@ \
-@EMEMOA_CFLAGS@
+@EMEMOA_CFLAGS@ \
+@EFL_EINA_BUILD@
 
 if EINA_BUILD_EMEMOA_UNKNOWN
 if !EINA_STATIC_BUILD_EMEMOA_UNKNOWN
diff --git a/legacy/eina/src/modules/mp/fixed_bitmap/Makefile.am b/legacy/eina/src/modules/mp/fixed_bitmap/Makefile.am
index 87b9397f35..eaad65f176 100644
--- a/legacy/eina/src/modules/mp/fixed_bitmap/Makefile.am
+++ b/legacy/eina/src/modules/mp/fixed_bitmap/Makefile.am
@@ -5,7 +5,8 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/include \
 -I$(top_builddir)/src/include \
 @EINA_CPPFLAGS@ \
-@EINA_CFLAGS@
+@EINA_CFLAGS@ \
+@EFL_EINA_BUILD@
 
 if EINA_BUILD_FIXED_BITMAP
 if !EINA_STATIC_BUILD_FIXED_BITMAP
diff --git a/legacy/eina/src/modules/mp/pass_through/Makefile.am b/legacy/eina/src/modules/mp/pass_through/Makefile.am
index b630492255..4ce8f3736b 100644
--- a/legacy/eina/src/modules/mp/pass_through/Makefile.am
+++ b/legacy/eina/src/modules/mp/pass_through/Makefile.am
@@ -5,7 +5,8 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/include \
 -I$(top_builddir)/src/include \
 @EINA_CPPFLAGS@ \
-@EINA_CFLAGS@
+@EINA_CFLAGS@ \
+@EFL_EINA_BUILD@
 
 if EINA_BUILD_PASS_THROUGH
 if !EINA_STATIC_BUILD_PASS_THROUGH