diff --git a/autotests/addremoveannotationtest.cpp b/autotests/addremoveannotationtest.cpp
index cb4f3578e..fe6c5817e 100644
--- a/autotests/addremoveannotationtest.cpp
+++ b/autotests/addremoveannotationtest.cpp
@@ -7,7 +7,8 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <QtTest>
+#include <QTest>
+#include <QMimeDatabase>
 
 #include "../core/annotations.h"
 #include "../core/document.h"
diff --git a/autotests/annotationstest.cpp b/autotests/annotationstest.cpp
index f2af379e3..871459ce5 100644
--- a/autotests/annotationstest.cpp
+++ b/autotests/annotationstest.cpp
@@ -7,7 +7,8 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <QtTest>
+#include <QTest>
+#include <QMimeDatabase>
 
 #include "../core/annotations.h"
 #include "../core/document.h"
diff --git a/autotests/annotationtoolbartest.cpp b/autotests/annotationtoolbartest.cpp
index cd730df86..288fb074f 100644
--- a/autotests/annotationtoolbartest.cpp
+++ b/autotests/annotationtoolbartest.cpp
@@ -9,7 +9,7 @@
 
 // clazy:excludeall=qstring-allocations
 
-#include <QtTest>
+#include <QTest>
 
 #include <KActionCollection>
 #include <QTabBar>
diff --git a/autotests/calculatetexttest.cpp b/autotests/calculatetexttest.cpp
index b3f0f2842..22a2b9e74 100644
--- a/autotests/calculatetexttest.cpp
+++ b/autotests/calculatetexttest.cpp
@@ -7,7 +7,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <QtTest>
+#include <QTest>
 
 #include "../settings_core.h"
 #include "core/document.h"
diff --git a/autotests/documenttest.cpp b/autotests/documenttest.cpp
index 18bada767..2aa6593fe 100644
--- a/autotests/documenttest.cpp
+++ b/autotests/documenttest.cpp
@@ -10,7 +10,9 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <QtTest>
+#include <QTest>
+#include <QMimeDatabase>
+#include <QTemporaryFile>
 
 #include <threadweaver/queue.h>
 
diff --git a/autotests/editannotationcontentstest.cpp b/autotests/editannotationcontentstest.cpp
index 59b0220d4..c561c2f4f 100644
--- a/autotests/editannotationcontentstest.cpp
+++ b/autotests/editannotationcontentstest.cpp
@@ -7,7 +7,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <QtTest>
+#include <QTest>
 
 #include "../settings_core.h"
 #include "core/annotations.h"
diff --git a/autotests/editformstest.cpp b/autotests/editformstest.cpp
index 799363bc1..671e19456 100644
--- a/autotests/editformstest.cpp
+++ b/autotests/editformstest.cpp
@@ -7,7 +7,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <QtTest>
+#include <QTest>
 
 #include "../settings_core.h"
 #include "core/document.h"
diff --git a/autotests/mainshelltest.cpp b/autotests/mainshelltest.cpp
index 0994f5bbe..c7d0262da 100644
--- a/autotests/mainshelltest.cpp
+++ b/autotests/mainshelltest.cpp
@@ -9,7 +9,7 @@
 
 // clazy:excludeall=qstring-allocations
 
-#include <QtTest>
+#include <QTest>
 
 #include <KConfigGroup>
 #include <KLineEdit>
diff --git a/autotests/markdowntest.cpp b/autotests/markdowntest.cpp
index 57128a981..7291ef975 100644
--- a/autotests/markdowntest.cpp
+++ b/autotests/markdowntest.cpp
@@ -7,7 +7,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <QtTest>
+#include <QTest>
 
 #include "../settings_core.h"
 #include "core/document.h"
diff --git a/autotests/modifyannotationpropertiestest.cpp b/autotests/modifyannotationpropertiestest.cpp
index 2b18fe9fc..f84ce760c 100644
--- a/autotests/modifyannotationpropertiestest.cpp
+++ b/autotests/modifyannotationpropertiestest.cpp
@@ -7,7 +7,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <QtTest>
+#include <QTest>
 
 #include "../settings_core.h"
 #include "core/document.h"
diff --git a/autotests/searchtest.cpp b/autotests/searchtest.cpp
index 7baf55269..335d302cf 100644
--- a/autotests/searchtest.cpp
+++ b/autotests/searchtest.cpp
@@ -9,7 +9,9 @@
 
 // clazy:excludeall=qstring-allocations
 
-#include <QtTest>
+#include <QTest>
+#include <QMimeDatabase>
+#include <QSignalSpy>
 
 #include "../core/document.h"
 #include "../core/page.h"
diff --git a/autotests/shelltest.cpp b/autotests/shelltest.cpp
index 43aceb607..0f839623c 100644
--- a/autotests/shelltest.cpp
+++ b/autotests/shelltest.cpp
@@ -7,7 +7,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <QtTest>
+#include <QTest>
 
 #include <QDir>
 #include <QUrl>
diff --git a/autotests/signatureformtest.cpp b/autotests/signatureformtest.cpp
index 2e63ae5f5..1d4b0cd28 100644
--- a/autotests/signatureformtest.cpp
+++ b/autotests/signatureformtest.cpp
@@ -7,7 +7,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <QtTest>
+#include <QTest>
 
 #include <QMimeDatabase>
 #include <QMimeType>
diff --git a/autotests/translateannotationtest.cpp b/autotests/translateannotationtest.cpp
index d0421d759..08bad7a58 100644
--- a/autotests/translateannotationtest.cpp
+++ b/autotests/translateannotationtest.cpp
@@ -7,7 +7,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <QtTest>
+#include <QTest>
 
 #include "../settings_core.h"
 #include "core/annotations.h"
diff --git a/autotests/urldetecttest.cpp b/autotests/urldetecttest.cpp
index 59474e860..6b4811bb7 100644
--- a/autotests/urldetecttest.cpp
+++ b/autotests/urldetecttest.cpp
@@ -7,7 +7,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <QtTest>
+#include <QTest>
 
 #include "../part/url_utils.h"
 
diff --git a/generators/chm/autotests/chmgeneratortest.cpp b/generators/chm/autotests/chmgeneratortest.cpp
index 18305913e..6a38e7a96 100644
--- a/generators/chm/autotests/chmgeneratortest.cpp
+++ b/generators/chm/autotests/chmgeneratortest.cpp
@@ -7,7 +7,8 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <QtTest>
+#include <QTest>
+#include <QMimeDatabase>
 
 #include "core/document.h"
 #include "core/page.h"
diff --git a/generators/comicbook/autotests/comicbooktest.cpp b/generators/comicbook/autotests/comicbooktest.cpp
index 79cdc62c3..06e02926c 100644
--- a/generators/comicbook/autotests/comicbooktest.cpp
+++ b/generators/comicbook/autotests/comicbooktest.cpp
@@ -7,7 +7,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <QtTest>
+#include <QTest>
 
 #include "core/document.h"
 #include "core/generator.h"
diff --git a/generators/epub/autotests/epubgeneratortest.cpp b/generators/epub/autotests/epubgeneratortest.cpp
index b708ad2ac..fe2ddfcfc 100644
--- a/generators/epub/autotests/epubgeneratortest.cpp
+++ b/generators/epub/autotests/epubgeneratortest.cpp
@@ -7,7 +7,8 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <QtTest>
+#include <QTest>
+#include <QMimeDatabase>
 
 #include "core/document.h"
 #include "core/page.h"
diff --git a/generators/kimgio/tests/kimgiotest.cpp b/generators/kimgio/tests/kimgiotest.cpp
index 2b507ed79..78c8a2714 100644
--- a/generators/kimgio/tests/kimgiotest.cpp
+++ b/generators/kimgio/tests/kimgiotest.cpp
@@ -14,11 +14,12 @@
 #include <core/page.h>
 #include <part/pagepainter.h>
 
-#include <QtTest>
+#include <QTest>
 
 #include <KPluginLoader>
 #include <QImage>
 #include <QImageReader>
+#include <QMimeDatabase>
 #include <QPainter>
 #include <QTemporaryFile>