Forward declare as much as possible

src/base/bittorrent/magneturi.cpp

@@ -34,6 +34,7 @@
 #include <libtorrent/sha1_hash.hpp>
 
 #include <QRegularExpression>
+#include <QUrl>
 
 #include "infohash.h"
 

src/base/bittorrent/magneturi.h

@@ -29,15 +29,16 @@
 #ifndef BITTORRENT_MAGNETURI_H
 #define BITTORRENT_MAGNETURI_H
 
+#include <libtorrent/add_torrent_params.hpp>
+
 #include <QList>
 #include <QString>
-#include <QUrl>
-
-#include <libtorrent/add_torrent_params.hpp>
 
 #include "infohash.h"
 #include "trackerentry.h"
 
+class QUrl;
+
 namespace BitTorrent
 {
     class MagnetUri

src/base/bittorrent/peerinfo.h

@@ -29,12 +29,12 @@
 #ifndef BITTORRENT_PEERINFO_H
 #define BITTORRENT_PEERINFO_H
 
+#include <libtorrent/peer_info.hpp>
+
 #include <QBitArray>
 #include <QCoreApplication>
 #include <QHostAddress>
 
-#include <libtorrent/peer_info.hpp>
-
 namespace BitTorrent
 {
     class TorrentHandle;

src/base/bittorrent/private/bandwidthscheduler.cpp

@@ -33,6 +33,7 @@
 
 #include <QDate>
 #include <QTime>
+#include <QTimer>
 
 #include "base/preferences.h"
 

src/base/bittorrent/private/filterparserthread.h

@@ -29,10 +29,10 @@
 #ifndef FILTERPARSERTHREAD_H
 #define FILTERPARSERTHREAD_H
 
-#include <QThread>
-
 #include <libtorrent/ip_filter.hpp>
 
+#include <QThread>
+
 class QDataStream;
 
 class FilterParserThread : public QThread

src/base/bittorrent/private/portforwarderimpl.cpp

@@ -28,10 +28,10 @@
 
 #include "portforwarderimpl.h"
 
-#include <QDebug>
-
 #include <libtorrent/session.hpp>
 
+#include <QDebug>
+
 #include "base/logger.h"
 #include "base/settingsstorage.h"
 

src/base/bittorrent/private/resumedatasavingmanager.cpp

@@ -28,6 +28,7 @@
 
 #include "resumedatasavingmanager.h"
 
+#include <QByteArray>
 #include <QDebug>
 #include <QSaveFile>
 

src/base/bittorrent/private/resumedatasavingmanager.h

@@ -28,10 +28,11 @@
 
 #pragma once
 
-#include <QByteArray>
 #include <QDir>
 #include <QObject>
 
+class QByteArray;
+
 class ResumeDataSavingManager : public QObject
 {
     Q_OBJECT

src/base/bittorrent/session.h

@@ -43,7 +43,6 @@
 #include <QSet>
 
 #include "base/settingvalue.h"
-#include "base/tristatebool.h"
 #include "base/types.h"
 #include "addtorrentparams.h"
 #include "cachestatus.h"

src/base/bittorrent/torrentinfo.h

@@ -29,7 +29,6 @@
 #ifndef BITTORRENT_TORRENTINFO_H
 #define BITTORRENT_TORRENTINFO_H
 
-#include <libtorrent/fwd.hpp>
 #include <libtorrent/torrent_info.hpp>
 #include <libtorrent/version.hpp>
 

src/base/filesystemwatcher.h

@@ -32,9 +32,11 @@
 #include <QDir>
 #include <QFileSystemWatcher>
 #include <QHash>
-#include <QStringList>
+#include <QList>
 #include <QTimer>
 
+class QStringList;
+
 /*
  * Subclassing QFileSystemWatcher in order to support Network File
  * System watching (NFS, CIFS) on Linux and Mac OS.

src/base/iconprovider.h

@@ -31,7 +31,8 @@
 #define ICONPROVIDER_H
 
 #include <QObject>
-#include <QString>
+
+class QString;
 
 class IconProvider : public QObject
 {

src/base/net/smtp.cpp

@@ -33,10 +33,12 @@
 #include "smtp.h"
 
 #include <QCryptographicHash>
+#include <QDateTime>
 #include <QDebug>
 #include <QHostInfo>
 #include <QStringList>
 #include <QTextCodec>
+
 #ifndef QT_NO_OPENSSL
 #include <QSslSocket>
 #else

src/base/preferences.cpp

@@ -29,9 +29,21 @@
 
 #include "preferences.h"
 
+#ifdef Q_OS_MAC
+#include <CoreServices/CoreServices.h>
+#endif
+#ifdef Q_OS_WIN
+#include <shlobj.h>
+#endif
+
+#include <QDateTime>
 #include <QDir>
 #include <QLocale>
+#include <QNetworkCookie>
 #include <QSettings>
+#include <QSize>
+#include <QTime>
+#include <QVariant>
 
 #ifndef DISABLE_GUI
 #include <QApplication>
@@ -40,14 +52,9 @@
 #endif
 
 #ifdef Q_OS_WIN
-#include <shlobj.h>
 #include <QRegularExpression>
 #endif
 
-#ifdef Q_OS_MAC
-#include <CoreServices/CoreServices.h>
-#endif
-
 #include "algorithm.h"
 #include "global.h"
 #include "settingsstorage.h"

src/base/preferences.h

@@ -30,16 +30,17 @@
 #ifndef PREFERENCES_H
 #define PREFERENCES_H
 
-#include <QDateTime>
 #include <QList>
-#include <QNetworkCookie>
-#include <QSize>
 #include <QStringList>
-#include <QTime>
-#include <QVariant>
 
 #include "base/utils/net.h"
 
+class QDateTime;
+class QNetworkCookie;
+class QSize;
+class QTime;
+class QVariant;
+
 enum SchedulerDays
 {
     EVERY_DAY,
@@ -74,8 +75,6 @@ namespace DNS
     };
 }
 
-class SettingsStorage;
-
 class Preferences : public QObject
 {
     Q_OBJECT

src/base/private/profile_p.cpp

@@ -31,8 +31,6 @@
 
 #include <QCoreApplication>
 
-#include "base/utils/fs.h"
-
 Private::Profile::Profile(const QString &configurationName)
     : m_configurationSuffix {configurationName.isEmpty() ? QString() : QLatin1Char('_') + configurationName}
 {

src/base/profile.h

@@ -33,8 +33,8 @@
 #include <memory>
 
 #include <QSettings>
-#include <QString>
 
+class QString;
 class Application;
 
 namespace Private

src/base/rss/rss_autodownloader.cpp

@@ -37,6 +37,7 @@
 #include <QSaveFile>
 #include <QThread>
 #include <QTimer>
+#include <QUrl>
 #include <QVariant>
 #include <QVector>
 

src/base/rss/rss_autodownloadrule.h

@@ -29,10 +29,10 @@
 
 #pragma once
 
-#include <QDateTime>
 #include <QSharedDataPointer>
 #include <QVariant>
 
+class QDateTime;
 class QJsonObject;
 class QRegularExpression;
 class TriStateBool;

src/base/search/searchhandler.h

@@ -32,6 +32,7 @@
 #include <QByteArray>
 #include <QList>
 #include <QObject>
+#include <QString>
 
 class QProcess;
 class QTimer;

src/base/settingvalue.h

@@ -33,7 +33,6 @@
 
 #include <QMetaEnum>
 #include <QString>
-#include <QVariant>
 
 #include "settingsstorage.h"
 

src/base/utils/fs.cpp

@@ -34,15 +34,6 @@
 #include <memory>
 #endif
 
-#include <QCoreApplication>
-#include <QDebug>
-#include <QDir>
-#include <QDirIterator>
-#include <QFile>
-#include <QFileInfo>
-#include <QStorageInfo>
-#include <QRegularExpression>
-
 #include <sys/stat.h>
 #include <sys/types.h>
 
@@ -58,6 +49,15 @@
 #include <unistd.h>
 #endif
 
+#include <QCoreApplication>
+#include <QDebug>
+#include <QDir>
+#include <QDirIterator>
+#include <QFile>
+#include <QFileInfo>
+#include <QStorageInfo>
+#include <QRegularExpression>
+
 #include "base/bittorrent/torrenthandle.h"
 #include "base/global.h"
 

src/base/utils/random.cpp

@@ -43,6 +43,8 @@
 #include <cstdio>
 #endif
 
+#include <QString>
+
 #include "misc.h"
 
 namespace