diff --git a/source/RobotAPI/libraries/aron/codegeneration/codegenerator/codewriter/cpp/generator/Factory.cpp b/source/RobotAPI/libraries/aron/codegeneration/codegenerator/codewriter/cpp/generator/Factory.cpp
index 4fc47f01c245eb620b0d6d6109328162702fcba2..c83144cb7090da617e3abcd1c04f81a302eebfae 100644
--- a/source/RobotAPI/libraries/aron/codegeneration/codegenerator/codewriter/cpp/generator/Factory.cpp
+++ b/source/RobotAPI/libraries/aron/codegeneration/codegenerator/codewriter/cpp/generator/Factory.cpp
@@ -25,8 +25,6 @@
 
 // Header
 #include "Factory.h"
-#include <memory>
-#include "RobotAPI/libraries/aron/core/Descriptor.h"
 
 // ArmarX
 #include "All.h"
diff --git a/source/RobotAPI/libraries/aron/core/data/variant/Factory.cpp b/source/RobotAPI/libraries/aron/core/data/variant/Factory.cpp
index 0a24108931416e9843a885106a728616e05553e5..c03b3c37fec376834168d1795dbc6fc390874bea 100644
--- a/source/RobotAPI/libraries/aron/core/data/variant/Factory.cpp
+++ b/source/RobotAPI/libraries/aron/core/data/variant/Factory.cpp
@@ -25,11 +25,8 @@
 
 // Header
 #include "Factory.h"
-#include <memory>
 
 // ArmarX
-#include "RobotAPI/libraries/aron/core/Descriptor.h"
-#include <RobotAPI/interface/aron/Aron.h>
 #include <RobotAPI/libraries/aron/core/data/variant/All.h>
 
 namespace armarx::aron::data
diff --git a/source/RobotAPI/libraries/aron/core/data/visitor/variant/VariantVisitor.cpp b/source/RobotAPI/libraries/aron/core/data/visitor/variant/VariantVisitor.cpp
index 1fd13aea4535ea081b6077058c9882e787cf937e..d060c70606a439a9b7abe8ec03f89c565aefaa17 100644
--- a/source/RobotAPI/libraries/aron/core/data/visitor/variant/VariantVisitor.cpp
+++ b/source/RobotAPI/libraries/aron/core/data/visitor/variant/VariantVisitor.cpp
@@ -23,7 +23,6 @@
 
 // Header
 #include "VariantVisitor.h"
-#include "RobotAPI/libraries/aron/core/type/variant/forward_declarations.h"
 
 #include "../../variant/All.h"
 #include "../../../type/visitor/variant/VariantVisitor.h"
diff --git a/source/RobotAPI/libraries/aron/core/type/variant/Factory.cpp b/source/RobotAPI/libraries/aron/core/type/variant/Factory.cpp
index 8a1aa195d11c08b5e20150d58f6d2bfd36f274c2..21ba5cd0984b9077f668886327b57e8722b1f553 100644
--- a/source/RobotAPI/libraries/aron/core/type/variant/Factory.cpp
+++ b/source/RobotAPI/libraries/aron/core/type/variant/Factory.cpp
@@ -25,11 +25,8 @@
 
 // Header
 #include "Factory.h"
-#include <memory>
 
 // ArmarX
-#include "RobotAPI/libraries/aron/core/Descriptor.h"
-#include <RobotAPI/interface/aron/Aron.h>
 #include <RobotAPI/libraries/aron/core/type/variant/All.h>
 
 namespace armarx::aron::type