diff --git a/source/RobotAPI/libraries/armem_skills/aron_conversions.cpp b/source/RobotAPI/libraries/armem_skills/aron_conversions.cpp
index 0b6d18a61ae044a7d1ea4dfad62e5796803d595f..db18f5ac2a93db5a20b5103aff547e607ff6c29d 100644
--- a/source/RobotAPI/libraries/armem_skills/aron_conversions.cpp
+++ b/source/RobotAPI/libraries/armem_skills/aron_conversions.cpp
@@ -2,6 +2,23 @@
 
 namespace armarx::armem
 {
+    std::map<armarx::eStateType, armarx::armem::arondto::Statechart::StateType> toAronStateTypeMap =
+    {
+        {eNormalState, armarx::armem::arondto::Statechart::StateType::NORMAL},
+        {eFinalState, armarx::armem::arondto::Statechart::StateType::FINAL},
+        {eRemoteState, armarx::armem::arondto::Statechart::StateType::REMOTE},
+        {eDynamicRemoteState, armarx::armem::arondto::Statechart::StateType::DYNAMIC_REMOTE},
+        {eUndefined, armarx::armem::arondto::Statechart::StateType::UNDEFINED},
+    };
+
+    std::map<armarx::armem::arondto::Statechart::StateType, armarx::eStateType> fromAronStateTypeMap =
+    {
+        {armarx::armem::arondto::Statechart::StateType::NORMAL, eNormalState},
+        {armarx::armem::arondto::Statechart::StateType::FINAL, eFinalState},
+        {armarx::armem::arondto::Statechart::StateType::REMOTE, eRemoteState},
+        {armarx::armem::arondto::Statechart::StateType::DYNAMIC_REMOTE, eDynamicRemoteState},
+        {armarx::armem::arondto::Statechart::StateType::UNDEFINED, eUndefined},
+    };
 
     void fromAron(const arondto::Statechart::StateType& dto, eStateType& bo)
     {
diff --git a/source/RobotAPI/libraries/armem_skills/aron_conversions.h b/source/RobotAPI/libraries/armem_skills/aron_conversions.h
index 4315d97452745f97b63c82d0d334440ea6803247..bc6314b4613d8ed0d1fa0f49188a51aad47518ca 100644
--- a/source/RobotAPI/libraries/armem_skills/aron_conversions.h
+++ b/source/RobotAPI/libraries/armem_skills/aron_conversions.h
@@ -7,24 +7,6 @@
 
 namespace armarx::armem
 {
-    std::map<armarx::eStateType, armarx::armem::arondto::Statechart::StateType> toAronStateTypeMap =
-    {
-        {eNormalState, armarx::armem::arondto::Statechart::StateType::NORMAL},
-        {eFinalState, armarx::armem::arondto::Statechart::StateType::FINAL},
-        {eRemoteState, armarx::armem::arondto::Statechart::StateType::REMOTE},
-        {eDynamicRemoteState, armarx::armem::arondto::Statechart::StateType::DYNAMIC_REMOTE},
-        {eUndefined, armarx::armem::arondto::Statechart::StateType::UNDEFINED},
-    };
-
-    std::map<armarx::armem::arondto::Statechart::StateType, armarx::eStateType> fromAronStateTypeMap =
-    {
-        {armarx::armem::arondto::Statechart::StateType::NORMAL, eNormalState},
-        {armarx::armem::arondto::Statechart::StateType::FINAL, eFinalState},
-        {armarx::armem::arondto::Statechart::StateType::REMOTE, eRemoteState},
-        {armarx::armem::arondto::Statechart::StateType::DYNAMIC_REMOTE, eDynamicRemoteState},
-        {armarx::armem::arondto::Statechart::StateType::UNDEFINED, eUndefined},
-    };
-
     void fromAron(const armarx::armem::arondto::Statechart::StateType& dto, armarx::eStateType& bo);
     void toAron(armarx::armem::arondto::Statechart::StateType& dto, const armarx::eStateType& bo);