diff --git a/source/RobotAPI/libraries/armem/client/plugins/ListeningPluginUser.h b/source/RobotAPI/libraries/armem/client/plugins/ListeningPluginUser.h
index 20b124d5de44b9e2f0a67bb7ec4302a51cdc1ccd..7314b32c048ddfff685ad2095d440cf0f515194c 100644
--- a/source/RobotAPI/libraries/armem/client/plugins/ListeningPluginUser.h
+++ b/source/RobotAPI/libraries/armem/client/plugins/ListeningPluginUser.h
@@ -41,3 +41,11 @@ namespace armarx::armem::client::plugins
     };
 
 }
+namespace armarx::armem::client
+{
+    using ListeningPluginUser = plugins::ListeningPluginUser;
+}
+namespace armarx::armem
+{
+    using ListeningClientPluginUser = client::ListeningPluginUser;
+}
diff --git a/source/RobotAPI/libraries/armem/client/plugins/PluginUser.cpp b/source/RobotAPI/libraries/armem/client/plugins/PluginUser.cpp
index 91414da1c95a84f532ceafc7cb40fc2e12402b9e..c4129c63d9c51b011bbeb42f412a5372f244a532 100644
--- a/source/RobotAPI/libraries/armem/client/plugins/PluginUser.cpp
+++ b/source/RobotAPI/libraries/armem/client/plugins/PluginUser.cpp
@@ -31,4 +31,3 @@ namespace armarx::armem::client::plugins
     }
 
 }
-
diff --git a/source/RobotAPI/libraries/armem/client/plugins/PluginUser.h b/source/RobotAPI/libraries/armem/client/plugins/PluginUser.h
index f67afc8bc739399dd959639924419cd9045821bc..0638084dd61bc6563a6a99797a0e7eef96415204 100644
--- a/source/RobotAPI/libraries/armem/client/plugins/PluginUser.h
+++ b/source/RobotAPI/libraries/armem/client/plugins/PluginUser.h
@@ -1,14 +1,16 @@
 #pragma once
 
-// Let's not forward declare this one.
-#include <RobotAPI/libraries/armem/client/MemoryNameSystem.h>
+#include <RobotAPI/libraries/armem/client/forward_declarations.h>
 
 #include <ArmarXCore/core/ManagedIceObject.h>
 
 
+// Use this one include in your .cpp:
+// #include <RobotAPI/libraries/armem/client/MemoryNameSystem.h>
+
+
 namespace armarx::armem::client::plugins
 {
-
     class Plugin;
 
 
@@ -46,3 +48,11 @@ namespace armarx::armem::client::plugins
     };
 
 }
+namespace armarx::armem::client
+{
+    using PluginUser = plugins::PluginUser;
+}
+namespace armarx::armem
+{
+    using ClientPluginUser = client::PluginUser;
+}