30 files changed, 169 insertions, 169 deletions
diff --git a/src/win/CMakeLists.txt b/src/win/CMakeLists.txt
index 696ef200..f4062411 100644
--- a/src/win/CMakeLists.txt
+++ b/src/win/CMakeLists.txt
@@ -1,16 +1,16 @@
 set(CRU_WIN_BASE_INCLUDE_DIR ${CRU_INCLUDE_DIR}/cru/win/)
 
 add_library(cru_win_base STATIC
-	debug_logger.hpp
+	DebugLogger.hpp
 
-	exception.cpp
-	heap_debug.cpp
-	string.cpp
+	Exception.cpp
+	HeapDebug.cpp
+	String.cpp
 )
 target_sources(cru_win_base PUBLIC
-	${CRU_WIN_BASE_INCLUDE_DIR}/exception.hpp
-	${CRU_WIN_BASE_INCLUDE_DIR}/string.hpp
-	${CRU_WIN_BASE_INCLUDE_DIR}/win_pre_config.hpp
+	${CRU_WIN_BASE_INCLUDE_DIR}/Exception.hpp
+	${CRU_WIN_BASE_INCLUDE_DIR}/String.hpp
+	${CRU_WIN_BASE_INCLUDE_DIR}/WinPreConfig.hpp
 )
 target_compile_definitions(cru_win_base PUBLIC UNICODE _UNICODE) # use unicode
 target_link_libraries(cru_win_base PUBLIC cru_base)
diff --git a/src/win/debug_logger.hpp b/src/win/DebugLogger.hpp
index b6694279..381803bc 100644
--- a/src/win/debug_logger.hpp
+++ b/src/win/DebugLogger.hpp
@@ -1,7 +1,7 @@
-#include "cru/win/win_pre_config.hpp"
+#include "cru/win/WinPreConfig.hpp"
 
-#include "cru/common/logger.hpp"
-#include "cru/win/string.hpp"
+#include "cru/common/Logger.hpp"
+#include "cru/win/String.hpp"
 
 namespace cru::platform::win {
 
diff --git a/src/win/heap_debug.cpp b/src/win/HeapDebug.cpp
index 33ebae7c..6ec1ffcc 100644
--- a/src/win/heap_debug.cpp
+++ b/src/win/HeapDebug.cpp
@@ -1,6 +1,6 @@
-#include "cru/win/win_pre_config.hpp"
+#include "cru/win/WinPreConfig.hpp"
 
-#include "cru/platform/heap_debug.hpp"
+#include "cru/platform/HeapDebug.hpp"
 
 #include <crtdbg.h>
 
diff --git a/src/win/exception.cpp b/src/win/exception.cpp
index fde3ec6f..9f9fb03d 100644
--- a/src/win/exception.cpp
+++ b/src/win/exception.cpp
@@ -1,4 +1,4 @@
-#include "cru/win/exception.hpp"
+#include "cru/win/Exception.hpp"
 
 #include <fmt/format.h>
 #include <optional>
diff --git a/src/win/graph/direct/CMakeLists.txt b/src/win/graph/direct/CMakeLists.txt
index 492f6749..5505b0b5 100644
--- a/src/win/graph/direct/CMakeLists.txt
+++ b/src/win/graph/direct/CMakeLists.txt
@@ -1,25 +1,25 @@
 set(CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR ${CRU_INCLUDE_DIR}/cru/win/graph/direct)
 
 add_library(cru_win_graph_direct STATIC
-	brush.cpp
-	font.cpp
-	geometry.cpp
-	factory.cpp
-	painter.cpp
-	resource.cpp
-	text_layout.cpp
+	Brush.cpp
+	Font.cpp
+	Geometry.cpp
+	Factory.cpp
+	Painter.cpp
+	Resource.cpp
+	TextLayout.cpp
 )
 target_sources(cru_win_graph_direct PUBLIC
-	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/brush.hpp
-	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/com_resource.hpp
-	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/convert_util.hpp
-	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/exception.hpp
-	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/font.hpp
-	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/geometry.hpp
-	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/factory.hpp
-	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/painter.hpp
-	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/resource.hpp
-	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/text_layout.hpp
+	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/Brush.hpp
+	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/ComResource.hpp
+	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/ConvertUtil.hpp
+	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/Exception.hpp
+	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/Font.hpp
+	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/Geometry.hpp
+	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/Factory.hpp
+	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/Painter.hpp
+	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/Resource.hpp
+	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/TextLayout.hpp
 )
 target_link_libraries(cru_win_graph_direct PUBLIC D3D11 D2d1 DWrite)
 target_link_libraries(cru_win_graph_direct PUBLIC cru_win_base cru_platform_graph)
diff --git a/src/win/graph/direct/text_layout.cpp b/src/win/graph/direct/TextLayout.cpp
index 7b8d2ab0..16db77f0 100644
--- a/src/win/graph/direct/text_layout.cpp
+++ b/src/win/graph/direct/TextLayout.cpp
@@ -1,11 +1,11 @@
-#include "cru/win/graph/direct/text_layout.hpp"
-
-#include "cru/common/logger.hpp"
-#include "cru/platform/check.hpp"
-#include "cru/win/graph/direct/exception.hpp"
-#include "cru/win/graph/direct/factory.hpp"
-#include "cru/win/graph/direct/font.hpp"
-#include "cru/win/string.hpp"
+#include "cru/win/graph/direct/TextLayout.hpp"
+
+#include "cru/common/Logger.hpp"
+#include "cru/platform/Check.hpp"
+#include "cru/win/graph/direct/Exception.hpp"
+#include "cru/win/graph/direct/Factory.hpp"
+#include "cru/win/graph/direct/Font.hpp"
+#include "cru/win/String.hpp"
 
 #include <utility>
 
diff --git a/src/win/graph/direct/brush.cpp b/src/win/graph/direct/brush.cpp
index 329ce509..2b9d4ac3 100644
--- a/src/win/graph/direct/brush.cpp
+++ b/src/win/graph/direct/brush.cpp
@@ -1,8 +1,8 @@
-#include "cru/win/graph/direct/brush.hpp"
+#include "cru/win/graph/direct/Brush.hpp"
 
-#include "cru/win/graph/direct/convert_util.hpp"
-#include "cru/win/graph/direct/exception.hpp"
-#include "cru/win/graph/direct/factory.hpp"
+#include "cru/win/graph/direct/ConvertUtil.hpp"
+#include "cru/win/graph/direct/Exception.hpp"
+#include "cru/win/graph/direct/Factory.hpp"
 
 namespace cru::platform::graph::win::direct {
 D2DSolidColorBrush::D2DSolidColorBrush(DirectGraphFactory* factory)
diff --git a/src/win/graph/direct/factory.cpp b/src/win/graph/direct/factory.cpp
index 0f4739ee..d9213994 100644
--- a/src/win/graph/direct/factory.cpp
+++ b/src/win/graph/direct/factory.cpp
@@ -1,11 +1,11 @@
-#include "cru/win/graph/direct/factory.hpp"
-
-#include "cru/common/logger.hpp"
-#include "cru/win/graph/direct/brush.hpp"
-#include "cru/win/graph/direct/exception.hpp"
-#include "cru/win/graph/direct/font.hpp"
-#include "cru/win/graph/direct/geometry.hpp"
-#include "cru/win/graph/direct/text_layout.hpp"
+#include "cru/win/graph/direct/Factory.hpp"
+
+#include "cru/common/Logger.hpp"
+#include "cru/win/graph/direct/Brush.hpp"
+#include "cru/win/graph/direct/Exception.hpp"
+#include "cru/win/graph/direct/Font.hpp"
+#include "cru/win/graph/direct/Geometry.hpp"
+#include "cru/win/graph/direct/TextLayout.hpp"
 
 #include <cstdlib>
 #include <utility>
diff --git a/src/win/graph/direct/font.cpp b/src/win/graph/direct/font.cpp
index 6d50fafe..edbbc59d 100644
--- a/src/win/graph/direct/font.cpp
+++ b/src/win/graph/direct/font.cpp
@@ -1,8 +1,8 @@
-#include "cru/win/graph/direct/font.hpp"
+#include "cru/win/graph/direct/Font.hpp"
 
-#include "cru/win/graph/direct/exception.hpp"
-#include "cru/win/graph/direct/factory.hpp"
-#include "cru/win/string.hpp"
+#include "cru/win/graph/direct/Exception.hpp"
+#include "cru/win/graph/direct/Factory.hpp"
+#include "cru/win/String.hpp"
 
 #include <array>
 #include <utility>
diff --git a/src/win/graph/direct/geometry.cpp b/src/win/graph/direct/geometry.cpp
index 57b7f237..e77b4749 100644
--- a/src/win/graph/direct/geometry.cpp
+++ b/src/win/graph/direct/geometry.cpp
@@ -1,8 +1,8 @@
-#include "cru/win/graph/direct/geometry.hpp"
+#include "cru/win/graph/direct/Geometry.hpp"
 
-#include "cru/win/graph/direct/convert_util.hpp"
-#include "cru/win/graph/direct/exception.hpp"
-#include "cru/win/graph/direct/factory.hpp"
+#include "cru/win/graph/direct/ConvertUtil.hpp"
+#include "cru/win/graph/direct/Exception.hpp"
+#include "cru/win/graph/direct/Factory.hpp"
 
 namespace cru::platform::graph::win::direct {
 D2DGeometryBuilder::D2DGeometryBuilder(DirectGraphFactory* factory)
diff --git a/src/win/graph/direct/painter.cpp b/src/win/graph/direct/painter.cpp
index df0075e0..3ffb5208 100644
--- a/src/win/graph/direct/painter.cpp
+++ b/src/win/graph/direct/painter.cpp
@@ -1,11 +1,11 @@
-#include "cru/win/graph/direct/painter.hpp"
-
-#include "cru/platform/check.hpp"
-#include "cru/win/graph/direct/brush.hpp"
-#include "cru/win/graph/direct/convert_util.hpp"
-#include "cru/win/graph/direct/exception.hpp"
-#include "cru/win/graph/direct/geometry.hpp"
-#include "cru/win/graph/direct/text_layout.hpp"
+#include "cru/win/graph/direct/Painter.hpp"
+
+#include "cru/platform/Check.hpp"
+#include "cru/win/graph/direct/Brush.hpp"
+#include "cru/win/graph/direct/ConvertUtil.hpp"
+#include "cru/win/graph/direct/Exception.hpp"
+#include "cru/win/graph/direct/Geometry.hpp"
+#include "cru/win/graph/direct/TextLayout.hpp"
 
 #include <type_traits>
 
diff --git a/src/win/graph/direct/resource.cpp b/src/win/graph/direct/resource.cpp
index c2be27ed..772bb74b 100644
--- a/src/win/graph/direct/resource.cpp
+++ b/src/win/graph/direct/resource.cpp
@@ -1,6 +1,6 @@
-#include "cru/win/graph/direct/resource.hpp"
+#include "cru/win/graph/direct/Resource.hpp"
 
-#include "cru/win/graph/direct/factory.hpp"
+#include "cru/win/graph/direct/Factory.hpp"
 
 namespace cru::platform::graph::win::direct {
 DirectGraphResource::DirectGraphResource(DirectGraphFactory* factory)
diff --git a/src/win/native/CMakeLists.txt b/src/win/native/CMakeLists.txt
index ba4b3387..f1b167d2 100644
--- a/src/win/native/CMakeLists.txt
+++ b/src/win/native/CMakeLists.txt
@@ -1,37 +1,37 @@
 set(CRU_WIN_NATIVE_INCLUDE_DIR ${CRU_INCLUDE_DIR}/cru/win/native)
 
 add_library(cru_win_native STATIC
-	dpi_util.hpp
-	god_window_message.hpp
-	timer.hpp
-	window_d2d_painter.hpp
-	window_manager.hpp
+	DpiUtil.hpp
+	GodWindowMessage.hpp
+	Timer.hpp
+	WindowD2DPainter.hpp
+	WindowManager.hpp
 
-	cursor.cpp
-	god_window.cpp
-	input_method.cpp
-	keyboard.cpp
-	timer.cpp
-	ui_application.cpp
-	window.cpp
-	window_class.cpp
-	window_d2d_painter.cpp
-	window_manager.cpp
-	window_render_target.cpp
+	Cursor.cpp
+	GodWindow.cpp
+	InputMethod.cpp
+	Keyboard.cpp
+	Timer.cpp
+	UiApplication.cpp
+	Window.cpp
+	WindowClass.cpp
+	WindowD2DPainter.cpp
+	WindowManager.cpp
+	WindowRenderTarget.cpp
 )
 target_sources(cru_win_native PUBLIC
-	${CRU_WIN_NATIVE_INCLUDE_DIR}/cursor.hpp
-	${CRU_WIN_NATIVE_INCLUDE_DIR}/exception.hpp
-	${CRU_WIN_NATIVE_INCLUDE_DIR}/base.hpp
-	${CRU_WIN_NATIVE_INCLUDE_DIR}/god_window.hpp
-	${CRU_WIN_NATIVE_INCLUDE_DIR}/input_method.hpp
-	${CRU_WIN_NATIVE_INCLUDE_DIR}/keyboard.hpp
-	${CRU_WIN_NATIVE_INCLUDE_DIR}/resource.hpp
-	${CRU_WIN_NATIVE_INCLUDE_DIR}/ui_application.hpp
-	${CRU_WIN_NATIVE_INCLUDE_DIR}/window.hpp
-	${CRU_WIN_NATIVE_INCLUDE_DIR}/window_class.hpp
-	${CRU_WIN_NATIVE_INCLUDE_DIR}/window_native_message_event_args.hpp
-	${CRU_WIN_NATIVE_INCLUDE_DIR}/window_render_target.hpp
+	${CRU_WIN_NATIVE_INCLUDE_DIR}/Cursor.hpp
+	${CRU_WIN_NATIVE_INCLUDE_DIR}/Exception.hpp
+	${CRU_WIN_NATIVE_INCLUDE_DIR}/Base.hpp
+	${CRU_WIN_NATIVE_INCLUDE_DIR}/GodWindow.hpp
+	${CRU_WIN_NATIVE_INCLUDE_DIR}/InputMethod.hpp
+	${CRU_WIN_NATIVE_INCLUDE_DIR}/Keyboard.hpp
+	${CRU_WIN_NATIVE_INCLUDE_DIR}/Resource.hpp
+	${CRU_WIN_NATIVE_INCLUDE_DIR}/UiApplication.hpp
+	${CRU_WIN_NATIVE_INCLUDE_DIR}/Window.hpp
+	${CRU_WIN_NATIVE_INCLUDE_DIR}/WindowClass.hpp
+	${CRU_WIN_NATIVE_INCLUDE_DIR}/WindowNativeMessageEventArgs.hpp
+	${CRU_WIN_NATIVE_INCLUDE_DIR}/WindowRenderTarget.hpp
 )
 target_link_libraries(cru_win_native PUBLIC imm32)
 target_link_libraries(cru_win_native PUBLIC cru_win_graph_direct cru_platform_native)
diff --git a/src/win/native/dpi_util.hpp b/src/win/native/DpiUtil.hpp
index 07b89a95..16ffda25 100644
--- a/src/win/native/dpi_util.hpp
+++ b/src/win/native/DpiUtil.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "cru/platform/native/base.hpp"
+#include "cru/platform/native/Base.hpp"
 
 // The dpi awareness needs to be implemented in the future. Currently we use 96
 // as default.
diff --git a/src/win/native/god_window.cpp b/src/win/native/GodWindow.cpp
index 00577002..076954d4 100644
--- a/src/win/native/god_window.cpp
+++ b/src/win/native/GodWindow.cpp
@@ -1,11 +1,11 @@
-#include "cru/win/native/god_window.hpp"
+#include "cru/win/native/GodWindow.hpp"
 
-#include "cru/common/logger.hpp"
-#include "cru/win/native/exception.hpp"
-#include "cru/win/native/ui_application.hpp"
-#include "cru/win/native/window_class.hpp"
-#include "god_window_message.hpp"
-#include "timer.hpp"
+#include "cru/common/Logger.hpp"
+#include "cru/win/native/Exception.hpp"
+#include "cru/win/native/UiApplication.hpp"
+#include "cru/win/native/WindowClass.hpp"
+#include "GodWindowMessage.hpp"
+#include "Timer.hpp"
 
 namespace cru::platform::native::win {
 constexpr auto god_window_class_name = L"GodWindowClass";
diff --git a/src/win/native/god_window_message.hpp b/src/win/native/GodWindowMessage.hpp
index 591270d9..9063cb4d 100644
--- a/src/win/native/god_window_message.hpp
+++ b/src/win/native/GodWindowMessage.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "cru/win/win_pre_config.hpp"
+#include "cru/win/WinPreConfig.hpp"
 
 namespace cru::platform::native::win {
 constexpr int invoke_later_message_id = WM_USER + 2000;
diff --git a/src/win/native/input_method.cpp b/src/win/native/InputMethod.cpp
index dba2b1eb..2e31108e 100644
--- a/src/win/native/input_method.cpp
+++ b/src/win/native/InputMethod.cpp
@@ -1,11 +1,11 @@
-#include "cru/win/native/input_method.hpp"
-
-#include "cru/common/logger.hpp"
-#include "cru/platform/check.hpp"
-#include "cru/win/exception.hpp"
-#include "cru/win/native/window.hpp"
-#include "cru/win/string.hpp"
-#include "dpi_util.hpp"
+#include "cru/win/native/InputMethod.hpp"
+
+#include "cru/common/Logger.hpp"
+#include "cru/platform/Check.hpp"
+#include "cru/win/Exception.hpp"
+#include "cru/win/native/Window.hpp"
+#include "cru/win/String.hpp"
+#include "DpiUtil.hpp"
 
 #include <vector>
 
diff --git a/src/win/native/ui_application.cpp b/src/win/native/UiApplication.cpp
index 599ecadc..dbf52e05 100644
--- a/src/win/native/ui_application.cpp
+++ b/src/win/native/UiApplication.cpp
@@ -1,17 +1,17 @@
-#include "cru/win/native/ui_application.hpp"
-
-#include "../debug_logger.hpp"
-#include "cru/common/logger.hpp"
-#include "cru/platform/check.hpp"
-#include "cru/win/graph/direct/factory.hpp"
-#include "cru/win/native/cursor.hpp"
-#include "cru/win/native/exception.hpp"
-#include "cru/win/native/god_window.hpp"
-#include "cru/win/native/input_method.hpp"
-#include "cru/win/native/window.hpp"
-#include "god_window_message.hpp"
-#include "timer.hpp"
-#include "window_manager.hpp"
+#include "cru/win/native/UiApplication.hpp"
+
+#include "../DebugLogger.hpp"
+#include "cru/common/Logger.hpp"
+#include "cru/platform/Check.hpp"
+#include "cru/win/graph/direct/Factory.hpp"
+#include "cru/win/native/Cursor.hpp"
+#include "cru/win/native/Exception.hpp"
+#include "cru/win/native/GodWindow.hpp"
+#include "cru/win/native/InputMethod.hpp"
+#include "cru/win/native/Window.hpp"
+#include "GodWindowMessage.hpp"
+#include "Timer.hpp"
+#include "WindowManager.hpp"
 
 namespace cru::platform::native {
 std::unique_ptr<IUiApplication> CreateUiApplication() {
diff --git a/src/win/native/window_class.cpp b/src/win/native/WindowClass.cpp
index 11dc86aa..2e74606e 100644
--- a/src/win/native/window_class.cpp
+++ b/src/win/native/WindowClass.cpp
@@ -1,6 +1,6 @@
-#include "cru/win/native/window_class.hpp"
+#include "cru/win/native/WindowClass.hpp"
 
-#include "cru/win/native/exception.hpp"
+#include "cru/win/native/Exception.hpp"
 
 namespace cru::platform::native::win {
 WindowClass::WindowClass(std::wstring name, WNDPROC window_proc,
diff --git a/src/win/native/window_d2d_painter.cpp b/src/win/native/WindowD2DPainter.cpp
index 54343fbf..7a97480b 100644
--- a/src/win/native/window_d2d_painter.cpp
+++ b/src/win/native/WindowD2DPainter.cpp
@@ -1,8 +1,8 @@
-#include "window_d2d_painter.hpp"
+#include "WindowD2DPainter.hpp"
 
-#include "cru/win/graph/direct/exception.hpp"
-#include "cru/win/graph/direct/factory.hpp"
-#include "cru/win/native/window_render_target.hpp"
+#include "cru/win/graph/direct/Exception.hpp"
+#include "cru/win/graph/direct/Factory.hpp"
+#include "cru/win/native/WindowRenderTarget.hpp"
 
 namespace cru::platform::native::win {
 using namespace cru::platform::graph::win::direct;
diff --git a/src/win/native/window_d2d_painter.hpp b/src/win/native/WindowD2DPainter.hpp
index 40a5dee6..a638b77a 100644
--- a/src/win/native/window_d2d_painter.hpp
+++ b/src/win/native/WindowD2DPainter.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#include "cru/win/graph/direct/painter.hpp"
-#include "cru/win/native/window_render_target.hpp"
+#include "cru/win/graph/direct/Painter.hpp"
+#include "cru/win/native/WindowRenderTarget.hpp"
 
 namespace cru::platform::native::win {
 class WindowD2DPainter : public graph::win::direct::D2DPainter {
diff --git a/src/win/native/window_manager.cpp b/src/win/native/WindowManager.cpp
index 205a139c..56cc8981 100644
--- a/src/win/native/window_manager.cpp
+++ b/src/win/native/WindowManager.cpp
@@ -1,8 +1,8 @@
-#include "window_manager.hpp"
+#include "WindowManager.hpp"
 
-#include "cru/win/native/ui_application.hpp"
-#include "cru/win/native/window.hpp"
-#include "cru/win/native/window_class.hpp"
+#include "cru/win/native/UiApplication.hpp"
+#include "cru/win/native/Window.hpp"
+#include "cru/win/native/WindowClass.hpp"
 
 namespace cru::platform::native::win {
 LRESULT __stdcall GeneralWndProc(HWND hWnd, UINT Msg, WPARAM wParam,
diff --git a/src/win/native/window_manager.hpp b/src/win/native/WindowManager.hpp
index 677719aa..3f6387f7 100644
--- a/src/win/native/window_manager.hpp
+++ b/src/win/native/WindowManager.hpp
@@ -1,7 +1,7 @@
 #pragma once
-#include "cru/win/win_pre_config.hpp"
+#include "cru/win/WinPreConfig.hpp"
 
-#include "cru/common/base.hpp"
+#include "cru/common/Base.hpp"
 
 #include <map>
 #include <memory>
diff --git a/src/win/native/window_render_target.cpp b/src/win/native/WindowRenderTarget.cpp
index eb6673c6..4a114ebf 100644
--- a/src/win/native/window_render_target.cpp
+++ b/src/win/native/WindowRenderTarget.cpp
@@ -1,8 +1,8 @@
-#include "cru/win/native/window_render_target.hpp"
+#include "cru/win/native/WindowRenderTarget.hpp"
 
-#include "cru/win/graph/direct/exception.hpp"
-#include "cru/win/graph/direct/factory.hpp"
-#include "dpi_util.hpp"
+#include "cru/win/graph/direct/Exception.hpp"
+#include "cru/win/graph/direct/Factory.hpp"
+#include "DpiUtil.hpp"
 
 namespace cru::platform::native::win {
 using namespace cru::platform::graph::win::direct;
diff --git a/src/win/native/cursor.cpp b/src/win/native/cursor.cpp
index 096f3fdf..ca8bb1cd 100644
--- a/src/win/native/cursor.cpp
+++ b/src/win/native/cursor.cpp
@@ -1,7 +1,7 @@
-#include "cru/win/native/cursor.hpp"
+#include "cru/win/native/Cursor.hpp"
 
-#include "cru/common/logger.hpp"
-#include "cru/win/native/exception.hpp"
+#include "cru/common/Logger.hpp"
+#include "cru/win/native/Exception.hpp"
 
 #include <stdexcept>
 
diff --git a/src/win/native/keyboard.cpp b/src/win/native/keyboard.cpp
index 98a95778..aa22e4a4 100644
--- a/src/win/native/keyboard.cpp
+++ b/src/win/native/keyboard.cpp
@@ -1,4 +1,4 @@
-#include "cru/win/native/keyboard.hpp"
+#include "cru/win/native/Keyboard.hpp"
 
 namespace cru::platform::native::win {
 KeyCode VirtualKeyToKeyCode(int virtual_key) {
diff --git a/src/win/native/timer.cpp b/src/win/native/timer.cpp
index 66743963..662067fb 100644
--- a/src/win/native/timer.cpp
+++ b/src/win/native/timer.cpp
@@ -1,4 +1,4 @@
-#include "timer.hpp"
+#include "Timer.hpp"
 
 namespace cru::platform::native::win {
 TimerManager::TimerManager(GodWindow* god_window) { god_window_ = god_window; }
diff --git a/src/win/native/timer.hpp b/src/win/native/timer.hpp
index 6c4871dd..95f186a1 100644
--- a/src/win/native/timer.hpp
+++ b/src/win/native/timer.hpp
@@ -1,8 +1,8 @@
 #pragma once
-#include "cru/win/win_pre_config.hpp"
+#include "cru/win/WinPreConfig.hpp"
 
-#include "cru/common/base.hpp"
-#include "cru/win/native/god_window.hpp"
+#include "cru/common/Base.hpp"
+#include "cru/win/native/GodWindow.hpp"
 
 #include <chrono>
 #include <functional>
diff --git a/src/win/native/window.cpp b/src/win/native/window.cpp
index bed9a264..9dde1af3 100644
--- a/src/win/native/window.cpp
+++ b/src/win/native/window.cpp
@@ -1,17 +1,17 @@
-#include "cru/win/native/window.hpp"
-
-#include "cru/common/logger.hpp"
-#include "cru/platform/check.hpp"
-#include "cru/win/native/cursor.hpp"
-#include "cru/win/native/exception.hpp"
-#include "cru/win/native/keyboard.hpp"
-#include "cru/win/native/ui_application.hpp"
-#include "cru/win/native/window_class.hpp"
-#include "cru/win/native/window_render_target.hpp"
-#include "cru/win/string.hpp"
-#include "dpi_util.hpp"
-#include "window_d2d_painter.hpp"
-#include "window_manager.hpp"
+#include "cru/win/native/Window.hpp"
+
+#include "cru/common/Logger.hpp"
+#include "cru/platform/Check.hpp"
+#include "cru/win/native/Cursor.hpp"
+#include "cru/win/native/Exception.hpp"
+#include "cru/win/native/Keyboard.hpp"
+#include "cru/win/native/UiApplication.hpp"
+#include "cru/win/native/WindowClass.hpp"
+#include "cru/win/native/WindowRenderTarget.hpp"
+#include "cru/win/String.hpp"
+#include "DpiUtil.hpp"
+#include "WindowD2DPainter.hpp"
+#include "WindowManager.hpp"
 
 #include <imm.h>
 #include <windowsx.h>
diff --git a/src/win/string.cpp b/src/win/string.cpp
index 5518e6af..65a280f2 100644
--- a/src/win/string.cpp
+++ b/src/win/string.cpp
@@ -1,6 +1,6 @@
-#include "cru/win/string.hpp"
+#include "cru/win/String.hpp"
 
-#include "cru/win/exception.hpp"
+#include "cru/win/Exception.hpp"
 
 #include <type_traits>