turning a lot of includes into forward declares

src/common/Aliases.hpp

@@ -32,3 +32,5 @@ QStringAlias(UserName);
 QStringAlias(UserId);
 QStringAlias(Url);
 QStringAlias(Tooltip);
+QStringAlias(EmoteId);
+QStringAlias(EmoteName);

src/common/Channel.hpp

@@ -1,9 +1,7 @@
 #pragma once
 
 #include "common/CompletionModel.hpp"
-#include "messages/Image.hpp"
 #include "messages/LimitedQueue.hpp"
-#include "messages/Message.hpp"
 
 #include <QString>
 #include <QTimer>
@@ -12,7 +10,9 @@
 #include <memory>
 
 namespace chatterino {
+
 struct Message;
+using MessagePtr = std::shared_ptr<const Message>;
 
 class Channel : public std::enable_shared_from_this<Channel>
 {

src/common/Common.hpp

@@ -3,7 +3,6 @@
 #include "common/Aliases.hpp"
 #include "common/Outcome.hpp"
 #include "common/ProviderId.hpp"
-#include "debug/Log.hpp"
 
 #include <QString>
 #include <QWidget>
@@ -39,4 +38,7 @@ std::weak_ptr<T> weakOf(T *element)
     return element->shared_from_this();
 }
 
+struct Message;
+using MessagePtr = std::shared_ptr<const Message>;
+
 }  // namespace chatterino

src/common/CompletionModel.cpp

@@ -5,6 +5,7 @@
 #include "controllers/accounts/AccountController.hpp"
 #include "controllers/commands/CommandController.hpp"
 #include "debug/Log.hpp"
+#include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchServer.hpp"
 #include "singletons/Emotes.hpp"
 

src/common/CompletionModel.hpp

@@ -1,7 +1,5 @@
 #pragma once
 
-#include "common/Common.hpp"
-
 #include <QAbstractListModel>
 
 #include <chrono>

src/common/NetworkCommon.hpp

@@ -2,12 +2,11 @@
 
 #include <functional>
 
-#include "Common.hpp"
-
 class QNetworkReply;
 
 namespace chatterino {
 
+class Outcome;
 class NetworkResult;
 
 using NetworkSuccessCallback = std::function<Outcome(NetworkResult)>;

src/common/NetworkManager.hpp

@@ -1,16 +1,7 @@
 #pragma once
 
-#include "common/NetworkRequester.hpp"
-#include "common/NetworkWorker.hpp"
-#include "debug/Log.hpp"
-
-#include <QJsonDocument>
-#include <QJsonObject>
 #include <QNetworkAccessManager>
-#include <QNetworkReply>
 #include <QThread>
-#include <QTimer>
-#include <QUrl>
 
 namespace chatterino {
 

src/common/NetworkRequest.cpp

@@ -1,7 +1,9 @@
 #include "common/NetworkRequest.hpp"
 
 #include "Application.hpp"
+#include "common/NetworkData.hpp"
 #include "common/NetworkManager.hpp"
+#include "common/Outcome.hpp"
 #include "debug/Log.hpp"
 #include "providers/twitch/TwitchCommon.hpp"
 #include "singletons/Paths.hpp"

src/common/NetworkRequest.hpp

@@ -1,14 +1,13 @@
 #pragma once
 
-#include "Application.hpp"
 #include "common/NetworkCommon.hpp"
-#include "common/NetworkData.hpp"
 #include "common/NetworkRequester.hpp"
 #include "common/NetworkResult.hpp"
 #include "common/NetworkTimer.hpp"
 #include "common/NetworkWorker.hpp"
 
 namespace chatterino {
+class NetworkData;
 
 class NetworkRequest
 {