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>

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"

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>

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

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 *

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 *

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"
 

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

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"