diff --git a/ext/eglgles/gsteglglessink.h b/ext/eglgles/gsteglglessink.h
index acc6e26110..231a57c92b 100644
--- a/ext/eglgles/gsteglglessink.h
+++ b/ext/eglgles/gsteglglessink.h
@@ -46,6 +46,8 @@
 #define __GST_EGLGLESSINK_H__
 
 #include <gst/gst.h>
+#include <gst/video/gstvideosink.h>
+#include <gst/base/gstdataqueue.h>
 
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
@@ -228,13 +230,12 @@ struct _GstEglGlesSink
   GstVideoFormat format;
   GstVideoRectangle display_region;
   GstCaps *sinkcaps;
-  GstCaps *current_caps;
+  GstCaps *current_caps, *configured_caps;
 
   GstEglGlesImageFmt *selected_fmt;
   GstEglGlesSinkRenderingPath rendering_path;
-  GstEglGlesRenderContext *eglglesctx;
+  GstEglGlesRenderContext eglglesctx;
 
-  GMutex *flow_lock;
   GList *supported_fmts;
 
   /* Runtime flags */
@@ -245,6 +246,13 @@ struct _GstEglGlesSink
   gboolean have_texture;
   gboolean egl_started;
 
+  GThread *thread;
+  gboolean thread_running;
+  GstDataQueue *queue;
+  GCond *render_cond;
+  GMutex *render_lock;
+  GstFlowReturn last_flow;
+
   /* Properties */
   gboolean create_window;
   gboolean force_rendering_slow;