diff --git a/include/hpp/manipulation/fwd.hh b/include/hpp/manipulation/fwd.hh
index 2e298c7d62e25c71f0288c14ec792ba6dbdc4106..0fa89ecf0d787aa2ce8028a9fdab607e66bc9248 100644
--- a/include/hpp/manipulation/fwd.hh
+++ b/include/hpp/manipulation/fwd.hh
@@ -31,7 +31,7 @@ namespace hpp {
     typedef pinocchio::Joint Joint;
     typedef pinocchio::JointPtr_t JointPtr_t;
     typedef pinocchio::JointIndex JointIndex;
-    typedef pinocchio::Transform3f Transform3f;
+    typedef std::vector<JointIndex> JointIndexes_t;
     typedef pinocchio::Configuration_t Configuration_t;
     typedef pinocchio::ConfigurationIn_t ConfigurationIn_t;
     typedef pinocchio::ConfigurationOut_t ConfigurationOut_t;
@@ -93,7 +93,6 @@ namespace hpp {
 
     typedef std::vector <pinocchio::DevicePtr_t> Devices_t;
     typedef std::vector <ObjectPtr_t> Objects_t;
-    typedef std::map <JointConstPtr_t, JointPtr_t> JointMap_t;
     typedef core::Constraint Constraint;
     typedef core::ConstraintPtr_t ConstraintPtr_t;
     typedef core::LockedJoint LockedJoint;
@@ -108,6 +107,7 @@ namespace hpp {
     typedef core::ConfigurationShooter ConfigurationShooter;
     typedef core::ConfigurationShooterPtr_t ConfigurationShooterPtr_t;
     typedef core::ValidationReport ValidationReport;
+    typedef core::PathValidationPtr_t PathValidationPtr_t;
     typedef core::PathValidationReportPtr_t PathValidationReportPtr_t;
     typedef core::matrix_t matrix_t;
     typedef core::matrixIn_t matrixIn_t;
@@ -115,6 +115,7 @@ namespace hpp {
     typedef core::size_type size_type;
     typedef core::value_type value_type;
     typedef core::vector3_t vector3_t;
+    typedef core::matrix3_t matrix3_t;
 
     typedef std::list < NumericalConstraintPtr_t > NumericalConstraints_t;
     typedef std::pair< GripperPtr_t, HandlePtr_t> Grasp_t;
diff --git a/include/hpp/manipulation/handle.hh b/include/hpp/manipulation/handle.hh
index f0c6092ab7aab3170d8df53bafa8a767f4b7b0bf..a6bd6409dc8733b0b35c80a2d6a12f2d7ee51897 100644
--- a/include/hpp/manipulation/handle.hh
+++ b/include/hpp/manipulation/handle.hh
@@ -20,6 +20,8 @@
 #ifndef HPP_MANIPULATION_HANDLE_HH
 # define HPP_MANIPULATION_HANDLE_HH
 
+# include <pinocchio/spatial/se3.hpp>
+
 # include <hpp/manipulation/fwd.hh>
 # include <hpp/manipulation/config.hh>
 
diff --git a/include/hpp/manipulation/problem-solver.hh b/include/hpp/manipulation/problem-solver.hh
index e584b9ebc889035d19d5430996f42d53b15e5493..a19a9feddf1e8f8a4620ca7771e711f3a29a385d 100644
--- a/include/hpp/manipulation/problem-solver.hh
+++ b/include/hpp/manipulation/problem-solver.hh
@@ -19,7 +19,7 @@
 # define HPP_MANIPULATION_PROBLEM_SOLVER_HH
 
 # include <map>
-# include <hpp/model/device.hh>
+# include <hpp/pinocchio/device.hh>
 # include <hpp/core/problem-solver.hh>
 # include <hpp/core/container.hh>
 # include "hpp/manipulation/fwd.hh"
diff --git a/include/hpp/manipulation/roadmap-node.hh b/include/hpp/manipulation/roadmap-node.hh
index f38bff2dba0ce9f1df39d9e2771b5885cd66d0e6..6d1f85f58fa0bbc6b0222921ff2ac8446389a66e 100644
--- a/include/hpp/manipulation/roadmap-node.hh
+++ b/include/hpp/manipulation/roadmap-node.hh
@@ -37,11 +37,7 @@ namespace hpp {
         {}
 
         RoadmapNode (const ConfigurationPtr_t& configuration,
-            ConnectedComponentPtr_t cc) :
-          core::Node (configuration, cc),
-          cacheSystem_ (defaultCachingSystem),
-          node_ ()
-        {}
+            ConnectedComponentPtr_t cc);
 
         /// \name Cache system
         /// \{
diff --git a/src/device.cc b/src/device.cc
index 6bf2601d8e4667e70ca202dee6f50c519c887fd3..3c6668b844efa2ef35421d4937f9c1d45b3af51c 100644
--- a/src/device.cc
+++ b/src/device.cc
@@ -19,6 +19,8 @@
 
 #include <hpp/manipulation/device.hh>
 
+#include <pinocchio/multibody/model.hpp>
+
 #include <hpp/pinocchio/joint.hh>
 #include <hpp/pinocchio/gripper.hh>
 
diff --git a/src/graph-optimizer.cc b/src/graph-optimizer.cc
index 6d4452388e244e6cf6a520311dac016559adbb00..7f8e838453f5339aadbe172dbac34a2f1ee7e231 100644
--- a/src/graph-optimizer.cc
+++ b/src/graph-optimizer.cc
@@ -19,6 +19,7 @@
 #include <hpp/core/path.hh>
 #include <hpp/core/path-vector.hh>
 #include <hpp/core/problem.hh>
+#include <hpp/core/config-projector.hh>
 
 #include <hpp/manipulation/constraint-set.hh>
 #include <hpp/manipulation/graph/edge.hh>
diff --git a/src/manipulation-planner.cc b/src/manipulation-planner.cc
index 913afab8646f458e7478f75f5f8535526ec0f03a..00944a6b71f5031b1bb64bc13813980621862a39 100644
--- a/src/manipulation-planner.cc
+++ b/src/manipulation-planner.cc
@@ -35,9 +35,11 @@
 
 #include "hpp/manipulation/graph/statistics.hh"
 #include "hpp/manipulation/device.hh"
+#include "hpp/manipulation/connected-component.hh"
 #include "hpp/manipulation/problem.hh"
 #include "hpp/manipulation/roadmap.hh"
 #include "hpp/manipulation/roadmap-node.hh"
+#include "hpp/manipulation/graph-path-validation.hh"
 #include "hpp/manipulation/graph/edge.hh"
 #include "hpp/manipulation/graph/node-selector.hh"
 
diff --git a/src/path-optimization/small-steps.cc b/src/path-optimization/small-steps.cc
index 6f9c8d86994370dfe51d15aaa42858a621d456e8..1ebf1ff14244249917ed0a57e817de1d53a7ecd1 100644
--- a/src/path-optimization/small-steps.cc
+++ b/src/path-optimization/small-steps.cc
@@ -17,6 +17,7 @@
 #include <hpp/manipulation/path-optimization/small-steps.hh>
 
 #include <hpp/core/problem.hh>
+#include <hpp/core/path-vector.hh>
 
 #include <hpp/wholebody-step/small-steps.hh>
 
diff --git a/src/roadmap-node.cc b/src/roadmap-node.cc
index 5548de33fa41d6bac922161fd6f65e168a26fd3d..b5026ec23fa68f97bc61a31d6e6f2f96c2dbeef0 100644
--- a/src/roadmap-node.cc
+++ b/src/roadmap-node.cc
@@ -16,8 +16,17 @@
 
 #include "hpp/manipulation/roadmap-node.hh"
 
+#include <hpp/manipulation/connected-component.hh>
+
 namespace hpp {
   namespace manipulation {
     RoadmapNode::CachingSystem RoadmapNode::defaultCachingSystem = RoadmapNode::CACHE_DISABLED;
+
+    RoadmapNode::RoadmapNode (const ConfigurationPtr_t& configuration,
+        ConnectedComponentPtr_t cc) :
+      core::Node (configuration, cc),
+      cacheSystem_ (defaultCachingSystem),
+      node_ ()
+    {}
   } // namespace manipulation
 } // namespace hpp