diff --git a/src/plugins/platforms/wayland/client.pro b/src/plugins/platforms/wayland/client.pro
index 61404eeb98c..994cf544300 100644
--- a/src/plugins/platforms/wayland/client.pro
+++ b/src/plugins/platforms/wayland/client.pro
@@ -99,9 +99,6 @@ HEADERS +=  qwaylandintegration_p.h \
             qwaylandsubsurface_p.h \
             qwaylandtouch_p.h \
             qwaylandqtkey_p.h \
-            ../shared/qwaylandmimehelper.h \
-            ../shared/qwaylandxkb.h \
-            ../shared/qwaylandinputmethodeventbuilder.h \
             qwaylandabstractdecoration_p.h \
             qwaylanddecorationfactory_p.h \
             qwaylanddecorationplugin_p.h \
@@ -109,6 +106,11 @@ HEADERS +=  qwaylandintegration_p.h \
             qwaylandinputcontext_p.h \
             qwaylanddatadevice_p.h \
             qwaylandshm_p.h \
+            qwaylandclientexport.h \
+            ../shared/qwaylandinputmethodeventbuilder_p.h \
+            ../shared/qwaylandmimehelper_p.h \
+            ../shared/qwaylandxkb_p.h \
+            ../shared/qwaylandshmformathelper_p.h
 
 include(hardwareintegration/hardwareintegration.pri)
 include(shellintegration/shellintegration.pri)
diff --git a/src/plugins/platforms/wayland/global/qwaylandclientextension.cpp b/src/plugins/platforms/wayland/global/qwaylandclientextension.cpp
index b71c41d11e9..04aca8c2e12 100644
--- a/src/plugins/platforms/wayland/global/qwaylandclientextension.cpp
+++ b/src/plugins/platforms/wayland/global/qwaylandclientextension.cpp
@@ -43,8 +43,6 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace QtWaylandClient {
-
 QWaylandClientExtensionPrivate::QWaylandClientExtensionPrivate()
     : QObjectPrivate()
     , waylandIntegration(NULL)
@@ -57,7 +55,7 @@ QWaylandClientExtensionPrivate::QWaylandClientExtensionPrivate()
     if (QGuiApplication::platformNativeInterface()) {
         waylandDisplay = static_cast<struct ::wl_display*>(QGuiApplication::platformNativeInterface()->nativeResourceForIntegration("wl_display"));
     } else {
-        waylandIntegration = new QWaylandIntegration();
+        waylandIntegration = new QtWaylandClient::QWaylandIntegration();
         waylandDisplay = waylandIntegration->display()->wl_display();
     }
 
@@ -84,7 +82,7 @@ QWaylandClientExtension::QWaylandClientExtension(const int ver)
     d->version = ver;
 }
 
-QWaylandIntegration *QWaylandClientExtension::integration() const
+QtWaylandClient::QWaylandIntegration *QWaylandClientExtension::integration() const
 {
     Q_D(const QWaylandClientExtension);
     return d->waylandIntegration;
@@ -105,12 +103,10 @@ void QWaylandClientExtension::setVersion(const int ver)
     }
 }
 
-bool QWaylandClientExtension::active() const
+bool QWaylandClientExtension::isActive() const
 {
     Q_D(const QWaylandClientExtension);
     return d->active;
 }
 
-}
-
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/wayland/global/qwaylandclientextension.h b/src/plugins/platforms/wayland/global/qwaylandclientextension.h
index aee03eb2911..a3de0aa4b8c 100644
--- a/src/plugins/platforms/wayland/global/qwaylandclientextension.h
+++ b/src/plugins/platforms/wayland/global/qwaylandclientextension.h
@@ -39,13 +39,14 @@
 
 #include <QObject>
 #include <qpa/qwindowsysteminterface.h>
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 #include <QtWaylandClient/private/qwayland-wayland.h>
 QT_BEGIN_NAMESPACE
 
 namespace QtWaylandClient {
-
 class QWaylandIntegration;
+}
+
 class QWaylandClientExtensionPrivate;
 class QWaylandClientExtensionTemplatePrivate;
 
@@ -54,13 +55,13 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandClientExtension : public QObject
     Q_OBJECT
     Q_DECLARE_PRIVATE(QWaylandClientExtension)
     Q_PROPERTY(int protocolVersion READ version NOTIFY versionChanged)
-    Q_PROPERTY(bool active READ active NOTIFY activeChanged)
+    Q_PROPERTY(bool active READ isActive NOTIFY activeChanged)
 public:
     QWaylandClientExtension(const int version);
 
-    QWaylandIntegration *integration() const;
+    QtWaylandClient::QWaylandIntegration *integration() const;
     int version() const;
-    bool active() const;
+    bool isActive() const;
 
     virtual const struct wl_interface *extensionInterface() const = 0;
     virtual void bind(struct ::wl_registry *registry, int id, int version) = 0;
@@ -101,8 +102,6 @@ public:
     }
 };
 
-}
-
 QT_END_NAMESPACE
 
 #endif // QWAYLANDCLIENTEXTENSION_H
diff --git a/src/plugins/platforms/wayland/global/qwaylandclientextension_p.h b/src/plugins/platforms/wayland/global/qwaylandclientextension_p.h
index 9287ee95a50..70cf36c3da9 100644
--- a/src/plugins/platforms/wayland/global/qwaylandclientextension_p.h
+++ b/src/plugins/platforms/wayland/global/qwaylandclientextension_p.h
@@ -55,15 +55,13 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace QtWaylandClient {
-
 class Q_WAYLAND_CLIENT_EXPORT QWaylandClientExtensionPrivate : public QObjectPrivate, public QtWayland::wl_registry
 {
     Q_DECLARE_PUBLIC(QWaylandClientExtension)
 public:
     QWaylandClientExtensionPrivate();
 
-    QWaylandIntegration *waylandIntegration;
+    QtWaylandClient::QWaylandIntegration *waylandIntegration;
     int version;
     bool active;
 
@@ -79,8 +77,6 @@ public:
     { }
 };
 
-}
-
 QT_END_NAMESPACE
 
 #endif  /*QWAYLANDCLIENTEXTENSION_P_H*/
diff --git a/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration_p.h b/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration_p.h
index 342742c3e65..adaf2902a24 100644
--- a/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration_p.h
+++ b/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <QtCore/qglobal.h>
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationfactory_p.h b/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationfactory_p.h
index 0a5d3561632..c70a2bd56a5 100644
--- a/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationfactory_p.h
+++ b/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationfactory_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 #include <QtCore/QStringList>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationplugin_p.h b/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationplugin_p.h
index 39a0379674d..2830f95fa9a 100644
--- a/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationplugin_p.h
+++ b/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationplugin_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 
 #include <QtCore/qplugin.h>
 #include <QtCore/qfactoryinterface.h>
diff --git a/src/plugins/platforms/wayland/hardwareintegration/qwaylandhardwareintegration_p.h b/src/plugins/platforms/wayland/hardwareintegration/qwaylandhardwareintegration_p.h
index 3b8028eac8c..92748c9f083 100644
--- a/src/plugins/platforms/wayland/hardwareintegration/qwaylandhardwareintegration_p.h
+++ b/src/plugins/platforms/wayland/hardwareintegration/qwaylandhardwareintegration_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <QtWaylandClient/private/qwayland-hardware-integration.h>
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegration_p.h b/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegration_p.h
index 11ea36bc9b2..e3943da805f 100644
--- a/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegration_p.h
+++ b/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegration_p.h
@@ -55,7 +55,7 @@
 #include <QtGui/qopengl.h>
 
 #include <QtWaylandClient/private/qwayland-server-buffer-extension.h>
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationfactory_p.h b/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationfactory_p.h
index 91871fad2c7..f17856208b2 100644
--- a/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationfactory_p.h
+++ b/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationfactory_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 #include <QtCore/QStringList>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationplugin_p.h b/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationplugin_p.h
index 8a074fb21b1..7eaaa1700cc 100644
--- a/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationplugin_p.h
+++ b/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationplugin_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 
 #include <QtCore/qplugin.h>
 #include <QtCore/qfactoryinterface.h>
diff --git a/src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegration_p.h b/src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegration_p.h
index 21d0c8bd8b9..ada63b713cb 100644
--- a/src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegration_p.h
+++ b/src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegration_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <QtCore/qglobal.h>
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 
 #include <stdint.h>
 
diff --git a/src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegrationfactory_p.h b/src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegrationfactory_p.h
index 4431529ff8e..d6d0e843c6b 100644
--- a/src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegrationfactory_p.h
+++ b/src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegrationfactory_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 #include <QtCore/QStringList>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegrationplugin_p.h b/src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegrationplugin_p.h
index cea178c49cc..c4a578d2e21 100644
--- a/src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegrationplugin_p.h
+++ b/src/plugins/platforms/wayland/inputdeviceintegration/qwaylandinputdeviceintegrationplugin_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 
 #include <QtCore/qplugin.h>
 #include <QtCore/qfactoryinterface.h>
diff --git a/src/plugins/platforms/wayland/qwaylandabstractdecoration_p.h b/src/plugins/platforms/wayland/qwaylandabstractdecoration_p.h
index 6e4113efff8..3220dab9ccc 100644
--- a/src/plugins/platforms/wayland/qwaylandabstractdecoration_p.h
+++ b/src/plugins/platforms/wayland/qwaylandabstractdecoration_p.h
@@ -59,7 +59,7 @@
 #include <QtGui/QColor>
 #include <QtGui/QStaticText>
 #include <QtGui/QImage>
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 
 #include <wayland-client.h>
 
diff --git a/src/plugins/platforms/wayland/qwaylandbuffer_p.h b/src/plugins/platforms/wayland/qwaylandbuffer_p.h
index 7dd920acc2c..8d651f82369 100644
--- a/src/plugins/platforms/wayland/qwaylandbuffer_p.h
+++ b/src/plugins/platforms/wayland/qwaylandbuffer_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 
 #include <QtCore/QSize>
 #include <QtCore/QRect>
diff --git a/src/plugins/platforms/wayland/qwaylandclientexport_p.h b/src/plugins/platforms/wayland/qwaylandclientexport.h
similarity index 100%
rename from src/plugins/platforms/wayland/qwaylandclientexport_p.h
rename to src/plugins/platforms/wayland/qwaylandclientexport.h
diff --git a/src/plugins/platforms/wayland/qwaylandclipboard_p.h b/src/plugins/platforms/wayland/qwaylandclipboard_p.h
index 08d4baabdc6..aa008eef939 100644
--- a/src/plugins/platforms/wayland/qwaylandclipboard_p.h
+++ b/src/plugins/platforms/wayland/qwaylandclipboard_p.h
@@ -54,7 +54,7 @@
 #include <qpa/qplatformclipboard.h>
 #include <QtCore/QVariant>
 
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/wayland/qwaylandcursor_p.h b/src/plugins/platforms/wayland/qwaylandcursor_p.h
index a54841a28fd..4154ee191ee 100644
--- a/src/plugins/platforms/wayland/qwaylandcursor_p.h
+++ b/src/plugins/platforms/wayland/qwaylandcursor_p.h
@@ -53,7 +53,7 @@
 
 #include <qpa/qplatformcursor.h>
 #include <QtCore/QMap>
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 
 struct wl_cursor;
 struct wl_cursor_image;
diff --git a/src/plugins/platforms/wayland/qwaylanddatadevicemanager_p.h b/src/plugins/platforms/wayland/qwaylanddatadevicemanager_p.h
index 36060529300..0c1d95d8223 100644
--- a/src/plugins/platforms/wayland/qwaylanddatadevicemanager_p.h
+++ b/src/plugins/platforms/wayland/qwaylanddatadevicemanager_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 #include <QtWaylandClient/private/qwayland-wayland.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/wayland/qwaylanddataoffer_p.h b/src/plugins/platforms/wayland/qwaylanddataoffer_p.h
index 534d79d7faa..5e635c1a0db 100644
--- a/src/plugins/platforms/wayland/qwaylanddataoffer_p.h
+++ b/src/plugins/platforms/wayland/qwaylanddataoffer_p.h
@@ -53,7 +53,7 @@
 
 #include <QtGui/private/qdnd_p.h>
 
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 #include <QtWaylandClient/private/qwayland-wayland.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/wayland/qwaylanddatasource.cpp b/src/plugins/platforms/wayland/qwaylanddatasource.cpp
index 32aab082390..40beea317cd 100644
--- a/src/plugins/platforms/wayland/qwaylanddatasource.cpp
+++ b/src/plugins/platforms/wayland/qwaylanddatasource.cpp
@@ -41,7 +41,7 @@
 #include "qwaylanddataoffer_p.h"
 #include "qwaylanddatadevicemanager_p.h"
 #include "qwaylandinputdevice_p.h"
-#include "qwaylandmimehelper.h"
+#include "qwaylandmimehelper_p.h"
 
 #include <QtCore/QFile>
 
diff --git a/src/plugins/platforms/wayland/qwaylanddatasource_p.h b/src/plugins/platforms/wayland/qwaylanddatasource_p.h
index ec3f0aacc63..c099ff62a49 100644
--- a/src/plugins/platforms/wayland/qwaylanddatasource_p.h
+++ b/src/plugins/platforms/wayland/qwaylanddatasource_p.h
@@ -54,7 +54,7 @@
 #include <QObject>
 
 #include <QtWaylandClient/private/qwayland-wayland.h>
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/wayland/qwaylanddecorationfactory_p.h b/src/plugins/platforms/wayland/qwaylanddecorationfactory_p.h
index 4797f2336f5..9d4e7a9fb0d 100644
--- a/src/plugins/platforms/wayland/qwaylanddecorationfactory_p.h
+++ b/src/plugins/platforms/wayland/qwaylanddecorationfactory_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 #include <QtCore/QStringList>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/wayland/qwaylanddecorationplugin_p.h b/src/plugins/platforms/wayland/qwaylanddecorationplugin_p.h
index c5baa83f755..dd33f3416da 100644
--- a/src/plugins/platforms/wayland/qwaylanddecorationplugin_p.h
+++ b/src/plugins/platforms/wayland/qwaylanddecorationplugin_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 
 #include <QtCore/qplugin.h>
 #include <QtCore/qfactoryinterface.h>
diff --git a/src/plugins/platforms/wayland/qwaylanddisplay_p.h b/src/plugins/platforms/wayland/qwaylanddisplay_p.h
index 618e57c59a8..59b005743c8 100644
--- a/src/plugins/platforms/wayland/qwaylanddisplay_p.h
+++ b/src/plugins/platforms/wayland/qwaylanddisplay_p.h
@@ -60,7 +60,7 @@
 #include <wayland-client.h>
 
 #include <QtWaylandClient/private/qwayland-wayland.h>
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 #include <QtWaylandClient/private/qwayland-xdg-shell.h>
 #include <QtWaylandClient/private/qwaylandshm_p.h>
 
diff --git a/src/plugins/platforms/wayland/qwaylanddnd_p.h b/src/plugins/platforms/wayland/qwaylanddnd_p.h
index 29424375316..2ff00b9ffcf 100644
--- a/src/plugins/platforms/wayland/qwaylanddnd_p.h
+++ b/src/plugins/platforms/wayland/qwaylanddnd_p.h
@@ -57,7 +57,7 @@
 #include <QtGui/QDrag>
 #include <QtCore/QMimeData>
 
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/wayland/qwaylandextendedsurface_p.h b/src/plugins/platforms/wayland/qwaylandextendedsurface_p.h
index c004a9f7b47..39b85438a16 100644
--- a/src/plugins/platforms/wayland/qwaylandextendedsurface_p.h
+++ b/src/plugins/platforms/wayland/qwaylandextendedsurface_p.h
@@ -54,7 +54,7 @@
 #include <QtCore/QString>
 #include <QtCore/QVariant>
 
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 
 #include <wayland-client.h>
 #include <QtWaylandClient/private/qwayland-surface-extension.h>
diff --git a/src/plugins/platforms/wayland/qwaylandinputcontext.cpp b/src/plugins/platforms/wayland/qwaylandinputcontext.cpp
index af8e6f81838..509965d2f1a 100644
--- a/src/plugins/platforms/wayland/qwaylandinputcontext.cpp
+++ b/src/plugins/platforms/wayland/qwaylandinputcontext.cpp
@@ -48,9 +48,9 @@
 
 #include "qwaylanddisplay_p.h"
 #include "qwaylandinputdevice_p.h"
-#include "qwaylandinputmethodeventbuilder.h"
+#include "qwaylandinputmethodeventbuilder_p.h"
 #include "qwaylandwindow_p.h"
-#include "qwaylandxkb.h"
+#include "qwaylandxkb_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/wayland/qwaylandinputcontext_p.h b/src/plugins/platforms/wayland/qwaylandinputcontext_p.h
index 8b789e3420a..53eab994f5b 100644
--- a/src/plugins/platforms/wayland/qwaylandinputcontext_p.h
+++ b/src/plugins/platforms/wayland/qwaylandinputcontext_p.h
@@ -60,7 +60,7 @@
 #include <QVector>
 
 #include <QtWaylandClient/private/qwayland-text-input-unstable-v2.h>
-#include <qwaylandinputmethodeventbuilder.h>
+#include <qwaylandinputmethodeventbuilder_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/wayland/qwaylandinputdevice.cpp b/src/plugins/platforms/wayland/qwaylandinputdevice.cpp
index cf1c7ac448e..e85a8d98403 100644
--- a/src/plugins/platforms/wayland/qwaylandinputdevice.cpp
+++ b/src/plugins/platforms/wayland/qwaylandinputdevice.cpp
@@ -49,7 +49,7 @@
 #include "qwaylandcursor_p.h"
 #include "qwaylanddisplay_p.h"
 #include "qwaylandshmbackingstore_p.h"
-#include "../shared/qwaylandxkb.h"
+#include "../shared/qwaylandxkb_p.h"
 #include "qwaylandinputcontext_p.h"
 
 #include <QtGui/private/qpixmap_raster_p.h>
diff --git a/src/plugins/platforms/wayland/qwaylandintegration_p.h b/src/plugins/platforms/wayland/qwaylandintegration_p.h
index 630ac090bf6..4ee6fac8e4e 100644
--- a/src/plugins/platforms/wayland/qwaylandintegration_p.h
+++ b/src/plugins/platforms/wayland/qwaylandintegration_p.h
@@ -53,7 +53,7 @@
 
 #include <qpa/qplatformintegration.h>
 
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 QT_BEGIN_NAMESPACE
 
 namespace QtWaylandClient {
diff --git a/src/plugins/platforms/wayland/qwaylandnativeinterface_p.h b/src/plugins/platforms/wayland/qwaylandnativeinterface_p.h
index 71194da33de..61c5e59d5b7 100644
--- a/src/plugins/platforms/wayland/qwaylandnativeinterface_p.h
+++ b/src/plugins/platforms/wayland/qwaylandnativeinterface_p.h
@@ -54,7 +54,7 @@
 #include <QVariantMap>
 #include <qpa/qplatformnativeinterface.h>
 
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/wayland/qwaylandqtkey_p.h b/src/plugins/platforms/wayland/qwaylandqtkey_p.h
index c746dc92592..b749bd5f9e8 100644
--- a/src/plugins/platforms/wayland/qwaylandqtkey_p.h
+++ b/src/plugins/platforms/wayland/qwaylandqtkey_p.h
@@ -53,7 +53,7 @@
 
 #include <qpa/qwindowsysteminterface.h>
 
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 #include <QtWaylandClient/private/qwayland-qtkey-extension.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/wayland/qwaylandscreen_p.h b/src/plugins/platforms/wayland/qwaylandscreen_p.h
index b4fa12e4717..12b68064017 100644
--- a/src/plugins/platforms/wayland/qwaylandscreen_p.h
+++ b/src/plugins/platforms/wayland/qwaylandscreen_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <qpa/qplatformscreen.h>
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 
 #include <QtWaylandClient/private/qwayland-wayland.h>
 
diff --git a/src/plugins/platforms/wayland/qwaylandshellsurface_p.h b/src/plugins/platforms/wayland/qwaylandshellsurface_p.h
index 053be3b5f9a..63b77ab33c5 100644
--- a/src/plugins/platforms/wayland/qwaylandshellsurface_p.h
+++ b/src/plugins/platforms/wayland/qwaylandshellsurface_p.h
@@ -57,7 +57,7 @@
 #include <wayland-client.h>
 
 #include <QtWaylandClient/private/qwayland-wayland.h>
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/wayland/qwaylandshm.cpp b/src/plugins/platforms/wayland/qwaylandshm.cpp
index 137789679b0..790a0e1b99f 100644
--- a/src/plugins/platforms/wayland/qwaylandshm.cpp
+++ b/src/plugins/platforms/wayland/qwaylandshm.cpp
@@ -39,7 +39,7 @@
 #include <QtWaylandClient/private/qwaylandshm_p.h>
 #include <QtWaylandClient/private/qwaylanddisplay_p.h>
 
-#include "qwaylandshmformathelper.h"
+#include "qwaylandshmformathelper_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/wayland/qwaylandshm_p.h b/src/plugins/platforms/wayland/qwaylandshm_p.h
index 80d2b94923c..aafe4463291 100644
--- a/src/plugins/platforms/wayland/qwaylandshm_p.h
+++ b/src/plugins/platforms/wayland/qwaylandshm_p.h
@@ -54,7 +54,7 @@
 #include <QVector>
 #include <QImage>
 
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 #include <QtWaylandClient/private/qwayland-wayland.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/wayland/qwaylandsubsurface.cpp b/src/plugins/platforms/wayland/qwaylandsubsurface.cpp
index 4093805323f..36fdd1c7a24 100644
--- a/src/plugins/platforms/wayland/qwaylandsubsurface.cpp
+++ b/src/plugins/platforms/wayland/qwaylandsubsurface.cpp
@@ -60,6 +60,7 @@ QWaylandSubSurface::QWaylandSubSurface(QWaylandWindow *window, QWaylandWindow *p
 QWaylandSubSurface::~QWaylandSubSurface()
 {
     m_parent->mChildren.removeOne(this);
+    destroy();
 }
 
 void QWaylandSubSurface::setSync()
diff --git a/src/plugins/platforms/wayland/qwaylandsubsurface_p.h b/src/plugins/platforms/wayland/qwaylandsubsurface_p.h
index b5f869bf2e2..0abd168bc18 100644
--- a/src/plugins/platforms/wayland/qwaylandsubsurface_p.h
+++ b/src/plugins/platforms/wayland/qwaylandsubsurface_p.h
@@ -56,7 +56,7 @@
 #include <QtCore/qglobal.h>
 #include <QtCore/qmutex.h>
 
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 #include <QtWaylandClient/private/qwayland-wayland.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/wayland/qwaylandtouch_p.h b/src/plugins/platforms/wayland/qwaylandtouch_p.h
index 8aa06d3ec4a..dc32b84a063 100644
--- a/src/plugins/platforms/wayland/qwaylandtouch_p.h
+++ b/src/plugins/platforms/wayland/qwaylandtouch_p.h
@@ -54,7 +54,7 @@
 #include <qpa/qwindowsysteminterface.h>
 
 #include <QtWaylandClient/private/qwayland-touch-extension.h>
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/wayland/qwaylandwindow.cpp b/src/plugins/platforms/wayland/qwaylandwindow.cpp
index da067dc9231..51cf20a7208 100644
--- a/src/plugins/platforms/wayland/qwaylandwindow.cpp
+++ b/src/plugins/platforms/wayland/qwaylandwindow.cpp
@@ -207,7 +207,7 @@ bool QWaylandWindow::shouldCreateShellSurface() const
         return false;
 
     if (qEnvironmentVariableIsSet("QT_WAYLAND_USE_BYPASSWINDOWMANAGERHINT"))
-        return window()->flags() & Qt::BypassWindowManagerHint;
+        return !(window()->flags() & Qt::BypassWindowManagerHint);
 
     return true;
 }
diff --git a/src/plugins/platforms/wayland/qwaylandwindow_p.h b/src/plugins/platforms/wayland/qwaylandwindow_p.h
index f36f0833ba9..100c068facc 100644
--- a/src/plugins/platforms/wayland/qwaylandwindow_p.h
+++ b/src/plugins/platforms/wayland/qwaylandwindow_p.h
@@ -59,7 +59,7 @@
 #include <qpa/qplatformwindow.h>
 
 #include <QtWaylandClient/private/qwayland-wayland.h>
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 
 struct wl_egl_window;
 
diff --git a/src/plugins/platforms/wayland/qwaylandwindowmanagerintegration_p.h b/src/plugins/platforms/wayland/qwaylandwindowmanagerintegration_p.h
index 344960d5799..80513af3aaa 100644
--- a/src/plugins/platforms/wayland/qwaylandwindowmanagerintegration_p.h
+++ b/src/plugins/platforms/wayland/qwaylandwindowmanagerintegration_p.h
@@ -58,7 +58,7 @@
 #include <QtPlatformSupport/private/qgenericunixservices_p.h>
 
 #include <QtWaylandClient/private/qwayland-windowmanager.h>
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/wayland/qwaylandwlshellsurface_p.h b/src/plugins/platforms/wayland/qwaylandwlshellsurface_p.h
index 1da64e9d7ef..c319cd98393 100644
--- a/src/plugins/platforms/wayland/qwaylandwlshellsurface_p.h
+++ b/src/plugins/platforms/wayland/qwaylandwlshellsurface_p.h
@@ -56,7 +56,7 @@
 #include <wayland-client.h>
 
 #include <QtWaylandClient/private/qwayland-wayland.h>
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 #include "qwaylandshellsurface_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/wayland/qwaylandxdgshell_p.h b/src/plugins/platforms/wayland/qwaylandxdgshell_p.h
index 2b5a8eb8b6d..bce8345d005 100644
--- a/src/plugins/platforms/wayland/qwaylandxdgshell_p.h
+++ b/src/plugins/platforms/wayland/qwaylandxdgshell_p.h
@@ -56,7 +56,7 @@
 #include <wayland-client.h>
 
 #include <QtWaylandClient/private/qwayland-xdg-shell.h>
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 #include "qwaylandshellsurface_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/wayland/qwaylandxdgsurface_p.h b/src/plugins/platforms/wayland/qwaylandxdgsurface_p.h
index 9d6c8c410d2..342dff75d39 100644
--- a/src/plugins/platforms/wayland/qwaylandxdgsurface_p.h
+++ b/src/plugins/platforms/wayland/qwaylandxdgsurface_p.h
@@ -57,7 +57,7 @@
 #include <wayland-client.h>
 
 #include <QtWaylandClient/private/qwayland-xdg-shell.h>
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 #include "qwaylandshellsurface_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/wayland/shared/qwaylandinputmethodeventbuilder.cpp b/src/plugins/platforms/wayland/shared/qwaylandinputmethodeventbuilder.cpp
index fe93f51463f..0e2d1a406b3 100644
--- a/src/plugins/platforms/wayland/shared/qwaylandinputmethodeventbuilder.cpp
+++ b/src/plugins/platforms/wayland/shared/qwaylandinputmethodeventbuilder.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "qwaylandinputmethodeventbuilder.h"
+#include "qwaylandinputmethodeventbuilder_p.h"
 
 #include <QInputMethod>
 #include <QTextCharFormat>
diff --git a/src/plugins/platforms/wayland/shared/qwaylandinputmethodeventbuilder.h b/src/plugins/platforms/wayland/shared/qwaylandinputmethodeventbuilder_p.h
similarity index 100%
rename from src/plugins/platforms/wayland/shared/qwaylandinputmethodeventbuilder.h
rename to src/plugins/platforms/wayland/shared/qwaylandinputmethodeventbuilder_p.h
diff --git a/src/plugins/platforms/wayland/shared/qwaylandmimehelper.cpp b/src/plugins/platforms/wayland/shared/qwaylandmimehelper.cpp
index c223efbe5b4..a5fdd34dec4 100644
--- a/src/plugins/platforms/wayland/shared/qwaylandmimehelper.cpp
+++ b/src/plugins/platforms/wayland/shared/qwaylandmimehelper.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "qwaylandmimehelper.h"
+#include "qwaylandmimehelper_p.h"
 #include <QImage>
 #include <QColor>
 #include <QUrl>
diff --git a/src/plugins/platforms/wayland/shared/qwaylandmimehelper.h b/src/plugins/platforms/wayland/shared/qwaylandmimehelper_p.h
similarity index 100%
rename from src/plugins/platforms/wayland/shared/qwaylandmimehelper.h
rename to src/plugins/platforms/wayland/shared/qwaylandmimehelper_p.h
diff --git a/src/plugins/platforms/wayland/shared/qwaylandshmformathelper.h b/src/plugins/platforms/wayland/shared/qwaylandshmformathelper_p.h
similarity index 100%
rename from src/plugins/platforms/wayland/shared/qwaylandshmformathelper.h
rename to src/plugins/platforms/wayland/shared/qwaylandshmformathelper_p.h
diff --git a/src/plugins/platforms/wayland/shared/qwaylandxkb.cpp b/src/plugins/platforms/wayland/shared/qwaylandxkb.cpp
index 32d24bd62d1..499257009cf 100644
--- a/src/plugins/platforms/wayland/shared/qwaylandxkb.cpp
+++ b/src/plugins/platforms/wayland/shared/qwaylandxkb.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include "qwaylandxkb.h"
+#include "qwaylandxkb_p.h"
 
 #include <QKeyEvent>
 #include <QString>
diff --git a/src/plugins/platforms/wayland/shared/qwaylandxkb.h b/src/plugins/platforms/wayland/shared/qwaylandxkb_p.h
similarity index 100%
rename from src/plugins/platforms/wayland/shared/qwaylandxkb.h
rename to src/plugins/platforms/wayland/shared/qwaylandxkb_p.h
diff --git a/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegration_p.h b/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegration_p.h
index 8395c868ec5..e8e46ecaa12 100644
--- a/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegration_p.h
+++ b/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegration_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <QtCore/qglobal.h>
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegrationfactory_p.h b/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegrationfactory_p.h
index 6e595b06dc7..0783465a82a 100644
--- a/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegrationfactory_p.h
+++ b/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegrationfactory_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 #include <QtCore/QStringList>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegrationplugin_p.h b/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegrationplugin_p.h
index 5566843b109..be511bfc338 100644
--- a/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegrationplugin_p.h
+++ b/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegrationplugin_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtWaylandClient/private/qwaylandclientexport_p.h>
+#include <QtWaylandClient/qwaylandclientexport.h>
 
 #include <QtCore/qplugin.h>
 #include <QtCore/qfactoryinterface.h>