diff --git a/src/axial-handle.cc b/src/axial-handle.cc
index 945e3173964137c5ffe02d2493c534ac5dfe74da..baa84d8854867ade701dc29883928d12956d636e 100644
--- a/src/axial-handle.cc
+++ b/src/axial-handle.cc
@@ -26,7 +26,7 @@
 #include <hpp/model/joint.hh>
 #include <hpp/model/gripper.hh>
 
-#include <hpp/constraints/relative-transformation.hh>
+#include <hpp/constraints/generic-transformation.hh>
 
 #include <hpp/core/numerical-constraint.hh>
 
diff --git a/src/handle.cc b/src/handle.cc
index 16b4b2d43fb5a4e7a0b448d275fd88f360115f4a..df82081ee25d88f8d747110626f6c3ee02348093 100644
--- a/src/handle.cc
+++ b/src/handle.cc
@@ -29,8 +29,7 @@
 #include <hpp/model/joint.hh>
 #include <hpp/model/gripper.hh>
 
-#include <hpp/constraints/relative-position.hh>
-#include <hpp/constraints/relative-transformation.hh>
+#include <hpp/constraints/generic-transformation.hh>
 
 #include <hpp/core/numerical-constraint.hh>
 #include <hpp/core/explicit-numerical-constraint.hh>
diff --git a/tests/path-projection.cc b/tests/path-projection.cc
index b28441912c77124f86156d306d3ffe4e2c33de53..af72044333b0f32c27c94eff5514426f7a7cd502 100644
--- a/tests/path-projection.cc
+++ b/tests/path-projection.cc
@@ -36,7 +36,7 @@
 #include <hpp/model/configuration.hh>
 #include <hpp/model/object-factory.hh>
 
-#include <hpp/constraints/position.hh>
+#include <hpp/constraints/generic-transformation.hh>
 
 #define REQUIRE_MESSAGE(b,m) do {\
   if (!b) {\
@@ -79,8 +79,6 @@ using hpp::core::pathProjector::Progressive;
 using hpp::core::Problem;
 using hpp::core::ProblemPtr_t;
 
-static matrix3_t identity () { matrix3_t R; R.setIdentity (); return R;}
-
 hpp::model::ObjectFactory objectFactory;
 
 namespace hpp_test {
@@ -177,7 +175,8 @@ int main (int , char**) {
   JointPtr_t ee = r->getJointByName ("FOREARM");
   vector3_t target (0, (ARM_LENGTH + FOREARM_LENGTH ) / 2, 0),
             origin (0, FOREARM_LENGTH, 0);
-  PositionPtr_t c = Position::create (r, ee, origin, target, identity (), list_of (false)(true)(false));
+  PositionPtr_t c = Position::create ("Pos", r, ee, origin, target,
+      list_of (false)(true)(false).convert_to_container<std::vector<bool> >());
   ConstraintSetPtr_t cs = ConstraintSet::create (r, "test-cs");
   ConfigProjectorPtr_t proj = ConfigProjector::create (r, "test", 1e-4, 20);
   proj->add (NumericalConstraint::create (c));