diff --git a/src/modules/evas/engines/gl_generic/evas_ector_gl_buffer.c b/src/modules/evas/engines/gl_generic/evas_ector_gl_buffer.c
index 108a1c9e8b..63af1d1c5a 100644
--- a/src/modules/evas/engines/gl_generic/evas_ector_gl_buffer.c
+++ b/src/modules/evas/engines/gl_generic/evas_ector_gl_buffer.c
@@ -5,13 +5,10 @@
 #define ECTOR_GL_BUFFER_BASE_PROTECTED
 
 #include "evas_common_private.h"
+#include "evas_gl_private.h"
 
+#include <software/Ector_Software.h>
 #include <gl/Ector_GL.h>
-#include "gl/ector_gl_private.h"
-#include "evas_common_private.h"
-#include "../gl_common/evas_gl_common.h"
-#include "evas_private.h"
-#include "ector_buffer.h"
 #include "Evas_Engine_GL_Generic.h"
 
 #include "evas_ector_buffer.eo.h"
diff --git a/src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.c b/src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.c
index d6be151782..360882f2a2 100644
--- a/src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.c
+++ b/src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.c
@@ -7,17 +7,13 @@
 #define ECTOR_GL_BUFFER_BASE_PROTECTED
 
 #include "evas_common_private.h"
+#include "evas_gl_private.h"
 
+#include <software/Ector_Software.h>
 #include <gl/Ector_GL.h>
-#include "gl/ector_gl_private.h"
-#include "evas_common_private.h"
-#include "../gl_common/evas_gl_common.h"
-#include "evas_private.h"
-#include "ector_buffer.h"
 #include "Evas_Engine_GL_Generic.h"
 
 #include "evas_ector_buffer.eo.h"
-#include "evas_ector_gl_buffer.eo.h"
 #include "evas_ector_gl_image_buffer.eo.h"
 #include "evas_gl_private.h"