diff --git a/source/RobotAPI/libraries/armem/core/ice_conversions_templates.h b/source/RobotAPI/libraries/armem/core/ice_conversions_templates.h
index 1001fd1f9a732b875a8574593003c632ed34a6e7..e0c71faac37cd899d85d174c33196499a29df770 100644
--- a/source/RobotAPI/libraries/armem/core/ice_conversions_templates.h
+++ b/source/RobotAPI/libraries/armem/core/ice_conversions_templates.h
@@ -23,7 +23,6 @@ namespace armarx::armem
 
 
     // Ice Handle
-
     template <class IceT, class CppT>
     void toIce(::IceInternal::Handle<IceT>& ice, const CppT& cpp)
     {
diff --git a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/BaseQueryProcessor.h b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/BaseQueryProcessor.h
index f2645b4752c005e74491ba0c11450bbb64dc54a6..99811dcc72d168dfecb0c5864f0760c4d5634a6e 100644
--- a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/BaseQueryProcessor.h
+++ b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/BaseQueryProcessor.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <RobotAPI/libraries/armem/core/workingmemory/ice_conversions.h>
+
 #include <RobotAPI/interface/armem/query.h>
 #include <RobotAPI/libraries/armem/core/DataMode.h>
 
diff --git a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/CoreSegmentQueryProcessor.h b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/CoreSegmentQueryProcessor.h
index 160ccd18df4e5dc2b1761bb8a49a2dd7e81082a9..079f63ac59928f2bd4ace9ab7ab033bef93c04a1 100644
--- a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/CoreSegmentQueryProcessor.h
+++ b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/CoreSegmentQueryProcessor.h
@@ -3,8 +3,6 @@
 #include "BaseQueryProcessor.h"
 #include "../base/CoreSegmentQueryProcessorBase.h"
 
-#include <RobotAPI/libraries/armem/core/workingmemory/ice_conversions.h>
-
 #include "ProviderSegmentQueryProcessor.h"
 
 
diff --git a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/EntityQueryProcessor.h b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/EntityQueryProcessor.h
index 62e24dd461be801cc61de11618a78ba34b9388fa..94dc905e489be501257be508cff03c7efee8f8b8 100644
--- a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/EntityQueryProcessor.h
+++ b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/EntityQueryProcessor.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <RobotAPI/libraries/armem/core/workingmemory/ice_conversions.h>
-
 #include "BaseQueryProcessor.h"
 #include "../base/EntityQueryProcessorBase.h"
 
diff --git a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/MemoryQueryProcessor.h b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/MemoryQueryProcessor.h
index dc82f403e3645b9f34ad957bb712ddcd14a20dea..b017c3b561569c1da5d3d7f661ee604bbb1cae12 100644
--- a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/MemoryQueryProcessor.h
+++ b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/MemoryQueryProcessor.h
@@ -3,8 +3,6 @@
 #include "BaseQueryProcessor.h"
 #include "../base/MemoryQueryProcessorBase.h"
 
-#include <RobotAPI/libraries/armem/core/workingmemory/ice_conversions.h>
-
 #include "CoreSegmentQueryProcessor.h"
 
 namespace armarx::armem::wm::query_proc
diff --git a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/ProviderSegmentQueryProcessor.h b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/ProviderSegmentQueryProcessor.h
index 4f88a1709081ee6b4540d2bd828733c8ed5d936f..1b2e9ba97850ed1f62f2d761a51996f3b2bb2665 100644
--- a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/ProviderSegmentQueryProcessor.h
+++ b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/ProviderSegmentQueryProcessor.h
@@ -3,8 +3,6 @@
 #include "BaseQueryProcessor.h"
 #include "../base/ProviderSegmentQueryProcessorBase.h"
 
-#include <RobotAPI/libraries/armem/core/workingmemory/ice_conversions.h>
-
 #include "EntityQueryProcessor.h"
 
 namespace armarx::armem::wm::query_proc