diff --git a/src/app/application.cpp b/src/app/application.cpp
index 8a647ec2e..9cc1d3558 100644
--- a/src/app/application.cpp
+++ b/src/app/application.cpp
@@ -33,7 +33,6 @@
 
 #include <QAtomicInt>
 #include <QDebug>
-#include <QFileInfo>
 #include <QLibraryInfo>
 #include <QLocale>
 #include <QProcess>
@@ -51,8 +50,6 @@
 #endif // Q_OS_WIN
 #ifdef Q_OS_MAC
 #include <QFileOpenEvent>
-#include <QFont>
-#include <QUrl>
 #endif // Q_OS_MAC
 #include "addnewtorrentdialog.h"
 #include "gui/guiiconprovider.h"
diff --git a/src/base/bittorrent/session.cpp b/src/base/bittorrent/session.cpp
index 98c75ffe9..434a4bce9 100644
--- a/src/base/bittorrent/session.cpp
+++ b/src/base/bittorrent/session.cpp
@@ -35,7 +35,6 @@
 #include <string>
 
 #include <QCoreApplication>
-#include <QDateTime>
 #include <QDebug>
 #include <QDir>
 #include <QHostAddress>
diff --git a/src/base/net/dnsupdater.cpp b/src/base/net/dnsupdater.cpp
index 91fd1a377..aefab36f1 100644
--- a/src/base/net/dnsupdater.cpp
+++ b/src/base/net/dnsupdater.cpp
@@ -30,7 +30,6 @@
 
 #include <QDebug>
 #include <QRegularExpression>
-#include <QStringList>
 #include <QUrlQuery>
 
 #include "base/logger.h"
diff --git a/src/base/net/private/geoipdatabase.cpp b/src/base/net/private/geoipdatabase.cpp
index 2dc906c37..ba1af9a7e 100644
--- a/src/base/net/private/geoipdatabase.cpp
+++ b/src/base/net/private/geoipdatabase.cpp
@@ -29,7 +29,6 @@
 #include <QDateTime>
 #include <QDebug>
 #include <QFile>
-#include <QHash>
 #include <QHostAddress>
 #include <QVariant>
 
diff --git a/src/base/net/smtp.cpp b/src/base/net/smtp.cpp
index 4342fb548..e8069f15d 100644
--- a/src/base/net/smtp.cpp
+++ b/src/base/net/smtp.cpp
@@ -34,12 +34,9 @@
 
 #include <QCryptographicHash>
 #include <QDebug>
-#include <QHostAddress>
 #include <QHostInfo>
-#include <QNetworkInterface>
 #include <QStringList>
 #include <QTextCodec>
-#include <QTextStream>
 #ifndef QT_NO_OPENSSL
 #include <QSslSocket>
 #else
diff --git a/src/base/net/smtp.h b/src/base/net/smtp.h
index f9b159316..d1944bd49 100644
--- a/src/base/net/smtp.h
+++ b/src/base/net/smtp.h
@@ -46,7 +46,6 @@ class QSslSocket;
 class QTcpSocket;
 #endif
 class QTextCodec;
-class QTextStream;
 
 namespace Net
 {
diff --git a/src/base/preferences.cpp b/src/base/preferences.cpp
index a800223c6..d7a0837b6 100644
--- a/src/base/preferences.cpp
+++ b/src/base/preferences.cpp
@@ -33,7 +33,6 @@
 #include <QDir>
 #include <QLocale>
 #include <QMutableListIterator>
-#include <QPair>
 #include <QSettings>
 
 #ifndef DISABLE_GUI
diff --git a/src/base/rss/rss_feed.cpp b/src/base/rss/rss_feed.cpp
index f094a8e0a..c93a7e7e7 100644
--- a/src/base/rss/rss_feed.cpp
+++ b/src/base/rss/rss_feed.cpp
@@ -30,7 +30,6 @@
 
 #include "rss_feed.h"
 
-#include <QCryptographicHash>
 #include <QDebug>
 #include <QDir>
 #include <QJsonArray>
diff --git a/src/base/rss/rss_session.h b/src/base/rss/rss_session.h
index 3af3b6208..de7fdd44f 100644
--- a/src/base/rss/rss_session.h
+++ b/src/base/rss/rss_session.h
@@ -65,7 +65,6 @@
 #include <QHash>
 #include <QObject>
 #include <QPointer>
-#include <QStringList>
 #include <QTimer>
 
 class QThread;
diff --git a/src/base/settingsstorage.cpp b/src/base/settingsstorage.cpp
index 60dc7a8ed..b3b78d265 100644
--- a/src/base/settingsstorage.cpp
+++ b/src/base/settingsstorage.cpp
@@ -32,7 +32,6 @@
 #include <memory>
 #include <QFile>
 #include <QHash>
-#include <QStringList>
 
 #include "logger.h"
 #include "profile.h"
diff --git a/src/base/utils/misc.cpp b/src/base/utils/misc.cpp
index dcdcca560..212445d5e 100644
--- a/src/base/utils/misc.cpp
+++ b/src/base/utils/misc.cpp
@@ -45,9 +45,7 @@
 #endif
 
 #include <QByteArray>
-#include <QDateTime>
 #include <QDebug>
-#include <QDir>
 #include <QFileInfo>
 #include <QProcess>
 #include <QRegularExpression>
diff --git a/src/base/utils/misc.h b/src/base/utils/misc.h
index 028bc146a..f4f06461b 100644
--- a/src/base/utils/misc.h
+++ b/src/base/utils/misc.h
@@ -40,7 +40,6 @@
 #endif
 
 #include <QDir>
-#include <QFile>
 #include <QPoint>
 #include <QSize>
 #include <QString>
diff --git a/src/base/utils/net.cpp b/src/base/utils/net.cpp
index 47b89ce37..06fe9b375 100644
--- a/src/base/utils/net.cpp
+++ b/src/base/utils/net.cpp
@@ -30,7 +30,6 @@
 
 #include <QHostAddress>
 #include <QString>
-#include <QStringList>
 
 namespace Utils
 {
diff --git a/src/base/utils/net.h b/src/base/utils/net.h
index 8b51377b6..cc440326b 100644
--- a/src/base/utils/net.h
+++ b/src/base/utils/net.h
@@ -34,7 +34,6 @@
 
 class QHostAddress;
 class QString;
-class QStringList;
 
 namespace Utils
 {
diff --git a/src/base/utils/version.h b/src/base/utils/version.h
index 71b797eb4..e82e3b6e9 100644
--- a/src/base/utils/version.h
+++ b/src/base/utils/version.h
@@ -34,7 +34,6 @@
 
 #include <QDebug>
 #include <QString>
-#include <QStringList>
 
 namespace Utils
 {
diff --git a/src/gui/addnewtorrentdialog.cpp b/src/gui/addnewtorrentdialog.cpp
index 1828cf5b7..28ce94485 100644
--- a/src/gui/addnewtorrentdialog.cpp
+++ b/src/gui/addnewtorrentdialog.cpp
@@ -30,7 +30,6 @@
 
 #include <QDebug>
 #include <QFile>
-#include <QFileDialog>
 #include <QMenu>
 #include <QPushButton>
 #include <QString>
diff --git a/src/gui/addnewtorrentdialog.h b/src/gui/addnewtorrentdialog.h
index c34cc5c65..e2636dfe1 100644
--- a/src/gui/addnewtorrentdialog.h
+++ b/src/gui/addnewtorrentdialog.h
@@ -32,7 +32,6 @@
 #include <QDialog>
 #include <QScopedPointer>
 #include <QShortcut>
-#include <QUrl>
 
 #include "base/bittorrent/addtorrentparams.h"
 #include "base/bittorrent/infohash.h"
diff --git a/src/gui/categoryfiltermodel.h b/src/gui/categoryfiltermodel.h
index 4b43d9907..15609ccbf 100644
--- a/src/gui/categoryfiltermodel.h
+++ b/src/gui/categoryfiltermodel.h
@@ -30,7 +30,6 @@
 #define CATEGORYFILTERMODEL_H
 
 #include <QAbstractItemModel>
-#include <QHash>
 #include <QModelIndex>
 
 namespace BitTorrent
diff --git a/src/gui/categoryfilterwidget.cpp b/src/gui/categoryfilterwidget.cpp
index fff71c379..8f5a1335d 100644
--- a/src/gui/categoryfilterwidget.cpp
+++ b/src/gui/categoryfilterwidget.cpp
@@ -30,9 +30,7 @@
 
 #include <QAction>
 #include <QHeaderView>
-#include <QLayout>
 #include <QMenu>
-#include <QMessageBox>
 
 #include "base/bittorrent/session.h"
 #include "base/global.h"
diff --git a/src/gui/executionlogwidget.cpp b/src/gui/executionlogwidget.cpp
index a26a75146..305cf1074 100644
--- a/src/gui/executionlogwidget.cpp
+++ b/src/gui/executionlogwidget.cpp
@@ -30,8 +30,6 @@
 
 #include <QColor>
 #include <QDateTime>
-#include <QLabel>
-#include <QListWidgetItem>
 #include <QPalette>
 
 #include "guiiconprovider.h"
diff --git a/src/gui/fspathedit_p.h b/src/gui/fspathedit_p.h
index b9296e4d7..21c553eb0 100644
--- a/src/gui/fspathedit_p.h
+++ b/src/gui/fspathedit_p.h
@@ -33,7 +33,6 @@
 #include <QComboBox>
 #include <QCompleter>
 #include <QContextMenuEvent>
-#include <QDir>
 #include <QFileIconProvider>
 #include <QFileSystemModel>
 #include <QKeyEvent>
diff --git a/src/gui/ipsubnetwhitelistoptionsdialog.cpp b/src/gui/ipsubnetwhitelistoptionsdialog.cpp
index 5e60fa9e4..65eb905a4 100644
--- a/src/gui/ipsubnetwhitelistoptionsdialog.cpp
+++ b/src/gui/ipsubnetwhitelistoptionsdialog.cpp
@@ -28,9 +28,7 @@
 
 #include "ipsubnetwhitelistoptionsdialog.h"
 
-#include <QHostAddress>
 #include <QMessageBox>
-#include <QPair>
 #include <QSortFilterProxyModel>
 #include <QStringListModel>
 
diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h
index 9487b60c9..d8625779f 100644
--- a/src/gui/mainwindow.h
+++ b/src/gui/mainwindow.h
@@ -38,7 +38,6 @@
 
 class QCloseEvent;
 class QFileSystemWatcher;
-class QShortcut;
 class QSplitter;
 class QTabWidget;
 class QTimer;
diff --git a/src/gui/previewselectdialog.h b/src/gui/previewselectdialog.h
index 4608ab707..715643b8a 100644
--- a/src/gui/previewselectdialog.h
+++ b/src/gui/previewselectdialog.h
@@ -30,7 +30,6 @@
 #define PREVIEWSELECTDIALOG_H
 
 #include <QDialog>
-#include <QList>
 
 #include "base/bittorrent/torrenthandle.h"
 #include "base/settingvalue.h"
diff --git a/src/gui/properties/peerlistsortmodel.h b/src/gui/properties/peerlistsortmodel.h
index c6fccbb9c..8cd8b3f9f 100644
--- a/src/gui/properties/peerlistsortmodel.h
+++ b/src/gui/properties/peerlistsortmodel.h
@@ -30,7 +30,6 @@
 #define PEERLISTSORTMODEL_H
 
 #include <QSortFilterProxyModel>
-#include <QStringList>
 
 #include "peerlistdelegate.h"
 
diff --git a/src/gui/properties/propertieswidget.cpp b/src/gui/properties/propertieswidget.cpp
index 4662b5ce4..e0573a5ce 100644
--- a/src/gui/properties/propertieswidget.cpp
+++ b/src/gui/properties/propertieswidget.cpp
@@ -29,9 +29,7 @@
 #include "propertieswidget.h"
 
 #include <QAction>
-#include <QBitArray>
 #include <QDebug>
-#include <QFileDialog>
 #include <QHeaderView>
 #include <QListWidgetItem>
 #include <QMenu>
@@ -39,7 +37,6 @@
 #include <QStackedWidget>
 #include <QThread>
 #include <QTimer>
-#include <QVBoxLayout>
 
 #include "base/bittorrent/session.h"
 #include "base/preferences.h"
diff --git a/src/gui/properties/speedwidget.cpp b/src/gui/properties/speedwidget.cpp
index 513f77cea..754211569 100644
--- a/src/gui/properties/speedwidget.cpp
+++ b/src/gui/properties/speedwidget.cpp
@@ -33,7 +33,6 @@
 #include <QLabel>
 #include <QMenu>
 #include <QSignalMapper>
-#include <QThread>
 #include <QTimer>
 
 #include <libtorrent/session_status.hpp>
diff --git a/src/gui/properties/trackersadditiondialog.cpp b/src/gui/properties/trackersadditiondialog.cpp
index 41aff1346..235db43f4 100644
--- a/src/gui/properties/trackersadditiondialog.cpp
+++ b/src/gui/properties/trackersadditiondialog.cpp
@@ -31,7 +31,6 @@
 #include <QBuffer>
 #include <QMessageBox>
 #include <QStringList>
-#include <QUrl>
 
 #include "base/bittorrent/torrenthandle.h"
 #include "base/bittorrent/trackerentry.h"
diff --git a/src/gui/rss/automatedrssdownloader.cpp b/src/gui/rss/automatedrssdownloader.cpp
index e3a2d3485..da7ca8ab1 100644
--- a/src/gui/rss/automatedrssdownloader.cpp
+++ b/src/gui/rss/automatedrssdownloader.cpp
@@ -36,7 +36,6 @@
 #include <QMessageBox>
 #include <QPair>
 #include <QRegularExpression>
-#include <QSet>
 #include <QShortcut>
 #include <QSignalBlocker>
 #include <QString>
diff --git a/src/gui/scanfoldersdelegate.cpp b/src/gui/scanfoldersdelegate.cpp
index cecee102e..d0a68cf7c 100644
--- a/src/gui/scanfoldersdelegate.cpp
+++ b/src/gui/scanfoldersdelegate.cpp
@@ -31,8 +31,6 @@
 #include <QComboBox>
 #include <QDebug>
 #include <QFileDialog>
-#include <QItemSelectionModel>
-#include <QPainter>
 #include <QTreeView>
 
 #include "base/bittorrent/session.h"
diff --git a/src/gui/search/searchjobwidget.cpp b/src/gui/search/searchjobwidget.cpp
index d5371c1f7..20385f0f2 100644
--- a/src/gui/search/searchjobwidget.cpp
+++ b/src/gui/search/searchjobwidget.cpp
@@ -32,16 +32,13 @@
 #include <QApplication>
 #include <QClipboard>
 #include <QDesktopServices>
-#include <QDir>
 #include <QHeaderView>
-#include <QLabel>
 #include <QMenu>
 #include <QPalette>
 #include <QSortFilterProxyModel>
 #include <QStandardItemModel>
 #include <QTableView>
 #include <QTreeView>
-#include <QVBoxLayout>
 
 #include "base/bittorrent/session.h"
 #include "base/preferences.h"
diff --git a/src/gui/search/searchjobwidget.h b/src/gui/search/searchjobwidget.h
index 4719445b1..6a9cc12b3 100644
--- a/src/gui/search/searchjobwidget.h
+++ b/src/gui/search/searchjobwidget.h
@@ -35,11 +35,9 @@
 #define URL_COLUMN 5
 
 class QHeaderView;
-class QLabel;
 class QModelIndex;
 class QStandardItem;
 class QStandardItemModel;
-class QVBoxLayout;
 
 template <typename T> class CachedSettingValue;
 
diff --git a/src/gui/search/searchwidget.cpp b/src/gui/search/searchwidget.cpp
index 6e4c40296..43cac5dee 100644
--- a/src/gui/search/searchwidget.cpp
+++ b/src/gui/search/searchwidget.cpp
@@ -36,10 +36,7 @@
 #endif
 
 #include <QDebug>
-#include <QDir>
-#include <QFileDialog>
 #include <QHeaderView>
-#include <QMenu>
 #include <QMessageBox>
 #include <QMimeData>
 #include <QProcess>
@@ -47,9 +44,7 @@
 #include <QSignalMapper>
 #include <QSortFilterProxyModel>
 #include <QStandardItemModel>
-#include <QSystemTrayIcon>
 #include <QTextStream>
-#include <QTimer>
 #include <QTreeView>
 
 #include "base/bittorrent/session.h"
diff --git a/src/gui/speedlimitdialog.h b/src/gui/speedlimitdialog.h
index 7fee9adbd..24d0ca1c9 100644
--- a/src/gui/speedlimitdialog.h
+++ b/src/gui/speedlimitdialog.h
@@ -30,7 +30,6 @@
 #define SPEEDLIMITDIALOG_H
 
 #include <QDialog>
-#include <QList>
 
 #include "base/bittorrent/session.h"
 #include "base/utils/misc.h"
diff --git a/src/gui/tagfiltermodel.cpp b/src/gui/tagfiltermodel.cpp
index b27161b25..818b72d5a 100644
--- a/src/gui/tagfiltermodel.cpp
+++ b/src/gui/tagfiltermodel.cpp
@@ -29,7 +29,6 @@
 #include "tagfiltermodel.h"
 
 #include <QDebug>
-#include <QHash>
 #include <QIcon>
 
 #include "base/bittorrent/session.h"
diff --git a/src/gui/tagfiltermodel.h b/src/gui/tagfiltermodel.h
index 8dbea520d..4d02035ce 100644
--- a/src/gui/tagfiltermodel.h
+++ b/src/gui/tagfiltermodel.h
@@ -30,7 +30,6 @@
 #define TAGFILTERMODEL_H
 
 #include <QAbstractListModel>
-#include <QHash>
 #include <QModelIndex>
 #include <QSet>
 #include <QVector>
diff --git a/src/gui/tagfilterwidget.cpp b/src/gui/tagfilterwidget.cpp
index 136938882..dea898840 100644
--- a/src/gui/tagfilterwidget.cpp
+++ b/src/gui/tagfilterwidget.cpp
@@ -31,7 +31,6 @@
 #include <QAction>
 #include <QDebug>
 #include <QHeaderView>
-#include <QLayout>
 #include <QMenu>
 #include <QMessageBox>
 
diff --git a/src/gui/transferlistfilterswidget.cpp b/src/gui/transferlistfilterswidget.cpp
index 843fad8c0..5e1ce496f 100644
--- a/src/gui/transferlistfilterswidget.cpp
+++ b/src/gui/transferlistfilterswidget.cpp
@@ -33,7 +33,6 @@
 #include <QIcon>
 #include <QListWidgetItem>
 #include <QMenu>
-#include <QMessageBox>
 #include <QScrollArea>
 #include <QUrl>
 #include <QVBoxLayout>
diff --git a/src/webui/webapplication.cpp b/src/webui/webapplication.cpp
index 28bab0ba8..1c5d866af 100644
--- a/src/webui/webapplication.cpp
+++ b/src/webui/webapplication.cpp
@@ -43,7 +43,6 @@
 #include <QMimeDatabase>
 #include <QMimeType>
 #include <QRegExp>
-#include <QTimer>
 #include <QUrl>
 
 #include "base/global.h"