4 files changed, 12 insertions, 12 deletions
diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am
index 74e5863613..198c9ce7ef 100644
--- a/cpp/src/tests/Makefile.am
+++ b/cpp/src/tests/Makefile.am
@@ -1,5 +1,5 @@
 AM_CXXFLAGS = $(WARNING_CFLAGS) $(CPPUNIT_CXXFLAGS)   $(APR_CXXFLAGS)
-INCLUDES =  -I$(srcdir)/.. -I$(srcdir)/../gen -I$(builddir)/../gen
+INCLUDES =  -I$(srcdir)/.. -I$(srcdir)/../gen -I$(top_builddir)/src/gen
 
 # Unit tests
 broker_unit_tests =	\
diff --git a/cpp/src/tests/ProducerConsumerTest.cpp b/cpp/src/tests/ProducerConsumerTest.cpp
index 410a846b8b..789e365a85 100644
--- a/cpp/src/tests/ProducerConsumerTest.cpp
+++ b/cpp/src/tests/ProducerConsumerTest.cpp
@@ -74,9 +74,9 @@ class WatchedCounter : public Monitor {
         return count;
     }
 
-    bool waitFor(int i, Time timeout=TIME_SEC) {
+    bool waitFor(int i, Duration timeout=TIME_SEC) {
         Lock l(*this);
-        Time deadline = timeout+now();
+        AbsTime deadline(now(), timeout);
         while (count != i) {
             if (!wait(deadline))
                 return false;
@@ -116,8 +116,8 @@ class ProducerConsumerTest : public CppUnit::TestCase
 
     struct ConsumeTimeoutRunnable : public Runnable {
         ProducerConsumerTest& test;
-        Time timeout;
-        ConsumeTimeoutRunnable(ProducerConsumerTest& test_, const Time& t)
+        Duration timeout;
+        ConsumeTimeoutRunnable(ProducerConsumerTest& test_, const Duration& t)
             : test(test_), timeout(t) {}
         void run() { test.consumeTimeout(timeout); }
     };
@@ -143,7 +143,7 @@ class ProducerConsumerTest : public CppUnit::TestCase
         consumeInternal(consumer);
     };
 
-    void consumeTimeout(const Time& timeout) {
+    void consumeTimeout(const Duration& timeout) {
         ProducerConsumer::ConsumerLock consumer(pc, timeout);
         consumeInternal(consumer);
     };
diff --git a/cpp/src/tests/topic_listener.cpp b/cpp/src/tests/topic_listener.cpp
index aa51dd27d4..8af8f007d9 100644
--- a/cpp/src/tests/topic_listener.cpp
+++ b/cpp/src/tests/topic_listener.cpp
@@ -56,7 +56,7 @@ class Listener : public MessageListener{
     const bool transactional;
     bool init;
     int count;
-    Time start;
+    AbsTime start;
     
     void shutdown();
     void report();
@@ -159,8 +159,8 @@ void Listener::shutdown(){
 }
 
 void Listener::report(){
-    Time finish = now();
-    Time time = finish - start;
+    AbsTime finish = now();
+    Duration time(start, finish);
     stringstream reportstr;
     reportstr << "Received " << count << " messages in "
               << time/TIME_MSEC << " ms.";
diff --git a/cpp/src/tests/topic_publisher.cpp b/cpp/src/tests/topic_publisher.cpp
index 1c92f75cc8..7c16dd71f3 100644
--- a/cpp/src/tests/topic_publisher.cpp
+++ b/cpp/src/tests/topic_publisher.cpp
@@ -183,7 +183,7 @@ void Publisher::waitForCompletion(int msgs){
 int64_t Publisher::publish(int msgs, int listeners, int size){
     Message msg;
     msg.setData(generateData(size));
-    Time start = now();
+    AbsTime start = now();
     {
         Monitor::ScopedLock l(monitor);
         for(int i = 0; i < msgs; i++){
@@ -201,8 +201,8 @@ int64_t Publisher::publish(int msgs, int listeners, int size){
         waitForCompletion(listeners);
     }
 
-    Time finish = now();
-    return finish - start; 
+    AbsTime finish = now();
+    return Duration(start, finish); 
 }
 
 string Publisher::generateData(int size){