diff --git a/include/hpp/manipulation/roadmap.hh b/include/hpp/manipulation/roadmap.hh
index e236ace787192a03f30002fa02520e8dc8722fe8..c04902bb02f462580db0afad19759ac0bdb4ca99 100644
--- a/include/hpp/manipulation/roadmap.hh
+++ b/include/hpp/manipulation/roadmap.hh
@@ -19,9 +19,9 @@
 
 # include <hpp/core/roadmap.hh>
 
-# include "hpp/manipulation/config.hh"
-# include "hpp/manipulation/fwd.hh"
-# include "hpp/manipulation/graph/fwd.hh"
+# include <hpp/manipulation/fwd.hh>
+# include <hpp/manipulation/config.hh>
+# include <hpp/manipulation/graph/fwd.hh>
 
 namespace hpp {
   namespace manipulation {
diff --git a/src/roadmap.cc b/src/roadmap.cc
index 48b08ea50f9af15766640ba4dd6d2d4dcb8ff240..36bf7743c1f82f6b576cbdbb9732d05a9567c879 100644
--- a/src/roadmap.cc
+++ b/src/roadmap.cc
@@ -14,7 +14,7 @@
 // received a copy of the GNU Lesser General Public License along with
 // hpp-manipulation. If not, see <http://www.gnu.org/licenses/>.
 
-#include "hpp/manipulation/roadmap.hh"
+#include <hpp/manipulation/roadmap.hh>
 
 #include <hpp/util/pointer.hh>
 
@@ -24,6 +24,7 @@
 #include <hpp/manipulation/roadmap.hh>
 #include <hpp/manipulation/roadmap-node.hh>
 #include <hpp/manipulation/symbolic-component.hh>
+#include <hpp/manipulation/connected-component.hh>
 #include <hpp/manipulation/graph/node.hh>
 #include <hpp/manipulation/graph/statistics.hh>