3 files changed, 11 insertions, 10 deletions
diff --git a/include/cru/ui/events/KeyEventArgs.h b/include/cru/ui/events/KeyEventArgs.h
index 0ece9126..bf6c8c0f 100644
--- a/include/cru/ui/events/KeyEventArgs.h
+++ b/include/cru/ui/events/KeyEventArgs.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "UiEventArgs.h"
 
-#include "cru/platform/gui/Keyboard.h"
+#include "cru/platform/gui/Input.h"
 
 namespace cru::ui::events {
 class CRU_UI_API KeyEventArgs : public UiEventArgs {
@@ -26,4 +26,4 @@ class CRU_UI_API KeyEventArgs : public UiEventArgs {
   platform::gui::KeyModifier key_modifier_;
 };
 
-}  // namespace cru::ui::event
+}  // namespace cru::ui::events
diff --git a/include/cru/ui/events/MouseButtonEventArgs.h b/include/cru/ui/events/MouseButtonEventArgs.h
index 13b3b0a4..57a84cfb 100644
--- a/include/cru/ui/events/MouseButtonEventArgs.h
+++ b/include/cru/ui/events/MouseButtonEventArgs.h
@@ -1,20 +1,21 @@
 #pragma once
 #include "MouseEventArgs.h"
 
-#include "cru/platform/gui/Keyboard.h"
+#include "cru/platform/gui/Input.h"
 
 namespace cru::ui::events {
 
 class CRU_UI_API MouseButtonEventArgs : public MouseEventArgs {
  public:
   MouseButtonEventArgs(Object* sender, Object* original_sender,
-                       const Point& point, const MouseButton button,
+                       const Point& point,
+                       const platform::gui::MouseButton button,
                        platform::gui::KeyModifier key_modifier)
       : MouseEventArgs(sender, original_sender, point),
         button_(button),
         key_modifier_(key_modifier) {}
   MouseButtonEventArgs(Object* sender, Object* original_sender,
-                       const MouseButton button,
+                       const platform::gui::MouseButton button,
                        platform::gui::KeyModifier key_modifier)
       : MouseEventArgs(sender, original_sender),
         button_(button),
@@ -25,11 +26,11 @@ class CRU_UI_API MouseButtonEventArgs : public MouseEventArgs {
   MouseButtonEventArgs& operator=(MouseButtonEventArgs&& other) = default;
   ~MouseButtonEventArgs() override = default;
 
-  MouseButton GetButton() const { return button_; }
+  platform::gui::MouseButton GetButton() const { return button_; }
   platform::gui::KeyModifier GetKeyModifier() const { return key_modifier_; }
 
  private:
-  MouseButton button_;
+  platform::gui::MouseButton button_;
   platform::gui::KeyModifier key_modifier_;
 };
-}  // namespace cru::ui::event
+}  // namespace cru::ui::events
diff --git a/include/cru/ui/events/MouseWheelEventArgs.h b/include/cru/ui/events/MouseWheelEventArgs.h
index 85791491..9ed63924 100644
--- a/include/cru/ui/events/MouseWheelEventArgs.h
+++ b/include/cru/ui/events/MouseWheelEventArgs.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "MouseEventArgs.h"
 
-#include "cru/platform/gui/Keyboard.h"
+#include <cru/platform/gui/Input.h>
 
 namespace cru::ui::events {
 class CRU_UI_API MouseWheelEventArgs : public MouseEventArgs {
@@ -26,4 +26,4 @@ class CRU_UI_API MouseWheelEventArgs : public MouseEventArgs {
   float delta_;
   platform::gui::KeyModifier key_modifier_;
 };
-}  // namespace cru::ui::event
+}  // namespace cru::ui::events