diff --git a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianNaturalPositionController.cpp b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianNaturalPositionController.cpp
index d5f45c229d9595643638eb7965354c2591afe952..28bc1e4819946d6734110fa3831e33f4bc1009b0 100644
--- a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianNaturalPositionController.cpp
+++ b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianNaturalPositionController.cpp
@@ -7,6 +7,8 @@
 
 #include <VirtualRobot/math/Helpers.h>
 
+#include <iomanip>
+
 #include "NJointCartesianNaturalPositionController.h"
 
 namespace armarx
diff --git a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianWaypointController.cpp b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianWaypointController.cpp
index b8b5c3c93a55497807556278ac357a2c2c5f7115..6c1b1930b58993ae49a58d487cc540503abbc0d5 100644
--- a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianWaypointController.cpp
+++ b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianWaypointController.cpp
@@ -7,6 +7,8 @@
 
 #include "NJointCartesianWaypointController.h"
 
+#include <iomanip>
+
 namespace armarx
 {
     std::ostream& operator<<(std::ostream& out, const NJointCartesianWaypointControllerRuntimeConfig& cfg)
diff --git a/source/RobotAPI/libraries/ArmarXEtherCAT/EtherCAT.cpp b/source/RobotAPI/libraries/ArmarXEtherCAT/EtherCAT.cpp
index dcbd9ca9d926d65487dbe3d2427118f89c6bdb46..ad1a33863adfa1148400a2166182790a64c6a53d 100644
--- a/source/RobotAPI/libraries/ArmarXEtherCAT/EtherCAT.cpp
+++ b/source/RobotAPI/libraries/ArmarXEtherCAT/EtherCAT.cpp
@@ -7,6 +7,8 @@
 #include <ctime>
 #include <chrono>
 #include <thread>
+#include <iomanip>
+
 #include <ArmarXCore/core/logging/Logging.h>
 //#include <Armar6RT/units/Armar6Unit/FunctionalDevices/Joint.h>
 //#include "Armar6RT/units/Armar6Unit/BusSlaves/SensorBoard.h"
diff --git a/source/RobotAPI/libraries/RobotStatechartHelpers/RobotNameHelper.cpp b/source/RobotAPI/libraries/RobotStatechartHelpers/RobotNameHelper.cpp
index b4d16c5e2e3bff8fdbcf2d32469076825306bfff..b3474ad6eae922dc695e2126df1322e6bf271c74 100644
--- a/source/RobotAPI/libraries/RobotStatechartHelpers/RobotNameHelper.cpp
+++ b/source/RobotAPI/libraries/RobotStatechartHelpers/RobotNameHelper.cpp
@@ -22,7 +22,9 @@
  */
 
 #include "RobotNameHelper.h"
+
 #include <ArmarXCore/core/util/StringHelpers.h>
+#include <ArmarXCore/statechart/xmlstates/profiles/StatechartProfiles.h>
 
 namespace armarx
 {
diff --git a/source/RobotAPI/libraries/RobotStatechartHelpers/RobotNameHelper.h b/source/RobotAPI/libraries/RobotStatechartHelpers/RobotNameHelper.h
index e03a10bc85480726d8cf85b758164b159a266b0d..eca096cc5e62727236ad8c04e482d7ab4f5cdfec 100644
--- a/source/RobotAPI/libraries/RobotStatechartHelpers/RobotNameHelper.h
+++ b/source/RobotAPI/libraries/RobotStatechartHelpers/RobotNameHelper.h
@@ -25,13 +25,12 @@
 
 #include <RobotAPI/interface/core/RobotState.h>
 
-#include <ArmarXCore/statechart/xmlstates/profiles/StatechartProfiles.h>
-
 #include <VirtualRobot/Robot.h>
 
 namespace armarx
 {
     using RobotNameHelperPtr = std::shared_ptr<class RobotNameHelper>;
+    using StatechartProfilePtr = std::shared_ptr<class StatechartProfile>;
 
     class RobotNameHelper : public std::enable_shared_from_this<RobotNameHelper>
     {