diff --git a/include/hpp/manipulation/graph-path-validation.hh b/include/hpp/manipulation/graph-path-validation.hh
index 7449f8e7e76db0a97a905d3b1f9e110782e7555a..d2bea760a49efb85629885b150c047529fdfad9c 100644
--- a/include/hpp/manipulation/graph-path-validation.hh
+++ b/include/hpp/manipulation/graph-path-validation.hh
@@ -18,13 +18,10 @@
 #ifndef HPP_MANIPULATION_GRAPHPATHVALIDATOR_HH
 # define HPP_MANIPULATION_GRAPHPATHVALIDATOR_HH
 
-# include <hpp/core/path.hh>
-# include <hpp/core/path-vector.hh>
 # include <hpp/core/path-validation.hh>
 
-# include "hpp/manipulation/fwd.hh"
-# include "hpp/manipulation/graph/graph.hh"
-# include "hpp/manipulation/graph/node.hh"
+# include <hpp/manipulation/fwd.hh>
+# include <hpp/manipulation/config.hh>
 
 namespace hpp {
   namespace manipulation {
@@ -34,7 +31,6 @@ namespace hpp {
     using hpp::core::PathPtr_t;
     using hpp::core::PathVector;
     using hpp::core::PathVectorPtr_t;
-    using graph::GraphPtr_t;
 
     /// \addtogroup validation
     /// \{
@@ -127,7 +123,7 @@ namespace hpp {
         /// The encapsulated PathValidation.
         PathValidationPtr_t pathValidation_;
         /// Pointer to the constraint graph.
-        GraphPtr_t constraintGraph_;
+        graph::GraphPtr_t constraintGraph_;
     };
 
     template <typename T>
diff --git a/src/graph-path-validation.cc b/src/graph-path-validation.cc
index baa5183669e117118558d0d8d688c4b5463ecdd7..7394fe200b711d22808a36d5c31ee9b9f1e68b14 100644
--- a/src/graph-path-validation.cc
+++ b/src/graph-path-validation.cc
@@ -16,6 +16,10 @@
 
 #include "hpp/manipulation/graph-path-validation.hh"
 
+#include <hpp/core/path.hh>
+#include <hpp/core/path-vector.hh>
+
+#include <hpp/manipulation/graph/graph.hh>
 #include <hpp/manipulation/constraint-set.hh>
 
 namespace hpp {