diff --git a/configure.ac b/configure.ac
index 584ba0c3f5..0d888318fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -386,21 +386,6 @@ case "$host_vendor" in
     ;;
 esac
 
-# Exotic library for compilation on Coyote
-
-# TODO: add back whenever exotic is merged into efl single tree
-#PKG_CHECK_EXISTS([exotic],
-#   [
-#    enable_exotic="yes"
-#    AC_DEFINE([HAVE_EXOTIC_H], [1], [Define to 1 if you have Exotic.])
-#    EINA_CONFIGURE_HAVE_EXOTIC="#define EINA_HAVE_EXOTIC"
-#    requirements_pc_eina="exotic ${requirements_pc_eina}"
-#   ],
-#   [enable_exotic="no"])
-
-AM_CONDITIONAL([EINA_HAVE_EXOTIC], [test "x${enable_exotic}" = "xyes"])
-AC_SUBST([EINA_CONFIGURE_HAVE_EXOTIC])
-
 ## Options
 
 # Valgrind
@@ -605,17 +590,6 @@ case "$host_os" in
 esac
 AC_SUBST(EFL_EET_BUILD)
 
-# Exotic library for compilation on Coyote
-
-# TODO: add back whenever exotic is merged into efl single tree
-#PKG_CHECK_EXISTS([exotic],
-#   [
-#    enable_exotic="yes"
-#    AC_DEFINE([HAVE_EXOTIC_H], [1], [Define to 1 if you have Exotic.])
-#    requirements_pc_eet="exotic ${requirements_pc_eet}"
-#   ],
-#   [enable_exotic="no"])
-
 ## Secure layer
 
 case "$build_crypto" in
diff --git a/src/lib/eina/eina_config.h.in b/src/lib/eina/eina_config.h.in
index 1f7bb31ac2..2b4913467d 100644
--- a/src/lib/eina/eina_config.h.in
+++ b/src/lib/eina/eina_config.h.in
@@ -19,12 +19,7 @@
 #ifndef EINA_CONFIG_H_
 #define EINA_CONFIG_H_
 
-#ifdef EINA_HAVE_EXOTIC_H
-# undef EINA_HAVE_EXOTIC_H
-#endif
-@EINA_CONFIGURE_HAVE_EXOTIC@
-
-#ifdef EINA_HAVE_EXOTIC
+#ifdef HAVE_EXOTIC
 # include <Exotic.h>
 #endif
 
diff --git a/src/lib/eina/eina_module.c b/src/lib/eina/eina_module.c
index 736df0d33d..ab14e8189d 100644
--- a/src/lib/eina/eina_module.c
+++ b/src/lib/eina/eina_module.c
@@ -58,7 +58,7 @@ void *alloca (size_t);
 # include <Escape.h>
 #endif
 
-#ifdef HAVE_EXOTIC_H
+#ifdef HAVE_EXOTIC
 # include <Exotic.h>
 #endif