diff --git a/Source/controls/controller.cpp b/Source/controls/controller.cpp
index a5e099acc..c2ac4c284 100644
--- a/Source/controls/controller.cpp
+++ b/Source/controls/controller.cpp
@@ -38,7 +38,7 @@ ControllerButtonEvent ToControllerButtonEvent(const SDL_Event &event)
 
 	const Joystick *joystick = Joystick::Get(event);
 	if (joystick != nullptr)
-		result.button = joystick->ToControllerButton(event);
+		result.button = devilution::Joystick::ToControllerButton(event);
 
 	return result;
 }
diff --git a/Source/controls/controller_motion.cpp b/Source/controls/controller_motion.cpp
index 30508ec28..5916d5486 100644
--- a/Source/controls/controller_motion.cpp
+++ b/Source/controls/controller_motion.cpp
@@ -130,13 +130,13 @@ bool ProcessControllerMotion(const SDL_Event &event, ControllerButtonEvent ctrlE
 {
 #ifndef USE_SDL1
 	GameController *const controller = GameController::Get(event);
-	if (controller != nullptr && controller->ProcessAxisMotion(event)) {
+	if (controller != nullptr && devilution::GameController::ProcessAxisMotion(event)) {
 		ScaleJoysticks();
 		return true;
 	}
 #endif
 	Joystick *const joystick = Joystick::Get(event);
-	if (joystick != nullptr && joystick->ProcessAxisMotion(event)) {
+	if (joystick != nullptr && devilution::Joystick::ProcessAxisMotion(event)) {
 		ScaleJoysticks();
 		return true;
 	}