34 files changed, 77 insertions, 77 deletions
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 {