fixing includes

source/RobotAPI/libraries/armem_robot_localization/MemoryConnector.h

@@ -22,11 +22,12 @@
 
 #pragma once
 
-#include <RobotAPI/interface/armem/mns/MemoryNameSystemInterface.h>
 
 // TODO(fabian.reister): remove
 #include <ArmarXCore/core/application/properties/PropertyDefinitionContainer.h>
 
+#include <RobotAPI/interface/armem/mns/MemoryNameSystemInterface.h>
+
 namespace armarx
 {
 

source/RobotAPI/libraries/armem_robot_localization/TransformInterfaces.h

@@ -24,7 +24,7 @@
 
 #include <Eigen/Geometry>
 
-#include "ArmarXCore/core/application/properties/PropertyDefinitionContainer.h"
+#include <ArmarXCore/core/application/properties/PropertyDefinitionContainer.h>
 
 namespace armarx
 {

source/RobotAPI/libraries/armem_robot_localization/TransformReader.cpp

@@ -22,8 +22,6 @@
 
 #include "TransformReader.h"
 
-#include <Eigen/src/Geometry/Transform.h>
-#include <SimoxUtility/math/pose/interpolate.h>
 #include <algorithm>
 #include <iterator>
 #include <numeric>
@@ -38,15 +36,14 @@
 #include <SimoxUtility/algorithm/get_map_keys_values.h>
 #include <SimoxUtility/algorithm/string/string_tools.h>
 #include <SimoxUtility/color/cmaps.h>
+#include <SimoxUtility/math/pose/interpolate.h>
 
 // ArmarX
-#include "ArmarXCore/core/logging/Logging.h"
-#include "RobotAPI/components/armem/client/TransformClient/aron_conversions.h"
+#include <ArmarXCore/core/logging/Logging.h>
 #include <ArmarXCore/core/exceptions/local/ExpressionException.h>
 #include <ArmarXCore/core/time/CycleUtil.h>
 
 // this package
-#include <RobotAPI/components/armem/client/TransformClient/aron/Transform.aron.generated.h>
 #include <RobotAPI/libraries/armem/client/query/Builder.h>
 #include <RobotAPI/libraries/armem/client/query/query_fns.h>
 #include <RobotAPI/libraries/armem/core/Memory.h>
@@ -55,6 +52,7 @@
 #include <RobotAPI/libraries/armem/server/MemoryRemoteGui.h>
 #include <RobotAPI/libraries/aron/core/navigator/type/NavigatorFactory.h>
 #include <RobotAPI/libraries/core/FramedPose.h>
+#include <RobotAPI/libraries/armem_robot_localization/aron_conversions.h>
 
 namespace armarx
 {

source/RobotAPI/libraries/armem_robot_localization/TransformWriter.cpp

@@ -30,22 +30,24 @@
 
 #include <IceUtil/Time.h>
 
-#include "ArmarXCore/core/application/properties/PropertyDefinitionContainer.h"
-#include "ArmarXCore/core/logging/Logging.h"
-#include "RobotAPI/components/armem/client/TransformClient/aron_conversions.h"
-#include "RobotAPI/libraries/armem/core/Memory.h"
-#include "RobotAPI/libraries/armem/core/ProviderSegment.h"
-#include "RobotAPI/libraries/aron/core/navigator/type/NavigatorFactory.h"
-#include "RobotAPI/libraries/core/FramedPose.h"
-
+#include <ArmarXCore/core/application/properties/PropertyDefinitionContainer.h>
+#include <ArmarXCore/core/logging/Logging.h>
 #include <ArmarXCore/core/exceptions/local/ExpressionException.h>
 #include <ArmarXCore/core/time/CycleUtil.h>
 
-#include <RobotAPI/components/armem/client/TransformClient/aron/Transform.aron.generated.h>
 #include <RobotAPI/libraries/armem/client/query/Builder.h>
 #include <RobotAPI/libraries/armem/client/query/query_fns.h>
 #include <RobotAPI/libraries/armem/core/ice_conversions.h>
 #include <RobotAPI/libraries/armem/server/MemoryRemoteGui.h>
+#include <RobotAPI/libraries/armem/core/Memory.h>
+#include <RobotAPI/libraries/armem/core/ProviderSegment.h>
+#include <RobotAPI/libraries/aron/core/navigator/type/NavigatorFactory.h>
+#include <RobotAPI/libraries/core/FramedPose.h>
+
+#include <RobotAPI/libraries/armem_robot_localization/aron/Transform.aron.generated.h>
+
+#include "aron_conversions.h"
+
 
 namespace armarx
 {

source/RobotAPI/libraries/armem_robot_localization/aron_conversions.cpp

@@ -7,8 +7,8 @@
 #include <IceUtil/Time.h>
 
 // RobotAPI
-#include <RobotAPI/components/armem/client/TransformClient/TransformInterfaces.h>
-#include <RobotAPI/components/armem/client/TransformClient/aron/Transform.aron.generated.h>
+#include <RobotAPI/libraries/armem_robot_localization/TransformInterfaces.h>
+#include <RobotAPI/libraries/armem_robot_localization/aron/Transform.aron.generated.h>
 
 
 namespace armarx