Merge pull request #10752 from thalieht/fw-declare

Forward declare and remove some unused #include

src/base/bittorrent/addtorrentparams.h

@@ -33,10 +33,11 @@
 #include <QVector>
 
 #include "../tristatebool.h"
-#include "downloadpriority.h"
 
 namespace BitTorrent
 {
+    enum class DownloadPriority;
+
     struct AddTorrentParams
     {
         QString name;

src/base/bittorrent/peerinfo.cpp

@@ -28,6 +28,8 @@
 
 #include "peerinfo.h"
 
+#include <QBitArray>
+
 #include "base/bittorrent/torrenthandle.h"
 #include "base/net/geoipmanager.h"
 #include "base/unicodestrings.h"

src/base/bittorrent/peerinfo.h

@@ -31,10 +31,11 @@
 
 #include <libtorrent/peer_info.hpp>
 
-#include <QBitArray>
 #include <QCoreApplication>
 #include <QHostAddress>
 
+class QBitArray;
+
 namespace BitTorrent
 {
     class TorrentHandle;

src/base/bittorrent/private/resumedatasavingmanager.cpp

@@ -29,7 +29,6 @@
 #include "resumedatasavingmanager.h"
 
 #include <QByteArray>
-#include <QDebug>
 #include <QSaveFile>
 
 #include "base/logger.h"

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

src/base/bittorrent/torrenthandle.cpp

@@ -59,6 +59,7 @@
 #include "base/profile.h"
 #include "base/tristatebool.h"
 #include "base/utils/fs.h"
+#include "downloadpriority.h"
 #include "peerinfo.h"
 #include "session.h"
 #include "trackerentry.h"

src/base/bittorrent/torrenthandle.h

@@ -45,7 +45,6 @@
 #include <QVector>
 
 #include "private/speedmonitor.h"
-#include "downloadpriority.h"
 #include "infohash.h"
 #include "torrentinfo.h"
 
@@ -58,6 +57,7 @@ class QUrl;
 
 namespace BitTorrent
 {
+    enum class DownloadPriority;
     class PeerInfo;
     class Session;
     class TrackerEntry;

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;
 

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

src/base/http/connection.h

@@ -34,13 +34,12 @@
 #include <QElapsedTimer>
 #include <QObject>
 
-#include "types.h"
-
 class QTcpSocket;
 
 namespace Http
 {
     class IRequestHandler;
+    struct Response;
 
     class Connection : public QObject
     {

src/base/http/irequesthandler.h

@@ -29,10 +29,12 @@
 #ifndef HTTP_IREQUESTHANDLER_H
 #define HTTP_IREQUESTHANDLER_H
 
-#include "types.h"
-
 namespace Http
 {
+    struct Environment;
+    struct Request;
+    struct Response;
+
     class IRequestHandler
     {
     public:

src/base/http/responsegenerator.cpp

@@ -31,6 +31,7 @@
 
 #include <QDateTime>
 
+#include "base/http/types.h"
 #include "base/utils/gzip.h"
 
 QByteArray Http::toByteArray(Response response)

src/base/http/responsegenerator.h

@@ -31,10 +31,13 @@
 #ifndef HTTP_RESPONSEGENERATOR_H
 #define HTTP_RESPONSEGENERATOR_H
 
-#include "types.h"
+class QByteArray;
+class QString;
 
 namespace Http
 {
+    struct Response;
+
     QByteArray toByteArray(Response response);
     QString httpDate();
     void compressContent(Response &response);

src/base/net/downloadmanager.h

@@ -32,7 +32,6 @@
 
 #include <QHash>
 #include <QNetworkAccessManager>
-#include <QNetworkRequest>
 #include <QObject>
 #include <QQueue>
 #include <QSet>

src/base/net/geoipmanager.cpp

@@ -30,7 +30,6 @@
 #include "geoipmanager.h"
 
 #include <QDateTime>
-#include <QDebug>
 #include <QDir>
 #include <QFile>
 #include <QHostAddress>

src/base/net/geoipmanager.h

@@ -30,7 +30,6 @@
 #ifndef NET_GEOIPMANAGER_H
 #define NET_GEOIPMANAGER_H
 
-#include <QCache>
 #include <QObject>
 
 class QHostAddress;

src/base/net/private/geoipdatabase.cpp

@@ -32,7 +32,6 @@
 #include <QHostAddress>
 #include <QVariant>
 
-#include "base/types.h"
 #include "geoipdatabase.h"
 
 namespace

src/base/net/smtp.h

@@ -36,7 +36,6 @@
 #include <QAbstractSocket>
 #include <QByteArray>
 #include <QHash>
-#include <QMetaType>
 #include <QObject>
 #include <QString>
 

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;
 

src/base/preferences.h

@@ -31,13 +31,13 @@
 #define PREFERENCES_H
 
 #include <QList>
-#include <QStringList>
 
 #include "base/utils/net.h"
 
 class QDateTime;
 class QNetworkCookie;
 class QSize;
+class QStringList;
 class QTime;
 class QVariant;
 

src/base/profile.h

@@ -35,6 +35,7 @@
 #include <QSettings>
 
 class QString;
+
 class Application;
 
 namespace Private

src/base/rss/rss_autodownloader.cpp

@@ -30,7 +30,6 @@
 
 #include <QDataStream>
 #include <QDebug>
-#include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonValue>

src/base/rss/rss_autodownloader.h

@@ -40,6 +40,7 @@
 
 class QThread;
 class QTimer;
+
 class Application;
 class AsyncFileStorage;
 struct ProcessingJob;

src/base/rss/rss_autodownloadrule.cpp

@@ -32,7 +32,6 @@
 #include <algorithm>
 
 #include <QDebug>
-#include <QDir>
 #include <QHash>
 #include <QJsonArray>
 #include <QJsonObject>

src/base/rss/rss_autodownloadrule.h

@@ -35,6 +35,7 @@
 class QDateTime;
 class QJsonObject;
 class QRegularExpression;
+
 class TriStateBool;
 
 namespace RSS

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"

src/base/rss/rss_session.h

@@ -68,6 +68,7 @@
 #include <QTimer>
 
 class QThread;
+
 class Application;
 class AsyncFileStorage;
 

src/base/scanfoldersmodel.h

@@ -33,6 +33,7 @@
 #include <QList>
 
 class QStringList;
+
 class FileSystemWatcher;
 
 class ScanFoldersModel : public QAbstractListModel

src/base/search/searchdownloadhandler.h

@@ -31,6 +31,7 @@
 #include <QObject>
 
 class QProcess;
+
 class SearchPluginManager;
 
 class SearchDownloadHandler : public QObject

src/base/search/searchpluginmanager.cpp

@@ -31,7 +31,6 @@
 
 #include <memory>
 
-#include <QDebug>
 #include <QDir>
 #include <QDirIterator>
 #include <QDomDocument>

src/base/utils/fs.cpp

@@ -49,7 +49,6 @@
 #include <unistd.h>
 #endif
 
-#include <QCoreApplication>
 #include <QDebug>
 #include <QDir>
 #include <QDirIterator>

src/base/utils/misc.h

@@ -37,6 +37,7 @@
 #endif
 
 class QString;
+
 enum class ShutdownDialogAction;
 
 /*  Miscellaneous functions that can be useful */

src/base/utils/password.cpp

@@ -37,7 +37,6 @@
 
 #include "bytearray.h"
 #include "random.h"
-#include "string.h"
 
 namespace Utils
 {

src/base/utils/string.h

@@ -31,7 +31,8 @@
 #define UTILS_STRING_H
 
 #include <QLatin1String>
-#include <QString>
+
+class QString;
 
 class TriStateBool;
 

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"

src/gui/advancedsettings.cpp

@@ -30,7 +30,6 @@
 
 #include <limits>
 
-#include <QFont>
 #include <QHeaderView>
 #include <QHostAddress>
 #include <QNetworkInterface>

src/gui/autoexpandabledialog.cpp

@@ -28,9 +28,6 @@
 
 #include "autoexpandabledialog.h"
 
-#include <QDesktopWidget>
-
-#include "mainwindow.h"
 #include "ui_autoexpandabledialog.h"
 #include "utils.h"
 

src/gui/autoexpandabledialog.h

@@ -31,7 +31,8 @@
 
 #include <QDialog>
 #include <QLineEdit>
-#include <QString>
+
+class QString;
 
 namespace Ui
 {

src/gui/categoryfiltermodel.h

@@ -30,15 +30,16 @@
 #define CATEGORYFILTERMODEL_H
 
 #include <QAbstractItemModel>
-#include <QModelIndex>
+
+class QModelIndex;
+
+class CategoryModelItem;
 
 namespace BitTorrent
 {
     class TorrentHandle;
 }
 
-class CategoryModelItem;
-
 class CategoryFilterModel : public QAbstractItemModel
 {
     Q_OBJECT

src/gui/categoryfilterproxymodel.h

@@ -30,7 +30,8 @@
 #define CATEGORYFILTERPROXYMODEL_H
 
 #include <QSortFilterProxyModel>
-#include <QString>
+
+class QString;
 
 class CategoryFilterProxyModel : public QSortFilterProxyModel
 {

src/gui/categoryfilterwidget.cpp

@@ -29,7 +29,6 @@
 #include "categoryfilterwidget.h"
 
 #include <QAction>
-#include <QHeaderView>
 #include <QMenu>
 
 #include "base/bittorrent/session.h"

src/gui/executionlogwidget.cpp

@@ -28,7 +28,6 @@
 
 #include "executionlogwidget.h"
 
-#include <QColor>
 #include <QDateTime>
 #include <QPalette>
 

src/gui/fspathedit.h

@@ -29,7 +29,6 @@
 #ifndef QBT_FSPATHEDIT_H
 #define QBT_FSPATHEDIT_H
 
-#include <QScopedPointer>
 #include <QWidget>
 
 namespace Private

src/gui/fspathedit_p.cpp

@@ -29,8 +29,11 @@
 #include "fspathedit_p.h"
 
 #include <QCompleter>
+#include <QContextMenuEvent>
 #include <QDir>
 #include <QFileInfo>
+#include <QFileSystemModel>
+#include <QMenu>
 #include <QStringList>
 #include <QStyle>
 

src/gui/fspathedit_p.h

@@ -29,20 +29,19 @@
 #ifndef QBT_GUI_FSPATHEDIT_P_H
 #define QBT_GUI_FSPATHEDIT_P_H
 
-#include <QAction>
 #include <QComboBox>
-#include <QCompleter>
-#include <QContextMenuEvent>
 #include <QFileIconProvider>
-#include <QFileSystemModel>
-#include <QKeyEvent>
 #include <QLineEdit>
-#include <QMenu>
-#include <QStringRef>
 #include <QValidator>
 #include <QVector>
 
+class QAction;
+class QCompleter;
+class QContextMenuEvent;
+class QFileSystemModel;
+class QKeyEvent;
 class QStringList;
+class QStringRef;
 
 namespace Private
 {

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
 

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

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"

src/gui/optionsdialog.h

@@ -34,6 +34,7 @@
 class QAbstractButton;
 class QCloseEvent;
 class QListWidgetItem;
+
 class AdvancedSettings;
 
 // actions on double-click on torrents

src/gui/programupdater.cpp

@@ -36,7 +36,6 @@
 #include <QXmlStreamReader>
 
 #include "base/net/downloadmanager.h"
-#include "base/utils/fs.h"
 
 namespace
 {

src/gui/programupdater.h

@@ -30,7 +30,6 @@
 #define PROGRAMUPDATER_H
 
 #include <QObject>
-#include <QUrl>
 
 namespace Net
 {

src/gui/properties/downloadedpiecesbar.h

@@ -31,10 +31,11 @@
 
 #include <QBitArray>
 #include <QVector>
-#include <QWidget>
 
 #include "piecesbar.h"
 
+class QWidget;
+
 class DownloadedPiecesBar : public PiecesBar
 {
     using base = PiecesBar;

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)

src/gui/properties/peerlistwidget.h

@@ -35,18 +35,18 @@
 #include <QShortcut>
 #include <QTreeView>
 
-namespace Net
-{
-    class ReverseResolution;
-}
+class QSortFilterProxyModel;
+class QStandardItem;
+class QStandardItemModel;
 
 class PeerListDelegate;
 class PeerListSortModel;
 class PropertiesWidget;
 
-class QSortFilterProxyModel;
-class QStandardItem;
-class QStandardItemModel;
+namespace Net
+{
+    class ReverseResolution;
+}
 
 namespace BitTorrent
 {

src/gui/properties/propertieswidget.cpp

@@ -29,6 +29,7 @@
 #include "propertieswidget.h"
 
 #include <QAction>
+#include <QClipboard>
 #include <QDateTime>
 #include <QDebug>
 #include <QDir>

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
 {

src/gui/properties/proplistdelegate.h

@@ -35,6 +35,7 @@ class QAbstractItemModel;
 class QModelIndex;
 class QPainter;
 class QStyleOptionViewItem;
+
 class PropertiesWidget;
 
 // Defines for properties list columns

src/gui/properties/speedwidget.h

@@ -38,6 +38,7 @@ class QHBoxLayout;
 class QLabel;
 class QMenu;
 class QVBoxLayout;
+
 class PropertiesWidget;
 
 class ComboBoxMenuButton : public QComboBox

src/gui/properties/trackerlistwidget.cpp

@@ -30,12 +30,14 @@
 
 #include <QAction>
 #include <QApplication>
+#include <QClipboard>
 #include <QColor>
 #include <QDebug>
 #include <QHash>
 #include <QHeaderView>
 #include <QMenu>
 #include <QMessageBox>
+#include <QShortcut>
 #include <QStringList>
 #include <QTableView>
 #include <QTreeWidgetItem>
@@ -47,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"

src/gui/properties/trackerlistwidget.h

@@ -29,13 +29,13 @@
 #ifndef TRACKERLIST_H
 #define TRACKERLIST_H
 
-#include <QClipboard>
 #include <QList>
-#include <QShortcut>
 #include <QTreeWidget>
 
 #include "propertieswidget.h"
 
+class QShortcut;
+
 #define NB_STICKY_ITEM 3
 
 namespace BitTorrent

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"
 

src/gui/rss/automatedrssdownloader.cpp

@@ -30,7 +30,6 @@
 #include "automatedrssdownloader.h"
 
 #include <QCursor>
-#include <QDebug>
 #include <QFileDialog>
 #include <QMenu>
 #include <QMessageBox>

src/gui/rss/rsswidget.cpp

@@ -31,13 +31,12 @@
 #include "rsswidget.h"
 
 #include <QClipboard>
-#include <QDebug>
 #include <QDesktopServices>
 #include <QDragMoveEvent>
 #include <QMenu>
 #include <QMessageBox>
 #include <QRegularExpression>
-#include <QStandardItemModel>
+#include <QShortcut>
 #include <QString>
 
 #include "base/bittorrent/session.h"

src/gui/rss/rsswidget.h

@@ -31,14 +31,15 @@
 #ifndef RSSWIDGET_H
 #define RSSWIDGET_H
 
-#include <QPointer>
-#include <QShortcut>
+#include <QWidget>
 
-class ArticleListWidget;
-class FeedListWidget;
 class QListWidgetItem;
+class QShortcut;
 class QTreeWidgetItem;
 
+class ArticleListWidget;
+class FeedListWidget;
+
 namespace Ui
 {
     class RSSWidget;

src/gui/scanfoldersdelegate.h

@@ -36,6 +36,7 @@ class QModelIndex;
 class QPainter;
 class QStyleOptionViewItem;
 class QTreeView;
+
 class PropertiesWidget;
 
 class ScanFoldersDelegate : public QItemDelegate

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"

src/gui/search/searchsortmodel.cpp

@@ -29,6 +29,7 @@
 #include "searchsortmodel.h"
 
 #include "base/global.h"
+#include "base/utils/string.h"
 
 SearchSortModel::SearchSortModel(QObject *parent)
     : base(parent)

src/gui/search/searchsortmodel.h

@@ -31,7 +31,6 @@
 
 #include <QSortFilterProxyModel>
 #include <QStringList>
-#include "base/utils/string.h"
 
 class SearchSortModel : public QSortFilterProxyModel
 {

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"
 

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"
 

src/gui/tagfiltermodel.h

@@ -30,17 +30,18 @@
 #define TAGFILTERMODEL_H
 
 #include <QAbstractListModel>
-#include <QModelIndex>
 #include <QSet>
 #include <QVector>
 
+class QModelIndex;
+
+class TagModelItem;
+
 namespace BitTorrent
 {
     class TorrentHandle;
 }
 
-class TagModelItem;
-
 class TagFilterModel : public QAbstractListModel
 {
     Q_OBJECT

src/gui/tagfilterproxymodel.h

@@ -30,7 +30,8 @@
 #define TAGFILTERPROXYMODEL_H
 
 #include <QSortFilterProxyModel>
-#include <QString>
+
+class QString;
 
 class TagFilterProxyModel : public QSortFilterProxyModel
 {

src/gui/tagfilterwidget.cpp

@@ -29,8 +29,6 @@
 #include "tagfilterwidget.h"
 
 #include <QAction>
-#include <QDebug>
-#include <QHeaderView>
 #include <QMenu>
 #include <QMessageBox>
 

src/gui/torrentcontentmodel.cpp

@@ -49,9 +49,9 @@
 #endif
 
 #include "base/bittorrent/downloadpriority.h"
+#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"

src/gui/torrentcontentmodel.h

@@ -30,16 +30,21 @@
 #define TORRENTCONTENTMODEL_H
 
 #include <QAbstractItemModel>
-#include <QModelIndex>
-#include <QVariant>
 #include <QVector>
 
-#include "base/bittorrent/torrentinfo.h"
 #include "torrentcontentmodelitem.h"
 
 class QFileIconProvider;
+class QModelIndex;
+class QVariant;
+
 class TorrentContentModelFile;
 
+namespace BitTorrent
+{
+    class TorrentInfo;
+}
+
 class TorrentContentModel : public QAbstractItemModel
 {
     Q_OBJECT

src/gui/torrentcontentmodelfile.h

@@ -29,9 +29,13 @@
 #ifndef TORRENTCONTENTMODELFILE_H
 #define TORRENTCONTENTMODELFILE_H
 
-#include "base/bittorrent/downloadpriority.h"
 #include "torrentcontentmodelitem.h"
 
+namespace BitTorrent
+{
+    enum class DownloadPriority;
+}
+
 class TorrentContentModelFile : public TorrentContentModelItem
 {
 public:

src/gui/torrentcontentmodelfolder.h

@@ -29,9 +29,13 @@
 #ifndef TORRENTCONTENTMODELFOLDER_H
 #define TORRENTCONTENTMODELFOLDER_H
 
-#include "base/bittorrent/downloadpriority.h"
 #include "torrentcontentmodelitem.h"
 
+namespace BitTorrent
+{
+    enum class DownloadPriority;
+}
+
 class TorrentContentModelFolder : public TorrentContentModelItem
 {
 public:

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)

src/gui/torrentcontentmodelitem.h

@@ -30,10 +30,11 @@
 #define TORRENTCONTENTMODELITEM_H
 
 #include <QList>
-#include <QVariant>
 
 #include "base/bittorrent/downloadpriority.h"
 
+class QVariant;
+
 class TorrentContentModelFolder;
 
 class TorrentContentModelItem

src/gui/torrentcreatordialog.cpp

@@ -30,7 +30,6 @@
 #include "torrentcreatordialog.h"
 
 #include <QCloseEvent>
-#include <QDebug>
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QMimeData>

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"
 

src/gui/transferlistfilterswidget.h

@@ -34,6 +34,7 @@
 
 class QCheckBox;
 class QResizeEvent;
+
 class TransferListWidget;
 
 namespace BitTorrent

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);

src/webui/api/apicontroller.h

@@ -31,9 +31,10 @@
 #include <QMap>
 #include <QObject>
 #include <QSet>
-#include <QString>
 #include <QVariant>
 
+class QString;
+
 struct ISessionManager;
 using StringMap = QMap<QString, QString>;
 using DataMap = QMap<QString, QByteArray>;

src/webui/api/isessionmanager.h

@@ -28,9 +28,10 @@
 
 #pragma once
 
-#include <QString>
 #include <QVariant>
 
+class QString;
+
 struct ISession
 {
     virtual ~ISession() = default;

src/webui/api/searchcontroller.cpp

@@ -28,6 +28,8 @@
 
 #include "searchcontroller.h"
 
+#include <QJsonArray>
+#include <QJsonObject>
 #include <QSharedPointer>
 
 #include "base/global.h"
@@ -37,6 +39,7 @@
 #include "base/utils/random.h"
 #include "base/utils/string.h"
 #include "apierror.h"
+#include "isessionmanager.h"
 
 class SearchPluginManager;
 

src/webui/api/searchcontroller.h

@@ -29,15 +29,16 @@
 #pragma once
 
 #include <QHash>
-#include <QJsonArray>
-#include <QJsonObject>
 #include <QList>
-#include <QString>
 
 #include "base/search/searchpluginmanager.h"
 #include "apicontroller.h"
-#include "isessionmanager.h"
 
+class QJsonArray;
+class QJsonObject;
+class QStringList;
+
+struct ISession;
 struct SearchResult;
 
 class SearchController : public APIController

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
 {

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"