diff --git a/src/libcalamaresui/modulesystem/ModuleManager.h b/src/libcalamaresui/modulesystem/ModuleManager.h
index 7f7ead05e..015f66ed0 100644
--- a/src/libcalamaresui/modulesystem/ModuleManager.h
+++ b/src/libcalamaresui/modulesystem/ModuleManager.h
@@ -11,6 +11,8 @@
 #ifndef MODULELOADER_H
 #define MODULELOADER_H
 
+#include "DllMacro.h"
+
 #include "modulesystem/Descriptor.h"
 #include "modulesystem/InstanceKey.h"
 #include "modulesystem/Requirement.h"
@@ -32,7 +34,7 @@ class RequirementsModel;
  * constructs objects of type Module, loads them and makes them accessible by their
  * instance key.
  */
-class ModuleManager : public QObject
+class UIDLLEXPORT ModuleManager : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/libcalamaresui/utils/Paste.h b/src/libcalamaresui/utils/Paste.h
index 6bdcec0d6..9cec18c3c 100644
--- a/src/libcalamaresui/utils/Paste.h
+++ b/src/libcalamaresui/utils/Paste.h
@@ -10,6 +10,8 @@
 #ifndef UTILS_PASTE_H
 #define UTILS_PASTE_H
 
+#include "DllMacro.h"
+
 #include <QString>
 
 class QObject;
@@ -23,20 +25,20 @@ namespace Paste
  *
  * Returns the (string) URL that the pastebin gives us.
  */
-QString doLogUpload( QObject* parent );
+UIDLLEXPORT QString doLogUpload( QObject* parent );
 
 /** @brief Send the current log file to a pastebin
  *
  * As doLogUpload(), but also sets the clipboard and displays
  * a message saying it's been done.
  */
-QString doLogUploadUI( QWidget* parent );
+UIDLLEXPORT QString doLogUploadUI( QWidget* parent );
 
 /** @brief Is paste enabled?
  *
  * Checks the branding instance if paste can be done.
  */
-bool isEnabled();
+UIDLLEXPORT bool isEnabled();
 }  // namespace Paste
 
 }  // namespace Calamares
diff --git a/src/libcalamaresui/viewpages/ExecutionViewStep.h b/src/libcalamaresui/viewpages/ExecutionViewStep.h
index f545a8d43..df52e55ec 100644
--- a/src/libcalamaresui/viewpages/ExecutionViewStep.h
+++ b/src/libcalamaresui/viewpages/ExecutionViewStep.h
@@ -27,7 +27,14 @@ namespace Calamares
 
 class Slideshow;
 
-class ExecutionViewStep : public ViewStep
+/**
+ * @class
+ *
+ * This is the implementation of the special ViewStep "Install"
+ * which takes care of an *exec* phase in the sequence. It runs
+ * jobs, shows the slideshow, etc.
+ */
+class UIDLLEXPORT ExecutionViewStep : public ViewStep
 {
     Q_OBJECT
 public:
diff --git a/src/libcalamaresui/viewpages/QmlViewStep.h b/src/libcalamaresui/viewpages/QmlViewStep.h
index 8d6eada7c..0d9f6cfcd 100644
--- a/src/libcalamaresui/viewpages/QmlViewStep.h
+++ b/src/libcalamaresui/viewpages/QmlViewStep.h
@@ -10,6 +10,7 @@
 #ifndef QMLVIEWSTEP_H
 #define QMLVIEWSTEP_H
 
+#include "DllMacro.h"
 #include "utils/Qml.h"
 #include "viewpages/ViewStep.h"
 
@@ -37,7 +38,7 @@ namespace Calamares
  * the QML in the module, see the module documentation:
  *      src/modules/README.md
  */
-class QmlViewStep : public Calamares::ViewStep
+class UIDLLEXPORT QmlViewStep : public Calamares::ViewStep
 {
     Q_OBJECT
 public:
diff --git a/src/libcalamaresui/widgets/FixedAspectRatioLabel.h b/src/libcalamaresui/widgets/FixedAspectRatioLabel.h
index 7dd058775..58d0956fa 100644
--- a/src/libcalamaresui/widgets/FixedAspectRatioLabel.h
+++ b/src/libcalamaresui/widgets/FixedAspectRatioLabel.h
@@ -11,10 +11,12 @@
 #ifndef FIXEDASPECTRATIOLABEL_H
 #define FIXEDASPECTRATIOLABEL_H
 
+#include "DllMacro.h"
+
 #include <QLabel>
 #include <QPixmap>
 
-class FixedAspectRatioLabel : public QLabel
+class UIDLLEXPORT FixedAspectRatioLabel : public QLabel
 {
     Q_OBJECT
 public:
diff --git a/src/libcalamaresui/widgets/WaitingWidget.h b/src/libcalamaresui/widgets/WaitingWidget.h
index 4f256259e..3a7f03bc2 100644
--- a/src/libcalamaresui/widgets/WaitingWidget.h
+++ b/src/libcalamaresui/widgets/WaitingWidget.h
@@ -10,6 +10,8 @@
 #ifndef WAITINGWIDGET_H
 #define WAITINGWIDGET_H
 
+#include "DllMacro.h"
+
 #include "widgets/waitingspinnerwidget.h"
 
 #include <chrono>
@@ -24,7 +26,7 @@ class QTimer;
  * and the text is displayed centered below it. Use this
  * to display a long-term waiting situation with a status report.
  */
-class WaitingWidget : public WaitingSpinnerWidget
+class UIDLLEXPORT WaitingWidget : public WaitingSpinnerWidget
 {
 public:
     /// Create a WaitingWidget with initial @p text label.
@@ -39,7 +41,7 @@ public:
  * every second. The signal timeout() is sent every time
  * the countdown reaches 0.
  */
-class CountdownWaitingWidget : public WaitingSpinnerWidget
+class UIDLLEXPORT CountdownWaitingWidget : public WaitingSpinnerWidget
 {
     Q_OBJECT
 public:
diff --git a/src/libcalamaresui/widgets/waitingspinnerwidget.h b/src/libcalamaresui/widgets/waitingspinnerwidget.h
index 29385566e..29f98af5f 100644
--- a/src/libcalamaresui/widgets/waitingspinnerwidget.h
+++ b/src/libcalamaresui/widgets/waitingspinnerwidget.h
@@ -30,12 +30,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #pragma once
 
-// Qt includes
+#include "DllMacro.h"
+
 #include <QColor>
 #include <QTimer>
 #include <QWidget>
 
-class WaitingSpinnerWidget : public QWidget
+class UIDLLEXPORT WaitingSpinnerWidget : public QWidget
 {
     Q_OBJECT
 public: