diff --git a/source/RobotAPI/libraries/armem/CMakeLists.txt b/source/RobotAPI/libraries/armem/CMakeLists.txt
index 62da8840409c17d8968c34171120a230a379ef33..a75412cacca8c922714604ac68ff619c7673f4d5 100644
--- a/source/RobotAPI/libraries/armem/CMakeLists.txt
+++ b/source/RobotAPI/libraries/armem/CMakeLists.txt
@@ -137,6 +137,7 @@ set(LIB_HEADERS
     client/plugins/ListeningPlugin.h
     client/plugins/PluginUser.h
     client/plugins/Plugin.h
+    client/plugins/ReaderWriterPlugin.h
 
     client/query.h
     client/Query.h
diff --git a/source/RobotAPI/libraries/armem/client/plugins/ReaderWriterPlugin.h b/source/RobotAPI/libraries/armem/client/plugins/ReaderWriterPlugin.h
index dd35fb6dca7dc80ae5ef38d7e222f24d14571bef..76936faebf939eeb7b5fc5cbe77e1fd1205418ea 100644
--- a/source/RobotAPI/libraries/armem/client/plugins/ReaderWriterPlugin.h
+++ b/source/RobotAPI/libraries/armem/client/plugins/ReaderWriterPlugin.h
@@ -23,10 +23,10 @@
 
 #include <string>
 
-#include "ArmarXCore/core/exceptions/local/ExpressionException.h"
+#include <ArmarXCore/core/exceptions/local/ExpressionException.h>
 #include <ArmarXCore/core/ComponentPlugin.h>
 
-#include "RobotAPI/libraries/armem/client/plugins/Plugin.h"
+#include <RobotAPI/libraries/armem/client/plugins/Plugin.h>
 #include <RobotAPI/interface/armem/mns/MemoryNameSystemInterface.h>
 #include <RobotAPI/libraries/armem/client/MemoryNameSystem.h>
 
@@ -48,8 +48,7 @@ namespace armarx::armem::client::plugins
         ReaderWriterPlugin(ManagedIceObject& parent, const std::string pre) :
             ComponentPlugin(parent, pre), readerWriter(memoryNameSystem())
         {
-                addPlugin(armemPlugin);
-
+            addPlugin(armemPlugin);
         }
 
         ~ReaderWriterPlugin() override = default;
@@ -97,7 +96,6 @@ namespace armarx::armem::client::plugins
             return readerWriter;
         }
 
-
     private:
         MemoryNameSystem&
         memoryNameSystem()
@@ -111,9 +109,10 @@ namespace armarx::armem::client::plugins
             return armemPlugin->getMemoryNameSystemClient();
         }
 
+        armarx::armem::client::plugins::Plugin* armemPlugin = nullptr;
+        
         T readerWriter;
 
-        armarx::armem::client::plugins::Plugin* armemPlugin = nullptr;
     };
 
 } // namespace armarx::armem::client::plugins