diff --git a/source/RobotAPI/libraries/armem_robot_state/CMakeLists.txt b/source/RobotAPI/libraries/armem_robot_state/CMakeLists.txt
index defd8a3f48aa68b63673498549a731b573b9b9b4..f2f96fdd19c1a7d57d4710b0db7f5afa4b73dc96 100644
--- a/source/RobotAPI/libraries/armem_robot_state/CMakeLists.txt
+++ b/source/RobotAPI/libraries/armem_robot_state/CMakeLists.txt
@@ -6,6 +6,7 @@ armarx_set_target("Library: ${LIB_NAME}")
 find_package(Eigen3 QUIET)
 armarx_build_if(Eigen3_FOUND "Eigen3 not available")
 
+
 armarx_add_library(
     LIBS 
         # ArmarX
@@ -19,61 +20,59 @@ armarx_add_library(
         RobotAPIInterfaces 
         RobotAPI::armem
         RobotAPI::armem_robot
+        aroncommon
+
         # System / External
         Eigen3::Eigen
-        aroncommon
+
     HEADERS
-        ./common/localization/types.h
-        ./common/localization/TransformHelper.h
+        common/localization/types.h
+        common/localization/TransformHelper.h
 
-        ./client/common/RobotReader.h
-        ./client/common/VirtualRobotReader.h
+        client/common/RobotReader.h
+        client/common/VirtualRobotReader.h
 
-        ./client/localization/interfaces.h
-        ./client/localization/TransformReader.h
-        ./client/localization/TransformWriter.h
+        client/localization/interfaces.h
+        client/localization/TransformReader.h
+        client/localization/TransformWriter.h
 
-        ./server/common/Visu.h
+        server/common/Visu.h
 
-        ./server/localization/Segment.h
-        # ./server/localization/Visu.h
+        server/localization/Segment.h
 
-        ./server/proprioception/Segment.h
-        # ./server/proprioception/Visu.h
+        server/proprioception/Segment.h
 
-        ./server/description/Segment.h
+        server/description/Segment.h
 
+        aron_conversions.h
+        utils.h
 
-        ./aron_conversions.h
-        ./utils.h
     SOURCES
-        ./common/localization/TransformHelper.cpp
-
-        ./client/common/RobotReader.cpp
-        ./client/common/VirtualRobotReader.cpp
+        common/localization/TransformHelper.cpp
 
-        ./client/localization/TransformReader.cpp
-        ./client/localization/TransformWriter.cpp
+        client/common/RobotReader.cpp
+        client/common/VirtualRobotReader.cpp
 
-        ./server/common/Visu.cpp
+        client/localization/TransformReader.cpp
+        client/localization/TransformWriter.cpp
 
-        ./server/localization/Segment.cpp
-        # ./server/localization/Visu.cpp
+        server/common/Visu.cpp
 
-        ./server/proprioception/Segment.cpp
-        # ./server/proprioception/Visu.cpp
+        server/localization/Segment.cpp
 
-        ./server/description/Segment.cpp
+        server/proprioception/Segment.cpp
 
-        ./aron_conversions.cpp
-        ./utils.cpp
+        server/description/Segment.cpp
 
+        aron_conversions.cpp
+        utils.cpp
 )
 
 
 armarx_enable_aron_file_generation_for_target(
     TARGET_NAME
         "${LIB_NAME}"
+
     ARON_FILES
         aron/JointState.xml
         aron/Proprioception.xml