libs: headers: ensure we include headers in the correct order for EAPI

We need to ensure this order to make sure EAPI is working correctly on
windows.

Original patch by Vincent Torri.

Differential Revision: https://phab.enlightenment.org/D11856

Signed-off-by: Stefan Schmidt <s.schmidt@samsung.com>

3 files changed, 12 insertions, 12 deletions

diff --git a/src/lib/elua/Elua.h b/src/lib/elua/Elua.h
index 289f9112d7..cf93d65e53 100644
--- a/src/lib/elua/Elua.h
+++ b/src/lib/elua/Elua.h
@@ -18,6 +18,14 @@
 #ifndef _ELUA_H
 #define _ELUA_H
 
+#ifdef EFL_BETA_API_SUPPORT
+
+#include <Eina.h>
+
+#include <lua.h>
+#include <lualib.h>
+#include <lauxlib.h>
+
 #ifdef EAPI
 # undef EAPI
 #endif
@@ -92,14 +100,6 @@ extern "C" {
  * @{
  */
 
-#ifdef EFL_BETA_API_SUPPORT
-
-#include <Eina.h>
-
-#include <lua.h>
-#include <lualib.h>
-#include <lauxlib.h>
-
 /** Opaque Elua state
  *
  * @ingroup Elua
diff --git a/src/lib/elua/cache.c b/src/lib/elua/cache.c
index b18d690569..c731b0495a 100644
--- a/src/lib/elua/cache.c
+++ b/src/lib/elua/cache.c
@@ -1,10 +1,10 @@
-#include "elua_private.h"
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
 
+#include "elua_private.h"
+
 /* bytecode caching */
 
 static Eina_File *
diff --git a/src/lib/elua/io.c b/src/lib/elua/io.c
index 77ac3df94c..142f61b716 100644
--- a/src/lib/elua/io.c
+++ b/src/lib/elua/io.c
@@ -1,9 +1,9 @@
-#include "elua_private.h"
-
 #ifdef _WIN32
 # include <evil_private.h> /* realpath */
 #endif
 
+#include "elua_private.h"
+
 /* expand fname to full path name (so that PATH is ignored) plus turn
  * stuff into a command, and also verify whether the path exists */
 static char *