12 files changed, 6 insertions, 22 deletions
diff --git a/src/platform/gui/win/Resource.cpp b/src/platform/gui/win/Base.cpp
index 6fb4d634..2db07eb0 100644
--- a/src/platform/gui/win/Resource.cpp
+++ b/src/platform/gui/win/Base.cpp
@@ -1,4 +1,4 @@
-#include "cru/platform/gui/win/Resource.h"
+#include "cru/platform/gui/win/Base.h"
 
 namespace cru::platform::gui::win {
 std::string WinNativeResource::kPlatformId = "Windows";
diff --git a/src/platform/gui/win/CMakeLists.txt b/src/platform/gui/win/CMakeLists.txt
index 9f2263fd..d5ac6851 100644
--- a/src/platform/gui/win/CMakeLists.txt
+++ b/src/platform/gui/win/CMakeLists.txt
@@ -1,10 +1,10 @@
 add_library(CruPlatformGuiWin
+	Base.cpp
 	Clipboard.cpp
 	Cursor.cpp
 	GodWindow.cpp
 	InputMethod.cpp
 	Keyboard.cpp
-	Resource.cpp
 	TimerManager.cpp
 	UiApplication.cpp
 	Window.cpp
diff --git a/src/platform/gui/win/Clipboard.cpp b/src/platform/gui/win/Clipboard.cpp
index 1ffb0254..f5d2513a 100644
--- a/src/platform/gui/win/Clipboard.cpp
+++ b/src/platform/gui/win/Clipboard.cpp
@@ -1,5 +1,4 @@
 #include "cru/platform/gui/win/Clipboard.h"
-#include <string>
 #include "cru/base/StringUtil.h"
 #include "cru/base/log/Logger.h"
 #include "cru/platform/gui/win/GodWindow.h"
diff --git a/src/platform/gui/win/Cursor.cpp b/src/platform/gui/win/Cursor.cpp
index c5424eb4..0ed40416 100644
--- a/src/platform/gui/win/Cursor.cpp
+++ b/src/platform/gui/win/Cursor.cpp
@@ -1,7 +1,5 @@
 #include "cru/platform/gui/win/Cursor.h"
-
 #include "cru/base/log/Logger.h"
-#include "cru/platform/gui/win/Exception.h"
 
 #include <stdexcept>
 
@@ -17,7 +15,7 @@ WinCursor::~WinCursor() {
       // This is not a fetal error but might still need notice because it may
       // cause leak.
       CRU_LOG_TAG_WARN("Failed to destroy a cursor. Last error code: {}",
-                   ::GetLastError());
+                       ::GetLastError());
     }
   }
 }
diff --git a/src/platform/gui/win/GodWindow.cpp b/src/platform/gui/win/GodWindow.cpp
index 7f24fd17..7cdf229c 100644
--- a/src/platform/gui/win/GodWindow.cpp
+++ b/src/platform/gui/win/GodWindow.cpp
@@ -1,7 +1,5 @@
 #include "cru/platform/gui/win/GodWindow.h"
-
 #include "cru/base/log/Logger.h"
-#include "cru/platform/gui/win/Exception.h"
 #include "cru/platform/gui/win/UiApplication.h"
 #include "cru/platform/gui/win/WindowClass.h"
 
diff --git a/src/platform/gui/win/InputMethod.cpp b/src/platform/gui/win/InputMethod.cpp
index 1d7e2629..c5aca657 100644
--- a/src/platform/gui/win/InputMethod.cpp
+++ b/src/platform/gui/win/InputMethod.cpp
@@ -1,5 +1,4 @@
 #include "cru/platform/gui/win/InputMethod.h"
-
 #include "cru/base/StringUtil.h"
 #include "cru/base/log/Logger.h"
 #include "cru/platform/gui/DebugFlags.h"
diff --git a/src/platform/gui/win/TimerManager.cpp b/src/platform/gui/win/TimerManager.cpp
index 3fc9afe4..794e714c 100644
--- a/src/platform/gui/win/TimerManager.cpp
+++ b/src/platform/gui/win/TimerManager.cpp
@@ -1,8 +1,5 @@
 #include "TimerManager.h"
 
-#include "cru/platform/gui/win/Base.h"
-#include "cru/platform/gui/win/Exception.h"
-
 #include <functional>
 
 namespace cru::platform::gui::win {
diff --git a/src/platform/gui/win/TimerManager.h b/src/platform/gui/win/TimerManager.h
index 9b049310..b35ef1fc 100644
--- a/src/platform/gui/win/TimerManager.h
+++ b/src/platform/gui/win/TimerManager.h
@@ -1,7 +1,6 @@
 #pragma once
-#include "cru/base/Event.h"
-
 #include "cru/base/Base.h"
+#include "cru/base/Event.h"
 #include "cru/platform/gui/win/GodWindow.h"
 #include "cru/platform/gui/win/WindowNativeMessageEventArgs.h"
 
diff --git a/src/platform/gui/win/UiApplication.cpp b/src/platform/gui/win/UiApplication.cpp
index 9909cd47..0de79675 100644
--- a/src/platform/gui/win/UiApplication.cpp
+++ b/src/platform/gui/win/UiApplication.cpp
@@ -6,7 +6,6 @@
 #include "cru/platform/gui/win/Base.h"
 #include "cru/platform/gui/win/Clipboard.h"
 #include "cru/platform/gui/win/Cursor.h"
-#include "cru/platform/gui/win/Exception.h"
 #include "cru/platform/gui/win/GodWindow.h"
 #include "cru/platform/gui/win/Window.h"
 
diff --git a/src/platform/gui/win/Window.cpp b/src/platform/gui/win/Window.cpp
index 35f79a66..2acd4c75 100644
--- a/src/platform/gui/win/Window.cpp
+++ b/src/platform/gui/win/Window.cpp
@@ -9,7 +9,6 @@
 #include "cru/platform/gui/Input.h"
 #include "cru/platform/gui/Window.h"
 #include "cru/platform/gui/win/Cursor.h"
-#include "cru/platform/gui/win/Exception.h"
 #include "cru/platform/gui/win/InputMethod.h"
 #include "cru/platform/gui/win/Keyboard.h"
 #include "cru/platform/gui/win/UiApplication.h"
@@ -219,7 +218,7 @@ void WinNativeWindow::RequestRepaint() {
 std::unique_ptr<graphics::IPainter> WinNativeWindow::BeginPaint() {
   if (hwnd_)
     return std::make_unique<graphics::direct2d::D2DWindowPainter>(
-        window_render_target_.get());
+        application_->GetDirectFactory(), window_render_target_.get());
   else
     return std::make_unique<graphics::NullPainter>();
 }
diff --git a/src/platform/gui/win/WindowClass.cpp b/src/platform/gui/win/WindowClass.cpp
index 67ff4710..bf8e9c76 100644
--- a/src/platform/gui/win/WindowClass.cpp
+++ b/src/platform/gui/win/WindowClass.cpp
@@ -1,7 +1,5 @@
 #include "cru/platform/gui/win/WindowClass.h"
 
-#include "cru/platform/gui/win/Exception.h"
-
 namespace cru::platform::gui::win {
 WindowClass::WindowClass(std::wstring name, WNDPROC window_proc,
                          HINSTANCE h_instance)
diff --git a/src/platform/gui/win/WindowManager.h b/src/platform/gui/win/WindowManager.h
index 1bbcd25e..e674c951 100644
--- a/src/platform/gui/win/WindowManager.h
+++ b/src/platform/gui/win/WindowManager.h
@@ -1,7 +1,5 @@
 #pragma once
-#include "cru/platform/win/WinPreConfig.h"
-
-#include "cru/base/Base.h"
+#include "cru/base/platform/win/Base.h"
 
 #include <map>
 #include <memory>