3 files changed, 3 insertions, 9 deletions
diff --git a/include/cru/ui/components/Component.h b/include/cru/ui/components/Component.h
index d44e6728..627e2d3c 100644
--- a/include/cru/ui/components/Component.h
+++ b/include/cru/ui/components/Component.h
@@ -1,7 +1,6 @@
 #pragma once
 #include "../Base.h"
 #include "../DeleteLater.h"
-#include "cru/base/SelfResolvable.h"
 
 namespace cru::ui::components {
 /**
@@ -9,9 +8,7 @@ namespace cru::ui::components {
  * \remarks Component should respect children's Component::IsDeleteByParent
  * value and decide whether to delete it.
  */
-class CRU_UI_API Component : public Object,
-                             public SelfResolvable<Component>,
-                             public DeleteLaterImpl {
+class CRU_UI_API Component : public Object, public DeleteLaterImpl {
  public:
   Component() = default;
   ~Component() = default;
diff --git a/include/cru/ui/controls/Control.h b/include/cru/ui/controls/Control.h
index d70854fe..77f5f392 100644
--- a/include/cru/ui/controls/Control.h
+++ b/include/cru/ui/controls/Control.h
@@ -4,7 +4,6 @@
 #include "../events/UiEvents.h"
 #include "../render/RenderObject.h"
 #include "../style/StyleRuleSet.h"
-#include "cru/base/SelfResolvable.h"
 #include "cru/ui/render/MeasureRequirement.h"
 
 namespace cru::ui::controls {
@@ -18,9 +17,7 @@ namespace cru::ui::controls {
  *  - RemoveChild(Control* child)
  * The last two methods are totally for convenient control tree management.
  */
-class CRU_UI_API Control : public Object,
-                           public SelfResolvable<Control>,
-                           public DeleteLaterImpl {
+class CRU_UI_API Control : public Object, public DeleteLaterImpl {
   friend class RootControl;
 
   CRU_DEFINE_CLASS_LOG_TAG("Control")
diff --git a/include/cru/ui/host/WindowHost.h b/include/cru/ui/host/WindowHost.h
index 58fd120d..13b06b07 100644
--- a/include/cru/ui/host/WindowHost.h
+++ b/include/cru/ui/host/WindowHost.h
@@ -16,7 +16,7 @@ class LayoutPaintCycler;
 struct AfterLayoutEventArgs {};
 
 // The bridge between control tree and native window.
-class CRU_UI_API WindowHost : public Object, public SelfResolvable<WindowHost> {
+class CRU_UI_API WindowHost : public Object {
   friend controls::Control;
   CRU_DEFINE_CLASS_LOG_TAG("WindowHost")