Fill out remaining exports for broker lib to link in unit_tests

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

30 files changed, 430 insertions, 317 deletions

diff --git a/qpid/cpp/src/broker.vcproj b/qpid/cpp/src/broker.vcproj
index 138d44c12b..7f23557eae 100644
--- a/qpid/cpp/src/broker.vcproj
+++ b/qpid/cpp/src/broker.vcproj
@@ -43,8 +43,8 @@
 		<Configuration

 			Name="Debug|Win32"

 			OutputDirectory="."

-			IntermediateDirectory="Static_Debug\broker\I386"

-			ConfigurationType="4"

+			IntermediateDirectory="Debug\broker\I386"

+			ConfigurationType="2"

 			CharacterSet="0"

 

 			>

@@ -72,8 +72,8 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="$(BOOST_ROOT)\.,.,gen"

-                                PreprocessorDefinitions="QPID_BROKER_STATIC;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"

+				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"

+                                PreprocessorDefinitions="BROKER_EXPORT;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"

 				MinimalRebuild="false"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

@@ -90,14 +90,22 @@
 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_DEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"

 				Culture="1033"

-				AdditionalIncludeDirectories="$(BOOST_ROOT)\.,.,gen"

+				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)\qpidbrokersd.lib"

+				Name="VCLinkerTool"

+				AdditionalDependencies="qpidcommond.lib secur32.lib"

+				OutputFile="$(OutDir)\qpidbrokerd.dll"

+				LinkIncremental="2"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"

+				GenerateDebugInformation="true"

+				SubSystem="2"

+				ImportLibrary=".\qpidbrokerd.lib"

+				TargetMachine="1"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -113,13 +121,14 @@
 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

+				CommandLine="@if not exist deploy\lib mkdir deploy\lib&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y $(OutDir)\qpidbrokerd.dll deploy\lib\&#x0D;&#x0A;@copy /Y .\qpidbrokerd.lib deploy\lib\&#x0D;&#x0A;"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory="."

-			IntermediateDirectory="Static_Release\broker\I386"

-			ConfigurationType="4"

+			IntermediateDirectory="Release\broker\I386"

+			ConfigurationType="2"

 			CharacterSet="0"

 

 			>

@@ -147,9 +156,9 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

-				AdditionalIncludeDirectories="$(BOOST_ROOT)\.,.,gen"

-                                PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"

-				RuntimeLibrary="0"

+				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"

+                                PreprocessorDefinitions="BROKER_EXPORT;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"

+				RuntimeLibrary="2"

 				RuntimeTypeInfo="true"

 				WarningLevel="3"

 				Detect64BitPortabilityProblems="false"

@@ -168,8 +177,18 @@
 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)\qpidbrokers.lib"

+				Name="VCLinkerTool"

+				AdditionalDependencies="qpidcommon.lib secur32.lib"

+				OutputFile="$(OutDir)\qpidbroker.dll"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"

+				GenerateDebugInformation="true"

+				SubSystem="2"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				ImportLibrary=".\qpidbroker.lib"

+				TargetMachine="1"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -185,13 +204,14 @@
 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

+				CommandLine="@if not exist deploy\lib mkdir deploy\lib&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y $(OutDir)\qpidbroker.dll deploy\lib\&#x0D;&#x0A;@copy /Y .\qpidbroker.lib deploy\lib\&#x0D;&#x0A;"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|x64"

 			OutputDirectory="."

-			IntermediateDirectory="Static_Debug\broker\AMD64"

-			ConfigurationType="4"

+			IntermediateDirectory="Debug\broker\AMD64"

+			ConfigurationType="2"

 			CharacterSet="0"

 

 			>

@@ -219,11 +239,11 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="$(BOOST_ROOT)\.,.,gen"

-                                PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"

+				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"

+                                PreprocessorDefinitions="BROKER_EXPORT;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"

 				MinimalRebuild="false"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

+				RuntimeLibrary="3"

 				RuntimeTypeInfo="true"

 				WarningLevel="3"

 				Detect64BitPortabilityProblems="false"

@@ -243,8 +263,17 @@
 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)\qpidbrokersd.lib"

+				Name="VCLinkerTool"

+				AdditionalOptions="/machine:AMD64"

+				AdditionalDependencies="qpidcommond.lib secur32.lib"

+				OutputFile="$(OutDir)\qpidbrokerd.dll"

+				LinkIncremental="2"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"

+				GenerateDebugInformation="true"

+				SubSystem="2"

+				ImportLibrary=".\qpidbrokerd.lib"

+				TargetMachine="17"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -260,13 +289,14 @@
 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

+				CommandLine="@if not exist deploy\lib mkdir deploy\lib&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y $(OutDir)\qpidbrokerd.dll deploy\lib\&#x0D;&#x0A;@copy /Y .\qpidbrokerd.lib deploy\lib\&#x0D;&#x0A;"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Release|x64"

 			OutputDirectory="."

-			IntermediateDirectory="Static_Release\broker\AMD64"

-			ConfigurationType="4"

+			IntermediateDirectory="Release\broker\AMD64"

+			ConfigurationType="2"

 			CharacterSet="0"

 

 			>

@@ -294,9 +324,9 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

-				AdditionalIncludeDirectories="$(BOOST_ROOT)\.,.,gen"

-                                PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"

-				RuntimeLibrary="0"

+				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"

+                                PreprocessorDefinitions="BROKER_EXPORT;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"

+				RuntimeLibrary="2"

 				RuntimeTypeInfo="true"

 				WarningLevel="3"

 				Detect64BitPortabilityProblems="false"

@@ -315,8 +345,19 @@
 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)\qpidbrokers.lib"

+				Name="VCLinkerTool"

+				AdditionalOptions="/machine:AMD64"

+				AdditionalDependencies="qpidcommon.lib secur32.lib"

+				OutputFile="$(OutDir)\qpidbroker.dll"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"

+				GenerateDebugInformation="true"

+				SubSystem="2"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				ImportLibrary=".\qpidbroker.lib"

+				TargetMachine="17"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -332,6 +373,7 @@
 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

+				CommandLine="@if not exist deploy\lib mkdir deploy\lib&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y $(OutDir)\qpidbroker.dll deploy\lib\&#x0D;&#x0A;@copy /Y .\qpidbroker.lib deploy\lib\&#x0D;&#x0A;"

 			/>

 		</Configuration>

 	</Configurations>

diff --git a/qpid/cpp/src/qpid/broker/Broker.h b/qpid/cpp/src/qpid/broker/Broker.h
index a52a0f67e0..5a1529a3ba 100644
--- a/qpid/cpp/src/qpid/broker/Broker.h
+++ b/qpid/cpp/src/qpid/broker/Broker.h
@@ -22,6 +22,7 @@
  *
  */
 
+#include "BrokerImportExport.h"
 #include "ConnectionFactory.h"
 #include "ConnectionToken.h"
 #include "DirectExchange.h"
@@ -80,15 +81,16 @@ struct NoSuchTransportException : qpid::Exception
  * A broker instance. 
  */
 class Broker : public sys::Runnable, public Plugin::Target,
-               public management::Manageable, public RefCounted
+               public management::Manageable,
+               public RefCounted
 {
-  public:
+public:
 
     struct Options : public qpid::Options {
         static const std::string DEFAULT_DATA_DIR_LOCATION;
         static const std::string DEFAULT_DATA_DIR_NAME;
 
-        Options(const std::string& name="Broker Options");
+        QPID_BROKER_EXTERN Options(const std::string& name="Broker Options");
 
         bool noDataDir;
         std::string dataDir;
@@ -148,9 +150,9 @@ class Broker : public sys::Runnable, public Plugin::Target,
   
     virtual ~Broker();
 
-    Broker(const Options& configuration);
-    static boost::intrusive_ptr<Broker> create(const Options& configuration);
-    static boost::intrusive_ptr<Broker> create(int16_t port = DEFAULT_PORT);
+    QPID_BROKER_EXTERN Broker(const Options& configuration);
+    static QPID_BROKER_EXTERN boost::intrusive_ptr<Broker> create(const Options& configuration);
+    static QPID_BROKER_EXTERN boost::intrusive_ptr<Broker> create(int16_t port = DEFAULT_PORT);
 
     /**
      * Return listening port. If called before bind this is
@@ -169,7 +171,7 @@ class Broker : public sys::Runnable, public Plugin::Target,
     /** Shut down the broker */
     virtual void shutdown();
 
-    void setStore (MessageStore*);
+    QPID_BROKER_EXTERN void setStore (MessageStore*);
     MessageStore& getStore() { return *store; }
     void setAcl (AclModule* _acl) {acl = _acl;}
     AclModule* getAcl() { return acl; }
@@ -229,7 +231,7 @@ class Broker : public sys::Runnable, public Plugin::Target,
 
     boost::function<std::vector<Url> ()> getKnownBrokers;
 
-    static const std::string TCP_TRANSPORT;
+    static QPID_BROKER_EXTERN const std::string TCP_TRANSPORT;
 
     void setRecovery(bool set) { recovery = set; }
     bool getRecovery() const { return recovery; }
diff --git a/qpid/cpp/src/qpid/broker/BrokerSingleton.h b/qpid/cpp/src/qpid/broker/BrokerSingleton.h
index 22b707506b..3a842ee05a 100644
--- a/qpid/cpp/src/qpid/broker/BrokerSingleton.h
+++ b/qpid/cpp/src/qpid/broker/BrokerSingleton.h
@@ -20,6 +20,7 @@
  */
 
 #include "Broker.h"
+#include "BrokerImportExport.h"
 
 namespace qpid {
 namespace broker {
@@ -36,7 +37,7 @@ namespace broker {
  *
  * THREAD UNSAFE.
  */
-class BrokerSingleton : public boost::intrusive_ptr<Broker>
+class QPID_BROKER_EXTERN BrokerSingleton : public boost::intrusive_ptr<Broker>
 {
   public:
     BrokerSingleton();
diff --git a/qpid/cpp/src/qpid/broker/DeliverableMessage.h b/qpid/cpp/src/qpid/broker/DeliverableMessage.h
index f5db473c22..ad944c746b 100644
--- a/qpid/cpp/src/qpid/broker/DeliverableMessage.h
+++ b/qpid/cpp/src/qpid/broker/DeliverableMessage.h
@@ -21,6 +21,7 @@
 #ifndef _DeliverableMessage_
 #define _DeliverableMessage_
 
+#include "BrokerImportExport.h"
 #include "Deliverable.h"
 #include "Queue.h"
 #include "Message.h"
@@ -32,10 +33,10 @@ namespace qpid {
         class DeliverableMessage : public Deliverable{
             boost::intrusive_ptr<Message> msg;
         public:
-            DeliverableMessage(const boost::intrusive_ptr<Message>& msg);
-            virtual void deliverTo(const boost::shared_ptr<Queue>& queue);
-            Message& getMessage();
-            uint64_t contentSize();
+            QPID_BROKER_EXTERN DeliverableMessage(const boost::intrusive_ptr<Message>& msg);
+            QPID_BROKER_EXTERN virtual void deliverTo(const boost::shared_ptr<Queue>& queue);
+            QPID_BROKER_EXTERN Message& getMessage();
+            QPID_BROKER_EXTERN uint64_t contentSize();
             virtual ~DeliverableMessage(){}
         };
     }
diff --git a/qpid/cpp/src/qpid/broker/DeliveryRecord.h b/qpid/cpp/src/qpid/broker/DeliveryRecord.h
index d7ccab0726..2b2d4d0515 100644
--- a/qpid/cpp/src/qpid/broker/DeliveryRecord.h
+++ b/qpid/cpp/src/qpid/broker/DeliveryRecord.h
@@ -26,6 +26,7 @@
 #include <vector>
 #include <ostream>
 #include "qpid/framing/SequenceSet.h"
+#include "BrokerImportExport.h"
 #include "Queue.h"
 #include "QueuedMessage.h"
 #include "DeliveryId.h"
@@ -74,17 +75,16 @@ class DeliveryRecord
     const uint32_t credit;
 
   public:
-    DeliveryRecord(
-        const QueuedMessage& msg,
-        const Queue::shared_ptr& queue, 
-        const std::string& tag,
-        bool acquired,
-        bool accepted,
-        bool windowing,
-        uint32_t credit=0       // Only used if msg is empty.
+    QPID_BROKER_EXTERN DeliveryRecord(const QueuedMessage& msg,
+                                      const Queue::shared_ptr& queue, 
+                                      const std::string& tag,
+                                      bool acquired,
+                                      bool accepted,
+                                      bool windowing,
+                                      uint32_t credit=0       // Only used if msg is empty.
     );
     
-    bool matches(DeliveryId tag) const;
+    QPID_BROKER_EXTERN bool matches(DeliveryId tag) const;
     bool matchOrAfter(DeliveryId tag) const;
     bool after(DeliveryId tag) const;
     bool coveredBy(const framing::SequenceSet* const range) const;
@@ -119,7 +119,7 @@ class DeliveryRecord
     const QueuedMessage& getMessage() const { return msg; }
     framing::SequenceNumber getId() const { return id; }
     Queue::shared_ptr getQueue() const { return queue; }
-    friend bool operator<(const DeliveryRecord&, const DeliveryRecord&);         
+    friend QPID_BROKER_EXTERN bool operator<(const DeliveryRecord&, const DeliveryRecord&);         
     friend std::ostream& operator<<(std::ostream&, const DeliveryRecord&);
 };
 
diff --git a/qpid/cpp/src/qpid/broker/DirectExchange.h b/qpid/cpp/src/qpid/broker/DirectExchange.h
index ba60469df8..27d101c4fe 100644
--- a/qpid/cpp/src/qpid/broker/DirectExchange.h
+++ b/qpid/cpp/src/qpid/broker/DirectExchange.h
@@ -23,6 +23,7 @@
 
 #include <map>
 #include <vector>
+#include "BrokerImportExport.h"
 #include "Exchange.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/sys/CopyOnWriteArray.h"
@@ -44,18 +45,27 @@ class DirectExchange : public virtual Exchange {
 public:
     static const std::string typeName;
         
-    DirectExchange(const std::string& name, management::Manageable* parent = 0);
-    DirectExchange(const string& _name, bool _durable, 
-                   const qpid::framing::FieldTable& _args, management::Manageable* parent = 0);
+    QPID_BROKER_EXTERN DirectExchange(const std::string& name,
+                                      management::Manageable* parent = 0);
+    QPID_BROKER_EXTERN DirectExchange(const string& _name,
+                                      bool _durable, 
+                                      const qpid::framing::FieldTable& _args,
+                                      management::Manageable* parent = 0);
 
     virtual std::string getType() const { return typeName; }            
         
-    virtual bool bind(Queue::shared_ptr queue, const std::string& routingKey, const qpid::framing::FieldTable* args);
+    QPID_BROKER_EXTERN virtual bool bind(Queue::shared_ptr queue,
+                                         const std::string& routingKey,
+                                         const qpid::framing::FieldTable* args);
     virtual bool unbind(Queue::shared_ptr queue, const std::string& routingKey, const qpid::framing::FieldTable* args);
-    virtual void route(Deliverable& msg, const std::string& routingKey, const qpid::framing::FieldTable* args);
-    virtual bool isBound(Queue::shared_ptr queue, const string* const routingKey, const qpid::framing::FieldTable* const args);
+    QPID_BROKER_EXTERN virtual void route(Deliverable& msg,
+                                          const std::string& routingKey,
+                                          const qpid::framing::FieldTable* args);
+    QPID_BROKER_EXTERN virtual bool isBound(Queue::shared_ptr queue,
+                                            const string* const routingKey,
+                                            const qpid::framing::FieldTable* const args);
 
-    virtual ~DirectExchange();
+    QPID_BROKER_EXTERN virtual ~DirectExchange();
 
     virtual bool supportsDynamicBinding() { return true; }
 };
diff --git a/qpid/cpp/src/qpid/broker/DtxBuffer.h b/qpid/cpp/src/qpid/broker/DtxBuffer.h
index b302632037..ce37d09b7a 100644
--- a/qpid/cpp/src/qpid/broker/DtxBuffer.h
+++ b/qpid/cpp/src/qpid/broker/DtxBuffer.h
@@ -21,6 +21,7 @@
 #ifndef _DtxBuffer_
 #define _DtxBuffer_
 
+#include "BrokerImportExport.h"
 #include "TxBuffer.h"
 #include "qpid/sys/Mutex.h"
 
@@ -37,9 +38,9 @@ namespace qpid {
         public:
             typedef boost::shared_ptr<DtxBuffer> shared_ptr;
 
-            DtxBuffer(const std::string& xid = "");
-            ~DtxBuffer();
-            void markEnded();
+            QPID_BROKER_EXTERN DtxBuffer(const std::string& xid = "");
+            QPID_BROKER_EXTERN ~DtxBuffer();
+            QPID_BROKER_EXTERN void markEnded();
             bool isEnded();
             void setSuspended(bool suspended);
             bool isSuspended();
diff --git a/qpid/cpp/src/qpid/broker/DtxWorkRecord.h b/qpid/cpp/src/qpid/broker/DtxWorkRecord.h
index 6677784c32..21fc759d66 100644
--- a/qpid/cpp/src/qpid/broker/DtxWorkRecord.h
+++ b/qpid/cpp/src/qpid/broker/DtxWorkRecord.h
@@ -21,6 +21,7 @@
 #ifndef _DtxWorkRecord_
 #define _DtxWorkRecord_
 
+#include "BrokerImportExport.h"
 #include "DtxBuffer.h"
 #include "DtxTimeout.h"
 #include "TransactionalStore.h"
@@ -61,12 +62,13 @@ class DtxWorkRecord
     void abort();
     bool prepare(TransactionContext* txn);
 public:
-    DtxWorkRecord(const std::string& xid, TransactionalStore* const store);
-    ~DtxWorkRecord();
-    bool prepare();
-    bool commit(bool onePhase);
-    void rollback();
-    void add(DtxBuffer::shared_ptr ops);
+    QPID_BROKER_EXTERN DtxWorkRecord(const std::string& xid,
+                                     TransactionalStore* const store);
+    QPID_BROKER_EXTERN ~DtxWorkRecord();
+    QPID_BROKER_EXTERN bool prepare();
+    QPID_BROKER_EXTERN bool commit(bool onePhase);
+    QPID_BROKER_EXTERN void rollback();
+    QPID_BROKER_EXTERN void add(DtxBuffer::shared_ptr ops);
     void recover(std::auto_ptr<TPCTransactionContext> txn, DtxBuffer::shared_ptr ops);
     void timedout();
     void setTimeout(boost::intrusive_ptr<DtxTimeout> t) { timeout = t; }
diff --git a/qpid/cpp/src/qpid/broker/Exchange.h b/qpid/cpp/src/qpid/broker/Exchange.h
index 488549bbf6..4591216aaf 100644
--- a/qpid/cpp/src/qpid/broker/Exchange.h
+++ b/qpid/cpp/src/qpid/broker/Exchange.h
@@ -23,6 +23,7 @@
  */
 
 #include <boost/shared_ptr.hpp>
+#include "BrokerImportExport.h"
 #include "Deliverable.h"
 #include "Queue.h"
 #include "MessageStore.h"
@@ -123,7 +124,7 @@ public:
     explicit Exchange(const std::string& name, management::Manageable* parent = 0);
     Exchange(const std::string& _name, bool _durable, const qpid::framing::FieldTable& _args,
              management::Manageable* parent = 0);
-    virtual ~Exchange();
+    QPID_BROKER_EXTERN virtual ~Exchange();
 
     const std::string& getName() const { return name; }
     bool isDurable() { return durable; }
@@ -145,9 +146,9 @@ public:
     void setPersistenceId(uint64_t id) const;
     uint64_t getPersistenceId() const { return persistenceId; }
     uint32_t encodedSize() const;
-    void encode(framing::Buffer& buffer) const; 
+    QPID_BROKER_EXTERN void encode(framing::Buffer& buffer) const; 
 
-    static Exchange::shared_ptr decode(ExchangeRegistry& exchanges, framing::Buffer& buffer);
+    static QPID_BROKER_EXTERN Exchange::shared_ptr decode(ExchangeRegistry& exchanges, framing::Buffer& buffer);
 
     // Manageable entry points
     management::ManagementObject* GetManagementObject(void) const;
diff --git a/qpid/cpp/src/qpid/broker/ExchangeRegistry.h b/qpid/cpp/src/qpid/broker/ExchangeRegistry.h
index 787b7896f0..9ca432e41c 100644
--- a/qpid/cpp/src/qpid/broker/ExchangeRegistry.h
+++ b/qpid/cpp/src/qpid/broker/ExchangeRegistry.h
@@ -22,6 +22,7 @@
  *
  */
 
+#include "BrokerImportExport.h"
 #include "Exchange.h"
 #include "MessageStore.h"
 #include "qpid/framing/FieldTable.h"
@@ -45,13 +46,17 @@ class ExchangeRegistry{
                              bool, const qpid::framing::FieldTable&, qpid::management::Manageable*> FactoryFunction;
 
     ExchangeRegistry () : parent(0) {}
-    std::pair<Exchange::shared_ptr, bool> declare(const std::string& name, const std::string& type)
+    QPID_BROKER_EXTERN std::pair<Exchange::shared_ptr, bool> declare
+      (const std::string& name, const std::string& type)
         throw(UnknownExchangeTypeException);
-    std::pair<Exchange::shared_ptr, bool> declare(const std::string& name, const std::string& type, 
-                                                  bool durable, const qpid::framing::FieldTable& args = framing::FieldTable())
-        throw(UnknownExchangeTypeException);
-    void destroy(const std::string& name);
-    Exchange::shared_ptr get(const std::string& name);
+    QPID_BROKER_EXTERN std::pair<Exchange::shared_ptr, bool> declare
+      (const std::string& name,
+       const std::string& type, 
+       bool durable,
+       const qpid::framing::FieldTable& args = framing::FieldTable())
+         throw(UnknownExchangeTypeException);
+    QPID_BROKER_EXTERN void destroy(const std::string& name);
+    QPID_BROKER_EXTERN Exchange::shared_ptr get(const std::string& name);
     Exchange::shared_ptr getDefault();
 
     /**
diff --git a/qpid/cpp/src/qpid/broker/ExpiryPolicy.h b/qpid/cpp/src/qpid/broker/ExpiryPolicy.h
index 1b7316f6f9..cefe9b7552 100644
--- a/qpid/cpp/src/qpid/broker/ExpiryPolicy.h
+++ b/qpid/cpp/src/qpid/broker/ExpiryPolicy.h
@@ -23,6 +23,7 @@
  */
 
 #include "qpid/RefCounted.h"
+#include "BrokerImportExport.h"
 
 namespace qpid {
 namespace broker {
@@ -35,9 +36,9 @@ class Message;
 class ExpiryPolicy : public RefCounted
 {
   public:
-    virtual ~ExpiryPolicy();
-    virtual void willExpire(Message&);
-    virtual bool hasExpired(Message&);
+    QPID_BROKER_EXTERN virtual ~ExpiryPolicy();
+    QPID_BROKER_EXTERN virtual void willExpire(Message&);
+    QPID_BROKER_EXTERN virtual bool hasExpired(Message&);
 };
 }} // namespace qpid::broker
 
diff --git a/qpid/cpp/src/qpid/broker/FanOutExchange.h b/qpid/cpp/src/qpid/broker/FanOutExchange.h
index 5884a19732..edfc4395f4 100644
--- a/qpid/cpp/src/qpid/broker/FanOutExchange.h
+++ b/qpid/cpp/src/qpid/broker/FanOutExchange.h
@@ -23,6 +23,7 @@
 
 #include <map>
 #include <vector>
+#include "BrokerImportExport.h"
 #include "Exchange.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/sys/CopyOnWriteArray.h"
@@ -38,22 +39,30 @@ class FanOutExchange : public virtual Exchange {
   public:
     static const std::string typeName;
         
-    FanOutExchange(const std::string& name, management::Manageable* parent = 0);
-    FanOutExchange(const string& _name, bool _durable, 
-                   const qpid::framing::FieldTable& _args,
-                   management::Manageable* parent = 0);
+    QPID_BROKER_EXTERN FanOutExchange(const std::string& name,
+                                      management::Manageable* parent = 0);
+    QPID_BROKER_EXTERN FanOutExchange(const string& _name,
+                                      bool _durable, 
+                                      const qpid::framing::FieldTable& _args,
+                                      management::Manageable* parent = 0);
 
     virtual std::string getType() const { return typeName; }            
         
-    virtual bool bind(Queue::shared_ptr queue, const std::string& routingKey, const qpid::framing::FieldTable* args);
+    QPID_BROKER_EXTERN virtual bool bind(Queue::shared_ptr queue,
+                                         const std::string& routingKey,
+                                         const qpid::framing::FieldTable* args);
 
     virtual bool unbind(Queue::shared_ptr queue, const std::string& routingKey, const qpid::framing::FieldTable* args);
 
-    virtual void route(Deliverable& msg, const std::string& routingKey, const qpid::framing::FieldTable* args);
+    QPID_BROKER_EXTERN virtual void route(Deliverable& msg,
+                                          const std::string& routingKey,
+                                          const qpid::framing::FieldTable* args);
 
-    virtual bool isBound(Queue::shared_ptr queue, const string* const routingKey, const qpid::framing::FieldTable* const args);
+    QPID_BROKER_EXTERN virtual bool isBound(Queue::shared_ptr queue,
+                                            const string* const routingKey,
+                                            const qpid::framing::FieldTable* const args);
 
-    virtual ~FanOutExchange();
+    QPID_BROKER_EXTERN virtual ~FanOutExchange();
     virtual bool supportsDynamicBinding() { return true; }
 };
 
diff --git a/qpid/cpp/src/qpid/broker/HeadersExchange.h b/qpid/cpp/src/qpid/broker/HeadersExchange.h
index e10fab2250..2b01f9ecae 100644
--- a/qpid/cpp/src/qpid/broker/HeadersExchange.h
+++ b/qpid/cpp/src/qpid/broker/HeadersExchange.h
@@ -22,6 +22,7 @@
 #define _HeadersExchange_
 
 #include <vector>
+#include "BrokerImportExport.h"
 #include "Exchange.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/sys/CopyOnWriteArray.h"
@@ -59,24 +60,32 @@ class HeadersExchange : public virtual Exchange {
   public:
     static const std::string typeName;
 
-    HeadersExchange(const string& name, management::Manageable* parent = 0);
-    HeadersExchange(const string& _name, bool _durable, 
-                    const qpid::framing::FieldTable& _args,
-                    management::Manageable* parent = 0);
+    QPID_BROKER_EXTERN HeadersExchange(const string& name,
+                                       management::Manageable* parent = 0);
+    QPID_BROKER_EXTERN HeadersExchange(const string& _name,
+                                       bool _durable, 
+                                       const qpid::framing::FieldTable& _args,
+                                       management::Manageable* parent = 0);
     
     virtual std::string getType() const { return typeName; }            
         
-    virtual bool bind(Queue::shared_ptr queue, const string& routingKey, const qpid::framing::FieldTable* args);
+    QPID_BROKER_EXTERN virtual bool bind(Queue::shared_ptr queue,
+                                         const string& routingKey,
+                                         const qpid::framing::FieldTable* args);
 
     virtual bool unbind(Queue::shared_ptr queue, const string& routingKey, const qpid::framing::FieldTable* args);
 
-    virtual void route(Deliverable& msg, const string& routingKey, const qpid::framing::FieldTable* args);
+    QPID_BROKER_EXTERN virtual void route(Deliverable& msg,
+                                          const string& routingKey,
+                                          const qpid::framing::FieldTable* args);
 
-    virtual bool isBound(Queue::shared_ptr queue, const string* const routingKey, const qpid::framing::FieldTable* const args);
+    QPID_BROKER_EXTERN virtual bool isBound(Queue::shared_ptr queue,
+                                            const string* const routingKey,
+                                            const qpid::framing::FieldTable* const args);
 
-    virtual ~HeadersExchange();
+    QPID_BROKER_EXTERN virtual ~HeadersExchange();
 
-    static bool match(const qpid::framing::FieldTable& bindArgs, const qpid::framing::FieldTable& msgArgs);
+    static QPID_BROKER_EXTERN bool match(const qpid::framing::FieldTable& bindArgs, const qpid::framing::FieldTable& msgArgs);
     static bool equal(const qpid::framing::FieldTable& bindArgs, const qpid::framing::FieldTable& msgArgs);
 };
 
diff --git a/qpid/cpp/src/qpid/broker/IncompleteMessageList.h b/qpid/cpp/src/qpid/broker/IncompleteMessageList.h
index f89c0023b0..449194d571 100644
--- a/qpid/cpp/src/qpid/broker/IncompleteMessageList.h
+++ b/qpid/cpp/src/qpid/broker/IncompleteMessageList.h
@@ -21,6 +21,7 @@
 #ifndef _IncompleteMessageList_
 #define _IncompleteMessageList_
 
+#include "BrokerImportExport.h"
 #include "qpid/sys/Monitor.h"
 #include "qpid/broker/Message.h"
 #include <boost/intrusive_ptr.hpp>
@@ -43,11 +44,11 @@ class IncompleteMessageList
 public:
     typedef Message::MessageCallback CompletionListener;    
 
-    IncompleteMessageList();
-    ~IncompleteMessageList();
+    QPID_BROKER_EXTERN IncompleteMessageList();
+    QPID_BROKER_EXTERN ~IncompleteMessageList();
     
-    void add(boost::intrusive_ptr<Message> msg);
-    void process(const CompletionListener& l, bool sync);
+    QPID_BROKER_EXTERN void add(boost::intrusive_ptr<Message> msg);
+    QPID_BROKER_EXTERN void process(const CompletionListener& l, bool sync);
     void each(const CompletionListener& l);
 };
 
diff --git a/qpid/cpp/src/qpid/broker/Message.h b/qpid/cpp/src/qpid/broker/Message.h
index 96fcf61dfc..a41ecd76be 100644
--- a/qpid/cpp/src/qpid/broker/Message.h
+++ b/qpid/cpp/src/qpid/broker/Message.h
@@ -22,6 +22,7 @@
  *
  */
 
+#include "BrokerImportExport.h"
 #include "PersistableMessage.h"
 #include "MessageAdapter.h"
 #include "qpid/framing/amqp_types.h"
@@ -51,8 +52,8 @@ class Message : public PersistableMessage {
 public:
     typedef boost::function<void (const boost::intrusive_ptr<Message>&)> MessageCallback;
     
-    Message(const framing::SequenceNumber& id = framing::SequenceNumber());
-    ~Message();
+    QPID_BROKER_EXTERN Message(const framing::SequenceNumber& id = framing::SequenceNumber());
+    QPID_BROKER_EXTERN ~Message();
         
     uint64_t getPersistenceId() const { return persistenceId; }
     void setPersistenceId(uint64_t _persistenceId) const { persistenceId = _persistenceId; }
@@ -65,17 +66,17 @@ public:
 
     const framing::SequenceNumber& getCommandId() { return frames.getId(); }
 
-    uint64_t contentSize() const;
+    QPID_BROKER_EXTERN uint64_t contentSize() const;
 
-    std::string getRoutingKey() const;
+    QPID_BROKER_EXTERN std::string getRoutingKey() const;
     const boost::shared_ptr<Exchange> getExchange(ExchangeRegistry&) const;
-    std::string getExchangeName() const;
+    QPID_BROKER_EXTERN std::string getExchangeName() const;
     bool isImmediate() const;
-    const framing::FieldTable* getApplicationHeaders() const;
-    bool isPersistent();
+    QPID_BROKER_EXTERN const framing::FieldTable* getApplicationHeaders() const;
+    QPID_BROKER_EXTERN bool isPersistent();
     bool requiresAccept();
 
-    void setTimestamp(const boost::intrusive_ptr<ExpiryPolicy>& e);
+    QPID_BROKER_EXTERN void setTimestamp(const boost::intrusive_ptr<ExpiryPolicy>& e);
     void setExpiryPolicy(const boost::intrusive_ptr<ExpiryPolicy>& e);
     bool hasExpired();
     sys::AbsTime getExpiration() const { return expiration; }
@@ -124,8 +125,8 @@ public:
     uint32_t encodedHeaderSize() const;
     uint32_t encodedContentSize() const;
 
-    void decodeHeader(framing::Buffer& buffer);
-    void decodeContent(framing::Buffer& buffer);
+    QPID_BROKER_EXTERN void decodeHeader(framing::Buffer& buffer);
+    QPID_BROKER_EXTERN void decodeContent(framing::Buffer& buffer);
             
     /**
      * Releases the in-memory content data held by this
@@ -139,7 +140,7 @@ public:
     void sendContent(const Queue& queue, framing::FrameHandler& out, uint16_t maxFrameSize) const;
     void sendHeader(framing::FrameHandler& out, uint16_t maxFrameSize) const;
 
-    bool isContentLoaded() const;
+    QPID_BROKER_EXTERN bool isContentLoaded() const;
 
     bool isExcluded(const std::vector<std::string>& excludes) const;
     void addTraceId(const std::string& id);
diff --git a/qpid/cpp/src/qpid/broker/MessageBuilder.h b/qpid/cpp/src/qpid/broker/MessageBuilder.h
index 395de024ab..1f5a2a8b84 100644
--- a/qpid/cpp/src/qpid/broker/MessageBuilder.h
+++ b/qpid/cpp/src/qpid/broker/MessageBuilder.h
@@ -21,6 +21,7 @@
 #ifndef _MessageBuilder_
 #define _MessageBuilder_
 
+#include "BrokerImportExport.h"
 #include "qpid/framing/FrameHandler.h"
 #include "qpid/framing/SequenceNumber.h"
 #include "qpid/RefCounted.h"
@@ -34,10 +35,11 @@ namespace qpid {
 
         class MessageBuilder : public framing::FrameHandler{
         public:
-            MessageBuilder(MessageStore* const store, uint64_t stagingThreshold);
-            void handle(framing::AMQFrame& frame);
+            QPID_BROKER_EXTERN MessageBuilder(MessageStore* const store,
+                                              uint64_t stagingThreshold);
+            QPID_BROKER_EXTERN void handle(framing::AMQFrame& frame);
             boost::intrusive_ptr<Message> getMessage() { return message; }
-            void start(const framing::SequenceNumber& id);
+            QPID_BROKER_EXTERN void start(const framing::SequenceNumber& id);
             void end();
         private:
             enum State {DORMANT, METHOD, HEADER, CONTENT};
diff --git a/qpid/cpp/src/qpid/broker/NullMessageStore.h b/qpid/cpp/src/qpid/broker/NullMessageStore.h
index d99c751d26..a44f8d2804 100644
--- a/qpid/cpp/src/qpid/broker/NullMessageStore.h
+++ b/qpid/cpp/src/qpid/broker/NullMessageStore.h
@@ -22,6 +22,7 @@
 #define _NullMessageStore_
 
 #include <set>
+#include "BrokerImportExport.h"
 #include "MessageStore.h"
 #include "Queue.h"
 
@@ -38,46 +39,54 @@ class NullMessageStore : public MessageStore
     std::set<std::string> prepared;
     uint64_t nextPersistenceId;
   public:
-    NullMessageStore();
+    QPID_BROKER_EXTERN NullMessageStore();
 
-    virtual bool init(const Options* options);
-    virtual std::auto_ptr<TransactionContext> begin();
-    virtual std::auto_ptr<TPCTransactionContext> begin(const std::string& xid);
-    virtual void prepare(TPCTransactionContext& txn);
-    virtual void commit(TransactionContext& txn);
-    virtual void abort(TransactionContext& txn);
-    virtual void collectPreparedXids(std::set<std::string>& xids);
+    QPID_BROKER_EXTERN virtual bool init(const Options* options);
+    QPID_BROKER_EXTERN virtual std::auto_ptr<TransactionContext> begin();
+    QPID_BROKER_EXTERN virtual std::auto_ptr<TPCTransactionContext> begin(const std::string& xid);
+    QPID_BROKER_EXTERN virtual void prepare(TPCTransactionContext& txn);
+    QPID_BROKER_EXTERN virtual void commit(TransactionContext& txn);
+    QPID_BROKER_EXTERN virtual void abort(TransactionContext& txn);
+    QPID_BROKER_EXTERN virtual void collectPreparedXids(std::set<std::string>& xids);
 
-    virtual void create(PersistableQueue& queue, const framing::FieldTable& args);
-    virtual void destroy(PersistableQueue& queue);
-    virtual void create(const PersistableExchange& exchange, const framing::FieldTable& args);
-    virtual void destroy(const PersistableExchange& exchange);
+    QPID_BROKER_EXTERN virtual void create(PersistableQueue& queue,
+                                           const framing::FieldTable& args);
+    QPID_BROKER_EXTERN virtual void destroy(PersistableQueue& queue);
+    QPID_BROKER_EXTERN virtual void create(const PersistableExchange& exchange,
+                                           const framing::FieldTable& args);
+    QPID_BROKER_EXTERN virtual void destroy(const PersistableExchange& exchange);
 
-    virtual void bind(const PersistableExchange& exchange, const PersistableQueue& queue, 
-                      const std::string& key, const framing::FieldTable& args);
-    virtual void unbind(const PersistableExchange& exchange, const PersistableQueue& queue, 
-                        const std::string& key, const framing::FieldTable& args);
-    virtual void create(const PersistableConfig& config);
-    virtual void destroy(const PersistableConfig& config);
-    virtual void recover(RecoveryManager& queues);
-    virtual void stage(const boost::intrusive_ptr<PersistableMessage>& msg);
-    virtual void destroy(PersistableMessage& msg);
-    virtual void appendContent(const boost::intrusive_ptr<const PersistableMessage>& msg,
-                               const std::string& data);
-    virtual void loadContent(const qpid::broker::PersistableQueue& queue,
-                             const boost::intrusive_ptr<const PersistableMessage>& msg, std::string& data,
-                             uint64_t offset, uint32_t length);
-    virtual void enqueue(TransactionContext* ctxt,
-                         const boost::intrusive_ptr<PersistableMessage>& msg,
-                         const PersistableQueue& queue);
-    virtual void dequeue(TransactionContext* ctxt,
-                         const boost::intrusive_ptr<PersistableMessage>& msg,
-                         const PersistableQueue& queue);
-    virtual uint32_t outstandingQueueAIO(const PersistableQueue& queue);
-    virtual void flush(const qpid::broker::PersistableQueue& queue);
+    QPID_BROKER_EXTERN virtual void bind(const PersistableExchange& exchange,
+                                         const PersistableQueue& queue, 
+                                         const std::string& key,
+                                         const framing::FieldTable& args);
+    QPID_BROKER_EXTERN virtual void unbind(const PersistableExchange& exchange,
+                                           const PersistableQueue& queue, 
+                                           const std::string& key,
+                                           const framing::FieldTable& args);
+    QPID_BROKER_EXTERN virtual void create(const PersistableConfig& config);
+    QPID_BROKER_EXTERN virtual void destroy(const PersistableConfig& config);
+    QPID_BROKER_EXTERN virtual void recover(RecoveryManager& queues);
+    QPID_BROKER_EXTERN virtual void stage(const boost::intrusive_ptr<PersistableMessage>& msg);
+    QPID_BROKER_EXTERN virtual void destroy(PersistableMessage& msg);
+    QPID_BROKER_EXTERN virtual void appendContent(const boost::intrusive_ptr<const PersistableMessage>& msg,
+                                                  const std::string& data);
+    QPID_BROKER_EXTERN virtual void loadContent(const qpid::broker::PersistableQueue& queue,
+                                                const boost::intrusive_ptr<const PersistableMessage>& msg,
+                                                std::string& data,
+                                                uint64_t offset,
+                                                uint32_t length);
+    QPID_BROKER_EXTERN virtual void enqueue(TransactionContext* ctxt,
+                                            const boost::intrusive_ptr<PersistableMessage>& msg,
+                                            const PersistableQueue& queue);
+    QPID_BROKER_EXTERN virtual void dequeue(TransactionContext* ctxt,
+                                            const boost::intrusive_ptr<PersistableMessage>& msg,
+                                            const PersistableQueue& queue);
+    QPID_BROKER_EXTERN virtual uint32_t outstandingQueueAIO(const PersistableQueue& queue);
+    QPID_BROKER_EXTERN virtual void flush(const qpid::broker::PersistableQueue& queue);
     ~NullMessageStore(){}
 
-    virtual bool isNull() const;
+    QPID_BROKER_EXTERN virtual bool isNull() const;
     static bool isNullStore(const MessageStore*);
 };
 
diff --git a/qpid/cpp/src/qpid/broker/PersistableMessage.h b/qpid/cpp/src/qpid/broker/PersistableMessage.h
index 4f2e3abafa..d26352452e 100644
--- a/qpid/cpp/src/qpid/broker/PersistableMessage.h
+++ b/qpid/cpp/src/qpid/broker/PersistableMessage.h
@@ -26,6 +26,7 @@
 #include <list>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
+#include "BrokerImportExport.h"
 #include "Persistable.h"
 #include "qpid/framing/amqp_types.h"
 #include "qpid/sys/Mutex.h"
@@ -93,13 +94,14 @@ class PersistableMessage : public Persistable
     
     bool isContentReleased() const;
 	
-    bool isEnqueueComplete();
+    QPID_BROKER_EXTERN bool isEnqueueComplete();
 
-    void enqueueComplete();
+    QPID_BROKER_EXTERN void enqueueComplete();
 
-    void enqueueAsync(PersistableQueue::shared_ptr queue, MessageStore* _store);
+    QPID_BROKER_EXTERN void enqueueAsync(PersistableQueue::shared_ptr queue,
+                                         MessageStore* _store);
 
-    void enqueueAsync();
+    QPID_BROKER_EXTERN void enqueueAsync();
 
     bool isDequeueComplete();
     
diff --git a/qpid/cpp/src/qpid/broker/Queue.h b/qpid/cpp/src/qpid/broker/Queue.h
index 14849b3c8e..822e827f35 100644
--- a/qpid/cpp/src/qpid/broker/Queue.h
+++ b/qpid/cpp/src/qpid/broker/Queue.h
@@ -21,6 +21,8 @@
  * under the License.
  *
  */
+
+#include "BrokerImportExport.h"
 #include "OwnershipToken.h"
 #include "Consumer.h"
 #include "Message.h"
@@ -149,13 +151,14 @@ namespace qpid {
 
             typedef std::vector<shared_ptr> vector;
 
-            Queue(const string& name, bool autodelete = false, 
-                  MessageStore* const store = 0, 
-                  const OwnershipToken* const owner = 0,
-                  management::Manageable* parent = 0);
-            ~Queue();
+            QPID_BROKER_EXTERN Queue(const string& name,
+                                     bool autodelete = false, 
+                                     MessageStore* const store = 0, 
+                                     const OwnershipToken* const owner = 0,
+                                     management::Manageable* parent = 0);
+            QPID_BROKER_EXTERN ~Queue();
 
-            bool dispatch(Consumer::shared_ptr);
+            QPID_BROKER_EXTERN bool dispatch(Consumer::shared_ptr);
             /**
              * Check whether there would be a message available for
              * dispatch to this consumer. If not, the consumer will be
@@ -167,24 +170,28 @@ namespace qpid {
             void create(const qpid::framing::FieldTable& settings);
 
             // "recovering" means we are doing a MessageStore recovery.
-            void configure(const qpid::framing::FieldTable& settings, bool recovering = false);
+            QPID_BROKER_EXTERN void configure(const qpid::framing::FieldTable& settings,
+                                              bool recovering = false);
             void destroy();
-            void bound(const string& exchange, const string& key, const qpid::framing::FieldTable& args);
-            void unbind(ExchangeRegistry& exchanges, Queue::shared_ptr shared_ref);
+            QPID_BROKER_EXTERN void bound(const string& exchange,
+                                          const string& key,
+                                          const qpid::framing::FieldTable& args);
+            QPID_BROKER_EXTERN void unbind(ExchangeRegistry& exchanges,
+                                           Queue::shared_ptr shared_ref);
 
-            bool acquire(const QueuedMessage& msg);
+            QPID_BROKER_EXTERN bool acquire(const QueuedMessage& msg);
             bool acquireMessageAt(const qpid::framing::SequenceNumber& position, QueuedMessage& message);
 
             /**
              * Delivers a message to the queue. Will record it as
              * enqueued if persistent then process it.
              */
-            void deliver(boost::intrusive_ptr<Message>& msg);
+            QPID_BROKER_EXTERN void deliver(boost::intrusive_ptr<Message>& msg);
             /**
              * Dispatches the messages immediately to a consumer if
              * one is available or stores it for later if not.
              */
-            void process(boost::intrusive_ptr<Message>& msg);
+            QPID_BROKER_EXTERN void process(boost::intrusive_ptr<Message>& msg);
             /**
              * Returns a message to the in-memory queue (due to lack
              * of acknowledegement from a receiver). If a consumer is
@@ -197,17 +204,18 @@ namespace qpid {
              */
             void recover(boost::intrusive_ptr<Message>& msg);
 
-            void consume(Consumer::shared_ptr c, bool exclusive = false);
-            void cancel(Consumer::shared_ptr c);
+            QPID_BROKER_EXTERN void consume(Consumer::shared_ptr c,
+                                            bool exclusive = false);
+            QPID_BROKER_EXTERN void cancel(Consumer::shared_ptr c);
 
             uint32_t purge(const uint32_t purge_request = 0); //defaults to all messages 
-            void purgeExpired();
+            QPID_BROKER_EXTERN void purgeExpired();
 
             //move qty # of messages to destination Queue destq
             uint32_t move(const Queue::shared_ptr destq, uint32_t qty); 
 
-            uint32_t getMessageCount() const;
-            uint32_t getConsumerCount() const;
+            QPID_BROKER_EXTERN uint32_t getMessageCount() const;
+            QPID_BROKER_EXTERN uint32_t getConsumerCount() const;
             inline const string& getName() const { return name; }
             bool isExclusiveOwner(const OwnershipToken* const o) const;
             void releaseExclusiveOwnership();
@@ -223,8 +231,8 @@ namespace qpid {
             /**
              * used to take messages from in memory and flush down to disk.
              */
-            void setLastNodeFailure();
-            void clearLastNodeFailure();
+            QPID_BROKER_EXTERN void setLastNodeFailure();
+            QPID_BROKER_EXTERN void clearLastNodeFailure();
 
             bool enqueue(TransactionContext* ctxt, boost::intrusive_ptr<Message> msg);
             /**
@@ -240,7 +248,7 @@ namespace qpid {
             /**
              * Gets the next available message 
              */
-            QueuedMessage get();
+            QPID_BROKER_EXTERN QueuedMessage get();
 
             /** Get the message at position pos */
             QueuedMessage find(framing::SequenceNumber pos) const;
diff --git a/qpid/cpp/src/qpid/broker/QueueCleaner.h b/qpid/cpp/src/qpid/broker/QueueCleaner.h
index 7903266f5f..007826f33e 100644
--- a/qpid/cpp/src/qpid/broker/QueueCleaner.h
+++ b/qpid/cpp/src/qpid/broker/QueueCleaner.h
@@ -22,6 +22,7 @@
  *
  */
 
+#include "BrokerImportExport.h"
 #include "Timer.h"
 
 namespace qpid {
@@ -34,8 +35,8 @@ class QueueRegistry;
 class QueueCleaner
 {
   public:
-    QueueCleaner(QueueRegistry& queues, Timer& timer);
-    void start(qpid::sys::Duration period);
+    QPID_BROKER_EXTERN QueueCleaner(QueueRegistry& queues, Timer& timer);
+    QPID_BROKER_EXTERN void start(qpid::sys::Duration period);
   private:
     class Task : public TimerTask
     {
diff --git a/qpid/cpp/src/qpid/broker/QueueEvents.h b/qpid/cpp/src/qpid/broker/QueueEvents.h
index 2ba69e33e6..9bb56f888d 100644
--- a/qpid/cpp/src/qpid/broker/QueueEvents.h
+++ b/qpid/cpp/src/qpid/broker/QueueEvents.h
@@ -22,6 +22,7 @@
  *
  */
 
+#include "BrokerImportExport.h"
 #include "QueuedMessage.h"
 #include "qpid/sys/Mutex.h"
 #include "qpid/sys/PollableQueue.h"
@@ -48,19 +49,20 @@ class QueueEvents
         EventType type;
         QueuedMessage msg;
 
-        Event(EventType, const QueuedMessage&);
+        QPID_BROKER_EXTERN Event(EventType, const QueuedMessage&);
     };
 
     typedef boost::function<void (Event)> EventListener;
 
-    QueueEvents(const boost::shared_ptr<sys::Poller>& poller);
-    ~QueueEvents();
-    void enqueued(const QueuedMessage&);
-    void dequeued(const QueuedMessage&);
-    void registerListener(const std::string& id, const EventListener&);
-    void unregisterListener(const std::string& id);
+    QPID_BROKER_EXTERN QueueEvents(const boost::shared_ptr<sys::Poller>& poller);
+    QPID_BROKER_EXTERN ~QueueEvents();
+    QPID_BROKER_EXTERN void enqueued(const QueuedMessage&);
+    QPID_BROKER_EXTERN void dequeued(const QueuedMessage&);
+    QPID_BROKER_EXTERN void registerListener(const std::string& id,
+                                             const EventListener&);
+    QPID_BROKER_EXTERN void unregisterListener(const std::string& id);
     //process all outstanding events
-    void shutdown();
+    QPID_BROKER_EXTERN void shutdown();
   private:
     typedef qpid::sys::PollableQueue<Event> EventQueue;
     typedef std::map<std::string, EventListener> Listeners;
diff --git a/qpid/cpp/src/qpid/broker/QueuePolicy.h b/qpid/cpp/src/qpid/broker/QueuePolicy.h
index 0e8c15aa0e..45992f87ac 100644
--- a/qpid/cpp/src/qpid/broker/QueuePolicy.h
+++ b/qpid/cpp/src/qpid/broker/QueuePolicy.h
@@ -24,6 +24,7 @@
 #include <deque>
 #include <iostream>
 #include <memory>
+#include "BrokerImportExport.h"
 #include "QueuedMessage.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/sys/AtomicValue.h"
@@ -47,20 +48,20 @@ class QueuePolicy
     static std::string getType(const qpid::framing::FieldTable& settings);
 
   public:
-    static const std::string maxCountKey;
-    static const std::string maxSizeKey;
-    static const std::string typeKey;
-    static const std::string REJECT;
-    static const std::string FLOW_TO_DISK;
-    static const std::string RING;
-    static const std::string RING_STRICT;            
+    static QPID_BROKER_EXTERN const std::string maxCountKey;
+    static QPID_BROKER_EXTERN const std::string maxSizeKey;
+    static QPID_BROKER_EXTERN const std::string typeKey;
+    static QPID_BROKER_EXTERN const std::string REJECT;
+    static QPID_BROKER_EXTERN const std::string FLOW_TO_DISK;
+    static QPID_BROKER_EXTERN const std::string RING;
+    static QPID_BROKER_EXTERN const std::string RING_STRICT;            
 
     virtual ~QueuePolicy() {}
-    void tryEnqueue(const QueuedMessage&);
+    QPID_BROKER_EXTERN void tryEnqueue(const QueuedMessage&);
     virtual void dequeued(const QueuedMessage&);
     virtual bool isEnqueued(const QueuedMessage&);
     virtual bool checkLimit(const QueuedMessage&);
-    void update(qpid::framing::FieldTable& settings);
+    QPID_BROKER_EXTERN void update(qpid::framing::FieldTable& settings);
     uint32_t getMaxCount() const { return maxCount; }
     uint64_t getMaxSize() const { return maxSize; }           
     void encode(framing::Buffer& buffer) const;
@@ -68,10 +69,11 @@ class QueuePolicy
     uint32_t encodedSize() const;
 
 
-    static std::auto_ptr<QueuePolicy> createQueuePolicy(const qpid::framing::FieldTable& settings);
-    static std::auto_ptr<QueuePolicy> createQueuePolicy(uint32_t maxCount, uint64_t maxSize, const std::string& type = REJECT);
+    static QPID_BROKER_EXTERN std::auto_ptr<QueuePolicy> createQueuePolicy(const qpid::framing::FieldTable& settings);
+    static QPID_BROKER_EXTERN std::auto_ptr<QueuePolicy> createQueuePolicy(uint32_t maxCount, uint64_t maxSize, const std::string& type = REJECT);
     static void setDefaultMaxSize(uint64_t);
-    friend std::ostream& operator<<(std::ostream&, const QueuePolicy&);
+    friend QPID_BROKER_EXTERN std::ostream& operator<<(std::ostream&,
+                                                       const QueuePolicy&);
   protected:
     QueuePolicy(uint32_t maxCount, uint64_t maxSize, const std::string& type = REJECT);
 
diff --git a/qpid/cpp/src/qpid/broker/QueueRegistry.h b/qpid/cpp/src/qpid/broker/QueueRegistry.h
index c53ba668cc..07bb550fd4 100644
--- a/qpid/cpp/src/qpid/broker/QueueRegistry.h
+++ b/qpid/cpp/src/qpid/broker/QueueRegistry.h
@@ -21,6 +21,7 @@
 #ifndef _QueueRegistry_
 #define _QueueRegistry_
 
+#include "BrokerImportExport.h"
 #include "Queue.h"
 #include "qpid/sys/Mutex.h"
 #include "qpid/management/Manageable.h"
@@ -38,10 +39,10 @@ namespace broker {
  * are deleted when and only when they are no longer in use.
  *
  */
-class QueueRegistry{
+class QueueRegistry {
   public:
-    QueueRegistry();
-    ~QueueRegistry();
+    QPID_BROKER_EXTERN QueueRegistry();
+    QPID_BROKER_EXTERN ~QueueRegistry();
 
     /**
      * Declare a queue.
@@ -49,8 +50,11 @@ class QueueRegistry{
      * @return The queue and a boolean flag which is true if the queue
      * was created by this declare call false if it already existed.
      */
-    std::pair<Queue::shared_ptr, bool> declare(const string& name, bool durable = false, bool autodelete = false, 
-                                               const OwnershipToken* owner = 0);
+    QPID_BROKER_EXTERN std::pair<Queue::shared_ptr, bool> declare
+      (const string& name,
+       bool durable = false,
+       bool autodelete = false, 
+       const OwnershipToken* owner = 0);
 
     /**
      * Destroy the named queue.
@@ -64,7 +68,7 @@ class QueueRegistry{
      * subsequent calls to find or declare with the same name.
      *
      */
-    void destroy   (const string& name);
+    QPID_BROKER_EXTERN void destroy(const string& name);
     template <class Test> bool destroyIf(const string& name, Test test)
     {
         qpid::sys::RWlock::ScopedWlock locker(lock);
@@ -79,7 +83,7 @@ class QueueRegistry{
     /**
      * Find the named queue. Return 0 if not found.
      */
-    Queue::shared_ptr find(const string& name);
+    QPID_BROKER_EXTERN Queue::shared_ptr find(const string& name);
 
     /**
      * Generate unique queue name.
diff --git a/qpid/cpp/src/qpid/broker/RetryList.h b/qpid/cpp/src/qpid/broker/RetryList.h
index 013233ef00..3cdba72ecf 100644
--- a/qpid/cpp/src/qpid/broker/RetryList.h
+++ b/qpid/cpp/src/qpid/broker/RetryList.h
@@ -22,6 +22,7 @@
  *
  */
 
+#include "BrokerImportExport.h"
 #include "qpid/Address.h"
 #include "qpid/Url.h"
 
@@ -35,9 +36,9 @@ namespace broker {
 class RetryList
 {
   public:
-    RetryList();                
-    void reset(const std::vector<Url>& urls);
-    bool next(TcpAddress& address);
+    QPID_BROKER_EXTERN RetryList();                
+    QPID_BROKER_EXTERN void reset(const std::vector<Url>& urls);
+    QPID_BROKER_EXTERN bool next(TcpAddress& address);
   private:
     std::vector<Url> urls;
     size_t urlIndex;
diff --git a/qpid/cpp/src/qpid/broker/Timer.h b/qpid/cpp/src/qpid/broker/Timer.h
index be4ac9d056..564fec5804 100644
--- a/qpid/cpp/src/qpid/broker/Timer.h
+++ b/qpid/cpp/src/qpid/broker/Timer.h
@@ -21,6 +21,7 @@
 #ifndef _Timer_
 #define _Timer_
 
+#include "BrokerImportExport.h"
 #include "qpid/sys/Monitor.h"
 #include "qpid/sys/Thread.h"
 #include "qpid/sys/Runnable.h"
@@ -43,9 +44,9 @@ struct TimerTask : public RefCounted {
     qpid::sys::AbsTime time;
     volatile bool cancelled;
 
-    TimerTask(qpid::sys::Duration timeout);
+    QPID_BROKER_EXTERN TimerTask(qpid::sys::Duration timeout);
     TimerTask(qpid::sys::AbsTime time);
-    virtual ~TimerTask();
+    QPID_BROKER_EXTERN virtual ~TimerTask();
     void reset();
     void cancel();
     bool isCancelled() const;
@@ -69,10 +70,10 @@ class Timer : private qpid::sys::Runnable {
     virtual void run();
 
   public:
-    Timer();
-    virtual ~Timer();
+    QPID_BROKER_EXTERN Timer();
+    QPID_BROKER_EXTERN virtual ~Timer();
 
-    void add(boost::intrusive_ptr<TimerTask> task);
+    QPID_BROKER_EXTERN void add(boost::intrusive_ptr<TimerTask> task);
     void start();
     void stop();
 
diff --git a/qpid/cpp/src/qpid/broker/TopicExchange.h b/qpid/cpp/src/qpid/broker/TopicExchange.h
index f3a2e221f7..24bf5f7bca 100644
--- a/qpid/cpp/src/qpid/broker/TopicExchange.h
+++ b/qpid/cpp/src/qpid/broker/TopicExchange.h
@@ -23,6 +23,7 @@
 
 #include <map>
 #include <vector>
+#include "BrokerImportExport.h"
 #include "Exchange.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/sys/Monitor.h"
@@ -40,7 +41,7 @@ class Tokens : public std::vector<std::string> {
     /** Tokenize s, provides automatic conversion of string to Tokens */
     Tokens(const std::string& s) { operator=(s); }
     /** Tokenizing assignment operator s */
-    Tokens & operator=(const std::string& s);
+    QPID_BROKER_EXTERN Tokens & operator=(const std::string& s);
     void key(std::string& key) const;
     
   private:
@@ -60,12 +61,12 @@ class TopicPattern : public Tokens
     // Default copy, assign, dtor are sufficient.
     TopicPattern(const Tokens& tokens) { operator=(tokens); }
     TopicPattern(const std::string& str) { operator=(str); }
-    TopicPattern& operator=(const Tokens&);
+    QPID_BROKER_EXTERN TopicPattern& operator=(const Tokens&);
     TopicPattern& operator=(const std::string& str) { return operator=(Tokens(str)); }
     
     /** Match a topic */
     bool match(const std::string& topic) { return match(Tokens(topic)); }
-    bool match(const Tokens& topic) const;
+    QPID_BROKER_EXTERN bool match(const Tokens& topic) const;
 
   private:
     void normalize();
@@ -84,21 +85,30 @@ class TopicExchange : public virtual Exchange {
   public:
     static const std::string typeName;
 
-    TopicExchange(const string& name, management::Manageable* parent = 0);
-    TopicExchange(const string& _name, bool _durable, 
-                  const qpid::framing::FieldTable& _args, management::Manageable* parent = 0);
+    QPID_BROKER_EXTERN TopicExchange(const string& name,
+                                     management::Manageable* parent = 0);
+    QPID_BROKER_EXTERN TopicExchange(const string& _name,
+                                     bool _durable, 
+                                     const qpid::framing::FieldTable& _args,
+                                     management::Manageable* parent = 0);
 
     virtual std::string getType() const { return typeName; }            
 
-    virtual bool bind(Queue::shared_ptr queue, const string& routingKey, const qpid::framing::FieldTable* args);
+    QPID_BROKER_EXTERN virtual bool bind(Queue::shared_ptr queue,
+                                         const string& routingKey,
+                                         const qpid::framing::FieldTable* args);
 
     virtual bool unbind(Queue::shared_ptr queue, const string& routingKey, const qpid::framing::FieldTable* args);
 
-    virtual void route(Deliverable& msg, const string& routingKey, const qpid::framing::FieldTable* args);
+    QPID_BROKER_EXTERN virtual void route(Deliverable& msg,
+                                          const string& routingKey,
+                                          const qpid::framing::FieldTable* args);
 
-    virtual bool isBound(Queue::shared_ptr queue, const string* const routingKey, const qpid::framing::FieldTable* const args);
+    QPID_BROKER_EXTERN virtual bool isBound(Queue::shared_ptr queue,
+                                            const string* const routingKey,
+                                            const qpid::framing::FieldTable* const args);
 
-    virtual ~TopicExchange();
+    QPID_BROKER_EXTERN virtual ~TopicExchange();
     virtual bool supportsDynamicBinding() { return true; }
 };
 
diff --git a/qpid/cpp/src/qpid/broker/TxBuffer.h b/qpid/cpp/src/qpid/broker/TxBuffer.h
index aabb5ea0b1..f63a65f115 100644
--- a/qpid/cpp/src/qpid/broker/TxBuffer.h
+++ b/qpid/cpp/src/qpid/broker/TxBuffer.h
@@ -24,6 +24,7 @@
 #include <algorithm>
 #include <functional>
 #include <vector>
+#include "BrokerImportExport.h"
 #include "TransactionalStore.h"
 #include "TxOp.h"
 
@@ -68,7 +69,7 @@ namespace qpid {
             /**
              * Adds an operation to the transaction.
              */
-            void enlist(TxOp::shared_ptr op);
+            QPID_BROKER_EXTERN void enlist(TxOp::shared_ptr op);
 
             /**
              * Requests that all ops are prepared. This should
@@ -81,7 +82,7 @@ namespace qpid {
              * @returns true if all the operations prepared
              * successfully, false if not.
              */
-            bool prepare(TransactionContext* const ctxt);
+            QPID_BROKER_EXTERN bool prepare(TransactionContext* const ctxt);
 
             /**
              * Signals that the ops all prepared successfully and can
@@ -91,7 +92,7 @@ namespace qpid {
              * Should only be called after a call to prepare() returns
              * true.
              */
-            void commit();
+            QPID_BROKER_EXTERN void commit();
 
             /**
              * Signals that all ops can be rolled back.
@@ -100,13 +101,13 @@ namespace qpid {
              * returns true (2pc) or instead of a prepare call
              * ('server-local')
              */
-            void rollback();
+            QPID_BROKER_EXTERN void rollback();
 
             /**
              * Helper method for managing the process of server local
              * commit
              */
-            bool commitLocal(TransactionalStore* const store);
+            QPID_BROKER_EXTERN bool commitLocal(TransactionalStore* const store);
 
             // Used by cluster to replicate transaction status.
             void accept(TxOpConstVisitor& v) const;
diff --git a/qpid/cpp/src/qpid/broker/TxPublish.h b/qpid/cpp/src/qpid/broker/TxPublish.h
index 1f73cb8767..ebe3b51f3d 100644
--- a/qpid/cpp/src/qpid/broker/TxPublish.h
+++ b/qpid/cpp/src/qpid/broker/TxPublish.h
@@ -21,6 +21,7 @@
 #ifndef _TxPublish_
 #define _TxPublish_
 
+#include "BrokerImportExport.h"
 #include "Queue.h"
 #include "Deliverable.h"
 #include "Message.h"
@@ -65,19 +66,19 @@ namespace qpid {
             std::list<Queue::shared_ptr> queues;
 
         public:
-            TxPublish(boost::intrusive_ptr<Message> msg);
-            virtual bool prepare(TransactionContext* ctxt) throw();
-            virtual void commit() throw();
-            virtual void rollback() throw();
+            QPID_BROKER_EXTERN TxPublish(boost::intrusive_ptr<Message> msg);
+            QPID_BROKER_EXTERN virtual bool prepare(TransactionContext* ctxt) throw();
+            QPID_BROKER_EXTERN virtual void commit() throw();
+            QPID_BROKER_EXTERN virtual void rollback() throw();
 
 	    virtual Message& getMessage() { return *msg; };
             
-            virtual void deliverTo(const boost::shared_ptr<Queue>& queue);
+            QPID_BROKER_EXTERN virtual void deliverTo(const boost::shared_ptr<Queue>& queue);
 
             virtual ~TxPublish(){}
             virtual void accept(TxOpConstVisitor& visitor) const { visitor(*this); }
 
-            uint64_t contentSize();
+            QPID_BROKER_EXTERN uint64_t contentSize();
 
             boost::intrusive_ptr<Message> getMessage() const { return msg; }
             const std::list<Queue::shared_ptr> getQueues() const { return queues; }
diff --git a/qpid/cpp/src/qpidbroker.vcproj b/qpid/cpp/src/qpidbroker.vcproj
index 40010efadf..d0ab053220 100644
--- a/qpid/cpp/src/qpidbroker.vcproj
+++ b/qpid/cpp/src/qpidbroker.vcproj
@@ -6,7 +6,7 @@
 	ProjectGUID="{66213D3E-FECA-1BAD-9D20-8C378F43FDD9}"

 	RootNamespace="qpidbroker"

 	Keyword="Win32Proj"

-	TargetFrameworkVersion="0"

+	SignManifests="true"

 	>

 	<Platforms>

 		<Platform

@@ -25,6 +25,7 @@
 			IntermediateDirectory="Debug\qpidbroker\I386"

 			ConfigurationType="1"

 			CharacterSet="0"

+

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -51,7 +52,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"

-				PreprocessorDefinitions="QPID_BROKER_STATIC;_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN"

+                                PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN"

 				MinimalRebuild="false"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

@@ -59,13 +60,14 @@
 				WarningLevel="3"

 				Detect64BitPortabilityProblems="false"

 				DebugInformationFormat="3"

+				DisableSpecificWarnings="4244;4290;4800;4355"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

+				PreprocessorDefinitions="_DEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN"

 				Culture="1033"

 				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"

 			/>

@@ -74,7 +76,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="qpidcommond.lib qpidbrokersd.lib"

+				AdditionalDependencies="qpidcommond.lib qpidbrokerd.lib"

 				OutputFile="$(OutDir)\qpidbroker.exe"

 				LinkIncremental="2"

 				SuppressStartupBanner="true"

@@ -87,9 +89,6 @@
 				Name="VCALinkTool"

 			/>

 			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

 				Name="VCXDCMakeTool"

 			/>

 			<Tool

@@ -99,18 +98,17 @@
 				Name="VCFxCopTool"

 			/>

 			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

+				CommandLine="@if not exist deploy\bin mkdir deploy\bin&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y $(OutDir)\qpidbroker.exe deploy\bin\&#x0D;&#x0A;"

 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="."

-			IntermediateDirectory="Debug\qpidbroker\AMD64"

+			Name="Release|Win32"

+			OutputDirectory="Release"

+			IntermediateDirectory="Release\qpidbroker\I386"

 			ConfigurationType="1"

 			CharacterSet="0"

+

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -135,23 +133,21 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="$(BOOST_ROOT)\.,.,gen"

-				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64"

-				MinimalRebuild="false"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

+				Optimization="2"

+				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"

+                                PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN"

+				RuntimeLibrary="2"

 				RuntimeTypeInfo="true"

 				WarningLevel="3"

 				Detect64BitPortabilityProblems="false"

-				DebugInformationFormat="3"

+				DisableSpecificWarnings="4244;4290;4800;4355"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG;_WIN64"

+				PreprocessorDefinitions="NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN"

 				Culture="1033"

 				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"

 			/>

@@ -160,23 +156,21 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalOptions="/machine:AMD64"

-				AdditionalDependencies="qpidbrokersd.lib qpidcommond.lib"

+				AdditionalDependencies="qpidcommon.lib qpidbroker.lib"

 				OutputFile="$(OutDir)\qpidbroker.exe"

-				LinkIncremental="2"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"

 				GenerateDebugInformation="true"

 				SubSystem="1"

-				TargetMachine="17"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				TargetMachine="1"

 			/>

 			<Tool

 				Name="VCALinkTool"

 			/>

 			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

 				Name="VCXDCMakeTool"

 			/>

 			<Tool

@@ -186,18 +180,17 @@
 				Name="VCFxCopTool"

 			/>

 			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

+				CommandLine="@if not exist deploy\bin mkdir deploy\bin&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y $(OutDir)\qpidbroker.exe deploy\bin\&#x0D;&#x0A;"

 			/>

 		</Configuration>

 		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="Release"

-			IntermediateDirectory="Release\qpidbroker\I386"

+			Name="Debug|x64"

+			OutputDirectory="."

+			IntermediateDirectory="Debug\qpidbroker\AMD64"

 			ConfigurationType="1"

 			CharacterSet="0"

+

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -222,20 +215,24 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="2"

-				AdditionalIncludeDirectories="$(BOOST_ROOT)\.,.,gen"

-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS"

-				RuntimeLibrary="2"

+				Optimization="0"

+				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"

+                                PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN"

+				MinimalRebuild="false"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

 				RuntimeTypeInfo="true"

 				WarningLevel="3"

 				Detect64BitPortabilityProblems="false"

+				DebugInformationFormat="3"

+				DisableSpecificWarnings="4244;4290;4800;4355"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

+				PreprocessorDefinitions="_DEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;_WIN64"

 				Culture="1033"

 				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"

 			/>

@@ -244,24 +241,20 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="qpidbrokers.lib qpidcommon.lib"

+				AdditionalOptions="/machine:AMD64"

+				AdditionalDependencies="qpidcommond.lib qpidbrokerd.lib"

 				OutputFile="$(OutDir)\qpidbroker.exe"

-				LinkIncremental="1"

+				LinkIncremental="2"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"

 				GenerateDebugInformation="true"

 				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				TargetMachine="17"

 			/>

 			<Tool

 				Name="VCALinkTool"

 			/>

 			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

 				Name="VCXDCMakeTool"

 			/>

 			<Tool

@@ -271,10 +264,8 @@
 				Name="VCFxCopTool"

 			/>

 			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

+				CommandLine="@if not exist deploy\bin mkdir deploy\bin&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y $(OutDir)\qpidbroker.exe deploy\bin\&#x0D;&#x0A;"

 			/>

 		</Configuration>

 		<Configuration

@@ -283,6 +274,7 @@
 			IntermediateDirectory="Release\qpidbroker\AMD64"

 			ConfigurationType="1"

 			CharacterSet="0"

+

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -308,19 +300,20 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

-				AdditionalIncludeDirectories="$(BOOST_ROOT)\.,.,gen"

-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64"

+				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"

+                                PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN"

 				RuntimeLibrary="2"

 				RuntimeTypeInfo="true"

 				WarningLevel="3"

 				Detect64BitPortabilityProblems="false"

+				DisableSpecificWarnings="4244;4290;4800;4355"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG;_WIN64"

+				PreprocessorDefinitions="NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;_WIN64"

 				Culture="1033"

 				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"

 			/>

@@ -330,7 +323,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalOptions="/machine:AMD64"

-				AdditionalDependencies="qpidbrokers.lib qpidcommon.lib"

+				AdditionalDependencies="qpidcommon.lib qpidbroker.lib"

 				OutputFile="$(OutDir)\qpidbroker.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

@@ -345,9 +338,6 @@
 				Name="VCALinkTool"

 			/>

 			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

 				Name="VCXDCMakeTool"

 			/>

 			<Tool

@@ -357,10 +347,8 @@
 				Name="VCFxCopTool"

 			/>

 			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

+				CommandLine="@if not exist deploy\bin mkdir deploy\bin&#x0D;&#x0A;&#x0D;&#x0A;@copy /Y $(OutDir)\qpidbroker.exe deploy\bin\&#x0D;&#x0A;"

 			/>

 		</Configuration>

 	</Configurations>

@@ -369,24 +357,19 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;cxx;cc;C;c"

-			>

+			Filter="cpp;cxx;cc;C;c">

 			<File

-				RelativePath="qpidd.cpp"

-				>

+				RelativePath="qpidd.cpp">

 			</File>

 			<File

-				RelativePath="windows\QpiddBroker.cpp"

-				>

+				RelativePath="windows\QpiddBroker.cpp">

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

-			Filter="h;hpp;hxx;hh"

-			>

+			Filter="h;hpp;hxx;hh">

 			<File

-				RelativePath="qpidd.h"

-				>

+				RelativePath="qpidd.h">

 			</File>

 		</Filter>

 	</Files>

diff --git a/qpid/cpp/src/tests/unit_test.vcproj b/qpid/cpp/src/tests/unit_test.vcproj
index e0cd6d8d4c..8710b617f8 100644
--- a/qpid/cpp/src/tests/unit_test.vcproj
+++ b/qpid/cpp/src/tests/unit_test.vcproj
@@ -52,7 +52,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,..,..\gen"

-                                PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;QPID_BROKER_STATIC"

+                                PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"

 				MinimalRebuild="false"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

@@ -60,14 +60,14 @@
 				WarningLevel="3"

 				Detect64BitPortabilityProblems="false"

 				DebugInformationFormat="3"

-				DisableSpecificWarnings="4244;4800"

+				DisableSpecificWarnings="4244;4800;4290;4355"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;QPID_BROKER_STATIC"

+				PreprocessorDefinitions="_DEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"

 				Culture="1033"

 				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,..,..\gen"

 			/>

@@ -76,7 +76,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="qpidcommond.lib qpidclientd.lib qmfconsoled.lib qpidbrokersd.lib"

+				AdditionalDependencies="qpidcommond.lib qpidclientd.lib qpidbrokerd.lib qmfconsoled.lib"

 				OutputFile="$(OutDir)\unit_test.exe"

 				LinkIncremental="2"

 				SuppressStartupBanner="true"

@@ -134,19 +134,19 @@
 				Name="VCCLCompilerTool"

 				Optimization="2"

 				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,..,..\gen"

-                                PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;QPID_BROKER_STATIC"

+                                PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"

 				RuntimeLibrary="2"

 				RuntimeTypeInfo="true"

 				WarningLevel="3"

 				Detect64BitPortabilityProblems="false"

-				DisableSpecificWarnings="4244;4800"

+				DisableSpecificWarnings="4244;4800;4290;4355"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;QPID_BROKER_STATIC"

+				PreprocessorDefinitions="NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"

 				Culture="1033"

 				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,..,..\gen"

 			/>

@@ -155,7 +155,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="qpidcommon.lib qpidclient.lib qmfconsole.lib qpidbrokersd.lib"

+				AdditionalDependencies="qpidcommon.lib qpidclient.lib qpidbroker.lib qmfconsole.lib"

 				OutputFile="$(OutDir)\unit_test.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

@@ -215,7 +215,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,..,..\gen"

-                                PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;QPID_BROKER_STATIC"

+                                PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"

 				MinimalRebuild="false"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

@@ -223,14 +223,14 @@
 				WarningLevel="3"

 				Detect64BitPortabilityProblems="false"

 				DebugInformationFormat="3"

-				DisableSpecificWarnings="4244;4800"

+				DisableSpecificWarnings="4244;4800;4290;4355"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;QPID_BROKER_STATIC;_WIN64"

+				PreprocessorDefinitions="_DEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WIN64"

 				Culture="1033"

 				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,..,..\gen"

 			/>

@@ -240,7 +240,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalOptions="/machine:AMD64"

-				AdditionalDependencies="qpidcommond.lib qpidclientd.lib qmfconsoled.lib qpidbrokersd.lib"

+				AdditionalDependencies="qpidcommond.lib qpidclientd.lib qpidbrokerd.lib qmfconsoled.lib"

 				OutputFile="$(OutDir)\unit_test.exe"

 				LinkIncremental="2"

 				SuppressStartupBanner="true"

@@ -298,19 +298,19 @@
 				Name="VCCLCompilerTool"

 				Optimization="2"

 				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,..,..\gen"

-                                PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;QPID_BROKER_STATIC"

+                                PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"

 				RuntimeLibrary="2"

 				RuntimeTypeInfo="true"

 				WarningLevel="3"

 				Detect64BitPortabilityProblems="false"

-				DisableSpecificWarnings="4244;4800"

+				DisableSpecificWarnings="4244;4800;4290;4355"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;QPID_BROKER_STATIC;_WIN64"

+				PreprocessorDefinitions="NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WIN64"

 				Culture="1033"

 				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,..,..\gen"

 			/>

@@ -320,7 +320,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalOptions="/machine:AMD64"

-				AdditionalDependencies="qpidcommon.lib qpidclient.lib qmfconsole.lib qpidbrokersd.lib"

+				AdditionalDependencies="qpidcommon.lib qpidclient.lib qpidbroker.lib qmfconsole.lib"

 				OutputFile="$(OutDir)\unit_test.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"