diff --git a/include/jstick.hpp b/include/jstick.hpp
index 163b9d7..fd4a0a3 100644
--- a/include/jstick.hpp
+++ b/include/jstick.hpp
@@ -66,21 +66,21 @@ namespace jstick {
 
     /// This event is fired when a new joystick device is detected.
     // TODO: Call JoystickConnected for each device found on library runtime start.
-    static Event<int> JoystickConnected;
+    inline Event<int> JoystickConnected;
 
     /// This event is fired when a joystick device is unplugged or otherwise dropped.
-    static Event<int> JoystickDisconnected;
+    inline Event<int> JoystickDisconnected;
 
     /// This event is fired when a joystick button is pressed.
-    static Event<XBoxButton> ButtonPressed;
+    inline Event<XBoxButton> ButtonPressed;
 
     /// This event is fired when a xbox button is pressed.
-    static Event<XBoxButton> ButtonReleased;
-    static Event<Vector2> LeftThumbstickMoved;
-    static Event<Vector2> RightThumbstickMoved;
-    static Event<Vector2> DPadMoved;
-    static Event<short> LeftTriggerMoved;
-    static Event<short> RightTriggerMoved;
+    inline Event<XBoxButton> ButtonReleased;
+    inline Event<Vector2> LeftThumbstickMoved;
+    inline Event<Vector2> RightThumbstickMoved;
+    inline Event<Vector2> DPadMoved;
+    inline Event<short> LeftTriggerMoved;
+    inline Event<short> RightTriggerMoved;
     //Event<int, JoystickAxis> AxisMoved;