diff --git a/lib/macro/macro-segment.cpp b/lib/macro/macro-segment.cpp
index bd612c61..8a660259 100644
--- a/lib/macro/macro-segment.cpp
+++ b/lib/macro/macro-segment.cpp
@@ -4,7 +4,6 @@
 #include "section.hpp"
 #include "ui-helpers.hpp"
 
-#include <obs.hpp>
 #include <QApplication>
 #include <QEvent>
 #include <QLabel>
diff --git a/lib/macro/macro-segment.hpp b/lib/macro/macro-segment.hpp
index a3ba79ac..d54a877f 100644
--- a/lib/macro/macro-segment.hpp
+++ b/lib/macro/macro-segment.hpp
@@ -11,7 +11,7 @@
 #include <QFrame>
 #include <QVBoxLayout>
 #include <QTimer>
-#include <obs.hpp>
+#include <obs-data.h>
 
 class QLabel;
 
@@ -116,8 +116,8 @@ private:
 
 	void ShowDropLine(DropLineState);
 
-	// The reason for using two separate frame widget each with their own
-	// stylesheet and changing their visibility vs. using a single frame
+	// The reason for using two separate frame widgets, each with their own
+	// stylesheet, and changing their visibility vs. using a single frame
 	// and changing the stylesheet at runtime is that the operation of
 	// adjusting the stylesheet is very expensive and can take multiple
 	// hundred milliseconds per widget.
diff --git a/lib/macro/macro.hpp b/lib/macro/macro.hpp
index 0fdaff63..7187e70e 100644
--- a/lib/macro/macro.hpp
+++ b/lib/macro/macro.hpp
@@ -13,7 +13,7 @@
 #include <memory>
 #include <map>
 #include <thread>
-#include <obs-data.h>
+#include <obs.hpp>
 #include <obs-module-helper.hpp>
 
 namespace advss {
diff --git a/lib/utils/curl-helper.cpp b/lib/utils/curl-helper.cpp
index 5ffed82a..2ade8aa2 100644
--- a/lib/utils/curl-helper.cpp
+++ b/lib/utils/curl-helper.cpp
@@ -1,9 +1,9 @@
 #include "curl-helper.hpp"
+#include "log-helper.hpp"
 
 #include <QDir>
 #include <QFileInfo>
 #include <curl/curl.h>
-#include <obs.hpp>
 
 namespace advss {
 
diff --git a/lib/utils/selection-helpers.hpp b/lib/utils/selection-helpers.hpp
index c0c411ec..db9d6988 100644
--- a/lib/utils/selection-helpers.hpp
+++ b/lib/utils/selection-helpers.hpp
@@ -2,7 +2,6 @@
 #include "export-symbol-helper.hpp"
 
 #include <deque>
-#include <obs.hpp>
 #include <QComboBox>
 #include <QStringList>
 #include <string>
diff --git a/lib/utils/temp-variable.hpp b/lib/utils/temp-variable.hpp
index cebed162..b2758e15 100644
--- a/lib/utils/temp-variable.hpp
+++ b/lib/utils/temp-variable.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "filter-combo-box.hpp"
 
-#include <obs.hpp>
+#include <obs-data.h>
 #include <mutex>
 #include <optional>
 #include <QEnterEvent>
diff --git a/lib/utils/ui-helpers.cpp b/lib/utils/ui-helpers.cpp
index 05e512b2..dd5f6ed2 100644
--- a/lib/utils/ui-helpers.cpp
+++ b/lib/utils/ui-helpers.cpp
@@ -3,7 +3,6 @@
 #include "obs-module-helper.hpp"
 
 #include <obs-frontend-api.h>
-#include <obs.hpp>
 #include <QGraphicsColorizeEffect>
 #include <QMainWindow>
 #include <QPropertyAnimation>
diff --git a/lib/variables/variable-number.hpp b/lib/variables/variable-number.hpp
index 8c0011e0..5945286b 100644
--- a/lib/variables/variable-number.hpp
+++ b/lib/variables/variable-number.hpp
@@ -1,8 +1,6 @@
 #pragma once
 #include "variable.hpp"
 
-#include <obs.hpp>
-
 namespace advss {
 
 template<typename T> class NumberVariable {
diff --git a/lib/variables/variable-string.hpp b/lib/variables/variable-string.hpp
index df73e31c..32c56060 100644
--- a/lib/variables/variable-string.hpp
+++ b/lib/variables/variable-string.hpp
@@ -2,7 +2,7 @@
 #include "variable.hpp"
 
 #include <string>
-#include <obs.hpp>
+#include <obs-data.h>
 
 namespace advss {
 
diff --git a/plugins/base/macro-action-clipboard.cpp b/plugins/base/macro-action-clipboard.cpp
index f5720f96..e863214b 100644
--- a/plugins/base/macro-action-clipboard.cpp
+++ b/plugins/base/macro-action-clipboard.cpp
@@ -1,6 +1,7 @@
 #include "macro-action-clipboard.hpp"
 #include "curl-helper.hpp"
 
+#include <obs.hpp>
 #include <QApplication>
 #include <QClipboard>
 #include <QImage>
diff --git a/plugins/base/macro-action-plugin-state.hpp b/plugins/base/macro-action-plugin-state.hpp
index d111a8e0..e1aeb4d4 100644
--- a/plugins/base/macro-action-plugin-state.hpp
+++ b/plugins/base/macro-action-plugin-state.hpp
@@ -2,6 +2,7 @@
 #include "macro-action-edit.hpp"
 #include "file-selection.hpp"
 
+#include <obs.hpp>
 #include <QDoubleSpinBox>
 #include <QLabel>
 
diff --git a/plugins/base/macro-condition-obs-stats.hpp b/plugins/base/macro-condition-obs-stats.hpp
index 7d317ff6..2c8c0b51 100644
--- a/plugins/base/macro-condition-obs-stats.hpp
+++ b/plugins/base/macro-condition-obs-stats.hpp
@@ -2,6 +2,7 @@
 #include "macro-condition-edit.hpp"
 #include "variable-spinbox.hpp"
 
+#include <obs.hpp>
 #include <QWidget>
 #include <QComboBox>
 #include <util/platform.h>
diff --git a/plugins/base/utils/osc-helpers.cpp b/plugins/base/utils/osc-helpers.cpp
index 266614c6..cec61bb5 100644
--- a/plugins/base/utils/osc-helpers.cpp
+++ b/plugins/base/utils/osc-helpers.cpp
@@ -1,4 +1,5 @@
 #include "osc-helpers.hpp"
+#include "log-helper.hpp"
 #include "obs-module-helper.hpp"
 #include "ui-helpers.hpp"