diff --git a/source/ArmarXGui/gui-plugins/StatechartViewerPlugin/StateWatcher.cpp b/source/ArmarXGui/gui-plugins/StatechartViewerPlugin/StateWatcher.cpp
index 2d3283bd25885d278f544aef87663ab6edd91d34..f3ea80e770459158f040f50ac216a0cfc08e0e4b 100644
--- a/source/ArmarXGui/gui-plugins/StatechartViewerPlugin/StateWatcher.cpp
+++ b/source/ArmarXGui/gui-plugins/StatechartViewerPlugin/StateWatcher.cpp
@@ -32,7 +32,7 @@
 #include <ArmarXCore/observers/variant/StringValueMap.h>
 #include <ArmarXCore/statechart/StateUtilFunctions.h>
 #include <ArmarXCore/observers/variant/VariantContainer.h>
-
+#include <ArmarXCore/core/services/profiler/Profiler.h>  // for ProfilerPtr
 
 
 using namespace armarx::statechartmodel;
@@ -79,7 +79,7 @@ namespace armarx
             tempList.swap(subscriptionQueue);
         }
         ARMARX_DEBUG << tempList.size() << " new subscriptions received";
-        for (auto & elem : tempList)
+        for (auto& elem : tempList)
         {
             StateIceBasePtr iceState = elem.first;
             statechartmodel::StatePtr state = elem.second;
@@ -139,13 +139,13 @@ namespace armarx
         ScopedLock lock(mapMutex);
         try
         {
-            for (const auto & stateData : stateMap)
+            for (const auto& stateData : stateMap)
             {
                 if (stateData.second.states.count(state))
                 {
                     //                    ARMARX_INFO << "Checking: " << "Found";
                     StringValueMap map(false);
-                    for (auto & entry : stateData.second.parameters.at(paramMapType))
+                    for (auto& entry : stateData.second.parameters.at(paramMapType))
                     {
                         map.addElement(entry.first, entry.second->value);
                     }
@@ -166,7 +166,7 @@ namespace armarx
         ScopedLock lock(mapMutex);
         //        try
         {
-            for (const auto & stateData : stateMap)
+            for (const auto& stateData : stateMap)
             {
                 if (stateData.second.states.count(state))
                 {
@@ -177,7 +177,7 @@ namespace armarx
                     if (it == stateData.second.parameters.end())
                     {
                         std::stringstream s;
-                        for (auto & e : stateData.second.parameters)
+                        for (auto& e : stateData.second.parameters)
                         {
                             s << e.first << ", ";
                         }
@@ -238,7 +238,7 @@ namespace armarx
                     return;
                 }
                 const StateListenerData& data = it->second;
-                for (auto & state : data.states)
+                for (auto& state : data.states)
                 {
                     if (state)
                     {
@@ -268,7 +268,7 @@ namespace armarx
                     return;
                 }
                 const StateListenerData& data = it->second;
-                for (const statechartmodel::StatePtr & state : data.states)
+                for (const statechartmodel::StatePtr& state : data.states)
                 {
                     if (state->getActiveSubstate())
                     {
@@ -309,7 +309,7 @@ namespace armarx
                     return;
                 }
                 const StateListenerData& data = it->second;
-                for (const statechartmodel::StatePtr & state : data.states)
+                for (const statechartmodel::StatePtr& state : data.states)
                 {
                     statechartmodel::StateCPtr cstate = state;
 
@@ -386,7 +386,7 @@ namespace armarx
 
     void StateWatcher::reportStatechartTransitionList(const ProfilerStatechartTransitionList& data, const Ice::Current& c)
     {
-        for (auto & elem : data)
+        for (auto& elem : data)
         {
             reportStatechartTransition(elem, c);
         }
@@ -394,7 +394,7 @@ namespace armarx
 
     void StateWatcher::reportStatechartInputParametersList(const ProfilerStatechartParametersList& data, const Ice::Current& c)
     {
-        for (auto & elem : data)
+        for (auto& elem : data)
         {
             reportStatechartInputParameters(elem, c);
         }
@@ -402,7 +402,7 @@ namespace armarx
 
     void StateWatcher::reportStatechartLocalParametersList(const ProfilerStatechartParametersList& data, const Ice::Current& c)
     {
-        for (auto & elem : data)
+        for (auto& elem : data)
         {
             reportStatechartLocalParameters(elem, c);
         }
@@ -410,7 +410,7 @@ namespace armarx
 
     void StateWatcher::reportStatechartOutputParametersList(const ProfilerStatechartParametersList& data, const Ice::Current& c)
     {
-        for (auto & elem : data)
+        for (auto& elem : data)
         {
             reportStatechartOutputParameters(elem, c);
         }