--- qt/src/openvg/qpaintengine_vg.cpp.ark	2011-06-10 12:48:05.345302348 +0200
+++ qt/src/openvg/qpaintengine_vg.cpp	2011-06-10 13:07:40.345273724 +0200
@@ -39,9 +39,16 @@
 **
 ****************************************************************************/
 
+#include <qmetatype.h>
 #include "qpaintengine_vg_p.h"
+#undef CursorShape // Undo damage caused by X11/X.h
+#undef None
+#undef Bool
 #include "qpixmapdata_vg_p.h"
 #include "qpixmapfilter_vg_p.h"
+#undef CursorShape // Undo damage caused by X11/X.h being included again
+#undef None
+#undef Bool
 #include "qvgcompositionhelper_p.h"
 #include "qvgimagepool_p.h"
 #include "qvgfontglyphcache_p.h"
--- qt/src/openvg/qpixmapdata_vg.cpp.ark	2011-06-10 13:33:41.268569032 +0200
+++ qt/src/openvg/qpixmapdata_vg.cpp	2011-06-10 13:48:41.691880430 +0200
@@ -39,7 +39,16 @@
 **
 ****************************************************************************/
 
+#include <qmetatype.h>
+#include <qtextstream.h>
 #include "qpixmapdata_vg_p.h"
+#undef None
+#undef KeyPress
+#undef KeyRelease
+#undef FocusIn
+#undef FocusOut
+#undef FontChange
+#undef Bool
 #include "qpaintengine_vg_p.h"
 #include <QtGui/private/qdrawhelper_p.h>
 #if !defined(QT_NO_EGL)
--- qt/src/openvg/qpixmapfilter_vg.cpp.ark	2011-06-10 14:27:19.458490634 +0200
+++ qt/src/openvg/qpixmapfilter_vg.cpp	2011-06-10 14:27:29.108490398 +0200
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 
+#include <qmetatype.h>
 #include "qpixmapfilter_vg_p.h"
 #include "qvgimagepool_p.h"
 #include <QtCore/qvarlengtharray.h>
--- qt/src/openvg/qwindowsurface_vg.cpp.ark	2011-06-10 17:34:31.941550334 +0200
+++ qt/src/openvg/qwindowsurface_vg.cpp	2011-06-10 17:42:06.291539266 +0200
@@ -39,8 +39,17 @@
 **
 ****************************************************************************/
 
+#include <qmetatype.h>
+#include <qvariant.h>
+#include <qtextstream.h>
 #include "qwindowsurface_vg_p.h"
 #include "qwindowsurface_vgegl_p.h"
+#undef None
+#undef KeyPress
+#undef KeyRelease
+#undef FocusIn
+#undef FocusOut
+#undef FontChange
 #include "qpaintengine_vg_p.h"
 #include "qpixmapdata_vg_p.h"
 #include "qvg_p.h"
--- qt/src/openvg/qwindowsurface_vgegl.cpp.ark	2011-06-10 17:43:11.271537683 +0200
+++ qt/src/openvg/qwindowsurface_vgegl.cpp	2011-06-10 17:52:07.404857956 +0200
@@ -39,7 +39,16 @@
 **
 ****************************************************************************/
 
+#include <qmetatype.h>
+#include <qtextstream.h>
+#include <qvariant.h>
 #include "qwindowsurface_vgegl_p.h"
+#undef None
+#undef KeyPress
+#undef KeyRelease
+#undef FocusIn
+#undef FocusOut
+#undef FontChange
 #include "qpaintengine_vg_p.h"
 #include "qpixmapdata_vg_p.h"
 #include "qvgimagepool_p.h"