Remove Unnecessary Includes in Headers (#4275)

* refactor: remove unnecessary includes in headers

* fix: formatting

* chore: changelog

* fix: scrollbar

* fix: suggestions and old appbase remains

* fix: suggestion

* fix: missing Qt forward declarations

* fix: another qt include

* fix: includes for precompiled-headers=off

* Add missing `<memory>` includes

* Add missing `#pragma once`

* Fix tests

Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>

src/providers/IvrApi.cpp

@@ -1,5 +1,6 @@
 #include "IvrApi.hpp"
 
+#include "common/NetworkResult.hpp"
 #include "common/Outcome.hpp"
 #include "common/QLogging.hpp"
 

src/providers/IvrApi.hpp

@@ -1,10 +1,11 @@
 #pragma once
 
 #include "common/NetworkRequest.hpp"
-#include "messages/Link.hpp"
 #include "providers/twitch/TwitchEmotes.hpp"
 
 #include <boost/noncopyable.hpp>
+#include <QJsonArray>
+#include <QJsonObject>
 
 #include <functional>
 

src/providers/LinkResolver.cpp

@@ -1,8 +1,9 @@
 #include "providers/LinkResolver.hpp"
 
-#include "common/Common.hpp"
 #include "common/Env.hpp"
 #include "common/NetworkRequest.hpp"
+#include "common/NetworkResult.hpp"
+#include "common/Outcome.hpp"
 #include "messages/Image.hpp"
 #include "messages/Link.hpp"
 #include "singletons/Settings.hpp"

src/providers/LinkResolver.hpp

@@ -1,14 +1,17 @@
 #pragma once
 
-#include "messages/Image.hpp"
-#include "messages/Link.hpp"
-
+#include <QObject>
 #include <QString>
 
 #include <functional>
+#include <memory>
 
 namespace chatterino {
 
+class Image;
+struct Link;
+using ImagePtr = std::shared_ptr<Image>;
+
 class LinkResolver
 {
 public:

src/providers/RecentMessagesApi.cpp

@@ -1,10 +1,12 @@
-#include "RecentMessagesApi.hpp"
+#include "providers/RecentMessagesApi.hpp"
 
 #include "common/Channel.hpp"
 #include "common/Common.hpp"
 #include "common/Env.hpp"
 #include "common/NetworkRequest.hpp"
+#include "common/NetworkResult.hpp"
 #include "common/QLogging.hpp"
+#include "messages/Message.hpp"
 #include "providers/twitch/IrcMessageHandler.hpp"
 #include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchMessageBuilder.hpp"
@@ -16,6 +18,7 @@
 #include <QJsonArray>
 #include <QJsonObject>
 #include <QUrl>
+#include <QUrlQuery>
 
 namespace chatterino {
 

src/providers/bttv/BttvEmotes.cpp

@@ -1,7 +1,7 @@
 #include "providers/bttv/BttvEmotes.hpp"
 
-#include "common/Common.hpp"
 #include "common/NetworkRequest.hpp"
+#include "common/NetworkResult.hpp"
 #include "common/QLogging.hpp"
 #include "messages/Emote.hpp"
 #include "messages/Image.hpp"

src/providers/bttv/BttvEmotes.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "boost/optional.hpp"
 #include "common/Aliases.hpp"
 #include "common/Atomic.hpp"
-#include "providers/twitch/TwitchChannel.hpp"
+
+#include <boost/optional.hpp>
 
 #include <memory>
 
@@ -12,6 +12,7 @@ namespace chatterino {
 struct Emote;
 using EmotePtr = std::shared_ptr<const Emote>;
 class EmoteMap;
+class Channel;
 
 class BttvEmotes final
 {

src/providers/bttv/LoadBttvChannelEmote.cpp

@@ -1,15 +0,0 @@
-#include "LoadBttvChannelEmote.hpp"
-
-#include "common/Common.hpp"
-#include "common/NetworkRequest.hpp"
-#include "common/UniqueAccess.hpp"
-#include "messages/Emote.hpp"
-
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QJsonValue>
-#include <QThread>
-
-namespace chatterino {
-
-}  // namespace chatterino

src/providers/bttv/LoadBttvChannelEmote.hpp

@@ -1,9 +0,0 @@
-#pragma once
-
-#include <functional>
-
-class QString;
-
-namespace chatterino {
-
-}  // namespace chatterino

src/providers/chatterino/ChatterinoBadges.cpp

@@ -1,6 +1,7 @@
 #include "ChatterinoBadges.hpp"
 
 #include "common/NetworkRequest.hpp"
+#include "common/NetworkResult.hpp"
 #include "common/Outcome.hpp"
 #include "messages/Emote.hpp"
 

src/providers/chatterino/ChatterinoBadges.hpp

@@ -1,10 +1,10 @@
 #pragma once
 
 #include "common/Aliases.hpp"
+#include "common/Singleton.hpp"
 #include "util/QStringHash.hpp"
 
 #include <boost/optional.hpp>
-#include <common/Singleton.hpp>
 
 #include <memory>
 #include <shared_mutex>

src/providers/colors/ColorProvider.cpp

@@ -1,5 +1,7 @@
 #include "providers/colors/ColorProvider.hpp"
 
+#include "controllers/highlights/HighlightPhrase.hpp"
+#include "singletons/Settings.hpp"
 #include "singletons/Theme.hpp"
 
 namespace chatterino {

src/providers/emoji/Emojis.cpp

@@ -1,9 +1,10 @@
 #include "providers/emoji/Emojis.hpp"
 
-#include "Application.hpp"
 #include "common/QLogging.hpp"
 #include "messages/Emote.hpp"
+#include "messages/Image.hpp"
 #include "singletons/Settings.hpp"
+#include "util/RapidjsonHelpers.hpp"
 
 #include <boost/variant.hpp>
 #include <QFile>
@@ -11,6 +12,7 @@
 #include <rapidjson/error/error.h>
 #include <rapidjson/rapidjson.h>
 
+#include <array>
 #include <memory>
 
 namespace chatterino {

src/providers/ffz/FfzBadges.cpp

@@ -1,6 +1,7 @@
 #include "FfzBadges.hpp"
 
 #include "common/NetworkRequest.hpp"
+#include "common/NetworkResult.hpp"
 #include "common/Outcome.hpp"
 #include "messages/Emote.hpp"
 

src/providers/ffz/FfzBadges.hpp

@@ -1,14 +1,12 @@
 #pragma once
 
 #include "common/Aliases.hpp"
-#include "common/UniqueAccess.hpp"
+#include "common/Singleton.hpp"
 #include "util/QStringHash.hpp"
 
 #include <boost/optional.hpp>
-#include <common/Singleton.hpp>
 #include <QColor>
 
-#include <map>
 #include <memory>
 #include <set>
 #include <shared_mutex>

src/providers/ffz/FfzEmotes.cpp

@@ -1,6 +1,7 @@
 #include "providers/ffz/FfzEmotes.hpp"
 
 #include "common/NetworkRequest.hpp"
+#include "common/NetworkResult.hpp"
 #include "common/Outcome.hpp"
 #include "common/QLogging.hpp"
 #include "messages/Emote.hpp"
@@ -9,8 +10,6 @@
 #include "providers/twitch/TwitchChannel.hpp"
 #include "singletons/Settings.hpp"
 
-#include <QJsonArray>
-
 namespace chatterino {
 namespace {
 

src/providers/ffz/FfzEmotes.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "boost/optional.hpp"
 #include "common/Aliases.hpp"
 #include "common/Atomic.hpp"
-#include "providers/twitch/TwitchChannel.hpp"
+
+#include <boost/optional.hpp>
 
 #include <memory>
 
@@ -12,12 +12,10 @@ namespace chatterino {
 struct Emote;
 using EmotePtr = std::shared_ptr<const Emote>;
 class EmoteMap;
+class Channel;
 
 class FfzEmotes final
 {
-    static constexpr const char *globalEmoteApiUrl =
-        "https://api.frankerfacez.com/v1/set/global";
-
 public:
     FfzEmotes();
 

src/providers/irc/AbstractIrcServer.cpp

@@ -1,7 +1,6 @@
 #include "AbstractIrcServer.hpp"
 
 #include "common/Channel.hpp"
-#include "common/Common.hpp"
 #include "common/QLogging.hpp"
 #include "messages/LimitedQueueSnapshot.hpp"
 #include "messages/Message.hpp"

src/providers/irc/AbstractIrcServer.hpp

@@ -15,6 +15,7 @@ namespace chatterino {
 
 class Channel;
 using ChannelPtr = std::shared_ptr<Channel>;
+class RatelimitBucket;
 
 class AbstractIrcServer : public QObject
 {

src/providers/irc/Irc2.cpp

@@ -2,6 +2,8 @@
 
 #include "common/Credentials.hpp"
 #include "common/SignalVectorModel.hpp"
+#include "providers/irc/IrcChannel2.hpp"
+#include "providers/irc/IrcServer.hpp"
 #include "singletons/Paths.hpp"
 #include "util/CombinePath.hpp"
 #include "util/RapidjsonHelpers.hpp"

src/providers/irc/Irc2.hpp

@@ -1,8 +1,6 @@
 #pragma once
 
 #include "common/SignalVector.hpp"
-#include "providers/irc/IrcChannel2.hpp"
-#include "providers/irc/IrcServer.hpp"
 
 #include <rapidjson/rapidjson.h>
 
@@ -10,6 +8,10 @@ class QAbstractTableModel;
 
 namespace chatterino {
 
+class Channel;
+using ChannelPtr = std::shared_ptr<Channel>;
+class IrcServer;
+
 enum class IrcAuthType { Anonymous, Custom, Pass, Sasl };
 
 struct IrcServerData {

src/providers/irc/IrcChannel2.cpp

@@ -3,6 +3,7 @@
 #include "debug/AssertInGuiThread.hpp"
 #include "messages/Message.hpp"
 #include "messages/MessageBuilder.hpp"
+#include "messages/MessageElement.hpp"
 #include "providers/irc/IrcCommands.hpp"
 #include "providers/irc/IrcMessageBuilder.hpp"
 #include "providers/irc/IrcServer.hpp"

src/providers/irc/IrcMessageBuilder.cpp

@@ -1,15 +1,11 @@
 #include "providers/irc/IrcMessageBuilder.hpp"
 
-#include "Application.hpp"
-#include "common/IrcColors.hpp"
-#include "controllers/accounts/AccountController.hpp"
 #include "controllers/ignores/IgnoreController.hpp"
 #include "controllers/ignores/IgnorePhrase.hpp"
 #include "messages/Message.hpp"
 #include "messages/MessageColor.hpp"
-#include "providers/chatterino/ChatterinoBadges.hpp"
+#include "messages/MessageElement.hpp"
 #include "singletons/Emotes.hpp"
-#include "singletons/Resources.hpp"
 #include "singletons/Settings.hpp"
 #include "singletons/Theme.hpp"
 #include "singletons/WindowManager.hpp"

src/providers/irc/IrcMessageBuilder.hpp

@@ -3,7 +3,6 @@
 #include "common/Aliases.hpp"
 #include "common/Outcome.hpp"
 #include "messages/SharedMessageBuilder.hpp"
-#include "providers/twitch/TwitchBadge.hpp"
 
 #include <IrcMessage>
 #include <QString>
@@ -15,7 +14,6 @@ struct Emote;
 using EmotePtr = std::shared_ptr<const Emote>;
 
 class Channel;
-class TwitchChannel;
 
 class IrcMessageBuilder : public SharedMessageBuilder
 {

src/providers/irc/IrcServer.cpp

@@ -1,5 +1,6 @@
 #include "IrcServer.hpp"
 
+#include "Application.hpp"
 #include "common/QLogging.hpp"
 #include "messages/Message.hpp"
 #include "messages/MessageColor.hpp"

src/providers/irc/IrcServer.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "providers/irc/AbstractIrcServer.hpp"
-#include "providers/irc/IrcAccount.hpp"
 
 namespace chatterino {
 

src/providers/seventv/SeventvBadges.cpp

@@ -1,6 +1,7 @@
 #include "providers/seventv/SeventvBadges.hpp"
 
 #include "common/NetworkRequest.hpp"
+#include "common/NetworkResult.hpp"
 #include "common/Outcome.hpp"
 #include "messages/Emote.hpp"
 

src/providers/seventv/SeventvBadges.hpp

@@ -1,10 +1,10 @@
 #pragma once
 
 #include "common/Aliases.hpp"
+#include "common/Singleton.hpp"
 #include "util/QStringHash.hpp"
 
 #include <boost/optional.hpp>
-#include <common/Singleton.hpp>
 
 #include <memory>
 #include <shared_mutex>

src/providers/seventv/SeventvEmotes.cpp

@@ -1,12 +1,13 @@
 #include "providers/seventv/SeventvEmotes.hpp"
 
-#include "common/Common.hpp"
 #include "common/NetworkRequest.hpp"
+#include "common/NetworkResult.hpp"
 #include "common/QLogging.hpp"
 #include "messages/Emote.hpp"
 #include "messages/Image.hpp"
 #include "messages/ImageSet.hpp"
 #include "messages/MessageBuilder.hpp"
+#include "providers/seventv/eventapi/SeventvEventAPIDispatch.hpp"
 #include "providers/twitch/TwitchChannel.hpp"
 #include "singletons/Settings.hpp"
 
@@ -14,6 +15,7 @@
 #include <QJsonDocument>
 #include <QThread>
 
+#include <array>
 #include <utility>
 
 /**

src/providers/seventv/SeventvEmotes.hpp

@@ -3,13 +3,17 @@
 #include "boost/optional.hpp"
 #include "common/Aliases.hpp"
 #include "common/Atomic.hpp"
-#include "providers/seventv/eventapi/SeventvEventAPIDispatch.hpp"
-#include "providers/twitch/TwitchChannel.hpp"
+#include "common/FlagsEnum.hpp"
 
 #include <memory>
 
 namespace chatterino {
 
+class Channel;
+struct SeventvEventAPIEmoteAddDispatch;
+struct SeventvEventAPIEmoteUpdateDispatch;
+struct SeventvEventAPIEmoteRemoveDispatch;
+
 // https://github.com/SevenTV/API/blob/a84e884b5590dbb5d91a5c6b3548afabb228f385/data/model/emote-set.model.go#L29-L36
 enum class SeventvActiveEmoteFlag : int64_t {
     None = 0LL,

src/providers/seventv/SeventvEventAPI.cpp

@@ -1,6 +1,7 @@
 #include "providers/seventv/SeventvEventAPI.hpp"
 
 #include "providers/seventv/eventapi/SeventvEventAPIClient.hpp"
+#include "providers/seventv/eventapi/SeventvEventAPIDispatch.hpp"
 #include "providers/seventv/eventapi/SeventvEventAPIMessage.hpp"
 
 #include <QJsonArray>

src/providers/seventv/SeventvEventAPI.hpp

@@ -2,14 +2,19 @@
 
 #include "providers/liveupdates/BasicPubSubClient.hpp"
 #include "providers/liveupdates/BasicPubSubManager.hpp"
-#include "providers/seventv/eventapi/SeventvEventAPIDispatch.hpp"
-#include "providers/seventv/eventapi/SeventvEventAPISubscription.hpp"
 #include "util/QStringHash.hpp"
 
 #include <pajlada/signals/signal.hpp>
 
 namespace chatterino {
 
+struct SeventvEventAPISubscription;
+struct SeventvEventAPIDispatch;
+struct SeventvEventAPIEmoteAddDispatch;
+struct SeventvEventAPIEmoteUpdateDispatch;
+struct SeventvEventAPIEmoteRemoveDispatch;
+struct SeventvEventAPIUserConnectionUpdateDispatch;
+
 class SeventvEventAPI : public BasicPubSubManager<SeventvEventAPISubscription>
 {
     template <typename T>

src/providers/seventv/eventapi/SeventvEventAPIClient.cpp

@@ -1,5 +1,6 @@
 #include "providers/seventv/eventapi/SeventvEventAPIClient.hpp"
 
+#include "providers/seventv/eventapi/SeventvEventAPISubscription.hpp"
 #include "providers/twitch/PubSubHelpers.hpp"
 
 #include <utility>

src/providers/seventv/eventapi/SeventvEventAPIClient.hpp

@@ -1,6 +1,8 @@
 #pragma once
 
 #include "providers/liveupdates/BasicPubSubClient.hpp"
+// this needs to be included for the specialization
+// of std::hash for SeventvEventAPISubscription
 #include "providers/seventv/eventapi/SeventvEventAPISubscription.hpp"
 
 namespace chatterino {

src/providers/seventv/eventapi/SeventvEventAPIMessage.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "providers/seventv/SeventvEventAPI.hpp"
+#include "providers/seventv/eventapi/SeventvEventAPISubscription.hpp"
 
 #include <boost/optional.hpp>
 #include <magic_enum.hpp>

src/providers/twitch/ChannelPointReward.cpp

@@ -1,6 +1,7 @@
 #include "ChannelPointReward.hpp"
 
 #include "common/QLogging.hpp"
+#include "messages/Image.hpp"
 
 namespace chatterino {
 

src/providers/twitch/ChannelPointReward.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "common/Aliases.hpp"
-#include "messages/Image.hpp"
 #include "messages/ImageSet.hpp"
 
 #include <QJsonObject>

src/providers/twitch/IrcMessageHandler.cpp

@@ -4,12 +4,19 @@
 #include "common/QLogging.hpp"
 #include "controllers/accounts/AccountController.hpp"
 #include "messages/LimitedQueue.hpp"
+#include "messages/Link.hpp"
 #include "messages/Message.hpp"
+#include "messages/MessageBuilder.hpp"
+#include "messages/MessageColor.hpp"
+#include "messages/MessageElement.hpp"
+#include "messages/MessageThread.hpp"
+#include "providers/twitch/ChannelPointReward.hpp"
 #include "providers/twitch/TwitchAccount.hpp"
 #include "providers/twitch/TwitchAccountManager.hpp"
 #include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchHelpers.hpp"
 #include "providers/twitch/TwitchIrcServer.hpp"
+#include "providers/twitch/TwitchMessageBuilder.hpp"
 #include "singletons/Resources.hpp"
 #include "singletons/Settings.hpp"
 #include "singletons/WindowManager.hpp"

src/providers/twitch/IrcMessageHandler.hpp

@@ -1,9 +1,6 @@
 #pragma once
 
-#include "common/Channel.hpp"
-#include "messages/Message.hpp"
-#include "providers/twitch/TwitchChannel.hpp"
-#include "providers/twitch/TwitchMessageBuilder.hpp"
+#include "messages/LimitedQueueSnapshot.hpp"
 
 #include <IrcMessage>
 
@@ -13,6 +10,11 @@ namespace chatterino {
 
 class TwitchIrcServer;
 class Channel;
+using ChannelPtr = std::shared_ptr<Channel>;
+struct Message;
+using MessagePtr = std::shared_ptr<const Message>;
+class TwitchChannel;
+class TwitchMessageBuilder;
 
 class IrcMessageHandler
 {

src/providers/twitch/PubSubClient.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "providers/twitch/PubSubClientOptions.hpp"
-#include "providers/twitch/PubSubMessages.hpp"
 #include "providers/twitch/PubSubWebsocket.hpp"
 
 #include <pajlada/signals/signal.hpp>
@@ -12,6 +11,9 @@
 
 namespace chatterino {
 
+struct PubSubMessage;
+struct PubSubListenMessage;
+
 struct TopicData {
     QString topic;
     bool authed{false};

src/providers/twitch/PubSubHelpers.hpp

@@ -1,11 +1,9 @@
 #pragma once
 
 #include "common/QLogging.hpp"
-#include "util/RapidjsonHelpers.hpp"
 
 #include <boost/asio.hpp>
 #include <boost/asio/steady_timer.hpp>
-#include <QJsonObject>
 
 #include <memory>
 

src/providers/twitch/PubSubManager.cpp

@@ -2,6 +2,7 @@
 
 #include "common/QLogging.hpp"
 #include "providers/twitch/PubSubActions.hpp"
+#include "providers/twitch/PubSubClient.hpp"
 #include "providers/twitch/PubSubHelpers.hpp"
 #include "providers/twitch/PubSubMessages.hpp"
 #include "providers/twitch/TwitchAccount.hpp"
@@ -9,6 +10,8 @@
 #include "util/Helpers.hpp"
 #include "util/RapidjsonHelpers.hpp"
 
+#include <QJsonArray>
+
 #include <algorithm>
 #include <exception>
 #include <iostream>

src/providers/twitch/PubSubManager.hpp

@@ -1,14 +1,11 @@
 #pragma once
 
-#include "providers/twitch/ChatterinoWebSocketppLogger.hpp"
-#include "providers/twitch/PubSubActions.hpp"
-#include "providers/twitch/PubSubClient.hpp"
 #include "providers/twitch/PubSubClientOptions.hpp"
-#include "providers/twitch/PubSubMessages.hpp"
 #include "providers/twitch/PubSubWebsocket.hpp"
 #include "util/ExponentialBackoff.hpp"
 #include "util/QStringHash.hpp"
 
+#include <boost/optional.hpp>
 #include <pajlada/signals/signal.hpp>
 #include <QJsonObject>
 #include <QString>
@@ -25,6 +22,23 @@
 namespace chatterino {
 
 class TwitchAccount;
+class PubSubClient;
+
+struct ClearChatAction;
+struct DeleteAction;
+struct ModeChangedAction;
+struct ModerationStateAction;
+struct BanAction;
+struct UnbanAction;
+struct PubSubAutoModQueueMessage;
+struct AutomodAction;
+struct AutomodUserAction;
+struct AutomodInfoAction;
+struct PubSubWhisperMessage;
+
+struct PubSubListenMessage;
+struct PubSubMessage;
+struct PubSubMessageMessage;
 
 class PubSub
 {

src/providers/twitch/TwitchAccount.hpp

@@ -2,11 +2,9 @@
 
 #include "common/Aliases.hpp"
 #include "common/Atomic.hpp"
-#include "common/Channel.hpp"
 #include "common/UniqueAccess.hpp"
 #include "controllers/accounts/Account.hpp"
 #include "messages/Emote.hpp"
-#include "providers/twitch/TwitchUser.hpp"
 #include "util/QStringHash.hpp"
 
 #include <QColor>
@@ -20,6 +18,10 @@
 
 namespace chatterino {
 
+struct TwitchUser;
+class Channel;
+using ChannelPtr = std::shared_ptr<Channel>;
+
 class TwitchAccount : public Account
 {
 public:

src/providers/twitch/TwitchAccountManager.cpp

@@ -5,6 +5,8 @@
 #include "providers/twitch/api/Helix.hpp"
 #include "providers/twitch/TwitchAccount.hpp"
 #include "providers/twitch/TwitchCommon.hpp"
+#include "providers/twitch/TwitchUser.hpp"
+#include "util/SharedPtrElementLess.hpp"
 
 namespace chatterino {
 

src/providers/twitch/TwitchAccountManager.hpp

@@ -2,7 +2,7 @@
 
 #include "common/ChatterinoSetting.hpp"
 #include "common/SignalVector.hpp"
-#include "util/SharedPtrElementLess.hpp"
+#include "util/RapidJsonSerializeQString.hpp"
 
 #include <boost/signals2.hpp>
 

src/providers/twitch/TwitchBadges.cpp

@@ -1,9 +1,12 @@
 #include "TwitchBadges.hpp"
 
 #include "common/NetworkRequest.hpp"
+#include "common/NetworkResult.hpp"
 #include "common/Outcome.hpp"
 #include "common/QLogging.hpp"
 #include "messages/Emote.hpp"
+#include "messages/Image.hpp"
+#include "util/DisplayBadge.hpp"
 
 #include <QBuffer>
 #include <QIcon>

src/providers/twitch/TwitchBadges.hpp

@@ -1,12 +1,11 @@
 #pragma once
 
 #include "common/UniqueAccess.hpp"
-#include "messages/Image.hpp"
-#include "util/DisplayBadge.hpp"
 #include "util/QStringHash.hpp"
 
 #include <boost/optional.hpp>
 #include <pajlada/signals/signal.hpp>
+#include <QIcon>
 #include <QMap>
 #include <QString>
 
@@ -22,6 +21,8 @@ using EmotePtr = std::shared_ptr<const Emote>;
 
 class Settings;
 class Paths;
+class Image;
+class DisplayBadge;
 
 class TwitchBadges
 {

src/providers/twitch/TwitchChannel.cpp

@@ -1,19 +1,26 @@
 #include "providers/twitch/TwitchChannel.hpp"
 
+#include "Application.hpp"
 #include "common/Common.hpp"
 #include "common/Env.hpp"
 #include "common/NetworkRequest.hpp"
+#include "common/NetworkResult.hpp"
 #include "common/QLogging.hpp"
 #include "controllers/accounts/AccountController.hpp"
 #include "controllers/notifications/NotificationController.hpp"
 #include "messages/Emote.hpp"
+#include "messages/Image.hpp"
+#include "messages/Link.hpp"
 #include "messages/Message.hpp"
+#include "messages/MessageElement.hpp"
+#include "messages/MessageThread.hpp"
 #include "providers/bttv/BttvEmotes.hpp"
-#include "providers/bttv/LoadBttvChannelEmote.hpp"
 #include "providers/RecentMessagesApi.hpp"
+#include "providers/seventv/eventapi/SeventvEventAPIDispatch.hpp"
 #include "providers/seventv/SeventvEmotes.hpp"
 #include "providers/seventv/SeventvEventAPI.hpp"
 #include "providers/twitch/api/Helix.hpp"
+#include "providers/twitch/ChannelPointReward.hpp"
 #include "providers/twitch/IrcMessageHandler.hpp"
 #include "providers/twitch/PubSubManager.hpp"
 #include "providers/twitch/TwitchAccount.hpp"

src/providers/twitch/TwitchChannel.hpp

@@ -1,17 +1,11 @@
 #pragma once
 
-#include "Application.hpp"
 #include "common/Aliases.hpp"
 #include "common/Atomic.hpp"
 #include "common/Channel.hpp"
 #include "common/ChannelChatters.hpp"
-#include "common/ChatterSet.hpp"
 #include "common/Outcome.hpp"
 #include "common/UniqueAccess.hpp"
-#include "messages/MessageThread.hpp"
-#include "providers/seventv/eventapi/SeventvEventAPIDispatch.hpp"
-#include "providers/twitch/api/Helix.hpp"
-#include "providers/twitch/ChannelPointReward.hpp"
 #include "providers/twitch/TwitchEmotes.hpp"
 #include "util/QStringHash.hpp"
 
@@ -54,6 +48,14 @@ class TwitchBadges;
 class FfzEmotes;
 class BttvEmotes;
 class SeventvEmotes;
+struct SeventvEventAPIEmoteAddDispatch;
+struct SeventvEventAPIEmoteUpdateDispatch;
+struct SeventvEventAPIEmoteRemoveDispatch;
+struct SeventvEventAPIUserConnectionUpdateDispatch;
+struct ChannelPointReward;
+class MessageThread;
+struct CheerEmoteSet;
+struct HelixStream;
 
 class TwitchIrcServer;
 

src/providers/twitch/TwitchIrcServer.cpp

@@ -1,18 +1,19 @@
 #include "TwitchIrcServer.hpp"
 
 #include "Application.hpp"
-#include "common/Common.hpp"
 #include "common/Env.hpp"
 #include "common/QLogging.hpp"
 #include "controllers/accounts/AccountController.hpp"
 #include "messages/Message.hpp"
 #include "messages/MessageBuilder.hpp"
+#include "providers/seventv/eventapi/SeventvEventAPISubscription.hpp"
 #include "providers/seventv/SeventvEventAPI.hpp"
+#include "providers/twitch/api/Helix.hpp"
+#include "providers/twitch/ChannelPointReward.hpp"
 #include "providers/twitch/IrcMessageHandler.hpp"
 #include "providers/twitch/PubSubManager.hpp"
 #include "providers/twitch/TwitchAccount.hpp"
 #include "providers/twitch/TwitchChannel.hpp"
-#include "providers/twitch/TwitchHelpers.hpp"
 #include "singletons/Settings.hpp"
 #include "util/Helpers.hpp"
 #include "util/PostToThread.hpp"

src/providers/twitch/TwitchIrcServer.hpp

@@ -3,12 +3,13 @@
 #include "common/Atomic.hpp"
 #include "common/Channel.hpp"
 #include "common/Singleton.hpp"
-#include "pajlada/signals/signalholder.hpp"
 #include "providers/bttv/BttvEmotes.hpp"
 #include "providers/ffz/FfzEmotes.hpp"
 #include "providers/irc/AbstractIrcServer.hpp"
 #include "providers/seventv/SeventvEmotes.hpp"
 
+#include <pajlada/signals/signalholder.hpp>
+
 #include <chrono>
 #include <memory>
 #include <queue>

src/providers/twitch/TwitchMessageBuilder.cpp

@@ -7,10 +7,16 @@
 #include "controllers/ignores/IgnorePhrase.hpp"
 #include "controllers/userdata/UserDataController.hpp"
 #include "messages/Emote.hpp"
+#include "messages/Image.hpp"
 #include "messages/Message.hpp"
+#include "messages/MessageThread.hpp"
 #include "providers/chatterino/ChatterinoBadges.hpp"
+#include "providers/colors/ColorProvider.hpp"
 #include "providers/ffz/FfzBadges.hpp"
 #include "providers/seventv/SeventvBadges.hpp"
+#include "providers/twitch/api/Helix.hpp"
+#include "providers/twitch/ChannelPointReward.hpp"
+#include "providers/twitch/PubSubActions.hpp"
 #include "providers/twitch/TwitchAccount.hpp"
 #include "providers/twitch/TwitchBadge.hpp"
 #include "providers/twitch/TwitchBadges.hpp"
@@ -27,7 +33,6 @@
 #include "widgets/Window.hpp"
 
 #include <boost/variant.hpp>
-#include <QApplication>
 #include <QColor>
 #include <QDebug>
 #include <QMediaPlayer>

src/providers/twitch/TwitchMessageBuilder.hpp

@@ -2,13 +2,9 @@
 
 #include "common/Aliases.hpp"
 #include "common/Outcome.hpp"
-#include "messages/MessageThread.hpp"
 #include "messages/SharedMessageBuilder.hpp"
-#include "providers/twitch/api/Helix.hpp"
-#include "providers/twitch/ChannelPointReward.hpp"
-#include "providers/twitch/PubSubActions.hpp"
-#include "providers/twitch/TwitchBadge.hpp"
 
+#include <boost/optional.hpp>
 #include <IrcMessage>
 #include <QString>
 #include <QVariant>
@@ -20,6 +16,11 @@ using EmotePtr = std::shared_ptr<const Emote>;
 
 class Channel;
 class TwitchChannel;
+class MessageThread;
+struct HelixVip;
+using HelixModerator = HelixVip;
+struct ChannelPointReward;
+struct DeleteAction;
 
 struct TwitchEmoteOccurrence {
     int start;

src/providers/twitch/TwitchUser.cpp

@@ -1,7 +1,15 @@
 #include "providers/twitch/TwitchUser.hpp"
 
+#include "providers/twitch/api/Helix.hpp"
 #include "util/RapidjsonHelpers.hpp"
 
 namespace chatterino {
 
+void TwitchUser::fromHelixBlock(const HelixBlock &ignore)
+{
+    this->id = ignore.userId;
+    this->name = ignore.userName;
+    this->displayName = ignore.displayName;
+}
+
 }  // namespace chatterino

src/providers/twitch/TwitchUser.hpp

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "providers/twitch/api/Helix.hpp"
 #include "util/RapidjsonHelpers.hpp"
 
 #include <pajlada/serialize.hpp>
@@ -11,6 +10,8 @@
 
 namespace chatterino {
 
+struct HelixBlock;
+
 struct TwitchUser {
     QString id;
     mutable QString name;
@@ -24,12 +25,7 @@ struct TwitchUser {
         this->displayName = other.displayName;
     }
 
-    void fromHelixBlock(const HelixBlock &ignore)
-    {
-        this->id = ignore.userId;
-        this->name = ignore.userName;
-        this->displayName = ignore.displayName;
-    }
+    void fromHelixBlock(const HelixBlock &ignore);
 
     bool operator<(const TwitchUser &rhs) const
     {

src/providers/twitch/api/Helix.cpp

@@ -1,5 +1,7 @@
 #include "providers/twitch/api/Helix.hpp"
 
+#include "common/NetworkRequest.hpp"
+#include "common/NetworkResult.hpp"
 #include "common/Outcome.hpp"
 #include "common/QLogging.hpp"
 

src/providers/twitch/api/Helix.hpp

@@ -7,6 +7,7 @@
 
 #include <boost/optional.hpp>
 #include <QJsonArray>
+#include <QJsonObject>
 #include <QString>
 #include <QStringList>
 #include <QUrl>