diff --git a/include/hpp/fcl/BV/AABB.h b/include/hpp/fcl/BV/AABB.h
index 9b1ed094f4b39bed4f75dc6d261d020be16b2a81..64e940aedafc50c00e29ce7e6f5db5a98bc816ae 100644
--- a/include/hpp/fcl/BV/AABB.h
+++ b/include/hpp/fcl/BV/AABB.h
@@ -114,7 +114,7 @@ public:
     return true;
   }    
 
-  /// Not implemented
+  /// @brief Check whether two AABB are overlap
   bool overlap(const AABB& other, const CollisionRequest& request,
                FCL_REAL& sqrDistLowerBound) const;
 
diff --git a/include/hpp/fcl/internal/tools.h b/include/hpp/fcl/internal/tools.h
index e8c89a1dde94f91fa6e34ca6b499e93ef156feba..0b4db2311565fe60c005ea839c2628b83b6b45be 100644
--- a/include/hpp/fcl/internal/tools.h
+++ b/include/hpp/fcl/internal/tools.h
@@ -38,9 +38,6 @@
 #ifndef HPP_FCL_MATH_TOOLS_H
 #define HPP_FCL_MATH_TOOLS_H
 
-#include <hpp/fcl/deprecated.hh>
-#include <hpp/fcl/config.hh>
-
 #include <Eigen/Dense>
 #include <Eigen/Geometry>
 
@@ -48,6 +45,10 @@
 #include <iostream>
 #include <limits>
 
+#include <hpp/fcl/deprecated.hh>
+#include <hpp/fcl/config.hh>
+#include <hpp/fcl/data_types.h>
+
 namespace hpp
 {
 namespace fcl