10 files changed, 23 insertions, 7 deletions
diff --git a/include/cru/ui/controls/Button.h b/include/cru/ui/controls/Button.h
index ab1ef8eb..00253793 100644
--- a/include/cru/ui/controls/Button.h
+++ b/include/cru/ui/controls/Button.h
@@ -5,12 +5,13 @@
 #include "IBorderControl.h"
 #include "IClickableControl.h"
 #include "cru/common/Event.h"
+#include "cru/ui/render/BorderRenderObject.h"
 #include "cru/ui/style/ApplyBorderStyleInfo.h"
 
 namespace cru::ui::controls {
 class CRU_UI_API Button : public ContentControl,
-               public virtual IClickableControl,
-               public virtual IBorderControl {
+                          public virtual IClickableControl,
+                          public virtual IBorderControl {
  public:
   static constexpr StringView control_type = u"Button";
 
diff --git a/include/cru/ui/controls/Container.h b/include/cru/ui/controls/Container.h
index f250807d..926e395e 100644
--- a/include/cru/ui/controls/Container.h
+++ b/include/cru/ui/controls/Container.h
@@ -1,6 +1,8 @@
 #pragma once
 #include "ContentControl.h"
 
+#include "cru/ui/render/BorderRenderObject.h"
+
 namespace cru::ui::controls {
 class CRU_UI_API Container : public ContentControl {
   static constexpr StringView control_type = u"Container";
diff --git a/include/cru/ui/controls/ContentControl.h b/include/cru/ui/controls/ContentControl.h
index 86e90dae..5600ec25 100644
--- a/include/cru/ui/controls/ContentControl.h
+++ b/include/cru/ui/controls/ContentControl.h
@@ -1,7 +1,6 @@
 #pragma once
 #include "Control.h"
 
-#include "cru/ui/render/RenderObject.h"
 
 namespace cru::ui::controls {
 class CRU_UI_API ContentControl : public Control {
diff --git a/include/cru/ui/controls/Control.h b/include/cru/ui/controls/Control.h
index edbf5919..3927e604 100644
--- a/include/cru/ui/controls/Control.h
+++ b/include/cru/ui/controls/Control.h
@@ -2,8 +2,8 @@
 #include "Base.h"
 
 #include "../events/UiEvents.h"
-#include "../render/Base.h"
 #include "cru/common/Event.h"
+#include "cru/ui/render/RenderObject.h"
 
 namespace cru::ui::controls {
 class CRU_UI_API Control : public Object {
diff --git a/include/cru/ui/controls/FlexLayout.h b/include/cru/ui/controls/FlexLayout.h
index 1255b119..8fdb3aef 100644
--- a/include/cru/ui/controls/FlexLayout.h
+++ b/include/cru/ui/controls/FlexLayout.h
@@ -1,7 +1,15 @@
 #pragma once
 #include "LayoutControl.h"
 
+#include "cru/ui/render/FlexLayoutRenderObject.h"
+
 namespace cru::ui::controls {
+
+using render::FlexChildLayoutData;
+using render::FlexCrossAlignment;
+using render::FlexDirection;
+using render::FlexMainAlignment;
+
 class CRU_UI_API FlexLayout : public LayoutControl {
  public:
   static constexpr StringView control_type = u"FlexLayout";
diff --git a/include/cru/ui/controls/RootControl.h b/include/cru/ui/controls/RootControl.h
index c7ed916a..41424286 100644
--- a/include/cru/ui/controls/RootControl.h
+++ b/include/cru/ui/controls/RootControl.h
@@ -7,6 +7,7 @@
 #include "cru/platform/gui/Window.h"
 #include "cru/ui/Base.h"
 #include "cru/ui/host/WindowHost.h"
+#include "cru/ui/render/StackLayoutRenderObject.h"
 
 namespace cru::ui::controls {
 class CRU_UI_API RootControl : public LayoutControl {
diff --git a/include/cru/ui/controls/ScrollView.h b/include/cru/ui/controls/ScrollView.h
index 46c23691..7bc9b226 100644
--- a/include/cru/ui/controls/ScrollView.h
+++ b/include/cru/ui/controls/ScrollView.h
@@ -2,6 +2,7 @@
 #include "ContentControl.h"
 #include "cru/common/Base.h"
 #include "cru/ui/render/RenderObject.h"
+
 #include "cru/ui/render/ScrollRenderObject.h"
 
 #include <memory>
diff --git a/include/cru/ui/controls/TextBlock.h b/include/cru/ui/controls/TextBlock.h
index 5e5674a2..3f87d96c 100644
--- a/include/cru/ui/controls/TextBlock.h
+++ b/include/cru/ui/controls/TextBlock.h
@@ -1,10 +1,12 @@
 #pragma once
 #include "NoChildControl.h"
 
+#include "../render/TextRenderObject.h"
 #include "TextHostControlService.h"
 
 namespace cru::ui::controls {
-class CRU_UI_API TextBlock : public NoChildControl, public virtual ITextHostControl {
+class CRU_UI_API TextBlock : public NoChildControl,
+                             public virtual ITextHostControl {
  public:
   static constexpr StringView control_type = u"TextBlock";
 
diff --git a/include/cru/ui/controls/TextBox.h b/include/cru/ui/controls/TextBox.h
index 2ed7db5e..10f67b72 100644
--- a/include/cru/ui/controls/TextBox.h
+++ b/include/cru/ui/controls/TextBox.h
@@ -1,6 +1,7 @@
 #pragma once
 #include "NoChildControl.h"
 
+#include "../render/TextRenderObject.h"
 #include "IBorderControl.h"
 #include "TextHostControlService.h"
 
@@ -8,8 +9,8 @@
 
 namespace cru::ui::controls {
 class CRU_UI_API TextBox : public NoChildControl,
-                public virtual IBorderControl,
-                public virtual ITextHostControl {
+                           public virtual IBorderControl,
+                           public virtual ITextHostControl {
  public:
   static constexpr StringView control_type = u"TextBox";
 
diff --git a/include/cru/ui/controls/TextHostControlService.h b/include/cru/ui/controls/TextHostControlService.h
index 5178107f..67b075c5 100644
--- a/include/cru/ui/controls/TextHostControlService.h
+++ b/include/cru/ui/controls/TextHostControlService.h
@@ -1,6 +1,7 @@
 #pragma once
 #include "Base.h"
 
+#include "../render/TextRenderObject.h"
 #include "cru/platform/gui/InputMethod.h"
 #include "cru/platform/gui/TimerHelper.h"
 #include "cru/platform/gui/UiApplication.h"