214 files changed, 522 insertions, 522 deletions

diff --git a/include/cru/common/Base.hpp b/include/cru/common/Base.h
index bab4f733..4d4d1f5f 100644
--- a/include/cru/common/Base.hpp
+++ b/include/cru/common/Base.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "PreConfig.hpp"
+#include "PreConfig.h"
 
 #ifdef CRU_PLATFORM_WINDOWS
 #ifdef CRU_BASE_EXPORT_API
diff --git a/include/cru/common/Bitmask.hpp b/include/cru/common/Bitmask.h
index c1b6443a..bd6a8309 100644
--- a/include/cru/common/Bitmask.hpp
+++ b/include/cru/common/Bitmask.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
 namespace cru {
 template <typename Tag, typename TUnderlying = unsigned>
diff --git a/include/cru/common/ClonablePtr.hpp b/include/cru/common/ClonablePtr.h
index 39b5b454..39b5b454 100644
--- a/include/cru/common/ClonablePtr.hpp
+++ b/include/cru/common/ClonablePtr.h
diff --git a/include/cru/common/Event.hpp b/include/cru/common/Event.h
index 5d60c5b3..564afc40 100644
--- a/include/cru/common/Event.hpp
+++ b/include/cru/common/Event.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
-#include "SelfResolvable.hpp"
+#include "SelfResolvable.h"
 
 #include <algorithm>
 #include <functional>
diff --git a/include/cru/common/Exception.hpp b/include/cru/common/Exception.h
index cb35469c..365d2064 100644
--- a/include/cru/common/Exception.hpp
+++ b/include/cru/common/Exception.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "String.hpp"
+#include "String.h"
 
 namespace cru {
 #ifdef _MSC_VER
diff --git a/include/cru/common/Format.hpp b/include/cru/common/Format.h
index 1ad71262..ede2998b 100644
--- a/include/cru/common/Format.hpp
+++ b/include/cru/common/Format.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Exception.hpp"
-#include "String.hpp"
+#include "Exception.h"
+#include "String.h"
 
 #include <charconv>
 
diff --git a/include/cru/common/HandlerRegistry.hpp b/include/cru/common/HandlerRegistry.h
index 8049e74b..e405d1fd 100644
--- a/include/cru/common/HandlerRegistry.hpp
+++ b/include/cru/common/HandlerRegistry.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
 #include <algorithm>
 #include <functional>
diff --git a/include/cru/common/Logger.hpp b/include/cru/common/Logger.h
index c4a3e54a..25875651 100644
--- a/include/cru/common/Logger.hpp
+++ b/include/cru/common/Logger.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
-#include "String.hpp"
-#include "Format.hpp"
+#include "String.h"
+#include "Format.h"
 
 #include <list>
 #include <memory>
diff --git a/include/cru/common/PreConfig.hpp b/include/cru/common/PreConfig.h
index ba0f5bd8..ba0f5bd8 100644
--- a/include/cru/common/PreConfig.hpp
+++ b/include/cru/common/PreConfig.h
diff --git a/include/cru/common/PropertyTree.hpp b/include/cru/common/PropertyTree.h
index 613bcc47..54e185b9 100644
--- a/include/cru/common/PropertyTree.hpp
+++ b/include/cru/common/PropertyTree.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Base.hpp"
-#include "String.hpp"
+#include "Base.h"
+#include "String.h"
 
 #include <unordered_map>
 
diff --git a/include/cru/common/Range.hpp b/include/cru/common/Range.h
index ecc61243..e61d90ca 100644
--- a/include/cru/common/Range.hpp
+++ b/include/cru/common/Range.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
 namespace cru {
 struct Range final {
diff --git a/include/cru/common/SelfResolvable.hpp b/include/cru/common/SelfResolvable.h
index eaa4ce34..c8acd4b9 100644
--- a/include/cru/common/SelfResolvable.hpp
+++ b/include/cru/common/SelfResolvable.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "PreConfig.hpp"
+#include "PreConfig.h"
 
 #include <memory>
 #include <type_traits>
diff --git a/include/cru/common/String.hpp b/include/cru/common/String.h
index c1f957c0..0b1b031b 100644
--- a/include/cru/common/String.hpp
+++ b/include/cru/common/String.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
-#include "Range.hpp"
-#include "StringUtil.hpp"
+#include "Range.h"
+#include "StringUtil.h"
 
 #include <double-conversion/double-conversion.h>
 #include <filesystem>
diff --git a/include/cru/common/StringUtil.hpp b/include/cru/common/StringUtil.h
index c840960d..19948250 100644
--- a/include/cru/common/StringUtil.hpp
+++ b/include/cru/common/StringUtil.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
 #include <functional>
 
diff --git a/include/cru/common/io/FileStream.hpp b/include/cru/common/io/FileStream.h
index 86c4c037..4f1499be 100644
--- a/include/cru/common/io/FileStream.hpp
+++ b/include/cru/common/io/FileStream.h
@@ -1,12 +1,12 @@
 #pragma once
 
 #ifdef CRU_PLATFORM_UNIX
-#include "../platform/unix/UnixFileStream.hpp"
+#include "../platform/unix/UnixFileStream.h"
 namespace cru::io {
 using FileStream = platform::unix::UnixFileStream;
 }
 #elif CRU_PLATFORM_WINDOWS
-#include "../platform/win/Win32FileStream.hpp"
+#include "../platform/win/Win32FileStream.h"
 namespace cru::io {
 using FileStream = platform::win::Win32FileStream;
 }
diff --git a/include/cru/common/io/MemoryStream.hpp b/include/cru/common/io/MemoryStream.h
index 29da7b9f..a6243d67 100644
--- a/include/cru/common/io/MemoryStream.hpp
+++ b/include/cru/common/io/MemoryStream.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Stream.hpp"
+#include "Stream.h"
 
 #include <functional>
 
diff --git a/include/cru/common/io/OpenFileFlag.hpp b/include/cru/common/io/OpenFileFlag.h
index 3319bb4f..b0bceddc 100644
--- a/include/cru/common/io/OpenFileFlag.hpp
+++ b/include/cru/common/io/OpenFileFlag.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../Bitmask.hpp"
+#include "../Bitmask.h"
 
 namespace cru::io {
 namespace details {
diff --git a/include/cru/common/io/Resource.hpp b/include/cru/common/io/Resource.h
index 4fd00bdd..1d5313a6 100644
--- a/include/cru/common/io/Resource.hpp
+++ b/include/cru/common/io/Resource.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "../Base.hpp"
+#include "../Base.h"
 
 #include <filesystem>
 
diff --git a/include/cru/common/io/Stream.hpp b/include/cru/common/io/Stream.h
index 131e82e9..66be4468 100644
--- a/include/cru/common/io/Stream.hpp
+++ b/include/cru/common/io/Stream.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../Base.hpp"
+#include "../Base.h"
 
-#include "../String.hpp"
+#include "../String.h"
 
 #include <cstddef>
 #include <vector>
diff --git a/include/cru/common/platform/Exception.hpp b/include/cru/common/platform/Exception.h
index 0241947b..c1b649f3 100644
--- a/include/cru/common/platform/Exception.hpp
+++ b/include/cru/common/platform/Exception.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "../Base.hpp"
-#include "../Exception.hpp"
+#include "../Base.h"
+#include "../Exception.h"
 
 namespace cru::platform {
 class CRU_BASE_API PlatformException : public Exception {
diff --git a/include/cru/common/platform/osx/Convert.hpp b/include/cru/common/platform/osx/Convert.h
index a2d8beae..503576be 100644
--- a/include/cru/common/platform/osx/Convert.hpp
+++ b/include/cru/common/platform/osx/Convert.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "../../PreConfig.hpp"
+#include "../../PreConfig.h"
 #ifdef CRU_PLATFORM_OSX
 
-#include "../../String.hpp"
+#include "../../String.h"
 
 #include <CoreFoundation/CoreFoundation.h>
 
diff --git a/include/cru/common/platform/osx/Exception.hpp b/include/cru/common/platform/osx/Exception.h
index 49527c69..53e874e9 100644
--- a/include/cru/common/platform/osx/Exception.hpp
+++ b/include/cru/common/platform/osx/Exception.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "../../PreConfig.hpp"
+#include "../../PreConfig.h"
 #ifdef CRU_PLATFORM_OSX
 
-#include "../Exception.hpp"
+#include "../Exception.h"
 
 namespace cru::platform::osx {
 class OsxException : public PlatformException {
diff --git a/include/cru/common/platform/unix/ErrnoException.hpp b/include/cru/common/platform/unix/ErrnoException.h
index 2982e26a..00e1864b 100644
--- a/include/cru/common/platform/unix/ErrnoException.hpp
+++ b/include/cru/common/platform/unix/ErrnoException.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "../../PreConfig.hpp"
+#include "../../PreConfig.h"
 
 #ifdef CRU_PLATFORM_UNIX
 
-#include "../Exception.hpp"
+#include "../Exception.h"
 
 namespace cru::platform::unix {
 class ErrnoException : public PlatformException {
diff --git a/include/cru/common/platform/unix/UnixFileStream.hpp b/include/cru/common/platform/unix/UnixFileStream.h
index 76355f2f..0c8ef340 100644
--- a/include/cru/common/platform/unix/UnixFileStream.hpp
+++ b/include/cru/common/platform/unix/UnixFileStream.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "../../PreConfig.hpp"
+#include "../../PreConfig.h"
 
 #ifdef CRU_PLATFORM_UNIX
 
-#include "../../String.hpp"
-#include "../../io/OpenFileFlag.hpp"
-#include "../../io/Stream.hpp"
+#include "../../String.h"
+#include "../../io/OpenFileFlag.h"
+#include "../../io/Stream.h"
 
 namespace cru::platform::unix {
 class UnixFileStream : public io::Stream {
diff --git a/include/cru/common/platform/win/ComAutoInit.hpp b/include/cru/common/platform/win/ComAutoInit.h
index 131f3f30..cc968e4b 100644
--- a/include/cru/common/platform/win/ComAutoInit.hpp
+++ b/include/cru/common/platform/win/ComAutoInit.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "../../PreConfig.hpp"
+#include "../../PreConfig.h"
 #ifdef CRU_PLATFORM_WINDOWS
 
-#include "WinPreConfig.hpp"
-#include "cru/common/Base.hpp"
+#include "WinPreConfig.h"
+#include "cru/common/Base.h"
 
 namespace cru::platform::win {
 class CRU_BASE_API ComAutoInit {
diff --git a/include/cru/common/platform/win/Exception.hpp b/include/cru/common/platform/win/Exception.h
index 4e332b4f..3e63b191 100644
--- a/include/cru/common/platform/win/Exception.hpp
+++ b/include/cru/common/platform/win/Exception.h
@@ -1,10 +1,10 @@
 #pragma once
-#include "../../PreConfig.hpp"
+#include "../../PreConfig.h"
 #ifdef CRU_PLATFORM_WINDOWS
 
-#include "WinPreConfig.hpp"
+#include "WinPreConfig.h"
 
-#include "../Exception.hpp"
+#include "../Exception.h"
 
 #include <stdexcept>
 #include <string_view>
diff --git a/include/cru/common/platform/win/StreamConvert.hpp b/include/cru/common/platform/win/StreamConvert.h
index 80800115..3499604a 100644
--- a/include/cru/common/platform/win/StreamConvert.hpp
+++ b/include/cru/common/platform/win/StreamConvert.h
@@ -1,9 +1,9 @@
 #pragma once
-#include "../../PreConfig.hpp"
+#include "../../PreConfig.h"
 
 #ifdef CRU_PLATFORM_WINDOWS
 
-#include "../../io/Stream.hpp"
+#include "../../io/Stream.h"
 
 #include <objidlbase.h>
 
diff --git a/include/cru/common/platform/win/Win32FileStream.hpp b/include/cru/common/platform/win/Win32FileStream.h
index b5511ba3..521fd58d 100644
--- a/include/cru/common/platform/win/Win32FileStream.hpp
+++ b/include/cru/common/platform/win/Win32FileStream.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "../../PreConfig.hpp"
+#include "../../PreConfig.h"
 
 #ifdef CRU_PLATFORM_WINDOWS
 
-#include "../../String.hpp"
-#include "../../io/OpenFileFlag.hpp"
-#include "../../io/Stream.hpp"
+#include "../../String.h"
+#include "../../io/OpenFileFlag.h"
+#include "../../io/Stream.h"
 
 namespace cru::platform::win {
 namespace details {
diff --git a/include/cru/common/platform/win/WinPreConfig.hpp b/include/cru/common/platform/win/WinPreConfig.h
index ac397820..c2284df3 100644
--- a/include/cru/common/platform/win/WinPreConfig.hpp
+++ b/include/cru/common/platform/win/WinPreConfig.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "../../PreConfig.hpp"
+#include "../../PreConfig.h"
 #ifdef CRU_PLATFORM_WINDOWS
 
 #define NOMINMAX
diff --git a/include/cru/osx/Convert.h b/include/cru/osx/Convert.h
new file mode 100644
index 00000000..bf32174a
--- /dev/null
+++ b/include/cru/osx/Convert.h
@@ -0,0 +1,2 @@
+#pragma once
+#include "cru/common/platform/osx/Convert.h"
diff --git a/include/cru/osx/Convert.hpp b/include/cru/osx/Convert.hpp
deleted file mode 100644
index ec1d5d6b..00000000
--- a/include/cru/osx/Convert.hpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#pragma once
-#include "cru/common/platform/osx/Convert.hpp"
diff --git a/include/cru/osx/Exception.h b/include/cru/osx/Exception.h
new file mode 100644
index 00000000..c346b970
--- /dev/null
+++ b/include/cru/osx/Exception.h
@@ -0,0 +1,3 @@
+#pragma once
+#include "cru/common/platform/osx/Exception.h"
+#include "cru/platform/Exception.h"
diff --git a/include/cru/osx/Exception.hpp b/include/cru/osx/Exception.hpp
deleted file mode 100644
index 5776ab72..00000000
--- a/include/cru/osx/Exception.hpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-#include "cru/common/platform/osx/Exception.hpp"
-#include "cru/platform/Exception.hpp"
diff --git a/include/cru/osx/Resource.hpp b/include/cru/osx/Resource.h
index b1f673f8..d30ee31b 100644
--- a/include/cru/osx/Resource.hpp
+++ b/include/cru/osx/Resource.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "cru/platform/Resource.hpp"
+#include "cru/platform/Resource.h"
 
 namespace cru::platform::osx {
 class OsxResource : public Object, public virtual IPlatformResource {
diff --git a/include/cru/osx/graphics/quartz/Brush.hpp b/include/cru/osx/graphics/quartz/Brush.h
index 1fa26794..677a0b6c 100644
--- a/include/cru/osx/graphics/quartz/Brush.hpp
+++ b/include/cru/osx/graphics/quartz/Brush.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "Resource.hpp"
-#include "cru/common/Base.hpp"
-#include "cru/platform/graphics/Base.hpp"
-#include "cru/platform/graphics/Brush.hpp"
+#include "Resource.h"
+#include "cru/common/Base.h"
+#include "cru/platform/graphics/Base.h"
+#include "cru/platform/graphics/Brush.h"
 
 #include <CoreGraphics/CoreGraphics.h>
 
diff --git a/include/cru/osx/graphics/quartz/Convert.hpp b/include/cru/osx/graphics/quartz/Convert.h
index ba2b1be1..8d486069 100644
--- a/include/cru/osx/graphics/quartz/Convert.hpp
+++ b/include/cru/osx/graphics/quartz/Convert.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "cru/common/Range.hpp"
-#include "cru/common/String.hpp"
-#include "cru/common/io/Stream.hpp"
-#include "cru/platform/Matrix.hpp"
+#include "cru/common/Range.h"
+#include "cru/common/String.h"
+#include "cru/common/io/Stream.h"
+#include "cru/platform/Matrix.h"
 
 #include <CoreGraphics/CoreGraphics.h>
 
diff --git a/include/cru/osx/graphics/quartz/Factory.hpp b/include/cru/osx/graphics/quartz/Factory.h
index 59433b54..1a5abdc1 100644
--- a/include/cru/osx/graphics/quartz/Factory.hpp
+++ b/include/cru/osx/graphics/quartz/Factory.h
@@ -1,9 +1,9 @@
 #pragma once
-#include "Resource.hpp"
-#include "cru/common/Base.hpp"
-#include "cru/osx/graphics/quartz/ImageFactory.hpp"
-#include "cru/platform/graphics/Factory.hpp"
-#include "cru/platform/graphics/ImageFactory.hpp"
+#include "Resource.h"
+#include "cru/common/Base.h"
+#include "cru/osx/graphics/quartz/ImageFactory.h"
+#include "cru/platform/graphics/Factory.h"
+#include "cru/platform/graphics/ImageFactory.h"
 
 namespace cru::platform::graphics::osx::quartz {
 class QuartzGraphicsFactory : public OsxQuartzResource,
diff --git a/include/cru/osx/graphics/quartz/Font.hpp b/include/cru/osx/graphics/quartz/Font.h
index 1ea2b891..d53c6a20 100644
--- a/include/cru/osx/graphics/quartz/Font.hpp
+++ b/include/cru/osx/graphics/quartz/Font.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "Resource.hpp"
-#include "cru/common/Base.hpp"
-#include "cru/platform/graphics/Font.hpp"
+#include "Resource.h"
+#include "cru/common/Base.h"
+#include "cru/platform/graphics/Font.h"
 
 #include <CoreText/CoreText.h>
 
diff --git a/include/cru/osx/graphics/quartz/Geometry.hpp b/include/cru/osx/graphics/quartz/Geometry.h
index 565c5b86..8e42491b 100644
--- a/include/cru/osx/graphics/quartz/Geometry.hpp
+++ b/include/cru/osx/graphics/quartz/Geometry.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "Resource.hpp"
-#include "cru/platform/graphics/Geometry.hpp"
+#include "Resource.h"
+#include "cru/platform/graphics/Geometry.h"
 
 #include <memory>
 
diff --git a/include/cru/osx/graphics/quartz/Image.hpp b/include/cru/osx/graphics/quartz/Image.h
index 62b7fa8b..458f5db0 100644
--- a/include/cru/osx/graphics/quartz/Image.hpp
+++ b/include/cru/osx/graphics/quartz/Image.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "Resource.hpp"
-#include "cru/platform/graphics/Image.hpp"
-#include "cru/platform/graphics/ImageFactory.hpp"
+#include "Resource.h"
+#include "cru/platform/graphics/Image.h"
+#include "cru/platform/graphics/ImageFactory.h"
 
 #include <CoreGraphics/CoreGraphics.h>
 
diff --git a/include/cru/osx/graphics/quartz/ImageFactory.hpp b/include/cru/osx/graphics/quartz/ImageFactory.h
index 027f3f2a..e9854738 100644
--- a/include/cru/osx/graphics/quartz/ImageFactory.hpp
+++ b/include/cru/osx/graphics/quartz/ImageFactory.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "Resource.hpp"
-#include "cru/platform/graphics/ImageFactory.hpp"
+#include "Resource.h"
+#include "cru/platform/graphics/ImageFactory.h"
 
 namespace cru::platform::graphics::osx::quartz {
 class QuartzImageFactory : public OsxQuartzResource,
diff --git a/include/cru/osx/graphics/quartz/Painter.hpp b/include/cru/osx/graphics/quartz/Painter.h
index e5b8e767..19428583 100644
--- a/include/cru/osx/graphics/quartz/Painter.hpp
+++ b/include/cru/osx/graphics/quartz/Painter.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "Resource.hpp"
-#include "cru/common/Base.hpp"
-#include "cru/platform/graphics/Base.hpp"
-#include "cru/platform/graphics/Painter.hpp"
+#include "Resource.h"
+#include "cru/common/Base.h"
+#include "cru/platform/graphics/Base.h"
+#include "cru/platform/graphics/Painter.h"
 
 #include <CoreGraphics/CoreGraphics.h>
 
diff --git a/include/cru/osx/graphics/quartz/Resource.hpp b/include/cru/osx/graphics/quartz/Resource.h
index 8b8f8bbc..916a376f 100644
--- a/include/cru/osx/graphics/quartz/Resource.hpp
+++ b/include/cru/osx/graphics/quartz/Resource.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "cru/osx/Resource.hpp"
-#include "cru/platform/graphics/Base.hpp"
-#include "cru/platform/graphics/Resource.hpp"
+#include "cru/osx/Resource.h"
+#include "cru/platform/graphics/Base.h"
+#include "cru/platform/graphics/Resource.h"
 
 namespace cru::platform::graphics::osx::quartz {
 class OsxQuartzResource : public platform::osx::OsxResource,
diff --git a/include/cru/osx/graphics/quartz/TextLayout.hpp b/include/cru/osx/graphics/quartz/TextLayout.h
index 2c6347db..c0abc7f9 100644
--- a/include/cru/osx/graphics/quartz/TextLayout.hpp
+++ b/include/cru/osx/graphics/quartz/TextLayout.h
@@ -1,9 +1,9 @@
 #pragma once
-#include "Resource.hpp"
+#include "Resource.h"
 
-#include "Font.hpp"
-#include "cru/common/Base.hpp"
-#include "cru/platform/graphics/TextLayout.hpp"
+#include "Font.h"
+#include "cru/common/Base.h"
+#include "cru/platform/graphics/TextLayout.h"
 
 #include <memory>
 
diff --git a/include/cru/osx/gui/Clipboard.hpp b/include/cru/osx/gui/Clipboard.h
index fea97140..b4dcce4c 100644
--- a/include/cru/osx/gui/Clipboard.hpp
+++ b/include/cru/osx/gui/Clipboard.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "Resource.hpp"
+#include "Resource.h"
 
-#include "cru/platform/gui/Base.hpp"
-#include "cru/platform/gui/Clipboard.hpp"
+#include "cru/platform/gui/Base.h"
+#include "cru/platform/gui/Clipboard.h"
 
 #include <memory>
 
diff --git a/include/cru/osx/gui/Cursor.hpp b/include/cru/osx/gui/Cursor.h
index 497f5853..6cfd400a 100644
--- a/include/cru/osx/gui/Cursor.hpp
+++ b/include/cru/osx/gui/Cursor.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "Resource.hpp"
-#include "cru/platform/gui/Cursor.hpp"
+#include "Resource.h"
+#include "cru/platform/gui/Cursor.h"
 
 #include <memory>
 
diff --git a/include/cru/osx/gui/InputMethod.hpp b/include/cru/osx/gui/InputMethod.h
index d184a722..cbfdae6c 100644
--- a/include/cru/osx/gui/InputMethod.hpp
+++ b/include/cru/osx/gui/InputMethod.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "Resource.hpp"
+#include "Resource.h"
 
-#include "cru/platform/gui/InputMethod.hpp"
+#include "cru/platform/gui/InputMethod.h"
 
 namespace cru::platform::gui::osx {
 class OsxWindow;
diff --git a/include/cru/osx/gui/Keyboard.hpp b/include/cru/osx/gui/Keyboard.h
index ae5b3ccf..89e0fa05 100644
--- a/include/cru/osx/gui/Keyboard.hpp
+++ b/include/cru/osx/gui/Keyboard.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "cru/platform/gui/Keyboard.hpp"
+#include "cru/platform/gui/Keyboard.h"
 
 namespace cru::platform::gui::osx {
 KeyCode KeyCodeFromOsxToCru(unsigned short n);
diff --git a/include/cru/osx/gui/Menu.hpp b/include/cru/osx/gui/Menu.h
index fe3bf3f9..c5cc756a 100644
--- a/include/cru/osx/gui/Menu.hpp
+++ b/include/cru/osx/gui/Menu.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "Resource.hpp"
+#include "Resource.h"
 
-#include "cru/platform/gui/Menu.hpp"
+#include "cru/platform/gui/Menu.h"
 
 namespace cru::platform::gui::osx {
 namespace details {
diff --git a/include/cru/osx/gui/Resource.hpp b/include/cru/osx/gui/Resource.h
index 3e44bb9b..bc3f9cd6 100644
--- a/include/cru/osx/gui/Resource.hpp
+++ b/include/cru/osx/gui/Resource.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "../Resource.hpp"
+#include "../Resource.h"
 
-#include "cru/platform/gui/Base.hpp"
+#include "cru/platform/gui/Base.h"
 
 namespace cru::platform::gui::osx {
 class OsxGuiResource : public platform::osx::OsxResource {
diff --git a/include/cru/osx/gui/UiApplication.hpp b/include/cru/osx/gui/UiApplication.h
index 003df8cc..2d2c119c 100644
--- a/include/cru/osx/gui/UiApplication.hpp
+++ b/include/cru/osx/gui/UiApplication.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "Resource.hpp"
-#include "cru/platform/gui/UiApplication.hpp"
+#include "Resource.h"
+#include "cru/platform/gui/UiApplication.h"
 
 #include <functional>
 #include <memory>
diff --git a/include/cru/osx/gui/Window.hpp b/include/cru/osx/gui/Window.h
index 904a0188..6cefbe8e 100644
--- a/include/cru/osx/gui/Window.hpp
+++ b/include/cru/osx/gui/Window.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "Resource.hpp"
-#include "cru/platform/gui/Base.hpp"
-#include "cru/platform/gui/InputMethod.hpp"
-#include "cru/platform/gui/Window.hpp"
+#include "Resource.h"
+#include "cru/platform/gui/Base.h"
+#include "cru/platform/gui/InputMethod.h"
+#include "cru/platform/gui/Window.h"
 
 #include <memory>
 
diff --git a/include/cru/parse/Base.hpp b/include/cru/parse/Base.h
index 8f3a05e9..8f3a05e9 100644
--- a/include/cru/parse/Base.hpp
+++ b/include/cru/parse/Base.h
diff --git a/include/cru/parse/Grammar.hpp b/include/cru/parse/Grammar.h
index 8dc1833f..7dd1eec0 100644
--- a/include/cru/parse/Grammar.hpp
+++ b/include/cru/parse/Grammar.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Production.hpp"
+#include "Production.h"
 
 #include <unordered_map>
 #include <vector>
diff --git a/include/cru/parse/Nonterminal.hpp b/include/cru/parse/Nonterminal.h
index b01c7c8a..0ea15149 100644
--- a/include/cru/parse/Nonterminal.hpp
+++ b/include/cru/parse/Nonterminal.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Symbol.hpp"
+#include "Symbol.h"
 
 namespace cru::parse {
 class CRU_PARSE_API Nonterminal : public Symbol {
diff --git a/include/cru/parse/ParsingAlgorithm.hpp b/include/cru/parse/ParsingAlgorithm.h
index 8f38c0ab..ae2dd0b5 100644
--- a/include/cru/parse/ParsingAlgorithm.hpp
+++ b/include/cru/parse/ParsingAlgorithm.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Grammar.hpp"
+#include "Grammar.h"
 
 namespace cru::parse {
 class ParsingAlgorithmContext;
diff --git a/include/cru/parse/ParsingAlgorithmContext.hpp b/include/cru/parse/ParsingAlgorithmContext.h
index b959462c..fe46c4d2 100644
--- a/include/cru/parse/ParsingAlgorithmContext.hpp
+++ b/include/cru/parse/ParsingAlgorithmContext.h
@@ -1,8 +1,8 @@
 #pragma once
 #include <vector>
-#include "Grammar.hpp"
-#include "cru/parse/ParsingTreeNode.hpp"
-#include "cru/parse/Terminal.hpp"
+#include "Grammar.h"
+#include "cru/parse/ParsingTreeNode.h"
+#include "cru/parse/Terminal.h"
 
 namespace cru::parse {
 class ParsingAlgorithm;
diff --git a/include/cru/parse/ParsingContext.hpp b/include/cru/parse/ParsingContext.h
index cfb850b9..02dc4c9c 100644
--- a/include/cru/parse/ParsingContext.hpp
+++ b/include/cru/parse/ParsingContext.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "ParsingAlgorithmContext.hpp"
-#include "cru/parse/ParsingTreeNode.hpp"
+#include "ParsingAlgorithmContext.h"
+#include "cru/parse/ParsingTreeNode.h"
 
 namespace cru::parse {
 // A parsing context contains all info that a program needs to know when parsing
diff --git a/include/cru/parse/ParsingTreeNode.hpp b/include/cru/parse/ParsingTreeNode.h
index 7119ca0b..05b1006c 100644
--- a/include/cru/parse/ParsingTreeNode.hpp
+++ b/include/cru/parse/ParsingTreeNode.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Grammar.hpp"
+#include "Grammar.h"
 
 #include <vector>
 
diff --git a/include/cru/parse/Production.hpp b/include/cru/parse/Production.h
index cb3c79c0..d5ababe6 100644
--- a/include/cru/parse/Production.hpp
+++ b/include/cru/parse/Production.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "cru/common/String.hpp"
+#include "cru/common/String.h"
 
-#include "Nonterminal.hpp"
-#include "Terminal.hpp"
+#include "Nonterminal.h"
+#include "Terminal.h"
 
 #include <vector>
 
diff --git a/include/cru/parse/RecursiveDescentAlgorithm.hpp b/include/cru/parse/RecursiveDescentAlgorithm.h
index 373724ea..9da4b8fe 100644
--- a/include/cru/parse/RecursiveDescentAlgorithm.hpp
+++ b/include/cru/parse/RecursiveDescentAlgorithm.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "ParsingAlgorithm.hpp"
+#include "ParsingAlgorithm.h"
 
 namespace cru::parse {
 class CRU_PARSE_API RecursiveDescentAlgorithm : public ParsingAlgorithm {
diff --git a/include/cru/parse/RecursiveDescentAlgorithmContext.hpp b/include/cru/parse/RecursiveDescentAlgorithmContext.h
index b29ee1a1..00acf479 100644
--- a/include/cru/parse/RecursiveDescentAlgorithmContext.hpp
+++ b/include/cru/parse/RecursiveDescentAlgorithmContext.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "ParsingAlgorithmContext.hpp"
-#include "cru/parse/ParsingTreeNode.hpp"
-#include "cru/parse/RecursiveDescentAlgorithm.hpp"
-#include "cru/parse/Terminal.hpp"
+#include "ParsingAlgorithmContext.h"
+#include "cru/parse/ParsingTreeNode.h"
+#include "cru/parse/RecursiveDescentAlgorithm.h"
+#include "cru/parse/Terminal.h"
 
 namespace cru::parse {
 class CRU_PARSE_API RecursiveDescentAlgorithmContext : public ParsingAlgorithmContext {
diff --git a/include/cru/parse/Symbol.hpp b/include/cru/parse/Symbol.h
index 7404a5e7..e7bd4808 100644
--- a/include/cru/parse/Symbol.hpp
+++ b/include/cru/parse/Symbol.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
-#include "cru/common/String.hpp"
+#include "cru/common/String.h"
 
 namespace cru::parse {
 class Grammar;
diff --git a/include/cru/parse/Terminal.hpp b/include/cru/parse/Terminal.h
index 4ff8f898..d197ab29 100644
--- a/include/cru/parse/Terminal.hpp
+++ b/include/cru/parse/Terminal.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Symbol.hpp"
+#include "Symbol.h"
 
 namespace cru::parse {
 class CRU_PARSE_API Terminal : public Symbol {
diff --git a/include/cru/parse/Token.hpp b/include/cru/parse/Token.h
index e69de29b..e69de29b 100644
--- a/include/cru/parse/Token.hpp
+++ b/include/cru/parse/Token.h
diff --git a/include/cru/parse/TokenType.hpp b/include/cru/parse/TokenType.h
index 49415d3b..cb6f6159 100644
--- a/include/cru/parse/TokenType.hpp
+++ b/include/cru/parse/TokenType.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
-#include "cru/common/Base.hpp"
-#include "cru/common/String.hpp"
+#include "cru/common/Base.h"
+#include "cru/common/String.h"
 
 namespace cru::parse {
 class CRU_PARSE_API TokenType : public Object {
diff --git a/include/cru/platform/Base.hpp b/include/cru/platform/Base.h
index 8589e6cb..8589e6cb 100644
--- a/include/cru/platform/Base.hpp
+++ b/include/cru/platform/Base.h
diff --git a/include/cru/platform/Check.hpp b/include/cru/platform/Check.h
index 121e3505..1750c7e8 100644
--- a/include/cru/platform/Check.hpp
+++ b/include/cru/platform/Check.h
@@ -1,9 +1,9 @@
 #pragma once
-#include "Exception.hpp"
-#include "Resource.hpp"
+#include "Exception.h"
+#include "Resource.h"
 
-#include "cru/common/String.hpp"
-#include "cru/common/Format.hpp"
+#include "cru/common/String.h"
+#include "cru/common/Format.h"
 
 #include <memory>
 #include <type_traits>
diff --git a/include/cru/platform/Color.hpp b/include/cru/platform/Color.h
index cdc6518b..4e35ae63 100644
--- a/include/cru/platform/Color.hpp
+++ b/include/cru/platform/Color.h
@@ -1,9 +1,9 @@
 #pragma once
-#include "cru/common/Base.hpp"
-#include "cru/platform/Base.hpp"
+#include "cru/common/Base.h"
+#include "cru/platform/Base.h"
 
-#include "cru/common/String.hpp"
-#include "cru/common/Format.hpp"
+#include "cru/common/String.h"
+#include "cru/common/Format.h"
 
 #include <cstdint>
 #include <optional>
diff --git a/include/cru/platform/Exception.hpp b/include/cru/platform/Exception.h
index b50e8c67..7d194d41 100644
--- a/include/cru/platform/Exception.hpp
+++ b/include/cru/platform/Exception.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "Base.hpp"
-#include "cru/common/Base.hpp"
-#include "cru/common/Exception.hpp"
-#include "cru/common/platform/Exception.hpp"
+#include "Base.h"
+#include "cru/common/Base.h"
+#include "cru/common/Exception.h"
+#include "cru/common/platform/Exception.h"
 
 namespace cru::platform {
 // This exception is thrown when a resource is used on another platform.
diff --git a/include/cru/platform/GraphicsBase.hpp b/include/cru/platform/GraphicsBase.h
index 088086e9..8fb9a3af 100644
--- a/include/cru/platform/GraphicsBase.hpp
+++ b/include/cru/platform/GraphicsBase.h
@@ -1,9 +1,9 @@
 #pragma once
-#include "cru/common/Base.hpp"
+#include "cru/common/Base.h"
 
-#include "cru/common/Range.hpp"
-#include "cru/common/String.hpp"
-#include "cru/common/Format.hpp"
+#include "cru/common/Range.h"
+#include "cru/common/String.h"
+#include "cru/common/Format.h"
 
 #include <cstdint>
 #include <limits>
diff --git a/include/cru/platform/Matrix.hpp b/include/cru/platform/Matrix.h
index 47917d47..c9a52158 100644
--- a/include/cru/platform/Matrix.hpp
+++ b/include/cru/platform/Matrix.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "GraphicsBase.hpp"
+#include "GraphicsBase.h"
 
 #include <cmath>
 #include <optional>
diff --git a/include/cru/platform/Resource.hpp b/include/cru/platform/Resource.h
index c89068fa..fe95ebb3 100644
--- a/include/cru/platform/Resource.hpp
+++ b/include/cru/platform/Resource.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
-#include "cru/common/Base.hpp"
-#include "cru/common/String.hpp"
+#include "cru/common/Base.h"
+#include "cru/common/String.h"
 
 #include <string_view>
 
diff --git a/include/cru/platform/bootstrap/Bootstrap.hpp b/include/cru/platform/bootstrap/Bootstrap.h
index 33fb5122..3ab89a91 100644
--- a/include/cru/platform/bootstrap/Bootstrap.hpp
+++ b/include/cru/platform/bootstrap/Bootstrap.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "cru/platform/gui/UiApplication.hpp"
+#include "cru/platform/gui/UiApplication.h"
 
 #ifdef CRU_PLATFORM_WINDOWS
 #ifdef CRU_PLATFORM_BOOTSTRAP_EXPORT_API
diff --git a/include/cru/platform/graphics/Base.hpp b/include/cru/platform/graphics/Base.h
index 416f0df4..a134fb33 100644
--- a/include/cru/platform/graphics/Base.hpp
+++ b/include/cru/platform/graphics/Base.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "../Color.hpp"
-#include "../GraphicsBase.hpp"
-#include "../Matrix.hpp"
-#include "../Resource.hpp"
+#include "../Color.h"
+#include "../GraphicsBase.h"
+#include "../Matrix.h"
+#include "../Resource.h"
 
 #include <memory>
 
diff --git a/include/cru/platform/graphics/Brush.hpp b/include/cru/platform/graphics/Brush.h
index 772edd5c..6f4a6902 100644
--- a/include/cru/platform/graphics/Brush.hpp
+++ b/include/cru/platform/graphics/Brush.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Resource.hpp"
+#include "Resource.h"
 
 namespace cru::platform::graphics {
 struct CRU_PLATFORM_GRAPHICS_API IBrush : virtual IGraphicsResource {};
diff --git a/include/cru/platform/graphics/Factory.hpp b/include/cru/platform/graphics/Factory.h
index 7aa88ebd..d197d821 100644
--- a/include/cru/platform/graphics/Factory.hpp
+++ b/include/cru/platform/graphics/Factory.h
@@ -1,12 +1,12 @@
 #pragma once
-#include "Resource.hpp"
+#include "Resource.h"
 
-#include "Brush.hpp"
-#include "Font.hpp"
-#include "Geometry.hpp"
-#include "Image.hpp"
-#include "ImageFactory.hpp"
-#include "TextLayout.hpp"
+#include "Brush.h"
+#include "Font.h"
+#include "Geometry.h"
+#include "Image.h"
+#include "ImageFactory.h"
+#include "TextLayout.h"
 
 namespace cru::platform::graphics {
 // Entry point of the graphics module.
diff --git a/include/cru/platform/graphics/Font.hpp b/include/cru/platform/graphics/Font.h
index 2d1bc9a6..24c35f7c 100644
--- a/include/cru/platform/graphics/Font.hpp
+++ b/include/cru/platform/graphics/Font.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Resource.hpp"
+#include "Resource.h"
 
 namespace cru::platform::graphics {
 struct CRU_PLATFORM_GRAPHICS_API IFont : virtual IGraphicsResource {
diff --git a/include/cru/platform/graphics/Geometry.hpp b/include/cru/platform/graphics/Geometry.h
index e83d1c51..732fc547 100644
--- a/include/cru/platform/graphics/Geometry.hpp
+++ b/include/cru/platform/graphics/Geometry.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Resource.hpp"
+#include "Resource.h"
 
 namespace cru::platform::graphics {
 struct CRU_PLATFORM_GRAPHICS_API IGeometry : virtual IGraphicsResource {
diff --git a/include/cru/platform/graphics/Image.hpp b/include/cru/platform/graphics/Image.h
index e8bf6671..51e27678 100644
--- a/include/cru/platform/graphics/Image.hpp
+++ b/include/cru/platform/graphics/Image.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Resource.hpp"
+#include "Resource.h"
 
 namespace cru::platform::graphics {
 struct CRU_PLATFORM_GRAPHICS_API IImage : public virtual IGraphicsResource {
diff --git a/include/cru/platform/graphics/ImageFactory.hpp b/include/cru/platform/graphics/ImageFactory.h
index 3997f783..2a7902b2 100644
--- a/include/cru/platform/graphics/ImageFactory.hpp
+++ b/include/cru/platform/graphics/ImageFactory.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "Image.hpp"
-#include "Resource.hpp"
-#include "cru/common/io/Stream.hpp"
+#include "Image.h"
+#include "Resource.h"
+#include "cru/common/io/Stream.h"
 
 namespace cru::platform::graphics {
 struct CRU_PLATFORM_GRAPHICS_API IImageFactory
diff --git a/include/cru/platform/graphics/NullPainter.hpp b/include/cru/platform/graphics/NullPainter.h
index 54c610c1..2c6e6cb1 100644
--- a/include/cru/platform/graphics/NullPainter.hpp
+++ b/include/cru/platform/graphics/NullPainter.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "Painter.hpp"
-#include "cru/common/Base.hpp"
+#include "Painter.h"
+#include "cru/common/Base.h"
 
 namespace cru::platform::graphics {
 class CRU_PLATFORM_GRAPHICS_API NullPainter : public Object,
diff --git a/include/cru/platform/graphics/Painter.hpp b/include/cru/platform/graphics/Painter.h
index 171e6260..38ff8849 100644
--- a/include/cru/platform/graphics/Painter.hpp
+++ b/include/cru/platform/graphics/Painter.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Resource.hpp"
+#include "Resource.h"
 
 namespace cru::platform::graphics {
 
diff --git a/include/cru/platform/graphics/Resource.hpp b/include/cru/platform/graphics/Resource.h
index e559b0e9..ab1b8de6 100644
--- a/include/cru/platform/graphics/Resource.hpp
+++ b/include/cru/platform/graphics/Resource.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
 namespace cru::platform::graphics {
 struct IGraphicsFactory;
diff --git a/include/cru/platform/graphics/TextLayout.hpp b/include/cru/platform/graphics/TextLayout.h
index f9ccc824..e060186b 100644
--- a/include/cru/platform/graphics/TextLayout.hpp
+++ b/include/cru/platform/graphics/TextLayout.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Resource.hpp"
+#include "Resource.h"
 
 #include <string>
 #include <vector>
diff --git a/include/cru/platform/graphics/util/Painter.hpp b/include/cru/platform/graphics/util/Painter.h
index 2e0fbb51..e36d5c55 100644
--- a/include/cru/platform/graphics/util/Painter.hpp
+++ b/include/cru/platform/graphics/util/Painter.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "../Painter.hpp"
+#include "../Painter.h"
 
 #include <functional>
 #include <type_traits>
diff --git a/include/cru/platform/gui/Base.hpp b/include/cru/platform/gui/Base.h
index b432a2e0..789ab308 100644
--- a/include/cru/platform/gui/Base.hpp
+++ b/include/cru/platform/gui/Base.h
@@ -1,9 +1,9 @@
 #pragma once
-#include "cru/common/Base.hpp"
-#include "cru/common/Bitmask.hpp"
-#include "cru/platform/graphics/Base.hpp"
+#include "cru/common/Base.h"
+#include "cru/common/Bitmask.h"
+#include "cru/platform/graphics/Base.h"
 
-#include "../Resource.hpp"
+#include "../Resource.h"
 
 #ifdef CRU_PLATFORM_WINDOWS
 #ifdef CRU_PLATFORM_GUI_EXPORT_API
diff --git a/include/cru/platform/gui/Clipboard.hpp b/include/cru/platform/gui/Clipboard.h
index c3467de5..47267895 100644
--- a/include/cru/platform/gui/Clipboard.hpp
+++ b/include/cru/platform/gui/Clipboard.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
 namespace cru::platform::gui {
 struct IClipboard : virtual IPlatformResource {
diff --git a/include/cru/platform/gui/Cursor.hpp b/include/cru/platform/gui/Cursor.h
index abc8b064..99168656 100644
--- a/include/cru/platform/gui/Cursor.hpp
+++ b/include/cru/platform/gui/Cursor.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
 #include <memory>
 
diff --git a/include/cru/platform/gui/DebugFlags.hpp b/include/cru/platform/gui/DebugFlags.h
index 2b7c7c19..2b7c7c19 100644
--- a/include/cru/platform/gui/DebugFlags.hpp
+++ b/include/cru/platform/gui/DebugFlags.h
diff --git a/include/cru/platform/gui/InputMethod.hpp b/include/cru/platform/gui/InputMethod.h
index a34aba74..45e11c06 100644
--- a/include/cru/platform/gui/InputMethod.hpp
+++ b/include/cru/platform/gui/InputMethod.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
-#include "cru/common/Event.hpp"
+#include "cru/common/Event.h"
 
 #include <memory>
 #include <vector>
diff --git a/include/cru/platform/gui/Keyboard.hpp b/include/cru/platform/gui/Keyboard.h
index 347b57bc..f25b25fa 100644
--- a/include/cru/platform/gui/Keyboard.hpp
+++ b/include/cru/platform/gui/Keyboard.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "cru/common/Bitmask.hpp"
-#include "cru/platform/gui/Base.hpp"
+#include "cru/common/Bitmask.h"
+#include "cru/platform/gui/Base.h"
 
 #include <string>
 #include <string_view>
diff --git a/include/cru/platform/gui/Menu.hpp b/include/cru/platform/gui/Menu.h
index fc2e844f..6e2a8902 100644
--- a/include/cru/platform/gui/Menu.hpp
+++ b/include/cru/platform/gui/Menu.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
-#include "Keyboard.hpp"
+#include "Keyboard.h"
 
 #include <functional>
 
diff --git a/include/cru/platform/gui/SaveOpenDialogOptions.hpp b/include/cru/platform/gui/SaveOpenDialogOptions.h
index 907ec808..cff4a44f 100644
--- a/include/cru/platform/gui/SaveOpenDialogOptions.hpp
+++ b/include/cru/platform/gui/SaveOpenDialogOptions.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
 namespace cru::platform::gui {
 struct CRU_PLATFORM_GUI_API SaveDialogOptions {
diff --git a/include/cru/platform/gui/TimerHelper.hpp b/include/cru/platform/gui/TimerHelper.h
index a61d2f04..91d436a4 100644
--- a/include/cru/platform/gui/TimerHelper.hpp
+++ b/include/cru/platform/gui/TimerHelper.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "UiApplication.hpp"
+#include "UiApplication.h"
 
 namespace cru::platform::gui {
 
diff --git a/include/cru/platform/gui/UiApplication.hpp b/include/cru/platform/gui/UiApplication.h
index c917aa01..b39e2d36 100644
--- a/include/cru/platform/gui/UiApplication.hpp
+++ b/include/cru/platform/gui/UiApplication.h
@@ -1,10 +1,10 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
-#include "cru/common/Bitmask.hpp"
-#include "cru/platform/gui/Menu.hpp"
+#include "cru/common/Bitmask.h"
+#include "cru/platform/gui/Menu.h"
 
-#include "SaveOpenDialogOptions.hpp"
+#include "SaveOpenDialogOptions.h"
 
 #include <chrono>
 #include <functional>
diff --git a/include/cru/platform/gui/Window.hpp b/include/cru/platform/gui/Window.h
index a8fe3ca6..d3f0daad 100644
--- a/include/cru/platform/gui/Window.hpp
+++ b/include/cru/platform/gui/Window.h
@@ -1,9 +1,9 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
-#include "Keyboard.hpp"
+#include "Keyboard.h"
 
-#include "cru/common/Event.hpp"
+#include "cru/common/Event.h"
 
 #include <string_view>
 
diff --git a/include/cru/toml/Base.hpp b/include/cru/toml/Base.h
index de1d558c..de1d558c 100644
--- a/include/cru/toml/Base.hpp
+++ b/include/cru/toml/Base.h
diff --git a/include/cru/toml/TomlDocument.hpp b/include/cru/toml/TomlDocument.h
index 1e5caf71..6da5ad74 100644
--- a/include/cru/toml/TomlDocument.hpp
+++ b/include/cru/toml/TomlDocument.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "Base.hpp"
+#include "Base.h"
 
-#include "cru/common/Base.hpp"
-#include "cru/common/String.hpp"
+#include "cru/common/Base.h"
+#include "cru/common/String.h"
 
 #include <optional>
 #include <unordered_map>
diff --git a/include/cru/toml/TomlParser.hpp b/include/cru/toml/TomlParser.h
index c3091bad..dcef2920 100644
--- a/include/cru/toml/TomlParser.hpp
+++ b/include/cru/toml/TomlParser.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "cru/common/Exception.hpp"
-#include "cru/toml/TomlDocument.hpp"
+#include "cru/common/Exception.h"
+#include "cru/toml/TomlDocument.h"
 
 #include <optional>
 
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>
diff --git a/include/cru/win/Base.hpp b/include/cru/win/Base.h
index d78f2538..75da7287 100644
--- a/include/cru/win/Base.hpp
+++ b/include/cru/win/Base.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "WinPreConfig.hpp"
+#include "WinPreConfig.h"
 
 #ifdef CRU_PLATFORM_WINDOWS
 #ifdef CRU_WIN_EXPORT_API
diff --git a/include/cru/win/DebugLogger.hpp b/include/cru/win/DebugLogger.h
index 05793607..6a7173ea 100644
--- a/include/cru/win/DebugLogger.hpp
+++ b/include/cru/win/DebugLogger.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
-#include "cru/common/Logger.hpp"
+#include "cru/common/Logger.h"
 
 namespace cru::platform::win {
 
diff --git a/include/cru/win/Exception.h b/include/cru/win/Exception.h
new file mode 100644
index 00000000..af8b495c
--- /dev/null
+++ b/include/cru/win/Exception.h
@@ -0,0 +1,3 @@
+#pragma once
+#include "cru/common/platform/win/Exception.h"
+#include "cru/platform/Exception.h"
diff --git a/include/cru/win/Exception.hpp b/include/cru/win/Exception.hpp
deleted file mode 100644
index 3c42ff65..00000000
--- a/include/cru/win/Exception.hpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-#include "cru/common/platform/win/Exception.hpp"
-#include "cru/platform/Exception.hpp"
diff --git a/include/cru/win/StdOutLogger.hpp b/include/cru/win/StdOutLogger.h
index cfda0a85..831d006f 100644
--- a/include/cru/win/StdOutLogger.hpp
+++ b/include/cru/win/StdOutLogger.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
-#include "cru/common/Logger.hpp"
+#include "cru/common/Logger.h"
 
 namespace cru::platform::win {
 class CRU_WIN_API WinStdOutLoggerSource : public ::cru::log::ILogSource {
diff --git a/include/cru/win/WinPreConfig.h b/include/cru/win/WinPreConfig.h
new file mode 100644
index 00000000..e714bf5e
--- /dev/null
+++ b/include/cru/win/WinPreConfig.h
@@ -0,0 +1,2 @@
+#pragma once
+#include "cru/common/platform/win/WinPreConfig.h"
diff --git a/include/cru/win/WinPreConfig.hpp b/include/cru/win/WinPreConfig.hpp
deleted file mode 100644
index 1658e45d..00000000
--- a/include/cru/win/WinPreConfig.hpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#pragma once
-#include "cru/common/platform/win/WinPreConfig.hpp"
diff --git a/include/cru/win/graphics/direct/Base.hpp b/include/cru/win/graphics/direct/Base.h
index 49fc7897..5f6f8c99 100644
--- a/include/cru/win/graphics/direct/Base.hpp
+++ b/include/cru/win/graphics/direct/Base.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "../../WinPreConfig.hpp"
+#include "../../WinPreConfig.h"
 
 #include <d2d1_2.h>
 #include <d3d11.h>
diff --git a/include/cru/win/graphics/direct/Brush.hpp b/include/cru/win/graphics/direct/Brush.h
index 22b0a8af..fe5321b7 100644
--- a/include/cru/win/graphics/direct/Brush.hpp
+++ b/include/cru/win/graphics/direct/Brush.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "ComResource.hpp"
-#include "Resource.hpp"
+#include "ComResource.h"
+#include "Resource.h"
 
-#include "cru/platform/graphics/Brush.hpp"
+#include "cru/platform/graphics/Brush.h"
 
 namespace cru::platform::graphics::win::direct {
 struct CRU_WIN_GRAPHICS_DIRECT_API ID2DBrush : virtual IBrush {
diff --git a/include/cru/win/graphics/direct/ComResource.hpp b/include/cru/win/graphics/direct/ComResource.h
index f8738f6e..36023b84 100644
--- a/include/cru/win/graphics/direct/ComResource.hpp
+++ b/include/cru/win/graphics/direct/ComResource.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
-#include "cru/common/Base.hpp"
+#include "cru/common/Base.h"
 
 namespace cru::platform::graphics::win::direct {
 template <typename TInterface>
diff --git a/include/cru/win/graphics/direct/ConvertUtil.hpp b/include/cru/win/graphics/direct/ConvertUtil.h
index 963b22f3..8066a265 100644
--- a/include/cru/win/graphics/direct/ConvertUtil.hpp
+++ b/include/cru/win/graphics/direct/ConvertUtil.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
-#include "cru/platform/graphics/Base.hpp"
+#include "cru/platform/graphics/Base.h"
 
 namespace cru::platform::graphics::win::direct {
 inline D2D1_MATRIX_3X2_F Convert(const platform::Matrix& matrix) {
diff --git a/include/cru/win/graphics/direct/Exception.hpp b/include/cru/win/graphics/direct/Exception.h
index 72493f2f..21dde875 100644
--- a/include/cru/win/graphics/direct/Exception.hpp
+++ b/include/cru/win/graphics/direct/Exception.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "../../Exception.hpp"
+#include "../../Exception.h"
 
 namespace cru::platform::graphics::win::direct {
 using platform::win::HResultError;
diff --git a/include/cru/win/graphics/direct/Factory.hpp b/include/cru/win/graphics/direct/Factory.h
index 4ceed7c5..368c68f0 100644
--- a/include/cru/win/graphics/direct/Factory.hpp
+++ b/include/cru/win/graphics/direct/Factory.h
@@ -1,11 +1,11 @@
 #pragma once
-#include "Resource.hpp"
+#include "Resource.h"
 
-#include "ImageFactory.hpp"
+#include "ImageFactory.h"
 
-#include "cru/common/platform/win/ComAutoInit.hpp"
-#include "cru/platform/graphics/Base.hpp"
-#include "cru/platform/graphics/Factory.hpp"
+#include "cru/common/platform/win/ComAutoInit.h"
+#include "cru/platform/graphics/Base.h"
+#include "cru/platform/graphics/Factory.h"
 
 namespace cru::platform::graphics::win::direct {
 class CRU_WIN_GRAPHICS_DIRECT_API DirectGraphicsFactory
diff --git a/include/cru/win/graphics/direct/Font.hpp b/include/cru/win/graphics/direct/Font.h
index 3bf423a0..e08ec5a3 100644
--- a/include/cru/win/graphics/direct/Font.hpp
+++ b/include/cru/win/graphics/direct/Font.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "ComResource.hpp"
-#include "Resource.hpp"
+#include "ComResource.h"
+#include "Resource.h"
 
-#include "cru/platform/graphics/Font.hpp"
+#include "cru/platform/graphics/Font.h"
 
 #include <string_view>
 
diff --git a/include/cru/win/graphics/direct/Geometry.hpp b/include/cru/win/graphics/direct/Geometry.h
index 3849045e..8e40c383 100644
--- a/include/cru/win/graphics/direct/Geometry.hpp
+++ b/include/cru/win/graphics/direct/Geometry.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "ComResource.hpp"
-#include "Resource.hpp"
+#include "ComResource.h"
+#include "Resource.h"
 
-#include "cru/platform/graphics/Geometry.hpp"
+#include "cru/platform/graphics/Geometry.h"
 
 namespace cru::platform::graphics::win::direct {
 class CRU_WIN_GRAPHICS_DIRECT_API D2DGeometryBuilder
diff --git a/include/cru/win/graphics/direct/Image.hpp b/include/cru/win/graphics/direct/Image.h
index 06448621..0b51f350 100644
--- a/include/cru/win/graphics/direct/Image.hpp
+++ b/include/cru/win/graphics/direct/Image.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "Resource.hpp"
-#include "cru/platform/graphics/Image.hpp"
+#include "Resource.h"
+#include "cru/platform/graphics/Image.h"
 
 namespace cru::platform::graphics::win::direct {
 class CRU_WIN_GRAPHICS_DIRECT_API Direct2DImage : public DirectGraphicsResource,
diff --git a/include/cru/win/graphics/direct/ImageFactory.hpp b/include/cru/win/graphics/direct/ImageFactory.h
index fa450039..34d363b0 100644
--- a/include/cru/win/graphics/direct/ImageFactory.hpp
+++ b/include/cru/win/graphics/direct/ImageFactory.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "Resource.hpp"
-#include "cru/platform/graphics/Image.hpp"
-#include "cru/platform/graphics/ImageFactory.hpp"
+#include "Resource.h"
+#include "cru/platform/graphics/Image.h"
+#include "cru/platform/graphics/ImageFactory.h"
 
 namespace cru::platform::graphics::win::direct {
 class CRU_WIN_GRAPHICS_DIRECT_API WinImageFactory
diff --git a/include/cru/win/graphics/direct/Painter.hpp b/include/cru/win/graphics/direct/Painter.h
index 57a59357..b1795395 100644
--- a/include/cru/win/graphics/direct/Painter.hpp
+++ b/include/cru/win/graphics/direct/Painter.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "ComResource.hpp"
-#include "Resource.hpp"
+#include "ComResource.h"
+#include "Resource.h"
 
-#include "cru/platform/graphics/Painter.hpp"
+#include "cru/platform/graphics/Painter.h"
 
 #include <vector>
 
diff --git a/include/cru/win/graphics/direct/Resource.hpp b/include/cru/win/graphics/direct/Resource.h
index 112af26f..df558686 100644
--- a/include/cru/win/graphics/direct/Resource.hpp
+++ b/include/cru/win/graphics/direct/Resource.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
-#include "cru/platform/graphics/Resource.hpp"
+#include "cru/platform/graphics/Resource.h"
 
 #include <string_view>
 
diff --git a/include/cru/win/graphics/direct/TextLayout.hpp b/include/cru/win/graphics/direct/TextLayout.h
index 41698862..fca5d68f 100644
--- a/include/cru/win/graphics/direct/TextLayout.hpp
+++ b/include/cru/win/graphics/direct/TextLayout.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "ComResource.hpp"
-#include "Resource.hpp"
+#include "ComResource.h"
+#include "Resource.h"
 
-#include "cru/platform/graphics/TextLayout.hpp"
+#include "cru/platform/graphics/TextLayout.h"
 
 #include <limits>
 #include <memory>
diff --git a/include/cru/win/graphics/direct/WindowPainter.hpp b/include/cru/win/graphics/direct/WindowPainter.h
index 3d66bc2e..67ff91e1 100644
--- a/include/cru/win/graphics/direct/WindowPainter.hpp
+++ b/include/cru/win/graphics/direct/WindowPainter.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "Painter.hpp"
-#include "WindowRenderTarget.hpp"
+#include "Painter.h"
+#include "WindowRenderTarget.h"
 
 namespace cru::platform::graphics::win::direct {
 class CRU_WIN_GRAPHICS_DIRECT_API D2DWindowPainter
diff --git a/include/cru/win/graphics/direct/WindowRenderTarget.hpp b/include/cru/win/graphics/direct/WindowRenderTarget.h
index 6b775241..c588f261 100644
--- a/include/cru/win/graphics/direct/WindowRenderTarget.hpp
+++ b/include/cru/win/graphics/direct/WindowRenderTarget.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Factory.hpp"
+#include "Factory.h"
 
 namespace cru::platform::graphics::win::direct {
 // Represents a window render target.
diff --git a/include/cru/win/gui/Base.hpp b/include/cru/win/gui/Base.h
index 2a0d0247..ab915c57 100644
--- a/include/cru/win/gui/Base.hpp
+++ b/include/cru/win/gui/Base.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "../WinPreConfig.hpp"
+#include "../WinPreConfig.h"
 
-#include "cru/common/Base.hpp"
+#include "cru/common/Base.h"
 
 #ifdef CRU_PLATFORM_WINDOWS
 #ifdef CRU_WIN_GUI_EXPORT_API
diff --git a/include/cru/win/gui/Clipboard.hpp b/include/cru/win/gui/Clipboard.h
index 63d4906a..7580642b 100644
--- a/include/cru/win/gui/Clipboard.hpp
+++ b/include/cru/win/gui/Clipboard.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "Resource.hpp"
-#include "cru/common/Base.hpp"
-#include "cru/platform/gui/Clipboard.hpp"
-#include "cru/win/gui/Base.hpp"
+#include "Resource.h"
+#include "cru/common/Base.h"
+#include "cru/platform/gui/Clipboard.h"
+#include "cru/win/gui/Base.h"
 
 namespace cru::platform::gui::win {
 class WinClipboard : public WinNativeResource, public virtual IClipboard {
diff --git a/include/cru/win/gui/Cursor.hpp b/include/cru/win/gui/Cursor.h
index 89f61db9..7a9a2198 100644
--- a/include/cru/win/gui/Cursor.hpp
+++ b/include/cru/win/gui/Cursor.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "Resource.hpp"
+#include "Resource.h"
 
-#include "cru/platform/gui/Cursor.hpp"
+#include "cru/platform/gui/Cursor.h"
 
 #include <memory>
 
diff --git a/include/cru/win/gui/Exception.hpp b/include/cru/win/gui/Exception.h
index 895e6c14..99ed5863 100644
--- a/include/cru/win/gui/Exception.hpp
+++ b/include/cru/win/gui/Exception.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "../Exception.hpp"
+#include "../Exception.h"
 
 namespace cru::platform::gui::win {
 using platform::win::Win32Error;
diff --git a/include/cru/win/gui/GodWindow.hpp b/include/cru/win/gui/GodWindow.h
index fa69cb84..63051245 100644
--- a/include/cru/win/gui/GodWindow.hpp
+++ b/include/cru/win/gui/GodWindow.h
@@ -1,9 +1,9 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
-#include "WindowNativeMessageEventArgs.hpp"
-#include "cru/common/Event.hpp"
-#include "cru/common/String.hpp"
+#include "WindowNativeMessageEventArgs.h"
+#include "cru/common/Event.h"
+#include "cru/common/String.h"
 
 #include <memory>
 
diff --git a/include/cru/win/gui/InputMethod.hpp b/include/cru/win/gui/InputMethod.h
index 0f50c0aa..27a621be 100644
--- a/include/cru/win/gui/InputMethod.hpp
+++ b/include/cru/win/gui/InputMethod.h
@@ -3,10 +3,10 @@
 // https://chromium.googlesource.com/chromium/chromium/+/refs/heads/master/ui/base/win/ime_input.cc
 
 #pragma once
-#include "Resource.hpp"
+#include "Resource.h"
 
-#include "WindowNativeMessageEventArgs.hpp"
-#include "cru/platform/gui/InputMethod.hpp"
+#include "WindowNativeMessageEventArgs.h"
+#include "cru/platform/gui/InputMethod.h"
 
 #include <imm.h>
 
diff --git a/include/cru/win/gui/Keyboard.hpp b/include/cru/win/gui/Keyboard.h
index d736966a..18b37b60 100644
--- a/include/cru/win/gui/Keyboard.hpp
+++ b/include/cru/win/gui/Keyboard.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
-#include "cru/platform/gui/Keyboard.hpp"
+#include "cru/platform/gui/Keyboard.h"
 
 namespace cru::platform::gui::win {
 KeyCode CRU_WIN_GUI_API VirtualKeyToKeyCode(int virtual_key);
diff --git a/include/cru/win/gui/Resource.hpp b/include/cru/win/gui/Resource.h
index 34c4fc1b..ed43bec3 100644
--- a/include/cru/win/gui/Resource.hpp
+++ b/include/cru/win/gui/Resource.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
-#include "cru/platform/Resource.hpp"
+#include "cru/platform/Resource.h"
 
 namespace cru::platform::gui::win {
 class CRU_WIN_GUI_API WinNativeResource : public Object,
diff --git a/include/cru/win/gui/UiApplication.hpp b/include/cru/win/gui/UiApplication.h
index 1280e7a6..a4dfcf3d 100644
--- a/include/cru/win/gui/UiApplication.hpp
+++ b/include/cru/win/gui/UiApplication.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "Resource.hpp"
+#include "Resource.h"
 
-#include "cru/platform/gui/Base.hpp"
-#include "cru/platform/gui/UiApplication.hpp"
+#include "cru/platform/gui/Base.h"
+#include "cru/platform/gui/UiApplication.h"
 
 #include <memory>
 
diff --git a/include/cru/win/gui/Window.hpp b/include/cru/win/gui/Window.h
index 75530596..fcbe1dbd 100644
--- a/include/cru/win/gui/Window.hpp
+++ b/include/cru/win/gui/Window.h
@@ -1,10 +1,10 @@
 #pragma once
-#include "Resource.hpp"
+#include "Resource.h"
 
-#include "WindowNativeMessageEventArgs.hpp"
-#include "cru/platform/gui/Base.hpp"
-#include "cru/platform/gui/Window.hpp"
-#include "cru/win/graphics/direct/WindowRenderTarget.hpp"
+#include "WindowNativeMessageEventArgs.h"
+#include "cru/platform/gui/Base.h"
+#include "cru/platform/gui/Window.h"
+#include "cru/win/graphics/direct/WindowRenderTarget.h"
 
 #include <memory>
 
diff --git a/include/cru/win/gui/WindowClass.hpp b/include/cru/win/gui/WindowClass.h
index ab55b214..50729887 100644
--- a/include/cru/win/gui/WindowClass.hpp
+++ b/include/cru/win/gui/WindowClass.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
 #include <string>
 
diff --git a/include/cru/win/gui/WindowNativeMessageEventArgs.hpp b/include/cru/win/gui/WindowNativeMessageEventArgs.h
index 7e62c19d..bc85a597 100644
--- a/include/cru/win/gui/WindowNativeMessageEventArgs.hpp
+++ b/include/cru/win/gui/WindowNativeMessageEventArgs.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "Base.hpp"
+#include "Base.h"
 
-#include "cru/common/Base.hpp"
+#include "cru/common/Base.h"
 
 namespace cru::platform::gui::win {
 struct CRU_WIN_GUI_API WindowNativeMessage {
diff --git a/include/cru/xml/Base.hpp b/include/cru/xml/Base.h
index 5d6fe144..5d6fe144 100644
--- a/include/cru/xml/Base.hpp
+++ b/include/cru/xml/Base.h
diff --git a/include/cru/xml/XmlNode.hpp b/include/cru/xml/XmlNode.h
index cfe6e155..737a2d87 100644
--- a/include/cru/xml/XmlNode.hpp
+++ b/include/cru/xml/XmlNode.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "Base.hpp"
+#include "Base.h"
 
-#include "cru/common/String.hpp"
+#include "cru/common/String.h"
 
 #include <algorithm>
 #include <optional>
diff --git a/include/cru/xml/XmlParser.hpp b/include/cru/xml/XmlParser.h
index e916cc53..75664ce3 100644
--- a/include/cru/xml/XmlParser.hpp
+++ b/include/cru/xml/XmlParser.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "XmlNode.hpp"
+#include "XmlNode.h"
 
-#include "cru/common/Exception.hpp"
-#include "cru/common/String.hpp"
+#include "cru/common/Exception.h"
+#include "cru/common/String.h"
 
 #include <optional>