diff --git a/src/plugins/platforms/wayland/client.pro b/src/plugins/platforms/wayland/client.pro
index 66dc1a4754c..7aac1d1b64a 100644
--- a/src/plugins/platforms/wayland/client.pro
+++ b/src/plugins/platforms/wayland/client.pro
@@ -40,7 +40,6 @@ WAYLANDCLIENTSOURCES += \
             ../extensions/windowmanager.xml \
             ../3rdparty/protocol/text.xml \
 
-
 SOURCES +=  qwaylandintegration.cpp \
             qwaylandnativeinterface.cpp \
             qwaylandshmbackingstore.cpp \
@@ -100,4 +99,3 @@ contains(DEFINES, QT_WAYLAND_GL_SUPPORT) {
     SOURCES += qwaylandglintegration.cpp
     HEADERS += qwaylandglintegration.h
 }
-
diff --git a/src/plugins/platforms/wayland/qwaylandbuffer.h b/src/plugins/platforms/wayland/qwaylandbuffer.h
index 8d9ceaa8abc..9548eadf873 100644
--- a/src/plugins/platforms/wayland/qwaylandbuffer.h
+++ b/src/plugins/platforms/wayland/qwaylandbuffer.h
@@ -42,7 +42,7 @@
 #ifndef QWAYLANDBUFFER_H
 #define QWAYLANDBUFFER_H
 
-#include "qwaylandclientexport.h"
+#include <QtWaylandClient/qwaylandclientexport.h>
 
 #include <QtCore/QSize>
 #include <QtCore/QRect>
diff --git a/src/plugins/platforms/wayland/qwaylanddatadevicemanager.h b/src/plugins/platforms/wayland/qwaylanddatadevicemanager.h
index 6b3ad177cce..c51e12e7823 100644
--- a/src/plugins/platforms/wayland/qwaylanddatadevicemanager.h
+++ b/src/plugins/platforms/wayland/qwaylanddatadevicemanager.h
@@ -42,7 +42,7 @@
 #ifndef QWAYLANDDATADEVICEMANAGER_H
 #define QWAYLANDDATADEVICEMANAGER_H
 
-#include "qwaylanddisplay.h"
+#include <QtWaylandClient/qwaylanddisplay.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/wayland/qwaylanddatasource.h b/src/plugins/platforms/wayland/qwaylanddatasource.h
index 670a8872ff6..63a2150f802 100644
--- a/src/plugins/platforms/wayland/qwaylanddatasource.h
+++ b/src/plugins/platforms/wayland/qwaylanddatasource.h
@@ -42,7 +42,9 @@
 #ifndef QWAYLANDDATASOURCE_H
 #define QWAYLANDDATASOURCE_H
 
-#include "qwaylanddisplay.h"
+#include <QtWaylandClient/qwaylanddatadevicemanager.h>
+
+#include <QtWaylandClient/private/wayland-wayland-client-protocol.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/wayland/qwaylanddisplay.h b/src/plugins/platforms/wayland/qwaylanddisplay.h
index 45104350738..b841a21ca65 100644
--- a/src/plugins/platforms/wayland/qwaylanddisplay.h
+++ b/src/plugins/platforms/wayland/qwaylanddisplay.h
@@ -48,8 +48,8 @@
 #include <QtCore/QWaitCondition>
 
 #include <wayland-client.h>
-#include <QtWaylandClient/private/qwayland-wayland.h>
 
+#include <QtWaylandClient/private/qwayland-wayland.h>
 #include <QtWaylandClient/qwaylandclientexport.h>
 
 struct wl_cursor_image;
diff --git a/src/plugins/platforms/wayland/qwaylanddnd.h b/src/plugins/platforms/wayland/qwaylanddnd.h
index f125dd2b2f6..8879a1d4ea9 100644
--- a/src/plugins/platforms/wayland/qwaylanddnd.h
+++ b/src/plugins/platforms/wayland/qwaylanddnd.h
@@ -47,7 +47,7 @@
 
 #include <QtGui/QDrag>
 #include <QtCore/QMimeData>
-#include "qwaylanddisplay.h"
+#include <QtWaylandClient/qwaylanddisplay.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/wayland/qwaylandextendedoutput.h b/src/plugins/platforms/wayland/qwaylandextendedoutput.h
index e311a9b4f63..d1ef3397f85 100644
--- a/src/plugins/platforms/wayland/qwaylandextendedoutput.h
+++ b/src/plugins/platforms/wayland/qwaylandextendedoutput.h
@@ -42,7 +42,7 @@
 #ifndef QWAYLANDEXTENDEDOUTPUT_H
 #define QWAYLANDEXTENDEDOUTPUT_H
 
-#include "qwaylanddisplay.h"
+#include <QtWaylandClient/qwaylanddisplay.h>
 #include <QtWaylandClient/private/qwayland-output-extension.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/wayland/qwaylandinputdevice.h b/src/plugins/platforms/wayland/qwaylandinputdevice.h
index 625d773d14d..641c8b84026 100644
--- a/src/plugins/platforms/wayland/qwaylandinputdevice.h
+++ b/src/plugins/platforms/wayland/qwaylandinputdevice.h
@@ -42,7 +42,7 @@
 #ifndef QWAYLANDINPUTDEVICE_H
 #define QWAYLANDINPUTDEVICE_H
 
-#include "qwaylandwindow.h"
+#include <QtWaylandClient/qwaylandwindow.h>
 
 #include <QSocketNotifier>
 #include <QObject>
diff --git a/src/plugins/platforms/wayland/qwaylandnativeinterface.h b/src/plugins/platforms/wayland/qwaylandnativeinterface.h
index c5f0fda73c9..bc080769397 100644
--- a/src/plugins/platforms/wayland/qwaylandnativeinterface.h
+++ b/src/plugins/platforms/wayland/qwaylandnativeinterface.h
@@ -42,7 +42,7 @@
 #ifndef QWAYLANDNATIVEINTERFACE_H
 #define QWAYLANDNATIVEINTERFACE_H
 
-#include "qwaylandscreen.h"
+#include <QtWaylandClient/qwaylandscreen.h>
 #include <QVariantMap>
 #include <qpa/qplatformnativeinterface.h>
 
diff --git a/src/plugins/platforms/wayland/qwaylandqtkey.h b/src/plugins/platforms/wayland/qwaylandqtkey.h
index 0acc9e8ad7f..49563b78e01 100644
--- a/src/plugins/platforms/wayland/qwaylandqtkey.h
+++ b/src/plugins/platforms/wayland/qwaylandqtkey.h
@@ -42,7 +42,7 @@
 #ifndef QWAYLANDQTKEY_H
 #define QWAYLANDQTKEY_H
 
-#include "qwaylanddisplay.h"
+#include <QtWaylandClient/qwaylanddisplay.h>
 #include <qpa/qwindowsysteminterface.h>
 
 #include <QtWaylandClient/private/qwayland-qtkey-extension.h>
diff --git a/src/plugins/platforms/wayland/qwaylandshmbackingstore.h b/src/plugins/platforms/wayland/qwaylandshmbackingstore.h
index c7875f52c17..b5ee3a38cb3 100644
--- a/src/plugins/platforms/wayland/qwaylandshmbackingstore.h
+++ b/src/plugins/platforms/wayland/qwaylandshmbackingstore.h
@@ -42,10 +42,10 @@
 #ifndef QWAYLANDSHMBACKINGSTORE_H
 #define QWAYLANDSHMBACKINGSTORE_H
 
-#include "qwaylandbuffer.h"
+#include <QtWaylandClient/qwaylandbuffer.h>
 
-#include "qwaylanddecoration.h"
-#include "qwaylandshmwindow.h"
+#include <QtWaylandClient/qwaylanddecoration.h>
+#include <QtWaylandClient/qwaylandshmwindow.h>
 
 #include <qpa/qplatformbackingstore.h>
 #include <QtGui/QImage>
diff --git a/src/plugins/platforms/wayland/qwaylandshmwindow.h b/src/plugins/platforms/wayland/qwaylandshmwindow.h
index e443bb18743..f915c545f0e 100644
--- a/src/plugins/platforms/wayland/qwaylandshmwindow.h
+++ b/src/plugins/platforms/wayland/qwaylandshmwindow.h
@@ -42,7 +42,7 @@
 #ifndef QWAYLANDSHMWINDOW_H
 #define QWAYLANDSHMWINDOW_H
 
-#include "qwaylandwindow.h"
+#include <QtWaylandClient/qwaylandwindow.h>
 #include <QtGui/QRegion>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/wayland/qwaylandtouch.h b/src/plugins/platforms/wayland/qwaylandtouch.h
index 0d14330e710..e6f57ab575c 100644
--- a/src/plugins/platforms/wayland/qwaylandtouch.h
+++ b/src/plugins/platforms/wayland/qwaylandtouch.h
@@ -42,7 +42,7 @@
 #ifndef QWAYLANDTOUCh_H
 #define QWAYLANDTOUCH_H
 
-#include "qwaylanddisplay.h"
+#include <QtWaylandClient/qwaylanddisplay.h>
 #include <qpa/qwindowsysteminterface.h>
 
 #include <QtWaylandClient/private/qwayland-touch-extension.h>
diff --git a/src/plugins/platforms/wayland/qwaylandwindow.h b/src/plugins/platforms/wayland/qwaylandwindow.h
index c4d39180719..1f7344dc267 100644
--- a/src/plugins/platforms/wayland/qwaylandwindow.h
+++ b/src/plugins/platforms/wayland/qwaylandwindow.h
@@ -48,7 +48,7 @@
 
 #include <qpa/qplatformwindow.h>
 
-#include "qwaylanddisplay.h"
+#include <QtWaylandClient/qwaylanddisplay.h>
 
 #include <QtWaylandClient/private/qwayland-wayland.h>
 
diff --git a/src/plugins/platforms/wayland/qwaylandwindowmanagerintegration.h b/src/plugins/platforms/wayland/qwaylandwindowmanagerintegration.h
index 4506f06a1fa..2164f4c8da4 100644
--- a/src/plugins/platforms/wayland/qwaylandwindowmanagerintegration.h
+++ b/src/plugins/platforms/wayland/qwaylandwindowmanagerintegration.h
@@ -46,10 +46,10 @@
 #include <QtCore/QScopedPointer>
 
 #include "wayland-client.h"
-#include "qwaylanddisplay.h"
+#include <QtWaylandClient/qwaylanddisplay.h>
 #include <qpa/qplatformservices.h>
 
-#include "QtWaylandClient/private/qwayland-windowmanager.h"
+#include <QtWaylandClient/private/qwayland-windowmanager.h>
 
 QT_BEGIN_NAMESPACE