diff --git a/lib/macro/macro-action-factory.hpp b/lib/macro/macro-action-factory.hpp
index f451c577..d4137b84 100644
--- a/lib/macro/macro-action-factory.hpp
+++ b/lib/macro/macro-action-factory.hpp
@@ -20,7 +20,7 @@ public:
 	MacroActionFactory() = delete;
 
 	EXPORT static bool Register(const std::string &id, MacroActionInfo);
-	static bool Deregister(const std::string &id);
+	EXPORT static bool Deregister(const std::string &id);
 	static std::shared_ptr<MacroAction> Create(const std::string &id,
 						   Macro *m);
 	static QWidget *CreateWidget(const std::string &id, QWidget *parent,
diff --git a/lib/macro/macro-condition-factory.hpp b/lib/macro/macro-condition-factory.hpp
index 0a6845b5..5ace62a3 100644
--- a/lib/macro/macro-condition-factory.hpp
+++ b/lib/macro/macro-condition-factory.hpp
@@ -20,7 +20,7 @@ class MacroConditionFactory {
 public:
 	MacroConditionFactory() = delete;
 	EXPORT static bool Register(const std::string &, MacroConditionInfo);
-	static bool Deregister(const std::string &);
+	EXPORT static bool Deregister(const std::string &);
 	static std::shared_ptr<MacroCondition> Create(const std::string &,
 						      Macro *m);
 	static QWidget *CreateWidget(const std::string &id, QWidget *parent,
diff --git a/lib/utils/double-slider.hpp b/lib/utils/double-slider.hpp
index 804b84b4..27cb9132 100644
--- a/lib/utils/double-slider.hpp
+++ b/lib/utils/double-slider.hpp
@@ -7,7 +7,7 @@
 
 namespace advss {
 
-class SliderIgnoreScroll : public QSlider {
+class ADVSS_EXPORT SliderIgnoreScroll : public QSlider {
 	Q_OBJECT
 
 public:
diff --git a/lib/utils/duration-control.hpp b/lib/utils/duration-control.hpp
index 8ae68dce..dd2a1b66 100644
--- a/lib/utils/duration-control.hpp
+++ b/lib/utils/duration-control.hpp
@@ -9,15 +9,14 @@
 
 namespace advss {
 
-class DurationSelection : public QWidget {
+class ADVSS_EXPORT DurationSelection : public QWidget {
 	Q_OBJECT
 public:
-	EXPORT DurationSelection(QWidget *parent = nullptr,
-				 bool showUnitSelection = true,
-				 double minValue = 0.0);
-	EXPORT void SetDuration(const Duration &);
+	DurationSelection(QWidget *parent = nullptr,
+			  bool showUnitSelection = true, double minValue = 0.0);
+	void SetDuration(const Duration &);
 	Duration GetDuration() const { return _current; }
-	EXPORT QDoubleSpinBox *SpinBox() { return _duration->SpinBox(); }
+	QDoubleSpinBox *SpinBox() { return _duration->SpinBox(); }
 
 private slots:
 	void _DurationChanged(const NumberVariable<double> &value);
diff --git a/lib/utils/plugin-state-helpers.hpp b/lib/utils/plugin-state-helpers.hpp
index 2bd1bfe8..5135524c 100644
--- a/lib/utils/plugin-state-helpers.hpp
+++ b/lib/utils/plugin-state-helpers.hpp
@@ -25,8 +25,8 @@ EXPORT void StopPlugin();
 EXPORT void StartPlugin();
 EXPORT bool PluginIsRunning();
 EXPORT int GetIntervalValue();
-void AddStartStep(std::function<void()>);
-void AddStopStep(std::function<void()>);
+EXPORT void AddStartStep(std::function<void()>);
+EXPORT void AddStopStep(std::function<void()>);
 void RunStartSteps();
 void RunStopSteps();
 void RunIntervalResetSteps();
diff --git a/lib/utils/resizing-text-edit.hpp b/lib/utils/resizing-text-edit.hpp
index dcc2d642..4aad0c68 100644
--- a/lib/utils/resizing-text-edit.hpp
+++ b/lib/utils/resizing-text-edit.hpp
@@ -5,15 +5,15 @@
 
 namespace advss {
 
-class ResizingPlainTextEdit : public QPlainTextEdit {
+class ADVSS_EXPORT ResizingPlainTextEdit : public QPlainTextEdit {
 	Q_OBJECT
 public:
 	ResizingPlainTextEdit(QWidget *parent, const int scrollAt = 10,
 			      const int minLines = 3,
 			      const int paddingLines = 2);
 	virtual ~ResizingPlainTextEdit(){};
-	EXPORT int maxLength();
-	EXPORT void setMaxLength(int maxLength);
+	int maxLength();
+	void setMaxLength(int maxLength);
 
 protected:
 	bool eventFilter(QObject *obj, QEvent *event) override;
diff --git a/lib/variables/variable-text-edit.hpp b/lib/variables/variable-text-edit.hpp
index a2056f1d..5b7e867f 100644
--- a/lib/variables/variable-text-edit.hpp
+++ b/lib/variables/variable-text-edit.hpp
@@ -4,15 +4,15 @@
 
 namespace advss {
 
-class VariableTextEdit : public ResizingPlainTextEdit {
+class ADVSS_EXPORT VariableTextEdit : public ResizingPlainTextEdit {
 	Q_OBJECT
 public:
-	EXPORT VariableTextEdit(QWidget *parent, const int scrollAt = 10,
-				const int minLines = 3,
-				const int paddingLines = 2);
-	EXPORT void setPlainText(const QString &);
-	EXPORT void setPlainText(const StringVariable &);
-	EXPORT void setToolTip(const QString &string);
+	VariableTextEdit(QWidget *parent, const int scrollAt = 10,
+			 const int minLines = 3, const int paddingLines = 2);
+	virtual ~VariableTextEdit(){};
+	void setPlainText(const QString &);
+	void setPlainText(const StringVariable &);
+	void setToolTip(const QString &string);
 
 private:
 };