diff --git a/lib/advanced-scene-switcher.hpp b/lib/advanced-scene-switcher.hpp
index f893d48b..6b8561bf 100644
--- a/lib/advanced-scene-switcher.hpp
+++ b/lib/advanced-scene-switcher.hpp
@@ -1,7 +1,4 @@
 #pragma once
-#include "macro-segment-list.hpp"
-#include "condition-logic.hpp"
-#include "log-helper.hpp"
 
 #include <ui_advanced-scene-switcher.h>
 
diff --git a/lib/general.cpp b/lib/general.cpp
index a93f5169..dccd8c94 100644
--- a/lib/general.cpp
+++ b/lib/general.cpp
@@ -4,9 +4,10 @@
 #include "filter-combo-box.hpp"
 #include "first-run-wizard.hpp"
 #include "layout-helpers.hpp"
-#include "macro.hpp"
+#include "macro-helpers.hpp"
 #include "macro-search.hpp"
 #include "macro-settings.hpp"
+#include "macro.hpp"
 #include "path-helpers.hpp"
 #include "source-helpers.hpp"
 #include "splitter-helpers.hpp"
@@ -18,6 +19,7 @@
 #include "version.h"
 
 #include <obs-frontend-api.h>
+
 #include <QFileDialog>
 #include <QInputDialog>
 #include <QMessageBox>
diff --git a/lib/macro/macro-action-macro.cpp b/lib/macro/macro-action-macro.cpp
index ff7d77ab..cf4b8112 100644
--- a/lib/macro/macro-action-macro.cpp
+++ b/lib/macro/macro-action-macro.cpp
@@ -1,8 +1,11 @@
 #include "macro-action-macro.hpp"
+
+#include "condition-logic.hpp"
 #include "help-icon.hpp"
 #include "layout-helpers.hpp"
-#include "macro.hpp"
 #include "macro-action-factory.hpp"
+#include "macro-helpers.hpp"
+#include "macro.hpp"
 
 #include <chrono>
 
diff --git a/lib/macro/macro-condition-edit.cpp b/lib/macro/macro-condition-edit.cpp
index 616d89f2..885871fd 100644
--- a/lib/macro/macro-condition-edit.cpp
+++ b/lib/macro/macro-condition-edit.cpp
@@ -1,7 +1,9 @@
 #include "macro-condition-edit.hpp"
+
 #include "advanced-scene-switcher.hpp"
-#include "macro-signals.hpp"
+#include "condition-logic.hpp"
 #include "macro-settings.hpp"
+#include "macro-signals.hpp"
 #include "macro.hpp"
 #include "path-helpers.hpp"
 #include "plugin-state-helpers.hpp"
diff --git a/lib/macro/macro-condition-macro.cpp b/lib/macro/macro-condition-macro.cpp
index 7f3d437b..7fbcb7c2 100644
--- a/lib/macro/macro-condition-macro.cpp
+++ b/lib/macro/macro-condition-macro.cpp
@@ -1,6 +1,9 @@
 #include "macro-condition-macro.hpp"
+
 #include "layout-helpers.hpp"
 #include "macro-action-edit.hpp"
+#include "macro-helpers.hpp"
+#include "macro-ref.hpp"
 #include "macro-signals.hpp"
 #include "macro.hpp"
 
diff --git a/lib/macro/macro-condition.cpp b/lib/macro/macro-condition.cpp
index dc26f9dc..449af204 100644
--- a/lib/macro/macro-condition.cpp
+++ b/lib/macro/macro-condition.cpp
@@ -1,5 +1,7 @@
 #include "macro-condition.hpp"
 
+#include "condition-logic.hpp"
+
 namespace advss {
 
 MacroCondition::MacroCondition(Macro *m, bool supportsVariableValue)
diff --git a/lib/macro/macro-dock-settings.cpp b/lib/macro/macro-dock-settings.cpp
index b65df0f0..1375071a 100644
--- a/lib/macro/macro-dock-settings.cpp
+++ b/lib/macro/macro-dock-settings.cpp
@@ -1,8 +1,11 @@
 #include "macro-dock-settings.hpp"
-#include "macro-dock.hpp"
+
 #include "macro-dock-window.hpp"
+#include "macro-dock.hpp"
+#include "macro-helpers.hpp"
 #include "macro.hpp"
 #include "plugin-state-helpers.hpp"
+#include "variable-string.hpp"
 
 #include <obs-frontend-api.h>
 #include <util/platform.h>
diff --git a/lib/macro/macro-edit.cpp b/lib/macro/macro-edit.cpp
index af57f28b..b9442c03 100644
--- a/lib/macro/macro-edit.cpp
+++ b/lib/macro/macro-edit.cpp
@@ -1,17 +1,20 @@
 #include "macro-edit.hpp"
+
+#include "condition-logic.hpp"
 #include "cursor-shape-changer.hpp"
-#include "macro.hpp"
 #include "macro-action-edit.hpp"
 #include "macro-action-macro.hpp"
 #include "macro-condition-edit.hpp"
+#include "macro-helpers.hpp"
 #include "macro-segment-copy-paste.hpp"
 #include "macro-segment-list.hpp"
 #include "macro-settings.hpp"
 #include "macro-signals.hpp"
+#include "macro.hpp"
 #include "math-helpers.hpp"
 #include "name-dialog.hpp"
-#include "path-helpers.hpp"
 #include "obs-module-helper.hpp"
+#include "path-helpers.hpp"
 #include "plugin-state-helpers.hpp"
 #include "splitter-helpers.hpp"
 #include "tab-helpers.hpp"
diff --git a/lib/macro/macro-ref.cpp b/lib/macro/macro-ref.cpp
index 5021a3e7..aa12bb0f 100644
--- a/lib/macro/macro-ref.cpp
+++ b/lib/macro/macro-ref.cpp
@@ -1,6 +1,7 @@
 #include "macro-ref.hpp"
-#include "macro.hpp"
 
+#include "macro-helpers.hpp"
+#include "macro.hpp"
 #include "plugin-state-helpers.hpp"
 
 namespace advss {
diff --git a/lib/macro/macro-segment-copy-paste.cpp b/lib/macro/macro-segment-copy-paste.cpp
index 031a278f..e2b176f6 100644
--- a/lib/macro/macro-segment-copy-paste.cpp
+++ b/lib/macro/macro-segment-copy-paste.cpp
@@ -1,5 +1,7 @@
 #include "macro-segment-copy-paste.hpp"
+
 #include "advanced-scene-switcher.hpp"
+#include "condition-logic.hpp"
 #include "macro.hpp"
 
 #include <QShortcut>
diff --git a/lib/macro/macro-segment.cpp b/lib/macro/macro-segment.cpp
index 6faa5641..7de29628 100644
--- a/lib/macro/macro-segment.cpp
+++ b/lib/macro/macro-segment.cpp
@@ -1,4 +1,5 @@
 #include "macro-segment.hpp"
+
 #include "macro.hpp"
 #include "mouse-wheel-guard.hpp"
 #include "path-helpers.hpp"
@@ -8,10 +9,13 @@
 
 #include <QApplication>
 #include <QEvent>
+#include <QFrame>
 #include <QGraphicsOpacityEffect>
 #include <QLabel>
 #include <QMouseEvent>
+#include <QPushButton>
 #include <QScrollBar>
+#include <QVBoxLayout>
 
 namespace advss {
 
diff --git a/lib/macro/macro-segment.hpp b/lib/macro/macro-segment.hpp
index 60ab7161..e275a84f 100644
--- a/lib/macro/macro-segment.hpp
+++ b/lib/macro/macro-segment.hpp
@@ -7,15 +7,17 @@
 #include "sync-helpers.hpp"
 #include "temp-variable.hpp"
 
-#include <QWidget>
-#include <QFrame>
-#include <QPushButton>
-#include <QVBoxLayout>
-#include <QTimer>
 #include <obs-data.h>
+
+#include <QHBoxLayout>
+#include <QPushButton>
+#include <QWidget>
+
 #include <memory>
 
+class QFrame;
 class QLabel;
+class QVBoxLayout;
 
 namespace advss {
 
diff --git a/lib/macro/macro-selection.cpp b/lib/macro/macro-selection.cpp
index 0b14121f..0331f6e0 100644
--- a/lib/macro/macro-selection.cpp
+++ b/lib/macro/macro-selection.cpp
@@ -1,8 +1,11 @@
 #include "macro-selection.hpp"
+
 #include "advanced-scene-switcher.hpp"
 #include "layout-helpers.hpp"
-#include "macro.hpp"
+#include "macro-helpers.hpp"
+#include "macro-ref.hpp"
 #include "macro-signals.hpp"
+#include "macro.hpp"
 #include "ui-helpers.hpp"
 
 #include <QDialogButtonBox>
diff --git a/lib/macro/macro-tab.cpp b/lib/macro/macro-tab.cpp
index c373e25a..0287a176 100644
--- a/lib/macro/macro-tab.cpp
+++ b/lib/macro/macro-tab.cpp
@@ -2,8 +2,9 @@
 #include "macro-action-edit.hpp"
 #include "macro-condition-edit.hpp"
 #include "macro-export-import-dialog.hpp"
-#include "macro-settings.hpp"
+#include "macro-helpers.hpp"
 #include "macro-search.hpp"
+#include "macro-settings.hpp"
 #include "macro-signals.hpp"
 #include "macro-tree.hpp"
 #include "macro.hpp"
@@ -17,6 +18,7 @@
 #include "version.h"
 
 #include <obs-frontend-api.h>
+
 #include <QColor>
 #include <QMenu>
 
diff --git a/lib/macro/macro-tree.cpp b/lib/macro/macro-tree.cpp
index f4c963eb..211f2500 100644
--- a/lib/macro/macro-tree.cpp
+++ b/lib/macro/macro-tree.cpp
@@ -1,21 +1,25 @@
 #include "macro-tree.hpp"
-#include "macro.hpp"
+
+#include "macro-helpers.hpp"
 #include "macro-search.hpp"
 #include "macro-signals.hpp"
+#include "macro.hpp"
 #include "path-helpers.hpp"
 #include "sync-helpers.hpp"
 #include "ui-helpers.hpp"
 
 #include <obs.h>
-#include <string>
+
+#include <QHBoxLayout>
 #include <QLabel>
 #include <QLineEdit>
-#include <QSpacerItem>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
 #include <QMouseEvent>
+#include <QSpacerItem>
 #include <QStylePainter>
 #include <QToolTip>
+#include <QVBoxLayout>
+
+#include <string>
 
 Q_DECLARE_METATYPE(std::shared_ptr<advss::Macro>);
 
diff --git a/lib/macro/macro.cpp b/lib/macro/macro.cpp
index 60879737..e49b84d1 100644
--- a/lib/macro/macro.cpp
+++ b/lib/macro/macro.cpp
@@ -1,4 +1,6 @@
 #include "macro.hpp"
+
+#include "condition-logic.hpp"
 #include "macro-action-factory.hpp"
 #include "macro-condition-factory.hpp"
 #include "macro-helpers.hpp"
@@ -7,12 +9,14 @@
 #include "splitter-helpers.hpp"
 #include "sync-helpers.hpp"
 
+#include <obs-frontend-api.h>
+
+#include <QAction>
+#include <QMainWindow>
+
 #include <chrono>
 #include <limits>
 #undef max
-#include <obs-frontend-api.h>
-#include <QAction>
-#include <QMainWindow>
 #include <unordered_map>
 
 namespace advss {
diff --git a/lib/macro/macro.hpp b/lib/macro/macro.hpp
index aecf8efc..30601a88 100644
--- a/lib/macro/macro.hpp
+++ b/lib/macro/macro.hpp
@@ -1,21 +1,20 @@
 #pragma once
+
 #include "macro-action.hpp"
 #include "macro-condition.hpp"
 #include "macro-dock-settings.hpp"
-#include "macro-helpers.hpp"
 #include "macro-input.hpp"
-#include "macro-ref.hpp"
-#include "variable-string.hpp"
 #include "temp-variable.hpp"
 
-#include <future>
-#include <string>
-#include <deque>
-#include <memory>
-#include <map>
-#include <thread>
 #include <obs.hpp>
-#include <obs-module-helper.hpp>
+
+#include <QList>
+
+#include <deque>
+#include <future>
+#include <memory>
+#include <string>
+#include <thread>
 
 namespace advss {
 
@@ -225,12 +224,7 @@ private:
 	MacroDockSettings _dockSettings;
 };
 
-void LoadMacros(obs_data_t *obj);
-void SaveMacros(obs_data_t *obj);
-bool CheckMacros();
-bool RunMacros();
 void WaitForAllMacros();
-void InvalidateMacroTempVarValues();
 std::shared_ptr<Macro> GetMacroWithInvalidConditionInterval();
 
 } // namespace advss
diff --git a/lib/queue/action-queue.cpp b/lib/queue/action-queue.cpp
index 7fca0d18..a9131911 100644
--- a/lib/queue/action-queue.cpp
+++ b/lib/queue/action-queue.cpp
@@ -3,6 +3,9 @@
 #include "plugin-state-helpers.hpp"
 #include "ui-helpers.hpp"
 
+#include <QGridLayout>
+#include <QHBoxLayout>
+
 namespace advss {
 
 static std::deque<std::shared_ptr<Item>> queues;
diff --git a/lib/utils/priority-helper.cpp b/lib/utils/priority-helper.cpp
index 944dca17..33f3afcf 100644
--- a/lib/utils/priority-helper.cpp
+++ b/lib/utils/priority-helper.cpp
@@ -1,6 +1,8 @@
 #include "priority-helper.hpp"
-#include "switcher-data.hpp"
+
 #include "advanced-scene-switcher.hpp"
+#include "macro-helpers.hpp"
+#include "macro.hpp"
 #include "scene-group.hpp"
 #include "switch-audio.hpp"
 #include "switch-executable.hpp"
@@ -10,15 +12,16 @@
 #include "switch-pause.hpp"
 #include "switch-random.hpp"
 #include "switch-screen-region.hpp"
+#include "switch-sequence.hpp"
 #include "switch-time.hpp"
 #include "switch-transitions.hpp"
-#include "switch-window.hpp"
-#include "switch-sequence.hpp"
 #include "switch-video.hpp"
-#include "macro.hpp"
+#include "switch-window.hpp"
+#include "switcher-data.hpp"
+
+#include <QThread>
 
 #include <algorithm>
-#include <QThread>
 
 namespace advss {
 
diff --git a/lib/utils/temp-variable.cpp b/lib/utils/temp-variable.cpp
index afe63255..0dc3dc60 100644
--- a/lib/utils/temp-variable.cpp
+++ b/lib/utils/temp-variable.cpp
@@ -1,9 +1,11 @@
 #include "temp-variable.hpp"
-#include "obs-module-helper.hpp"
-#include "macro.hpp"
+
 #include "macro-action-macro.hpp"
 #include "macro-edit.hpp"
+#include "macro-helpers.hpp"
 #include "macro-segment.hpp"
+#include "macro.hpp"
+#include "obs-module-helper.hpp"
 #include "plugin-state-helpers.hpp"
 #include "sync-helpers.hpp"
 #include "ui-helpers.hpp"
diff --git a/lib/utils/ui-helpers.cpp b/lib/utils/ui-helpers.cpp
index 8cf7ff09..c3a04c3d 100644
--- a/lib/utils/ui-helpers.cpp
+++ b/lib/utils/ui-helpers.cpp
@@ -1,12 +1,18 @@
 #include "ui-helpers.hpp"
+
 #include "advanced-scene-switcher.hpp"
 #include "non-modal-dialog.hpp"
 #include "obs-module-helper.hpp"
 #include "plugin-state-helpers.hpp"
 
 #include <obs-frontend-api.h>
+
+#include <QAbstractButton>
+#include <QComboBox>
+#include <QCursor>
 #include <QGraphicsColorizeEffect>
 #include <QListView>
+#include <QListWidget>
 #include <QMainWindow>
 #include <QPropertyAnimation>
 #include <QScrollBar>
diff --git a/lib/utils/ui-helpers.hpp b/lib/utils/ui-helpers.hpp
index 86bf3016..463e824f 100644
--- a/lib/utils/ui-helpers.hpp
+++ b/lib/utils/ui-helpers.hpp
@@ -1,15 +1,18 @@
 #pragma once
+
 #include "export-symbol-helper.hpp"
 
-#include <QAbstractButton>
 #include <QColor>
-#include <QComboBox>
 #include <QIcon>
-#include <QListWidget>
 #include <QString>
-#include <QWidget>
+
 #include <string>
 
+class QAbstractButton;
+class QComboBox;
+class QListWidget;
+class QWidget;
+
 namespace advss {
 
 // Returns QObject* to QPropertyAnimation object
diff --git a/lib/utils/utility.cpp b/lib/utils/utility.cpp
index 014b8249..ff248bbc 100644
--- a/lib/utils/utility.cpp
+++ b/lib/utils/utility.cpp
@@ -1,6 +1,9 @@
 #include "utility.hpp"
 
+#include <QCursor>
+#include <QListWidget>
 #include <QTextStream>
+
 #include <sstream>
 
 namespace advss {
diff --git a/lib/utils/utility.hpp b/lib/utils/utility.hpp
index 472b6c99..d0044f3c 100644
--- a/lib/utils/utility.hpp
+++ b/lib/utils/utility.hpp
@@ -1,14 +1,15 @@
 #pragma once
+
 #include "export-symbol-helper.hpp"
 
-#include <optional>
-#include <QListWidget>
-#include <QMetaObject>
-#include <QPushButton>
 #include <QString>
-#include <QWidget>
+
 #include <string>
 
+class QListWidget;
+class QObject;
+class QWidget;
+
 namespace advss {
 
 EXPORT std::pair<int, int> GetCursorPos();
diff --git a/plugins/scripting/macro-script-handler.cpp b/plugins/scripting/macro-script-handler.cpp
index 585ade5d..2be6f05d 100644
--- a/plugins/scripting/macro-script-handler.cpp
+++ b/plugins/scripting/macro-script-handler.cpp
@@ -1,8 +1,9 @@
 #include "macro-script-handler.hpp"
+
+#include "log-helper.hpp"
 #include "macro-action-script.hpp"
 #include "macro-condition-script.hpp"
 #include "plugin-state-helpers.hpp"
-#include "log-helper.hpp"
 #include "variable.hpp"
 
 #include <obs-properties.h>
diff --git a/plugins/twitch/chat-connection.cpp b/plugins/twitch/chat-connection.cpp
index 0d34a96b..e7cfc5b9 100644
--- a/plugins/twitch/chat-connection.cpp
+++ b/plugins/twitch/chat-connection.cpp
@@ -1,4 +1,6 @@
 #include "chat-connection.hpp"
+
+#include "log-helper.hpp"
 #include "token.hpp"
 #include "twitch-helpers.hpp"
 
diff --git a/plugins/twitch/content-classification.cpp b/plugins/twitch/content-classification.cpp
index ce509dc0..37f399dd 100644
--- a/plugins/twitch/content-classification.cpp
+++ b/plugins/twitch/content-classification.cpp
@@ -1,4 +1,5 @@
 #include "content-classification.hpp"
+
 #include "channel-selection.hpp"
 #include "log-helper.hpp"
 #include "obs-module-helper.hpp"
diff --git a/plugins/twitch/event-sub.cpp b/plugins/twitch/event-sub.cpp
index 447e51db..6d2372a9 100644
--- a/plugins/twitch/event-sub.cpp
+++ b/plugins/twitch/event-sub.cpp
@@ -1,10 +1,12 @@
 #include "event-sub.hpp"
+
+#include "log-helper.hpp"
 #include "token.hpp"
 #include "twitch-helpers.hpp"
+#include "twitch-timestamp.hpp"
 
 #include <log-helper.hpp>
 #include <plugin-state-helpers.hpp>
-#include "twitch-timestamp.hpp"
 
 using namespace std::chrono_literals;
 
diff --git a/plugins/twitch/tag-selection.cpp b/plugins/twitch/tag-selection.cpp
index f86e23b6..94b9d5df 100644
--- a/plugins/twitch/tag-selection.cpp
+++ b/plugins/twitch/tag-selection.cpp
@@ -1,10 +1,10 @@
 #include "tag-selection.hpp"
+
 #include "channel-selection.hpp"
 #include "log-helper.hpp"
 #include "obs-module-helper.hpp"
 #include "twitch-helpers.hpp"
 
-#include <nlohmann/json.hpp>
 #include <QHBoxLayout>
 #include <QListWidget>
 #include <QMessageBox>
@@ -12,6 +12,8 @@
 #include <QRegularExpression>
 #include <QVBoxLayout>
 
+#include <nlohmann/json.hpp>
+
 namespace advss {
 
 void TwitchTagList::Load(obs_data_t *obj)
diff --git a/plugins/twitch/token.cpp b/plugins/twitch/token.cpp
index b83cb780..6a292a37 100644
--- a/plugins/twitch/token.cpp
+++ b/plugins/twitch/token.cpp
@@ -1,16 +1,20 @@
 #include "token.hpp"
+
+#include "log-helper.hpp"
 #include "twitch-helpers.hpp"
 
+#include <obs-module-helper.hpp>
+
+#include <QDesktopServices>
+#include <QGroupBox>
+#include <QScrollArea>
+#include <QUrl>
+
 #include <help-icon.hpp>
 #include <layout-helpers.hpp>
 #include <log-helper.hpp>
 #include <macro-export-extensions.hpp>
-#include <obs-module-helper.hpp>
 #include <plugin-state-helpers.hpp>
-#include <QDesktopServices>
-#include <QGroupBox>
-#include <QScrollArea>
-#include <QUrl>
 #include <ui-helpers.hpp>
 
 namespace advss {
diff --git a/plugins/twitch/twitch-helpers.cpp b/plugins/twitch/twitch-helpers.cpp
index ffdd062b..295492b4 100644
--- a/plugins/twitch/twitch-helpers.cpp
+++ b/plugins/twitch/twitch-helpers.cpp
@@ -1,4 +1,6 @@
 #include "twitch-helpers.hpp"
+
+#include "log-helper.hpp"
 #include "plugin-state-helpers.hpp"
 #include "token.hpp"