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>

CHANGELOG.md

@@ -24,7 +24,7 @@
 - Dev: Ignore `WM_SHOWWINDOW` hide events, causing fewer attempted rescales. (#4198)
 - Dev: Migrated to C++ 20 (#4252, #4257)
 - Dev: Enable LTO for main branch builds. (#4258, #4260)
-- Dev: Removed unused include directives. (#4266)
+- Dev: Removed unused include directives. (#4266, #4275)
 - Dev: Removed TooltipPreviewImage. (#4268)
 - Dev: Removed unused operators in `Image` (#4267)
 

src/Application.cpp

@@ -4,6 +4,7 @@
 #include "common/QLogging.hpp"
 #include "common/Version.hpp"
 #include "controllers/accounts/AccountController.hpp"
+#include "controllers/commands/Command.hpp"
 #include "controllers/commands/CommandController.hpp"
 #include "controllers/highlights/HighlightController.hpp"
 #include "controllers/hotkeys/HotkeyController.hpp"
@@ -11,24 +12,27 @@
 #include "controllers/notifications/NotificationController.hpp"
 #include "controllers/userdata/UserDataController.hpp"
 #include "debug/AssertInGuiThread.hpp"
+#include "messages/Message.hpp"
 #include "messages/MessageBuilder.hpp"
-#include "providers/bttv/BttvEmotes.hpp"
 #include "providers/chatterino/ChatterinoBadges.hpp"
 #include "providers/ffz/FfzBadges.hpp"
-#include "providers/ffz/FfzEmotes.hpp"
 #include "providers/irc/Irc2.hpp"
+#include "providers/seventv/eventapi/SeventvEventAPIDispatch.hpp"
+#include "providers/seventv/eventapi/SeventvEventAPISubscription.hpp"
 #include "providers/seventv/SeventvBadges.hpp"
-#include "providers/seventv/SeventvEmotes.hpp"
 #include "providers/seventv/SeventvEventAPI.hpp"
+#include "providers/twitch/ChannelPointReward.hpp"
+#include "providers/twitch/PubSubActions.hpp"
 #include "providers/twitch/PubSubManager.hpp"
+#include "providers/twitch/PubSubMessages.hpp"
+#include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchIrcServer.hpp"
 #include "providers/twitch/TwitchMessageBuilder.hpp"
 #include "singletons/Emotes.hpp"
 #include "singletons/Fonts.hpp"
+#include "singletons/helper/LoggingChannel.hpp"
 #include "singletons/Logging.hpp"
-#include "singletons/NativeMessaging.hpp"
 #include "singletons/Paths.hpp"
-#include "singletons/Resources.hpp"
 #include "singletons/Settings.hpp"
 #include "singletons/Theme.hpp"
 #include "singletons/Toasts.hpp"
@@ -36,7 +40,6 @@
 #include "singletons/WindowManager.hpp"
 #include "util/Helpers.hpp"
 #include "util/PostToThread.hpp"
-#include "util/RapidjsonHelpers.hpp"
 #include "widgets/Notebook.hpp"
 #include "widgets/splits/Split.hpp"
 #include "widgets/Window.hpp"

src/Application.hpp

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "common/SignalVector.hpp"
 #include "common/Singleton.hpp"
 #include "singletons/NativeMessaging.hpp"
 
@@ -25,7 +24,6 @@ class Theme;
 class WindowManager;
 class Logging;
 class Paths;
-class AccountManager;
 class Emotes;
 class IEmotes;
 class Settings;

src/BaseSettings.hpp

@@ -1,5 +1,4 @@
-#ifndef AB_SETTINGS_H
+#pragma once
-#define AB_SETTINGS_H
 
 #include "common/ChatterinoSetting.hpp"
 
@@ -46,8 +45,3 @@ Settings *getSettings();
 AB_SETTINGS_CLASS *getABSettings();
 
 }  // namespace chatterino
-
-#ifdef CHATTERINO
-#    include "singletons/Settings.hpp"
-#endif
-#endif

src/CMakeLists.txt

@@ -70,6 +70,10 @@ set(SOURCE_FILES
 
         controllers/filters/FilterModel.cpp
         controllers/filters/FilterModel.hpp
+        controllers/filters/FilterRecord.cpp
+        controllers/filters/FilterRecord.hpp
+        controllers/filters/FilterSet.cpp
+        controllers/filters/FilterSet.hpp
         controllers/filters/parser/FilterParser.cpp
         controllers/filters/parser/FilterParser.hpp
         controllers/filters/parser/Tokenizer.cpp
@@ -188,8 +192,6 @@ set(SOURCE_FILES
 
         providers/bttv/BttvEmotes.cpp
         providers/bttv/BttvEmotes.hpp
-        providers/bttv/LoadBttvChannelEmote.cpp
-        providers/bttv/LoadBttvChannelEmote.hpp
 
         providers/chatterino/ChatterinoBadges.cpp
         providers/chatterino/ChatterinoBadges.hpp
@@ -330,6 +332,7 @@ set(SOURCE_FILES
         util/AttachToConsole.hpp
         util/Clipboard.cpp
         util/Clipboard.hpp
+        util/ConcurrentMap.hpp
         util/DebugCount.cpp
         util/DebugCount.hpp
         util/DisplayBadge.cpp
@@ -356,6 +359,7 @@ set(SOURCE_FILES
         util/RatelimitBucket.hpp
         util/SampleData.cpp
         util/SampleData.hpp
+        util/SharedPtrElementLess.hpp
         util/SplitCommand.cpp
         util/SplitCommand.hpp
         util/StreamLink.cpp

src/common/ChannelChatters.cpp

@@ -1,9 +1,12 @@
 #include "ChannelChatters.hpp"
 
+#include "common/Channel.hpp"
 #include "messages/Message.hpp"
 #include "messages/MessageBuilder.hpp"
 #include "providers/twitch/TwitchMessageBuilder.hpp"
 
+#include <QColor>
+
 namespace chatterino {
 
 ChannelChatters::ChannelChatters(Channel &channel)

src/common/ChannelChatters.hpp

@@ -1,15 +1,18 @@
 #pragma once
 
-#include "common/Channel.hpp"
 #include "common/ChatterSet.hpp"
 #include "common/UniqueAccess.hpp"
 #include "lrucache/lrucache.hpp"
 #include "util/QStringHash.hpp"
 
+#include <QColor>
+#include <QObject>
 #include <QRgb>
 
 namespace chatterino {
 
+class Channel;
+
 class ChannelChatters
 {
 public:

src/common/Common.hpp

@@ -1,9 +1,5 @@
 #pragma once
 
-#include "common/Aliases.hpp"
-#include "common/Outcome.hpp"
-#include "common/ProviderId.hpp"
-
 #include <boost/optional.hpp>
 #include <boost/preprocessor.hpp>
 #include <QString>
@@ -20,11 +16,6 @@ enum class HighlightState {
     NewMessage,
 };
 
-inline QString qS(const std::string &string)
-{
-    return QString::fromStdString(string);
-}
-
 const Qt::KeyboardModifiers showSplitOverlayModifiers =
     Qt::ControlModifier | Qt::AltModifier;
 const Qt::KeyboardModifiers showAddSplitRegions =

src/common/CompletionModel.cpp

@@ -3,6 +3,7 @@
 #include "Application.hpp"
 #include "common/ChatterSet.hpp"
 #include "controllers/accounts/AccountController.hpp"
+#include "controllers/commands/Command.hpp"
 #include "controllers/commands/CommandController.hpp"
 #include "messages/Emote.hpp"
 #include "providers/twitch/TwitchAccount.hpp"

src/common/DownloadManager.hpp

@@ -3,9 +3,7 @@
 #include <QFile>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
-#include <QNetworkRequest>
 #include <QObject>
-#include <QStringList>
 
 namespace chatterino {
 

src/common/LinkParser.hpp

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <QRegularExpressionMatch>
 #include <QString>
 
 namespace chatterino {

src/common/NetworkRequest.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "common/NetworkCommon.hpp"
-#include "common/NetworkResult.hpp"
 
 #include <QHttpMultiPart>
 

src/common/SignalVectorModel.hpp

@@ -10,6 +10,12 @@
 
 namespace chatterino {
 
+template <typename T>
+class SignalVector;
+
+template <typename T>
+struct SignalVectorItemEvent;
+
 template <typename TVectorItem>
 class SignalVectorModel : public QAbstractTableModel,
                           pajlada::Signals::SignalHolder

src/controllers/accounts/AccountController.cpp

@@ -3,6 +3,7 @@
 #include "controllers/accounts/Account.hpp"
 #include "controllers/accounts/AccountModel.hpp"
 #include "providers/twitch/TwitchAccount.hpp"
+#include "util/SharedPtrElementLess.hpp"
 
 namespace chatterino {
 

src/controllers/accounts/AccountController.hpp

@@ -3,7 +3,6 @@
 #include "common/SignalVector.hpp"
 #include "common/Singleton.hpp"
 #include "providers/twitch/TwitchAccountManager.hpp"
-#include "util/SharedPtrElementLess.hpp"
 
 #include <QObject>
 

src/controllers/accounts/AccountModel.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "common/SignalVectorModel.hpp"
-#include "controllers/accounts/Account.hpp"
 #include "util/QStringHash.hpp"
 
 #include <unordered_map>

src/controllers/commands/CommandContext.hpp

@@ -1,12 +1,15 @@
 #pragma once
 
-#include "common/Channel.hpp"
-#include "providers/twitch/TwitchChannel.hpp"
-
 #include <QStringList>
 
+#include <memory>
+
 namespace chatterino {
 
+class Channel;
+using ChannelPtr = std::shared_ptr<Channel>;
+class TwitchChannel;
+
 struct CommandContext {
     QStringList words;
 

src/controllers/commands/CommandController.cpp

@@ -1,21 +1,25 @@
-#include "CommandController.hpp"
+#include "controllers/commands/CommandController.hpp"
 
 #include "Application.hpp"
 #include "common/Env.hpp"
+#include "common/NetworkResult.hpp"
 #include "common/QLogging.hpp"
 #include "common/SignalVector.hpp"
 #include "controllers/accounts/AccountController.hpp"
 #include "controllers/commands/builtin/twitch/ChatSettings.hpp"
 #include "controllers/commands/Command.hpp"
+#include "controllers/commands/CommandContext.hpp"
 #include "controllers/commands/CommandModel.hpp"
 #include "controllers/userdata/UserDataController.hpp"
 #include "messages/Message.hpp"
 #include "messages/MessageBuilder.hpp"
 #include "messages/MessageElement.hpp"
+#include "messages/MessageThread.hpp"
 #include "providers/irc/IrcChannel2.hpp"
 #include "providers/irc/IrcServer.hpp"
 #include "providers/twitch/api/Helix.hpp"
 #include "providers/twitch/TwitchAccount.hpp"
+#include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchCommon.hpp"
 #include "providers/twitch/TwitchIrcServer.hpp"
 #include "providers/twitch/TwitchMessageBuilder.hpp"
@@ -35,6 +39,7 @@
 #include "util/Twitch.hpp"
 #include "widgets/dialogs/ReplyThreadPopup.hpp"
 #include "widgets/dialogs/UserInfoPopup.hpp"
+#include "widgets/helper/ChannelView.hpp"
 #include "widgets/splits/Split.hpp"
 #include "widgets/splits/SplitContainer.hpp"
 #include "widgets/Window.hpp"

src/controllers/commands/CommandController.hpp

@@ -1,11 +1,8 @@
 #pragma once
 
-#include "common/ChatterinoSetting.hpp"
 #include "common/SignalVector.hpp"
 #include "common/Singleton.hpp"
-#include "controllers/commands/Command.hpp"
+#include "util/QStringHash.hpp"
-#include "controllers/commands/CommandContext.hpp"
-#include "providers/twitch/TwitchChannel.hpp"
 
 #include <pajlada/settings.hpp>
 #include <QMap>
@@ -20,8 +17,12 @@ namespace chatterino {
 class Settings;
 class Paths;
 class Channel;
+using ChannelPtr = std::shared_ptr<Channel>;
+struct Message;
 
+struct Command;
 class CommandModel;
+struct CommandContext;
 
 class CommandController final : public Singleton
 {

src/controllers/commands/CommandModel.cpp

@@ -1,5 +1,7 @@
-#include "CommandModel.hpp"
+#include "controllers/commands/CommandModel.hpp"
 
+#include "common/SignalVector.hpp"
+#include "controllers/commands/Command.hpp"
 #include "util/StandardItemHelper.hpp"
 
 namespace chatterino {

src/controllers/commands/CommandModel.hpp

@@ -1,13 +1,13 @@
 #pragma once
 
 #include "common/SignalVectorModel.hpp"
-#include "controllers/commands/Command.hpp"
 
 #include <QObject>
 
 namespace chatterino {
 
 class CommandController;
+struct Command;
 
 class CommandModel : public SignalVectorModel<Command>
 {

src/controllers/commands/builtin/twitch/ChatSettings.cpp

@@ -2,6 +2,7 @@
 
 #include "Application.hpp"
 #include "controllers/accounts/AccountController.hpp"
+#include "controllers/commands/CommandContext.hpp"
 #include "messages/MessageBuilder.hpp"
 #include "providers/twitch/api/Helix.hpp"
 #include "providers/twitch/TwitchAccount.hpp"

src/controllers/commands/builtin/twitch/ChatSettings.hpp

@@ -1,24 +1,28 @@
 #pragma once
 
-#include "controllers/commands/CommandContext.hpp"
-
 #include <QString>
 
-namespace chatterino::commands {
+namespace chatterino {
 
-QString emoteOnly(const CommandContext &ctx);
+struct CommandContext;
-QString emoteOnlyOff(const CommandContext &ctx);
 
-QString subscribers(const CommandContext &ctx);
+namespace commands {
-QString subscribersOff(const CommandContext &ctx);
 
-QString slow(const CommandContext &ctx);
+    QString emoteOnly(const CommandContext &ctx);
-QString slowOff(const CommandContext &ctx);
+    QString emoteOnlyOff(const CommandContext &ctx);
 
-QString followers(const CommandContext &ctx);
+    QString subscribers(const CommandContext &ctx);
-QString followersOff(const CommandContext &ctx);
+    QString subscribersOff(const CommandContext &ctx);
 
-QString uniqueChat(const CommandContext &ctx);
+    QString slow(const CommandContext &ctx);
-QString uniqueChatOff(const CommandContext &ctx);
+    QString slowOff(const CommandContext &ctx);
 
-}  // namespace chatterino::commands
+    QString followers(const CommandContext &ctx);
+    QString followersOff(const CommandContext &ctx);
+
+    QString uniqueChat(const CommandContext &ctx);
+    QString uniqueChatOff(const CommandContext &ctx);
+
+}  // namespace commands
+
+}  // namespace chatterino

src/controllers/filters/FilterModel.cpp

@@ -1,6 +1,7 @@
-#include "FilterModel.hpp"
+#include "controllers/filters/FilterModel.hpp"
 
 #include "Application.hpp"
+#include "controllers/filters/FilterRecord.hpp"
 #include "singletons/Settings.hpp"
 #include "util/StandardItemHelper.hpp"
 

src/controllers/filters/FilterModel.hpp

@@ -1,12 +1,14 @@
 #pragma once
 
 #include "common/SignalVectorModel.hpp"
-#include "controllers/filters/FilterRecord.hpp"
 
 #include <QObject>
 
 namespace chatterino {
 
+class FilterRecord;
+using FilterRecordPtr = std::shared_ptr<FilterRecord>;
+
 class FilterModel : public SignalVectorModel<FilterRecordPtr>
 {
 public:

src/controllers/filters/FilterRecord.cpp

@@ -0,0 +1,53 @@
+#include "controllers/filters/FilterRecord.hpp"
+
+namespace chatterino {
+
+FilterRecord::FilterRecord(const QString &name, const QString &filter)
+    : name_(name)
+    , filter_(filter)
+    , id_(QUuid::createUuid())
+    , parser_(std::make_unique<filterparser::FilterParser>(filter))
+{
+}
+
+FilterRecord::FilterRecord(const QString &name, const QString &filter,
+                           const QUuid &id)
+    : name_(name)
+    , filter_(filter)
+    , id_(id)
+    , parser_(std::make_unique<filterparser::FilterParser>(filter))
+{
+}
+
+const QString &FilterRecord::getName() const
+{
+    return this->name_;
+}
+
+const QString &FilterRecord::getFilter() const
+{
+    return this->filter_;
+}
+
+const QUuid &FilterRecord::getId() const
+{
+    return this->id_;
+}
+
+bool FilterRecord::valid() const
+{
+    return this->parser_->valid();
+}
+
+bool FilterRecord::filter(const filterparser::ContextMap &context) const
+{
+    return this->parser_->execute(context);
+}
+
+bool FilterRecord::operator==(const FilterRecord &other) const
+{
+    return std::tie(this->name_, this->filter_, this->id_) ==
+           std::tie(other.name_, other.filter_, other.id_);
+}
+
+}  // namespace chatterino

src/controllers/filters/FilterRecord.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "controllers/filters/parser/FilterParser.hpp"
-#include "controllers/filters/parser/Types.hpp"
 #include "util/RapidjsonHelpers.hpp"
 #include "util/RapidJsonSerializeQString.hpp"
 
@@ -17,52 +16,21 @@ namespace chatterino {
 class FilterRecord
 {
 public:
-    bool operator==(const FilterRecord &other) const
+    FilterRecord(const QString &name, const QString &filter);
-    {
-        return std::tie(this->name_, this->filter_, this->id_) ==
-               std::tie(other.name_, other.filter_, other.id_);
-    }
 
-    FilterRecord(const QString &name, const QString &filter)
+    FilterRecord(const QString &name, const QString &filter, const QUuid &id);
-        : name_(name)
-        , filter_(filter)
-        , id_(QUuid::createUuid())
-        , parser_(std::make_unique<filterparser::FilterParser>(filter))
-    {
-    }
 
-    FilterRecord(const QString &name, const QString &filter, const QUuid &id)
+    const QString &getName() const;
-        : name_(name)
-        , filter_(filter)
-        , id_(id)
-        , parser_(std::make_unique<filterparser::FilterParser>(filter))
-    {
-    }
 
-    const QString &getName() const
+    const QString &getFilter() const;
-    {
-        return this->name_;
-    }
 
-    const QString &getFilter() const
+    const QUuid &getId() const;
-    {
-        return this->filter_;
-    }
 
-    const QUuid &getId() const
+    bool valid() const;
-    {
-        return this->id_;
-    }
 
-    bool valid() const
+    bool filter(const filterparser::ContextMap &context) const;
-    {
-        return this->parser_->valid();
-    }
 
-    bool filter(const filterparser::ContextMap &context) const
+    bool operator==(const FilterRecord &other) const;
-    {
-        return this->parser_->execute(context);
-    }
 
 private:
     QString name_;

src/controllers/filters/FilterSet.cpp

@@ -0,0 +1,78 @@
+#include "controllers/filters/FilterSet.hpp"
+
+#include "controllers/filters/FilterRecord.hpp"
+#include "singletons/Settings.hpp"
+
+namespace chatterino {
+
+FilterSet::FilterSet()
+{
+    this->listener_ =
+        getCSettings().filterRecords.delayedItemsChanged.connect([this] {
+            this->reloadFilters();
+        });
+}
+
+FilterSet::FilterSet(const QList<QUuid> &filterIds)
+{
+    auto filters = getCSettings().filterRecords.readOnly();
+    for (const auto &f : *filters)
+    {
+        if (filterIds.contains(f->getId()))
+            this->filters_.insert(f->getId(), f);
+    }
+
+    this->listener_ =
+        getCSettings().filterRecords.delayedItemsChanged.connect([this] {
+            this->reloadFilters();
+        });
+}
+
+FilterSet::~FilterSet()
+{
+    this->listener_.disconnect();
+}
+
+bool FilterSet::filter(const MessagePtr &m, ChannelPtr channel) const
+{
+    if (this->filters_.size() == 0)
+        return true;
+
+    filterparser::ContextMap context =
+        filterparser::buildContextMap(m, channel.get());
+    for (const auto &f : this->filters_.values())
+    {
+        if (!f->valid() || !f->filter(context))
+            return false;
+    }
+
+    return true;
+}
+
+const QList<QUuid> FilterSet::filterIds() const
+{
+    return this->filters_.keys();
+}
+
+void FilterSet::reloadFilters()
+{
+    auto filters = getCSettings().filterRecords.readOnly();
+    for (const auto &key : this->filters_.keys())
+    {
+        bool found = false;
+        for (const auto &f : *filters)
+        {
+            if (f->getId() == key)
+            {
+                found = true;
+                this->filters_.insert(key, f);
+            }
+        }
+        if (!found)
+        {
+            this->filters_.remove(key);
+        }
+    }
+}
+
+}  // namespace chatterino

src/controllers/filters/FilterSet.hpp

@@ -1,86 +1,37 @@
 #pragma once
 
-#include "controllers/filters/FilterRecord.hpp"
+#include <pajlada/signals.hpp>
-#include "singletons/Settings.hpp"
+#include <QList>
+#include <QMap>
+#include <QUuid>
+
+#include <memory>
 
 namespace chatterino {
 
+class FilterRecord;
+using FilterRecordPtr = std::shared_ptr<FilterRecord>;
+struct Message;
+class Channel;
+using MessagePtr = std::shared_ptr<const Message>;
+using ChannelPtr = std::shared_ptr<Channel>;
+
 class FilterSet
 {
 public:
-    FilterSet()
+    FilterSet();
-    {
+    FilterSet(const QList<QUuid> &filterIds);
-        this->listener_ =
-            getCSettings().filterRecords.delayedItemsChanged.connect([this] {
-                this->reloadFilters();
-            });
-    }
 
-    FilterSet(const QList<QUuid> &filterIds)
+    ~FilterSet();
-    {
-        auto filters = getCSettings().filterRecords.readOnly();
-        for (const auto &f : *filters)
-        {
-            if (filterIds.contains(f->getId()))
-                this->filters_.insert(f->getId(), f);
-        }
 
-        this->listener_ =
+    bool filter(const MessagePtr &m, ChannelPtr channel) const;
-            getCSettings().filterRecords.delayedItemsChanged.connect([this] {
+    const QList<QUuid> filterIds() const;
-                this->reloadFilters();
-            });
-    }
-
-    ~FilterSet()
-    {
-        this->listener_.disconnect();
-    }
-
-    bool filter(const MessagePtr &m, ChannelPtr channel) const
-    {
-        if (this->filters_.size() == 0)
-            return true;
-
-        filterparser::ContextMap context =
-            filterparser::buildContextMap(m, channel.get());
-        for (const auto &f : this->filters_.values())
-        {
-            if (!f->valid() || !f->filter(context))
-                return false;
-        }
-
-        return true;
-    }
-
-    const QList<QUuid> filterIds() const
-    {
-        return this->filters_.keys();
-    }
 
 private:
     QMap<QUuid, FilterRecordPtr> filters_;
     pajlada::Signals::Connection listener_;
 
-    void reloadFilters()
+    void reloadFilters();
-    {
-        auto filters = getCSettings().filterRecords.readOnly();
-        for (const auto &key : this->filters_.keys())
-        {
-            bool found = false;
-            for (const auto &f : *filters)
-            {
-                if (f->getId() == key)
-                {
-                    found = true;
-                    this->filters_.insert(key, f);
-                }
-            }
-            if (!found)
-            {
-                this->filters_.remove(key);
-            }
-        }
-    }
 };
 
 using FilterSetPtr = std::shared_ptr<FilterSet>;

src/controllers/filters/parser/FilterParser.cpp

@@ -3,6 +3,9 @@
 #include "Application.hpp"
 #include "common/Channel.hpp"
 #include "controllers/filters/parser/Types.hpp"
+#include "messages/Message.hpp"
+#include "providers/twitch/TwitchBadge.hpp"
+#include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchIrcServer.hpp"
 
 namespace filterparser {

src/controllers/filters/parser/Types.hpp

@@ -1,9 +1,15 @@
 #pragma once
 
-#include "messages/Message.hpp"
-
 #include <QRegularExpression>
 
+#include <memory>
+
+namespace chatterino {
+
+struct Message;
+
+}
+
 namespace filterparser {
 
 using MessagePtr = std::shared_ptr<const chatterino::Message>;

src/controllers/highlights/BadgeHighlightModel.cpp

@@ -1,7 +1,11 @@
-#include "BadgeHighlightModel.hpp"
+#include "controllers/highlights/BadgeHighlightModel.hpp"
 
 #include "Application.hpp"
+#include "common/SignalVectorModel.hpp"
+#include "controllers/highlights/HighlightBadge.hpp"
+#include "controllers/highlights/HighlightPhrase.hpp"
 #include "messages/Emote.hpp"
+#include "providers/twitch/TwitchBadges.hpp"
 #include "singletons/Settings.hpp"
 #include "util/StandardItemHelper.hpp"
 

src/controllers/highlights/BadgeHighlightModel.hpp

@@ -1,14 +1,13 @@
 #pragma once
 
 #include "common/SignalVectorModel.hpp"
-#include "controllers/highlights/HighlightBadge.hpp"
-#include "providers/twitch/TwitchBadges.hpp"
 
 #include <QObject>
 
 namespace chatterino {
 
 class HighlightController;
+class HighlightBadge;
 
 class BadgeHighlightModel : public SignalVectorModel<HighlightBadge>
 {

src/controllers/highlights/HighlightBadge.cpp

@@ -1,6 +1,7 @@
 #include "HighlightBadge.hpp"
 
 #include "messages/SharedMessageBuilder.hpp"
+#include "providers/twitch/TwitchBadge.hpp"
 #include "singletons/Resources.hpp"
 
 namespace chatterino {

src/controllers/highlights/HighlightBadge.hpp

@@ -1,14 +1,19 @@
 #pragma once
 
-#include "providers/twitch/TwitchBadge.hpp"
 #include "util/RapidjsonHelpers.hpp"
 #include "util/RapidJsonSerializeQString.hpp"
 
 #include <pajlada/serialize.hpp>
+#include <QColor>
 #include <QString>
 #include <QUrl>
 
+#include <memory>
+
 namespace chatterino {
+
+class Badge;
+
 class HighlightBadge
 {
 public:

src/controllers/highlights/HighlightBlacklistModel.cpp

@@ -1,6 +1,7 @@
 #include "controllers/highlights/HighlightBlacklistModel.hpp"
 
 #include "Application.hpp"
+#include "controllers/highlights/HighlightBlacklistUser.hpp"
 #include "singletons/Settings.hpp"
 #include "util/StandardItemHelper.hpp"
 

src/controllers/highlights/HighlightBlacklistModel.hpp

@@ -1,12 +1,12 @@
 #pragma once
 
 #include "common/SignalVectorModel.hpp"
-#include "controllers/highlights/HighlightBlacklistUser.hpp"
 
 #include <QObject>
 
 namespace chatterino {
 
+class HighlightBlacklistUser;
 class HighlightController;
 
 class HighlightBlacklistModel : public SignalVectorModel<HighlightBlacklistUser>

src/controllers/highlights/HighlightController.cpp

@@ -1,7 +1,17 @@
 #include "controllers/highlights/HighlightController.hpp"
 
+#include "Application.hpp"
 #include "common/QLogging.hpp"
+#include "controllers/accounts/AccountController.hpp"
+#include "controllers/highlights/HighlightBadge.hpp"
+#include "controllers/highlights/HighlightPhrase.hpp"
+#include "messages/Message.hpp"
+#include "messages/MessageBuilder.hpp"
+#include "providers/colors/ColorProvider.hpp"
 #include "providers/twitch/TwitchAccount.hpp"
+#include "providers/twitch/TwitchBadge.hpp"
+#include "singletons/Paths.hpp"
+#include "singletons/Settings.hpp"
 
 namespace {
 
@@ -282,6 +292,89 @@ void rebuildBadgeHighlights(Settings &settings,
 
 namespace chatterino {
 
+HighlightResult::HighlightResult(bool _alert, bool _playSound,
+                                 boost::optional<QUrl> _customSoundUrl,
+                                 std::shared_ptr<QColor> _color,
+                                 bool _showInMentions)
+    : alert(_alert)
+    , playSound(_playSound)
+    , customSoundUrl(std::move(_customSoundUrl))
+    , color(std::move(_color))
+    , showInMentions(_showInMentions)
+{
+}
+
+HighlightResult HighlightResult::emptyResult()
+{
+    return {
+        false, false, boost::none, nullptr, false,
+    };
+}
+
+bool HighlightResult::operator==(const HighlightResult &other) const
+{
+    if (this->alert != other.alert)
+    {
+        return false;
+    }
+    if (this->playSound != other.playSound)
+    {
+        return false;
+    }
+    if (this->customSoundUrl != other.customSoundUrl)
+    {
+        return false;
+    }
+
+    if (this->color && other.color)
+    {
+        if (*this->color != *other.color)
+        {
+            return false;
+        }
+    }
+
+    if (this->showInMentions != other.showInMentions)
+    {
+        return false;
+    }
+
+    return true;
+}
+
+bool HighlightResult::operator!=(const HighlightResult &other) const
+{
+    return !(*this == other);
+}
+
+bool HighlightResult::empty() const
+{
+    return !this->alert && !this->playSound &&
+           !this->customSoundUrl.has_value() && !this->color &&
+           !this->showInMentions;
+}
+
+bool HighlightResult::full() const
+{
+    return this->alert && this->playSound && this->customSoundUrl.has_value() &&
+           this->color && this->showInMentions;
+}
+
+std::ostream &operator<<(std::ostream &os, const HighlightResult &result)
+{
+    os << "Alert: " << (result.alert ? "Yes" : "No") << ", "
+       << "Play sound: " << (result.playSound ? "Yes" : "No") << " ("
+       << (result.customSoundUrl
+               ? result.customSoundUrl.get().toString().toStdString()
+               : "")
+       << ")"
+       << ", "
+       << "Color: " << (result.color ? result.color->name().toStdString() : "")
+       << ", "
+       << "Show in mentions: " << (result.showInMentions ? "Yes" : "No");
+    return os;
+}
+
 void HighlightController::initialize(Settings &settings, Paths & /*paths*/)
 {
     this->rebuildListener_.addSetting(settings.enableSelfHighlight);

src/controllers/highlights/HighlightController.hpp

@@ -1,13 +1,12 @@
 #pragma once
 
+#include "common/FlagsEnum.hpp"
 #include "common/Singleton.hpp"
 #include "common/UniqueAccess.hpp"
-#include "messages/MessageBuilder.hpp"
-#include "providers/twitch/TwitchBadge.hpp"
-#include "singletons/Paths.hpp"
-#include "singletons/Settings.hpp"
 
 #include <boost/optional.hpp>
+#include <pajlada/settings.hpp>
+#include <pajlada/settings/settinglistener.hpp>
 #include <QColor>
 #include <QUrl>
 
@@ -17,27 +16,20 @@
 
 namespace chatterino {
 
+class Badge;
+struct MessageParseArgs;
+enum class MessageFlag : int64_t;
+using MessageFlags = FlagsEnum<MessageFlag>;
+
 struct HighlightResult {
     HighlightResult(bool _alert, bool _playSound,
                     boost::optional<QUrl> _customSoundUrl,
-                    std::shared_ptr<QColor> _color, bool _showInMentions)
+                    std::shared_ptr<QColor> _color, bool _showInMentions);
-        : alert(_alert)
-        , playSound(_playSound)
-        , customSoundUrl(std::move(_customSoundUrl))
-        , color(std::move(_color))
-        , showInMentions(_showInMentions)
-    {
-    }
 
     /**
      * @brief Construct an empty HighlightResult with all side-effects disabled
      **/
-    static HighlightResult emptyResult()
+    static HighlightResult emptyResult();
-    {
-        return {
-            false, false, boost::none, nullptr, false,
-        };
-    }
 
     /**
      * @brief true if highlight should trigger the taskbar to flash
@@ -66,77 +58,21 @@ struct HighlightResult {
      **/
     bool showInMentions{false};
 
-    bool operator==(const HighlightResult &other) const
+    bool operator==(const HighlightResult &other) const;
-    {
+    bool operator!=(const HighlightResult &other) const;
-        if (this->alert != other.alert)
-        {
-            return false;
-        }
-        if (this->playSound != other.playSound)
-        {
-            return false;
-        }
-        if (this->customSoundUrl != other.customSoundUrl)
-        {
-            return false;
-        }
-
-        if (this->color && other.color)
-        {
-            if (*this->color != *other.color)
-            {
-                return false;
-            }
-        }
-
-        if (this->showInMentions != other.showInMentions)
-        {
-            return false;
-        }
-
-        return true;
-    }
-
-    bool operator!=(const HighlightResult &other) const
-    {
-        return !(*this == other);
-    }
 
     /**
      * @brief Returns true if no side-effect has been enabled
      **/
-    [[nodiscard]] bool empty() const
+    [[nodiscard]] bool empty() const;
-    {
-        return !this->alert && !this->playSound &&
-               !this->customSoundUrl.has_value() && !this->color &&
-               !this->showInMentions;
-    }
 
     /**
      * @brief Returns true if all side-effects have been enabled
      **/
-    [[nodiscard]] bool full() const
+    [[nodiscard]] bool full() const;
-    {
-        return this->alert && this->playSound &&
-               this->customSoundUrl.has_value() && this->color &&
-               this->showInMentions;
-    }
 
     friend std::ostream &operator<<(std::ostream &os,
-                                    const HighlightResult &result)
+                                    const HighlightResult &result);
-    {
-        os << "Alert: " << (result.alert ? "Yes" : "No") << ", "
-           << "Play sound: " << (result.playSound ? "Yes" : "No") << " ("
-           << (result.customSoundUrl
-                   ? result.customSoundUrl.get().toString().toStdString()
-                   : "")
-           << ")"
-           << ", "
-           << "Color: "
-           << (result.color ? result.color->name().toStdString() : "") << ", "
-           << "Show in mentions: " << (result.showInMentions ? "Yes" : "No");
-        return os;
-    }
 };
 
 struct HighlightCheck {

src/controllers/highlights/HighlightModel.cpp

@@ -1,6 +1,9 @@
-#include "HighlightModel.hpp"
+#include "controllers/highlights/HighlightModel.hpp"
 
 #include "Application.hpp"
+#include "common/SignalVectorModel.hpp"
+#include "controllers/highlights/HighlightPhrase.hpp"
+#include "providers/colors/ColorProvider.hpp"
 #include "singletons/Settings.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/StandardItemHelper.hpp"

src/controllers/highlights/HighlightModel.hpp

@@ -1,12 +1,13 @@
 #pragma once
 
 #include "common/SignalVectorModel.hpp"
-#include "controllers/highlights/HighlightPhrase.hpp"
 
 #include <QObject>
 
 namespace chatterino {
 
+class HighlightPhrase;
+
 class HighlightModel : public SignalVectorModel<HighlightPhrase>
 {
 public:

src/controllers/highlights/HighlightPhrase.hpp

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "providers/colors/ColorProvider.hpp"
 #include "util/RapidjsonHelpers.hpp"
 #include "util/RapidJsonSerializeQString.hpp"
 

src/controllers/highlights/UserHighlightModel.cpp

@@ -2,6 +2,7 @@
 
 #include "Application.hpp"
 #include "controllers/highlights/HighlightModel.hpp"
+#include "controllers/highlights/HighlightPhrase.hpp"
 #include "singletons/Settings.hpp"
 #include "util/StandardItemHelper.hpp"
 

src/controllers/highlights/UserHighlightModel.hpp

@@ -1,13 +1,13 @@
 #pragma once
 
 #include "common/SignalVectorModel.hpp"
-#include "controllers/highlights/HighlightPhrase.hpp"
 
 #include <QObject>
 
 namespace chatterino {
 
 class HighlightController;
+class HighlightPhrase;
 
 class UserHighlightModel : public SignalVectorModel<HighlightPhrase>
 {

src/controllers/hotkeys/ActionNames.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "HotkeyCategory.hpp"
+#include "controllers/hotkeys/HotkeyCategory.hpp"
 
 #include <QString>
 

src/controllers/hotkeys/HotkeyController.cpp

@@ -1,6 +1,7 @@
 #include "controllers/hotkeys/HotkeyController.hpp"
 
 #include "common/QLogging.hpp"
+#include "controllers/hotkeys/Hotkey.hpp"
 #include "controllers/hotkeys/HotkeyCategory.hpp"
 #include "controllers/hotkeys/HotkeyModel.hpp"
 #include "singletons/Settings.hpp"

src/controllers/hotkeys/HotkeyModel.cpp

@@ -1,6 +1,7 @@
 #include "controllers/hotkeys/HotkeyModel.hpp"
 
 #include "common/QLogging.hpp"
+#include "controllers/hotkeys/Hotkey.hpp"
 #include "util/StandardItemHelper.hpp"
 
 namespace chatterino {

src/controllers/hotkeys/HotkeyModel.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "common/SignalVectorModel.hpp"
-#include "controllers/hotkeys/Hotkey.hpp"
 #include "util/QStringHash.hpp"
 
 #include <unordered_map>
@@ -9,6 +8,7 @@
 namespace chatterino {
 
 class HotkeyController;
+class Hotkey;
 
 class HotkeyModel : public SignalVectorModel<std::shared_ptr<Hotkey>>
 {

src/controllers/ignores/IgnoreController.cpp

@@ -1,6 +1,8 @@
 #include "controllers/ignores/IgnoreController.hpp"
 
+#include "Application.hpp"
 #include "common/QLogging.hpp"
+#include "controllers/accounts/AccountController.hpp"
 #include "controllers/ignores/IgnorePhrase.hpp"
 #include "providers/twitch/TwitchAccount.hpp"
 #include "singletons/Settings.hpp"

src/controllers/ignores/IgnoreModel.cpp

@@ -1,6 +1,7 @@
-#include "IgnoreModel.hpp"
+#include "controllers/ignores/IgnoreModel.hpp"
 
 #include "Application.hpp"
+#include "controllers/ignores/IgnorePhrase.hpp"
 #include "singletons/Settings.hpp"
 #include "util/StandardItemHelper.hpp"
 

src/controllers/ignores/IgnoreModel.hpp

@@ -1,12 +1,13 @@
 #pragma once
 
 #include "common/SignalVectorModel.hpp"
-#include "controllers/ignores/IgnorePhrase.hpp"
 
 #include <QObject>
 
 namespace chatterino {
 
+class IgnorePhrase;
+
 class IgnoreModel : public SignalVectorModel<IgnorePhrase>
 {
 public:

src/controllers/ignores/IgnorePhrase.cpp

@@ -3,6 +3,7 @@
 #include "Application.hpp"
 #include "controllers/accounts/AccountController.hpp"
 #include "providers/twitch/TwitchAccount.hpp"
+#include "singletons/Settings.hpp"
 
 namespace chatterino {
 
@@ -112,4 +113,10 @@ bool IgnorePhrase::containsEmote() const
     return !this->emotes_.empty();
 }
 
+IgnorePhrase IgnorePhrase::createEmpty()
+{
+    return IgnorePhrase(QString(), false, false,
+                        getSettings()->ignoredPhraseReplace.getValue(), true);
+}
+
 }  // namespace chatterino

src/controllers/ignores/IgnorePhrase.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
-#include "messages/Emote.hpp"
+#include "common/Aliases.hpp"
-#include "singletons/Settings.hpp"
 #include "util/RapidjsonHelpers.hpp"
 #include "util/RapidJsonSerializeQString.hpp"
 
@@ -9,10 +8,14 @@
 #include <QRegularExpression>
 #include <QString>
 
+#include <memory>
 #include <unordered_map>
 
 namespace chatterino {
 
+struct Emote;
+using EmotePtr = std::shared_ptr<const Emote>;
+
 class IgnorePhrase
 {
 public:
@@ -43,6 +46,8 @@ public:
 
     bool containsEmote() const;
 
+    static IgnorePhrase createEmpty();
+
 private:
     QString pattern_;
     bool isRegex_;
@@ -82,10 +87,7 @@ struct Deserialize<chatterino::IgnorePhrase> {
         if (!value.IsObject())
         {
             PAJLADA_REPORT_ERROR(error)
-            return chatterino::IgnorePhrase(
+            return chatterino::IgnorePhrase::createEmpty();
-                QString(), false, false,
-                ::chatterino::getSettings()->ignoredPhraseReplace.getValue(),
-                true);
         }
 
         QString _pattern;

src/controllers/moderationactions/ModerationAction.cpp

@@ -1,6 +1,7 @@
-#include "ModerationAction.hpp"
+#include "controllers/moderationactions/ModerationAction.hpp"
 
 #include "Application.hpp"
+#include "debug/AssertInGuiThread.hpp"
 #include "messages/Image.hpp"
 #include "singletons/Resources.hpp"
 

src/controllers/moderationactions/ModerationActionModel.cpp

@@ -1,5 +1,6 @@
-#include "ModerationActionModel.hpp"
+#include "controllers/moderationactions/ModerationActionModel.hpp"
 
+#include "controllers/moderationactions/ModerationAction.hpp"
 #include "util/StandardItemHelper.hpp"
 
 namespace chatterino {

src/controllers/moderationactions/ModerationActionModel.hpp

@@ -1,12 +1,13 @@
 #pragma once
 
 #include "common/SignalVectorModel.hpp"
-#include "controllers/moderationactions/ModerationAction.hpp"
 
 #include <QObject>
 
 namespace chatterino {
 
+class ModerationAction;
+
 class ModerationActionModel : public SignalVectorModel<ModerationAction>
 {
 public:

src/controllers/nicknames/Nickname.hpp

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "controllers/accounts/AccountController.hpp"
 #include "util/RapidjsonHelpers.hpp"
 #include "util/RapidJsonSerializeQString.hpp"
 

src/controllers/nicknames/NicknamesModel.cpp

@@ -1,6 +1,7 @@
-#include "NicknamesModel.hpp"
+#include "controllers/nicknames/NicknamesModel.hpp"
 
 #include "Application.hpp"
+#include "controllers/nicknames/Nickname.hpp"
 #include "providers/twitch/api/Helix.hpp"
 #include "singletons/Settings.hpp"
 #include "util/StandardItemHelper.hpp"

src/controllers/nicknames/NicknamesModel.hpp

@@ -1,12 +1,13 @@
 #pragma once
 
 #include "common/SignalVectorModel.hpp"
-#include "controllers/nicknames/Nickname.hpp"
 
 #include <QObject>
 
 namespace chatterino {
 
+class Nickname;
+
 class NicknamesModel : public SignalVectorModel<Nickname>
 {
 public:

src/controllers/notifications/NotificationController.cpp

@@ -5,9 +5,11 @@
 #include "common/Outcome.hpp"
 #include "common/QLogging.hpp"
 #include "controllers/notifications/NotificationModel.hpp"
+#include "messages/Message.hpp"
 #include "providers/twitch/api/Helix.hpp"
 #include "providers/twitch/TwitchIrcServer.hpp"
 #include "providers/twitch/TwitchMessageBuilder.hpp"
+#include "singletons/Settings.hpp"
 #include "singletons/Toasts.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/Helpers.hpp"

src/controllers/notifications/NotificationController.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
+#include "common/ChatterinoSetting.hpp"
 #include "common/SignalVector.hpp"
 #include "common/Singleton.hpp"
-#include "singletons/Settings.hpp"
 
 #include <QTimer>
 

src/controllers/notifications/NotificationModel.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "common/SignalVectorModel.hpp"
-#include "controllers/notifications/NotificationController.hpp"
 
 #include <QObject>
 

src/controllers/pings/MutedChannelModel.hpp

@@ -1,14 +1,11 @@
 #pragma once
 
 #include "common/SignalVectorModel.hpp"
-#include "controllers/notifications/NotificationController.hpp"
 
 #include <QObject>
 
 namespace chatterino {
 
-class MutedChannelController;
-
 class MutedChannelModel : public SignalVectorModel<QString>
 {
     explicit MutedChannelModel(QObject *parent);

src/messages/Emote.hpp

@@ -1,13 +1,13 @@
 #pragma once
 
-#include "common/Atomic.hpp"
+#include "common/Aliases.hpp"
-#include "messages/Image.hpp"
 #include "messages/ImageSet.hpp"
 
 #include <boost/optional.hpp>
 
 #include <functional>
 #include <memory>
+#include <mutex>
 #include <unordered_map>
 
 namespace chatterino {
@@ -55,9 +55,6 @@ public:
     EmoteMap::const_iterator findEmote(const QString &emoteNameHint,
                                        const QString &emoteID) const;
 };
-using EmoteIdMap = std::unordered_map<EmoteId, EmotePtr>;
-using WeakEmoteMap = std::unordered_map<EmoteName, std::weak_ptr<const Emote>>;
-using WeakEmoteIdMap = std::unordered_map<EmoteId, std::weak_ptr<const Emote>>;
 
 static const std::shared_ptr<const EmoteMap> EMPTY_EMOTE_MAP = std::make_shared<
     const EmoteMap>();  // NOLINT(cert-err58-cpp) -- assume this doesn't throw an exception

src/messages/Image.cpp

@@ -3,6 +3,8 @@
 #include "Application.hpp"
 #include "common/Common.hpp"
 #include "common/NetworkRequest.hpp"
+#include "common/NetworkResult.hpp"
+#include "common/Outcome.hpp"
 #include "common/QLogging.hpp"
 #include "debug/AssertInGuiThread.hpp"
 #include "debug/Benchmark.hpp"
@@ -347,6 +349,11 @@ ImagePtr Image::getEmpty()
     return empty;
 }
 
+ImagePtr getEmptyImagePtr()
+{
+    return Image::getEmpty();
+}
+
 Image::Image()
     : empty_(true)
 {

src/messages/Image.hpp

@@ -102,6 +102,9 @@ private:
     friend class ImageExpirationPool;
 };
 
+// forward-declarable function that calls Image::getEmpty() under the hood.
+ImagePtr getEmptyImagePtr();
+
 class ImageExpirationPool
 {
 private:

src/messages/ImageSet.cpp

@@ -1,5 +1,6 @@
 #include "messages/ImageSet.hpp"
 
+#include "messages/Image.hpp"
 #include "singletons/Settings.hpp"
 
 namespace chatterino {

src/messages/ImageSet.hpp

@@ -1,15 +1,22 @@
 #pragma once
 
-#include "messages/Image.hpp"
+#include "common/Aliases.hpp"
+
+#include <memory>
 
 namespace chatterino {
 
+class Image;
+using ImagePtr = std::shared_ptr<Image>;
+ImagePtr getEmptyImagePtr();
+
 class ImageSet
 {
 public:
     ImageSet();
-    ImageSet(const ImagePtr &image1, const ImagePtr &image2 = Image::getEmpty(),
+    ImageSet(const ImagePtr &image1,
-             const ImagePtr &image3 = Image::getEmpty());
+             const ImagePtr &image2 = getEmptyImagePtr(),
+             const ImagePtr &image3 = getEmptyImagePtr());
     ImageSet(const Url &image1, const Url &image2 = {}, const Url &image3 = {});
 
     void setImage1(const ImagePtr &image);

src/messages/Message.cpp

@@ -2,10 +2,14 @@
 
 #include "Application.hpp"
 #include "MessageElement.hpp"
+#include "providers/colors/ColorProvider.hpp"
 #include "providers/twitch/PubSubActions.hpp"
+#include "providers/twitch/TwitchBadge.hpp"
+#include "singletons/Settings.hpp"
 #include "singletons/Theme.hpp"
 #include "util/DebugCount.hpp"
 #include "util/IrcHelpers.hpp"
+#include "widgets/helper/ScrollbarHighlight.hpp"
 
 using SBHighlight = chatterino::ScrollbarHighlight;
 

src/messages/Message.hpp

@@ -1,11 +1,10 @@
 #pragma once
 
 #include "common/FlagsEnum.hpp"
-#include "providers/twitch/TwitchBadge.hpp"
 #include "util/QStringHash.hpp"
-#include "widgets/helper/ScrollbarHighlight.hpp"
 
 #include <boost/noncopyable.hpp>
+#include <QColor>
 #include <QTime>
 
 #include <cinttypes>
@@ -15,6 +14,8 @@
 namespace chatterino {
 class MessageElement;
 class MessageThread;
+class Badge;
+class ScrollbarHighlight;
 
 enum class MessageFlag : int64_t {
     None = 0LL,

src/messages/MessageBuilder.hpp

@@ -1,10 +1,12 @@
 #pragma once
 
-#include "messages/MessageElement.hpp"
+#include "messages/MessageColor.hpp"
 
 #include <QRegularExpression>
+#include <QTime>
 
 #include <ctime>
+#include <memory>
 #include <utility>
 
 namespace chatterino {
@@ -16,6 +18,11 @@ struct AutomodInfoAction;
 struct Message;
 using MessagePtr = std::shared_ptr<const Message>;
 
+class MessageElement;
+class TextElement;
+struct Emote;
+using EmotePtr = std::shared_ptr<const Emote>;
+
 struct SystemMessageTag {
 };
 struct TimeoutMessageTag {

src/messages/MessageElement.cpp

@@ -1,8 +1,10 @@
 #include "messages/MessageElement.hpp"
 
 #include "Application.hpp"
+#include "controllers/moderationactions/ModerationAction.hpp"
 #include "debug/Benchmark.hpp"
 #include "messages/Emote.hpp"
+#include "messages/Image.hpp"
 #include "messages/layouts/MessageLayoutContainer.hpp"
 #include "messages/layouts/MessageLayoutElement.hpp"
 #include "providers/emoji/Emojis.hpp"

src/messages/MessageParseArgs.hpp

@@ -1,5 +0,0 @@
-#pragma once
-
-namespace chatterino {
-
-}  // namespace chatterino

src/messages/SharedMessageBuilder.cpp

@@ -5,7 +5,10 @@
 #include "controllers/highlights/HighlightController.hpp"
 #include "controllers/ignores/IgnoreController.hpp"
 #include "controllers/ignores/IgnorePhrase.hpp"
+#include "controllers/nicknames/Nickname.hpp"
+#include "messages/Message.hpp"
 #include "messages/MessageElement.hpp"
+#include "providers/twitch/TwitchBadge.hpp"
 #include "singletons/Settings.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/Helpers.hpp"

src/messages/SharedMessageBuilder.hpp

@@ -1,8 +1,8 @@
+#pragma once
+
 #include "common/Aliases.hpp"
 #include "common/Outcome.hpp"
 #include "messages/MessageBuilder.hpp"
-#include "messages/MessageColor.hpp"
-#include "providers/twitch/TwitchBadge.hpp"
 
 #include <IrcMessage>
 #include <QColor>
@@ -10,6 +10,9 @@
 
 namespace chatterino {
 
+class Badge;
+class Channel;
+
 class SharedMessageBuilder : public MessageBuilder
 {
 public:

src/messages/layouts/MessageLayout.cpp

@@ -3,8 +3,11 @@
 #include "Application.hpp"
 #include "debug/Benchmark.hpp"
 #include "messages/layouts/MessageLayoutContainer.hpp"
+#include "messages/layouts/MessageLayoutElement.hpp"
 #include "messages/Message.hpp"
 #include "messages/MessageElement.hpp"
+#include "messages/Selection.hpp"
+#include "providers/colors/ColorProvider.hpp"
 #include "singletons/Emotes.hpp"
 #include "singletons/Settings.hpp"
 #include "singletons/Theme.hpp"

src/messages/layouts/MessageLayoutContainer.hpp

@@ -2,8 +2,6 @@
 
 #include "common/Common.hpp"
 #include "common/FlagsEnum.hpp"
-#include "messages/layouts/MessageLayoutElement.hpp"
-#include "messages/Selection.hpp"
 
 #include <QPoint>
 #include <QRect>
@@ -18,6 +16,8 @@ namespace chatterino {
 enum class MessageFlag : int64_t;
 enum class FirstWord { Neutral, RTL, LTR };
 using MessageFlags = FlagsEnum<MessageFlag>;
+class MessageLayoutElement;
+struct Selection;
 
 struct Margin {
     int top;

src/messages/layouts/MessageLayoutElement.hpp

@@ -2,8 +2,6 @@
 
 #include "common/FlagsEnum.hpp"
 #include "messages/Link.hpp"
-#include "messages/MessageColor.hpp"
-#include "messages/MessageElement.hpp"
 
 #include <boost/noncopyable.hpp>
 #include <pajlada/signals/signalholder.hpp>
@@ -22,6 +20,7 @@ class MessageElement;
 class Image;
 using ImagePtr = std::shared_ptr<Image>;
 enum class FontStyle : uint8_t;
+enum class MessageElementFlag : int64_t;
 
 class MessageLayoutElement : boost::noncopyable
 {

src/messages/search/AuthorPredicate.cpp

@@ -1,5 +1,6 @@
 #include "messages/search/AuthorPredicate.hpp"
 
+#include "messages/Message.hpp"
 #include "util/Qt.hpp"
 
 namespace chatterino {

src/messages/search/AuthorPredicate.hpp

@@ -2,6 +2,9 @@
 
 #include "messages/search/MessagePredicate.hpp"
 
+#include <QString>
+#include <QStringList>
+
 namespace chatterino {
 
 /**

src/messages/search/BadgePredicate.cpp

@@ -1,5 +1,7 @@
 #include "messages/search/BadgePredicate.hpp"
 
+#include "messages/Message.hpp"
+#include "providers/twitch/TwitchBadge.hpp"
 #include "util/Qt.hpp"
 
 namespace chatterino {

src/messages/search/BadgePredicate.hpp

@@ -2,6 +2,9 @@
 
 #include "messages/search/MessagePredicate.hpp"
 
+#include <QString>
+#include <QStringList>
+
 namespace chatterino {
 
 /**

src/messages/search/ChannelPredicate.cpp

@@ -1,5 +1,6 @@
 #include "messages/search/ChannelPredicate.hpp"
 
+#include "messages/Message.hpp"
 #include "util/Qt.hpp"
 
 namespace chatterino {

src/messages/search/ChannelPredicate.hpp

@@ -2,6 +2,9 @@
 
 #include "messages/search/MessagePredicate.hpp"
 
+#include <QString>
+#include <QStringList>
+
 namespace chatterino {
 
 /**

src/messages/search/LinkPredicate.cpp

@@ -1,6 +1,7 @@
 #include "messages/search/LinkPredicate.hpp"
 
 #include "common/LinkParser.hpp"
+#include "messages/Message.hpp"
 #include "util/Qt.hpp"
 
 namespace chatterino {

src/messages/search/LinkPredicate.hpp

@@ -2,6 +2,8 @@
 
 #include "messages/search/MessagePredicate.hpp"
 
+#include <QString>
+
 namespace chatterino {
 
 /**

src/messages/search/MessageFlagsPredicate.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "common/FlagsEnum.hpp"
+#include "messages/Message.hpp"
 #include "messages/search/MessagePredicate.hpp"
 
 namespace chatterino {

src/messages/search/MessagePredicate.hpp

@@ -1,11 +1,11 @@
 #pragma once
 
-#include "messages/Message.hpp"
-
 #include <memory>
 
 namespace chatterino {
 
+struct Message;
+
 /**
  * @brief Abstract base class for message predicates.
  *

src/messages/search/RegexPredicate.cpp

@@ -1,5 +1,7 @@
 #include "RegexPredicate.hpp"
 
+#include "messages/Message.hpp"
+
 namespace chatterino {
 
 RegexPredicate::RegexPredicate(const QString &regex, bool negate)

src/messages/search/RegexPredicate.hpp

@@ -3,6 +3,8 @@
 #include "messages/search/MessagePredicate.hpp"
 #include "QRegularExpression"
 
+#include <QString>
+
 namespace chatterino {
 
 /**

src/messages/search/SubstringPredicate.cpp

@@ -1,5 +1,7 @@
 #include "messages/search/SubstringPredicate.hpp"
 
+#include "messages/Message.hpp"
+
 namespace chatterino {
 
 SubstringPredicate::SubstringPredicate(const QString &search)

src/messages/search/SubstringPredicate.hpp

@@ -2,6 +2,8 @@
 
 #include "messages/search/MessagePredicate.hpp"
 
+#include <QString>
+
 namespace chatterino {
 
 /**

src/messages/search/SubtierPredicate.cpp

@@ -1,5 +1,7 @@
 #include "messages/search/SubtierPredicate.hpp"
 
+#include "messages/Message.hpp"
+#include "providers/twitch/TwitchBadge.hpp"
 #include "util/Qt.hpp"
 
 namespace chatterino {

src/messages/search/SubtierPredicate.hpp

@@ -2,6 +2,9 @@
 
 #include "messages/search/MessagePredicate.hpp"
 
+#include <QString>
+#include <QStringList>
+
 namespace chatterino {
 
 /**

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 <QObject>
-#include "messages/Link.hpp"
-
 #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"