diff --git a/include/hpp/manipulation/problem.hh b/include/hpp/manipulation/problem.hh
index 0563b31a96ee9bac61e637a4c19c37dc341758e5..6b4b05ef3b13c26e010f6ea4dceba1a8fcb9925d 100644
--- a/include/hpp/manipulation/problem.hh
+++ b/include/hpp/manipulation/problem.hh
@@ -18,12 +18,11 @@
 # define HPP_MANIPULATION_PROBLEM_HH
 
 # include <hpp/core/problem.hh>
-# include <hpp/core/problem-solver.hh>
+# include <hpp/core/problem-solver.hh> // PathValidationBuilder_t
 
-# include "hpp/manipulation/fwd.hh"
-# include "hpp/manipulation/device.hh"
-# include "hpp/manipulation/graph/graph.hh"
-# include "hpp/manipulation/graph-path-validation.hh"
+# include <hpp/manipulation/fwd.hh>
+# include <hpp/manipulation/device.hh>
+# include <hpp/manipulation/graph/fwd.hh>
 
 namespace hpp {
   namespace manipulation {
diff --git a/src/problem.cc b/src/problem.cc
index fba71b74d3e6c8325374705d091935d7d9cc5e12..c34cbfa91b3595dbed86d617539911461ba6a753 100644
--- a/src/problem.cc
+++ b/src/problem.cc
@@ -20,6 +20,7 @@
 
 #include <hpp/manipulation/weighed-distance.hh>
 #include <hpp/manipulation/graph-steering-method.hh>
+#include <hpp/manipulation/graph-path-validation.hh>
 
 namespace hpp {
   namespace manipulation {