diff --git a/include/hpp/manipulation/graph-optimizer.hh b/include/hpp/manipulation/graph-optimizer.hh
index 752fbf0c84a82efdff3e8eb43d27cc023128d0bf..28dbc7ca14c66c45df319e7009843de6891b64f9 100644
--- a/include/hpp/manipulation/graph-optimizer.hh
+++ b/include/hpp/manipulation/graph-optimizer.hh
@@ -18,16 +18,12 @@
 #ifndef HPP_MANIPULATION_GRAPHOPTIMIZER_HH
 # define HPP_MANIPULATION_GRAPHOPTIMIZER_HH
 
-# include <hpp/core/path.hh>
-# include <hpp/core/path-vector.hh>
 # include <hpp/core/path-optimizer.hh>
-# include <hpp/core/problem.hh>
-# include <hpp/core/problem-solver.hh>
+# include <hpp/core/problem-solver.hh> // PathOptimizerBuilder_t
 
 # include <hpp/manipulation/fwd.hh>
-# include <hpp/manipulation/graph/fwd.hh>
 # include <hpp/manipulation/config.hh>
-# include <hpp/manipulation/constraint-set.hh>
+# include <hpp/manipulation/graph/fwd.hh>
 
 namespace hpp {
   namespace manipulation {
diff --git a/src/graph-optimizer.cc b/src/graph-optimizer.cc
index 92af5fe503eab82555875c7e7a16312f08af014f..6d4452388e244e6cf6a520311dac016559adbb00 100644
--- a/src/graph-optimizer.cc
+++ b/src/graph-optimizer.cc
@@ -16,6 +16,11 @@
 
 #include <hpp/manipulation/graph-optimizer.hh>
 
+#include <hpp/core/path.hh>
+#include <hpp/core/path-vector.hh>
+#include <hpp/core/problem.hh>
+
+#include <hpp/manipulation/constraint-set.hh>
 #include <hpp/manipulation/graph/edge.hh>
 #include <hpp/manipulation/graph-path-validation.hh>