diff --git a/legacy/eio/src/lib/eio_dir.c b/legacy/eio/src/lib/eio_dir.c
index 6578d66487..6b4456ff93 100644
--- a/legacy/eio/src/lib/eio_dir.c
+++ b/legacy/eio/src/lib/eio_dir.c
@@ -16,36 +16,7 @@
  * License along with this library;
  * if not, see <http://www.gnu.org/licenses/>.
  */
-
-#define _FILE_OFFSET_BITS 64
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdio.h>
-#include <string.h>
-
-#ifndef _MSC_VER
-# include <unistd.h>
-# include <libgen.h>
-#endif
-
-#ifdef HAVE_FEATURES_H
-# include <features.h>
-#endif
-#include <ctype.h>
-#include <errno.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <unistd.h>
-#include <sys/mman.h>
-#include <fcntl.h>
-
 #include "eio_private.h"
-
 #include "Eio.h"
 
 static int
diff --git a/legacy/eio/src/lib/eio_file.c b/legacy/eio/src/lib/eio_file.c
index fadd3eed89..7d317b79fc 100644
--- a/legacy/eio/src/lib/eio_file.c
+++ b/legacy/eio/src/lib/eio_file.c
@@ -18,35 +18,7 @@
  * License along with this library;
  * if not, see <http://www.gnu.org/licenses/>.
  */
-
-#define _FILE_OFFSET_BITS 64
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdio.h>
-#include <string.h>
-
-#ifndef _MSC_VER
-# include <unistd.h>
-# include <libgen.h>
-#endif
-
-#ifdef HAVE_FEATURES_H
-# include <features.h>
-#endif
-#include <ctype.h>
-#include <errno.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <sys/mman.h>
-#include <fcntl.h>
-
 #include "eio_private.h"
-
 #include "Eio.h"
 
 static void
diff --git a/legacy/eio/src/lib/eio_main.c b/legacy/eio/src/lib/eio_main.c
index e600d7355e..31b5fcbb18 100644
--- a/legacy/eio/src/lib/eio_main.c
+++ b/legacy/eio/src/lib/eio_main.c
@@ -16,16 +16,7 @@
  * License along with this library;
  * if not, see <http://www.gnu.org/licenses/>.
  */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <pthread.h>
-#include <dirent.h>
-
 #include "eio_private.h"
-
 #include "Eio.h"
 
 static int _eio_count = 0;
diff --git a/legacy/eio/src/lib/eio_private.h b/legacy/eio/src/lib/eio_private.h
index 4806755732..b8528e025c 100644
--- a/legacy/eio/src/lib/eio_private.h
+++ b/legacy/eio/src/lib/eio_private.h
@@ -1,11 +1,40 @@
 #ifndef EIO_PRIVATE_H_
 #define EIO_PRIVATE_H_
 
-#include <Ecore.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE
+#endif
+
+#ifdef HAVE_FEATURES_H
+# include <features.h>
+#endif
+
+#ifndef _FILE_OFFSET_BITS
+# define _FILE_OFFSET_BITS 64
+#endif
+
+#include <stdio.h>
+#include <string.h>
+
+#ifndef _MSC_VER
+# include <unistd.h>
+# include <libgen.h>
+#endif
+
+#include <ctype.h>
+#include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
+#include <dirent.h>
+#include <sys/mman.h>
+#include <fcntl.h>
+#include <pthread.h>
+
+#include <Ecore.h>
 
 #include "Eio.h"
 
diff --git a/legacy/eio/src/lib/eio_single.c b/legacy/eio/src/lib/eio_single.c
index af5b6a7ad1..8407b2e819 100644
--- a/legacy/eio/src/lib/eio_single.c
+++ b/legacy/eio/src/lib/eio_single.c
@@ -18,15 +18,7 @@
  * License along with this library;
  * if not, see <http://www.gnu.org/licenses/>.
  */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <errno.h>
-
 #include "eio_private.h"
-
 #include "Eio.h"
 
 void