diff --git a/src/advanced-scene-switcher.cpp b/src/advanced-scene-switcher.cpp
index 351a1997..343a298b 100644
--- a/src/advanced-scene-switcher.cpp
+++ b/src/advanced-scene-switcher.cpp
@@ -9,6 +9,7 @@
 #include <obs-frontend-api.h>
 
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "status-control.hpp"
 #include "scene-switch-helpers.hpp"
 #include "curl-helper.hpp"
@@ -742,19 +743,3 @@ extern "C" void InitSceneSwitcher(obs_module_t *module, translateFunc translate)
 }
 
 } // namespace advss
-
-const char *obs_module_text(const char *text)
-{
-	if (!advss::switcher) {
-		return "";
-	}
-	return advss::switcher->Translate(text);
-}
-
-obs_module_t *obs_current_module()
-{
-	if (!advss::switcher) {
-		return nullptr;
-	}
-	return advss::switcher->GetModule();
-}
diff --git a/src/advanced-scene-switcher.hpp b/src/advanced-scene-switcher.hpp
index a1e0f68a..bdd11953 100644
--- a/src/advanced-scene-switcher.hpp
+++ b/src/advanced-scene-switcher.hpp
@@ -1,6 +1,6 @@
 #pragma once
 #include "macro-segment-list.hpp"
-#include "switcher-data.hpp"
+#include "log-helper.hpp"
 
 #include <ui_advanced-scene-switcher.h>
 
@@ -10,6 +10,9 @@ namespace advss {
 
 class MacroActionEdit;
 class MacroConditionEdit;
+class Duration;
+class SequenceWidget;
+struct SceneGroup;
 
 /*******************************************************************************
  * Advanced Scene Switcher window
diff --git a/src/general.cpp b/src/general.cpp
index 7f85dc4e..cff035e0 100644
--- a/src/general.cpp
+++ b/src/general.cpp
@@ -1,4 +1,5 @@
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "status-control.hpp"
 #include "file-selection.hpp"
 #include "utility.hpp"
diff --git a/src/hotkey.cpp b/src/hotkey.cpp
index a1da5b7a..3f428ba3 100644
--- a/src/hotkey.cpp
+++ b/src/hotkey.cpp
@@ -1,5 +1,6 @@
 #include "hotkey.hpp"
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include <obs-module.h>
 #include <fstream>
 #include <regex>
diff --git a/src/legacy/scene-group.cpp b/src/legacy/scene-group.cpp
index 02b89bd4..116bc6e1 100644
--- a/src/legacy/scene-group.cpp
+++ b/src/legacy/scene-group.cpp
@@ -3,6 +3,7 @@
 #include <random>
 
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "name-dialog.hpp"
 #include "utility.hpp"
 
diff --git a/src/legacy/scene-trigger.cpp b/src/legacy/scene-trigger.cpp
index 4e27a734..a7a719ec 100644
--- a/src/legacy/scene-trigger.cpp
+++ b/src/legacy/scene-trigger.cpp
@@ -1,8 +1,9 @@
-#include <thread>
-
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
 
+#include <thread>
+
 namespace advss {
 
 bool SceneTrigger::pause = false;
diff --git a/src/legacy/switch-audio.cpp b/src/legacy/switch-audio.cpp
index d6990011..f3c10133 100644
--- a/src/legacy/switch-audio.cpp
+++ b/src/legacy/switch-audio.cpp
@@ -1,9 +1,10 @@
-#include <float.h>
-
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "volume-control.hpp"
 #include "utility.hpp"
 
+#include <float.h>
+
 namespace advss {
 
 bool AudioSwitch::pause = false;
diff --git a/src/legacy/switch-executable.cpp b/src/legacy/switch-executable.cpp
index 0caba048..55c02f14 100644
--- a/src/legacy/switch-executable.cpp
+++ b/src/legacy/switch-executable.cpp
@@ -1,4 +1,5 @@
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "platform-funcs.hpp"
 #include "utility.hpp"
 
diff --git a/src/legacy/switch-file.cpp b/src/legacy/switch-file.cpp
index b3286a02..101899d2 100644
--- a/src/legacy/switch-file.cpp
+++ b/src/legacy/switch-file.cpp
@@ -1,3 +1,8 @@
+#include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
+#include "curl-helper.hpp"
+#include "utility.hpp"
+
 #include <QtGlobal>
 #include <QFileDialog>
 #include <QTextStream>
@@ -6,10 +11,6 @@
 #include <regex>
 #include <curl/curl.h>
 
-#include "advanced-scene-switcher.hpp"
-#include "curl-helper.hpp"
-#include "utility.hpp"
-
 namespace advss {
 
 bool FileSwitch::pause = false;
diff --git a/src/legacy/switch-generic.cpp b/src/legacy/switch-generic.cpp
index ff28ab1b..d30a2ade 100644
--- a/src/legacy/switch-generic.cpp
+++ b/src/legacy/switch-generic.cpp
@@ -1,4 +1,5 @@
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
 
 constexpr auto previous_scene_name = "Previous Scene";
diff --git a/src/legacy/switch-idle.cpp b/src/legacy/switch-idle.cpp
index ffa4b376..c61c4570 100644
--- a/src/legacy/switch-idle.cpp
+++ b/src/legacy/switch-idle.cpp
@@ -1,9 +1,10 @@
-#include <regex>
-
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "platform-funcs.hpp"
 #include "utility.hpp"
 
+#include <regex>
+
 namespace advss {
 
 bool IdleData::pause = false;
diff --git a/src/legacy/switch-media.cpp b/src/legacy/switch-media.cpp
index 2ba94a7a..ee0550e9 100644
--- a/src/legacy/switch-media.cpp
+++ b/src/legacy/switch-media.cpp
@@ -1,4 +1,5 @@
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
 
 namespace advss {
diff --git a/src/legacy/switch-network.cpp b/src/legacy/switch-network.cpp
index 69a393a9..7eec691d 100644
--- a/src/legacy/switch-network.cpp
+++ b/src/legacy/switch-network.cpp
@@ -7,6 +7,7 @@ Most of this code is based on https://github.com/Palakis/obs-websocket
 #include <QMessageBox>
 
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "scene-switch-helpers.hpp"
 #include "utility.hpp"
 
diff --git a/src/legacy/switch-pause.cpp b/src/legacy/switch-pause.cpp
index 0a68856c..7b882edb 100644
--- a/src/legacy/switch-pause.cpp
+++ b/src/legacy/switch-pause.cpp
@@ -1,8 +1,9 @@
-#include <regex>
-
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
 
+#include <regex>
+
 namespace advss {
 
 static QMetaObject::Connection addPulse;
diff --git a/src/legacy/switch-priority.cpp b/src/legacy/switch-priority.cpp
index 85ec0f40..c5e5e0eb 100644
--- a/src/legacy/switch-priority.cpp
+++ b/src/legacy/switch-priority.cpp
@@ -1,6 +1,7 @@
-#include <algorithm>
-
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
+
+#include <algorithm>
 
 namespace advss {
 
diff --git a/src/legacy/switch-random.cpp b/src/legacy/switch-random.cpp
index c789b95e..e81f4352 100644
--- a/src/legacy/switch-random.cpp
+++ b/src/legacy/switch-random.cpp
@@ -1,8 +1,9 @@
-#include <random>
-
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
 
+#include <random>
+
 namespace advss {
 
 bool RandomSwitch::pause = false;
diff --git a/src/legacy/switch-screen-region.cpp b/src/legacy/switch-screen-region.cpp
index 6f492068..ff66b5f2 100644
--- a/src/legacy/switch-screen-region.cpp
+++ b/src/legacy/switch-screen-region.cpp
@@ -1,8 +1,9 @@
-#include <QTimer>
-
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
 
+#include <QTimer>
+
 namespace advss {
 
 bool ScreenRegionSwitch::pause = false;
diff --git a/src/legacy/switch-sequence.cpp b/src/legacy/switch-sequence.cpp
index a2abd736..fcc94530 100644
--- a/src/legacy/switch-sequence.cpp
+++ b/src/legacy/switch-sequence.cpp
@@ -1,10 +1,11 @@
+#include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
+#include "utility.hpp"
+
 #include <QFileDialog>
 #include <QTextStream>
 #include <QScrollArea>
 
-#include "advanced-scene-switcher.hpp"
-#include "utility.hpp"
-
 namespace advss {
 
 constexpr auto max_extend_text_size = 150;
diff --git a/src/legacy/switch-time.cpp b/src/legacy/switch-time.cpp
index 11c2aab3..de672372 100644
--- a/src/legacy/switch-time.cpp
+++ b/src/legacy/switch-time.cpp
@@ -1,4 +1,5 @@
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
 
 namespace advss {
diff --git a/src/legacy/switch-transitions.cpp b/src/legacy/switch-transitions.cpp
index 7baf27bb..c64ce633 100644
--- a/src/legacy/switch-transitions.cpp
+++ b/src/legacy/switch-transitions.cpp
@@ -1,8 +1,9 @@
-#include <thread>
-
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
 
+#include <thread>
+
 namespace advss {
 
 constexpr auto default_def_transition_dealy = 300;
diff --git a/src/legacy/switch-video.cpp b/src/legacy/switch-video.cpp
index 49238516..743b24d8 100644
--- a/src/legacy/switch-video.cpp
+++ b/src/legacy/switch-video.cpp
@@ -1,11 +1,12 @@
+#include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
+#include "utility.hpp"
+
 #include <QFileDialog>
 #include <QBuffer>
 #include <QToolTip>
 #include <thread>
 
-#include "advanced-scene-switcher.hpp"
-#include "utility.hpp"
-
 namespace advss {
 
 bool VideoSwitch::pause = false;
diff --git a/src/legacy/switch-window.cpp b/src/legacy/switch-window.cpp
index e6a65010..c941f9c2 100644
--- a/src/legacy/switch-window.cpp
+++ b/src/legacy/switch-window.cpp
@@ -1,9 +1,10 @@
-#include <regex>
-
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "platform-funcs.hpp"
 #include "utility.hpp"
 
+#include <regex>
+
 namespace advss {
 
 bool WindowSwitch::pause = false;
diff --git a/src/macro-core/macro-action-audio.cpp b/src/macro-core/macro-action-audio.cpp
index 0d78b4df..ba0546d3 100644
--- a/src/macro-core/macro-action-audio.cpp
+++ b/src/macro-core/macro-action-audio.cpp
@@ -1,5 +1,5 @@
 #include "macro-action-audio.hpp"
-#include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
 
 namespace advss {
@@ -505,7 +505,7 @@ void MacroActionAudioEdit::SourceChanged(const SourceSelection &source)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_audioSource = source;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -517,7 +517,7 @@ void MacroActionAudioEdit::ActionChanged(int idx)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_action = static_cast<MacroActionAudio::Action>(
 		_actions->itemData(idx).toInt());
 	SetWidgetVisibility();
@@ -529,7 +529,7 @@ void MacroActionAudioEdit::SyncOffsetChanged(const NumberVariable<int> &value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_syncOffset = value;
 }
 
@@ -539,7 +539,7 @@ void MacroActionAudioEdit::MonitorTypeChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_monitorType = static_cast<obs_monitoring_type>(value);
 }
 
@@ -549,7 +549,7 @@ void MacroActionAudioEdit::BalanceChanged(const NumberVariable<double> &value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_balance = value;
 }
 
@@ -559,7 +559,7 @@ void MacroActionAudioEdit::VolumeChanged(const NumberVariable<int> &value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_volume = value;
 }
 
@@ -569,7 +569,7 @@ void MacroActionAudioEdit::FadeChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_fade = value;
 	SetWidgetVisibility();
 }
@@ -580,7 +580,7 @@ void MacroActionAudioEdit::DurationChanged(const Duration &dur)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_duration = dur;
 }
 
@@ -590,7 +590,7 @@ void MacroActionAudioEdit::RateChanged(const NumberVariable<double> &value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_rate = value;
 }
 
@@ -600,7 +600,7 @@ void MacroActionAudioEdit::WaitChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_wait = value;
 }
 
@@ -610,7 +610,7 @@ void MacroActionAudioEdit::AbortActiveFadeChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_abortActiveFade = value;
 }
 
@@ -620,7 +620,7 @@ void MacroActionAudioEdit::FadeTypeChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_fadeType = static_cast<MacroActionAudio::FadeType>(value);
 	SetWidgetVisibility();
 }
diff --git a/src/macro-core/macro-action-edit.cpp b/src/macro-core/macro-action-edit.cpp
index 83c4aceb..54a56686 100644
--- a/src/macro-core/macro-action-edit.cpp
+++ b/src/macro-core/macro-action-edit.cpp
@@ -1,4 +1,5 @@
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "macro-action-edit.hpp"
 #include "macro-action-scene-switch.hpp"
 #include "section.hpp"
diff --git a/src/macro-core/macro-action-file.cpp b/src/macro-core/macro-action-file.cpp
index 73df42b6..8023a4e2 100644
--- a/src/macro-core/macro-action-file.cpp
+++ b/src/macro-core/macro-action-file.cpp
@@ -1,5 +1,4 @@
 #include "macro-action-file.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
 #include <QFile>
@@ -141,7 +140,7 @@ void MacroActionFileEdit::PathChanged(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_file = text.toUtf8().constData();
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -153,7 +152,7 @@ void MacroActionFileEdit::TextChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_text = _text->toPlainText().toStdString();
 
 	adjustSize();
@@ -166,7 +165,7 @@ void MacroActionFileEdit::ActionChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_action = static_cast<FileAction>(value);
 }
 
diff --git a/src/macro-core/macro-action-filter.cpp b/src/macro-core/macro-action-filter.cpp
index f09e85a7..f7e20249 100644
--- a/src/macro-core/macro-action-filter.cpp
+++ b/src/macro-core/macro-action-filter.cpp
@@ -1,5 +1,4 @@
 #include "macro-action-filter.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
 namespace advss {
@@ -185,7 +184,7 @@ void MacroActionFilterEdit::SourceChanged(const SourceSelection &source)
 		return;
 	}
 	{
-		std::lock_guard<std::mutex> lock(switcher->m);
+		auto lock = LockContext();
 		_entryData->_source = source;
 	}
 	_filters->clear();
@@ -199,7 +198,7 @@ void MacroActionFilterEdit::FilterChanged(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_filterName = text.toStdString();
 	_entryData->_filter =
 		GetWeakFilterByQString(_entryData->_source.GetSource(), text);
@@ -213,7 +212,7 @@ void MacroActionFilterEdit::ActionChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_action = static_cast<MacroActionFilter::Action>(value);
 	SetWidgetVisibility(_entryData->_action ==
 			    MacroActionFilter::Action::SETTINGS);
@@ -236,7 +235,7 @@ void MacroActionFilterEdit::SettingsChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_settings = _settings->toPlainText().toStdString();
 
 	adjustSize();
diff --git a/src/macro-core/macro-action-hotkey.cpp b/src/macro-core/macro-action-hotkey.cpp
index ffd7f619..974cbdf1 100644
--- a/src/macro-core/macro-action-hotkey.cpp
+++ b/src/macro-core/macro-action-hotkey.cpp
@@ -1,5 +1,4 @@
 #include "macro-action-hotkey.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "platform-funcs.hpp"
 #include "utility.hpp"
 
@@ -512,7 +511,7 @@ void MacroActionHotkeyEdit::LShiftChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_leftShift = state;
 }
 
@@ -522,7 +521,7 @@ void MacroActionHotkeyEdit::RShiftChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_rightShift = state;
 }
 
@@ -532,7 +531,7 @@ void MacroActionHotkeyEdit::LCtrlChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_leftCtrl = state;
 }
 
@@ -542,7 +541,7 @@ void MacroActionHotkeyEdit::RCtrlChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_rightCtrl = state;
 }
 
@@ -552,7 +551,7 @@ void MacroActionHotkeyEdit::LAltChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_leftAlt = state;
 }
 
@@ -562,7 +561,7 @@ void MacroActionHotkeyEdit::RAltChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_rightAlt = state;
 }
 
@@ -572,7 +571,7 @@ void MacroActionHotkeyEdit::LMetaChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_leftMeta = state;
 }
 
@@ -582,7 +581,7 @@ void MacroActionHotkeyEdit::RMetaChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_rightMeta = state;
 }
 
@@ -592,7 +591,7 @@ void MacroActionHotkeyEdit::DurationChanged(const Duration &dur)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_duration = dur;
 }
 
@@ -602,7 +601,7 @@ void MacroActionHotkeyEdit::OnlySendToOBSChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_onlySendToObs = state;
 	SetWarningVisibility();
 }
@@ -613,7 +612,7 @@ void MacroActionHotkeyEdit::KeyChanged(int key)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_key = static_cast<HotkeyType>(key);
 }
 
diff --git a/src/macro-core/macro-action-http.cpp b/src/macro-core/macro-action-http.cpp
index 6d8a5b84..dbdb1935 100644
--- a/src/macro-core/macro-action-http.cpp
+++ b/src/macro-core/macro-action-http.cpp
@@ -1,5 +1,5 @@
 #include "macro-action-http.hpp"
-#include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
 #include "curl-helper.hpp"
 
@@ -224,7 +224,7 @@ void MacroActionHttpEdit::URLChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_url = _url->text().toStdString();
 	emit(HeaderInfoChanged(_url->text()));
 }
@@ -235,7 +235,7 @@ void MacroActionHttpEdit::MethodChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_method = static_cast<MacroActionHttp::Method>(value);
 	SetWidgetVisibility();
 }
@@ -246,7 +246,7 @@ void MacroActionHttpEdit::TimeoutChanged(const Duration &dur)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_timeout = dur;
 }
 
@@ -256,7 +256,7 @@ void MacroActionHttpEdit::SetHeadersChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_setHeaders = value;
 	SetWidgetVisibility();
 }
@@ -267,7 +267,7 @@ void MacroActionHttpEdit::HeadersChanged(const StringList &headers)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_headers = headers;
 	adjustSize();
 	updateGeometry();
@@ -288,7 +288,7 @@ void MacroActionHttpEdit::DataChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_data = _data->toPlainText().toUtf8().constData();
 
 	adjustSize();
diff --git a/src/macro-core/macro-action-macro.cpp b/src/macro-core/macro-action-macro.cpp
index 0ca75b91..a20fa544 100644
--- a/src/macro-core/macro-action-macro.cpp
+++ b/src/macro-core/macro-action-macro.cpp
@@ -1,5 +1,5 @@
 #include "macro-action-macro.hpp"
-#include "advanced-scene-switcher.hpp"
+#include "macro.hpp"
 #include "utility.hpp"
 
 namespace advss {
@@ -157,7 +157,7 @@ void MacroActionMacroEdit::MacroChanged(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_macro = text;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -169,7 +169,7 @@ void MacroActionMacroEdit::ActionChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_action = static_cast<PerformMacroAction>(value);
 
 	if (_entryData->_action == PerformMacroAction::RUN ||
diff --git a/src/macro-core/macro-action-media.cpp b/src/macro-core/macro-action-media.cpp
index 54e8fcb3..fe00bdfe 100644
--- a/src/macro-core/macro-action-media.cpp
+++ b/src/macro-core/macro-action-media.cpp
@@ -1,5 +1,4 @@
 #include "macro-action-media.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
 namespace advss {
@@ -154,7 +153,7 @@ void MacroActionMediaEdit::SourceChanged(const SourceSelection &source)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_mediaSource = source;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -166,7 +165,7 @@ void MacroActionMediaEdit::ActionChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_action = static_cast<MediaAction>(value);
 	SetWidgetVisibility();
 }
@@ -177,7 +176,7 @@ void MacroActionMediaEdit::DurationChanged(const Duration &dur)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_seek = dur;
 }
 
diff --git a/src/macro-core/macro-action-plugin-state.cpp b/src/macro-core/macro-action-plugin-state.cpp
index cd37ac9a..a3aa847d 100644
--- a/src/macro-core/macro-action-plugin-state.cpp
+++ b/src/macro-core/macro-action-plugin-state.cpp
@@ -1,5 +1,5 @@
 #include "macro-action-plugin-state.hpp"
-#include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
 
 #include <thread>
@@ -22,12 +22,12 @@ const static std::map<PluginStateAction, std::string> actionTypes = {
 	 "AdvSceneSwitcher.action.pluginState.type.import"},
 };
 
-const static std::map<NoMatch, std::string> noMatchValues = {
-	{NO_SWITCH,
+const static std::map<SwitcherData::NoMatch, std::string> noMatchValues = {
+	{SwitcherData::NoMatch::NO_SWITCH,
 	 "AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.dontSwitch"},
-	{SWITCH,
+	{SwitcherData::NoMatch::SWITCH,
 	 "AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.switchTo"},
-	{RANDOM_SWITCH,
+	{SwitcherData::NoMatch::RANDOM_SWITCH,
 	 "AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.switchToRandom"},
 };
 
@@ -52,8 +52,9 @@ void importSettings(const std::string &path)
 
 void setNoMatchBehaviour(int value, OBSWeakSource &scene)
 {
-	switcher->switchIfNotMatching = static_cast<NoMatch>(value);
-	if (switcher->switchIfNotMatching == SWITCH) {
+	switcher->switchIfNotMatching =
+		static_cast<SwitcherData::NoMatch>(value);
+	if (switcher->switchIfNotMatching == SwitcherData::NoMatch::SWITCH) {
 		switcher->nonMatchingScene = scene;
 	}
 }
@@ -198,7 +199,7 @@ void MacroActionPluginStateEdit::ActionChanged(int value)
 	}
 
 	{
-		std::lock_guard<std::mutex> lock(switcher->m);
+		auto lock = LockContext();
 		_entryData->_action = static_cast<PluginStateAction>(value);
 		SetWidgetVisibility();
 	}
@@ -213,7 +214,7 @@ void MacroActionPluginStateEdit::ValueChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_value = value;
 	SetWidgetVisibility();
 }
@@ -224,7 +225,7 @@ void MacroActionPluginStateEdit::SceneChanged(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_scene = GetWeakSourceByQString(text);
 }
 
@@ -234,7 +235,7 @@ void MacroActionPluginStateEdit::PathChanged(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_settingsPath = text.toStdString();
 }
 
@@ -253,7 +254,8 @@ void MacroActionPluginStateEdit::SetWidgetVisibility()
 		break;
 	case PluginStateAction::NO_MATCH_BEHAVIOUR:
 		_values->show();
-		if ((NoMatch)_entryData->_value == SWITCH) {
+		if (static_cast<SwitcherData::NoMatch>(_entryData->_value) ==
+		    SwitcherData::NoMatch::SWITCH) {
 			_scenes->show();
 		}
 		break;
diff --git a/src/macro-core/macro-action-profile.cpp b/src/macro-core/macro-action-profile.cpp
index a09deab4..13f898cf 100644
--- a/src/macro-core/macro-action-profile.cpp
+++ b/src/macro-core/macro-action-profile.cpp
@@ -1,5 +1,4 @@
 #include "macro-action-profile.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
 namespace advss {
@@ -78,7 +77,7 @@ void MacroActionProfileEdit::ProfileChanged(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_profile = text.toStdString();
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
diff --git a/src/macro-core/macro-action-projector.cpp b/src/macro-core/macro-action-projector.cpp
index 236ed461..f6136116 100644
--- a/src/macro-core/macro-action-projector.cpp
+++ b/src/macro-core/macro-action-projector.cpp
@@ -1,7 +1,7 @@
 #include "macro-action-projector.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
+#include <QGuiApplication>
 #include <QScreen>
 
 namespace advss {
@@ -227,7 +227,7 @@ void MacroActionProjectorEdit::SceneChanged(const SceneSelection &s)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_scene = s;
 }
 
@@ -237,7 +237,7 @@ void MacroActionProjectorEdit::SourceChanged(const SourceSelection &source)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_source = source;
 }
 
@@ -247,7 +247,7 @@ void MacroActionProjectorEdit::MonitorChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_monitor = value;
 }
 
@@ -257,7 +257,7 @@ void MacroActionProjectorEdit::WindowTypeChanged(int)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_fullscreen =
 		_windowTypes->currentText() ==
 		obs_module_text("AdvSceneSwitcher.action.projector.fullscreen");
@@ -270,7 +270,7 @@ void MacroActionProjectorEdit::TypeChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_type = static_cast<MacroActionProjector::Type>(value);
 	SetWidgetVisibility();
 }
diff --git a/src/macro-core/macro-action-random.cpp b/src/macro-core/macro-action-random.cpp
index aff26024..d4b06a2b 100644
--- a/src/macro-core/macro-action-random.cpp
+++ b/src/macro-core/macro-action-random.cpp
@@ -1,5 +1,5 @@
 #include "macro-action-random.hpp"
-#include "advanced-scene-switcher.hpp"
+#include "macro.hpp"
 #include "utility.hpp"
 
 #include <cstdlib>
@@ -151,7 +151,7 @@ void MacroActionRandomEdit::Add(const std::string &name)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	MacroRef macro(name);
 	_entryData->_macros.push_back(macro);
 	_allowRepeat->setVisible(ShouldShowAllowRepeat());
@@ -164,7 +164,7 @@ void MacroActionRandomEdit::Remove(int idx)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_macros.erase(std::next(_entryData->_macros.begin(), idx));
 	_allowRepeat->setVisible(ShouldShowAllowRepeat());
 	adjustSize();
@@ -177,7 +177,7 @@ void MacroActionRandomEdit::Replace(int idx, const std::string &name)
 	}
 
 	MacroRef macro(name);
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_macros[idx] = macro;
 	adjustSize();
 }
@@ -188,7 +188,7 @@ void MacroActionRandomEdit::AllowRepeatChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_allowRepeat = value;
 }
 
diff --git a/src/macro-core/macro-action-recording.cpp b/src/macro-core/macro-action-recording.cpp
index fd099b70..370b51f8 100644
--- a/src/macro-core/macro-action-recording.cpp
+++ b/src/macro-core/macro-action-recording.cpp
@@ -1,5 +1,4 @@
 #include "macro-action-recording.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
 #include <util/config-file.h>
@@ -187,7 +186,7 @@ void MacroActionRecordEdit::FolderChanged(const QString &folder)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_folder = folder.toStdString();
 }
 
@@ -197,7 +196,7 @@ void MacroActionRecordEdit::FormatStringChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_fileFormat = _recordFileFormat->text().toStdString();
 }
 
@@ -218,7 +217,7 @@ void MacroActionRecordEdit::ActionChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_action = static_cast<MacroActionRecord::Action>(value);
 	SetWidgetVisibility();
 }
diff --git a/src/macro-core/macro-action-replay-buffer.cpp b/src/macro-core/macro-action-replay-buffer.cpp
index 910e0874..f28ffffc 100644
--- a/src/macro-core/macro-action-replay-buffer.cpp
+++ b/src/macro-core/macro-action-replay-buffer.cpp
@@ -1,5 +1,4 @@
 #include "macro-action-replay-buffer.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
 namespace advss {
@@ -119,7 +118,7 @@ void MacroActionReplayBufferEdit::ActionChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_action = static_cast<ReplayBufferAction>(value);
 	_saveWarning->setVisible(_entryData->_action ==
 				 ReplayBufferAction::SAVE);
diff --git a/src/macro-core/macro-action-run.cpp b/src/macro-core/macro-action-run.cpp
index aaee2c9f..5348c543 100644
--- a/src/macro-core/macro-action-run.cpp
+++ b/src/macro-core/macro-action-run.cpp
@@ -1,5 +1,4 @@
 #include "macro-action-run.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
 #include <QProcess>
@@ -82,7 +81,7 @@ void MacroActionRunEdit::ProcessConfigChanged(const ProcessConfig &conf)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_procConfig = conf;
 	adjustSize();
 	updateGeometry();
diff --git a/src/macro-core/macro-action-scene-collection.cpp b/src/macro-core/macro-action-scene-collection.cpp
index d64535d7..21df17f4 100644
--- a/src/macro-core/macro-action-scene-collection.cpp
+++ b/src/macro-core/macro-action-scene-collection.cpp
@@ -1,5 +1,5 @@
 #include "macro-action-scene-collection.hpp"
-#include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
 
 namespace advss {
@@ -112,7 +112,7 @@ void MacroActionSceneCollectionEdit::SceneCollectionChanged(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_sceneCollection = text.toStdString();
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
diff --git a/src/macro-core/macro-action-scene-order.cpp b/src/macro-core/macro-action-scene-order.cpp
index 701768ec..f60ac864 100644
--- a/src/macro-core/macro-action-scene-order.cpp
+++ b/src/macro-core/macro-action-scene-order.cpp
@@ -1,5 +1,4 @@
 #include "macro-action-scene-order.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
 namespace advss {
@@ -215,7 +214,7 @@ void MacroActionSceneOrderEdit::SceneChanged(const SceneSelection &s)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_scene = s;
 }
 
@@ -225,7 +224,7 @@ void MacroActionSceneOrderEdit::SourceChanged(const SceneItemSelection &item)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_source = item;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -237,7 +236,7 @@ void MacroActionSceneOrderEdit::ActionChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_action = static_cast<SceneOrderAction>(value);
 	_position->setVisible(_entryData->_action ==
 			      SceneOrderAction::POSITION);
@@ -249,7 +248,7 @@ void MacroActionSceneOrderEdit::PositionChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_position = value;
 }
 
diff --git a/src/macro-core/macro-action-scene-switch.cpp b/src/macro-core/macro-action-scene-switch.cpp
index 0415d9bd..ac1fbc65 100644
--- a/src/macro-core/macro-action-scene-switch.cpp
+++ b/src/macro-core/macro-action-scene-switch.cpp
@@ -1,5 +1,5 @@
 #include "macro-action-scene-switch.hpp"
-#include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "scene-switch-helpers.hpp"
 #include "utility.hpp"
 
@@ -234,7 +234,7 @@ void MacroActionSwitchSceneEdit::DurationChanged(const Duration &dur)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_duration = dur;
 }
 
@@ -244,7 +244,7 @@ void MacroActionSwitchSceneEdit::BlockUntilTransitionDoneChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_blockUntilTransitionDone = state;
 }
 
@@ -285,7 +285,7 @@ void MacroActionSwitchSceneEdit::SceneChanged(const SceneSelection &s)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_scene = s;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -297,7 +297,7 @@ void MacroActionSwitchSceneEdit::TransitionChanged(const TransitionSelection &t)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_transition = t;
 	SetDurationVisibility();
 }
diff --git a/src/macro-core/macro-action-scene-transform.cpp b/src/macro-core/macro-action-scene-transform.cpp
index fe557f5b..f898157e 100644
--- a/src/macro-core/macro-action-scene-transform.cpp
+++ b/src/macro-core/macro-action-scene-transform.cpp
@@ -1,5 +1,4 @@
 #include "macro-action-scene-transform.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
 namespace advss {
@@ -183,7 +182,7 @@ void MacroActionSceneTransformEdit::SceneChanged(const SceneSelection &s)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_scene = s;
 }
 
@@ -193,7 +192,7 @@ void MacroActionSceneTransformEdit::SourceChanged(const SceneItemSelection &item
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_source = item;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -223,7 +222,7 @@ void MacroActionSceneTransformEdit::SettingsChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_settings = _settings->toPlainText().toStdString();
 
 	adjustSize();
diff --git a/src/macro-core/macro-action-scene-visibility.cpp b/src/macro-core/macro-action-scene-visibility.cpp
index d6314533..cd534e14 100644
--- a/src/macro-core/macro-action-scene-visibility.cpp
+++ b/src/macro-core/macro-action-scene-visibility.cpp
@@ -1,5 +1,4 @@
 #include "macro-action-scene-visibility.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
 namespace advss {
@@ -248,7 +247,7 @@ void MacroActionSceneVisibilityEdit::SceneChanged(const SceneSelection &s)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_scene = s;
 }
 
@@ -258,7 +257,7 @@ void MacroActionSceneVisibilityEdit::SourceTypeChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_sourceType = static_cast<SceneItemSourceType>(value);
 	SetWidgetVisibility();
 }
@@ -270,7 +269,7 @@ void MacroActionSceneVisibilityEdit::SourceChanged(
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_source = item;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -282,7 +281,7 @@ void MacroActionSceneVisibilityEdit::SourceGroupChanged(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	if (text == obs_module_text("AdvSceneSwitcher.selectItem")) {
 		_entryData->_sourceGroup = "";
 	} else {
@@ -298,7 +297,7 @@ void MacroActionSceneVisibilityEdit::ActionChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_action = static_cast<SceneVisibilityAction>(value);
 }
 
diff --git a/src/macro-core/macro-action-screenshot.cpp b/src/macro-core/macro-action-screenshot.cpp
index e1f12055..aa1565aa 100644
--- a/src/macro-core/macro-action-screenshot.cpp
+++ b/src/macro-core/macro-action-screenshot.cpp
@@ -1,5 +1,4 @@
 #include "macro-action-screenshot.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
 namespace advss {
@@ -212,7 +211,7 @@ void MacroActionScreenshotEdit::SceneChanged(const SceneSelection &s)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_scene = s;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -244,7 +243,7 @@ void MacroActionScreenshotEdit::PathChanged(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_path = text.toStdString();
 }
 
@@ -254,7 +253,7 @@ void MacroActionScreenshotEdit::SourceChanged(const SourceSelection &source)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_source = source;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
diff --git a/src/macro-core/macro-action-sequence.cpp b/src/macro-core/macro-action-sequence.cpp
index 1dcb2fe8..d201baf3 100644
--- a/src/macro-core/macro-action-sequence.cpp
+++ b/src/macro-core/macro-action-sequence.cpp
@@ -1,5 +1,5 @@
 #include "macro-action-sequence.hpp"
-#include "advanced-scene-switcher.hpp"
+#include "macro.hpp"
 #include "utility.hpp"
 
 namespace advss {
@@ -177,7 +177,7 @@ void MacroActionSequenceEdit::Add(const std::string &name)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	MacroRef macro(name);
 	_entryData->_macros.push_back(macro);
 	adjustSize();
@@ -189,7 +189,7 @@ void MacroActionSequenceEdit::Remove(int idx)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_macros.erase(std::next(_entryData->_macros.begin(), idx));
 	adjustSize();
 }
@@ -200,13 +200,13 @@ void MacroActionSequenceEdit::Up(int idx)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	std::swap(_entryData->_macros[idx], _entryData->_macros[idx - 1]);
 }
 
 void MacroActionSequenceEdit::Down(int idx)
 {
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	std::swap(_entryData->_macros[idx], _entryData->_macros[idx + 1]);
 }
 
@@ -217,7 +217,7 @@ void MacroActionSequenceEdit::Replace(int idx, const std::string &name)
 	}
 
 	MacroRef macro(name);
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_macros[idx] = macro;
 	adjustSize();
 }
@@ -232,7 +232,7 @@ void MacroActionSequenceEdit::ContinueFromClicked()
 	if (idx == -1) {
 		return;
 	}
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_lastIdx = idx - 1;
 }
 
@@ -242,7 +242,7 @@ void MacroActionSequenceEdit::RestartChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_restart = state;
 }
 
diff --git a/src/macro-core/macro-action-source.cpp b/src/macro-core/macro-action-source.cpp
index b910a39c..09eda4d6 100644
--- a/src/macro-core/macro-action-source.cpp
+++ b/src/macro-core/macro-action-source.cpp
@@ -1,5 +1,4 @@
 #include "macro-action-source.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
 Q_DECLARE_METATYPE(advss::SourceSettingButton);
@@ -252,7 +251,7 @@ void MacroActionSourceEdit::SourceChanged(const SourceSelection &source)
 	}
 
 	{
-		std::lock_guard<std::mutex> lock(switcher->m);
+		auto lock = LockContext();
 		_entryData->_source = source;
 	}
 	populateSourceButtonSelection(_settingsButtons,
@@ -267,7 +266,7 @@ void MacroActionSourceEdit::ActionChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_action = static_cast<SourceAction>(value);
 	SetWidgetVisibility();
 }
@@ -278,7 +277,7 @@ void MacroActionSourceEdit::ButtonChanged(int idx)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_button = qvariant_cast<SourceSettingButton>(
 		_settingsButtons->itemData(idx));
 }
@@ -299,7 +298,7 @@ void MacroActionSourceEdit::SettingsChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_settings = _settings->toPlainText().toStdString();
 
 	adjustSize();
diff --git a/src/macro-core/macro-action-streaming.cpp b/src/macro-core/macro-action-streaming.cpp
index 72c19f4f..87720783 100644
--- a/src/macro-core/macro-action-streaming.cpp
+++ b/src/macro-core/macro-action-streaming.cpp
@@ -1,5 +1,4 @@
 #include "macro-action-streaming.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
 namespace advss {
@@ -119,7 +118,7 @@ void MacroActionStreamEdit::ActionChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_action = static_cast<StreamAction>(value);
 }
 
diff --git a/src/macro-core/macro-action-studio-mode.cpp b/src/macro-core/macro-action-studio-mode.cpp
index ef14f4cf..d2c7c6c0 100644
--- a/src/macro-core/macro-action-studio-mode.cpp
+++ b/src/macro-core/macro-action-studio-mode.cpp
@@ -1,5 +1,4 @@
 #include "macro-action-studio-mode.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
 namespace advss {
@@ -151,7 +150,7 @@ void MacroActionSudioModeEdit::SceneChanged(const SceneSelection &s)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_scene = s;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -163,7 +162,7 @@ void MacroActionSudioModeEdit::ActionChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_action = static_cast<StudioModeAction>(value);
 	_scenes->setVisible(_entryData->_action == StudioModeAction::SET_SCENE);
 	emit HeaderInfoChanged(
diff --git a/src/macro-core/macro-action-systray.cpp b/src/macro-core/macro-action-systray.cpp
index c9a68cfc..fc4db92a 100644
--- a/src/macro-core/macro-action-systray.cpp
+++ b/src/macro-core/macro-action-systray.cpp
@@ -1,5 +1,4 @@
 #include "macro-action-systray.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
 namespace advss {
@@ -67,7 +66,7 @@ void MacroActionSystrayEdit::MessageChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_msg = _msg->text().toStdString();
 }
 
diff --git a/src/macro-core/macro-action-timer.cpp b/src/macro-core/macro-action-timer.cpp
index 3b1d1e81..5a1ac701 100644
--- a/src/macro-core/macro-action-timer.cpp
+++ b/src/macro-core/macro-action-timer.cpp
@@ -1,6 +1,6 @@
 #include "macro-action-timer.hpp"
 #include "macro-condition-timer.hpp"
-#include "advanced-scene-switcher.hpp"
+#include "macro.hpp"
 #include "utility.hpp"
 
 #include <random>
@@ -170,7 +170,7 @@ void MacroActionTimerEdit::ActionTypeChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_actionType = static_cast<TimerAction>(value);
 	SetWidgetVisibility();
 }
@@ -191,7 +191,7 @@ void MacroActionTimerEdit::DurationChanged(const Duration &dur)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_duration = dur;
 }
 
@@ -201,7 +201,7 @@ void MacroActionTimerEdit::MacroChanged(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_macro = text;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
diff --git a/src/macro-core/macro-action-transition.cpp b/src/macro-core/macro-action-transition.cpp
index afb65d78..6213f0cc 100644
--- a/src/macro-core/macro-action-transition.cpp
+++ b/src/macro-core/macro-action-transition.cpp
@@ -1,5 +1,4 @@
 #include "macro-action-transition.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
 namespace advss {
@@ -294,7 +293,7 @@ void MacroActionTransitionEdit::SourceChanged(const SceneItemSelection &item)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_source = item;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -306,7 +305,7 @@ void MacroActionTransitionEdit::ActionChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_type = static_cast<MacroActionTransition::Type>(value);
 	SetWidgetVisibility();
 	emit HeaderInfoChanged(
@@ -319,7 +318,7 @@ void MacroActionTransitionEdit::SceneChanged(const SceneSelection &s)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_scene = s;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -331,7 +330,7 @@ void MacroActionTransitionEdit::TransitionChanged(const TransitionSelection &t)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_transition = t;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -343,7 +342,7 @@ void MacroActionTransitionEdit::DurationChanged(const Duration &dur)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_duration = dur;
 }
 
@@ -363,7 +362,7 @@ void MacroActionTransitionEdit::SetTransitionChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_setTransitionType = state;
 	_transitions->setEnabled(state);
 	if (state) {
@@ -380,7 +379,7 @@ void MacroActionTransitionEdit::SetDurationChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_setDuration = state;
 	_duration->setEnabled(state);
 }
diff --git a/src/macro-core/macro-action-variable.cpp b/src/macro-core/macro-action-variable.cpp
index c95c11b3..ecf98640 100644
--- a/src/macro-core/macro-action-variable.cpp
+++ b/src/macro-core/macro-action-variable.cpp
@@ -1,6 +1,8 @@
 #include "macro-action-variable.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "macro-condition-edit.hpp"
+#include "switcher-data.hpp"
+#include "advanced-scene-switcher.hpp"
+#include "macro.hpp"
 #include "math-helpers.hpp"
 #include "utility.hpp"
 
@@ -494,7 +496,7 @@ void MacroActionVariableEdit::VariableChanged(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_variable = GetWeakVariableByQString(text);
 }
 
@@ -504,7 +506,7 @@ void MacroActionVariableEdit::Variable2Changed(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_variable2 = GetWeakVariableByQString(text);
 }
 
@@ -514,7 +516,7 @@ void MacroActionVariableEdit::ActionChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_type = static_cast<MacroActionVariable::Type>(value);
 	SetWidgetVisibility();
 
@@ -531,7 +533,7 @@ void MacroActionVariableEdit::StrValueChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_strValue = _strValue->toPlainText().toStdString();
 	adjustSize();
 	updateGeometry();
@@ -543,7 +545,7 @@ void MacroActionVariableEdit::NumValueChanged(double val)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_numValue = val;
 }
 
@@ -553,7 +555,7 @@ void MacroActionVariableEdit::SegmentIndexChanged(int val)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->SetSegmentIndexValue(val - 1);
 	MarkSelectedSegment();
 }
@@ -656,7 +658,7 @@ void MacroActionVariableEdit::SubStringStartChanged(int val)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_subStringStart = val - 1;
 }
 
@@ -666,7 +668,7 @@ void MacroActionVariableEdit::SubStringSizeChanged(int val)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_subStringSize = val;
 }
 
@@ -676,7 +678,7 @@ void MacroActionVariableEdit::RegexChanged(RegexConfig conf)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_regex = conf;
 
 	SetWidgetVisibility();
@@ -688,7 +690,7 @@ void MacroActionVariableEdit::RegexPatternChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_regexPattern = _regexPattern->toPlainText().toStdString();
 	adjustSize();
 	updateGeometry();
@@ -700,7 +702,7 @@ void MacroActionVariableEdit::RegexMatchIdxChanged(int val)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_regexMatchIdx = val - 1;
 }
 
@@ -710,7 +712,7 @@ void MacroActionVariableEdit::FindStrValueChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_findStr = _findStr->toPlainText().toStdString();
 	adjustSize();
 	updateGeometry();
@@ -722,7 +724,7 @@ void MacroActionVariableEdit::ReplaceStrValueChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_replaceStr = _replaceStr->toPlainText().toStdString();
 	adjustSize();
 	updateGeometry();
@@ -734,7 +736,7 @@ void MacroActionVariableEdit::MathExpressionChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_mathExpression = _mathExpression->text().toStdString();
 
 	// In case of invalid expression display an error
diff --git a/src/macro-core/macro-action-virtual-cam.cpp b/src/macro-core/macro-action-virtual-cam.cpp
index fb499d32..d913ec2b 100644
--- a/src/macro-core/macro-action-virtual-cam.cpp
+++ b/src/macro-core/macro-action-virtual-cam.cpp
@@ -1,5 +1,4 @@
 #include "macro-action-virtual-cam.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
 namespace advss {
@@ -108,7 +107,7 @@ void MacroActionVCamEdit::ActionChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_action = static_cast<VCamAction>(value);
 }
 
diff --git a/src/macro-core/macro-action-wait.cpp b/src/macro-core/macro-action-wait.cpp
index 85172b48..38637962 100644
--- a/src/macro-core/macro-action-wait.cpp
+++ b/src/macro-core/macro-action-wait.cpp
@@ -1,5 +1,5 @@
 #include "macro-action-wait.hpp"
-#include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
 
 #include <random>
@@ -174,7 +174,7 @@ void MacroActionWaitEdit::TypeChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	WaitType type = static_cast<WaitType>(value);
 
 	if (type == WaitType::FIXED) {
@@ -192,7 +192,7 @@ void MacroActionWaitEdit::DurationChanged(const Duration &dur)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_duration = dur;
 }
 
@@ -202,7 +202,7 @@ void MacroActionWaitEdit::Duration2Changed(const Duration &dur)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_duration2 = dur;
 }
 
diff --git a/src/macro-core/macro-action-websocket.cpp b/src/macro-core/macro-action-websocket.cpp
index f9ceb675..ae8364fd 100644
--- a/src/macro-core/macro-action-websocket.cpp
+++ b/src/macro-core/macro-action-websocket.cpp
@@ -1,5 +1,4 @@
 #include "macro-action-websocket.hpp"
-#include "advanced-scene-switcher.hpp"
 #include "utility.hpp"
 
 namespace advss {
@@ -178,7 +177,7 @@ void MacroActionWebsocketEdit::ActionChanged(int index)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_type = static_cast<MacroActionWebsocket::Type>(index);
 	if (_entryData->_type == MacroActionWebsocket::Type::REQUEST) {
 		SetupRequestEdit();
@@ -195,7 +194,7 @@ void MacroActionWebsocketEdit::MessageChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_message = _message->toPlainText().toUtf8().constData();
 
 	adjustSize();
@@ -209,7 +208,7 @@ void MacroActionWebsocketEdit::ConnectionSelectionChanged(
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_connection = GetWeakConnectionByQString(connection);
 	emit(HeaderInfoChanged(connection));
 }
diff --git a/src/macro-core/macro-action.cpp b/src/macro-core/macro-action.cpp
index ff00cc87..cb21952d 100644
--- a/src/macro-core/macro-action.cpp
+++ b/src/macro-core/macro-action.cpp
@@ -1,5 +1,4 @@
 #include "macro-action.hpp"
-#include "advanced-scene-switcher.hpp"
 
 namespace advss {
 
diff --git a/src/macro-core/macro-condition-audio.cpp b/src/macro-core/macro-condition-audio.cpp
index 715bede4..fa396929 100644
--- a/src/macro-core/macro-condition-audio.cpp
+++ b/src/macro-core/macro-condition-audio.cpp
@@ -1,7 +1,6 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-audio.hpp"
+#include "macro.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 namespace advss {
 
@@ -422,7 +421,7 @@ void MacroConditionAudioEdit::SourceChanged(const SourceSelection &source)
 	}
 
 	{
-		std::lock_guard<std::mutex> lock(switcher->m);
+		auto lock = LockContext();
 		_entryData->_audioSource = source;
 		_entryData->ResetVolmeter();
 	}
@@ -439,7 +438,7 @@ void MacroConditionAudioEdit::VolumeThresholdChanged(
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_volume = vol;
 }
 
@@ -449,7 +448,7 @@ void MacroConditionAudioEdit::SyncOffsetChanged(const NumberVariable<int> &value
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_syncOffset = value;
 }
 
@@ -459,7 +458,7 @@ void MacroConditionAudioEdit::MonitorTypeChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_monitorType = static_cast<obs_monitoring_type>(value);
 }
 
@@ -469,7 +468,7 @@ void MacroConditionAudioEdit::BalanceChanged(const NumberVariable<double> &value
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_balance = value;
 }
 
@@ -479,7 +478,7 @@ void MacroConditionAudioEdit::ConditionChanged(int cond)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	if (_entryData->_checkType ==
 		    MacroConditionAudio::Type::OUTPUT_VOLUME ||
 	    _entryData->_checkType == MacroConditionAudio::Type::BALANCE ||
@@ -499,7 +498,7 @@ void MacroConditionAudioEdit::CheckTypeChanged(int idx)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_checkType = static_cast<MacroConditionAudio::Type>(
 		_checkTypes->itemData(idx).toInt());
 
diff --git a/src/macro-core/macro-condition-audio.hpp b/src/macro-core/macro-condition-audio.hpp
index daba9f8a..ef2dfa62 100644
--- a/src/macro-core/macro-condition-audio.hpp
+++ b/src/macro-core/macro-condition-audio.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 #include "volume-control.hpp"
 #include "slider-spinbox.hpp"
 #include "source-selection.hpp"
diff --git a/src/macro-core/macro-condition-cursor.cpp b/src/macro-core/macro-condition-cursor.cpp
index e488a998..345adef1 100644
--- a/src/macro-core/macro-condition-cursor.cpp
+++ b/src/macro-core/macro-condition-cursor.cpp
@@ -1,10 +1,10 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-cursor.hpp"
+#include "switcher-data.hpp"
 #include "platform-funcs.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 #include <QScreen>
+#include <QGuiApplication>
 
 namespace advss {
 
@@ -219,7 +219,7 @@ void MacroConditionCursorEdit::ConditionChanged(int index)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_condition = static_cast<MacroConditionCursor::Condition>(
 		_conditions->itemData(index).toInt());
 	SetWidgetVisibility();
@@ -231,7 +231,7 @@ void MacroConditionCursorEdit::ButtonChanged(int index)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_button = static_cast<MacroConditionCursor::Button>(
 		_buttons->itemData(index).toInt());
 }
@@ -242,7 +242,7 @@ void MacroConditionCursorEdit::MinXChanged(const NumberVariable<int> &pos)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_minX = pos;
 	SetupFrame();
 }
@@ -253,7 +253,7 @@ void MacroConditionCursorEdit::MinYChanged(const NumberVariable<int> &pos)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_minY = pos;
 	SetupFrame();
 }
@@ -264,7 +264,7 @@ void MacroConditionCursorEdit::MaxXChanged(const NumberVariable<int> &pos)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_maxX = pos;
 	SetupFrame();
 }
@@ -275,7 +275,7 @@ void MacroConditionCursorEdit::MaxYChanged(const NumberVariable<int> &pos)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_maxY = pos;
 	SetupFrame();
 }
diff --git a/src/macro-core/macro-condition-cursor.hpp b/src/macro-core/macro-condition-cursor.hpp
index 4ac641e4..4a2436c1 100644
--- a/src/macro-core/macro-condition-cursor.hpp
+++ b/src/macro-core/macro-condition-cursor.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 #include "striped-frame.hpp"
 #include "variable-spinbox.hpp"
 
diff --git a/src/macro-core/macro-condition-date.cpp b/src/macro-core/macro-condition-date.cpp
index 703cc889..d9b96583 100644
--- a/src/macro-core/macro-condition-date.cpp
+++ b/src/macro-core/macro-condition-date.cpp
@@ -1,7 +1,6 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-date.hpp"
+#include "macro.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 #include <QCalendarWidget>
 
@@ -479,7 +478,7 @@ void MacroConditionDateEdit::DayOfWeekChanged(int day)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_dayOfWeek = static_cast<MacroConditionDate::Day>(day);
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -491,7 +490,7 @@ void MacroConditionDateEdit::ConditionChanged(int cond)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_condition =
 		static_cast<MacroConditionDate::Condition>(cond);
 	SetWidgetStatus();
@@ -505,7 +504,7 @@ void MacroConditionDateEdit::DateChanged(const QDate &date)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->SetDate1(date);
 
 	emit HeaderInfoChanged(
@@ -518,7 +517,7 @@ void MacroConditionDateEdit::TimeChanged(const QTime &time)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->SetTime1(time);
 
 	emit HeaderInfoChanged(
@@ -531,7 +530,7 @@ void MacroConditionDateEdit::Date2Changed(const QDate &date)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->SetDate2(date);
 }
 
@@ -541,7 +540,7 @@ void MacroConditionDateEdit::Time2Changed(const QTime &time)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->SetTime2(time);
 }
 
@@ -551,7 +550,7 @@ void MacroConditionDateEdit::IgnoreDateChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_ignoreDate = !state;
 	SetWidgetStatus();
 }
@@ -562,7 +561,7 @@ void MacroConditionDateEdit::IgnoreTimeChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_ignoreTime = !state;
 	SetWidgetStatus();
 }
@@ -573,7 +572,7 @@ void MacroConditionDateEdit::RepeatChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_repeat = state;
 	_duration->setDisabled(!state);
 	SetWidgetStatus();
@@ -585,7 +584,7 @@ void MacroConditionDateEdit::UpdateOnRepeatChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_updateOnRepeat = state;
 }
 
@@ -595,7 +594,7 @@ void MacroConditionDateEdit::DurationChanged(const Duration &dur)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_duration = dur;
 }
 
@@ -605,7 +604,7 @@ void MacroConditionDateEdit::AdvancedSettingsToggleClicked()
 		return;
 	}
 	{
-		std::lock_guard<std::mutex> lock(switcher->m);
+		auto lock = LockContext();
 		_entryData->_dayOfWeekCheck = !_entryData->_dayOfWeekCheck;
 		_entryData->_condition = MacroConditionDate::Condition::AT;
 	}
diff --git a/src/macro-core/macro-condition-date.hpp b/src/macro-core/macro-condition-date.hpp
index 53c9de35..42d5434b 100644
--- a/src/macro-core/macro-condition-date.hpp
+++ b/src/macro-core/macro-condition-date.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 #include "duration-control.hpp"
 
 #include <QCheckBox>
diff --git a/src/macro-core/macro-condition-edit.cpp b/src/macro-core/macro-condition-edit.cpp
index 3bcc9087..ee8d7d1f 100644
--- a/src/macro-core/macro-condition-edit.cpp
+++ b/src/macro-core/macro-condition-edit.cpp
@@ -1,4 +1,5 @@
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "macro-condition-edit.hpp"
 #include "macro-condition-scene.hpp"
 #include "section.hpp"
@@ -235,7 +236,7 @@ void MacroConditionEdit::LogicSelectionChanged(int idx)
 		type = static_cast<LogicType>(idx + logic_root_offset);
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	(*_entryData)->SetLogicType(type);
 }
 
@@ -302,7 +303,7 @@ void MacroConditionEdit::ConditionSelectionChanged(const QString &text)
 	_dur->SetValue(temp);
 	HeaderInfoChanged("");
 	{
-		std::lock_guard<std::mutex> lock(switcher->m);
+		auto lock = LockContext();
 		auto logic = (*_entryData)->GetLogicType();
 		_entryData->reset();
 		*_entryData = MacroConditionFactory::Create(id, macro);
@@ -324,7 +325,7 @@ void MacroConditionEdit::DurationChanged(const Duration &seconds)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	(*_entryData)->SetDuration(seconds);
 }
 
@@ -334,7 +335,7 @@ void MacroConditionEdit::DurationModifierChanged(DurationModifier::Type m)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	(*_entryData)->SetDurationModifier(m);
 }
 
@@ -369,7 +370,7 @@ void AdvSceneSwitcher::AddMacroCondition(int idx)
 		logic = LogicType::ROOT_NONE;
 	}
 	{
-		std::lock_guard<std::mutex> lock(switcher->m);
+		auto lock = LockContext();
 		auto cond = macro->Conditions().emplace(
 			macro->Conditions().begin() + idx,
 			MacroConditionFactory::Create(id, macro.get()));
@@ -421,7 +422,7 @@ void AdvSceneSwitcher::RemoveMacroCondition(int idx)
 	}
 
 	{
-		std::lock_guard<std::mutex> lock(switcher->m);
+		auto lock = LockContext();
 		conditionsList->Remove(idx);
 		macro->Conditions().erase(macro->Conditions().begin() + idx);
 		macro->UpdateConditionIndices();
@@ -481,7 +482,7 @@ void AdvSceneSwitcher::SwapConditions(Macro *m, int pos1, int pos2)
 	}
 
 	bool root = pos1 == 0;
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	iter_swap(m->Conditions().begin() + pos1,
 		  m->Conditions().begin() + pos2);
 	m->UpdateConditionIndices();
@@ -569,7 +570,7 @@ void AdvSceneSwitcher::MacroConditionReorder(int to, int from)
 		return;
 	}
 	{
-		std::lock_guard<std::mutex> lock(switcher->m);
+		auto lock = LockContext();
 		auto condition = macro->Conditions().at(from);
 		if (to == 0) {
 			condition->SetLogicType(LogicType::ROOT_NONE);
diff --git a/src/macro-core/macro-condition-file.cpp b/src/macro-core/macro-condition-file.cpp
index 72d86a36..13bf44bd 100644
--- a/src/macro-core/macro-condition-file.cpp
+++ b/src/macro-core/macro-condition-file.cpp
@@ -1,7 +1,6 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-file.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "curl-helper.hpp"
 
 #include <QTextStream>
@@ -331,7 +330,7 @@ void MacroConditionFileEdit::FileTypeChanged(int index)
 		_checkModificationDate->setDisabled(true);
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_fileType = type;
 }
 
@@ -341,7 +340,7 @@ void MacroConditionFileEdit::ConditionChanged(int index)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_condition =
 		static_cast<MacroConditionFile::ConditionType>(index);
 	SetWidgetVisibility();
@@ -353,7 +352,7 @@ void MacroConditionFileEdit::PathChanged(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_file = text.toUtf8().constData();
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -365,7 +364,7 @@ void MacroConditionFileEdit::MatchTextChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_text = _matchText->toPlainText().toUtf8().constData();
 
 	adjustSize();
@@ -378,7 +377,7 @@ void MacroConditionFileEdit::RegexChanged(RegexConfig conf)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_regex = conf;
 	adjustSize();
 	updateGeometry();
@@ -390,7 +389,7 @@ void MacroConditionFileEdit::CheckModificationDateChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_useTime = state;
 }
 
@@ -400,7 +399,7 @@ void MacroConditionFileEdit::OnlyMatchIfChangedChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_onlyMatchIfChanged = state;
 }
 
diff --git a/src/macro-core/macro-condition-file.hpp b/src/macro-core/macro-condition-file.hpp
index f1f12627..b4630c44 100644
--- a/src/macro-core/macro-condition-file.hpp
+++ b/src/macro-core/macro-condition-file.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 #include "file-selection.hpp"
 #include "variable-text-edit.hpp"
 #include "regex-config.hpp"
diff --git a/src/macro-core/macro-condition-filter.cpp b/src/macro-core/macro-condition-filter.cpp
index 0e817262..d311001a 100644
--- a/src/macro-core/macro-condition-filter.cpp
+++ b/src/macro-core/macro-condition-filter.cpp
@@ -1,7 +1,5 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-filter.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 #include <regex>
 
@@ -183,7 +181,7 @@ void MacroConditionFilterEdit::SourceChanged(const SourceSelection &source)
 		return;
 	}
 	{
-		std::lock_guard<std::mutex> lock(switcher->m);
+		auto lock = LockContext();
 		_entryData->_source = source;
 	}
 	_filters->clear();
@@ -197,7 +195,7 @@ void MacroConditionFilterEdit::FilterChanged(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_filterName = text.toStdString();
 	_entryData->_filter =
 		GetWeakFilterByQString(_entryData->_source.GetSource(), text);
@@ -211,7 +209,7 @@ void MacroConditionFilterEdit::ConditionChanged(int index)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_condition =
 		static_cast<MacroConditionFilter::Condition>(index);
 	SetSettingsSelectionVisible(_entryData->_condition ==
@@ -237,7 +235,7 @@ void MacroConditionFilterEdit::SettingsChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_settings = _settings->toPlainText().toStdString();
 
 	adjustSize();
@@ -250,7 +248,7 @@ void MacroConditionFilterEdit::RegexChanged(RegexConfig conf)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_regex = conf;
 
 	adjustSize();
diff --git a/src/macro-core/macro-condition-filter.hpp b/src/macro-core/macro-condition-filter.hpp
index d0b4ed4a..3aae6078 100644
--- a/src/macro-core/macro-condition-filter.hpp
+++ b/src/macro-core/macro-condition-filter.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 #include "variable-text-edit.hpp"
 #include "regex-config.hpp"
 #include "source-selection.hpp"
diff --git a/src/macro-core/macro-condition-hotkey.cpp b/src/macro-core/macro-condition-hotkey.cpp
index d623c574..a2196d09 100644
--- a/src/macro-core/macro-condition-hotkey.cpp
+++ b/src/macro-core/macro-condition-hotkey.cpp
@@ -1,7 +1,5 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-hotkey.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 namespace advss {
 
@@ -88,7 +86,7 @@ void MacroConditionHotkeyEdit::NameChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	const auto name = _name->text().toStdString();
 	// In case a hotkey is used by multiple conditions create a new hotkey
 	// with the new description or get an existing hotkey matching this
diff --git a/src/macro-core/macro-condition-hotkey.hpp b/src/macro-core/macro-condition-hotkey.hpp
index 7cd345e4..ce944ca6 100644
--- a/src/macro-core/macro-condition-hotkey.hpp
+++ b/src/macro-core/macro-condition-hotkey.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 #include "hotkey.hpp"
 
 #include <QWidget>
diff --git a/src/macro-core/macro-condition-idle.cpp b/src/macro-core/macro-condition-idle.cpp
index 0fb51785..e65b195b 100644
--- a/src/macro-core/macro-condition-idle.cpp
+++ b/src/macro-core/macro-condition-idle.cpp
@@ -1,8 +1,6 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-idle.hpp"
 #include "platform-funcs.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 namespace advss {
 
@@ -62,7 +60,7 @@ void MacroConditionIdleEdit::DurationChanged(const Duration &dur)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_duration = dur;
 }
 
diff --git a/src/macro-core/macro-condition-idle.hpp b/src/macro-core/macro-condition-idle.hpp
index 55b7f6c0..a071e634 100644
--- a/src/macro-core/macro-condition-idle.hpp
+++ b/src/macro-core/macro-condition-idle.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 #include "duration-control.hpp"
 
 #include <QWidget>
diff --git a/src/macro-core/macro-condition-macro.cpp b/src/macro-core/macro-condition-macro.cpp
index 014298c3..128b4414 100644
--- a/src/macro-core/macro-condition-macro.cpp
+++ b/src/macro-core/macro-condition-macro.cpp
@@ -1,7 +1,6 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-macro.hpp"
+#include "macro.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 namespace advss {
 
@@ -419,7 +418,7 @@ void MacroConditionMacroEdit::MacroChanged(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_macro = text;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -431,7 +430,7 @@ void MacroConditionMacroEdit::CountChanged(const NumberVariable<int> &value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_count = value;
 }
 
@@ -441,7 +440,7 @@ void MacroConditionMacroEdit::CountConditionChanged(int cond)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_counterCondition =
 		static_cast<MacroConditionMacro::CounterCondition>(cond);
 }
@@ -469,7 +468,7 @@ void MacroConditionMacroEdit::TypeChanged(int type)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_type = static_cast<MacroConditionMacro::Type>(type);
 
 	switch (_entryData->_type) {
@@ -530,7 +529,7 @@ void MacroConditionMacroEdit::MultiStateConditionChanged(int cond)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_multiSateCondition =
 		static_cast<MacroConditionMacro::MultiStateCondition>(cond);
 }
@@ -542,7 +541,7 @@ void MacroConditionMacroEdit::MultiStateCountChanged(
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_multiSateCount = value;
 }
 
@@ -552,7 +551,7 @@ void MacroConditionMacroEdit::Add(const std::string &name)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	MacroRef macro(name);
 	_entryData->_macros.push_back(macro);
 	adjustSize();
@@ -564,7 +563,7 @@ void MacroConditionMacroEdit::Remove(int idx)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_macros.erase(std::next(_entryData->_macros.begin(), idx));
 	adjustSize();
 }
@@ -576,7 +575,7 @@ void MacroConditionMacroEdit::Replace(int idx, const std::string &name)
 	}
 
 	MacroRef macro(name);
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_macros[idx] = macro;
 	adjustSize();
 }
diff --git a/src/macro-core/macro-condition-macro.hpp b/src/macro-core/macro-condition-macro.hpp
index 7ea1d7ec..20a3b197 100644
--- a/src/macro-core/macro-condition-macro.hpp
+++ b/src/macro-core/macro-condition-macro.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 #include "macro-selection.hpp"
 #include "macro-list.hpp"
 #include "variable-spinbox.hpp"
diff --git a/src/macro-core/macro-condition-media.cpp b/src/macro-core/macro-condition-media.cpp
index 53a0215e..4e038e70 100644
--- a/src/macro-core/macro-condition-media.cpp
+++ b/src/macro-core/macro-condition-media.cpp
@@ -1,7 +1,6 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-media.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 namespace advss {
 
@@ -467,7 +466,7 @@ void MacroConditionMediaEdit::SourceTypeChanged(int idx)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_sourceType = static_cast<MacroConditionMedia::Type>(
 		_sourceTypes->itemData(idx).toInt());
 
@@ -488,7 +487,7 @@ void MacroConditionMediaEdit::SourceChanged(const SourceSelection &source)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_sourceGroup.clear();
 	_entryData->_sourceType = MacroConditionMedia::Type::SOURCE;
 	_entryData->ClearSignalHandler();
@@ -505,7 +504,7 @@ void MacroConditionMediaEdit::SceneChanged(const SceneSelection &s)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_scene = s;
 	_entryData->UpdateMediaSourcesOfSceneList();
 	emit HeaderInfoChanged(
@@ -532,7 +531,7 @@ void MacroConditionMediaEdit::StateChanged(int index)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_state = getMediaStateFromIdx(index);
 	if (_entryData->_sourceType != MacroConditionMedia::Type::SOURCE) {
 		_entryData->UpdateMediaSourcesOfSceneList();
@@ -552,7 +551,7 @@ void MacroConditionMediaEdit::TimeRestrictionChanged(int index)
 		_time->setDisabled(false);
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_restriction =
 		static_cast<MacroConditionMedia::Time>(index);
 	if (_entryData->_sourceType != MacroConditionMedia::Type::SOURCE) {
@@ -566,7 +565,7 @@ void MacroConditionMediaEdit::TimeChanged(const Duration &dur)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_time = dur;
 	if (_entryData->_sourceType != MacroConditionMedia::Type::SOURCE) {
 		_entryData->UpdateMediaSourcesOfSceneList();
@@ -579,7 +578,7 @@ void MacroConditionMediaEdit::OnChangeChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_onlyMatchOnChagne = value;
 	if (_entryData->_sourceType != MacroConditionMedia::Type::SOURCE) {
 		_entryData->UpdateMediaSourcesOfSceneList();
diff --git a/src/macro-core/macro-condition-media.hpp b/src/macro-core/macro-condition-media.hpp
index b7d582d1..85d02534 100644
--- a/src/macro-core/macro-condition-media.hpp
+++ b/src/macro-core/macro-condition-media.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 #include "duration-control.hpp"
 #include "scene-selection.hpp"
 #include "source-selection.hpp"
diff --git a/src/macro-core/macro-condition-obs-stats.cpp b/src/macro-core/macro-condition-obs-stats.cpp
index 4ecd720d..c19c7b33 100644
--- a/src/macro-core/macro-condition-obs-stats.cpp
+++ b/src/macro-core/macro-condition-obs-stats.cpp
@@ -1,7 +1,5 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-obs-stats.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 namespace advss {
 
@@ -481,7 +479,7 @@ void MacroConditionStatsEdit::ValueChanged(const NumberVariable<double> &value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_value = value;
 }
 
@@ -492,7 +490,7 @@ void MacroConditionStatsEdit::StatsTypeChanged(int type)
 	}
 
 	{
-		std::lock_guard<std::mutex> lock(switcher->m);
+		auto lock = LockContext();
 		_entryData->_type =
 			static_cast<MacroConditionStats::Type>(type);
 		SetWidgetVisibility();
@@ -508,7 +506,7 @@ void MacroConditionStatsEdit::ConditionChanged(int cond)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_condition =
 		static_cast<MacroConditionStats::Condition>(cond);
 }
diff --git a/src/macro-core/macro-condition-obs-stats.hpp b/src/macro-core/macro-condition-obs-stats.hpp
index d3603a21..7d317ff6 100644
--- a/src/macro-core/macro-condition-obs-stats.hpp
+++ b/src/macro-core/macro-condition-obs-stats.hpp
@@ -1,8 +1,9 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
+#include "variable-spinbox.hpp"
+
 #include <QWidget>
 #include <QComboBox>
-#include <variable-spinbox.hpp>
 #include <util/platform.h>
 
 namespace advss {
diff --git a/src/macro-core/macro-condition-plugin-state.cpp b/src/macro-core/macro-condition-plugin-state.cpp
index ee3dcc11..c92e790e 100644
--- a/src/macro-core/macro-condition-plugin-state.cpp
+++ b/src/macro-core/macro-condition-plugin-state.cpp
@@ -1,7 +1,6 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-plugin-state.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 namespace advss {
 
@@ -144,7 +143,7 @@ void MacroConditionPluginStateEdit::ConditionChanged(int idx)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	if (_entryData->_condition ==
 	    MacroConditionPluginState::Condition::OBS_SHUTDOWN) {
 		switcher->shutdownConditionCount--;
diff --git a/src/macro-core/macro-condition-plugin-state.hpp b/src/macro-core/macro-condition-plugin-state.hpp
index 10e0e2dc..e8173888 100644
--- a/src/macro-core/macro-condition-plugin-state.hpp
+++ b/src/macro-core/macro-condition-plugin-state.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 #include <QWidget>
 #include <QComboBox>
 
diff --git a/src/macro-core/macro-condition-process.cpp b/src/macro-core/macro-condition-process.cpp
index 8e4f9ce1..eefc2d05 100644
--- a/src/macro-core/macro-condition-process.cpp
+++ b/src/macro-core/macro-condition-process.cpp
@@ -1,8 +1,7 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-process.hpp"
+#include "switcher-data.hpp"
 #include "platform-funcs.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 #include <regex>
 
@@ -107,7 +106,7 @@ void MacroConditionProcessEdit::ProcessChanged(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_process = text.toStdString();
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -119,7 +118,7 @@ void MacroConditionProcessEdit::FocusChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_focus = state;
 	SetWidgetVisibility();
 }
diff --git a/src/macro-core/macro-condition-process.hpp b/src/macro-core/macro-condition-process.hpp
index 09cb8d1d..6bf0a795 100644
--- a/src/macro-core/macro-condition-process.hpp
+++ b/src/macro-core/macro-condition-process.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 
 #include <QComboBox>
 #include <QCheckBox>
diff --git a/src/macro-core/macro-condition-profile.cpp b/src/macro-core/macro-condition-profile.cpp
index 9c5f103c..acd69960 100644
--- a/src/macro-core/macro-condition-profile.cpp
+++ b/src/macro-core/macro-condition-profile.cpp
@@ -1,7 +1,5 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-profile.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 namespace advss {
 
@@ -69,7 +67,7 @@ void MacroConditionProfileEdit::ProfileChanged(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_profile = text.toStdString();
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
diff --git a/src/macro-core/macro-condition-profile.hpp b/src/macro-core/macro-condition-profile.hpp
index cf4bff15..e2917d68 100644
--- a/src/macro-core/macro-condition-profile.hpp
+++ b/src/macro-core/macro-condition-profile.hpp
@@ -1,5 +1,6 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
+
 #include <QWidget>
 #include <QComboBox>
 
diff --git a/src/macro-core/macro-condition-recording.cpp b/src/macro-core/macro-condition-recording.cpp
index 6e4eb963..8c03a162 100644
--- a/src/macro-core/macro-condition-recording.cpp
+++ b/src/macro-core/macro-condition-recording.cpp
@@ -1,7 +1,5 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-recording.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 namespace advss {
 
@@ -90,7 +88,7 @@ void MacroConditionRecordEdit::StateChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_recordState = static_cast<RecordState>(value);
 }
 
diff --git a/src/macro-core/macro-condition-recording.hpp b/src/macro-core/macro-condition-recording.hpp
index 18645021..2833e0f0 100644
--- a/src/macro-core/macro-condition-recording.hpp
+++ b/src/macro-core/macro-condition-recording.hpp
@@ -1,5 +1,6 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
+
 #include <QWidget>
 #include <QComboBox>
 
diff --git a/src/macro-core/macro-condition-replay-buffer.cpp b/src/macro-core/macro-condition-replay-buffer.cpp
index 04e03ba4..a9731038 100644
--- a/src/macro-core/macro-condition-replay-buffer.cpp
+++ b/src/macro-core/macro-condition-replay-buffer.cpp
@@ -1,7 +1,6 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-replay-buffer.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 namespace advss {
 
@@ -96,7 +95,7 @@ void MacroConditionReplayBufferEdit::StateChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_state = static_cast<ReplayBufferState>(value);
 }
 
diff --git a/src/macro-core/macro-condition-replay-buffer.hpp b/src/macro-core/macro-condition-replay-buffer.hpp
index af107ad6..797e49f5 100644
--- a/src/macro-core/macro-condition-replay-buffer.hpp
+++ b/src/macro-core/macro-condition-replay-buffer.hpp
@@ -1,5 +1,6 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
+
 #include <QWidget>
 #include <QComboBox>
 
diff --git a/src/macro-core/macro-condition-run.cpp b/src/macro-core/macro-condition-run.cpp
index a9c71550..4f318613 100644
--- a/src/macro-core/macro-condition-run.cpp
+++ b/src/macro-core/macro-condition-run.cpp
@@ -1,7 +1,5 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-run.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 #include <QProcess>
 #include <QDesktopServices>
@@ -185,7 +183,7 @@ void MacroConditionRunEdit::TimeoutChanged(const Duration &dur)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_timeout = dur;
 }
 
@@ -195,7 +193,7 @@ void MacroConditionRunEdit::CheckExitCodeChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_checkExitCode = state;
 }
 
@@ -205,7 +203,7 @@ void MacroConditionRunEdit::ExitCodeChanged(int exitCode)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_exitCode = exitCode;
 }
 
@@ -215,7 +213,7 @@ void MacroConditionRunEdit::ProcessConfigChanged(const ProcessConfig &conf)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_procConfig = conf;
 	adjustSize();
 	updateGeometry();
diff --git a/src/macro-core/macro-condition-run.hpp b/src/macro-core/macro-condition-run.hpp
index 5fbb7d61..bc32b0b2 100644
--- a/src/macro-core/macro-condition-run.hpp
+++ b/src/macro-core/macro-condition-run.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 #include "process-config.hpp"
 #include "duration-control.hpp"
 
diff --git a/src/macro-core/macro-condition-scene-order.cpp b/src/macro-core/macro-condition-scene-order.cpp
index 89fe054e..f5280f37 100644
--- a/src/macro-core/macro-condition-scene-order.cpp
+++ b/src/macro-core/macro-condition-scene-order.cpp
@@ -1,7 +1,5 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-scene-order.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 namespace advss {
 
@@ -270,7 +268,7 @@ void MacroConditionSceneOrderEdit::SceneChanged(const SceneSelection &s)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_scene = s;
 }
 
@@ -280,7 +278,7 @@ void MacroConditionSceneOrderEdit::SourceChanged(const SceneItemSelection &item)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_source = item;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -292,7 +290,7 @@ void MacroConditionSceneOrderEdit::Source2Changed(const SceneItemSelection &item
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_source2 = item;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -304,7 +302,7 @@ void MacroConditionSceneOrderEdit::ConditionChanged(int index)
 		return;
 	}
 	{
-		std::lock_guard<std::mutex> lock(switcher->m);
+		auto lock = LockContext();
 		_entryData->_condition =
 			static_cast<MacroConditionSceneOrder::Condition>(index);
 	}
@@ -330,7 +328,7 @@ void MacroConditionSceneOrderEdit::PositionChanged(
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_position = value;
 }
 
diff --git a/src/macro-core/macro-condition-scene-order.hpp b/src/macro-core/macro-condition-scene-order.hpp
index d658802e..0c12b0b7 100644
--- a/src/macro-core/macro-condition-scene-order.hpp
+++ b/src/macro-core/macro-condition-scene-order.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 #include "scene-selection.hpp"
 #include "scene-item-selection.hpp"
 #include "variable-spinbox.hpp"
diff --git a/src/macro-core/macro-condition-scene-transform.cpp b/src/macro-core/macro-condition-scene-transform.cpp
index b7a570f9..64f84ec9 100644
--- a/src/macro-core/macro-condition-scene-transform.cpp
+++ b/src/macro-core/macro-condition-scene-transform.cpp
@@ -1,7 +1,5 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-scene-transform.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 namespace advss {
 
@@ -152,7 +150,7 @@ void MacroConditionSceneTransformEdit::SceneChanged(const SceneSelection &s)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_scene = s;
 }
 
@@ -163,7 +161,7 @@ void MacroConditionSceneTransformEdit::SourceChanged(
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_source = item;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -198,7 +196,7 @@ void MacroConditionSceneTransformEdit::SettingsChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_settings = _settings->toPlainText().toStdString();
 
 	adjustSize();
@@ -211,7 +209,7 @@ void MacroConditionSceneTransformEdit::RegexChanged(RegexConfig conf)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_regex = conf;
 
 	adjustSize();
diff --git a/src/macro-core/macro-condition-scene-transform.hpp b/src/macro-core/macro-condition-scene-transform.hpp
index d01fca62..945b1802 100644
--- a/src/macro-core/macro-condition-scene-transform.hpp
+++ b/src/macro-core/macro-condition-scene-transform.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 #include "scene-selection.hpp"
 #include "scene-item-selection.hpp"
 #include "variable-text-edit.hpp"
diff --git a/src/macro-core/macro-condition-scene-visibility.cpp b/src/macro-core/macro-condition-scene-visibility.cpp
index f09e98ea..7c726127 100644
--- a/src/macro-core/macro-condition-scene-visibility.cpp
+++ b/src/macro-core/macro-condition-scene-visibility.cpp
@@ -1,7 +1,5 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-scene-visibility.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 #include <regex>
 
@@ -181,7 +179,7 @@ void MacroConditionSceneVisibilityEdit::SourceChanged(
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_source = item;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -193,7 +191,7 @@ void MacroConditionSceneVisibilityEdit::SceneChanged(const SceneSelection &s)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_scene = s;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -205,7 +203,7 @@ void MacroConditionSceneVisibilityEdit::ConditionChanged(int index)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_condition =
 		static_cast<MacroConditionSceneVisibility::Condition>(index);
 	if (_entryData->_condition ==
diff --git a/src/macro-core/macro-condition-scene-visibility.hpp b/src/macro-core/macro-condition-scene-visibility.hpp
index 5295d963..e7649611 100644
--- a/src/macro-core/macro-condition-scene-visibility.hpp
+++ b/src/macro-core/macro-condition-scene-visibility.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 #include "scene-selection.hpp"
 #include "scene-item-selection.hpp"
 
diff --git a/src/macro-core/macro-condition-scene.cpp b/src/macro-core/macro-condition-scene.cpp
index 434b09a9..134dd5ab 100644
--- a/src/macro-core/macro-condition-scene.cpp
+++ b/src/macro-core/macro-condition-scene.cpp
@@ -1,7 +1,6 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-scene.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 namespace advss {
 
@@ -181,7 +180,7 @@ void MacroConditionSceneEdit::SceneChanged(const SceneSelection &s)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_scene = s;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -193,7 +192,7 @@ void MacroConditionSceneEdit::TypeChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_type = static_cast<MacroConditionScene::Type>(value);
 	SetWidgetVisibility();
 }
@@ -204,7 +203,7 @@ void MacroConditionSceneEdit::PatternChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_pattern = _pattern->text().toStdString();
 }
 
@@ -214,7 +213,7 @@ void MacroConditionSceneEdit::UseTransitionTargetSceneChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_useTransitionTargetScene = state;
 }
 
diff --git a/src/macro-core/macro-condition-scene.hpp b/src/macro-core/macro-condition-scene.hpp
index f0c072cf..8e432b31 100644
--- a/src/macro-core/macro-condition-scene.hpp
+++ b/src/macro-core/macro-condition-scene.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 #include "scene-selection.hpp"
 
 #include <QWidget>
diff --git a/src/macro-core/macro-condition-source.cpp b/src/macro-core/macro-condition-source.cpp
index b2c9fcb7..fa3c759a 100644
--- a/src/macro-core/macro-condition-source.cpp
+++ b/src/macro-core/macro-condition-source.cpp
@@ -1,7 +1,5 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-source.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 namespace advss {
 
@@ -157,7 +155,7 @@ void MacroConditionSourceEdit::SourceChanged(const SourceSelection &source)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_source = source;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -169,7 +167,7 @@ void MacroConditionSourceEdit::ConditionChanged(int index)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_condition = static_cast<SourceCondition>(index);
 	SetSettingsSelectionVisible(_entryData->_condition ==
 				    SourceCondition::SETTINGS);
@@ -195,7 +193,7 @@ void MacroConditionSourceEdit::SettingsChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_settings = _settings->toPlainText().toStdString();
 
 	adjustSize();
@@ -208,7 +206,7 @@ void MacroConditionSourceEdit::RegexChanged(RegexConfig conf)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_regex = conf;
 
 	adjustSize();
diff --git a/src/macro-core/macro-condition-source.hpp b/src/macro-core/macro-condition-source.hpp
index 3010bdd0..a6e944f4 100644
--- a/src/macro-core/macro-condition-source.hpp
+++ b/src/macro-core/macro-condition-source.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 #include "variable-text-edit.hpp"
 #include "regex-config.hpp"
 #include "source-selection.hpp"
diff --git a/src/macro-core/macro-condition-streaming.cpp b/src/macro-core/macro-condition-streaming.cpp
index 8e0e4acb..d84296bb 100644
--- a/src/macro-core/macro-condition-streaming.cpp
+++ b/src/macro-core/macro-condition-streaming.cpp
@@ -1,7 +1,6 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-streaming.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 namespace advss {
 
@@ -109,7 +108,7 @@ void MacroConditionStreamEdit::StateChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_streamState = static_cast<StreamState>(value);
 }
 
diff --git a/src/macro-core/macro-condition-streaming.hpp b/src/macro-core/macro-condition-streaming.hpp
index b7d82654..cc2d7db5 100644
--- a/src/macro-core/macro-condition-streaming.hpp
+++ b/src/macro-core/macro-condition-streaming.hpp
@@ -1,5 +1,6 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
+
 #include <QWidget>
 #include <QComboBox>
 
diff --git a/src/macro-core/macro-condition-studio-mode.cpp b/src/macro-core/macro-condition-studio-mode.cpp
index 7af7ba73..d3489215 100644
--- a/src/macro-core/macro-condition-studio-mode.cpp
+++ b/src/macro-core/macro-condition-studio-mode.cpp
@@ -1,7 +1,5 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-studio-mode.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 namespace advss {
 
@@ -118,7 +116,7 @@ void MacroConditionStudioModeEdit::ConditionChanged(int cond)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_condition = static_cast<StudioModeCondition>(cond);
 	SetWidgetVisibility();
 	emit HeaderInfoChanged(
@@ -131,7 +129,7 @@ void MacroConditionStudioModeEdit::SceneChanged(const SceneSelection &s)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_scene = s;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
diff --git a/src/macro-core/macro-condition-studio-mode.hpp b/src/macro-core/macro-condition-studio-mode.hpp
index 389ebb66..38c19fe4 100644
--- a/src/macro-core/macro-condition-studio-mode.hpp
+++ b/src/macro-core/macro-condition-studio-mode.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 #include "scene-selection.hpp"
 
 #include <QWidget>
diff --git a/src/macro-core/macro-condition-timer.cpp b/src/macro-core/macro-condition-timer.cpp
index 285c0b07..8c82ce79 100644
--- a/src/macro-core/macro-condition-timer.cpp
+++ b/src/macro-core/macro-condition-timer.cpp
@@ -1,7 +1,5 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-timer.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 namespace advss {
 
@@ -202,7 +200,7 @@ void MacroConditionTimerEdit::TimerTypeChanged(int type)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_type = static_cast<TimerType>(type);
 	SetWidgetVisibility();
 }
@@ -213,7 +211,7 @@ void MacroConditionTimerEdit::DurationChanged(const Duration &dur)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_duration = dur;
 }
 
@@ -223,7 +221,7 @@ void MacroConditionTimerEdit::Duration2Changed(const Duration &dur)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_duration2 = dur;
 }
 
@@ -233,7 +231,7 @@ void MacroConditionTimerEdit::SaveRemainingChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_saveRemaining = state;
 }
 
@@ -243,7 +241,7 @@ void MacroConditionTimerEdit::AutoResetChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_oneshot = !state;
 }
 
@@ -253,7 +251,7 @@ void MacroConditionTimerEdit::PauseContinueClicked()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	if (_entryData->_paused) {
 		timer.start(1000);
 		_entryData->Continue();
@@ -270,7 +268,7 @@ void MacroConditionTimerEdit::ResetClicked()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->Reset();
 }
 
diff --git a/src/macro-core/macro-condition-timer.hpp b/src/macro-core/macro-condition-timer.hpp
index 73dc8158..fc674b59 100644
--- a/src/macro-core/macro-condition-timer.hpp
+++ b/src/macro-core/macro-condition-timer.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 #include "duration-control.hpp"
 
 #include <QCheckBox>
diff --git a/src/macro-core/macro-condition-transition.cpp b/src/macro-core/macro-condition-transition.cpp
index 434e4ebe..55fea462 100644
--- a/src/macro-core/macro-condition-transition.cpp
+++ b/src/macro-core/macro-condition-transition.cpp
@@ -1,7 +1,6 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-transition.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 namespace advss {
 
@@ -228,7 +227,7 @@ void MacroConditionTransitionEdit::ConditionChanged(int index)
 	}
 
 	{
-		std::lock_guard<std::mutex> lock(switcher->m);
+		auto lock = LockContext();
 		_entryData->_condition =
 			static_cast<TransitionCondition>(index);
 	}
@@ -244,7 +243,7 @@ void MacroConditionTransitionEdit::TransitionChanged(
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->DisconnectTransitionSignals();
 	_entryData->_transition = t;
 	_entryData->ConnectToTransitionSignals();
@@ -258,7 +257,7 @@ void MacroConditionTransitionEdit::SceneChanged(const SceneSelection &s)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_scene = s;
 }
 
@@ -268,7 +267,7 @@ void MacroConditionTransitionEdit::DurationChanged(const Duration &dur)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_duration = dur;
 }
 
diff --git a/src/macro-core/macro-condition-transition.hpp b/src/macro-core/macro-condition-transition.hpp
index adecf294..54430c02 100644
--- a/src/macro-core/macro-condition-transition.hpp
+++ b/src/macro-core/macro-condition-transition.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 #include "duration-control.hpp"
 #include "transition-selection.hpp"
 #include "scene-selection.hpp"
diff --git a/src/macro-core/macro-condition-variable.cpp b/src/macro-core/macro-condition-variable.cpp
index d763ae68..1cfbd49e 100644
--- a/src/macro-core/macro-condition-variable.cpp
+++ b/src/macro-core/macro-condition-variable.cpp
@@ -1,7 +1,5 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-variable.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 #include <regex>
 
@@ -257,7 +255,7 @@ void MacroConditionVariableEdit::VariableChanged(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_variable = GetWeakVariableByQString(text);
 }
 
@@ -268,7 +266,7 @@ void MacroConditionVariableEdit::Variable2Changed(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_variable2 = GetWeakVariableByQString(text);
 }
 
@@ -278,7 +276,7 @@ void MacroConditionVariableEdit::ConditionChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_type = static_cast<MacroConditionVariable::Type>(value);
 	SetWidgetVisibility();
 }
@@ -289,7 +287,7 @@ void MacroConditionVariableEdit::StrValueChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_strValue = _strValue->toPlainText().toStdString();
 	adjustSize();
 }
@@ -300,7 +298,7 @@ void MacroConditionVariableEdit::NumValueChanged(double val)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_numValue = val;
 }
 
@@ -310,7 +308,7 @@ void MacroConditionVariableEdit::RegexChanged(RegexConfig conf)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_regex = conf;
 	adjustSize();
 	updateGeometry();
diff --git a/src/macro-core/macro-condition-variable.hpp b/src/macro-core/macro-condition-variable.hpp
index 377183af..89ffb8fe 100644
--- a/src/macro-core/macro-condition-variable.hpp
+++ b/src/macro-core/macro-condition-variable.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 #include "resizing-text-edit.hpp"
 #include "variable.hpp"
 #include "regex-config.hpp"
diff --git a/src/macro-core/macro-condition-virtual-cam.cpp b/src/macro-core/macro-condition-virtual-cam.cpp
index 33f77f2e..4d9d8763 100644
--- a/src/macro-core/macro-condition-virtual-cam.cpp
+++ b/src/macro-core/macro-condition-virtual-cam.cpp
@@ -1,7 +1,5 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-virtual-cam.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 namespace advss {
 
@@ -91,7 +89,7 @@ void MacroConditionVCamEdit::StateChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_state = static_cast<VCamState>(value);
 }
 
diff --git a/src/macro-core/macro-condition-virtual-cam.hpp b/src/macro-core/macro-condition-virtual-cam.hpp
index 8abd9e54..fa8cb372 100644
--- a/src/macro-core/macro-condition-virtual-cam.hpp
+++ b/src/macro-core/macro-condition-virtual-cam.hpp
@@ -1,5 +1,6 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
+
 #include <QWidget>
 #include <QComboBox>
 
diff --git a/src/macro-core/macro-condition-websocket.cpp b/src/macro-core/macro-condition-websocket.cpp
index 07d8667e..9cfa2588 100644
--- a/src/macro-core/macro-condition-websocket.cpp
+++ b/src/macro-core/macro-condition-websocket.cpp
@@ -1,7 +1,6 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-websocket.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 #include <regex>
 
@@ -209,7 +208,7 @@ void MacroConditionWebsocketEdit::ConditionChanged(int index)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_type = static_cast<MacroConditionWebsocket::Type>(index);
 	if (_entryData->_type == MacroConditionWebsocket::Type::REQUEST) {
 		SetupRequestEdit();
@@ -226,7 +225,7 @@ void MacroConditionWebsocketEdit::MessageChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_message = _message->toPlainText().toUtf8().constData();
 
 	adjustSize();
@@ -240,7 +239,7 @@ void MacroConditionWebsocketEdit::ConnectionSelectionChanged(
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_connection = GetWeakConnectionByQString(connection);
 	emit(HeaderInfoChanged(connection));
 }
@@ -251,7 +250,7 @@ void MacroConditionWebsocketEdit::RegexChanged(RegexConfig conf)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_regex = conf;
 
 	adjustSize();
diff --git a/src/macro-core/macro-condition-websocket.hpp b/src/macro-core/macro-condition-websocket.hpp
index 8aaf9638..2a37a76a 100644
--- a/src/macro-core/macro-condition-websocket.hpp
+++ b/src/macro-core/macro-condition-websocket.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 #include "connection-manager.hpp"
 #include "variable-text-edit.hpp"
 #include "regex-config.hpp"
diff --git a/src/macro-core/macro-condition-window.cpp b/src/macro-core/macro-condition-window.cpp
index 9a627b9a..258eb4d8 100644
--- a/src/macro-core/macro-condition-window.cpp
+++ b/src/macro-core/macro-condition-window.cpp
@@ -1,8 +1,7 @@
-#include "macro-condition-edit.hpp"
 #include "macro-condition-window.hpp"
+#include "switcher-data.hpp"
 #include "platform-funcs.hpp"
 #include "utility.hpp"
-#include "advanced-scene-switcher.hpp"
 
 #include <regex>
 
@@ -173,7 +172,7 @@ void MacroConditionWindowEdit::WindowChanged(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_window = text.toStdString();
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -185,7 +184,7 @@ void MacroConditionWindowEdit::FullscreenChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_fullscreen = state;
 }
 
@@ -195,7 +194,7 @@ void MacroConditionWindowEdit::MaximizedChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_maximized = state;
 }
 
@@ -205,7 +204,7 @@ void MacroConditionWindowEdit::FocusedChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_focus = state;
 	SetWidgetVisibility();
 }
@@ -216,7 +215,7 @@ void MacroConditionWindowEdit::WindowFocusChanged(int state)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	_entryData->_windowFocusChanged = state;
 	SetWidgetVisibility();
 }
diff --git a/src/macro-core/macro-condition-window.hpp b/src/macro-core/macro-condition-window.hpp
index 3c4e6aa2..c105381b 100644
--- a/src/macro-core/macro-condition-window.hpp
+++ b/src/macro-core/macro-condition-window.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition-edit.hpp"
 
 #include <QComboBox>
 #include <QCheckBox>
diff --git a/src/macro-core/macro-condition.cpp b/src/macro-core/macro-condition.cpp
index 3f5f6f93..af13a877 100644
--- a/src/macro-core/macro-condition.cpp
+++ b/src/macro-core/macro-condition.cpp
@@ -1,5 +1,4 @@
 #include "macro-condition.hpp"
-#include "advanced-scene-switcher.hpp"
 
 namespace advss {
 
diff --git a/src/macro-core/macro-ref.hpp b/src/macro-core/macro-ref.hpp
index baea8ec1..ca460260 100644
--- a/src/macro-core/macro-ref.hpp
+++ b/src/macro-core/macro-ref.hpp
@@ -3,7 +3,7 @@
 #include <string>
 #include <vector>
 #include <QString>
-#include <obs-module.h>
+#include <obs-data.h>
 
 namespace advss {
 
diff --git a/src/macro-core/macro-segment.hpp b/src/macro-core/macro-segment.hpp
index b39c4039..92b0ba2c 100644
--- a/src/macro-core/macro-segment.hpp
+++ b/src/macro-core/macro-segment.hpp
@@ -1,4 +1,11 @@
 #pragma once
+
+// The following helpers are used by all macro seements,
+// so it makes sense to include them here:
+#include "log-helper.hpp"
+#include "obs-module-helper.hpp"
+#include "sync-helper.hpp"
+
 #include <QWidget>
 #include <QFrame>
 #include <QVBoxLayout>
diff --git a/src/macro-core/macro-selection.cpp b/src/macro-core/macro-selection.cpp
index 90b32880..24e8a62e 100644
--- a/src/macro-core/macro-selection.cpp
+++ b/src/macro-core/macro-selection.cpp
@@ -1,5 +1,6 @@
 #include "macro-selection.hpp"
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
 
 #include <QStandardItemModel>
diff --git a/src/macro-core/macro-tab.cpp b/src/macro-core/macro-tab.cpp
index cb9d1e95..d2db9606 100644
--- a/src/macro-core/macro-tab.cpp
+++ b/src/macro-core/macro-tab.cpp
@@ -3,6 +3,7 @@
 #include "macro-action-edit.hpp"
 #include "macro-condition-edit.hpp"
 #include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "name-dialog.hpp"
 #include "macro-properties.hpp"
 #include "utility.hpp"
@@ -60,7 +61,7 @@ bool AdvSceneSwitcher::AddNewMacro(std::shared_ptr<Macro> &res,
 	}
 
 	{
-		std::lock_guard<std::mutex> lock(switcher->m);
+		auto lock = LockContext();
 		res = std::make_shared<Macro>(
 			name,
 			switcher->macroProperties._newMacroRegisterHotkeys);
@@ -77,7 +78,7 @@ void AdvSceneSwitcher::on_macroAdd_clicked()
 	}
 
 	{
-		std::lock_guard<std::mutex> lock(switcher->m);
+		auto lock = LockContext();
 		ui->macros->Add(newMacro);
 	}
 
@@ -101,7 +102,7 @@ void AdvSceneSwitcher::RemoveMacro(std::shared_ptr<Macro> &macro)
 	}
 
 	{
-		std::lock_guard<std::mutex> lock(switcher->m);
+		auto lock = LockContext();
 		ui->macros->Remove(macro);
 	}
 
@@ -113,7 +114,7 @@ void AdvSceneSwitcher::RenameMacro(std::shared_ptr<Macro> &macro,
 {
 	auto oldName = QString::fromStdString(macro->Name());
 	{
-		std::lock_guard<std::mutex> lock(switcher->m);
+		auto lock = LockContext();
 		macro->SetName(name.toStdString());
 	}
 	emit MacroRenamed(oldName, name);
@@ -151,7 +152,7 @@ void AdvSceneSwitcher::on_macroRemove_clicked()
 
 void AdvSceneSwitcher::on_macroUp_clicked()
 {
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	auto macro = GetSelectedMacro();
 	if (!macro) {
 		return;
@@ -161,7 +162,7 @@ void AdvSceneSwitcher::on_macroUp_clicked()
 
 void AdvSceneSwitcher::on_macroDown_clicked()
 {
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	auto macro = GetSelectedMacro();
 	if (!macro) {
 		return;
@@ -240,7 +241,7 @@ void AdvSceneSwitcher::on_runMacroInParallel_stateChanged(int value)
 	if (!macro) {
 		return;
 	}
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	macro->SetRunInParallel(value);
 }
 
@@ -250,7 +251,7 @@ void AdvSceneSwitcher::on_runMacroOnChange_stateChanged(int value)
 	if (!macro) {
 		return;
 	}
-	std::lock_guard<std::mutex> lock(switcher->m);
+	auto lock = LockContext();
 	macro->SetMatchOnChange(value);
 }
 
diff --git a/src/macro-core/macro.cpp b/src/macro-core/macro.cpp
index 94d7a9ee..e609c8a8 100644
--- a/src/macro-core/macro.cpp
+++ b/src/macro-core/macro.cpp
@@ -3,7 +3,7 @@
 #include "macro-condition-edit.hpp"
 #include "macro-dock.hpp"
 #include "macro-action-scene-switch.hpp"
-#include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "hotkey.hpp"
 
 #include <limits>
diff --git a/src/macro-external/openvr/macro-condition-openvr.cpp b/src/macro-external/openvr/macro-condition-openvr.cpp
index 305b1dcd..ced75565 100644
--- a/src/macro-external/openvr/macro-condition-openvr.cpp
+++ b/src/macro-external/openvr/macro-condition-openvr.cpp
@@ -2,7 +2,6 @@
 
 #include <macro-condition-edit.hpp>
 #include <utility.hpp>
-#include <advanced-scene-switcher.hpp>
 #include <openvr.h>
 
 namespace advss {
@@ -236,7 +235,7 @@ void MacroConditionOpenVREdit::MinXChanged(const NumberVariable<double> &pos)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(GetSwitcher()->m);
+	auto lock = LockContext();
 	_entryData->_minX = pos;
 }
 
@@ -246,7 +245,7 @@ void MacroConditionOpenVREdit::MinYChanged(const NumberVariable<double> &pos)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(GetSwitcher()->m);
+	auto lock = LockContext();
 	_entryData->_minY = pos;
 }
 
@@ -256,7 +255,7 @@ void MacroConditionOpenVREdit::MinZChanged(const NumberVariable<double> &pos)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(GetSwitcher()->m);
+	auto lock = LockContext();
 	_entryData->_minZ = pos;
 }
 
@@ -266,7 +265,7 @@ void MacroConditionOpenVREdit::MaxXChanged(const NumberVariable<double> &pos)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(GetSwitcher()->m);
+	auto lock = LockContext();
 	_entryData->_maxX = pos;
 }
 
@@ -276,7 +275,7 @@ void MacroConditionOpenVREdit::MaxYChanged(const NumberVariable<double> &pos)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(GetSwitcher()->m);
+	auto lock = LockContext();
 	_entryData->_maxY = pos;
 }
 
@@ -286,7 +285,7 @@ void MacroConditionOpenVREdit::MaxZChanged(const NumberVariable<double> &pos)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(GetSwitcher()->m);
+	auto lock = LockContext();
 	_entryData->_maxZ = pos;
 }
 
diff --git a/src/macro-external/video/macro-condition-video.cpp b/src/macro-external/video/macro-condition-video.cpp
index bf036bbd..2caed1f6 100644
--- a/src/macro-external/video/macro-condition-video.cpp
+++ b/src/macro-external/video/macro-condition-video.cpp
@@ -1,6 +1,5 @@
 #include "macro-condition-video.hpp"
 
-#include <advanced-scene-switcher.hpp>
 #include <macro-condition-edit.hpp>
 #include <switcher-data.hpp>
 #include <utility.hpp>
@@ -693,7 +692,7 @@ void MacroConditionVideoEdit::SourceChanged(const SourceSelection &source)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(GetSwitcher()->m);
+	auto lock = LockContext();
 	_entryData->_video.source = source;
 	HandleVideoInputUpdate();
 }
@@ -704,7 +703,7 @@ void MacroConditionVideoEdit::SceneChanged(const SceneSelection &scene)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(GetSwitcher()->m);
+	auto lock = LockContext();
 	_entryData->_video.scene = scene;
 	HandleVideoInputUpdate();
 }
@@ -715,7 +714,7 @@ void MacroConditionVideoEdit::VideoInputTypeChanged(int type)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(GetSwitcher()->m);
+	auto lock = LockContext();
 	_entryData->_video.type = static_cast<VideoInput::Type>(type);
 	HandleVideoInputUpdate();
 	SetWidgetVisibility();
@@ -727,7 +726,7 @@ void MacroConditionVideoEdit::ConditionChanged(int cond)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(GetSwitcher()->m);
+	auto lock = LockContext();
 	_entryData->_condition = static_cast<VideoCondition>(cond);
 	_entryData->ResetLastMatch();
 	SetWidgetVisibility();
@@ -758,7 +757,7 @@ void MacroConditionVideoEdit::ImagePathChanged(const QString &text)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(GetSwitcher()->m);
+	auto lock = LockContext();
 	_entryData->_file = text.toUtf8().constData();
 	_entryData->ResetLastMatch();
 	if (_entryData->LoadImageFromFile()) {
@@ -865,7 +864,7 @@ void MacroConditionVideoEdit::UsePatternForChangedCheckChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(GetSwitcher()->m);
+	auto lock = LockContext();
 	_entryData->_patternMatchParameters.useForChangedCheck = value;
 	SetWidgetVisibility();
 }
@@ -877,7 +876,7 @@ void MacroConditionVideoEdit::PatternThresholdChanged(
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(GetSwitcher()->m);
+	auto lock = LockContext();
 	_entryData->_patternMatchParameters.threshold = value;
 	_previewDialog.PatternMatchParamtersChanged(
 		_entryData->_patternMatchParameters);
@@ -889,7 +888,7 @@ void MacroConditionVideoEdit::ReduceLatencyChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(GetSwitcher()->m);
+	auto lock = LockContext();
 	_entryData->_blockUntilScreenshotDone = value;
 }
 
@@ -899,7 +898,7 @@ void MacroConditionVideoEdit::UseAlphaAsMaskChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(GetSwitcher()->m);
+	auto lock = LockContext();
 	_entryData->_patternMatchParameters.useAlphaAsMask = value;
 	_entryData->LoadImageFromFile();
 	_previewDialog.PatternMatchParamtersChanged(
@@ -912,7 +911,7 @@ void MacroConditionVideoEdit::PatternMatchModeChanged(int idx)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(GetSwitcher()->m);
+	auto lock = LockContext();
 	_entryData->_patternMatchParameters.matchMode =
 		static_cast<cv::TemplateMatchModes>(
 			_patternMatchMode->itemData(idx).toInt());
@@ -927,7 +926,7 @@ void MacroConditionVideoEdit::BrightnessThresholdChanged(
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(GetSwitcher()->m);
+	auto lock = LockContext();
 	_entryData->_brightnessThreshold = value;
 }
 
@@ -938,7 +937,7 @@ void MacroConditionVideoEdit::ObjectScaleThresholdChanged(
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(GetSwitcher()->m);
+	auto lock = LockContext();
 	_entryData->_objMatchParameters.scaleFactor = value;
 	_previewDialog.ObjDetectParamtersChanged(
 		_entryData->_objMatchParameters);
@@ -950,7 +949,7 @@ void MacroConditionVideoEdit::MinNeighborsChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(GetSwitcher()->m);
+	auto lock = LockContext();
 	_entryData->_objMatchParameters.minNeighbors = value;
 	_previewDialog.ObjDetectParamtersChanged(
 		_entryData->_objMatchParameters);
@@ -962,7 +961,7 @@ void MacroConditionVideoEdit::MinSizeChanged(advss::Size value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(GetSwitcher()->m);
+	auto lock = LockContext();
 	_entryData->_objMatchParameters.minSize = value;
 	_previewDialog.ObjDetectParamtersChanged(
 		_entryData->_objMatchParameters);
@@ -982,7 +981,7 @@ void MacroConditionVideoEdit::MaxSizeChanged(advss::Size value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(GetSwitcher()->m);
+	auto lock = LockContext();
 	_entryData->_objMatchParameters.maxSize = value;
 	_previewDialog.ObjDetectParamtersChanged(
 		_entryData->_objMatchParameters);
@@ -1011,7 +1010,7 @@ void MacroConditionVideoEdit::SelectColorClicked()
 	}
 
 	SetupColorLabel(color);
-	std::lock_guard<std::mutex> lock(GetSwitcher()->m);
+	auto lock = LockContext();
 	_entryData->_ocrParamters.color = color;
 
 	_previewDialog.OCRParamtersChanged(_entryData->_ocrParamters);
@@ -1023,7 +1022,7 @@ void MacroConditionVideoEdit::MatchTextChanged()
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(GetSwitcher()->m);
+	auto lock = LockContext();
 	_entryData->_ocrParamters.text =
 		_matchText->toPlainText().toUtf8().constData();
 
@@ -1039,7 +1038,7 @@ void MacroConditionVideoEdit::RegexChanged(RegexConfig conf)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(GetSwitcher()->m);
+	auto lock = LockContext();
 	_entryData->_ocrParamters.regex = conf;
 	adjustSize();
 	updateGeometry();
@@ -1053,7 +1052,7 @@ void MacroConditionVideoEdit::PageSegModeChanged(int idx)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(GetSwitcher()->m);
+	auto lock = LockContext();
 	_entryData->SetPageSegMode(static_cast<tesseract::PageSegMode>(
 		_pageSegMode->itemData(idx).toInt()));
 
@@ -1066,7 +1065,7 @@ void MacroConditionVideoEdit::CheckAreaEnableChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(GetSwitcher()->m);
+	auto lock = LockContext();
 	_entryData->_areaParameters.enable = value;
 	_checkArea->setEnabled(value);
 	_selectArea->setEnabled(value);
@@ -1082,7 +1081,7 @@ void MacroConditionVideoEdit::CheckAreaChanged(advss::Area value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(GetSwitcher()->m);
+	auto lock = LockContext();
 	_entryData->_areaParameters.area = value;
 	_previewDialog.AreaParamtersChanged(_entryData->_areaParameters);
 }
@@ -1100,7 +1099,7 @@ void MacroConditionVideoEdit::ThrottleEnableChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(GetSwitcher()->m);
+	auto lock = LockContext();
 	_entryData->_throttleEnabled = value;
 	_throttleCount->setEnabled(value);
 }
@@ -1111,7 +1110,7 @@ void MacroConditionVideoEdit::ThrottleCountChanged(int value)
 		return;
 	}
 
-	std::lock_guard<std::mutex> lock(GetSwitcher()->m);
+	auto lock = LockContext();
 	_entryData->_throttleCount = value / GetSwitcher()->interval;
 }
 
@@ -1147,7 +1146,7 @@ void MacroConditionVideoEdit::ModelPathChanged(const QString &text)
 
 	bool dataLoaded = false;
 	{
-		std::lock_guard<std::mutex> lock(GetSwitcher()->m);
+		auto lock = LockContext();
 		std::string path = text.toStdString();
 		dataLoaded = _entryData->LoadModelData(path);
 	}
diff --git a/src/status-control.cpp b/src/status-control.cpp
index 55cae3e4..59157c94 100644
--- a/src/status-control.cpp
+++ b/src/status-control.cpp
@@ -1,5 +1,5 @@
 #include "status-control.hpp"
-#include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
 
 #include <obs-module.h>
@@ -9,6 +9,7 @@
 
 namespace advss {
 
+void OpenSettingsWindow();
 StatusDock *dock = nullptr;
 
 StatusControl::StatusControl(QWidget *parent, bool noLayout)
diff --git a/src/switcher-data.cpp b/src/switcher-data.cpp
index 7fcdb8c4..768091e1 100644
--- a/src/switcher-data.cpp
+++ b/src/switcher-data.cpp
@@ -9,6 +9,16 @@ SwitcherData *GetSwitcher()
 	return switcher;
 }
 
+std::mutex *GetSwitcherMutex()
+{
+	return switcher ? &switcher->m : nullptr;
+}
+
+bool VerboseLoggingEnabled()
+{
+	return switcher ? switcher->verbose : false;
+}
+
 SwitcherData::SwitcherData(obs_module_t *m, translateFunc t)
 {
 	_modulePtr = m;
diff --git a/src/switcher-data.hpp b/src/switcher-data.hpp
index 1918f11d..1b2aa170 100644
--- a/src/switcher-data.hpp
+++ b/src/switcher-data.hpp
@@ -1,13 +1,4 @@
 #pragma once
-#include <condition_variable>
-#include <vector>
-#include <deque>
-#include <mutex>
-#include <QDateTime>
-#include <QThread>
-#include <curl/curl.h>
-#include <unordered_map>
-
 #include "scene-group.hpp"
 #include "scene-trigger.hpp"
 #include "switch-audio.hpp"
@@ -31,11 +22,16 @@
 #include "curl-helper.hpp"
 #include "priority-helper.hpp"
 
-#define blog(level, msg, ...) blog(level, "[adv-ss] " msg, ##__VA_ARGS__)
-#define vblog(level, msg, ...)                   \
-	if (GetSwitcher()->verbose) {            \
-		blog(level, msg, ##__VA_ARGS__); \
-	}
+#include "log-helper.hpp"
+
+#include <condition_variable>
+#include <vector>
+#include <deque>
+#include <mutex>
+#include <QDateTime>
+#include <QThread>
+#include <curl/curl.h>
+#include <unordered_map>
 
 namespace advss {
 
@@ -51,6 +47,8 @@ class SwitcherThread;
 class SwitcherData;
 extern SwitcherData *switcher;
 SwitcherData *GetSwitcher();
+std::mutex *GetSwitcherMutex();
+bool VerboseLoggingEnabled();
 
 class SwitcherData {
 public:
diff --git a/src/utils/scene-selection.cpp b/src/utils/scene-selection.cpp
index f49c9963..ab338393 100644
--- a/src/utils/scene-selection.cpp
+++ b/src/utils/scene-selection.cpp
@@ -1,5 +1,5 @@
 #include "scene-selection.hpp"
-#include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
 
 namespace advss {
diff --git a/src/utils/source-selection.cpp b/src/utils/source-selection.cpp
index ed810689..9693a67c 100644
--- a/src/utils/source-selection.cpp
+++ b/src/utils/source-selection.cpp
@@ -1,5 +1,5 @@
 #include "source-selection.hpp"
-#include "advanced-scene-switcher.hpp"
+#include "obs-module-helper.hpp"
 
 namespace advss {
 
diff --git a/src/utils/transition-selection.cpp b/src/utils/transition-selection.cpp
index 80df77a2..1913083e 100644
--- a/src/utils/transition-selection.cpp
+++ b/src/utils/transition-selection.cpp
@@ -1,5 +1,5 @@
 #include "transition-selection.hpp"
-#include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 
 namespace advss {
 
diff --git a/src/utils/utility.cpp b/src/utils/utility.cpp
index 4da52ee0..5282b6d5 100644
--- a/src/utils/utility.cpp
+++ b/src/utils/utility.cpp
@@ -2,6 +2,7 @@
 #include "platform-funcs.hpp"
 #include "scene-selection.hpp"
 #include "regex-config.hpp"
+#include "scene-group.hpp"
 
 #include <QStandardPaths>
 #include <QFile>
diff --git a/src/utils/utility.hpp b/src/utils/utility.hpp
index fe92ac69..b087a093 100644
--- a/src/utils/utility.hpp
+++ b/src/utils/utility.hpp
@@ -11,12 +11,12 @@
 #include <obs-frontend-api.h>
 #include <deque>
 #include <unordered_map>
-#include "scene-group.hpp"
 
 namespace advss {
 
 class SceneSelection;
 class RegexConfig;
+struct SceneGroup;
 
 /* Source helpers */
 
diff --git a/src/utils/variable-spinbox.cpp b/src/utils/variable-spinbox.cpp
index 229fd863..8b2c94d2 100644
--- a/src/utils/variable-spinbox.cpp
+++ b/src/utils/variable-spinbox.cpp
@@ -1,5 +1,5 @@
 #include "variable-spinbox.hpp"
-#include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 #include "utility.hpp"
 
 #include <QLayout>
diff --git a/src/utils/websocket-helpers.cpp b/src/utils/websocket-helpers.cpp
index dc89d50f..c2186d25 100644
--- a/src/utils/websocket-helpers.cpp
+++ b/src/utils/websocket-helpers.cpp
@@ -1,6 +1,6 @@
 #include "websocket-helpers.hpp"
 #include "connection-manager.hpp"
-#include "advanced-scene-switcher.hpp"
+#include "switcher-data.hpp"
 
 #include <QCryptographicHash>
 #include <obs-websocket-api.h>