diff --git a/src/base/bittorrent/private/resumedatasavingmanager.cpp b/src/base/bittorrent/private/resumedatasavingmanager.cpp
index 4fd93722d..ffe1a6162 100644
--- a/src/base/bittorrent/private/resumedatasavingmanager.cpp
+++ b/src/base/bittorrent/private/resumedatasavingmanager.cpp
@@ -29,7 +29,6 @@
 #include "resumedatasavingmanager.h"
 
 #include <QByteArray>
-#include <QDebug>
 #include <QSaveFile>
 
 #include "base/logger.h"
diff --git a/src/base/bittorrent/torrentcreatorthread.cpp b/src/base/bittorrent/torrentcreatorthread.cpp
index 681519fbd..6b5961351 100644
--- a/src/base/bittorrent/torrentcreatorthread.cpp
+++ b/src/base/bittorrent/torrentcreatorthread.cpp
@@ -43,7 +43,6 @@
 
 #include "base/global.h"
 #include "base/utils/fs.h"
-#include "base/utils/misc.h"
 #include "base/utils/string.h"
 
 namespace
diff --git a/src/base/bittorrent/trackerentry.h b/src/base/bittorrent/trackerentry.h
index 9592bc1ff..b427aa455 100644
--- a/src/base/bittorrent/trackerentry.h
+++ b/src/base/bittorrent/trackerentry.h
@@ -30,7 +30,6 @@
 #define BITTORRENT_TRACKERENTRY_H
 
 #include <libtorrent/announce_entry.hpp>
-#include <libtorrent/torrent_info.hpp>
 
 class QString;
 
diff --git a/src/base/filesystemwatcher.cpp b/src/base/filesystemwatcher.cpp
index b68ac4f4f..c9cbe8c36 100644
--- a/src/base/filesystemwatcher.cpp
+++ b/src/base/filesystemwatcher.cpp
@@ -37,11 +37,9 @@
 #endif
 
 #include "base/algorithm.h"
-#include "base/bittorrent/magneturi.h"
 #include "base/bittorrent/torrentinfo.h"
 #include "base/global.h"
 #include "base/logger.h"
-#include "base/preferences.h"
 #include "base/utils/fs.h"
 
 namespace
diff --git a/src/base/net/downloadmanager.h b/src/base/net/downloadmanager.h
index 84716934e..b92ad3e95 100644
--- a/src/base/net/downloadmanager.h
+++ b/src/base/net/downloadmanager.h
@@ -32,7 +32,6 @@
 
 #include <QHash>
 #include <QNetworkAccessManager>
-#include <QNetworkRequest>
 #include <QObject>
 #include <QQueue>
 #include <QSet>
diff --git a/src/base/net/geoipmanager.cpp b/src/base/net/geoipmanager.cpp
index a496b038a..15ffa4a6d 100644
--- a/src/base/net/geoipmanager.cpp
+++ b/src/base/net/geoipmanager.cpp
@@ -30,7 +30,6 @@
 #include "geoipmanager.h"
 
 #include <QDateTime>
-#include <QDebug>
 #include <QDir>
 #include <QFile>
 #include <QHostAddress>
diff --git a/src/base/net/geoipmanager.h b/src/base/net/geoipmanager.h
index ef9ef5a4d..28e5c4e27 100644
--- a/src/base/net/geoipmanager.h
+++ b/src/base/net/geoipmanager.h
@@ -30,7 +30,6 @@
 #ifndef NET_GEOIPMANAGER_H
 #define NET_GEOIPMANAGER_H
 
-#include <QCache>
 #include <QObject>
 
 class QHostAddress;
diff --git a/src/base/net/private/geoipdatabase.cpp b/src/base/net/private/geoipdatabase.cpp
index 233a6fb7a..f50538684 100644
--- a/src/base/net/private/geoipdatabase.cpp
+++ b/src/base/net/private/geoipdatabase.cpp
@@ -32,7 +32,6 @@
 #include <QHostAddress>
 #include <QVariant>
 
-#include "base/types.h"
 #include "geoipdatabase.h"
 
 namespace
diff --git a/src/base/net/smtp.h b/src/base/net/smtp.h
index b8775f895..91f5aa881 100644
--- a/src/base/net/smtp.h
+++ b/src/base/net/smtp.h
@@ -36,7 +36,6 @@
 #include <QAbstractSocket>
 #include <QByteArray>
 #include <QHash>
-#include <QMetaType>
 #include <QObject>
 #include <QString>
 
diff --git a/src/base/preferences.cpp b/src/base/preferences.cpp
index 81ac30e1f..fce855ac3 100644
--- a/src/base/preferences.cpp
+++ b/src/base/preferences.cpp
@@ -59,7 +59,6 @@
 #include "global.h"
 #include "settingsstorage.h"
 #include "utils/fs.h"
-#include "utils/misc.h"
 
 Preferences *Preferences::m_instance = nullptr;
 
diff --git a/src/base/rss/rss_autodownloader.cpp b/src/base/rss/rss_autodownloader.cpp
index 10513ac9d..a293651b5 100644
--- a/src/base/rss/rss_autodownloader.cpp
+++ b/src/base/rss/rss_autodownloader.cpp
@@ -30,7 +30,6 @@
 
 #include <QDataStream>
 #include <QDebug>
-#include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonValue>
diff --git a/src/base/rss/rss_autodownloadrule.cpp b/src/base/rss/rss_autodownloadrule.cpp
index 3e6c57566..b8f67c039 100644
--- a/src/base/rss/rss_autodownloadrule.cpp
+++ b/src/base/rss/rss_autodownloadrule.cpp
@@ -32,7 +32,6 @@
 #include <algorithm>
 
 #include <QDebug>
-#include <QDir>
 #include <QHash>
 #include <QJsonArray>
 #include <QJsonObject>
diff --git a/src/base/rss/rss_session.cpp b/src/base/rss/rss_session.cpp
index 339329bc4..ed8d64959 100644
--- a/src/base/rss/rss_session.cpp
+++ b/src/base/rss/rss_session.cpp
@@ -31,14 +31,12 @@
 #include "rss_session.h"
 
 #include <QDebug>
-#include <QDir>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonValue>
 #include <QSaveFile>
 #include <QString>
 #include <QThread>
-#include <QVariantHash>
 
 #include "../asyncfilestorage.h"
 #include "../global.h"
diff --git a/src/base/search/searchpluginmanager.cpp b/src/base/search/searchpluginmanager.cpp
index 12d5280b4..7643e924a 100644
--- a/src/base/search/searchpluginmanager.cpp
+++ b/src/base/search/searchpluginmanager.cpp
@@ -31,7 +31,6 @@
 
 #include <memory>
 
-#include <QDebug>
 #include <QDir>
 #include <QDirIterator>
 #include <QDomDocument>
diff --git a/src/base/utils/fs.cpp b/src/base/utils/fs.cpp
index ab29a9a2c..ec87a0af7 100644
--- a/src/base/utils/fs.cpp
+++ b/src/base/utils/fs.cpp
@@ -49,7 +49,6 @@
 #include <unistd.h>
 #endif
 
-#include <QCoreApplication>
 #include <QDebug>
 #include <QDir>
 #include <QDirIterator>
diff --git a/src/base/utils/password.cpp b/src/base/utils/password.cpp
index e7bf0cbf6..06f425863 100644
--- a/src/base/utils/password.cpp
+++ b/src/base/utils/password.cpp
@@ -37,7 +37,6 @@
 
 #include "bytearray.h"
 #include "random.h"
-#include "string.h"
 
 namespace Utils
 {
diff --git a/src/gui/addnewtorrentdialog.cpp b/src/gui/addnewtorrentdialog.cpp
index 7b90af8c8..3dff791fd 100644
--- a/src/gui/addnewtorrentdialog.cpp
+++ b/src/gui/addnewtorrentdialog.cpp
@@ -43,7 +43,6 @@
 #include "base/bittorrent/torrenthandle.h"
 #include "base/global.h"
 #include "base/net/downloadmanager.h"
-#include "base/preferences.h"
 #include "base/settingsstorage.h"
 #include "base/torrentfileguard.h"
 #include "base/utils/fs.h"
diff --git a/src/gui/advancedsettings.cpp b/src/gui/advancedsettings.cpp
index dd5d5139a..5def580b7 100644
--- a/src/gui/advancedsettings.cpp
+++ b/src/gui/advancedsettings.cpp
@@ -30,7 +30,6 @@
 
 #include <limits>
 
-#include <QFont>
 #include <QHeaderView>
 #include <QHostAddress>
 #include <QNetworkInterface>
diff --git a/src/gui/autoexpandabledialog.cpp b/src/gui/autoexpandabledialog.cpp
index d8385f47b..be4074f89 100644
--- a/src/gui/autoexpandabledialog.cpp
+++ b/src/gui/autoexpandabledialog.cpp
@@ -28,9 +28,6 @@
 
 #include "autoexpandabledialog.h"
 
-#include <QDesktopWidget>
-
-#include "mainwindow.h"
 #include "ui_autoexpandabledialog.h"
 #include "utils.h"
 
diff --git a/src/gui/categoryfilterwidget.cpp b/src/gui/categoryfilterwidget.cpp
index 9bc7032c8..fda482e95 100644
--- a/src/gui/categoryfilterwidget.cpp
+++ b/src/gui/categoryfilterwidget.cpp
@@ -29,7 +29,6 @@
 #include "categoryfilterwidget.h"
 
 #include <QAction>
-#include <QHeaderView>
 #include <QMenu>
 
 #include "base/bittorrent/session.h"
diff --git a/src/gui/executionlogwidget.cpp b/src/gui/executionlogwidget.cpp
index a561a53ca..301201994 100644
--- a/src/gui/executionlogwidget.cpp
+++ b/src/gui/executionlogwidget.cpp
@@ -28,7 +28,6 @@
 
 #include "executionlogwidget.h"
 
-#include <QColor>
 #include <QDateTime>
 #include <QPalette>
 
diff --git a/src/gui/fspathedit.h b/src/gui/fspathedit.h
index 87359a9c3..49c28f903 100644
--- a/src/gui/fspathedit.h
+++ b/src/gui/fspathedit.h
@@ -29,7 +29,6 @@
 #ifndef QBT_FSPATHEDIT_H
 #define QBT_FSPATHEDIT_H
 
-#include <QScopedPointer>
 #include <QWidget>
 
 namespace Private
diff --git a/src/gui/guiiconprovider.cpp b/src/gui/guiiconprovider.cpp
index 1a2688814..a958ca24f 100644
--- a/src/gui/guiiconprovider.cpp
+++ b/src/gui/guiiconprovider.cpp
@@ -31,9 +31,7 @@
 
 #include <QHash>
 #include <QIcon>
-#include <QVector>
 #if (defined(Q_OS_UNIX) && !defined(Q_OS_MAC))
-#include <QDir>
 #include <QFile>
 #endif
 
diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index d27366f44..e6aabfdff 100644
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -28,7 +28,6 @@
 
 #include "mainwindow.h"
 
-#include <QClipboard>
 #include <QCloseEvent>
 #include <QDebug>
 #include <QDesktopServices>
@@ -38,7 +37,6 @@
 #include <QMimeData>
 #include <QProcess>
 #include <QPushButton>
-#include <QScrollBar>
 #include <QShortcut>
 #include <QSplitter>
 #include <QStatusBar>
@@ -71,7 +69,6 @@
 #include "base/utils/password.h"
 #include "aboutdialog.h"
 #include "addnewtorrentdialog.h"
-#include "application.h"
 #include "autoexpandabledialog.h"
 #include "cookiesdialog.h"
 #include "downloadfromurldialog.h"
@@ -96,9 +93,6 @@
 #include "ui_mainwindow.h"
 #include "utils.h"
 
-#ifdef Q_OS_WIN
-#include "base/net/downloadmanager.h"
-#endif
 #ifdef Q_OS_MAC
 #include "macutilities.h"
 #endif
diff --git a/src/gui/optionsdialog.cpp b/src/gui/optionsdialog.cpp
index 5368ee190..ee1125d4a 100644
--- a/src/gui/optionsdialog.cpp
+++ b/src/gui/optionsdialog.cpp
@@ -35,7 +35,6 @@
 #include <QCloseEvent>
 #include <QDebug>
 #include <QDesktopServices>
-#include <QDesktopWidget>
 #include <QDialogButtonBox>
 #include <QEvent>
 #include <QFileDialog>
@@ -45,7 +44,6 @@
 
 #include "base/bittorrent/session.h"
 #include "base/global.h"
-#include "base/http/server.h"
 #include "base/net/dnsupdater.h"
 #include "base/net/portforwarder.h"
 #include "base/net/proxyconfigurationmanager.h"
diff --git a/src/gui/programupdater.cpp b/src/gui/programupdater.cpp
index 9e5b46e51..0611e1717 100644
--- a/src/gui/programupdater.cpp
+++ b/src/gui/programupdater.cpp
@@ -36,7 +36,6 @@
 #include <QXmlStreamReader>
 
 #include "base/net/downloadmanager.h"
-#include "base/utils/fs.h"
 
 namespace
 {
diff --git a/src/gui/programupdater.h b/src/gui/programupdater.h
index f87836869..628a511bb 100644
--- a/src/gui/programupdater.h
+++ b/src/gui/programupdater.h
@@ -30,7 +30,6 @@
 #define PROGRAMUPDATER_H
 
 #include <QObject>
-#include <QUrl>
 
 namespace Net
 {
diff --git a/src/gui/properties/peerlistwidget.cpp b/src/gui/properties/peerlistwidget.cpp
index f4cc47873..5cbfe5111 100644
--- a/src/gui/properties/peerlistwidget.cpp
+++ b/src/gui/properties/peerlistwidget.cpp
@@ -46,13 +46,11 @@
 #include "base/net/geoipmanager.h"
 #include "base/net/reverseresolution.h"
 #include "base/preferences.h"
-#include "base/unicodestrings.h"
 #include "guiiconprovider.h"
 #include "peerlistdelegate.h"
 #include "peerlistsortmodel.h"
 #include "peersadditiondialog.h"
 #include "propertieswidget.h"
-#include "speedlimitdialog.h"
 
 PeerListWidget::PeerListWidget(PropertiesWidget *parent)
     : QTreeView(parent)
diff --git a/src/gui/properties/proplistdelegate.cpp b/src/gui/properties/proplistdelegate.cpp
index 9a1aa401d..75d8e058e 100644
--- a/src/gui/properties/proplistdelegate.cpp
+++ b/src/gui/properties/proplistdelegate.cpp
@@ -45,7 +45,6 @@
 #include "base/utils/misc.h"
 #include "base/utils/string.h"
 #include "propertieswidget.h"
-#include "torrentcontentmodelitem.h"
 
 namespace
 {
diff --git a/src/gui/properties/trackerlistwidget.cpp b/src/gui/properties/trackerlistwidget.cpp
index 0caa12ecf..72dffd7e1 100644
--- a/src/gui/properties/trackerlistwidget.cpp
+++ b/src/gui/properties/trackerlistwidget.cpp
@@ -49,7 +49,6 @@
 #include "base/bittorrent/trackerentry.h"
 #include "base/global.h"
 #include "base/preferences.h"
-#include "base/utils/misc.h"
 #include "autoexpandabledialog.h"
 #include "guiiconprovider.h"
 #include "propertieswidget.h"
diff --git a/src/gui/properties/trackersadditiondialog.cpp b/src/gui/properties/trackersadditiondialog.cpp
index d57c728f4..b2de95e16 100644
--- a/src/gui/properties/trackersadditiondialog.cpp
+++ b/src/gui/properties/trackersadditiondialog.cpp
@@ -36,8 +36,6 @@
 #include "base/bittorrent/trackerentry.h"
 #include "base/global.h"
 #include "base/net/downloadmanager.h"
-#include "base/utils/fs.h"
-#include "base/utils/misc.h"
 #include "guiiconprovider.h"
 #include "ui_trackersadditiondialog.h"
 
diff --git a/src/gui/rss/automatedrssdownloader.cpp b/src/gui/rss/automatedrssdownloader.cpp
index b5179a33f..09112f244 100644
--- a/src/gui/rss/automatedrssdownloader.cpp
+++ b/src/gui/rss/automatedrssdownloader.cpp
@@ -30,7 +30,6 @@
 #include "automatedrssdownloader.h"
 
 #include <QCursor>
-#include <QDebug>
 #include <QFileDialog>
 #include <QMenu>
 #include <QMessageBox>
diff --git a/src/gui/rss/rsswidget.cpp b/src/gui/rss/rsswidget.cpp
index 2ca6f8d6a..552702c89 100644
--- a/src/gui/rss/rsswidget.cpp
+++ b/src/gui/rss/rsswidget.cpp
@@ -31,14 +31,12 @@
 #include "rsswidget.h"
 
 #include <QClipboard>
-#include <QDebug>
 #include <QDesktopServices>
 #include <QDragMoveEvent>
 #include <QMenu>
 #include <QMessageBox>
 #include <QRegularExpression>
 #include <QShortcut>
-#include <QStandardItemModel>
 #include <QString>
 
 #include "base/bittorrent/session.h"
diff --git a/src/gui/rss/rsswidget.h b/src/gui/rss/rsswidget.h
index a4e693f0c..3174782d6 100644
--- a/src/gui/rss/rsswidget.h
+++ b/src/gui/rss/rsswidget.h
@@ -31,7 +31,6 @@
 #ifndef RSSWIDGET_H
 #define RSSWIDGET_H
 
-#include <QPointer>
 #include <QWidget>
 
 class QShortcut;
diff --git a/src/gui/search/searchlistdelegate.cpp b/src/gui/search/searchlistdelegate.cpp
index 11b25c679..dabe1961d 100644
--- a/src/gui/search/searchlistdelegate.cpp
+++ b/src/gui/search/searchlistdelegate.cpp
@@ -28,10 +28,8 @@
 
 #include "searchlistdelegate.h"
 
-#include <QCoreApplication>
 #include <QModelIndex>
 #include <QPainter>
-#include <QProgressBar>
 #include <QStyleOptionViewItem>
 
 #include "base/utils/misc.h"
diff --git a/src/gui/search/searchwidget.cpp b/src/gui/search/searchwidget.cpp
index 632802c00..3fac10a2c 100644
--- a/src/gui/search/searchwidget.cpp
+++ b/src/gui/search/searchwidget.cpp
@@ -36,30 +36,18 @@
 #endif
 
 #include <QDebug>
-#include <QHeaderView>
 #include <QMessageBox>
-#include <QMimeData>
-#include <QProcess>
 #include <QRegularExpression>
 #include <QShortcut>
-#include <QSortFilterProxyModel>
-#include <QStandardItemModel>
 #include <QTextStream>
-#include <QTreeView>
 
-#include "base/bittorrent/session.h"
 #include "base/global.h"
-#include "base/preferences.h"
 #include "base/search/searchpluginmanager.h"
 #include "base/search/searchhandler.h"
 #include "base/utils/foreignapps.h"
-#include "base/utils/fs.h"
-#include "addnewtorrentdialog.h"
 #include "guiiconprovider.h"
 #include "mainwindow.h"
 #include "pluginselectdialog.h"
-#include "searchlistdelegate.h"
-#include "searchsortmodel.h"
 #include "searchjobwidget.h"
 #include "ui_searchwidget.h"
 
diff --git a/src/gui/statusbar.cpp b/src/gui/statusbar.cpp
index 8c6fd4ef2..4575812a2 100644
--- a/src/gui/statusbar.cpp
+++ b/src/gui/statusbar.cpp
@@ -39,7 +39,6 @@
 #include "base/bittorrent/session.h"
 #include "base/bittorrent/sessionstatus.h"
 #include "base/utils/misc.h"
-#include "guiiconprovider.h"
 #include "speedlimitdialog.h"
 #include "utils.h"
 
diff --git a/src/gui/tagfilterwidget.cpp b/src/gui/tagfilterwidget.cpp
index 453e4ea07..d9548373c 100644
--- a/src/gui/tagfilterwidget.cpp
+++ b/src/gui/tagfilterwidget.cpp
@@ -29,8 +29,6 @@
 #include "tagfilterwidget.h"
 
 #include <QAction>
-#include <QDebug>
-#include <QHeaderView>
 #include <QMenu>
 #include <QMessageBox>
 
diff --git a/src/gui/torrentcontentmodel.cpp b/src/gui/torrentcontentmodel.cpp
index 902ef34bb..fe938c17f 100644
--- a/src/gui/torrentcontentmodel.cpp
+++ b/src/gui/torrentcontentmodel.cpp
@@ -52,7 +52,6 @@
 #include "base/bittorrent/torrentinfo.h"
 #include "base/global.h"
 #include "base/utils/fs.h"
-#include "base/utils/misc.h"
 #include "guiiconprovider.h"
 #include "torrentcontentmodelfile.h"
 #include "torrentcontentmodelfolder.h"
diff --git a/src/gui/torrentcontentmodelitem.cpp b/src/gui/torrentcontentmodelitem.cpp
index a6dc0402f..bcec140b2 100644
--- a/src/gui/torrentcontentmodelitem.cpp
+++ b/src/gui/torrentcontentmodelitem.cpp
@@ -28,10 +28,6 @@
 
 #include "torrentcontentmodelitem.h"
 
-#include <QDebug>
-
-#include "base/utils/misc.h"
-#include "base/utils/fs.h"
 #include "torrentcontentmodelfolder.h"
 
 TorrentContentModelItem::TorrentContentModelItem(TorrentContentModelFolder *parent)
diff --git a/src/gui/torrentcreatordialog.cpp b/src/gui/torrentcreatordialog.cpp
index 00f59c783..c219ce1ba 100644
--- a/src/gui/torrentcreatordialog.cpp
+++ b/src/gui/torrentcreatordialog.cpp
@@ -30,7 +30,6 @@
 #include "torrentcreatordialog.h"
 
 #include <QCloseEvent>
-#include <QDebug>
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QMimeData>
diff --git a/src/gui/transferlistfilterswidget.cpp b/src/gui/transferlistfilterswidget.cpp
index 4ef93d883..580dbca25 100644
--- a/src/gui/transferlistfilterswidget.cpp
+++ b/src/gui/transferlistfilterswidget.cpp
@@ -29,7 +29,6 @@
 #include "transferlistfilterswidget.h"
 
 #include <QCheckBox>
-#include <QDebug>
 #include <QIcon>
 #include <QListWidgetItem>
 #include <QMenu>
@@ -49,12 +48,9 @@
 #include "base/torrentfilter.h"
 #include "base/utils/fs.h"
 #include "base/utils/string.h"
-#include "autoexpandabledialog.h"
 #include "categoryfilterwidget.h"
 #include "guiiconprovider.h"
 #include "tagfilterwidget.h"
-#include "transferlistdelegate.h"
-#include "transferlistmodel.h"
 #include "transferlistwidget.h"
 #include "utils.h"
 
diff --git a/src/gui/transferlistmodel.cpp b/src/gui/transferlistmodel.cpp
index eb98486ac..db3263dc8 100644
--- a/src/gui/transferlistmodel.cpp
+++ b/src/gui/transferlistmodel.cpp
@@ -38,7 +38,6 @@
 #include "base/bittorrent/session.h"
 #include "base/bittorrent/torrenthandle.h"
 #include "base/global.h"
-#include "base/torrentfilter.h"
 #include "base/utils/fs.h"
 
 static QIcon getIconByState(BitTorrent::TorrentState state);
diff --git a/src/webui/api/serialize/serialize_torrent.cpp b/src/webui/api/serialize/serialize_torrent.cpp
index 621cbb09c..f90ee30b7 100644
--- a/src/webui/api/serialize/serialize_torrent.cpp
+++ b/src/webui/api/serialize/serialize_torrent.cpp
@@ -30,10 +30,8 @@
 
 #include <QDateTime>
 
-#include "base/bittorrent/session.h"
 #include "base/bittorrent/torrenthandle.h"
 #include "base/utils/fs.h"
-#include "base/utils/string.h"
 
 namespace
 {
diff --git a/src/webui/api/synccontroller.cpp b/src/webui/api/synccontroller.cpp
index f3f27090f..ce068bf1a 100644
--- a/src/webui/api/synccontroller.cpp
+++ b/src/webui/api/synccontroller.cpp
@@ -40,7 +40,6 @@
 #include "base/global.h"
 #include "base/net/geoipmanager.h"
 #include "base/preferences.h"
-#include "base/utils/fs.h"
 #include "base/utils/string.h"
 #include "apierror.h"
 #include "freediskspacechecker.h"