...

2 files changed, 2 insertions, 5 deletions

diff --git a/include/cru/ui/controls/LayoutControl.h b/include/cru/ui/controls/LayoutControl.h
index 78cc4806..54407a3f 100644
--- a/include/cru/ui/controls/LayoutControl.h
+++ b/include/cru/ui/controls/LayoutControl.h
@@ -67,16 +67,16 @@ class LayoutControl : public Control {
     if (position < 0 || position >= children_.size()) return;
     auto child = children_[position];
     children_.erase(children_.begin() + position);
-    child->SetParent(nullptr);
     container_render_object_->RemoveChild(position);
+    child->SetParent(nullptr);
   }
 
   void ClearChildren() {
+    container_render_object_->ClearChildren();
     for (auto child : children_) {
       child->SetParent(nullptr);
     }
     children_.clear();
-    container_render_object_->ClearChildren();
   }
 
   const typename TRenderObject::ChildLayoutData& GetChildLayoutData(
diff --git a/src/theme_builder/components/StyleRuleSetEditor.cpp b/src/theme_builder/components/StyleRuleSetEditor.cpp
index bc28a462..89ab4efb 100644
--- a/src/theme_builder/components/StyleRuleSetEditor.cpp
+++ b/src/theme_builder/components/StyleRuleSetEditor.cpp
@@ -1,7 +1,4 @@
 #include "StyleRuleSetEditor.h"
-#include <algorithm>
-#include <memory>
-#include <optional>
 #include "cru/common/Exception.h"
 #include "cru/common/String.h"
 #include "cru/ui/DeleteLater.h"