yet one more time to make WIN32 build

src/pv/channelProviderLocal.h

@@ -28,6 +28,8 @@
 #include <pv/pvAccess.h>
 #include <pv/status.h>
 #include <pv/serverContext.h>
+#include <pv/pvDatabase.h>
+#include <pv/pvStructureCopy.h>
 
 
 #ifdef channelProviderLocalEpicsExportSharedSymbols
@@ -36,8 +38,6 @@
 #endif
 
 #include <shareLib.h>
-#include <pv/pvDatabase.h>
-#include <pv/pvStructureCopy.h>
 
 namespace epics { namespace pvDatabase { 
 

src/pv/controlSupport.h

@@ -17,6 +17,7 @@
 
 #include <pv/pvDatabase.h>
 #include <pv/pvSupport.h>
+#include <pv/pvStructureCopy.h>
 
 #ifdef pvdatabaseEpicsExportSharedSymbols
 #   define epicsExportSharedSymbols
@@ -24,7 +25,6 @@
 #endif
 
 #include <shareLib.h>
-#include <pv/pvStructureCopy.h>
 
 namespace epics { namespace pvDatabase { 
 

src/pv/pvDatabase.h

@@ -17,7 +17,7 @@
 #include <pv/pvData.h>
 #include <pv/pvTimeStamp.h>
 #include <pv/rpcService.h>
-
+#include <pv/pvStructureCopy.h>
 
 #ifdef pvdatabaseEpicsExportSharedSymbols
 #   define epicsExportSharedSymbols
@@ -25,7 +25,6 @@
 #endif
 
 #include <shareLib.h>
-#include <pv/pvStructureCopy.h>
 
 namespace epics { namespace pvDatabase { 
 

src/pv/pvSupport.h

@@ -21,7 +21,7 @@
 #include <pv/pvData.h>
 #include <pv/pvTimeStamp.h>
 #include <pv/rpcService.h>
-
+#include <pv/pvStructureCopy.h>
 
 #ifdef pvdatabaseEpicsExportSharedSymbols
 #   define epicsExportSharedSymbols
@@ -29,7 +29,6 @@
 #endif
 
 #include <shareLib.h>
-#include <pv/pvStructureCopy.h>
 
 namespace epics { namespace pvDatabase { 
 

src/pv/removeRecord.h

@@ -11,10 +11,20 @@
 #ifndef REMOVERECORD_H
 #define REMOVERECORD_H
 
-#include <shareLib.h>
+#ifdef epicsExportSharedSymbols
+#   define pvdatabaseEpicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
+#endif
 
 #include <pv/channelProviderLocal.h>
 
+#ifdef pvdatabaseEpicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#	undef pvdatabaseEpicsExportSharedSymbols
+#endif
+
+#include <shareLib.h>
+
 namespace epics { namespace pvDatabase { 
 
 

src/pv/scalarAlarmSupport.h

@@ -19,6 +19,7 @@
 #include <pv/pvSupport.h>
 #include <pv/alarm.h>
 #include <pv/pvAlarm.h>
+#include <pv/pvStructureCopy.h>
 
 #ifdef pvdatabaseEpicsExportSharedSymbols
 #   define epicsExportSharedSymbols
@@ -26,7 +27,6 @@
 #endif
 
 #include <shareLib.h>
-#include <pv/pvStructureCopy.h>
 
 namespace epics { namespace pvDatabase { 
 

src/pv/traceRecord.h

@@ -11,10 +11,21 @@
 #ifndef TRACERECORD_H
 #define TRACERECORD_H
 
-#include <shareLib.h>
+#ifdef epicsExportSharedSymbols
+#   define pvdatabaseEpicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
+#endif
 
 #include <pv/channelProviderLocal.h>
 
+#ifdef pvdatabaseEpicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#	undef pvdatabaseEpicsExportSharedSymbols
+#endif
+
+#include <shareLib.h>
+
+
 namespace epics { namespace pvDatabase {