diff --git a/configure.ac b/configure.ac
index 0920b6066b..11d02190d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -392,7 +392,6 @@ sys/signalfd.h \
 sys/types.h \
 sys/param.h \
 sys/mman.h \
-unistd.h \
 ])
 
 have_inotify="${ac_cv_header_sys_inotify_h}"
diff --git a/m4/efl_check_funcs.m4 b/m4/efl_check_funcs.m4
index 0356685371..59a38f7894 100644
--- a/m4/efl_check_funcs.m4
+++ b/m4/efl_check_funcs.m4
@@ -211,9 +211,7 @@ dnl _EFL_CHECK_FUNC_SPLICE is for internal use
 dnl _EFL_CHECK_FUNC_SPLICE(EFL, VARIABLE)
 AC_DEFUN([_EFL_CHECK_FUNC_SPLICE],
 [EFL_FIND_LIB_FOR_CODE([$1], [], [$2], [[
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 #include <fcntl.h>
 ]], [[
 long ret = splice(0, 0, 1, 0, 400, 0);
diff --git a/src/bin/eet/eet_main.c b/src/bin/eet/eet_main.c
index eff7207de7..e59c2599e9 100644
--- a/src/bin/eet/eet_main.c
+++ b/src/bin/eet/eet_main.c
@@ -5,10 +5,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* ifdef HAVE_UNISTD_H */
+#include <unistd.h>
 
 #ifdef HAVE_EVIL
 # include <Evil.h>
diff --git a/src/bin/embryo/embryo_cc_sc1.c b/src/bin/embryo/embryo_cc_sc1.c
index f396f4f6e0..f941041182 100644
--- a/src/bin/embryo/embryo_cc_sc1.c
+++ b/src/bin/embryo/embryo_cc_sc1.c
@@ -33,12 +33,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include <sys/stat.h>
 
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
 #ifdef HAVE_EVIL
 # include <Evil.h>
 #endif
diff --git a/src/bin/embryo/embryo_cc_sc5.c b/src/bin/embryo/embryo_cc_sc5.c
index f284420bb3..838a08aacc 100644
--- a/src/bin/embryo/embryo_cc_sc5.c
+++ b/src/bin/embryo/embryo_cc_sc5.c
@@ -31,10 +31,7 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 
 #include <Eina.h>
 
diff --git a/src/bin/evas/loaders/psd/evas_image_load_psd.c b/src/bin/evas/loaders/psd/evas_image_load_psd.c
index 29f1c1975e..0c8585fc2c 100644
--- a/src/bin/evas/loaders/psd/evas_image_load_psd.c
+++ b/src/bin/evas/loaders/psd/evas_image_load_psd.c
@@ -7,6 +7,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
 #include <errno.h>
 
 #include <math.h>
@@ -18,10 +19,6 @@
 # include <netinet/in.h>
 #endif
 
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
 #ifdef HAVE_EVIL
 # include <Evil.h>
 #endif
diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index 3aa15bf77c..eb306408b3 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -6,13 +6,10 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
 #ifdef HAVE_LOCALE_H
 # include <locale.h>
 #endif
diff --git a/src/lib/ecore/ecore_app.c b/src/lib/ecore/ecore_app.c
index 04df487d3c..716cd4a1aa 100644
--- a/src/lib/ecore/ecore_app.c
+++ b/src/lib/ecore/ecore_app.c
@@ -3,10 +3,7 @@
 #endif
 
 #include <stdlib.h>
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 
 #ifdef _MSC_VER
 # include <process.h>
diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index 9f531361f9..b6f27a9491 100644
--- a/src/lib/ecore/ecore_main.c
+++ b/src/lib/ecore/ecore_main.c
@@ -18,6 +18,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <unistd.h>
 #include <math.h>
 #include <sys/types.h>
 #include <errno.h>
@@ -27,10 +28,6 @@
 # include <sys/time.h>
 #endif
 
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
 #ifdef _MSC_VER
 # include <float.h>
 #endif
diff --git a/src/lib/ecore/ecore_thread.c b/src/lib/ecore/ecore_thread.c
index 954d3a1827..53da07ac47 100644
--- a/src/lib/ecore/ecore_thread.c
+++ b/src/lib/ecore/ecore_thread.c
@@ -6,10 +6,7 @@
 #include <sys/time.h>
 #include <assert.h>
 #include <sys/types.h>
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 
 #ifdef HAVE_EVIL
 # include <Evil.h>
diff --git a/src/lib/ecore/ecore_throttle.c b/src/lib/ecore/ecore_throttle.c
index febaeacb77..de0a43ed9a 100644
--- a/src/lib/ecore/ecore_throttle.c
+++ b/src/lib/ecore/ecore_throttle.c
@@ -3,10 +3,7 @@
 #endif
 
 #include <stdlib.h>
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 
 #include "Ecore.h"
 #include "ecore_private.h"
diff --git a/src/lib/eet/eet_cipher.c b/src/lib/eet/eet_cipher.c
index 60105acde4..5eb2f87958 100644
--- a/src/lib/eet/eet_cipher.c
+++ b/src/lib/eet/eet_cipher.c
@@ -6,10 +6,7 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* ifdef HAVE_UNISTD_H */
+#include <unistd.h>
 
 #ifdef HAVE_NETINET_IN_H
 # include <netinet/in.h>
diff --git a/src/lib/eet/eet_lib.c b/src/lib/eet/eet_lib.c
index 7717fdf9f6..41f29757d7 100644
--- a/src/lib/eet/eet_lib.c
+++ b/src/lib/eet/eet_lib.c
@@ -12,14 +12,11 @@
 #include <sys/stat.h>
 #include <time.h>
 #include <string.h>
+#include <unistd.h>
 #include <fnmatch.h>
 #include <fcntl.h>
 #include <zlib.h>
 
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* ifdef HAVE_UNISTD_H */
-
 #ifdef HAVE_NETINET_IN_H
 # include <netinet/in.h>
 #endif /* ifdef HAVE_NETINET_IN_H */
diff --git a/src/lib/eina/eina_log.c b/src/lib/eina/eina_log.c
index f4e343688b..0be1cb8a08 100644
--- a/src/lib/eina/eina_log.c
+++ b/src/lib/eina/eina_log.c
@@ -24,6 +24,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include <fnmatch.h>
 #include <assert.h>
 #include <errno.h>
@@ -33,10 +34,6 @@
 # define EINA_LOG_BACKTRACE
 #endif
 
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
 #ifdef HAVE_EVIL
 # include <Evil.h>
 #endif
diff --git a/src/lib/eina/eina_main.c b/src/lib/eina/eina_main.c
index 893ca8e5d4..667c3a1b71 100644
--- a/src/lib/eina/eina_main.c
+++ b/src/lib/eina/eina_main.c
@@ -32,9 +32,7 @@
 # ifdef HAVE_SYS_TYPES_H
 #  include <sys/types.h>
 # endif
-# ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-# endif
+# include <unistd.h>
 #endif
 
 #ifdef HAVE_MCHECK_H
diff --git a/src/lib/eina/eina_prefix.c b/src/lib/eina/eina_prefix.c
index ed20d84f65..b1b4d86422 100644
--- a/src/lib/eina/eina_prefix.c
+++ b/src/lib/eina/eina_prefix.c
@@ -34,12 +34,9 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <unistd.h>
 #include <limits.h>
 
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
 #ifdef HAVE_DLADDR
 # include <dlfcn.h>
 #endif
diff --git a/src/lib/eina/eina_xattr.c b/src/lib/eina/eina_xattr.c
index e1fac0fa21..a8521da58f 100644
--- a/src/lib/eina/eina_xattr.c
+++ b/src/lib/eina/eina_xattr.c
@@ -23,15 +23,13 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <string.h>
+#include <unistd.h>
 #include <math.h>
 
 #ifdef HAVE_XATTR
 # include <sys/xattr.h>
 #endif
 
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
 #include <fcntl.h>
 
 #include "eina_config.h"
diff --git a/src/lib/eio/eio_private.h b/src/lib/eio/eio_private.h
index 3a47200890..1fb5ee4452 100644
--- a/src/lib/eio/eio_private.h
+++ b/src/lib/eio/eio_private.h
@@ -39,16 +39,13 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
+#include <unistd.h>
 #include <fcntl.h>
 
 #ifdef HAVE_FEATURES_H
 # include <features.h>
 #endif
 
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
 #ifdef HAVE_LIBGEN_H
 # include <libgen.h>
 #endif
diff --git a/src/modules/emotion/gstreamer/emotion_gstreamer.c b/src/modules/emotion/gstreamer/emotion_gstreamer.c
index 8138ae6413..f5669caf61 100644
--- a/src/modules/emotion/gstreamer/emotion_gstreamer.c
+++ b/src/modules/emotion/gstreamer/emotion_gstreamer.c
@@ -2,9 +2,7 @@
 # include "config.h"
 #endif
 
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 #include <fcntl.h>
 
 #include <Eina.h>
diff --git a/src/modules/evas/loaders/psd/evas_image_load_psd.c b/src/modules/evas/loaders/psd/evas_image_load_psd.c
index 414b02dd3e..6213745357 100644
--- a/src/modules/evas/loaders/psd/evas_image_load_psd.c
+++ b/src/modules/evas/loaders/psd/evas_image_load_psd.c
@@ -12,16 +12,13 @@
 #include <math.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <unistd.h>
 #include <fcntl.h>
 
 #ifdef HAVE_NETINET_IN_H
 # include <netinet/in.h>
 #endif
 
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
 #ifdef HAVE_EVIL
 # include <Evil.h>
 #endif