diff --git a/src/plugins/platforms/wayland/plugins/hardwareintegration/dmabuf-server/dmabuf-server.pro b/src/plugins/platforms/wayland/plugins/hardwareintegration/dmabuf-server/dmabuf-server.pro
index 5925c8b04f1..3c91b2ecf0a 100644
--- a/src/plugins/platforms/wayland/plugins/hardwareintegration/dmabuf-server/dmabuf-server.pro
+++ b/src/plugins/platforms/wayland/plugins/hardwareintegration/dmabuf-server/dmabuf-server.pro
@@ -1,7 +1,7 @@
 # We have a bunch of C code with casts, so we can't have this option
 QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual
 
-QT += waylandclient-private
+QT += waylandclient-private opengl
 
 include(../../../../hardwareintegration/client/dmabuf-server/dmabuf-server.pri)
 
diff --git a/src/plugins/platforms/wayland/plugins/hardwareintegration/drm-egl-server/drm-egl-server.pro b/src/plugins/platforms/wayland/plugins/hardwareintegration/drm-egl-server/drm-egl-server.pro
index 2fba5bd1fdf..390278b1c7d 100644
--- a/src/plugins/platforms/wayland/plugins/hardwareintegration/drm-egl-server/drm-egl-server.pro
+++ b/src/plugins/platforms/wayland/plugins/hardwareintegration/drm-egl-server/drm-egl-server.pro
@@ -1,7 +1,7 @@
 # We have a bunch of C code with casts, so we can't have this option
 QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual
 
-QT += waylandclient-private
+QT += waylandclient-private opengl
 
 include(../../../../hardwareintegration/client/drm-egl-server/drm-egl-server.pri)
 
diff --git a/src/plugins/platforms/wayland/plugins/hardwareintegration/shm-emulation-server/shm-emulation-server.pro b/src/plugins/platforms/wayland/plugins/hardwareintegration/shm-emulation-server/shm-emulation-server.pro
index 8b1c6e5f2da..9e9319d2535 100644
--- a/src/plugins/platforms/wayland/plugins/hardwareintegration/shm-emulation-server/shm-emulation-server.pro
+++ b/src/plugins/platforms/wayland/plugins/hardwareintegration/shm-emulation-server/shm-emulation-server.pro
@@ -1,7 +1,7 @@
 # We have a bunch of C code with casts, so we can't have this option
 QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual
 
-QT += waylandclient-private
+QT += waylandclient-private opengl
 
 include(../../../../hardwareintegration/client/shm-emulation-server/shm-emulation-server.pri)
 
diff --git a/src/plugins/platforms/wayland/plugins/hardwareintegration/vulkan-server/vulkan-server.pro b/src/plugins/platforms/wayland/plugins/hardwareintegration/vulkan-server/vulkan-server.pro
index 1be60f7c10f..13cb2ab90e6 100644
--- a/src/plugins/platforms/wayland/plugins/hardwareintegration/vulkan-server/vulkan-server.pro
+++ b/src/plugins/platforms/wayland/plugins/hardwareintegration/vulkan-server/vulkan-server.pro
@@ -1,7 +1,7 @@
 # We have a bunch of C code with casts, so we can't have this option
 QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual
 
-QT += waylandclient-private
+QT += waylandclient-private opengl
 
 include(../../../../hardwareintegration/client/vulkan-server/vulkan-server.pri)
 
diff --git a/tests/auto/wayland/datadevicev1/tst_datadevicev1.cpp b/tests/auto/wayland/datadevicev1/tst_datadevicev1.cpp
index 1568b3b9680..91a479e28d3 100644
--- a/tests/auto/wayland/datadevicev1/tst_datadevicev1.cpp
+++ b/tests/auto/wayland/datadevicev1/tst_datadevicev1.cpp
@@ -28,8 +28,8 @@
 
 #include "mockcompositor.h"
 
+#include <QtOpenGL/QOpenGLWindow>
 #include <QtGui/QRasterWindow>
-#include <QtGui/QOpenGLWindow>
 #include <QtGui/QClipboard>
 #include <QtGui/QDrag>
 
diff --git a/tests/auto/wayland/primaryselectionv1/tst_primaryselectionv1.cpp b/tests/auto/wayland/primaryselectionv1/tst_primaryselectionv1.cpp
index ee9fa110e4b..660d1f83e11 100644
--- a/tests/auto/wayland/primaryselectionv1/tst_primaryselectionv1.cpp
+++ b/tests/auto/wayland/primaryselectionv1/tst_primaryselectionv1.cpp
@@ -30,8 +30,8 @@
 
 #include <qwayland-server-wp-primary-selection-unstable-v1.h>
 
+#include <QtOpenGL/QOpenGLWindow>
 #include <QtGui/QRasterWindow>
-#include <QtGui/QOpenGLWindow>
 #include <QtGui/QClipboard>
 #include <QtCore/private/qcore_unix_p.h>
 
diff --git a/tests/auto/wayland/seatv4/tst_seatv4.cpp b/tests/auto/wayland/seatv4/tst_seatv4.cpp
index 2e17bef8727..f5c07896322 100644
--- a/tests/auto/wayland/seatv4/tst_seatv4.cpp
+++ b/tests/auto/wayland/seatv4/tst_seatv4.cpp
@@ -28,8 +28,8 @@
 
 #include "mockcompositor.h"
 
+#include <QtOpenGL/QOpenGLWindow>
 #include <QtGui/QRasterWindow>
-#include <QtGui/QOpenGLWindow>
 #if QT_CONFIG(cursor)
 #include <wayland-cursor.h>
 #include <QtGui/private/qguiapplication_p.h>
diff --git a/tests/auto/wayland/seatv5/tst_seatv5.cpp b/tests/auto/wayland/seatv5/tst_seatv5.cpp
index e333082ecc7..2a2a05cd253 100644
--- a/tests/auto/wayland/seatv5/tst_seatv5.cpp
+++ b/tests/auto/wayland/seatv5/tst_seatv5.cpp
@@ -27,8 +27,8 @@
 ****************************************************************************/
 
 #include "mockcompositor.h"
+#include <QtOpenGL/QOpenGLWindow>
 #include <QtGui/QRasterWindow>
-#include <QtGui/QOpenGLWindow>
 
 using namespace MockCompositor;
 
@@ -397,9 +397,9 @@ public:
             , touchPoints(event->touchPoints())
         {
         }
-        const QEvent::Type type{};
-        const Qt::TouchPointStates touchPointStates{};
-        const QList<QTouchEvent::TouchPoint> touchPoints;
+        QEvent::Type type{};
+        Qt::TouchPointStates touchPointStates{};
+        QList<QTouchEvent::TouchPoint> touchPoints;
     };
     QVector<Event> m_events;
 };
diff --git a/tests/auto/wayland/shared/shared.pri b/tests/auto/wayland/shared/shared.pri
index c86183b3d62..b59cdc481da 100644
--- a/tests/auto/wayland/shared/shared.pri
+++ b/tests/auto/wayland/shared/shared.pri
@@ -1,4 +1,4 @@
-QT += testlib waylandclient-private
+QT += testlib waylandclient-private opengl
 CONFIG += testcase wayland-scanner
 QMAKE_USE += wayland-server
 
diff --git a/tests/auto/wayland/shared_old/shared_old.pri b/tests/auto/wayland/shared_old/shared_old.pri
index 467e98115a2..6989e613e6c 100644
--- a/tests/auto/wayland/shared_old/shared_old.pri
+++ b/tests/auto/wayland/shared_old/shared_old.pri
@@ -1,6 +1,6 @@
 CONFIG += testcase link_pkgconfig
 QT += testlib
-QT += core-private gui-private waylandclient-private
+QT += core-private gui-private waylandclient-private opengl
 
 QMAKE_USE += wayland-client wayland-server
 
diff --git a/tests/auto/wayland/surface/tst_surface.cpp b/tests/auto/wayland/surface/tst_surface.cpp
index b8a65f1595f..289fbd62153 100644
--- a/tests/auto/wayland/surface/tst_surface.cpp
+++ b/tests/auto/wayland/surface/tst_surface.cpp
@@ -29,7 +29,7 @@
 #include "mockcompositor.h"
 #include <QtGui/QRasterWindow>
 #if QT_CONFIG(opengl)
-#include <QtGui/QOpenGLWindow>
+#include <QtOpenGL/QOpenGLWindow>
 #endif
 
 using namespace MockCompositor;
diff --git a/tests/auto/wayland/xdgdecorationv1/tst_xdgdecorationv1.cpp b/tests/auto/wayland/xdgdecorationv1/tst_xdgdecorationv1.cpp
index 386713cf567..cf20a137392 100644
--- a/tests/auto/wayland/xdgdecorationv1/tst_xdgdecorationv1.cpp
+++ b/tests/auto/wayland/xdgdecorationv1/tst_xdgdecorationv1.cpp
@@ -30,8 +30,8 @@
 
 #include <qwayland-server-xdg-decoration-unstable-v1.h>
 
+#include <QtOpenGL/QOpenGLWindow>
 #include <QtGui/QRasterWindow>
-#include <QtGui/QOpenGLWindow>
 #include <QtGui/QClipboard>
 #include <QtCore/private/qcore_unix_p.h>
 
diff --git a/tests/auto/wayland/xdgoutput/tst_xdgoutput.cpp b/tests/auto/wayland/xdgoutput/tst_xdgoutput.cpp
index a628810d19c..16e29a3c6d9 100644
--- a/tests/auto/wayland/xdgoutput/tst_xdgoutput.cpp
+++ b/tests/auto/wayland/xdgoutput/tst_xdgoutput.cpp
@@ -27,8 +27,8 @@
 ****************************************************************************/
 
 #include "mockcompositor.h"
+#include <QtOpenGL/QOpenGLWindow>
 #include <QtGui/QRasterWindow>
-#include <QtGui/QOpenGLWindow>
 #include <QtGui/QScreen>
 
 #include <qwayland-server-xdg-output-unstable-v1.h>
diff --git a/tests/auto/wayland/xdgshell/tst_xdgshell.cpp b/tests/auto/wayland/xdgshell/tst_xdgshell.cpp
index 2277bbb80ab..eabf29b7e64 100644
--- a/tests/auto/wayland/xdgshell/tst_xdgshell.cpp
+++ b/tests/auto/wayland/xdgshell/tst_xdgshell.cpp
@@ -27,8 +27,8 @@
 ****************************************************************************/
 
 #include "mockcompositor.h"
+#include <QtOpenGL/QOpenGLWindow>
 #include <QtGui/QRasterWindow>
-#include <QtGui/QOpenGLWindow>
 #include <QtGui/qpa/qplatformnativeinterface.h>
 #include <QtWaylandClient/private/wayland-wayland-client-protocol.h>