10 files changed, 34 insertions, 69 deletions
diff --git a/include/cru/platform/gui/win/Base.h b/include/cru/platform/gui/win/Base.h
index 5c9ab7d3..9c253950 100644
--- a/include/cru/platform/gui/win/Base.h
+++ b/include/cru/platform/gui/win/Base.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "cru/platform/win/WinPreConfig.h"
-
-#include "cru/base/Base.h"
+#include <cru/base/Base.h>
+#include <cru/base/platform/win/Base.h>
+#include <cru/platform/Base.h>
 
 #ifdef CRU_IS_DLL
 #ifdef CRU_WIN_GUI_EXPORT_API
@@ -14,6 +14,9 @@
 #endif
 
 namespace cru::platform::gui::win {
+using platform::win::HResultError;
+using platform::win::Win32Error;
+
 class GodWindow;
 class TimerManager;
 class WinCursor;
@@ -24,4 +27,16 @@ class WinNativeWindow;
 class WinUiApplication;
 class WinInputMethodContext;
 class WinClipboard;
+
+class CRU_WIN_GUI_API WinNativeResource : public Object,
+                                          public virtual IPlatformResource {
+ public:
+  static std::string kPlatformId;
+
+ protected:
+  WinNativeResource() = default;
+
+ public:
+  std::string GetPlatformId() const final { return kPlatformId; }
+};
 }  // namespace cru::platform::gui::win
diff --git a/include/cru/platform/gui/win/Clipboard.h b/include/cru/platform/gui/win/Clipboard.h
index 50a3aeea..d9ef0532 100644
--- a/include/cru/platform/gui/win/Clipboard.h
+++ b/include/cru/platform/gui/win/Clipboard.h
@@ -1,8 +1,7 @@
 #pragma once
-#include "Resource.h"
-#include "cru/base/Base.h"
-#include "cru/platform/gui/Clipboard.h"
-#include "cru/platform/gui/win/Base.h"
+#include "Base.h"
+
+#include <cru/platform/gui/Clipboard.h>
 
 namespace cru::platform::gui::win {
 class WinClipboard : public WinNativeResource, public virtual IClipboard {
@@ -10,9 +9,6 @@ class WinClipboard : public WinNativeResource, public virtual IClipboard {
  public:
   explicit WinClipboard(WinUiApplication* application);
 
-  CRU_DELETE_COPY(WinClipboard)
-  CRU_DELETE_MOVE(WinClipboard)
-
   ~WinClipboard() override;
 
  public:
diff --git a/include/cru/platform/gui/win/Cursor.h b/include/cru/platform/gui/win/Cursor.h
index 66b0f657..48817061 100644
--- a/include/cru/platform/gui/win/Cursor.h
+++ b/include/cru/platform/gui/win/Cursor.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "Resource.h"
+#include "Base.h"
 
-#include "cru/platform/gui/Cursor.h"
+#include <cru/platform/gui/Cursor.h>
 
 #include <memory>
 
@@ -13,9 +13,6 @@ class CRU_WIN_GUI_API WinCursor : public WinNativeResource,
  public:
   WinCursor(HCURSOR handle, bool auto_destroy);
 
-  CRU_DELETE_COPY(WinCursor)
-  CRU_DELETE_MOVE(WinCursor)
-
   ~WinCursor() override;
 
  public:
@@ -31,9 +28,6 @@ class WinCursorManager : public WinNativeResource,
  public:
   WinCursorManager();
 
-  CRU_DELETE_COPY(WinCursorManager)
-  CRU_DELETE_MOVE(WinCursorManager)
-
   ~WinCursorManager() override = default;
 
  public:
diff --git a/include/cru/platform/gui/win/Exception.h b/include/cru/platform/gui/win/Exception.h
deleted file mode 100644
index a0689075..00000000
--- a/include/cru/platform/gui/win/Exception.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-#include "cru/platform/win/Exception.h"
-
-namespace cru::platform::gui::win {
-using platform::win::HResultError;
-using platform::win::Win32Error;
-}  // namespace cru::platform::gui::win
diff --git a/include/cru/platform/gui/win/GodWindow.h b/include/cru/platform/gui/win/GodWindow.h
index 439c0125..22068ff5 100644
--- a/include/cru/platform/gui/win/GodWindow.h
+++ b/include/cru/platform/gui/win/GodWindow.h
@@ -1,8 +1,8 @@
 #pragma once
 #include "Base.h"
-
 #include "WindowNativeMessageEventArgs.h"
-#include "cru/base/Event.h"
+
+#include <cru/base/Event.h>
 
 #include <memory>
 
diff --git a/include/cru/platform/gui/win/InputMethod.h b/include/cru/platform/gui/win/InputMethod.h
index fa4d5882..bf59387b 100644
--- a/include/cru/platform/gui/win/InputMethod.h
+++ b/include/cru/platform/gui/win/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.h"
-
+#include "Base.h"
 #include "WindowNativeMessageEventArgs.h"
-#include "cru/platform/gui/InputMethod.h"
+
+#include <cru/platform/gui/InputMethod.h>
 
 #include <imm.h>
 
@@ -41,9 +41,6 @@ class CRU_WIN_GUI_API WinInputMethodContext
  public:
   WinInputMethodContext(WinNativeWindow* window);
 
-  CRU_DELETE_COPY(WinInputMethodContext)
-  CRU_DELETE_MOVE(WinInputMethodContext)
-
   ~WinInputMethodContext() override;
 
   bool ShouldManuallyDrawCompositionText() override { return true; }
diff --git a/include/cru/platform/gui/win/Resource.h b/include/cru/platform/gui/win/Resource.h
deleted file mode 100644
index 98853ed7..00000000
--- a/include/cru/platform/gui/win/Resource.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-#include "Base.h"
-
-#include <cru/platform/Base.h>
-
-namespace cru::platform::gui::win {
-class CRU_WIN_GUI_API WinNativeResource : public Object,
-                                          public virtual IPlatformResource {
- public:
-  static std::string kPlatformId;
-
- protected:
-  WinNativeResource() = default;
-
- public:
-  ~WinNativeResource() override = default;
-
- public:
-  std::string GetPlatformId() const final { return kPlatformId; }
-};
-}  // namespace cru::platform::gui::win
diff --git a/include/cru/platform/gui/win/UiApplication.h b/include/cru/platform/gui/win/UiApplication.h
index 5abe7356..9b1d011b 100644
--- a/include/cru/platform/gui/win/UiApplication.h
+++ b/include/cru/platform/gui/win/UiApplication.h
@@ -1,8 +1,7 @@
 #pragma once
-#include "Resource.h"
+#include "Base.h"
 
-#include "cru/platform/gui/Base.h"
-#include "cru/platform/gui/UiApplication.h"
+#include <cru/platform/gui/UiApplication.h>
 
 #include <memory>
 
@@ -22,9 +21,6 @@ class CRU_WIN_GUI_API WinUiApplication : public WinNativeResource,
  public:
   WinUiApplication();
 
-  CRU_DELETE_COPY(WinUiApplication)
-  CRU_DELETE_MOVE(WinUiApplication)
-
   ~WinUiApplication() override;
 
  public:
diff --git a/include/cru/platform/gui/win/Window.h b/include/cru/platform/gui/win/Window.h
index f315f3d3..409574eb 100644
--- a/include/cru/platform/gui/win/Window.h
+++ b/include/cru/platform/gui/win/Window.h
@@ -1,9 +1,9 @@
 #pragma once
-#include "Resource.h"
-
+#include "Base.h"
 #include "WindowNativeMessageEventArgs.h"
-#include "cru/platform/gui/Window.h"
-#include "cru/platform/graphics/direct2d/WindowRenderTarget.h"
+
+#include <cru/platform/gui/Window.h>
+#include <cru/platform/graphics/direct2d/WindowRenderTarget.h>
 
 #include <memory>
 
@@ -15,9 +15,6 @@ class CRU_WIN_GUI_API WinNativeWindow : public WinNativeResource,
  public:
   explicit WinNativeWindow(WinUiApplication* application);
 
-  CRU_DELETE_COPY(WinNativeWindow)
-  CRU_DELETE_MOVE(WinNativeWindow)
-
   ~WinNativeWindow() override;
 
  public:
diff --git a/include/cru/platform/gui/win/WindowNativeMessageEventArgs.h b/include/cru/platform/gui/win/WindowNativeMessageEventArgs.h
index 3a89b786..169d2c74 100644
--- a/include/cru/platform/gui/win/WindowNativeMessageEventArgs.h
+++ b/include/cru/platform/gui/win/WindowNativeMessageEventArgs.h
@@ -1,8 +1,6 @@
 #pragma once
 #include "Base.h"
 
-#include "cru/base/Base.h"
-
 namespace cru::platform::gui::win {
 struct CRU_WIN_GUI_API WindowNativeMessage {
   HWND hwnd;