--- a/qtmobility/plugins/multimedia/gstreamer/qgstxvimagebuffer.h	Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qgstxvimagebuffer.h	Wed Jun 23 19:08:38 2010 +0300
@@ -42,12 +42,14 @@
 #ifndef QGSTXVIMAGEBUFFER_H
 #define QGSTXVIMAGEBUFFER_H
 
-#include <QtMultimedia/qabstractvideobuffer.h>
-#include <QtMultimedia/qvideosurfaceformat.h>
+#include <qabstractvideobuffer.h>
+#include <qvideosurfaceformat.h>
 #include <QtCore/qmutex.h>
 #include <QtCore/qwaitcondition.h>
 #include <QtCore/qqueue.h>
 
+#ifndef QT_NO_XVIDEO
+
 #include <X11/Xlib.h>
 #include <sys/ipc.h>
 #include <sys/shm.h>
@@ -117,4 +119,6 @@
     QList<XvShmImage> m_imagesToDestroy;
 };
 
+#endif //QT_NO_XVIDEO
+
 #endif