diff --git a/include/grabber/X11Grabber.h b/include/grabber/X11Grabber.h
index 61c2d103..b35031cf 100644
--- a/include/grabber/X11Grabber.h
+++ b/include/grabber/X11Grabber.h
@@ -7,6 +7,11 @@
 // X11 includes
 #include <X11/Xlib.h>
 
+#include <X11/extensions/Xrender.h>
+#include <X11/extensions/XShm.h>
+#include <sys/ipc.h>
+#include <sys/shm.h>
+
 class X11Grabber
 {
 public:
@@ -16,6 +21,8 @@ public:
 	virtual ~X11Grabber();
 
 	int open();
+	
+	bool Setup();
 
 	Image<ColorRgb> & grab();
 
@@ -27,18 +34,23 @@ private:
     int _cropTop;
     int _cropBottom;
     
-    Screen *Xscreen;
-    XImage *xImage;
-    XShmSegmentInfo shminfo;
-    int screen;
+    XImage* _xImage;
+    XShmSegmentInfo _shminfo;
 
 	/// Reference to the X11 display (nullptr if not opened)
-	Display * _x11Display;
+	Display* _x11Display;
+	Window _window;
+	XWindowAttributes _windowAttr;
 
 	unsigned _screenWidth;
 	unsigned _screenHeight;
+	unsigned _croppedWidth;
+	unsigned _croppedHeight;
 
 	Image<ColorRgb> _image;
-
+	
+	void freeResources();
+	void setupResources();
+	
 	int updateScreenDimensions();
 };