diff --git a/legacy/evas/configure.ac b/legacy/evas/configure.ac
index 0a97d3a036..2998484b90 100644
--- a/legacy/evas/configure.ac
+++ b/legacy/evas/configure.ac
@@ -243,6 +243,20 @@ case "$host_os" in
    ;;
 esac
 
+### Checks for portability layer
+
+PKG_CHECK_MODULES([EXOTIC],
+   [exotic],
+   [enable_exotic="yes"],
+   [enable_exotic="no"])
+
+if test "x${enable_exotic}" = "xyes"; then
+    requirement_eina="exotic ${requirement_eina}"
+
+    AC_DEFINE([HAVE_EXOTIC], [1], [Define to 1 if you have Exotic.])
+fi
+AM_CONDITIONAL([EVAS_HAVE_EXOTIC], [test "x${enable_exotic}" = "xyes"])
+
 ## strong dependencies
 
 # Eina
@@ -1837,8 +1851,8 @@ AM_CONDITIONAL([BUILD_EXAMPLES], [test "x${build_examples}" = "xyes"])
 EFL_CHECK_TESTS([enable_tests="yes"], [enable_tests="no"])
 
 EFL_CHECK_COVERAGE([${enable_tests}], [enable_coverage="yes"], [enable_coverage="no"])
-EVAS_CFLAGS="${EVAS_CFLAGS} ${EFL_COVERAGE_CFLAGS}"
-EVAS_LIBS="${EVAS_LIBS} ${EFL_COVERAGE_LIBS}"
+EVAS_CFLAGS="${EVAS_CFLAGS} ${EFL_COVERAGE_CFLAGS} ${EXOTIC_CFLAGS}"
+EVAS_LIBS="${EVAS_LIBS} ${EFL_COVERAGE_LIBS} ${EXOTIC_LIBS}"
 if test "x$enable_coverage" = "xyes" ; then
    EVAS_CFLAGS="${EVAS_CFLAGS} ${EFL_DEBUG_CFLAGS}"
 fi
diff --git a/legacy/evas/m4/efl_fnmatch.m4 b/legacy/evas/m4/efl_fnmatch.m4
index a92ac6b636..c857046e06 100644
--- a/legacy/evas/m4/efl_fnmatch.m4
+++ b/legacy/evas/m4/efl_fnmatch.m4
@@ -13,7 +13,7 @@ AC_CHECK_HEADER([fnmatch.h], [_efl_have_fnmatch="yes"], [_efl_have_fnmatch="no"]
 
 if test "x${_efl_have_fnmatch}" = "xyes" ; then
    AC_SEARCH_LIBS([fnmatch],
-      [fnmatch evil iberty],
+      [fnmatch evil exotic iberty],
       [_efl_have_fnmatch="yes"],
       [_efl_have_fnmatch="no"])
 fi
diff --git a/legacy/evas/src/lib/Evas.h b/legacy/evas/src/lib/Evas.h
index f65f5b27ef..e84048d194 100644
--- a/legacy/evas/src/lib/Evas.h
+++ b/legacy/evas/src/lib/Evas.h
@@ -5,6 +5,7 @@
 @date 2000-2012
 
 Please see the @ref authors page for contact details.
+@link Evas.h Evas API @endlink
 
 @link Evas.h Evas API @endlink
 
diff --git a/legacy/evas/src/lib/include/evas_common.h b/legacy/evas/src/lib/include/evas_common.h
index 155c22f413..e8530646c6 100644
--- a/legacy/evas/src/lib/include/evas_common.h
+++ b/legacy/evas/src/lib/include/evas_common.h
@@ -52,14 +52,22 @@ void *alloca (size_t);
 # include <Escape.h>
 #endif
 
-#include <Eina.h>
-#include "Evas.h"
-//#include "Evas_GL.h"
-
 #ifdef HAVE_PIXMAN
 #include <pixman.h>
 #endif
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#ifdef HAVE_EXOTIC
+# include <Exotic.h>
+#endif
+
+#include <Eina.h>
+#include "Evas.h"
+//#include "Evas_GL.h"
+
 #ifndef HAVE_LROUND
 /* right now i dont care about rendering bugs on platforms without lround
  (e.g. windows/vc++... yay!)