...

77 files changed, 237 insertions, 237 deletions

diff --git a/include/cru/ui/Base.hpp b/include/cru/ui/Base.h
index e99c956f..44f76907 100644
--- a/include/cru/ui/Base.hpp
+++ b/include/cru/ui/Base.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "cru/common/Base.hpp"
-#include "cru/platform/graphics/Base.hpp"
-#include "cru/platform/gui/Base.hpp"
+#include "cru/common/Base.h"
+#include "cru/platform/graphics/Base.h"
+#include "cru/platform/gui/Base.h"
 
 #include <functional>
 #include <memory>
diff --git a/include/cru/ui/DebugFlags.hpp b/include/cru/ui/DebugFlags.h
index 71d2c03e..71d2c03e 100644
--- a/include/cru/ui/DebugFlags.hpp
+++ b/include/cru/ui/DebugFlags.h
diff --git a/include/cru/ui/ThemeManager.hpp b/include/cru/ui/ThemeManager.h
index 68c2b121..9176d85e 100644
--- a/include/cru/ui/ThemeManager.hpp
+++ b/include/cru/ui/ThemeManager.h
@@ -1,12 +1,12 @@
 #pragma once
-#include "Base.hpp"
-#include "cru/common/Base.hpp"
-#include "cru/common/Event.hpp"
-#include "cru/common/Exception.hpp"
-#include "cru/platform/graphics/Brush.hpp"
-#include "cru/ui/mapper/MapperRegistry.hpp"
-#include "cru/ui/style/StyleRuleSet.hpp"
-#include "cru/xml/XmlNode.hpp"
+#include "Base.h"
+#include "cru/common/Base.h"
+#include "cru/common/Event.h"
+#include "cru/common/Exception.h"
+#include "cru/platform/graphics/Brush.h"
+#include "cru/ui/mapper/MapperRegistry.h"
+#include "cru/ui/style/StyleRuleSet.h"
+#include "cru/xml/XmlNode.h"
 
 #include <any>
 #include <typeindex>
diff --git a/include/cru/ui/components/Component.hpp b/include/cru/ui/components/Component.h
index 4cbc3791..0b871dc4 100644
--- a/include/cru/ui/components/Component.hpp
+++ b/include/cru/ui/components/Component.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "../Base.hpp"
+#include "../Base.h"
 
 namespace cru::ui::components {
 // In destructor, component should check all owned controls whether it is
diff --git a/include/cru/ui/components/Menu.hpp b/include/cru/ui/components/Menu.h
index 9b60eb02..32936f84 100644
--- a/include/cru/ui/components/Menu.hpp
+++ b/include/cru/ui/components/Menu.h
@@ -1,11 +1,11 @@
 #pragma once
-#include "Component.hpp"
-#include "cru/common/Base.hpp"
-#include "cru/ui/controls/Button.hpp"
-#include "cru/ui/controls/Control.hpp"
-#include "cru/ui/controls/FlexLayout.hpp"
-#include "cru/ui/controls/Popup.hpp"
-#include "cru/ui/controls/TextBlock.hpp"
+#include "Component.h"
+#include "cru/common/Base.h"
+#include "cru/ui/controls/Button.h"
+#include "cru/ui/controls/Control.h"
+#include "cru/ui/controls/FlexLayout.h"
+#include "cru/ui/controls/Popup.h"
+#include "cru/ui/controls/TextBlock.h"
 
 #include <functional>
 #include <vector>
diff --git a/include/cru/ui/controls/Base.hpp b/include/cru/ui/controls/Base.h
index 7c85cdb2..21f1c563 100644
--- a/include/cru/ui/controls/Base.hpp
+++ b/include/cru/ui/controls/Base.h
@@ -1,4 +1,4 @@
 #pragma once
-#include "../Base.hpp"
+#include "../Base.h"
 
 namespace cru::ui::controls {}  // namespace cru::ui::controls
diff --git a/include/cru/ui/controls/Button.hpp b/include/cru/ui/controls/Button.h
index 77e0989c..ab1ef8eb 100644
--- a/include/cru/ui/controls/Button.hpp
+++ b/include/cru/ui/controls/Button.h
@@ -1,11 +1,11 @@
 #pragma once
-#include "ContentControl.hpp"
+#include "ContentControl.h"
 
-#include "../helper/ClickDetector.hpp"
-#include "IBorderControl.hpp"
-#include "IClickableControl.hpp"
-#include "cru/common/Event.hpp"
-#include "cru/ui/style/ApplyBorderStyleInfo.hpp"
+#include "../helper/ClickDetector.h"
+#include "IBorderControl.h"
+#include "IClickableControl.h"
+#include "cru/common/Event.h"
+#include "cru/ui/style/ApplyBorderStyleInfo.h"
 
 namespace cru::ui::controls {
 class CRU_UI_API Button : public ContentControl,
diff --git a/include/cru/ui/controls/Container.hpp b/include/cru/ui/controls/Container.h
index 4385c23f..f250807d 100644
--- a/include/cru/ui/controls/Container.hpp
+++ b/include/cru/ui/controls/Container.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "ContentControl.hpp"
+#include "ContentControl.h"
 
 namespace cru::ui::controls {
 class CRU_UI_API Container : public ContentControl {
diff --git a/include/cru/ui/controls/ContentControl.hpp b/include/cru/ui/controls/ContentControl.h
index 7b40de64..86e90dae 100644
--- a/include/cru/ui/controls/ContentControl.hpp
+++ b/include/cru/ui/controls/ContentControl.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "Control.hpp"
+#include "Control.h"
 
-#include "cru/ui/render/RenderObject.hpp"
+#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.hpp b/include/cru/ui/controls/Control.h
index c51643be..c00e3a65 100644
--- a/include/cru/ui/controls/Control.hpp
+++ b/include/cru/ui/controls/Control.h
@@ -1,9 +1,9 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
-#include "../events/UiEvents.hpp"
-#include "../render/Base.hpp"
-#include "cru/common/Event.hpp"
+#include "../events/UiEvents.h"
+#include "../render/Base.h"
+#include "cru/common/Event.h"
 
 #include <string_view>
 
diff --git a/include/cru/ui/controls/FlexLayout.hpp b/include/cru/ui/controls/FlexLayout.h
index 7724c4c6..1255b119 100644
--- a/include/cru/ui/controls/FlexLayout.hpp
+++ b/include/cru/ui/controls/FlexLayout.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "LayoutControl.hpp"
+#include "LayoutControl.h"
 
 namespace cru::ui::controls {
 class CRU_UI_API FlexLayout : public LayoutControl {
diff --git a/include/cru/ui/controls/IBorderControl.hpp b/include/cru/ui/controls/IBorderControl.h
index a8bc0b51..3178d7f2 100644
--- a/include/cru/ui/controls/IBorderControl.hpp
+++ b/include/cru/ui/controls/IBorderControl.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "../style/ApplyBorderStyleInfo.hpp"
-#include "Base.hpp"
-#include "cru/common/Base.hpp"
+#include "../style/ApplyBorderStyleInfo.h"
+#include "Base.h"
+#include "cru/common/Base.h"
 
 namespace cru::ui::controls {
 struct CRU_UI_API IBorderControl : virtual Interface {
diff --git a/include/cru/ui/controls/IClickableControl.hpp b/include/cru/ui/controls/IClickableControl.h
index af9ae100..48b3ad5f 100644
--- a/include/cru/ui/controls/IClickableControl.hpp
+++ b/include/cru/ui/controls/IClickableControl.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
-#include "cru/common/Event.hpp"
-#include "cru/ui/helper/ClickDetector.hpp"
+#include "cru/common/Event.h"
+#include "cru/ui/helper/ClickDetector.h"
 
 namespace cru::ui::controls {
 struct CRU_UI_API IClickableControl : virtual Interface {
diff --git a/include/cru/ui/controls/LayoutControl.hpp b/include/cru/ui/controls/LayoutControl.h
index 3999e9bc..639ecc74 100644
--- a/include/cru/ui/controls/LayoutControl.hpp
+++ b/include/cru/ui/controls/LayoutControl.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Control.hpp"
+#include "Control.h"
 
 namespace cru::ui::controls {
 class CRU_UI_API LayoutControl : public Control {
diff --git a/include/cru/ui/controls/NoChildControl.hpp b/include/cru/ui/controls/NoChildControl.h
index 0c432532..6d2168cb 100644
--- a/include/cru/ui/controls/NoChildControl.hpp
+++ b/include/cru/ui/controls/NoChildControl.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Control.hpp"
+#include "Control.h"
 
 namespace cru::ui::controls {
 class CRU_UI_API NoChildControl : public Control {
diff --git a/include/cru/ui/controls/Popup.hpp b/include/cru/ui/controls/Popup.h
index 4076e45b..271ad4b7 100644
--- a/include/cru/ui/controls/Popup.hpp
+++ b/include/cru/ui/controls/Popup.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "RootControl.hpp"
+#include "RootControl.h"
 
-#include "cru/platform/gui/Base.hpp"
+#include "cru/platform/gui/Base.h"
 
 #include <memory>
 
diff --git a/include/cru/ui/controls/RootControl.hpp b/include/cru/ui/controls/RootControl.h
index f70f2eeb..c7ed916a 100644
--- a/include/cru/ui/controls/RootControl.hpp
+++ b/include/cru/ui/controls/RootControl.h
@@ -1,12 +1,12 @@
 #pragma once
-#include "LayoutControl.hpp"
-
-#include "cru/common/Base.hpp"
-#include "cru/common/Event.hpp"
-#include "cru/platform/gui/Base.hpp"
-#include "cru/platform/gui/Window.hpp"
-#include "cru/ui/Base.hpp"
-#include "cru/ui/host/WindowHost.hpp"
+#include "LayoutControl.h"
+
+#include "cru/common/Base.h"
+#include "cru/common/Event.h"
+#include "cru/platform/gui/Base.h"
+#include "cru/platform/gui/Window.h"
+#include "cru/ui/Base.h"
+#include "cru/ui/host/WindowHost.h"
 
 namespace cru::ui::controls {
 class CRU_UI_API RootControl : public LayoutControl {
diff --git a/include/cru/ui/controls/ScrollView.hpp b/include/cru/ui/controls/ScrollView.h
index 18a9bf97..46c23691 100644
--- a/include/cru/ui/controls/ScrollView.hpp
+++ b/include/cru/ui/controls/ScrollView.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "ContentControl.hpp"
-#include "cru/common/Base.hpp"
-#include "cru/ui/render/RenderObject.hpp"
-#include "cru/ui/render/ScrollRenderObject.hpp"
+#include "ContentControl.h"
+#include "cru/common/Base.h"
+#include "cru/ui/render/RenderObject.h"
+#include "cru/ui/render/ScrollRenderObject.h"
 
 #include <memory>
 #include <string_view>
diff --git a/include/cru/ui/controls/StackLayout.hpp b/include/cru/ui/controls/StackLayout.h
index 5d90dfda..36e8ab43 100644
--- a/include/cru/ui/controls/StackLayout.hpp
+++ b/include/cru/ui/controls/StackLayout.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "LayoutControl.hpp"
-#include "cru/ui/Base.hpp"
+#include "LayoutControl.h"
+#include "cru/ui/Base.h"
 
 namespace cru::ui::controls {
 class CRU_UI_API StackLayout : public LayoutControl {
diff --git a/include/cru/ui/controls/TextBlock.hpp b/include/cru/ui/controls/TextBlock.h
index 68e9ced1..5e5674a2 100644
--- a/include/cru/ui/controls/TextBlock.hpp
+++ b/include/cru/ui/controls/TextBlock.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "NoChildControl.hpp"
+#include "NoChildControl.h"
 
-#include "TextHostControlService.hpp"
+#include "TextHostControlService.h"
 
 namespace cru::ui::controls {
 class CRU_UI_API TextBlock : public NoChildControl, public virtual ITextHostControl {
diff --git a/include/cru/ui/controls/TextBox.hpp b/include/cru/ui/controls/TextBox.h
index 241a8a16..2ed7db5e 100644
--- a/include/cru/ui/controls/TextBox.hpp
+++ b/include/cru/ui/controls/TextBox.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "NoChildControl.hpp"
+#include "NoChildControl.h"
 
-#include "IBorderControl.hpp"
-#include "TextHostControlService.hpp"
+#include "IBorderControl.h"
+#include "TextHostControlService.h"
 
 #include <memory>
 
diff --git a/include/cru/ui/controls/TextHostControlService.hpp b/include/cru/ui/controls/TextHostControlService.h
index be6a7c39..5178107f 100644
--- a/include/cru/ui/controls/TextHostControlService.hpp
+++ b/include/cru/ui/controls/TextHostControlService.h
@@ -1,11 +1,11 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
-#include "cru/platform/gui/InputMethod.hpp"
-#include "cru/platform/gui/TimerHelper.hpp"
-#include "cru/platform/gui/UiApplication.hpp"
-#include "cru/ui/controls/Control.hpp"
-#include "cru/ui/helper/ShortcutHub.hpp"
+#include "cru/platform/gui/InputMethod.h"
+#include "cru/platform/gui/TimerHelper.h"
+#include "cru/platform/gui/UiApplication.h"
+#include "cru/ui/controls/Control.h"
+#include "cru/ui/helper/ShortcutHub.h"
 
 #include <functional>
 #include <vector>
diff --git a/include/cru/ui/controls/Window.hpp b/include/cru/ui/controls/Window.h
index c304a839..5fb6d594 100644
--- a/include/cru/ui/controls/Window.hpp
+++ b/include/cru/ui/controls/Window.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "cru/platform/gui/Base.hpp"
-#include "cru/ui/controls/RootControl.hpp"
+#include "cru/platform/gui/Base.h"
+#include "cru/ui/controls/RootControl.h"
 
-#include "cru/common/Base.hpp"
+#include "cru/common/Base.h"
 
 namespace cru::ui::controls {
 class CRU_UI_API Window final : public RootControl {
diff --git a/include/cru/ui/events/FocusChangeEventArgs.hpp b/include/cru/ui/events/FocusChangeEventArgs.h
index b72790a5..aaef25b4 100644
--- a/include/cru/ui/events/FocusChangeEventArgs.hpp
+++ b/include/cru/ui/events/FocusChangeEventArgs.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "UiEventArgs.hpp"
+#include "UiEventArgs.h"
 
 namespace cru::ui::events {
 
diff --git a/include/cru/ui/events/KeyEventArgs.hpp b/include/cru/ui/events/KeyEventArgs.h
index 133db1df..0ece9126 100644
--- a/include/cru/ui/events/KeyEventArgs.hpp
+++ b/include/cru/ui/events/KeyEventArgs.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "UiEventArgs.hpp"
+#include "UiEventArgs.h"
 
-#include "cru/platform/gui/Keyboard.hpp"
+#include "cru/platform/gui/Keyboard.h"
 
 namespace cru::ui::events {
 class CRU_UI_API KeyEventArgs : public UiEventArgs {
diff --git a/include/cru/ui/events/MouseButtonEventArgs.hpp b/include/cru/ui/events/MouseButtonEventArgs.h
index 791ed03b..13b3b0a4 100644
--- a/include/cru/ui/events/MouseButtonEventArgs.hpp
+++ b/include/cru/ui/events/MouseButtonEventArgs.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "MouseEventArgs.hpp"
+#include "MouseEventArgs.h"
 
-#include "cru/platform/gui/Keyboard.hpp"
+#include "cru/platform/gui/Keyboard.h"
 
 namespace cru::ui::events {
 
diff --git a/include/cru/ui/events/MouseEventArgs.hpp b/include/cru/ui/events/MouseEventArgs.h
index 0adc65b6..11ce6463 100644
--- a/include/cru/ui/events/MouseEventArgs.hpp
+++ b/include/cru/ui/events/MouseEventArgs.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "UiEventArgs.hpp"
+#include "UiEventArgs.h"
 
 #include <optional>
 
diff --git a/include/cru/ui/events/MouseWheelEventArgs.hpp b/include/cru/ui/events/MouseWheelEventArgs.h
index c6c0fe10..85791491 100644
--- a/include/cru/ui/events/MouseWheelEventArgs.hpp
+++ b/include/cru/ui/events/MouseWheelEventArgs.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "MouseEventArgs.hpp"
+#include "MouseEventArgs.h"
 
-#include "cru/platform/gui/Keyboard.hpp"
+#include "cru/platform/gui/Keyboard.h"
 
 namespace cru::ui::events {
 class CRU_UI_API MouseWheelEventArgs : public MouseEventArgs {
diff --git a/include/cru/ui/events/PaintEventArgs.hpp b/include/cru/ui/events/PaintEventArgs.h
index f2b53977..934c6c8c 100644
--- a/include/cru/ui/events/PaintEventArgs.hpp
+++ b/include/cru/ui/events/PaintEventArgs.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "UiEventArgs.hpp"
+#include "UiEventArgs.h"
 
 namespace cru::platform::graphics {
 struct IPainter;
diff --git a/include/cru/ui/events/RoutedEvent.hpp b/include/cru/ui/events/RoutedEvent.h
index dd0bc21f..909678f8 100644
--- a/include/cru/ui/events/RoutedEvent.hpp
+++ b/include/cru/ui/events/RoutedEvent.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "UiEventArgs.hpp"
+#include "UiEventArgs.h"
 
-#include "cru/common/Event.hpp"
+#include "cru/common/Event.h"
 
 namespace cru::ui::events {
 // TEventArgs must not be a reference type. This class help add reference.
diff --git a/include/cru/ui/events/UiEventArgs.hpp b/include/cru/ui/events/UiEventArgs.h
index 1e1f9e93..fff84edd 100644
--- a/include/cru/ui/events/UiEventArgs.hpp
+++ b/include/cru/ui/events/UiEventArgs.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "../Base.hpp"
+#include "../Base.h"
 
 namespace cru::ui::events {
 class CRU_UI_API UiEventArgs : public Object {
diff --git a/include/cru/ui/events/UiEvents.h b/include/cru/ui/events/UiEvents.h
new file mode 100644
index 00000000..301ec694
--- /dev/null
+++ b/include/cru/ui/events/UiEvents.h
@@ -0,0 +1,10 @@
+#pragma once
+
+#include "FocusChangeEventArgs.h"
+#include "KeyEventArgs.h"
+#include "MouseButtonEventArgs.h"
+#include "MouseEventArgs.h"
+#include "MouseWheelEventArgs.h"
+#include "PaintEventArgs.h"
+#include "RoutedEvent.h"
+#include "UiEventArgs.h"
diff --git a/include/cru/ui/events/UiEvents.hpp b/include/cru/ui/events/UiEvents.hpp
deleted file mode 100644
index bd6f7d2a..00000000
--- a/include/cru/ui/events/UiEvents.hpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-#include "FocusChangeEventArgs.hpp"
-#include "KeyEventArgs.hpp"
-#include "MouseButtonEventArgs.hpp"
-#include "MouseEventArgs.hpp"
-#include "MouseWheelEventArgs.hpp"
-#include "PaintEventArgs.hpp"
-#include "RoutedEvent.hpp"
-#include "UiEventArgs.hpp"
diff --git a/include/cru/ui/helper/ClickDetector.hpp b/include/cru/ui/helper/ClickDetector.h
index fd80a953..6e30aaf0 100644
--- a/include/cru/ui/helper/ClickDetector.hpp
+++ b/include/cru/ui/helper/ClickDetector.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "../controls/Control.hpp"
+#include "../controls/Control.h"
 
 namespace cru::ui::helper {
 class CRU_UI_API ClickEventArgs : Object {
diff --git a/include/cru/ui/helper/ShortcutHub.hpp b/include/cru/ui/helper/ShortcutHub.h
index c7054786..84e786aa 100644
--- a/include/cru/ui/helper/ShortcutHub.hpp
+++ b/include/cru/ui/helper/ShortcutHub.h
@@ -1,9 +1,9 @@
 #pragma once
-#include "../Base.hpp"
+#include "../Base.h"
 
-#include "../events/UiEvents.hpp"
-#include "cru/common/Event.hpp"
-#include "cru/platform/gui/Keyboard.hpp"
+#include "../events/UiEvents.h"
+#include "cru/common/Event.h"
+#include "cru/platform/gui/Keyboard.h"
 
 #include <cstddef>
 #include <functional>
diff --git a/include/cru/ui/host/LayoutPaintCycler.hpp b/include/cru/ui/host/LayoutPaintCycler.h
index 1d44ad06..e95ed81d 100644
--- a/include/cru/ui/host/LayoutPaintCycler.hpp
+++ b/include/cru/ui/host/LayoutPaintCycler.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "../Base.hpp"
+#include "../Base.h"
 
-#include "cru/platform/gui/TimerHelper.hpp"
-#include "cru/platform/gui/UiApplication.hpp"
+#include "cru/platform/gui/TimerHelper.h"
+#include "cru/platform/gui/UiApplication.h"
 
 #include <chrono>
 
diff --git a/include/cru/ui/host/WindowHost.hpp b/include/cru/ui/host/WindowHost.h
index 7832174c..caa50397 100644
--- a/include/cru/ui/host/WindowHost.hpp
+++ b/include/cru/ui/host/WindowHost.h
@@ -1,11 +1,11 @@
 #pragma once
-#include "../Base.hpp"
+#include "../Base.h"
 
-#include "../render/Base.hpp"
-#include "cru/common/Event.hpp"
-#include "cru/platform/gui/Cursor.hpp"
-#include "cru/platform/gui/UiApplication.hpp"
-#include "cru/platform/gui/Window.hpp"
+#include "../render/Base.h"
+#include "cru/common/Event.h"
+#include "cru/platform/gui/Cursor.h"
+#include "cru/platform/gui/UiApplication.h"
+#include "cru/platform/gui/Window.h"
 
 #include <functional>
 #include <memory>
diff --git a/include/cru/ui/mapper/BorderStyleMapper.hpp b/include/cru/ui/mapper/BorderStyleMapper.h
index 7a574f38..d585639f 100644
--- a/include/cru/ui/mapper/BorderStyleMapper.hpp
+++ b/include/cru/ui/mapper/BorderStyleMapper.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "Mapper.hpp"
-#include "cru/ui/style/ApplyBorderStyleInfo.hpp"
-#include "cru/xml/XmlNode.hpp"
+#include "Mapper.h"
+#include "cru/ui/style/ApplyBorderStyleInfo.h"
+#include "cru/xml/XmlNode.h"
 
 namespace cru::ui::mapper {
 class CRU_UI_API BorderStyleMapper
diff --git a/include/cru/ui/mapper/BrushMapper.hpp b/include/cru/ui/mapper/BrushMapper.h
index b2021076..be70e89e 100644
--- a/include/cru/ui/mapper/BrushMapper.hpp
+++ b/include/cru/ui/mapper/BrushMapper.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "Mapper.hpp"
-#include "cru/common/Base.hpp"
-#include "cru/platform/graphics/Brush.hpp"
-#include "cru/xml/XmlNode.hpp"
+#include "Mapper.h"
+#include "cru/common/Base.h"
+#include "cru/platform/graphics/Brush.h"
+#include "cru/xml/XmlNode.h"
 
 namespace cru::ui::mapper {
 class BrushMapper : public BasicRefMapper<platform::graphics::IBrush> {
diff --git a/include/cru/ui/mapper/ColorMapper.hpp b/include/cru/ui/mapper/ColorMapper.h
index d96ca74b..785f1ca9 100644
--- a/include/cru/ui/mapper/ColorMapper.hpp
+++ b/include/cru/ui/mapper/ColorMapper.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "Mapper.hpp"
-#include "cru/xml/XmlNode.hpp"
+#include "Mapper.h"
+#include "cru/xml/XmlNode.h"
 
 namespace cru::ui::mapper {
 class CRU_UI_API ColorMapper : public BasicMapper<Color> {
diff --git a/include/cru/ui/mapper/CornerRadiusMapper.hpp b/include/cru/ui/mapper/CornerRadiusMapper.h
index 4d83f2de..b8998a1b 100644
--- a/include/cru/ui/mapper/CornerRadiusMapper.hpp
+++ b/include/cru/ui/mapper/CornerRadiusMapper.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Mapper.hpp"
+#include "Mapper.h"
 
 namespace cru::ui::mapper {
 class CRU_UI_API CornerRadiusMapper : public BasicMapper<CornerRadius> {
diff --git a/include/cru/ui/mapper/CursorMapper.hpp b/include/cru/ui/mapper/CursorMapper.h
index 6cb61d87..d98a798c 100644
--- a/include/cru/ui/mapper/CursorMapper.hpp
+++ b/include/cru/ui/mapper/CursorMapper.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "Mapper.hpp"
-#include "cru/platform/gui/Cursor.hpp"
-#include "cru/xml/XmlNode.hpp"
+#include "Mapper.h"
+#include "cru/platform/gui/Cursor.h"
+#include "cru/xml/XmlNode.h"
 
 namespace cru::ui::mapper {
 class CRU_UI_API CursorMapper : public BasicRefMapper<platform::gui::ICursor> {
diff --git a/include/cru/ui/mapper/FontMapper.hpp b/include/cru/ui/mapper/FontMapper.h
index ad8c43b5..545b94d8 100644
--- a/include/cru/ui/mapper/FontMapper.hpp
+++ b/include/cru/ui/mapper/FontMapper.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "Mapper.hpp"
-#include "cru/common/Base.hpp"
-#include "cru/platform/graphics/Font.hpp"
+#include "Mapper.h"
+#include "cru/common/Base.h"
+#include "cru/platform/graphics/Font.h"
 
 namespace cru::ui::mapper {
 class FontMapper : public BasicRefMapper<platform::graphics::IFont> {
diff --git a/include/cru/ui/mapper/Mapper.hpp b/include/cru/ui/mapper/Mapper.h
index c52bec70..fa7f8cef 100644
--- a/include/cru/ui/mapper/Mapper.hpp
+++ b/include/cru/ui/mapper/Mapper.h
@@ -1,9 +1,9 @@
 #pragma once
-#include "../Base.hpp"
+#include "../Base.h"
 
-#include "cru/common/ClonablePtr.hpp"
-#include "cru/common/Exception.hpp"
-#include "cru/xml/XmlNode.hpp"
+#include "cru/common/ClonablePtr.h"
+#include "cru/common/Exception.h"
+#include "cru/xml/XmlNode.h"
 
 #include <memory>
 #include <type_traits>
diff --git a/include/cru/ui/mapper/MapperRegistry.hpp b/include/cru/ui/mapper/MapperRegistry.h
index 1c02be49..29d26156 100644
--- a/include/cru/ui/mapper/MapperRegistry.hpp
+++ b/include/cru/ui/mapper/MapperRegistry.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Mapper.hpp"
+#include "Mapper.h"
 
 #include <memory>
 #include <vector>
diff --git a/include/cru/ui/mapper/PointMapper.hpp b/include/cru/ui/mapper/PointMapper.h
index b1837fe1..83dd135b 100644
--- a/include/cru/ui/mapper/PointMapper.hpp
+++ b/include/cru/ui/mapper/PointMapper.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Mapper.hpp"
+#include "Mapper.h"
 
 namespace cru::ui::mapper {
 class CRU_UI_API PointMapper : public BasicMapper<Point> {
diff --git a/include/cru/ui/mapper/SizeMapper.hpp b/include/cru/ui/mapper/SizeMapper.h
index 6ab4b97d..6cf3eb9a 100644
--- a/include/cru/ui/mapper/SizeMapper.hpp
+++ b/include/cru/ui/mapper/SizeMapper.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Mapper.hpp"
+#include "Mapper.h"
 
 namespace cru::ui::mapper {
 class CRU_UI_API SizeMapper : public BasicMapper<Size> {
diff --git a/include/cru/ui/mapper/ThicknessMapper.hpp b/include/cru/ui/mapper/ThicknessMapper.h
index 4ffbeb9b..10f6c87e 100644
--- a/include/cru/ui/mapper/ThicknessMapper.hpp
+++ b/include/cru/ui/mapper/ThicknessMapper.h
@@ -1,9 +1,9 @@
 #pragma once
-#include "Mapper.hpp"
+#include "Mapper.h"
 
-#include "../Base.hpp"
-#include "cru/common/Base.hpp"
-#include "cru/xml/XmlNode.hpp"
+#include "../Base.h"
+#include "cru/common/Base.h"
+#include "cru/xml/XmlNode.h"
 
 namespace cru::ui::mapper {
 class CRU_UI_API ThicknessMapper : public BasicMapper<Thickness> {
diff --git a/include/cru/ui/mapper/style/AndConditionMapper.hpp b/include/cru/ui/mapper/style/AndConditionMapper.h
index 747e496d..142637a7 100644
--- a/include/cru/ui/mapper/style/AndConditionMapper.hpp
+++ b/include/cru/ui/mapper/style/AndConditionMapper.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "../Mapper.hpp"
-#include "IConditionMapper.hpp"
+#include "../Mapper.h"
+#include "IConditionMapper.h"
 
 namespace cru::ui::mapper::style {
 class CRU_UI_API AndConditionMapper
diff --git a/include/cru/ui/mapper/style/BorderStylerMapper.hpp b/include/cru/ui/mapper/style/BorderStylerMapper.h
index 2f48550c..da09989b 100644
--- a/include/cru/ui/mapper/style/BorderStylerMapper.hpp
+++ b/include/cru/ui/mapper/style/BorderStylerMapper.h
@@ -1,9 +1,9 @@
 #pragma once
-#include "../Mapper.hpp"
-#include "cru/common/ClonablePtr.hpp"
-#include "cru/ui/mapper/style/IStylerMapper.hpp"
-#include "cru/ui/style/Styler.hpp"
-#include "cru/xml/XmlNode.hpp"
+#include "../Mapper.h"
+#include "cru/common/ClonablePtr.h"
+#include "cru/ui/mapper/style/IStylerMapper.h"
+#include "cru/ui/style/Styler.h"
+#include "cru/xml/XmlNode.h"
 
 namespace cru::ui::mapper::style {
 class CRU_UI_API BorderStylerMapper
diff --git a/include/cru/ui/mapper/style/ClickStateConditionMapper.hpp b/include/cru/ui/mapper/style/ClickStateConditionMapper.h
index 63577641..0c25646c 100644
--- a/include/cru/ui/mapper/style/ClickStateConditionMapper.hpp
+++ b/include/cru/ui/mapper/style/ClickStateConditionMapper.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "../Mapper.hpp"
-#include "IConditionMapper.hpp"
-#include "cru/ui/style/Condition.hpp"
+#include "../Mapper.h"
+#include "IConditionMapper.h"
+#include "cru/ui/style/Condition.h"
 
 namespace cru::ui::mapper::style {
 class CRU_UI_API ClickStateConditionMapper
diff --git a/include/cru/ui/mapper/style/CursorStylerMapper.hpp b/include/cru/ui/mapper/style/CursorStylerMapper.h
index 2b0c62a8..37c3ade9 100644
--- a/include/cru/ui/mapper/style/CursorStylerMapper.hpp
+++ b/include/cru/ui/mapper/style/CursorStylerMapper.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "../Mapper.hpp"
-#include "cru/ui/mapper/style/IStylerMapper.hpp"
-#include "cru/ui/style/Styler.hpp"
+#include "../Mapper.h"
+#include "cru/ui/mapper/style/IStylerMapper.h"
+#include "cru/ui/style/Styler.h"
 
 namespace cru::ui::mapper::style {
 class CRU_UI_API CursorStylerMapper
diff --git a/include/cru/ui/mapper/style/FocusConditionMapper.hpp b/include/cru/ui/mapper/style/FocusConditionMapper.h
index 00809850..bc7264d1 100644
--- a/include/cru/ui/mapper/style/FocusConditionMapper.hpp
+++ b/include/cru/ui/mapper/style/FocusConditionMapper.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "../Mapper.hpp"
-#include "IConditionMapper.hpp"
-#include "cru/ui/style/Condition.hpp"
+#include "../Mapper.h"
+#include "IConditionMapper.h"
+#include "cru/ui/style/Condition.h"
 
 namespace cru::ui::mapper::style {
 class CRU_UI_API FocusConditionMapper
diff --git a/include/cru/ui/mapper/style/HoverConditionMapper.hpp b/include/cru/ui/mapper/style/HoverConditionMapper.h
index bbd840f0..c897f672 100644
--- a/include/cru/ui/mapper/style/HoverConditionMapper.hpp
+++ b/include/cru/ui/mapper/style/HoverConditionMapper.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "../Mapper.hpp"
-#include "IConditionMapper.hpp"
-#include "cru/ui/style/Condition.hpp"
+#include "../Mapper.h"
+#include "IConditionMapper.h"
+#include "cru/ui/style/Condition.h"
 
 namespace cru::ui::mapper::style {
 class CRU_UI_API HoverConditionMapper
diff --git a/include/cru/ui/mapper/style/IConditionMapper.hpp b/include/cru/ui/mapper/style/IConditionMapper.h
index 3fa7d10a..7610dc8d 100644
--- a/include/cru/ui/mapper/style/IConditionMapper.hpp
+++ b/include/cru/ui/mapper/style/IConditionMapper.h
@@ -1,9 +1,9 @@
 #pragma once
-#include "../../Base.hpp"
-#include "cru/common/ClonablePtr.hpp"
-#include "cru/ui/mapper/Mapper.hpp"
-#include "cru/ui/style/Condition.hpp"
-#include "cru/xml/XmlNode.hpp"
+#include "../../Base.h"
+#include "cru/common/ClonablePtr.h"
+#include "cru/ui/mapper/Mapper.h"
+#include "cru/ui/style/Condition.h"
+#include "cru/xml/XmlNode.h"
 
 namespace cru::ui::mapper::style {
 struct CRU_UI_API IConditionMapper : virtual Interface {
diff --git a/include/cru/ui/mapper/style/IStylerMapper.hpp b/include/cru/ui/mapper/style/IStylerMapper.h
index d00f39be..4c2ecd16 100644
--- a/include/cru/ui/mapper/style/IStylerMapper.hpp
+++ b/include/cru/ui/mapper/style/IStylerMapper.h
@@ -1,9 +1,9 @@
 #pragma once
-#include "../../Base.hpp"
-#include "cru/common/ClonablePtr.hpp"
-#include "cru/ui/mapper/Mapper.hpp"
-#include "cru/ui/style/Styler.hpp"
-#include "cru/xml/XmlNode.hpp"
+#include "../../Base.h"
+#include "cru/common/ClonablePtr.h"
+#include "cru/ui/mapper/Mapper.h"
+#include "cru/ui/style/Styler.h"
+#include "cru/xml/XmlNode.h"
 
 namespace cru::ui::mapper::style {
 struct CRU_UI_API IStylerMapper : virtual Interface {
diff --git a/include/cru/ui/mapper/style/NoConditionMapper.hpp b/include/cru/ui/mapper/style/NoConditionMapper.h
index ed3a9699..bc7ce623 100644
--- a/include/cru/ui/mapper/style/NoConditionMapper.hpp
+++ b/include/cru/ui/mapper/style/NoConditionMapper.h
@@ -1,10 +1,10 @@
 #pragma once
-#include "../Mapper.hpp"
-#include "IConditionMapper.hpp"
-#include "cru/common/Base.hpp"
-#include "cru/common/ClonablePtr.hpp"
-#include "cru/ui/style/Condition.hpp"
-#include "cru/xml/XmlNode.hpp"
+#include "../Mapper.h"
+#include "IConditionMapper.h"
+#include "cru/common/Base.h"
+#include "cru/common/ClonablePtr.h"
+#include "cru/ui/style/Condition.h"
+#include "cru/xml/XmlNode.h"
 
 namespace cru::ui::mapper::style {
 class CRU_UI_API NoConditionMapper
diff --git a/include/cru/ui/mapper/style/OrConditionMapper.hpp b/include/cru/ui/mapper/style/OrConditionMapper.h
index 21a402c2..e93484b4 100644
--- a/include/cru/ui/mapper/style/OrConditionMapper.hpp
+++ b/include/cru/ui/mapper/style/OrConditionMapper.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "../Mapper.hpp"
-#include "IConditionMapper.hpp"
+#include "../Mapper.h"
+#include "IConditionMapper.h"
 
 namespace cru::ui::mapper::style {
 class CRU_UI_API OrConditionMapper
diff --git a/include/cru/ui/mapper/style/StyleRuleMapper.hpp b/include/cru/ui/mapper/style/StyleRuleMapper.h
index ce5ccf00..cba4872c 100644
--- a/include/cru/ui/mapper/style/StyleRuleMapper.hpp
+++ b/include/cru/ui/mapper/style/StyleRuleMapper.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "../Mapper.hpp"
-#include "cru/common/ClonablePtr.hpp"
-#include "cru/ui/style/StyleRule.hpp"
-#include "cru/xml/XmlNode.hpp"
+#include "../Mapper.h"
+#include "cru/common/ClonablePtr.h"
+#include "cru/ui/style/StyleRule.h"
+#include "cru/xml/XmlNode.h"
 
 namespace cru::ui::mapper::style {
 class CRU_UI_API StyleRuleMapper : public BasicPtrMapper<ui::style::StyleRule> {
diff --git a/include/cru/ui/mapper/style/StyleRuleSetMapper.hpp b/include/cru/ui/mapper/style/StyleRuleSetMapper.h
index 66b95f4a..95f745e5 100644
--- a/include/cru/ui/mapper/style/StyleRuleSetMapper.hpp
+++ b/include/cru/ui/mapper/style/StyleRuleSetMapper.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <memory>
-#include "../../style/StyleRuleSet.hpp"
-#include "../Mapper.hpp"
+#include "../../style/StyleRuleSet.h"
+#include "../Mapper.h"
 
 namespace cru::ui::mapper::style {
 class CRU_UI_API StyleRuleSetMapper
diff --git a/include/cru/ui/render/Base.hpp b/include/cru/ui/render/Base.h
index ac67349e..fca67086 100644
--- a/include/cru/ui/render/Base.hpp
+++ b/include/cru/ui/render/Base.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "../Base.hpp"
+#include "../Base.h"
 
 namespace cru::ui::render {
 class RenderObject;
diff --git a/include/cru/ui/render/BorderRenderObject.hpp b/include/cru/ui/render/BorderRenderObject.h
index bf4b27a1..d75a979f 100644
--- a/include/cru/ui/render/BorderRenderObject.hpp
+++ b/include/cru/ui/render/BorderRenderObject.h
@@ -1,9 +1,9 @@
 #pragma once
 #include <string_view>
-#include "../style/ApplyBorderStyleInfo.hpp"
-#include "RenderObject.hpp"
-#include "cru/platform/GraphicsBase.hpp"
-#include "cru/ui/Base.hpp"
+#include "../style/ApplyBorderStyleInfo.h"
+#include "RenderObject.h"
+#include "cru/platform/GraphicsBase.h"
+#include "cru/ui/Base.h"
 
 namespace cru::ui::render {
 class CRU_UI_API BorderRenderObject : public RenderObject {
diff --git a/include/cru/ui/render/CanvasRenderObject.hpp b/include/cru/ui/render/CanvasRenderObject.h
index 68400271..ca55ebc6 100644
--- a/include/cru/ui/render/CanvasRenderObject.hpp
+++ b/include/cru/ui/render/CanvasRenderObject.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "RenderObject.hpp"
+#include "RenderObject.h"
 
 namespace cru::ui::render {
 // Layout logic:
diff --git a/include/cru/ui/render/FlexLayoutRenderObject.hpp b/include/cru/ui/render/FlexLayoutRenderObject.h
index c6fb7211..3a8348f6 100644
--- a/include/cru/ui/render/FlexLayoutRenderObject.hpp
+++ b/include/cru/ui/render/FlexLayoutRenderObject.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "LayoutRenderObject.hpp"
+#include "LayoutRenderObject.h"
 
 #include <string_view>
 
diff --git a/include/cru/ui/render/LayoutHelper.hpp b/include/cru/ui/render/LayoutHelper.h
index 518dc5a3..c2377066 100644
--- a/include/cru/ui/render/LayoutHelper.hpp
+++ b/include/cru/ui/render/LayoutHelper.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
-#include "MeasureRequirement.hpp"
+#include "MeasureRequirement.h"
 
 namespace cru::ui::render {
 float CalculateAnchorByAlignment(Alignment alignment, float start_point,
diff --git a/include/cru/ui/render/LayoutRenderObject.hpp b/include/cru/ui/render/LayoutRenderObject.h
index 424a5831..42a3aa55 100644
--- a/include/cru/ui/render/LayoutRenderObject.hpp
+++ b/include/cru/ui/render/LayoutRenderObject.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "RenderObject.hpp"
+#include "RenderObject.h"
 
-#include "cru/platform/graphics/util/Painter.hpp"
+#include "cru/platform/graphics/util/Painter.h"
 
 namespace cru::ui::render {
 template <typename TChildLayoutData>
diff --git a/include/cru/ui/render/MeasureRequirement.hpp b/include/cru/ui/render/MeasureRequirement.h
index 90d02a02..c740385b 100644
--- a/include/cru/ui/render/MeasureRequirement.hpp
+++ b/include/cru/ui/render/MeasureRequirement.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
-#include "cru/common/String.hpp"
+#include "cru/common/String.h"
 
 #include <algorithm>
 #include <limits>
diff --git a/include/cru/ui/render/RenderObject.hpp b/include/cru/ui/render/RenderObject.h
index bac97640..1e47e7fc 100644
--- a/include/cru/ui/render/RenderObject.hpp
+++ b/include/cru/ui/render/RenderObject.h
@@ -1,10 +1,10 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
-#include "MeasureRequirement.hpp"
-#include "cru/common/Base.hpp"
-#include "cru/common/Event.hpp"
-#include "cru/ui/Base.hpp"
+#include "MeasureRequirement.h"
+#include "cru/common/Base.h"
+#include "cru/common/Event.h"
+#include "cru/ui/Base.h"
 
 #include <cstddef>
 #include <string>
diff --git a/include/cru/ui/render/ScrollBar.hpp b/include/cru/ui/render/ScrollBar.h
index f1007d4d..84d4375b 100644
--- a/include/cru/ui/render/ScrollBar.hpp
+++ b/include/cru/ui/render/ScrollBar.h
@@ -1,17 +1,17 @@
 #pragma once
-#include "Base.hpp"
-#include "cru/common/Base.hpp"
-#include "cru/common/Event.hpp"
-#include "cru/platform/graphics/Base.hpp"
-#include "cru/platform/graphics/Brush.hpp"
-#include "cru/platform/graphics/Geometry.hpp"
-#include "cru/platform/graphics/Painter.hpp"
-#include "cru/platform/gui/Cursor.hpp"
-#include "cru/platform/gui/TimerHelper.hpp"
-#include "cru/platform/gui/UiApplication.hpp"
-#include "cru/ui/Base.hpp"
-#include "cru/ui/controls/Control.hpp"
-#include "cru/ui/helper/ClickDetector.hpp"
+#include "Base.h"
+#include "cru/common/Base.h"
+#include "cru/common/Event.h"
+#include "cru/platform/graphics/Base.h"
+#include "cru/platform/graphics/Brush.h"
+#include "cru/platform/graphics/Geometry.h"
+#include "cru/platform/graphics/Painter.h"
+#include "cru/platform/gui/Cursor.h"
+#include "cru/platform/gui/TimerHelper.h"
+#include "cru/platform/gui/UiApplication.h"
+#include "cru/ui/Base.h"
+#include "cru/ui/controls/Control.h"
+#include "cru/ui/helper/ClickDetector.h"
 
 #include <gsl/pointers>
 #include <memory>
diff --git a/include/cru/ui/render/ScrollRenderObject.hpp b/include/cru/ui/render/ScrollRenderObject.h
index 19814c51..bb282953 100644
--- a/include/cru/ui/render/ScrollRenderObject.hpp
+++ b/include/cru/ui/render/ScrollRenderObject.h
@@ -1,10 +1,10 @@
 #pragma once
-#include "RenderObject.hpp"
+#include "RenderObject.h"
 
-#include "cru/common/Event.hpp"
-#include "cru/platform/graphics/util/Painter.hpp"
-#include "cru/ui/Base.hpp"
-#include "cru/ui/render/ScrollBar.hpp"
+#include "cru/common/Event.h"
+#include "cru/platform/graphics/util/Painter.h"
+#include "cru/ui/Base.h"
+#include "cru/ui/render/ScrollBar.h"
 
 #include <memory>
 #include <optional>
diff --git a/include/cru/ui/render/StackLayoutRenderObject.hpp b/include/cru/ui/render/StackLayoutRenderObject.h
index 2f832e55..e141d16e 100644
--- a/include/cru/ui/render/StackLayoutRenderObject.hpp
+++ b/include/cru/ui/render/StackLayoutRenderObject.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "LayoutRenderObject.hpp"
-#include "cru/ui/Base.hpp"
+#include "LayoutRenderObject.h"
+#include "cru/ui/Base.h"
 
 namespace cru::ui::render {
 // Measure Logic:
diff --git a/include/cru/ui/render/TextRenderObject.hpp b/include/cru/ui/render/TextRenderObject.h
index 601bd0a8..3b5f581a 100644
--- a/include/cru/ui/render/TextRenderObject.hpp
+++ b/include/cru/ui/render/TextRenderObject.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "RenderObject.hpp"
+#include "RenderObject.h"
 
 #include <string>
 
diff --git a/include/cru/ui/style/ApplyBorderStyleInfo.hpp b/include/cru/ui/style/ApplyBorderStyleInfo.h
index 7ae5b2c5..2e6753fc 100644
--- a/include/cru/ui/style/ApplyBorderStyleInfo.hpp
+++ b/include/cru/ui/style/ApplyBorderStyleInfo.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "../Base.hpp"
+#include "../Base.h"
 
 #include <optional>
 
diff --git a/include/cru/ui/style/Condition.hpp b/include/cru/ui/style/Condition.h
index 89da81f6..221a7428 100644
--- a/include/cru/ui/style/Condition.hpp
+++ b/include/cru/ui/style/Condition.h
@@ -1,10 +1,10 @@
 #pragma once
-#include "../Base.hpp"
-#include "cru/common/Base.hpp"
-#include "cru/common/ClonablePtr.hpp"
-#include "cru/common/Event.hpp"
-#include "cru/ui/controls/IClickableControl.hpp"
-#include "cru/ui/helper/ClickDetector.hpp"
+#include "../Base.h"
+#include "cru/common/Base.h"
+#include "cru/common/ClonablePtr.h"
+#include "cru/common/Event.h"
+#include "cru/ui/controls/IClickableControl.h"
+#include "cru/ui/helper/ClickDetector.h"
 
 #include <memory>
 #include <type_traits>
diff --git a/include/cru/ui/style/StyleRule.hpp b/include/cru/ui/style/StyleRule.h
index 743aa759..68b239f3 100644
--- a/include/cru/ui/style/StyleRule.hpp
+++ b/include/cru/ui/style/StyleRule.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "../Base.hpp"
-#include "Condition.hpp"
-#include "Styler.hpp"
-#include "cru/common/ClonablePtr.hpp"
+#include "../Base.h"
+#include "Condition.h"
+#include "Styler.h"
+#include "cru/common/ClonablePtr.h"
 
 #include <memory>
 #include <vector>
diff --git a/include/cru/ui/style/StyleRuleSet.hpp b/include/cru/ui/style/StyleRuleSet.h
index 32b02d78..34d0fad4 100644
--- a/include/cru/ui/style/StyleRuleSet.hpp
+++ b/include/cru/ui/style/StyleRuleSet.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "StyleRule.hpp"
-#include "cru/common/Base.hpp"
-#include "cru/common/Event.hpp"
+#include "StyleRule.h"
+#include "cru/common/Base.h"
+#include "cru/common/Event.h"
 
 #include <cstddef>
 
diff --git a/include/cru/ui/style/Styler.hpp b/include/cru/ui/style/Styler.h
index 3bf0b027..9bdec294 100644
--- a/include/cru/ui/style/Styler.hpp
+++ b/include/cru/ui/style/Styler.h
@@ -1,10 +1,10 @@
 #pragma once
-#include "../Base.hpp"
-#include "ApplyBorderStyleInfo.hpp"
-#include "cru/common/Base.hpp"
-#include "cru/common/ClonablePtr.hpp"
-#include "cru/platform/gui/Cursor.hpp"
-#include "cru/ui/controls/Control.hpp"
+#include "../Base.h"
+#include "ApplyBorderStyleInfo.h"
+#include "cru/common/Base.h"
+#include "cru/common/ClonablePtr.h"
+#include "cru/platform/gui/Cursor.h"
+#include "cru/ui/controls/Control.h"
 
 #include <memory>
 #include <vector>