diff --git a/source/armarx/navigation/global_planning/aron/AStarParams.xml b/source/armarx/navigation/global_planning/aron/AStarParams.xml
index 1e35c5c50bb94441ffa421b86f15320a5f59fe7d..fd8b9263e9bfed18558f668d82e07c571f5cd435 100644
--- a/source/armarx/navigation/global_planning/aron/AStarParams.xml
+++ b/source/armarx/navigation/global_planning/aron/AStarParams.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <AronTypeDefinition>
-    <CodeIncludes>
-        <Include include="<armarx/navigation/global_planning/aron/GlobalPlannerParams.aron.generated.h>" />
-    </CodeIncludes>
     <AronIncludes>
-        <Include include="GlobalPlannerParams.xml" />
+        <Include include="armarx/navigation/global_planning/aron/GlobalPlannerParams.xml" />
     </AronIncludes>
 
     <GenerateTypes>
diff --git a/source/armarx/navigation/global_planning/aron/Point2PointParams.xml b/source/armarx/navigation/global_planning/aron/Point2PointParams.xml
index a1e6b05bacf27de3cb53c08418c6030f124d3ce0..71f77b198bd2eea0254beff6400c08dd865195ab 100644
--- a/source/armarx/navigation/global_planning/aron/Point2PointParams.xml
+++ b/source/armarx/navigation/global_planning/aron/Point2PointParams.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <AronTypeDefinition>
-    <CodeIncludes>
-        <Include include="<armarx/navigation/global_planning/aron/GlobalPlannerParams.aron.generated.h>" />
-    </CodeIncludes>
     <AronIncludes>
-        <Include include="GlobalPlannerParams.xml" />
+        <Include include="armarx/navigation/global_planning/aron/GlobalPlannerParams.xml" />
     </AronIncludes>
 
     <GenerateTypes>
diff --git a/source/armarx/navigation/global_planning/aron/SPFAParams.xml b/source/armarx/navigation/global_planning/aron/SPFAParams.xml
index b1a34a4d350513b1e1189a4a10a4c2c5da671ab8..63b61b6f9b54346494a9c58db5e8e15b7805f82d 100644
--- a/source/armarx/navigation/global_planning/aron/SPFAParams.xml
+++ b/source/armarx/navigation/global_planning/aron/SPFAParams.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <AronTypeDefinition>
-    <CodeIncludes>
-        <Include include="<armarx/navigation/global_planning/aron/GlobalPlannerParams.aron.generated.h>" />
-    </CodeIncludes>
     <AronIncludes>
-        <Include include="GlobalPlannerParams.xml" />
+        <Include include="armarx/navigation/global_planning/aron/GlobalPlannerParams.xml" />
     </AronIncludes>
 
     <GenerateTypes>
diff --git a/source/armarx/navigation/trajectory_control/aron/TrajectoryControllerParams.xml b/source/armarx/navigation/trajectory_control/aron/TrajectoryControllerParams.xml
index b40e68ba246404cc1b569fa9625a890119149d4c..44429d94deb4fdb36468b91c2063268b5ad73e07 100644
--- a/source/armarx/navigation/trajectory_control/aron/TrajectoryControllerParams.xml
+++ b/source/armarx/navigation/trajectory_control/aron/TrajectoryControllerParams.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <AronTypeDefinition>
-    <CodeIncludes>
-        <Include include="<armarx/navigation/core/aron/TwistLimits.aron.generated.h>" />
-    </CodeIncludes>
     <AronIncludes>
-        <Include include="../../core/aron/TwistLimits.xml" />
+        <Include include="armarx/navigation/core/aron/TwistLimits.xml" />
     </AronIncludes>
 
     <GenerateTypes>
diff --git a/source/armarx/navigation/trajectory_control/aron/TrajectoryFollowingControllerParams.xml b/source/armarx/navigation/trajectory_control/aron/TrajectoryFollowingControllerParams.xml
index 357cfb654527db4096dbaaa310c045644448016e..860dcfe1aa63c636d87768fcc18f1f62621f5ecd 100644
--- a/source/armarx/navigation/trajectory_control/aron/TrajectoryFollowingControllerParams.xml
+++ b/source/armarx/navigation/trajectory_control/aron/TrajectoryFollowingControllerParams.xml
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <AronTypeDefinition>
-    <CodeIncludes>
-        <Include include="<armarx/navigation/trajectory_control/aron/TrajectoryControllerParams.aron.generated.h>" />
-        <Include include="<armarx/navigation/core/aron/PIDParams.aron.generated.h>" />
-        <Include include="<armarx/navigation/core/aron/TwistLimits.aron.generated.h>" />
-    </CodeIncludes>
     <AronIncludes>
-        <Include include="TrajectoryControllerParams.xml" />
-        <Include include="../../core/aron/PIDParams.xml" />
-        <Include include="../../core/aron/TwistLimits.xml" />
+        <Include include="armarx/navigation/trajectory_control/aron/TrajectoryControllerParams.xml" />
+        <Include include="armarx/navigation/core/aron/PIDParams.xml" />
+        <Include include="armarx/navigation/core/aron/TwistLimits.xml" />
     </AronIncludes>
 
     <GenerateTypes>
diff --git a/source/armarx/navigation/trajectory_control/aron/WaypointControllerParams.xml b/source/armarx/navigation/trajectory_control/aron/WaypointControllerParams.xml
index 9f1e482d7fff56779d996b218117e060c505085a..6a63d73467f6fdf6a447213277b661afbf0cc31e 100644
--- a/source/armarx/navigation/trajectory_control/aron/WaypointControllerParams.xml
+++ b/source/armarx/navigation/trajectory_control/aron/WaypointControllerParams.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <AronTypeDefinition>
-    <CodeIncludes>
-        <Include include="<armarx/navigation/trajectory_control/aron/TrajectoryControllerParams.aron.generated.h>" />
-    </CodeIncludes>
     <AronIncludes>
-        <Include include="TrajectoryControllerParams.xml" />
+        <Include include="armarx/navigation/trajectory_control/aron/TrajectoryControllerParams.xml" />
     </AronIncludes>
 
     <GenerateTypes>