diff --git a/source/RobotAPI/libraries/armem/CMakeLists.txt b/source/RobotAPI/libraries/armem/CMakeLists.txt
index 1a42a332b2ee3462cd33650e033d31abbf1c7348..f4b752fbb7c12ad6d9de500e1784408777a62988 100644
--- a/source/RobotAPI/libraries/armem/CMakeLists.txt
+++ b/source/RobotAPI/libraries/armem/CMakeLists.txt
@@ -101,6 +101,7 @@ set(LIB_HEADERS
     core/io/DiskReader/DiskReader.h
     core/io/DiskReader/NlohmannJSONDiskReader/NlohmannJSONDiskReader.h
 
+    client.h
     client/ComponentPlugin.h
     client/Reader.h
     client/ReaderComponentPlugin.h
@@ -114,6 +115,7 @@ set(LIB_HEADERS
     client/query/detail/NameSelectorOps.h
     client/query/detail/SelectorOps.h
 
+    server.h
     server/ComponentPlugin.h
     server/MemoryToIceAdapter.h
     server/MemoryRemoteGui.h
diff --git a/source/RobotAPI/libraries/armem/client.h b/source/RobotAPI/libraries/armem/client.h
new file mode 100644
index 0000000000000000000000000000000000000000..baf0ca232e5447048939aa062ee122a1d4f936b2
--- /dev/null
+++ b/source/RobotAPI/libraries/armem/client.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include "client/ComponentPlugin.h"
+#include "client/Query.h"
+#include "client/query/Builder.h"
+#include "client/query/query_fns.h"
+#include "client/Reader.h"
+#include "client/ReaderComponentPlugin.h"
+#include "client/Writer.h"
+#include "client/WriterComponentPlugin.h"
+
+
+namespace armarx::armem
+{
+
+    using ClientReader = client::Reader;
+    using ClientWriter = client::Writer;
+
+    using ClientQueryInput = client::QueryInput;
+    using ClientQueryResult = client::QueryResult;
+    using ClientQueryBuilder = client::query::Builder;
+    namespace client_query_fns = client::query_fns;
+
+    using ClientComponentPluginUser = client::ComponentPluginUser;
+    using ClientReaderComponentPluginUser = client::ReaderComponentPluginUser;
+    using ClientWriterComponentPluginUser = client::WriterComponentPluginUser;
+
+}
diff --git a/source/RobotAPI/libraries/armem/server.h b/source/RobotAPI/libraries/armem/server.h
new file mode 100644
index 0000000000000000000000000000000000000000..10950a29e308a75b5d30f2e3dc6bd075717ff1ce
--- /dev/null
+++ b/source/RobotAPI/libraries/armem/server.h
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "server/ComponentPlugin.h"
+#include "server/MemoryRemoteGui.h"
+
+
+namespace armarx::armem
+{
+    using server::MemoryRemoteGui;
+    using ServerComponentPluginUser = server::ComponentPluginUser;
+}