Forward declare in a few places

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/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/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/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/utils/string.h

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