5 files changed, 8 insertions, 6 deletions
diff --git a/cpp/src/qpid/CommonImportExport.h b/cpp/src/qpid/CommonImportExport.h
index 47872646d9..02c06ed7af 100644
--- a/cpp/src/qpid/CommonImportExport.h
+++ b/cpp/src/qpid/CommonImportExport.h
@@ -21,7 +21,7 @@
  */
 
 #if defined(WIN32) && !defined(QPID_DECLARE_STATIC)
-#if defined(COMMON_EXPORT)
+#if defined(COMMON_EXPORT) || defined (qpidcommon_EXPORTS)
 #define QPID_COMMON_EXTERN __declspec(dllexport)
 #else
 #define QPID_COMMON_EXTERN __declspec(dllimport)
diff --git a/cpp/src/qpid/broker/BrokerImportExport.h b/cpp/src/qpid/broker/BrokerImportExport.h
index 2edc90993e..4edf8c9844 100644
--- a/cpp/src/qpid/broker/BrokerImportExport.h
+++ b/cpp/src/qpid/broker/BrokerImportExport.h
@@ -21,7 +21,7 @@
  */
 
 #if defined(WIN32) && !defined(QPID_BROKER_STATIC)
-#if defined(BROKER_EXPORT)
+#if defined(BROKER_EXPORT) || defined (qpidbroker_EXPORTS)
 #define QPID_BROKER_EXTERN __declspec(dllexport)
 #else
 #define QPID_BROKER_EXTERN __declspec(dllimport)
diff --git a/cpp/src/qpid/client/ClientImportExport.h b/cpp/src/qpid/client/ClientImportExport.h
index 0e6e5660d6..3b311655ab 100644
--- a/cpp/src/qpid/client/ClientImportExport.h
+++ b/cpp/src/qpid/client/ClientImportExport.h
@@ -21,7 +21,7 @@
  */
 
 #if defined(WIN32) && !defined(QPID_DECLARE_STATIC)
-#if defined(CLIENT_EXPORT)
+#if defined(CLIENT_EXPORT) || defined (qpidclient_EXPORTS)
 #define QPID_CLIENT_EXTERN __declspec(dllexport)
 #else
 #define QPID_CLIENT_EXTERN __declspec(dllimport)
diff --git a/cpp/src/qpid/client/LoadPlugins.cpp b/cpp/src/qpid/client/LoadPlugins.cpp
index b395226859..eca6aa47fc 100644
--- a/cpp/src/qpid/client/LoadPlugins.cpp
+++ b/cpp/src/qpid/client/LoadPlugins.cpp
@@ -19,6 +19,7 @@
  *
  */
 
+#include "config.h"
 #include "qpid/Modules.h"
 #include "qpid/sys/Shlib.h"
 #include <string>
@@ -30,9 +31,9 @@ namespace {
 
 struct LoadtimeInitialise {
     LoadtimeInitialise() {
-        qpid::ModuleOptions moduleOptions(MODULE_DIR);
+        qpid::ModuleOptions moduleOptions(QPIDC_MODULE_DIR);
         string              defaultPath (moduleOptions.loadDir);
-        moduleOptions.parse (0, 0, CONF_FILE, true);
+        moduleOptions.parse (0, 0, QPIDC_CONF_FILE, true);
     
         for (vector<string>::iterator iter = moduleOptions.load.begin();
              iter != moduleOptions.load.end();
diff --git a/cpp/src/qpid/client/SslConnector.cpp b/cpp/src/qpid/client/SslConnector.cpp
index a4298dd4ca..7b0bcc6f1e 100644
--- a/cpp/src/qpid/client/SslConnector.cpp
+++ b/cpp/src/qpid/client/SslConnector.cpp
@@ -20,6 +20,7 @@
  */
 #include "Connector.h"
 
+#include "config.h"
 #include "Bounds.h"
 #include "ConnectionImpl.h"
 #include "ConnectionSettings.h"
@@ -146,7 +147,7 @@ namespace {
         StaticInit() {
             try {
                 SslOptions options;
-                options.parse (0, 0, CONF_FILE, true);
+                options.parse (0, 0, QPIDC_CONF_FILE, true);
                 if (options.certDbPath.empty()) {
                     QPID_LOG(info, "SSL connector not enabled, you must set QPID_SSL_CERT_DB to enable it.");                    
                 } else {