WIN32 follow Michael's advice about O.yyy/*.d files

src/copy/pvTimestampPlugin.cpp

@@ -11,6 +11,7 @@
 #include <pv/convert.h>
 #include <pv/pvTimeStamp.h>
 #define epicsExportSharedSymbols
+#include "pv/pvPlugin.h"
 #include "pv/pvTimestampPlugin.h"
 
 

src/database/pvDatabase.cpp

@@ -16,13 +16,13 @@
 #include <pv/pvTimeStamp.h>
 #include <pv/rpcService.h>
 #include <pv/pvStructureCopy.h>
-#include <pv/pvPlugin.h>
-#include <pv/pvArrayPlugin.h>
-#include <pv/pvTimestampPlugin.h>
-#include <pv/pvDeadbandPlugin.h>
 
 #define epicsExportSharedSymbols
-#include <pv/pvDatabase.h>
+#include "pv/pvDatabase.h"
+#include "pv/pvPlugin.h"
+#include "pv/pvArrayPlugin.h"
+#include "pv/pvTimestampPlugin.h"
+#include "pv/pvDeadbandPlugin.h"
 
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;

src/database/pvRecord.cpp

@@ -8,16 +8,25 @@
  * @author mrk
  * @date 2012.11.21
  */
+#include <list>
 #include <epicsGuard.h>
 #include <epicsThread.h>
+#include <pv/status.h>
+#include <pv/pvAccess.h>
+#include <pv/createRequest.h>
+#include <pv/pvaVersion.h>
+#include <pv/pvaVersionNum.h>
+#include <pv/monitor.h>
 #include <pv/convert.h>
-#include <pv/pvStructureCopy.h>
+#include <pv/rpcService.h>
+#include <pv/timeStamp.h>
 #include <pv/pvData.h>
-#include <list>
+#include <pv/rpcService.h>
 #include <pv/pvTimeStamp.h>
+#include <pv/pvStructureCopy.h>
 
 #define epicsExportSharedSymbols
-#include <pv/pvDatabase.h>
+#include "pv/pvDatabase.h"
 
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;

src/pv/channelProviderLocal.h

@@ -23,8 +23,8 @@
 #include <pv/pvAccess.h>
 #include <pv/status.h>
 #include <pv/serverContext.h>
-#include <pv/pvDatabase.h>
 #include <pv/pvStructureCopy.h>
+#include <pv/pvDatabase.h>
 
 #include <shareLib.h>
 

src/pvAccess/channelLocal.cpp

@@ -13,13 +13,21 @@
 
 #include <epicsGuard.h>
 #include <epicsThread.h>
+#include <pv/pvData.h>
+#include <pv/pvAccess.h>
+#include <pv/pvTimeStamp.h>
+#include <pv/rpcService.h>
 #include <pv/timeStamp.h>
+#include <pv/createRequest.h>
+#include <pv/pvaVersion.h>
+#include <pv/pvaVersionNum.h>
+#include <pv/serverContext.h>
 #include <pv/pvSubArrayCopy.h>
 #include <pv/pvStructureCopy.h>
 
 #define epicsExportSharedSymbols
-#include <pv/pvDatabase.h>
-#include <pv/channelProviderLocal.h>
+#include "pv/pvDatabase.h"
+#include "pv/channelProviderLocal.h"
 
 using namespace epics::pvData;
 using namespace epics::pvAccess;

src/pvAccess/channelProviderLocal.cpp

@@ -13,10 +13,14 @@
 #include <epicsExport.h>
 #include <pv/serverContext.h>
 #include <pv/syncChannelFind.h>
+#include <pv/pvTimeStamp.h>
+#include <pv/rpcService.h>
+#include <pv/timeStamp.h>
+#include <pv/pvStructureCopy.h>
 
 #define epicsExportSharedSymbols
-#include <pv/pvDatabase.h>
-#include <pv/channelProviderLocal.h>
+#include "pv/pvDatabase.h"
+#include "pv/channelProviderLocal.h"
 
 using namespace epics::pvData;
 using namespace epics::pvAccess;

src/pvAccess/monitorFactory.cpp

@@ -15,12 +15,16 @@
 #include <pv/thread.h>
 #include <pv/bitSetUtil.h>
 #include <pv/pvData.h>
+#include <pv/pvAccess.h>
+#include <pv/pvTimeStamp.h>
+#include <pv/rpcService.h>
+#include <pv/serverContext.h>
 #include <pv/timeStamp.h>
 #include <pv/pvStructureCopy.h>
 
 #define epicsExportSharedSymbols
-#include <pv/pvDatabase.h>
-#include <pv/channelProviderLocal.h>
+#include "pv/pvDatabase.h"
+#include "pv/channelProviderLocal.h"
 
 using namespace epics::pvData;
 using namespace epics::pvAccess;

src/pvAccess/registerChannelProviderLocal.cpp

@@ -18,8 +18,8 @@
 
 
 #define epicsExportSharedSymbols
-#include <pv/pvDatabase.h>
-#include <pv/channelProviderLocal.h>
+#include "pv/pvDatabase.h"
+#include "pv/channelProviderLocal.h"
 
 using std::cout;
 using std::endl;

src/special/processRecord.cpp

@@ -12,10 +12,26 @@
 #include <epicsThread.h>
 #include <pv/event.h>
 #include <shareLib.h>
+#include <string>
+#include <cstring>
+#include <stdexcept>
+#include <memory>
+#include <set>
+
+#include <pv/lock.h>
+#include <pv/pvType.h>
+#include <pv/pvData.h>
+#include <pv/pvTimeStamp.h>
+#include <pv/timeStamp.h>
+#include <pv/rpcService.h>
+#include <pv/pvAccess.h>
+#include <pv/status.h>
+#include <pv/serverContext.h>
+#include <pv/pvStructureCopy.h>
 
 #define epicsExportSharedSymbols
-#include <pv/pvDatabase.h>
-#include <pv/processRecord.h>
+#include "pv/pvDatabase.h"
+#include "pv/processRecord.h"
 
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;

src/special/processRecordRegister.cpp

@@ -12,12 +12,19 @@
 /* Author: Marty Kraimer */
 
 #include <epicsExport.h>
+#include <epicsThread.h>
 #include <iocsh.h>
+#include <pv/event.h>
 #include <pv/pvAccess.h>
+#include <pv/serverContext.h>
+#include <pv/pvData.h>
+#include <pv/pvTimeStamp.h>
+#include <pv/rpcService.h>
+#include <pv/pvStructureCopy.h>
 
 #define epicsExportSharedSymbols
-#include <pv/pvDatabase.h>
-#include <pv/processRecord.h>
+#include "pv/pvDatabase.h"
+#include "pv/processRecord.h"
 
 
 using namespace epics::pvData;

src/special/removeRecord.cpp

@@ -8,11 +8,27 @@
  * @author mrk
  * @date 2013.04.18
  */
-#include <shareLib.h>
+
+#include <string>
+#include <cstring>
+#include <stdexcept>
+#include <memory>
+#include <set>
+
+#include <pv/lock.h>
+#include <pv/pvType.h>
+#include <pv/pvData.h>
+#include <pv/pvTimeStamp.h>
+#include <pv/timeStamp.h>
+#include <pv/rpcService.h>
+#include <pv/pvAccess.h>
+#include <pv/status.h>
+#include <pv/serverContext.h>
+#include <pv/pvStructureCopy.h>
 
 #define epicsExportSharedSymbols
-#include <pv/pvDatabase.h>
-#include <pv/removeRecord.h>
+#include "pv/pvDatabase.h"
+#include "pv/removeRecord.h"
 
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;

src/special/removeRecordRegister.cpp

@@ -11,12 +11,19 @@
 
 /* Author: Marty Kraimer */
 #include <epicsExport.h>
+#include <epicsThread.h>
 #include <iocsh.h>
+#include <pv/event.h>
 #include <pv/pvAccess.h>
+#include <pv/serverContext.h>
+#include <pv/pvData.h>
+#include <pv/pvTimeStamp.h>
+#include <pv/rpcService.h>
+#include <pv/pvStructureCopy.h>
 
 #define epicsExportSharedSymbols
-#include <pv/pvDatabase.h>
-#include <pv/removeRecord.h>
+#include "pv/pvDatabase.h"
+#include "pv/removeRecord.h"
 
 using namespace epics::pvData;
 using namespace epics::pvAccess;

src/special/traceRecord.cpp

@@ -8,11 +8,27 @@
  * @author mrk
  * @date 2013.04.18
  */
-#include <shareLib.h>
-#include <pv/channelProviderLocal.h>
+
+#include <string>
+#include <cstring>
+#include <stdexcept>
+#include <memory>
+#include <set>
+
+#include <pv/lock.h>
+#include <pv/pvType.h>
+#include <pv/pvData.h>
+#include <pv/pvTimeStamp.h>
+#include <pv/timeStamp.h>
+#include <pv/rpcService.h>
+#include <pv/pvAccess.h>
+#include <pv/status.h>
+#include <pv/serverContext.h>
+#include <pv/pvStructureCopy.h>
 
 #define epicsExportSharedSymbols
-#include <pv/traceRecord.h>
+#include "pv/channelProviderLocal.h"
+#include "pv/traceRecord.h"
 
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;

src/special/traceRecordRegister.cpp

@@ -12,12 +12,19 @@
 /* Author: Marty Kraimer */
 
 #include <epicsExport.h>
+#include <epicsThread.h>
 #include <iocsh.h>
+#include <pv/event.h>
 #include <pv/pvAccess.h>
+#include <pv/serverContext.h>
+#include <pv/pvData.h>
+#include <pv/pvTimeStamp.h>
+#include <pv/rpcService.h>
+#include <pv/pvStructureCopy.h>
 
 #define epicsExportSharedSymbols
-#include <pv/pvDatabase.h>
-#include <pv/traceRecord.h>
+#include "pv/pvDatabase.h"
+#include "pv/traceRecord.h"
 
 using namespace epics::pvData;
 using namespace epics::pvAccess;

src/support/controlSupport.cpp

@@ -8,16 +8,16 @@
  * @author mrk
  * @date 2019.06.01
  */
-#include <pv/pvDatabase.h>
-#include <pv/pvSupport.h>
+
+
 #include <pv/convert.h>
 #include <pv/standardField.h>
 #include <pv/pvStructureCopy.h>
 
-
 #define epicsExportSharedSymbols
-#include <pv/pvDatabase.h>
-#include <pv/controlSupport.h>
+#include <pv/pvSupport.h>
+#include "pv/pvDatabase.h"
+#include "pv/controlSupport.h"
 
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;

src/support/scalarAlarmSupport.cpp

@@ -8,8 +8,7 @@
  * @author mrk
  * @date 2019.06.01
  */
-#include <pv/pvDatabase.h>
-#include <pv/pvSupport.h>
+
 #include <pv/convert.h>
 #include <pv/standardField.h>
 #include <pv/alarm.h>
@@ -18,8 +17,9 @@
 
 
 #define epicsExportSharedSymbols
-#include <pv/pvDatabase.h>
-#include <pv/scalarAlarmSupport.h>
+#include <pv/pvSupport.h>
+#include "pv/pvDatabase.h"
+#include "pv/scalarAlarmSupport.h"
 
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;