diff --git a/include/Keyboard.hpp b/include/Keyboard.hpp
index b111d2c5..de59b6a7 100644
--- a/include/Keyboard.hpp
+++ b/include/Keyboard.hpp
@@ -7,8 +7,7 @@ namespace raylib {
 /**
  * Input-related functions: keyboard
  */
-class Keyboard {
- public:
+namespace Keyboard {
     /**
      * Detect if a key has been pressed once
      */
@@ -60,6 +59,6 @@ class Keyboard {
 };
 } // namespace raylib
 
-using RKeyboard = raylib::Keyboard;
+namespace RKeyboard = raylib::Keyboard;
 
 #endif // RAYLIB_CPP_INCLUDE_KEYBOARD_HPP_
diff --git a/include/Mouse.hpp b/include/Mouse.hpp
index 4416497a..4eb6d16d 100644
--- a/include/Mouse.hpp
+++ b/include/Mouse.hpp
@@ -8,8 +8,7 @@ namespace raylib {
 /**
  * Input-related functions: mouse
  */
-class Mouse {
- public:
+namespace Mouse {
     /**
      * Detect if a mouse button has been pressed once
      */
@@ -148,6 +147,6 @@ class Mouse {
 };
 }  // namespace raylib
 
-using RMouse = raylib::Mouse;
+namespace RMouse = raylib::Mouse;
 
 #endif  // RAYLIB_CPP_INCLUDE_MOUSE_HPP_