diff --git a/src/messages/Message.cpp b/src/messages/Message.cpp
index cb005a84..73f8ccde 100644
--- a/src/messages/Message.cpp
+++ b/src/messages/Message.cpp
@@ -1,18 +1,11 @@
 #include "messages/Message.hpp"
 
-#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;
-
 namespace chatterino {
 
 Message::Message()
@@ -26,45 +19,57 @@ Message::~Message()
     DebugCount::decrease("messages");
 }
 
-SBHighlight Message::getScrollBarHighlight() const
+ScrollbarHighlight Message::getScrollBarHighlight() const
 {
     if (this->flags.has(MessageFlag::Highlighted) ||
         this->flags.has(MessageFlag::HighlightedWhisper))
     {
-        return SBHighlight(this->highlightColor);
-    }
-    else if (this->flags.has(MessageFlag::Subscription) &&
-             getSettings()->enableSubHighlight)
-    {
-        return SBHighlight(
-            ColorProvider::instance().color(ColorType::Subscription));
-    }
-    else if (this->flags.has(MessageFlag::RedeemedHighlight) ||
-             this->flags.has(MessageFlag::RedeemedChannelPointReward))
-    {
-        return SBHighlight(
-            ColorProvider::instance().color(ColorType::RedeemedHighlight),
-            SBHighlight::Default, true);
-    }
-    else if (this->flags.has(MessageFlag::ElevatedMessage))
-    {
-        return SBHighlight(ColorProvider::instance().color(
-                               ColorType::ElevatedMessageHighlight),
-                           SBHighlight::Default, false, false, true);
-    }
-    else if (this->flags.has(MessageFlag::FirstMessage))
-    {
-        return SBHighlight(
-            ColorProvider::instance().color(ColorType::FirstMessageHighlight),
-            SBHighlight::Default, false, true);
+        return {
+            this->highlightColor,
+        };
     }
 
-    return SBHighlight();
+    if (this->flags.has(MessageFlag::Subscription) &&
+        getSettings()->enableSubHighlight)
+    {
+        return {
+            ColorProvider::instance().color(ColorType::Subscription),
+        };
+    }
+
+    if (this->flags.has(MessageFlag::RedeemedHighlight) ||
+        this->flags.has(MessageFlag::RedeemedChannelPointReward))
+    {
+        return {
+            ColorProvider::instance().color(ColorType::RedeemedHighlight),
+            ScrollbarHighlight::Default,
+            true,
+        };
+    }
+
+    if (this->flags.has(MessageFlag::ElevatedMessage))
+    {
+        return {
+            ColorProvider::instance().color(
+                ColorType::ElevatedMessageHighlight),
+            ScrollbarHighlight::Default,
+            false,
+            false,
+            true,
+        };
+    }
+
+    if (this->flags.has(MessageFlag::FirstMessage))
+    {
+        return {
+            ColorProvider::instance().color(ColorType::FirstMessageHighlight),
+            ScrollbarHighlight::Default,
+            false,
+            true,
+        };
+    }
+
+    return {};
 }
 
-// Static
-namespace {
-
-}  // namespace
-
 }  // namespace chatterino
diff --git a/src/providers/twitch/api/Helix.cpp b/src/providers/twitch/api/Helix.cpp
index 810e02e8..893cdee1 100644
--- a/src/providers/twitch/api/Helix.cpp
+++ b/src/providers/twitch/api/Helix.cpp
@@ -14,9 +14,9 @@ namespace {
 
 using namespace chatterino;
 
-static constexpr auto NUM_MODERATORS_TO_FETCH_PER_REQUEST = 100;
+constexpr auto NUM_MODERATORS_TO_FETCH_PER_REQUEST = 100;
 
-static constexpr auto NUM_CHATTERS_TO_FETCH = 1000;
+constexpr auto NUM_CHATTERS_TO_FETCH = 1000;
 
 }  // namespace
 
diff --git a/src/widgets/AttachedWindow.cpp b/src/widgets/AttachedWindow.cpp
index a3fb20c8..5ce232a1 100644
--- a/src/widgets/AttachedWindow.cpp
+++ b/src/widgets/AttachedWindow.cpp
@@ -2,7 +2,6 @@
 
 #include "Application.hpp"
 #include "common/QLogging.hpp"
-#include "ForwardDecl.hpp"
 #include "singletons/Settings.hpp"
 #include "util/DebugCount.hpp"
 #include "widgets/splits/Split.hpp"