diff --git a/VERSION b/VERSION
index 984db311..203bb4f2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-a12-158-g6f77ba8aea+1
\ No newline at end of file
+a12-159-gba50fbdc3e+1
\ No newline at end of file
diff --git a/c-host/platform/Linux/capture/XCB/CMakeLists.txt b/c-host/platform/Linux/capture/XCB/CMakeLists.txt
index 034bdb4d..aee57d87 100644
--- a/c-host/platform/Linux/capture/XCB/CMakeLists.txt
+++ b/c-host/platform/Linux/capture/XCB/CMakeLists.txt
@@ -6,6 +6,7 @@ add_library(capture_XCB STATIC
 )
 
 target_link_libraries(capture_XCB
+	lg_common
 	xcb
 	xcb-shm
 	Xfixes
diff --git a/c-host/platform/Linux/capture/XCB/src/xcb.c b/c-host/platform/Linux/capture/XCB/src/xcb.c
index b4939e36..8e5166b0 100644
--- a/c-host/platform/Linux/capture/XCB/src/xcb.c
+++ b/c-host/platform/Linux/capture/XCB/src/xcb.c
@@ -17,9 +17,9 @@ this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "capture/interface.h"
-#include "debug.h"
-#include "app.h"
+#include "interface/capture.h"
+#include "interface/platform.h"
+#include "common/debug.h"
 #include <string.h>
 #include <assert.h>
 #include <stdlib.h>
@@ -193,7 +193,7 @@ static CaptureResult xcb_capture()
   return CAPTURE_RESULT_OK;
 }
 
-static bool xcb_getFrame(CaptureFrame * frame)
+static CaptureResult xcb_getFrame(CaptureFrame * frame)
 {
   assert(this);
   assert(this->initialized);
@@ -207,7 +207,7 @@ static bool xcb_getFrame(CaptureFrame * frame)
   if (!img)
   {
     DEBUG_ERROR("Failed to get image reply");
-    return false;
+    return CAPTURE_RESULT_ERROR;
   }
 
   frame->width  = this->width;
@@ -219,12 +219,13 @@ static bool xcb_getFrame(CaptureFrame * frame)
   free(img);
 
   this->hasFrame = false;
-  return true;
+  return CAPTURE_RESULT_OK;
 }
 
-static bool xcb_getPointer(CapturePointer * pointer)
+static CaptureResult xcb_getPointer(CapturePointer * pointer)
 {
-  return false;
+  memset(pointer, 0, sizeof(CapturePointer));
+  return CAPTURE_RESULT_OK;
 }
 
 struct CaptureInterface Capture_XCB =
diff --git a/c-host/platform/Linux/src/platform.c b/c-host/platform/Linux/src/platform.c
index afb31ede..3708c7f6 100644
--- a/c-host/platform/Linux/src/platform.c
+++ b/c-host/platform/Linux/src/platform.c
@@ -17,8 +17,9 @@ this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "app.h"
-#include "debug.h"
+#include "interface/platform.h"
+#include "common/debug.h"
+
 #include <assert.h>
 #include <getopt.h>
 #include <sys/stat.h>