diff --git a/include/hpp/manipulation/graph-steering-method.hh b/include/hpp/manipulation/graph-steering-method.hh
index 22e8a6d206373e365db2a27b8cfa832055b8da19..29a750cc92e073f5b8bc6eb21e6da9ebfe051c52 100644
--- a/include/hpp/manipulation/graph-steering-method.hh
+++ b/include/hpp/manipulation/graph-steering-method.hh
@@ -18,16 +18,12 @@
 #ifndef HPP_MANIPULATION_GRAPH_STEERING_METHOD_HH
 # define HPP_MANIPULATION_GRAPH_STEERING_METHOD_HH
 
-# include <hpp/manipulation/config.hh>
-
-# include "hpp/core/problem-solver.hh" // SteeringMethodBuilder_t
+# include <hpp/core/problem-solver.hh> // SteeringMethodBuilder_t
 # include <hpp/core/steering-method.hh>
-# include <hpp/core/weighed-distance.hh>
-# include <hpp/model/device.hh>
 
-# include "hpp/manipulation/fwd.hh"
-# include "hpp/manipulation/graph/fwd.hh"
-# include "hpp/manipulation/problem.hh"
+# include <hpp/manipulation/config.hh>
+# include <hpp/manipulation/fwd.hh>
+# include <hpp/manipulation/graph/fwd.hh>
 
 namespace hpp {
   namespace manipulation {
diff --git a/src/graph-steering-method.cc b/src/graph-steering-method.cc
index 1094f82e3019600113304481eeae1e9f0afce788..9b0618da7c6a21d684a282fd966b582cf7979cb0 100644
--- a/src/graph-steering-method.cc
+++ b/src/graph-steering-method.cc
@@ -18,11 +18,11 @@
 
 #include <hpp/util/pointer.hh>
 
-#include <hpp/core/distance.hh>
 #include <hpp/core/straight-path.hh>
 
-#include "hpp/manipulation/graph/graph.hh"
-#include "hpp/manipulation/graph/edge.hh"
+#include <hpp/manipulation/problem.hh>
+#include <hpp/manipulation/graph/graph.hh>
+#include <hpp/manipulation/graph/edge.hh>
 
 namespace hpp {
   namespace manipulation {