diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.h b/src/modules/evas/engines/wayland_egl/evas_engine.h
index 7d02fbf15e..165ff752a6 100644
--- a/src/modules/evas/engines/wayland_egl/evas_engine.h
+++ b/src/modules/evas/engines/wayland_egl/evas_engine.h
@@ -12,11 +12,9 @@
 
 # define GL_GLEXT_PROTOTYPES
 
-# ifdef GL_GLES
-#  include <EGL/egl.h>
-#  include <GLES2/gl2.h>
-#  include <GLES2/gl2ext.h>
-# endif
+# include <EGL/egl.h>
+# include <GLES2/gl2.h>
+# include <GLES2/gl2ext.h>
 
 # include "../gl_generic/Evas_Engine_GL_Generic.h"
 
@@ -47,6 +45,10 @@ extern int _evas_engine_wl_egl_log_dom;
 # endif
 # define CRI(...) EINA_LOG_DOM_CRIT(_evas_engine_wl_egl_log_dom, __VA_ARGS__)
 
+# ifndef EGL_BUFFER_AGE_EXT
+#  define EGL_BUFFER_AGE_EXT 0x313d
+# endif
+
 typedef struct _Outbuf Outbuf;
 
 struct _Outbuf
@@ -57,28 +59,83 @@ struct _Outbuf
    int w, h;
    int depth, screen, rot, alpha;
 
+   Evas *evas;
+   Evas_Engine_Info_Wayland_Egl *info;
    Evas_Engine_GL_Context *gl_context;
 
+   Render_Engine_Swap_Mode swap_mode;
+   int prev_age, vsync;
+   int frame_cnt;
+
    struct 
      {
         Eina_Bool drew : 1;
      } draw;
 
-#ifdef GL_GLES
    EGLContext egl_context[1];
    EGLSurface egl_surface[1];
    EGLConfig egl_config;
    EGLDisplay egl_disp;
-#endif
 
+   Eina_Bool lost_back : 1;
    Eina_Bool surf : 1;
 };
 
-Outbuf *eng_window_new(struct wl_display *disp, struct wl_surface *surface, int screen, int depth, int w, int h, int indirect, int alpha, int rot);
+struct _Context_3D
+{
+   EGLDisplay display;
+   EGLContext context;
+   EGLSurface surface;
+};
+
+extern Eina_Bool extn_have_buffer_age;
+extern Eina_Bool extn_have_y_inverted;
+
+extern Evas_GL_Common_Context_New glsym_evas_gl_common_context_new;
+extern Evas_GL_Common_Context_Call glsym_evas_gl_common_context_flush;
+extern Evas_GL_Common_Context_Call glsym_evas_gl_common_context_free;
+extern Evas_GL_Common_Context_Call glsym_evas_gl_common_context_use;
+extern Evas_GL_Common_Context_Call glsym_evas_gl_common_context_newframe;
+extern Evas_GL_Common_Context_Call glsym_evas_gl_common_context_done;
+extern Evas_GL_Common_Context_Resize_Call glsym_evas_gl_common_context_resize;
+extern Evas_GL_Common_Buffer_Dump_Call glsym_evas_gl_common_buffer_dump;
+extern Evas_GL_Preload_Render_Call glsym_evas_gl_preload_render_lock;
+extern Evas_GL_Preload_Render_Call glsym_evas_gl_preload_render_unlock;
+
+extern unsigned int (*glsym_eglSwapBuffersWithDamage) (EGLDisplay a, void *b, const EGLint *d, EGLint c);
+
+Outbuf *eng_window_new(struct wl_display *disp, struct wl_surface *surface, int screen, int depth, int w, int h, int indirect, int alpha, int rot, Render_Engine_Swap_Mode swap_mode);
 void eng_window_free(Outbuf *gw);
 void eng_window_use(Outbuf *gw);
 void eng_window_unsurf(Outbuf *gw);
 void eng_window_resurf(Outbuf *gw);
-Eina_Bool eng_window_make_current(void *data, void *doit);
+
+void eng_outbuf_reconfigure(Outbuf *ob, int w, int h, int rot, Outbuf_Depth depth);
+int eng_outbuf_rotation_get(Outbuf *ob);
+Render_Engine_Swap_Mode eng_outbuf_swap_mode_get(Outbuf *ob);
+Eina_Bool eng_outbuf_region_first_rect(Outbuf *ob);
+void *eng_outbuf_update_region_new(Outbuf *ob, int x, int y, int w, int h, int *cx, int *cy, int *cw, int *ch);
+void eng_outbuf_update_region_free(Outbuf *ob, RGBA_Image *update);
+void eng_outbuf_update_region_push(Outbuf *ob, RGBA_Image *update, int x, int y, int w, int h);
+void eng_outbuf_flush(Outbuf *ob, Tilebuf_Rect *rects, Evas_Render_Mode render_mode);
+
+Evas_Engine_GL_Context *eng_outbuf_gl_context_get(Outbuf *ob);
+void *eng_outbuf_egl_display_get(Outbuf *ob);
+Eina_Bool eng_preload_make_current(void *data, void *doit);
+
+Context_3D *eng_gl_context_new(Outbuf *win);
+void eng_gl_context_free(Context_3D *context);
+void eng_gl_context_use(Context_3D *context);
+
+static inline int 
+_re_wincheck(Outbuf *ob)
+{
+   if (ob->surf) return 1;
+   eng_window_resurf(ob);
+   ob->lost_back = EINA_TRUE;
+   if (!ob->surf)
+     ERR("Wayland EGL Engine cannot recreate window surface");
+   return 0;
+}
 
 #endif