92 files changed, 202 insertions, 145 deletions

diff --git a/src/plugins/platforms/wayland_common/wayland_common.pro b/src/client/client.pro
index cd40a1824..66dc1a475 100644
--- a/src/plugins/platforms/wayland_common/wayland_common.pro
+++ b/src/client/client.pro
@@ -1,7 +1,45 @@
-TEMPLATE = lib
-CONFIG += staticlib
+TARGET = QtWaylandClient
+QT += core-private gui-private
+QT_FOR_PRIVATE += platformsupport-private
+
+MODULE=waylandclient
+load(qt_module)
+
+CONFIG += link_pkgconfig qpa/genericunixfontdatabase wayland-scanner
+
+!equals(QT_WAYLAND_GL_CONFIG, nogl) {
+    DEFINES += QT_WAYLAND_GL_SUPPORT
+}
+
+config_xkbcommon {
+    !contains(QT_CONFIG, no-pkg-config) {
+        PKGCONFIG += xkbcommon
+    } else {
+        LIBS += -lxkbcommon
+    }
+} else {
+    DEFINES += QT_NO_WAYLAND_XKB
+}
+
+!contains(QT_CONFIG, no-pkg-config) {
+    PKGCONFIG += wayland-client wayland-cursor
+    contains(QT_CONFIG, glib): PKGCONFIG_PRIVATE += glib-2.0
+} else {
+    LIBS += -lwayland-client -lwayland-cursor $$QT_LIBS_GLIB
+}
+
+INCLUDEPATH += $$PWD/../shared
+
+WAYLANDCLIENTSOURCES += \
+            ../3rdparty/protocol/wayland.xml \
+            ../extensions/surface-extension.xml \
+            ../extensions/sub-surface-extension.xml \
+            ../extensions/output-extension.xml \
+            ../extensions/touch-extension.xml \
+            ../extensions/qtkey-extension.xml \
+            ../extensions/windowmanager.xml \
+            ../3rdparty/protocol/text.xml \
 
-include ($$PWD/wayland_common_share.pri)
 
 SOURCES +=  qwaylandintegration.cpp \
             qwaylandnativeinterface.cpp \
@@ -23,7 +61,7 @@ SOURCES +=  qwaylandintegration.cpp \
             qwaylandsubsurface.cpp \
             qwaylandtouch.cpp \
             qwaylandqtkey.cpp \
-            ../../../shared/qwaylandmimehelper.cpp \
+            ../shared/qwaylandmimehelper.cpp \
             qwaylanddecoration.cpp \
             qwaylandeventthread.cpp\
             qwaylandwindowmanagerintegration.cpp \
@@ -51,7 +89,7 @@ HEADERS +=  qwaylandintegration.h \
             qwaylandsubsurface.h \
             qwaylandtouch.h \
             qwaylandqtkey.h \
-            ../../../shared/qwaylandmimehelper.h \
+            ../shared/qwaylandmimehelper.h \
             qwaylanddecoration.h \
             qwaylandeventthread.h \
             qwaylandwindowmanagerintegration.h \
@@ -63,16 +101,3 @@ contains(DEFINES, QT_WAYLAND_GL_SUPPORT) {
     HEADERS += qwaylandglintegration.h
 }
 
-CONFIG += wayland-scanner
-WAYLANDCLIENTSOURCES += \
-            ../../../extensions/surface-extension.xml \
-            ../../../extensions/sub-surface-extension.xml \
-            ../../../extensions/output-extension.xml \
-            ../../../extensions/touch-extension.xml \
-            ../../../extensions/qtkey-extension.xml \
-            ../../../extensions/windowmanager.xml \
-            ../../../3rdparty/protocol/text.xml \
-
-PLUGIN_TYPE = platforms
-
-load(qt_common)
diff --git a/src/plugins/platforms/wayland_common/qwaylandbuffer.h b/src/client/qwaylandbuffer.h
index eee648561..8d9ceaa8a 100644
--- a/src/plugins/platforms/wayland_common/qwaylandbuffer.h
+++ b/src/client/qwaylandbuffer.h
@@ -42,6 +42,8 @@
 #ifndef QWAYLANDBUFFER_H
 #define QWAYLANDBUFFER_H
 
+#include "qwaylandclientexport.h"
+
 #include <QtCore/QSize>
 #include <QtCore/QRect>
 
@@ -50,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QWaylandBuffer {
+class Q_WAYLAND_CLIENT_EXPORT QWaylandBuffer {
 public:
     QWaylandBuffer() { }
     virtual ~QWaylandBuffer() { }
diff --git a/src/client/qwaylandclientexport.h b/src/client/qwaylandclientexport.h
new file mode 100644
index 000000000..d9d6d7f7c
--- /dev/null
+++ b/src/client/qwaylandclientexport.h
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QWAYLANDCLIENTEXPORT_H
+#define QWAYLANDCLIENTEXPORT_H
+
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_NAMESPACE
+
+#if !defined(Q_WAYLAND_CLIENT_EXPORT)
+#  if defined(QT_SHARED)
+#    define Q_WAYLAND_CLIENT_EXPORT Q_DECL_EXPORT
+#  else
+#    define Q_WAYLAND_CLIENT_EXPORT
+#  endif
+#endif
+
+QT_END_NAMESPACE
+
+#endif //QWAYLANDCLIENTEXPORT_H
+
diff --git a/src/plugins/platforms/wayland_common/qwaylandclipboard.cpp b/src/client/qwaylandclipboard.cpp
index 838f6d231..838f6d231 100644
--- a/src/plugins/platforms/wayland_common/qwaylandclipboard.cpp
+++ b/src/client/qwaylandclipboard.cpp
diff --git a/src/plugins/platforms/wayland_common/qwaylandclipboard.h b/src/client/qwaylandclipboard.h
index f1b1800e3..692a31255 100644
--- a/src/plugins/platforms/wayland_common/qwaylandclipboard.h
+++ b/src/client/qwaylandclipboard.h
@@ -45,11 +45,13 @@
 #include <qpa/qplatformclipboard.h>
 #include <QtCore/QVariant>
 
+#include <QtWaylandClient/qwaylandclientexport.h>
+
 QT_BEGIN_NAMESPACE
 
 class QWaylandDisplay;
 
-class QWaylandClipboard : public QPlatformClipboard
+class Q_WAYLAND_CLIENT_EXPORT QWaylandClipboard : public QPlatformClipboard
 {
 public:
     QWaylandClipboard(QWaylandDisplay *display);
diff --git a/src/plugins/platforms/wayland_common/qwaylandcursor.cpp b/src/client/qwaylandcursor.cpp
index 05ab6d496..05ab6d496 100644
--- a/src/plugins/platforms/wayland_common/qwaylandcursor.cpp
+++ b/src/client/qwaylandcursor.cpp
diff --git a/src/plugins/platforms/wayland_common/qwaylandcursor.h b/src/client/qwaylandcursor.h
index ceb6d7488..894d322a6 100644
--- a/src/plugins/platforms/wayland_common/qwaylandcursor.h
+++ b/src/client/qwaylandcursor.h
@@ -43,7 +43,8 @@
 #define QWAYLANDCURSOR_H
 
 #include <qpa/qplatformcursor.h>
-#include <QMap>
+#include <QtCore/QMap>
+#include <QtWaylandClient/qwaylandclientexport.h>
 
 struct wl_cursor;
 struct wl_cursor_image;
@@ -54,7 +55,7 @@ QT_BEGIN_NAMESPACE
 class QWaylandDisplay;
 class QWaylandScreen;
 
-class QWaylandCursor : public QPlatformCursor
+class Q_WAYLAND_CLIENT_EXPORT QWaylandCursor : public QPlatformCursor
 {
 public:
     QWaylandCursor(QWaylandScreen *screen);
diff --git a/src/plugins/platforms/wayland_common/qwaylanddatadevice.cpp b/src/client/qwaylanddatadevice.cpp
index 2a70a338c..2a70a338c 100644
--- a/src/plugins/platforms/wayland_common/qwaylanddatadevice.cpp
+++ b/src/client/qwaylanddatadevice.cpp
diff --git a/src/plugins/platforms/wayland_common/qwaylanddatadevice.h b/src/client/qwaylanddatadevice.h
index e258d8776..e258d8776 100644
--- a/src/plugins/platforms/wayland_common/qwaylanddatadevice.h
+++ b/src/client/qwaylanddatadevice.h
diff --git a/src/plugins/platforms/wayland_common/qwaylanddatadevicemanager.cpp b/src/client/qwaylanddatadevicemanager.cpp
index 4a96dbce3..4a96dbce3 100644
--- a/src/plugins/platforms/wayland_common/qwaylanddatadevicemanager.cpp
+++ b/src/client/qwaylanddatadevicemanager.cpp
diff --git a/src/plugins/platforms/wayland_common/qwaylanddatadevicemanager.h b/src/client/qwaylanddatadevicemanager.h
index b13e73329..6b3ad177c 100644
--- a/src/plugins/platforms/wayland_common/qwaylanddatadevicemanager.h
+++ b/src/client/qwaylanddatadevicemanager.h
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 class QWaylandDataDevice;
 class QWaylandDataSource;
 
-class QWaylandDataDeviceManager : public QtWayland::wl_data_device_manager
+class Q_WAYLAND_CLIENT_EXPORT QWaylandDataDeviceManager : public QtWayland::wl_data_device_manager
 {
 public:
     QWaylandDataDeviceManager(QWaylandDisplay *display, uint32_t id);
diff --git a/src/plugins/platforms/wayland_common/qwaylanddataoffer.cpp b/src/client/qwaylanddataoffer.cpp
index e237d0b9a..e237d0b9a 100644
--- a/src/plugins/platforms/wayland_common/qwaylanddataoffer.cpp
+++ b/src/client/qwaylanddataoffer.cpp
diff --git a/src/plugins/platforms/wayland_common/qwaylanddataoffer.h b/src/client/qwaylanddataoffer.h
index 4b2b832f6..7dc3baa38 100644
--- a/src/plugins/platforms/wayland_common/qwaylanddataoffer.h
+++ b/src/client/qwaylanddataoffer.h
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 class QWaylandDisplay;
 class QWaylandMimeData;
 
-class QWaylandDataOffer : public QtWayland::wl_data_offer
+class Q_WAYLAND_CLIENT_EXPORT QWaylandDataOffer : public QtWayland::wl_data_offer
 {
 public:
     explicit QWaylandDataOffer(QWaylandDisplay *display, struct ::wl_data_offer *offer);
diff --git a/src/plugins/platforms/wayland_common/qwaylanddatasource.cpp b/src/client/qwaylanddatasource.cpp
index ba4b68110..ba4b68110 100644
--- a/src/plugins/platforms/wayland_common/qwaylanddatasource.cpp
+++ b/src/client/qwaylanddatasource.cpp
diff --git a/src/plugins/platforms/wayland_common/qwaylanddatasource.h b/src/client/qwaylanddatasource.h
index 48c445bef..670a8872f 100644
--- a/src/plugins/platforms/wayland_common/qwaylanddatasource.h
+++ b/src/client/qwaylanddatasource.h
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 class QMimeData;
 class QWaylandDataDeviceManager;
 
-class QWaylandDataSource : public QObject, public QtWayland::wl_data_source
+class Q_WAYLAND_CLIENT_EXPORT QWaylandDataSource : public QObject, public QtWayland::wl_data_source
 {
     Q_OBJECT
 public:
diff --git a/src/plugins/platforms/wayland_common/qwaylanddecoration.cpp b/src/client/qwaylanddecoration.cpp
index 74c01f93a..74c01f93a 100644
--- a/src/plugins/platforms/wayland_common/qwaylanddecoration.cpp
+++ b/src/client/qwaylanddecoration.cpp
diff --git a/src/plugins/platforms/wayland_common/qwaylanddecoration.h b/src/client/qwaylanddecoration.h
index 5efeab226..f99723588 100644
--- a/src/plugins/platforms/wayland_common/qwaylanddecoration.h
+++ b/src/client/qwaylanddecoration.h
@@ -49,6 +49,7 @@
 #include <QtGui/QColor>
 #include <QtGui/QStaticText>
 #include <QtGui/QImage>
+#include <QtWaylandClient/qwaylandclientexport.h>
 
 #include <wayland-client.h>
 
@@ -64,7 +65,7 @@ class QWaylandScreen;
 class QWaylandWindow;
 class QWaylandInputDevice;
 
-class QWaylandDecoration
+class Q_WAYLAND_CLIENT_EXPORT QWaylandDecoration
 {
 public:
     QWaylandDecoration(QWaylandWindow *window);
diff --git a/src/plugins/platforms/wayland_common/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp
index 3d83e5941..d9a8b4528 100644
--- a/src/plugins/platforms/wayland_common/qwaylanddisplay.cpp
+++ b/src/client/qwaylanddisplay.cpp
@@ -61,7 +61,7 @@
 #include "qwaylandtouch.h"
 #include "qwaylandqtkey.h"
 
-#include "qwayland-text.h"
+#include <QtWaylandClient/private/qwayland-text.h>
 
 #include <QtCore/QAbstractEventDispatcher>
 #include <QtGui/private/qguiapplication_p.h>
@@ -135,7 +135,7 @@ QWaylandDisplay::QWaylandDisplay()
     connect(mEventThreadObject, SIGNAL(newEventsRead()), this, SLOT(flushRequests()));
 
 #ifdef QT_WAYLAND_GL_SUPPORT
-    mEglIntegration = QWaylandGLIntegration::createGLIntegration(this);
+    //mEglIntegration = QWaylandGLIntegration::createGLIntegration(this);
 #endif
 
     mWindowManagerIntegration = new QWaylandWindowManagerIntegration(this);
diff --git a/src/plugins/platforms/wayland_common/qwaylanddisplay.h b/src/client/qwaylanddisplay.h
index be509dfd9..451043507 100644
--- a/src/plugins/platforms/wayland_common/qwaylanddisplay.h
+++ b/src/client/qwaylanddisplay.h
@@ -48,7 +48,9 @@
 #include <QtCore/QWaitCondition>
 
 #include <wayland-client.h>
-#include <qwayland-wayland.h>
+#include <QtWaylandClient/private/qwayland-wayland.h>
+
+#include <QtWaylandClient/qwaylandclientexport.h>
 
 struct wl_cursor_image;
 
@@ -82,7 +84,7 @@ typedef void (*RegistryListener)(void *data,
                                  const QString &interface,
                                  uint32_t version);
 
-class QWaylandDisplay : public QObject, public QtWayland::wl_registry {
+class Q_WAYLAND_CLIENT_EXPORT QWaylandDisplay : public QObject, public QtWayland::wl_registry {
     Q_OBJECT
 
 public:
diff --git a/src/plugins/platforms/wayland_common/qwaylanddnd.cpp b/src/client/qwaylanddnd.cpp
index 635fd9678..635fd9678 100644
--- a/src/plugins/platforms/wayland_common/qwaylanddnd.cpp
+++ b/src/client/qwaylanddnd.cpp
diff --git a/src/plugins/platforms/wayland_common/qwaylanddnd.h b/src/client/qwaylanddnd.h
index 409b3d546..f125dd2b2 100644
--- a/src/plugins/platforms/wayland_common/qwaylanddnd.h
+++ b/src/client/qwaylanddnd.h
@@ -51,7 +51,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QWaylandDrag : public QBasicDrag
+class Q_WAYLAND_CLIENT_EXPORT QWaylandDrag : public QBasicDrag
 {
 public:
     QWaylandDrag(QWaylandDisplay *display);
diff --git a/src/plugins/platforms/wayland_common/qwaylandeventthread.cpp b/src/client/qwaylandeventthread.cpp
index 3392d36c6..3392d36c6 100644
--- a/src/plugins/platforms/wayland_common/qwaylandeventthread.cpp
+++ b/src/client/qwaylandeventthread.cpp
diff --git a/src/plugins/platforms/wayland_common/qwaylandeventthread.h b/src/client/qwaylandeventthread.h
index f4aec744c..ba7e33e09 100644
--- a/src/plugins/platforms/wayland_common/qwaylandeventthread.h
+++ b/src/client/qwaylandeventthread.h
@@ -5,11 +5,13 @@
 #include <QMutex>
 #include <wayland-client.h>
 
+#include <QtWaylandClient/qwaylandclientexport.h>
+
 QT_BEGIN_NAMESPACE
 
 class QSocketNotifier;
 
-class QWaylandEventThread : public QObject
+class Q_WAYLAND_CLIENT_EXPORT QWaylandEventThread : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/plugins/platforms/wayland_common/qwaylandextendedoutput.cpp b/src/client/qwaylandextendedoutput.cpp
index d7c684be9..d7c684be9 100644
--- a/src/plugins/platforms/wayland_common/qwaylandextendedoutput.cpp
+++ b/src/client/qwaylandextendedoutput.cpp
diff --git a/src/plugins/platforms/wayland_common/qwaylandextendedoutput.h b/src/client/qwaylandextendedoutput.h
index dd9ce6a85..e311a9b4f 100644
--- a/src/plugins/platforms/wayland_common/qwaylandextendedoutput.h
+++ b/src/client/qwaylandextendedoutput.h
@@ -43,13 +43,13 @@
 #define QWAYLANDEXTENDEDOUTPUT_H
 
 #include "qwaylanddisplay.h"
-#include "qwayland-output-extension.h"
+#include <QtWaylandClient/private/qwayland-output-extension.h>
 
 QT_BEGIN_NAMESPACE
 
 class QWaylandExtendedOutput;
 
-class QWaylandExtendedOutput : public QtWayland::qt_extended_output
+class Q_WAYLAND_CLIENT_EXPORT QWaylandExtendedOutput : public QtWayland::qt_extended_output
 {
 public:
     QWaylandExtendedOutput(QWaylandScreen *screen, struct ::qt_extended_output *extended_output);
diff --git a/src/plugins/platforms/wayland_common/qwaylandextendedsurface.cpp b/src/client/qwaylandextendedsurface.cpp
index bfd2a1d0b..bfd2a1d0b 100644
--- a/src/plugins/platforms/wayland_common/qwaylandextendedsurface.cpp
+++ b/src/client/qwaylandextendedsurface.cpp
diff --git a/src/plugins/platforms/wayland_common/qwaylandextendedsurface.h b/src/client/qwaylandextendedsurface.h
index 4bef5e073..8c0546473 100644
--- a/src/plugins/platforms/wayland_common/qwaylandextendedsurface.h
+++ b/src/client/qwaylandextendedsurface.h
@@ -45,15 +45,17 @@
 #include <QtCore/QString>
 #include <QtCore/QVariant>
 
+#include <QtWaylandClient/qwaylandclientexport.h>
+
 #include <wayland-client.h>
-#include <qwayland-surface-extension.h>
+#include <QtWaylandClient/private/qwayland-surface-extension.h>
 
 QT_BEGIN_NAMESPACE
 
 class QWaylandDisplay;
 class QWaylandWindow;
 
-class QWaylandExtendedSurface : public QtWayland::qt_extended_surface
+class Q_WAYLAND_CLIENT_EXPORT QWaylandExtendedSurface : public QtWayland::qt_extended_surface
 {
 public:
     QWaylandExtendedSurface(QWaylandWindow *window, struct ::qt_extended_surface *extended_surface);
diff --git a/src/plugins/platforms/wayland_common/qwaylandglintegration.cpp b/src/client/qwaylandglintegration.cpp
index bafb99443..bafb99443 100644
--- a/src/plugins/platforms/wayland_common/qwaylandglintegration.cpp
+++ b/src/client/qwaylandglintegration.cpp
diff --git a/src/plugins/platforms/wayland_common/qwaylandglintegration.h b/src/client/qwaylandglintegration.h
index 4055790b3..7697d3103 100644
--- a/src/plugins/platforms/wayland_common/qwaylandglintegration.h
+++ b/src/client/qwaylandglintegration.h
@@ -43,6 +43,7 @@
 #define QWAYLANDGLINTEGRATION_H
 
 #include <QtCore/qglobal.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -53,7 +54,7 @@ class QWindow;
 class QPlatformOpenGLContext;
 class QSurfaceFormat;
 
-class QWaylandGLIntegration
+class Q_WAYLAND_CLIENT_EXPORT QWaylandGLIntegration
 {
 public:
     QWaylandGLIntegration();
diff --git a/src/plugins/platforms/wayland_common/qwaylandinputcontext.cpp b/src/client/qwaylandinputcontext.cpp
index f50581b3a..f50581b3a 100644
--- a/src/plugins/platforms/wayland_common/qwaylandinputcontext.cpp
+++ b/src/client/qwaylandinputcontext.cpp
diff --git a/src/plugins/platforms/wayland_common/qwaylandinputcontext.h b/src/client/qwaylandinputcontext.h
index 43284eb9e..1f7e4e361 100644
--- a/src/plugins/platforms/wayland_common/qwaylandinputcontext.h
+++ b/src/client/qwaylandinputcontext.h
@@ -43,7 +43,7 @@
 
 #include <qpa/qplatforminputcontext.h>
 
-#include <qwayland-text.h>
+#include <QtWaylandClient/private/qwayland-text.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/wayland_common/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp
index b9338b4c3..b9338b4c3 100644
--- a/src/plugins/platforms/wayland_common/qwaylandinputdevice.cpp
+++ b/src/client/qwaylandinputdevice.cpp
diff --git a/src/plugins/platforms/wayland_common/qwaylandinputdevice.h b/src/client/qwaylandinputdevice.h
index 15b0571d6..625d773d1 100644
--- a/src/plugins/platforms/wayland_common/qwaylandinputdevice.h
+++ b/src/client/qwaylandinputdevice.h
@@ -53,7 +53,7 @@
 
 #include <wayland-client.h>
 
-#include "qwayland-wayland.h"
+#include <QtWaylandClient/private/qwayland-wayland.h>
 
 #ifndef QT_NO_WAYLAND_XKB
 struct xkb_context;
@@ -67,7 +67,12 @@ class QWaylandWindow;
 class QWaylandDisplay;
 class QWaylandDataDevice;
 
-class QWaylandInputDevice : public QObject, public QtWayland::wl_pointer, public QtWayland::wl_keyboard, public QtWayland::wl_touch, public QtWayland::wl_seat
+class Q_WAYLAND_CLIENT_EXPORT QWaylandInputDevice
+                            : public QObject
+                            , public QtWayland::wl_pointer
+                            , public QtWayland::wl_keyboard
+                            , public QtWayland::wl_touch
+                            , public QtWayland::wl_seat
 {
     Q_OBJECT
 public:
diff --git a/src/plugins/platforms/wayland_common/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp
index 9c02419b8..9c02419b8 100644
--- a/src/plugins/platforms/wayland_common/qwaylandintegration.cpp
+++ b/src/client/qwaylandintegration.cpp
diff --git a/src/plugins/platforms/wayland_common/qwaylandintegration.h b/src/client/qwaylandintegration.h
index 9a6b7cd2c..8886c28da 100644
--- a/src/plugins/platforms/wayland_common/qwaylandintegration.h
+++ b/src/client/qwaylandintegration.h
@@ -44,12 +44,13 @@
 
 #include <qpa/qplatformintegration.h>
 
+#include <QtWaylandClient/qwaylandclientexport.h>
 QT_BEGIN_NAMESPACE
 
 class QWaylandBuffer;
 class QWaylandDisplay;
 
-class QWaylandIntegration : public QPlatformIntegration
+class Q_WAYLAND_CLIENT_EXPORT QWaylandIntegration : public QPlatformIntegration
 {
 public:
     QWaylandIntegration();
diff --git a/src/plugins/platforms/wayland_common/qwaylandnativeinterface.cpp b/src/client/qwaylandnativeinterface.cpp
index 354e8dbaa..354e8dbaa 100644
--- a/src/plugins/platforms/wayland_common/qwaylandnativeinterface.cpp
+++ b/src/client/qwaylandnativeinterface.cpp
diff --git a/src/plugins/platforms/wayland_common/qwaylandnativeinterface.h b/src/client/qwaylandnativeinterface.h
index 5c1fe601d..c5f0fda73 100644
--- a/src/plugins/platforms/wayland_common/qwaylandnativeinterface.h
+++ b/src/client/qwaylandnativeinterface.h
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
 
 class QWaylandIntegration;
 
-class QWaylandNativeInterface : public QPlatformNativeInterface
+class Q_WAYLAND_CLIENT_EXPORT QWaylandNativeInterface : public QPlatformNativeInterface
 {
 public:
     QWaylandNativeInterface(QWaylandIntegration *integration);
diff --git a/src/plugins/platforms/wayland_common/qwaylandqtkey.cpp b/src/client/qwaylandqtkey.cpp
index 6cc4597d9..6cc4597d9 100644
--- a/src/plugins/platforms/wayland_common/qwaylandqtkey.cpp
+++ b/src/client/qwaylandqtkey.cpp
diff --git a/src/plugins/platforms/wayland_common/qwaylandqtkey.h b/src/client/qwaylandqtkey.h
index c02831304..0acc9e8ad 100644
--- a/src/plugins/platforms/wayland_common/qwaylandqtkey.h
+++ b/src/client/qwaylandqtkey.h
@@ -45,11 +45,11 @@
 #include "qwaylanddisplay.h"
 #include <qpa/qwindowsysteminterface.h>
 
-#include "qwayland-qtkey-extension.h"
+#include <QtWaylandClient/private/qwayland-qtkey-extension.h>
 
 QT_BEGIN_NAMESPACE
 
-class QWaylandQtKeyExtension : public QtWayland::qt_key_extension
+class Q_WAYLAND_CLIENT_EXPORT QWaylandQtKeyExtension : public QtWayland::qt_key_extension
 {
 public:
     QWaylandQtKeyExtension(QWaylandDisplay *display, uint32_t id);
diff --git a/src/plugins/platforms/wayland_common/qwaylandscreen.cpp b/src/client/qwaylandscreen.cpp
index cda94a7e1..cda94a7e1 100644
--- a/src/plugins/platforms/wayland_common/qwaylandscreen.cpp
+++ b/src/client/qwaylandscreen.cpp
diff --git a/src/plugins/platforms/wayland_common/qwaylandscreen.h b/src/client/qwaylandscreen.h
index 039d3f501..15ae5189a 100644
--- a/src/plugins/platforms/wayland_common/qwaylandscreen.h
+++ b/src/client/qwaylandscreen.h
@@ -43,8 +43,9 @@
 #define QWAYLANDSCREEN_H
 
 #include <qpa/qplatformscreen.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 
-#include <qwayland-wayland.h>
+#include <QtWaylandClient/private/qwayland-wayland.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -52,7 +53,7 @@ class QWaylandDisplay;
 class QWaylandCursor;
 class QWaylandExtendedOutput;
 
-class QWaylandScreen : public QPlatformScreen, QtWayland::wl_output
+class Q_WAYLAND_CLIENT_EXPORT QWaylandScreen : public QPlatformScreen, QtWayland::wl_output
 {
 public:
     QWaylandScreen(QWaylandDisplay *waylandDisplay, uint32_t id);
diff --git a/src/plugins/platforms/wayland_common/qwaylandshellsurface.cpp b/src/client/qwaylandshellsurface.cpp
index 4c8ff1bc4..4c8ff1bc4 100644
--- a/src/plugins/platforms/wayland_common/qwaylandshellsurface.cpp
+++ b/src/client/qwaylandshellsurface.cpp
diff --git a/src/plugins/platforms/wayland_common/qwaylandshellsurface.h b/src/client/qwaylandshellsurface.h
index 172a0f965..25f703334 100644
--- a/src/plugins/platforms/wayland_common/qwaylandshellsurface.h
+++ b/src/client/qwaylandshellsurface.h
@@ -46,7 +46,8 @@
 
 #include <wayland-client.h>
 
-#include "qwayland-wayland.h"
+#include <QtWaylandClient/private/qwayland-wayland.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -54,7 +55,7 @@ class QWaylandWindow;
 class QWaylandInputDevice;
 class QWindow;
 
-class QWaylandShellSurface : public QtWayland::wl_shell_surface
+class Q_WAYLAND_CLIENT_EXPORT QWaylandShellSurface : public QtWayland::wl_shell_surface
 {
 public:
     QWaylandShellSurface(struct ::wl_shell_surface *shell_surface, QWaylandWindow *window);
diff --git a/src/plugins/platforms/wayland_common/qwaylandshmbackingstore.cpp b/src/client/qwaylandshmbackingstore.cpp
index 00a4b13a2..00a4b13a2 100644
--- a/src/plugins/platforms/wayland_common/qwaylandshmbackingstore.cpp
+++ b/src/client/qwaylandshmbackingstore.cpp
diff --git a/src/plugins/platforms/wayland_common/qwaylandshmbackingstore.h b/src/client/qwaylandshmbackingstore.h
index 601173420..c7875f52c 100644
--- a/src/plugins/platforms/wayland_common/qwaylandshmbackingstore.h
+++ b/src/client/qwaylandshmbackingstore.h
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
 
 class QWaylandDisplay;
 
-class QWaylandShmBuffer : public QWaylandBuffer {
+class Q_WAYLAND_CLIENT_EXPORT QWaylandShmBuffer : public QWaylandBuffer {
 public:
     QWaylandShmBuffer(QWaylandDisplay *display,
            const QSize &size, QImage::Format format);
@@ -71,7 +71,7 @@ private:
     QImage *mMarginsImage;
 };
 
-class QWaylandShmBackingStore : public QPlatformBackingStore
+class Q_WAYLAND_CLIENT_EXPORT QWaylandShmBackingStore : public QPlatformBackingStore
 {
 public:
     QWaylandShmBackingStore(QWindow *window);
diff --git a/src/plugins/platforms/wayland_common/qwaylandshmwindow.cpp b/src/client/qwaylandshmwindow.cpp
index 48a1bfd53..48a1bfd53 100644
--- a/src/plugins/platforms/wayland_common/qwaylandshmwindow.cpp
+++ b/src/client/qwaylandshmwindow.cpp
diff --git a/src/plugins/platforms/wayland_common/qwaylandshmwindow.h b/src/client/qwaylandshmwindow.h
index ffd11c948..e443bb187 100644
--- a/src/plugins/platforms/wayland_common/qwaylandshmwindow.h
+++ b/src/client/qwaylandshmwindow.h
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 
 class QWaylandShmBackingStore;
 
-class QWaylandShmWindow : public QWaylandWindow
+class Q_WAYLAND_CLIENT_EXPORT QWaylandShmWindow : public QWaylandWindow
 {
 public:
     QWaylandShmWindow(QWindow *window);
diff --git a/src/plugins/platforms/wayland_common/qwaylandsubsurface.cpp b/src/client/qwaylandsubsurface.cpp
index 0e9d575a9..0e9d575a9 100644
--- a/src/plugins/platforms/wayland_common/qwaylandsubsurface.cpp
+++ b/src/client/qwaylandsubsurface.cpp
diff --git a/src/plugins/platforms/wayland_common/qwaylandsubsurface.h b/src/client/qwaylandsubsurface.h
index 10290d8c1..97158b6aa 100644
--- a/src/plugins/platforms/wayland_common/qwaylandsubsurface.h
+++ b/src/client/qwaylandsubsurface.h
@@ -46,7 +46,9 @@
 
 #include <QtCore/qglobal.h>
 
-#include <qwayland-sub-surface-extension.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
+
+#include <QtWaylandClient/private/qwayland-sub-surface-extension.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -54,7 +56,7 @@ class QWaylandDisplay;
 class QWaylandWindow;
 class QWaylandSubSurface;
 
-class QWaylandSubSurface : public QtWayland::qt_sub_surface
+class Q_WAYLAND_CLIENT_EXPORT QWaylandSubSurface : public QtWayland::qt_sub_surface
 {
 public:
     QWaylandSubSurface(QWaylandWindow *window, struct ::qt_sub_surface *sub_surface);
diff --git a/src/plugins/platforms/wayland_common/qwaylandtouch.cpp b/src/client/qwaylandtouch.cpp
index 5835d9d3c..5835d9d3c 100644
--- a/src/plugins/platforms/wayland_common/qwaylandtouch.cpp
+++ b/src/client/qwaylandtouch.cpp
diff --git a/src/plugins/platforms/wayland_common/qwaylandtouch.h b/src/client/qwaylandtouch.h
index 3762209dc..0d14330e7 100644
--- a/src/plugins/platforms/wayland_common/qwaylandtouch.h
+++ b/src/client/qwaylandtouch.h
@@ -45,11 +45,11 @@
 #include "qwaylanddisplay.h"
 #include <qpa/qwindowsysteminterface.h>
 
-#include <qwayland-touch-extension.h>
+#include <QtWaylandClient/private/qwayland-touch-extension.h>
 
 QT_BEGIN_NAMESPACE
 
-class QWaylandTouchExtension : public QtWayland::qt_touch_extension
+class Q_WAYLAND_CLIENT_EXPORT QWaylandTouchExtension : public QtWayland::qt_touch_extension
 {
 public:
     QWaylandTouchExtension(QWaylandDisplay *display, uint32_t id);
diff --git a/src/plugins/platforms/wayland_common/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
index b64d3e6ab..b64d3e6ab 100644
--- a/src/plugins/platforms/wayland_common/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
diff --git a/src/plugins/platforms/wayland_common/qwaylandwindow.h b/src/client/qwaylandwindow.h
index e6d15c6c4..c4d391807 100644
--- a/src/plugins/platforms/wayland_common/qwaylandwindow.h
+++ b/src/client/qwaylandwindow.h
@@ -50,7 +50,7 @@
 
 #include "qwaylanddisplay.h"
 
-#include "qwayland-wayland.h"
+#include <QtWaylandClient/private/qwayland-wayland.h>
 
 struct wl_egl_window;
 
@@ -63,7 +63,7 @@ class QWaylandExtendedSurface;
 class QWaylandSubSurface;
 class QWaylandDecoration;
 
-class QWaylandWindowConfigure
+class Q_WAYLAND_CLIENT_EXPORT QWaylandWindowConfigure
 {
 public:
     QWaylandWindowConfigure()
@@ -83,7 +83,7 @@ public:
     uint32_t edges;
 };
 
-class QWaylandWindow : public QObject, public QPlatformWindow, public QtWayland::wl_surface
+class Q_WAYLAND_CLIENT_EXPORT QWaylandWindow : public QObject, public QPlatformWindow, public QtWayland::wl_surface
 {
     Q_OBJECT
 public:
diff --git a/src/plugins/platforms/wayland_common/qwaylandwindowmanagerintegration.cpp b/src/client/qwaylandwindowmanagerintegration.cpp
index 7543ba13c..7543ba13c 100644
--- a/src/plugins/platforms/wayland_common/qwaylandwindowmanagerintegration.cpp
+++ b/src/client/qwaylandwindowmanagerintegration.cpp
diff --git a/src/plugins/platforms/wayland_common/qwaylandwindowmanagerintegration.h b/src/client/qwaylandwindowmanagerintegration.h
index 4524ce121..4506f06a1 100644
--- a/src/plugins/platforms/wayland_common/qwaylandwindowmanagerintegration.h
+++ b/src/client/qwaylandwindowmanagerintegration.h
@@ -49,15 +49,14 @@
 #include "qwaylanddisplay.h"
 #include <qpa/qplatformservices.h>
 
-#include "qwayland-windowmanager.h"
+#include "QtWaylandClient/private/qwayland-windowmanager.h"
 
 QT_BEGIN_NAMESPACE
 
 class QWaylandWindow;
-
 class QWaylandWindowManagerIntegrationPrivate;
 
-class QWaylandWindowManagerIntegration : public QObject, public QPlatformServices, public QtWayland::qt_windowmanager
+class Q_WAYLAND_CLIENT_EXPORT QWaylandWindowManagerIntegration : public QObject, public QPlatformServices, public QtWayland::qt_windowmanager
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QWaylandWindowManagerIntegration)
diff --git a/src/compositor/compositor.pro b/src/compositor/compositor.pro
index 67f34c899..74c955dd2 100644
--- a/src/compositor/compositor.pro
+++ b/src/compositor/compositor.pro
@@ -18,7 +18,6 @@ DEFINES += QT_WAYLAND_WINDOWMANAGER_SUPPORT
 INCLUDEPATH += ../shared
 HEADERS += ../shared/qwaylandmimehelper.h
 SOURCES += ../shared/qwaylandmimehelper.cpp
-HEADERS += qwayland-server-wayland.h
 
 include ($$PWD/global/global.pri)
 include ($$PWD/wayland_wrapper/wayland_wrapper.pri)
diff --git a/src/compositor/wayland_wrapper/qwldatadevice_p.h b/src/compositor/wayland_wrapper/qwldatadevice_p.h
index cb0b1721c..fb4bbcdbd 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 <QtCompositor/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 dcb51e16b..e21a95676 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 <QtCompositor/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 d29658576..5911819d8 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 <QtCompositor/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 35eda8cf0..01ac4cbd9 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 <QtCompositor/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 5dd6e3823..affb0d17a 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 <QtCompositor/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 d1704b8c5..f3625ed46 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 <QtCompositor/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 ecf2f49dd..3b572108e 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 <QtCompositor/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 8c5b411ab..01f68c3f3 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 <QtCompositor/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 58830d1c0..2cfa14b99 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 <QtCompositor/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 9ceb8bf88..5060d4d6f 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 <QtCompositor/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 87a8c6a5c..75d795e4c 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 <QtCompositor/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 f9d4dfee6..89c85895f 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 <QtCompositor/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 a350a746e..4d783f77e 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 <QtCompositor/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 514d3e9f5..738a73fc9 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 <QtCompositor/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 3200e1020..ed53b048c 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 <QtCompositor/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 012ef3888..6257e0a92 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 <QtCompositor/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 2610936a3..f2729c995 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 <QtCompositor/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 f905d96b6..06d21ff37 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 <QtCompositor/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 910429343..18ecdabb5 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 <QtCompositor/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 6f6ad1202..938c2be33 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 <QtCompositor/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 9741a2160..101d8938c 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 <QtCompositor/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 c624387a8..7bfe6b88c 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 <QtCompositor/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 081fdfa9d..2d9be14da 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 <QtCompositor/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 d967b714d..695609809 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 <QtCompositor/private/qwayland-server-wayland.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/compositor/windowmanagerprotocol/waylandwindowmanagerintegration.h b/src/compositor/windowmanagerprotocol/waylandwindowmanagerintegration.h
index ccf5d4e8d..4b2a753ee 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 <QtCompositor/private/qwayland-server-windowmanager.h>
 
 #include <QObject>
 #include <QMap>
diff --git a/src/plugins/platforms/platforms.pro b/src/plugins/platforms/platforms.pro
index 167602901..ab8c9347e 100644
--- a/src/plugins/platforms/platforms.pro
+++ b/src/plugins/platforms/platforms.pro
@@ -1,6 +1,5 @@
 TEMPLATE=subdirs
 CONFIG+=ordered
-SUBDIRS += wayland_common
 
 equals(QT_WAYLAND_GL_CONFIG, nogl) {
     SUBDIRS += qwayland-nogl
@@ -9,17 +8,4 @@ equals(QT_WAYLAND_GL_CONFIG, nogl) {
         SUBDIRS += qwayland-egl
     }
 
-    #The following integrations are only useful with QtCompositor
-    contains(CONFIG, wayland-compositor) {
-        config_brcm_egl {
-            SUBDIRS += qwayland-brcm-egl
-        }
-        config_xcomposite {
-            config_egl {
-                SUBDIRS += qwayland-xcomposite-egl
-            } else:config_glx {
-                SUBDIRS += qwayland-xcomposite-glx
-            }
-        }
-    }
 }
diff --git a/src/plugins/platforms/qwayland-egl/qwayland-egl.pro b/src/plugins/platforms/qwayland-egl/qwayland-egl.pro
index 339f94616..7f8c7f3aa 100644
--- a/src/plugins/platforms/qwayland-egl/qwayland-egl.pro
+++ b/src/plugins/platforms/qwayland-egl/qwayland-egl.pro
@@ -1,11 +1,12 @@
 PLUGIN_TYPE = platforms
 load(qt_plugin)
 
-include(../wayland_common/wayland_common.pri)
+QT += waylandclient-private
 
 OTHER_FILES += \
     qwayland-egl.json
 
+DEFINES += QT_WAYLAND_GL_SUPPORT
 !contains(QT_CONFIG, no-pkg-config) {
     CONFIG += link_pkgconfig
     PKGCONFIG += wayland-egl egl
diff --git a/src/plugins/platforms/qwayland-egl/qwaylandeglintegration.cpp b/src/plugins/platforms/qwayland-egl/qwaylandeglintegration.cpp
index 5a44779e9..fd9c55859 100644
--- a/src/plugins/platforms/qwayland-egl/qwaylandeglintegration.cpp
+++ b/src/plugins/platforms/qwayland-egl/qwaylandeglintegration.cpp
@@ -41,7 +41,7 @@
 
 #include "qwaylandeglintegration.h"
 
-#include "qwaylandglintegration.h"
+#include <QtWaylandClient/qwaylandglintegration.h>
 
 #include "qwaylandeglwindow.h"
 #include "qwaylandglcontext.h"
diff --git a/src/plugins/platforms/qwayland-egl/qwaylandeglintegration.h b/src/plugins/platforms/qwayland-egl/qwaylandeglintegration.h
index a280493b4..b26c43fe7 100644
--- a/src/plugins/platforms/qwayland-egl/qwaylandeglintegration.h
+++ b/src/plugins/platforms/qwayland-egl/qwaylandeglintegration.h
@@ -42,7 +42,7 @@
 #ifndef QWAYLANDEGLINTEGRATION_H
 #define QWAYLANDEGLINTEGRATION_H
 
-#include "qwaylandglintegration.h"
+#include <QtWaylandClient/qwaylandglintegration.h>
 
 #include "qwaylandeglinclude.h"
 
diff --git a/src/plugins/platforms/qwayland-egl/qwaylandeglwindow.h b/src/plugins/platforms/qwayland-egl/qwaylandeglwindow.h
index f973547a7..b20e2ad01 100644
--- a/src/plugins/platforms/qwayland-egl/qwaylandeglwindow.h
+++ b/src/plugins/platforms/qwayland-egl/qwaylandeglwindow.h
@@ -42,7 +42,7 @@
 #ifndef QWAYLANDEGLWINDOW_H
 #define QWAYLANDEGLWINDOW_H
 
-#include "qwaylandwindow.h"
+#include <QtWaylandClient/qwaylandwindow.h>
 #include "qwaylandeglinclude.h"
 #include "qwaylandeglintegration.h"
 
diff --git a/src/plugins/platforms/qwayland-egl/qwaylandglcontext.h b/src/plugins/platforms/qwayland-egl/qwaylandglcontext.h
index a0750bd87..1da849556 100644
--- a/src/plugins/platforms/qwayland-egl/qwaylandglcontext.h
+++ b/src/plugins/platforms/qwayland-egl/qwaylandglcontext.h
@@ -42,7 +42,7 @@
 #ifndef QWAYLANDGLCONTEXT_H
 #define QWAYLANDGLCONTEXT_H
 
-#include "qwaylanddisplay.h"
+#include <QtWaylandClient/qwaylanddisplay.h>
 
 #include <qpa/qplatformopenglcontext.h>
 #include <QtGui/QOpenGLFunctions>
diff --git a/src/plugins/platforms/wayland_common/wayland_common.pri b/src/plugins/platforms/wayland_common/wayland_common.pri
deleted file mode 100644
index cc956a722..000000000
--- a/src/plugins/platforms/wayland_common/wayland_common.pri
+++ /dev/null
@@ -1,10 +0,0 @@
-#This file(wayland_common.pri) is included from .pro files of GL integrations.
-
-include ($$PWD/wayland_common_share.pri)
-
-INCLUDEPATH += $$PWD
-
-staticlib = $$shadowed($$PWD)/$${QMAKE_PREFIX_STATICLIB}wayland_common.$${QMAKE_EXTENSION_STATICLIB}
-LIBS += $$staticlib
-PRE_TARGETDEPS += $$staticlib
-
diff --git a/src/plugins/platforms/wayland_common/wayland_common_share.pri b/src/plugins/platforms/wayland_common/wayland_common_share.pri
deleted file mode 100644
index a2e727153..000000000
--- a/src/plugins/platforms/wayland_common/wayland_common_share.pri
+++ /dev/null
@@ -1,28 +0,0 @@
-QT += core-private gui-private platformsupport-private
-CONFIG += link_pkgconfig qpa/genericunixfontdatabase
-
-!equals(QT_WAYLAND_GL_CONFIG, nogl) {
-    DEFINES += QT_WAYLAND_GL_SUPPORT
-}
-
-config_xkbcommon {
-    !contains(QT_CONFIG, no-pkg-config) {
-        PKGCONFIG += xkbcommon
-    } else {
-        LIBS += -lxkbcommon
-    }
-} else {
-    DEFINES += QT_NO_WAYLAND_XKB
-}
-
-!contains(QT_CONFIG, no-pkg-config) {
-    PKGCONFIG += wayland-client wayland-cursor
-    contains(QT_CONFIG, glib): PKGCONFIG_PRIVATE += glib-2.0
-} else {
-    LIBS += -lwayland-client -lwayland-cursor $$QT_LIBS_GLIB
-}
-
-INCLUDEPATH += $$PWD/../../../shared
-
-CONFIG += wayland-scanner
-WAYLANDCLIENTSOURCES += ../../../3rdparty/protocol/wayland.xml
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 9613979bf..7325e57f1 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -1,6 +1,7 @@
 TEMPLATE=subdirs
 SUBDIRS += platforms
 
+
 #The compositor plugins are only useful with QtCompositor
 contains(CONFIG, wayland-compositor) {
         SUBDIRS += waylandcompositors
diff --git a/src/src.pro b/src/src.pro
index ac4e62aa4..274cc01c4 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -8,4 +8,4 @@ contains(CONFIG, wayland-compositor) {
     SUBDIRS += compositor
 }
 
-SUBDIRS += plugins
+SUBDIRS += client plugins
diff --git a/sync.profile b/sync.profile
index e8c62c4d2..5bff75354 100644
--- a/sync.profile
+++ b/sync.profile
@@ -1,5 +1,6 @@
 %modules = ( # path to module name map
     "QtCompositor" => "$basedir/src/compositor",
+    "QtWaylandClient" => "$basedir/src/client",
 );
 %moduleheaders = ( # restrict the module headers to those found in relative path
 );