diff --git a/src/copy/createRequest.cpp b/src/copy/createRequest.cpp
index 101edb6..94f110d 100644
--- a/src/copy/createRequest.cpp
+++ b/src/copy/createRequest.cpp
@@ -7,10 +7,10 @@
 #include <string>
 #include <sstream>
 
+#define epicsExportSharedSymbols
+
 #include <pv/pvData.h>
 #include <pv/lock.h>
-
-#define epicsExportSharedSymbols
 #include <pv/createRequest.h>
 
 using namespace epics::pvData;
diff --git a/src/copy/createRequest.h b/src/copy/createRequest.h
index 6d4e429..e7d66a4 100644
--- a/src/copy/createRequest.h
+++ b/src/copy/createRequest.h
@@ -10,21 +10,10 @@
 #include <string>
 #include <sstream>
 
-#ifdef epicsExportSharedSymbols
-#   define pvDataEpicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
-
 #include <pv/pvData.h>
 #include <pv/lock.h>
 
-#ifdef pvDataEpicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#       undef pvDataEpicsExportSharedSymbols
-#endif
-
-
+#include <shareLib.h>
 
 namespace epics { namespace pvData {
 
diff --git a/src/copy/pvCopy.cpp b/src/copy/pvCopy.cpp
index 1c74b44..0bb768d 100644
--- a/src/copy/pvCopy.cpp
+++ b/src/copy/pvCopy.cpp
@@ -13,6 +13,8 @@
 #include <memory>
 #include <sstream>
 
+#define epicsExportSharedSymbols
+
 #include <pv/thread.h>
 
 #include <pv/pvCopy.h>
diff --git a/src/monitor/monitorPlugin.cpp b/src/monitor/monitorPlugin.cpp
index 4c87a2c..a8249b0 100644
--- a/src/monitor/monitorPlugin.cpp
+++ b/src/monitor/monitorPlugin.cpp
@@ -8,6 +8,8 @@
  *  @author mrk
  */
 
+#define epicsExportSharedSymbols
+
 #include <pv/monitorPlugin.h>
 
 namespace epics { namespace pvData { 
diff --git a/src/monitor/monitorPlugin.h b/src/monitor/monitorPlugin.h
index b106c24..8937b73 100644
--- a/src/monitor/monitorPlugin.h
+++ b/src/monitor/monitorPlugin.h
@@ -48,7 +48,7 @@ typedef std::tr1::shared_ptr<MonitorPluginManager> MonitorPluginManagerPtr;
  * A monitor is assumed to be associated with a field of a top level
  * structure.
  */
-class MonitorPlugin
+class epicsShareClass MonitorPlugin
 {
 public:
     virtual ~MonitorPlugin(){}
@@ -103,7 +103,7 @@ public:
 /** A class that creates a plugin.
  * Normlly a plugin is created for a single client.
  */
-class MonitorPluginCreator
+class epicsShareClass MonitorPluginCreator
 {
 public:
     virtual ~MonitorPluginCreator() {}