diff --git a/source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.cpp b/source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.cpp
index f4e7b492421b31d5de6fe99243c76cd5fb55c5cd..b7a74d925c6fc005cd506fff1f5a28558106c752 100644
--- a/source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.cpp
+++ b/source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.cpp
@@ -6,8 +6,6 @@
 #include <ArmarXCore/core/system/cmake/CMakePackageFinder.h>
 #include <ArmarXCore/core/util/StringHelpers.h>
 
-#include "ObjectInfo.h"
-
 
 namespace armarx
 {
diff --git a/source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.h b/source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.h
index 5e3a31f546c76a92d16e9a8bc87bba1dfcaef971..e7f3170c1954e810a077c88c0ea2f3aa1cc9f898 100644
--- a/source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.h
+++ b/source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.h
@@ -4,13 +4,11 @@
 
 #include <ArmarXCore/core/logging/Logging.h>
 
+#include "ObjectInfo.h"
+
 
 namespace armarx
 {
-    // #include <RobotAPI/libraries/ArmarXObjects/ObjectInfo.h>
-    class ObjectInfo;
-
-
     /**
      * @brief Used to find objects in the ArmarX objects repository [1].
      *
diff --git a/source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.h b/source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.h
index 260b3c15c66922eb2026817278f8d71ac2f14c75..0fd1ef03216ba8fdbb620462306b9779baeabde9 100644
--- a/source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.h
+++ b/source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.h
@@ -6,7 +6,9 @@
 
 namespace simox
 {
+    // #include <SimoxUtility/shapes/AxisAlignedBoundingBox.h>
     struct AxisAlignedBoundingBox;
+    // #include <SimoxUtility/shapes/OrientedBox.h>
     template<class FloatT> class OrientedBox;
 }