diff --git a/include/hpp/manipulation/weighed-distance.hh b/include/hpp/manipulation/weighed-distance.hh
index 472a6d57540c81538f1af640acd3d22e53541871..fabe97a80a4e8f1fb40311267a9c8eec8b2bb3cf 100644
--- a/include/hpp/manipulation/weighed-distance.hh
+++ b/include/hpp/manipulation/weighed-distance.hh
@@ -19,9 +19,10 @@
 # define HPP_MANIPULATION_DISTANCE_HH
 
 # include <hpp/core/weighed-distance.hh>
+
 # include <hpp/manipulation/fwd.hh>
-# include <hpp/manipulation/graph/fwd.hh>
 # include <hpp/manipulation/config.hh>
+# include <hpp/manipulation/graph/fwd.hh>
 
 namespace hpp {
   namespace manipulation {
diff --git a/src/weighed-distance.cc b/src/weighed-distance.cc
index 4709eb4a1368a591596c061a30ef77236dc302a4..756e0f11cc44c0d784bc955d1e125e40d4c86b3e 100644
--- a/src/weighed-distance.cc
+++ b/src/weighed-distance.cc
@@ -18,8 +18,8 @@
 
 #include <hpp/util/debug.hh>
 
-#include <hpp/manipulation/roadmap-node.hh>
 #include <hpp/manipulation/device.hh>
+#include <hpp/manipulation/roadmap-node.hh>
 #include <hpp/manipulation/graph/graph.hh>
 #include <hpp/manipulation/graph/edge.hh>