diff --git a/source/RobotAPI/libraries/armem/core/base/EntityBase.h b/source/RobotAPI/libraries/armem/core/base/EntityBase.h
index f8c19146cfb37131b4fc4df21f001df51389b2ad..d4193c15b29f7b95dc1f58992b36a0160f95e490 100644
--- a/source/RobotAPI/libraries/armem/core/base/EntityBase.h
+++ b/source/RobotAPI/libraries/armem/core/base/EntityBase.h
@@ -7,8 +7,8 @@
 
 #include <ArmarXCore/core/exceptions/local/ExpressionException.h>
 
-#include "../../core/Time.h"
-#include "../../core/MemoryID.h"
+#include <RobotAPI/libraries/armem/core/MemoryID.h>
+#include <RobotAPI/libraries/armem/core/Time.h>
 
 #include "EntitySnapshotBase.h"
 #include "detail/MaxHistorySize.h"
diff --git a/source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.h b/source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.h
index 18f3319d190ad5d0c1e10492ae0efd04d5742bde..61ae186ed9c1026fc4297af5c3216ada4030fce0 100644
--- a/source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.h
+++ b/source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.h
@@ -1,8 +1,7 @@
 #pragma once
 
-#include "../../core/Time.h"
-
-#include "../Commit.h"
+#include <RobotAPI/libraries/armem/core/Commit.h>
+#include <RobotAPI/libraries/armem/core/Time.h>
 #include "detail/MemoryItem.h"
 
 
diff --git a/source/RobotAPI/libraries/armem/core/base/detail/EntityContainerBase.h b/source/RobotAPI/libraries/armem/core/base/detail/EntityContainerBase.h
index 452277eca8313622a1074d23ccfed930b58dc7bb..96d1512df5535a8dd8798d6992f37b3fa69946d5 100644
--- a/source/RobotAPI/libraries/armem/core/base/detail/EntityContainerBase.h
+++ b/source/RobotAPI/libraries/armem/core/base/detail/EntityContainerBase.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "../../Commit.h"
-#include "../../error/ArMemError.h"
+#include <RobotAPI/libraries/armem/core/Commit.h>
+#include <RobotAPI/libraries/armem/core/error/ArMemError.h>
 
 #include "MemoryContainerBase.h"
 
-#include "../EntityBase.h"
-#include "../EntitySnapshotBase.h"
+#include <RobotAPI/libraries/armem/core/base/EntityBase.h>
+#include <RobotAPI/libraries/armem/core/base/EntitySnapshotBase.h>
 
 
 namespace armarx::armem::base::detail
diff --git a/source/RobotAPI/libraries/armem/core/base/detail/MemoryItem.h b/source/RobotAPI/libraries/armem/core/base/detail/MemoryItem.h
index c70c68adad1e8bfd6362f31ad1a2f5be03d9de2e..b26ceb19d9ba9ac35d2fd56f01136987359e2abd 100644
--- a/source/RobotAPI/libraries/armem/core/base/detail/MemoryItem.h
+++ b/source/RobotAPI/libraries/armem/core/base/detail/MemoryItem.h
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "../../MemoryID.h"
+#include <RobotAPI/libraries/armem/core/MemoryID.h>
 
 
 namespace armarx::armem::base::detail
diff --git a/source/RobotAPI/libraries/armem/core/workingmemory/CoreSegment.h b/source/RobotAPI/libraries/armem/core/workingmemory/CoreSegment.h
index 86b9b439e72d4d686b2c52fe5fd39f0a9b6aaf1c..54df4ff40aa6f19a74e9a8d8e1f968bf111b7711 100644
--- a/source/RobotAPI/libraries/armem/core/workingmemory/CoreSegment.h
+++ b/source/RobotAPI/libraries/armem/core/workingmemory/CoreSegment.h
@@ -3,7 +3,7 @@
 #include <mutex>
 #include <optional>
 
-#include "../base/CoreSegmentBase.h"
+#include <RobotAPI/libraries/armem/core/base/CoreSegmentBase.h>
 
 #include "ProviderSegment.h"
 #include "detail/CopyWithoutData.h"
diff --git a/source/RobotAPI/libraries/armem/core/workingmemory/Entity.h b/source/RobotAPI/libraries/armem/core/workingmemory/Entity.h
index a6a7621e21272db6447e9e09b695900eefd263c1..d8e29a7941dc8a9f0477b2f21bdcf81b97583e57 100644
--- a/source/RobotAPI/libraries/armem/core/workingmemory/Entity.h
+++ b/source/RobotAPI/libraries/armem/core/workingmemory/Entity.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../base/EntityBase.h"
+#include <RobotAPI/libraries/armem/core/base/EntityBase.h>
 
 #include "EntitySnapshot.h"
 #include "detail/CopyWithoutData.h"
diff --git a/source/RobotAPI/libraries/armem/core/workingmemory/EntityInstance.h b/source/RobotAPI/libraries/armem/core/workingmemory/EntityInstance.h
index d3dc888d0304276bc6aaf1c677e8b33f4a1cae1a..5e60a759670d756aa762a74a3de15fe8e4f417fd 100644
--- a/source/RobotAPI/libraries/armem/core/workingmemory/EntityInstance.h
+++ b/source/RobotAPI/libraries/armem/core/workingmemory/EntityInstance.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../base/EntityInstanceBase.h"
+#include <RobotAPI/libraries/armem/core/base/EntityInstanceBase.h>
 
 #include "detail/CopyWithoutData.h"
 
diff --git a/source/RobotAPI/libraries/armem/core/workingmemory/EntitySnapshot.h b/source/RobotAPI/libraries/armem/core/workingmemory/EntitySnapshot.h
index 3eedb48d0b4aaa5191541d8ca1586ffc59ab5998..fb3123eb75a9dfccc8ceb86389a134745f7ffd90 100644
--- a/source/RobotAPI/libraries/armem/core/workingmemory/EntitySnapshot.h
+++ b/source/RobotAPI/libraries/armem/core/workingmemory/EntitySnapshot.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../base/EntitySnapshotBase.h"
+#include <RobotAPI/libraries/armem/core/base/EntitySnapshotBase.h>
 
 #include "EntityInstance.h"
 #include "detail/CopyWithoutData.h"
diff --git a/source/RobotAPI/libraries/armem/core/workingmemory/ProviderSegment.h b/source/RobotAPI/libraries/armem/core/workingmemory/ProviderSegment.h
index 7d1e9db335ee39433351a8e15113059836bf825d..f3e7086288f038853832a2b286a76910e9437bff 100644
--- a/source/RobotAPI/libraries/armem/core/workingmemory/ProviderSegment.h
+++ b/source/RobotAPI/libraries/armem/core/workingmemory/ProviderSegment.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../base/ProviderSegmentBase.h"
+#include <RobotAPI/libraries/armem/core/base/ProviderSegmentBase.h>
 
 #include "Entity.h"
 #include "detail/CopyWithoutData.h"
@@ -15,7 +15,6 @@ namespace armarx::armem::wm
     class ProviderSegment :
         public base::ProviderSegmentBase<Entity, ProviderSegment>,
         public detail::CopyWithoutData<ProviderSegment>
-
     {
         using Base = base::ProviderSegmentBase<Entity, ProviderSegment>;