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/singletons/Badges.hpp

@@ -1,9 +1,6 @@
 #pragma once
 
 #include "common/Singleton.hpp"
-#include "messages/Emote.hpp"
-
-#include <unordered_map>
 
 namespace chatterino {
 

src/singletons/Emotes.cpp

@@ -1,8 +1,5 @@
 #include "singletons/Emotes.hpp"
 
-#include "Application.hpp"
-#include "controllers/accounts/AccountController.hpp"
-
 namespace chatterino {
 
 Emotes::Emotes()

src/singletons/Emotes.hpp

@@ -1,10 +1,7 @@
 #pragma once
 
 #include "common/Singleton.hpp"
-#include "providers/bttv/BttvEmotes.hpp"
 #include "providers/emoji/Emojis.hpp"
-#include "providers/ffz/FfzEmotes.hpp"
-#include "providers/seventv/SeventvEmotes.hpp"
 #include "providers/twitch/TwitchEmotes.hpp"
 #include "singletons/helper/GifTimer.hpp"
 

src/singletons/Fonts.cpp

@@ -1,16 +1,13 @@
 #include "singletons/Fonts.hpp"
 
-#include "BaseSettings.hpp"
+#include "Application.hpp"
 #include "debug/AssertInGuiThread.hpp"
+#include "singletons/Settings.hpp"
+#include "singletons/WindowManager.hpp"
 
 #include <QDebug>
 #include <QtGlobal>
 
-#ifdef CHATTERINO
-#    include "Application.hpp"
-#    include "singletons/WindowManager.hpp"
-#endif
-
 #ifdef Q_OS_WIN32
 #    define DEFAULT_FONT_FAMILY "Segoe UI"
 #    define DEFAULT_FONT_SIZE 10

src/singletons/Logging.hpp

@@ -1,14 +1,18 @@
 #pragma once
 
 #include "common/Singleton.hpp"
-#include "messages/Message.hpp"
-#include "singletons/helper/LoggingChannel.hpp"
 
+#include <QString>
+
+#include <map>
 #include <memory>
 
 namespace chatterino {
 
 class Paths;
+struct Message;
+using MessagePtr = std::shared_ptr<const Message>;
+class LoggingChannel;
 
 class Logging : public Singleton
 {

src/singletons/NativeMessaging.hpp

@@ -1,7 +1,8 @@
 #pragma once
 
+#include "common/Atomic.hpp"
+
 #include <boost/optional.hpp>
-#include <common/Atomic.hpp>
 #include <QString>
 #include <QThread>
 

src/singletons/Settings.cpp

@@ -1,12 +1,12 @@
 #include "singletons/Settings.hpp"
 
-#include "Application.hpp"
+#include "controllers/filters/FilterRecord.hpp"
+#include "controllers/highlights/HighlightBadge.hpp"
 #include "controllers/highlights/HighlightBlacklistUser.hpp"
 #include "controllers/highlights/HighlightPhrase.hpp"
 #include "controllers/ignores/IgnorePhrase.hpp"
-#include "singletons/Paths.hpp"
-#include "singletons/Resources.hpp"
-#include "singletons/WindowManager.hpp"
+#include "controllers/moderationactions/ModerationAction.hpp"
+#include "controllers/nicknames/Nickname.hpp"
 #include "util/PersistSignalVector.hpp"
 #include "util/WindowsHelper.hpp"
 

src/singletons/Settings.hpp

@@ -3,12 +3,8 @@
 #include "BaseSettings.hpp"
 #include "common/Channel.hpp"
 #include "common/SignalVector.hpp"
-#include "controllers/filters/FilterRecord.hpp"
-#include "controllers/highlights/HighlightBadge.hpp"
-#include "controllers/highlights/HighlightPhrase.hpp"
-#include "controllers/moderationactions/ModerationAction.hpp"
-#include "controllers/nicknames/Nickname.hpp"
 #include "singletons/Toasts.hpp"
+#include "util/RapidJsonSerializeQString.hpp"
 #include "util/StreamerMode.hpp"
 #include "widgets/Notebook.hpp"
 #include "widgets/splits/SplitInput.hpp"
@@ -24,7 +20,10 @@ class HighlightPhrase;
 class HighlightBlacklistUser;
 class IgnorePhrase;
 class FilterRecord;
+using FilterRecordPtr = std::shared_ptr<FilterRecord>;
 class Nickname;
+class HighlightBadge;
+class ModerationAction;
 
 /// Settings which are available for reading on all threads.
 class ConcurrentSettings
@@ -521,7 +520,3 @@ private:
 };
 
 }  // namespace chatterino
-
-#ifdef CHATTERINO
-#    include "singletons/Settings.hpp"
-#endif

src/singletons/Theme.hpp

@@ -1,12 +1,12 @@
 #pragma once
 
+#include "common/ChatterinoSetting.hpp"
 #include "common/Singleton.hpp"
 #include "util/RapidJsonSerializeQString.hpp"
 
 #include <pajlada/settings/setting.hpp>
 #include <QBrush>
 #include <QColor>
-#include <singletons/Settings.hpp>
 
 namespace chatterino {
 

src/singletons/Toasts.cpp

@@ -9,6 +9,7 @@
 #include "providers/twitch/TwitchCommon.hpp"
 #include "providers/twitch/TwitchIrcServer.hpp"
 #include "singletons/Paths.hpp"
+#include "singletons/Settings.hpp"
 #include "util/StreamLink.hpp"
 #include "widgets/helper/CommonTexts.hpp"
 

src/singletons/Toasts.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "Application.hpp"
 #include "common/Singleton.hpp"
 
 #include <pajlada/settings/setting.hpp>
+#include <QString>
 
 namespace chatterino {
 

src/singletons/Updates.cpp

@@ -2,6 +2,7 @@
 
 #include "common/Modes.hpp"
 #include "common/NetworkRequest.hpp"
+#include "common/NetworkResult.hpp"
 #include "common/Outcome.hpp"
 #include "common/QLogging.hpp"
 #include "common/Version.hpp"

src/singletons/WindowManager.hpp

@@ -1,12 +1,13 @@
 #pragma once
 
-#include "common/Channel.hpp"
 #include "common/FlagsEnum.hpp"
 #include "common/Singleton.hpp"
-#include "common/WindowDescriptors.hpp"
-#include "pajlada/settings/settinglistener.hpp"
 #include "widgets/splits/SplitContainer.hpp"
 
+#include <pajlada/settings/settinglistener.hpp>
+#include <QPoint>
+#include <QTimer>
+
 #include <memory>
 
 namespace chatterino {
@@ -14,8 +15,15 @@ namespace chatterino {
 class Settings;
 class Paths;
 class Window;
-class SplitContainer;
 class ChannelView;
+class IndirectChannel;
+class Split;
+struct SplitDescriptor;
+class Channel;
+using ChannelPtr = std::shared_ptr<Channel>;
+struct Message;
+using MessagePtr = std::shared_ptr<const Message>;
+class WindowLayout;
 
 enum class MessageElementFlag : int64_t;
 using MessageElementFlags = FlagsEnum<MessageElementFlag>;

src/singletons/helper/LoggingChannel.cpp

@@ -1,14 +1,12 @@
 #include "LoggingChannel.hpp"
 
-#include "Application.hpp"
 #include "common/QLogging.hpp"
+#include "messages/Message.hpp"
 #include "singletons/Paths.hpp"
 #include "singletons/Settings.hpp"
 
 #include <QDir>
 
-#include <ctime>
-
 namespace chatterino {
 
 QByteArray endline("\n");

src/singletons/helper/LoggingChannel.hpp

@@ -1,7 +1,5 @@
 #pragma once
 
-#include "messages/Message.hpp"
-
 #include <boost/noncopyable.hpp>
 #include <QDateTime>
 #include <QFile>
@@ -12,6 +10,8 @@
 namespace chatterino {
 
 class Logging;
+struct Message;
+using MessagePtr = std::shared_ptr<const Message>;
 
 class LoggingChannel : boost::noncopyable
 {