Merge branch 'move_public_h_to_include' into trunk

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

93 files changed, 808 insertions, 844 deletions

diff --git a/.gitignore b/.gitignore
index 310bbe6906..b255259f91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 *.o
 *.la
 *.lo
+*.vglog
 .dirstamp
 Makefile*
 config\.*
@@ -12,35 +13,6 @@ configure
 .deps
 .libs
 autom4te.cache
-qpid/cpp/examples/direct/declare_queues
-qpid/cpp/examples/direct/direct_producer
-qpid/cpp/examples/direct/listener
-qpid/cpp/examples/failover/declare_queues
-qpid/cpp/examples/failover/replaying_sender
-qpid/cpp/examples/failover/resuming_receiver
-qpid/cpp/examples/qmf-console/console
-qpid/cpp/examples/qmf-console/ping
-qpid/cpp/examples/qmf-console/printevents
-qpid/cpp/examples/fanout/fanout_producer
-qpid/cpp/examples/fanout/listener
-qpid/cpp/examples/pub-sub/topic_listener
-qpid/cpp/examples/pub-sub/topic_publisher
-qpid/cpp/examples/request-response/client
-qpid/cpp/examples/request-response/server
-qpid/cpp/src/tests/client_test
-qpid/cpp/src/tests/consume
-qpid/cpp/src/tests/latencytest
-qpid/cpp/src/tests/perftest
-qpid/cpp/src/tests/publish
-qpid/cpp/src/tests/qpidd.log
-qpid/cpp/src/tests/qpidd.port
-qpid/cpp/src/tests/topic_listener
-qpid/cpp/src/tests/topic_publisher
-qpid/cpp/src/tests/txtest
-qpid/cpp/src/tests/unit_test
-qpid/cpp/src/boost
-qpid/cpp/src/generate_MaxMethodBodySize_h
-qpid/cpp/src/stamp-h1
 aclocal.m4
 developer.doxygen
 user.doxygen
@@ -49,9 +21,7 @@ qpid/cpp/libtool
 qpidc.spec
 qpid/cpp/src/gen/
 *.mk
-mgen.timestamp
-MaxMethodBodySize.h
-qpidd
+*.timestamp
 rgen.timestamp
 *.pcl
 qpid/cpp/managementgen/management-types.xml
diff --git a/qpid/cpp/docs/api/Makefile.am b/qpid/cpp/docs/api/Makefile.am
index 66169d5caf..63d48c323d 100644
--- a/qpid/cpp/docs/api/Makefile.am
+++ b/qpid/cpp/docs/api/Makefile.am
@@ -21,9 +21,6 @@
 # Generate dependency files so its rebuilt only when needed. 
 #
 
-# TODO aconway 2007-04-12: html should have a
-# dependency on source/header files.
-
 if HAVE_DOXYGEN
 
 EXTRA_DIST = html user.doxygen developer.doxygen html.timestamp
@@ -31,6 +28,7 @@ EXTRA_DIST = html user.doxygen developer.doxygen html.timestamp
 html: html.timestamp
 
 html.timestamp:
+	cp $(srcdir)/header.html $(srcdir)/footer.html .
 	doxygen user.doxygen
 	touch $@
 
diff --git a/qpid/cpp/examples/CMakeLists.txt b/qpid/cpp/examples/CMakeLists.txt
index a381dbe023..34dfa340ce 100644
--- a/qpid/cpp/examples/CMakeLists.txt
+++ b/qpid/cpp/examples/CMakeLists.txt
@@ -24,7 +24,7 @@ endif(COMMAND cmake_policy)
 
 # This will probably need some fiddling to get right for installed kits.
 get_directory_property(QPIDC_TOP PARENT_DIRECTORY)
-include_directories(${QPIDC_TOP}/src ${CMAKE_CURRENT_BINARY_DIR}/../src/gen)
+include_directories(${QPIDC_TOP}/include ${CMAKE_CURRENT_BINARY_DIR}/../src/gen)
 
 # Shouldn't need this... but there are still client header inclusions of Boost.
 include_directories( ${Boost_INCLUDE_DIR} )
diff --git a/qpid/cpp/examples/makedist.mk b/qpid/cpp/examples/makedist.mk
index 391ddf47e7..9fd4ee6e28 100644
--- a/qpid/cpp/examples/makedist.mk
+++ b/qpid/cpp/examples/makedist.mk
@@ -1,6 +1,6 @@
 # Settings to build the examples in automake
 AM_CXXFLAGS = $(WARNING_CFLAGS)
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/gen -I$(top_builddir)/src -I$(top_builddir)/src/gen
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gen -I$(top_builddir)/src/gen
 CLIENT_LIB=$(top_builddir)/src/libqpidclient.la
 CONSOLE_LIB=$(top_builddir)/src/libqmfconsole.la
 CLIENTFLAGS=-lqpidclient
diff --git a/qpid/cpp/src/qpid/Address.h b/qpid/cpp/include/qpid/Address.h
index a5a4345ba3..fe82b21b9e 100755
--- a/qpid/cpp/src/qpid/Address.h
+++ b/qpid/cpp/include/qpid/Address.h
@@ -63,13 +63,13 @@ public:
 
     /** Get the address of type AddressType.
      *@return AddressType* pointing to the contained address or 0 if
-     *contained address is not of type AddressType.  
+     *contained address is not of type AddressType.
      */
     template <class AddressType> AddressType* get() { return boost::get<AddressType>(&value); }
 
     /** Get the address of type AddressType.
      *@return AddressType* pointing to the contained address or 0 if
-     *contained address is not of type AddressType.  
+     *contained address is not of type AddressType.
      */
     template <class AddressType> const AddressType* get() const { return boost::get<AddressType>(&value); }
 
diff --git a/qpid/cpp/src/qpid/CommonImportExport.h b/qpid/cpp/include/qpid/CommonImportExport.h
index 02c06ed7af..02c06ed7af 100644
--- a/qpid/cpp/src/qpid/CommonImportExport.h
+++ b/qpid/cpp/include/qpid/CommonImportExport.h
diff --git a/qpid/cpp/src/qpid/Exception.h b/qpid/cpp/include/qpid/Exception.h
index 0b0bc33e93..7b937c242a 100644
--- a/qpid/cpp/src/qpid/Exception.h
+++ b/qpid/cpp/include/qpid/Exception.h
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -57,7 +57,7 @@ struct ErrnoException : public Exception {
     ErrnoException(const std::string& msg, int err) : Exception(msg+": "+qpid::sys::strError(err)) {}
     ErrnoException(const std::string& msg) : Exception(msg+": "+qpid::sys::strError(errno)) {}
 };
-    
+
 struct SessionException : public Exception {
     const framing::execution::ErrorCode code;
     SessionException(framing::execution::ErrorCode code_, const std::string& message)
@@ -89,5 +89,5 @@ struct TransportFailure : public Exception {
 };
 
 } // namespace qpid
- 
+
 #endif  /*!_Exception_*/
diff --git a/qpid/cpp/src/qpid/InlineAllocator.h b/qpid/cpp/include/qpid/InlineAllocator.h
index 152c02a299..2502545dcb 100644
--- a/qpid/cpp/src/qpid/InlineAllocator.h
+++ b/qpid/cpp/include/qpid/InlineAllocator.h
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -37,7 +37,7 @@ struct InlineRebind;
  * An allocator that has inline storage for up to Max objects
  * of type BaseAllocator::value_type.
  */
-template <class BaseAllocator, size_t Max> 
+template <class BaseAllocator, size_t Max>
 class InlineAllocator : public BaseAllocator {
   public:
     typedef typename BaseAllocator::pointer pointer;
@@ -46,13 +46,13 @@ class InlineAllocator : public BaseAllocator {
 
     InlineAllocator() : allocated(false) {}
     InlineAllocator(const InlineAllocator& x) : BaseAllocator(x), allocated(false) {}
-    
+
     pointer allocate(size_type n) {
         if (n <= Max && !allocated) {
             allocated=true;
             return reinterpret_cast<value_type*>(address());
         }
-        else 
+        else
             return BaseAllocator::allocate(n, 0);
     }
 
diff --git a/qpid/cpp/src/qpid/InlineVector.h b/qpid/cpp/include/qpid/InlineVector.h
index c23841decd..c55db295f3 100644
--- a/qpid/cpp/src/qpid/InlineVector.h
+++ b/qpid/cpp/include/qpid/InlineVector.h
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -45,7 +45,7 @@ class InlineVector : public std::vector<T, InlineAllocator<Alloc, Max> >
     typedef typename Base::allocator_type allocator_type;
     typedef typename Base::value_type value_type;
     typedef typename Base::size_type size_type;
-    
+
     explicit InlineVector(const allocator_type& a=allocator_type()) : Base(a) {
         this->reserve(Max);
     }
diff --git a/qpid/cpp/src/qpid/Msg.h b/qpid/cpp/include/qpid/Msg.h
index 7214db611f..5149a94d7f 100644
--- a/qpid/cpp/src/qpid/Msg.h
+++ b/qpid/cpp/include/qpid/Msg.h
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/qpid/cpp/src/qpid/Options.h b/qpid/cpp/include/qpid/Options.h
index aeb7a79329..078a6b4d95 100644
--- a/qpid/cpp/src/qpid/Options.h
+++ b/qpid/cpp/include/qpid/Options.h
@@ -43,7 +43,7 @@
 #include <string>
 #include "qpid/CommonImportExport.h"
 
-namespace qpid { 
+namespace qpid {
 namespace po=boost::program_options;
 
 
@@ -106,7 +106,7 @@ inline po::value_semantic* optValue(bool& value) { return po::bool_switch(&value
      ("y", optValue(y, "YUNIT"), "Option Y");
    }
  };
- 
+
  struct MyOptions : public Options {
    bool z;
    vector<string> foo;
@@ -126,7 +126,7 @@ inline po::value_semantic* optValue(bool& value) { return po::bool_switch(&value
    if (error)
      cout << opts << end;       // Help message.
  }
-  
+
  @endcode
  */
 
@@ -137,7 +137,7 @@ inline po::value_semantic* optValue(bool& value) { return po::bool_switch(&value
  *  ---------------------------------------------
  *  Explanation for Boost 103200 conditional code
  *  ---------------------------------------------
- *  
+ *
  *  This boost version has an implementation of the program_options library
  *  that has no provision for allowing unregistered options to pass by.
  *
@@ -145,22 +145,22 @@ inline po::value_semantic* optValue(bool& value) { return po::bool_switch(&value
  *  after start-up, and those modules each have their own set of options,
  *  then if you parse the command line too soon, you will get spurious
  *  reports of unrecognized options -- and the program will exit!
- *  
+ *
  *  And we must process the command-line before module-loading, because we
  *  need to look at the "bootstrap" options.
- *  
+ *
  *  This conditional code:
- *    
- *      1. implements it's own functor class, derived from the Boost 
+ *
+ *      1. implements it's own functor class, derived from the Boost
  *         "options_description_easy_init" class.  This functor is used
- *         to process added options and do the functor chaining, so that 
+ *         to process added options and do the functor chaining, so that
  *         I can snoop on the arguments before doing an explicit call
  *         to its parent.
  *
  *      2. It implements two static vectors, one to hold long names, and
  *         one for short names, so that options declared by modules are
  *         not forgotten when their options_description goes out of scope.
- *  
+ *
  *  I will be thrilled to personally delete this code if we ever decide
  *  that qpid doesn't really need to support this antique version of Boost.
  *
@@ -170,13 +170,13 @@ inline po::value_semantic* optValue(bool& value) { return po::bool_switch(&value
 struct Options;
 
 
-struct 
-options_description_less_easy_init 
-  : public po::options_description_easy_init 
+struct
+options_description_less_easy_init
+  : public po::options_description_easy_init
 {
   options_description_less_easy_init ( Options * my_owner,
-                                       po::options_description * my_parents_owner 
-                                     ) 
+                                       po::options_description * my_parents_owner
+                                     )
     : po::options_description_easy_init(my_parents_owner)
   {
     owner = my_owner;
@@ -220,7 +220,7 @@ struct Options : public po::options_description {
     QPID_COMMON_EXTERN void parse(int argc, char const* const* argv,
                const std::string& configfile=std::string(),
                bool  allowUnknown = false);
-    
+
 
   #if ( BOOST_VERSION == 103200 )
   options_description_less_easy_init m_less_easy;
@@ -229,7 +229,7 @@ struct Options : public po::options_description {
       return m_less_easy;
   }
 
-  bool 
+  bool
   is_registered_option ( std::string s );
 
   void
diff --git a/qpid/cpp/src/qpid/RangeSet.h b/qpid/cpp/include/qpid/RangeSet.h
index 1ba4fbbcef..1b2e4201a6 100644
--- a/qpid/cpp/src/qpid/RangeSet.h
+++ b/qpid/cpp/include/qpid/RangeSet.h
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -39,7 +39,7 @@ template <class T>
 class Range {
   public:
     static Range makeClosed(const T& first, T last) { return Range(first, ++last); }
-    
+
     Range() : begin_(), end_() {}
     explicit Range(const T& t) : begin_(t), end_(t) { ++end_; }
     Range(const T& b, const T& e) : begin_(b), end_(e) { assert(b <= e); }
@@ -81,7 +81,7 @@ class Range {
     operator bool() const { return !empty(); }
 
     template <class S> void serialize(S& s) { s(begin_)(end_); }
-        
+
   private:
     T begin_, end_;
 };
@@ -101,7 +101,7 @@ class RangeSet
     typedef InlineVector<Range<T>, 3> Ranges; // TODO aconway 2008-04-21: what's the optimial inlined value?
 
   public:
-    
+
     class iterator : public boost::iterator_facade<
         iterator,
         const T,
@@ -109,12 +109,12 @@ class RangeSet
     {
       public:
         iterator() : ranges(), iter(), value() {}
-    
+
       private:
         typedef typename Ranges::const_iterator RangesIter;
         iterator(const Ranges& r, const RangesIter& i, const T& t)
             : ranges(&r), iter(i), value(t) {}
-        
+
         void increment();
         bool equal(const iterator& i) const;
         const T& dereference() const { return value; }
@@ -128,11 +128,11 @@ class RangeSet
     };
 
     typedef iterator const_iterator;
-    
+
     RangeSet() {}
     explicit RangeSet(const Range<T>& r) { *this += r; }
     RangeSet(const T& a, const T& b) { *this += Range<T>(a,b); }
-    
+
     bool contiguous() const { return ranges.size() <= 1; }
 
     bool contains(const T& t) const;
@@ -176,7 +176,7 @@ class RangeSet
     size_t size() const;
     bool empty() const { return ranges.empty(); }
     void clear() { ranges.clear(); }
-    
+
     /** Return the largest contiguous range containing x.
      * Returns the empty range [x,x) if x is not in the set.
      */
@@ -185,7 +185,7 @@ class RangeSet
     template <class S> void serialize(S& s) { s.split(*this); s(ranges.begin(), ranges.end()); }
     template <class S> void encode(S& s) const { s(uint16_t(ranges.size()*sizeof(Range<T>))); }
     template <class S> void decode(S& s) { uint16_t sz; s(sz); ranges.resize(sz/sizeof(Range<T>)); }
-    
+
  private:
     static size_t accumulateSize(size_t s, const Range<T>& r) { return s+r.size(); }
     Ranges ranges;
@@ -226,7 +226,7 @@ template <class T> void RangeSet<T>::addRange(const Range<T>& r) {
     if (r.empty()) return;
     typename Ranges::iterator i =
         std::lower_bound(ranges.begin(), ranges.end(), r);
-    if (i == ranges.end() || !i->touching(r)) 
+    if (i == ranges.end() || !i->touching(r))
         ranges.insert(i, r);
     else {
         i->merge(r);
@@ -241,7 +241,7 @@ template <class T> void RangeSet<T>::addRange(const Range<T>& r) {
 
 template <class T> void RangeSet<T>::addSet(const RangeSet<T>& s) {
     typedef RangeSet<T>& (RangeSet<T>::*RangeSetRangeOp)(const Range<T>&);
-    std::for_each(s.ranges.begin(), s.ranges.end(), 
+    std::for_each(s.ranges.begin(), s.ranges.end(),
                   boost::bind((RangeSetRangeOp)&RangeSet<T>::operator+=, this, _1));
 }
 
@@ -288,7 +288,7 @@ template <class T> void RangeSet<T>::iterator::increment() {
         ++iter;
         if (iter == ranges->end())
             *this=iterator();   // end() iterator
-        else 
+        else
             value=iter->begin();
     }
 }
diff --git a/qpid/cpp/src/qpid/SessionId.h b/qpid/cpp/include/qpid/SessionId.h
index bf52f9856b..e18b360999 100644
--- a/qpid/cpp/src/qpid/SessionId.h
+++ b/qpid/cpp/include/qpid/SessionId.h
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -30,10 +30,10 @@ namespace qpid {
 
 /** Identifier for a session.
  * There are two parts to a session identifier:
- * 
+ *
  * getUserId() returns the authentication principal associated with
  * the session's connection.
- * 
+ *
  * getName() returns the session name.
  *
  * The name must be unique among sessions with the same authentication
diff --git a/qpid/cpp/src/qpid/Url.h b/qpid/cpp/include/qpid/Url.h
index 353eac28f3..d0f4bb0c22 100644
--- a/qpid/cpp/src/qpid/Url.h
+++ b/qpid/cpp/include/qpid/Url.h
@@ -48,7 +48,7 @@ struct Url : public std::vector<Address> {
 
     /** Empty URL. */
     Url() {}
-    
+
     /** URL containing a single address */
     explicit Url(const Address& addr) { push_back(addr); }
 
@@ -61,7 +61,7 @@ struct Url : public std::vector<Address> {
     Url& operator=(const Url& u) { this->std::vector<Address>::operator=(u); cache=u.cache; return *this; }
     Url& operator=(const char* s) { parse(s); return *this; }
     Url& operator=(const std::string& s) { parse(s); return *this; }
-    
+
     /** Throw Invalid if the URL does not contain any addresses. */
     QPID_COMMON_EXTERN void throwIfEmpty() const;
 
diff --git a/qpid/cpp/src/qpid/agent/ManagementAgent.h b/qpid/cpp/include/qpid/agent/ManagementAgent.h
index 4dc4f0e895..1a8d0c4025 100644
--- a/qpid/cpp/src/qpid/agent/ManagementAgent.h
+++ b/qpid/cpp/include/qpid/agent/ManagementAgent.h
@@ -9,9 +9,9 @@
 // to you under the Apache License, Version 2.0 (the
 // "License"); you may not use this file except in compliance
 // with the License.  You may obtain a copy of the License at
-// 
+//
 //   http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing,
 // software distributed under the License is distributed on an
 // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -27,7 +27,7 @@
 #include "qpid/sys/Mutex.h"
 #include "qpid/client/ConnectionSettings.h"
 
-namespace qpid { 
+namespace qpid {
 namespace management {
 
 class ManagementAgent
diff --git a/qpid/cpp/src/qpid/agent/QmfAgentImportExport.h b/qpid/cpp/include/qpid/agent/QmfAgentImportExport.h
index 9eee4a18fd..9eee4a18fd 100644
--- a/qpid/cpp/src/qpid/agent/QmfAgentImportExport.h
+++ b/qpid/cpp/include/qpid/agent/QmfAgentImportExport.h
diff --git a/qpid/cpp/src/qpid/client/AsyncSession.h b/qpid/cpp/include/qpid/client/AsyncSession.h
index 150aabe191..d91efeb4f1 100644
--- a/qpid/cpp/src/qpid/client/AsyncSession.h
+++ b/qpid/cpp/include/qpid/client/AsyncSession.h
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/qpid/cpp/src/qpid/client/ClientImportExport.h b/qpid/cpp/include/qpid/client/ClientImportExport.h
index 3b311655ab..42b02e33c3 100644
--- a/qpid/cpp/src/qpid/client/ClientImportExport.h
+++ b/qpid/cpp/include/qpid/client/ClientImportExport.h
@@ -27,7 +27,7 @@
 #define QPID_CLIENT_EXTERN __declspec(dllimport)
 #endif
 #else
-#define QPID_CLIENT_EXTERN 
+#define QPID_CLIENT_EXTERN
 #endif
 
 #endif
diff --git a/qpid/cpp/src/qpid/client/Completion.h b/qpid/cpp/include/qpid/client/Completion.h
index 73b22119fd..99d940f031 100644
--- a/qpid/cpp/src/qpid/client/Completion.h
+++ b/qpid/cpp/include/qpid/client/Completion.h
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -32,7 +32,7 @@ namespace client {
 class CompletionImpl;
 template <class T> class PrivateImplRef;
 
-/** 
+/**
  * Asynchronous commands that do not return a result will return a
  * Completion. You can use the completion to wait for that specific
  * command to complete.
diff --git a/qpid/cpp/src/qpid/client/Connection.h b/qpid/cpp/include/qpid/client/Connection.h
index 1671462c58..b7b967d232 100644
--- a/qpid/cpp/src/qpid/client/Connection.h
+++ b/qpid/cpp/include/qpid/client/Connection.h
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -40,7 +40,7 @@ class ConnectionImpl;
  * Represents a connection to an AMQP broker. All communication is
  * initiated by establishing a connection, then creating one or more
  * Session objects using the connection. @see newSession()
- * 
+ *
  * \ingroup clientapi
  *
  */
@@ -66,31 +66,31 @@ class Connection
 
     /**
      * Opens a connection to a broker.
-     * 
+     *
      * @param host the host on which the broker is running.
-     * 
+     *
      * @param port the port on the which the broker is listening.
-     * 
+     *
      * @param uid the userid to connect with.
-     * 
+     *
      * @param pwd the password to connect with (currently SASL
      * PLAIN is the only authentication method supported so this
      * is sent in clear text).
-     * 
+     *
      * @param virtualhost the AMQP virtual host to use (virtual
      * hosts, where implemented(!), provide namespace partitioning
      * within a single broker).
      */
-    QPID_CLIENT_EXTERN void open(const std::string& host, int port = 5672, 
+    QPID_CLIENT_EXTERN void open(const std::string& host, int port = 5672,
               const std::string& uid = "guest",
-              const std::string& pwd = "guest", 
+              const std::string& pwd = "guest",
               const std::string& virtualhost = "/", uint16_t maxFrameSize=65535);
 
     /**
      * Opens a connection to a broker using a URL.
      * If the URL contains multiple addresses, try each in turn
      * till connection is successful.
-     * 
+     *
      * @url address of the broker to connect to.
      *
      * @param uid the userid to connect with.
@@ -98,21 +98,21 @@ class Connection
      * @param pwd the password to connect with (currently SASL
      * PLAIN is the only authentication method supported so this
      * is sent in clear text).
-     * 
+     *
      * @param virtualhost the AMQP virtual host to use (virtual
      * hosts, where implemented(!), provide namespace partitioning
      * within a single broker).
      */
     QPID_CLIENT_EXTERN void open(const Url& url,
               const std::string& uid = "guest",
-              const std::string& pwd = "guest", 
+              const std::string& pwd = "guest",
               const std::string& virtualhost = "/", uint16_t maxFrameSize=65535);
 
     /**
      * Opens a connection to a broker using a URL.
      * If the URL contains multiple addresses, try each in turn
      * till connection is successful.
-     * 
+     *
      * @url address of the broker to connect to.
      *
      * @param settings used for any settings not provided by the URL.
@@ -122,7 +122,7 @@ class Connection
 
     /**
      * Opens a connection to a broker.
-     * 
+     *
      * @param the settings to use (host, port etc). @see ConnectionSettings.
      */
     QPID_CLIENT_EXTERN void open(const ConnectionSettings& settings);
@@ -148,7 +148,7 @@ class Connection
      *
      * AsyncSession provides asynchronous versions of the same
      * functions.  These functions send a command to the broker but do
-     * not wait for a response. 
+     * not wait for a response.
      *
      * You can convert a Session s into an AsyncSession as follows:
      * @code
@@ -161,7 +161,7 @@ class Connection
      * @code
      *  async(s).messageTransfer(...);
      * @endcode
-     * 
+     *
      * Using an AsyncSession is faster for sending large numbers of
      * commands, since each command is sent as soon as possible
      * without waiting for the previous command to be confirmed.
diff --git a/qpid/cpp/src/qpid/client/ConnectionSettings.h b/qpid/cpp/include/qpid/client/ConnectionSettings.h
index 71fef219b4..46053e1fa8 100644
--- a/qpid/cpp/src/qpid/client/ConnectionSettings.h
+++ b/qpid/cpp/include/qpid/client/ConnectionSettings.h
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/qpid/cpp/src/qpid/client/FailoverManager.h b/qpid/cpp/include/qpid/client/FailoverManager.h
index 581989c46a..d50fcff8bb 100644
--- a/qpid/cpp/src/qpid/client/FailoverManager.h
+++ b/qpid/cpp/include/qpid/client/FailoverManager.h
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -33,7 +33,7 @@
 namespace qpid {
 namespace client {
 
-struct CannotConnectException : qpid::Exception 
+struct CannotConnectException : qpid::Exception
 {
     CannotConnectException(const std::string& m) : qpid::Exception(m) {}
 };
@@ -79,7 +79,7 @@ class FailoverManager
 
     /**
      * Create a manager to control failover for a logical connection.
-     * 
+     *
      * @param settings the initial connection settings
      * @param strategy optional stratgey callback allowing application
      * to edit or reorder the list of urls to which reconnection is
@@ -92,7 +92,7 @@ class FailoverManager
      * known brokers from the last connection will be used. If no list
      * is specified and this is the first connect attempt, the host
      * and port from the initial settings will be used.
-     * 
+     *
      * If the full list is tried and all attempts fail,
      * CannotConnectException is thrown.
      */
@@ -110,7 +110,7 @@ class FailoverManager
      * a session on which to carry out the work of the command,
      * handling failover occuring while exeuting that command and
      * re-starting the work.
-     * 
+     *
      * Multiple concurrent threads can call execute with different
      * commands; each thread will be allocated its own
      * session. FailoverManager will coordinate the different threads
diff --git a/qpid/cpp/src/qpid/client/FlowControl.h b/qpid/cpp/include/qpid/client/FlowControl.h
index d2205aaa78..bff7071b3b 100644
--- a/qpid/cpp/src/qpid/client/FlowControl.h
+++ b/qpid/cpp/include/qpid/client/FlowControl.h
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -50,7 +50,7 @@ struct FlowControl {
     static const uint32_t UNLIMITED=0xFFFFFFFF;
     FlowControl(uint32_t messages_=0, uint32_t bytes_=0, bool window_=false)
         : messages(messages_), bytes(bytes_), window(window_) {}
-    
+
     static FlowControl messageCredit(uint32_t messages_) { return FlowControl(messages_,UNLIMITED,false); }
     static FlowControl messageWindow(uint32_t messages_) { return FlowControl(messages_,UNLIMITED,true); }
     static FlowControl byteCredit(uint32_t bytes_) { return FlowControl(UNLIMITED,bytes_,false); }
diff --git a/qpid/cpp/src/qpid/client/Future.h b/qpid/cpp/include/qpid/client/Future.h
index 29d9044894..09088e68f6 100644
--- a/qpid/cpp/src/qpid/client/Future.h
+++ b/qpid/cpp/include/qpid/client/Future.h
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -41,8 +41,8 @@ class Future
     bool complete;
 
 public:
-    Future() : complete(false) {}    
-    Future(const framing::SequenceNumber& id) : command(id), complete(false) {}    
+    Future() : complete(false) {}
+    Future(const framing::SequenceNumber& id) : command(id), complete(false) {}
 
     std::string getResult(SessionImpl& session) {
         if (result) return result->getResult(session);
diff --git a/qpid/cpp/src/qpid/client/FutureCompletion.h b/qpid/cpp/include/qpid/client/FutureCompletion.h
index 4248ddeab8..0970f494b7 100644
--- a/qpid/cpp/src/qpid/client/FutureCompletion.h
+++ b/qpid/cpp/include/qpid/client/FutureCompletion.h
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -29,7 +29,7 @@ namespace qpid {
 namespace client {
 
 ///@internal
-class FutureCompletion 
+class FutureCompletion
 {
 protected:
     mutable sys::Monitor lock;
diff --git a/qpid/cpp/src/qpid/client/FutureResult.h b/qpid/cpp/include/qpid/client/FutureResult.h
index 1466378711..b2b663daa1 100644
--- a/qpid/cpp/src/qpid/client/FutureResult.h
+++ b/qpid/cpp/include/qpid/client/FutureResult.h
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -34,7 +34,7 @@ namespace client {
 class SessionImpl;
 
 ///@internal
-class FutureResult : public FutureCompletion 
+class FutureResult : public FutureCompletion
 {
     std::string result;
 public:
diff --git a/qpid/cpp/src/qpid/client/Handle.h b/qpid/cpp/include/qpid/client/Handle.h
index 41ead78eb7..088e836fcf 100644
--- a/qpid/cpp/src/qpid/client/Handle.h
+++ b/qpid/cpp/include/qpid/client/Handle.h
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -32,7 +32,7 @@ template <class> class PrivateImplRef;
 /**
  * A handle is like a pointer: refers to an underlying implementation object.
  * Copying the handle does not copy the object.
- * 
+ *
  * Handles can be null,  like a 0 pointer. Use isValid(), isNull() or the
  * conversion to bool to test for a null handle.
  */
@@ -52,7 +52,7 @@ template <class T> class Handle {
     QPID_CLIENT_EXTERN bool operator !() const { return !impl; }
 
     void swap(Handle<T>& h) { T* t = h.impl; h.impl = impl; impl = t; }
-    
+
   protected:
     typedef T Impl;
     QPID_CLIENT_EXTERN Handle() :impl() {}
diff --git a/qpid/cpp/src/qpid/client/LocalQueue.h b/qpid/cpp/include/qpid/client/LocalQueue.h
index a584f74f05..70e4cebcf1 100644
--- a/qpid/cpp/src/qpid/client/LocalQueue.h
+++ b/qpid/cpp/include/qpid/client/LocalQueue.h
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -51,7 +51,7 @@ template <class T> class PrivateImplRef;
  *   std::cout &lt;&lt; message.getData() &lt;&lt; std::endl;
  * }
  * </pre>
- * 
+ *
  * <h2>Getting Messages</h2>
  *
  * <ul><li>
@@ -61,7 +61,7 @@ template <class T> class PrivateImplRef;
  *#include <qpid/sys/Time.h>
  *Message message;
  *local_queue.get(message, 5*sys::TIME_SEC);</pre></li></ul>
- * 
+ *
  * <h2>Checking size</h2>
  * <ul><li>
  * <p>empty()</p>
@@ -85,7 +85,7 @@ class LocalQueue : public Handle<LocalQueueImpl> {
 
     /** Wait up to timeout for the next message from the local queue.
      *@param result Set to the message from the queue.
-     *@param timeout wait up this timeout for a message to appear. 
+     *@param timeout wait up this timeout for a message to appear.
      *@return true if result was set, false if queue was empty after timeout.
      */
     QPID_CLIENT_EXTERN bool get(Message& result, sys::Duration timeout=0);
diff --git a/qpid/cpp/src/qpid/client/Message.h b/qpid/cpp/include/qpid/client/Message.h
index 3a6f1814cd..2401cbdc92 100644
--- a/qpid/cpp/src/qpid/client/Message.h
+++ b/qpid/cpp/include/qpid/client/Message.h
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -42,12 +42,12 @@ class MessageImpl;
  * A message sent to or received from the broker.
  *
  * \ingroup clientapi
- * \details 
- * 
+ * \details
+ *
  * <h2>Getting and setting message contents</h2>
  *
  * <ul>
- * <li> 
+ * <li>
  * <p>getData()</p>
  * <pre>std::cout &lt;&lt; "Response: " &lt;&lt; message.getData() &lt;&lt; std::endl;</pre>
  * </li>
@@ -58,9 +58,9 @@ class MessageImpl;
  * <p>appendData()</p>
  * <pre>message.appendData(" ... let's add a bit more ...");</pre></li>
  * </ul>
- * 
+ *
  * <h2>Getting and Setting Delivery Properties</h2>
- * 
+ *
  * <ul>
  * <li>
  * <p>getDeliveryProperties()</p>
@@ -68,16 +68,16 @@ class MessageImpl;
  * <pre>message.getDeliveryProperties().setDeliveryMode(PERSISTENT);</pre>
  * <pre>message.getDeliveryProperties().setPriority(9);</pre>
  * <pre>message.getDeliveryProperties().setTtl(100);</pre></li>
- * 
+ *
  * <li>
  * <p>hasDeliveryProperties()</p>
  * <pre>if (! message.hasDeliveryProperties()) {
  *  ...
  *}</pre></li>
  * </ul>
- * 
+ *
  * <h2>Getting and Setting Message Properties</h2>
- * 
+ *
  * <ul>
  * <li>
  * <p>getMessageProperties()</p>
@@ -96,9 +96,9 @@ class MessageImpl;
  * <pre>request.getMessageProperties().hasReplyTo();</pre>
  * </li>
  * </ul>
- * 
+ *
  * <h2>Getting and Setting Application Headers</h2>
- * 
+ *
  * <ul>
  * <li>
  * <p>getHeaders()</p>
@@ -109,8 +109,8 @@ class MessageImpl;
  *message.getHeaders().setString("control","continue");
  * </pre></li>
  * </ul>
- * 
- * 
+ *
+ *
  */
 class Message
 {
@@ -142,7 +142,7 @@ public:
     QPID_CLIENT_EXTERN framing::DeliveryProperties& getDeliveryProperties();
     QPID_CLIENT_EXTERN const framing::DeliveryProperties& getDeliveryProperties() const;
 
-    
+
     /** The destination of messages sent to the broker is the exchange
      * name.  The destination of messages received from the broker is
      * the delivery tag identifyig the local subscription (often this
diff --git a/qpid/cpp/src/qpid/client/MessageListener.h b/qpid/cpp/include/qpid/client/MessageListener.h
index c8e34eebb8..d200f8cf21 100644
--- a/qpid/cpp/src/qpid/client/MessageListener.h
+++ b/qpid/cpp/include/qpid/client/MessageListener.h
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -34,12 +34,12 @@ namespace client {
      * the SubscriptionManager to receive messages.
      *
      * Another way to receive messages is by using a LocalQueue.
-     * 
+     *
      * \ingroup clientapi
-     * \details 
+     * \details
      *
      * <h2>Using a MessageListener</h2>
-     * 
+     *
      * <ul>
      * <li>
      * <p>The received() function is called when a message arrives:</p>
@@ -55,10 +55,10 @@ namespace client {
      *    Listener(SubscriptionManager&amp; subscriptions);
      *    virtual void received(Message&amp; message);
      * };
-     * 
+     *
      * Listener::Listener(SubscriptionManager&amp; subs) : subscriptions(subs)
      * {}
-     * 
+     *
      * void Listener::received(Message&amp; message) {
      *   std::cout &lt;&lt; "Message: " &lt;&lt; message.getData() &lt;&lt; std::endl;
      *   if (message.getData() == "That's all, folks!") {
@@ -70,18 +70,18 @@ namespace client {
      *</pre>
      * <pre>
      * SubscriptionManager subscriptions(session);
-     * 
+     *
      * // Create a listener and subscribe it to the queue named "message_queue"
      * Listener listener(subscriptions);
      * subscriptions.subscribe(listener, "message_queue");
-     * 
+     *
      * // Receive messages until the subscription is cancelled
      * // by Listener::received()
      * subscriptions.run();
      * </pre>
      * </li>
      * </ul>
-     * 
+     *
      */
 
     class MessageListener{
diff --git a/qpid/cpp/src/qpid/client/MessageReplayTracker.h b/qpid/cpp/include/qpid/client/MessageReplayTracker.h
index 657ea07193..6f5a0f4ac3 100644
--- a/qpid/cpp/src/qpid/client/MessageReplayTracker.h
+++ b/qpid/cpp/include/qpid/client/MessageReplayTracker.h
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/qpid/cpp/src/qpid/client/QueueOptions.h b/qpid/cpp/include/qpid/client/QueueOptions.h
index 702fc80656..9418cb092d 100644
--- a/qpid/cpp/src/qpid/client/QueueOptions.h
+++ b/qpid/cpp/include/qpid/client/QueueOptions.h
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -40,10 +40,10 @@ class QueueOptions: public framing::FieldTable
   public:
     QPID_CLIENT_EXTERN QueueOptions();
     QPID_CLIENT_EXTERN virtual ~QueueOptions();
-	
+
     /**
      * Sets the queue sizing policy
-     * 
+     *
      * @param sp SizePolicy
      * REJECT - reject if queue greater than size/count
      * FLOW_TO_DISK - page messages to disk from this point is greater than size/count
@@ -60,30 +60,30 @@ class QueueOptions: public framing::FieldTable
      * node. Does so optimistically. Will start persisting when cluster count >1 again.
      */
     QPID_CLIENT_EXTERN void setPersistLastNode();
-	
+
     /**
      * Sets the odering policy on the Queue, default ordering is FIFO.
      */
     QPID_CLIENT_EXTERN void setOrdering(QueueOrderingPolicy op);
-    
+
     /**
      * Use broker defualt sizing ploicy
      */
     QPID_CLIENT_EXTERN void clearSizePolicy();
-	
+
     /**
      * Clear Persist Last Node Policy
-     */ 
+     */
     QPID_CLIENT_EXTERN void clearPersistLastNode();
-	
+
     /**
-     * get the key used match LVQ in args for message transfer 
+     * get the key used match LVQ in args for message transfer
      */
     QPID_CLIENT_EXTERN void getLVQKey(std::string& key);
-		
+
     /**
      * Use default odering policy
-     */ 
+     */
     QPID_CLIENT_EXTERN void clearOrdering();
 
     /**
@@ -92,7 +92,7 @@ class QueueOptions: public framing::FieldTable
      * processed by a regsitered broker plugin.
      */
     QPID_CLIENT_EXTERN void enableQueueEvents(bool enqueueOnly);
-	
+
     static QPID_CLIENT_EXTERN const std::string strMaxCountKey;
     static QPID_CLIENT_EXTERN const std::string strMaxSizeKey;
     static QPID_CLIENT_EXTERN const std::string strTypeKey;
diff --git a/qpid/cpp/src/qpid/client/Session.h b/qpid/cpp/include/qpid/client/Session.h
index bdabd26c82..c40549bbc5 100644
--- a/qpid/cpp/src/qpid/client/Session.h
+++ b/qpid/cpp/include/qpid/client/Session.h
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/qpid/cpp/src/qpid/client/SessionBase_0_10.h b/qpid/cpp/include/qpid/client/SessionBase_0_10.h
index 8438977e45..afa458bcee 100644
--- a/qpid/cpp/src/qpid/client/SessionBase_0_10.h
+++ b/qpid/cpp/include/qpid/client/SessionBase_0_10.h
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -50,7 +50,7 @@ enum CreditUnit { MESSAGE_CREDIT=0, BYTE_CREDIT=1, UNLIMITED_CREDIT=0xFFFFFFFF }
 
 /**
  * Base class for handles to an AMQP session.
- * 
+ *
  * Subclasses provide the AMQP commands for a given
  * version of the protocol.
  */
@@ -62,13 +62,13 @@ class SessionBase_0_10 {
     QPID_CLIENT_EXTERN ~SessionBase_0_10();
 
     /** Get the session ID */
-    QPID_CLIENT_EXTERN SessionId getId() const;         
+    QPID_CLIENT_EXTERN SessionId getId() const;
 
     /** Close the session.
      * A session is automatically closed when all handles to it are destroyed.
      */
     QPID_CLIENT_EXTERN void close();
-    
+
     /**
      * Synchronize the session: sync() waits until all commands issued
      * on this session so far have been completed by the broker.
diff --git a/qpid/cpp/src/qpid/client/Subscription.h b/qpid/cpp/include/qpid/client/Subscription.h
index 83a9be5e14..425b6b92e2 100644
--- a/qpid/cpp/src/qpid/client/Subscription.h
+++ b/qpid/cpp/include/qpid/client/Subscription.h
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -45,8 +45,8 @@ class Subscription : public Handle<SubscriptionImpl> {
     QPID_CLIENT_EXTERN Subscription(const Subscription&);
     QPID_CLIENT_EXTERN ~Subscription();
     QPID_CLIENT_EXTERN Subscription& operator=(const Subscription&);
-    
-    
+
+
     /** The name of the subscription, used as the "destination" for messages from the broker.
      * Usually the same as the queue name but can be set differently.
      */
diff --git a/qpid/cpp/src/qpid/client/SubscriptionManager.h b/qpid/cpp/include/qpid/client/SubscriptionManager.h
index 2df8a8d0ca..632efe0f70 100644
--- a/qpid/cpp/src/qpid/client/SubscriptionManager.h
+++ b/qpid/cpp/include/qpid/client/SubscriptionManager.h
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -39,18 +39,18 @@ class SubscriptionManagerImpl;
 
 /**
  * A class to help create and manage subscriptions.
- * 
+ *
  * Set up your subscriptions, then call run() to have messages
  * delivered.
- *  
+ *
  * \ingroup clientapi
  *
  * \details
- * 
+ *
  * <h2>Subscribing and canceling subscriptions</h2>
  *
  * <ul>
- * <li> 
+ * <li>
  * <p>subscribe()</p>
  * <pre> SubscriptionManager subscriptions(session);
  * Listener listener(subscriptions);
@@ -62,11 +62,11 @@ class SubscriptionManagerImpl;
  * <p>cancel()</p>
  * <pre>subscriptions.cancel();</pre></li>
  * </ul>
- * 
+ *
  * <h2>Waiting for messages (and returning)</h2>
  *
  * <ul>
- * <li> 
+ * <li>
  * <p>run()</p>
  * <pre> // Give up control to receive messages
  * subscriptions.run();</pre></li>
@@ -84,7 +84,7 @@ class SubscriptionManagerImpl;
  * <p>Ending a subscription in a listener</p>
  * <pre>
  * void Listener::received(Message&amp; message) {
- * 
+ *
  *  if (message.getData() == "That's all, folks!") {
  *       subscriptions.cancel(message.getDestination());
  *   }
@@ -92,7 +92,7 @@ class SubscriptionManagerImpl;
  * </pre>
  * </li>
  * </ul>
- * 
+ *
  */
 class SubscriptionManager : public sys::Runnable, public Handle<SubscriptionManagerImpl>
 {
@@ -102,13 +102,13 @@ class SubscriptionManager : public sys::Runnable, public Handle<SubscriptionMana
     QPID_CLIENT_EXTERN SubscriptionManager(const SubscriptionManager&);
     QPID_CLIENT_EXTERN ~SubscriptionManager();
     QPID_CLIENT_EXTERN SubscriptionManager& operator=(const SubscriptionManager&);
-    
+
     /**
      * Subscribe a MessagesListener to receive messages from queue.
      *
      * Provide your own subclass of MessagesListener to process
      * incoming messages. It will be called for each message received.
-     * 
+     *
      *@param listener Listener object to receive messages.
      *@param queue Name of the queue to subscribe to.
      *@param settings settings for the subscription.
@@ -121,9 +121,9 @@ class SubscriptionManager : public sys::Runnable, public Handle<SubscriptionMana
 
     /**
      * Subscribe a LocalQueue to receive messages from queue.
-     * 
+     *
      * Incoming messages are stored in the queue for you to retrieve.
-     * 
+     *
      *@param queue Name of the queue to subscribe to.
      *@param flow initial FlowControl for the subscription.
      *@param name unique destination name for the subscription, defaults to queue name.
@@ -139,7 +139,7 @@ class SubscriptionManager : public sys::Runnable, public Handle<SubscriptionMana
      *
      * Provide your own subclass of MessagesListener to process
      * incoming messages. It will be called for each message received.
-     * 
+     *
      *@param listener Listener object to receive messages.
      *@param queue Name of the queue to subscribe to.
      *@param name unique destination name for the subscription, defaults to queue name.
@@ -151,9 +151,9 @@ class SubscriptionManager : public sys::Runnable, public Handle<SubscriptionMana
 
     /**
      * Subscribe a LocalQueue to receive messages from queue.
-     * 
+     *
      * Incoming messages are stored in the queue for you to retrieve.
-     * 
+     *
      *@param queue Name of the queue to subscribe to.
      *@param name unique destination name for the subscription, defaults to queue name.
      * If not specified, the queue name is used.
@@ -165,13 +165,13 @@ class SubscriptionManager : public sys::Runnable, public Handle<SubscriptionMana
 
     /** Get a single message from a queue.
      *@param result is set to the message from the queue.
-     *@param timeout wait up this timeout for a message to appear. 
+     *@param timeout wait up this timeout for a message to appear.
      *@return true if result was set, false if no message available after timeout.
      */
     QPID_CLIENT_EXTERN bool get(Message& result, const std::string& queue, sys::Duration timeout=0);
 
     /** Get a single message from a queue.
-     *@param timeout wait up this timeout for a message to appear. 
+     *@param timeout wait up this timeout for a message to appear.
      *@return message from the queue.
      *@throw Exception if the timeout is exceeded.
      */
@@ -181,7 +181,7 @@ class SubscriptionManager : public sys::Runnable, public Handle<SubscriptionMana
      *@throw Exception if not found.
      */
     QPID_CLIENT_EXTERN Subscription getSubscription(const std::string& name) const;
-    
+
     /** Cancel a subscription. See also: Subscription.cancel() */
     QPID_CLIENT_EXTERN void cancel(const std::string& name);
 
@@ -201,7 +201,7 @@ class SubscriptionManager : public sys::Runnable, public Handle<SubscriptionMana
      * Wait for the thread started by a call to start() to complete.
      */
     QPID_CLIENT_EXTERN void wait();
-    
+
     /** If set true, run() will stop when all subscriptions
      * are cancelled. If false, run will only stop when stop()
      * is called. True by default.
diff --git a/qpid/cpp/src/qpid/client/SubscriptionSettings.h b/qpid/cpp/include/qpid/client/SubscriptionSettings.h
index ade539b376..4d64119d3a 100644
--- a/qpid/cpp/src/qpid/client/SubscriptionSettings.h
+++ b/qpid/cpp/include/qpid/client/SubscriptionSettings.h
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -47,7 +47,7 @@ struct SubscriptionSettings
         unsigned int autoAck_=1,
         CompletionMode completion=COMPLETE_ON_DELIVERY
     ) : flowControl(flow), acceptMode(accept), acquireMode(acquire), autoAck(autoAck_), completionMode(completion), exclusive(false) {}
-                         
+
     FlowControl flowControl;    ///@< Flow control settings. @see FlowControl
     AcceptMode acceptMode;      ///@< ACCEPT_MODE_EXPLICIT or ACCEPT_MODE_NONE
     AcquireMode acquireMode;    ///@< ACQUIRE_MODE_PRE_ACQUIRED or ACQUIRE_MODE_NOT_ACQUIRED
@@ -62,7 +62,7 @@ struct SubscriptionSettings
      * credit used up by that message to be reallocated. The
      * subscriptions completion mode controls how completion is
      * managed.
-     * 
+     *
      * If set to COMPLETE_ON_DELIVERY (which is the default), messages
      * will be marked as completed once they have been received. The
      * server will be explicitly notified of all completed messages
@@ -70,12 +70,12 @@ struct SubscriptionSettings
      * subscription (either explictly or through autAck). However the
      * server may also periodically request information on the
      * completed messages.
-     * 
+     *
      * If set to COMPLETE_ON_ACCEPT, messages will be marked as
      * completed once they are accepted (via the Subscription class)
      * and the server will also be notified of all completed messages
      * for the session.
-     * 
+     *
      * If set to MANUAL_COMPLETION the application is responsible for
      * completing messages (@see Session::markCompleted()).
      */
diff --git a/qpid/cpp/src/qpid/client/TypedResult.h b/qpid/cpp/include/qpid/client/TypedResult.h
index 0eac96c9c3..8e1a16580c 100644
--- a/qpid/cpp/src/qpid/client/TypedResult.h
+++ b/qpid/cpp/include/qpid/client/TypedResult.h
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -45,7 +45,7 @@ public:
     /**
      * Wait for the asynchronous command that returned this TypedResult to complete
      * and return its result.
-     * 
+     *
      *@return The result returned by the command.
      *@exception If the command returns an error, get() throws an exception.
      *
diff --git a/qpid/cpp/src/qpid/console/Agent.h b/qpid/cpp/include/qpid/console/Agent.h
index e9cd2abc22..97d75da250 100644
--- a/qpid/cpp/src/qpid/console/Agent.h
+++ b/qpid/cpp/include/qpid/console/Agent.h
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/qpid/cpp/src/qpid/console/Broker.h b/qpid/cpp/include/qpid/console/Broker.h
index 6aebdf0493..af163b8bfd 100644
--- a/qpid/cpp/src/qpid/console/Broker.h
+++ b/qpid/cpp/include/qpid/console/Broker.h
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -54,7 +54,7 @@ namespace console {
         QPID_CONSOLE_EXTERN Broker(SessionManager& sm,
                                    client::ConnectionSettings& settings);
         QPID_CONSOLE_EXTERN ~Broker();
-        
+
         bool isConnected() const { return connected; }
         const std::string& getError() const { return error; }
         const std::string& getSessionId() const { return amqpSessionId; }
diff --git a/qpid/cpp/src/qpid/console/ClassKey.h b/qpid/cpp/include/qpid/console/ClassKey.h
index bfbcb6a059..95cd2627f1 100644
--- a/qpid/cpp/src/qpid/console/ClassKey.h
+++ b/qpid/cpp/include/qpid/console/ClassKey.h
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/qpid/cpp/src/qpid/console/ConsoleImportExport.h b/qpid/cpp/include/qpid/console/ConsoleImportExport.h
index 5ef8a892b1..c2d7cb3a14 100644
--- a/qpid/cpp/src/qpid/console/ConsoleImportExport.h
+++ b/qpid/cpp/include/qpid/console/ConsoleImportExport.h
@@ -27,7 +27,7 @@
 #define QPID_CONSOLE_EXTERN __declspec(dllimport)
 #endif
 #else
-#define QPID_CONSOLE_EXTERN 
+#define QPID_CONSOLE_EXTERN
 #endif
 
 #endif
diff --git a/qpid/cpp/src/qpid/console/ConsoleListener.h b/qpid/cpp/include/qpid/console/ConsoleListener.h
index bd87390e99..7a649da657 100644
--- a/qpid/cpp/src/qpid/console/ConsoleListener.h
+++ b/qpid/cpp/include/qpid/console/ConsoleListener.h
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/qpid/cpp/src/qpid/console/Event.h b/qpid/cpp/include/qpid/console/Event.h
index 475898a1bc..ef4ecc791c 100644
--- a/qpid/cpp/src/qpid/console/Event.h
+++ b/qpid/cpp/include/qpid/console/Event.h
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/qpid/cpp/src/qpid/console/Object.h b/qpid/cpp/include/qpid/console/Object.h
index 38f4f0fc5e..5a29fdf792 100644
--- a/qpid/cpp/src/qpid/console/Object.h
+++ b/qpid/cpp/include/qpid/console/Object.h
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/qpid/cpp/src/qpid/console/ObjectId.h b/qpid/cpp/include/qpid/console/ObjectId.h
index df5098288d..7904c85598 100644
--- a/qpid/cpp/src/qpid/console/ObjectId.h
+++ b/qpid/cpp/include/qpid/console/ObjectId.h
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/qpid/cpp/src/qpid/console/Package.h b/qpid/cpp/include/qpid/console/Package.h
index 62356a71da..3b59e366ff 100644
--- a/qpid/cpp/src/qpid/console/Package.h
+++ b/qpid/cpp/include/qpid/console/Package.h
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/qpid/cpp/src/qpid/console/Schema.h b/qpid/cpp/include/qpid/console/Schema.h
index b167de1f45..6d4e41ab3e 100644
--- a/qpid/cpp/src/qpid/console/Schema.h
+++ b/qpid/cpp/include/qpid/console/Schema.h
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/qpid/cpp/src/qpid/console/SequenceManager.h b/qpid/cpp/include/qpid/console/SequenceManager.h
index 181120dd7b..ea0ccf3f77 100644
--- a/qpid/cpp/src/qpid/console/SequenceManager.h
+++ b/qpid/cpp/include/qpid/console/SequenceManager.h
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/qpid/cpp/src/qpid/console/SessionManager.h b/qpid/cpp/include/qpid/console/SessionManager.h
index 51b6aa69d1..f27037a559 100644
--- a/qpid/cpp/src/qpid/console/SessionManager.h
+++ b/qpid/cpp/include/qpid/console/SessionManager.h
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -44,7 +44,7 @@ namespace console {
 class ConsoleListener;
 
 /**
- *  
+ *
  * \ingroup qmfconsoleapi
  */
 class SessionManager
diff --git a/qpid/cpp/src/qpid/console/Value.h b/qpid/cpp/include/qpid/console/Value.h
index 8769ae3d77..d9eb65053b 100644
--- a/qpid/cpp/src/qpid/console/Value.h
+++ b/qpid/cpp/include/qpid/console/Value.h
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/qpid/cpp/src/qpid/framing/Array.h b/qpid/cpp/include/qpid/framing/Array.h
index f243307084..d3bdd36aa6 100644
--- a/qpid/cpp/src/qpid/framing/Array.h
+++ b/qpid/cpp/include/qpid/framing/Array.h
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -56,7 +56,7 @@ class Array
     QPID_COMMON_EXTERN Array(const std::vector<std::string>& in);
 
     QPID_COMMON_EXTERN TypeCode getType() const { return type; }
-    
+
     // std collection interface.
     QPID_COMMON_EXTERN const_iterator begin() const { return values.begin(); }
     QPID_COMMON_EXTERN const_iterator end() const { return values.end(); }
@@ -71,7 +71,7 @@ class Array
     QPID_COMMON_EXTERN void erase(iterator i) { values.erase(i); }
     QPID_COMMON_EXTERN void push_back(ValuePtr value) { values.insert(end(), value); }
     QPID_COMMON_EXTERN void pop_back() { values.pop_back(); }
-    
+
     // Non-std interface
     QPID_COMMON_EXTERN void add(ValuePtr value) { push_back(value); }
 
diff --git a/qpid/cpp/src/qpid/framing/Buffer.h b/qpid/cpp/include/qpid/framing/Buffer.h
index cacca7806e..8a6a5c0d5f 100644
--- a/qpid/cpp/src/qpid/framing/Buffer.h
+++ b/qpid/cpp/include/qpid/framing/Buffer.h
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -46,7 +46,7 @@ class Buffer
     void checkAvailable(uint32_t count) { if (position + count > size) throw OutOfBounds(); }
 
   public:
-    
+
     /** Buffer input/output iterator.
      * Supports using an amqp_0_10::Codec with a framing::Buffer.
      */
@@ -64,9 +64,9 @@ class Buffer
 
         Buffer* buffer;
     };
-    
+
   friend class Iterator;
-    
+
     QPID_COMMON_EXTERN Buffer(char* data=0, uint32_t size=0);
 
     QPID_COMMON_EXTERN void record();
@@ -78,7 +78,7 @@ class Buffer
     QPID_COMMON_EXTERN uint32_t getPosition() { return position; }
     QPID_COMMON_EXTERN Iterator getIterator() { return Iterator(*this); }
     QPID_COMMON_EXTERN char* getPointer() { return data; }
-        
+
     QPID_COMMON_EXTERN void putOctet(uint8_t i);
     QPID_COMMON_EXTERN void putShort(uint16_t i);
     QPID_COMMON_EXTERN void putLong(uint32_t i);
@@ -92,7 +92,7 @@ class Buffer
     QPID_COMMON_EXTERN void putBin128(const uint8_t* b);
 
     QPID_COMMON_EXTERN uint8_t  getOctet();
-    QPID_COMMON_EXTERN uint16_t getShort(); 
+    QPID_COMMON_EXTERN uint16_t getShort();
     QPID_COMMON_EXTERN uint32_t getLong();
     QPID_COMMON_EXTERN uint64_t getLongLong();
     QPID_COMMON_EXTERN int8_t   getInt8();
@@ -101,7 +101,7 @@ class Buffer
     QPID_COMMON_EXTERN int64_t  getInt64();
     QPID_COMMON_EXTERN float    getFloat();
     QPID_COMMON_EXTERN double   getDouble();
-    
+
     template <int n>
     QPID_COMMON_EXTERN uint64_t getUInt();
 
diff --git a/qpid/cpp/src/qpid/framing/FieldTable.h b/qpid/cpp/include/qpid/framing/FieldTable.h
index 72a00493af..a3a5c8a4ee 100644
--- a/qpid/cpp/src/qpid/framing/FieldTable.h
+++ b/qpid/cpp/include/qpid/framing/FieldTable.h
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -92,7 +92,7 @@ class FieldTable
     //bool getTimestamp(const std::string& name, uint64_t& value) const;
     //bool getDecimal(string& name, xxx& value);
     QPID_COMMON_EXTERN void erase(const std::string& name);
-    
+
 
     QPID_COMMON_EXTERN bool operator==(const FieldTable& other) const;
 
@@ -108,7 +108,7 @@ class FieldTable
     // ### Hack Alert
 
     ValueMap::iterator getValues() { return values.begin(); }
-    
+
   private:
     ValueMap values;
 
diff --git a/qpid/cpp/src/qpid/framing/FieldValue.h b/qpid/cpp/include/qpid/framing/FieldValue.h
index a648289844..97fc56d606 100644
--- a/qpid/cpp/src/qpid/framing/FieldValue.h
+++ b/qpid/cpp/include/qpid/framing/FieldValue.h
@@ -9,9 +9,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -39,14 +39,14 @@ namespace framing {
 //class Array;
 /**
  * Exception that is the base exception for all field table errors.
- * 
+ *
  * \ingroup clientapi
  */
 class FieldValueException : public qpid::Exception {};
 
 /**
  * Exception thrown when we can't perform requested conversion
- * 
+ *
  * \ingroup clientapi
  */
 struct InvalidConversionException : public FieldValueException {
@@ -66,7 +66,7 @@ class FieldValue {
     class Data {
       public:
         virtual ~Data() {};
-        virtual uint32_t encodedSize() const = 0;        
+        virtual uint32_t encodedSize() const = 0;
         virtual void encode(Buffer& buffer) = 0;
         virtual void decode(Buffer& buffer) = 0;
         virtual bool operator==(const Data&) const = 0;
@@ -85,14 +85,14 @@ class FieldValue {
     uint8_t getType();
     Data& getData() { return *data; }
     uint32_t encodedSize() const { return 1 + data->encodedSize(); };
-    bool empty() const { return data.get() == 0; } 
+    bool empty() const { return data.get() == 0; }
     void encode(Buffer& buffer);
     void decode(Buffer& buffer);
     QPID_COMMON_EXTERN bool operator==(const FieldValue&) const;
     QPID_COMMON_EXTERN bool operator!=(const FieldValue& v) const { return !(*this == v); }
-    
+
     void print(std::ostream& out) const;
-    
+
     template <typename T> bool convertsTo() const { return false; }
     template <typename T> T get() const { throw InvalidConversionException(); }
 
@@ -101,7 +101,7 @@ class FieldValue {
 
   private:
     uint8_t typeOctet;
-    std::auto_ptr<Data> data; 
+    std::auto_ptr<Data> data;
 };
 
 template <>
@@ -130,7 +130,7 @@ inline std::ostream& operator<<(std::ostream& out, const FieldValue& v) {
 template <int width>
 class FixedWidthValue : public FieldValue::Data {
     uint8_t octets[width];
-    
+
   public:
     FixedWidthValue() {}
     FixedWidthValue(const uint8_t (&data)[width]) : octets(data) {}
@@ -151,7 +151,7 @@ class FixedWidthValue : public FieldValue::Data {
     bool operator==(const Data& d) const {
         const FixedWidthValue<width>* rhs = dynamic_cast< const FixedWidthValue<width>* >(&d);
         if (rhs == 0) return false;
-        else return std::equal(&octets[0], &octets[width], &rhs->octets[0]); 
+        else return std::equal(&octets[0], &octets[width], &rhs->octets[0]);
     }
 
     bool convertsToInt() const { return true; }
@@ -191,7 +191,7 @@ class VariableWidthValue : public FieldValue::Data {
     VariableWidthValue() {}
     VariableWidthValue(const std::vector<uint8_t>& data) : octets(data) {}
     VariableWidthValue(const uint8_t* start, const uint8_t* end) : octets(start, end) {}
-    uint32_t encodedSize() const { return lenwidth + octets.size(); } 
+    uint32_t encodedSize() const { return lenwidth + octets.size(); }
     void encode(Buffer& buffer) {
         buffer.putUInt<lenwidth>(octets.size());
         if (octets.size() > 0)
@@ -206,16 +206,16 @@ class VariableWidthValue : public FieldValue::Data {
     bool operator==(const Data& d) const {
         const VariableWidthValue<lenwidth>* rhs = dynamic_cast< const VariableWidthValue<lenwidth>* >(&d);
         if (rhs == 0) return false;
-        else return octets==rhs->octets; 
+        else return octets==rhs->octets;
     }
-    
+
     bool convertsToString() const { return true; }
     std::string getString() const { return std::string(octets.begin(), octets.end()); }
 
     void print(std::ostream& o) const { o << "V" << lenwidth << ":" << octets.size() << ":"; };
 };
 
-template <class T> 
+template <class T>
 class EncodedValue : public FieldValue::Data {
     T value;
   public:
@@ -226,7 +226,7 @@ class EncodedValue : public FieldValue::Data {
     T& getValue() { return value; }
     const T& getValue() const { return value; }
 
-    uint32_t encodedSize() const { return value.encodedSize(); } 
+    uint32_t encodedSize() const { return value.encodedSize(); }
 
     void encode(Buffer& buffer) {
         value.encode(buffer);
@@ -237,7 +237,7 @@ class EncodedValue : public FieldValue::Data {
     bool operator==(const Data& d) const {
         const EncodedValue<T>* rhs = dynamic_cast< const EncodedValue<T>* >(&d);
         if (rhs == 0) return false;
-        else return value==rhs->value; 
+        else return value==rhs->value;
     }
 
     void print(std::ostream& o) const { o << "[" << value << "]"; };
@@ -303,12 +303,12 @@ class ArrayValue : public FieldValue {
 };
 
 template <class T>
-bool getEncodedValue(FieldTable::ValuePtr vptr, T& value) 
+bool getEncodedValue(FieldTable::ValuePtr vptr, T& value)
 {
     if (vptr) {
-        const EncodedValue<T>* ev = dynamic_cast< EncodedValue<T>* >(&(vptr->getData()));    
+        const EncodedValue<T>* ev = dynamic_cast< EncodedValue<T>* >(&(vptr->getData()));
         if (ev != 0) {
-            value = ev->getValue(); 
+            value = ev->getValue();
             return true;
         }
     }
diff --git a/qpid/cpp/src/qpid/framing/ProtocolVersion.h b/qpid/cpp/include/qpid/framing/ProtocolVersion.h
index f10b1bf21e..e7e75d75f6 100644
--- a/qpid/cpp/src/qpid/framing/ProtocolVersion.h
+++ b/qpid/cpp/include/qpid/framing/ProtocolVersion.h
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -34,9 +34,9 @@ class ProtocolVersion
 private:
     uint8_t major_;
     uint8_t minor_;
-    
+
 public:
-    explicit ProtocolVersion(uint8_t _major=0, uint8_t _minor=0) 
+    explicit ProtocolVersion(uint8_t _major=0, uint8_t _minor=0)
         : major_(_major), minor_(_minor) {}
 
     QPID_COMMON_EXTERN uint8_t getMajor() const { return major_; }
@@ -45,7 +45,7 @@ public:
     QPID_COMMON_EXTERN void setMinor(uint8_t minor) { minor_ = minor; }
     QPID_COMMON_EXTERN const std::string toString() const;
 
-    QPID_COMMON_EXTERN ProtocolVersion& operator=(ProtocolVersion p); 
+    QPID_COMMON_EXTERN ProtocolVersion& operator=(ProtocolVersion p);
 
     QPID_COMMON_EXTERN bool operator==(ProtocolVersion p) const;
     QPID_COMMON_EXTERN bool operator!=(ProtocolVersion p) const { return ! (*this == p); }
diff --git a/qpid/cpp/src/qpid/framing/SequenceNumber.h b/qpid/cpp/include/qpid/framing/SequenceNumber.h
index 6058367593..1e53058df8 100644
--- a/qpid/cpp/src/qpid/framing/SequenceNumber.h
+++ b/qpid/cpp/include/qpid/framing/SequenceNumber.h
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -44,7 +44,7 @@ boost::equality_comparable<
 
   public:
     SequenceNumber(uint32_t v=0) : value(v) {}
-  
+
     SequenceNumber& operator++() { ++value; return *this; }
     SequenceNumber& operator--() { --value; return *this; }
     bool operator==(const SequenceNumber& other) const { return value == other.value; }
@@ -54,18 +54,18 @@ boost::equality_comparable<
 
     void encode(Buffer& buffer) const;
     void decode(Buffer& buffer);
-    uint32_t encodedSize() const;   
+    uint32_t encodedSize() const;
 
     template <class S> void serialize(S& s) { s(value); }
 
   friend inline int32_t operator-(const SequenceNumber& a, const SequenceNumber& b);
-};    
+};
 
 inline int32_t operator-(const SequenceNumber& a, const SequenceNumber& b) {
     return int32_t(a.value - b.value);
 }
 
-struct Window 
+struct Window
 {
     SequenceNumber hwm;
     SequenceNumber lwm;
diff --git a/qpid/cpp/src/qpid/framing/SequenceSet.h b/qpid/cpp/include/qpid/framing/SequenceSet.h
index f1da828afc..39395e9ad7 100644
--- a/qpid/cpp/src/qpid/framing/SequenceSet.h
+++ b/qpid/cpp/include/qpid/framing/SequenceSet.h
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -36,11 +36,11 @@ class SequenceSet : public RangeSet<SequenceNumber> {
         : RangeSet<SequenceNumber>(r) {}
     SequenceSet(const SequenceNumber& s) { add(s); }
     SequenceSet(const SequenceNumber& start, const SequenceNumber finish) { add(start,finish); }
-    
-    
+
+
     void encode(Buffer& buffer) const;
     void decode(Buffer& buffer);
-    uint32_t encodedSize() const;   
+    uint32_t encodedSize() const;
 
     QPID_COMMON_EXTERN bool contains(const SequenceNumber& s) const;
     QPID_COMMON_EXTERN void add(const SequenceNumber& s);
@@ -51,17 +51,17 @@ class SequenceSet : public RangeSet<SequenceNumber> {
     QPID_COMMON_EXTERN void remove(const SequenceSet& set);
 
     template <class T> void for_each(T& t) const {
-        for (RangeIterator i = rangesBegin(); i != rangesEnd(); i++) 
+        for (RangeIterator i = rangesBegin(); i != rangesEnd(); i++)
             t(i->first(), i->last());
         }
 
     template <class T> void for_each(const T& t) const {
-        for (RangeIterator i = rangesBegin(); i != rangesEnd(); i++) 
+        for (RangeIterator i = rangesBegin(); i != rangesEnd(); i++)
             t(i->first(), i->last());
     }
 
   friend QPID_COMMON_EXTERN std::ostream& operator<<(std::ostream&, const SequenceSet&);
-};    
+};
 
 }} // namespace qpid::framing
 
diff --git a/qpid/cpp/src/qpid/framing/StructHelper.h b/qpid/cpp/include/qpid/framing/StructHelper.h
index 00b15be78d..fc9a7909cc 100644
--- a/qpid/cpp/src/qpid/framing/StructHelper.h
+++ b/qpid/cpp/include/qpid/framing/StructHelper.h
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -54,4 +54,4 @@ public:
 };
 
 }}
-#endif  
+#endif
diff --git a/qpid/cpp/src/qpid/framing/Uuid.h b/qpid/cpp/include/qpid/framing/Uuid.h
index 33be497c64..0dfa7a58e7 100644
--- a/qpid/cpp/src/qpid/framing/Uuid.h
+++ b/qpid/cpp/include/qpid/framing/Uuid.h
@@ -50,13 +50,13 @@ struct Uuid : public boost::array<uint8_t, 16> {
     void assign(const uint8_t* data) {
         uuid_copy(c_array(), data);
     }
-    
+
     /** Set to a new unique identifier. */
     void generate() { uuid_generate(c_array()); }
 
     /** Set to all zeros. */
     void clear() { uuid_clear(c_array()); }
-    
+
     /** Test for null (all zeros). */
     // Force int 0/!0 to false/true; avoids compile warnings.
     bool isNull() {
diff --git a/qpid/cpp/src/qpid/framing/amqp_types.h b/qpid/cpp/include/qpid/framing/amqp_types.h
index 0cc2e80dce..d9088b7a12 100644
--- a/qpid/cpp/src/qpid/framing/amqp_types.h
+++ b/qpid/cpp/include/qpid/framing/amqp_types.h
@@ -9,9 +9,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -22,7 +22,7 @@
  */
 
 /** \file
- * Definitions and forward declarations of all types used 
+ * Definitions and forward declarations of all types used
  * in AMQP messages.
  */
 
diff --git a/qpid/cpp/src/qpid/framing/amqp_types_full.h b/qpid/cpp/include/qpid/framing/amqp_types_full.h
index c5d84dedea..c5d84dedea 100644
--- a/qpid/cpp/src/qpid/framing/amqp_types_full.h
+++ b/qpid/cpp/include/qpid/framing/amqp_types_full.h
diff --git a/qpid/cpp/src/qpid/log/Logger.h b/qpid/cpp/include/qpid/log/Logger.h
index 35aa13f7ef..d7da1f077a 100644
--- a/qpid/cpp/src/qpid/log/Logger.h
+++ b/qpid/cpp/include/qpid/log/Logger.h
@@ -59,7 +59,7 @@ class Logger : private boost::noncopyable {
 
     QPID_COMMON_EXTERN Logger();
     QPID_COMMON_EXTERN ~Logger();
-    
+
     /** Select the messages to be logged. */
     QPID_COMMON_EXTERN void select(const Selector& s);
 
@@ -85,14 +85,14 @@ class Logger : private boost::noncopyable {
 
     /** Set a prefix for all messages */
     QPID_COMMON_EXTERN void setPrefix(const std::string& prefix);
-    
+
     /** Reset the logger. */
     QPID_COMMON_EXTERN void clear();
 
     /** Get the options used to configure the logger. */
     QPID_COMMON_EXTERN const Options& getOptions() const { return options; }
-    
-    
+
+
   private:
     typedef boost::ptr_vector<Output> Outputs;
     typedef std::set<Statement*> Statements;
diff --git a/qpid/cpp/src/qpid/log/Options.h b/qpid/cpp/include/qpid/log/Options.h
index bbc47b47d3..bbc47b47d3 100644
--- a/qpid/cpp/src/qpid/log/Options.h
+++ b/qpid/cpp/include/qpid/log/Options.h
diff --git a/qpid/cpp/src/qpid/log/Selector.h b/qpid/cpp/include/qpid/log/Selector.h
index 3c18fb6ba2..061152d7e2 100644
--- a/qpid/cpp/src/qpid/log/Selector.h
+++ b/qpid/cpp/include/qpid/log/Selector.h
@@ -29,8 +29,8 @@ struct Options;
 
 /**
  * A selector identifies the set of log messages to enable.
- * 
- * Thread object unsafe, pass-by-value type. 
+ *
+ * Thread object unsafe, pass-by-value type.
  */
 class Selector {
   public:
@@ -39,7 +39,7 @@ class Selector {
 
     /** Set selector from Options */
     QPID_COMMON_EXTERN Selector(const Options&);
-    
+
     /** Equavlient to: Selector s; s.enable(l, s) */
     Selector(Level l, const std::string& s=std::string()) {
         enable(l,s);
@@ -47,7 +47,7 @@ class Selector {
 
     Selector(const std::string& enableStr) { enable(enableStr); }
     /**
-     * Enable messages with level in levels where the file 
+     * Enable messages with level in levels where the file
      * name contains substring. Empty string matches all.
      */
     void enable(Level level, const std::string& substring=std::string()) {
diff --git a/qpid/cpp/src/qpid/log/SinkOptions.h b/qpid/cpp/include/qpid/log/SinkOptions.h
index 7ec2cfbc17..7ec2cfbc17 100644
--- a/qpid/cpp/src/qpid/log/SinkOptions.h
+++ b/qpid/cpp/include/qpid/log/SinkOptions.h
diff --git a/qpid/cpp/src/qpid/log/Statement.h b/qpid/cpp/include/qpid/log/Statement.h
index 445f635cdd..8f73175630 100644
--- a/qpid/cpp/src/qpid/log/Statement.h
+++ b/qpid/cpp/include/qpid/log/Statement.h
@@ -32,7 +32,7 @@ namespace log {
  * - info: Informational messages.
  * - notice: Normal but significant condition.
  * - warning: Warn of a possible problem.
- * - error: A definite error has occured. 
+ * - error: A definite error has occured.
  * - critical: System in danger of severe failure.
  */
 enum Level { trace, debug, info, notice, warning, error, critical };
@@ -42,7 +42,7 @@ struct LevelTraits {
     /** Get level from string name.
      *@exception if name invalid.
      */
-    static Level level(const char* name); 
+    static Level level(const char* name);
 
     /** Get level from string name.
      *@exception if name invalid.
@@ -52,16 +52,16 @@ struct LevelTraits {
     }
 
     /** String name of level */
-    static const char* name(Level); 
+    static const char* name(Level);
 };
-    
+
 /** POD struct representing a logging statement in source code. */
 struct Statement {
     bool enabled;
     const char* file;
-    int line;        
+    int line;
     const char* function;
-    Level level;           
+    Level level;
 
     QPID_COMMON_EXTERN void log(const std::string& message);
 
@@ -118,4 +118,4 @@ struct Statement {
 
 
 #endif  /*!STATEMENT_H*/
- 
+
diff --git a/qpid/cpp/src/qpid/management/Args.h b/qpid/cpp/include/qpid/management/Args.h
index da1fb033b9..5d1cb7e01d 100644
--- a/qpid/cpp/src/qpid/management/Args.h
+++ b/qpid/cpp/include/qpid/management/Args.h
@@ -9,9 +9,9 @@
 // to you under the Apache License, Version 2.0 (the
 // "License"); you may not use this file except in compliance
 // with the License.  You may obtain a copy of the License at
-// 
+//
 //   http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing,
 // software distributed under the License is distributed on an
 // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
 //
 
 
-namespace qpid { 
+namespace qpid {
 namespace management {
 
 class Args
diff --git a/qpid/cpp/src/qpid/management/Manageable.h b/qpid/cpp/include/qpid/management/Manageable.h
index dd4e06b018..8062479ac6 100644
--- a/qpid/cpp/src/qpid/management/Manageable.h
+++ b/qpid/cpp/include/qpid/management/Manageable.h
@@ -9,9 +9,9 @@
 // to you under the Apache License, Version 2.0 (the
 // "License"); you may not use this file except in compliance
 // with the License.  You may obtain a copy of the License at
-// 
+//
 //   http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing,
 // software distributed under the License is distributed on an
 // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -25,7 +25,7 @@
 #include <string>
 #include "qpid/CommonImportExport.h"
 
-namespace qpid { 
+namespace qpid {
 namespace management {
 
 class QPID_COMMON_EXTERN Manageable
diff --git a/qpid/cpp/src/qpid/management/ManagementEvent.h b/qpid/cpp/include/qpid/management/ManagementEvent.h
index 6eeea32b70..01b9ae49ec 100644
--- a/qpid/cpp/src/qpid/management/ManagementEvent.h
+++ b/qpid/cpp/include/qpid/management/ManagementEvent.h
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/qpid/cpp/src/qpid/management/ManagementObject.h b/qpid/cpp/include/qpid/management/ManagementObject.h
index a6ef8fb392..d0a443d6cb 100644
--- a/qpid/cpp/src/qpid/management/ManagementObject.h
+++ b/qpid/cpp/include/qpid/management/ManagementObject.h
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -28,7 +28,7 @@
 #include "qpid/CommonImportExport.h"
 #include <map>
 
-namespace qpid { 
+namespace qpid {
 namespace management {
 
 class Manageable;
@@ -111,7 +111,7 @@ public:
 class ManagementObject : public ManagementItem
 {
 protected:
-    
+
     uint64_t         createTime;
     uint64_t         destroyTime;
     uint64_t         updateTime;
@@ -125,7 +125,7 @@ protected:
 
     static int nextThreadIndex;
     bool             forcePublish;
-        
+
     QPID_COMMON_EXTERN int  getThreadIndex();
     QPID_COMMON_EXTERN void writeTimestamps(qpid::framing::Buffer& buf);
 
@@ -181,7 +181,7 @@ protected:
 typedef std::map<ObjectId, ManagementObject*> ManagementObjectMap;
 
 }}
-            
+
 
 
 #endif  /*!_ManagementObject_*/
diff --git a/qpid/cpp/src/qpid/sys/Condition.h b/qpid/cpp/include/qpid/sys/Condition.h
index fe0e3a1c71..9be4b357fe 100644
--- a/qpid/cpp/src/qpid/sys/Condition.h
+++ b/qpid/cpp/include/qpid/sys/Condition.h
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/qpid/cpp/src/qpid/sys/IOHandle.h b/qpid/cpp/include/qpid/sys/IOHandle.h
index 656e5e1efd..283e021162 100644
--- a/qpid/cpp/src/qpid/sys/IOHandle.h
+++ b/qpid/cpp/include/qpid/sys/IOHandle.h
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/qpid/cpp/src/qpid/sys/IntegerTypes.h b/qpid/cpp/include/qpid/sys/IntegerTypes.h
index 89635f033e..89635f033e 100755
--- a/qpid/cpp/src/qpid/sys/IntegerTypes.h
+++ b/qpid/cpp/include/qpid/sys/IntegerTypes.h
diff --git a/qpid/cpp/src/qpid/sys/Monitor.h b/qpid/cpp/include/qpid/sys/Monitor.h
index 76c7118928..123bf92dcb 100644
--- a/qpid/cpp/src/qpid/sys/Monitor.h
+++ b/qpid/cpp/include/qpid/sys/Monitor.h
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/qpid/cpp/src/qpid/sys/Mutex.h b/qpid/cpp/include/qpid/sys/Mutex.h
index 00bf392604..43a83d4fc3 100644
--- a/qpid/cpp/src/qpid/sys/Mutex.h
+++ b/qpid/cpp/include/qpid/sys/Mutex.h
@@ -79,7 +79,7 @@ class ConditionalScopedLock
 };
 
 }}
-    
+
 #ifdef USE_APR_PLATFORM
 #include "apr/Mutex.h"
 #elif defined (_WIN32)
diff --git a/qpid/cpp/src/qpid/sys/Runnable.h b/qpid/cpp/include/qpid/sys/Runnable.h
index 4bf43c93d1..0f1243a277 100644
--- a/qpid/cpp/src/qpid/sys/Runnable.h
+++ b/qpid/cpp/include/qpid/sys/Runnable.h
@@ -9,9 +9,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -35,7 +35,7 @@ class Runnable
   public:
     /** Type to represent a runnable as a Functor */
     typedef boost::function0<void> Functor;
-    
+
     QPID_COMMON_EXTERN virtual ~Runnable();
 
     /** Derived classes override run(). */
diff --git a/qpid/cpp/src/qpid/sys/StrError.h b/qpid/cpp/include/qpid/sys/StrError.h
index 69cc7e714c..36489dd0fc 100644
--- a/qpid/cpp/src/qpid/sys/StrError.h
+++ b/qpid/cpp/include/qpid/sys/StrError.h
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -32,5 +32,5 @@ namespace sys {
 QPID_COMMON_EXTERN std::string strError(int err);
 
 }} // namespace qpid
- 
+
 #endif  // _sys_StrError_h
diff --git a/qpid/cpp/src/qpid/sys/SystemInfo.h b/qpid/cpp/include/qpid/sys/SystemInfo.h
index 6e97022b36..09f9980173 100644
--- a/qpid/cpp/src/qpid/sys/SystemInfo.h
+++ b/qpid/cpp/include/qpid/sys/SystemInfo.h
@@ -30,7 +30,7 @@ namespace sys {
 
 /**
  * Retrieve information about the system we are running on.
- * Results may be dependent on OS/hardware. 
+ * Results may be dependent on OS/hardware.
  */
 namespace SystemInfo {
     /**
diff --git a/qpid/cpp/src/qpid/sys/Thread.h b/qpid/cpp/include/qpid/sys/Thread.h
index b532d4d80a..bfea4b4944 100644
--- a/qpid/cpp/src/qpid/sys/Thread.h
+++ b/qpid/cpp/include/qpid/sys/Thread.h
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -48,11 +48,11 @@ class Thread
     QPID_COMMON_EXTERN Thread();
     QPID_COMMON_EXTERN explicit Thread(qpid::sys::Runnable*);
     QPID_COMMON_EXTERN explicit Thread(qpid::sys::Runnable&);
-    
+
     QPID_COMMON_EXTERN void join();
 
     QPID_COMMON_EXTERN unsigned long id();
-        
+
     QPID_COMMON_EXTERN static Thread current();
 
     /** ID of current thread for logging.
diff --git a/qpid/cpp/src/qpid/sys/Time.h b/qpid/cpp/include/qpid/sys/Time.h
index ca229c2f27..c19757747b 100644
--- a/qpid/cpp/src/qpid/sys/Time.h
+++ b/qpid/cpp/include/qpid/sys/Time.h
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -86,13 +86,13 @@ class AbsTime {
     friend class Duration;
 
     TimePrivate timepoint;
-	
+
 public:
     QPID_COMMON_EXTERN inline AbsTime() {}
     QPID_COMMON_EXTERN AbsTime(const AbsTime& time0, const Duration& duration);
     // Default assignment operation fine
     // Default copy constructor fine
-	 
+
     QPID_COMMON_EXTERN static AbsTime now();
     QPID_COMMON_EXTERN static AbsTime FarFuture();
     const TimePrivate& getPrivate(void) const { return timepoint; }
@@ -158,7 +158,7 @@ const Duration TIME_INFINITE = std::numeric_limits<int64_t>::max();
 
 /** Time greater than any other time */
 const AbsTime FAR_FUTURE = AbsTime::FarFuture();
- 
+
 /** Portable sleep for a number of seconds */
 QPID_COMMON_EXTERN void sleep(int secs);
 
diff --git a/qpid/cpp/src/qpid/sys/posix/Condition.h b/qpid/cpp/include/qpid/sys/posix/Condition.h
index 93aae3ffce..279039735a 100644
--- a/qpid/cpp/src/qpid/sys/posix/Condition.h
+++ b/qpid/cpp/include/qpid/sys/posix/Condition.h
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/qpid/cpp/src/qpid/sys/posix/IntegerTypes.h b/qpid/cpp/include/qpid/sys/posix/IntegerTypes.h
index ce97f7bde8..ce97f7bde8 100755
--- a/qpid/cpp/src/qpid/sys/posix/IntegerTypes.h
+++ b/qpid/cpp/include/qpid/sys/posix/IntegerTypes.h
diff --git a/qpid/cpp/src/qpid/sys/posix/Mutex.h b/qpid/cpp/include/qpid/sys/posix/Mutex.h
index fb8491dec0..e2b21b5a56 100644
--- a/qpid/cpp/src/qpid/sys/posix/Mutex.h
+++ b/qpid/cpp/include/qpid/sys/posix/Mutex.h
@@ -39,12 +39,12 @@ class Mutex : private boost::noncopyable {
 public:
     typedef ::qpid::sys::ScopedLock<Mutex> ScopedLock;
     typedef ::qpid::sys::ScopedUnlock<Mutex> ScopedUnlock;
-     
+
     inline Mutex();
     inline ~Mutex();
-    inline void lock();  
+    inline void lock();
     inline void unlock();
-    inline bool trylock();  
+    inline bool trylock();
 
 
 protected:
@@ -60,7 +60,7 @@ class RWlock : private boost::noncopyable {
 public:
     typedef ::qpid::sys::ScopedRlock<RWlock> ScopedRlock;
     typedef ::qpid::sys::ScopedWlock<RWlock> ScopedWlock;
-    
+
     inline RWlock();
     inline ~RWlock();
     inline void wlock();  // will write-lock
@@ -78,13 +78,13 @@ protected:
  * PODMutex is a POD, can be static-initialized with
  * PODMutex m = QPID_PODMUTEX_INITIALIZER
  */
-struct PODMutex 
+struct PODMutex
 {
     typedef ::qpid::sys::ScopedLock<PODMutex> ScopedLock;
 
-    inline void lock();  
+    inline void lock();
     inline void unlock();
-    inline bool trylock();  
+    inline bool trylock();
 
     // Must be public to be a POD:
     pthread_mutex_t mutex;
diff --git a/qpid/cpp/src/qpid/sys/posix/PrivatePosix.h b/qpid/cpp/include/qpid/sys/posix/PrivatePosix.h
index 0fefa50ab6..6ffd3d8383 100644
--- a/qpid/cpp/src/qpid/sys/posix/PrivatePosix.h
+++ b/qpid/cpp/include/qpid/sys/posix/PrivatePosix.h
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -42,7 +42,7 @@ public:
     IOHandlePrivate(int f = -1) :
             fd(f)
     {}
-    
+
     int fd;
 };
 
diff --git a/qpid/cpp/src/qpid/sys/posix/Time.h b/qpid/cpp/include/qpid/sys/posix/Time.h
index 62d734c816..62d734c816 100755
--- a/qpid/cpp/src/qpid/sys/posix/Time.h
+++ b/qpid/cpp/include/qpid/sys/posix/Time.h
diff --git a/qpid/cpp/src/qpid/sys/posix/check.h b/qpid/cpp/include/qpid/sys/posix/check.h
index 03eee54196..bbc66d389b 100644
--- a/qpid/cpp/src/qpid/sys/posix/check.h
+++ b/qpid/cpp/include/qpid/sys/posix/check.h
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/qpid/cpp/src/qpid/sys/uuid.h b/qpid/cpp/include/qpid/sys/uuid.h
index 804ab34463..804ab34463 100644
--- a/qpid/cpp/src/qpid/sys/uuid.h
+++ b/qpid/cpp/include/qpid/sys/uuid.h
diff --git a/qpid/cpp/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt
index a8c201d802..65a8e66a98 100644
--- a/qpid/cpp/src/CMakeLists.txt
+++ b/qpid/cpp/src/CMakeLists.txt
@@ -195,6 +195,7 @@ endif (MSVC)
 include_directories( ${Boost_INCLUDE_DIR} )
 
 include_directories( . )
+include_directories( ../include )
 include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/gen)
 
 link_directories( ${Boost_LIBRARY_DIRS} )
@@ -511,7 +512,7 @@ set (libqpidclient_SOURCES
      qpid/client/QueueOptions.cpp
      qpid/client/Results.cpp
      qpid/client/SessionBase_0_10.cpp
-     qpid/client/SessionBase_0_10.h
+     ../include/qpid/client/SessionBase_0_10.h
      qpid/client/SessionBase_0_10Access.h
      qpid/client/ConnectionAccess.h
      qpid/client/SessionImpl.cpp
@@ -615,7 +616,7 @@ target_link_libraries (qpidd qpidbroker qpidcommon ${Boost_PROGRAM_OPTIONS_LIBRA
 #  qpid/agent/ManagementAgent.h \
 #  qpid/agent/ManagementAgentImpl.h
 set (qmfagent_SOURCES
-     qpid/agent/ManagementAgent.h
+     ../include/qpid/agent/ManagementAgent.h
      qpid/agent/ManagementAgentImpl.cpp
      qpid/agent/ManagementAgentImpl.h
      qmf/Agent.cpp
@@ -656,29 +657,29 @@ set_target_properties (qmfcommon PROPERTIES
 #  qpid/console/SessionManager.h \
 #  qpid/console/Value.h
 set (qmfconsole_SOURCES
-     qpid/console/Agent.h
+     ../include/qpid/console/Agent.h
+     ../include/qpid/console/Broker.h
+     ../include/qpid/console/ClassKey.h
+     ../include/qpid/console/ConsoleImportExport.h
+     ../include/qpid/console/ConsoleListener.h
+     ../include/qpid/console/Event.h
+     ../include/qpid/console/Object.h
+     ../include/qpid/console/ObjectId.h
+     ../include/qpid/console/Package.h
+     ../include/qpid/console/Schema.h
+     ../include/qpid/console/SequenceManager.h
+     ../include/qpid/console/SessionManager.h
+     ../include/qpid/console/Value.h
      qpid/console/Agent.cpp
-     qpid/console/Broker.h
      qpid/console/Broker.cpp
-     qpid/console/ClassKey.h
      qpid/console/ClassKey.cpp
-     qpid/console/ConsoleImportExport.h
-     qpid/console/ConsoleListener.h
-     qpid/console/Event.h
      qpid/console/Event.cpp
-     qpid/console/Object.h
      qpid/console/Object.cpp
-     qpid/console/ObjectId.h
      qpid/console/ObjectId.cpp
-     qpid/console/Package.h
      qpid/console/Package.cpp
-     qpid/console/Schema.h
      qpid/console/Schema.cpp
-     qpid/console/SequenceManager.h
      qpid/console/SequenceManager.cpp
-     qpid/console/SessionManager.h
      qpid/console/SessionManager.cpp
-     qpid/console/Value.h
      qpid/console/Value.cpp
     )
 add_library (qmfconsole SHARED ${qmfconsole_SOURCES})
diff --git a/qpid/cpp/src/Makefile.am b/qpid/cpp/src/Makefile.am
index 541e81a7f6..e6038bbd43 100644
--- a/qpid/cpp/src/Makefile.am
+++ b/qpid/cpp/src/Makefile.am
@@ -61,6 +61,10 @@ windows_dist = \
 
 EXTRA_DIST= $(platform_dist) $(rgen_srcs) $(windows_dist)
 
+# Define variables that are be appended to by this file and included .mk files.
+nobase_include_HEADERS =
+libqpidcommon_la_SOURCES =
+
 ## Generated code
 
 # Note: generated soure and makefiles included in distribution so a
@@ -105,7 +109,7 @@ include $(srcdir)/managementgen.mk
 ## Compiler flags
 AM_CXXFLAGS = $(WARNING_CFLAGS)
 AM_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO_ARG)
-INCLUDES = -Igen -I$(srcdir)/gen
+INCLUDES = -Igen -I$(srcdir)/gen -I$(top_srcdir)/include
 
 #
 # Destination for intalled programs and tests defined here
@@ -132,31 +136,34 @@ posix_qpidd_src = posix/QpiddBroker.cpp
 sbin_PROGRAMS = qpidd
 qpidd_SOURCES = qpidd.cpp qpidd.h $(posix_qpidd_src)
 
-posix_plat_src = \
-  qpid/log/posix/SinkOptions.cpp \
-  qpid/sys/posix/IOHandle.cpp \
-  qpid/sys/posix/Socket.cpp \
-  qpid/sys/posix/AsynchIO.cpp \
-  qpid/sys/posix/FileSysDir.cpp \
-  qpid/sys/posix/LockFile.cpp \
-  qpid/sys/posix/Time.cpp \
-  qpid/sys/posix/Thread.cpp \
-  qpid/sys/posix/Shlib.cpp \
-  qpid/sys/posix/Mutex.cpp \
-  qpid/sys/posix/Fork.cpp \
-  qpid/sys/posix/StrError.cpp \
-  qpid/sys/posix/PollableCondition.cpp \
-  qpid/sys/posix/PipeHandle.cpp
-
-posix_plat_hdr = \
-  qpid/log/posix/SinkOptions.h \
-  qpid/sys/posix/check.h \
-  qpid/sys/posix/Condition.h \
-  qpid/sys/posix/PrivatePosix.h \
-  qpid/sys/posix/Mutex.h \
-  qpid/sys/posix/Fork.h \
-  qpid/sys/posix/IntegerTypes.h \
-  qpid/sys/posix/Time.h
+## Platform specific code.
+
+# Posix-specific code
+libqpidcommon_la_SOURCES +=			\
+  qpid/log/posix/SinkOptions.cpp		\
+  qpid/sys/posix/IOHandle.cpp			\
+  qpid/sys/posix/Socket.cpp			\
+  qpid/sys/posix/AsynchIO.cpp			\
+  qpid/sys/posix/FileSysDir.cpp			\
+  qpid/sys/posix/LockFile.cpp			\
+  qpid/sys/posix/Time.cpp			\
+  qpid/sys/posix/Thread.cpp			\
+  qpid/sys/posix/Shlib.cpp			\
+  qpid/sys/posix/Mutex.cpp			\
+  qpid/sys/posix/Fork.cpp			\
+  qpid/sys/posix/StrError.cpp			\
+  qpid/sys/posix/PollableCondition.cpp		\
+  qpid/sys/posix/PipeHandle.cpp			\
+  qpid/log/posix/SinkOptions.h 			\
+  qpid/sys/posix/Fork.h
+
+nobase_include_HEADERS +=			\
+  ../include/qpid/sys/posix/Condition.h		\
+  ../include/qpid/sys/posix/IntegerTypes.h	\
+  ../include/qpid/sys/posix/Mutex.h		\
+  ../include/qpid/sys/posix/PrivatePosix.h	\
+  ../include/qpid/sys/posix/Time.h		\
+  ../include/qpid/sys/posix/check.h
 
 if HAVE_EPOLL 
   poller = qpid/sys/epoll/EpollPoller.cpp
@@ -172,8 +179,7 @@ else
   systeminfo = qpid/sys/posix/SystemInfo.cpp
 endif
 
-platform_src = $(posix_plat_src) $(poller) $(systeminfo)
-platform_hdr = $(posix_plat_hdr)
+libqpidcommon_la_SOURCES += $(poller) $(systeminfo)
 
 posix_broker_src = \
   qpid/broker/posix/BrokerDefaults.cpp
@@ -187,7 +193,6 @@ dmoduledir=$(libdir)/qpid/daemon
 cmoduledir=$(libdir)/qpid/client
 dmodule_LTLIBRARIES =
 cmodule_LTLIBRARIES = 
-module_hdr =
 
 include cluster.mk
 include acl.mk
@@ -301,66 +306,157 @@ libqpidcommon_la_LIBADD = \
   $(LIB_DLOPEN) \
   $(LIB_CLOCK_GETTIME)
 
-libqpidcommon_la_SOURCES = \
-  $(rgen_framing_srcs) \
-  $(platform_src) \
-  qpid/assert.cpp qpid/assert.h \
-  qpid/pointer_to_other.h \
-  qpid/Address.cpp \
-  qpid/DataDir.cpp \
-  qpid/Exception.cpp \
-  qpid/Modules.cpp \
-  qpid/Options.cpp \
-  qpid/Plugin.cpp \
-  qpid/RefCountedBuffer.h \
-  qpid/RefCountedBuffer.cpp \
-  qpid/Serializer.h \
-  qpid/SessionState.h \
-  qpid/SessionState.cpp \
-  qpid/SessionId.cpp \
-  qpid/StringUtils.cpp \
-  qpid/Url.cpp \
-  qpid/amqp_0_10/SessionHandler.h \
-  qpid/amqp_0_10/SessionHandler.cpp \
-  qpid/framing/AccumulatedAck.cpp \
-  qpid/framing/AMQBody.cpp \
-  qpid/framing/AMQMethodBody.cpp \
-  qpid/framing/AMQContentBody.cpp \
-  qpid/framing/AMQFrame.cpp \
-  qpid/framing/AMQHeaderBody.cpp \
-  qpid/framing/AMQHeartbeatBody.cpp \
-  qpid/framing/Array.cpp \
-  qpid/framing/BodyHandler.cpp \
-  qpid/framing/Buffer.cpp \
-  qpid/framing/Endian.cpp \
-  qpid/framing/FieldTable.cpp \
-  qpid/framing/FieldValue.cpp \
-  qpid/framing/FrameSet.cpp \
-  qpid/framing/FrameDecoder.cpp \
-  qpid/framing/ProtocolInitiation.cpp \
-  qpid/framing/ProtocolVersion.cpp \
-  qpid/framing/SendContent.cpp \
-  qpid/framing/SequenceNumber.cpp \
-  qpid/framing/SequenceNumberSet.cpp \
-  qpid/framing/SequenceSet.cpp \
-  qpid/framing/Proxy.cpp \
-  qpid/framing/Uuid.cpp \
-  qpid/framing/AMQP_HighestVersion.h \
-  qpid/framing/TransferContent.cpp \
-  qpid/log/Logger.cpp \
-  qpid/log/Options.cpp \
-  qpid/log/OstreamOutput.cpp \
-  qpid/log/Selector.cpp \
-  qpid/log/Statement.cpp \
-  qpid/management/Manageable.cpp \
-  qpid/management/ManagementObject.cpp \
-  qpid/sys/AggregateOutput.cpp \
-  qpid/sys/AsynchIOHandler.cpp \
-  qpid/sys/Dispatcher.cpp \
-  qpid/sys/DispatchHandle.cpp \
-  qpid/sys/Runnable.cpp \
-  qpid/sys/Shlib.cpp \
-  qpid/sys/Timer.cpp
+libqpidcommon_la_SOURCES +=			\
+  $(rgen_framing_srcs)				\
+  $(platform_src)				\
+  qpid/Address.cpp				\
+  qpid/DataDir.cpp				\
+  qpid/DataDir.h				\
+  qpid/Exception.cpp				\
+  qpid/Modules.cpp				\
+  qpid/Modules.h				\
+  qpid/Options.cpp				\
+  qpid/Plugin.cpp				\
+  qpid/Plugin.h					\
+  qpid/RefCounted.h				\
+  qpid/RefCountedBuffer.cpp			\
+  qpid/RefCountedBuffer.h			\
+  qpid/Serializer.h				\
+  qpid/SessionId.cpp				\
+  qpid/SessionState.cpp				\
+  qpid/SessionState.h				\
+  qpid/SessionState.h				\
+  qpid/SharedObject.h				\
+  qpid/StringUtils.cpp				\
+  qpid/StringUtils.h				\
+  qpid/Url.cpp					\
+  qpid/Version.h				\
+  qpid/amqp_0_10/Exception.h			\
+  qpid/amqp_0_10/SessionHandler.cpp		\
+  qpid/amqp_0_10/SessionHandler.h		\
+  qpid/amqp_0_10/apply.h			\
+  qpid/assert.cpp qpid/assert.h			\
+  qpid/assert.h					\
+  qpid/framing/AMQBody.cpp			\
+  qpid/framing/AMQBody.h			\
+  qpid/framing/AMQCommandControlBody.h		\
+  qpid/framing/AMQContentBody.cpp		\
+  qpid/framing/AMQContentBody.h			\
+  qpid/framing/AMQDataBlock.h			\
+  qpid/framing/AMQFrame.cpp			\
+  qpid/framing/AMQFrame.h			\
+  qpid/framing/AMQHeaderBody.cpp		\
+  qpid/framing/AMQHeaderBody.h			\
+  qpid/framing/AMQHeartbeatBody.cpp		\
+  qpid/framing/AMQHeartbeatBody.h		\
+  qpid/framing/AMQMethodBody.cpp		\
+  qpid/framing/AMQMethodBody.h			\
+  qpid/framing/AMQP_HighestVersion.h		\
+  qpid/framing/AMQP_HighestVersion.h		\
+  qpid/framing/AccumulatedAck.cpp		\
+  qpid/framing/AccumulatedAck.h			\
+  qpid/framing/Array.cpp			\
+  qpid/framing/BodyFactory.h			\
+  qpid/framing/BodyHandler.cpp			\
+  qpid/framing/BodyHandler.h			\
+  qpid/framing/Buffer.cpp			\
+  qpid/framing/ChannelHandler.h			\
+  qpid/framing/Endian.cpp			\
+  qpid/framing/Endian.h				\
+  qpid/framing/FieldTable.cpp			\
+  qpid/framing/FieldValue.cpp			\
+  qpid/framing/FrameDecoder.cpp			\
+  qpid/framing/FrameDecoder.h			\
+  qpid/framing/FrameDefaultVisitor.h		\
+  qpid/framing/FrameHandler.h			\
+  qpid/framing/FrameSet.cpp			\
+  qpid/framing/FrameSet.h			\
+  qpid/framing/Handler.h			\
+  qpid/framing/HeaderProperties.h		\
+  qpid/framing/InitiationHandler.h		\
+  qpid/framing/InputHandler.h			\
+  qpid/framing/Invoker.h			\
+  qpid/framing/MethodBodyFactory.h		\
+  qpid/framing/MethodContent.h			\
+  qpid/framing/ModelMethod.h			\
+  qpid/framing/OutputHandler.h			\
+  qpid/framing/ProtocolInitiation.cpp		\
+  qpid/framing/ProtocolInitiation.h		\
+  qpid/framing/ProtocolVersion.cpp		\
+  qpid/framing/Proxy.cpp			\
+  qpid/framing/Proxy.h				\
+  qpid/framing/SendContent.cpp			\
+  qpid/framing/SendContent.h			\
+  qpid/framing/SequenceNumber.cpp		\
+  qpid/framing/SequenceNumberSet.cpp		\
+  qpid/framing/SequenceNumberSet.h		\
+  qpid/framing/SequenceSet.cpp			\
+  qpid/framing/TransferContent.cpp		\
+  qpid/framing/TransferContent.h		\
+  qpid/framing/TypeFilter.h			\
+  qpid/framing/Uuid.cpp				\
+  qpid/framing/Visitor.h			\
+  qpid/framing/amqp_framing.h			\
+  qpid/framing/frame_functors.h			\
+  qpid/framing/variant.h			\
+  qpid/log/Helpers.h				\
+  qpid/log/Logger.cpp				\
+  qpid/log/Options.cpp				\
+  qpid/log/OstreamOutput.cpp			\
+  qpid/log/OstreamOutput.h			\
+  qpid/log/Selector.cpp				\
+  qpid/log/Statement.cpp			\
+  qpid/memory.h					\
+  qpid/pointer_to_other.h			\
+  qpid/ptr_map.h				\
+  qpid/sys/AggregateOutput.cpp			\
+  qpid/sys/AggregateOutput.h			\
+  qpid/sys/AsynchIO.h				\
+  qpid/sys/AsynchIOHandler.cpp			\
+  qpid/sys/AsynchIOHandler.h			\
+  qpid/sys/AtomicCount.h			\
+  qpid/sys/AtomicValue.h			\
+  qpid/sys/AtomicValue_gcc.h			\
+  qpid/sys/AtomicValue_mutex.h			\
+  qpid/sys/BlockingQueue.h			\
+  qpid/sys/Codec.h				\
+  qpid/sys/ConnectionCodec.h			\
+  qpid/sys/ConnectionInputHandler.h		\
+  qpid/sys/ConnectionInputHandlerFactory.h	\
+  qpid/sys/ConnectionOutputHandler.h		\
+  qpid/sys/ConnectionOutputHandlerPtr.h		\
+  qpid/sys/CopyOnWriteArray.h			\
+  qpid/sys/DeletionManager.h			\
+  qpid/sys/DispatchHandle.cpp			\
+  qpid/sys/DispatchHandle.h			\
+  qpid/sys/Dispatcher.cpp			\
+  qpid/sys/Dispatcher.h				\
+  qpid/sys/ExceptionHolder.h			\
+  qpid/sys/FileSysDir.h				\
+  qpid/sys/Fork.h				\
+  qpid/sys/LockFile.h				\
+  qpid/sys/LockPtr.h				\
+  qpid/sys/OutputControl.h			\
+  qpid/sys/OutputTask.h				\
+  qpid/sys/PipeHandle.h				\
+  qpid/sys/PollableCondition.h			\
+  qpid/sys/PollableQueue.h			\
+  qpid/sys/Poller.h				\
+  qpid/sys/ProtocolFactory.h			\
+  qpid/sys/Runnable.cpp				\
+  qpid/sys/ScopedIncrement.h			\
+  qpid/sys/SecurityLayer.h			\
+  qpid/sys/Semaphore.h				\
+  qpid/sys/Shlib.cpp				\
+  qpid/sys/Shlib.h				\
+  qpid/sys/ShutdownHandler.h			\
+  qpid/sys/Socket.h				\
+  qpid/sys/StateMonitor.h			\
+  qpid/sys/TimeoutHandler.h			\
+  qpid/sys/Timer.cpp				\
+  qpid/sys/Timer.h				\
+  qpid/sys/Waitable.h				\
+  qpid/sys/alloca.h
 
 if HAVE_SASL
 libqpidcommon_la_SOURCES += qpid/sys/cyrus/CyrusSecurityLayer.h
@@ -373,74 +469,160 @@ libqpidbroker_la_LIBADD = libqpidcommon.la -luuid
 libqpidbroker_la_SOURCES = \
   $(mgen_broker_cpp) \
   $(posix_broker_src) \
-  qpid/amqp_0_10/Connection.h \
   qpid/amqp_0_10/Connection.cpp \
+  qpid/amqp_0_10/Connection.h \
+  qpid/broker/AclModule.h \
+  qpid/broker/Bridge.cpp \
+  qpid/broker/Bridge.h \
   qpid/broker/Broker.cpp \
+  qpid/broker/Broker.h \
+  qpid/broker/BrokerImportExport.h \
   qpid/broker/BrokerSingleton.cpp \
-  qpid/broker/Exchange.cpp \
-  qpid/broker/ExpiryPolicy.cpp \
-  qpid/broker/Queue.cpp \
-  qpid/broker/QueueCleaner.cpp \
-  qpid/broker/QueueListeners.cpp \
-  qpid/broker/PersistableMessage.cpp \
-  qpid/broker/Bridge.cpp \
+  qpid/broker/BrokerSingleton.h \
   qpid/broker/Connection.cpp \
-  qpid/broker/ConnectionHandler.cpp \
+  qpid/broker/Connection.h \
   qpid/broker/ConnectionFactory.cpp \
+  qpid/broker/ConnectionFactory.h \
+  qpid/broker/ConnectionHandler.cpp \
+  qpid/broker/ConnectionHandler.h \
+  qpid/broker/ConnectionState.h \
+  qpid/broker/ConnectionToken.h \
+  qpid/broker/Consumer.h \
   qpid/broker/Daemon.cpp \
+  qpid/broker/Daemon.h \
+  qpid/broker/Deliverable.h \
   qpid/broker/DeliverableMessage.cpp \
+  qpid/broker/DeliverableMessage.h \
+  qpid/broker/DeliveryAdapter.h \
+  qpid/broker/DeliveryId.h \
   qpid/broker/DeliveryRecord.cpp \
+  qpid/broker/DeliveryRecord.h \
   qpid/broker/DirectExchange.cpp \
+  qpid/broker/DirectExchange.h \
   qpid/broker/DtxAck.cpp \
+  qpid/broker/DtxAck.h \
   qpid/broker/DtxBuffer.cpp \
+  qpid/broker/DtxBuffer.h \
   qpid/broker/DtxManager.cpp \
+  qpid/broker/DtxManager.h \
   qpid/broker/DtxTimeout.cpp \
+  qpid/broker/DtxTimeout.h \
   qpid/broker/DtxWorkRecord.cpp \
+  qpid/broker/DtxWorkRecord.h \
+  qpid/broker/Exchange.cpp \
+  qpid/broker/Exchange.h \
   qpid/broker/ExchangeRegistry.cpp \
+  qpid/broker/ExchangeRegistry.h \
+  qpid/broker/ExpiryPolicy.cpp \
+  qpid/broker/ExpiryPolicy.h \
   qpid/broker/FanOutExchange.cpp \
+  qpid/broker/FanOutExchange.h \
+  qpid/broker/HandlerImpl.h \
   qpid/broker/HeadersExchange.cpp \
+  qpid/broker/HeadersExchange.h \
   qpid/broker/IncompleteMessageList.cpp \
+  qpid/broker/IncompleteMessageList.h \
   qpid/broker/Link.cpp \
+  qpid/broker/Link.h \
   qpid/broker/LinkRegistry.cpp \
+  qpid/broker/LinkRegistry.h \
   qpid/broker/Message.cpp \
+  qpid/broker/Message.h \
   qpid/broker/MessageAdapter.cpp \
+  qpid/broker/MessageAdapter.h \
   qpid/broker/MessageBuilder.cpp \
+  qpid/broker/MessageBuilder.h \
+  qpid/broker/MessageStore.h \
   qpid/broker/MessageStoreModule.cpp \
+  qpid/broker/MessageStoreModule.h \
   qpid/broker/NameGenerator.cpp \
+  qpid/broker/NameGenerator.h \
   qpid/broker/NullMessageStore.cpp \
+  qpid/broker/NullMessageStore.h \
+  qpid/broker/OwnershipToken.h \
+  qpid/broker/Persistable.h \
+  qpid/broker/PersistableConfig.h \
+  qpid/broker/PersistableExchange.h \
+  qpid/broker/PersistableMessage.cpp \
+  qpid/broker/PersistableMessage.h \
+  qpid/broker/PersistableQueue.h \
+  qpid/broker/Queue.cpp \
+  qpid/broker/Queue.h \
   qpid/broker/QueueBindings.cpp \
+  qpid/broker/QueueBindings.h \
+  qpid/broker/QueueCleaner.cpp \
+  qpid/broker/QueueCleaner.h \
   qpid/broker/QueueEvents.cpp \
+  qpid/broker/QueueEvents.h \
+  qpid/broker/QueueListeners.cpp \
+  qpid/broker/QueueListeners.h \
   qpid/broker/QueuePolicy.cpp \
+  qpid/broker/QueuePolicy.h \
   qpid/broker/QueueRegistry.cpp \
+  qpid/broker/QueueRegistry.h \
+  qpid/broker/QueuedMessage.h \
+  qpid/broker/RateFlowcontrol.h \
   qpid/broker/RateTracker.cpp \
-  qpid/broker/RecoveryManagerImpl.cpp \
-  qpid/broker/RecoveredEnqueue.cpp \
+  qpid/broker/RateTracker.h \
+  qpid/broker/RecoverableConfig.h \
+  qpid/broker/RecoverableExchange.h \
+  qpid/broker/RecoverableMessage.h \
+  qpid/broker/RecoverableQueue.h \
+  qpid/broker/RecoverableTransaction.h \
   qpid/broker/RecoveredDequeue.cpp \
+  qpid/broker/RecoveredDequeue.h \
+  qpid/broker/RecoveredEnqueue.cpp \
+  qpid/broker/RecoveredEnqueue.h \
+  qpid/broker/RecoveryManager.h \
+  qpid/broker/RecoveryManagerImpl.cpp \
+  qpid/broker/RecoveryManagerImpl.h \
   qpid/broker/RetryList.cpp \
+  qpid/broker/RetryList.h \
   qpid/broker/SaslAuthenticator.cpp \
+  qpid/broker/SaslAuthenticator.h \
   qpid/broker/SecureConnection.cpp \
+  qpid/broker/SecureConnection.h \
   qpid/broker/SecureConnectionFactory.cpp \
-  qpid/broker/SemanticState.h \
+  qpid/broker/SecureConnectionFactory.h \
   qpid/broker/SemanticState.cpp \
+  qpid/broker/SemanticState.h \
   qpid/broker/SessionAdapter.cpp \
-  qpid/broker/SessionState.h \
-  qpid/broker/SessionState.cpp \
-  qpid/broker/SessionManager.h \
-  qpid/broker/SessionManager.cpp \
+  qpid/broker/SessionAdapter.h \
+  qpid/broker/SessionAdapter.h \
   qpid/broker/SessionContext.h \
-  qpid/broker/SessionHandler.h \
   qpid/broker/SessionHandler.cpp \
-  qpid/broker/SignalHandler.h \
+  qpid/broker/SessionHandler.h \
+  qpid/broker/SessionManager.cpp \
+  qpid/broker/SessionManager.h \
+  qpid/broker/SessionManager.h \
+  qpid/broker/SessionState.cpp \
+  qpid/broker/SessionState.h \
   qpid/broker/SignalHandler.cpp \
+  qpid/broker/SignalHandler.h \
   qpid/broker/System.cpp \
+  qpid/broker/System.h \
   qpid/broker/Timer.cpp \
+  qpid/broker/Timer.h \
   qpid/broker/TopicExchange.cpp \
+  qpid/broker/TopicExchange.h \
+  qpid/broker/TransactionalStore.h \
   qpid/broker/TxAccept.cpp \
+  qpid/broker/TxAccept.h \
   qpid/broker/TxBuffer.cpp \
+  qpid/broker/TxBuffer.h \
+  qpid/broker/TxOp.h \
+  qpid/broker/TxOpVisitor.h \
   qpid/broker/TxPublish.cpp \
+  qpid/broker/TxPublish.h \
   qpid/broker/Vhost.cpp \
+  qpid/broker/Vhost.h \
+  qpid/management/IdAllocator.h			\
+  qpid/management/Manageable.cpp		\
   qpid/management/ManagementAgent.cpp \
+  qpid/management/ManagementAgent.h		\
   qpid/management/ManagementExchange.cpp \
+  qpid/management/ManagementExchange.h		\
+  qpid/management/ManagementObject.cpp		\
   qpid/sys/TCPIOPlugin.cpp
 
 
@@ -449,20 +631,29 @@ libqpidclient_la_LIBADD = libqpidcommon.la  -luuid
 libqpidclient_la_SOURCES =			\
   $(rgen_client_srcs)				\
   qpid/client/Bounds.cpp			\
+  qpid/client/Bounds.h				\
+  qpid/client/ChainableFrameHandler.h		\
+  qpid/client/Completion.cpp			\
+  qpid/client/CompletionImpl.h			\
   qpid/client/Connection.cpp			\
+  qpid/client/ConnectionAccess.h		\
   qpid/client/ConnectionHandler.cpp		\
+  qpid/client/ConnectionHandler.h		\
   qpid/client/ConnectionImpl.cpp		\
+  qpid/client/ConnectionImpl.h			\
   qpid/client/ConnectionSettings.cpp		\
   qpid/client/Connector.cpp			\
+  qpid/client/Connector.h			\
   qpid/client/Demux.cpp				\
+  qpid/client/Demux.h				\
   qpid/client/Dispatcher.cpp			\
-  qpid/client/FailoverManager.cpp		\
-  qpid/client/FailoverListener.h		\
+  qpid/client/Dispatcher.h			\
+  qpid/client/Execution.h			\
   qpid/client/FailoverListener.cpp		\
+  qpid/client/FailoverListener.h		\
+  qpid/client/FailoverManager.cpp		\
   qpid/client/Future.cpp			\
   qpid/client/FutureCompletion.cpp		\
-  qpid/client/Completion.cpp			\
-  qpid/client/CompletionImpl.h			\
   qpid/client/FutureResult.cpp			\
   qpid/client/LoadPlugins.cpp			\
   qpid/client/LocalQueue.cpp			\
@@ -473,279 +664,94 @@ libqpidclient_la_SOURCES =			\
   qpid/client/MessageImpl.h			\
   qpid/client/MessageListener.cpp		\
   qpid/client/MessageReplayTracker.cpp		\
+  qpid/client/PrivateImplRef.h			\
   qpid/client/QueueOptions.cpp			\
   qpid/client/Results.cpp			\
+  qpid/client/Results.h				\
+  qpid/client/Sasl.h				\
   qpid/client/SaslFactory.cpp			\
+  qpid/client/SaslFactory.h			\
   qpid/client/SessionBase_0_10.cpp		\
-  qpid/client/SessionBase_0_10.h		\
   qpid/client/SessionBase_0_10Access.h		\
-  qpid/client/ConnectionAccess.h		\
   qpid/client/SessionImpl.cpp			\
+  qpid/client/SessionImpl.h 			\
   qpid/client/StateManager.cpp			\
+  qpid/client/StateManager.h			\
   qpid/client/Subscription.cpp			\
   qpid/client/SubscriptionImpl.cpp		\
-  qpid/client/SubscriptionImpl.h 		\
+  qpid/client/SubscriptionImpl.h		\
   qpid/client/SubscriptionManager.cpp		\
   qpid/client/SubscriptionManagerImpl.cpp	\
   qpid/client/SubscriptionManagerImpl.h
 
-nobase_include_HEADERS = \
-  $(platform_hdr) \
-  $(module_hdr) \
-  qpid/amqp_0_10/apply.h \
-  qpid/assert.h \
-  qpid/Address.h \
-  qpid/DataDir.h \
-  qpid/Exception.h \
-  qpid/sys/ExceptionHolder.h \
-  qpid/amqp_0_10/Exception.h \
-  qpid/Modules.h \
-  qpid/Msg.h \
-  qpid/Options.h \
-  qpid/Plugin.h \
-  qpid/ptr_map.h \
-  qpid/RangeSet.h \
-  qpid/RefCounted.h \
-  qpid/SessionId.h \
-  qpid/SessionState.h \
-  qpid/SharedObject.h \
-  qpid/StringUtils.h \
-  qpid/Url.h \
-  qpid/InlineVector.h \
-  qpid/InlineAllocator.h \
-  qpid/memory.h \
-  qpid/Version.h \
-  qpid/broker/Broker.h \
-  qpid/broker/AclModule.h \
-  qpid/broker/SessionAdapter.h \
-  qpid/broker/Exchange.h \
-  qpid/broker/Queue.h \
-  qpid/broker/QueueListeners.h \
-  qpid/broker/QueueCleaner.h \
-  qpid/broker/BrokerImportExport.h \
-  qpid/broker/BrokerSingleton.h \
-  qpid/broker/Bridge.h \
-  qpid/broker/Connection.h \
-  qpid/broker/ConnectionState.h \
-  qpid/broker/ConnectionFactory.h \
-  qpid/broker/ConnectionHandler.h \
-  qpid/broker/ConnectionToken.h \
-  qpid/broker/OwnershipToken.h \
-  qpid/broker/Consumer.h \
-  qpid/broker/Daemon.h \
-  qpid/broker/Deliverable.h \
-  qpid/broker/DeliverableMessage.h \
-  qpid/broker/DeliveryAdapter.h \
-  qpid/broker/DeliveryId.h \
-  qpid/broker/DeliveryRecord.h \
-  qpid/broker/DirectExchange.h \
-  qpid/broker/DtxAck.h \
-  qpid/broker/DtxBuffer.h \
-  qpid/broker/DtxManager.h \
-  qpid/broker/DtxTimeout.h \
-  qpid/broker/DtxWorkRecord.h \
-  qpid/broker/ExchangeRegistry.h \
-  qpid/broker/ExpiryPolicy.h \
-  qpid/broker/FanOutExchange.h \
-  qpid/broker/HandlerImpl.h \
-  qpid/broker/HeadersExchange.h \
-  qpid/broker/IncompleteMessageList.h \
-  qpid/broker/Link.h \
-  qpid/broker/LinkRegistry.h \
-  qpid/broker/Message.h \
-  qpid/broker/MessageAdapter.h \
-  qpid/broker/MessageBuilder.h \
-  qpid/broker/MessageStore.h \
-  qpid/broker/MessageStoreModule.h \
-  qpid/broker/NameGenerator.h \
-  qpid/broker/NullMessageStore.h \
-  qpid/broker/Persistable.h \
-  qpid/broker/PersistableConfig.h \
-  qpid/broker/PersistableExchange.h \
-  qpid/broker/PersistableMessage.h \
-  qpid/broker/PersistableQueue.h \
-  qpid/broker/QueueBindings.h \
-  qpid/broker/QueueEvents.h \
-  qpid/broker/QueuedMessage.h \
-  qpid/broker/QueuePolicy.h \
-  qpid/broker/QueueRegistry.h \
-  qpid/broker/RateFlowcontrol.h \
-  qpid/broker/RateTracker.h \
-  qpid/broker/RecoverableConfig.h \
-  qpid/broker/RecoverableExchange.h \
-  qpid/broker/RecoverableMessage.h \
-  qpid/broker/RecoverableQueue.h \
-  qpid/broker/RecoverableTransaction.h \
-  qpid/broker/RecoveredDequeue.h \
-  qpid/broker/RecoveredEnqueue.h \
-  qpid/broker/RecoveryManager.h \
-  qpid/broker/RecoveryManagerImpl.h \
-  qpid/broker/RetryList.h \
-  qpid/broker/SaslAuthenticator.h \
-  qpid/broker/SecureConnection.h \
-  qpid/broker/SecureConnectionFactory.h \
-  qpid/broker/SessionAdapter.h \
-  qpid/broker/SessionManager.h \
-  qpid/broker/System.h \
-  qpid/broker/Timer.h \
-  qpid/broker/TopicExchange.h \
-  qpid/broker/TransactionalStore.h \
-  qpid/broker/TxAccept.h \
-  qpid/broker/TxBuffer.h \
-  qpid/broker/TxOp.h \
-  qpid/broker/TxOpVisitor.h \
-  qpid/broker/TxPublish.h \
-  qpid/broker/Vhost.h \
-  qpid/client/Bounds.h \
-  qpid/client/ChainableFrameHandler.h \
-  qpid/client/ClientImportExport.h \
-  qpid/client/Completion.h \
-  qpid/client/Connection.h \
-  qpid/client/ConnectionHandler.h \
-  qpid/client/ConnectionImpl.h \
-  qpid/client/ConnectionSettings.h \
-  qpid/client/Connector.h \
-  qpid/client/Demux.h \
-  qpid/client/Dispatcher.h \
-  qpid/client/Execution.h \
-  qpid/client/FailoverManager.h \
-  qpid/client/Subscription.h \
-  qpid/client/SubscriptionSettings.h \
-  qpid/client/FlowControl.h \
-  qpid/client/Future.h \
-  qpid/client/FutureCompletion.h \
-  qpid/client/FutureResult.h \
-  qpid/client/Handle.h \
-  qpid/client/PrivateImplRef.h \
-  qpid/client/LocalQueue.h \
-  qpid/client/QueueOptions.h \
-  qpid/client/Message.h \
-  qpid/client/MessageListener.h \
-  qpid/client/MessageReplayTracker.h \
-  qpid/client/Results.h \
-  qpid/client/Sasl.h \
-  qpid/client/SaslFactory.h \
-  qpid/client/SessionBase_0_10.h \
-  qpid/client/Session.h \
-  qpid/client/SessionImpl.h \
-  qpid/client/AsyncSession.h \
-  qpid/client/StateManager.h \
-  qpid/client/SubscriptionManager.h \
-  qpid/client/TypedResult.h \
-  qpid/framing/AMQBody.h \
-  qpid/framing/AMQCommandControlBody.h \
-  qpid/framing/AMQContentBody.h \
-  qpid/framing/AMQDataBlock.h \
-  qpid/framing/AMQFrame.h \
-  qpid/framing/AMQHeaderBody.h \
-  qpid/framing/AMQHeartbeatBody.h \
-  qpid/framing/AMQMethodBody.h \
-  qpid/framing/AMQP_HighestVersion.h \
-  qpid/framing/AccumulatedAck.h \
-  qpid/framing/Array.h \
-  qpid/framing/BodyHandler.h \
-  qpid/framing/BodyFactory.h \
-  qpid/framing/MethodBodyFactory.h \
-  qpid/framing/Buffer.h \
-  qpid/framing/ChannelHandler.h \
-  qpid/framing/Endian.h \
-  qpid/framing/FieldTable.h \
-  qpid/framing/FieldValue.h \
-  qpid/framing/FrameDefaultVisitor.h \
-  qpid/framing/FrameDecoder.h \
-  qpid/framing/FrameHandler.h \
-  qpid/framing/FrameSet.h \
-  qpid/framing/Handler.h \
-  qpid/framing/HeaderProperties.h \
-  qpid/framing/Invoker.h \
-  qpid/framing/InputHandler.h \
-  qpid/framing/InitiationHandler.h \
-  qpid/framing/MethodContent.h \
-  qpid/framing/ModelMethod.h \
-  qpid/framing/OutputHandler.h \
-  qpid/framing/ProtocolInitiation.h \
-  qpid/framing/ProtocolVersion.h \
-  qpid/framing/Proxy.h \
-  qpid/framing/SendContent.h \
-  qpid/framing/SequenceNumber.h \
-  qpid/framing/SequenceSet.h \
-  qpid/framing/SequenceNumberSet.h \
-  qpid/framing/StructHelper.h \
-  qpid/framing/TransferContent.h \
-  qpid/framing/TypeFilter.h \
-  qpid/framing/Uuid.h \
-  qpid/framing/Visitor.h \
-  qpid/framing/amqp_framing.h \
-  qpid/framing/amqp_types.h \
-  qpid/framing/amqp_types_full.h \
-  qpid/framing/frame_functors.h \
-  qpid/framing/variant.h \
-  qpid/log/Helpers.h \
-  qpid/log/Options.h \
-  qpid/log/Logger.h \
-  qpid/log/OstreamOutput.h \
-  qpid/log/Selector.h \
-  qpid/log/SinkOptions.h \
-  qpid/log/Statement.h \
-  qpid/management/Args.h \
-  qpid/management/IdAllocator.h \
-  qpid/management/Manageable.h \
-  qpid/management/ManagementAgent.h \
-  qpid/management/ManagementEvent.h \
-  qpid/management/ManagementExchange.h \
-  qpid/management/ManagementObject.h \
-  qpid/sys/alloca.h \
-  qpid/sys/AggregateOutput.h \
-  qpid/sys/AsynchIO.h \
-  qpid/sys/AsynchIOHandler.h \
-  qpid/sys/AtomicCount.h \
-  qpid/sys/AtomicValue.h \
-  qpid/sys/AtomicValue_gcc.h \
-  qpid/sys/AtomicValue_mutex.h \
-  qpid/sys/BlockingQueue.h \
-  qpid/sys/Codec.h \
-  qpid/sys/CopyOnWriteArray.h \
-  qpid/sys/Condition.h \
-  qpid/sys/ConnectionCodec.h \
-  qpid/sys/ConnectionInputHandler.h \
-  qpid/sys/ConnectionInputHandlerFactory.h \
-  qpid/sys/ConnectionOutputHandler.h \
-  qpid/sys/ConnectionOutputHandlerPtr.h \
-  qpid/sys/DeletionManager.h \
-  qpid/sys/Dispatcher.h \
-  qpid/sys/DispatchHandle.h \
-  qpid/sys/FileSysDir.h \
-  qpid/sys/IntegerTypes.h \
-  qpid/sys/IOHandle.h \
-  qpid/sys/LockFile.h \
-  qpid/sys/LockPtr.h \
-  qpid/sys/Monitor.h \
-  qpid/sys/Mutex.h \
-  qpid/sys/OutputControl.h \
-  qpid/sys/OutputTask.h \
-  qpid/sys/PipeHandle.h \
-  qpid/sys/PollableCondition.h \
-  qpid/sys/PollableQueue.h \
-  qpid/sys/Poller.h \
-  qpid/sys/ProtocolFactory.h \
-  qpid/sys/Runnable.h \
-  qpid/sys/Fork.h \
-  qpid/sys/ScopedIncrement.h \
-  qpid/sys/SecurityLayer.h \
-  qpid/sys/Semaphore.h \
-  qpid/sys/SystemInfo.h \
-  qpid/sys/Shlib.h \
-  qpid/sys/ShutdownHandler.h \
-  qpid/sys/Socket.h \
-  qpid/sys/StateMonitor.h \
-  qpid/sys/StrError.h \
-  qpid/sys/Waitable.h \
-  qpid/sys/Thread.h \
-  qpid/sys/Time.h \
-  qpid/sys/Timer.h \
-  qpid/sys/TimeoutHandler.h \
-  qpid/sys/uuid.h \
-  qpid/CommonImportExport.h
+# NOTE: only public header files (which should be in ../include)
+# should go in this list. Private headers should go in the SOURCES
+# list for one of the libraries or executables that includes it.
+
+nobase_include_HEADERS +=			\
+  ../include/qpid/Address.h			\
+  ../include/qpid/CommonImportExport.h		\
+  ../include/qpid/Exception.h			\
+  ../include/qpid/InlineAllocator.h		\
+  ../include/qpid/InlineVector.h		\
+  ../include/qpid/Msg.h				\
+  ../include/qpid/Options.h			\
+  ../include/qpid/RangeSet.h			\
+  ../include/qpid/SessionId.h			\
+  ../include/qpid/Url.h				\
+  ../include/qpid/client/AsyncSession.h		\
+  ../include/qpid/client/ClientImportExport.h	\
+  ../include/qpid/client/Completion.h		\
+  ../include/qpid/client/Connection.h		\
+  ../include/qpid/client/ConnectionSettings.h	\
+  ../include/qpid/client/FailoverManager.h	\
+  ../include/qpid/client/FlowControl.h		\
+  ../include/qpid/client/Future.h		\
+  ../include/qpid/client/FutureCompletion.h	\
+  ../include/qpid/client/FutureResult.h		\
+  ../include/qpid/client/Handle.h		\
+  ../include/qpid/client/LocalQueue.h		\
+  ../include/qpid/client/Message.h		\
+  ../include/qpid/client/MessageListener.h	\
+  ../include/qpid/client/MessageReplayTracker.h	\
+  ../include/qpid/client/QueueOptions.h		\
+  ../include/qpid/client/Session.h		\
+  ../include/qpid/client/SessionBase_0_10.h	\
+  ../include/qpid/client/Subscription.h		\
+  ../include/qpid/client/SubscriptionManager.h	\
+  ../include/qpid/client/SubscriptionSettings.h	\
+  ../include/qpid/client/TypedResult.h		\
+  ../include/qpid/framing/Array.h		\
+  ../include/qpid/framing/Buffer.h		\
+  ../include/qpid/framing/FieldTable.h		\
+  ../include/qpid/framing/FieldValue.h		\
+  ../include/qpid/framing/ProtocolVersion.h	\
+  ../include/qpid/framing/SequenceNumber.h	\
+  ../include/qpid/framing/SequenceSet.h		\
+  ../include/qpid/framing/StructHelper.h	\
+  ../include/qpid/framing/Uuid.h		\
+  ../include/qpid/framing/amqp_types.h		\
+  ../include/qpid/framing/amqp_types_full.h	\
+  ../include/qpid/log/Logger.h			\
+  ../include/qpid/log/Options.h			\
+  ../include/qpid/log/Selector.h		\
+  ../include/qpid/log/SinkOptions.h		\
+  ../include/qpid/log/Statement.h		\
+  ../include/qpid/management/Args.h		\
+  ../include/qpid/management/Manageable.h	\
+  ../include/qpid/management/ManagementEvent.h	\
+  ../include/qpid/management/ManagementObject.h	\
+  ../include/qpid/sys/Condition.h		\
+  ../include/qpid/sys/IOHandle.h		\
+  ../include/qpid/sys/IntegerTypes.h		\
+  ../include/qpid/sys/Monitor.h			\
+  ../include/qpid/sys/Mutex.h			\
+  ../include/qpid/sys/Runnable.h		\
+  ../include/qpid/sys/StrError.h		\
+  ../include/qpid/sys/SystemInfo.h		\
+  ../include/qpid/sys/Thread.h			\
+  ../include/qpid/sys/Time.h			\
+  ../include/qpid/sys/uuid.h
 
 # Force build of qpidd during dist phase so help2man will work.
 dist-hook: $(BUILT_SOURCES)
diff --git a/qpid/cpp/src/qmf.mk b/qpid/cpp/src/qmf.mk
index 44e30efd9b..62393cdcfb 100644
--- a/qpid/cpp/src/qmf.mk
+++ b/qpid/cpp/src/qmf.mk
@@ -20,46 +20,47 @@
 #
 # qmf agent library makefile fragment, to be included in Makefile.am
 # 
-lib_LTLIBRARIES += \
-  libqmfcommon.la \
+lib_LTLIBRARIES +=				\
+  libqmfcommon.la				\
   libqmfagent.la
 
-module_hdr += \
-  qpid/agent/ManagementAgent.h \
-  qpid/agent/ManagementAgentImpl.h \
-  qpid/agent/QmfAgentImportExport.h \
-  qmf/Agent.h \
-  qmf/Console.h \
-  qmf/Event.h \
-  qmf/Message.h \
-  qmf/MessageImpl.h \
-  qmf/Object.h \
-  qmf/ObjectId.h \
-  qmf/ObjectIdImpl.h \
-  qmf/ObjectImpl.h \
-  qmf/Query.h \
-  qmf/QueryImpl.h \
-  qmf/ResilientConnection.h \
-  qmf/Schema.h \
-  qmf/SchemaImpl.h \
-  qmf/Typecode.h \
-  qmf/Value.h \
-  qmf/ValueImpl.h
+# Public header files
+nobase_include_HEADERS +=			\
+  ../include/qpid/agent/ManagementAgent.h	\
+  ../include/qpid/agent/QmfAgentImportExport.h
+
 
-libqmfcommon_la_SOURCES = \
-  qmf/Agent.cpp \
-  qmf/ResilientConnection.cpp \
-  qmf/MessageImpl.cpp \
-  qmf/SchemaImpl.cpp \
-  qmf/ValueImpl.cpp \
-  qmf/ObjectIdImpl.cpp \
-  qmf/ObjectImpl.cpp \
-  qmf/QueryImpl.cpp
+libqmfcommon_la_SOURCES =			\
+  qmf/Agent.cpp					\
+  qmf/Agent.h					\
+  qmf/Console.h					\
+  qmf/Event.h					\
+  qmf/Message.h					\
+  qmf/MessageImpl.cpp				\
+  qmf/MessageImpl.h				\
+  qmf/Object.h					\
+  qmf/ObjectId.h				\
+  qmf/ObjectIdImpl.cpp				\
+  qmf/ObjectIdImpl.h				\
+  qmf/ObjectImpl.cpp				\
+  qmf/ObjectImpl.h				\
+  qmf/Query.h					\
+  qmf/QueryImpl.cpp				\
+  qmf/QueryImpl.h				\
+  qmf/ResilientConnection.cpp			\
+  qmf/ResilientConnection.h			\
+  qmf/Schema.h					\
+  qmf/SchemaImpl.cpp				\
+  qmf/SchemaImpl.h				\
+  qmf/Typecode.h				\
+  qmf/Value.h					\
+  qmf/ValueImpl.cpp				\
+  qmf/ValueImpl.h
 
-libqmfagent_la_SOURCES = \
-  qpid/agent/ManagementAgent.h \
-  qpid/agent/ManagementAgentImpl.cpp \
-  qpid/agent/ManagementAgentImpl.h \
+libqmfagent_la_SOURCES =			\
+  ../include/qpid/agent/ManagementAgent.h	\
+  qpid/agent/ManagementAgentImpl.cpp		\
+  qpid/agent/ManagementAgentImpl.h		\
   qmf/Agent.cpp
 
 libqmfagent_la_LIBADD = libqpidclient.la
diff --git a/qpid/cpp/src/qmfc.mk b/qpid/cpp/src/qmfc.mk
index a95028413d..f3e6dc259d 100644
--- a/qpid/cpp/src/qmfc.mk
+++ b/qpid/cpp/src/qmfc.mk
@@ -22,45 +22,33 @@
 # 
 lib_LTLIBRARIES += libqmfconsole.la
 
-module_hdr += \
-  qpid/console/Agent.h \
-  qpid/console/Broker.h \
-  qpid/console/ClassKey.h \
-  qpid/console/ConsoleImportExport.h \
-  qpid/console/ConsoleListener.h \
-  qpid/console/Event.h \
-  qpid/console/Object.h \
-  qpid/console/ObjectId.h \
-  qpid/console/Package.h \
-  qpid/console/Schema.h \
-  qpid/console/SequenceManager.h \
-  qpid/console/SessionManager.h \
-  qpid/console/Value.h
+# Public header files.
+nobase_include_HEADERS +=			\
+  ../include/qpid/console/Agent.h		\
+  ../include/qpid/console/Broker.h		\
+  ../include/qpid/console/ClassKey.h		\
+  ../include/qpid/console/ConsoleImportExport.h	\
+  ../include/qpid/console/ConsoleListener.h	\
+  ../include/qpid/console/Event.h		\
+  ../include/qpid/console/Object.h		\
+  ../include/qpid/console/ObjectId.h		\
+  ../include/qpid/console/Package.h		\
+  ../include/qpid/console/Schema.h		\
+  ../include/qpid/console/SequenceManager.h	\
+  ../include/qpid/console/SessionManager.h	\
+  ../include/qpid/console/Value.h
 
-libqmfconsole_la_SOURCES = \
-  qpid/console/Agent.h \
-  qpid/console/Agent.cpp \
-  qpid/console/Broker.h \
-  qpid/console/Broker.cpp \
-  qpid/console/ClassKey.h \
-  qpid/console/ClassKey.cpp \
-  qpid/console/ConsoleImportExport.h \
-  qpid/console/ConsoleListener.h \
-  qpid/console/Event.h \
-  qpid/console/Event.cpp \
-  qpid/console/Object.h \
-  qpid/console/Object.cpp \
-  qpid/console/ObjectId.h \
-  qpid/console/ObjectId.cpp \
-  qpid/console/Package.h \
-  qpid/console/Package.cpp \
-  qpid/console/Schema.h \
-  qpid/console/Schema.cpp \
-  qpid/console/SequenceManager.h \
-  qpid/console/SequenceManager.cpp \
-  qpid/console/SessionManager.h \
-  qpid/console/SessionManager.cpp \
-  qpid/console/Value.h \
+libqmfconsole_la_SOURCES =			\
+  qpid/console/Agent.cpp			\
+  qpid/console/Broker.cpp			\
+  qpid/console/ClassKey.cpp			\
+  qpid/console/Event.cpp			\
+  qpid/console/Object.cpp			\
+  qpid/console/ObjectId.cpp			\
+  qpid/console/Package.cpp			\
+  qpid/console/Schema.cpp			\
+  qpid/console/SequenceManager.cpp		\
+  qpid/console/SessionManager.cpp		\
   qpid/console/Value.cpp
 
 libqmfconsole_la_LIBADD = libqpidclient.la
diff --git a/qpid/cpp/src/tests/Makefile.am b/qpid/cpp/src/tests/Makefile.am
index e318942cbf..3700ab4b4b 100644
--- a/qpid/cpp/src/tests/Makefile.am
+++ b/qpid/cpp/src/tests/Makefile.am
@@ -18,7 +18,7 @@
 #
 
 AM_CXXFLAGS = $(WARNING_CFLAGS) -DBOOST_TEST_DYN_LINK
-INCLUDES =  -I$(srcdir)/.. -I$(srcdir)/../gen -I$(top_builddir)/src/gen
+INCLUDES =  -I$(top_srcdir)/include -I$(srcdir)/.. -I$(srcdir)/../gen -I$(top_builddir)/src/gen
 
 abs_builddir=@abs_builddir@
 extra_libs =