diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 064c7caef..f17f97fa6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,9 +4,11 @@
 include:
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/reuse-lint.yml
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android-qt6.yml
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml
-# TODO enable once we can have qt6 libQuotient on the CI
-#  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows-qt6.yml
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml
+#  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd-qt6.yml
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/flatpak.yml
diff --git a/.kde-ci.yml b/.kde-ci.yml
index d98548e92..8ca7ebd8f 100644
--- a/.kde-ci.yml
+++ b/.kde-ci.yml
@@ -30,4 +30,4 @@ Dependencies:
     'frameworks/kdbusaddons': '@stable'
 
 Options:
-  require-passing-tests-on: [ 'Linux', 'FreeBSD', 'Windows' ]
+  require-passing-tests-on: [ 'Linux/Qt5', 'FreeBSD', 'Windows' ]
diff --git a/src/controller.cpp b/src/controller.cpp
index 54f8b667c..8225ab5d6 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -4,7 +4,11 @@
 
 #include "controller.h"
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <qt5keychain/keychain.h>
+#else
+#include <qt6keychain/keychain.h>
+#endif
 
 #include <KConfig>
 #include <KConfigGroup>
diff --git a/src/main.cpp b/src/main.cpp
index 81a81f1bd..8376480a2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -91,6 +91,10 @@
 #include <QDBusConnection>
 #endif
 
+#ifdef Q_OS_WINDOWS
+#include <Windows.h>
+#endif
+
 using namespace Quotient;
 
 class NetworkAccessManagerFactory : public QQmlNetworkAccessManagerFactory
diff --git a/src/models/completionmodel.cpp b/src/models/completionmodel.cpp
index 7572f573e..5191920e3 100644
--- a/src/models/completionmodel.cpp
+++ b/src/models/completionmodel.cpp
@@ -16,7 +16,7 @@ CompletionModel::CompletionModel(QObject *parent)
     : QAbstractListModel(parent)
     , m_filterModel(new CompletionProxyModel())
     , m_userListModel(new UserListModel(this))
-    , m_emojiModel(new KConcatenateRowsProxyModel(this))
+    , m_emojiModel(new QConcatenateTablesProxyModel(this))
 {
     connect(this, &CompletionModel::textChanged, this, &CompletionModel::updateCompletion);
     connect(this, &CompletionModel::roomChanged, this, [this]() {
diff --git a/src/models/completionmodel.h b/src/models/completionmodel.h
index ec8f3b3a2..00fb3dd6a 100644
--- a/src/models/completionmodel.h
+++ b/src/models/completionmodel.h
@@ -3,10 +3,9 @@
 
 #pragma once
 
+#include <QConcatenateTablesProxyModel>
 #include <QSortFilterProxyModel>
 
-#include <KConcatenateRowsProxyModel>
-
 #include "roomlistmodel.h"
 
 class CompletionProxyModel;
@@ -75,6 +74,6 @@ private:
 
     UserListModel *m_userListModel;
     RoomListModel *m_roomListModel;
-    KConcatenateRowsProxyModel *m_emojiModel;
+    QConcatenateTablesProxyModel *m_emojiModel;
 };
 Q_DECLARE_METATYPE(CompletionModel::AutoCompletionType);
diff --git a/src/neochatroom.h b/src/neochatroom.h
index 7c408c655..ace379b4d 100644
--- a/src/neochatroom.h
+++ b/src/neochatroom.h
@@ -12,8 +12,8 @@
 
 #include <qcoro/task.h>
 
-class PollHandler;
-class NeoChatUser;
+#include "neochatuser.h"
+#include "pollhandler.h"
 
 class PushNotificationState : public QObject
 {