diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,7 +110,7 @@
 option(ENABLE_WEBENGINE "Enable QWebEngine" OFF)
 if(ENABLE_WEBENGINE)
   find_package(Qt5WebEngineWidgets 5.8 REQUIRED)
-  if(Qt5WebEngineWidgets_VERSION VERSION_GREATER 5.8.99 AND Qt5WebEngineWidgets_VERSION VERSION_LESS 5.9.2)
+  if(Qt5WebEngineWidgets_VERSION VERSION_GREATER 5.8.99 AND Qt5WebEngineWidgets_VERSION VERSION_LESS 5.9.3)
     message(WARNING "QWebEngine version ${Qt5WebEngineWidgets_VERSION} is known to be unstable with KMyMoney")
   endif()
 else(ENABLE_WEBENGINE)
diff --git a/kmymoney/converter/tests/converter-test.h b/kmymoney/converter/tests/converter-test.h
--- a/kmymoney/converter/tests/converter-test.h
+++ b/kmymoney/converter/tests/converter-test.h
@@ -18,7 +18,7 @@
 #ifndef CONVERTERTEST_H
 #define CONVERTERTEST_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 #include "mymoneyfile.h"
 #include "storage/mymoneyseqaccessmgr.h"
diff --git a/kmymoney/converter/tests/converter-test.cpp b/kmymoney/converter/tests/converter-test.cpp
--- a/kmymoney/converter/tests/converter-test.cpp
+++ b/kmymoney/converter/tests/converter-test.cpp
@@ -17,7 +17,7 @@
 
 #include "converter-test.h"
 
-#include <QtTest/QtTest>
+#include <QtTest>
 #include <QFile>
 
 // uses helper functions from reports tests
diff --git a/kmymoney/converter/tests/matchfinder-test.h b/kmymoney/converter/tests/matchfinder-test.h
--- a/kmymoney/converter/tests/matchfinder-test.h
+++ b/kmymoney/converter/tests/matchfinder-test.h
@@ -17,7 +17,7 @@
 #ifndef MATCHFINDERTEST_H
 #define MATCHFINDERTEST_H
 
-#include <QtCore/QObject>
+#include <QObject>
 #include <QScopedPointer>
 
 #include "mymoneyaccount.h"
diff --git a/kmymoney/misc/CMakeLists.txt b/kmymoney/misc/CMakeLists.txt
--- a/kmymoney/misc/CMakeLists.txt
+++ b/kmymoney/misc/CMakeLists.txt
@@ -42,11 +42,13 @@
 target_link_libraries( kmm_utils_validators
   PUBLIC
   Qt5::Core
+  Qt5::Gui
 )
 
 target_link_libraries( kmm_utils_webconnect
   PUBLIC
   Qt5::Core
+  Qt5::Network
 )
 
 target_link_libraries( kmm_utils_platformtools
diff --git a/kmymoney/misc/charvalidator.h b/kmymoney/misc/charvalidator.h
--- a/kmymoney/misc/charvalidator.h
+++ b/kmymoney/misc/charvalidator.h
@@ -19,7 +19,7 @@
 #ifndef CHARVALIDATOR_H
 #define CHARVALIDATOR_H
 
-#include <QtGui/QValidator>
+#include <QValidator>
 
 class charValidator : public QValidator
 {
diff --git a/kmymoney/misc/validators.h b/kmymoney/misc/validators.h
--- a/kmymoney/misc/validators.h
+++ b/kmymoney/misc/validators.h
@@ -19,7 +19,7 @@
 #ifndef VALIDATORS_H
 #define VALIDATORS_H
 
-#include <QtCore/QString>
+#include <QString>
 
 namespace validators
 {
diff --git a/kmymoney/misc/validators.cpp b/kmymoney/misc/validators.cpp
--- a/kmymoney/misc/validators.cpp
+++ b/kmymoney/misc/validators.cpp
@@ -18,7 +18,7 @@
 
 #include "validators.h"
 
-#include <QtCore/QStringList>
+#include <QStringList>
 
 bool validators::checkLineLength(const QString& text, const int& length)
 {
diff --git a/kmymoney/misc/webconnect.cpp b/kmymoney/misc/webconnect.cpp
--- a/kmymoney/misc/webconnect.cpp
+++ b/kmymoney/misc/webconnect.cpp
@@ -18,8 +18,8 @@
 
 #include "webconnect.h"
 
-#include <QtNetwork/QLocalSocket>
-#include <QtNetwork/QLocalServer>
+#include <QLocalSocket>
+#include <QLocalServer>
 #include <QStandardPaths>
 #include <QDataStream>
 #include <QUrl>
diff --git a/kmymoney/models/CMakeLists.txt b/kmymoney/models/CMakeLists.txt
--- a/kmymoney/models/CMakeLists.txt
+++ b/kmymoney/models/CMakeLists.txt
@@ -27,10 +27,23 @@
 
 add_library(models STATIC ${libmodels_a_SOURCES})
 
+if (USE_MODELTEST)
+
 target_link_libraries(models LINK_PUBLIC
     kmm_mymoney
     kmymoney_common
     KF5::ItemModels
+    Qt5::Test
 )
 
+else(USE_MODELTEST)
+
+target_link_libraries(models LINK_PUBLIC
+    kmm_mymoney
+    kmymoney_common
+    KF5::ItemModels
+)
+
+endif(USE_MODELTEST)
+
 add_dependencies(models kmm_config)
diff --git a/kmymoney/models/modeltest.h b/kmymoney/models/modeltest.h
--- a/kmymoney/models/modeltest.h
+++ b/kmymoney/models/modeltest.h
@@ -43,7 +43,7 @@
 #ifndef MODELTEST_H
 #define MODELTEST_H
 
-#include <QtCore/QObject>
+#include <QObject>
 #include <QtCore/QAbstractItemModel>
 #include <QtCore/QStack>
 
diff --git a/kmymoney/models/modeltest.cpp b/kmymoney/models/modeltest.cpp
--- a/kmymoney/models/modeltest.cpp
+++ b/kmymoney/models/modeltest.cpp
@@ -41,9 +41,9 @@
 
 #include "modeltest.h"
 
-#include <QtGui/QtGui>
+#include <QtGui>
 
-#include <QtTest/QtTest>
+#include <QtTest>
 
 Q_DECLARE_METATYPE ( QModelIndex )
 
diff --git a/kmymoney/models/onlinejobmessagesmodel.h b/kmymoney/models/onlinejobmessagesmodel.h
--- a/kmymoney/models/onlinejobmessagesmodel.h
+++ b/kmymoney/models/onlinejobmessagesmodel.h
@@ -19,7 +19,7 @@
 #ifndef ONLINEJOBMESSAGESMODEL_H
 #define ONLINEJOBMESSAGESMODEL_H
 
-#include <QtCore/QAbstractTableModel>
+#include <QAbstractTableModel>
 
 #include "mymoney/onlinejob.h"
 
diff --git a/kmymoney/mymoney/payeeidentifier/payeeidentifiercontainermodel.h b/kmymoney/mymoney/payeeidentifier/payeeidentifiercontainermodel.h
--- a/kmymoney/mymoney/payeeidentifier/payeeidentifiercontainermodel.h
+++ b/kmymoney/mymoney/payeeidentifier/payeeidentifiercontainermodel.h
@@ -19,7 +19,7 @@
 #ifndef PAYEEIDENTIFIERCONTAINERMODEL_H
 #define PAYEEIDENTIFIERCONTAINERMODEL_H
 
-#include <QtCore/QModelIndex>
+#include <QModelIndex>
 #include "mymoney/mymoneypayeeidentifiercontainer.h"
 #include "payeeidentifier/payeeidentifier.h"
 
diff --git a/kmymoney/mymoney/payeeidentifier/payeeidentifierdata.h b/kmymoney/mymoney/payeeidentifier/payeeidentifierdata.h
--- a/kmymoney/mymoney/payeeidentifier/payeeidentifierdata.h
+++ b/kmymoney/mymoney/payeeidentifier/payeeidentifierdata.h
@@ -21,11 +21,11 @@
 
 #include "payeeidentifier/kmm_payeeidentifier_export.h"
 
-#include <QtCore/QtPlugin>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QHash>
-#include <QtCore/QMetaType>
-#include <QtXml/QDomElement>
+#include <QtPlugin>
+#include <QSharedPointer>
+#include <QHash>
+#include <QMetaType>
+#include <QDomElement>
 
 #include "storage/databasestoreableobject.h"
 
diff --git a/kmymoney/mymoney/storage/tests/mymoneydatabasemgr-test.h b/kmymoney/mymoney/storage/tests/mymoneydatabasemgr-test.h
--- a/kmymoney/mymoney/storage/tests/mymoneydatabasemgr-test.h
+++ b/kmymoney/mymoney/storage/tests/mymoneydatabasemgr-test.h
@@ -17,7 +17,7 @@
 #ifndef MYMONEYDATABASEMGRTEST_H
 #define MYMONEYDATABASEMGRTEST_H
 
-#include <QtCore/QObject>
+#include <QObject>
 #include <QTemporaryFile>
 #include <QElapsedTimer>
 
diff --git a/kmymoney/mymoney/storage/tests/mymoneydatabasemgr-test.cpp b/kmymoney/mymoney/storage/tests/mymoneydatabasemgr-test.cpp
--- a/kmymoney/mymoney/storage/tests/mymoneydatabasemgr-test.cpp
+++ b/kmymoney/mymoney/storage/tests/mymoneydatabasemgr-test.cpp
@@ -17,7 +17,7 @@
 #include "mymoneydatabasemgr-test.h"
 #include <iostream>
 
-#include <QtTest/QtTest>
+#include <QtTest>
 
 #include "mymoneytestutils.h"
 #include "mymoneymoney.h"
diff --git a/kmymoney/mymoney/storage/tests/mymoneymap-test.h b/kmymoney/mymoney/storage/tests/mymoneymap-test.h
--- a/kmymoney/mymoney/storage/tests/mymoneymap-test.h
+++ b/kmymoney/mymoney/storage/tests/mymoneymap-test.h
@@ -17,7 +17,7 @@
 #ifndef MYMONEYMAPTEST_H
 #define MYMONEYMAPTEST_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 #include "mymoneytestutils.h"
 
diff --git a/kmymoney/mymoney/storage/tests/mymoneymap-test.cpp b/kmymoney/mymoney/storage/tests/mymoneymap-test.cpp
--- a/kmymoney/mymoney/storage/tests/mymoneymap-test.cpp
+++ b/kmymoney/mymoney/storage/tests/mymoneymap-test.cpp
@@ -16,7 +16,7 @@
 
 #include "mymoneymap-test.h"
 #include <iostream>
-#include <QtTest/QtTest>
+#include <QtTest>
 
 QTEST_GUILESS_MAIN(MyMoneyMapTest)
 
diff --git a/kmymoney/mymoney/storage/tests/mymoneyseqaccessmgr-test.h b/kmymoney/mymoney/storage/tests/mymoneyseqaccessmgr-test.h
--- a/kmymoney/mymoney/storage/tests/mymoneyseqaccessmgr-test.h
+++ b/kmymoney/mymoney/storage/tests/mymoneyseqaccessmgr-test.h
@@ -17,7 +17,7 @@
 #ifndef MYMONEYSEQACCESSMGRTEST_H
 #define MYMONEYSEQACCESSMGRTEST_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 #define KMM_MYMONEY_UNIT_TESTABLE friend class MyMoneySeqAccessMgrTest;
 
diff --git a/kmymoney/mymoney/storage/tests/mymoneyseqaccessmgr-test.cpp b/kmymoney/mymoney/storage/tests/mymoneyseqaccessmgr-test.cpp
--- a/kmymoney/mymoney/storage/tests/mymoneyseqaccessmgr-test.cpp
+++ b/kmymoney/mymoney/storage/tests/mymoneyseqaccessmgr-test.cpp
@@ -17,7 +17,7 @@
 #include "mymoneyseqaccessmgr-test.h"
 #include <iostream>
 #include <QList>
-#include <QtTest/QtTest>
+#include <QtTest>
 
 #include "mymoneytestutils.h"
 #include "mymoneymoney.h"
diff --git a/kmymoney/mymoney/tests/mymoneyaccount-test.h b/kmymoney/mymoney/tests/mymoneyaccount-test.h
--- a/kmymoney/mymoney/tests/mymoneyaccount-test.h
+++ b/kmymoney/mymoney/tests/mymoneyaccount-test.h
@@ -17,7 +17,7 @@
 #ifndef MYMONEYACCOUNTTEST_H
 #define MYMONEYACCOUNTTEST_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 class MyMoneyAccount;
 
diff --git a/kmymoney/mymoney/tests/mymoneyaccount-test.cpp b/kmymoney/mymoney/tests/mymoneyaccount-test.cpp
--- a/kmymoney/mymoney/tests/mymoneyaccount-test.cpp
+++ b/kmymoney/mymoney/tests/mymoneyaccount-test.cpp
@@ -16,7 +16,7 @@
 
 #include "mymoneyaccount-test.h"
 
-#include <QtTest/QtTest>
+#include <QtTest>
 
 #define KMM_MYMONEY_UNIT_TESTABLE friend class MyMoneyAccountTest;
 
diff --git a/kmymoney/mymoney/tests/mymoneybalancecache-test.h b/kmymoney/mymoney/tests/mymoneybalancecache-test.h
--- a/kmymoney/mymoney/tests/mymoneybalancecache-test.h
+++ b/kmymoney/mymoney/tests/mymoneybalancecache-test.h
@@ -18,7 +18,7 @@
 #ifndef MYMONEYBALANCECACHETEST_H
 #define MYMONEYBALANCECACHETEST_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 #include "mymoneybalancecache.h"
 
diff --git a/kmymoney/mymoney/tests/mymoneybalancecache-test.cpp b/kmymoney/mymoney/tests/mymoneybalancecache-test.cpp
--- a/kmymoney/mymoney/tests/mymoneybalancecache-test.cpp
+++ b/kmymoney/mymoney/tests/mymoneybalancecache-test.cpp
@@ -17,9 +17,9 @@
 
 #include "mymoneybalancecache-test.h"
 
-#include <QtCore/QDebug>
+#include <QDebug>
 
-#include <QtTest/QtTest>
+#include <QtTest>
 
 #include "mymoneytestutils.h"
 #include "mymoneybalancecache.h"
diff --git a/kmymoney/mymoney/tests/mymoneybudget-test.h b/kmymoney/mymoney/tests/mymoneybudget-test.h
--- a/kmymoney/mymoney/tests/mymoneybudget-test.h
+++ b/kmymoney/mymoney/tests/mymoneybudget-test.h
@@ -17,7 +17,7 @@
 #ifndef MYMONEYBUDGETTEST_H
 #define MYMONEYBUDGETTEST_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 class MyMoneyBudgetTest : public QObject
 {
diff --git a/kmymoney/mymoney/tests/mymoneybudget-test.cpp b/kmymoney/mymoney/tests/mymoneybudget-test.cpp
--- a/kmymoney/mymoney/tests/mymoneybudget-test.cpp
+++ b/kmymoney/mymoney/tests/mymoneybudget-test.cpp
@@ -16,7 +16,7 @@
 
 #include "mymoneybudget-test.h"
 
-#include <QtTest/QtTest>
+#include <QtTest>
 
 #define KMM_MYMONEY_UNIT_TESTABLE friend class MyMoneyBudgetTest;
 
diff --git a/kmymoney/mymoney/tests/mymoneyexception-test.h b/kmymoney/mymoney/tests/mymoneyexception-test.h
--- a/kmymoney/mymoney/tests/mymoneyexception-test.h
+++ b/kmymoney/mymoney/tests/mymoneyexception-test.h
@@ -17,7 +17,7 @@
 #ifndef MYMONEYEXCEPTIONTEST_H
 #define MYMONEYEXCEPTIONTEST_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 #include "mymoneyutils.h"
 #include "mymoneyexception.h"
diff --git a/kmymoney/mymoney/tests/mymoneyexception-test.cpp b/kmymoney/mymoney/tests/mymoneyexception-test.cpp
--- a/kmymoney/mymoney/tests/mymoneyexception-test.cpp
+++ b/kmymoney/mymoney/tests/mymoneyexception-test.cpp
@@ -17,7 +17,7 @@
 
 #include "mymoneyexception-test.h"
 
-#include <QtTest/QtTest>
+#include <QtTest>
 
 QTEST_GUILESS_MAIN(MyMoneyExceptionTest)
 
diff --git a/kmymoney/mymoney/tests/mymoneyfile-test.h b/kmymoney/mymoney/tests/mymoneyfile-test.h
--- a/kmymoney/mymoney/tests/mymoneyfile-test.h
+++ b/kmymoney/mymoney/tests/mymoneyfile-test.h
@@ -17,7 +17,7 @@
 #ifndef MYMONEYFILETEST_H
 #define MYMONEYFILETEST_H
 
-#include <QtCore/QObject>
+#include <QObject>
 #include <QtCore/QList>
 
 #define KMM_MYMONEY_UNIT_TESTABLE friend class MyMoneyFileTest;
diff --git a/kmymoney/mymoney/tests/mymoneyfile-test.cpp b/kmymoney/mymoney/tests/mymoneyfile-test.cpp
--- a/kmymoney/mymoney/tests/mymoneyfile-test.cpp
+++ b/kmymoney/mymoney/tests/mymoneyfile-test.cpp
@@ -21,7 +21,7 @@
 #include <QFile>
 #include <QDataStream>
 #include <QList>
-#include <QtTest/QtTest>
+#include <QtTest>
 
 #include "mymoneytestutils.h"
 #include "mymoneymoney.h"
diff --git a/kmymoney/mymoney/tests/mymoneyfinancialcalculator-test.h b/kmymoney/mymoney/tests/mymoneyfinancialcalculator-test.h
--- a/kmymoney/mymoney/tests/mymoneyfinancialcalculator-test.h
+++ b/kmymoney/mymoney/tests/mymoneyfinancialcalculator-test.h
@@ -17,7 +17,7 @@
 #ifndef MYMONEYFINANCIALCALCULATORTEST_H
 #define MYMONEYFINANCIALCALCULATORTEST_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 class MyMoneyFinancialCalculator;
 
diff --git a/kmymoney/mymoney/tests/mymoneyfinancialcalculator-test.cpp b/kmymoney/mymoney/tests/mymoneyfinancialcalculator-test.cpp
--- a/kmymoney/mymoney/tests/mymoneyfinancialcalculator-test.cpp
+++ b/kmymoney/mymoney/tests/mymoneyfinancialcalculator-test.cpp
@@ -16,7 +16,7 @@
 
 #include "mymoneyfinancialcalculator-test.h"
 
-#include <QtTest/QtTest>
+#include <QtTest>
 
 #define KMM_MYMONEY_UNIT_TESTABLE friend class MyMoneyFinancialCalculatorTest;
 
diff --git a/kmymoney/mymoney/tests/mymoneyforecast-test.h b/kmymoney/mymoney/tests/mymoneyforecast-test.h
--- a/kmymoney/mymoney/tests/mymoneyforecast-test.h
+++ b/kmymoney/mymoney/tests/mymoneyforecast-test.h
@@ -17,7 +17,7 @@
 #ifndef MYMONEYFORECASTTEST_H
 #define MYMONEYFORECASTTEST_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 #define KMM_MYMONEY_UNIT_TESTABLE friend class MyMoneyForecastTest;
 
diff --git a/kmymoney/mymoney/tests/mymoneyforecast-test.cpp b/kmymoney/mymoney/tests/mymoneyforecast-test.cpp
--- a/kmymoney/mymoney/tests/mymoneyforecast-test.cpp
+++ b/kmymoney/mymoney/tests/mymoneyforecast-test.cpp
@@ -18,7 +18,7 @@
 
 #include <iostream>
 #include <QList>
-#include <QtTest/QtTest>
+#include <QtTest>
 
 #include "mymoneybudget.h"
 
diff --git a/kmymoney/mymoney/tests/mymoneyinstitution-test.h b/kmymoney/mymoney/tests/mymoneyinstitution-test.h
--- a/kmymoney/mymoney/tests/mymoneyinstitution-test.h
+++ b/kmymoney/mymoney/tests/mymoneyinstitution-test.h
@@ -18,7 +18,7 @@
 #ifndef MYMONEYINSTITUTIONTEST_H
 #define MYMONEYINSTITUTIONTEST_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 class MyMoneyInstitution;
 
diff --git a/kmymoney/mymoney/tests/mymoneyinstitution-test.cpp b/kmymoney/mymoney/tests/mymoneyinstitution-test.cpp
--- a/kmymoney/mymoney/tests/mymoneyinstitution-test.cpp
+++ b/kmymoney/mymoney/tests/mymoneyinstitution-test.cpp
@@ -16,7 +16,7 @@
 
 #include "mymoneyinstitution-test.h"
 
-#include <QtTest/QtTest>
+#include <QtTest>
 
 #define KMM_MYMONEY_UNIT_TESTABLE friend class MyMoneyInstitutionTest;
 
diff --git a/kmymoney/mymoney/tests/mymoneykeyvaluecontainer-test.h b/kmymoney/mymoney/tests/mymoneykeyvaluecontainer-test.h
--- a/kmymoney/mymoney/tests/mymoneykeyvaluecontainer-test.h
+++ b/kmymoney/mymoney/tests/mymoneykeyvaluecontainer-test.h
@@ -17,7 +17,7 @@
 #ifndef MYMONEYKEYVALUECONTAINERTEST_H
 #define MYMONEYKEYVALUECONTAINERTEST_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 class MyMoneyKeyValueContainer;
 
diff --git a/kmymoney/mymoney/tests/mymoneykeyvaluecontainer-test.cpp b/kmymoney/mymoney/tests/mymoneykeyvaluecontainer-test.cpp
--- a/kmymoney/mymoney/tests/mymoneykeyvaluecontainer-test.cpp
+++ b/kmymoney/mymoney/tests/mymoneykeyvaluecontainer-test.cpp
@@ -16,7 +16,7 @@
 
 #include "mymoneykeyvaluecontainer-test.h"
 
-#include <QtTest/QtTest>
+#include <QtTest>
 
 #define KMM_MYMONEY_UNIT_TESTABLE friend class MyMoneyKeyValueContainerTest;
 
diff --git a/kmymoney/mymoney/tests/mymoneymoney-test.h b/kmymoney/mymoney/tests/mymoneymoney-test.h
--- a/kmymoney/mymoney/tests/mymoneymoney-test.h
+++ b/kmymoney/mymoney/tests/mymoneymoney-test.h
@@ -17,7 +17,7 @@
 #ifndef MYMONEYMONEYTEST_H
 #define MYMONEYMONEYTEST_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 class MyMoneyMoney;
 
diff --git a/kmymoney/mymoney/tests/mymoneymoney-test.cpp b/kmymoney/mymoney/tests/mymoneymoney-test.cpp
--- a/kmymoney/mymoney/tests/mymoneymoney-test.cpp
+++ b/kmymoney/mymoney/tests/mymoneymoney-test.cpp
@@ -19,7 +19,7 @@
 #include <limits>
 #include <cstdint>
 
-#include <QtTest/QtTest>
+#include <QtTest>
 
 #define KMM_MYMONEY_UNIT_TESTABLE friend class MyMoneyMoneyTest;
 
diff --git a/kmymoney/mymoney/tests/mymoneyobject-test.h b/kmymoney/mymoney/tests/mymoneyobject-test.h
--- a/kmymoney/mymoney/tests/mymoneyobject-test.h
+++ b/kmymoney/mymoney/tests/mymoneyobject-test.h
@@ -17,7 +17,7 @@
 #ifndef MYMONEYOBJECTTEST_H
 #define MYMONEYOBJECTTEST_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 #include "mymoneyobject.h"
 
diff --git a/kmymoney/mymoney/tests/mymoneyobject-test.cpp b/kmymoney/mymoney/tests/mymoneyobject-test.cpp
--- a/kmymoney/mymoney/tests/mymoneyobject-test.cpp
+++ b/kmymoney/mymoney/tests/mymoneyobject-test.cpp
@@ -16,7 +16,7 @@
 
 #include "mymoneyobject-test.h"
 
-#include <QtTest/QtTest>
+#include <QtTest>
 
 #include "mymoneyexception.h"
 #include "mymoneyaccount.h"
diff --git a/kmymoney/mymoney/tests/mymoneypayee-test.h b/kmymoney/mymoney/tests/mymoneypayee-test.h
--- a/kmymoney/mymoney/tests/mymoneypayee-test.h
+++ b/kmymoney/mymoney/tests/mymoneypayee-test.h
@@ -14,7 +14,7 @@
 #ifndef MYMONEYPAYEETEST_H
 #define MYMONEYPAYEETEST_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 class MyMoneyPayeeTest : public QObject
 {
diff --git a/kmymoney/mymoney/tests/mymoneypayee-test.cpp b/kmymoney/mymoney/tests/mymoneypayee-test.cpp
--- a/kmymoney/mymoney/tests/mymoneypayee-test.cpp
+++ b/kmymoney/mymoney/tests/mymoneypayee-test.cpp
@@ -16,7 +16,7 @@
 #include <QDomDocument>
 #include <QDomElement>
 
-#include <QtTest/QtTest>
+#include <QtTest>
 
 #define KMM_MYMONEY_UNIT_TESTABLE friend class MyMoneyPayeeTest;
 
diff --git a/kmymoney/mymoney/tests/mymoneyprice-test.h b/kmymoney/mymoney/tests/mymoneyprice-test.h
--- a/kmymoney/mymoney/tests/mymoneyprice-test.h
+++ b/kmymoney/mymoney/tests/mymoneyprice-test.h
@@ -17,7 +17,7 @@
 #ifndef MYMONEYPRICETEST_H
 #define MYMONEYPRICETEST_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 #include "mymoneyprice.h"
 
diff --git a/kmymoney/mymoney/tests/mymoneyprice-test.cpp b/kmymoney/mymoney/tests/mymoneyprice-test.cpp
--- a/kmymoney/mymoney/tests/mymoneyprice-test.cpp
+++ b/kmymoney/mymoney/tests/mymoneyprice-test.cpp
@@ -16,7 +16,7 @@
 
 #include "mymoneyprice-test.h"
 
-#include <QtTest/QtTest>
+#include <QtTest>
 
 #include "mymoneyexception.h"
 #include "mymoneymoney.h"
diff --git a/kmymoney/mymoney/tests/mymoneyreport-test.h b/kmymoney/mymoney/tests/mymoneyreport-test.h
--- a/kmymoney/mymoney/tests/mymoneyreport-test.h
+++ b/kmymoney/mymoney/tests/mymoneyreport-test.h
@@ -17,7 +17,7 @@
 #ifndef MYMONEYREPORTTEST_H
 #define MYMONEYREPORTTEST_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 #define KMM_MYMONEY_UNIT_TESTABLE friend class MyMoneyReportTest;
 
diff --git a/kmymoney/mymoney/tests/mymoneyreport-test.cpp b/kmymoney/mymoney/tests/mymoneyreport-test.cpp
--- a/kmymoney/mymoney/tests/mymoneyreport-test.cpp
+++ b/kmymoney/mymoney/tests/mymoneyreport-test.cpp
@@ -16,9 +16,9 @@
 
 #include "mymoneyreport-test.h"
 
-#include <QtCore/QDebug>
+#include <QDebug>
 
-#include <QtTest/QtTest>
+#include <QtTest>
 
 #include <QMetaEnum>
 
diff --git a/kmymoney/mymoney/tests/mymoneyschedule-test.h b/kmymoney/mymoney/tests/mymoneyschedule-test.h
--- a/kmymoney/mymoney/tests/mymoneyschedule-test.h
+++ b/kmymoney/mymoney/tests/mymoneyschedule-test.h
@@ -17,7 +17,7 @@
 #ifndef MYMONEYSCHEDULETEST_H
 #define MYMONEYSCHEDULETEST_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 class MyMoneyScheduleTest : public QObject
 {
diff --git a/kmymoney/mymoney/tests/mymoneyschedule-test.cpp b/kmymoney/mymoney/tests/mymoneyschedule-test.cpp
--- a/kmymoney/mymoney/tests/mymoneyschedule-test.cpp
+++ b/kmymoney/mymoney/tests/mymoneyschedule-test.cpp
@@ -17,7 +17,7 @@
 #include "mymoneyschedule-test.h"
 
 #include <QList>
-#include <QtTest/QtTest>
+#include <QtTest>
 
 #define KMM_MYMONEY_UNIT_TESTABLE friend class MyMoneyScheduleTest;
 
diff --git a/kmymoney/mymoney/tests/mymoneysecurity-test.h b/kmymoney/mymoney/tests/mymoneysecurity-test.h
--- a/kmymoney/mymoney/tests/mymoneysecurity-test.h
+++ b/kmymoney/mymoney/tests/mymoneysecurity-test.h
@@ -18,7 +18,7 @@
 #define MYMONEYSECURITYTEST_H
 
 #include <memory>
-#include <QtCore/QObject>
+#include <QObject>
 
 class MyMoneySecurity;
 
diff --git a/kmymoney/mymoney/tests/mymoneysecurity-test.cpp b/kmymoney/mymoney/tests/mymoneysecurity-test.cpp
--- a/kmymoney/mymoney/tests/mymoneysecurity-test.cpp
+++ b/kmymoney/mymoney/tests/mymoneysecurity-test.cpp
@@ -16,7 +16,7 @@
 
 #include "mymoneysecurity-test.h"
 
-#include <QtTest/QtTest>
+#include <QtTest>
 
 #define KMM_MYMONEY_UNIT_TESTABLE friend class MyMoneySecurityTest;
 
diff --git a/kmymoney/mymoney/tests/mymoneysplit-test.h b/kmymoney/mymoney/tests/mymoneysplit-test.h
--- a/kmymoney/mymoney/tests/mymoneysplit-test.h
+++ b/kmymoney/mymoney/tests/mymoneysplit-test.h
@@ -17,7 +17,7 @@
 #ifndef MYMONEYSPLITTEST_H
 #define MYMONEYSPLITTEST_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 class MyMoneySplit;
 
diff --git a/kmymoney/mymoney/tests/mymoneysplit-test.cpp b/kmymoney/mymoney/tests/mymoneysplit-test.cpp
--- a/kmymoney/mymoney/tests/mymoneysplit-test.cpp
+++ b/kmymoney/mymoney/tests/mymoneysplit-test.cpp
@@ -16,7 +16,7 @@
 
 #include "mymoneysplit-test.h"
 
-#include <QtTest/QtTest>
+#include <QtTest>
 
 #define KMM_MYMONEY_UNIT_TESTABLE friend class MyMoneySplitTest;
 
diff --git a/kmymoney/mymoney/tests/mymoneytag-test.h b/kmymoney/mymoney/tests/mymoneytag-test.h
--- a/kmymoney/mymoney/tests/mymoneytag-test.h
+++ b/kmymoney/mymoney/tests/mymoneytag-test.h
@@ -14,7 +14,7 @@
 #ifndef MYMONEYTAGTEST_H
 #define MYMONEYTAGTEST_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 class MyMoneyTagTest : public QObject
 {
diff --git a/kmymoney/mymoney/tests/mymoneytag-test.cpp b/kmymoney/mymoney/tests/mymoneytag-test.cpp
--- a/kmymoney/mymoney/tests/mymoneytag-test.cpp
+++ b/kmymoney/mymoney/tests/mymoneytag-test.cpp
@@ -16,7 +16,7 @@
 #include <QDomDocument>
 #include <QDomElement>
 
-#include <QtTest/QtTest>
+#include <QtTest>
 
 #define KMM_MYMONEY_UNIT_TESTABLE friend class MyMoneyTagTest;
 
diff --git a/kmymoney/mymoney/tests/mymoneytransaction-test.h b/kmymoney/mymoney/tests/mymoneytransaction-test.h
--- a/kmymoney/mymoney/tests/mymoneytransaction-test.h
+++ b/kmymoney/mymoney/tests/mymoneytransaction-test.h
@@ -17,7 +17,7 @@
 #ifndef MYMONEYTRANSACTIONTEST_H
 #define MYMONEYTRANSACTIONTEST_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 #define KMM_MYMONEY_UNIT_TESTABLE friend class MyMoneyTransactionTest;
 
diff --git a/kmymoney/mymoney/tests/mymoneytransaction-test.cpp b/kmymoney/mymoney/tests/mymoneytransaction-test.cpp
--- a/kmymoney/mymoney/tests/mymoneytransaction-test.cpp
+++ b/kmymoney/mymoney/tests/mymoneytransaction-test.cpp
@@ -16,9 +16,9 @@
 
 #include "mymoneytransaction-test.h"
 
-#include <QtCore/QDebug>
+#include <QDebug>
 
-#include <QtTest/QtTest>
+#include <QtTest>
 
 #include "mymoneytestutils.h"
 #include "mymoneymoney.h"
diff --git a/kmymoney/mymoney/tests/onlinejob-test.h b/kmymoney/mymoney/tests/onlinejob-test.h
--- a/kmymoney/mymoney/tests/onlinejob-test.h
+++ b/kmymoney/mymoney/tests/onlinejob-test.h
@@ -20,7 +20,7 @@
 #define ONLINEJOBTEST_H
 
 #include <QObject>
-#include <QtCore/QString>
+#include <QString>
 
 class onlineJobTest : public QObject
 {
diff --git a/kmymoney/mymoney/tests/onlinejobadministration-test.h b/kmymoney/mymoney/tests/onlinejobadministration-test.h
--- a/kmymoney/mymoney/tests/onlinejobadministration-test.h
+++ b/kmymoney/mymoney/tests/onlinejobadministration-test.h
@@ -20,7 +20,7 @@
 #define ONLINEJOBADMINISTRATIONTEST_H
 
 #include <QObject>
-#include <QtCore/QString>
+#include <QString>
 
 class MyMoneyFile;
 class IMyMoneyStorage;
diff --git a/kmymoney/payeeidentifier/ibanandbic/bicmodel.h b/kmymoney/payeeidentifier/ibanandbic/bicmodel.h
--- a/kmymoney/payeeidentifier/ibanandbic/bicmodel.h
+++ b/kmymoney/payeeidentifier/ibanandbic/bicmodel.h
@@ -19,7 +19,7 @@
 #ifndef BICMODEL_H
 #define BICMODEL_H
 
-#include <QtSql/QSqlQueryModel>
+#include <QSqlQueryModel>
 
 #include "iban_bic_identifier_export.h"
 
diff --git a/kmymoney/payeeidentifier/ibanandbic/bicmodel.cpp b/kmymoney/payeeidentifier/ibanandbic/bicmodel.cpp
--- a/kmymoney/payeeidentifier/ibanandbic/bicmodel.cpp
+++ b/kmymoney/payeeidentifier/ibanandbic/bicmodel.cpp
@@ -19,12 +19,12 @@
 #include "bicmodel.h"
 
 #include <KServiceTypeTrader>
-#include <QtSql/QSqlQuery>
-#include <QtSql/QSqlError>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QStandardPaths>
-#include <QtCore/QDebug>
+#include <QSqlQuery>
+#include <QSqlError>
+#include <QString>
+#include <QStringList>
+#include <QStandardPaths>
+#include <QDebug>
 
 /**
  * @warning At the moment the completion may fail if bicModel was created in more than one thread
diff --git a/kmymoney/payeeidentifier/ibanandbic/ibanbic.h b/kmymoney/payeeidentifier/ibanandbic/ibanbic.h
--- a/kmymoney/payeeidentifier/ibanandbic/ibanbic.h
+++ b/kmymoney/payeeidentifier/ibanandbic/ibanbic.h
@@ -19,8 +19,8 @@
 #ifndef PAYEEIDENTIFIER_IBANBIC_H
 #define PAYEEIDENTIFIER_IBANBIC_H
 
-#include <QtCore/QString>
-#include <QtCore/QChar>
+#include <QString>
+#include <QChar>
 
 #include "payeeidentifier/payeeidentifierdata.h"
 #include "mymoneyunittestable.h"
diff --git a/kmymoney/payeeidentifier/ibanandbic/ibanbicdata.h b/kmymoney/payeeidentifier/ibanandbic/ibanbicdata.h
--- a/kmymoney/payeeidentifier/ibanandbic/ibanbicdata.h
+++ b/kmymoney/payeeidentifier/ibanandbic/ibanbicdata.h
@@ -23,9 +23,9 @@
 #  define KMM_MYMONEY_UNIT_TESTABLE
 #endif
 
-#include <QtCore/QObject>
-#include <QtCore/QVariant>
-#include <QtSql/QSqlDatabase>
+#include <QObject>
+#include <QVariant>
+#include <QSqlDatabase>
 
 /**
  * @brief This class implements everything that needs lookup
diff --git a/kmymoney/payeeidentifier/ibanandbic/ibanbicdata.cpp b/kmymoney/payeeidentifier/ibanandbic/ibanbicdata.cpp
--- a/kmymoney/payeeidentifier/ibanandbic/ibanbicdata.cpp
+++ b/kmymoney/payeeidentifier/ibanandbic/ibanbicdata.cpp
@@ -19,10 +19,10 @@
 #include "ibanbicdata.h"
 
 #include <KServiceTypeTrader>
-#include <QtSql/QSqlQuery>
+#include <QSqlQuery>
 #include <QSqlError>
-#include <QtCore/QStandardPaths>
-#include <QtCore/QDebug>
+#include <QStandardPaths>
+#include <QDebug>
 
 #include "ibanbic.h"
 
diff --git a/kmymoney/payeeidentifier/ibanandbic/widgets/bicvalidator.h b/kmymoney/payeeidentifier/ibanandbic/widgets/bicvalidator.h
--- a/kmymoney/payeeidentifier/ibanandbic/widgets/bicvalidator.h
+++ b/kmymoney/payeeidentifier/ibanandbic/widgets/bicvalidator.h
@@ -19,7 +19,7 @@
 #ifndef BICVALIDATOR_H
 #define BICVALIDATOR_H
 
-#include <QtGui/QValidator>
+#include <QValidator>
 #include "payeeidentifier_iban_bic_widgets_export.h"
 #include "kmymoneyvalidationfeedback.h"
 
diff --git a/kmymoney/payeeidentifier/ibanandbic/widgets/ibanvalidator.h b/kmymoney/payeeidentifier/ibanandbic/widgets/ibanvalidator.h
--- a/kmymoney/payeeidentifier/ibanandbic/widgets/ibanvalidator.h
+++ b/kmymoney/payeeidentifier/ibanandbic/widgets/ibanvalidator.h
@@ -21,7 +21,7 @@
 
 #include "payeeidentifier_iban_bic_widgets_export.h"
 
-#include <QtGui/QValidator>
+#include <QValidator>
 
 #include "kmymoneyvalidationfeedback.h"
 
diff --git a/kmymoney/payeeidentifier/ibanandbic/widgets/kbicedit.h b/kmymoney/payeeidentifier/ibanandbic/widgets/kbicedit.h
--- a/kmymoney/payeeidentifier/ibanandbic/widgets/kbicedit.h
+++ b/kmymoney/payeeidentifier/ibanandbic/widgets/kbicedit.h
@@ -19,7 +19,7 @@
 #ifndef KBICEDIT_H
 #define KBICEDIT_H
 
-#include <QtGui/QValidator>
+#include <QValidator>
 #include <KLineEdit>
 
 #include "payeeidentifier_iban_bic_widgets_export.h"
diff --git a/kmymoney/plugins/csvimport/tests/csvdate-test.h b/kmymoney/plugins/csvimport/tests/csvdate-test.h
--- a/kmymoney/plugins/csvimport/tests/csvdate-test.h
+++ b/kmymoney/plugins/csvimport/tests/csvdate-test.h
@@ -17,7 +17,7 @@
 #ifndef CSVDATETEST_H
 #define CSVDATETEST_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 class ConvertDate;
 
diff --git a/kmymoney/plugins/csvimport/tests/csvdate-test.cpp b/kmymoney/plugins/csvimport/tests/csvdate-test.cpp
--- a/kmymoney/plugins/csvimport/tests/csvdate-test.cpp
+++ b/kmymoney/plugins/csvimport/tests/csvdate-test.cpp
@@ -18,7 +18,7 @@
 ***************************************************************************/
 #include "csvdate-test.h"
 
-#include <QtTest/QtTest>
+#include <QtTest>
 
 #include "../convdate.h"
 
diff --git a/kmymoney/plugins/csvimport/tests/csvimporter-test.h b/kmymoney/plugins/csvimport/tests/csvimporter-test.h
--- a/kmymoney/plugins/csvimport/tests/csvimporter-test.h
+++ b/kmymoney/plugins/csvimport/tests/csvimporter-test.h
@@ -16,7 +16,7 @@
 #ifndef CSVIMPORTERTEST_H
 #define CSVIMPORTERTEST_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 class CSVImporter;
 class BankingProfile;
diff --git a/kmymoney/plugins/csvimport/tests/csvimporter-test.cpp b/kmymoney/plugins/csvimport/tests/csvimporter-test.cpp
--- a/kmymoney/plugins/csvimport/tests/csvimporter-test.cpp
+++ b/kmymoney/plugins/csvimport/tests/csvimporter-test.cpp
@@ -15,7 +15,7 @@
 ***************************************************************************/
 #include "csvimporter-test.h"
 
-#include <QtTest/QtTest>
+#include <QtTest>
 
 #include <csvimporter.h>
 #include "mymoneyfile.h"
diff --git a/kmymoney/plugins/csvimport/tests/parsedata-test.h b/kmymoney/plugins/csvimport/tests/parsedata-test.h
--- a/kmymoney/plugins/csvimport/tests/parsedata-test.h
+++ b/kmymoney/plugins/csvimport/tests/parsedata-test.h
@@ -19,7 +19,7 @@
 
 #include "../csvutil.h"
 
-#include <QtCore/QObject>
+#include <QObject>
 
 class Parse;
 
diff --git a/kmymoney/plugins/csvimport/tests/parsedata-test.cpp b/kmymoney/plugins/csvimport/tests/parsedata-test.cpp
--- a/kmymoney/plugins/csvimport/tests/parsedata-test.cpp
+++ b/kmymoney/plugins/csvimport/tests/parsedata-test.cpp
@@ -16,8 +16,8 @@
  ***************************************************************************/
 #include "parsedata-test.h"
 
-#include <QtTest/QtTest>
-#include <QtCore/QString>
+#include <QtTest>
+#include <QString>
 
 #include "../csvutil.h"
 
diff --git a/kmymoney/plugins/csvimport/tests/symbol-test.h b/kmymoney/plugins/csvimport/tests/symbol-test.h
--- a/kmymoney/plugins/csvimport/tests/symbol-test.h
+++ b/kmymoney/plugins/csvimport/tests/symbol-test.h
@@ -19,7 +19,7 @@
 
 #include "../csvutil.h"
 
-#include <QtCore/QObject>
+#include <QObject>
 
 class Parse;
 
diff --git a/kmymoney/plugins/csvimport/tests/symbol-test.cpp b/kmymoney/plugins/csvimport/tests/symbol-test.cpp
--- a/kmymoney/plugins/csvimport/tests/symbol-test.cpp
+++ b/kmymoney/plugins/csvimport/tests/symbol-test.cpp
@@ -17,8 +17,8 @@
 #include "symbol-test.h"
 #include "../csvutil.h"
 
-#include <QtTest/QtTest>
-#include <QtCore/QString>
+#include <QtTest>
+#include <QString>
 #include <QtCore/QLocale>
 
 QTEST_GUILESS_MAIN(SymbolTest);
diff --git a/kmymoney/plugins/kbanking/aqbankingkmmoperators.h b/kmymoney/plugins/kbanking/aqbankingkmmoperators.h
--- a/kmymoney/plugins/kbanking/aqbankingkmmoperators.h
+++ b/kmymoney/plugins/kbanking/aqbankingkmmoperators.h
@@ -25,7 +25,7 @@
 #ifndef AQBANKINGKMMOPERATORS_H
 #define AQBANKINGKMMOPERATORS_H
 
-#include <QtCore/QSharedPointer>
+#include <QSharedPointer>
 
 #include "onlinetasks/interfaces/tasks/ionlinetasksettings.h"
 #include "onlinetasks/sepa/tasks/sepaonlinetransfer.h"
diff --git a/kmymoney/plugins/kbanking/gwenhywfarqtoperators.cpp b/kmymoney/plugins/kbanking/gwenhywfarqtoperators.cpp
--- a/kmymoney/plugins/kbanking/gwenhywfarqtoperators.cpp
+++ b/kmymoney/plugins/kbanking/gwenhywfarqtoperators.cpp
@@ -18,8 +18,8 @@
 
 #include "gwenhywfarqtoperators.h"
 
-#include <QtCore/QString>
-#include <QtCore/QStringList>
+#include <QString>
+#include <QStringList>
 
 GWEN_STRINGLIST* GWEN_StringList_fromQStringList(const QStringList& input)
 {
diff --git a/kmymoney/plugins/kbanking/gwenkdegui.cpp b/kmymoney/plugins/kbanking/gwenkdegui.cpp
--- a/kmymoney/plugins/kbanking/gwenkdegui.cpp
+++ b/kmymoney/plugins/kbanking/gwenkdegui.cpp
@@ -22,9 +22,9 @@
 
 #include "gwenkdegui.h"
 
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QRegExp>
+#include <QString>
+#include <QStringList>
+#include <QRegExp>
 
 #include <QDebug>
 #include <QPointer>
diff --git a/kmymoney/plugins/kbanking/widgets/kbaccountlist.cpp b/kmymoney/plugins/kbanking/widgets/kbaccountlist.cpp
--- a/kmymoney/plugins/kbanking/widgets/kbaccountlist.cpp
+++ b/kmymoney/plugins/kbanking/widgets/kbaccountlist.cpp
@@ -19,7 +19,7 @@
 
 #include "kbaccountlist.h"
 #include <assert.h>
-#include <QtCore/qstring.h>
+#include <QString>
 #include <KLocalizedString>
 
 
diff --git a/kmymoney/plugins/onlinetasks/interfaces/tasks/ionlinetasksettings.h b/kmymoney/plugins/onlinetasks/interfaces/tasks/ionlinetasksettings.h
--- a/kmymoney/plugins/onlinetasks/interfaces/tasks/ionlinetasksettings.h
+++ b/kmymoney/plugins/onlinetasks/interfaces/tasks/ionlinetasksettings.h
@@ -19,7 +19,7 @@
 #ifndef IONLINETASKSETTINGS_H
 #define IONLINETASKSETTINGS_H
 
-#include <QtCore/QSharedPointer>
+#include <QSharedPointer>
 
 /**
  * @brief Account/plugin dependent settings for an onlineTask
diff --git a/kmymoney/plugins/printcheck/kcm_printcheck.cpp b/kmymoney/plugins/printcheck/kcm_printcheck.cpp
--- a/kmymoney/plugins/printcheck/kcm_printcheck.cpp
+++ b/kmymoney/plugins/printcheck/kcm_printcheck.cpp
@@ -26,7 +26,7 @@
 #ifdef ENABLE_WEBENGINE
 #include <QWebEngineView>
 #else
-#include <KDEWebKit/KWebView>
+#include <KWebView>
 #endif
 
 // KDE includes
diff --git a/kmymoney/plugins/printcheck/printcheck.cpp b/kmymoney/plugins/printcheck/printcheck.cpp
--- a/kmymoney/plugins/printcheck/printcheck.cpp
+++ b/kmymoney/plugins/printcheck/printcheck.cpp
@@ -29,10 +29,10 @@
 #ifdef ENABLE_WEBENGINE
 #include <QWebEngineView>
 #else
-#include <KDEWebKit/KWebView>
+#include <KWebView>
 #endif
-#include <QtPrintSupport/QPrintDialog>
-#include <QtPrintSupport/QPrinter>
+#include <QPrintDialog>
+#include <QPrinter>
 
 // KDE includes
 #include <KActionCollection>
diff --git a/kmymoney/plugins/reconciliationreport/kreconciliationreportdlg.cpp b/kmymoney/plugins/reconciliationreport/kreconciliationreportdlg.cpp
--- a/kmymoney/plugins/reconciliationreport/kreconciliationreportdlg.cpp
+++ b/kmymoney/plugins/reconciliationreport/kreconciliationreportdlg.cpp
@@ -24,14 +24,14 @@
 #include <QPushButton>
 #include <QTabWidget>
 #include <QPrinter>
-#include <QtPrintSupport/QPrintDialog>
+#include <QPrintDialog>
 
 // KDE includes
 #include <KStandardGuiItem>
 #ifdef ENABLE_WEBENGINE
-#include <QtWebEngineWidgets/QWebEngineView>
+#include <QWebEngineView>
 #else
-#include <KDEWebKit/KWebView>
+#include <KWebView>
 #endif
 
 KReportDlg::KReportDlg(QWidget* parent, const QString& summaryReportHTML, const QString& detailsReportHTML) : QDialog(parent)
diff --git a/kmymoney/plugins/sqlcipher/qsqlcipherdriverplugin.h b/kmymoney/plugins/sqlcipher/qsqlcipherdriverplugin.h
--- a/kmymoney/plugins/sqlcipher/qsqlcipherdriverplugin.h
+++ b/kmymoney/plugins/sqlcipher/qsqlcipherdriverplugin.h
@@ -27,8 +27,8 @@
 #ifndef QSQLCIPHERDRIVERPLUGIN_H
 #define QSQLCIPHERDRIVERPLUGIN_H
 
-#include <QtCore/QtPlugin>
-#include <QtSql/QSqlDriverPlugin>
+#include <QtPlugin>
+#include <QSqlDriverPlugin>
 
 #ifdef QT_PLUGIN
 #define Q_EXPORT_SQLDRIVER_SQLCIPHER
diff --git a/kmymoney/plugins/sqlcipher/sqlcipherdriver.h b/kmymoney/plugins/sqlcipher/sqlcipherdriver.h
--- a/kmymoney/plugins/sqlcipher/sqlcipherdriver.h
+++ b/kmymoney/plugins/sqlcipher/sqlcipherdriver.h
@@ -26,7 +26,7 @@
 #ifndef SQLCIPHERDRIVER_H
 #define SQLCIPHERDRIVER_H
 
-#include <QtSql/QSQLiteDriver>
+#include <QtSql/QSQLiteDriver> // krazy:exclude=includes
 
 class SQLCipherDriver : public QSQLiteDriver
 {
diff --git a/kmymoney/reports/tests/kreportsview-test.h b/kmymoney/reports/tests/kreportsview-test.h
--- a/kmymoney/reports/tests/kreportsview-test.h
+++ b/kmymoney/reports/tests/kreportsview-test.h
@@ -18,7 +18,7 @@
 #ifndef KREPORTSVIEWTEST_H
 #define KREPORTSVIEWTEST_H
 
-#include <QtCore/QObject>
+#include <QObject>
 #include "mymoneyfile.h"
 #include "mymoneyseqaccessmgr.h"
 
diff --git a/kmymoney/reports/tests/pivotgrid-test.h b/kmymoney/reports/tests/pivotgrid-test.h
--- a/kmymoney/reports/tests/pivotgrid-test.h
+++ b/kmymoney/reports/tests/pivotgrid-test.h
@@ -18,7 +18,7 @@
 #ifndef PIVOTGRIDTEST_H
 #define PIVOTGRIDTEST_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 namespace reports
 {
diff --git a/kmymoney/reports/tests/pivotgrid-test.cpp b/kmymoney/reports/tests/pivotgrid-test.cpp
--- a/kmymoney/reports/tests/pivotgrid-test.cpp
+++ b/kmymoney/reports/tests/pivotgrid-test.cpp
@@ -17,7 +17,7 @@
 
 #include "pivotgrid-test.h"
 
-#include <QtTest/QtTest>
+#include <QtTest>
 
 #include "reportstestcommon.h"
 
diff --git a/kmymoney/reports/tests/pivottable-test.h b/kmymoney/reports/tests/pivottable-test.h
--- a/kmymoney/reports/tests/pivottable-test.h
+++ b/kmymoney/reports/tests/pivottable-test.h
@@ -18,7 +18,7 @@
 #ifndef PIVOTTABLETEST_H
 #define PIVOTTABLETEST_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 namespace reports
 {
diff --git a/kmymoney/reports/tests/querytable-test.h b/kmymoney/reports/tests/querytable-test.h
--- a/kmymoney/reports/tests/querytable-test.h
+++ b/kmymoney/reports/tests/querytable-test.h
@@ -18,7 +18,7 @@
 #ifndef QUERYTABLETEST_H
 #define QUERYTABLETEST_H
 
-#include <QtCore/QObject>
+#include <QObject>
 #include "mymoneyfile.h"
 #include "mymoneyseqaccessmgr.h"
 
diff --git a/kmymoney/tests/kmymoneyutils-test.h b/kmymoney/tests/kmymoneyutils-test.h
--- a/kmymoney/tests/kmymoneyutils-test.h
+++ b/kmymoney/tests/kmymoneyutils-test.h
@@ -20,7 +20,7 @@
 #ifndef KMYMONEYUTILSTEST_H
 #define KMYMONEYUTILSTEST_H
 
-#include <QtCore/QObject>
+#include <QObject>
 #include <QtCore/QList>
 
 #define KMM_MYMONEY_UNIT_TESTABLE friend class KMyMoneyUtilsTest;
diff --git a/kmymoney/tests/kmymoneyutils-test.cpp b/kmymoney/tests/kmymoneyutils-test.cpp
--- a/kmymoney/tests/kmymoneyutils-test.cpp
+++ b/kmymoney/tests/kmymoneyutils-test.cpp
@@ -20,7 +20,7 @@
 #include "kmymoneyutils-test.h"
 #include "mymoneyaccount.h"
 
-#include <QtTest/QtTest>
+#include <QtTest>
 
 QTEST_GUILESS_MAIN(KMyMoneyUtilsTest)
 
diff --git a/kmymoney/views/CMakeLists.txt b/kmymoney/views/CMakeLists.txt
--- a/kmymoney/views/CMakeLists.txt
+++ b/kmymoney/views/CMakeLists.txt
@@ -68,7 +68,7 @@
 
 add_library(views STATIC ${libviews_a_SOURCES})
 
-target_link_libraries(views PUBLIC KChart KF5::KIOFileWidgets KF5::Notifications KF5::Archive KF5::TextWidgets Qt5::Sql Alkimia::alkimia)
+target_link_libraries(views PUBLIC KChart KF5::KIOFileWidgets KF5::Notifications KF5::Archive KF5::TextWidgets Qt5::Sql Qt5::PrintSupport Alkimia::alkimia)
 
 if(ENABLE_WEBENGINE)
  target_link_libraries(views PUBLIC Qt5::WebEngineWidgets)
diff --git a/kmymoney/views/khomeview.h b/kmymoney/views/khomeview.h
--- a/kmymoney/views/khomeview.h
+++ b/kmymoney/views/khomeview.h
@@ -21,6 +21,8 @@
 #ifndef KHOMEVIEW_H
 #define KHOMEVIEW_H
 
+#include <config-kmymoney.h>
+
 // ----------------------------------------------------------------------------
 // QT Includes
 
diff --git a/kmymoney/views/khomeview.cpp b/kmymoney/views/khomeview.cpp
--- a/kmymoney/views/khomeview.cpp
+++ b/kmymoney/views/khomeview.cpp
@@ -32,12 +32,12 @@
 #include <QDesktopServices>
 #include <QUrlQuery>
 #include <QWheelEvent>
-#include <QtPrintSupport/QPrintDialog>
-#include <QtPrintSupport/QPrinter>
+#include <QPrintDialog>
+#include <QPrinter>
 #ifdef ENABLE_WEBENGINE
-#include <QtWebEngineWidgets/QWebEngineView>
+#include <QWebEngineView>
 #else
-#include <KDEWebKit/KWebView>
+#include <KWebView>
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney/views/kreportsview.cpp b/kmymoney/views/kreportsview.cpp
--- a/kmymoney/views/kreportsview.cpp
+++ b/kmymoney/views/kreportsview.cpp
@@ -41,12 +41,12 @@
 #include <QFileDialog>
 #include <QLocale>
 #include <QTextCodec>
-#include <QtPrintSupport/QPrintDialog>
+#include <QPrintDialog>
 #include <QMenu>
 #ifdef ENABLE_WEBENGINE
-#include <QtWebEngineWidgets/QWebEngineView>
+#include <QWebEngineView>
 #else
-#include <KDEWebKit/KWebView>
+#include <KWebView>
 #endif
 
 // ----------------------------------------------------------------------------