diff --git a/libs/tasks/source/ui.cpp b/libs/tasks/source/ui.cpp
index 5a000f4b..56484f95 100644
--- a/libs/tasks/source/ui.cpp
+++ b/libs/tasks/source/ui.cpp
@@ -1,5 +1,11 @@
 #include <psemek/tasks/ui.hpp>
 
+#include <psemek/ui/window.hpp>
+#include <psemek/ui/grid_layout.hpp>
+#include <psemek/ui/frame.hpp>
+#include <psemek/ui/scroller.hpp>
+#include <psemek/ui/rich_button.hpp>
+
 #include <psemek/util/recursive.hpp>
 
 namespace psemek::tasks
diff --git a/libs/ui/include/psemek/ui/element_factory.hpp b/libs/ui/include/psemek/ui/element_factory.hpp
index fd5b9a3b..d1cffa87 100644
--- a/libs/ui/include/psemek/ui/element_factory.hpp
+++ b/libs/ui/include/psemek/ui/element_factory.hpp
@@ -1,27 +1,30 @@
 #pragma once
 
-#include <psemek/ui/button.hpp>
-#include <psemek/ui/rich_button.hpp>
-#include <psemek/ui/label.hpp>
-#include <psemek/ui/frame.hpp>
-#include <psemek/ui/window.hpp>
-#include <psemek/ui/screen.hpp>
-#include <psemek/ui/grid_layout.hpp>
-#include <psemek/ui/image_view.hpp>
-#include <psemek/ui/rich_image_view.hpp>
-#include <psemek/ui/checkbox.hpp>
-#include <psemek/ui/toggle_button.hpp>
-#include <psemek/ui/slider.hpp>
-#include <psemek/ui/spinbox.hpp>
-#include <psemek/ui/scroller.hpp>
-#include <psemek/ui/progress_bar.hpp>
-#include <psemek/ui/selector.hpp>
+#include <psemek/ui/element.hpp>
 
 #include <psemek/gfx/texture.hpp>
+#include <psemek/gfx/texture_view.hpp>
 
 namespace psemek::ui
 {
 
+	struct button;
+	struct rich_button;
+	struct label;
+	struct frame;
+	struct window;
+	struct screen;
+	struct grid_layout;
+	struct image_view;
+	struct rich_image_view;
+	struct checkbox;
+	struct toggle_button;
+	struct slider;
+	struct spinbox;
+	struct scroller;
+	struct progress_bar;
+	struct selector;
+
 	struct element_factory
 	{
 		virtual std::shared_ptr<rich_button> make_button();
diff --git a/libs/ui/source/default_element_factory.cpp b/libs/ui/source/default_element_factory.cpp
index 7ad1b961..54bc253e 100644
--- a/libs/ui/source/default_element_factory.cpp
+++ b/libs/ui/source/default_element_factory.cpp
@@ -1,6 +1,15 @@
 #include <psemek/ui/default_element_factory.hpp>
 
+#include <psemek/ui/rich_button.hpp>
+#include <psemek/ui/frame.hpp>
+#include <psemek/ui/window.hpp>
+#include <psemek/ui/checkbox.hpp>
+#include <psemek/ui/slider.hpp>
+#include <psemek/ui/spinbox.hpp>
 #include <psemek/ui/box_shape.hpp>
+#include <psemek/ui/container.hpp>
+#include <psemek/ui/grid_layout.hpp>
+#include <psemek/ui/scroller.hpp>
 
 #include <psemek/io/memory_stream.hpp>
 
diff --git a/libs/ui/source/element_factory.cpp b/libs/ui/source/element_factory.cpp
index 38336f56..7dab502a 100644
--- a/libs/ui/source/element_factory.cpp
+++ b/libs/ui/source/element_factory.cpp
@@ -1,5 +1,13 @@
 #include <psemek/ui/element_factory.hpp>
 
+#include <psemek/ui/label.hpp>
+#include <psemek/ui/rich_button.hpp>
+#include <psemek/ui/toggle_button.hpp>
+#include <psemek/ui/image_view.hpp>
+#include <psemek/ui/rich_image_view.hpp>
+#include <psemek/ui/grid_layout.hpp>
+#include <psemek/ui/screen.hpp>
+
 namespace psemek::ui
 {