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>

8 files changed, 18 insertions, 23 deletions

diff --git a/src/lib/ecore_input_evas/ecore_input_evas.c b/src/lib/ecore_input_evas/ecore_input_evas.c
index 8f26737778..ea07300e7a 100644
--- a/src/lib/ecore_input_evas/ecore_input_evas.c
+++ b/src/lib/ecore_input_evas/ecore_input_evas.c
@@ -7,8 +7,8 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "Ecore.h"
-#include "Ecore_Input.h"
+#include <Ecore.h>
+#include <Ecore_Input.h>
 
 #include "Ecore_Input_Evas.h"
 #include "ecore_input_evas_private.h"
diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h
index ffc5fd43c5..e2d0cf6abe 100644
--- a/src/lib/elementary/Efl_Ui.h
+++ b/src/lib/elementary/Efl_Ui.h
@@ -40,13 +40,6 @@
 #include <alloca.h>
 #endif
 
-#ifdef ELM_WIN32
-#include <malloc.h>
-#ifndef alloca
-#define alloca _alloca
-#endif
-#endif
-
 #ifdef _WIN32
 # define WIN32_LEAN_AND_MEAN
 # include <winsock2.h>
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 *
diff --git a/src/lib/embryo/embryo_main.c b/src/lib/embryo/embryo_main.c
index 852b1903f2..452a272787 100644
--- a/src/lib/embryo/embryo_main.c
+++ b/src/lib/embryo/embryo_main.c
@@ -6,6 +6,8 @@
 #include <stdlib.h>
 #include <time.h>
 
+#include <Eina.h>
+
 #include "Embryo.h"
 #include "embryo_private.h"
 
diff --git a/src/lib/embryo/embryo_private.h b/src/lib/embryo/embryo_private.h
index 4bf8ceb2c6..e63351b2c7 100644
--- a/src/lib/embryo/embryo_private.h
+++ b/src/lib/embryo/embryo_private.h
@@ -1,8 +1,6 @@
 #ifndef _EMBRYO_PRIVATE_H
 #define _EMBRYO_PRIVATE_H
 
-#include <Eina.h>
-
 typedef enum _Embryo_Opcode Embryo_Opcode;
 
 enum _Embryo_Opcode
diff --git a/src/lib/embryo/embryo_str.c b/src/lib/embryo/embryo_str.c
index d7da4e0dd3..6fafa83db0 100644
--- a/src/lib/embryo/embryo_str.c
+++ b/src/lib/embryo/embryo_str.c
@@ -16,6 +16,8 @@
 #include <string.h>
 #include <fnmatch.h>
 
+#include <Eina.h>
+
 #include "Embryo.h"
 #include "embryo_private.h"