diff --git a/legacy/eina/src/lib/eina_benchmark.c b/legacy/eina/src/lib/eina_benchmark.c
index f08066caa3..ec1b27066d 100644
--- a/legacy/eina/src/lib/eina_benchmark.c
+++ b/legacy/eina/src/lib/eina_benchmark.c
@@ -28,10 +28,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
 #ifdef HAVE_ALLOCA_H
 # include <alloca.h>
 #elif defined __GNUC__
@@ -49,6 +45,10 @@ extern "C"
 void *alloca (size_t);
 #endif
 
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "eina_benchmark.h"
 #include "eina_inlist.h"
 #include "eina_counter.h"
diff --git a/legacy/eina/src/lib/eina_file.c b/legacy/eina/src/lib/eina_file.c
index c958f9eb45..0a436c8fe9 100644
--- a/legacy/eina/src/lib/eina_file.c
+++ b/legacy/eina/src/lib/eina_file.c
@@ -20,20 +20,9 @@
 # include <config.h>
 #endif
 
-#include <string.h>
-
 #ifndef _WIN32
 # define _GNU_SOURCE
-# include <sys/types.h>
-# include <sys/stat.h>
-# include <unistd.h>
-# include <dirent.h>
-#else
-# define WIN32_LEAN_AND_MEAN
-# include <windows.h>
-# undef WIN32_LEAN_AND_MEAN
-# include <Evil.h>
-#endif /* _WIN2 */
+#endif
 
 #ifdef HAVE_ALLOCA_H
 # include <alloca.h>
@@ -52,6 +41,20 @@ extern "C"
 void *alloca (size_t);
 #endif
 
+#include <string.h>
+
+#ifndef _WIN32
+# include <sys/types.h>
+# include <sys/stat.h>
+# include <unistd.h>
+# include <dirent.h>
+#else
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h>
+# undef WIN32_LEAN_AND_MEAN
+# include <Evil.h>
+#endif /* _WIN2 */
+
 #ifndef _WIN32
 # define PATH_DELIM '/'
 #else
diff --git a/legacy/eina/src/lib/eina_module.c b/legacy/eina/src/lib/eina_module.c
index 137c232350..5e1b83de93 100644
--- a/legacy/eina/src/lib/eina_module.c
+++ b/legacy/eina/src/lib/eina_module.c
@@ -21,14 +21,9 @@
 #endif
 
 #ifdef HAVE_DLADDR
-#define _GNU_SOURCE
+# define _GNU_SOURCE
 #endif
 
-#include <stdio.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <string.h>
-
 #ifdef HAVE_ALLOCA_H
 # include <alloca.h>
 #elif defined __GNUC__
@@ -46,6 +41,11 @@ extern "C"
 void *alloca (size_t);
 #endif
 
+#include <stdio.h>
+#include <sys/types.h>
+#include <dirent.h>
+#include <string.h>
+
 #include <dlfcn.h>
 
 #ifdef HAVE_EVIL