7 files changed, 21 insertions, 20 deletions
diff --git a/include/cru/platform/gui/xcb/Base.h b/include/cru/platform/gui/xcb/Base.h
index ad571a40..71007f87 100644
--- a/include/cru/platform/gui/xcb/Base.h
+++ b/include/cru/platform/gui/xcb/Base.h
@@ -1,19 +1,19 @@
 #pragma once
 
 #include <cru/base/Exception.h>
-
-#include "../../Resource.h"
+#include <cru/platform/Resource.h>
+#include <cru/platform/gui/Base.h>
 
 namespace cru::platform::gui::xcb {
 class XcbResource : public Object, public virtual IPlatformResource {
  public:
-  static constexpr const char16_t* kPlatformId = u"XCB";
+  static constexpr const char* kPlatformId = "XCB";
 
  protected:
   XcbResource() = default;
 
  public:
-  String GetPlatformId() const final { return String(kPlatformId); }
+  std::string GetPlatformId() const final { return std::string(kPlatformId); }
 };
 
 class XcbException : public PlatformException {
diff --git a/include/cru/platform/gui/xcb/Clipboard.h b/include/cru/platform/gui/xcb/Clipboard.h
index 44294cbc..690cd2b1 100644
--- a/include/cru/platform/gui/xcb/Clipboard.h
+++ b/include/cru/platform/gui/xcb/Clipboard.h
@@ -10,8 +10,8 @@ class XcbClipboard : public XcbResource, public virtual IClipboard {
   explicit XcbClipboard(XcbUiApplication* application);
   ~XcbClipboard() override;
 
-  String GetText() override;
-  void SetText(String text) override;
+  std::string GetText() override;
+  void SetText(std::string text) override;
 
  private:
   XcbUiApplication* application_;
diff --git a/include/cru/platform/gui/xcb/Cursor.h b/include/cru/platform/gui/xcb/Cursor.h
index 02ede7dd..03399333 100644
--- a/include/cru/platform/gui/xcb/Cursor.h
+++ b/include/cru/platform/gui/xcb/Cursor.h
@@ -1,9 +1,10 @@
 #pragma once
 
-#include <cru/base/io/Stream.h>
-#include "../Cursor.h"
 #include "Base.h"
 
+#include <cru/base/io/Stream.h>
+#include <cru/platform/gui/Cursor.h>
+
 #include <xcb/xcb.h>
 #include <xcb/xcb_cursor.h>
 #include <memory>
diff --git a/include/cru/platform/gui/xcb/Keyboard.h b/include/cru/platform/gui/xcb/Input.h
index adff95c1..77e213de 100644
--- a/include/cru/platform/gui/xcb/Keyboard.h
+++ b/include/cru/platform/gui/xcb/Input.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <cru/platform/gui/Keyboard.h>
+#include <cru/platform/gui/Input.h>
 
 #include <xcb/xcb.h>
 #include <xkbcommon/xkbcommon.h>
diff --git a/include/cru/platform/gui/xcb/InputMethod.h b/include/cru/platform/gui/xcb/InputMethod.h
index c5ffd416..e32ed63e 100644
--- a/include/cru/platform/gui/xcb/InputMethod.h
+++ b/include/cru/platform/gui/xcb/InputMethod.h
@@ -1,9 +1,10 @@
 #pragma once
 
-#include <cru/base/Base.h>
-#include "../InputMethod.h"
 #include "Base.h"
 
+#include <cru/base/Base.h>
+#include <cru/platform/gui/InputMethod.h>
+
 #include <xcb-imdkit/imclient.h>
 #include <xcb/xcb.h>
 #include <optional>
@@ -66,7 +67,7 @@ class XcbXimInputMethodContext : public XcbResource,
   IEvent<std::nullptr_t>* CompositionStartEvent() override;
   IEvent<std::nullptr_t>* CompositionEndEvent() override;
   IEvent<std::nullptr_t>* CompositionEvent() override;
-  IEvent<StringView>* TextEvent() override;
+  IEvent<std::string>* TextEvent() override;
 
  private:
   void CreateIc(xcb_window_t window);
@@ -83,6 +84,6 @@ class XcbXimInputMethodContext : public XcbResource,
   Event<std::nullptr_t> composition_start_event_;
   Event<std::nullptr_t> composition_end_event_;
   Event<std::nullptr_t> composition_event_;
-  Event<StringView> text_event_;
+  Event<std::string> text_event_;
 };
 }  // namespace cru::platform::gui::xcb
diff --git a/include/cru/platform/gui/xcb/UiApplication.h b/include/cru/platform/gui/xcb/UiApplication.h
index ab481c79..55138fd3 100644
--- a/include/cru/platform/gui/xcb/UiApplication.h
+++ b/include/cru/platform/gui/xcb/UiApplication.h
@@ -1,9 +1,9 @@
 #pragma once
-#include "../UiApplication.h"
 #include "Base.h"
 
 #include <cru/base/platform/unix/EventLoop.h>
 #include <cru/platform/graphics/cairo/CairoGraphicsFactory.h>
+#include <cru/platform/gui/UiApplication.h>
 
 #include <xcb/xcb.h>
 #include <functional>
diff --git a/include/cru/platform/gui/xcb/Window.h b/include/cru/platform/gui/xcb/Window.h
index 5f1fd66e..bfd86297 100644
--- a/include/cru/platform/gui/xcb/Window.h
+++ b/include/cru/platform/gui/xcb/Window.h
@@ -1,11 +1,10 @@
 
 #pragma once
-#include <cru/base/Base.h>
-#include "../../GraphicsBase.h"
-#include "../TimerHelper.h"
-#include "../Window.h"
 #include "Base.h"
 
+#include <cru/platform/gui/TimerHelper.h>
+#include <cru/platform/gui/Window.h>
+
 #include <cairo.h>
 #include <xcb/xcb.h>
 #include <cstddef>
@@ -34,8 +33,8 @@ class XcbWindow : public XcbResource, public virtual INativeWindow {
   WindowStyleFlag GetStyleFlag() override;
   void SetStyleFlag(WindowStyleFlag flag) override;
 
-  String GetTitle() override;
-  void SetTitle(String title) override;
+  std::string GetTitle() override;
+  void SetTitle(std::string title) override;
 
   WindowVisibilityType GetVisibility() override;
   void SetVisibility(WindowVisibilityType visibility) override;