diff --git a/source/RobotAPI/libraries/armem_robot_state/server/description/Segment.h b/source/RobotAPI/libraries/armem_robot_state/server/description/Segment.h
index a6e2d08ee9afde374c117c340c3a55c8a0e58662..073c40230dbd3075a9a7f6f8422fb25ffbf2c069 100644
--- a/source/RobotAPI/libraries/armem_robot_state/server/description/Segment.h
+++ b/source/RobotAPI/libraries/armem_robot_state/server/description/Segment.h
@@ -30,8 +30,6 @@
 #include <ArmarXCore/core/logging/Logging.h>
 #include <ArmarXCore/core/application/properties/PropertyDefinitionContainer.h>
 
-// #include <ArmarXGui/libraries/RemoteGui/Client/Widgets.h>
-
 #include <RobotAPI/components/ArViz/Client/Client.h>
 
 #include <RobotAPI/libraries/armem/core/MemoryID.h>
diff --git a/source/RobotAPI/libraries/aron/core/Randomizer.h b/source/RobotAPI/libraries/aron/core/Randomizer.h
index bdc05099f108f0abaecb8db68cc58f47b8688a6c..00f355baa9c01e66792a886b027ad4186b808016 100644
--- a/source/RobotAPI/libraries/aron/core/Randomizer.h
+++ b/source/RobotAPI/libraries/aron/core/Randomizer.h
@@ -55,6 +55,7 @@ namespace armarx::aron
             {
                 nextMaybeType = getRandomElement(type::ALL_MAYBE_TYPES);
             }
+            (void) nextMaybeType;  // Unused
 
             switch (nextType)
             {