7 files changed, 17 insertions, 47 deletions
diff --git a/include/cru/platform/gui/osx/Resource.h b/include/cru/platform/gui/osx/Base.h
index 1253544c..48388ddf 100644
--- a/include/cru/platform/gui/osx/Resource.h
+++ b/include/cru/platform/gui/osx/Base.h
@@ -1,16 +1,12 @@
 #pragma once
-#include "cru/platform/osx/Resource.h"
+#include <cru/platform/Base.h>
 
 #include <cru/platform/gui/UiApplication.h>
 
 namespace cru::platform::gui::osx {
-class OsxGuiResource : public platform::osx::OsxResource {
+class OsxGuiResource : public Object, public virtual IPlatformResource {
  public:
   explicit OsxGuiResource(IUiApplication* ui_application);
-
-  CRU_DELETE_COPY(OsxGuiResource)
-  CRU_DELETE_MOVE(OsxGuiResource)
-
   ~OsxGuiResource() override = default;
 
  public:
diff --git a/include/cru/platform/gui/osx/Clipboard.h b/include/cru/platform/gui/osx/Clipboard.h
index 6672f84d..838ad9a6 100644
--- a/include/cru/platform/gui/osx/Clipboard.h
+++ b/include/cru/platform/gui/osx/Clipboard.h
@@ -1,8 +1,7 @@
 #pragma once
-#include "Resource.h"
+#include "Base.h"
 
-#include "cru/platform/gui/Base.h"
-#include "cru/platform/gui/Clipboard.h"
+#include <cru/platform/gui/Clipboard.h>
 
 #include <memory>
 
@@ -15,10 +14,6 @@ class OsxClipboard : public OsxGuiResource, public virtual IClipboard {
  public:
   OsxClipboard(cru::platform::gui::IUiApplication* ui_application,
                std::unique_ptr<details::OsxClipboardPrivate> p);
-
-  CRU_DELETE_COPY(OsxClipboard)
-  CRU_DELETE_MOVE(OsxClipboard)
-
   ~OsxClipboard() override;
 
  public:
diff --git a/include/cru/platform/gui/osx/Cursor.h b/include/cru/platform/gui/osx/Cursor.h
index 6cfd400a..582e25af 100644
--- a/include/cru/platform/gui/osx/Cursor.h
+++ b/include/cru/platform/gui/osx/Cursor.h
@@ -1,6 +1,7 @@
 #pragma once
-#include "Resource.h"
-#include "cru/platform/gui/Cursor.h"
+#include "Base.h"
+
+#include <cru/platform/gui/Cursor.h>
 
 #include <memory>
 
@@ -17,9 +18,6 @@ class OsxCursor : public OsxGuiResource, public virtual ICursor {
 
  public:
   OsxCursor(IUiApplication* ui_application, SystemCursorType cursor_type);
-  CRU_DELETE_COPY(OsxCursor)
-  CRU_DELETE_MOVE(OsxCursor)
-
   ~OsxCursor() override;
 
  private:
@@ -29,10 +27,6 @@ class OsxCursor : public OsxGuiResource, public virtual ICursor {
 class OsxCursorManager : public OsxGuiResource, public virtual ICursorManager {
  public:
   explicit OsxCursorManager(IUiApplication* ui_application);
-
-  CRU_DELETE_COPY(OsxCursorManager)
-  CRU_DELETE_MOVE(OsxCursorManager)
-
   ~OsxCursorManager() override;
 
   std::shared_ptr<ICursor> GetSystemCursor(SystemCursorType type) override;
diff --git a/include/cru/platform/gui/osx/InputMethod.h b/include/cru/platform/gui/osx/InputMethod.h
index 067d86ea..9044a76c 100644
--- a/include/cru/platform/gui/osx/InputMethod.h
+++ b/include/cru/platform/gui/osx/InputMethod.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "Resource.h"
+#include "Base.h"
 
-#include "cru/platform/gui/InputMethod.h"
+#include <cru/platform/gui/InputMethod.h>
 
 namespace cru::platform::gui::osx {
 class OsxWindow;
@@ -19,10 +19,6 @@ class OsxInputMethodContext : public OsxGuiResource,
 
  public:
   explicit OsxInputMethodContext(OsxWindow* window);
-
-  CRU_DELETE_COPY(OsxInputMethodContext)
-  CRU_DELETE_MOVE(OsxInputMethodContext)
-
   ~OsxInputMethodContext() override;
 
  public:
diff --git a/include/cru/platform/gui/osx/Menu.h b/include/cru/platform/gui/osx/Menu.h
index 05f21e1c..296adb69 100644
--- a/include/cru/platform/gui/osx/Menu.h
+++ b/include/cru/platform/gui/osx/Menu.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "Resource.h"
+#include "Base.h"
 
-#include "cru/platform/gui/Menu.h"
+#include <cru/platform/gui/Menu.h>
 
 namespace cru::platform::gui::osx {
 namespace details {
@@ -19,9 +19,6 @@ class OsxMenuItem : public OsxGuiResource, public virtual IMenuItem {
   explicit OsxMenuItem(IUiApplication* ui_application);
 
  public:
-  CRU_DELETE_COPY(OsxMenuItem)
-  CRU_DELETE_MOVE(OsxMenuItem)
-
   ~OsxMenuItem() override;
 
  public:
diff --git a/include/cru/platform/gui/osx/UiApplication.h b/include/cru/platform/gui/osx/UiApplication.h
index f0e311dc..e8bcb9f8 100644
--- a/include/cru/platform/gui/osx/UiApplication.h
+++ b/include/cru/platform/gui/osx/UiApplication.h
@@ -1,6 +1,7 @@
 #pragma once
-#include "Resource.h"
-#include "cru/platform/gui/UiApplication.h"
+#include "Base.h"
+
+#include <cru/platform/gui/UiApplication.h>
 
 #include <functional>
 #include <memory>
@@ -18,10 +19,6 @@ class OsxUiApplication : public OsxGuiResource, public virtual IUiApplication {
 
  public:
   OsxUiApplication();
-
-  CRU_DELETE_COPY(OsxUiApplication)
-  CRU_DELETE_MOVE(OsxUiApplication)
-
   ~OsxUiApplication() override;
 
  public:
diff --git a/include/cru/platform/gui/osx/Window.h b/include/cru/platform/gui/osx/Window.h
index d00136b0..f4bda28e 100644
--- a/include/cru/platform/gui/osx/Window.h
+++ b/include/cru/platform/gui/osx/Window.h
@@ -1,8 +1,7 @@
 #pragma once
-#include "Resource.h"
-#include "cru/platform/gui/Base.h"
-#include "cru/platform/gui/InputMethod.h"
-#include "cru/platform/gui/Window.h"
+#include "Base.h"
+
+#include <cru/platform/gui/Window.h>
 
 #include <memory>
 
@@ -21,10 +20,6 @@ class OsxWindow : public OsxGuiResource, public INativeWindow {
 
  public:
   OsxWindow(OsxUiApplication* ui_application);
-
-  CRU_DELETE_COPY(OsxWindow)
-  CRU_DELETE_MOVE(OsxWindow)
-
   ~OsxWindow() override;
 
  public: