diff --git a/src/headers/macro-action-audio.hpp b/src/headers/macro-action-audio.hpp
index 72fb28d0..d1f0ec75 100644
--- a/src/headers/macro-action-audio.hpp
+++ b/src/headers/macro-action-audio.hpp
@@ -1,5 +1,6 @@
 #pragma once
 #include <QSpinBox>
+#include <QHBoxLayout>
 #include "macro-action-edit.hpp"
 
 enum class AudioAction {
diff --git a/src/headers/macro-action-hotkey.hpp b/src/headers/macro-action-hotkey.hpp
index 3662855d..6e50e23f 100644
--- a/src/headers/macro-action-hotkey.hpp
+++ b/src/headers/macro-action-hotkey.hpp
@@ -3,6 +3,7 @@
 #include "hotkey.hpp"
 
 #include <QCheckBox>
+#include <QHBoxLayout>
 
 class MacroActionHotkey : public MacroAction {
 public:
diff --git a/src/headers/macro-action-macro.hpp b/src/headers/macro-action-macro.hpp
index 4d13a10b..57d2ddab 100644
--- a/src/headers/macro-action-macro.hpp
+++ b/src/headers/macro-action-macro.hpp
@@ -1,8 +1,9 @@
 #pragma once
-#include <QDoubleSpinBox>
 #include "macro-action-edit.hpp"
 #include "macro-selection.hpp"
 
+#include <QHBoxLayout>
+
 enum class PerformMacroAction {
 	PAUSE,
 	UNPAUSE,
diff --git a/src/headers/macro-action-media.hpp b/src/headers/macro-action-media.hpp
index a4f583a3..88ff2dcc 100644
--- a/src/headers/macro-action-media.hpp
+++ b/src/headers/macro-action-media.hpp
@@ -1,7 +1,9 @@
 #pragma once
-#include <QSpinBox>
 #include "macro-action-edit.hpp"
 
+#include <QSpinBox>
+#include <QHBoxLayout>
+
 enum class MediaAction {
 	PLAY,
 	PAUSE,
diff --git a/src/headers/macro-action-plugin-state.hpp b/src/headers/macro-action-plugin-state.hpp
index d0e30a4c..2762be2e 100644
--- a/src/headers/macro-action-plugin-state.hpp
+++ b/src/headers/macro-action-plugin-state.hpp
@@ -1,7 +1,9 @@
 #pragma once
-#include <QDoubleSpinBox>
 #include "macro-action-edit.hpp"
 
+#include <QDoubleSpinBox>
+#include <QHBoxLayout>
+
 enum class PluginStateAction {
 	STOP,
 	NO_MATCH_BEHAVIOUR,
diff --git a/src/headers/macro-action-recording.hpp b/src/headers/macro-action-recording.hpp
index 34b29e6f..d7f71bac 100644
--- a/src/headers/macro-action-recording.hpp
+++ b/src/headers/macro-action-recording.hpp
@@ -1,8 +1,9 @@
 #pragma once
-#include <QDoubleSpinBox>
-#include <QLabel>
 #include "macro-action-edit.hpp"
 
+#include <QComboBox>
+#include <QHBoxLayout>
+
 enum class RecordAction {
 	STOP,
 	START,
diff --git a/src/headers/macro-action-replay-buffer.hpp b/src/headers/macro-action-replay-buffer.hpp
index 5d047270..91f1f75d 100644
--- a/src/headers/macro-action-replay-buffer.hpp
+++ b/src/headers/macro-action-replay-buffer.hpp
@@ -1,8 +1,9 @@
 #pragma once
-#include <QDoubleSpinBox>
 #include "macro-action-edit.hpp"
 #include "duration-control.hpp"
 
+#include <QHBoxLayout>
+
 enum class ReplayBufferAction {
 	STOP,
 	START,
diff --git a/src/headers/macro-action-streaming.hpp b/src/headers/macro-action-streaming.hpp
index 8d3fc038..3dc8fa72 100644
--- a/src/headers/macro-action-streaming.hpp
+++ b/src/headers/macro-action-streaming.hpp
@@ -1,8 +1,11 @@
 #pragma once
-#include <QDoubleSpinBox>
 #include "macro-action-edit.hpp"
 #include "duration-control.hpp"
 
+#include <QDoubleSpinBox>
+#include <QComboBox>
+#include <QHBoxLayout>
+
 enum class StreamAction {
 	STOP,
 	START,
diff --git a/src/headers/macro-action-virtual-cam.hpp b/src/headers/macro-action-virtual-cam.hpp
index 5a180bdd..e9467f4c 100644
--- a/src/headers/macro-action-virtual-cam.hpp
+++ b/src/headers/macro-action-virtual-cam.hpp
@@ -1,7 +1,9 @@
 #pragma once
-#include <QDoubleSpinBox>
 #include "macro-action-edit.hpp"
 
+#include <QComboBox>
+#include <QHBoxLayout>
+
 enum class VCamAction {
 	STOP,
 	START,
diff --git a/src/headers/macro-action-wait.hpp b/src/headers/macro-action-wait.hpp
index e3b9756d..1b234b21 100644
--- a/src/headers/macro-action-wait.hpp
+++ b/src/headers/macro-action-wait.hpp
@@ -1,8 +1,10 @@
 #pragma once
-#include <QDoubleSpinBox>
 #include "macro-action-edit.hpp"
 #include "duration-control.hpp"
 
+#include <QDoubleSpinBox>
+#include <QHBoxLayout>
+
 enum class WaitType {
 	FIXED,
 	RANDOM,
diff --git a/src/headers/macro-condition-cursor.hpp b/src/headers/macro-condition-cursor.hpp
index 061be488..c58c31c7 100644
--- a/src/headers/macro-condition-cursor.hpp
+++ b/src/headers/macro-condition-cursor.hpp
@@ -1,7 +1,11 @@
 #pragma once
 #include "macro.hpp"
-#include <QWidget>
+
+#include <QSpinBox>
 #include <QComboBox>
+#include <QPushButton>
+#include <QTimer>
+#include <QFrame>
 
 enum class CursorCondition {
 	REGION,
diff --git a/src/headers/macro-condition-date.hpp b/src/headers/macro-condition-date.hpp
index dfb919f4..d9bf5dc8 100644
--- a/src/headers/macro-condition-date.hpp
+++ b/src/headers/macro-condition-date.hpp
@@ -1,10 +1,10 @@
 #pragma once
 #include "macro.hpp"
-#include <QWidget>
-#include <QComboBox>
-#include <QDateTimeEdit>
 #include "duration-control.hpp"
 
+#include <QCheckBox>
+#include <QDateTimeEdit>
+
 class MacroConditionDate : public MacroCondition {
 public:
 	bool CheckCondition();
diff --git a/src/headers/macro-condition-filter.hpp b/src/headers/macro-condition-filter.hpp
index 85020da8..578c71f6 100644
--- a/src/headers/macro-condition-filter.hpp
+++ b/src/headers/macro-condition-filter.hpp
@@ -1,7 +1,10 @@
 #pragma once
 #include "macro.hpp"
-#include <QWidget>
+
 #include <QComboBox>
+#include <QPushButton>
+#include <QPlainTextEdit>
+#include <QCheckBox>
 
 enum class FilterCondition {
 	ENABLED,
diff --git a/src/headers/macro-condition-macro.hpp b/src/headers/macro-condition-macro.hpp
index 96527784..f121f40d 100644
--- a/src/headers/macro-condition-macro.hpp
+++ b/src/headers/macro-condition-macro.hpp
@@ -1,9 +1,11 @@
 #pragma once
 #include "macro.hpp"
 #include "macro-selection.hpp"
-#include <QWidget>
+
+#include <QComboBox>
 #include <QSpinBox>
-#include <QLabel>
+#include <QPushButton>
+#include <QHBoxLayout>
 #include <QTimer>
 
 enum class MacroConditionMacroType {
diff --git a/src/headers/macro-condition-process.hpp b/src/headers/macro-condition-process.hpp
index 55636d1a..6b109080 100644
--- a/src/headers/macro-condition-process.hpp
+++ b/src/headers/macro-condition-process.hpp
@@ -1,7 +1,8 @@
 #pragma once
 #include "macro.hpp"
-#include <QWidget>
+
 #include <QComboBox>
+#include <QCheckBox>
 
 class MacroConditionProcess : public MacroCondition {
 public:
diff --git a/src/headers/macro-condition-source.hpp b/src/headers/macro-condition-source.hpp
index 09037ebb..03864fbd 100644
--- a/src/headers/macro-condition-source.hpp
+++ b/src/headers/macro-condition-source.hpp
@@ -1,7 +1,10 @@
 #pragma once
 #include "macro.hpp"
-#include <QWidget>
+
 #include <QComboBox>
+#include <QPushButton>
+#include <QPlainTextEdit>
+#include <QCheckBox>
 
 enum class SourceCondition {
 	ACTIVE,
diff --git a/src/headers/macro-condition-timer.hpp b/src/headers/macro-condition-timer.hpp
index 081e6b11..ba6c7b1c 100644
--- a/src/headers/macro-condition-timer.hpp
+++ b/src/headers/macro-condition-timer.hpp
@@ -1,10 +1,11 @@
 #pragma once
 #include "macro.hpp"
-#include <QWidget>
-#include <QComboBox>
-#include <QTimer>
 #include "duration-control.hpp"
 
+#include <QCheckBox>
+#include <QPushButton>
+#include <QTimer>
+
 class MacroConditionTimer : public MacroCondition {
 public:
 	bool CheckCondition();
diff --git a/src/headers/macro-condition-window.hpp b/src/headers/macro-condition-window.hpp
index 57fc4e40..01264d5b 100644
--- a/src/headers/macro-condition-window.hpp
+++ b/src/headers/macro-condition-window.hpp
@@ -1,7 +1,8 @@
 #pragma once
 #include "macro.hpp"
-#include <QWidget>
+
 #include <QComboBox>
+#include <QCheckBox>
 
 class MacroConditionWindow : public MacroCondition {
 public:
diff --git a/src/macro-tab.cpp b/src/macro-tab.cpp
index 6da51ee3..e3d363aa 100644
--- a/src/macro-tab.cpp
+++ b/src/macro-tab.cpp
@@ -3,6 +3,7 @@
 #include "headers/macro-condition-edit.hpp"
 #include "headers/advanced-scene-switcher.hpp"
 #include "headers/name-dialog.hpp"
+#include "headers/utility.hpp"
 
 #include <QMenu>
 
diff --git a/src/macro.cpp b/src/macro.cpp
index d3dc2d2d..c97cb580 100644
--- a/src/macro.cpp
+++ b/src/macro.cpp
@@ -7,6 +7,7 @@
 #include <limits>
 #undef max
 #include <chrono>
+#include <unordered_map>
 
 constexpr int perfLogThreshold = 300;