diff --git a/legacy/eina/configure.ac b/legacy/eina/configure.ac
index 97fb9ed59b..6f71e0d9bd 100644
--- a/legacy/eina/configure.ac
+++ b/legacy/eina/configure.ac
@@ -330,6 +330,7 @@ fi
 AC_HEADER_ASSERT
 AC_HEADER_DIRENT
 AC_HEADER_TIME
+AC_CHECK_HEADERS([unistd.h libgen.h])
 EFL_CHECK_PATH_MAX
 
 ### Checks for types
diff --git a/legacy/eina/src/lib/eina_hash.c b/legacy/eina/src/lib/eina_hash.c
index 18633e7551..38c6a61c52 100644
--- a/legacy/eina/src/lib/eina_hash.c
+++ b/legacy/eina/src/lib/eina_hash.c
@@ -24,10 +24,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+
 #ifdef _MSC_VER
 # include <Evil.h>
-#else
-# include <stdint.h>
 #endif
 
 #include "eina_config.h"
diff --git a/legacy/eina/src/lib/eina_log.c b/legacy/eina/src/lib/eina_log.c
index 33c021dd6f..4093b5590c 100644
--- a/legacy/eina/src/lib/eina_log.c
+++ b/legacy/eina/src/lib/eina_log.c
@@ -268,7 +268,7 @@
 #include <assert.h>
 #include <errno.h>
 
-#ifndef _MSC_VER
+#ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
 
diff --git a/legacy/eina/src/lib/eina_module.c b/legacy/eina/src/lib/eina_module.c
index 1c6d70f5ff..203fe7a955 100644
--- a/legacy/eina/src/lib/eina_module.c
+++ b/legacy/eina/src/lib/eina_module.c
@@ -42,10 +42,8 @@ void *alloca (size_t);
 #include <dirent.h>
 #include <string.h>
 
-#ifndef _MSC_VER
+#ifdef HAVE_LIBGEN_H
 # include <libgen.h>
-#else
-# include <Evil.h>
 #endif
 
 #include <dlfcn.h>