diff --git a/source/armarx/navigation/platform_controller/PlatformTrajectoryController.h b/source/armarx/navigation/platform_controller/PlatformTrajectoryController.h
index 9dac5f6bfda91153dee8117be719b8e327156ba7..a54d44b235fce4e1bb5c177aa1e18abc57de4ad2 100644
--- a/source/armarx/navigation/platform_controller/PlatformTrajectoryController.h
+++ b/source/armarx/navigation/platform_controller/PlatformTrajectoryController.h
@@ -29,12 +29,9 @@
 #include <RobotAPI/components/units/RobotUnit/RobotUnit.h>
 #include <RobotAPI/components/units/RobotUnit/SensorValues/SensorValueHolonomicPlatform.h>
 
-#include <armarx/navigation/trajectory_control/TrajectoryFollowingController.h>
-#include <armarx/control/common/control_law/ControllerCommonInterface.h>
-#include <armarx/control/njoint_controller/task_space/ControllerInterface.h>
-#include <armarx/control/njoint_qp_controller/ControllerInterface.h>
-
+#include <armarx/control/interface/ConfigurableNJointControllerInterface.h>
 #include <armarx/navigation/core/types.h>
+#include <armarx/navigation/trajectory_control/TrajectoryFollowingController.h>
 
 namespace armarx
 {
@@ -88,7 +85,7 @@ namespace armarx::navigation::platform_controller::platform_trajectory
         virtual public armarx::control::ConfigurableNJointControllerInterface
     {
     public:
-        using ConfigPtrT = NJointTaskspaceControllerConfigPtr;
+        using ConfigPtrT = control::ConfigurableNJointControllerInterfacePtr;
 
         Controller(const RobotUnitPtr& robotUnit,
                    const NJointControllerConfigPtr& config,
@@ -149,4 +146,4 @@ namespace armarx::navigation::platform_controller::platform_trajectory
         //                                       const NameValueMap& targetJointAngles) const;
     };
 
-} // namespace armarx::control::platform_controller::platform_trajectory
+}  // namespace armarx::navigation::platform_controller::platform_trajectory
diff --git a/source/armarx/navigation/server/CMakeLists.txt b/source/armarx/navigation/server/CMakeLists.txt
index 0e08f94b3d1ccb835ea3ebe13c298baa51e7d658..a7dad944f4c1d0540fc3d2333664d52ef8e06862 100644
--- a/source/armarx/navigation/server/CMakeLists.txt
+++ b/source/armarx/navigation/server/CMakeLists.txt
@@ -57,7 +57,7 @@ armarx_add_library(server
         armarx_navigation::safety_control
         armarx_navigation::memory
         armarx_control::client
-        armarx_control::njoint_qp_controller_ice
+        armarx_control::interface
     DEPENDENCIES_PRIVATE
         range-v3::range-v3
 )