diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index 65a665e57..2643aaaa6 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -165,9 +165,7 @@ set(
     GUI/ColorWidgets/bookmarkedcolors.cpp
     GUI/ColorWidgets/paintcolorwidget.cpp
     #GUI/Dialogs/animationtopaintdialog.cpp
-    GUI/Dialogs/applyexpressiondialog.cpp
     GUI/Dialogs/dialogsinterfaceimpl.cpp
-    GUI/Dialogs/durationrectsettingsdialog.cpp
     GUI/Expressions/expressiondialog.cpp
     GUI/Expressions/expressioneditor.cpp
     GUI/Expressions/expressionhighlighter.cpp
@@ -259,9 +257,7 @@ set(
     GUI/ColorWidgets/bookmarkedcolors.h
     GUI/ColorWidgets/paintcolorwidget.h
     #GUI/Dialogs/animationtopaintdialog.h
-    GUI/Dialogs/applyexpressiondialog.h
     GUI/Dialogs/dialogsinterfaceimpl.h
-    GUI/Dialogs/durationrectsettingsdialog.h
     GUI/Expressions/expressiondialog.h
     GUI/Expressions/expressioneditor.h
     GUI/Expressions/expressionhighlighter.h
diff --git a/src/app/GUI/Dialogs/dialogsinterfaceimpl.cpp b/src/app/GUI/Dialogs/dialogsinterfaceimpl.cpp
index 8496dea83..a0e9ad425 100644
--- a/src/app/GUI/Dialogs/dialogsinterfaceimpl.cpp
+++ b/src/app/GUI/Dialogs/dialogsinterfaceimpl.cpp
@@ -35,9 +35,9 @@
 #include "GUI/global.h"
 #include "GUI/mainwindow.h"
 #include "GUI/Expressions/expressiondialog.h"
-#include "GUI/Dialogs/durationrectsettingsdialog.h"
+#include "dialogs/durationrectsettingsdialog.h"
 //#include "GUI/Dialogs/animationtopaintdialog.h"
-#include "GUI/Dialogs/applyexpressiondialog.h"
+#include "dialogs/applyexpressiondialog.h"
 #include "dialogs/scenesettingsdialog.h"
 
 DialogsInterfaceImpl DialogsInterfaceImpl::sInstance;
diff --git a/src/app/GUI/keysview.cpp b/src/app/GUI/keysview.cpp
index a3991eb10..25d24b3b4 100644
--- a/src/app/GUI/keysview.cpp
+++ b/src/app/GUI/keysview.cpp
@@ -36,7 +36,6 @@
 #include "GUI/global.h"
 #include "pointhelpers.h"
 #include "canvaswindow.h"
-#include "GUI/Dialogs/durationrectsettingsdialog.h"
 #include <QApplication>
 #include "clipboardcontainer.h"
 #include "Animators/qrealpoint.h"
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index c49c47f95..c0f931224 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -36,6 +36,8 @@ include_directories(
 
 set(
     SOURCES
+    dialogs/applyexpressiondialog.cpp
+    dialogs/durationrectsettingsdialog.cpp
     dialogs/exportsvgdialog.cpp
     dialogs/scenesettingsdialog.cpp
     optimalscrollarena/minimalscrollwidget.cpp
@@ -64,6 +66,8 @@ set(
 set(
     HEADERS
     ui_global.h
+    dialogs/applyexpressiondialog.h
+    dialogs/durationrectsettingsdialog.h
     dialogs/exportsvgdialog.h
     dialogs/scenesettingsdialog.h
     optimalscrollarena/minimalscrollwidget.h
diff --git a/src/app/GUI/Dialogs/applyexpressiondialog.cpp b/src/ui/dialogs/applyexpressiondialog.cpp
similarity index 100%
rename from src/app/GUI/Dialogs/applyexpressiondialog.cpp
rename to src/ui/dialogs/applyexpressiondialog.cpp
diff --git a/src/app/GUI/Dialogs/applyexpressiondialog.h b/src/ui/dialogs/applyexpressiondialog.h
similarity index 94%
rename from src/app/GUI/Dialogs/applyexpressiondialog.h
rename to src/ui/dialogs/applyexpressiondialog.h
index 4246d2aa3..18ac5cf27 100644
--- a/src/app/GUI/Dialogs/applyexpressiondialog.h
+++ b/src/ui/dialogs/applyexpressiondialog.h
@@ -26,13 +26,16 @@
 #ifndef APPLYEXPRESSIONDIALOG_H
 #define APPLYEXPRESSIONDIALOG_H
 
+#include "ui_global.h"
+
 #include <QDialog>
 
 #include <QDoubleSpinBox>
 
 #include "Animators/qrealanimator.h"
 
-class ApplyExpressionDialog : public QDialog {
+class UI_EXPORT ApplyExpressionDialog : public QDialog
+{
 public:
     ApplyExpressionDialog(QrealAnimator* const target,
                           QWidget * const parent = nullptr);
diff --git a/src/app/GUI/Dialogs/durationrectsettingsdialog.cpp b/src/ui/dialogs/durationrectsettingsdialog.cpp
similarity index 100%
rename from src/app/GUI/Dialogs/durationrectsettingsdialog.cpp
rename to src/ui/dialogs/durationrectsettingsdialog.cpp
diff --git a/src/app/GUI/Dialogs/durationrectsettingsdialog.h b/src/ui/dialogs/durationrectsettingsdialog.h
similarity index 94%
rename from src/app/GUI/Dialogs/durationrectsettingsdialog.h
rename to src/ui/dialogs/durationrectsettingsdialog.h
index 05e8a9646..fdc5c1a90 100644
--- a/src/app/GUI/Dialogs/durationrectsettingsdialog.h
+++ b/src/ui/dialogs/durationrectsettingsdialog.h
@@ -25,16 +25,21 @@
 
 #ifndef DURATIONRECTSETTINGSDIALOG_H
 #define DURATIONRECTSETTINGSDIALOG_H
+
+#include "ui_global.h"
+
 #include <QDialog>
 #include <QSpinBox>
 #include <QLabel>
 #include <QPushButton>
 #include "Timeline/durationrectangle.h"
+
 class QHBoxLayout;
 class QVBoxLayout;
 class TwoColumnLayout;
 
-class DurationRectSettingsDialog : public QDialog {
+class UI_EXPORT DurationRectSettingsDialog : public QDialog
+{
 public:
     DurationRectSettingsDialog(DurationRectangle* const target,
                                QWidget *parent = nullptr);
@@ -42,6 +47,7 @@ class DurationRectSettingsDialog : public QDialog {
     int getMinFrame() const;
     int getMaxFrame() const;
     int getShift() const;
+
 private:
     DurationRectangle* const mTarget;