File _service:tar_git:0001_qtcompositor_private_wayland_headers.patch of Package qtwayland

diff --git a/src/compositor/wayland_wrapper/qwldatadevice_p.h b/src/compositor/wayland_wrapper/qwldatadevice_p.h
index edbb517..69965a4 100644
--- a/src/compositor/wayland_wrapper/qwldatadevice_p.h
+++ b/src/compositor/wayland_wrapper/qwldatadevice_p.h
@@ -41,7 +41,7 @@
 #ifndef WLDATADEVICE_H
 #define WLDATADEVICE_H
 
-#include <qwayland-server-wayland.h>
+#include <private/qwayland-server-wayland.h>
 #include <qwlpointer_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/compositor/wayland_wrapper/qwldatadevicemanager_p.h b/src/compositor/wayland_wrapper/qwldatadevicemanager_p.h
index dcb51e1..263008d 100644
--- a/src/compositor/wayland_wrapper/qwldatadevicemanager_p.h
+++ b/src/compositor/wayland_wrapper/qwldatadevicemanager_p.h
@@ -48,7 +48,7 @@
 #include <QtGui/QClipboard>
 #include <QtCore/QMimeData>
 
-#include <qwayland-server-wayland.h>
+#include <private/qwayland-server-wayland.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/compositor/wayland_wrapper/qwldataoffer_p.h b/src/compositor/wayland_wrapper/qwldataoffer_p.h
index d296585..21d8658 100644
--- a/src/compositor/wayland_wrapper/qwldataoffer_p.h
+++ b/src/compositor/wayland_wrapper/qwldataoffer_p.h
@@ -41,7 +41,7 @@
 #ifndef WLDATAOFFER_H
 #define WLDATAOFFER_H
 
-#include <qwayland-server-wayland.h>
+#include <private/qwayland-server-wayland.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/compositor/wayland_wrapper/qwldatasource_p.h b/src/compositor/wayland_wrapper/qwldatasource_p.h
index c46e713..630a65c 100644
--- a/src/compositor/wayland_wrapper/qwldatasource_p.h
+++ b/src/compositor/wayland_wrapper/qwldatasource_p.h
@@ -41,7 +41,7 @@
 #ifndef WLDATASOURCE_H
 #define WLDATASOURCE_H
 
-#include <qwayland-server-wayland.h>
+#include <private/qwayland-server-wayland.h>
 
 #include <QtCore/QList>
 
diff --git a/src/compositor/wayland_wrapper/qwldisplay.cpp b/src/compositor/wayland_wrapper/qwldisplay.cpp
index 5dd6e38..2321ba5 100644
--- a/src/compositor/wayland_wrapper/qwldisplay.cpp
+++ b/src/compositor/wayland_wrapper/qwldisplay.cpp
@@ -42,7 +42,7 @@
 
 #include <QtCore/QDebug>
 
-#include <wayland-wayland-server-protocol.h>
+#include <private/wayland-wayland-server-protocol.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/compositor/wayland_wrapper/qwlextendedoutput_p.h b/src/compositor/wayland_wrapper/qwlextendedoutput_p.h
index d1704b8..8296c1e 100644
--- a/src/compositor/wayland_wrapper/qwlextendedoutput_p.h
+++ b/src/compositor/wayland_wrapper/qwlextendedoutput_p.h
@@ -47,7 +47,7 @@
 
 #include <QtCore/qnamespace.h>
 
-#include <qwayland-server-output-extension.h>
+#include <private/qwayland-server-output-extension.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/compositor/wayland_wrapper/qwlextendedsurface_p.h b/src/compositor/wayland_wrapper/qwlextendedsurface_p.h
index ecf2f49..ed4a69b 100644
--- a/src/compositor/wayland_wrapper/qwlextendedsurface_p.h
+++ b/src/compositor/wayland_wrapper/qwlextendedsurface_p.h
@@ -43,7 +43,7 @@
 
 #include <wayland-server.h>
 
-#include "qwayland-server-surface-extension.h"
+#include "private/qwayland-server-surface-extension.h"
 #include <private/qwlsurface_p.h>
 #include <QtCompositor/qwaylandsurface.h>
 
diff --git a/src/compositor/wayland_wrapper/qwlinputdevice_p.h b/src/compositor/wayland_wrapper/qwlinputdevice_p.h
index 3f7e4cc..741e8da 100644
--- a/src/compositor/wayland_wrapper/qwlinputdevice_p.h
+++ b/src/compositor/wayland_wrapper/qwlinputdevice_p.h
@@ -53,7 +53,7 @@
 #include <xkbcommon/xkbcommon.h>
 #endif
 
-#include <qwayland-server-wayland.h>
+#include <private/qwayland-server-wayland.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/compositor/wayland_wrapper/qwlinputmethod_p.h b/src/compositor/wayland_wrapper/qwlinputmethod_p.h
index 6b78034..aa9ff0a 100644
--- a/src/compositor/wayland_wrapper/qwlinputmethod_p.h
+++ b/src/compositor/wayland_wrapper/qwlinputmethod_p.h
@@ -41,7 +41,7 @@
 #ifndef QTWAYLAND_QWLINPUTMETHOD_H
 #define QTWAYLAND_QWLINPUTMETHOD_H
 
-#include <qwayland-server-input-method.h>
+#include <private/qwayland-server-input-method.h>
 
 #include <QObject>
 #include <QScopedPointer>
diff --git a/src/compositor/wayland_wrapper/qwlinputmethodcontext_p.h b/src/compositor/wayland_wrapper/qwlinputmethodcontext_p.h
index 9ceb8bf..df34a8e 100644
--- a/src/compositor/wayland_wrapper/qwlinputmethodcontext_p.h
+++ b/src/compositor/wayland_wrapper/qwlinputmethodcontext_p.h
@@ -41,7 +41,7 @@
 #ifndef QTWAYLAND_QWLINPUTMETHODCONTEXT_P_H
 #define QTWAYLAND_QWLINPUTMETHODCONTEXT_P_H
 
-#include <qwayland-server-input-method.h>
+#include <private/qwayland-server-input-method.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/compositor/wayland_wrapper/qwlinputpanel_p.h b/src/compositor/wayland_wrapper/qwlinputpanel_p.h
index 87a8c6a..cac002b 100644
--- a/src/compositor/wayland_wrapper/qwlinputpanel_p.h
+++ b/src/compositor/wayland_wrapper/qwlinputpanel_p.h
@@ -43,7 +43,7 @@
 
 #include <QtCompositor/qwaylandexport.h>
 
-#include <qwayland-server-input-method.h>
+#include <private/qwayland-server-input-method.h>
 
 #include <QRect>
 #include <QScopedPointer>
diff --git a/src/compositor/wayland_wrapper/qwlinputpanelsurface_p.h b/src/compositor/wayland_wrapper/qwlinputpanelsurface_p.h
index f9d4dfe..dbdffe3 100644
--- a/src/compositor/wayland_wrapper/qwlinputpanelsurface_p.h
+++ b/src/compositor/wayland_wrapper/qwlinputpanelsurface_p.h
@@ -41,7 +41,7 @@
 #ifndef QTWAYLAND_QWLINPUTPANELSURFACE_P_H
 #define QTWAYLAND_QWLINPUTPANELSURFACE_P_H
 
-#include <qwayland-server-input-method.h>
+#include <private/qwayland-server-input-method.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/compositor/wayland_wrapper/qwlkeyboard_p.h b/src/compositor/wayland_wrapper/qwlkeyboard_p.h
index a350a74..2251e16 100644
--- a/src/compositor/wayland_wrapper/qwlkeyboard_p.h
+++ b/src/compositor/wayland_wrapper/qwlkeyboard_p.h
@@ -45,7 +45,7 @@
 #include <QtCompositor/qwaylandexport.h>
 
 #include <QObject>
-#include <qwayland-server-wayland.h>
+#include <private/qwayland-server-wayland.h>
 
 #include <QtCore/QByteArray>
 
diff --git a/src/compositor/wayland_wrapper/qwloutput_p.h b/src/compositor/wayland_wrapper/qwloutput_p.h
index 514d3e9..bf33c62 100644
--- a/src/compositor/wayland_wrapper/qwloutput_p.h
+++ b/src/compositor/wayland_wrapper/qwloutput_p.h
@@ -44,7 +44,7 @@
 #include <QtCore/QRect>
 #include <QtCore/QList>
 
-#include <qwayland-server-wayland.h>
+#include <private/qwayland-server-wayland.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/compositor/wayland_wrapper/qwlpointer_p.h b/src/compositor/wayland_wrapper/qwlpointer_p.h
index 3200e10..013c882 100644
--- a/src/compositor/wayland_wrapper/qwlpointer_p.h
+++ b/src/compositor/wayland_wrapper/qwlpointer_p.h
@@ -47,7 +47,7 @@
 #include <QtCore/QList>
 #include <QtCore/QPoint>
 
-#include <qwayland-server-wayland.h>
+#include <private/qwayland-server-wayland.h>
 
 #include <stdint.h>
 
diff --git a/src/compositor/wayland_wrapper/qwlqtkey_p.h b/src/compositor/wayland_wrapper/qwlqtkey_p.h
index 012ef38..a6335ad 100644
--- a/src/compositor/wayland_wrapper/qwlqtkey_p.h
+++ b/src/compositor/wayland_wrapper/qwlqtkey_p.h
@@ -45,7 +45,7 @@
 
 #include "wayland-util.h"
 
-#include "qwayland-server-qtkey-extension.h"
+#include "private/qwayland-server-qtkey-extension.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/compositor/wayland_wrapper/qwlqttouch_p.h b/src/compositor/wayland_wrapper/qwlqttouch_p.h
index 2610936..5b6e99a 100644
--- a/src/compositor/wayland_wrapper/qwlqttouch_p.h
+++ b/src/compositor/wayland_wrapper/qwlqttouch_p.h
@@ -42,7 +42,7 @@
 #define WLTOUCH_H
 
 #include <private/qwlcompositor_p.h>
-#include "qwayland-server-touch-extension.h"
+#include "private/qwayland-server-touch-extension.h"
 #include "wayland-util.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/compositor/wayland_wrapper/qwlregion_p.h b/src/compositor/wayland_wrapper/qwlregion_p.h
index f905d96..e67e7f7 100644
--- a/src/compositor/wayland_wrapper/qwlregion_p.h
+++ b/src/compositor/wayland_wrapper/qwlregion_p.h
@@ -46,7 +46,7 @@
 #include <QRegion>
 
 #include <wayland-util.h>
-#include "qwayland-server-wayland.h"
+#include "private/qwayland-server-wayland.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/compositor/wayland_wrapper/qwlshellsurface_p.h b/src/compositor/wayland_wrapper/qwlshellsurface_p.h
index 9104293..eccafa2 100644
--- a/src/compositor/wayland_wrapper/qwlshellsurface_p.h
+++ b/src/compositor/wayland_wrapper/qwlshellsurface_p.h
@@ -50,7 +50,7 @@
 #include <QSet>
 #include <private/qwlpointer_p.h>
 
-#include <qwayland-server-wayland.h>
+#include <private/qwayland-server-wayland.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/compositor/wayland_wrapper/qwlsubsurface_p.h b/src/compositor/wayland_wrapper/qwlsubsurface_p.h
index 6f6ad12..2d67af8 100644
--- a/src/compositor/wayland_wrapper/qwlsubsurface_p.h
+++ b/src/compositor/wayland_wrapper/qwlsubsurface_p.h
@@ -43,7 +43,7 @@
 
 #include <private/qwlsurface_p.h>
 
-#include "wayland-sub-surface-extension-server-protocol.h"
+#include "private/wayland-sub-surface-extension-server-protocol.h"
 
 #include <QtCore/QLinkedList>
 
diff --git a/src/compositor/wayland_wrapper/qwlsurface_p.h b/src/compositor/wayland_wrapper/qwlsurface_p.h
index 9741a21..164755c 100644
--- a/src/compositor/wayland_wrapper/qwlsurface_p.h
+++ b/src/compositor/wayland_wrapper/qwlsurface_p.h
@@ -59,7 +59,7 @@
 
 #include <wayland-util.h>
 
-#include "qwayland-server-wayland.h"
+#include "private/qwayland-server-wayland.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/compositor/wayland_wrapper/qwltextinput_p.h b/src/compositor/wayland_wrapper/qwltextinput_p.h
index c624387..677d39e 100644
--- a/src/compositor/wayland_wrapper/qwltextinput_p.h
+++ b/src/compositor/wayland_wrapper/qwltextinput_p.h
@@ -41,7 +41,7 @@
 #ifndef QTWAYLAND_QWLTEXTINPUT_P_H
 #define QTWAYLAND_QWLTEXTINPUT_P_H
 
-#include <qwayland-server-text.h>
+#include <private/qwayland-server-text.h>
 
 #include <QRect>
 
diff --git a/src/compositor/wayland_wrapper/qwltextinputmanager_p.h b/src/compositor/wayland_wrapper/qwltextinputmanager_p.h
index 081fdfa..08199aa 100644
--- a/src/compositor/wayland_wrapper/qwltextinputmanager_p.h
+++ b/src/compositor/wayland_wrapper/qwltextinputmanager_p.h
@@ -41,7 +41,7 @@
 #ifndef QTWAYLAND_QWLTEXTINPUTMANAGER_P_H
 #define QTWAYLAND_QWLTEXTINPUTMANAGER_P_H
 
-#include <qwayland-server-text.h>
+#include <private/qwayland-server-text.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/compositor/wayland_wrapper/qwltouch_p.h b/src/compositor/wayland_wrapper/qwltouch_p.h
index d967b71..14b9e85 100644
--- a/src/compositor/wayland_wrapper/qwltouch_p.h
+++ b/src/compositor/wayland_wrapper/qwltouch_p.h
@@ -46,7 +46,7 @@
 
 #include <QtCore/QPoint>
 
-#include <qwayland-server-wayland.h>
+#include <private/qwayland-server-wayland.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/compositor/windowmanagerprotocol/waylandwindowmanagerintegration.h b/src/compositor/windowmanagerprotocol/waylandwindowmanagerintegration.h
index ccf5d4e..fbb42dc 100644
--- a/src/compositor/windowmanagerprotocol/waylandwindowmanagerintegration.h
+++ b/src/compositor/windowmanagerprotocol/waylandwindowmanagerintegration.h
@@ -42,7 +42,7 @@
 #define WAYLANDWINDOWMANAGERINTEGRATION_H
 
 #include <QtCompositor/qwaylandexport.h>
-#include "qwayland-server-windowmanager.h"
+#include "private/qwayland-server-windowmanager.h"
 
 #include <QObject>
 #include <QMap>
diff --git a/src/plugins/waylandcompositors/brcm-egl/brcmbuffer.h b/src/plugins/waylandcompositors/brcm-egl/brcmbuffer.h
index 6ec5868..19d5dc3 100644
--- a/src/plugins/waylandcompositors/brcm-egl/brcmbuffer.h
+++ b/src/plugins/waylandcompositors/brcm-egl/brcmbuffer.h
@@ -42,7 +42,7 @@
 #define BRCMBUFFER_H
 
 #include <QtCompositor/private/qwlcompositor_p.h>
-#include <qwayland-server-wayland.h>
+#include <private/qwayland-server-wayland.h>
 
 #include <QtCore/QSize>
 #include <QtCore/QVector>
diff --git a/src/plugins/waylandcompositors/xcomposite_share/xcompositebuffer.h b/src/plugins/waylandcompositors/xcomposite_share/xcompositebuffer.h
index 20cf399..01a7fcd 100644
--- a/src/plugins/waylandcompositors/xcomposite_share/xcompositebuffer.h
+++ b/src/plugins/waylandcompositors/xcomposite_share/xcompositebuffer.h
@@ -42,7 +42,7 @@
 #define XCOMPOSITEBUFFER_H
 
 #include <private/qwlcompositor_p.h>
-#include <qwayland-server-wayland.h>
+#include <private/qwayland-server-wayland.h>
 
 #include <QtCore/QSize>
 
diff --git a/src/qtwaylandscanner/qtwaylandscanner.cpp b/src/qtwaylandscanner/qtwaylandscanner.cpp
index 5b5b76e..b44ce5f 100644
--- a/src/qtwaylandscanner/qtwaylandscanner.cpp
+++ b/src/qtwaylandscanner/qtwaylandscanner.cpp
@@ -362,7 +362,7 @@ void process(QXmlStreamReader &xml)
         printf("#define %s\n", inclusionGuard.constData());
         printf("\n");
         printf("#include \"wayland-server.h\"\n");
-        printf("#include \"wayland-%s-server-protocol.h\"\n", QByteArray(protocolName).replace('_', '-').constData());
+        printf("#include \"private/wayland-%s-server-protocol.h\"\n", QByteArray(protocolName).replace('_', '-').constData());
         printf("#include <QByteArray>\n");
         printf("#include <QMultiMap>\n");
         printf("#include <QString>\n");
@@ -501,7 +501,7 @@ void process(QXmlStreamReader &xml)
     }
 
     if (option == ServerCode) {
-        printf("#include \"qwayland-server-%s.h\"\n", QByteArray(protocolName).replace('_', '-').constData());
+        printf("#include \"private/qwayland-server-%s.h\"\n", QByteArray(protocolName).replace('_', '-').constData());
         printf("\n");
         printf("QT_BEGIN_NAMESPACE\n");
         printf("\n");
diff --git a/tests/auto/client/mockinput.h b/tests/auto/client/mockinput.h
index 669bfae..ac895f3 100644
--- a/tests/auto/client/mockinput.h
+++ b/tests/auto/client/mockinput.h
@@ -45,7 +45,7 @@
 
 #include <qglobal.h>
 
-#include "qwayland-server-wayland.h"
+#include "private/qwayland-server-wayland.h"
 
 #include "mockcompositor.h"
 
diff --git a/tests/auto/client/mocksurface.h b/tests/auto/client/mocksurface.h
index 49260f5..5a2f634 100644
--- a/tests/auto/client/mocksurface.h
+++ b/tests/auto/client/mocksurface.h
@@ -41,7 +41,7 @@
 
 #include <qglobal.h>
 
-#include "qwayland-server-wayland.h"
+#include "private/qwayland-server-wayland.h"
 
 #include "mockcompositor.h"