diff --git a/source/RobotAPI/libraries/skills/core/Skill.h b/source/RobotAPI/libraries/skills/core/Skill.h
index 9fffd35a6f258e778200351ef387ba9d3b184480..d9edf529c300968b4b428066836ba106a39e76e8 100644
--- a/source/RobotAPI/libraries/skills/core/Skill.h
+++ b/source/RobotAPI/libraries/skills/core/Skill.h
@@ -2,7 +2,6 @@
 
 #include <functional>
 #include <mutex>
-#include <queue>
 #include <thread>
 
 #include <ArmarXCore/core/logging/Logging.h>
@@ -14,10 +13,8 @@
 
 #include "SkillDescription.h"
 #include "SkillID.h"
-#include "SkillPreparationInput.h"
 #include "SkillProxy.h"
 #include "SkillStatusUpdate.h"
-#include "error/Exception.h"
 
 namespace armarx
 {
diff --git a/source/RobotAPI/libraries/skills/core/SkillDescription.h b/source/RobotAPI/libraries/skills/core/SkillDescription.h
index 784afd9321f4d677109c1f43672f0bdff4846db8..f65ba3f45e5da2c36c223c79797bb3b27ac52450 100644
--- a/source/RobotAPI/libraries/skills/core/SkillDescription.h
+++ b/source/RobotAPI/libraries/skills/core/SkillDescription.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <string>
-#include <vector>
 
 #include <ArmarXCore/core/time/Duration.h>
 
diff --git a/source/RobotAPI/libraries/skills/core/SkillID.h b/source/RobotAPI/libraries/skills/core/SkillID.h
index 91494c78c331272e85babe5052ccd2369e29833e..8bf5eb0f34a4a73ef8255f1ac64e1222ca71692d 100644
--- a/source/RobotAPI/libraries/skills/core/SkillID.h
+++ b/source/RobotAPI/libraries/skills/core/SkillID.h
@@ -1,14 +1,12 @@
 #pragma once
 
 #include <string>
-#include <vector>
 
 #include <SimoxUtility/algorithm/string.h>
 
 #include <RobotAPI/interface/skills/SkillManagerInterface.h>
 
 #include "ProviderID.h"
-#include "error/Exception.h"
 
 namespace armarx
 {
diff --git a/source/RobotAPI/libraries/skills/core/SkillStatusUpdate.h b/source/RobotAPI/libraries/skills/core/SkillStatusUpdate.h
index ace31510a8a362ed45289c4facdd51c97ba22fbb..f6318d5c1993fd94d17a6a5e5e16086794d1f34d 100644
--- a/source/RobotAPI/libraries/skills/core/SkillStatusUpdate.h
+++ b/source/RobotAPI/libraries/skills/core/SkillStatusUpdate.h
@@ -1,8 +1,5 @@
 #pragma once
 
-#include <string>
-#include <vector>
-
 #include <ArmarXCore/core/time/DateTime.h>
 #include <ArmarXCore/core/time/ice_conversions.h>
 
@@ -10,8 +7,6 @@
 #include <RobotAPI/libraries/aron/core/data/variant/container/Dict.h>
 
 #include "SkillExecutionID.h"
-#include "SkillID.h"
-#include "SkillParameterization.h"
 
 namespace armarx
 {
diff --git a/source/RobotAPI/libraries/skills/provider/SpecializedSkill.h b/source/RobotAPI/libraries/skills/provider/SpecializedSkill.h
index 2fded9a0a50ede4cdc3e8d76861217fbc1127c58..fa3c43ce54eda2feacd0f88895ede30840c08e1f 100644
--- a/source/RobotAPI/libraries/skills/provider/SpecializedSkill.h
+++ b/source/RobotAPI/libraries/skills/provider/SpecializedSkill.h
@@ -3,47 +3,41 @@
 #include <RobotAPI/libraries/aron/core/type/variant/container/Object.h>
 #include <RobotAPI/libraries/skills/core/Skill.h>
 
-// Debug
-#include <RobotAPI/libraries/aron/converter/json/NLohmannJSONConverter.h>
-
-namespace armarx
+namespace armarx::skills
 {
-    namespace skills
+    template <class AronT>
+    class SpecializedSkill : public Skill
     {
-        template <class AronT>
-        class SpecializedSkill : public Skill
+    public:
+        using Base = Skill;
+        using ParamType = AronT;
+
+        using Skill::Skill;
+        virtual ~SpecializedSkill() = default;
+
+        void
+        setParameters(const AronT& d)
+        {
+            Base::setParameters(d.toAron());
+        }
+
+        /// Overwrite getter for parameters. Shadow Skill::getParameters()
+        AronT
+        getParameters() const
+        {
+            AronT d;
+            d.fromAron(this->parameters);
+            return d;
+        }
+
+        /// returns the accepted type of the skill
+        static armarx::aron::type::ObjectPtr
+        GetAcceptedType()
         {
-        public:
-            using Base = Skill;
-            using ParamType = AronT;
-
-            using Skill::Skill;
-            virtual ~SpecializedSkill() = default;
-
-            void
-            setParameters(const AronT& d)
-            {
-                Base::setParameters(d.toAron());
-            }
-
-            /// Overwrite getter for parameters. Shadow Skill::getParameters()
-            AronT
-            getParameters() const
-            {
-                AronT d;
-                d.fromAron(this->parameters);
-                return d;
-            }
-
-            /// returns the accepted type of the skill
-            static armarx::aron::type::ObjectPtr
-            GetAcceptedType()
-            {
-                return AronT::ToAronType();
-            }
-
-
-        protected:
-        };
-    } // namespace skills
-} // namespace armarx
+            return AronT::ToAronType();
+        }
+
+
+    protected:
+    };
+} // namespace armarx::skills