Added POSIX equivalents to APR classes used by clients, inlined trivial calls.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@473087 13f79535-47bb-0310-9956-ffa450edef68

56 files changed, 231 insertions, 229 deletions

diff --git a/cpp/src/qpid/broker/AccumulatedAck.cpp b/cpp/src/qpid/broker/AccumulatedAck.cpp
index 84ddcee556..11ac94f06e 100644
--- a/cpp/src/qpid/broker/AccumulatedAck.cpp
+++ b/cpp/src/qpid/broker/AccumulatedAck.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "qpid/broker/AccumulatedAck.h"
+#include <qpid/broker/AccumulatedAck.h>
 
 using std::less_equal;
 using std::bind2nd;
diff --git a/cpp/src/qpid/broker/AutoDelete.cpp b/cpp/src/qpid/broker/AutoDelete.cpp
index d96105ba7d..3d8e233768 100644
--- a/cpp/src/qpid/broker/AutoDelete.cpp
+++ b/cpp/src/qpid/broker/AutoDelete.cpp
@@ -15,7 +15,8 @@
  * limitations under the License.
  *
  */
-#include "qpid/broker/AutoDelete.h"
+#include <qpid/broker/AutoDelete.h>
+#include <qpid/sys/Time.h>
 
 using namespace qpid::broker;
 using namespace qpid::sys;
@@ -59,7 +60,7 @@ void AutoDelete::run(){
     Monitor::ScopedLock l(monitor);
     while(!stopped){
         process();
-        monitor.wait(msecsToNsecs(period));
+        monitor.wait(period * Time::NSEC_PER_MSEC);
     }
 }
 
diff --git a/cpp/src/qpid/broker/AutoDelete.h b/cpp/src/qpid/broker/AutoDelete.h
index e0efe7b399..775d2850c8 100644
--- a/cpp/src/qpid/broker/AutoDelete.h
+++ b/cpp/src/qpid/broker/AutoDelete.h
@@ -21,9 +21,9 @@
 #include <iostream>
 #include <queue>
 #include <qpid/sys/Monitor.h>
-#include "qpid/broker/Queue.h"
-#include "qpid/broker/QueueRegistry.h"
-#include "qpid/sys/Thread.h"
+#include <qpid/broker/Queue.h>
+#include <qpid/broker/QueueRegistry.h>
+#include <qpid/sys/Thread.h>
 
 namespace qpid {
     namespace broker{
diff --git a/cpp/src/qpid/broker/Binding.h b/cpp/src/qpid/broker/Binding.h
index 0e8f9b5d6c..224276e49b 100644
--- a/cpp/src/qpid/broker/Binding.h
+++ b/cpp/src/qpid/broker/Binding.h
@@ -18,7 +18,7 @@
 #ifndef _Binding_
 #define _Binding_
 
-#include "qpid/framing/FieldTable.h"
+#include <qpid/framing/FieldTable.h>
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp
index 90a705f173..0e92dfd508 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/cpp/src/qpid/broker/Broker.cpp
@@ -17,16 +17,16 @@
  */
 #include <iostream>
 #include <memory>
-#include "qpid/broker/Broker.h"
+#include <qpid/broker/Broker.h>
 
 
 using namespace qpid::broker;
 using namespace qpid::sys;
 
 Broker::Broker(const Configuration& config) :
-    acceptor(new Acceptor(config.getPort(),
-                          config.getConnectionBacklog(),
-                          config.getWorkerThreads()))
+    acceptor(Acceptor::create(config.getPort(),
+                              config.getConnectionBacklog(),
+                              config.getWorkerThreads()))
 { }
 
 
diff --git a/cpp/src/qpid/broker/Broker.h b/cpp/src/qpid/broker/Broker.h
index c4a3a3fd4a..857a527530 100644
--- a/cpp/src/qpid/broker/Broker.h
+++ b/cpp/src/qpid/broker/Broker.h
@@ -19,59 +19,59 @@
  *
  */
 
-#include "qpid/broker/Configuration.h"
-#include "qpid/broker/SessionHandlerFactoryImpl.h"
-#include "qpid/sys/Runnable.h"
-#include "qpid/sys/Acceptor.h"
+#include <qpid/broker/Configuration.h>
+#include <qpid/broker/SessionHandlerFactoryImpl.h>
+#include <qpid/sys/Runnable.h>
+#include <qpid/sys/Acceptor.h>
 #include <qpid/SharedObject.h>
 
 namespace qpid {
-    namespace broker {
-        /**
-         * A broker instance. 
-         */
-        class Broker : public qpid::sys::Runnable,
-                       public qpid::SharedObject<Broker>
-        {
-          public:
-            static const int16_t DEFAULT_PORT;
+namespace broker {
+/**
+ * A broker instance. 
+ */
+class Broker : public qpid::sys::Runnable,
+               public qpid::SharedObject<Broker>
+{
+  public:
+    static const int16_t DEFAULT_PORT;
             
-            virtual ~Broker();
+    virtual ~Broker();
 
-            /**
-             * Create a broker.
-             * @param port Port to listen on or 0 to pick a port dynamically.
-             */
-            static shared_ptr create(int16_t port = DEFAULT_PORT);
+    /**
+     * Create a broker.
+     * @param port Port to listen on or 0 to pick a port dynamically.
+     */
+    static shared_ptr create(int16_t port = DEFAULT_PORT);
 
-            /**
-             * Create a broker using a Configuration.
-             */
-            static shared_ptr create(const Configuration& config);
+    /**
+     * Create a broker using a Configuration.
+     */
+    static shared_ptr create(const Configuration& config);
 
-            /**
-             * Return listening port. If called before bind this is
-             * the configured port. If called after it is the actual
-             * port, which will be different if the configured port is
-             * 0.
-             */
-            virtual int16_t getPort() const { return acceptor->getPort(); }
+    /**
+     * Return listening port. If called before bind this is
+     * the configured port. If called after it is the actual
+     * port, which will be different if the configured port is
+     * 0.
+     */
+    virtual int16_t getPort() const { return acceptor->getPort(); }
             
-            /**
-             * Run the broker. Implements Runnable::run() so the broker
-             * can be run in a separate thread.
-             */
-            virtual void run();
+    /**
+     * Run the broker. Implements Runnable::run() so the broker
+     * can be run in a separate thread.
+     */
+    virtual void run();
 
-            /** Shut down the broker */
-            virtual void shutdown();
+    /** Shut down the broker */
+    virtual void shutdown();
 
-          private:
-            Broker(const Configuration& config); 
-            qpid::sys::Acceptor::shared_ptr acceptor;
-            SessionHandlerFactoryImpl factory;
-        };
-    }
+  private:
+    Broker(const Configuration& config); 
+    qpid::sys::Acceptor::shared_ptr acceptor;
+    SessionHandlerFactoryImpl factory;
+};
+}
 }
             
 
diff --git a/cpp/src/qpid/broker/Channel.cpp b/cpp/src/qpid/broker/Channel.cpp
index 947a97ae7c..c225036a07 100644
--- a/cpp/src/qpid/broker/Channel.cpp
+++ b/cpp/src/qpid/broker/Channel.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "qpid/broker/Channel.h"
-#include "qpid/QpidError.h"
+#include <qpid/broker/Channel.h>
+#include <qpid/QpidError.h>
 #include <iostream>
 #include <sstream>
 #include <assert.h>
diff --git a/cpp/src/qpid/broker/Channel.h b/cpp/src/qpid/broker/Channel.h
index 24dbf728ba..cc7b1ada77 100644
--- a/cpp/src/qpid/broker/Channel.h
+++ b/cpp/src/qpid/broker/Channel.h
@@ -22,26 +22,26 @@
 #include <functional>
 #include <list>
 #include <map>
-#include "qpid/broker/AccumulatedAck.h"
-#include "qpid/broker/Binding.h"
-#include "qpid/broker/Consumer.h"
-#include "qpid/broker/DeletingTxOp.h"
-#include "qpid/broker/DeliverableMessage.h"
-#include "qpid/broker/DeliveryRecord.h"
-#include "qpid/broker/Message.h"
-#include "qpid/broker/MessageBuilder.h"
-#include "qpid/broker/NameGenerator.h"
-#include "qpid/broker/Prefetch.h"
-#include "qpid/broker/Queue.h"
-#include "qpid/broker/TransactionalStore.h"
-#include "qpid/broker/TxAck.h"
-#include "qpid/broker/TxBuffer.h"
-#include "qpid/broker/TxPublish.h"
-#include "qpid/sys/Monitor.h"
-#include "qpid/framing/OutputHandler.h"
-#include "qpid/framing/AMQContentBody.h"
-#include "qpid/framing/AMQHeaderBody.h"
-#include "qpid/framing/BasicPublishBody.h"
+#include <qpid/broker/AccumulatedAck.h>
+#include <qpid/broker/Binding.h>
+#include <qpid/broker/Consumer.h>
+#include <qpid/broker/DeletingTxOp.h>
+#include <qpid/broker/DeliverableMessage.h>
+#include <qpid/broker/DeliveryRecord.h>
+#include <qpid/broker/Message.h>
+#include <qpid/broker/MessageBuilder.h>
+#include <qpid/broker/NameGenerator.h>
+#include <qpid/broker/Prefetch.h>
+#include <qpid/broker/Queue.h>
+#include <qpid/broker/TransactionalStore.h>
+#include <qpid/broker/TxAck.h>
+#include <qpid/broker/TxBuffer.h>
+#include <qpid/broker/TxPublish.h>
+#include <qpid/sys/Monitor.h>
+#include <qpid/framing/OutputHandler.h>
+#include <qpid/framing/AMQContentBody.h>
+#include <qpid/framing/AMQHeaderBody.h>
+#include <qpid/framing/BasicPublishBody.h>
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/qpid/broker/Configuration.cpp b/cpp/src/qpid/broker/Configuration.cpp
index 550b283d62..9e966e4259 100644
--- a/cpp/src/qpid/broker/Configuration.cpp
+++ b/cpp/src/qpid/broker/Configuration.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "qpid/broker/Configuration.h"
+#include <qpid/broker/Configuration.h>
 #include <string.h>
 
 using namespace qpid::broker;
diff --git a/cpp/src/qpid/broker/Configuration.h b/cpp/src/qpid/broker/Configuration.h
index e1e7c40947..f7900849c7 100644
--- a/cpp/src/qpid/broker/Configuration.h
+++ b/cpp/src/qpid/broker/Configuration.h
@@ -21,7 +21,7 @@
 #include <cstdlib>
 #include <iostream>
 #include <vector>
-#include "qpid/Exception.h"
+#include <qpid/Exception.h>
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/qpid/broker/Consumer.h b/cpp/src/qpid/broker/Consumer.h
index 73b7ca9ed1..6b0fc5fbf2 100644
--- a/cpp/src/qpid/broker/Consumer.h
+++ b/cpp/src/qpid/broker/Consumer.h
@@ -18,7 +18,7 @@
 #ifndef _Consumer_
 #define _Consumer_
 
-#include "qpid/broker/Message.h"
+#include <qpid/broker/Message.h>
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/qpid/broker/DeletingTxOp.cpp b/cpp/src/qpid/broker/DeletingTxOp.cpp
index ea3735f361..208c6f526d 100644
--- a/cpp/src/qpid/broker/DeletingTxOp.cpp
+++ b/cpp/src/qpid/broker/DeletingTxOp.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "qpid/broker/DeletingTxOp.h"
+#include <qpid/broker/DeletingTxOp.h>
 
 using namespace qpid::broker;
 
diff --git a/cpp/src/qpid/broker/DeletingTxOp.h b/cpp/src/qpid/broker/DeletingTxOp.h
index f450807256..0baf6819c9 100644
--- a/cpp/src/qpid/broker/DeletingTxOp.h
+++ b/cpp/src/qpid/broker/DeletingTxOp.h
@@ -18,7 +18,7 @@
 #ifndef _DeletingTxOp_
 #define _DeletingTxOp_
 
-#include "qpid/broker/TxOp.h"
+#include <qpid/broker/TxOp.h>
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/qpid/broker/Deliverable.h b/cpp/src/qpid/broker/Deliverable.h
index 5aded061b7..009397a7e5 100644
--- a/cpp/src/qpid/broker/Deliverable.h
+++ b/cpp/src/qpid/broker/Deliverable.h
@@ -18,7 +18,7 @@
 #ifndef _Deliverable_
 #define _Deliverable_
 
-#include "qpid/broker/Queue.h"
+#include <qpid/broker/Queue.h>
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/qpid/broker/DeliverableMessage.cpp b/cpp/src/qpid/broker/DeliverableMessage.cpp
index aff0012bf4..8fb1fdced3 100644
--- a/cpp/src/qpid/broker/DeliverableMessage.cpp
+++ b/cpp/src/qpid/broker/DeliverableMessage.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "qpid/broker/DeliverableMessage.h"
+#include <qpid/broker/DeliverableMessage.h>
 
 using namespace qpid::broker;
 
diff --git a/cpp/src/qpid/broker/DeliverableMessage.h b/cpp/src/qpid/broker/DeliverableMessage.h
index 9c65cf7103..b24bd0697d 100644
--- a/cpp/src/qpid/broker/DeliverableMessage.h
+++ b/cpp/src/qpid/broker/DeliverableMessage.h
@@ -18,9 +18,9 @@
 #ifndef _DeliverableMessage_
 #define _DeliverableMessage_
 
-#include "qpid/broker/Deliverable.h"
-#include "qpid/broker/Message.h"
-#include "qpid/broker/Queue.h"
+#include <qpid/broker/Deliverable.h>
+#include <qpid/broker/Message.h>
+#include <qpid/broker/Queue.h>
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/qpid/broker/DeliveryRecord.cpp b/cpp/src/qpid/broker/DeliveryRecord.cpp
index a49c5fbc02..a78b30d4a3 100644
--- a/cpp/src/qpid/broker/DeliveryRecord.cpp
+++ b/cpp/src/qpid/broker/DeliveryRecord.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "qpid/broker/DeliveryRecord.h"
-#include "qpid/broker/Channel.h"
+#include <qpid/broker/DeliveryRecord.h>
+#include <qpid/broker/Channel.h>
 
 using namespace qpid::broker;
 
diff --git a/cpp/src/qpid/broker/DeliveryRecord.h b/cpp/src/qpid/broker/DeliveryRecord.h
index 5ec7be77cb..d8c55ef45d 100644
--- a/cpp/src/qpid/broker/DeliveryRecord.h
+++ b/cpp/src/qpid/broker/DeliveryRecord.h
@@ -20,10 +20,10 @@
 
 #include <algorithm>
 #include <list>
-#include "qpid/broker/AccumulatedAck.h"
-#include "qpid/broker/Message.h"
-#include "qpid/broker/Prefetch.h"
-#include "qpid/broker/Queue.h"
+#include <qpid/broker/AccumulatedAck.h>
+#include <qpid/broker/Message.h>
+#include <qpid/broker/Prefetch.h>
+#include <qpid/broker/Queue.h>
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/qpid/broker/DirectExchange.cpp b/cpp/src/qpid/broker/DirectExchange.cpp
index 3f9d23cdc7..27a10a8b47 100644
--- a/cpp/src/qpid/broker/DirectExchange.cpp
+++ b/cpp/src/qpid/broker/DirectExchange.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "qpid/broker/DirectExchange.h"
-#include "qpid/broker/ExchangeBinding.h"
+#include <qpid/broker/DirectExchange.h>
+#include <qpid/broker/ExchangeBinding.h>
 #include <iostream>
 
 using namespace qpid::broker;
diff --git a/cpp/src/qpid/broker/DirectExchange.h b/cpp/src/qpid/broker/DirectExchange.h
index 0ee9ce2705..3b182d32f5 100644
--- a/cpp/src/qpid/broker/DirectExchange.h
+++ b/cpp/src/qpid/broker/DirectExchange.h
@@ -20,11 +20,11 @@
 
 #include <map>
 #include <vector>
-#include "qpid/broker/Exchange.h"
-#include "qpid/framing/FieldTable.h"
-#include "qpid/broker/Message.h"
-#include "qpid/sys/Monitor.h"
-#include "qpid/broker/Queue.h"
+#include <qpid/broker/Exchange.h>
+#include <qpid/framing/FieldTable.h>
+#include <qpid/broker/Message.h>
+#include <qpid/sys/Monitor.h>
+#include <qpid/broker/Queue.h>
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/qpid/broker/Exchange.h b/cpp/src/qpid/broker/Exchange.h
index 20b70ed475..688529c912 100644
--- a/cpp/src/qpid/broker/Exchange.h
+++ b/cpp/src/qpid/broker/Exchange.h
@@ -19,9 +19,9 @@
 #define _Exchange_
 
 #include <boost/shared_ptr.hpp>
-#include "qpid/broker/Deliverable.h"
-#include "qpid/broker/Queue.h"
-#include "qpid/framing/FieldTable.h"
+#include <qpid/broker/Deliverable.h>
+#include <qpid/broker/Queue.h>
+#include <qpid/framing/FieldTable.h>
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/qpid/broker/ExchangeBinding.cpp b/cpp/src/qpid/broker/ExchangeBinding.cpp
index 115bf4f9ec..759ecf81a8 100644
--- a/cpp/src/qpid/broker/ExchangeBinding.cpp
+++ b/cpp/src/qpid/broker/ExchangeBinding.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "qpid/broker/ExchangeBinding.h"
-#include "qpid/broker/Exchange.h"
+#include <qpid/broker/ExchangeBinding.h>
+#include <qpid/broker/Exchange.h>
 
 using namespace qpid::broker;
 using namespace qpid::framing;
diff --git a/cpp/src/qpid/broker/ExchangeBinding.h b/cpp/src/qpid/broker/ExchangeBinding.h
index 692aa8a57f..20e38a9554 100644
--- a/cpp/src/qpid/broker/ExchangeBinding.h
+++ b/cpp/src/qpid/broker/ExchangeBinding.h
@@ -18,9 +18,9 @@
 #ifndef _ExchangeBinding_
 #define _ExchangeBinding_
 
-#include "qpid/broker/Binding.h"
-#include "qpid/framing/FieldTable.h"
-#include "qpid/broker/Queue.h"
+#include <qpid/broker/Binding.h>
+#include <qpid/framing/FieldTable.h>
+#include <qpid/broker/Queue.h>
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/qpid/broker/ExchangeRegistry.cpp b/cpp/src/qpid/broker/ExchangeRegistry.cpp
index 1c3a4af026..a00ba50c5c 100644
--- a/cpp/src/qpid/broker/ExchangeRegistry.cpp
+++ b/cpp/src/qpid/broker/ExchangeRegistry.cpp
@@ -15,11 +15,11 @@
  * limitations under the License.
  *
  */
-#include "qpid/broker/ExchangeRegistry.h"
-#include "qpid/broker/DirectExchange.h"
-#include "qpid/broker/FanOutExchange.h"
-#include "qpid/broker/HeadersExchange.h"
-#include "qpid/broker/TopicExchange.h"
+#include <qpid/broker/ExchangeRegistry.h>
+#include <qpid/broker/DirectExchange.h>
+#include <qpid/broker/FanOutExchange.h>
+#include <qpid/broker/HeadersExchange.h>
+#include <qpid/broker/TopicExchange.h>
 
 using namespace qpid::broker;
 using namespace qpid::sys;
diff --git a/cpp/src/qpid/broker/ExchangeRegistry.h b/cpp/src/qpid/broker/ExchangeRegistry.h
index 5d4cf10de8..083d0fb69c 100644
--- a/cpp/src/qpid/broker/ExchangeRegistry.h
+++ b/cpp/src/qpid/broker/ExchangeRegistry.h
@@ -19,8 +19,8 @@
 #define _ExchangeRegistry_
 
 #include <map>
-#include "qpid/broker/Exchange.h"
-#include "qpid/sys/Monitor.h"
+#include <qpid/broker/Exchange.h>
+#include <qpid/sys/Monitor.h>
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/qpid/broker/FanOutExchange.cpp b/cpp/src/qpid/broker/FanOutExchange.cpp
index 2f8d4eadb2..5f88ce9108 100644
--- a/cpp/src/qpid/broker/FanOutExchange.cpp
+++ b/cpp/src/qpid/broker/FanOutExchange.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "qpid/broker/FanOutExchange.h"
-#include "qpid/broker/ExchangeBinding.h"
+#include <qpid/broker/FanOutExchange.h>
+#include <qpid/broker/ExchangeBinding.h>
 #include <algorithm>
 
 using namespace qpid::broker;
diff --git a/cpp/src/qpid/broker/FanOutExchange.h b/cpp/src/qpid/broker/FanOutExchange.h
index 910acdc203..7fb91a689b 100644
--- a/cpp/src/qpid/broker/FanOutExchange.h
+++ b/cpp/src/qpid/broker/FanOutExchange.h
@@ -20,11 +20,11 @@
 
 #include <map>
 #include <vector>
-#include "qpid/broker/Exchange.h"
-#include "qpid/framing/FieldTable.h"
-#include "qpid/broker/Message.h"
-#include "qpid/sys/Monitor.h"
-#include "qpid/broker/Queue.h"
+#include <qpid/broker/Exchange.h>
+#include <qpid/framing/FieldTable.h>
+#include <qpid/broker/Message.h>
+#include <qpid/sys/Monitor.h>
+#include <qpid/broker/Queue.h>
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/qpid/broker/HeadersExchange.cpp b/cpp/src/qpid/broker/HeadersExchange.cpp
index 0c4c290bbd..bca4eb7e3e 100644
--- a/cpp/src/qpid/broker/HeadersExchange.cpp
+++ b/cpp/src/qpid/broker/HeadersExchange.cpp
@@ -15,10 +15,10 @@
  * limitations under the License.
  *
  */
-#include "qpid/broker/HeadersExchange.h"
-#include "qpid/broker/ExchangeBinding.h"
-#include "qpid/framing/Value.h"
-#include "qpid/QpidError.h"
+#include <qpid/broker/HeadersExchange.h>
+#include <qpid/broker/ExchangeBinding.h>
+#include <qpid/framing/Value.h>
+#include <qpid/QpidError.h>
 #include <algorithm>
 
 
diff --git a/cpp/src/qpid/broker/HeadersExchange.h b/cpp/src/qpid/broker/HeadersExchange.h
index 77af612fe6..6aaea129e3 100644
--- a/cpp/src/qpid/broker/HeadersExchange.h
+++ b/cpp/src/qpid/broker/HeadersExchange.h
@@ -19,11 +19,11 @@
 #define _HeadersExchange_
 
 #include <vector>
-#include "qpid/broker/Exchange.h"
-#include "qpid/framing/FieldTable.h"
-#include "qpid/broker/Message.h"
-#include "qpid/sys/Monitor.h"
-#include "qpid/broker/Queue.h"
+#include <qpid/broker/Exchange.h>
+#include <qpid/framing/FieldTable.h>
+#include <qpid/broker/Message.h>
+#include <qpid/sys/Monitor.h>
+#include <qpid/broker/Queue.h>
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/qpid/broker/Message.cpp b/cpp/src/qpid/broker/Message.cpp
index 112e8dd77d..139725820e 100644
--- a/cpp/src/qpid/broker/Message.cpp
+++ b/cpp/src/qpid/broker/Message.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "qpid/broker/Message.h"
+#include <qpid/broker/Message.h>
 #include <iostream>
 
 using namespace boost;
diff --git a/cpp/src/qpid/broker/Message.h b/cpp/src/qpid/broker/Message.h
index 06780ba6ed..d918fd9830 100644
--- a/cpp/src/qpid/broker/Message.h
+++ b/cpp/src/qpid/broker/Message.h
@@ -19,13 +19,13 @@
 #define _Message_
 
 #include <boost/shared_ptr.hpp>
-#include "qpid/broker/ConnectionToken.h"
-#include "qpid/broker/TxBuffer.h"
-#include "qpid/framing/AMQContentBody.h"
-#include "qpid/framing/AMQHeaderBody.h"
-#include "qpid/framing/BasicHeaderProperties.h"
-#include "qpid/framing/BasicPublishBody.h"
-#include "qpid/framing/OutputHandler.h"
+#include <qpid/broker/ConnectionToken.h>
+#include <qpid/broker/TxBuffer.h>
+#include <qpid/framing/AMQContentBody.h>
+#include <qpid/framing/AMQHeaderBody.h>
+#include <qpid/framing/BasicHeaderProperties.h>
+#include <qpid/framing/BasicPublishBody.h>
+#include <qpid/framing/OutputHandler.h>
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/qpid/broker/MessageBuilder.cpp b/cpp/src/qpid/broker/MessageBuilder.cpp
index c8488292b7..9037b773ac 100644
--- a/cpp/src/qpid/broker/MessageBuilder.cpp
+++ b/cpp/src/qpid/broker/MessageBuilder.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "qpid/broker/MessageBuilder.h"
+#include <qpid/broker/MessageBuilder.h>
 
 using namespace qpid::broker;
 using namespace qpid::framing;
diff --git a/cpp/src/qpid/broker/MessageBuilder.h b/cpp/src/qpid/broker/MessageBuilder.h
index a5966574ad..832acdc971 100644
--- a/cpp/src/qpid/broker/MessageBuilder.h
+++ b/cpp/src/qpid/broker/MessageBuilder.h
@@ -18,12 +18,12 @@
 #ifndef _MessageBuilder_
 #define _MessageBuilder_
 
-#include "qpid/QpidError.h"
-#include "qpid/broker/Exchange.h"
-#include "qpid/broker/Message.h"
-#include "qpid/framing/AMQContentBody.h"
-#include "qpid/framing/AMQHeaderBody.h"
-#include "qpid/framing/BasicPublishBody.h"
+#include <qpid/QpidError.h>
+#include <qpid/broker/Exchange.h>
+#include <qpid/broker/Message.h>
+#include <qpid/framing/AMQContentBody.h>
+#include <qpid/framing/AMQHeaderBody.h>
+#include <qpid/framing/BasicPublishBody.h>
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/qpid/broker/MessageStore.h b/cpp/src/qpid/broker/MessageStore.h
index 276f33eacd..f3330889f6 100644
--- a/cpp/src/qpid/broker/MessageStore.h
+++ b/cpp/src/qpid/broker/MessageStore.h
@@ -18,9 +18,9 @@
 #ifndef _MessageStore_
 #define _MessageStore_
 
-#include "qpid/broker/Message.h"
-#include "qpid/broker/Queue.h"
-#include "qpid/broker/TransactionalStore.h"
+#include <qpid/broker/Message.h>
+#include <qpid/broker/Queue.h>
+#include <qpid/broker/TransactionalStore.h>
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/qpid/broker/NameGenerator.cpp b/cpp/src/qpid/broker/NameGenerator.cpp
index 5f1b1431f3..ec0e66c367 100644
--- a/cpp/src/qpid/broker/NameGenerator.cpp
+++ b/cpp/src/qpid/broker/NameGenerator.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "qpid/broker/NameGenerator.h"
+#include <qpid/broker/NameGenerator.h>
 #include <sstream>
 
 using namespace qpid::broker;
diff --git a/cpp/src/qpid/broker/NameGenerator.h b/cpp/src/qpid/broker/NameGenerator.h
index 71643ef675..9c5c69983f 100644
--- a/cpp/src/qpid/broker/NameGenerator.h
+++ b/cpp/src/qpid/broker/NameGenerator.h
@@ -18,7 +18,7 @@
 #ifndef _NameGenerator_
 #define _NameGenerator_
 
-#include "qpid/broker/Message.h"
+#include <qpid/broker/Message.h>
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/qpid/broker/NullMessageStore.cpp b/cpp/src/qpid/broker/NullMessageStore.cpp
index 87df407ad8..01b14e080f 100644
--- a/cpp/src/qpid/broker/NullMessageStore.cpp
+++ b/cpp/src/qpid/broker/NullMessageStore.cpp
@@ -16,10 +16,10 @@
  *
  */
 
-#include "qpid/broker/NullMessageStore.h"
+#include <qpid/broker/NullMessageStore.h>
 
-#include "qpid/broker/Queue.h"
-#include "qpid/broker/QueueRegistry.h"
+#include <qpid/broker/Queue.h>
+#include <qpid/broker/QueueRegistry.h>
 
 #include <iostream>
 
diff --git a/cpp/src/qpid/broker/NullMessageStore.h b/cpp/src/qpid/broker/NullMessageStore.h
index 3b34a7f6a0..2b4007c6d2 100644
--- a/cpp/src/qpid/broker/NullMessageStore.h
+++ b/cpp/src/qpid/broker/NullMessageStore.h
@@ -18,9 +18,9 @@
 #ifndef _NullMessageStore_
 #define _NullMessageStore_
 
-#include "qpid/broker/Message.h"
-#include "qpid/broker/MessageStore.h"
-#include "qpid/broker/Queue.h"
+#include <qpid/broker/Message.h>
+#include <qpid/broker/MessageStore.h>
+#include <qpid/broker/Queue.h>
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/qpid/broker/Prefetch.h b/cpp/src/qpid/broker/Prefetch.h
index d56799f835..afbc85fe94 100644
--- a/cpp/src/qpid/broker/Prefetch.h
+++ b/cpp/src/qpid/broker/Prefetch.h
@@ -18,7 +18,7 @@
 #ifndef _Prefetch_
 #define _Prefetch_
 
-#include "qpid/framing/amqp_types.h"
+#include <qpid/framing/amqp_types.h>
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/qpid/broker/Queue.cpp b/cpp/src/qpid/broker/Queue.cpp
index 2fe5de2dc9..4fae1086d5 100644
--- a/cpp/src/qpid/broker/Queue.cpp
+++ b/cpp/src/qpid/broker/Queue.cpp
@@ -15,9 +15,10 @@
  * limitations under the License.
  *
  */
-#include "qpid/broker/Queue.h"
-#include "qpid/broker/MessageStore.h"
-#include "qpid/sys/Monitor.h"
+#include <qpid/broker/Queue.h>
+#include <qpid/broker/MessageStore.h>
+#include <qpid/sys/Monitor.h>
+#include <qpid/sys/Time.h>
 #include <iostream>
 
 using namespace qpid::broker;
@@ -38,7 +39,7 @@ Queue::Queue(const string& _name, u_int32_t _autodelete,
     exclusive(0),
     persistenceId(0)
 {
-    if(autodelete) lastUsed = getTimeMsecs();
+    if(autodelete) lastUsed = Time::now().msecs();
 }
 
 Queue::~Queue(){
@@ -133,7 +134,7 @@ void Queue::consume(Consumer* c, bool requestExclusive){
 void Queue::cancel(Consumer* c){
     Mutex::ScopedLock locker(lock);
     consumers.erase(find(consumers.begin(), consumers.end(), c));
-    if(autodelete && consumers.empty()) lastUsed = getTimeMsecs();
+    if(autodelete && consumers.empty()) lastUsed = Time::now().msecs();
     if(exclusive == c) exclusive = 0;
 }
 
@@ -166,7 +167,7 @@ u_int32_t Queue::getConsumerCount() const{
 
 bool Queue::canAutoDelete() const{
     Mutex::ScopedLock locker(lock);
-    return lastUsed && (getTimeMsecs() - lastUsed > autodelete);
+    return lastUsed && (Time::now().msecs() - lastUsed > autodelete);
 }
 
 void Queue::enqueue(TransactionContext* ctxt, Message::shared_ptr& msg, const string * const xid)
diff --git a/cpp/src/qpid/broker/Queue.h b/cpp/src/qpid/broker/Queue.h
index 2f7ee3ec78..3788158379 100644
--- a/cpp/src/qpid/broker/Queue.h
+++ b/cpp/src/qpid/broker/Queue.h
@@ -21,12 +21,12 @@
 #include <vector>
 #include <queue>
 #include <boost/shared_ptr.hpp>
-#include "qpid/framing/amqp_types.h"
-#include "qpid/broker/Binding.h"
-#include "qpid/broker/ConnectionToken.h"
-#include "qpid/broker/Consumer.h"
-#include "qpid/broker/Message.h"
-#include "qpid/sys/Monitor.h"
+#include <qpid/framing/amqp_types.h>
+#include <qpid/broker/Binding.h>
+#include <qpid/broker/ConnectionToken.h>
+#include <qpid/broker/Consumer.h>
+#include <qpid/broker/Message.h>
+#include <qpid/sys/Monitor.h>
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/qpid/broker/QueueRegistry.cpp b/cpp/src/qpid/broker/QueueRegistry.cpp
index 1976da812d..f3b05f59b1 100644
--- a/cpp/src/qpid/broker/QueueRegistry.cpp
+++ b/cpp/src/qpid/broker/QueueRegistry.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "qpid/broker/QueueRegistry.h"
-#include "qpid/broker/SessionHandlerImpl.h"
+#include <qpid/broker/QueueRegistry.h>
+#include <qpid/broker/SessionHandlerImpl.h>
 #include <sstream>
 #include <assert.h>
 
diff --git a/cpp/src/qpid/broker/QueueRegistry.h b/cpp/src/qpid/broker/QueueRegistry.h
index e3d03a06b1..28ed2cd4c4 100644
--- a/cpp/src/qpid/broker/QueueRegistry.h
+++ b/cpp/src/qpid/broker/QueueRegistry.h
@@ -19,8 +19,8 @@
 #define _QueueRegistry_
 
 #include <map>
-#include "qpid/sys/Monitor.h"
-#include "qpid/broker/Queue.h"
+#include <qpid/sys/Monitor.h>
+#include <qpid/broker/Queue.h>
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp b/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp
index 707881b6bb..cfcb5dd271 100644
--- a/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp
+++ b/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp
@@ -15,13 +15,13 @@
  * limitations under the License.
  *
  */
-#include "qpid/broker/SessionHandlerFactoryImpl.h"
+#include <qpid/broker/SessionHandlerFactoryImpl.h>
 
-#include "qpid/broker/DirectExchange.h"
-#include "qpid/broker/FanOutExchange.h"
-#include "qpid/broker/HeadersExchange.h"
-#include "qpid/broker/NullMessageStore.h"
-#include "qpid/broker/SessionHandlerImpl.h"
+#include <qpid/broker/DirectExchange.h>
+#include <qpid/broker/FanOutExchange.h>
+#include <qpid/broker/HeadersExchange.h>
+#include <qpid/broker/NullMessageStore.h>
+#include <qpid/broker/SessionHandlerImpl.h>
 
 using namespace qpid::broker;
 using namespace qpid::sys;
diff --git a/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h b/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h
index 6e679592ff..5f5d06f82f 100644
--- a/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h
+++ b/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h
@@ -18,16 +18,16 @@
 #ifndef _SessionHandlerFactoryImpl_
 #define _SessionHandlerFactoryImpl_
 
-#include "qpid/broker/AutoDelete.h"
-#include "qpid/broker/ExchangeRegistry.h"
-#include "qpid/broker/MessageStore.h"
-#include "qpid/broker/QueueRegistry.h"
-#include "qpid/framing/AMQFrame.h"
-#include "qpid/framing/ProtocolInitiation.h"
-#include "qpid/sys/SessionContext.h"
-#include "qpid/sys/SessionHandler.h"
-#include "qpid/sys/SessionHandlerFactory.h"
-#include "qpid/sys/TimeoutHandler.h"
+#include <qpid/broker/AutoDelete.h>
+#include <qpid/broker/ExchangeRegistry.h>
+#include <qpid/broker/MessageStore.h>
+#include <qpid/broker/QueueRegistry.h>
+#include <qpid/framing/AMQFrame.h>
+#include <qpid/framing/ProtocolInitiation.h>
+#include <qpid/sys/SessionContext.h>
+#include <qpid/sys/SessionHandler.h>
+#include <qpid/sys/SessionHandlerFactory.h>
+#include <qpid/sys/TimeoutHandler.h>
 #include <memory>
 
 namespace qpid {
diff --git a/cpp/src/qpid/broker/SessionHandlerImpl.cpp b/cpp/src/qpid/broker/SessionHandlerImpl.cpp
index 5c46ed1b1b..e32f100e0f 100644
--- a/cpp/src/qpid/broker/SessionHandlerImpl.cpp
+++ b/cpp/src/qpid/broker/SessionHandlerImpl.cpp
@@ -16,10 +16,10 @@
  *
  */
 #include <iostream>
-#include "qpid/broker/SessionHandlerImpl.h"
-#include "qpid/broker/FanOutExchange.h"
-#include "qpid/broker/HeadersExchange.h"
-#include "qpid/broker/TopicExchange.h"
+#include <qpid/broker/SessionHandlerImpl.h>
+#include <qpid/broker/FanOutExchange.h>
+#include <qpid/broker/HeadersExchange.h>
+#include <qpid/broker/TopicExchange.h>
 #include "assert.h"
 
 using namespace boost;
diff --git a/cpp/src/qpid/broker/SessionHandlerImpl.h b/cpp/src/qpid/broker/SessionHandlerImpl.h
index 55cc2170ec..44e8386327 100644
--- a/cpp/src/qpid/broker/SessionHandlerImpl.h
+++ b/cpp/src/qpid/broker/SessionHandlerImpl.h
@@ -22,21 +22,21 @@
 #include <sstream>
 #include <vector>
 #include <exception>
-#include "qpid/framing/AMQFrame.h"
-#include "qpid/framing/AMQP_ClientProxy.h"
-#include "qpid/framing/AMQP_ServerOperations.h"
-#include "qpid/broker/AutoDelete.h"
-#include "qpid/broker/ExchangeRegistry.h"
-#include "qpid/broker/Channel.h"
-#include "qpid/broker/ConnectionToken.h"
-#include "qpid/broker/DirectExchange.h"
-#include "qpid/framing/OutputHandler.h"
-#include "qpid/framing/ProtocolInitiation.h"
-#include "qpid/broker/QueueRegistry.h"
-#include "qpid/sys/SessionContext.h"
-#include "qpid/sys/SessionHandler.h"
-#include "qpid/sys/TimeoutHandler.h"
-#include "qpid/broker/TopicExchange.h"
+#include <qpid/framing/AMQFrame.h>
+#include <qpid/framing/AMQP_ClientProxy.h>
+#include <qpid/framing/AMQP_ServerOperations.h>
+#include <qpid/broker/AutoDelete.h>
+#include <qpid/broker/ExchangeRegistry.h>
+#include <qpid/broker/Channel.h>
+#include <qpid/broker/ConnectionToken.h>
+#include <qpid/broker/DirectExchange.h>
+#include <qpid/framing/OutputHandler.h>
+#include <qpid/framing/ProtocolInitiation.h>
+#include <qpid/broker/QueueRegistry.h>
+#include <qpid/sys/SessionContext.h>
+#include <qpid/sys/SessionHandler.h>
+#include <qpid/sys/TimeoutHandler.h>
+#include <qpid/broker/TopicExchange.h>
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/qpid/broker/TopicExchange.cpp b/cpp/src/qpid/broker/TopicExchange.cpp
index eecd9918d4..302fc1f6c5 100644
--- a/cpp/src/qpid/broker/TopicExchange.cpp
+++ b/cpp/src/qpid/broker/TopicExchange.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "qpid/broker/TopicExchange.h"
-#include "qpid/broker/ExchangeBinding.h"
+#include <qpid/broker/TopicExchange.h>
+#include <qpid/broker/ExchangeBinding.h>
 #include <algorithm>
 
 using namespace qpid::broker;
diff --git a/cpp/src/qpid/broker/TopicExchange.h b/cpp/src/qpid/broker/TopicExchange.h
index a3e133845f..040be81a40 100644
--- a/cpp/src/qpid/broker/TopicExchange.h
+++ b/cpp/src/qpid/broker/TopicExchange.h
@@ -20,11 +20,11 @@
 
 #include <map>
 #include <vector>
-#include "qpid/broker/Exchange.h"
-#include "qpid/framing/FieldTable.h"
-#include "qpid/broker/Message.h"
-#include "qpid/sys/Monitor.h"
-#include "qpid/broker/Queue.h"
+#include <qpid/broker/Exchange.h>
+#include <qpid/framing/FieldTable.h>
+#include <qpid/broker/Message.h>
+#include <qpid/sys/Monitor.h>
+#include <qpid/broker/Queue.h>
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/qpid/broker/TxAck.cpp b/cpp/src/qpid/broker/TxAck.cpp
index 0bd525cc68..6b936430cf 100644
--- a/cpp/src/qpid/broker/TxAck.cpp
+++ b/cpp/src/qpid/broker/TxAck.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "qpid/broker/TxAck.h"
+#include <qpid/broker/TxAck.h>
 
 using std::bind1st;
 using std::bind2nd;
diff --git a/cpp/src/qpid/broker/TxAck.h b/cpp/src/qpid/broker/TxAck.h
index f284f8827d..40abac4020 100644
--- a/cpp/src/qpid/broker/TxAck.h
+++ b/cpp/src/qpid/broker/TxAck.h
@@ -21,9 +21,9 @@
 #include <algorithm>
 #include <functional>
 #include <list>
-#include "qpid/broker/AccumulatedAck.h"
-#include "qpid/broker/DeliveryRecord.h"
-#include "qpid/broker/TxOp.h"
+#include <qpid/broker/AccumulatedAck.h>
+#include <qpid/broker/DeliveryRecord.h>
+#include <qpid/broker/TxOp.h>
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/qpid/broker/TxBuffer.cpp b/cpp/src/qpid/broker/TxBuffer.cpp
index 920b9862b0..35fbe81846 100644
--- a/cpp/src/qpid/broker/TxBuffer.cpp
+++ b/cpp/src/qpid/broker/TxBuffer.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "qpid/broker/TxBuffer.h"
+#include <qpid/broker/TxBuffer.h>
 
 using std::mem_fun;
 using namespace qpid::broker;
diff --git a/cpp/src/qpid/broker/TxBuffer.h b/cpp/src/qpid/broker/TxBuffer.h
index dbf77304ed..1ff12192da 100644
--- a/cpp/src/qpid/broker/TxBuffer.h
+++ b/cpp/src/qpid/broker/TxBuffer.h
@@ -21,8 +21,8 @@
 #include <algorithm>
 #include <functional>
 #include <vector>
-#include "qpid/broker/TransactionalStore.h"
-#include "qpid/broker/TxOp.h"
+#include <qpid/broker/TransactionalStore.h>
+#include <qpid/broker/TxOp.h>
 
 /**
  * Represents a single transaction. As such, an instance of this class
diff --git a/cpp/src/qpid/broker/TxOp.h b/cpp/src/qpid/broker/TxOp.h
index af6eaded23..bc36060847 100644
--- a/cpp/src/qpid/broker/TxOp.h
+++ b/cpp/src/qpid/broker/TxOp.h
@@ -18,7 +18,7 @@
 #ifndef _TxOp_
 #define _TxOp_
 
-#include "qpid/broker/TransactionalStore.h"
+#include <qpid/broker/TransactionalStore.h>
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/qpid/broker/TxPublish.cpp b/cpp/src/qpid/broker/TxPublish.cpp
index 461ddfe052..6a2ad87aea 100644
--- a/cpp/src/qpid/broker/TxPublish.cpp
+++ b/cpp/src/qpid/broker/TxPublish.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "qpid/broker/TxPublish.h"
+#include <qpid/broker/TxPublish.h>
 
 using namespace qpid::broker;
 
diff --git a/cpp/src/qpid/broker/TxPublish.h b/cpp/src/qpid/broker/TxPublish.h
index f955ab4bc0..3ffa894de0 100644
--- a/cpp/src/qpid/broker/TxPublish.h
+++ b/cpp/src/qpid/broker/TxPublish.h
@@ -21,11 +21,11 @@
 #include <algorithm>
 #include <functional>
 #include <list>
-#include "qpid/broker/Deliverable.h"
-#include "qpid/broker/Message.h"
-#include "qpid/broker/MessageStore.h"
-#include "qpid/broker/Queue.h"
-#include "qpid/broker/TxOp.h"
+#include <qpid/broker/Deliverable.h>
+#include <qpid/broker/Message.h>
+#include <qpid/broker/MessageStore.h>
+#include <qpid/broker/Queue.h>
+#include <qpid/broker/TxOp.h>
 
 namespace qpid {
     namespace broker {