diff --git a/legacy/ecore/configure.ac b/legacy/ecore/configure.ac
index f4cc314ae1..df8d9a95ec 100644
--- a/legacy/ecore/configure.ac
+++ b/legacy/ecore/configure.ac
@@ -889,7 +889,7 @@ case "$host_os" in
       have_addrinfo="yes"
       ;;
    *)
-      AC_CHECK_HEADERS([dlfcn.h features.h langinfo.h locale.h sys/time.h sys/mman.h signal.h sys/resource.h sys/param.h unistd.h libgen])
+      AC_CHECK_HEADERS([dlfcn.h features.h langinfo.h locale.h sys/time.h sys/mman.h signal.h sys/resource.h])
       ;;
 esac
 
diff --git a/legacy/ecore/src/lib/ecore/ecore.c b/legacy/ecore/src/lib/ecore/ecore.c
index 9a1c30cdd0..ff17209297 100644
--- a/legacy/ecore/src/lib/ecore/ecore.c
+++ b/legacy/ecore/src/lib/ecore/ecore.c
@@ -8,7 +8,7 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#ifdef HAVE_UNISTD_H
+#ifndef _MSC_VER
 # include <unistd.h>
 #endif
 
@@ -27,7 +27,6 @@
 #ifdef HAVE_EVIL
 # include <Evil.h>
 #endif
-
 #include <Eina.h>
 
 #include "Ecore.h"
diff --git a/legacy/ecore/src/lib/ecore/ecore_app.c b/legacy/ecore/src/lib/ecore/ecore_app.c
index 9ee05b1d99..fe47d81453 100644
--- a/legacy/ecore/src/lib/ecore/ecore_app.c
+++ b/legacy/ecore/src/lib/ecore/ecore_app.c
@@ -4,11 +4,9 @@
 
 #include <stdlib.h>
 
-#ifdef HAVE_UNISTD_H
+#ifndef _MSC_VER
 # include <unistd.h>
-#endif
-
-#ifdef _MSC_VER
+#else
 # include <process.h>
 #endif
 
diff --git a/legacy/ecore/src/lib/ecore/ecore_main.c b/legacy/ecore/src/lib/ecore/ecore_main.c
index b268612d7d..479beb50f3 100644
--- a/legacy/ecore/src/lib/ecore/ecore_main.c
+++ b/legacy/ecore/src/lib/ecore/ecore_main.c
@@ -23,22 +23,17 @@
 #include <errno.h>
 #include <fcntl.h>
 
-#ifdef HAVE_SYS_TIME_H
+#ifndef _MSC_VER
 # include <sys/time.h>
-#endif
-
-#ifdef HAVE_UNISTD_H
 # include <unistd.h>
-#endif
-
-#ifdef _MSC_VER
+#else
 # include <float.h>
 #endif
 
 #define FIX_HZ 1
 
 #ifdef FIX_HZ
-# ifdef HAVE_SYS_PARAM_H
+# ifndef _MSC_VER
 #  include <sys/param.h>
 # endif
 # ifndef HZ
@@ -50,6 +45,9 @@
 # include <Evil.h>
 #endif
 
+#include "Ecore.h"
+#include "ecore_private.h"
+
 #ifdef HAVE_SYS_EPOLL_H
 # define HAVE_EPOLL
 # include <sys/epoll.h>
@@ -59,9 +57,6 @@
 # include <glib.h>
 #endif
 
-#include "Ecore.h"
-#include "ecore_private.h"
-
 struct _Ecore_Fd_Handler
 {
    EINA_INLIST;
diff --git a/legacy/ecore/src/lib/ecore_file/ecore_file.c b/legacy/ecore/src/lib/ecore_file/ecore_file.c
index 82c1aa26fe..7fff28421f 100644
--- a/legacy/ecore/src/lib/ecore_file/ecore_file.c
+++ b/legacy/ecore/src/lib/ecore_file/ecore_file.c
@@ -5,18 +5,14 @@
 #include <stdio.h>
 #include <string.h>
 
-#ifdef HAVE_UNISTD_H
+#ifndef _MSC_VER
 # include <unistd.h>
-#endif
-
-#ifdef HAVE_LIBGEN_H
 # include <libgen.h>
 #endif
 
 #ifdef HAVE_FEATURES_H
 # include <features.h>
 #endif
-
 #include <ctype.h>
 #include <errno.h>
 
diff --git a/legacy/eet/configure.ac b/legacy/eet/configure.ac
index 95eb99d199..653100661f 100644
--- a/legacy/eet/configure.ac
+++ b/legacy/eet/configure.ac
@@ -352,7 +352,7 @@ AC_CHECK_HEADER([jpeglib.h],
    [dummy="yes"],
    [AC_MSG_ERROR("Cannot find jpeglib.h. Make sure your CFLAGS environment variable contains include lines for the location of this file")])
 
-AC_CHECK_HEADERS([netinet/in.h unistd.h])
+AC_CHECK_HEADERS(netinet/in.h)
 EFL_CHECK_PATH_MAX
 
 ### Checks for types
diff --git a/legacy/eet/src/lib/eet_cipher.c b/legacy/eet/src/lib/eet_cipher.c
index 8c892d8241..6eff8de466 100644
--- a/legacy/eet/src/lib/eet_cipher.c
+++ b/legacy/eet/src/lib/eet_cipher.c
@@ -25,9 +25,9 @@ void *    alloca (size_t);
 #include <sys/stat.h>
 #include <sys/mman.h>
 
-#ifdef HAVE_UNISTD_H
+#ifndef _MSC_VER
 # include <unistd.h>
-#endif
+#endif /* ifndef _MSC_VER */
 
 #ifdef HAVE_NETINET_IN_H
 # include <netinet/in.h>
diff --git a/legacy/eet/src/lib/eet_lib.c b/legacy/eet/src/lib/eet_lib.c
index cd1019c766..d67c5e8da1 100644
--- a/legacy/eet/src/lib/eet_lib.c
+++ b/legacy/eet/src/lib/eet_lib.c
@@ -34,9 +34,9 @@ void *    alloca (size_t);
 #include <fcntl.h>
 #include <zlib.h>
 
-#ifdef HAVE_UNISTD_H
+#ifndef _MSC_VER
 # include <unistd.h>
-#endif
+#endif /* ifndef _MSC_VER */
 
 #ifdef HAVE_NETINET_IN_H
 # include <netinet/in.h>
diff --git a/legacy/eina/configure.ac b/legacy/eina/configure.ac
index 6f71e0d9bd..97fb9ed59b 100644
--- a/legacy/eina/configure.ac
+++ b/legacy/eina/configure.ac
@@ -330,7 +330,6 @@ 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 38c6a61c52..18633e7551 100644
--- a/legacy/eina/src/lib/eina_hash.c
+++ b/legacy/eina/src/lib/eina_hash.c
@@ -24,13 +24,10 @@
 #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 4093b5590c..33c021dd6f 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>
 
-#ifdef HAVE_UNISTD_H
+#ifndef _MSC_VER
 # include <unistd.h>
 #endif
 
diff --git a/legacy/eina/src/lib/eina_module.c b/legacy/eina/src/lib/eina_module.c
index 203fe7a955..1c6d70f5ff 100644
--- a/legacy/eina/src/lib/eina_module.c
+++ b/legacy/eina/src/lib/eina_module.c
@@ -42,8 +42,10 @@ void *alloca (size_t);
 #include <dirent.h>
 #include <string.h>
 
-#ifdef HAVE_LIBGEN_H
+#ifndef _MSC_VER
 # include <libgen.h>
+#else
+# include <Evil.h>
 #endif
 
 #include <dlfcn.h>
diff --git a/legacy/evas/src/lib/canvas/evas_async_events.c b/legacy/evas/src/lib/canvas/evas_async_events.c
index 148e3d4ac6..a88620d467 100644
--- a/legacy/evas/src/lib/canvas/evas_async_events.c
+++ b/legacy/evas/src/lib/canvas/evas_async_events.c
@@ -3,11 +3,9 @@
 
 #ifdef BUILD_ASYNC_EVENTS
 
-
-#ifdef HAVE_UNISTD_H
+#ifndef _MSC_VER
 # include <unistd.h>
 #endif
-
 #include <fcntl.h>
 #include <errno.h>
 
diff --git a/legacy/evas/src/lib/file/evas_path.c b/legacy/evas/src/lib/file/evas_path.c
index 0ab2bd2949..3b1238aea9 100644
--- a/legacy/evas/src/lib/file/evas_path.c
+++ b/legacy/evas/src/lib/file/evas_path.c
@@ -14,12 +14,8 @@
 /* get the casefold feature! */
 #include <fnmatch.h>
 #include <dirent.h>
-
-#ifdef HAVE_UNISTD_H
+#ifndef _MSC_VER
 # include <unistd.h>
-#endif
-
-#ifndef HAVE_SYS_PARAM_H
 # include <sys/param.h>
 #endif
 
diff --git a/legacy/evas/src/lib/include/evas_common.h b/legacy/evas/src/lib/include/evas_common.h
index 646fb36250..707ab0a7d6 100644
--- a/legacy/evas/src/lib/include/evas_common.h
+++ b/legacy/evas/src/lib/include/evas_common.h
@@ -242,14 +242,10 @@ void *alloca (size_t);
 #include <time.h>
 #include <ctype.h>
 
-#ifdef HAVE_STDINT_H
+#ifndef _MSC_VER
 # include <stdint.h>
 #endif
 
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include FT_GLYPH_H