diff --git a/source/RobotAPI/components/ArViz/Client/Elements.h b/source/RobotAPI/components/ArViz/Client/Elements.h
index e9157a24d9f60b9ba71d70cccd2141b0258665c3..e540d18c0e2927ab5b5008abe3f92105aaf04211 100644
--- a/source/RobotAPI/components/ArViz/Client/Elements.h
+++ b/source/RobotAPI/components/ArViz/Client/Elements.h
@@ -1,19 +1,9 @@
 #pragma once
 
-#include <RobotAPI/interface/ArViz/Elements.h>
 
-#include <SimoxUtility/EigenStdVector.h>
-#include <SimoxUtility/math/normal/normal_to_mat4.h>
-#include <SimoxUtility/math/convert/rpy_to_mat3f.h>
-#include <SimoxUtility/math/pose/transform.h>
-#include <SimoxUtility/shapes/OrientedBoxBase.h>
 
-#include <Eigen/Core>
-#include <Eigen/Geometry>
 
-#include <string>
 
-#include <ArmarXCore/core/exceptions/local/ExpressionException.h>
 
 #include "Color.h"
 #include "elements/ElementOps.h"
@@ -22,6 +12,22 @@
 #include "elements/Robot.h"
 //#include "elements/RobotHand.h"  // Not included by default (exposes additional headers).
 
+#include <RobotAPI/interface/ArViz/Elements.h>
+
+#include <ArmarXCore/core/exceptions/local/ExpressionException.h>
+
+#include <SimoxUtility/EigenStdVector.h>
+#include <SimoxUtility/math/normal/normal_to_mat4.h>
+#include <SimoxUtility/math/convert/rpy_to_mat3f.h>
+#include <SimoxUtility/math/pose/transform.h>
+#include <SimoxUtility/shapes/OrientedBoxBase.h>
+
+#include <Eigen/Geometry>
+#include <Eigen/Core>
+
+#include <ctime>
+#include <string>
+
 // The has_member macro causes compile errors if *any* other header uses
 // the identifier has_member. Boost.Thread does, so this causes compile
 // errors down the line.
@@ -118,7 +124,7 @@ namespace armarx::viz
         template<class T>
         Box(
             const simox::OrientedBoxBase<T>& b,
-            const std::string& name = std::to_string(std::chrono::high_resolution_clock::now().time_since_epoch().count())
+            const std::string& name = std::to_string(std::time(0))
         )
             : Box(name, b)
         {}
diff --git a/source/RobotAPI/libraries/armem/core/base/EntityBase.h b/source/RobotAPI/libraries/armem/core/base/EntityBase.h
index 0775a71f977fde16966550f0506e9fd0f591e9a5..4fd0611bb61bcd513de5d9b4c1d066c3dd5814af 100644
--- a/source/RobotAPI/libraries/armem/core/base/EntityBase.h
+++ b/source/RobotAPI/libraries/armem/core/base/EntityBase.h
@@ -6,6 +6,7 @@
 #include <SimoxUtility/algorithm/get_map_keys_values.h>
 
 #include <ArmarXCore/core/exceptions/local/ExpressionException.h>
+#include <ArmarXCore/core/logging/Logging.h>
 
 #include "../../core/Time.h"
 #include "../../core/MemoryID.h"