diff --git a/src/libs/extensionsystem/iplugin.h b/src/libs/extensionsystem/iplugin.h
index 3867f93a7e5..d87dcfe6d89 100644
--- a/src/libs/extensionsystem/iplugin.h
+++ b/src/libs/extensionsystem/iplugin.h
@@ -28,7 +28,6 @@
 #include "extensionsystem_global.h"
 
 #include <QObject>
-#include <QtPlugin>
 
 namespace ExtensionSystem {
 
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp
index 20be799b028..16a50c48a5f 100644
--- a/src/plugins/android/androidmanager.cpp
+++ b/src/plugins/android/androidmanager.cpp
@@ -59,6 +59,7 @@
 #include <QDomDocument>
 #include <QFileSystemWatcher>
 #include <QJsonDocument>
+#include <QJsonObject>
 #include <QList>
 #include <QLoggingCategory>
 #include <QMessageBox>
diff --git a/src/plugins/autotest/autotestplugin.cpp b/src/plugins/autotest/autotestplugin.cpp
index ef15ec1eef7..3dfaa4fad51 100644
--- a/src/plugins/autotest/autotestplugin.cpp
+++ b/src/plugins/autotest/autotestplugin.cpp
@@ -72,7 +72,6 @@
 #include <QMainWindow>
 #include <QMenu>
 #include <QTextCursor>
-#include <QtPlugin>
 
 #ifdef WITH_TESTS
 #include "autotestunittests.h"
diff --git a/src/plugins/clangformat/clangformatplugin.cpp b/src/plugins/clangformat/clangformatplugin.cpp
index 4e2b8c6c839..561b7e888ec 100644
--- a/src/plugins/clangformat/clangformatplugin.cpp
+++ b/src/plugins/clangformat/clangformatplugin.cpp
@@ -66,8 +66,6 @@
 #include <QMessageBox>
 #include <QMenu>
 
-#include <QtPlugin>
-
 using namespace ProjectExplorer;
 
 namespace ClangFormat {
diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp
index 1ed0ed0dd7a..1b3a80d7189 100644
--- a/src/plugins/coreplugin/coreplugin.cpp
+++ b/src/plugins/coreplugin/coreplugin.cpp
@@ -58,11 +58,10 @@
 #include <utils/theme/theme.h>
 #include <utils/theme/theme_p.h>
 
-#include <QtPlugin>
-
 #include <QDateTime>
 #include <QDebug>
 #include <QDir>
+#include <QJsonObject>
 #include <QMenu>
 #include <QMessageBox>
 #include <QSettings>
diff --git a/src/plugins/coreplugin/find/findplugin.cpp b/src/plugins/coreplugin/find/findplugin.cpp
index cceea8a01a3..04236779184 100644
--- a/src/plugins/coreplugin/find/findplugin.cpp
+++ b/src/plugins/coreplugin/find/findplugin.cpp
@@ -50,8 +50,6 @@
 #include <QStringListModel>
 #include <QVector>
 #include <QAction>
-
-#include <QtPlugin>
 #include <QSettings>
 
 /*!
diff --git a/src/plugins/coreplugin/locator/locator.cpp b/src/plugins/coreplugin/locator/locator.cpp
index 6234d4c02f6..66d7f2d81ae 100644
--- a/src/plugins/coreplugin/locator/locator.cpp
+++ b/src/plugins/coreplugin/locator/locator.cpp
@@ -58,7 +58,6 @@
 
 #include <QAction>
 #include <QSettings>
-#include <QtPlugin>
 
 #ifdef Q_OS_MACOS
 #include "spotlightlocatorfilter.h"
diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp
index a39a4c5d951..67f96e7414f 100644
--- a/src/plugins/cvs/cvsplugin.cpp
+++ b/src/plugins/cvs/cvsplugin.cpp
@@ -67,7 +67,6 @@
 #include <QDir>
 #include <QFileInfo>
 #include <QTextCodec>
-#include <QtPlugin>
 #include <QAction>
 #include <QMainWindow>
 #include <QMenu>
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index b3d60e49955..bb84ac2a853 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -148,7 +148,6 @@
 #include <QVariant>
 #include <QJsonDocument>
 #include <QJsonObject>
-#include <QtPlugin>
 
 #ifdef WITH_TESTS
 
diff --git a/src/plugins/emacskeys/emacskeysplugin.cpp b/src/plugins/emacskeys/emacskeysplugin.cpp
index 369d1dea02d..d1259d7eb75 100644
--- a/src/plugins/emacskeys/emacskeysplugin.cpp
+++ b/src/plugins/emacskeys/emacskeysplugin.cpp
@@ -43,8 +43,6 @@
 #include <QClipboard>
 #include <QScrollBar>
 
-#include <QtPlugin>
-
 QT_BEGIN_NAMESPACE
 extern void qt_set_sequence_auto_mnemonic(bool enable);
 QT_END_NAMESPACE
diff --git a/src/plugins/git/gerrit/gerritserver.cpp b/src/plugins/git/gerrit/gerritserver.cpp
index f642b1f9d68..f2fae53d517 100644
--- a/src/plugins/git/gerrit/gerritserver.cpp
+++ b/src/plugins/git/gerrit/gerritserver.cpp
@@ -36,6 +36,7 @@
 
 #include <QFile>
 #include <QJsonDocument>
+#include <QJsonObject>
 #include <QMessageBox>
 #include <QRegularExpression>
 #include <QSettings>
diff --git a/src/plugins/helloworld/helloworldplugin.cpp b/src/plugins/helloworld/helloworldplugin.cpp
index 6158077bc56..7fe8e31afdb 100644
--- a/src/plugins/helloworld/helloworldplugin.cpp
+++ b/src/plugins/helloworld/helloworldplugin.cpp
@@ -34,7 +34,6 @@
 #include <coreplugin/id.h>
 
 #include <QDebug>
-#include <QtPlugin>
 #include <QAction>
 #include <QMenu>
 #include <QMessageBox>
diff --git a/src/plugins/marketplace/productlistmodel.cpp b/src/plugins/marketplace/productlistmodel.cpp
index de00dcebd33..a49f544c3d3 100644
--- a/src/plugins/marketplace/productlistmodel.cpp
+++ b/src/plugins/marketplace/productlistmodel.cpp
@@ -34,6 +34,7 @@
 
 #include <QJsonArray>
 #include <QJsonDocument>
+#include <QJsonObject>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp
index c48a2c21565..d25a71f7927 100644
--- a/src/plugins/mercurial/mercurialplugin.cpp
+++ b/src/plugins/mercurial/mercurialplugin.cpp
@@ -56,7 +56,6 @@
 #include <vcsbase/vcsoutputwindow.h>
 #include <vcsbase/vcscommand.h>
 
-#include <QtPlugin>
 #include <QAction>
 #include <QMenu>
 #include <QDebug>
diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp
index 082788f9cab..9350c6fdcc3 100644
--- a/src/plugins/perforce/perforceplugin.cpp
+++ b/src/plugins/perforce/perforceplugin.cpp
@@ -68,7 +68,6 @@
 #include <QMessageBox>
 #include <QSettings>
 #include <QTextCodec>
-#include <QtPlugin>
 
 using namespace Core;
 using namespace Utils;
diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp
index 7fbbb2fbc62..2ab52663d08 100644
--- a/src/plugins/projectexplorer/msvctoolchain.cpp
+++ b/src/plugins/projectexplorer/msvctoolchain.cpp
@@ -50,6 +50,7 @@
 #include <QFileInfo>
 #include <QJsonArray>
 #include <QJsonDocument>
+#include <QJsonObject>
 #include <QProcess>
 #include <QRegularExpression>
 #include <QSettings>
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 3c7427a598b..b8d25f61229 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -145,7 +145,6 @@
 #include <utils/stringutils.h>
 #include <utils/utilsicons.h>
 
-#include <QtPlugin>
 #include <QFileInfo>
 #include <QSettings>
 
diff --git a/src/plugins/qmldesigner/componentsplugin/componentsplugin.cpp b/src/plugins/qmldesigner/componentsplugin/componentsplugin.cpp
index ab65a441625..41e8cdbedc9 100644
--- a/src/plugins/qmldesigner/componentsplugin/componentsplugin.cpp
+++ b/src/plugins/qmldesigner/componentsplugin/componentsplugin.cpp
@@ -32,8 +32,6 @@
 #include <viewmanager.h>
 #include <qmldesignerplugin.h>
 
-#include <QtPlugin>
-
 namespace QmlDesigner {
 
 ComponentsPlugin::ComponentsPlugin()
diff --git a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp
index 3c3692d8ad8..a77cc28d029 100644
--- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp
+++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp
@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 #include "qtquickplugin.h"
-#include <QtPlugin>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/resourceeditor/resourceeditorplugin.cpp b/src/plugins/resourceeditor/resourceeditorplugin.cpp
index 5eb83a91935..b6d35956da1 100644
--- a/src/plugins/resourceeditor/resourceeditorplugin.cpp
+++ b/src/plugins/resourceeditor/resourceeditorplugin.cpp
@@ -48,7 +48,6 @@
 #include <utils/parameteraction.h>
 #include <utils/qtcassert.h>
 
-#include <QtPlugin>
 #include <QCoreApplication>
 #include <QAction>
 #include <QDebug>
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index f6b28f51e96..d4fa35042f5 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -65,7 +65,6 @@
 #include <QDir>
 #include <QFileInfo>
 #include <QTextCodec>
-#include <QtPlugin>
 #include <QProcessEnvironment>
 #include <QUrl>
 #include <QXmlStreamReader>
diff --git a/src/plugins/texteditor/texteditorplugin.cpp b/src/plugins/texteditor/texteditorplugin.cpp
index 676ce18b45e..fd361b0748b 100644
--- a/src/plugins/texteditor/texteditorplugin.cpp
+++ b/src/plugins/texteditor/texteditorplugin.cpp
@@ -52,7 +52,6 @@
 #include <utils/qtcassert.h>
 #include <utils/macroexpander.h>
 
-#include <QtPlugin>
 #include <QAction>
 #include <QDir>
 
diff --git a/src/plugins/updateinfo/updateinfoplugin.cpp b/src/plugins/updateinfo/updateinfoplugin.cpp
index e5c33241777..a5d2b2d3e82 100644
--- a/src/plugins/updateinfo/updateinfoplugin.cpp
+++ b/src/plugins/updateinfo/updateinfoplugin.cpp
@@ -46,7 +46,6 @@
 #include <QPointer>
 #include <QProcessEnvironment>
 #include <QTimer>
-#include <QtPlugin>
 
 namespace {
     static const char UpdaterGroup[] = "Updater";