From c006f64f791ee59ab8f41343029b6b830e6458d1 Mon Sep 17 00:00:00 2001
From: Cedric BAIL <cedric@osg.samsung.com>
Date: Fri, 17 Apr 2015 11:54:11 +0200
Subject: [PATCH] evas: more fix for include order in an attempt to fix Windows
 build.

---
 src/modules/evas/engines/gl_generic/evas_engine.c       | 8 ++++----
 src/modules/evas/engines/software_generic/evas_engine.c | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c
index ac3fd80776..b926d2bab7 100644
--- a/src/modules/evas/engines/gl_generic/evas_engine.c
+++ b/src/modules/evas/engines/gl_generic/evas_engine.c
@@ -7,6 +7,10 @@
 # include <unistd.h>
 #endif
 
+#include "software/Ector_Software.h"
+
+#include "ector_cairo_software_surface.eo.h"
+
 #ifdef HAVE_DLSYM
 # include <dlfcn.h>      /* dlopen,dlclose,etc */
 #else
@@ -21,10 +25,6 @@
 #include "evas_cs2_private.h"
 #endif
 
-#include "software/Ector_Software.h"
-
-#include "ector_cairo_software_surface.eo.h"
-
 #define EVAS_GL_NO_GL_H_CHECK 1
 #include "Evas_GL.h"
 
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c
index af26cb6c00..fa41a5a0c2 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -7,6 +7,8 @@
 
 #include <software/Ector_Software.h>
 
+#include "ector_cairo_software_surface.eo.h"
+
 #ifdef HAVE_DLSYM
 # include <dlfcn.h>      /* dlopen,dlclose,etc */
 
@@ -20,8 +22,6 @@
 
 #include "Evas_Engine_Software_Generic.h"
 
-#include "ector_cairo_software_surface.eo.h"
-
 #ifdef EVAS_GL
 //----------------------------------//
 // OSMesa...