-typedef simgrid::kernel::lmm::s_lmm_element_t* lmm_element_t;
-typedef simgrid::kernel::lmm::s_lmm_variable_t* lmm_variable_t;
-typedef simgrid::kernel::lmm::s_lmm_constraint_t* lmm_constraint_t;
-typedef simgrid::kernel::lmm::s_lmm_constraint_light_t* lmm_constraint_light_t;
-typedef simgrid::kernel::lmm::s_lmm_system_t* lmm_system_t;
+typedef simgrid::kernel::lmm::Element* lmm_element_t;
+typedef const simgrid::kernel::lmm::Element* const_lmm_element_t;
+typedef simgrid::kernel::lmm::Variable* lmm_variable_t;
+typedef simgrid::kernel::lmm::Constraint* lmm_constraint_t;
+typedef simgrid::kernel::lmm::ConstraintLight* lmm_constraint_light_t;
+typedef simgrid::kernel::lmm::System* lmm_system_t;