diff --git a/src/plugins/platforms/wayland/qwaylanddisplay.cpp b/src/plugins/platforms/wayland/qwaylanddisplay.cpp
index 1063fd591a2..26f99f0ed5d 100644
--- a/src/plugins/platforms/wayland/qwaylanddisplay.cpp
+++ b/src/plugins/platforms/wayland/qwaylanddisplay.cpp
@@ -70,6 +70,7 @@
 #include <QtWaylandClient/private/qwayland-text-input-unstable-v2.h>
 
 #include <QtCore/QAbstractEventDispatcher>
+#include <QtGui/qpa/qwindowsysteminterface.h>
 #include <QtGui/private/qguiapplication_p.h>
 
 #include <QtCore/QDebug>
@@ -153,7 +154,7 @@ QWaylandDisplay::~QWaylandDisplay(void)
     mInputDevices.clear();
 
     foreach (QWaylandScreen *screen, mScreens) {
-        mWaylandIntegration->destroyScreen(screen);
+        QWindowSystemInterface::handleScreenRemoved(screen);
     }
     mScreens.clear();
 
@@ -244,7 +245,7 @@ void QWaylandDisplay::registry_global(uint32_t id, const QString &interface, uin
         mScreens.append(screen);
         // We need to get the output events before creating surfaces
         forceRoundTrip();
-        mWaylandIntegration->screenAdded(screen);
+        QWindowSystemInterface::handleScreenAdded(screen);
     } else if (interface == QStringLiteral("wl_compositor")) {
         mCompositorVersion = qMin((int)version, 3);
         mCompositor.init(registry, id, mCompositorVersion);
@@ -300,7 +301,7 @@ void QWaylandDisplay::registry_global_remove(uint32_t id)
                 foreach (QWaylandScreen *screen, mScreens) {
                     if (screen->outputId() == id) {
                         mScreens.removeOne(screen);
-                        mWaylandIntegration->destroyScreen(screen);
+                        QWindowSystemInterface::handleScreenRemoved(screen);
                         break;
                     }
                 }
diff --git a/src/plugins/platforms/wayland/qwaylandinputdevice.cpp b/src/plugins/platforms/wayland/qwaylandinputdevice.cpp
index b01f5ea0636..711f5b422c9 100644
--- a/src/plugins/platforms/wayland/qwaylandinputdevice.cpp
+++ b/src/plugins/platforms/wayland/qwaylandinputdevice.cpp
@@ -318,7 +318,7 @@ void QWaylandInputDevice::Pointer::updateCursorTheme()
         while (scale > 1 && arrowPixelSize / scale < cursorSize())
             --scale;
     } else {
-        qWarning(lcQpaWayland) << "Cursor theme does not support the arrow cursor";
+        qCWarning(lcQpaWayland) << "Cursor theme does not support the arrow cursor";
     }
     mCursor.themeBufferScale = scale;
 }
@@ -588,9 +588,9 @@ void QWaylandInputDevice::Pointer::pointer_enter(uint32_t serial, struct wl_surf
     QWaylandWindow *window = QWaylandWindow::fromWlSurface(surface);
 
     if (mFocus) {
-        qWarning(lcQpaWayland) << "The compositor sent a wl_pointer.enter event before sending a"
-                               << "leave event first, this is not allowed by the wayland protocol"
-                               << "attempting to work around it by invalidating the current focus";
+        qCWarning(lcQpaWayland) << "The compositor sent a wl_pointer.enter event before sending a"
+                                << "leave event first, this is not allowed by the wayland protocol"
+                                << "attempting to work around it by invalidating the current focus";
         invalidateFocus();
     }
     mFocus = window;
diff --git a/src/plugins/platforms/wayland/qwaylandwindow.cpp b/src/plugins/platforms/wayland/qwaylandwindow.cpp
index f4dcae81498..12b99dc9f05 100644
--- a/src/plugins/platforms/wayland/qwaylandwindow.cpp
+++ b/src/plugins/platforms/wayland/qwaylandwindow.cpp
@@ -487,11 +487,11 @@ void QWaylandWindow::surface_enter(wl_output *output)
     auto addedScreen = QWaylandScreen::fromWlOutput(output);
 
     if (mScreens.contains(addedScreen)) {
-        qWarning(lcQpaWayland) << "Ignoring unexpected wl_surface.enter received for output with id:"
-                               << wl_proxy_get_id(reinterpret_cast<wl_proxy *>(output))
-                               << "screen name:" << addedScreen->name()
-                               << "screen model:" << addedScreen->model()
-                               << "This is most likely a bug in the compositor.";
+        qCWarning(lcQpaWayland)
+                << "Ignoring unexpected wl_surface.enter received for output with id:"
+                << wl_proxy_get_id(reinterpret_cast<wl_proxy *>(output))
+                << "screen name:" << addedScreen->name() << "screen model:" << addedScreen->model()
+                << "This is most likely a bug in the compositor.";
         return;
     }
 
@@ -508,11 +508,12 @@ void QWaylandWindow::surface_leave(wl_output *output)
     auto *removedScreen = QWaylandScreen::fromWlOutput(output);
     bool wasRemoved = mScreens.removeOne(removedScreen);
     if (!wasRemoved) {
-        qWarning(lcQpaWayland) << "Ignoring unexpected wl_surface.leave received for output with id:"
-                               << wl_proxy_get_id(reinterpret_cast<wl_proxy *>(output))
-                               << "screen name:" << removedScreen->name()
-                               << "screen model:" << removedScreen->model()
-                               << "This is most likely a bug in the compositor.";
+        qCWarning(lcQpaWayland)
+                << "Ignoring unexpected wl_surface.leave received for output with id:"
+                << wl_proxy_get_id(reinterpret_cast<wl_proxy *>(output))
+                << "screen name:" << removedScreen->name()
+                << "screen model:" << removedScreen->model()
+                << "This is most likely a bug in the compositor.";
         return;
     }