diff --git a/src/lib/element-tracker.hpp b/src/lib/element-tracker.hpp
index 117f1855a..160c6b5a2 100644
--- a/src/lib/element-tracker.hpp
+++ b/src/lib/element-tracker.hpp
@@ -114,7 +114,7 @@ namespace lib {
         {
           REQUIRE (asset, "Attempt to track a NIL element");
           remove (*asset);
-          push_back (asset);
+          this->push_back (asset);
         }
       
       void
@@ -124,7 +124,7 @@ namespace lib {
                i != _Vec::end() ; ++i )
             if (asset == **i)       // _Vec contains smart-ptrs
               {                    //   ELM is required to define '=='
-                erase (i);
+                this->erase (i);
                 return;
               }
         }
diff --git a/src/lib/multifact-arg.hpp b/src/lib/multifact-arg.hpp
index eee802e67..5422e1d08 100644
--- a/src/lib/multifact-arg.hpp
+++ b/src/lib/multifact-arg.hpp
@@ -111,8 +111,8 @@ namespace lib {
         Product
         operator() (ID const& id, ARG arg)
           {
-            Creator& func = selectProducer (id);
-            return wrap (func(arg));
+            Creator& func = this->selectProducer (id);
+            return this->wrap (func(arg));
           }
         
       };
diff --git a/src/lib/multifact.hpp b/src/lib/multifact.hpp
index 29bef6bce..b09ca8e2f 100644
--- a/src/lib/multifact.hpp
+++ b/src/lib/multifact.hpp
@@ -199,8 +199,8 @@ namespace lib {
         Product
         operator() (ID const& id)
           {
-            Creator& func = selectProducer (id);
-            return wrap (func());
+            Creator& func = this->selectProducer (id);
+            return this->wrap (func());
           }
         
         
diff --git a/src/lib/scoped-ptrvect.hpp b/src/lib/scoped-ptrvect.hpp
index 37dff93dd..341f7c23b 100644
--- a/src/lib/scoped-ptrvect.hpp
+++ b/src/lib/scoped-ptrvect.hpp
@@ -117,7 +117,7 @@ namespace lib {
           REQUIRE (obj);
           try 
             {
-              push_back (obj);
+              this->push_back (obj);
               return *obj;
             }
           catch(...)
diff --git a/src/lib/time/control-impl.hpp b/src/lib/time/control-impl.hpp
index 25e96dc07..5ec429309 100644
--- a/src/lib/time/control-impl.hpp
+++ b/src/lib/time/control-impl.hpp
@@ -145,7 +145,7 @@ namespace mutation {
       void
       attach (SIG const& toNotify)
         {
-          ChangeSignal newListener (ref(toNotify));
+          ChangeSignal newListener (std::tr1::ref(toNotify));
           listeners_.push_back (newListener);
         }
       
diff --git a/src/lib/time/control-policy.hpp b/src/lib/time/control-policy.hpp
index a657fb7ff..d05bbbe62 100644
--- a/src/lib/time/control-policy.hpp
+++ b/src/lib/time/control-policy.hpp
@@ -243,7 +243,7 @@ namespace mutation {
       processValueChange (TAR& target, SRC const& change)  ///< standard case: plain value change
         {
           imposeChange (target, maybeMaterialise(change));
-          return buildChangedValue (maybeMaterialise(target));
+          return Link::buildChangedValue (maybeMaterialise(target));
         }
       
       static TI