diff --git a/source/RobotAPI/libraries/armem_robot_mapping/MappingDataReader.cpp b/source/RobotAPI/libraries/armem_robot_mapping/MappingDataReader.cpp
index dda61ac81ac0846f24beee94a23025e41623553c..c304d4e3808cbb2507631a1d93c68a0e113fb783 100644
--- a/source/RobotAPI/libraries/armem_robot_mapping/MappingDataReader.cpp
+++ b/source/RobotAPI/libraries/armem_robot_mapping/MappingDataReader.cpp
@@ -1,5 +1,6 @@
 #include "MappingDataReader.h"
 
+// STD / STL
 #include <cstring>
 #include <vector>
 #include <algorithm>
@@ -9,36 +10,39 @@
 #include <type_traits>
 #include <utility>
 
+// ICE
 #include <IceUtil/Time.h>
 #include <IceUtil/Handle.h>
 
+// Simox
 #include <SimoxUtility/algorithm/get_map_keys_values.h>
 
+// ArmarXCore
 #include <ArmarXCore/core/logging/Logging.h>
 #include <ArmarXCore/core/logging/LogSender.h>
 #include <ArmarXCore/core/exceptions/local/ExpressionException.h>
 
-#include <RobotAPI/interface/armem/server/ReadingMemoryInterface.h>
+// RobotAPI Interfaces
 #include <RobotAPI/interface/units/LaserScannerUnit.h>
+#include <RobotAPI/interface/armem/mns/MemoryNameSystemInterface.h>
+#include <RobotAPI/interface/armem/server/ReadingMemoryInterface.h>
+
+// RobotAPI Aron
 #include <RobotAPI/libraries/aron/core/Exception.h>
 #include <RobotAPI/libraries/aron/core/navigator/data/complex/NDArray.h>
 
+// RobotAPI Armem
 #include <RobotAPI/libraries/armem/client/Query.h>
 #include <RobotAPI/libraries/armem/client/Reader.h>
 #include <RobotAPI/libraries/armem/client/query/Builder.h>
 #include <RobotAPI/libraries/armem/client/query/selectors.h>
 
-#include <RobotAPI/interface/armem/mns/MemoryNameSystemInterface.h>
 #include <RobotAPI/libraries/armem/core/workingmemory/Memory.h>
 #include <RobotAPI/libraries/armem/core/workingmemory/CoreSegment.h>
 #include <RobotAPI/libraries/armem/core/workingmemory/Entity.h>
 #include <RobotAPI/libraries/armem/core/workingmemory/ProviderSegment.h>
+#include <RobotAPI/libraries/armem/core/workingmemory/Entity.h>
 #include <RobotAPI/libraries/armem/core/workingmemory/EntityInstance.h>
-#include <RobotAPI/libraries/aron/core/Exception.h>
-#include <RobotAPI/libraries/aron/core/navigator/data/complex/NDArray.h>
-#include <RobotAPI/interface/armem/mns/MemoryNameSystemInterface.h>
-#include <RobotAPI/interface/armem/server/ReadingMemoryInterface.h>
-#include <RobotAPI/interface/units/LaserScannerUnit.h>
 
 #include <RobotAPI/libraries/armem/util/util.h>
 #include <RobotAPI/libraries/armem_robot_localization/MemoryConnector.h>
@@ -46,7 +50,6 @@
 #include <RobotAPI/libraries/armem_robot_mapping/aron_conversions.h>
 #include <RobotAPI/libraries/armem_robot_mapping/types.h>
 
-
 namespace armarx::armem
 {
 
diff --git a/source/RobotAPI/libraries/aron/core/CMakeLists.txt b/source/RobotAPI/libraries/aron/core/CMakeLists.txt
index c023cc567f9a48ce12b1f7e1251167648b6c2454..fef486aada57ceb7c03c5048ded67761ac3eeb50 100644
--- a/source/RobotAPI/libraries/aron/core/CMakeLists.txt
+++ b/source/RobotAPI/libraries/aron/core/CMakeLists.txt
@@ -20,7 +20,6 @@ set(LIBS
     cppgen
     Simox::SimoxUtility
 
-    #${Simox_LIBS}
     # System libraries
     Eigen3::Eigen
     # PCLInterface