organizing includes

source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateMemory.cpp

@@ -23,36 +23,34 @@
 #include "RobotStateMemory.h"
 
 // STD
-#include <Eigen/src/Geometry/Transform.h>
-#include <SimoxUtility/math/convert/rpy_to_mat3f.h>
 #include <algorithm>
 #include <iostream>
 #include <fstream>
+#include <memory>
 
-// Header
-#include "ArmarXCore/core/logging/Logging.h"
-#include "RobotAPI/libraries/armem/core/Time.h"
-#include "RobotAPI/libraries/aron/core/navigator/data/primitive/Primitive.h"
-#include "RobotAPI/libraries/core/Pose.h"
+// Eigen
+#include <Eigen/Core>
+#include <Eigen/Geometry>
 
 // Simox
 #include <SimoxUtility/algorithm/string.h>
+#include <SimoxUtility/math/convert/rpy_to_mat3f.h>
 
 // ArmarX
+#include <ArmarXCore/core/logging/Logging.h>
 #include <ArmarXCore/core/exceptions/local/ExpressionException.h>
 #include <ArmarXCore/core/system/ArmarXDataPath.h>
+
 #include <RobotAPI/libraries/armem/core/error.h>
 #include <RobotAPI/libraries/armem/server/MemoryRemoteGui.h>
-
 #include <RobotAPI/libraries/aron/core/navigator/data/AllNavigators.h>
 #include <RobotAPI/libraries/aron/core/navigator/type/AllNavigators.h>
-
 #include <RobotAPI/libraries/armem_robot_state/server/common/Visu.h>
-
 #include <RobotAPI/libraries/armem_robot_state/aron/Transform.aron.generated.h>
-
 #include <RobotAPI/libraries/core/FramedPose.h>
-#include <memory>
+#include <RobotAPI/libraries/armem/core/Time.h>
+#include <RobotAPI/libraries/aron/core/navigator/data/primitive/Primitive.h>
+#include <RobotAPI/libraries/core/Pose.h>
 
 namespace armarx::armem::server::robot_state
 {

source/RobotAPI/libraries/armem_robot_state/server/localization/Segment.cpp

 #include "Segment.h"
 
-#include <Eigen/src/Geometry/Transform.h>
-#include <IceUtil/Time.h>
-#include <RobotAPI/libraries/armem_robot_state/aron/Transform.aron.generated.h>
+// STL
+
 #include <iterator>
 #include <sstream>
 
-#include "ArmarXCore/core/logging/Logging.h"
+// Ice
+#include <IceUtil/Time.h>
+
+// Eigen
+#include <Eigen/Core>
+#include <Eigen/Geometry>
+
+#include <ArmarXCore/core/logging/Logging.h>
 #include <ArmarXCore/core/time/TimeUtil.h>
 
-#include "RobotAPI/libraries/aron/common/aron_conversions.h"
+#include <RobotAPI/libraries/core/FramedPose.h>
+
+#include <RobotAPI/libraries/aron/common/aron_conversions.h>
 
-#include "RobotAPI/libraries/armem/core/MemoryID.h"
-#include "RobotAPI/libraries/armem/core/Time.h"
-#include "RobotAPI/libraries/armem_robot/robot_conversions.h"
-#include "RobotAPI/libraries/core/FramedPose.h"
+#include <RobotAPI/libraries/armem/core/aron_conversions.h>
+#include <RobotAPI/libraries/armem/core/MemoryID.h>
+#include <RobotAPI/libraries/armem/core/Time.h>
 #include <RobotAPI/libraries/armem/client/Writer.h>
 #include <RobotAPI/libraries/armem/client/query/Builder.h>
 #include <RobotAPI/libraries/armem/client/query/query_fns.h>
@@ -22,12 +29,11 @@
 #include <RobotAPI/libraries/armem/core/workingmemory/Visitor.h>
 #include <RobotAPI/libraries/armem/server/MemoryToIceAdapter.h>
 
+#include <RobotAPI/libraries/armem_robot/robot_conversions.h>
 #include <RobotAPI/libraries/armem_robot/aron/Robot.aron.generated.h>
-#include <RobotAPI/libraries/armem_robot_state/aron_conversions.h>
-
-#include <RobotAPI/libraries/armem/core/aron_conversions.h>
-#include <RobotAPI/libraries/aron/common/aron_conversions.h>
 
+#include <RobotAPI/libraries/armem_robot_state/aron/Transform.aron.generated.h>
+#include <RobotAPI/libraries/armem_robot_state/aron_conversions.h>
 #include <RobotAPI/libraries/armem_robot_state/common/localization/types.h>
 #include <RobotAPI/libraries/armem_robot_state/common/localization/TransformHelper.h>