diff --git a/plugins/qpa/abstractplatformcontext.h b/plugins/qpa/abstractplatformcontext.h
index 984679a275..decd807dc5 100644
--- a/plugins/qpa/abstractplatformcontext.h
+++ b/plugins/qpa/abstractplatformcontext.h
@@ -29,12 +29,11 @@ namespace KWin
 {
 namespace QPA
 {
-class Integration;
 
 class AbstractPlatformContext : public QPlatformOpenGLContext
 {
 public:
-    explicit AbstractPlatformContext(QOpenGLContext *context, EGLDisplay display, EGLConfig config = nullptr);
+    AbstractPlatformContext(QOpenGLContext *context, EGLDisplay display, EGLConfig config = nullptr);
     virtual ~AbstractPlatformContext();
 
     void doneCurrent() override;
diff --git a/plugins/qpa/backingstore.cpp b/plugins/qpa/backingstore.cpp
index a2f4fd2ac4..9940b40473 100644
--- a/plugins/qpa/backingstore.cpp
+++ b/plugins/qpa/backingstore.cpp
@@ -21,8 +21,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "backingstore.h"
 #include "../../wayland_server.h"
 
-#include <KWayland/Client/connection_thread.h>
 #include <KWayland/Client/buffer.h>
+#include <KWayland/Client/connection_thread.h>
 #include <KWayland/Client/shm_pool.h>
 #include <KWayland/Client/surface.h>
 
diff --git a/plugins/qpa/integration.cpp b/plugins/qpa/integration.cpp
index 473dafb367..7216c276f6 100644
--- a/plugins/qpa/integration.cpp
+++ b/plugins/qpa/integration.cpp
@@ -17,18 +17,17 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
-#define WL_EGL_PLATFORM 1
 #include "integration.h"
-#include "platform.h"
 #include "backingstore.h"
 #include "nativeinterface.h"
 #include "offscreensurface.h"
 #include "screen.h"
 #include "sharingplatformcontext.h"
 #include "window.h"
-#include "../../virtualkeyboard.h"
 #include "../../main.h"
+#include "../../platform.h"
 #include "../../screens.h"
+#include "../../virtualkeyboard.h"
 #include "../../wayland_server.h"
 
 #include <KWayland/Client/compositor.h>
@@ -41,14 +40,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QCoreApplication>
 #include <QtConcurrentRun>
 
-#include <qpa/qplatformwindow.h>
 #include <qpa/qplatforminputcontext.h>
 #include <qpa/qplatforminputcontextfactory_p.h>
+#include <qpa/qplatformwindow.h>
 #include <qpa/qwindowsysteminterface.h>
 
+#include <QtEventDispatcherSupport/private/qunixeventdispatcher_qpa_p.h>
 #include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
 #include <QtThemeSupport/private/qgenericunixthemes_p.h>
-#include <QtEventDispatcherSupport/private/qunixeventdispatcher_qpa_p.h>
 
 namespace KWin
 {
@@ -122,7 +121,7 @@ void Integration::initialize()
             }
         );
         connect(qApp->inputMethod(), &QInputMethod::visibleChanged, this,
-            [this] {
+            [] {
                 if (qApp->inputMethod()->isVisible()) {
                     if (QWindow *w = VirtualKeyboard::self()->inputPanel()) {
                         QWindowSystemInterface::handleWindowActivated(w, Qt::ActiveWindowFocusReason);
diff --git a/plugins/qpa/integration.h b/plugins/qpa/integration.h
index ce96e5141d..eb18dbd211 100644
--- a/plugins/qpa/integration.h
+++ b/plugins/qpa/integration.h
@@ -31,7 +31,6 @@ namespace KWayland
 {
 namespace Client
 {
-class Registry;
 class Compositor;
 class Shell;
 }
diff --git a/plugins/qpa/nativeinterface.cpp b/plugins/qpa/nativeinterface.cpp
index 4b1e0dfdf9..26596e3bb8 100644
--- a/plugins/qpa/nativeinterface.cpp
+++ b/plugins/qpa/nativeinterface.cpp
@@ -22,12 +22,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "window.h"
 #include "../../wayland_server.h"
 
-#include <QWindow>
-
-#include <KWayland/Client/connection_thread.h>
 #include <KWayland/Client/compositor.h>
+#include <KWayland/Client/connection_thread.h>
 #include <KWayland/Client/surface.h>
 
+#include <QWindow>
+
 namespace KWin
 {
 namespace QPA
diff --git a/plugins/qpa/screen.cpp b/plugins/qpa/screen.cpp
index 5eae7d958a..cd23dea9d8 100644
--- a/plugins/qpa/screen.cpp
+++ b/plugins/qpa/screen.cpp
@@ -20,7 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "screen.h"
 #include "platformcursor.h"
 #include "screens.h"
-#include "wayland_server.h"
 
 namespace KWin
 {
diff --git a/plugins/qpa/sharingplatformcontext.cpp b/plugins/qpa/sharingplatformcontext.cpp
index 84dbc66178..01b772b51e 100644
--- a/plugins/qpa/sharingplatformcontext.cpp
+++ b/plugins/qpa/sharingplatformcontext.cpp
@@ -18,11 +18,9 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 #include "sharingplatformcontext.h"
-#include "integration.h"
 #include "offscreensurface.h"
 #include "window.h"
 #include "../../platform.h"
-#include "../../wayland_server.h"
 #include "../../shell_client.h"
 #include <logging.h>
 
diff --git a/plugins/qpa/sharingplatformcontext.h b/plugins/qpa/sharingplatformcontext.h
index 1a0f72cb77..bf03ebcf7d 100644
--- a/plugins/qpa/sharingplatformcontext.h
+++ b/plugins/qpa/sharingplatformcontext.h
@@ -26,13 +26,12 @@ namespace KWin
 {
 namespace QPA
 {
-class Integration;
 
 class SharingPlatformContext : public AbstractPlatformContext
 {
 public:
     explicit SharingPlatformContext(QOpenGLContext *context);
-    explicit SharingPlatformContext(QOpenGLContext *context, const EGLSurface &surface, EGLConfig config = nullptr);
+    SharingPlatformContext(QOpenGLContext *context, const EGLSurface &surface, EGLConfig config = nullptr);
 
     void swapBuffers(QPlatformSurface *surface) override;
 
diff --git a/plugins/qpa/window.cpp b/plugins/qpa/window.cpp
index 8b0717321a..1d33c2ccfa 100644
--- a/plugins/qpa/window.cpp
+++ b/plugins/qpa/window.cpp
@@ -17,8 +17,8 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
-#include "integration.h"
 #include "window.h"
+#include "integration.h"
 #include "screens.h"
 #include "../../shell_client.h"
 #include "../../wayland_server.h"