diff --git a/.gitignore b/.gitignore
index 21cee363f8..ffe296db5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -98,3 +98,4 @@ efl_libs.csv
 
 #native windows files
 env.bat
+subprojects/
\ No newline at end of file
diff --git a/meson.build b/meson.build
index 258678e0e8..05838494b7 100644
--- a/meson.build
+++ b/meson.build
@@ -232,7 +232,7 @@ config_h.set10('SLOPPY_SPEC', true)
 
 ## have to get compiler again for this to work
 code = '''#define _GNU_SOURCE 1
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <stdio.h>
 
 extern char **environ;
diff --git a/src/benchmarks/evas/evas_bench_saver.c b/src/benchmarks/evas/evas_bench_saver.c
index 21381fae37..0639085a5c 100644
--- a/src/benchmarks/evas/evas_bench_saver.c
+++ b/src/benchmarks/evas/evas_bench_saver.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <fcntl.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include "Evas.h"
 #include "Evas_Engine_Buffer.h"
diff --git a/src/bin/ecore_buffer/bq_mgr.c b/src/bin/ecore_buffer/bq_mgr.c
index 4cb3c1f759..2d2c6cc9e6 100644
--- a/src/bin/ecore_buffer/bq_mgr.c
+++ b/src/bin/ecore_buffer/bq_mgr.c
@@ -1,5 +1,5 @@
 #include <signal.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/xattr.h>
diff --git a/src/bin/ecore_con/efl_net_proxy_helper.c b/src/bin/ecore_con/efl_net_proxy_helper.c
index 6b2e3678ce..386aa565d3 100644
--- a/src/bin/ecore_con/efl_net_proxy_helper.c
+++ b/src/bin/ecore_con/efl_net_proxy_helper.c
@@ -7,7 +7,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <fcntl.h>
 
 #include "Eina.h"
@@ -163,7 +163,7 @@ proxy_lookup(void *data, Eina_Thread t)
    eina_spinlock_release(&pending_lock);
    // if there are no more pending threads doing work - sleep for the
    // timeout then check if we still are and if so - exit;
-   if (pending_local == 0) sleep(10);
+   if (pending_local == 0) evil_sleep(10);
    eina_spinlock_take(&pending_lock);
      {
         Eina_Thread *tt;
@@ -253,7 +253,7 @@ main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
         // Failed to init libproxy so report this before exit
         fprintf(stdout, "F\n");
         fflush(stdout);
-        for (;;) sleep(60 * 60 * 24);
+        for (;;) evil_sleep(60 * 60 * 24);
      }
    eina_shutdown();
    return 0;
diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index 3c9d997930..f427fb83bb 100644
--- a/src/bin/edje/edje_cc_handlers.c
+++ b/src/bin/edje/edje_cc_handlers.c
@@ -34,7 +34,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <ctype.h>
 #ifdef _WIN32
 # include <evil_private.h> /* mmap */
diff --git a/src/bin/edje/edje_cc_out.c b/src/bin/edje/edje_cc_out.c
index 64f6cec29d..c51b731448 100644
--- a/src/bin/edje/edje_cc_out.c
+++ b/src/bin/edje/edje_cc_out.c
@@ -13,7 +13,7 @@
 
 #include <string.h>
 #include <limits.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <sys/stat.h>
 #include <libgen.h>
 
diff --git a/src/bin/edje/edje_cc_parse.c b/src/bin/edje/edje_cc_parse.c
index e6db4f5840..79ded3981b 100644
--- a/src/bin/edje/edje_cc_parse.c
+++ b/src/bin/edje/edje_cc_parse.c
@@ -8,7 +8,7 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <fcntl.h>
 #include <math.h>
 
diff --git a/src/bin/edje/edje_codegen.c b/src/bin/edje/edje_codegen.c
index f55c8f9a78..637002201f 100644
--- a/src/bin/edje/edje_codegen.c
+++ b/src/bin/edje/edje_codegen.c
@@ -6,7 +6,7 @@
 #include <ctype.h>
 #include <fcntl.h>
 #include <locale.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <errno.h>
 
 #include <Eina.h>
diff --git a/src/bin/edje/edje_decc.c b/src/bin/edje/edje_decc.c
index dfee86affe..b178e0f19e 100644
--- a/src/bin/edje/edje_decc.c
+++ b/src/bin/edje/edje_decc.c
@@ -6,7 +6,7 @@
 
 #include <string.h>
 #include <ctype.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <locale.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/bin/edje/edje_inspector.c b/src/bin/edje/edje_inspector.c
index 25024cee73..faa07212c1 100644
--- a/src/bin/edje/edje_inspector.c
+++ b/src/bin/edje/edje_inspector.c
@@ -4,7 +4,7 @@
 
 #include <locale.h>
 #include <fnmatch.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <errno.h>
 
 #include "Edje.h"
diff --git a/src/bin/edje/edje_pick.c b/src/bin/edje/edje_pick.c
index 3967443556..30a171599f 100644
--- a/src/bin/edje/edje_pick.c
+++ b/src/bin/edje/edje_pick.c
@@ -6,7 +6,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <fcntl.h>
 #include <ctype.h>
 #include <Ecore_Getopt.h>
diff --git a/src/bin/edje/edje_player.c b/src/bin/edje/edje_player.c
index 7d79ec0d7a..e5a23b8485 100644
--- a/src/bin/edje/edje_player.c
+++ b/src/bin/edje/edje_player.c
@@ -6,7 +6,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <fcntl.h>
 #include <ctype.h>
 
diff --git a/src/bin/edje/epp/cpplib.c b/src/bin/edje/epp/cpplib.c
index ff211de8b4..d3d0df659a 100644
--- a/src/bin/edje/epp/cpplib.c
+++ b/src/bin/edje/epp/cpplib.c
@@ -68,7 +68,7 @@ const char         *version_string = "0.0.0";
 #include <string.h>
 #include <signal.h>
 #include <stdlib.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/src/bin/eet/eet_main.c b/src/bin/eet/eet_main.c
index 7da5cfd4d3..71a6542fe7 100644
--- a/src/bin/eet/eet_main.c
+++ b/src/bin/eet/eet_main.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include <Eet.h>
 
diff --git a/src/bin/eeze/eeze_scanner/eeze_scanner.c b/src/bin/eeze/eeze_scanner/eeze_scanner.c
index 9236b6ab3b..8ea0cd5275 100644
--- a/src/bin/eeze/eeze_scanner/eeze_scanner.c
+++ b/src/bin/eeze/eeze_scanner/eeze_scanner.c
@@ -9,7 +9,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <errno.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <fcntl.h>
 
 #include "eeze_scanner.h"
diff --git a/src/bin/eeze/eeze_sensor_test/eeze_sensor_test.c b/src/bin/eeze/eeze_sensor_test/eeze_sensor_test.c
index dcf6991e87..1eac872cd1 100644
--- a/src/bin/eeze/eeze_sensor_test/eeze_sensor_test.c
+++ b/src/bin/eeze/eeze_sensor_test/eeze_sensor_test.c
@@ -5,7 +5,7 @@
 #include <Eeze.h>
 #include <Ecore.h>
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include <Eeze_Sensor.h>
 
diff --git a/src/bin/efl_mono_msbuild_gen/main.cc b/src/bin/efl_mono_msbuild_gen/main.cc
index d7ab599b4b..47ab4b3814 100644
--- a/src/bin/efl_mono_msbuild_gen/main.cc
+++ b/src/bin/efl_mono_msbuild_gen/main.cc
@@ -18,7 +18,7 @@
 #include <fstream>
 
 #include <stdlib.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <getopt.h>
 #include <libgen.h>
 
diff --git a/src/bin/efreet/efreet_desktop_cache_create.c b/src/bin/efreet/efreet_desktop_cache_create.c
index 8988168e94..5698a82a5b 100644
--- a/src/bin/efreet/efreet_desktop_cache_create.c
+++ b/src/bin/efreet/efreet_desktop_cache_create.c
@@ -3,7 +3,7 @@
 #endif
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <errno.h>
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/time.h>
diff --git a/src/bin/efreet/efreet_icon_cache_create.c b/src/bin/efreet/efreet_icon_cache_create.c
index 9f3141b8f9..c4d823abb9 100644
--- a/src/bin/efreet/efreet_icon_cache_create.c
+++ b/src/bin/efreet/efreet_icon_cache_create.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <fcntl.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <errno.h>
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/time.h>
diff --git a/src/bin/efreet/efreet_mime_cache_create.c b/src/bin/efreet/efreet_mime_cache_create.c
index 56fa592a2b..7d98bc3240 100644
--- a/src/bin/efreet/efreet_mime_cache_create.c
+++ b/src/bin/efreet/efreet_mime_cache_create.c
@@ -3,7 +3,7 @@
 #endif
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <errno.h>
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/time.h>
diff --git a/src/bin/efreet/efreetd.c b/src/bin/efreet/efreetd.c
index 1ef7d339c2..a965144bc3 100644
--- a/src/bin/efreet/efreetd.c
+++ b/src/bin/efreet/efreetd.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <stdlib.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/time.h>
 #include <sys/resource.h>
diff --git a/src/bin/efreet/efreetd_cache.c b/src/bin/efreet/efreetd_cache.c
index 4b801a8fc0..7d36949f11 100644
--- a/src/bin/efreet/efreetd_cache.c
+++ b/src/bin/efreet/efreetd_cache.c
@@ -17,7 +17,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 static Eina_Hash *icon_change_monitors = NULL;
 static Eina_Hash *icon_change_monitors_mon = NULL;
diff --git a/src/bin/elementary/elementary_codegen.c b/src/bin/elementary/elementary_codegen.c
index 28ed576f25..2c22c7d19a 100644
--- a/src/bin/elementary/elementary_codegen.c
+++ b/src/bin/elementary/elementary_codegen.c
@@ -17,7 +17,7 @@
 #include <fcntl.h>
 #include <locale.h>
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #ifndef ENABLE_NLS
 # ifndef libintl_setlocale
diff --git a/src/bin/elementary/elm_prefs_cc_handlers.c b/src/bin/elementary/elm_prefs_cc_handlers.c
index ce5c01210b..d6d482819e 100644
--- a/src/bin/elementary/elm_prefs_cc_handlers.c
+++ b/src/bin/elementary/elm_prefs_cc_handlers.c
@@ -32,7 +32,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include "elm_prefs_cc.h"
 
diff --git a/src/bin/elementary/elm_prefs_cc_parse.c b/src/bin/elementary/elm_prefs_cc_parse.c
index 11415e1d86..cbc02b4937 100644
--- a/src/bin/elementary/elm_prefs_cc_parse.c
+++ b/src/bin/elementary/elm_prefs_cc_parse.c
@@ -8,7 +8,7 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <fcntl.h>
 #include <math.h>
 #include <regex.h>
diff --git a/src/bin/elementary/quicklaunch.c b/src/bin/elementary/quicklaunch.c
index 3e7598e6c2..b9a364179e 100644
--- a/src/bin/elementary/quicklaunch.c
+++ b/src/bin/elementary/quicklaunch.c
@@ -11,7 +11,7 @@
 #ifdef HAVE_ENVIRON
 # define _GNU_SOURCE 1
 #endif
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <signal.h>
diff --git a/src/bin/elementary/run.c b/src/bin/elementary/run.c
index 261935f41f..bff12d15a6 100644
--- a/src/bin/elementary/run.c
+++ b/src/bin/elementary/run.c
@@ -10,7 +10,7 @@
 #ifdef HAVE_ENVIRON
 # define _GNU_SOURCE 1
 #endif
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #ifdef HAVE_ALLOCA_H
@@ -126,7 +126,7 @@ main(int argc, char **argv)
                {
                   char buf2[PATH_MAX];
 
-                  ssize_t len = readlink(exe, buf2, sizeof(buf2) - 1);
+                  ssize_t len = evil_readlink(exe, buf2, sizeof(buf2) - 1);
                   if (len >= 0)
                     {
                        char *p;
diff --git a/src/bin/embryo/embryo_cc_sc1.c b/src/bin/embryo/embryo_cc_sc1.c
index bb9486de6b..50df48da3d 100644
--- a/src/bin/embryo/embryo_cc_sc1.c
+++ b/src/bin/embryo/embryo_cc_sc1.c
@@ -33,7 +33,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <sys/stat.h>
 
 #include <Eina.h>
diff --git a/src/bin/embryo/embryo_cc_sc5.c b/src/bin/embryo/embryo_cc_sc5.c
index ff9a721869..a052a74267 100644
--- a/src/bin/embryo/embryo_cc_sc5.c
+++ b/src/bin/embryo/embryo_cc_sc5.c
@@ -31,7 +31,7 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include <Eina.h>
 
diff --git a/src/bin/eolian/main.c b/src/bin/eolian/main.c
index 8e965e25b2..8bfcb9873a 100644
--- a/src/bin/eolian/main.c
+++ b/src/bin/eolian/main.c
@@ -1,5 +1,5 @@
 #include <stdlib.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include "main.h"
 #include "types.h"
diff --git a/src/bin/eolian_cxx/eolian_cxx.cc b/src/bin/eolian_cxx/eolian_cxx.cc
index a625627d50..d3672c8e4e 100644
--- a/src/bin/eolian_cxx/eolian_cxx.cc
+++ b/src/bin/eolian_cxx/eolian_cxx.cc
@@ -18,7 +18,7 @@
 #include <fstream>
 
 #include <stdlib.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <getopt.h>
 #include <libgen.h>
 
diff --git a/src/bin/eolian_mono/eolian_mono.cc b/src/bin/eolian_mono/eolian_mono.cc
index 1a96aaa826..9c212e7fbb 100644
--- a/src/bin/eolian_mono/eolian_mono.cc
+++ b/src/bin/eolian_mono/eolian_mono.cc
@@ -18,7 +18,7 @@
 #include <fstream>
 
 #include <stdlib.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <getopt.h>
 #include <libgen.h>
 
diff --git a/src/bin/ethumb_client/ethumbd.c b/src/bin/ethumb_client/ethumbd.c
index 476ecd4b52..36ce43a2a9 100644
--- a/src/bin/ethumb_client/ethumbd.c
+++ b/src/bin/ethumb_client/ethumbd.c
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <errno.h>
 
 #include <stdlib.h>
diff --git a/src/bin/ethumb_client/ethumbd_slave.c b/src/bin/ethumb_client/ethumbd_slave.c
index d7b7ff6680..f712d4e962 100644
--- a/src/bin/ethumb_client/ethumbd_slave.c
+++ b/src/bin/ethumb_client/ethumbd_slave.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <limits.h>
 #include <string.h>
 #include <errno.h>
diff --git a/src/bin/exactness/injector.c b/src/bin/exactness/injector.c
index 1482414740..1e023df008 100644
--- a/src/bin/exactness/injector.c
+++ b/src/bin/exactness/injector.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <getopt.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include <Eina.h>
 #include <Eet.h>
diff --git a/src/bin/exactness/player.c b/src/bin/exactness/player.c
index 2440657409..69ef025f8b 100644
--- a/src/bin/exactness/player.c
+++ b/src/bin/exactness/player.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <getopt.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #ifdef HAVE_DLSYM
 # include <dlfcn.h>
diff --git a/src/bin/exactness/recorder.c b/src/bin/exactness/recorder.c
index d7c6e7a1d8..ca0eba8e69 100644
--- a/src/bin/exactness/recorder.c
+++ b/src/bin/exactness/recorder.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <getopt.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #ifdef HAVE_DLSYM
 # include <dlfcn.h>
diff --git a/src/examples/ecore/ecore_audio_custom.c b/src/examples/ecore/ecore_audio_custom.c
index b0d26a1e75..cf31968197 100644
--- a/src/examples/ecore/ecore_audio_custom.c
+++ b/src/examples/ecore/ecore_audio_custom.c
@@ -5,7 +5,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <termios.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <fcntl.h>
 #include <Ecore.h>
 #include <Ecore_Audio.h>
diff --git a/src/examples/ecore/ecore_audio_playback.c b/src/examples/ecore/ecore_audio_playback.c
index c659f09d55..0a35e6747b 100644
--- a/src/examples/ecore/ecore_audio_playback.c
+++ b/src/examples/ecore/ecore_audio_playback.c
@@ -7,7 +7,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <termios.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <fcntl.h>
 #include <Ecore.h>
 #include <Ecore_Audio.h>
diff --git a/src/examples/ecore/ecore_audio_to_ogg.c b/src/examples/ecore/ecore_audio_to_ogg.c
index 756e69a209..a72de24510 100644
--- a/src/examples/ecore/ecore_audio_to_ogg.c
+++ b/src/examples/ecore/ecore_audio_to_ogg.c
@@ -5,7 +5,7 @@
 #include <libgen.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <fcntl.h>
 #include <Eo.h>
 #include <Ecore.h>
diff --git a/src/examples/ecore/ecore_con_url_download_example.c b/src/examples/ecore/ecore_con_url_download_example.c
index dcf634ec98..a1bc9b4835 100644
--- a/src/examples/ecore/ecore_con_url_download_example.c
+++ b/src/examples/ecore/ecore_con_url_download_example.c
@@ -5,7 +5,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include <Ecore.h>
 #include <Ecore_Con.h>
diff --git a/src/examples/ecore/ecore_evas_basics_example.c b/src/examples/ecore/ecore_evas_basics_example.c
index 5619480938..55ac2c3b67 100644
--- a/src/examples/ecore/ecore_evas_basics_example.c
+++ b/src/examples/ecore/ecore_evas_basics_example.c
@@ -11,7 +11,7 @@
 
 #include <Ecore.h>
 #include <Ecore_Evas.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 static Eina_Bool
 _stdin_cb(void *data EINA_UNUSED, Ecore_Fd_Handler *handler EINA_UNUSED)
diff --git a/src/examples/ecore/ecore_evas_ews_example.c b/src/examples/ecore/ecore_evas_ews_example.c
index b4415cb5e9..37050bc35b 100644
--- a/src/examples/ecore/ecore_evas_ews_example.c
+++ b/src/examples/ecore/ecore_evas_ews_example.c
@@ -11,7 +11,7 @@
 
 #include <Ecore.h>
 #include <Ecore_Evas.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <stdio.h>
 #include <ctype.h>
 
diff --git a/src/examples/ecore/ecore_evas_extn_plug_example.c b/src/examples/ecore/ecore_evas_extn_plug_example.c
index 1a88e02a96..9aa04f8d86 100644
--- a/src/examples/ecore/ecore_evas_extn_plug_example.c
+++ b/src/examples/ecore/ecore_evas_extn_plug_example.c
@@ -16,7 +16,7 @@
 
 #include <Ecore.h>
 #include <Ecore_Evas.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 // procotol version - change this as needed
 #define MSG_DOMAIN_CONTROL_OBJECT 0x1004
 #define MSG_ID_BG_COLOR 0x1005
diff --git a/src/examples/ecore/ecore_evas_extn_socket_example.c b/src/examples/ecore/ecore_evas_extn_socket_example.c
index 21255485d0..758fe4c584 100644
--- a/src/examples/ecore/ecore_evas_extn_socket_example.c
+++ b/src/examples/ecore/ecore_evas_extn_socket_example.c
@@ -18,7 +18,7 @@
 
 #include <Ecore.h>
 #include <Ecore_Evas.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 // protocol version - change this as needed
 #define MSG_DOMAIN_CONTROL_OBJECT 0x1004
diff --git a/src/examples/ecore/ecore_event_example_02.c b/src/examples/ecore/ecore_event_example_02.c
index b1c771ceb4..ce5a8f0985 100644
--- a/src/examples/ecore/ecore_event_example_02.c
+++ b/src/examples/ecore/ecore_event_example_02.c
@@ -2,7 +2,7 @@
 // gcc -g -Wall -o ecore_event_example_02 ecore_event_example_02.c `pkg-config --cflags --libs ecore`
 
 #include <Ecore.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 struct context   // helper struct to give some context to the callbacks
 {
diff --git a/src/examples/ecore/ecore_exe_example_child.c b/src/examples/ecore/ecore_exe_example_child.c
index b59ff815ee..5678919e6c 100644
--- a/src/examples/ecore/ecore_exe_example_child.c
+++ b/src/examples/ecore/ecore_exe_example_child.c
@@ -3,7 +3,7 @@
  */
 
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <Ecore.h>
 
 #define BUFFER_SIZE 1024
diff --git a/src/examples/ecore/ecore_fd_handler_example.c b/src/examples/ecore/ecore_fd_handler_example.c
index f842c34873..0e6d1fd463 100644
--- a/src/examples/ecore/ecore_fd_handler_example.c
+++ b/src/examples/ecore/ecore_fd_handler_example.c
@@ -3,7 +3,7 @@
  */
 
 #include <Ecore.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 struct context
 {
diff --git a/src/examples/ecore/ecore_fd_handler_gnutls_example.c b/src/examples/ecore/ecore_fd_handler_gnutls_example.c
index 30fd6bcce2..a0ac56c90d 100644
--- a/src/examples/ecore/ecore_fd_handler_gnutls_example.c
+++ b/src/examples/ecore/ecore_fd_handler_gnutls_example.c
@@ -19,7 +19,7 @@
 # include <arpa/inet.h>
 #endif
 #include <errno.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <gnutls/gnutls.h>
 #include <Ecore.h>
 
diff --git a/src/examples/ecore/ecore_idler_example.c b/src/examples/ecore/ecore_idler_example.c
index 2185210763..eb6c1e781b 100644
--- a/src/examples/ecore/ecore_idler_example.c
+++ b/src/examples/ecore/ecore_idler_example.c
@@ -7,7 +7,7 @@
 
 #include <Ecore.h>
 #include <Eo.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 struct context   // helper struct to give some context to the callbacks
 {
diff --git a/src/examples/ecore/ecore_job_example.c b/src/examples/ecore/ecore_job_example.c
index 221f01228c..3e5b8d1376 100644
--- a/src/examples/ecore/ecore_job_example.c
+++ b/src/examples/ecore/ecore_job_example.c
@@ -2,7 +2,7 @@
 // gcc -o ecore_job_example ecore_job_example.c `pkg-config --libs --cflags ecore`
 
 #include <Ecore.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 static void
 _job_print_cb(void *data)
diff --git a/src/examples/ecore/ecore_pipe_simple_example.c b/src/examples/ecore/ecore_pipe_simple_example.c
index e15c9250f7..8e9aabd2e2 100644
--- a/src/examples/ecore/ecore_pipe_simple_example.c
+++ b/src/examples/ecore/ecore_pipe_simple_example.c
@@ -1,7 +1,7 @@
 //Compile with:
 //gcc -g -Wall -o ecore_pipe_simple_example ecore_pipe_simple_example.c `pkg-config --cflags --libs ecore`
 
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <Ecore.h>
 
 static void
diff --git a/src/examples/ecore/ecore_poller_example.c b/src/examples/ecore/ecore_poller_example.c
index 3cbbcc5f2e..3f8afb9ffd 100644
--- a/src/examples/ecore/ecore_poller_example.c
+++ b/src/examples/ecore/ecore_poller_example.c
@@ -3,7 +3,7 @@
 
 #include <Ecore.h>
 //#include <Ecore_Eo.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 static double _initial_time = 0;
 
diff --git a/src/examples/ecore/ecore_thread_example.c b/src/examples/ecore/ecore_thread_example.c
index aac7643734..b1ec710dae 100644
--- a/src/examples/ecore/ecore_thread_example.c
+++ b/src/examples/ecore/ecore_thread_example.c
@@ -3,7 +3,7 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include <Ecore.h>
 #include <Ecore_Getopt.h>
diff --git a/src/examples/ecore/ecore_time_functions_example.c b/src/examples/ecore/ecore_time_functions_example.c
index c9020e93af..2fd2cfa96f 100644
--- a/src/examples/ecore/ecore_time_functions_example.c
+++ b/src/examples/ecore/ecore_time_functions_example.c
@@ -2,7 +2,7 @@
 // gcc -o ecore_time_functions_example ecore_time_functions_example.c `pkg-config --libs --cflags ecore`
 
 #include <Ecore.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 static Eina_Bool
 _timer_cb(void *data EINA_UNUSED)
diff --git a/src/examples/ecore/ecore_timer_example.c b/src/examples/ecore/ecore_timer_example.c
index 8edf09e295..3277399d89 100644
--- a/src/examples/ecore/ecore_timer_example.c
+++ b/src/examples/ecore/ecore_timer_example.c
@@ -2,7 +2,7 @@
 // gcc -o ecore_timer_example ecore_timer_example.c `pkg-config --libs --cflags ecore`
 
 #include <Ecore.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #define TIMEOUT_1 1.0 // interval for timer1
 #define TIMEOUT_2 3.0 // timer2 - delay timer1
diff --git a/src/examples/eet/eet-data-cipher_decipher.c b/src/examples/eet/eet-data-cipher_decipher.c
index 4ff94d5782..22d1c7a946 100644
--- a/src/examples/eet/eet-data-cipher_decipher.c
+++ b/src/examples/eet/eet-data-cipher_decipher.c
@@ -7,7 +7,7 @@
 #include <limits.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <string.h>
 
 int
diff --git a/src/examples/eet/eet-data-file_descriptor_01.c b/src/examples/eet/eet-data-file_descriptor_01.c
index 5df727bc42..bebc412f45 100644
--- a/src/examples/eet/eet-data-file_descriptor_01.c
+++ b/src/examples/eet/eet-data-file_descriptor_01.c
@@ -7,7 +7,7 @@
 #include <limits.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 // complex real-world structures based on elmdentica database
 typedef struct
diff --git a/src/examples/eet/eet-data-file_descriptor_02.c b/src/examples/eet/eet-data-file_descriptor_02.c
index e0ca00d6fd..74528c5363 100644
--- a/src/examples/eet/eet-data-file_descriptor_02.c
+++ b/src/examples/eet/eet-data-file_descriptor_02.c
@@ -7,7 +7,7 @@
 #include <limits.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 typedef enum _Example_Data_Type      Example_Data_Type;
 typedef struct _Example_Variant_Type Example_Variant_Type;
diff --git a/src/examples/eet/eet-data-nested.c b/src/examples/eet/eet-data-nested.c
index cfded408ce..849424fb8a 100644
--- a/src/examples/eet/eet-data-nested.c
+++ b/src/examples/eet/eet-data-nested.c
@@ -7,7 +7,7 @@
 #include <limits.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 // The struct that will be loaded and saved.
 // note that only the members described in the eet_data_descriptor
diff --git a/src/examples/eet/eet-data-simple.c b/src/examples/eet/eet-data-simple.c
index 3931e835f3..818c2a898f 100644
--- a/src/examples/eet/eet-data-simple.c
+++ b/src/examples/eet/eet-data-simple.c
@@ -7,7 +7,7 @@
 #include <limits.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 // The struct that will be loaded and saved.
 // note that only the members described in the eet_data_descriptor
diff --git a/src/examples/emotion/emotion_generic_example.c b/src/examples/emotion/emotion_generic_example.c
index 4ac996f33a..eee15b7568 100644
--- a/src/examples/emotion/emotion_generic_example.c
+++ b/src/examples/emotion/emotion_generic_example.c
@@ -10,7 +10,7 @@
 #include <Emotion.h>
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #define WIDTH  (320)
 #define HEIGHT (240)
diff --git a/src/generic/evas/common/shmfile.c b/src/generic/evas/common/shmfile.c
index 6fe9eb30d6..41aa6de658 100644
--- a/src/generic/evas/common/shmfile.c
+++ b/src/generic/evas/common/shmfile.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <math.h>
 #ifdef HAVE_NETINET_IN_H
 # include <netinet/in.h>
diff --git a/src/generic/evas/common/timeout.c b/src/generic/evas/common/timeout.c
index 844884c8e0..e55c0f8a70 100644
--- a/src/generic/evas/common/timeout.c
+++ b/src/generic/evas/common/timeout.c
@@ -1,6 +1,10 @@
 #ifdef _WIN32
 # include <stdio.h>
-# include <windows.h>
+# ifndef WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+# endif
+# include <Windows.h>
+# undef WIN32_LEAN_AND_MEAN
 # include <process.h>
 
 unsigned int
diff --git a/src/generic/evas/gst/main.c b/src/generic/evas/gst/main.c
index 3f93507078..fcaec4530a 100644
--- a/src/generic/evas/gst/main.c
+++ b/src/generic/evas/gst/main.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <fcntl.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include <gst/gst.h>
 
diff --git a/src/generic/evas/pdf/main.cpp b/src/generic/evas/pdf/main.cpp
index c7c3ee13bd..14d769a2ec 100644
--- a/src/generic/evas/pdf/main.cpp
+++ b/src/generic/evas/pdf/main.cpp
@@ -4,7 +4,7 @@
 
 #include <fcntl.h>
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <libgen.h>
 
 #include <Eina.h>
diff --git a/src/generic/evas/raw/main.c b/src/generic/evas/raw/main.c
index c007bf62ba..94fbe097a1 100644
--- a/src/generic/evas/raw/main.c
+++ b/src/generic/evas/raw/main.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <libraw.h>
 #include "shmfile.h"
 #include "timeout.h"
diff --git a/src/generic/evas/xcf/common.h b/src/generic/evas/xcf/common.h
index 4e605b0022..8c3ee744fc 100644
--- a/src/generic/evas/xcf/common.h
+++ b/src/generic/evas/xcf/common.h
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <math.h>
 #ifdef HAVE_NETINET_IN_H
 # include <netinet/in.h>
diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index 3110c5ef54..45cc65c205 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 
diff --git a/src/lib/ecore/ecore_anim.c b/src/lib/ecore/ecore_anim.c
index f2ec2d61c8..516694a61a 100644
--- a/src/lib/ecore/ecore_anim.c
+++ b/src/lib/ecore/ecore_anim.c
@@ -4,7 +4,7 @@
 
 #include <stdlib.h>
 #include <math.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/lib/ecore/ecore_app.c b/src/lib/ecore/ecore_app.c
index 605f046534..04c8c7fd05 100644
--- a/src/lib/ecore/ecore_app.c
+++ b/src/lib/ecore/ecore_app.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <stdlib.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include "Ecore.h"
 #include "ecore_private.h"
diff --git a/src/lib/ecore/ecore_exe_posix.c b/src/lib/ecore/ecore_exe_posix.c
index 07f1058ab0..22042c1008 100644
--- a/src/lib/ecore/ecore_exe_posix.c
+++ b/src/lib/ecore/ecore_exe_posix.c
@@ -8,7 +8,7 @@
 
 #include <errno.h>
 #include <sys/types.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <fcntl.h>
 #include <sys/time.h>
 #include <sys/resource.h>
@@ -71,11 +71,11 @@ static int _ecore_exe_check_errno(int         result,
                                   int         line);
 
 #define E_IF_NO_ERRNO(result, foo, ok)                                                           \
-  while (((ok) = _ecore_exe_check_errno((result) = (foo), __FILE__, __LINE__)) == -1) sleep(1);  \
+  while (((ok) = _ecore_exe_check_errno((result) = (foo), __FILE__, __LINE__)) == -1) evil_sleep(1);  \
           if (ok)
 
 #define E_NO_ERRNO(result, foo, ok) \
-  while (((ok) = _ecore_exe_check_errno((result) = (foo), __FILE__, __LINE__)) == -1) sleep(1)
+  while (((ok) = _ecore_exe_check_errno((result) = (foo), __FILE__, __LINE__)) == -1) evil_sleep(1)
 
 #define E_IF_NO_ERRNO_NOLOOP(result, foo, ok) \
   if (((ok) = _ecore_exe_check_errno((result) = (foo), __FILE__, __LINE__)))
@@ -1010,7 +1010,7 @@ _ecore_exe_exec_it(const char     *exe_cmd,
      }
 #endif
 
-   if (!(flags & ECORE_EXE_NOT_LEADER)) setsid();
+   if (!(flags & ECORE_EXE_NOT_LEADER)) evil_setsid();
    if ((flags & ECORE_EXE_USE_SH))
    {
       errno = 0;
diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index fc35331f3f..1fb4d93f0a 100644
--- a/src/lib/ecore/ecore_main.c
+++ b/src/lib/ecore/ecore_main.c
@@ -13,7 +13,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <math.h>
 #include <sys/types.h>
 #include <errno.h>
@@ -231,7 +231,7 @@ _ecore_fd_valid(Eo *obj EINA_UNUSED, Efl_Loop_Data *pd EINA_UNUSED)
 #  ifdef HAVE_PAUSE
         pause();
 #  else
-        sleep(60);
+        evil_sleep(60);
 #  endif
      }
 # endif
@@ -263,7 +263,7 @@ _throttle_do(Efl_Loop_Data *pd)
 {
    if (pd->throttle == 0) return;
    eina_evlog("+throttle", NULL, 0.0, NULL);
-   usleep(pd->throttle);
+   evil_usleep(pd->throttle);
    eina_evlog("-throttle", NULL, 0.0, NULL);
 }
 
diff --git a/src/lib/ecore/ecore_main_timechanges.c b/src/lib/ecore/ecore_main_timechanges.c
index cb3daf1fc1..e2f52d4c9b 100644
--- a/src/lib/ecore/ecore_main_timechanges.c
+++ b/src/lib/ecore/ecore_main_timechanges.c
@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <math.h>
 #include <sys/types.h>
 #include <errno.h>
diff --git a/src/lib/ecore/ecore_signal.c b/src/lib/ecore/ecore_signal.c
index eebb692276..b9e35364c4 100644
--- a/src/lib/ecore/ecore_signal.c
+++ b/src/lib/ecore/ecore_signal.c
@@ -8,7 +8,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <signal.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <assert.h>
 #include <fcntl.h>
 #include <errno.h>
diff --git a/src/lib/ecore/ecore_thread.c b/src/lib/ecore/ecore_thread.c
index 05ab26cdea..80c5d0c576 100644
--- a/src/lib/ecore/ecore_thread.c
+++ b/src/lib/ecore/ecore_thread.c
@@ -6,7 +6,7 @@
 #include <sys/time.h>
 #include <assert.h>
 #include <sys/types.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include "Ecore.h"
 #include "ecore_private.h"
@@ -522,11 +522,7 @@ _ecore_thread_worker(void *data EINA_UNUSED, Eina_Thread t EINA_UNUSED)
    SLKU(_ecore_pending_job_threads_mutex);
 
    /* Sleep a little to prevent premature death */
-#ifdef _WIN32
-   Sleep(1); /* around 50ms */
-#else
-   usleep(50);
-#endif
+   evil_usleep(50);
 
    SLKL(_ecore_pending_job_threads_mutex);
    if (_ecore_pending_job_threads || _ecore_pending_job_threads_feedback)
@@ -628,7 +624,7 @@ _ecore_thread_shutdown(void)
         if (test)
           {
              _ecore_main_call_flush();
-             usleep(1000);
+             evil_usleep(1000);
           }
      } while (test == EINA_TRUE && iteration < 50);
 
diff --git a/src/lib/ecore/ecore_throttle.c b/src/lib/ecore/ecore_throttle.c
index 2fe816ad62..5a82de1e1f 100644
--- a/src/lib/ecore/ecore_throttle.c
+++ b/src/lib/ecore/ecore_throttle.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <stdlib.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include "Ecore.h"
 #include "ecore_private.h"
@@ -31,7 +31,7 @@ _ecore_throttle(void)
 {
    if (throttle_val <= 0) return;
    eina_evlog("+throttle", NULL, 0.0, NULL);
-   usleep(throttle_val);
+   evil_usleep(throttle_val);
    eina_evlog("-throttle", NULL, 0.0, NULL);
 }
 
diff --git a/src/lib/ecore/efl_appthread.c b/src/lib/ecore/efl_appthread.c
index 4655d1f646..9553edc70c 100644
--- a/src/lib/ecore/efl_appthread.c
+++ b/src/lib/ecore/efl_appthread.c
@@ -10,7 +10,7 @@
 
 #include "ecore_private.h"
 
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <fcntl.h>
 #include <string.h>
 
diff --git a/src/lib/ecore/efl_exe.c b/src/lib/ecore/efl_exe.c
index c5a2f57343..f14f0c30f9 100644
--- a/src/lib/ecore/efl_exe.c
+++ b/src/lib/ecore/efl_exe.c
@@ -161,7 +161,7 @@ _exec(const char *cmd, Efl_Exe_Flags flags, Efl_Task_Flags task_flags)
      }
 #endif
 
-   if (flags & EFL_EXE_FLAGS_GROUP_LEADER) setsid();
+   if (flags & EFL_EXE_FLAGS_GROUP_LEADER) evil_setsid();
    if (use_sh) // We have to use a shell to run this.
      {
         errno = 0;
diff --git a/src/lib/ecore/efl_loop.c b/src/lib/ecore/efl_loop.c
index 726a4b36a0..a7b8f1a776 100644
--- a/src/lib/ecore/efl_loop.c
+++ b/src/lib/ecore/efl_loop.c
@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <math.h>
 #include <sys/time.h>
 #include <errno.h>
diff --git a/src/lib/ecore/efl_loop_message.c b/src/lib/ecore/efl_loop_message.c
index dc93020e6f..1c74ef8abc 100644
--- a/src/lib/ecore/efl_loop_message.c
+++ b/src/lib/ecore/efl_loop_message.c
@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <math.h>
 
 #include "Ecore.h"
diff --git a/src/lib/ecore/efl_loop_message_handler.c b/src/lib/ecore/efl_loop_message_handler.c
index e243c1713e..42cfc9bb69 100644
--- a/src/lib/ecore/efl_loop_message_handler.c
+++ b/src/lib/ecore/efl_loop_message_handler.c
@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <math.h>
 
 #include "Ecore.h"
diff --git a/src/lib/ecore/efl_thread.c b/src/lib/ecore/efl_thread.c
index ab6fdab7a1..11bb010574 100644
--- a/src/lib/ecore/efl_thread.c
+++ b/src/lib/ecore/efl_thread.c
@@ -13,7 +13,7 @@
 
 #include "ecore_private.h"
 
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <fcntl.h>
 #include <string.h>
 
diff --git a/src/lib/ecore_buffer/ecore_buffer_consumer.c b/src/lib/ecore_buffer/ecore_buffer_consumer.c
index d32026d891..417bfa5142 100644
--- a/src/lib/ecore_buffer/ecore_buffer_consumer.c
+++ b/src/lib/ecore_buffer/ecore_buffer_consumer.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include <Eina.h>
 #include <Ecore_Buffer.h>
diff --git a/src/lib/ecore_buffer/ecore_buffer_provider.c b/src/lib/ecore_buffer/ecore_buffer_provider.c
index 53380fac84..6c2ee6c4a8 100644
--- a/src/lib/ecore_buffer/ecore_buffer_provider.c
+++ b/src/lib/ecore_buffer/ecore_buffer_provider.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include <Eina.h>
 #include <Ecore_Buffer.h>
diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index 8a4e0fb43e..e80d796767 100644
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -7,7 +7,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <fcntl.h>
 
 #ifdef HAVE_SYS_SOCKET_H
diff --git a/src/lib/ecore_con/ecore_con_local.c b/src/lib/ecore_con/ecore_con_local.c
index fae182e133..009632486f 100644
--- a/src/lib/ecore_con/ecore_con_local.c
+++ b/src/lib/ecore_con/ecore_con_local.c
@@ -5,7 +5,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <time.h>
 #include <fcntl.h>
 #include <sys/types.h>
diff --git a/src/lib/ecore_con/ecore_con_proxy_helper.c b/src/lib/ecore_con/ecore_con_proxy_helper.c
index 01b90652d8..740bf08a9d 100644
--- a/src/lib/ecore_con/ecore_con_proxy_helper.c
+++ b/src/lib/ecore_con/ecore_con_proxy_helper.c
@@ -7,7 +7,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <fcntl.h>
 
 #include "Ecore.h"
diff --git a/src/lib/ecore_con/ecore_con_socks.c b/src/lib/ecore_con/ecore_con_socks.c
index 0068b33076..75c56bca93 100644
--- a/src/lib/ecore_con/ecore_con_socks.c
+++ b/src/lib/ecore_con/ecore_con_socks.c
@@ -7,7 +7,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <fcntl.h>
 
 #ifdef HAVE_SYS_SOCKET_H
diff --git a/src/lib/ecore_con/ecore_con_url.c b/src/lib/ecore_con/ecore_con_url.c
index ec1e5b1a0c..ca8a5483c7 100644
--- a/src/lib/ecore_con/ecore_con_url.c
+++ b/src/lib/ecore_con/ecore_con_url.c
@@ -15,7 +15,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <fcntl.h>
 #include <libgen.h>
 
diff --git a/src/lib/ecore_con/ecore_con_url_curl.c b/src/lib/ecore_con/ecore_con_url_curl.c
index f4fe730cdd..1349ff560a 100644
--- a/src/lib/ecore_con/ecore_con_url_curl.c
+++ b/src/lib/ecore_con/ecore_con_url_curl.c
@@ -6,7 +6,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #ifdef _WIN32
 # include <ws2tcpip.h>
diff --git a/src/lib/ecore_drm2/ecore_drm2_fb.c b/src/lib/ecore_drm2/ecore_drm2_fb.c
index e91cf67ec5..d65a20c6a8 100644
--- a/src/lib/ecore_drm2/ecore_drm2_fb.c
+++ b/src/lib/ecore_drm2/ecore_drm2_fb.c
@@ -523,7 +523,7 @@ _fb_atomic_flip(Ecore_Drm2_Output *output)
                                   output);
         if (res == 0) break;
         else ERR("DRM atomic commit failed - retry #%i", i + 1);
-        usleep(100);
+        evil_usleep(100);
      }
 
    if (res < 0)
@@ -618,7 +618,7 @@ _fb_flip(Ecore_Drm2_Output *output)
                   ERR("Pageflip EBUSY for %i tries - give up", count);
                   break;
                }
-             usleep(100);
+             evil_usleep(100);
           }
         else
           {
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index 75a0de18a6..d26d86778e 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -12,7 +12,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #ifdef _WIN32
 # include <evil_private.h> /* mmap */
diff --git a/src/lib/ecore_evas/ecore_evas_module.c b/src/lib/ecore_evas/ecore_evas_module.c
index 2b5394b06f..237e4779a2 100644
--- a/src/lib/ecore_evas/ecore_evas_module.c
+++ b/src/lib/ecore_evas/ecore_evas_module.c
@@ -7,7 +7,7 @@
 
 #include "Ecore_Evas.h"
 #include "ecore_evas_private.h"
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include "../../static_libs/buildsystem/buildsystem.h"
 
diff --git a/src/lib/ecore_fb/ecore_fb_private.h b/src/lib/ecore_fb/ecore_fb_private.h
index e48c7b09f8..22b85bf218 100644
--- a/src/lib/ecore_fb/ecore_fb_private.h
+++ b/src/lib/ecore_fb/ecore_fb_private.h
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <termios.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/lib/ecore_fb/ecore_fb_vt.c b/src/lib/ecore_fb/ecore_fb_vt.c
index c0c4536751..f78e8b84af 100644
--- a/src/lib/ecore_fb/ecore_fb_vt.c
+++ b/src/lib/ecore_fb/ecore_fb_vt.c
@@ -135,7 +135,7 @@ _ecore_fb_vt_setup(void)
    _ecore_fb_filter_handler = ecore_event_filter_add(_ecore_fb_event_filter_start, _ecore_fb_event_filter_filter, _ecore_fb_event_filter_end, NULL);
    */
 
-   usleep(40000);
+   evil_usleep(40000);
    if (ioctl(_ecore_fb_vt_tty_fd, VT_ACTIVATE, _ecore_fb_vt_current_vt) < 0)
      {
         perror("[ecore_fb:vt_setup] error on VT_ACTIVATE");
diff --git a/src/lib/ecore_file/ecore_file.c b/src/lib/ecore_file/ecore_file.c
index ab8b07f1ce..16b48de9b4 100644
--- a/src/lib/ecore_file/ecore_file.c
+++ b/src/lib/ecore_file/ecore_file.c
@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <libgen.h>
 
 #ifdef _WIN32
@@ -634,7 +634,7 @@ ecore_file_readlink(const char *link)
    char buf[PATH_MAX];
    int count;
 
-   if ((count = readlink(link, buf, sizeof(buf) - 1)) < 0) return NULL;
+   if ((count = evil_readlink(link, buf, sizeof(buf) - 1)) < 0) return NULL;
    buf[count] = 0;
    return strdup(buf);
 #else
diff --git a/src/lib/ecore_file/ecore_file_monitor_inotify.c b/src/lib/ecore_file/ecore_file_monitor_inotify.c
index 988893de4f..2da6bfe71a 100644
--- a/src/lib/ecore_file/ecore_file_monitor_inotify.c
+++ b/src/lib/ecore_file/ecore_file_monitor_inotify.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <fcntl.h>
 
 #include "ecore_file_private.h"
diff --git a/src/lib/ecore_imf/ecore_imf_module.c b/src/lib/ecore_imf/ecore_imf_module.c
index 391778f43b..9fe1ad14c3 100644
--- a/src/lib/ecore_imf/ecore_imf_module.c
+++ b/src/lib/ecore_imf/ecore_imf_module.c
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include <Ecore.h>
 #include <ecore_private.h>
diff --git a/src/lib/ecore_input/ecore_input_joystick.c b/src/lib/ecore_input/ecore_input_joystick.c
index 28f527bc89..82e9ab1c52 100644
--- a/src/lib/ecore_input/ecore_input_joystick.c
+++ b/src/lib/ecore_input/ecore_input_joystick.c
@@ -9,7 +9,7 @@
 
 #include <stdio.h>
 #include <fcntl.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #ifdef HAVE_EEZE
  #include "Eeze.h"
diff --git a/src/lib/ecore_wl2/ecore_wl2_dnd.c b/src/lib/ecore_wl2/ecore_wl2_dnd.c
index c9ac71fba5..29160fc0ad 100644
--- a/src/lib/ecore_wl2/ecore_wl2_dnd.c
+++ b/src/lib/ecore_wl2/ecore_wl2_dnd.c
@@ -26,7 +26,7 @@
 # include <config.h>
 #endif
 
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <fcntl.h>
 #include <sys/epoll.h>
 #include "ecore_wl2_private.h"
diff --git a/src/lib/ecore_wl2/ecore_wl2_input.c b/src/lib/ecore_wl2/ecore_wl2_input.c
index 0d7aaaa727..64cd507454 100644
--- a/src/lib/ecore_wl2/ecore_wl2_input.c
+++ b/src/lib/ecore_wl2/ecore_wl2_input.c
@@ -39,7 +39,7 @@
 # define BTN_BACK 0x116
 #endif
 
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <sys/mman.h>
 #include "ecore_wl2_private.h"
 
diff --git a/src/lib/ecore_x/ecore_x.c b/src/lib/ecore_x/ecore_x.c
index ff603bb43b..cb037352ed 100644
--- a/src/lib/ecore_x/ecore_x.c
+++ b/src/lib/ecore_x/ecore_x.c
@@ -13,7 +13,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 //#define LOGRT 1
 
diff --git a/src/lib/ecore_x/ecore_x_vsync.c b/src/lib/ecore_x/ecore_x_vsync.c
index e002e48302..f2d714c79f 100644
--- a/src/lib/ecore_x/ecore_x_vsync.c
+++ b/src/lib/ecore_x/ecore_x_vsync.c
@@ -9,7 +9,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <dlfcn.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/lib/ecore_x/ecore_x_window.c b/src/lib/ecore_x/ecore_x_window.c
index 5600956605..40175c7045 100644
--- a/src/lib/ecore_x/ecore_x_window.c
+++ b/src/lib/ecore_x/ecore_x_window.c
@@ -4,7 +4,7 @@
 
 #include <stdlib.h>
 #include <sys/types.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include "Ecore.h"
 #include "ecore_x_private.h"
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index 03e288c567..67888970e9 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -27,7 +27,7 @@
 #include <time.h>
 #include <sys/time.h>
 #include <errno.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include <fcntl.h>
 
diff --git a/src/lib/eet/eet_cipher.c b/src/lib/eet/eet_cipher.c
index 2314c24e03..f103e0798e 100644
--- a/src/lib/eet/eet_cipher.c
+++ b/src/lib/eet/eet_cipher.c
@@ -6,7 +6,7 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #ifdef HAVE_SIGNATURE
 # ifdef _WIN32
diff --git a/src/lib/eet/eet_lib.c b/src/lib/eet/eet_lib.c
index 0e05b2acaf..34f7e1b9d1 100644
--- a/src/lib/eet/eet_lib.c
+++ b/src/lib/eet/eet_lib.c
@@ -8,7 +8,7 @@
 #include <sys/stat.h>
 #include <time.h>
 #include <string.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <fnmatch.h>
 #include <fcntl.h>
 
diff --git a/src/lib/eeze/eeze_disk.c b/src/lib/eeze/eeze_disk.c
index 60c4fa74b7..9f5a546ecc 100644
--- a/src/lib/eeze/eeze_disk.c
+++ b/src/lib/eeze/eeze_disk.c
@@ -5,7 +5,7 @@
 #include <Ecore.h>
 #include <Eeze.h>
 #include <Eeze_Disk.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include "eeze_udev_private.h"
 #include "eeze_disk_private.h"
diff --git a/src/lib/eeze/eeze_disk_libmount.c b/src/lib/eeze/eeze_disk_libmount.c
index 9cc1980bb2..4befe9e3c1 100644
--- a/src/lib/eeze/eeze_disk_libmount.c
+++ b/src/lib/eeze/eeze_disk_libmount.c
@@ -10,7 +10,7 @@
 #include <Eeze.h>
 #include <Eeze_Disk.h>
 #include <libmount.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include "eeze_udev_private.h"
 #include "eeze_disk_private.h"
diff --git a/src/lib/eeze/eeze_disk_libmount_new.c b/src/lib/eeze/eeze_disk_libmount_new.c
index f7fd17d0af..c705f9713a 100644
--- a/src/lib/eeze/eeze_disk_libmount_new.c
+++ b/src/lib/eeze/eeze_disk_libmount_new.c
@@ -6,7 +6,7 @@
 # define USE_UNSTABLE_LIBMOUNT_API 1
 #endif
 
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/src/lib/eeze/eeze_disk_mount.c b/src/lib/eeze/eeze_disk_mount.c
index f6ba1207a1..6f825c40e8 100644
--- a/src/lib/eeze/eeze_disk_mount.c
+++ b/src/lib/eeze/eeze_disk_mount.c
@@ -2,7 +2,7 @@
 #include "config.h"
 #endif
 
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <errno.h>
diff --git a/src/lib/eeze/eeze_net.c b/src/lib/eeze/eeze_net.c
index 47887d74b6..e8af6ce3ab 100644
--- a/src/lib/eeze/eeze_net.c
+++ b/src/lib/eeze/eeze_net.c
@@ -5,7 +5,7 @@
 #include <arpa/inet.h>
 #include <sys/ioctl.h>
 #include <net/if.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <Eeze_Net.h>
 
 #include "eeze_udev_private.h"
diff --git a/src/lib/eeze/eeze_sensor.c b/src/lib/eeze/eeze_sensor.c
index ee31b1eba4..2b695b1d93 100644
--- a/src/lib/eeze/eeze_sensor.c
+++ b/src/lib/eeze/eeze_sensor.c
@@ -4,7 +4,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <Eina.h>
 #include <Ecore.h>
 #include <Eeze_Sensor.h>
diff --git a/src/lib/eeze/eeze_udev_find.c b/src/lib/eeze/eeze_udev_find.c
index 3b1e5ef926..0ebd4e7ee6 100644
--- a/src/lib/eeze/eeze_udev_find.c
+++ b/src/lib/eeze/eeze_udev_find.c
@@ -5,7 +5,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include <Eeze.h>
 #include "eeze_udev_private.h"
diff --git a/src/lib/eeze/eeze_udev_watch.c b/src/lib/eeze/eeze_udev_watch.c
index 7245f9d0a6..6d1ebfc24a 100644
--- a/src/lib/eeze/eeze_udev_watch.c
+++ b/src/lib/eeze/eeze_udev_watch.c
@@ -5,7 +5,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include <Ecore.h>
 #include <Eeze.h>
diff --git a/src/lib/efl_canvas_wl/dmabuf.c b/src/lib/efl_canvas_wl/dmabuf.c
index 273d141b05..6ba2c117dd 100644
--- a/src/lib/efl_canvas_wl/dmabuf.c
+++ b/src/lib/efl_canvas_wl/dmabuf.c
@@ -38,7 +38,7 @@
 #include "linux-dmabuf-unstable-v1-server-protocol.h"
 #include <stdlib.h>
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include "dmabuf.h"
 #include <Eina.h>
 
diff --git a/src/lib/efl_canvas_wl/efl_canvas_wl.c b/src/lib/efl_canvas_wl/efl_canvas_wl.c
index 6430ff84a0..bf3625f54b 100644
--- a/src/lib/efl_canvas_wl/efl_canvas_wl.c
+++ b/src/lib/efl_canvas_wl/efl_canvas_wl.c
@@ -11,7 +11,7 @@
 # pragma GCC diagnostic ignored "-Wunused-parameter"
 #endif
 
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <sys/mman.h>
 #include <sys/socket.h>
 #include <fcntl.h>
diff --git a/src/lib/efreet/efreet.c b/src/lib/efreet/efreet.c
index 091899f2b2..0892d7c177 100644
--- a/src/lib/efreet/efreet.c
+++ b/src/lib/efreet/efreet.c
@@ -2,7 +2,7 @@
 # include <config.h>
 #endif
 
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 
diff --git a/src/lib/efreet/efreet_base.c b/src/lib/efreet/efreet_base.c
index 6497e8d955..6f70089f7d 100644
--- a/src/lib/efreet/efreet_base.c
+++ b/src/lib/efreet/efreet_base.c
@@ -5,7 +5,7 @@
 # include <config.h>
 #endif
 
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <ctype.h>
 #include <sys/types.h>
 
diff --git a/src/lib/efreet/efreet_cache.c b/src/lib/efreet/efreet_cache.c
index 329bcc7ebc..334aa70949 100644
--- a/src/lib/efreet/efreet_cache.c
+++ b/src/lib/efreet/efreet_cache.c
@@ -8,7 +8,7 @@
  */
 
 #include <libgen.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 
@@ -141,7 +141,7 @@ _ipc_launch(void)
    while ((!ipc) && (num < tries))
      {
         num++;
-        usleep(try_gap);
+        evil_usleep(try_gap);
         ipc = ecore_ipc_server_connect(ECORE_IPC_LOCAL_USER, "efreetd", 0, NULL);
      }
    if (!ipc) ERR("Timeout in trying to start and then connect to efreetd");
diff --git a/src/lib/efreet/efreet_desktop_command.c b/src/lib/efreet/efreet_desktop_command.c
index 6c388caa3f..edf1705617 100644
--- a/src/lib/efreet/efreet_desktop_command.c
+++ b/src/lib/efreet/efreet_desktop_command.c
@@ -2,7 +2,7 @@
 # include <config.h>
 #endif
 
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <ctype.h>
 
 #ifdef _WIN32
diff --git a/src/lib/efreet/efreet_menu.c b/src/lib/efreet/efreet_menu.c
index 06c2c418fb..f454af088f 100644
--- a/src/lib/efreet/efreet_menu.c
+++ b/src/lib/efreet/efreet_menu.c
@@ -14,7 +14,7 @@ static int _efreet_menu_log_dom = -1;
 #include "Efreet.h"
 #include "efreet_private.h"
 #include "efreet_xml.h"
-#include <unistd.h>
+#include <evil_unistd.h>
 
 typedef struct Efreet_Menu_Move Efreet_Menu_Move;
 
diff --git a/src/lib/efreet/efreet_mime.c b/src/lib/efreet/efreet_mime.c
index 9eba8c8db9..5e69bafdb4 100644
--- a/src/lib/efreet/efreet_mime.c
+++ b/src/lib/efreet/efreet_mime.c
@@ -5,7 +5,7 @@
 #include <ctype.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <fnmatch.h>
 
 #include <Ecore.h>
diff --git a/src/lib/efreet/efreet_trash.c b/src/lib/efreet/efreet_trash.c
index 04a4a6cda4..f304e2775e 100644
--- a/src/lib/efreet/efreet_trash.c
+++ b/src/lib/efreet/efreet_trash.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <sys/stat.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <libgen.h>
 #include <errno.h>
 
diff --git a/src/lib/efreet/efreet_xml.c b/src/lib/efreet/efreet_xml.c
index 97a44aa9de..c411995922 100644
--- a/src/lib/efreet/efreet_xml.c
+++ b/src/lib/efreet/efreet_xml.c
@@ -5,7 +5,7 @@
 #include <ctype.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #ifdef _WIN32
 # include <evil_private.h> /* mmap */
diff --git a/src/lib/eina/eina_cpu.c b/src/lib/eina/eina_cpu.c
index bac68fee4a..aee50b8dac 100644
--- a/src/lib/eina/eina_cpu.c
+++ b/src/lib/eina/eina_cpu.c
@@ -46,7 +46,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include "eina_log.h"
 #include "eina_cpu.h"
diff --git a/src/lib/eina/eina_debug.c b/src/lib/eina/eina_debug.c
index c811c5fe2a..884ddc9676 100644
--- a/src/lib/eina/eina_debug.c
+++ b/src/lib/eina/eina_debug.c
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #ifdef HAVE_SYS_EPOLL_H
 # include <sys/epoll.h>
 #endif
diff --git a/src/lib/eina/eina_debug_bt_file.c b/src/lib/eina/eina_debug_bt_file.c
index 672b3fe20d..0ed6c79146 100644
--- a/src/lib/eina/eina_debug_bt_file.c
+++ b/src/lib/eina/eina_debug_bt_file.c
@@ -19,7 +19,7 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #ifdef _WIN32
 #include <evil_private.h> /* realpath */
diff --git a/src/lib/eina/eina_debug_cpu.c b/src/lib/eina/eina_debug_cpu.c
index 931139f5c0..a91509aa46 100644
--- a/src/lib/eina/eina_debug_cpu.c
+++ b/src/lib/eina/eina_debug_cpu.c
@@ -6,7 +6,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <pthread.h>
 #include <signal.h>
 #include <sys/types.h>
@@ -234,7 +234,7 @@ _sysmon(void *data EINA_UNUSED, Eina_Thread thr EINA_UNUSED)
                   cpufreqs[i] = freq;
                }
           }
-        usleep(1000); // 1ms sleep
+        evil_usleep(1000); // 1ms sleep
      }
    _eina_debug_cpu_active = -1;
    eina_lock_release(&_sysmon_lock);
@@ -279,7 +279,7 @@ _stop_cpu_thread(void)
    /* wait for thread to exit */
    while (!fork_resetting)
      {
-        usleep(1000);
+        evil_usleep(1000);
         eina_lock_take(&_sysmon_lock);
         if (_eina_debug_cpu_active == -1)
           {
diff --git a/src/lib/eina/eina_debug_timer.c b/src/lib/eina/eina_debug_timer.c
index 8d03c0e57b..7ea05077fb 100644
--- a/src/lib/eina/eina_debug_timer.c
+++ b/src/lib/eina/eina_debug_timer.c
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #ifdef HAVE_SYS_EPOLL_H
 # include <sys/epoll.h>
 #endif
diff --git a/src/lib/eina/eina_evlog.c b/src/lib/eina/eina_evlog.c
index eb32dfc27b..c02e1efa81 100644
--- a/src/lib/eina/eina_evlog.c
+++ b/src/lib/eina/eina_evlog.c
@@ -34,7 +34,7 @@
 #endif
 
 #include <time.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #ifdef _WIN32
 # include <evil_private.h> /* mmap */
diff --git a/src/lib/eina/eina_file.c b/src/lib/eina/eina_file.c
index 0d9486568f..5dd8b6f014 100644
--- a/src/lib/eina/eina_file.c
+++ b/src/lib/eina/eina_file.c
@@ -30,7 +30,7 @@
 #endif
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #ifdef HAVE_SYS_MMAN_H
 # include <sys/mman.h>
 #endif
diff --git a/src/lib/eina/eina_file_common.c b/src/lib/eina/eina_file_common.c
index e70d9ef1cb..59b8904f87 100644
--- a/src/lib/eina/eina_file_common.c
+++ b/src/lib/eina/eina_file_common.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 
diff --git a/src/lib/eina/eina_inline_lock_posix.x b/src/lib/eina/eina_inline_lock_posix.x
index 911b5c1f3b..0602937e9a 100644
--- a/src/lib/eina/eina_inline_lock_posix.x
+++ b/src/lib/eina/eina_inline_lock_posix.x
@@ -50,7 +50,7 @@
 #include <string.h>
 
 #include <sys/types.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #ifdef EINA_HAVE_DEBUG_THREADS
 #include <assert.h>
diff --git a/src/lib/eina/eina_log.c b/src/lib/eina/eina_log.c
index 7c66ee0b53..8d1be79cf9 100644
--- a/src/lib/eina/eina_log.c
+++ b/src/lib/eina/eina_log.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <fnmatch.h>
 #include <assert.h>
 #include <errno.h>
diff --git a/src/lib/eina/eina_main.c b/src/lib/eina/eina_main.c
index 47dd80a898..88a45fcda8 100644
--- a/src/lib/eina/eina_main.c
+++ b/src/lib/eina/eina_main.c
@@ -27,7 +27,7 @@
 # ifdef HAVE_SYS_TYPES_H
 #  include <sys/types.h>
 # endif
-# include <unistd.h>
+# include <evil_unistd.h>
 #endif
 
 #ifdef HAVE_MCHECK_H
diff --git a/src/lib/eina/eina_mmap.c b/src/lib/eina/eina_mmap.c
index 23386dac1d..af93a27dff 100644
--- a/src/lib/eina/eina_mmap.c
+++ b/src/lib/eina/eina_mmap.c
@@ -41,7 +41,7 @@
 #include <signal.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #if HAVE_SIGINFO_H
 # include <siginfo.h>
diff --git a/src/lib/eina/eina_module.c b/src/lib/eina/eina_module.c
index 171b71afad..4650e2275b 100644
--- a/src/lib/eina/eina_module.c
+++ b/src/lib/eina/eina_module.c
@@ -25,7 +25,7 @@
 #include <sys/types.h>
 #include <string.h>
 #include <libgen.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #if defined HAVE_DLOPEN && ! defined _WIN32
 # include <dlfcn.h>
diff --git a/src/lib/eina/eina_prefix.c b/src/lib/eina/eina_prefix.c
index dd483a085a..a6f55877e4 100644
--- a/src/lib/eina/eina_prefix.c
+++ b/src/lib/eina/eina_prefix.c
@@ -34,7 +34,7 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <limits.h>
 
 #if defined HAVE_DLADDR && ! defined _WIN32
diff --git a/src/lib/eina/eina_thread_queue.c b/src/lib/eina/eina_thread_queue.c
index 531800dac7..e08d76a180 100644
--- a/src/lib/eina/eina_thread_queue.c
+++ b/src/lib/eina/eina_thread_queue.c
@@ -2,7 +2,7 @@
 # include "config.h"
 #endif
 
-#include <unistd.h>
+#include <evil_unistd.h>
 #include "Eina.h"
 #include "eina_thread_queue.h"
 #include "eina_safety_checks.h"
diff --git a/src/lib/eina/eina_util.c b/src/lib/eina/eina_util.c
index 290038037d..9e668bbf6b 100644
--- a/src/lib/eina/eina_util.c
+++ b/src/lib/eina/eina_util.c
@@ -19,20 +19,7 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
-#include <stdlib.h>
-#include <unistd.h>
-#ifdef _WIN32
-# include <string.h>
-#else
-# include <sys/types.h>
-# include <pwd.h>
-# include <string.h>
-#endif
-
-#include "eina_config.h"
-#include "eina_private.h"
-#include "eina_tmpstr.h"
+#include "eina_util.h"
 
 /*============================================================================*
  *                                  Local                                     *
@@ -131,4 +118,4 @@ eina_environment_tmp_get(void)
 
    tmp = strdup(tmp);
    return tmp;
-}
+}
\ No newline at end of file
diff --git a/src/lib/eina/eina_util.h b/src/lib/eina/eina_util.h
index 08b15233ab..e18a16ee89 100644
--- a/src/lib/eina/eina_util.h
+++ b/src/lib/eina/eina_util.h
@@ -19,8 +19,26 @@
 #ifndef EINA_UTIL_H_
 #define EINA_UTIL_H_
 
+#ifdef _WIN32
+# include <string.h>
+# ifndef WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+# endif
+# include <Windows.h>
+# undef WIN32_LEAN_AND_MEAN
+#else
+# include <pwd.h>
+#endif
+#include <evil_unistd.h>
 #include <float.h>
 #include <math.h>
+#include <stdlib.h>
+#include <evil_unistd.h>
+#include <sys/types.h>
+#include <string.h>
+#include "eina_config.h"
+#include "eina_private.h"
+#include "eina_tmpstr.h"
 
 /**
  * @addtogroup Eina_Tools_Group Tools
diff --git a/src/lib/eina/eina_xattr.c b/src/lib/eina/eina_xattr.c
index a32ff5306a..2ddc04e743 100644
--- a/src/lib/eina/eina_xattr.c
+++ b/src/lib/eina/eina_xattr.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <string.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <math.h>
 
 #ifdef HAVE_XATTR
diff --git a/src/lib/eio/Eio.h b/src/lib/eio/Eio.h
index fb0fc64813..bb3018d3f1 100644
--- a/src/lib/eio/Eio.h
+++ b/src/lib/eio/Eio.h
@@ -26,7 +26,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include <Eina.h>
 #include <Eet.h>
diff --git a/src/lib/eio/eio_dir.c b/src/lib/eio/eio_dir.c
index 076d337764..9dae278a32 100644
--- a/src/lib/eio/eio_dir.c
+++ b/src/lib/eio/eio_dir.c
@@ -300,7 +300,7 @@ _eio_dir_link(Ecore_Thread *thread, Eio_Dir_Copy *order,
 
         /* read link target */
         if (target)
-          length = readlink(ln, target, bsz);
+          length = evil_readlink(ln, target, bsz);
         if (length < 0)
           goto on_error;
 
diff --git a/src/lib/eio/eio_private.h b/src/lib/eio/eio_private.h
index e8f9c856a4..cc4011ea9b 100644
--- a/src/lib/eio/eio_private.h
+++ b/src/lib/eio/eio_private.h
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <fcntl.h>
 
 #ifdef HAVE_FEATURES_H
diff --git a/src/lib/eio/eio_single.c b/src/lib/eio/eio_single.c
index c0c21a5979..a0c22e069d 100644
--- a/src/lib/eio/eio_single.c
+++ b/src/lib/eio/eio_single.c
@@ -22,7 +22,6 @@
 #ifdef _WIN32
 # include <evil_private.h> /* mkdir */
 #endif
-
 #include "eio_private.h"
 #include "Eio.h"
 
@@ -251,10 +250,9 @@ _eio_file_chown(void *data, Ecore_Thread *thread)
 
    if (owner == (uid_t) -1 && group == (gid_t) -1)
      goto on_error;
-
-   if (chown(own->path, owner, group) != 0)
+   
+   if (evil_chown(own->path, owner, group) != 0)
      eio_file_thread_error(&own->common, thread);
-
    return;
 
  on_error:
diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h
index ffc5fd43c5..37964aff50 100644
--- a/src/lib/elementary/Efl_Ui.h
+++ b/src/lib/elementary/Efl_Ui.h
@@ -7,7 +7,7 @@
 /* Standard headers for standard system calls etc. */
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/lib/elementary/Elementary.h b/src/lib/elementary/Elementary.h
index c83481a9fd..566023fc90 100644
--- a/src/lib/elementary/Elementary.h
+++ b/src/lib/elementary/Elementary.h
@@ -13,7 +13,7 @@
 /* Standard headers for standard system calls etc. */
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index 4bf652077b..8e500925dd 100644
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -1188,7 +1188,7 @@ elm_quicklaunch_fork(int    argc,
              perror("could not fork");
              return 0;
           }
-        setsid();
+        evil_setsid();
         if (chdir(cwd) != 0) perror("could not chdir");
         args = alloca((argc + 1) * sizeof(char *));
         for (i = 0; i < argc; i++) args[i] = argv[i];
@@ -1228,7 +1228,7 @@ elm_quicklaunch_fork(int    argc,
 #endif
      }
 
-   if (setsid() < 0) perror("could not setsid");
+   if (evil_setsid() < 0) perror("could not setsid");
    if (chdir(cwd) != 0) perror("could not chdir");
    if (_elm_config->atspi_mode != ELM_ATSPI_MODE_OFF)
      _elm_atspi_bridge_init();
diff --git a/src/lib/elua/cache.c b/src/lib/elua/cache.c
index b18d690569..bed8f3340f 100644
--- a/src/lib/elua/cache.c
+++ b/src/lib/elua/cache.c
@@ -3,7 +3,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 /* bytecode caching */
 
diff --git a/src/lib/emotion/emotion_modules.c b/src/lib/emotion/emotion_modules.c
index c23d0bb69d..a51ef58773 100644
--- a/src/lib/emotion/emotion_modules.c
+++ b/src/lib/emotion/emotion_modules.c
@@ -9,7 +9,7 @@
 
 #include "emotion_private.h"
 #include "../../static_libs/buildsystem/buildsystem.h"
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #ifdef EMOTION_STATIC_BUILD_XINE
 Eina_Bool xine_module_init(void);
diff --git a/src/lib/ethumb/ethumb.c b/src/lib/ethumb/ethumb.c
index ca019823ae..270d26ef37 100644
--- a/src/lib/ethumb/ethumb.c
+++ b/src/lib/ethumb/ethumb.c
@@ -36,7 +36,7 @@
 #include <stdlib.h>
 #include <limits.h>
 #include <string.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/lib/ethumb_client/ethumb_client.c b/src/lib/ethumb_client/ethumb_client.c
index e5919f7dbf..f9da83f9f9 100644
--- a/src/lib/ethumb_client/ethumb_client.c
+++ b/src/lib/ethumb_client/ethumb_client.c
@@ -69,7 +69,7 @@
 #include <stdlib.h>
 #include <limits.h>
 #include <string.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <stdbool.h>
diff --git a/src/lib/evas/canvas/evas_async_events.c b/src/lib/evas/canvas/evas_async_events.c
index 9e19c3d38d..a21f67a028 100644
--- a/src/lib/evas/canvas/evas_async_events.c
+++ b/src/lib/evas/canvas/evas_async_events.c
@@ -2,7 +2,7 @@
 # include <config.h>
 #endif
 
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <errno.h>
 
 #ifdef _WIN32
diff --git a/src/lib/evas/canvas/evas_font_dir.c b/src/lib/evas/canvas/evas_font_dir.c
index 5b945dcb27..9ae3861252 100644
--- a/src/lib/evas/canvas/evas_font_dir.c
+++ b/src/lib/evas/canvas/evas_font_dir.c
@@ -66,7 +66,7 @@ static FcConfig *fc_config = NULL;
 /* FIXME move these helper function to eina_file or eina_path */
 /* get the casefold feature! */
 #include <fnmatch.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <sys/param.h>
 int
 _file_path_is_full_path(const char *path)
diff --git a/src/lib/evas/canvas/evas_image_private.h b/src/lib/evas/canvas/evas_image_private.h
index 693125fb84..4daf7f297f 100644
--- a/src/lib/evas/canvas/evas_image_private.h
+++ b/src/lib/evas/canvas/evas_image_private.h
@@ -11,7 +11,7 @@
 #include "evas_common_private.h"
 
 #include <sys/types.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <math.h>
 
 #include "evas_private.h"
diff --git a/src/lib/evas/common/evas_image_load.c b/src/lib/evas/common/evas_image_load.c
index a969153528..ccad2b5c23 100644
--- a/src/lib/evas/common/evas_image_load.c
+++ b/src/lib/evas/common/evas_image_load.c
@@ -4,7 +4,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include "evas_common_private.h"
 #include "evas_private.h"
diff --git a/src/lib/evas/common/evas_image_scalecache.c b/src/lib/evas/common/evas_image_scalecache.c
index 65cb9a3c21..9b34cdd8dc 100644
--- a/src/lib/evas/common/evas_image_scalecache.c
+++ b/src/lib/evas/common/evas_image_scalecache.c
@@ -537,11 +537,7 @@ evas_common_rgba_image_scalecache_prepare(Image_Entry *ie, RGBA_Image *dst EINA_
         
         while (slpt < 500000)
           {
-#ifdef _WIN32
-             Sleep(slp / 1000);
-#else
-             usleep(slp);
-#endif
+             evil_usleep(slp);
              slpt += slp;
              slp++;
              ret = SLKT(im->cache.lock);
diff --git a/src/lib/evas/common/evas_pipe.c b/src/lib/evas/common/evas_pipe.c
index 55e551ba50..cf45ede2bd 100644
--- a/src/lib/evas/common/evas_pipe.c
+++ b/src/lib/evas/common/evas_pipe.c
@@ -1,5 +1,5 @@
 #include "evas_common_private.h"
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #ifdef BUILD_PIPE_RENDER
 
diff --git a/src/lib/evas/file/evas_path.c b/src/lib/evas/file/evas_path.c
index ef3d439018..530b79b157 100644
--- a/src/lib/evas/file/evas_path.c
+++ b/src/lib/evas/file/evas_path.c
@@ -13,7 +13,7 @@
 #include <sys/stat.h>
 /* get the casefold feature! */
 #include <fnmatch.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <sys/param.h>
 
 #ifdef _WIN32
diff --git a/src/lib/evas/include/evas_common_private.h b/src/lib/evas/include/evas_common_private.h
index 0190b27163..35f86ca0c5 100644
--- a/src/lib/evas/include/evas_common_private.h
+++ b/src/lib/evas/include/evas_common_private.h
@@ -22,7 +22,7 @@
 #include <time.h>
 #include <ctype.h>
 #include <stdint.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #ifdef HAVE_PIXMAN
 #include <pixman.h>
@@ -30,7 +30,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include <Eina.h>
 #include <Eo.h>
diff --git a/src/lib/evil/evil_mman.c b/src/lib/evil/evil_mman.c
index 42f8021e59..8ecac96286 100644
--- a/src/lib/evil/evil_mman.c
+++ b/src/lib/evil/evil_mman.c
@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <sys/types.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <errno.h>
 
 #include <io.h>
diff --git a/src/lib/evil/evil_unistd.c b/src/lib/evil/evil_unistd.c
index 3eebf97e1e..43bc2838bf 100644
--- a/src/lib/evil/evil_unistd.c
+++ b/src/lib/evil/evil_unistd.c
@@ -4,14 +4,7 @@
 
 #include <errno.h>
 #include <direct.h>
-# include <sys/time.h>
-
-#ifndef WIN32_LEAN_AND_MEAN
-# define WIN32_LEAN_AND_MEAN
-#endif
-#include <winsock2.h>
-#undef WIN32_LEAN_AND_MEAN
-
+#include <sys/time.h>
 #include "evil_private.h"
 
 
@@ -197,3 +190,64 @@ evil_pipe(int *fds)
 
    return -1;
 }
+
+EAPI void
+evil_sleep(unsigned int seconds)
+{
+#ifdef _WIN32
+   Sleep(seconds * 1000);
+#else
+   sleep(seconds);
+#endif
+}
+
+EAPI void
+evil_usleep(unsigned int microseconds)
+{
+#ifdef _WIN32
+   DWORD us = microseconds / 1000;
+   Sleep(us);
+#else
+   usleep(microseconds);
+#endif
+}
+
+EAPI int
+evil_chown(const char *pathname, uid_t owner, gid_t group)
+{
+   int ret;
+#ifdef _WIN32
+   SECURITY_DESCRIPTOR securityDescriptor;
+   DWORD lpnLengthNeeded;
+   GetFileSecurityA(pathname, OWNER_SECURITY_INFORMATION, &securityDescriptor,sizeof(securityDescriptor),&lpnLengthNeeded);
+   securityDescriptor.Owner = owner;
+   securityDescriptor.Group = group;
+   ret = (SetFileSecurityA(pathname, OWNER_SECURITY_INFORMATION, &securityDescriptor) != 0) ? 0 : -1;      
+#else
+   ret = chown(pathname, owner, group);
+#endif
+   return ret;
+}
+
+EAPI int
+evil_readlink(const char *pathname, char *buf, size_t bufsize)
+{
+#ifdef _WIN32
+   ssize_t string_size = strlen(pathname);
+   int n = string_size < bufsize ? string_size : bufsize;
+   strncpy(buf,pathname, n);
+   return n;
+#else
+   readlink(buf,pathname,bufsize);
+#endif
+}
+
+EAPI int
+evil_setsid(void)
+{
+#ifdef _WIN32
+   return -1;
+#else
+   return (pid_t)setsid();
+#endif
+}
\ No newline at end of file
diff --git a/src/lib/evil/evil_unistd.h b/src/lib/evil/evil_unistd.h
index d738a720b7..99b058a886 100644
--- a/src/lib/evil/evil_unistd.h
+++ b/src/lib/evil/evil_unistd.h
@@ -2,6 +2,32 @@
 #define __EVIL_UNISTD_H__
 
 #include "evil_eapi.h"
+#include "sys/types.h"
+#ifdef _WIN32
+# ifndef WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+# endif
+# include <io.h>
+# include <process.h>
+# include <winsock2.h>
+# include <Windows.h>
+# undef WIN32_LEAN_AND_MEAN
+# define F_OK 0
+# define X_OK 0
+# define W_OK 2
+# define R_OK 4
+# define STDIN_FILENO  0 
+# define STDOUT_FILENO 1
+# define STDERR_FILENO 2
+
+char optarg; //temporary
+int optind; //temporary
+int opterr; //temporary
+int optopt; //temporary
+#else
+# include <unistd.h>
+#endif
+
 
 /**
  * @file evil_unistd.h
@@ -83,6 +109,56 @@ EAPI void evil_sockets_shutdown(void);
  */
 EAPI int evil_pipe(int *fds);
 
+/*
+ * Wrapper related functions from posix unistd
+ */
+
+/**
+ * @brief Suspends the execution of calling thread until time specified by seconds.
+ * @param[in] Time in seconds for which execution is to be suspendend.
+ * 
+ * @since 1.15
+ */
+
+EAPI void evil_sleep(unsigned int seconds);
+
+/**
+ * @brief Suspends the execution of calling thread until time specified by microseconds.
+ * @param[in] Time in microseconds for which execution is to be suspendend.
+ * 
+ * @since 1.15
+ */
+EAPI void evil_usleep(unsigned int seconds);
+
+/**
+ * @brief Changes the ownership of the file specified by pathname.
+ * @param[in] The directory path to change owner.
+ * @param[in] The new user to set.
+ * @param[in] The new group to set.
+ * 
+ * @since 1.15
+ */
+EAPI int evil_chown(const char *pathname, uid_t owner, gid_t group);
+
+/**
+ * @brief Places the contents of the symbolic link pathname in the buffer buf, which has size bufsiz.
+ * @param[in] The symbolic link pathname.
+ * @param[out] The destination buffer to store pathname.
+ * @param[in] The size of the destination buf.
+ * @return Return the numbers of bytes placed in buf. If returned value equals bufsize, then truncation may have ocurred.
+ * 
+ * @since 1.15
+ */
+EAPI int evil_readlink(const char *pathname, char *buf, size_t bufsize);
+
+/**
+ * @brief Creates a new session if the calling process is not a process group leader.
+ * @return On success, the (new) session ID of the calling process is returned. On error, 
+ * (pid_t) -1 is returned, and errno is set to indicate the error.
+ * 
+ * @since 1.15
+ */
+EAPI int evil_setsid(void);
 
 /**
  * @}
diff --git a/src/lib/evil/unposix/getopt.h b/src/lib/evil/unposix/getopt.h
index b3f3af8438..ea9f3e8a0b 100644
--- a/src/lib/evil/unposix/getopt.h
+++ b/src/lib/evil/unposix/getopt.h
@@ -3,7 +3,7 @@
 
 #include "unimplemented.h"
 
-#include <unistd.h>
+#include <evil_unistd.h>
 
 UNIMPLEMENTED int getopt(int argc, char * const argv[],
           const char *optstring)
diff --git a/src/lib/evil/unposix/meson.build b/src/lib/evil/unposix/meson.build
index 3ee9f8ff97..a3391f09df 100644
--- a/src/lib/evil/unposix/meson.build
+++ b/src/lib/evil/unposix/meson.build
@@ -18,7 +18,6 @@ if target_machine.system() == 'windows'
     'string.h',
     'strings.h',
     'unimplemented.h',
-    'unistd.h',
   ]
 
 
diff --git a/src/lib/evil/unposix/unistd.h b/src/lib/evil/unposix/unistd.h
deleted file mode 100644
index 642f711474..0000000000
--- a/src/lib/evil/unposix/unistd.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef UNISTD_H
-#define UNISTD_H
-
-#include "unimplemented.h"
-
-#include <evil_unistd.h>
-
-#define F_OK 0
-#define W_OK 2
-#define R_OK 4
-#define X_OK 0
-
-UNIMPLEMENTED extern char *optarg;
-UNIMPLEMENTED extern int optind, opterr, optopt;
-
-#endif
diff --git a/src/modules/ecore_buffer/shm/ecore_buffer_shm.c b/src/modules/ecore_buffer/shm/ecore_buffer_shm.c
index 2d65a20201..c450c64f47 100644
--- a/src/modules/ecore_buffer/shm/ecore_buffer_shm.c
+++ b/src/modules/ecore_buffer/shm/ecore_buffer_shm.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #ifdef HAVE_SYS_MMAN_H
 # include <sys/mman.h>
 #endif
diff --git a/src/modules/ecore_buffer/x11_dri2/ecore_buffer_x11_dri2.c b/src/modules/ecore_buffer/x11_dri2/ecore_buffer_x11_dri2.c
index d673facd5a..14e2834e20 100644
--- a/src/modules/ecore_buffer/x11_dri2/ecore_buffer_x11_dri2.c
+++ b/src/modules/ecore_buffer/x11_dri2/ecore_buffer_x11_dri2.c
@@ -2,7 +2,7 @@
 # include "config.h"
 #endif
 
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/src/modules/ecore_buffer/x11_dri3/ecore_buffer_x11_dri3.c b/src/modules/ecore_buffer/x11_dri3/ecore_buffer_x11_dri3.c
index d3ab7031df..ecc46ab392 100644
--- a/src/modules/ecore_buffer/x11_dri3/ecore_buffer_x11_dri3.c
+++ b/src/modules/ecore_buffer/x11_dri3/ecore_buffer_x11_dri3.c
@@ -2,7 +2,7 @@
 # include "config.h"
 #endif
 
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/src/modules/ecore_evas/engines/extn/ecore_evas_extn_engine.h b/src/modules/ecore_evas/engines/extn/ecore_evas_extn_engine.h
index a6aad2492f..8c635e7f97 100644
--- a/src/modules/ecore_evas/engines/extn/ecore_evas_extn_engine.h
+++ b/src/modules/ecore_evas/engines/extn/ecore_evas_extn_engine.h
@@ -14,7 +14,7 @@
 #endif
 #include <stdio.h>
 #include <sys/types.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <math.h>
 #include <time.h>
 
@@ -28,7 +28,7 @@
 #include <fcntl.h>
 #include <string.h>
 #include <sys/file.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <Evas.h>
 #include <Evas_Engine_Buffer.h>
 #include <Ecore.h>
diff --git a/src/modules/ecore_imf/scim/scim_imcontext.cpp b/src/modules/ecore_imf/scim/scim_imcontext.cpp
index 54249dc260..0ab949b066 100644
--- a/src/modules/ecore_imf/scim/scim_imcontext.cpp
+++ b/src/modules/ecore_imf/scim/scim_imcontext.cpp
@@ -12,7 +12,7 @@
 #include <sys/wait.h>
 #include <sys/time.h>
 #include <sys/times.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <pthread.h>
 #include <Ecore_Evas.h>
 #include <Ecore_X.h>
diff --git a/src/modules/emotion/gstreamer1/emotion_gstreamer.h b/src/modules/emotion/gstreamer1/emotion_gstreamer.h
index 2469ef28d4..44b89c3888 100644
--- a/src/modules/emotion/gstreamer1/emotion_gstreamer.h
+++ b/src/modules/emotion/gstreamer1/emotion_gstreamer.h
@@ -11,7 +11,7 @@
 #include <gst/tag/tag.h>
 #include <gst/pbutils/pbutils.h>
 
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <fcntl.h>
 
 #include <Eina.h>
diff --git a/src/modules/evas/engines/fb/evas_fb.h b/src/modules/evas/engines/fb/evas_fb.h
index 20a52cf3fa..216ef666bc 100644
--- a/src/modules/evas/engines/fb/evas_fb.h
+++ b/src/modules/evas/engines/fb/evas_fb.h
@@ -11,7 +11,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <fcntl.h>
 #include <termios.h>
 #include <errno.h>
diff --git a/src/modules/evas/engines/gl_common/evas_gl_common.h b/src/modules/evas/engines/gl_common/evas_gl_common.h
index bcd131a146..8ec256b423 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_common.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_common.h
@@ -9,7 +9,7 @@
 #include <string.h>
 #include <math.h>
 #include <sys/time.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <Eet.h>
 
 #define GL_GLEXT_PROTOTYPES
diff --git a/src/modules/evas/image_loaders/gif/evas_image_load_gif.c b/src/modules/evas/image_loaders/gif/evas_image_load_gif.c
index 02412a280d..0dc9c68fd7 100644
--- a/src/modules/evas/image_loaders/gif/evas_image_load_gif.c
+++ b/src/modules/evas/image_loaders/gif/evas_image_load_gif.c
@@ -4,7 +4,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include <gif_lib.h>
 
diff --git a/src/modules/evas/image_loaders/psd/evas_image_load_psd.c b/src/modules/evas/image_loaders/psd/evas_image_load_psd.c
index c8abd1b893..2f8e933560 100644
--- a/src/modules/evas/image_loaders/psd/evas_image_load_psd.c
+++ b/src/modules/evas/image_loaders/psd/evas_image_load_psd.c
@@ -12,7 +12,7 @@
 #include <math.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <fcntl.h>
 
 #ifdef HAVE_NETINET_IN_H
diff --git a/src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c b/src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c
index 6f1cf61e14..441343b13e 100644
--- a/src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c
+++ b/src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c
@@ -4,7 +4,7 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <tiffio.h>
 
 #include "evas_common_private.h"
diff --git a/src/tests/ecore/ecore_test_ecore.c b/src/tests/ecore/ecore_test_ecore.c
index 66544d0f98..aa76ed0c5a 100644
--- a/src/tests/ecore/ecore_test_ecore.c
+++ b/src/tests/ecore/ecore_test_ecore.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #ifdef _WIN32
 # include <evil_private.h> /* pipe */
diff --git a/src/tests/ecore/ecore_test_ecore_fb.c b/src/tests/ecore/ecore_test_ecore_fb.c
index f639dfefb6..83fbafb896 100644
--- a/src/tests/ecore/ecore_test_ecore_fb.c
+++ b/src/tests/ecore/ecore_test_ecore_fb.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include <Ecore_Fb.h>
 
diff --git a/src/tests/ecore/ecore_test_ecore_file.c b/src/tests/ecore/ecore_test_ecore_file.c
index e41ce02fe5..15ca8ba945 100644
--- a/src/tests/ecore/ecore_test_ecore_file.c
+++ b/src/tests/ecore/ecore_test_ecore_file.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/src/tests/ecore/ecore_test_ecore_input.c b/src/tests/ecore/ecore_test_ecore_input.c
index 6d0420eb64..4111c5edb2 100644
--- a/src/tests/ecore/ecore_test_ecore_input.c
+++ b/src/tests/ecore/ecore_test_ecore_input.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include <Ecore_Input.h>
 
diff --git a/src/tests/ecore/ecore_test_ecore_thread_eina_thread_queue.c b/src/tests/ecore/ecore_test_ecore_thread_eina_thread_queue.c
index be5c3cdd1e..a96905861a 100644
--- a/src/tests/ecore/ecore_test_ecore_thread_eina_thread_queue.c
+++ b/src/tests/ecore/ecore_test_ecore_thread_eina_thread_queue.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #ifdef _WIN32
 # include <evil_private.h> /* pipe */
diff --git a/src/tests/ecore/ecore_test_ecore_x.c b/src/tests/ecore/ecore_test_ecore_x.c
index 4618449322..b39ccce4bb 100644
--- a/src/tests/ecore/ecore_test_ecore_x.c
+++ b/src/tests/ecore/ecore_test_ecore_x.c
@@ -38,10 +38,10 @@ EFL_START_TEST(ecore_test_ecore_x_bell)
    printf("You should hear 3 beeps now.\n");
    for (i = 0; i < 3; i++)
      {
-	ret = ecore_x_bell(0);
-	fail_if(ret != EINA_TRUE);
-	ecore_x_sync();
-	sleep(1);
+	     ret = ecore_x_bell(0);
+	     fail_if(ret != EINA_TRUE);
+	     ecore_x_sync();
+	     evil_sleep(1);
      }
 
    ecore_x_shutdown();
diff --git a/src/tests/ecore/ecore_test_idle.c b/src/tests/ecore/ecore_test_idle.c
index 512d00124f..dd91202727 100644
--- a/src/tests/ecore/ecore_test_idle.c
+++ b/src/tests/ecore/ecore_test_idle.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include <Eina.h>
 #include <Ecore.h>
diff --git a/src/tests/ecore/ecore_test_poller.c b/src/tests/ecore/ecore_test_poller.c
index 9e981ff367..c71fee8a32 100644
--- a/src/tests/ecore/ecore_test_poller.c
+++ b/src/tests/ecore/ecore_test_poller.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include <Eina.h>
 #include <Ecore.h>
diff --git a/src/tests/ecore/efl_app_suite.c b/src/tests/ecore/efl_app_suite.c
index 957cb3099e..7a06f30951 100644
--- a/src/tests/ecore/efl_app_suite.c
+++ b/src/tests/ecore/efl_app_suite.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #define EFL_NOLEGACY_API_SUPPORT
 #include <Efl_Core.h>
 #include "efl_app_suite.h"
diff --git a/src/tests/ecore/efl_app_test_cml.c b/src/tests/ecore/efl_app_test_cml.c
index 33024dabb8..0791b53065 100644
--- a/src/tests/ecore/efl_app_test_cml.c
+++ b/src/tests/ecore/efl_app_test_cml.c
@@ -5,7 +5,7 @@
 #define EFL_CORE_COMMAND_LINE_PROTECTED
 
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #define EFL_NOLEGACY_API_SUPPORT
 #include <Efl_Core.h>
 #include "efl_app_suite.h"
diff --git a/src/tests/ecore/efl_app_test_env.c b/src/tests/ecore/efl_app_test_env.c
index e7e5a2e034..fdf8f0efef 100644
--- a/src/tests/ecore/efl_app_test_env.c
+++ b/src/tests/ecore/efl_app_test_env.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #define EFL_NOLEGACY_API_SUPPORT
 #include <Efl_Core.h>
 #include "efl_app_suite.h"
diff --git a/src/tests/ecore/efl_app_test_loop.c b/src/tests/ecore/efl_app_test_loop.c
index 6fa85a0300..55a370f08a 100644
--- a/src/tests/ecore/efl_app_test_loop.c
+++ b/src/tests/ecore/efl_app_test_loop.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include "eo_internal.h"
 #define EFL_NOLEGACY_API_SUPPORT
 #include <Efl_Core.h>
diff --git a/src/tests/ecore/efl_app_test_loop_fd.c b/src/tests/ecore/efl_app_test_loop_fd.c
index 26bd318cd1..b99c402aa6 100644
--- a/src/tests/ecore/efl_app_test_loop_fd.c
+++ b/src/tests/ecore/efl_app_test_loop_fd.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #ifdef _WIN32
 # include <evil_private.h> /* pipe */
diff --git a/src/tests/ecore/efl_app_test_loop_timer.c b/src/tests/ecore/efl_app_test_loop_timer.c
index fecc6a39cf..0bd7169e71 100644
--- a/src/tests/ecore/efl_app_test_loop_timer.c
+++ b/src/tests/ecore/efl_app_test_loop_timer.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #define EFL_NOLEGACY_API_SUPPORT
 #include <Efl_Core.h>
 #include "efl_app_suite.h"
diff --git a/src/tests/ecore/efl_app_test_promise.c b/src/tests/ecore/efl_app_test_promise.c
index 424c278704..53c8bdf75f 100644
--- a/src/tests/ecore/efl_app_test_promise.c
+++ b/src/tests/ecore/efl_app_test_promise.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #define EFL_NOLEGACY_API_SUPPORT
 #include <Efl_Core.h>
 #include "efl_app_suite.h"
diff --git a/src/tests/ecore_con/ecore_con_test_ecore_con_url.c b/src/tests/ecore_con/ecore_con_test_ecore_con_url.c
index fd4b6e9ca9..255cac5591 100644
--- a/src/tests/ecore_con/ecore_con_test_ecore_con_url.c
+++ b/src/tests/ecore_con/ecore_con_test_ecore_con_url.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include <Eina.h>
 #include <Ecore.h>
diff --git a/src/tests/ecore_wl2/ecore_wl2_suite.h b/src/tests/ecore_wl2/ecore_wl2_suite.h
index 111b388f28..cdb462946a 100644
--- a/src/tests/ecore_wl2/ecore_wl2_suite.h
+++ b/src/tests/ecore_wl2/ecore_wl2_suite.h
@@ -8,7 +8,7 @@
 #include <check.h>
 #include "../efl_check.h"
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <Ecore.h>
 #include <Ecore_Wl2.h>
 
diff --git a/src/tests/edje/edje_test_container.c b/src/tests/edje/edje_test_container.c
index cfdee2ed68..fc3df361ff 100644
--- a/src/tests/edje/edje_test_container.c
+++ b/src/tests/edje/edje_test_container.c
@@ -2,7 +2,7 @@
 # include <config.h>
 #endif
 
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <stdio.h>
 
 #define EFL_GFX_FILTER_BETA
diff --git a/src/tests/edje/edje_test_edje.c b/src/tests/edje/edje_test_edje.c
index fed2dde075..16858ab021 100644
--- a/src/tests/edje/edje_test_edje.c
+++ b/src/tests/edje/edje_test_edje.c
@@ -2,7 +2,7 @@
 # include <config.h>
 #endif
 
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <stdio.h>
 
 #define EFL_GFX_FILTER_BETA
diff --git a/src/tests/edje/edje_test_features.c b/src/tests/edje/edje_test_features.c
index 894e27332f..110601fad3 100644
--- a/src/tests/edje/edje_test_features.c
+++ b/src/tests/edje/edje_test_features.c
@@ -2,7 +2,7 @@
 # include <config.h>
 #endif
 
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <stdio.h>
 
 #ifdef _WIN32
diff --git a/src/tests/edje/edje_test_signal.c b/src/tests/edje/edje_test_signal.c
index 553be69abe..be2813ed30 100644
--- a/src/tests/edje/edje_test_signal.c
+++ b/src/tests/edje/edje_test_signal.c
@@ -2,7 +2,7 @@
 # include <config.h>
 #endif
 
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <stdio.h>
 
 #define EFL_GFX_FILTER_BETA
diff --git a/src/tests/edje/edje_test_swallow.c b/src/tests/edje/edje_test_swallow.c
index a0e5b4eb96..5954e26d26 100644
--- a/src/tests/edje/edje_test_swallow.c
+++ b/src/tests/edje/edje_test_swallow.c
@@ -2,7 +2,7 @@
 # include <config.h>
 #endif
 
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <stdio.h>
 
 #define EFL_GFX_FILTER_BETA
diff --git a/src/tests/edje/edje_test_text.c b/src/tests/edje/edje_test_text.c
index bb8499c049..e72572d462 100644
--- a/src/tests/edje/edje_test_text.c
+++ b/src/tests/edje/edje_test_text.c
@@ -2,7 +2,7 @@
 # include <config.h>
 #endif
 
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <stdio.h>
 
 #define EFL_GFX_FILTER_BETA
diff --git a/src/tests/eet/eet_test_cache.c b/src/tests/eet/eet_test_cache.c
index 6dee39142c..f3f9b96882 100644
--- a/src/tests/eet/eet_test_cache.c
+++ b/src/tests/eet/eet_test_cache.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <stdlib.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include <Eina.h>
 #include <Eet.h>
diff --git a/src/tests/eet/eet_test_cipher.c b/src/tests/eet/eet_test_cipher.c
index c06c505b4c..9efa55003a 100644
--- a/src/tests/eet/eet_test_cipher.c
+++ b/src/tests/eet/eet_test_cipher.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <stdlib.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <fcntl.h>
 
 #include <Eina.h>
diff --git a/src/tests/eet/eet_test_file.c b/src/tests/eet/eet_test_file.c
index 6d77a7d817..7b50d8edbd 100644
--- a/src/tests/eet/eet_test_file.c
+++ b/src/tests/eet/eet_test_file.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <stdlib.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include <Eina.h>
 #include <Eet.h>
diff --git a/src/tests/eet/eet_test_identity.c b/src/tests/eet/eet_test_identity.c
index b22d537021..fbf0410f6a 100644
--- a/src/tests/eet/eet_test_identity.c
+++ b/src/tests/eet/eet_test_identity.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <stdlib.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <fcntl.h>
 
 #include <Eina.h>
diff --git a/src/tests/eet/eet_test_image.c b/src/tests/eet/eet_test_image.c
index 5e35e67e54..fe9b563517 100644
--- a/src/tests/eet/eet_test_image.c
+++ b/src/tests/eet/eet_test_image.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <stdlib.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include <Eina.h>
 #include <Eet.h>
diff --git a/src/tests/efl_check.h b/src/tests/efl_check.h
index a973250849..05c2d0a6e5 100644
--- a/src/tests/efl_check.h
+++ b/src/tests/efl_check.h
@@ -8,7 +8,7 @@
 #include <stdlib.h> /* getenv */
 #include <stdio.h> /* fprintf, fputs */
 #include <string.h> /* strcmp */
-#include <unistd.h> /* execvp */
+#include <evil_unistd.h> /* execvp */
 #include <errno.h> /* errno */
 #include <sys/time.h>
 
diff --git a/src/tests/efreet/ef_desktop.c b/src/tests/efreet/ef_desktop.c
index 86e45bd503..ec38e44855 100644
--- a/src/tests/efreet/ef_desktop.c
+++ b/src/tests/efreet/ef_desktop.c
@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <limits.h>
 
 #ifdef _WIN32
diff --git a/src/tests/efreet/ef_menu.c b/src/tests/efreet/ef_menu.c
index 49173417ea..aaf47744e9 100644
--- a/src/tests/efreet/ef_menu.c
+++ b/src/tests/efreet/ef_menu.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include <Efreet.h>
 
diff --git a/src/tests/efreet/efreet_async_test.c b/src/tests/efreet/efreet_async_test.c
index 0b116c30a4..a1509341dc 100644
--- a/src/tests/efreet/efreet_async_test.c
+++ b/src/tests/efreet/efreet_async_test.c
@@ -9,7 +9,7 @@ For now efreet_menu_async_parse is deprecated.
 #endif
 
 
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include <Eina.h>
 #include <Ecore.h>
@@ -41,7 +41,7 @@ thread_cb(void *data EINA_UNUSED, Eina_Thread t EINA_UNUSED)
     int i;
     for (i = 0; i < MCOUNT; i++) {
         efreet_menu_async_parse(MENU, menu_cb, NULL);
-        usleep(1e5);
+        evil_usleep(1e5);
     }
     return NULL;
 }
@@ -55,7 +55,7 @@ create_threads(void)
     {
         if (!eina_thread_create(&threads[i], EINA_THREAD_NORMAL, -1, thread_cb, NULL))
             fprintf(stderr, "error: eina_thread_create\n");
-        usleep(1e5);
+        evil_usleep(1e5);
     }
 }
 
diff --git a/src/tests/efreet/efreet_icon_cache_dump.c b/src/tests/efreet/efreet_icon_cache_dump.c
index a1b71eb855..9df3374f79 100644
--- a/src/tests/efreet/efreet_icon_cache_dump.c
+++ b/src/tests/efreet/efreet_icon_cache_dump.c
@@ -6,7 +6,7 @@
 #include <limits.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <errno.h>
 
 #include <Eina.h>
diff --git a/src/tests/eina/eina_test_barrier.c b/src/tests/eina/eina_test_barrier.c
index 369edc99bd..c70112090e 100644
--- a/src/tests/eina/eina_test_barrier.c
+++ b/src/tests/eina/eina_test_barrier.c
@@ -20,7 +20,7 @@
 # include "config.h"
 #endif
 
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include <Eina.h>
 
diff --git a/src/tests/eina/eina_test_benchmark.c b/src/tests/eina/eina_test_benchmark.c
index 9fb7a568ef..885ab8438e 100644
--- a/src/tests/eina/eina_test_benchmark.c
+++ b/src/tests/eina/eina_test_benchmark.c
@@ -20,7 +20,7 @@
 # include "config.h"
 #endif
 
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include "eina_suite.h"
 #include "eina_benchmark.h"
diff --git a/src/tests/eina/eina_test_file.c b/src/tests/eina/eina_test_file.c
index 36817eb01f..d65212fc91 100644
--- a/src/tests/eina/eina_test_file.c
+++ b/src/tests/eina/eina_test_file.c
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <fcntl.h>
 
 #ifdef _WIN32
@@ -758,7 +758,7 @@ EFL_START_TEST(eina_test_file_mktemp)
      unlink(buf);
 #elif !defined _WIN32
    sprintf(fmt, "/proc/self/fd/%d", fd);
-   if (readlink(fmt, buf, sizeof(buf)))
+   if (evil_readlink(fmt, buf, sizeof(buf)))
      unlink(buf);
 #else
    {
diff --git a/src/tests/eina/eina_test_xattr.c b/src/tests/eina/eina_test_xattr.c
index c3f8aff842..e697d036c1 100644
--- a/src/tests/eina/eina_test_xattr.c
+++ b/src/tests/eina/eina_test_xattr.c
@@ -22,7 +22,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <fcntl.h>
 
 #include <Eina.h>
diff --git a/src/tests/eio/eio_test_common.c b/src/tests/eio/eio_test_common.c
index 5872ceafe7..89d0fe3a88 100644
--- a/src/tests/eio/eio_test_common.c
+++ b/src/tests/eio/eio_test_common.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/src/tests/eio/eio_test_eet.c b/src/tests/eio/eio_test_eet.c
index 94f319a6d2..c4c4d76466 100644
--- a/src/tests/eio/eio_test_eet.c
+++ b/src/tests/eio/eio_test_eet.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/src/tests/eio/eio_test_file.c b/src/tests/eio/eio_test_file.c
index d7b84eaefb..12eab336e3 100644
--- a/src/tests/eio/eio_test_file.c
+++ b/src/tests/eio/eio_test_file.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/src/tests/eio/eio_test_manager_xattr.c b/src/tests/eio/eio_test_manager_xattr.c
index b62f426200..ce91179b87 100644
--- a/src/tests/eio/eio_test_manager_xattr.c
+++ b/src/tests/eio/eio_test_manager_xattr.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <string.h>
 #include <fcntl.h>
 
diff --git a/src/tests/eio/eio_test_map.c b/src/tests/eio/eio_test_map.c
index f794f73d73..8175ecce44 100644
--- a/src/tests/eio/eio_test_map.c
+++ b/src/tests/eio/eio_test_map.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/src/tests/eio/eio_test_monitor.c b/src/tests/eio/eio_test_monitor.c
index bbe860ba5d..3d3c559b4e 100644
--- a/src/tests/eio/eio_test_monitor.c
+++ b/src/tests/eio/eio_test_monitor.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <string.h>
 
 #include <Ecore.h>
diff --git a/src/tests/eio/eio_test_sentry.c b/src/tests/eio/eio_test_sentry.c
index 5e210751e7..0304584141 100644
--- a/src/tests/eio/eio_test_sentry.c
+++ b/src/tests/eio/eio_test_sentry.c
@@ -5,7 +5,7 @@
 #define EIO_SENTRY_BETA
 
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <string.h>
 
 #include <Ecore.h>
diff --git a/src/tests/eio/eio_test_xattr.c b/src/tests/eio/eio_test_xattr.c
index 62b956af05..67ca717d73 100644
--- a/src/tests/eio/eio_test_xattr.c
+++ b/src/tests/eio/eio_test_xattr.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 #include <string.h>
 #include <fcntl.h>
 
diff --git a/src/tests/eldbus/eldbus_test_eldbus_init.c b/src/tests/eldbus/eldbus_test_eldbus_init.c
index 064caea162..6bc40f9e0e 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_init.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_init.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include <Eina.h>
 #include <Ecore.h>
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model.c b/src/tests/eldbus/eldbus_test_eldbus_model.c
index 5994851b2f..44abfc4bf6 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model.c
@@ -4,7 +4,7 @@
 
 #include <stdbool.h>
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include <Eina.h>
 #include <Ecore.h>
diff --git a/src/tests/elput/elput_test_elput.c b/src/tests/elput/elput_test_elput.c
index 2d3202d810..349f067809 100644
--- a/src/tests/elput/elput_test_elput.c
+++ b/src/tests/elput/elput_test_elput.c
@@ -3,7 +3,7 @@
 #endif
 
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include <Eina.h>
 #include <Ecore.h>
diff --git a/src/tests/elua/elua_lib.c b/src/tests/elua/elua_lib.c
index f3d11d5023..4df1476ecb 100644
--- a/src/tests/elua/elua_lib.c
+++ b/src/tests/elua/elua_lib.c
@@ -4,7 +4,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #ifdef _WIN32
 # include <evil_private.h> /* setenv unsetenv */
diff --git a/src/tests/evas/evas_test_image.c b/src/tests/evas/evas_test_image.c
index 7ee16048c8..dc3b277af5 100644
--- a/src/tests/evas/evas_test_image.c
+++ b/src/tests/evas/evas_test_image.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #include <Evas.h>
 #include <Ecore_Evas.h>
diff --git a/src/tests/timeout.c b/src/tests/timeout.c
index de881535c1..ff3f7e1a7e 100644
--- a/src/tests/timeout.c
+++ b/src/tests/timeout.c
@@ -1,4 +1,4 @@
-#include <unistd.h>
+#include <evil_unistd.h>
 
 #if defined(__clang__)
 # pragma clang diagnostic ignored "-Wunused-parameter"
@@ -10,6 +10,6 @@
 int
 main(int arc, char *argv[])
 {
-   sleep(60);
+   evil_sleep(60);
    return 0;
 }