diff --git a/xgl/xgl.h b/xgl/xgl.h
index 62bbee011..d79d0c048 100644
--- a/xgl/xgl.h
+++ b/xgl/xgl.h
@@ -28,6 +28,11 @@
 
 #include <xgl-config.h>
 
+#include "glxserver.h"
+#include "glapi.h"
+#include "glthread.h"
+#include "dispatch.h"
+
 #include <X11/X.h>
 #define NEED_EVENTS
 #include <X11/Xproto.h>
diff --git a/xgl/xglcompose.c b/xgl/xglcompose.c
index f6725ac3b..5f27f5496 100644
--- a/xgl/xglcompose.c
+++ b/xgl/xglcompose.c
@@ -23,10 +23,6 @@
  * Author: David Reveman <davidr@novell.com>
  */
 
-#include "glxserver.h"
-#include "glapi.h"
-#include "glthread.h"
-#include "dispatch.h"
 #include "xgl.h"
 
 #ifdef RENDER
diff --git a/xgl/xglcopy.c b/xgl/xglcopy.c
index b0cf82f21..c5c479c89 100644
--- a/xgl/xglcopy.c
+++ b/xgl/xglcopy.c
@@ -22,11 +22,6 @@
  *
  * Author: David Reveman <davidr@novell.com>
  */
-#include "glxserver.h"
-#include "glapi.h"
-#include "glthread.h"
-#include "dispatch.h"
-
 
 #include "xgl.h"
 #include "fb.h"
diff --git a/xgl/xglget.c b/xgl/xglget.c
index 71e32b153..58040120e 100644
--- a/xgl/xglget.c
+++ b/xgl/xglget.c
@@ -22,11 +22,6 @@
  *
  * Author: David Reveman <davidr@novell.com>
  */
-#include "glxserver.h"
-#include "glapi.h"
-#include "glthread.h"
-#include "dispatch.h"
-
 
 #include "xgl.h"
 
diff --git a/xgl/xglsolid.c b/xgl/xglsolid.c
index a3dc2811c..3a820ad0e 100644
--- a/xgl/xglsolid.c
+++ b/xgl/xglsolid.c
@@ -22,10 +22,6 @@
  *
  * Author: David Reveman <davidr@novell.com>
  */
-#include "glxserver.h"
-#include "glapi.h"
-#include "glthread.h"
-#include "dispatch.h"
 
 #include "xgl.h"
 #include "gcstruct.h"
diff --git a/xgl/xglsync.c b/xgl/xglsync.c
index 2daef6eac..ad7f66dfd 100644
--- a/xgl/xglsync.c
+++ b/xgl/xglsync.c
@@ -475,6 +475,15 @@ xglAddCurrentBitDamage (DrawablePtr pDrawable)
 {
     XGL_DRAWABLE_PIXMAP_PRIV (pDrawable);
 
+    {
+    	/* This is a little severe as it also impacts xgl - tune me */
+    	XGL_SCREEN_PRIV (pDrawable->pScreen);
+	__glXleaveServer(FALSE);
+	glitz_surface_flush (pScreenPriv->surface);
+	glitz_drawable_finish (pScreenPriv->drawable);
+	__glXenterServer(FALSE);
+    }
+
     if (REGION_NOTEMPTY (pDrawable->pScreen, &pPixmapPriv->bitRegion))
     {
 	BoxPtr pBitExt;
diff --git a/xgl/xgltile.c b/xgl/xgltile.c
index 200b38149..dc7c3012d 100644
--- a/xgl/xgltile.c
+++ b/xgl/xgltile.c
@@ -22,10 +22,6 @@
  *
  * Author: David Reveman <davidr@novell.com>
  */
-#include "glxserver.h"
-#include "glapi.h"
-#include "glthread.h"
-#include "dispatch.h"
 
 
 #include "xgl.h"