--- a/include/Motion.hpp	Thu May 07 13:25:31 2015 +0200
+++ b/include/Motion.hpp	Thu May 07 16:09:47 2015 +0200
@@ -2,14 +2,12 @@
 #define MOTION_HPP
 
 #include "src/Trajectory.h"
-#include <boost/shared_ptr.hpp>
 #include <boost/graph/adjacency_list.hpp>
 
 
 template<typename T> class TrajectoryDBAccess;
-template<typename T> class TrajectoryDBAccessList;
 
-typedef boost::shared_ptr<TrajectoryPoint2f> TrajectoryPoint2fPtr;
+typedef std::shared_ptr<TrajectoryPoint2f> TrajectoryPoint2fPtr;
 
 /** Class for feature data
     positions, velocities and other statistics to evaluate their quality
@@ -23,7 +21,7 @@
 
   /** loads from database
    can be made generic for different list and blob */
-  FeatureTrajectory(const int& id, TrajectoryDBAccessList<cv::Point2f>& trajectoryDB, const std::string& positionsTableName, const std::string& velocitiesTableName);
+  FeatureTrajectory(const int& id, TrajectoryDBAccess<cv::Point2f>& trajectoryDB, const std::string& positionsTableName, const std::string& velocitiesTableName);
 
   unsigned int length(void) const { return positions->size();} // cautious if not continuous: max-min+1
 
@@ -76,7 +74,7 @@
   void computeMotionData(const int& frameNum);
 };
 
-typedef boost::shared_ptr<FeatureTrajectory> FeatureTrajectoryPtr;
+typedef std::shared_ptr<FeatureTrajectory> FeatureTrajectoryPtr;
 
 // inlined
 inline std::ostream& operator<<(std::ostream& out, const FeatureTrajectory& ft)