diff --git a/include/gamepad/controller.hpp b/include/gamepad/controller.hpp
index f00baf2..acc7a9e 100644
--- a/include/gamepad/controller.hpp
+++ b/include/gamepad/controller.hpp
@@ -43,8 +43,15 @@ class Button {
         EventHandler<> onReleaseEvent;
 };
 
+namespace _impl {
+static struct ControllerInit {
+        ControllerInit();
+        ~ControllerInit();
+} _controllerInit;
+} // namespace _impl
+
 class Controller {
-        friend struct ControllerInit;
+        friend struct _impl::ControllerInit;
     public:
         /**
          * Updates the state of the gamepad (all joysticks and buttons), and also runs
@@ -78,11 +85,4 @@ class Controller {
 extern Controller& master;
 extern Controller& partner;
 
-namespace _impl {
-static struct ControllerInit {
-        ControllerInit();
-        ~ControllerInit();
-} _controllerInit;
-} // namespace _impl
-
 } // namespace Gamepad
\ No newline at end of file