diff --git a/research/try.cpp b/research/try.cpp
index d03b9d2da..59acde5b4 100644
--- a/research/try.cpp
+++ b/research/try.cpp
@@ -53,15 +53,15 @@
 #include "lib/meta/tuple.hpp"
 #include "lib/meta/function-closure.hpp"
 
-//#include <tr1/functional>
+//#include <functional>
 #include <iostream>
 
 using lib::meta::Types;
 using lib::meta::Tuple;
-//using std::tr1::placeholders::_1;
-//using std::tr1::placeholders::_2;
-using std::tr1::function;
-using std::tr1::bind;
+//using std::placeholders::_1;
+//using std::placeholders::_2;
+using std::function;
+using std::bind;
 
 using std::string;
 using std::cout;
diff --git a/src/backend/real-clock.hpp b/src/backend/real-clock.hpp
index c25b71276..4d65f9852 100644
--- a/src/backend/real-clock.hpp
+++ b/src/backend/real-clock.hpp
@@ -52,13 +52,13 @@
 //#include <boost/noncopyable.hpp>
 //#include <string>
 //#include <vector>
-//#include <tr1/memory>
+//#include <memory>
 //#include <boost/scoped_ptr.hpp>
 
 //namespace lib {
 //namespace time{
 //  class Quantiser;
-//  typedef std::tr1::shared_ptr<const Quantiser> PQuant;
+//  typedef std::shared_ptr<const Quantiser> PQuant;
 //}}
 
 namespace backend {
@@ -68,7 +68,7 @@ namespace backend {
 //using std::string;
 
 //using std::vector;
-//using std::tr1::shared_ptr;
+//using std::shared_ptr;
 //using boost::scoped_ptr;
   
   
diff --git a/src/backend/thread-wrapper.hpp b/src/backend/thread-wrapper.hpp
index 1ccad35ca..62e04d026 100644
--- a/src/backend/thread-wrapper.hpp
+++ b/src/backend/thread-wrapper.hpp
@@ -36,14 +36,14 @@ extern "C" {
 }
 #include "backend/threadpool-init.hpp"
 
-#include <tr1/functional>
+#include <functional>
 #include <boost/noncopyable.hpp>
 
 
 namespace backend {
   
-  using std::tr1::bind;
-  using std::tr1::function;
+  using std::bind;
+  using std::function;
   using lib::Literal;
   namespace error = lumiera::error;
   using error::LUMIERA_ERROR_STATE;
diff --git a/src/common/advice/index.hpp b/src/common/advice/index.hpp
index f9593ef42..c04f1af72 100644
--- a/src/common/advice/index.hpp
+++ b/src/common/advice/index.hpp
@@ -96,7 +96,7 @@
 #include "common/advice/binding.hpp"
 
 #include <boost/operators.hpp>
-#include <tr1/unordered_map>
+#include <unordered_map>
 #include <iostream>
 #include <string>
 
@@ -105,8 +105,8 @@ namespace advice {
   
   namespace error = lumiera::error;
   
-  using std::tr1::placeholders::_1;
-  using std::tr1::unordered_map;
+  using std::placeholders::_1;
+  using std::unordered_map;
   using lib::iter_stl::eachVal;
   using lib::iter_stl::eachElm;
   using util::for_each;
diff --git a/src/common/guifacade.cpp b/src/common/guifacade.cpp
index c9b0c048c..87377808b 100644
--- a/src/common/guifacade.cpp
+++ b/src/common/guifacade.cpp
@@ -30,7 +30,7 @@
 #include "common/instancehandle.hpp"
 
 #include <boost/scoped_ptr.hpp>
-#include <tr1/functional>
+#include <functional>
 #include <string>
 
 
@@ -38,8 +38,8 @@ namespace gui {
   
   using std::string;
   using boost::scoped_ptr;
-  using std::tr1::bind;
-  using std::tr1::placeholders::_1;
+  using std::bind;
+  using std::placeholders::_1;
   using lumiera::Subsys;
   using lumiera::InstanceHandle;
   using util::dispatchSequenced;
diff --git a/src/common/query.hpp b/src/common/query.hpp
index 1b2486c28..832daea0f 100644
--- a/src/common/query.hpp
+++ b/src/common/query.hpp
@@ -87,7 +87,7 @@
 
 #include <boost/lexical_cast.hpp>
 #include <boost/operators.hpp>
-#include <tr1/memory>
+#include <memory>
 #include <typeinfo>
 #include <cctype>
 #include <string>
@@ -113,7 +113,7 @@ namespace lumiera {
 
   
   /** Allow for taking ownership of a result set */
-  typedef std::tr1::shared_ptr<Resolution> PReso;
+  typedef std::shared_ptr<Resolution> PReso;
 
   
   
diff --git a/src/common/query/defs-registry.hpp b/src/common/query/defs-registry.hpp
index 25df50734..0e58c03b7 100644
--- a/src/common/query/defs-registry.hpp
+++ b/src/common/query/defs-registry.hpp
@@ -58,7 +58,7 @@
 
 #include <set>
 #include <vector>
-#include <tr1/memory>
+#include <memory>
 #include <boost/utility.hpp>
 #include <boost/lambda/lambda.hpp>
 
@@ -68,7 +68,7 @@ namespace query  {
   
   using lib::P;
   using lib::ClassLock;
-  using std::tr1::weak_ptr;
+  using std::weak_ptr;
   
   using std::string;
   using boost::lambda::_1;
diff --git a/src/common/query/query-resolver.hpp b/src/common/query/query-resolver.hpp
index ece3f42cc..ccd4f86d3 100644
--- a/src/common/query/query-resolver.hpp
+++ b/src/common/query/query-resolver.hpp
@@ -29,11 +29,11 @@
 
 #include <boost/noncopyable.hpp>
 #include <boost/scoped_ptr.hpp>
-#include <tr1/functional>
-#include <tr1/memory>
+#include <functional>
+#include <memory>
 #include <string>
 
-using std::tr1::function;
+using std::function;
 
 namespace lumiera {
   
@@ -47,7 +47,7 @@ namespace lumiera {
   class QueryDispatcher;
   
   /** Allow for taking ownership of a result set */
-  typedef std::tr1::shared_ptr<Resolution> PReso;
+  typedef std::shared_ptr<Resolution> PReso;
   
   
   /** 
diff --git a/src/common/subsys.hpp b/src/common/subsys.hpp
index 26b080861..8a136a2a2 100644
--- a/src/common/subsys.hpp
+++ b/src/common/subsys.hpp
@@ -47,7 +47,7 @@
 #include "common/option.hpp"
 
 #include <boost/noncopyable.hpp>
-#include <tr1/functional>
+#include <functional>
 #include <string>
 #include <vector>
 
@@ -57,7 +57,7 @@ namespace lumiera {
   
   using std::string;
   using boost::noncopyable;
-  using std::tr1::function;
+  using std::function;
   
   
   
diff --git a/src/common/subsystem-runner.hpp b/src/common/subsystem-runner.hpp
index 35205d823..3d34951b0 100644
--- a/src/common/subsystem-runner.hpp
+++ b/src/common/subsystem-runner.hpp
@@ -30,16 +30,16 @@
 #include "common/subsys.hpp"
 #include "lib/sync.hpp"
 
-#include <tr1/functional>
+#include <functional>
 #include <vector>
 #include <string>
 
 
 namespace lumiera {
 
-  using std::tr1::bind;
-  using std::tr1::function;
-  using std::tr1::placeholders::_1;
+  using std::bind;
+  using std::function;
+  using std::placeholders::_1;
   using std::vector;
   using std::string;
   using util::cStr;
diff --git a/src/gui/gtk-lumiera.hpp b/src/gui/gtk-lumiera.hpp
index 315ee4f2c..d1ab75199 100644
--- a/src/gui/gtk-lumiera.hpp
+++ b/src/gui/gtk-lumiera.hpp
@@ -55,13 +55,13 @@
 #include "gui/window-manager.hpp"
 
 #include <boost/noncopyable.hpp>
-#include <tr1/memory>
+#include <memory>
 #include <vector>
 
 
 namespace gui {
 
-using std::tr1::shared_ptr;
+using std::shared_ptr;
 
 
 
diff --git a/src/gui/guistart.cpp b/src/gui/guistart.cpp
index 59b3d6edf..6cbd86eef 100644
--- a/src/gui/guistart.cpp
+++ b/src/gui/guistart.cpp
@@ -62,14 +62,14 @@ extern "C" {
 #include "common/interfacedescriptor.h"
 }
 
-#include <tr1/functional>
+#include <functional>
 #include <string>
 
 
 
 using std::string;
 using backend::Thread;
-using std::tr1::bind;
+using std::bind;
 using lumiera::Subsys;
 using lumiera::error::LUMIERA_ERROR_STATE;
 using gui::LUMIERA_INTERFACE_INAME(lumieraorg_Gui, 1);
diff --git a/src/gui/model/clip-track.cpp b/src/gui/model/clip-track.cpp
index 827aec0b9..fe71b2dfd 100644
--- a/src/gui/model/clip-track.cpp
+++ b/src/gui/model/clip-track.cpp
@@ -24,7 +24,6 @@
 
 #include "clip.hpp"
 
-using namespace std::tr1;
 
 namespace gui {
 namespace model {
diff --git a/src/gui/model/parent-track.cpp b/src/gui/model/parent-track.cpp
index 45c8d13ae..750edeacf 100644
--- a/src/gui/model/parent-track.cpp
+++ b/src/gui/model/parent-track.cpp
@@ -23,7 +23,7 @@
 #include "parent-track.hpp"
 #include <boost/foreach.hpp>
 
-using std::tr1::shared_ptr;
+using std::shared_ptr;
 
 namespace gui {
 namespace model {
@@ -73,18 +73,18 @@ ParentTrack::find_descendant_track_parent(shared_ptr<Track> child)
   using namespace boost;
 
   REQUIRE(child != NULL);
-  BOOST_FOREACH(std::tr1::shared_ptr<Track> track, tracks)
+  BOOST_FOREACH(std::shared_ptr<Track> track, tracks)
     {
       if(track == child)
         return shared_from_this();
 
-      std::tr1::shared_ptr<ParentTrack> result =
+      std::shared_ptr<ParentTrack> result =
         track->find_descendant_track_parent(child);
       if(result)
         return result;
     }
   
-  return std::tr1::shared_ptr<ParentTrack>();
+  return std::shared_ptr<ParentTrack>();
 }
 
 }   // namespace model
diff --git a/src/gui/model/parent-track.hpp b/src/gui/model/parent-track.hpp
index a1c709713..12053e321 100644
--- a/src/gui/model/parent-track.hpp
+++ b/src/gui/model/parent-track.hpp
@@ -40,7 +40,7 @@ namespace model {
  */
 class ParentTrack :
   public Track,
-  public std::tr1::enable_shared_from_this<ParentTrack>
+  public std::enable_shared_from_this<ParentTrack>
 {
 protected:
   /**
diff --git a/src/gui/model/project.cpp b/src/gui/model/project.cpp
index 7f8054b53..4ea08b7dd 100644
--- a/src/gui/model/project.cpp
+++ b/src/gui/model/project.cpp
@@ -20,13 +20,12 @@
 
 * *****************************************************/
 
-#include <boost/foreach.hpp>
 
 #include "project.hpp"
 #include "sequence.hpp"
 
-using namespace std;
-using namespace std::tr1;
+#include <memory>
+
 
 namespace gui {
 namespace model {
@@ -52,7 +51,7 @@ Project::get_sequences()
 void
 Project::add_new_sequence(uString name)
 {
-  shared_ptr<Sequence> sequence(new Sequence());
+  std::shared_ptr<Sequence> sequence(new Sequence());
   sequence->set_name(name);
   sequences.push_back(sequence);
 }
diff --git a/src/gui/model/sequence.cpp b/src/gui/model/sequence.cpp
index 107396515..d5f149a92 100644
--- a/src/gui/model/sequence.cpp
+++ b/src/gui/model/sequence.cpp
@@ -23,11 +23,12 @@
 #include "sequence.hpp"
 #include "include/logging.h"
 
+#include <memory>
+
 // TEST CODE
 #include "group-track.hpp"
 #include "clip-track.hpp"
 
-using namespace std::tr1;
 
 namespace gui {
 namespace model {
@@ -37,8 +38,8 @@ Sequence::Sequence()
   // TEST CODE
   static bool first = true;
   
-  shared_ptr<GroupTrack> group_track, group_track2;
-  shared_ptr<ClipTrack> clip_track;
+  std::shared_ptr<GroupTrack> group_track, group_track2;
+  std::shared_ptr<ClipTrack> clip_track;
   tracks.push_back(group_track = shared_ptr<GroupTrack>(new GroupTrack()));
   group_track->set_name("Group Track");
     
diff --git a/src/gui/model/track.cpp b/src/gui/model/track.cpp
index c81cc9739..4c3de6e19 100644
--- a/src/gui/model/track.cpp
+++ b/src/gui/model/track.cpp
@@ -22,16 +22,22 @@
 
 #include "track.hpp"
 #include "parent-track.hpp"
-#include <boost/foreach.hpp>
 
-using namespace std::tr1;
-using namespace std;
+#include <boost/foreach.hpp>
+#include <memory>
+#include <string>
+#include <list>
 
 namespace gui {
 namespace model {
   
+using std::list;
+using std::string;
+using std::shared_ptr;
+
 const list< shared_ptr<Track> > Track::NoChildren;
 
+
 Track::Track()
   : enabled(true),
     locked(false)
@@ -40,7 +46,7 @@ Track::Track()
 Track::~Track() { }
 
 
-const std::list< shared_ptr<Track> >&
+const list< shared_ptr<Track> >&
 Track::get_child_tracks() const
 {
   return Track::NoChildren;
@@ -98,8 +104,7 @@ Track::print_branch()
 }
 
 shared_ptr<ParentTrack>
-Track::find_descendant_track_parent(
-  shared_ptr<Track> /*child*/)
+Track::find_descendant_track_parent (shared_ptr<Track>)
 { 
   return shared_ptr<ParentTrack>();
 }
@@ -123,7 +128,7 @@ Track::signalNameChanged() const
 }
 
 string
-Track::print_branch_recursive(const unsigned int indentation)
+Track::print_branch_recursive (const unsigned int indentation)
 {
   string str;
   
diff --git a/src/gui/panels/timeline-panel.cpp b/src/gui/panels/timeline-panel.cpp
index 827a2bee9..3ae37c357 100644
--- a/src/gui/panels/timeline-panel.cpp
+++ b/src/gui/panels/timeline-panel.cpp
@@ -39,8 +39,8 @@ using namespace gui::widgets;
 using namespace gui::widgets::timeline;
 using namespace gui::model;
 
-using std::tr1::shared_ptr;
-using std::tr1::weak_ptr;
+using std::shared_ptr;
+using std::weak_ptr;
 using util::contains;
 
 namespace gui {
diff --git a/src/gui/panels/timeline-panel.hpp b/src/gui/panels/timeline-panel.hpp
index febcb857c..90d7b8978 100644
--- a/src/gui/panels/timeline-panel.hpp
+++ b/src/gui/panels/timeline-panel.hpp
@@ -36,14 +36,14 @@
 
 #include "lib/time/timevalue.hpp"
 
-#include <tr1/memory>
+#include <memory>
 
 using namespace gui::widgets;
 
 namespace gui {
   
-using std::tr1::shared_ptr;
-using std::tr1::weak_ptr;
+using std::shared_ptr;
+using std::weak_ptr;
 
 
 namespace model {
diff --git a/src/gui/widgets/timeline-widget.cpp b/src/gui/widgets/timeline-widget.cpp
index fac09a6f5..dae888c1c 100644
--- a/src/gui/widgets/timeline-widget.cpp
+++ b/src/gui/widgets/timeline-widget.cpp
@@ -24,16 +24,16 @@
 
 #include <boost/foreach.hpp>
 #include <typeinfo>
-
-using namespace Gtk;
-using namespace std;
-using namespace std::tr1;
-
-using namespace util;
-using namespace gui::widgets::timeline;
+#include <memory>
 
 using lib::time::Time;
 using lib::time::TimeValue;
+using std::dynamic_pointer_cast;
+
+using namespace Gtk;
+
+using namespace util;
+using namespace gui::widgets::timeline;
 
 namespace gui {
 namespace widgets {
diff --git a/src/gui/widgets/timeline-widget.hpp b/src/gui/widgets/timeline-widget.hpp
index ffff15dda..9afe5efe8 100644
--- a/src/gui/widgets/timeline-widget.hpp
+++ b/src/gui/widgets/timeline-widget.hpp
@@ -42,11 +42,14 @@
 
 #include "lib/time/timevalue.hpp"
 
+#include <memory>
+
 
 namespace gui {
 namespace widgets {
 
 using lib::time::Time;
+using std::shared_ptr;
 
   
 /**
diff --git a/src/gui/widgets/timeline/timeline-body.cpp b/src/gui/widgets/timeline/timeline-body.cpp
index 1b580c262..b20c229e6 100644
--- a/src/gui/widgets/timeline/timeline-body.cpp
+++ b/src/gui/widgets/timeline/timeline-body.cpp
@@ -37,7 +37,7 @@ using namespace std;
 using namespace lumiera;
 
 using gui::util::CairoUtil;
-using std::tr1::shared_ptr;
+using std::shared_ptr;
 
 namespace gui {
 namespace widgets {
diff --git a/src/gui/widgets/timeline/timeline-clip-track.cpp b/src/gui/widgets/timeline/timeline-clip-track.cpp
index f659aa1f8..d9c6014b5 100644
--- a/src/gui/widgets/timeline/timeline-clip-track.cpp
+++ b/src/gui/widgets/timeline/timeline-clip-track.cpp
@@ -28,7 +28,7 @@
 
 using namespace Gtk;
 
-using std::tr1::shared_ptr;
+using std::shared_ptr;
 using util::contains;
 
 namespace gui {
@@ -115,7 +115,7 @@ namespace timeline {
   shared_ptr<model::ClipTrack>
   ClipTrack::getModelTrack ()
   {
-    return std::tr1::dynamic_pointer_cast<model::ClipTrack>(modelTrack);
+    return std::dynamic_pointer_cast<model::ClipTrack>(modelTrack);
   }
 
   void
diff --git a/src/gui/widgets/timeline/timeline-clip.cpp b/src/gui/widgets/timeline/timeline-clip.cpp
index 1b4e04d72..5f528d4ac 100644
--- a/src/gui/widgets/timeline/timeline-clip.cpp
+++ b/src/gui/widgets/timeline/timeline-clip.cpp
@@ -27,7 +27,7 @@ namespace gui {
 namespace widgets {
 namespace timeline {
   
-  using std::tr1::shared_ptr;
+  using std::shared_ptr;
   
 
   Clip::Clip (shared_ptr<model::Clip> clip,
diff --git a/src/gui/widgets/timeline/timeline-entity.hpp b/src/gui/widgets/timeline/timeline-entity.hpp
index f30a804a1..0ce3ca565 100644
--- a/src/gui/widgets/timeline/timeline-entity.hpp
+++ b/src/gui/widgets/timeline/timeline-entity.hpp
@@ -31,7 +31,7 @@
 #include "lib/time/timevalue.hpp"
 
 #include <string>
-#include <tr1/memory>
+#include <memory>
 #include <cairomm/cairomm.h>
 
 
@@ -40,7 +40,7 @@ namespace widgets {
 namespace timeline {
   
   using lib::time::Time;
-  using std::tr1::shared_ptr;
+  using std::shared_ptr;
   
   
   class DrawStrategy;
diff --git a/src/gui/widgets/timeline/timeline-group-track.cpp b/src/gui/widgets/timeline/timeline-group-track.cpp
index 4ed072453..ad73b7a5b 100644
--- a/src/gui/widgets/timeline/timeline-group-track.cpp
+++ b/src/gui/widgets/timeline/timeline-group-track.cpp
@@ -24,7 +24,6 @@
 #include "gui/widgets/timeline-widget.hpp"
 
 using namespace Gtk;
-using namespace std::tr1;
 using namespace sigc;
 
 namespace gui {
@@ -32,7 +31,7 @@ namespace widgets {
 namespace timeline {
   
 GroupTrack::GroupTrack(TimelineWidget &timeline_widget,
-  shared_ptr<model::GroupTrack> track) :
+  std::shared_ptr<model::GroupTrack> track) :
   Track(timeline_widget, track)
 { 
   REQUIRE (track);
diff --git a/src/gui/widgets/timeline/timeline-header-container.cpp b/src/gui/widgets/timeline/timeline-header-container.cpp
index 1d1af9537..ce07aa876 100644
--- a/src/gui/widgets/timeline/timeline-header-container.cpp
+++ b/src/gui/widgets/timeline/timeline-header-container.cpp
@@ -28,9 +28,12 @@
 #include "gui/widgets/timeline-widget.hpp"
 #include "gui/util/rectangle.hpp"
 
+#include <memory>
+
+using std::pair;
+using std::shared_ptr;
+
 using namespace Gtk;
-using namespace std;
-using namespace std::tr1;
 using namespace util;
 
 namespace gui {
diff --git a/src/gui/widgets/timeline/timeline-header-widget.cpp b/src/gui/widgets/timeline/timeline-header-widget.cpp
index e9588fa82..cf4298c79 100644
--- a/src/gui/widgets/timeline/timeline-header-widget.cpp
+++ b/src/gui/widgets/timeline/timeline-header-widget.cpp
@@ -30,7 +30,7 @@ using namespace Gtk;
 using namespace std;
 using namespace util;
 
-using std::tr1::shared_ptr;
+using std::shared_ptr;
 
 namespace gui {
 namespace widgets {
diff --git a/src/gui/widgets/timeline/timeline-ibeam-tool.cpp b/src/gui/widgets/timeline/timeline-ibeam-tool.cpp
index 67da78ecd..2f69da0ce 100644
--- a/src/gui/widgets/timeline/timeline-ibeam-tool.cpp
+++ b/src/gui/widgets/timeline/timeline-ibeam-tool.cpp
@@ -27,7 +27,7 @@
 using namespace gui::widgets;
 
 using lib::time::Mutation;
-using std::tr1::shared_ptr;
+using std::shared_ptr;
 
 namespace gui {
 namespace widgets {
diff --git a/src/gui/widgets/timeline/timeline-layout-helper.cpp b/src/gui/widgets/timeline/timeline-layout-helper.cpp
index df00dd131..08afb5ce5 100644
--- a/src/gui/widgets/timeline/timeline-layout-helper.cpp
+++ b/src/gui/widgets/timeline/timeline-layout-helper.cpp
@@ -21,16 +21,19 @@
 
 * *****************************************************/
 
-#include <boost/foreach.hpp>
 
 #include "timeline-layout-helper.hpp"
 #include "gui/widgets/timeline-widget.hpp"
 #include "gui/model/sequence.hpp"
 #include "gui/util/rectangle.hpp"
 
+#include <boost/foreach.hpp>
+#include <memory>
+
+using std::pair;
+using std::shared_ptr;
+
 using namespace Gtk;
-using namespace std;
-using namespace std::tr1;
 using namespace lumiera;
 using namespace util;
 using namespace gui::util;
@@ -82,7 +85,7 @@ TimelineLayoutHelper::add_branch(
 
 boost::optional<Gdk::Rectangle>
 TimelineLayoutHelper::get_track_header_rect(
-  std::tr1::weak_ptr<timeline::Track> track)
+  std::weak_ptr<timeline::Track> track)
 {
   if(contains(headerBoxes, track))
   {
diff --git a/src/gui/widgets/timeline/timeline-layout-helper.hpp b/src/gui/widgets/timeline/timeline-layout-helper.hpp
index b6ce64e44..247dd7317 100644
--- a/src/gui/widgets/timeline/timeline-layout-helper.hpp
+++ b/src/gui/widgets/timeline/timeline-layout-helper.hpp
@@ -30,6 +30,7 @@
 #include "gui/gtk-lumiera.hpp"
 #include "lib/tree.hpp"
 
+#include <memory>
 #include <boost/optional.hpp>
 
 namespace gui {
@@ -45,6 +46,8 @@ class TimelineWidget;
   
 namespace timeline {
   
+using std::shared_ptr;
+  
 class Track;
 
 /**
@@ -59,7 +62,7 @@ public:
   /**
    * Definition of the layout track tree type.
    */
-  typedef lib::Tree< std::tr1::shared_ptr<model::Track> > TrackTree;
+  typedef lib::Tree< std::shared_ptr<model::Track> > TrackTree;
   
 public:
   /**
@@ -101,7 +104,7 @@ public:
    * @see update_layout()
    */
   boost::optional<Gdk::Rectangle> get_track_header_rect(
-    std::tr1::weak_ptr<timeline::Track> track);
+    std::weak_ptr<timeline::Track> track);
   
   /**
    * Searches for a header which has the specified point inside of it.
@@ -363,7 +366,7 @@ protected:
    * the update_layout method.
    * @see update_layout()
    */
-  std::map<std::tr1::weak_ptr<timeline::Track>, Gdk::Rectangle>
+  std::map<std::weak_ptr<timeline::Track>, Gdk::Rectangle>
     headerBoxes;
   
   /**
diff --git a/src/gui/widgets/timeline/timeline-ruler.cpp b/src/gui/widgets/timeline/timeline-ruler.cpp
index 532e461f7..359e28123 100644
--- a/src/gui/widgets/timeline/timeline-ruler.cpp
+++ b/src/gui/widgets/timeline/timeline-ruler.cpp
@@ -36,7 +36,7 @@ using namespace gui;
 using namespace gui::widgets;
 using namespace gui::widgets::timeline;
 
-using std::tr1::shared_ptr;
+using std::shared_ptr;
 using gui::util::CairoUtil;
 using lib::time::Time;
 using lib::time::TimeVar;
diff --git a/src/gui/widgets/timeline/timeline-state.cpp b/src/gui/widgets/timeline/timeline-state.cpp
index a38911ff5..5ce328934 100644
--- a/src/gui/widgets/timeline/timeline-state.cpp
+++ b/src/gui/widgets/timeline/timeline-state.cpp
@@ -38,7 +38,7 @@ using lib::time::Offset;
 using lib::time::Duration;
 using lib::time::Mutation;
 using lib::time::Control;
-using std::tr1::shared_ptr;
+using std::shared_ptr;
 
 
 TimelineState::TimelineState (shared_ptr<model::Sequence> source_sequence)
diff --git a/src/gui/widgets/timeline/timeline-tool.cpp b/src/gui/widgets/timeline/timeline-tool.cpp
index 2402f22ea..ff3fb9b3c 100644
--- a/src/gui/widgets/timeline/timeline-tool.cpp
+++ b/src/gui/widgets/timeline/timeline-tool.cpp
@@ -24,7 +24,7 @@
 #include "gui/widgets/timeline-widget.hpp"
 
 using namespace Gdk;
-using std::tr1::shared_ptr;
+using std::shared_ptr;
 
 namespace gui {
 namespace widgets {
diff --git a/src/gui/widgets/timeline/timeline-track.cpp b/src/gui/widgets/timeline/timeline-track.cpp
index ac1c6e4d1..a020b46ce 100644
--- a/src/gui/widgets/timeline/timeline-track.cpp
+++ b/src/gui/widgets/timeline/timeline-track.cpp
@@ -29,7 +29,7 @@
 using namespace Gtk;
 using namespace sigc;
 
-using std::tr1::shared_ptr;
+using std::shared_ptr;
 
 namespace gui {
 namespace widgets {
diff --git a/src/gui/window-manager.cpp b/src/gui/window-manager.cpp
index 821cfde60..11bd6ebb9 100644
--- a/src/gui/window-manager.cpp
+++ b/src/gui/window-manager.cpp
@@ -28,13 +28,15 @@
 #include "lib/util.hpp"
 
 #include <boost/filesystem.hpp>
+#include <memory>
+#include <list>
 
 using util::cStr;
+using std::list;
+using std::shared_ptr;
 
 using namespace Gtk;
 using namespace Glib;
-using namespace std;
-using namespace std::tr1;
 using namespace gui::workspace;
 
 namespace fsys = boost::filesystem;
diff --git a/src/gui/window-manager.hpp b/src/gui/window-manager.hpp
index e06b0f4ee..aa13f41bd 100644
--- a/src/gui/window-manager.hpp
+++ b/src/gui/window-manager.hpp
@@ -41,12 +41,12 @@
 #include <boost/noncopyable.hpp>
 #include <cairomm/cairomm.h>
 #include <string>
-#include <tr1/memory>
+#include <memory>
 
 namespace gui {
   
 using std::string;
-using std::tr1::shared_ptr;
+using std::shared_ptr;
 
 
 namespace model      { class Project; }
diff --git a/src/include/play-facade.h b/src/include/play-facade.h
index 2981c5ea0..23e0ba3dd 100644
--- a/src/include/play-facade.h
+++ b/src/include/play-facade.h
@@ -56,7 +56,7 @@ namespace lumiera {
   
   namespace time = lib::time;
   
-  using std::tr1::weak_ptr;
+  using std::weak_ptr;
     
     
     /**************************************************************//**
diff --git a/src/lib/functor-util.hpp b/src/lib/functor-util.hpp
index 05733edeb..53fbf7867 100644
--- a/src/lib/functor-util.hpp
+++ b/src/lib/functor-util.hpp
@@ -39,16 +39,16 @@
 
 #include "lib/hash-value.h"
 
-#include <tr1/functional>
+#include <functional>
 #include <boost/functional/hash.hpp>
 
 
 
 namespace util { ////////////TODO: refactor namespace. But probably not directly into namespace lib. Needs some more consideration though
   
-  using std::tr1::function;
-  using std::tr1::bind;
-  using std::tr1::placeholders::_1;
+  using std::function;
+  using std::bind;
+  using std::placeholders::_1;
   
   
   /** "Combiner" which calls two functions one after another
@@ -125,7 +125,7 @@ namespace util { ////////////TODO: refactor namespace. But probably not directly
      * to be the same. 
      */
     class HijackedFunction 
-      : std::tr1::_Function_base
+      : std::_Function_base
       {
         typedef void (*DummyInvoker) (void);
         DummyInvoker invoker_;
@@ -220,7 +220,6 @@ namespace util { ////////////TODO: refactor namespace. But probably not directly
 } // namespace util
 
 namespace std {
-namespace tr1 {
   
   /** inject into std::tr1 to be picked up by ADL:
    * @return hash value of given functor
@@ -234,6 +233,6 @@ namespace tr1 {
     return util::rawHashValue (fun);
   }
   
-}}
+}
 
 #endif /*UTIL_HPP_*/
diff --git a/src/lib/handle.hpp b/src/lib/handle.hpp
index 685a6a4c6..7aff95119 100644
--- a/src/lib/handle.hpp
+++ b/src/lib/handle.hpp
@@ -46,13 +46,13 @@
 #include "lib/nobug-init.hpp"
 #include "lib/bool-checkable.hpp"
 
-#include <tr1/memory>
+#include <memory>
 
 
 namespace lib {
   
-  using std::tr1::shared_ptr;
-  using std::tr1::weak_ptr;
+  using std::shared_ptr;
+  using std::weak_ptr;
   
   
   
@@ -71,7 +71,7 @@ namespace lib {
     : public lib::BoolCheckable<Handle<IMP> >
     {
     protected:
-      typedef std::tr1::shared_ptr<IMP> SmPtr;
+      typedef std::shared_ptr<IMP> SmPtr;
       
       SmPtr smPtr_;
       
diff --git a/src/lib/iter-explorer.hpp b/src/lib/iter-explorer.hpp
index a2b27527a..28e9f8241 100644
--- a/src/lib/iter-explorer.hpp
+++ b/src/lib/iter-explorer.hpp
@@ -255,7 +255,7 @@ namespace lib {
     using util::unConst;
     using boost::enable_if;
     using boost::disable_if;
-    using std::tr1::function;    
+    using std::function;
     using meta::_Fun;
 
     
diff --git a/src/lib/iter-source.hpp b/src/lib/iter-source.hpp
index c2f090710..ef4d4c157 100644
--- a/src/lib/iter-source.hpp
+++ b/src/lib/iter-source.hpp
@@ -53,14 +53,14 @@
 
 #include <boost/type_traits/remove_const.hpp>
 #include <boost/noncopyable.hpp>
-#include <tr1/memory>
+#include <memory>
 
 
 
 
 namespace lib {
   
-  using std::tr1::shared_ptr;
+  using std::shared_ptr;
   
   
   
diff --git a/src/lib/itertools.hpp b/src/lib/itertools.hpp
index 8a4e78e96..69ff3124a 100644
--- a/src/lib/itertools.hpp
+++ b/src/lib/itertools.hpp
@@ -75,13 +75,13 @@
 #include "lib/wrapper.hpp"
 #include "lib/util.hpp"
 
-#include <tr1/functional>
+#include <functional>
 
 
 
 namespace lib {
   
-  using std::tr1::function;
+  using std::function;
   using util::unConst;
   
   using lib::meta::RefTraits;
diff --git a/src/lib/lifecycleregistry.hpp b/src/lib/lifecycleregistry.hpp
index a52ff65c4..a78170988 100644
--- a/src/lib/lifecycleregistry.hpp
+++ b/src/lib/lifecycleregistry.hpp
@@ -41,7 +41,7 @@
 #include <map>
 #include <set>
 #include <string>
-#include <tr1/functional>
+#include <functional>
 #include <boost/scoped_ptr.hpp>
 #include <boost/noncopyable.hpp>
 
@@ -52,7 +52,7 @@ namespace lumiera {
   
   using boost::scoped_ptr;
   using boost::noncopyable;
-  using std::tr1::function;
+  using std::function;
   using util::contains;
   using std::string;
 
diff --git a/src/lib/meta/function-closure.hpp b/src/lib/meta/function-closure.hpp
index 081e9160f..b810bd83b 100644
--- a/src/lib/meta/function-closure.hpp
+++ b/src/lib/meta/function-closure.hpp
@@ -50,7 +50,7 @@
 #include "lib/meta/function.hpp"
 #include "lib/meta/tuple.hpp"
 
-#include <tr1/functional>
+#include <functional>
 
 
 
@@ -58,7 +58,7 @@ namespace lib {
 namespace meta{
 namespace func{
   
-  using std::tr1::function;
+  using std::function;
   
   
   
@@ -90,7 +90,7 @@ namespace func{
         static RET
         bind (FUN& f, TUP&)
           {
-            return std::tr1::bind (f);
+            return std::bind (f);
           }
       };
     
@@ -109,7 +109,7 @@ namespace func{
         static RET
         bind (FUN& f, TUP & arg)
           {
-            return std::tr1::bind (f, element<0>(arg));
+            return std::bind (f, element<0>(arg));
           }
       };
     
@@ -130,7 +130,7 @@ namespace func{
         static RET
         bind (FUN& f, TUP & arg)
           {
-            return std::tr1::bind (f, element<0>(arg)
+            return std::bind (f, element<0>(arg)
                                     , element<1>(arg)
                                    );
           }
@@ -154,7 +154,7 @@ namespace func{
         static RET
         bind (FUN& f, TUP & arg)
           {
-            return std::tr1::bind (f, element<0>(arg)
+            return std::bind (f, element<0>(arg)
                                     , element<1>(arg)
                                     , element<2>(arg)
                                    );
@@ -180,7 +180,7 @@ namespace func{
         static RET
         bind (FUN& f, TUP & arg)
           {
-            return std::tr1::bind (f, element<0>(arg)
+            return std::bind (f, element<0>(arg)
                                     , element<1>(arg)
                                     , element<2>(arg)
                                     , element<3>(arg)
@@ -208,7 +208,7 @@ namespace func{
         static RET
         bind (FUN& f, TUP & arg)
           {
-            return std::tr1::bind (f, element<0>(arg)
+            return std::bind (f, element<0>(arg)
                                     , element<1>(arg)
                                     , element<2>(arg)
                                     , element<3>(arg)
@@ -238,7 +238,7 @@ namespace func{
         static RET
         bind (FUN& f, TUP & arg)
           {
-            return std::tr1::bind (f, element<0>(arg)
+            return std::bind (f, element<0>(arg)
                                     , element<1>(arg)
                                     , element<2>(arg)
                                     , element<3>(arg)
@@ -270,7 +270,7 @@ namespace func{
         static RET
         bind (FUN& f, TUP & arg)
           {
-            return std::tr1::bind (f, element<0>(arg)
+            return std::bind (f, element<0>(arg)
                                     , element<1>(arg)
                                     , element<2>(arg)
                                     , element<3>(arg)
@@ -304,7 +304,7 @@ namespace func{
         static RET
         bind (FUN& f, TUP & arg)
           {
-            return std::tr1::bind (f, element<0>(arg)
+            return std::bind (f, element<0>(arg)
                                     , element<1>(arg)
                                     , element<2>(arg)
                                     , element<3>(arg)
@@ -340,7 +340,7 @@ namespace func{
         static RET
         bind (FUN& f, TUP & arg)
           {
-            return std::tr1::bind (f, element<0>(arg)
+            return std::bind (f, element<0>(arg)
                                     , element<1>(arg)
                                     , element<2>(arg)
                                     , element<3>(arg)
@@ -360,7 +360,7 @@ namespace func{
     
     /* ===== Helpers for partial function application ===== */
     
-    using std::tr1::_Placeholder;     // what is the "official" way to import them?
+    using std::_Placeholder;     // what is the "official" way to import them?
     
     
     /**
@@ -560,17 +560,17 @@ namespace func{
   
   
   namespace _composed { // repetitive impl.code for function composition
-    using std::tr1::bind;
-    using std::tr1::function;
-    using std::tr1::placeholders::_1;
-    using std::tr1::placeholders::_2;
-    using std::tr1::placeholders::_3;
-    using std::tr1::placeholders::_4;
-    using std::tr1::placeholders::_5;
-    using std::tr1::placeholders::_6;
-    using std::tr1::placeholders::_7;
-    using std::tr1::placeholders::_8;
-    using std::tr1::placeholders::_9;
+    using std::bind;
+    using std::function;
+    using std::placeholders::_1;
+    using std::placeholders::_2;
+    using std::placeholders::_3;
+    using std::placeholders::_4;
+    using std::placeholders::_5;
+    using std::placeholders::_6;
+    using std::placeholders::_7;
+    using std::placeholders::_8;
+    using std::placeholders::_9;
     
     template<typename RES, typename F1, typename F2, uint n>
     struct Build;
diff --git a/src/lib/meta/function-erasure.hpp b/src/lib/meta/function-erasure.hpp
index 33a8c27b6..203cc94d7 100644
--- a/src/lib/meta/function-erasure.hpp
+++ b/src/lib/meta/function-erasure.hpp
@@ -61,13 +61,13 @@
 #include "lib/opaque-holder.hpp"
 #include "lib/functor-util.hpp"
 
-#include <tr1/functional>
+#include <functional>
 
 
 namespace lib {
 namespace meta{
   
-  using std::tr1::function;
+  using std::function;
   using util::unConst;
   
   
diff --git a/src/lib/meta/function.hpp b/src/lib/meta/function.hpp
index 87f7379df..877b493c6 100644
--- a/src/lib/meta/function.hpp
+++ b/src/lib/meta/function.hpp
@@ -49,14 +49,14 @@
 
 #include "lib/meta/typelist.hpp"
 
-#include <tr1/functional>
+#include <functional>
 
 
 
 namespace lib {
 namespace meta{
 
-  using std::tr1::function;
+  using std::function;
   
   
   
diff --git a/src/lib/meta/maybe-compare.hpp b/src/lib/meta/maybe-compare.hpp
index 9fa81c9da..502259a26 100644
--- a/src/lib/meta/maybe-compare.hpp
+++ b/src/lib/meta/maybe-compare.hpp
@@ -27,13 +27,13 @@
 
 #include "lib/functor-util.hpp"
 
-#include <tr1/functional>
+#include <functional>
 
 
 namespace lib {
 namespace meta{
   
-  using std::tr1::function;
+  using std::function;
   
   /**
    * Trait template for invoking equality comparison.
diff --git a/src/lib/meta/trait-special.hpp b/src/lib/meta/trait-special.hpp
index e6a302a7b..3bc3e5c53 100644
--- a/src/lib/meta/trait-special.hpp
+++ b/src/lib/meta/trait-special.hpp
@@ -27,7 +27,7 @@
 
 #include "lib/meta/trait.hpp"
 
-#include <tr1/unordered_map>
+#include <unordered_map>
 
 
 namespace lib {
@@ -42,7 +42,7 @@ namespace meta {
    *  Thus we provide fixed diagnostics to bypass the traits check.
    */
   template<typename KEY, typename VAL, typename HASH>
-  struct can_STL_ForEach<std::tr1::unordered_map<KEY,VAL,HASH> >
+  struct can_STL_ForEach<std::unordered_map<KEY,VAL,HASH> >
     {
       enum { value = true };
     };
diff --git a/src/lib/meta/trait.hpp b/src/lib/meta/trait.hpp
index 22d6743e9..d7c5b10a3 100644
--- a/src/lib/meta/trait.hpp
+++ b/src/lib/meta/trait.hpp
@@ -41,10 +41,9 @@ namespace boost{
   template<class X> class reference_wrapper; 
 }
 namespace std {
-namespace tr1 {
   template<class X> class reference_wrapper;
   template<class X> class shared_ptr; 
-}}
+}
 namespace lib{
   template<class X, class B>  class P;
 }
@@ -102,24 +101,24 @@ namespace meta {
     };
   
   template<typename X>
-  struct Unwrap<std::tr1::reference_wrapper<X> >
+  struct Unwrap<std::reference_wrapper<X> >
     {
       typedef X  Type;
       
       static X&
-      extract (std::tr1::reference_wrapper<X> wrapped)
+      extract (std::reference_wrapper<X> wrapped)
         {
           return wrapped;
         }
     };
   
   template<typename X>
-  struct Unwrap<std::tr1::shared_ptr<X> >
+  struct Unwrap<std::shared_ptr<X> >
     {
       typedef X  Type;
       
       static X&
-      extract (std::tr1::shared_ptr<X> ptr)
+      extract (std::shared_ptr<X> ptr)
         {
           ASSERT (ptr);
           return *ptr;
diff --git a/src/lib/meta/tuple.hpp b/src/lib/meta/tuple.hpp
index c301e994d..39e5561c2 100644
--- a/src/lib/meta/tuple.hpp
+++ b/src/lib/meta/tuple.hpp
@@ -29,7 +29,7 @@
  ** capturing specific types to use as template parameter.
  ** 
  ** Additionally, this header augments the Tuple template into a simple Tuple
- ** (run time) datatype. This isn't meant as competing with std::tr1::tuple, which is
+ ** (run time) datatype. This isn't meant as competing with std::tuple, which is
  ** much more capable, but also has the downside of pulling in a lot of other headers.
  ** But when all we need is to define a generic typed record of N data elements and
  ** later re-accessing them (but no further advanced processing), the Tuple template
diff --git a/src/lib/multifact-arg.hpp b/src/lib/multifact-arg.hpp
index 5a04a7d69..c44948330 100644
--- a/src/lib/multifact-arg.hpp
+++ b/src/lib/multifact-arg.hpp
@@ -57,7 +57,7 @@ namespace lib {
     using lib::meta::Types;
     using lib::meta::FunctionSignature;
     using lib::meta::FunctionTypedef;
-    using std::tr1::function;
+    using std::function;
     
     
     /**
diff --git a/src/lib/multifact.hpp b/src/lib/multifact.hpp
index bce8133c7..08f0084b9 100644
--- a/src/lib/multifact.hpp
+++ b/src/lib/multifact.hpp
@@ -62,8 +62,8 @@
 #include "lib/depend.hpp"
 #include "util.hpp"
 
-#include <tr1/functional>
-#include <tr1/memory>
+#include <functional>
+#include <memory>
 #include <map>
 
 
@@ -95,7 +95,7 @@ namespace lib {
     struct BuildRefcountPtr
       {
         typedef TAR*                      RType;
-        typedef std::tr1::shared_ptr<TAR> PType;
+        typedef std::shared_ptr<TAR> PType;
         
         PType wrap (RType ptr) { return PType (ptr); }
       };
@@ -113,7 +113,7 @@ namespace lib {
     template<typename SIG, typename ID>
     struct Fab
       {
-        typedef std::tr1::function<SIG> FactoryFunc;
+        typedef std::function<SIG> FactoryFunc;
         
         
         FactoryFunc&
@@ -230,7 +230,7 @@ namespace lib {
             Creator
             createSingleton_accessFunction()
               {
-                return std::tr1::bind (&SingFac::operator()
+                return std::bind (&SingFac::operator()
                                       , static_cast<SingFac*>(this));
               }
             
diff --git a/src/lib/p.hpp b/src/lib/p.hpp
index 2fe3c789c..83c2088e5 100644
--- a/src/lib/p.hpp
+++ b/src/lib/p.hpp
@@ -22,7 +22,7 @@
 
 /** @file p.hpp
  ** Customised refcounting smart pointer.
- ** Template derived from std::tr1::shared_ptr adding total ordering and 
+ ** Template derived from std::shared_ptr adding total ordering and
  ** type relationships implemented by forwarding to the pointees. In all other
  ** respects, it should behave exactly as shared_ptr and is able to cooperate
  ** and share ownership with other shared_ptr instantiations.
@@ -51,17 +51,17 @@
 
 
 #include "lib/error.hpp"
-#include <tr1/memory>
+#include <memory>
 
 
 namespace lib {
   
-  using std::tr1::shared_ptr;
-  using std::tr1::weak_ptr;
+  using std::shared_ptr;
+  using std::weak_ptr;
   
   /**
    * Customised refcounting smart pointer template, built upon
-   * std::tr1::shared_ptr, but forwarding type relationships and
+   * std::shared_ptr, but forwarding type relationships and
    * ordering operators to the pointee objects.
    * @param TAR the visible pointee type
    * @param BASE the shared-ptr type used as implementation
diff --git a/src/lib/test/suite.cpp b/src/lib/test/suite.cpp
index ea065655f..aaf10dcb1 100644
--- a/src/lib/test/suite.cpp
+++ b/src/lib/test/suite.cpp
@@ -31,7 +31,7 @@
 #include "lib/util.hpp"
 
 #include <boost/algorithm/string.hpp>
-#include <tr1/memory>
+#include <memory>
 #include <iostream>
 #include <sstream>
 #include <memory>
@@ -49,7 +49,7 @@ namespace test {
   using std::endl;
   using std::vector;
   using std::auto_ptr;
-  using std::tr1::shared_ptr;
+  using std::shared_ptr;
   using boost::algorithm::trim;
   
   using util::isnil;
diff --git a/src/lib/test/test-coll.hpp b/src/lib/test/test-coll.hpp
index 839cbbdab..01e24e9dc 100644
--- a/src/lib/test/test-coll.hpp
+++ b/src/lib/test/test-coll.hpp
@@ -29,7 +29,7 @@
 
 //#include <typeinfo>
 //#include <cstdlib>
-#include <tr1/unordered_map>
+#include <unordered_map>
 #include <iostream>
 #include <vector>
 #include <map>
@@ -60,8 +60,8 @@ namespace test{
   typedef std::map<int,int> MapII;
   typedef std::multimap<int,int> MMapII;
   
-  typedef std::tr1::unordered_map<int,int> HMapII;
-  typedef std::tr1::unordered_multimap<int,int> HMMapII;
+  typedef std::unordered_map<int,int> HMapII;
+  typedef std::unordered_multimap<int,int> HMMapII;
   
   
   template<class MAP>
diff --git a/src/lib/time/control-impl.hpp b/src/lib/time/control-impl.hpp
index 5ec429309..b2a20641f 100644
--- a/src/lib/time/control-impl.hpp
+++ b/src/lib/time/control-impl.hpp
@@ -57,7 +57,7 @@
 #include "lib/time/mutation.hpp"
 #include "lib/time/timevalue.hpp"
 
-#include <tr1/functional>
+#include <functional>
 #include <vector>
 
 
@@ -65,7 +65,7 @@ namespace lib {
 namespace time {
 namespace mutation {
   
-  using std::tr1::function;
+  using std::function;
   
   
   
@@ -145,7 +145,7 @@ namespace mutation {
       void
       attach (SIG const& toNotify)
         {
-          ChangeSignal newListener (std::tr1::ref(toNotify));
+          ChangeSignal newListener (std::ref(toNotify));
           listeners_.push_back (newListener);
         }
       
diff --git a/src/lib/time/control-policy.hpp b/src/lib/time/control-policy.hpp
index 9fa0900c5..36cdccf63 100644
--- a/src/lib/time/control-policy.hpp
+++ b/src/lib/time/control-policy.hpp
@@ -106,7 +106,7 @@
 #include "lib/time/timevalue.hpp"
 
 #include <boost/utility/enable_if.hpp>
-#include <tr1/functional>
+#include <functional>
 
 
 namespace lib {
@@ -116,10 +116,10 @@ namespace mutation {
   
   using boost::disable_if;
   using lib::meta::is_sameType;
-  using std::tr1::placeholders::_1;
-  using std::tr1::function;
-  using std::tr1::bind;
-  using std::tr1::ref;
+  using std::placeholders::_1;
+  using std::function;
+  using std::bind;
+  using std::ref;
   
   
   
diff --git a/src/lib/time/digxel.hpp b/src/lib/time/digxel.hpp
index 66aa9431a..6ab0e5b84 100644
--- a/src/lib/time/digxel.hpp
+++ b/src/lib/time/digxel.hpp
@@ -70,7 +70,7 @@
 
 #include <boost/operators.hpp>
 #include <boost/lexical_cast.hpp>
-#include <tr1/functional>
+#include <functional>
 #include <string>
 #include <cstdio>
 #include <cmath>
@@ -196,9 +196,9 @@ namespace time {
   
   
   
-  using std::tr1::bind;
-  using std::tr1::function;
-  using std::tr1::placeholders::_1;
+  using std::bind;
+  using std::function;
+  using std::placeholders::_1;
   
   
   /**
diff --git a/src/lib/time/formats.hpp b/src/lib/time/formats.hpp
index 252c7145c..c463428c1 100644
--- a/src/lib/time/formats.hpp
+++ b/src/lib/time/formats.hpp
@@ -30,7 +30,7 @@
 #include "lib/meta/generator.hpp"
 #include "lib/typed-counter.hpp"
 
-#include <tr1/memory>
+#include <memory>
 #include <string>
 #include <bitset>
 
@@ -49,7 +49,7 @@ namespace time {
   
   class Quantiser; // API for grid aligning
   typedef Quantiser const& QuantR;
-  typedef std::tr1::shared_ptr<const Quantiser> PQuant;
+  typedef std::shared_ptr<const Quantiser> PQuant;
   
   
   namespace format {
diff --git a/src/lib/time/grid.hpp b/src/lib/time/grid.hpp
index df7a21f29..c02ae4a3d 100644
--- a/src/lib/time/grid.hpp
+++ b/src/lib/time/grid.hpp
@@ -26,7 +26,7 @@
 
 #include "lib/time/timevalue.hpp"
 
-#include <tr1/memory>
+#include <memory>
 
 
 namespace lib {
@@ -68,7 +68,7 @@ namespace time {
       virtual TimeValue timeOf    (FSecs gridTime, int=0) const   =0;
     };
   
-  typedef std::tr1::shared_ptr<const Grid> PGrid;
+  typedef std::shared_ptr<const Grid> PGrid;
   
   
   
diff --git a/src/lib/time/timecode.cpp b/src/lib/time/timecode.cpp
index 3eb1efbf4..0a7a629e5 100644
--- a/src/lib/time/timecode.cpp
+++ b/src/lib/time/timecode.cpp
@@ -29,7 +29,7 @@
 #include "lib/util.hpp"
 #include "lib/util-quant.hpp"
 
-#include <tr1/functional>
+#include <functional>
 #include <boost/regex.hpp>
 #include <boost/lexical_cast.hpp>
 
@@ -277,8 +277,8 @@ namespace time {
     }
     
     
-    using std::tr1::bind;
-    using std::tr1::placeholders::_1;
+    using std::bind;
+    using std::placeholders::_1;
     
     /** bind the individual Digxel mutation functors
      *  to normalise raw component values */
diff --git a/src/lib/typed-allocation-manager.hpp b/src/lib/typed-allocation-manager.hpp
index e44eb01bb..1c8ddcb93 100644
--- a/src/lib/typed-allocation-manager.hpp
+++ b/src/lib/typed-allocation-manager.hpp
@@ -72,13 +72,13 @@
 #include "include/logging.h"
 
 
-#include <tr1/memory>
+#include <memory>
 
 
 
 namespace lib {
   
-  using std::tr1::shared_ptr;
+  using std::shared_ptr;
   
   
   
diff --git a/src/lib/util-foreach.hpp b/src/lib/util-foreach.hpp
index 8c0791c65..37f72ed2e 100644
--- a/src/lib/util-foreach.hpp
+++ b/src/lib/util-foreach.hpp
@@ -55,7 +55,7 @@
 #include "lib/meta/trait.hpp"
 
 #include <boost/utility/enable_if.hpp>
-#include <tr1/functional>
+#include <functional>
 #include <algorithm>
 
 
@@ -204,7 +204,7 @@ namespace util {
   inline void                                                                            //________________________________
   for_each (CON const& elements, FUN function, P1 bind1)                                ///< Accept binding for 1 Argument 
   {
-    for_each (elements, std::tr1::bind (function, bind1));
+    for_each (elements, std::bind (function, bind1));
   }
   
   
@@ -215,7 +215,7 @@ namespace util {
   inline void                                                                            //________________________________
   for_each (CON const& elements, FUN function, P1 bind1, P2 bind2)                      ///< Accept binding for 2 Arguments
   {
-    for_each (elements, std::tr1::bind (function, bind1, bind2));
+    for_each (elements, std::bind (function, bind1, bind2));
   }
   
   
@@ -227,7 +227,7 @@ namespace util {
   inline void                                                                            //________________________________
   for_each (CON const& elements, FUN function, P1 bind1, P2 bind2, P3 bind3)            ///< Accept binding for 3 Arguments
   {
-    for_each (elements, std::tr1::bind (function, bind1, bind2, bind3));
+    for_each (elements, std::bind (function, bind1, bind2, bind3));
   }
   
   
@@ -240,7 +240,7 @@ namespace util {
   inline void                                                                            //________________________________
   for_each (CON const& elements, FUN function, P1 bind1, P2 bind2, P3 bind3, P4 bind4)  ///< Accept binding for 4 Arguments
   {
-    for_each (elements, std::tr1::bind (function, bind1, bind2, bind3, bind4));
+    for_each (elements, std::bind (function, bind1, bind2, bind3, bind4));
   }
   
   
@@ -253,7 +253,7 @@ namespace util {
   inline bool                                                                            //________________________________
   and_all (CON const& elements, FUN function, P1 bind1)                                 ///< Accept binding for 1 Argument 
   {
-    return and_all (elements, std::tr1::bind<bool> (function, bind1));
+    return and_all (elements, std::bind<bool> (function, bind1));
   }
   
   
@@ -264,7 +264,7 @@ namespace util {
   inline bool                                                                            //________________________________
   and_all (CON const& elements, FUN function, P1 bind1, P2 bind2)                       ///< Accept binding for 2 Arguments
   {
-    return and_all (elements, std::tr1::bind<bool> (function, bind1, bind2));
+    return and_all (elements, std::bind<bool> (function, bind1, bind2));
   }
   
   
@@ -276,7 +276,7 @@ namespace util {
   inline bool                                                                            //________________________________
   and_all (CON const& elements, FUN function, P1 bind1, P2 bind2, P3 bind3)             ///< Accept binding for 3 Arguments
   {
-    return and_all (elements, std::tr1::bind<bool> (function, bind1, bind2, bind3));
+    return and_all (elements, std::bind<bool> (function, bind1, bind2, bind3));
   }
   
   
@@ -289,7 +289,7 @@ namespace util {
   inline bool                                                                            //________________________________
   and_all (CON const& elements, FUN function, P1 bind1, P2 bind2, P3 bind3, P4 bind4)   ///< Accept binding for 4 Arguments
   {
-    return and_all (elements, std::tr1::bind<bool> (function, bind1, bind2, bind3, bind4));
+    return and_all (elements, std::bind<bool> (function, bind1, bind2, bind3, bind4));
   }
   
   
@@ -302,7 +302,7 @@ namespace util {
   inline bool                                                                            //________________________________
   has_any (CON const& elements, FUN function, P1 bind1)                                 ///< Accept binding for 1 Argument 
   {
-    return has_any (elements, std::tr1::bind<bool> (function, bind1));
+    return has_any (elements, std::bind<bool> (function, bind1));
   }
   
   
@@ -313,7 +313,7 @@ namespace util {
   inline bool                                                                            //________________________________
   has_any (CON const& elements, FUN function, P1 bind1, P2 bind2)                       ///< Accept binding for 2 Arguments
   {
-    return has_any (elements, std::tr1::bind<bool> (function, bind1, bind2));
+    return has_any (elements, std::bind<bool> (function, bind1, bind2));
   }
   
   
@@ -325,7 +325,7 @@ namespace util {
   inline bool                                                                            //________________________________
   has_any (CON const& elements, FUN function, P1 bind1, P2 bind2, P3 bind3)             ///< Accept binding for 3 Arguments
   {
-    return has_any (elements, std::tr1::bind<bool> (function, bind1, bind2, bind3));
+    return has_any (elements, std::bind<bool> (function, bind1, bind2, bind3));
   }
   
   
@@ -338,7 +338,7 @@ namespace util {
   inline bool                                                                            //________________________________
   has_any (CON const& elements, FUN function, P1 bind1, P2 bind2, P3 bind3, P4 bind4)   ///< Accept binding for 4 Arguments
   {
-    return has_any (elements, std::tr1::bind<bool> (function, bind1, bind2, bind3, bind4));
+    return has_any (elements, std::bind<bool> (function, bind1, bind2, bind3, bind4));
   }
   
   
diff --git a/src/lib/util.cpp b/src/lib/util.cpp
index b11c232fc..1726fa026 100644
--- a/src/lib/util.cpp
+++ b/src/lib/util.cpp
@@ -24,7 +24,7 @@
 #include "lib/util.hpp"
 
 #include <boost/algorithm/string.hpp>
-#include <tr1/functional>
+#include <functional>
 #include <boost/bind.hpp>          // we need operator! for bind-expressions
 
 using boost::algorithm::trim_right_copy_if;
@@ -35,7 +35,7 @@ using boost::algorithm::is_space;
 
 namespace util {
 
-  using std::tr1::function;
+  using std::function;
   
   typedef function<bool(string::value_type)> ChPredicate;
   ChPredicate operator! (ChPredicate p) { return ! bind(p,_1); }
diff --git a/src/lib/wrapper.hpp b/src/lib/wrapper.hpp
index 8aa616697..06f215746 100644
--- a/src/lib/wrapper.hpp
+++ b/src/lib/wrapper.hpp
@@ -48,7 +48,7 @@
 
 #include <boost/type_traits/remove_const.hpp>
 #include <boost/noncopyable.hpp>
-#include <tr1/functional>
+#include <functional>
 
 
 namespace lib {
@@ -60,7 +60,7 @@ namespace wrapper {
   using lumiera::error::LUMIERA_ERROR_BOTTOM_VALUE;
   
   using boost::remove_const;
-  using std::tr1::function;
+  using std::function;
   
   
   /** 
@@ -71,9 +71,9 @@ namespace wrapper {
    */
   template<typename TY>
   class AssignableRefWrapper
-    : public std::tr1::reference_wrapper<TY>
+    : public std::reference_wrapper<TY>
     {
-      typedef std::tr1::reference_wrapper<TY> RefWrapper;
+      typedef std::reference_wrapper<TY> RefWrapper;
     public:
       
       explicit AssignableRefWrapper(TY& ref)
@@ -378,8 +378,8 @@ namespace wrapper {
       template<typename FUN>
       FunctionResult (FUN targetFunction)
         {
-          using std::tr1::bind;
-          using std::tr1::placeholders::_1;
+          using std::bind;
+          using std::placeholders::_1;
           using lib::meta::func::chained;
                                                       // note: binding "this" mandates noncopyable
           function<Res(Res)> doCaptureResult  = bind (&FunctionResult::captureResult, this, _1 );
diff --git a/src/proc/asset.cpp b/src/proc/asset.cpp
index bf1bb154e..ca7a84706 100644
--- a/src/proc/asset.cpp
+++ b/src/proc/asset.cpp
@@ -28,13 +28,13 @@
 #include "lib/util-foreach.hpp"
 #include "lib/util.hpp"
 
-#include <tr1/functional>
+#include <functional>
 #include <string>
 
 
-using std::tr1::function;
-using std::tr1::placeholders::_1;
-using std::tr1::bind;
+using std::function;
+using std::placeholders::_1;
+using std::bind;
 using util::contains;
 using util::removeall;
 using util::for_each;
diff --git a/src/proc/asset.hpp b/src/proc/asset.hpp
index 8b7e3990e..06298785d 100644
--- a/src/proc/asset.hpp
+++ b/src/proc/asset.hpp
@@ -83,8 +83,8 @@ namespace asset {
   namespace error = lumiera::error;
   
   using std::size_t;
-  using std::tr1::shared_ptr;
-  using std::tr1::static_pointer_cast;
+  using std::shared_ptr;
+  using std::static_pointer_cast;
   
   using lib::HashVal;
   using lib::P;
diff --git a/src/proc/asset/clip.cpp b/src/proc/asset/clip.cpp
index 60db3391a..d57eec762 100644
--- a/src/proc/asset/clip.cpp
+++ b/src/proc/asset/clip.cpp
@@ -24,7 +24,7 @@
 #include "proc/asset/clip.hpp"
 #include "proc/mobject/session/mobjectfactory.hpp"   ////TODO: avoidable?
 
-using std::tr1::static_pointer_cast;
+using std::static_pointer_cast;
 
 
 namespace proc {
diff --git a/src/proc/asset/db.hpp b/src/proc/asset/db.hpp
index 8043cacbf..caccab03e 100644
--- a/src/proc/asset/db.hpp
+++ b/src/proc/asset/db.hpp
@@ -29,8 +29,8 @@
 #include "lib/error.hpp"
 #include "proc/asset.hpp"
 
-#include <tr1/memory>
-#include <tr1/unordered_map>
+#include <memory>
+#include <unordered_map>
 // #include <boost/functional/hash.hpp>   /////////TODO which boost include to use here??
 #include <boost/utility.hpp>
 
@@ -38,8 +38,8 @@
 namespace proc {
 namespace asset {
   
-  using std::tr1::static_pointer_cast;
-  using std::tr1::dynamic_pointer_cast;
+  using std::static_pointer_cast;
+  using std::dynamic_pointer_cast;
   
   using lib::Sync;
   using lib::RecursiveLock_NoWait;
@@ -77,7 +77,7 @@ namespace asset {
       operator() (size_t val)  const { return val; }
     };
   
-  typedef std::tr1::unordered_map<size_t, PAsset, IdentityHash> IdHashtable;
+  typedef std::unordered_map<size_t, PAsset, IdentityHash> IdHashtable;
   
   
   
diff --git a/src/proc/asset/media.cpp b/src/proc/asset/media.cpp
index 63312193a..844a597fd 100644
--- a/src/proc/asset/media.cpp
+++ b/src/proc/asset/media.cpp
@@ -46,7 +46,7 @@ using boost::format;
 using boost::regex;
 using boost::smatch;
 using boost::regex_search;
-using std::tr1::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
 
 namespace error = lumiera::error;
 
diff --git a/src/proc/asset/meta/time-grid.cpp b/src/proc/asset/meta/time-grid.cpp
index 62768fa4c..8966b4383 100644
--- a/src/proc/asset/meta/time-grid.cpp
+++ b/src/proc/asset/meta/time-grid.cpp
@@ -64,7 +64,7 @@ namespace meta {
   using lib::time::PQuant;
   using lib::time::Quantiser;
   using lib::time::FixedFrameQuantiser;
-  using std::tr1::dynamic_pointer_cast;
+  using std::dynamic_pointer_cast;
   
   namespace advice = lumiera::advice;
   
diff --git a/src/proc/asset/typed-id.hpp b/src/proc/asset/typed-id.hpp
index 99f625ff3..0822e07e6 100644
--- a/src/proc/asset/typed-id.hpp
+++ b/src/proc/asset/typed-id.hpp
@@ -53,7 +53,7 @@
 #include "lib/symbol.hpp"
 
 //#include <boost/operators.hpp>
-#include <tr1/memory>
+#include <memory>
 //#include <iostream>
 //#include <string>
 
@@ -125,7 +125,7 @@ namespace asset {
       
     public:
       void
-      registerInstance (std::tr1::weak_ptr<TY> smart_ptr_instance)
+      registerInstance (std::weak_ptr<TY> smart_ptr_instance)
         {
           TODO ("actually attach the smart-ptr to the existing TypedID registration");
         }
diff --git a/src/proc/assetmanager.cpp b/src/proc/assetmanager.cpp
index 5fa82b886..ee5edfdbf 100644
--- a/src/proc/assetmanager.cpp
+++ b/src/proc/assetmanager.cpp
@@ -27,12 +27,12 @@
 #include "lib/sync.hpp"
 #include "lib/util-foreach.hpp"
 
-#include <tr1/functional>
+#include <functional>
 #include <boost/format.hpp>
 
-using std::tr1::static_pointer_cast;
-using std::tr1::function;
-using std::tr1::placeholders::_1;
+using std::static_pointer_cast;
+using std::function;
+using std::placeholders::_1;
 using boost::format;
 using util::for_each;
 
@@ -165,7 +165,7 @@ namespace asset {
   bool
   AssetManager::known (IDA id)
   {
-    return ( registry.get (ID<Asset>(id)) );
+    return bool(registry.get (ID<Asset>(id)));
   }       // query most general Asset ID-kind and use implicit 
          //  conversion from smart-ptr to bool (test if empty)
   
diff --git a/src/proc/control/command-closure.hpp b/src/proc/control/command-closure.hpp
index 118beb68a..ef3d4ddb0 100644
--- a/src/proc/control/command-closure.hpp
+++ b/src/proc/control/command-closure.hpp
@@ -79,8 +79,8 @@
 #include "proc/control/argument-erasure.hpp"
 #include "lib/typed-allocation-manager.hpp"
 
-#include <tr1/memory>
-#include <tr1/functional>
+#include <memory>
+#include <functional>
 #include <iostream>
 #include <sstream>
 #include <string>
@@ -102,7 +102,7 @@ namespace control {
   using lib::meta::equals_safeInvoke;
   using lib::TypedAllocationManager;
   using util::unConst;
-  using std::tr1::function;
+  using std::function;
   using std::ostream;
   using std::string;
   
@@ -121,7 +121,7 @@ namespace control {
   
   
   class CmdClosure;
-  typedef std::tr1::shared_ptr<CmdClosure> PClo;
+  typedef std::shared_ptr<CmdClosure> PClo;
   
   
   
diff --git a/src/proc/control/command-def.hpp b/src/proc/control/command-def.hpp
index 5f0ac67b4..14c7dcbac 100644
--- a/src/proc/control/command-def.hpp
+++ b/src/proc/control/command-def.hpp
@@ -70,8 +70,8 @@
 #include "lib/meta/tuple.hpp"
 #include "lib/util.hpp"
 
-#include <tr1/memory>
-#include <tr1/functional>
+#include <memory>
+#include <functional>
 
 
 
@@ -79,10 +79,10 @@
 namespace proc {
 namespace control {
   
-  using std::tr1::shared_ptr;
-  using std::tr1::function;
-  using std::tr1::bind;
-  using std::tr1::placeholders::_1;
+  using std::shared_ptr;
+  using std::function;
+  using std::bind;
+  using std::placeholders::_1;
   using lib::Symbol;
   using util::cStr;
   
diff --git a/src/proc/control/command-impl-clone-builder.hpp b/src/proc/control/command-impl-clone-builder.hpp
index 549a8e30a..e40de13e2 100644
--- a/src/proc/control/command-impl-clone-builder.hpp
+++ b/src/proc/control/command-impl-clone-builder.hpp
@@ -56,16 +56,16 @@
 #include <boost/noncopyable.hpp>
 //#include <boost/operators.hpp>
 
-//#include <tr1/memory>
-//#include <tr1/functional>
+//#include <memory>
+//#include <functional>
 
 
 namespace proc {
 namespace control {
   
   using lib::TypedAllocationManager;
-//  using std::tr1::function;
-//  using std::tr1::shared_ptr;
+//  using std::function;
+//  using std::shared_ptr;
   using lib::InPlaceBuffer;
   
   
diff --git a/src/proc/control/command-impl.hpp b/src/proc/control/command-impl.hpp
index bec6be23d..f41593699 100644
--- a/src/proc/control/command-impl.hpp
+++ b/src/proc/control/command-impl.hpp
@@ -51,15 +51,15 @@
 #include <boost/noncopyable.hpp>
 #include <boost/operators.hpp>
 
-#include <tr1/memory>
-#include <tr1/functional>
+#include <memory>
+#include <functional>
 
 
 namespace proc {
 namespace control {
   
-  using std::tr1::function;
-  using std::tr1::shared_ptr;
+  using std::function;
+  using std::shared_ptr;
   
   
   
diff --git a/src/proc/control/command-registry.hpp b/src/proc/control/command-registry.hpp
index 3fbe51170..f296b5b41 100644
--- a/src/proc/control/command-registry.hpp
+++ b/src/proc/control/command-registry.hpp
@@ -70,8 +70,8 @@
 
 #include <boost/functional/hash.hpp>
 #include <boost/noncopyable.hpp>
-#include <tr1/unordered_map>
-#include <tr1/memory>
+#include <unordered_map>
+#include <memory>
 #include <string>
 #include <map>
 
@@ -82,8 +82,8 @@ namespace control {
   
   using boost::hash;
   using boost::noncopyable;
-  using std::tr1::shared_ptr;
-  using std::tr1::unordered_map;
+  using std::shared_ptr;
+  using std::unordered_map;
   using lib::TypedAllocationManager;
   using util::getValue_or_default;
   using util::contains;
diff --git a/src/proc/control/command-signature.hpp b/src/proc/control/command-signature.hpp
index 93ac35205..452c020cb 100644
--- a/src/proc/control/command-signature.hpp
+++ b/src/proc/control/command-signature.hpp
@@ -51,7 +51,7 @@
 #include "lib/meta/typelist-manip.hpp"
 #include "lib/meta/typeseq-util.hpp"
 
-#include <tr1/functional>
+#include <functional>
 
 
 
@@ -59,7 +59,7 @@
 namespace proc {
 namespace control {
   
-  using std::tr1::function;
+  using std::function;
   
   using lib::meta::FunctionSignature;
   using lib::meta::FunctionTypedef;
diff --git a/src/proc/control/command.hpp b/src/proc/control/command.hpp
index 5ec653634..4067e9383 100644
--- a/src/proc/control/command.hpp
+++ b/src/proc/control/command.hpp
@@ -73,7 +73,7 @@ namespace control {
   
   using std::string;
   using lib::Symbol;
-  using std::tr1::shared_ptr;
+  using std::shared_ptr;
   using lib::meta::Tuple;
   
   
diff --git a/src/proc/control/memento-tie.hpp b/src/proc/control/memento-tie.hpp
index 21881da6e..58feede94 100644
--- a/src/proc/control/memento-tie.hpp
+++ b/src/proc/control/memento-tie.hpp
@@ -49,7 +49,7 @@
 #include "lib/util.hpp"
 
 #include <boost/operators.hpp>
-#include <tr1/functional>
+#include <functional>
 #include <string>
 
 
@@ -135,7 +135,7 @@ namespace control {
       function<SIG> 
       tieUndoFunc()
         {
-          using std::tr1::bind;
+          using std::bind;
           
           return bindLast( undo_           // getState() bound to last argument of undo(...)
                          , bind (&MementoTie::getState, this)
@@ -150,7 +150,7 @@ namespace control {
       function<SIG>
       tieCaptureFunc()
         {
-          using std::tr1::placeholders::_1;
+          using std::placeholders::_1;
           
           function<void(MEM)> doCaptureMemento = bind (&MementoTie::capture, this, _1 );
           
diff --git a/src/proc/control/proc-dispatcher.hpp b/src/proc/control/proc-dispatcher.hpp
index 19a32d32f..13602c446 100644
--- a/src/proc/control/proc-dispatcher.hpp
+++ b/src/proc/control/proc-dispatcher.hpp
@@ -39,7 +39,7 @@
 #include "proc/control/command.hpp"
 #include "lib/depend.hpp"
 
-//#include <tr1/memory>
+//#include <memory>
 
 
 
@@ -47,7 +47,7 @@ namespace proc {
 namespace control {
   
 //  using lib::Symbol;
-//  using std::tr1::shared_ptr;
+//  using std::shared_ptr;
   
   
   /**
diff --git a/src/proc/control/styperegistry.hpp b/src/proc/control/styperegistry.hpp
index 26ca7f3b6..07b7ab737 100644
--- a/src/proc/control/styperegistry.hpp
+++ b/src/proc/control/styperegistry.hpp
@@ -44,7 +44,7 @@
 
 //#include <set>
 //#include <vector>
-//#include <tr1/memory>
+//#include <memory>
 //#include <boost/format.hpp>
 #include <boost/noncopyable.hpp>
 
diff --git a/src/proc/engine/buffer-metadata.hpp b/src/proc/engine/buffer-metadata.hpp
index d61f7f2d8..5adbf53cc 100644
--- a/src/proc/engine/buffer-metadata.hpp
+++ b/src/proc/engine/buffer-metadata.hpp
@@ -62,7 +62,7 @@
 #include "proc/engine/type-handler.hpp"
 #include "proc/engine/buffer-local-key.hpp"
 
-#include <tr1/unordered_map>
+#include <unordered_map>
 #include <boost/noncopyable.hpp>
 
 
@@ -443,7 +443,7 @@ namespace engine {
      */
     class Table
       {
-        typedef std::tr1::unordered_map<HashVal,Entry> MetadataStore;
+        typedef std::unordered_map<HashVal,Entry> MetadataStore;
         
         MetadataStore entries_;
 
diff --git a/src/proc/engine/calc-plan-continuation.hpp b/src/proc/engine/calc-plan-continuation.hpp
index 19b4ab8a9..893c887c7 100644
--- a/src/proc/engine/calc-plan-continuation.hpp
+++ b/src/proc/engine/calc-plan-continuation.hpp
@@ -37,7 +37,7 @@
 namespace proc {
 namespace engine {
   
-//  using std::tr1::function;
+//  using std::function;
   using backend::engine::JobParameter;
   using backend::engine::JobClosure;
   using mobject::ModelPort;
diff --git a/src/proc/engine/dispatcher.hpp b/src/proc/engine/dispatcher.hpp
index 0d8c7f7ee..91d2d0ce6 100644
--- a/src/proc/engine/dispatcher.hpp
+++ b/src/proc/engine/dispatcher.hpp
@@ -33,13 +33,13 @@
 #include "lib/time/timevalue.hpp"
 
 #include <boost/noncopyable.hpp>
-#include <tr1/functional>
+#include <functional>
 
 
 namespace proc {
 namespace engine {
   
-  using std::tr1::function;
+  using std::function;
   using mobject::ModelPort;
   using lib::time::FrameCnt;
   using lib::time::TimeSpan;
diff --git a/src/proc/engine/engine-service-mock.cpp b/src/proc/engine/engine-service-mock.cpp
index f5a6a2958..9bbf09c93 100644
--- a/src/proc/engine/engine-service-mock.cpp
+++ b/src/proc/engine/engine-service-mock.cpp
@@ -26,7 +26,7 @@
 
 //#include <string>
 //#include <memory>
-//#include <tr1/functional>
+//#include <functional>
 //#include <boost/scoped_ptr.hpp>
 
 
@@ -38,7 +38,7 @@ namespace engine{
 //    using lumiera::Subsys;
 //    using std::auto_ptr;
 //    using boost::scoped_ptr;
-//    using std::tr1::bind;
+//    using std::bind;
   
   
   namespace { // hidden local details of the service implementation....
diff --git a/src/proc/engine/engine-service.cpp b/src/proc/engine/engine-service.cpp
index a9833d592..485efd3af 100644
--- a/src/proc/engine/engine-service.cpp
+++ b/src/proc/engine/engine-service.cpp
@@ -26,7 +26,7 @@
 
 //#include <string>
 //#include <memory>
-#include <tr1/functional>
+#include <functional>
 //#include <boost/scoped_ptr.hpp>
 
 
@@ -38,9 +38,9 @@ namespace engine{
 //    using lumiera::Subsys;
 //    using std::auto_ptr;
 //    using boost::scoped_ptr;
-  using std::tr1::function;
-  using std::tr1::bind;
-  using std::tr1::ref;
+  using std::function;
+  using std::bind;
+  using std::ref;
   using lib::transform;
   using lib::append_all;
 
diff --git a/src/proc/engine/engine-service.hpp b/src/proc/engine/engine-service.hpp
index 6ec05f06f..bc98a6a28 100644
--- a/src/proc/engine/engine-service.hpp
+++ b/src/proc/engine/engine-service.hpp
@@ -76,7 +76,7 @@ namespace engine{
 //    using lumiera::Subsys;
 //    using lumiera::Display;
 //    using lumiera::DummyPlayer;
-//  using std::tr1::function;
+//  using std::function;
   using mobject::ModelPort;
   using proc::play::Timings;
   
diff --git a/src/proc/engine/nodewiring-config.hpp b/src/proc/engine/nodewiring-config.hpp
index aec901789..6282e6198 100644
--- a/src/proc/engine/nodewiring-config.hpp
+++ b/src/proc/engine/nodewiring-config.hpp
@@ -55,7 +55,7 @@
 #include "lib/meta/configflags.hpp"
 #include "lib/util.hpp"
 
-#include <tr1/functional>
+#include <functional>
 #include <bitset>
 #include <map>
 
@@ -112,7 +112,7 @@ namespace config {
           >
   class ConfigSelector
     {
-      typedef std::tr1::function<FUNC> FacFunction;
+      typedef std::function<FUNC> FacFunction;
       
       template<class FAC>
       struct FactoryHolder ///< impl type erasure
@@ -126,7 +126,7 @@ namespace config {
         };
       
       
-      typedef std::tr1::shared_ptr<FacFunction> PFunc;
+      typedef std::shared_ptr<FacFunction> PFunc;
       typedef std::map<IxID, PFunc> ConfigTable;
       
       ConfigTable possibleConfig_; ///< Table of factories
diff --git a/src/proc/engine/tracking-heap-block-provider.hpp b/src/proc/engine/tracking-heap-block-provider.hpp
index 180ad22fe..1e8c47096 100644
--- a/src/proc/engine/tracking-heap-block-provider.hpp
+++ b/src/proc/engine/tracking-heap-block-provider.hpp
@@ -48,7 +48,7 @@
 #include "proc/engine/buffer-provider.hpp"
 #include "lib/scoped-ptrvect.hpp"
 
-#include <tr1/unordered_map>
+#include <unordered_map>
 #include <boost/scoped_ptr.hpp>
 #include <boost/scoped_array.hpp>
 
@@ -114,7 +114,7 @@ namespace engine {
       
     class BlockPool;
     
-    typedef std::tr1::unordered_map<HashVal,BlockPool> PoolTable;
+    typedef std::unordered_map<HashVal,BlockPool> PoolTable;
   }
   
   
diff --git a/src/proc/engine/type-handler.hpp b/src/proc/engine/type-handler.hpp
index 0a9368bc1..db55f64b3 100644
--- a/src/proc/engine/type-handler.hpp
+++ b/src/proc/engine/type-handler.hpp
@@ -46,7 +46,7 @@
 #include "lib/hash-value.h"
 #include "lib/functor-util.hpp"
 
-#include <tr1/functional>
+#include <functional>
 #include <boost/functional/hash.hpp>
 
 
@@ -54,9 +54,9 @@ namespace proc {
 namespace engine {
   
   using lib::HashVal;
-  using std::tr1::bind;
-  using std::tr1::function;
-  using std::tr1::placeholders::_1;
+  using std::bind;
+  using std::function;
+  using std::placeholders::_1;
   
   namespace error = lumiera::error;
   
diff --git a/src/proc/engine/worker/dummy-tick.hpp b/src/proc/engine/worker/dummy-tick.hpp
index 317ff4301..75182400b 100644
--- a/src/proc/engine/worker/dummy-tick.hpp
+++ b/src/proc/engine/worker/dummy-tick.hpp
@@ -41,15 +41,15 @@
 #include "lib/error.hpp"
 #include "backend/thread-wrapper.hpp"
 
-#include <tr1/functional>
+#include <functional>
 #include <limits>
 
 
 namespace proc {
 namespace node {
 
-  using std::tr1::function;
-  using std::tr1::bind;
+  using std::function;
+  using std::bind;
   
   
   
diff --git a/src/proc/engine/worker/tick-service.hpp b/src/proc/engine/worker/tick-service.hpp
index 038ef83fd..5ee6e3926 100644
--- a/src/proc/engine/worker/tick-service.hpp
+++ b/src/proc/engine/worker/tick-service.hpp
@@ -41,15 +41,15 @@
 #include "lib/error.hpp"
 #include "backend/thread-wrapper.hpp"
 
-#include <tr1/functional>
+#include <functional>
 #include <limits>
 
 
 namespace proc {
 namespace node {
 
-  using std::tr1::function;
-  using std::tr1::bind;
+  using std::function;
+  using std::bind;
   
   
   
diff --git a/src/proc/mobject/placement.hpp b/src/proc/mobject/placement.hpp
index 641f9746f..4c9ad8c9c 100644
--- a/src/proc/mobject/placement.hpp
+++ b/src/proc/mobject/placement.hpp
@@ -74,7 +74,7 @@
 
 #include "proc/asset/pipe.hpp"   //////////////TICKET #109 : get rid of this
 
-#include <tr1/memory>
+#include <memory>
 
 
 namespace proc {
@@ -85,8 +85,8 @@ namespace mobject {
   class MObject;
   class ExplicitPlacement;
   
-  using std::tr1::shared_ptr;
-  using std::tr1::static_pointer_cast;
+  using std::shared_ptr;
+  using std::static_pointer_cast;
   using lib::HashIndexed;
   
   
diff --git a/src/proc/mobject/session.hpp b/src/proc/mobject/session.hpp
index 8d1ac1e5a..663b6666e 100644
--- a/src/proc/mobject/session.hpp
+++ b/src/proc/mobject/session.hpp
@@ -59,7 +59,7 @@
 #include "lib/p.hpp"
 
 #include <boost/noncopyable.hpp>
-#include <tr1/memory>
+#include <memory>
 
 
 
@@ -75,7 +75,7 @@ namespace mobject {
     class SessManager;
     class ElementQuery;
     class Fixture;
-    typedef std::tr1::shared_ptr<Fixture> PFix;
+    typedef std::shared_ptr<Fixture> PFix;
   }
   
   typedef session::SessManager& PSess;  ///< acts as a "PImpl" smart ptr
diff --git a/src/proc/mobject/session/element-query.hpp b/src/proc/mobject/session/element-query.hpp
index 8f902ccb3..486c737c9 100644
--- a/src/proc/mobject/session/element-query.hpp
+++ b/src/proc/mobject/session/element-query.hpp
@@ -31,7 +31,7 @@
 #include "proc/mobject/session/session-service-explore-scope.hpp"
 
 #include <boost/noncopyable.hpp>
-#include <tr1/functional>
+#include <functional>
 
 
 
@@ -40,7 +40,7 @@ namespace mobject {
 namespace session {
   
   
-  using std::tr1::function;
+  using std::function;
   
   
   namespace { // type matching helper
diff --git a/src/proc/mobject/session/fixture.hpp b/src/proc/mobject/session/fixture.hpp
index 0913a56ba..cf5f2e46c 100644
--- a/src/proc/mobject/session/fixture.hpp
+++ b/src/proc/mobject/session/fixture.hpp
@@ -35,7 +35,7 @@
 
 
 using std::list;
-using std::tr1::shared_ptr;
+using std::shared_ptr;
 
 
 
diff --git a/src/proc/mobject/session/locatingpin.hpp b/src/proc/mobject/session/locatingpin.hpp
index 52b0f2add..33b9bfedb 100644
--- a/src/proc/mobject/session/locatingpin.hpp
+++ b/src/proc/mobject/session/locatingpin.hpp
@@ -51,7 +51,7 @@
 #include "lib/time/timevalue.hpp"
 
 #include <utility>
-#include <tr1/memory>
+#include <memory>
 #include <boost/scoped_ptr.hpp>
 using boost::scoped_ptr;
 
@@ -102,7 +102,7 @@ namespace mobject {
         typedef lib::time::TimeVar TimeVar;
         typedef lib::time::Offset Offset;
         typedef Time* Track; //TODO dummy declaration; we don't use Tracks as first-class entity any longer
-        typedef std::tr1::shared_ptr<asset::Pipe> Pipe;
+        typedef std::shared_ptr<asset::Pipe> Pipe;
         typedef std::pair<Time,Pipe> SolutionData;  //TICKET #100 (ichthyo considers better passing of solution by subclass)
         struct LocatingSolution;
       
diff --git a/src/proc/mobject/session/placement-index-query-resolver.hpp b/src/proc/mobject/session/placement-index-query-resolver.hpp
index 984ef9e62..647a437bb 100644
--- a/src/proc/mobject/session/placement-index-query-resolver.hpp
+++ b/src/proc/mobject/session/placement-index-query-resolver.hpp
@@ -61,14 +61,14 @@
 
 #include "common/query.hpp"
 
-#include <tr1/functional>
+#include <functional>
 
 
 namespace proc {
 namespace mobject {
 namespace session {
  
-  using std::tr1::function;
+  using std::function;
   using lumiera::Goal;
   
   typedef PlacementIndex& IndexLink(void);
diff --git a/src/proc/mobject/session/placement-index.cpp b/src/proc/mobject/session/placement-index.cpp
index db2d55b5e..003408b19 100644
--- a/src/proc/mobject/session/placement-index.cpp
+++ b/src/proc/mobject/session/placement-index.cpp
@@ -62,9 +62,9 @@
 #include <boost/lambda/lambda.hpp>
 #include <boost/functional/hash.hpp>
 #include <boost/noncopyable.hpp>
-#include <tr1/unordered_map>
-#include <tr1/functional>
-#include <tr1/memory>
+#include <unordered_map>
+#include <functional>
+#include <memory>
 #include <string>
 
 
@@ -75,15 +75,15 @@ namespace session {
   using boost::hash;
   using boost::noncopyable;
   using boost::lambda::var;
-  using std::tr1::shared_ptr;
-  using std::tr1::unordered_map;
-  using std::tr1::unordered_multimap;
+  using std::shared_ptr;
+  using std::unordered_map;
+  using std::unordered_multimap;
   using lib::TypedAllocationManager;
   using lib::iter_stl::IterSnapshot;
   using lib::iter_stl::eachVal;
-  using std::tr1::placeholders::_1;
-  using std::tr1::function;
-  using std::tr1::bind;
+  using std::placeholders::_1;
+  using std::function;
+  using std::bind;
   using std::make_pair;
   using std::pair;
   
@@ -122,7 +122,7 @@ namespace session {
       // using hashtables to implement the index
       typedef PlacementMO::ID PID;
       typedef unordered_map<PID, PlacementEntry, hash<PID> > IDTable;
-      typedef std::tr1::unordered_multimap<PID,PID, hash<PID> > ScopeTable;
+      typedef std::unordered_multimap<PID,PID, hash<PID> > ScopeTable;
       
       typedef pair<ScopeIter, ScopeIter> ScopeContents;
       
diff --git a/src/proc/mobject/session/placement-index.hpp b/src/proc/mobject/session/placement-index.hpp
index f6a416628..aa2d3363a 100644
--- a/src/proc/mobject/session/placement-index.hpp
+++ b/src/proc/mobject/session/placement-index.hpp
@@ -112,7 +112,7 @@
 #include "proc/mobject/placement.hpp"
 #include "proc/mobject/placement-ref.hpp"
 
-#include <tr1/unordered_map>
+#include <unordered_map>
 #include <boost/noncopyable.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <vector>
@@ -171,7 +171,7 @@ namespace session {
       
       
       typedef PlacementMO::ID _PID;
-      typedef std::tr1::unordered_multimap<_PID,_PID>::const_iterator  ScopeIter;
+      typedef std::unordered_multimap<_PID,_PID>::const_iterator  ScopeIter;
       typedef lib::RangeIter<ScopeIter>                           ScopeRangeIter;
       typedef lib::TransformIter<ScopeRangeIter, PlacementMO&> _ID_TableIterator;
       
diff --git a/src/proc/mobject/session/query/fake-configrules.hpp b/src/proc/mobject/session/query/fake-configrules.hpp
index 62cb0c60f..93058a54e 100644
--- a/src/proc/mobject/session/query/fake-configrules.hpp
+++ b/src/proc/mobject/session/query/fake-configrules.hpp
@@ -106,6 +106,13 @@ namespace session {
         return querySpec.usesPredicate ("default");
       }
       
+      template<typename WRA>
+      inline bool
+      exists(WRA const& solution)
+      {
+        return bool(solution);
+      }
+      
     } // details (end)
     
     
@@ -180,7 +187,7 @@ namespace session {
                 if (! solution
                    ||(solution &&  solution == candidate)      // simulates a real unification
                    )
-                  return solution = candidate;
+                  return exists (solution = candidate);
               }
             return try_special_case(solution, q);
           }
@@ -190,18 +197,18 @@ namespace session {
         try_special_case (Ret& solution, Query<TY> const& q)
           {
             if (solution && isFakeBypass(q))        // backdoor for tests
-              return solution;
+              return exists (solution);
             
             if (is_defaults_query (q))
               {
                 Query<TY> defaultsQuery = q.rebuild().removeTerm("default");
-                return solution = Session::current->defaults (defaultsQuery);
+                return exists (solution = Session::current->defaults (defaultsQuery));
               }                             //  may lead to recursion
                                             
             if (this->detect_case (solution, q))
               return resolve (solution, q);
             
-            return solution = Ret();  // fail: return default-constructed empty smart ptr
+            return exists (solution = Ret());  // fail: return default-constructed empty smart ptr
           }
       };
     
diff --git a/src/proc/mobject/session/scope-query.hpp b/src/proc/mobject/session/scope-query.hpp
index 9c0e5b300..ca9e0a2c8 100644
--- a/src/proc/mobject/session/scope-query.hpp
+++ b/src/proc/mobject/session/scope-query.hpp
@@ -46,16 +46,16 @@
 #include "common/query/query-resolver.hpp"
 #include "lib/format-string.hpp"
 
-#include <tr1/functional>
+#include <functional>
 
 
 namespace proc {
 namespace mobject {
 namespace session {
   
-  using std::tr1::bind;
-  using std::tr1::function;
-  using std::tr1::placeholders::_1;
+  using std::bind;
+  using std::function;
+  using std::placeholders::_1;
   
   using lumiera::Goal;
   using lumiera::Query;
diff --git a/src/proc/mobject/session/session-query.hpp b/src/proc/mobject/session/session-query.hpp
index e52d06472..42923db4f 100644
--- a/src/proc/mobject/session/session-query.hpp
+++ b/src/proc/mobject/session/session-query.hpp
@@ -44,7 +44,7 @@
 #include "proc/mobject/placement.hpp"
 #include "proc/mobject/session/track.hpp"
 
-#include <tr1/functional>
+#include <functional>
 
 
 
@@ -52,9 +52,9 @@ namespace proc {
 namespace mobject {
 namespace session {
   
-  using std::tr1::bind;
-  using std::tr1::function;
-  using std::tr1::placeholders::_1;
+  using std::bind;
+  using std::function;
+  using std::placeholders::_1;
   
   ////////////TODO: shall we use a sub-namespace "query" ??
   
diff --git a/src/proc/mobject/session/session-service-mock-index.hpp b/src/proc/mobject/session/session-service-mock-index.hpp
index 3c9d88d36..e3ad609bf 100644
--- a/src/proc/mobject/session/session-service-mock-index.hpp
+++ b/src/proc/mobject/session/session-service-mock-index.hpp
@@ -46,7 +46,7 @@
 
 #include "proc/mobject/session/placement-index.hpp"
 
-#include <tr1/memory>
+#include <memory>
 
 
 
@@ -55,7 +55,7 @@ namespace proc {
 namespace mobject {
 namespace session {
   
-  typedef std::tr1::shared_ptr<PlacementIndex> PPIdx;
+  typedef std::shared_ptr<PlacementIndex> PPIdx;
   
 
   /** there is an implicit PlacementIndex available on a global level,
diff --git a/src/proc/mobject/session/specific-contents-query.hpp b/src/proc/mobject/session/specific-contents-query.hpp
index f534bd816..20654b22b 100644
--- a/src/proc/mobject/session/specific-contents-query.hpp
+++ b/src/proc/mobject/session/specific-contents-query.hpp
@@ -29,14 +29,14 @@
 #include "proc/mobject/placement.hpp"
 #include "common/query/query-resolver.hpp"
 
-#include <tr1/functional>
+#include <functional>
 
 
 namespace proc {
 namespace mobject {
 namespace session {
   
-  using std::tr1::function;
+  using std::function;
   
   using lumiera::QueryResolver;
   
diff --git a/src/proc/play/dummy-play-connection.cpp b/src/proc/play/dummy-play-connection.cpp
index 82c31ccc7..9691f9dd6 100644
--- a/src/proc/play/dummy-play-connection.cpp
+++ b/src/proc/play/dummy-play-connection.cpp
@@ -28,7 +28,7 @@
 
 //#include <string>
 //#include <memory>
-//#include <tr1/functional>
+//#include <functional>
 //#include <boost/scoped_ptr.hpp>
 
 
diff --git a/src/proc/play/dummy-player-service.cpp b/src/proc/play/dummy-player-service.cpp
index 0ce067655..8cae648fd 100644
--- a/src/proc/play/dummy-player-service.cpp
+++ b/src/proc/play/dummy-player-service.cpp
@@ -32,7 +32,7 @@ extern "C" {
 
 #include <string>
 #include <memory>
-#include <tr1/functional>
+#include <functional>
 #include <boost/scoped_ptr.hpp>
 
 
@@ -44,7 +44,7 @@ namespace proc  {
     using lumiera::Subsys;
     using std::auto_ptr;
     using boost::scoped_ptr;
-    using std::tr1::bind;
+    using std::bind;
     
     
     
diff --git a/src/proc/play/output-director.hpp b/src/proc/play/output-director.hpp
index 8547f34aa..582b3d81c 100644
--- a/src/proc/play/output-director.hpp
+++ b/src/proc/play/output-director.hpp
@@ -44,7 +44,7 @@
 #include <boost/noncopyable.hpp>
 //#include <string>
 //#include <vector>
-//#include <tr1/memory>
+//#include <memory>
 #include <boost/scoped_ptr.hpp>
 
 
@@ -53,7 +53,7 @@ namespace play {
   
 //using std::string;
 //using std::vector;
-//using std::tr1::shared_ptr;
+//using std::shared_ptr;
   using boost::scoped_ptr;
   
   
diff --git a/src/proc/play/output-manager.hpp b/src/proc/play/output-manager.hpp
index 7858f09e5..54bff0200 100644
--- a/src/proc/play/output-manager.hpp
+++ b/src/proc/play/output-manager.hpp
@@ -38,7 +38,7 @@
 #include <boost/noncopyable.hpp>
 //#include <string>
 //#include <vector>
-#include <tr1/memory>
+#include <memory>
 
 
 namespace proc {
@@ -46,7 +46,7 @@ namespace play {
   
 //using std::string;
 //using std::vector;
-  using std::tr1::shared_ptr;
+  using std::shared_ptr;
   
   
   LUMIERA_ERROR_DECLARE(CANT_PLAY); ///< unable to build playback or render process for this configuration
diff --git a/src/proc/play/output-slot-connection.hpp b/src/proc/play/output-slot-connection.hpp
index b6b22658a..0bba60baf 100644
--- a/src/proc/play/output-slot-connection.hpp
+++ b/src/proc/play/output-slot-connection.hpp
@@ -53,9 +53,9 @@
 #include <boost/noncopyable.hpp>
 #include <boost/scoped_ptr.hpp>
 //#include <string>
-#include <tr1/functional>
+#include <functional>
 #include <vector>
-//#include <tr1/memory>
+//#include <memory>
 
 
 namespace proc {
@@ -68,10 +68,10 @@ namespace play {
   using lib::transform;
   using lib::iter_stl::eachElm;
   
-//using std::tr1::placeholders::_1;
-//using std::tr1::bind;
+//using std::placeholders::_1;
+//using std::bind;
   using std::vector;
-//using std::tr1::shared_ptr;
+//using std::shared_ptr;
   using boost::scoped_ptr;
   
   
diff --git a/src/proc/play/play-controller.cpp b/src/proc/play/play-controller.cpp
index 5eb14b9f2..6335e471d 100644
--- a/src/proc/play/play-controller.cpp
+++ b/src/proc/play/play-controller.cpp
@@ -41,7 +41,7 @@
 
 //#include <string>
 //#include <memory>
-//#include <tr1/functional>
+//#include <functional>
 //#include <boost/scoped_ptr.hpp>
 
 namespace lumiera {
@@ -211,7 +211,7 @@ namespace play{
 //    using lumiera::Subsys;
 //    using std::auto_ptr;
 //    using boost::scoped_ptr;
-//    using std::tr1::bind;
+//    using std::bind;
     
     
     namespace { // hidden local details of the service implementation....
diff --git a/src/proc/play/play-process.cpp b/src/proc/play/play-process.cpp
index 159e111df..e7491f153 100644
--- a/src/proc/play/play-process.cpp
+++ b/src/proc/play/play-process.cpp
@@ -28,7 +28,7 @@
 
 //#include <string>
 //#include <memory>
-//#include <tr1/functional>
+//#include <functional>
 //#include <boost/scoped_ptr.hpp>
 
 
@@ -40,7 +40,7 @@ namespace play {
 //    using lumiera::Subsys;
 //    using std::auto_ptr;
 //    using boost::scoped_ptr;
-//    using std::tr1::bind;
+//    using std::bind;
   using lib::transform;
   using lib::append_all;
   
diff --git a/src/proc/play/play-process.hpp b/src/proc/play/play-process.hpp
index 2e80459eb..9f7b88028 100644
--- a/src/proc/play/play-process.hpp
+++ b/src/proc/play/play-process.hpp
@@ -63,7 +63,7 @@
 //
 #include <boost/noncopyable.hpp>
 //#include <boost/scoped_ptr.hpp>
-#include <tr1/functional>
+#include <functional>
 //#include <string>
 #include <vector>
 
@@ -77,7 +77,7 @@ namespace play {
 //    using lumiera::DummyPlayer;
   using util::isnil;
   using proc::mobject::ModelPort;
-  using std::tr1::function;
+  using std::function;
   
   typedef lib::IterSource<ModelPort>::iterator ModelPorts;
   
diff --git a/src/proc/play/play-service.cpp b/src/proc/play/play-service.cpp
index a7a6f3b56..411c487ec 100644
--- a/src/proc/play/play-service.cpp
+++ b/src/proc/play/play-service.cpp
@@ -32,8 +32,8 @@
 
 #include <string>
 //#include <memory>
-////#include <tr1/functional>
-#include <tr1/memory>
+////#include <functional>
+#include <memory>
 //#include <boost/scoped_ptr.hpp>
 
 
@@ -63,13 +63,13 @@ namespace play {
 //using lumiera::Subsys;
 //using std::auto_ptr;
 //using boost::scoped_ptr;
-//using std::tr1::bind;
+//using std::bind;
   using lib::Sync;
   using lib::RecursiveLock_NoWait;
-  using std::tr1::weak_ptr;
-  using std::tr1::bind;
-//using std::tr1::function;
-  using std::tr1::placeholders::_1;
+  using std::weak_ptr;
+  using std::bind;
+//using std::function;
+  using std::placeholders::_1;
   using util::remove_if;
   using util::and_all;
 
diff --git a/src/proc/play/render-configurator.cpp b/src/proc/play/render-configurator.cpp
index 9af8d71a2..95b820c65 100644
--- a/src/proc/play/render-configurator.cpp
+++ b/src/proc/play/render-configurator.cpp
@@ -29,8 +29,8 @@
 
 //#include <string>
 //#include <memory>
-#include <tr1/memory>
-#include <tr1/functional>
+#include <memory>
+#include <functional>
 //#include <boost/scoped_ptr.hpp>
 
 
@@ -43,9 +43,9 @@ namespace play {
 //    using lumiera::Subsys;
 //    using std::auto_ptr;
 //    using boost::scoped_ptr;
-  using std::tr1::shared_ptr;
-  using std::tr1::bind;
-  using std::tr1::placeholders::_1;
+  using std::shared_ptr;
+  using std::bind;
+  using std::placeholders::_1;
   using engine::EngineService;
   
   typedef EngineService::QoS_Definition RenderQuality;
@@ -53,9 +53,9 @@ namespace play {
   
   namespace { // Implementation details...
     
-//    using std::tr1::bind;
-//    using std::tr1::function;
-//    using std::tr1::placeholders::_1;
+//    using std::bind;
+//    using std::function;
+//    using std::placeholders::_1;
 //    using lib::transform;
     
     class LumieraRenderProcessBuilder
diff --git a/src/proc/play/render-configurator.hpp b/src/proc/play/render-configurator.hpp
index 4ba8cc665..c3c88910e 100644
--- a/src/proc/play/render-configurator.hpp
+++ b/src/proc/play/render-configurator.hpp
@@ -50,7 +50,7 @@
 #include <boost/noncopyable.hpp>
 //#include <boost/scoped_ptr.hpp>
 //#include <string>
-#include <tr1/functional>
+#include <functional>
 #include <vector>
 
 
@@ -62,7 +62,7 @@ namespace play {
 //    using lumiera::Display;
 //    using lumiera::DummyPlayer;
 //  using util::isnil;
-  using std::tr1::function;
+  using std::function;
   using proc::mobject::ModelPort;
   
 //  typedef proc::play::POutputManager POutputManager;
diff --git a/src/proc/play/timings.hpp b/src/proc/play/timings.hpp
index 6a2870bdd..3c9389870 100644
--- a/src/proc/play/timings.hpp
+++ b/src/proc/play/timings.hpp
@@ -54,13 +54,13 @@
 //#include <string>
 //#include <vector>
 #include <boost/rational.hpp>
-#include <tr1/memory>
+#include <memory>
 //#include <boost/scoped_ptr.hpp>
 
 namespace lib {
 namespace time{
   class Quantiser;
-  typedef std::tr1::shared_ptr<const Quantiser> PQuant;
+  typedef std::shared_ptr<const Quantiser> PQuant;
 }}
 
 namespace proc {
@@ -75,7 +75,7 @@ namespace play {
 //using std::string;
 
 //using std::vector;
-//using std::tr1::shared_ptr;
+//using std::shared_ptr;
 //using boost::scoped_ptr;
   
   enum PlaybackUrgency {
diff --git a/tests/core/backend/engine/dummy-job.cpp b/tests/core/backend/engine/dummy-job.cpp
index bb2997a28..029cdaf7f 100644
--- a/tests/core/backend/engine/dummy-job.cpp
+++ b/tests/core/backend/engine/dummy-job.cpp
@@ -31,7 +31,7 @@
 #include "lib/util.hpp"
 
 #include <cstdlib>
-#include <tr1/unordered_map>
+#include <unordered_map>
 #include <boost/functional/hash.hpp>
 
 
@@ -43,7 +43,7 @@ namespace engine {
     using lib::HashVal;
     using lib::NullValue;
     using lib::time::TimeVar;
-    using std::tr1::unordered_map;
+    using std::unordered_map;
     using util::access_or_default;
     
     
diff --git a/tests/core/proc/asset/asset-diagnostics.hpp b/tests/core/proc/asset/asset-diagnostics.hpp
index 28174d415..7939a995d 100644
--- a/tests/core/proc/asset/asset-diagnostics.hpp
+++ b/tests/core/proc/asset/asset-diagnostics.hpp
@@ -38,14 +38,14 @@
 #include "lib/util-foreach.hpp"
 #include "lib/util.hpp"
 
-#include <tr1/functional>
+#include <functional>
 #include <iostream>
 
 using util::contains;
 using util::for_each;
 using util::_Fmt;
-using std::tr1::placeholders::_1;
-using std::tr1::bind;
+using std::placeholders::_1;
+using std::bind;
 using std::string;
 using std::cout;
 
diff --git a/tests/core/proc/asset/entry-id-test.cpp b/tests/core/proc/asset/entry-id-test.cpp
index dd1c8a867..960e7194b 100644
--- a/tests/core/proc/asset/entry-id-test.cpp
+++ b/tests/core/proc/asset/entry-id-test.cpp
@@ -31,7 +31,7 @@
 #include "lib/util-foreach.hpp"
 #include "lib/symbol.hpp"
 
-#include <tr1/unordered_map>
+#include <unordered_map>
 #include <iostream>
 #include <string>
 
@@ -249,7 +249,7 @@ namespace test {
       
       
                                    //---key--+-value-+-hash-function--- 
-      typedef std::tr1::unordered_map<DummyID, string, DummyID::UseEmbeddedHash> Hashtable;
+      typedef std::unordered_map<DummyID, string, DummyID::UseEmbeddedHash> Hashtable;
       
       /** @test build a hashtable, using EntryID as key,
        *        thereby using the embedded hash-ID */
diff --git a/tests/core/proc/asset/makecliptest.cpp b/tests/core/proc/asset/makecliptest.cpp
index 96ab4a367..dd96fe2ea 100644
--- a/tests/core/proc/asset/makecliptest.cpp
+++ b/tests/core/proc/asset/makecliptest.cpp
@@ -38,7 +38,7 @@ using util::contains;
 using util::isnil;
 using std::string;
 
-using std::tr1::static_pointer_cast; //TODO only temporarily;
+using std::static_pointer_cast; //TODO only temporarily;
 
 namespace proc {
 namespace asset{
diff --git a/tests/core/proc/asset/testasset.cpp b/tests/core/proc/asset/testasset.cpp
index a1d6e4fed..6db47ff36 100644
--- a/tests/core/proc/asset/testasset.cpp
+++ b/tests/core/proc/asset/testasset.cpp
@@ -24,7 +24,7 @@
 #include "proc/asset/testasset.hpp"
 #include "proc/assetmanager.hpp"
 
-using std::tr1::static_pointer_cast;
+using std::static_pointer_cast;
 
 
 namespace proc {
diff --git a/tests/core/proc/asset/typed-id-test.cpp b/tests/core/proc/asset/typed-id-test.cpp
index 7cde1351f..d08d30988 100644
--- a/tests/core/proc/asset/typed-id-test.cpp
+++ b/tests/core/proc/asset/typed-id-test.cpp
@@ -35,7 +35,7 @@
 #include "lib/util-foreach.hpp"
 #include "lib/symbol.hpp"
 
-//#include <tr1/unordered_map>
+//#include <unordered_map>
 #include <iostream>
 //#include <string>
 
diff --git a/tests/core/proc/control/argument-tuple-accept-test.cpp b/tests/core/proc/control/argument-tuple-accept-test.cpp
index a5ac9f4dd..fdf3e9a41 100644
--- a/tests/core/proc/control/argument-tuple-accept-test.cpp
+++ b/tests/core/proc/control/argument-tuple-accept-test.cpp
@@ -28,7 +28,7 @@
 #include "lib/meta/tuple.hpp"
 #include "lib/time/diagnostics.hpp"
 
-#include <tr1/functional>
+#include <functional>
 #include <iostream>
 
 using std::cout;
@@ -43,7 +43,7 @@ namespace test    {
   using lib::test::randTime;
   
   using lib::time::TimeVar;
-  using std::tr1::function;
+  using std::function;
   using lib::meta::FunctionSignature;
   using lib::meta::Tuple;
   
diff --git a/tests/core/proc/control/command-argument-test.cpp b/tests/core/proc/control/command-argument-test.cpp
index b72516988..ac043f5e9 100644
--- a/tests/core/proc/control/command-argument-test.cpp
+++ b/tests/core/proc/control/command-argument-test.cpp
@@ -31,7 +31,7 @@
 #include "lib/util-foreach.hpp"
 #include "lib/util.hpp"
 
-#include <tr1/functional>
+#include <functional>
 #include <iostream>
 #include <sstream>
 #include <cstdlib>
@@ -359,9 +359,9 @@ namespace test    {
           typedef function<void()> OpFun;
           
           // now close all the functions with the stored parameter values...
-          OpFun bound_doItFun = std::tr1::bind (&CmdClosure::invoke, args, CmdFunctor(doItFun));
-          OpFun bound_undoFun = std::tr1::bind (&CmdClosure::invoke, args, CmdFunctor(undoFun));
-          OpFun bound_captFun = std::tr1::bind (&CmdClosure::invoke, args, CmdFunctor(captFun));
+          OpFun bound_doItFun = std::bind (&CmdClosure::invoke, args, CmdFunctor(doItFun));
+          OpFun bound_undoFun = std::bind (&CmdClosure::invoke, args, CmdFunctor(undoFun));
+          OpFun bound_captFun = std::bind (&CmdClosure::invoke, args, CmdFunctor(captFun));
           
           protocol.seekp(0);
           protocol << "START...";
diff --git a/tests/core/proc/control/command-equality-test.cpp b/tests/core/proc/control/command-equality-test.cpp
index 220d19ad7..aaabbbbcc 100644
--- a/tests/core/proc/control/command-equality-test.cpp
+++ b/tests/core/proc/control/command-equality-test.cpp
@@ -32,7 +32,7 @@
 #include "lib/symbol.hpp"
 #include "lib/util.hpp"
 
-#include <tr1/functional>
+#include <functional>
 #include <iostream>
 #include <string>
 
@@ -47,8 +47,8 @@ namespace test    {
   using util::isnil;
   using util::isSameObject;
   
-  using std::tr1::function;
-  using std::tr1::bind;
+  using std::function;
+  using std::bind;
   using std::string;
   using std::cout;
   using std::endl;
diff --git a/tests/core/proc/control/command-mutation-test.cpp b/tests/core/proc/control/command-mutation-test.cpp
index d93f4a70a..8fe501260 100644
--- a/tests/core/proc/control/command-mutation-test.cpp
+++ b/tests/core/proc/control/command-mutation-test.cpp
@@ -29,12 +29,12 @@
 #include "lib/meta/typelist.hpp"
 #include "lib/meta/tuple.hpp"
 
-#include <tr1/functional>
+#include <functional>
 #include <iostream>
 #include <cstdlib>
 #include <string>
 
-using std::tr1::function;
+using std::function;
 using std::string;
 using std::rand;
 using std::cout;
diff --git a/tests/core/proc/control/command-registry-test.cpp b/tests/core/proc/control/command-registry-test.cpp
index 0b4aff494..a36da3d00 100644
--- a/tests/core/proc/control/command-registry-test.cpp
+++ b/tests/core/proc/control/command-registry-test.cpp
@@ -30,7 +30,7 @@
 
 #include "proc/control/test-dummy-commands.hpp"
 
-#include <tr1/functional>
+#include <functional>
 
 
 namespace proc {
@@ -38,7 +38,7 @@ namespace control {
 namespace test    {
   
   
-  using std::tr1::function;
+  using std::function;
   using util::isSameObject;
   using lib::Symbol;
   
diff --git a/tests/core/proc/control/command-use2-test.cpp b/tests/core/proc/control/command-use2-test.cpp
index 54b1d2687..4f7d1520b 100644
--- a/tests/core/proc/control/command-use2-test.cpp
+++ b/tests/core/proc/control/command-use2-test.cpp
@@ -31,7 +31,7 @@
 
 #include "proc/control/test-dummy-commands.hpp"
 
-#include <tr1/functional>
+#include <functional>
 #include <boost/ref.hpp>
 #include <boost/lexical_cast.hpp>
 #include <string>
@@ -44,9 +44,9 @@ namespace test    {
 
   using util::_Fmt;
   using std::string;
-  using std::tr1::function;
-  using std::tr1::bind;
-  using std::tr1::ref;
+  using std::function;
+  using std::bind;
+  using std::ref;
   using boost::lexical_cast;
   using util::contains;
   
diff --git a/tests/core/proc/control/command-use3-test.cpp b/tests/core/proc/control/command-use3-test.cpp
index 82f581822..3819684db 100644
--- a/tests/core/proc/control/command-use3-test.cpp
+++ b/tests/core/proc/control/command-use3-test.cpp
@@ -28,7 +28,7 @@
 
 #include "proc/control/test-dummy-commands.hpp"
 
-//#include <tr1/functional>
+//#include <functional>
 //#include <boost/ref.hpp>
 //#include <boost/format.hpp>
 //#include <iostream>
@@ -44,8 +44,8 @@ namespace test    {
 //  using boost::format;
 //  using boost::str;
   //using util::contains;
-//  using std::tr1::function;
-//  using std::tr1::bind;
+//  using std::function;
+//  using std::bind;
 //  using std::string;
   //using std::rand;
   //using std::cout;
diff --git a/tests/core/proc/control/handling-pattern-basics-test.cpp b/tests/core/proc/control/handling-pattern-basics-test.cpp
index 7edaabeb1..e76974404 100644
--- a/tests/core/proc/control/handling-pattern-basics-test.cpp
+++ b/tests/core/proc/control/handling-pattern-basics-test.cpp
@@ -40,7 +40,7 @@ namespace test    {
   
   
   using lib::Symbol;
-  using std::tr1::function;
+  using std::function;
   using std::rand;
   
   
diff --git a/tests/core/proc/control/handling-pattern-standard-impl-test.cpp b/tests/core/proc/control/handling-pattern-standard-impl-test.cpp
index 90c8db025..539cfc137 100644
--- a/tests/core/proc/control/handling-pattern-standard-impl-test.cpp
+++ b/tests/core/proc/control/handling-pattern-standard-impl-test.cpp
@@ -41,7 +41,7 @@
 
 #include "proc/control/test-dummy-commands.hpp"
 
-//#include <tr1/functional>
+//#include <functional>
 //#include <boost/ref.hpp>
 //#include <boost/format.hpp>
 //#include <iostream>
@@ -57,8 +57,8 @@ namespace test    {
 //  using boost::format;
 //  using boost::str;
   //using util::contains;
-  using std::tr1::function;
-//  using std::tr1::bind;
+  using std::function;
+//  using std::bind;
 //  using std::string;
   //using std::rand;
   //using std::cout;
diff --git a/tests/core/proc/control/memento-tie-test.cpp b/tests/core/proc/control/memento-tie-test.cpp
index 919c70727..aea4af164 100644
--- a/tests/core/proc/control/memento-tie-test.cpp
+++ b/tests/core/proc/control/memento-tie-test.cpp
@@ -25,11 +25,11 @@
 #include "lib/test/test-helper.hpp"
 #include "proc/control/memento-tie.hpp"
 
-#include <tr1/functional>
+#include <functional>
 #include <cstdlib>
 
-using std::tr1::function;
-using std::tr1::bind;
+using std::function;
+using std::bind;
 using std::rand;
 
 
diff --git a/tests/core/proc/control/test-dummy-commands.hpp b/tests/core/proc/control/test-dummy-commands.hpp
index 518c9ff3a..6f720bd82 100644
--- a/tests/core/proc/control/test-dummy-commands.hpp
+++ b/tests/core/proc/control/test-dummy-commands.hpp
@@ -41,7 +41,7 @@
 #include "lib/error.hpp"
 #include "lib/test/test-helper.hpp"
 
-#include <tr1/functional>
+#include <functional>
 #include <sstream>
 #include <string>
 
@@ -51,7 +51,7 @@ namespace control {
 namespace test    {
   
   using std::ostringstream;
-  using std::tr1::function;
+  using std::function;
   using std::string;
   
   
diff --git a/tests/core/proc/engine/dispatcher-interface-test.cpp b/tests/core/proc/engine/dispatcher-interface-test.cpp
index a024092ae..13be756ad 100644
--- a/tests/core/proc/engine/dispatcher-interface-test.cpp
+++ b/tests/core/proc/engine/dispatcher-interface-test.cpp
@@ -38,14 +38,14 @@
 
 //#include <boost/scoped_ptr.hpp>
 //#include <iostream>
-#include <tr1/functional>
+#include <functional>
 #include <vector>
 
 using test::Test;
 using util::isnil;
 using util::last;
 using std::vector;
-using std::tr1::function;
+using std::function;
 //using std::cout;
 //using std::rand;
 
diff --git a/tests/core/proc/mobject/placement-hierarchy-test.cpp b/tests/core/proc/mobject/placement-hierarchy-test.cpp
index bc2272a98..0039e56e6 100644
--- a/tests/core/proc/mobject/placement-hierarchy-test.cpp
+++ b/tests/core/proc/mobject/placement-hierarchy-test.cpp
@@ -32,13 +32,13 @@
 #include "lib/error.hpp"
 #include "lib/util.hpp"
 
-#include <tr1/memory>
+#include <memory>
 #include <iostream>
 
 using lib::HashIndexed;
 using lib::test::Depend4Test;
 
-using std::tr1::shared_ptr;
+using std::shared_ptr;
 using std::string;
 using std::cout;
 using std::endl;
diff --git a/tests/core/proc/mobject/session/deletecliptest.cpp b/tests/core/proc/mobject/session/deletecliptest.cpp
index fcbb07137..cbf0d3736 100644
--- a/tests/core/proc/mobject/session/deletecliptest.cpp
+++ b/tests/core/proc/mobject/session/deletecliptest.cpp
@@ -39,7 +39,7 @@ using proc_interface::AssetManager;
 using proc_interface::PAsset;
 using proc_interface::IDA;
 
-using std::tr1::dynamic_pointer_cast;        /// TODO only temp
+using std::dynamic_pointer_cast;        /// TODO only temp
 
 
 namespace proc    {
diff --git a/tests/core/proc/mobject/session/rebuildfixturetest.cpp b/tests/core/proc/mobject/session/rebuildfixturetest.cpp
index 30a382269..75acf46af 100644
--- a/tests/core/proc/mobject/session/rebuildfixturetest.cpp
+++ b/tests/core/proc/mobject/session/rebuildfixturetest.cpp
@@ -27,10 +27,10 @@
 #include "lib/util-foreach.hpp"
 #include "lib/util.hpp"
 
-#include <tr1/functional>
+#include <functional>
 #include <iostream>
 
-using std::tr1::bind;
+using std::bind;
 using util::contains; 
 using util::for_each; 
 using std::string;
diff --git a/tests/core/proc/mobject/session/session-element-query-test.cpp b/tests/core/proc/mobject/session/session-element-query-test.cpp
index 54dc65b5b..2cda7d0ea 100644
--- a/tests/core/proc/mobject/session/session-element-query-test.cpp
+++ b/tests/core/proc/mobject/session/session-element-query-test.cpp
@@ -29,7 +29,7 @@
 #include "proc/mobject/mobject-ref.hpp"
 #include "lib/util.hpp"
 
-#include <tr1/functional>
+#include <functional>
 #include <string>
 
 
@@ -39,9 +39,9 @@ namespace mobject {
 namespace session {
 namespace test    {
   
-  using std::tr1::placeholders::_1;
-  using std::tr1::function;
-  using std::tr1::bind;
+  using std::placeholders::_1;
+  using std::function;
+  using std::bind;
   using std::string;
   
   using util::cStr;
diff --git a/tests/core/proc/mobject/session/session-modify-parts-test.cpp b/tests/core/proc/mobject/session/session-modify-parts-test.cpp
index 155c1e6a9..d85897ccc 100644
--- a/tests/core/proc/mobject/session/session-modify-parts-test.cpp
+++ b/tests/core/proc/mobject/session/session-modify-parts-test.cpp
@@ -33,12 +33,12 @@
 #include "proc/mobject/placement.hpp"
 #include "common/query.hpp"
 
-#include <tr1/functional>
+#include <functional>
 #include <iostream>
 #include <set>
 
-using std::tr1::ref;
-using std::tr1::placeholders::_1;
+using std::ref;
+using std::placeholders::_1;
 using util::isSameObject;
 using util::and_all;
 using std::string;
diff --git a/tests/core/proc/mobject/session/test-scopes.hpp b/tests/core/proc/mobject/session/test-scopes.hpp
index 875f9f3c5..c7d73906c 100644
--- a/tests/core/proc/mobject/session/test-scopes.hpp
+++ b/tests/core/proc/mobject/session/test-scopes.hpp
@@ -30,7 +30,7 @@
 #include "proc/mobject/session/scope-query.hpp"
 #include "proc/mobject/placement.hpp"
 
-#include <tr1/memory>
+#include <memory>
 
 
 namespace proc {
@@ -41,7 +41,7 @@ namespace test    {
   using namespace mobject::test;
   typedef TestPlacement<DummyMO> PDum;
   
-  typedef std::tr1::shared_ptr<PlacementIndex> PPIdx;
+  typedef std::shared_ptr<PlacementIndex> PPIdx;
   typedef ScopeQuery<MObject>::iterator _ScopeIterMO;
   
   
diff --git a/tests/core/proc/mobject/session/testclip.hpp b/tests/core/proc/mobject/session/testclip.hpp
index 7bf9b28d4..0f3179620 100644
--- a/tests/core/proc/mobject/session/testclip.hpp
+++ b/tests/core/proc/mobject/session/testclip.hpp
@@ -30,7 +30,7 @@
 
 
 
-using std::tr1::shared_ptr;
+using std::shared_ptr;
 using std::string;
 
 
diff --git a/tests/core/proc/play/diagnostic-output-slot.hpp b/tests/core/proc/play/diagnostic-output-slot.hpp
index 657a5de4d..ecaf0a692 100644
--- a/tests/core/proc/play/diagnostic-output-slot.hpp
+++ b/tests/core/proc/play/diagnostic-output-slot.hpp
@@ -50,8 +50,8 @@
 #include <boost/noncopyable.hpp>
 //#include <string>
 //#include <vector>
-#include <tr1/unordered_set>
-#include <tr1/memory>
+#include <unordered_set>
+#include <memory>
 //#include <boost/scoped_ptr.hpp>
 
 
@@ -71,7 +71,7 @@ namespace play {
   namespace diagn = proc::engine::diagn;
 
 //using std::vector;
-  using std::tr1::shared_ptr;
+  using std::shared_ptr;
 //using boost::scoped_ptr;
   
   namespace { // diagnostics & internals....
@@ -102,7 +102,7 @@ namespace play {
     , boost::noncopyable
     {
       
-      typedef std::tr1::unordered_set<FrameID> FrameTrackingInfo;
+      typedef std::unordered_set<FrameID> FrameTrackingInfo;
       
       
       TrackingHeapBlockProvider buffProvider_;
diff --git a/tests/library/custom-shared-ptr-test.cpp b/tests/library/custom-shared-ptr-test.cpp
index 879cae8b2..265c4d6b2 100644
--- a/tests/library/custom-shared-ptr-test.cpp
+++ b/tests/library/custom-shared-ptr-test.cpp
@@ -35,8 +35,8 @@ namespace lib {
 namespace test{
   
   using std::string;
-  using std::tr1::shared_ptr;
-  using std::tr1::weak_ptr;
+  using std::shared_ptr;
+  using std::weak_ptr;
   
   using lumiera::error::LUMIERA_ERROR_ASSERTION;
   
diff --git a/tests/library/functor-util-test.cpp b/tests/library/functor-util-test.cpp
index e6b8bb7ef..f1f9446e9 100644
--- a/tests/library/functor-util-test.cpp
+++ b/tests/library/functor-util-test.cpp
@@ -25,13 +25,13 @@
 #include "lib/test/run.hpp"
 #include "lib/functor-util.hpp"
 
-#include <tr1/functional>
+#include <functional>
 #include <boost/functional/hash.hpp>
 #include <iostream>
 
 using lib::HashVal;
 using std::cout;
-using std::tr1::function;
+using std::function;
 using boost::hash;         // note: only boost::hash allows for easy defining of custom hash functions 
 
 
diff --git a/tests/library/hash-indexed-test.cpp b/tests/library/hash-indexed-test.cpp
index a5d52c124..f709389a4 100644
--- a/tests/library/hash-indexed-test.cpp
+++ b/tests/library/hash-indexed-test.cpp
@@ -26,7 +26,7 @@
 #include "lib/hash-indexed.hpp"
 #include "lib/util.hpp"
 
-#include <tr1/unordered_map>
+#include <unordered_map>
 
 using util::isSameObject;
 
@@ -129,7 +129,7 @@ namespace test{
       void
       buildHashtable ()
         {
-          typedef std::tr1::unordered_map<KEY, VAL, HashFunc> Hashtable;
+          typedef std::unordered_map<KEY, VAL, HashFunc> Hashtable;
           
           Hashtable tab;
           
diff --git a/tests/library/hierarchy-orientation-indicator-test.cpp b/tests/library/hierarchy-orientation-indicator-test.cpp
index 41d3b9e78..32b2c98fc 100644
--- a/tests/library/hierarchy-orientation-indicator-test.cpp
+++ b/tests/library/hierarchy-orientation-indicator-test.cpp
@@ -30,7 +30,7 @@
 #include "lib/util.hpp"
 
 #include <boost/operators.hpp>
-#include <tr1/functional>
+#include <functional>
 #include <string>
 #include <vector>
 #include <cstdlib>
@@ -42,7 +42,7 @@ namespace test {
   namespace { // test fixture: a random Tree to navigate...
     
     using std::rand;
-    using std::tr1::function;
+    using std::function;
     using lib::transformIterator;
     using lib::iter_stl::eachAddress;
     using util::contains;
diff --git a/tests/library/item-wrapper-test.cpp b/tests/library/item-wrapper-test.cpp
index efeae1a22..44f707e1f 100644
--- a/tests/library/item-wrapper-test.cpp
+++ b/tests/library/item-wrapper-test.cpp
@@ -28,7 +28,7 @@
 
 #include "lib/wrapper.hpp"
 
-#include <tr1/functional>
+#include <functional>
 #include <iostream>
 #include <cstdlib>
 #include <string>
@@ -45,8 +45,8 @@ namespace test{
   using lib::test::showSizeof;
   using util::isSameObject;
   
-  using std::tr1::placeholders::_1;
-  using std::tr1::ref;
+  using std::placeholders::_1;
+  using std::ref;
   using std::vector;
   using std::string;
   using std::rand;
@@ -82,7 +82,7 @@ namespace test{
     function<int&(size_t)>
     pickElement_ofVector (vector<int>& vec)
     {
-      return std::tr1::bind (pickElement, ref(vec), _1 );
+      return std::bind (pickElement, ref(vec), _1 );
     }
   } // (END) Test helpers
   
diff --git a/tests/library/iter-source-test.cpp b/tests/library/iter-source-test.cpp
index d806d5318..8b994b921 100644
--- a/tests/library/iter-source-test.cpp
+++ b/tests/library/iter-source-test.cpp
@@ -31,7 +31,7 @@
 
 #include <boost/lexical_cast.hpp>
 #include <boost/noncopyable.hpp>
-#include <tr1/unordered_map>
+#include <unordered_map>
 #include <iostream>
 #include <cstdlib>
 #include <string>
@@ -156,10 +156,10 @@ namespace test{
       typedef IterSource<TimeVar>::iterator TimeIter;
       
       typedef std::map<string,TimeVar>                TreeMap;
-      typedef std::tr1::unordered_map<string,TimeVar> HashMap;
+      typedef std::unordered_map<string,TimeVar> HashMap;
       
       typedef std::multimap<int,int>               TreeMultimap;
-      typedef std::tr1::unordered_multimap<int,int>HashMultimap;
+      typedef std::unordered_multimap<int,int>HashMultimap;
       
       
       virtual void
diff --git a/tests/library/linked-elements-test.cpp b/tests/library/linked-elements-test.cpp
index a2efdce5e..dc843acce 100644
--- a/tests/library/linked-elements-test.cpp
+++ b/tests/library/linked-elements-test.cpp
@@ -31,7 +31,7 @@
 #include "lib/test/testdummy.hpp"
 #include "lib/iter-source.hpp"
 
-#include <tr1/memory>
+#include <memory>
 
 
 
diff --git a/tests/library/maybe-value-test.cpp b/tests/library/maybe-value-test.cpp
index 824d84821..bcc1cf257 100644
--- a/tests/library/maybe-value-test.cpp
+++ b/tests/library/maybe-value-test.cpp
@@ -28,7 +28,7 @@
 #include "lib/maybe.hpp"
 #include "lib/util.hpp"
 
-//#include <tr1/functional>
+//#include <functional>
 //#include <cstdlib>
 
 
diff --git a/tests/library/meta/function-composition-test.cpp b/tests/library/meta/function-composition-test.cpp
index 1fd9db847..36db69028 100644
--- a/tests/library/meta/function-composition-test.cpp
+++ b/tests/library/meta/function-composition-test.cpp
@@ -178,14 +178,14 @@ namespace test {
           
           // Version1: do a direct argument binding----------------- //
           
-          typedef std::tr1::_Placeholder<1> PH1;                     // tr1::function argument placeholders
-          typedef std::tr1::_Placeholder<2> PH2;
+          typedef std::_Placeholder<1> PH1;                     // tr1::function argument placeholders
+          typedef std::_Placeholder<2> PH2;
           
           PH1 ph1;                                                   // these empty structs are used to mark the arguments to be kept "open"
           PH2 ph2;
           Num<1> num18 (18);                                         // ...and this value is for closing the first function argument
           
-          F23 fun_23 = std::tr1::bind (f, num18                      // do the actual binding (i.e. close the first argument with a constant value)
+          F23 fun_23 = std::bind (f, num18                      // do the actual binding (i.e. close the first argument with a constant value)
                                         , ph1
                                         , ph2
                                       );
@@ -201,7 +201,7 @@ namespace test {
           typedef Tuple<Types<Num<1>, PH1, PH2> > PartialArg;        // Tuple type to hold the binding values. Note the placeholder types
           PartialArg arg(num18);                                     // Value for partial application (the placeholders are default constructed)
           
-          fun_23 = std::tr1::bind (f, tuple::element<0>(arg)         // now extract the values to bind from this tuple
+          fun_23 = std::bind (f, tuple::element<0>(arg)         // now extract the values to bind from this tuple
                                     , tuple::element<1>(arg)
                                     , tuple::element<2>(arg)
                                   );
@@ -363,7 +363,7 @@ namespace test {
           
           /* check the convenient function-style API */
           
-          using std::tr1::bind;
+          using std::bind;
           
           f_bound_5 = bindLast (f, bind(f5, Num<5>(99)));
           CHECK (1+2+3+4+99 == f_bound_5 (_1_,_2_,_3_,_4_   ) );
diff --git a/tests/library/meta/function-erasure-test.cpp b/tests/library/meta/function-erasure-test.cpp
index 807390291..e57524137 100644
--- a/tests/library/meta/function-erasure-test.cpp
+++ b/tests/library/meta/function-erasure-test.cpp
@@ -27,7 +27,7 @@
 #include "lib/error.hpp"
 #include "meta/dummy-functions.hpp"
 
-#include <tr1/functional>
+#include <functional>
 
 using ::test::Test;
 using lumiera::error::LUMIERA_ERROR_ASSERTION;
@@ -38,10 +38,10 @@ namespace lib  {
 namespace meta {
 namespace test {
   
-  using std::tr1::function;
-  using std::tr1::placeholders::_1;
-  using std::tr1::placeholders::_2;
-  using std::tr1::bind;
+  using std::function;
+  using std::placeholders::_1;
+  using std::placeholders::_2;
+  using std::bind;
   
   
   typedef FunErasure<StoreFunction> Efun;
diff --git a/tests/library/multifact-argument-test.cpp b/tests/library/multifact-argument-test.cpp
index 0ce4dd76f..26a1f0cc6 100644
--- a/tests/library/multifact-argument-test.cpp
+++ b/tests/library/multifact-argument-test.cpp
@@ -26,7 +26,7 @@
 #include "lib/multifact-arg.hpp"
 
 #include <iostream>
-#include <tr1/functional>
+#include <functional>
 
 
 
@@ -35,9 +35,9 @@ namespace test{
   
   using std::cout;
   using std::endl;
-  using std::tr1::bind;
-  using std::tr1::function;
-  using std::tr1::placeholders::_1;
+  using std::bind;
+  using std::function;
+  using std::placeholders::_1;
   using lib::test::showSizeof;
   
   
diff --git a/tests/library/query/query-utils-test.cpp b/tests/library/query/query-utils-test.cpp
index d6773efdb..75f0ff63e 100644
--- a/tests/library/query/query-utils-test.cpp
+++ b/tests/library/query/query-utils-test.cpp
@@ -28,7 +28,7 @@
 #include "lib/cmdline.hpp"
 #include "lib/query-diagnostics.hpp"
 
-#include <tr1/functional>
+#include <functional>
 #include <iostream>
 
 using lib::Cmdline;
@@ -36,8 +36,8 @@ using util::isnil;
 using util::contains;
 using util::for_each;
 
-using std::tr1::placeholders::_1;
-using std::tr1::bind;
+using std::placeholders::_1;
+using std::bind;
 using std::string;
 using std::cout;
 using std::endl;
diff --git a/tests/library/singleton-test.cpp b/tests/library/singleton-test.cpp
index 01ac049d1..81ee8d599 100644
--- a/tests/library/singleton-test.cpp
+++ b/tests/library/singleton-test.cpp
@@ -28,11 +28,11 @@
 #include "test-target-obj.hpp"
 #include "lib/depend.hpp"
 
-#include <tr1/functional>
+#include <functional>
 #include <boost/lexical_cast.hpp>
 #include <iostream>
 
-using std::tr1::function;
+using std::function;
 using boost::lexical_cast;
 using util::isSameObject;
 using util::_Fmt;
diff --git a/tests/library/sub-id-test.cpp b/tests/library/sub-id-test.cpp
index 0bf9ad77e..1d32df42c 100644
--- a/tests/library/sub-id-test.cpp
+++ b/tests/library/sub-id-test.cpp
@@ -28,8 +28,8 @@
 #include "lib/sub-id.hpp"
 
 #include <boost/functional/hash.hpp>
-#include <tr1/unordered_map>
-#include <tr1/functional>
+#include <unordered_map>
+#include <functional>
 #include <vector>
 #include <string>
 
@@ -40,8 +40,8 @@ namespace test{
   
   using util::cStr;
   using util::for_each;
-  using std::tr1::bind;
-  using std::tr1::placeholders::_1;
+  using std::bind;
+  using std::placeholders::_1;
   using boost::hash;
   using std::vector;
   using std::string;
@@ -144,7 +144,7 @@ namespace test{
       
       template<class KEY>
       struct HashTable
-        : std::tr1::unordered_map<KEY, string, hash<KEY> >
+        : std::unordered_map<KEY, string, hash<KEY> >
         {
           void
           add (KEY key)
diff --git a/tests/library/subsystem-runner-test.cpp b/tests/library/subsystem-runner-test.cpp
index fd0d536c2..ad1590ef5 100644
--- a/tests/library/subsystem-runner-test.cpp
+++ b/tests/library/subsystem-runner-test.cpp
@@ -34,11 +34,11 @@
 #include "lib/util.hpp"
 #include "lib/sync.hpp"
 
-#include <tr1/functional>
+#include <functional>
 #include <iostream>
 
 using std::cout;
-using std::tr1::bind;
+using std::bind;
 using util::isnil;
 using util::cStr;
 using test::Test;
diff --git a/tests/library/symbol-hashtable-test.cpp b/tests/library/symbol-hashtable-test.cpp
index dd0e8ccfb..71aefef4d 100644
--- a/tests/library/symbol-hashtable-test.cpp
+++ b/tests/library/symbol-hashtable-test.cpp
@@ -29,7 +29,7 @@
 #include "lib/symbol.hpp"
 
 #include <boost/functional/hash.hpp>
-#include <tr1/unordered_map>
+#include <unordered_map>
 #include <cstring>
 #include <string>
 
@@ -54,7 +54,7 @@ namespace test{
     
   }
   
-  typedef std::tr1::unordered_map< Symbol, string, hash<Symbol> > HTable;
+  typedef std::unordered_map< Symbol, string, hash<Symbol> > HTable;
   
   
   /*********************************************************//**
diff --git a/tests/library/sync-locking-test.cpp b/tests/library/sync-locking-test.cpp
index 84c0c41df..eab82cf44 100644
--- a/tests/library/sync-locking-test.cpp
+++ b/tests/library/sync-locking-test.cpp
@@ -28,9 +28,9 @@
 #include "backend/thread-wrapper.hpp"
 
 #include <iostream>
-#include <tr1/functional>
+#include <functional>
 
-using std::tr1::bind;
+using std::bind;
 
 using std::cout;
 using test::Test;
diff --git a/tests/library/sync-waiting-test.cpp b/tests/library/sync-waiting-test.cpp
index 96ba49b55..2e2004b76 100644
--- a/tests/library/sync-waiting-test.cpp
+++ b/tests/library/sync-waiting-test.cpp
@@ -27,9 +27,9 @@
 #include "backend/thread-wrapper.hpp"
 #include "lib/sync.hpp"
 
-#include <tr1/functional>
+#include <functional>
 
-using std::tr1::bind;
+using std::bind;
 using test::Test;
 
 
diff --git a/tests/library/test/test-helper-test.cpp b/tests/library/test/test-helper-test.cpp
index 96537de14..998952165 100644
--- a/tests/library/test/test-helper-test.cpp
+++ b/tests/library/test/test-helper-test.cpp
@@ -27,7 +27,7 @@
 #include "lib/util-foreach.hpp"
 
 #include <boost/algorithm/string.hpp>
-#include <tr1/functional>
+#include <functional>
 #include <iostream>
 #include <string>
 
@@ -38,7 +38,7 @@ using lumiera::error::LUMIERA_ERROR_ASSERTION;
 
 using boost::algorithm::is_lower;
 using boost::algorithm::is_digit;
-using std::tr1::function;
+using std::function;
 using std::string;
 using std::cout;
 using std::endl;
diff --git a/tests/library/thread-wrapper-join-test.cpp b/tests/library/thread-wrapper-join-test.cpp
index 5b3d108cb..36ba34851 100644
--- a/tests/library/thread-wrapper-join-test.cpp
+++ b/tests/library/thread-wrapper-join-test.cpp
@@ -29,9 +29,9 @@
 #include "lib/error.hpp"
 #include "lib/sync.hpp"
 
-#include <tr1/functional>
+#include <functional>
 
-using std::tr1::bind;
+using std::bind;
 using test::Test;
 
 
diff --git a/tests/library/thread-wrapper-test.cpp b/tests/library/thread-wrapper-test.cpp
index acdd5389d..6f643a5fd 100644
--- a/tests/library/thread-wrapper-test.cpp
+++ b/tests/library/thread-wrapper-test.cpp
@@ -27,9 +27,9 @@
 #include "lib/sync.hpp"
 #include "lib/symbol.hpp"
 
-#include <tr1/functional>
+#include <functional>
 
-using std::tr1::bind;
+using std::bind;
 using test::Test;
 
 
diff --git a/tests/library/typed-allocation-manager-test.cpp b/tests/library/typed-allocation-manager-test.cpp
index 3b46b240a..ef75edfd3 100644
--- a/tests/library/typed-allocation-manager-test.cpp
+++ b/tests/library/typed-allocation-manager-test.cpp
@@ -26,7 +26,7 @@
 #include "lib/util.hpp"
 
 
-#include <tr1/memory>
+#include <memory>
 #include <cstdlib>
 
 
@@ -35,7 +35,7 @@ namespace test{
   
   
   using util::isSameObject;
-  using std::tr1::shared_ptr;
+  using std::shared_ptr;
   using std::rand;
   
   
diff --git a/tests/library/typed-counter-test.cpp b/tests/library/typed-counter-test.cpp
index f2548492a..72fd45f3e 100644
--- a/tests/library/typed-counter-test.cpp
+++ b/tests/library/typed-counter-test.cpp
@@ -49,7 +49,7 @@
 #include "lib/util-foreach.hpp"
 #include "lib/sync.hpp"
 
-#include <tr1/functional>
+#include <functional>
 #include <cstdlib>
 #include <vector>
 #include <time.h>
@@ -62,9 +62,9 @@ namespace test{
   using backend::ThreadJoinable;
   using util::for_each;
   using util::isnil;
-  using std::tr1::placeholders::_1;
-  using std::tr1::bind;
-  using std::tr1::ref;
+  using std::placeholders::_1;
+  using std::bind;
+  using std::ref;
   using std::vector;
   using std::rand;
   
diff --git a/tests/library/util-foreach-test.cpp b/tests/library/util-foreach-test.cpp
index 2b60a8295..62c63dc95 100644
--- a/tests/library/util-foreach-test.cpp
+++ b/tests/library/util-foreach-test.cpp
@@ -28,7 +28,7 @@
 
 #include <boost/lexical_cast.hpp>
 #include <boost/lambda/lambda.hpp>
-#include <tr1/functional>
+#include <functional>
 #include <iostream>
 #include <vector>
 
@@ -40,8 +40,8 @@ using util::has_any;
 using util::and_all;
 
 using boost::lexical_cast;
-using std::tr1::function;
-using std::tr1::ref;
+using std::function;
+using std::ref;
 using std::cout;
 using std::endl;
 
@@ -63,7 +63,7 @@ namespace test {
     
     // need explicit definitions here, because we use
     // tr1/functional and boost::lambda at the same time
-    std::tr1::_Placeholder<1>        _1;
+    std::_Placeholder<1>        _1;
     boost::lambda::placeholder1_type _1_;
     
     
@@ -449,7 +449,7 @@ namespace test {
           for_each (buildTestNumberz(NUM_ELMS), _1_ = var(counter)-- );
           
           // passing a smart-ptr managed copy
-          std::tr1::shared_ptr<VecI> bySmartPtr (new VecI (coll));
+          std::shared_ptr<VecI> bySmartPtr (new VecI (coll));
           
           for_each (bySmartPtr,                 _1_ = var(counter)-- );