diff --git a/pvAccessCPP.config b/pvAccessCPP.config
deleted file mode 100644
index 8cec188..0000000
--- a/pvAccessCPP.config
+++ /dev/null
@@ -1 +0,0 @@
-// ADD PREDEFINED MACROS HERE!
diff --git a/pvAccessCPP.creator b/pvAccessCPP.creator
deleted file mode 100644
index e94cbbd..0000000
--- a/pvAccessCPP.creator
+++ /dev/null
@@ -1 +0,0 @@
-[General]
diff --git a/pvAccessCPP.files b/pvAccessCPP.files
deleted file mode 100644
index 5617612..0000000
--- a/pvAccessCPP.files
+++ /dev/null
@@ -1,962 +0,0 @@
-configure/CONFIG
-configure/CONFIG_SITE
-configure/RELEASE
-configure/RELEASE.local
-configure/RULES
-configure/RULES.ioc
-configure/RULES_DIRS
-configure/RULES_TOP
-documentation/pvAccessCPP.html
-documentation/README
-jenkins/cloudbees_build
-src/pva/pvaConstants.h
-src/pva/clientFactory.cpp
-src/pva/clientFactory.h
-src/pva/pvaVersion.cpp
-src/pva/pvaVersion.h
-src/client/pvAccess.cpp
-src/client/pvAccess.h
-src/factory/ChannelAccessFactory.cpp
-src/factory/CreateRequestFactory.cpp
-src/mb/pvAccessMB.cpp
-src/mb/pvAccessMB.h
-src/remote/abstractResponseHandler.cpp
-src/remote/beaconHandler.cpp
-src/remote/beaconHandler.h
-src/remote/blockingTCP.h
-src/remote/blockingTCPAcceptor.cpp
-src/remote/blockingTCPConnector.cpp
-src/remote/blockingUDP.h
-src/remote/blockingUDPConnector.cpp
-src/remote/blockingUDPTransport.cpp
-src/remote/channelSearchManager.h
-src/remote/remote.h
-src/remote/serializationHelper.cpp
-src/remote/serializationHelper.h
-src/remote/simpleChannelSearchManagerImpl.cpp
-src/remote/simpleChannelSearchManagerImpl.h
-src/remote/transportRegistry.cpp
-src/remote/transportRegistry.h
-src/remote/codec.cpp
-src/remote/codec.h
-src/remoteClient/clientContextImpl.cpp
-src/remoteClient/clientContextImpl.h
-src/remoteClient/clientContextImpl.h.orig
-src/rpcClient/rpcClient.cpp
-src/rpcClient/rpcClient.h
-src/rpcService/rpcServer.cpp
-src/rpcService/rpcServer.h
-src/rpcService/rpcService.h
-src/server/baseChannelRequester.cpp
-src/server/baseChannelRequester.h
-src/server/beaconEmitter.cpp
-src/server/beaconEmitter.h
-src/server/beaconServerStatusProvider.cpp
-src/server/beaconServerStatusProvider.h
-src/server/responseHandlers.cpp
-src/server/responseHandlers.h
-src/server/serverChannelImpl.cpp
-src/server/serverChannelImpl.h
-src/server/serverContext.cpp
-src/server/serverContext.h
-src/utils/configuration.cpp
-src/utils/configuration.h
-src/utils/hexDump.cpp
-src/utils/hexDump.h
-src/utils/inetAddressUtil.cpp
-src/utils/inetAddressUtil.h
-src/utils/introspectionRegistry.cpp
-src/utils/introspectionRegistry.h
-src/utils/likely.h
-src/utils/logger.cpp
-src/utils/logger.h
-src/utils/namedLockPattern.h
-src/utils/referenceCountingLock.cpp
-src/utils/referenceCountingLock.h
-scripts/gcovr
-testApp/client/MockClientImpl.cpp
-testApp/client/testChannelAccessFactory.cpp
-testApp/client/testCreateRequest.cpp
-testApp/client/testMockClient.cpp
-testApp/client/testStartStop.cpp
-pvtoolsSrc/eget.cpp
-testApp/remote/epicsv4Grayscale.h
-pvtoolsSrc/pvget.cpp
-pvtoolsSrc/pvput.cpp
-testApp/remote/pvutils.cpp
-testApp/remote/pvutils.h
-testApp/remote/rpcServiceExample.cpp
-testApp/remote/testADCSim.cpp
-testApp/remote/testBeaconEmitter.cpp
-testApp/remote/testBeaconHandler.cpp
-testApp/remote/testBlockingTCPClnt.cpp
-testApp/remote/testBlockingTCPSrv.cpp
-testApp/remote/testBlockingUDPClnt.cpp
-testApp/remote/testBlockingUDPSrv.cpp
-testApp/remote/testChannelConnect.cpp
-testApp/remote/testChannelSearchManager.cpp
-testApp/remote/testGetPerformance.cpp
-testApp/remote/testNTImage.cpp
-testApp/remote/testRemoteClientImpl.cpp
-testApp/remote/testServer.cpp
-testApp/remote/testServerContext.cpp
-testApp/remote/testChannelAccess.cpp
-testApp/remote/testCodec.cpp
-testApp/utils/testAtomicBoolean.cpp
-testApp/utils/configurationTest.cpp
-testApp/utils/testHexDump.cpp
-testApp/utils/testInetAddressUtils.cpp
-testApp/utils/introspectionRegistryTest.cpp
-testApp/utils/loggerTest.cpp
-testApp/utils/namedLockPatternTest.cpp
-testApp/utils/transportRegistryTest.cpp
-DEMO
-Doxyfile
-README
-runTestServer
-TODO
-pvtoolsSrc/pvinfo.cpp
-src/ca/caProvider.h
-src/ca/caProvider.cpp
-src/ca/caChannel.h
-src/ca/caChannel.cpp
-testApp/utils/Makefile
-testApp/remote/channelAccessIFTest.h
-testApp/remote/channelAccessIFTest.cpp
-testApp/remote/syncTestRequesters.h
-pvtoolsSrc/eget.cpp
-pvtoolsSrc/pvget.cpp
-pvtoolsSrc/pvinfo.cpp
-pvtoolsSrc/pvput.cpp
-pvtoolsSrc/pvutils.cpp
-pvtoolsSrc/pvutils.h
-src/ca/caChannel.cpp
-src/ca/caChannel.h
-src/ca/caProvider.cpp
-src/ca/caProvider.h
-src/client/pvAccess.cpp
-src/client/pvAccess.h
-src/factory/ChannelAccessFactory.cpp
-src/mb/pvAccessMB.cpp
-src/mb/pvAccessMB.h
-src/pva/clientFactory.cpp
-src/pva/clientFactory.h
-src/pva/pvaConstants.h
-src/pva/pvaVersion.cpp
-src/pva/pvaVersion.h
-src/remote/abstractResponseHandler.cpp
-src/remote/beaconHandler.cpp
-src/remote/beaconHandler.h
-src/remote/blockingTCP.h
-src/remote/blockingTCPAcceptor.cpp
-src/remote/blockingTCPConnector.cpp
-src/remote/blockingUDP.h
-src/remote/blockingUDPConnector.cpp
-src/remote/blockingUDPTransport.cpp
-src/remote/channelSearchManager.h
-src/remote/codec.cpp
-src/remote/codec.h
-src/remote/remote.h
-src/remote/serializationHelper.cpp
-src/remote/serializationHelper.h
-src/remote/simpleChannelSearchManagerImpl.cpp
-src/remote/simpleChannelSearchManagerImpl.h
-src/remote/transportRegistry.cpp
-src/remote/transportRegistry.h
-src/remoteClient/clientContextImpl.cpp
-src/remoteClient/clientContextImpl.h
-src/rpcClient/rpcClient.cpp
-src/rpcClient/rpcClient.h
-src/rpcService/rpcServer.cpp
-src/rpcService/rpcServer.h
-src/rpcService/rpcService.cpp
-src/rpcService/rpcService.h
-src/server/baseChannelRequester.cpp
-src/server/baseChannelRequester.h
-src/server/beaconEmitter.cpp
-src/server/beaconEmitter.h
-src/server/beaconServerStatusProvider.cpp
-src/server/beaconServerStatusProvider.h
-src/server/responseHandlers.cpp
-src/server/responseHandlers.h
-src/server/serverChannelImpl.cpp
-src/server/serverChannelImpl.h
-src/server/serverContext.cpp
-src/server/serverContext.h
-src/utils/configuration.cpp
-src/utils/configuration.h
-src/utils/hexDump.cpp
-src/utils/hexDump.h
-src/utils/inetAddressUtil.cpp
-src/utils/inetAddressUtil.h
-src/utils/introspectionRegistry.cpp
-src/utils/introspectionRegistry.h
-src/utils/likely.h
-src/utils/logger.cpp
-src/utils/logger.h
-src/utils/namedLockPattern.h
-src/utils/referenceCountingLock.cpp
-src/utils/referenceCountingLock.h
-src/v3ioc/PVAClientRegister.cpp
-src/v3ioc/PVAServerRegister.cpp
-src/v3ioc/syncChannelFind.h
-testApp/client/MockClientImpl.cpp
-testApp/client/testChannelAccessFactory.cpp
-testApp/client/testMockClient.cpp
-testApp/client/testStartStop.cpp
-testApp/remote/channelAccessIFTest.cpp
-testApp/remote/channelAccessIFTest.h
-testApp/remote/epicsv4Grayscale.h
-testApp/remote/rpcClientExample.cpp
-testApp/remote/rpcServiceExample.cpp
-testApp/remote/syncTestRequesters.h
-testApp/remote/testADCSim.cpp
-testApp/remote/testBeaconEmitter.cpp
-testApp/remote/testBeaconHandler.cpp
-testApp/remote/testBlockingTCPClnt.cpp
-testApp/remote/testBlockingTCPSrv.cpp
-testApp/remote/testBlockingUDPClnt.cpp
-testApp/remote/testBlockingUDPSrv.cpp
-testApp/remote/testChannelAccess.cpp
-testApp/remote/testChannelConnect.cpp
-testApp/remote/testChannelSearchManager.cpp
-testApp/remote/testCodec.cpp
-testApp/remote/testGetPerformance.cpp
-testApp/remote/testMonitorPerformance.cpp
-testApp/remote/testNTImage.cpp
-testApp/remote/testRemoteClientImpl.cpp
-testApp/remote/testServer.cpp
-testApp/remote/testServerContext.cpp
-testApp/utils/configurationTest.cpp
-testApp/utils/introspectionRegistryTest.cpp
-testApp/utils/loggerTest.cpp
-testApp/utils/namedLockPatternTest.cpp
-testApp/utils/testAtomicBoolean.cpp
-testApp/utils/testHexDump.cpp
-testApp/utils/testInetAddressUtils.cpp
-testApp/utils/transportRegistryTest.cpp
-src/remote/security.h
-src/remote/security.cpp
-include/pv/baseChannelRequester.h
-include/pv/beaconEmitter.h
-include/pv/beaconHandler.h
-include/pv/beaconServerStatusProvider.h
-include/pv/blockingTCP.h
-include/pv/blockingUDP.h
-include/pv/caChannel.h
-include/pv/caProvider.h
-include/pv/channelSearchManager.h
-include/pv/clientContextImpl.h
-include/pv/clientFactory.h
-include/pv/codec.h
-include/pv/configuration.h
-include/pv/hexDump.h
-include/pv/inetAddressUtil.h
-include/pv/introspectionRegistry.h
-include/pv/likely.h
-include/pv/logger.h
-include/pv/namedLockPattern.h
-include/pv/pvAccess.h
-include/pv/pvAccessMB.h
-include/pv/pvaConstants.h
-include/pv/pvaVersion.h
-include/pv/referenceCountingLock.h
-include/pv/remote.h
-include/pv/responseHandlers.h
-include/pv/rpcClient.h
-include/pv/rpcServer.h
-include/pv/rpcService.h
-include/pv/security.h
-include/pv/serializationHelper.h
-include/pv/serverChannelImpl.h
-include/pv/serverContext.h
-include/pv/simpleChannelSearchManagerImpl.h
-include/pv/syncChannelFind.h
-include/pv/transportRegistry.h
-include/pv/wildcard.h
-pvtoolsSrc/eget.cpp
-pvtoolsSrc/pvget.cpp
-pvtoolsSrc/pvinfo.cpp
-pvtoolsSrc/pvput.cpp
-pvtoolsSrc/pvutils.cpp
-pvtoolsSrc/pvutils.h
-src/ca/caChannel.cpp
-src/ca/caChannel.h
-src/ca/caProvider.cpp
-src/ca/caProvider.h
-src/client/pvAccess.cpp
-src/client/pvAccess.h
-src/factory/ChannelAccessFactory.cpp
-src/mb/pvAccessMB.cpp
-src/mb/pvAccessMB.h
-src/pva/clientFactory.cpp
-src/pva/clientFactory.h
-src/pva/pvaConstants.h
-src/pva/pvaVersion.cpp
-src/pva/pvaVersion.h
-src/remote/abstractResponseHandler.cpp
-src/remote/beaconHandler.cpp
-src/remote/beaconHandler.h
-src/remote/blockingTCP.h
-src/remote/blockingTCPAcceptor.cpp
-src/remote/blockingTCPConnector.cpp
-src/remote/blockingUDP.h
-src/remote/blockingUDPConnector.cpp
-src/remote/blockingUDPTransport.cpp
-src/remote/channelSearchManager.h
-src/remote/codec.cpp
-src/remote/codec.h
-src/remote/remote.h
-src/remote/security.cpp
-src/remote/security.h
-src/remote/serializationHelper.cpp
-src/remote/serializationHelper.h
-src/remote/simpleChannelSearchManagerImpl.cpp
-src/remote/simpleChannelSearchManagerImpl.h
-src/remote/transportRegistry.cpp
-src/remote/transportRegistry.h
-src/remoteClient/clientContextImpl.cpp
-src/remoteClient/clientContextImpl.h
-src/rpcClient/rpcClient.cpp
-src/rpcClient/rpcClient.h
-src/rpcService/rpcServer.cpp
-src/rpcService/rpcServer.h
-src/rpcService/rpcService.cpp
-src/rpcService/rpcService.h
-src/server/baseChannelRequester.cpp
-src/server/baseChannelRequester.h
-src/server/beaconEmitter.cpp
-src/server/beaconEmitter.h
-src/server/beaconServerStatusProvider.cpp
-src/server/beaconServerStatusProvider.h
-src/server/responseHandlers.cpp
-src/server/responseHandlers.h
-src/server/serverChannelImpl.cpp
-src/server/serverChannelImpl.h
-src/server/serverContext.cpp
-src/server/serverContext.h
-src/utils/configuration.cpp
-src/utils/configuration.h
-src/utils/hexDump.cpp
-src/utils/hexDump.h
-src/utils/inetAddressUtil.cpp
-src/utils/inetAddressUtil.h
-src/utils/introspectionRegistry.cpp
-src/utils/introspectionRegistry.h
-src/utils/likely.h
-src/utils/logger.cpp
-src/utils/logger.h
-src/utils/namedLockPattern.h
-src/utils/referenceCountingLock.cpp
-src/utils/referenceCountingLock.h
-src/utils/wildcard.cpp
-src/utils/wildcard.h
-src/v3ioc/PVAClientRegister.cpp
-src/v3ioc/PVAServerRegister.cpp
-src/v3ioc/syncChannelFind.h
-testApp/client/MockClientImpl.cpp
-testApp/client/testChannelAccessFactory.cpp
-testApp/client/testMockClient.cpp
-testApp/client/testStartStop.cpp
-testApp/remote/channelAccessIFTest.cpp
-testApp/remote/channelAccessIFTest.h
-testApp/remote/epicsv4Grayscale.h
-testApp/remote/rpcClientExample.cpp
-testApp/remote/rpcServiceExample.cpp
-testApp/remote/syncTestRequesters.h
-testApp/remote/testADCSim.cpp
-testApp/remote/testBeaconEmitter.cpp
-testApp/remote/testBeaconHandler.cpp
-testApp/remote/testBlockingTCPClnt.cpp
-testApp/remote/testBlockingTCPSrv.cpp
-testApp/remote/testBlockingUDPClnt.cpp
-testApp/remote/testBlockingUDPSrv.cpp
-testApp/remote/testChannelAccess.cpp
-testApp/remote/testChannelConnect.cpp
-testApp/remote/testChannelSearchManager.cpp
-testApp/remote/testCodec.cpp
-testApp/remote/testGetPerformance.cpp
-testApp/remote/testMonitorPerformance.cpp
-testApp/remote/testNTImage.cpp
-testApp/remote/testRemoteClientImpl.cpp
-testApp/remote/testServer.cpp
-testApp/remote/testServerContext.cpp
-testApp/utils/configurationTest.cpp
-testApp/utils/introspectionRegistryTest.cpp
-testApp/utils/loggerTest.cpp
-testApp/utils/namedLockPatternTest.cpp
-testApp/utils/testAtomicBoolean.cpp
-testApp/utils/testHexDump.cpp
-testApp/utils/testInetAddressUtils.cpp
-testApp/utils/transportRegistryTest.cpp
-include/pv/baseChannelRequester.h
-include/pv/beaconEmitter.h
-include/pv/beaconHandler.h
-include/pv/beaconServerStatusProvider.h
-include/pv/blockingTCP.h
-include/pv/blockingUDP.h
-include/pv/caChannel.h
-include/pv/caProvider.h
-include/pv/channelSearchManager.h
-include/pv/clientContextImpl.h
-include/pv/clientFactory.h
-include/pv/codec.h
-include/pv/configuration.h
-include/pv/hexDump.h
-include/pv/inetAddressUtil.h
-include/pv/introspectionRegistry.h
-include/pv/likely.h
-include/pv/logger.h
-include/pv/namedLockPattern.h
-include/pv/pvAccess.h
-include/pv/pvAccessMB.h
-include/pv/pvaConstants.h
-include/pv/pvaVersion.h
-include/pv/referenceCountingLock.h
-include/pv/remote.h
-include/pv/responseHandlers.h
-include/pv/rpcClient.h
-include/pv/rpcServer.h
-include/pv/rpcService.h
-include/pv/security.h
-include/pv/serializationHelper.h
-include/pv/serverChannelImpl.h
-include/pv/serverContext.h
-include/pv/simpleChannelSearchManagerImpl.h
-include/pv/syncChannelFind.h
-include/pv/transportRegistry.h
-include/pv/wildcard.h
-pvtoolsSrc/eget.cpp
-pvtoolsSrc/pvget.cpp
-pvtoolsSrc/pvinfo.cpp
-pvtoolsSrc/pvput.cpp
-pvtoolsSrc/pvutils.cpp
-pvtoolsSrc/pvutils.h
-src/ca/caChannel.cpp
-src/ca/caChannel.h
-src/ca/caProvider.cpp
-src/ca/caProvider.h
-src/client/pvAccess.cpp
-src/client/pvAccess.h
-src/factory/ChannelAccessFactory.cpp
-src/mb/pvAccessMB.cpp
-src/mb/pvAccessMB.h
-src/pva/clientFactory.cpp
-src/pva/clientFactory.h
-src/pva/pvaConstants.h
-src/pva/pvaVersion.cpp
-src/pva/pvaVersion.h
-src/remote/abstractResponseHandler.cpp
-src/remote/beaconHandler.cpp
-src/remote/beaconHandler.h
-src/remote/blockingTCP.h
-src/remote/blockingTCPAcceptor.cpp
-src/remote/blockingTCPConnector.cpp
-src/remote/blockingUDP.h
-src/remote/blockingUDPConnector.cpp
-src/remote/blockingUDPTransport.cpp
-src/remote/channelSearchManager.h
-src/remote/codec.cpp
-src/remote/codec.h
-src/remote/remote.h
-src/remote/security.cpp
-src/remote/security.h
-src/remote/serializationHelper.cpp
-src/remote/serializationHelper.h
-src/remote/simpleChannelSearchManagerImpl.cpp
-src/remote/simpleChannelSearchManagerImpl.h
-src/remote/transportRegistry.cpp
-src/remote/transportRegistry.h
-src/remoteClient/clientContextImpl.cpp
-src/remoteClient/clientContextImpl.h
-src/rpcClient/rpcClient.cpp
-src/rpcClient/rpcClient.h
-src/rpcService/rpcServer.cpp
-src/rpcService/rpcServer.h
-src/rpcService/rpcService.cpp
-src/rpcService/rpcService.h
-src/server/baseChannelRequester.cpp
-src/server/baseChannelRequester.h
-src/server/beaconEmitter.cpp
-src/server/beaconEmitter.h
-src/server/beaconServerStatusProvider.cpp
-src/server/beaconServerStatusProvider.h
-src/server/responseHandlers.cpp
-src/server/responseHandlers.h
-src/server/serverChannelImpl.cpp
-src/server/serverChannelImpl.h
-src/server/serverContext.cpp
-src/server/serverContext.h
-src/utils/configuration.cpp
-src/utils/configuration.h
-src/utils/hexDump.cpp
-src/utils/hexDump.h
-src/utils/inetAddressUtil.cpp
-src/utils/inetAddressUtil.h
-src/utils/introspectionRegistry.cpp
-src/utils/introspectionRegistry.h
-src/utils/likely.h
-src/utils/logger.cpp
-src/utils/logger.h
-src/utils/namedLockPattern.h
-src/utils/referenceCountingLock.cpp
-src/utils/referenceCountingLock.h
-src/utils/wildcard.cpp
-src/utils/wildcard.h
-src/v3ioc/PVAClientRegister.cpp
-src/v3ioc/PVAServerRegister.cpp
-src/v3ioc/syncChannelFind.h
-testApp/client/MockClientImpl.cpp
-testApp/client/testChannelAccessFactory.cpp
-testApp/client/testMockClient.cpp
-testApp/client/testStartStop.cpp
-testApp/remote/channelAccessIFTest.cpp
-testApp/remote/channelAccessIFTest.h
-testApp/remote/epicsv4Grayscale.h
-testApp/remote/rpcClientExample.cpp
-testApp/remote/rpcServiceExample.cpp
-testApp/remote/rpcWildServiceExample.cpp
-testApp/remote/syncTestRequesters.h
-testApp/remote/testADCSim.cpp
-testApp/remote/testBeaconEmitter.cpp
-testApp/remote/testBeaconHandler.cpp
-testApp/remote/testBlockingTCPClnt.cpp
-testApp/remote/testBlockingTCPSrv.cpp
-testApp/remote/testBlockingUDPClnt.cpp
-testApp/remote/testBlockingUDPSrv.cpp
-testApp/remote/testChannelAccess.cpp
-testApp/remote/testChannelConnect.cpp
-testApp/remote/testChannelSearchManager.cpp
-testApp/remote/testCodec.cpp
-testApp/remote/testGetPerformance.cpp
-testApp/remote/testMonitorPerformance.cpp
-testApp/remote/testNTImage.cpp
-testApp/remote/testRemoteClientImpl.cpp
-testApp/remote/testServer.cpp
-testApp/remote/testServerContext.cpp
-testApp/utils/configurationTest.cpp
-testApp/utils/introspectionRegistryTest.cpp
-testApp/utils/loggerTest.cpp
-testApp/utils/namedLockPatternTest.cpp
-testApp/utils/testAtomicBoolean.cpp
-testApp/utils/testHexDump.cpp
-testApp/utils/testInetAddressUtils.cpp
-testApp/utils/transportRegistryTest.cpp
-pvtoolsSrc/pvlist.cpp
-configure/O.darwin-x86/Makefile
-configure/Makefile
-include/pv/baseChannelRequester.h
-include/pv/beaconEmitter.h
-include/pv/beaconHandler.h
-include/pv/beaconServerStatusProvider.h
-include/pv/blockingTCP.h
-include/pv/blockingUDP.h
-include/pv/caChannel.h
-include/pv/caProvider.h
-include/pv/channelSearchManager.h
-include/pv/clientContextImpl.h
-include/pv/clientFactory.h
-include/pv/codec.h
-include/pv/configuration.h
-include/pv/hexDump.h
-include/pv/inetAddressUtil.h
-include/pv/introspectionRegistry.h
-include/pv/likely.h
-include/pv/logger.h
-include/pv/namedLockPattern.h
-include/pv/pvAccess.h
-include/pv/pvAccessMB.h
-include/pv/pvaConstants.h
-include/pv/pvaVersion.h
-include/pv/referenceCountingLock.h
-include/pv/remote.h
-include/pv/responseHandlers.h
-include/pv/rpcClient.h
-include/pv/rpcServer.h
-include/pv/rpcService.h
-include/pv/security.h
-include/pv/serializationHelper.h
-include/pv/serverChannelImpl.h
-include/pv/serverContext.h
-include/pv/simpleChannelSearchManagerImpl.h
-include/pv/syncChannelFind.h
-include/pv/transportRegistry.h
-include/pv/wildcard.h
-pvtoolsSrc/O.darwin-x86/Makefile
-pvtoolsSrc/eget.cpp
-pvtoolsSrc/Makefile
-pvtoolsSrc/pvget.cpp
-pvtoolsSrc/pvinfo.cpp
-pvtoolsSrc/pvlist.cpp
-pvtoolsSrc/pvput.cpp
-pvtoolsSrc/pvutils.cpp
-pvtoolsSrc/pvutils.h
-src/ca/caChannel.cpp
-src/ca/caChannel.h
-src/ca/caProvider.cpp
-src/ca/caProvider.h
-src/ca/Makefile
-src/client/Makefile
-src/client/pvAccess.cpp
-src/client/pvAccess.h
-src/factory/ChannelAccessFactory.cpp
-src/factory/Makefile
-src/mb/Makefile
-src/mb/pvAccessMB.cpp
-src/mb/pvAccessMB.h
-src/O.darwin-x86/Makefile
-src/pva/clientFactory.cpp
-src/pva/clientFactory.h
-src/pva/Makefile
-src/pva/pvaConstants.h
-src/pva/pvaVersion.cpp
-src/pva/pvaVersion.h
-src/remote/abstractResponseHandler.cpp
-src/remote/beaconHandler.cpp
-src/remote/beaconHandler.h
-src/remote/blockingTCP.h
-src/remote/blockingTCPAcceptor.cpp
-src/remote/blockingTCPConnector.cpp
-src/remote/blockingUDP.h
-src/remote/blockingUDPConnector.cpp
-src/remote/blockingUDPTransport.cpp
-src/remote/channelSearchManager.h
-src/remote/codec.cpp
-src/remote/codec.h
-src/remote/Makefile
-src/remote/remote.h
-src/remote/security.cpp
-src/remote/security.h
-src/remote/serializationHelper.cpp
-src/remote/serializationHelper.h
-src/remote/simpleChannelSearchManagerImpl.cpp
-src/remote/simpleChannelSearchManagerImpl.h
-src/remote/transportRegistry.cpp
-src/remote/transportRegistry.h
-src/remoteClient/clientContextImpl.cpp
-src/remoteClient/clientContextImpl.h
-src/remoteClient/Makefile
-src/rpcClient/Makefile
-src/rpcClient/rpcClient.cpp
-src/rpcClient/rpcClient.h
-src/rpcService/Makefile
-src/rpcService/rpcServer.cpp
-src/rpcService/rpcServer.h
-src/rpcService/rpcService.cpp
-src/rpcService/rpcService.h
-src/server/baseChannelRequester.cpp
-src/server/baseChannelRequester.h
-src/server/beaconEmitter.cpp
-src/server/beaconEmitter.h
-src/server/beaconServerStatusProvider.cpp
-src/server/beaconServerStatusProvider.h
-src/server/Makefile
-src/server/responseHandlers.cpp
-src/server/responseHandlers.h
-src/server/serverChannelImpl.cpp
-src/server/serverChannelImpl.h
-src/server/serverContext.cpp
-src/server/serverContext.h
-src/utils/configuration.cpp
-src/utils/configuration.h
-src/utils/hexDump.cpp
-src/utils/hexDump.h
-src/utils/inetAddressUtil.cpp
-src/utils/inetAddressUtil.h
-src/utils/introspectionRegistry.cpp
-src/utils/introspectionRegistry.h
-src/utils/likely.h
-src/utils/logger.cpp
-src/utils/logger.h
-src/utils/Makefile
-src/utils/namedLockPattern.h
-src/utils/referenceCountingLock.cpp
-src/utils/referenceCountingLock.h
-src/utils/wildcard.cpp
-src/utils/wildcard.h
-src/v3ioc/Makefile
-src/v3ioc/PVAClientRegister.cpp
-src/v3ioc/PVAServerRegister.cpp
-src/v3ioc/syncChannelFind.h
-src/Makefile
-testApp/client/O.darwin-x86/Makefile
-testApp/client/Makefile
-testApp/client/MockClientImpl.cpp
-testApp/client/testChannelAccessFactory.cpp
-testApp/client/testMockClient.cpp
-testApp/client/testStartStop.cpp
-testApp/remote/O.darwin-x86/Makefile
-testApp/remote/channelAccessIFTest.cpp
-testApp/remote/channelAccessIFTest.h
-testApp/remote/epicsv4Grayscale.h
-testApp/remote/Makefile
-testApp/remote/rpcClientExample.cpp
-testApp/remote/rpcServiceExample.cpp
-testApp/remote/rpcWildServiceExample.cpp
-testApp/remote/syncTestRequesters.h
-testApp/remote/testADCSim.cpp
-testApp/remote/testBeaconEmitter.cpp
-testApp/remote/testBeaconHandler.cpp
-testApp/remote/testBlockingTCPClnt.cpp
-testApp/remote/testBlockingTCPSrv.cpp
-testApp/remote/testBlockingUDPClnt.cpp
-testApp/remote/testBlockingUDPSrv.cpp
-testApp/remote/testChannelAccess.cpp
-testApp/remote/testChannelConnect.cpp
-testApp/remote/testChannelSearchManager.cpp
-testApp/remote/testCodec.cpp
-testApp/remote/testGetPerformance.cpp
-testApp/remote/testMonitorPerformance.cpp
-testApp/remote/testNTImage.cpp
-testApp/remote/testRemoteClientImpl.cpp
-testApp/remote/testServer.cpp
-testApp/remote/testServerContext.cpp
-testApp/utils/O.darwin-x86/Makefile
-testApp/utils/configurationTest.cpp
-testApp/utils/introspectionRegistryTest.cpp
-testApp/utils/loggerTest.cpp
-testApp/utils/Makefile
-testApp/utils/namedLockPatternTest.cpp
-testApp/utils/testAtomicBoolean.cpp
-testApp/utils/testHexDump.cpp
-testApp/utils/testInetAddressUtils.cpp
-testApp/utils/transportRegistryTest.cpp
-testApp/Makefile
-Makefile
-configure/O.darwin-x86/Makefile
-configure/Makefile
-include/pv/baseChannelRequester.h
-include/pv/beaconEmitter.h
-include/pv/beaconHandler.h
-include/pv/beaconServerStatusProvider.h
-include/pv/blockingTCP.h
-include/pv/blockingUDP.h
-include/pv/caChannel.h
-include/pv/caProvider.h
-include/pv/channelSearchManager.h
-include/pv/clientContextImpl.h
-include/pv/clientFactory.h
-include/pv/codec.h
-include/pv/configuration.h
-include/pv/hexDump.h
-include/pv/inetAddressUtil.h
-include/pv/introspectionRegistry.h
-include/pv/likely.h
-include/pv/logger.h
-include/pv/namedLockPattern.h
-include/pv/pvAccess.h
-include/pv/pvAccessMB.h
-include/pv/pvaConstants.h
-include/pv/pvaVersion.h
-include/pv/referenceCountingLock.h
-include/pv/remote.h
-include/pv/responseHandlers.h
-include/pv/rpcClient.h
-include/pv/rpcServer.h
-include/pv/rpcService.h
-include/pv/security.h
-include/pv/serializationHelper.h
-include/pv/serverChannelImpl.h
-include/pv/serverContext.h
-include/pv/simpleChannelSearchManagerImpl.h
-include/pv/syncChannelFind.h
-include/pv/transportRegistry.h
-include/pv/wildcard.h
-pvtoolsSrc/O.darwin-x86/Makefile
-pvtoolsSrc/eget.cpp
-pvtoolsSrc/Makefile
-pvtoolsSrc/pvget.cpp
-pvtoolsSrc/pvinfo.cpp
-pvtoolsSrc/pvlist.cpp
-pvtoolsSrc/pvput.cpp
-pvtoolsSrc/pvutils.cpp
-pvtoolsSrc/pvutils.h
-src/ca/caChannel.cpp
-src/ca/caChannel.h
-src/ca/caProvider.cpp
-src/ca/caProvider.h
-src/ca/Makefile
-src/client/Makefile
-src/client/pvAccess.cpp
-src/client/pvAccess.h
-src/factory/ChannelAccessFactory.cpp
-src/factory/Makefile
-src/mb/Makefile
-src/mb/pvAccessMB.cpp
-src/mb/pvAccessMB.h
-src/O.darwin-x86/Makefile
-src/pva/clientFactory.cpp
-src/pva/clientFactory.h
-src/pva/Makefile
-src/pva/pvaConstants.h
-src/pva/pvaVersion.cpp
-src/pva/pvaVersion.h
-src/remote/abstractResponseHandler.cpp
-src/remote/beaconHandler.cpp
-src/remote/beaconHandler.h
-src/remote/blockingTCP.h
-src/remote/blockingTCPAcceptor.cpp
-src/remote/blockingTCPConnector.cpp
-src/remote/blockingUDP.h
-src/remote/blockingUDPConnector.cpp
-src/remote/blockingUDPTransport.cpp
-src/remote/channelSearchManager.h
-src/remote/codec.cpp
-src/remote/codec.h
-src/remote/Makefile
-src/remote/remote.h
-src/remote/security.cpp
-src/remote/security.h
-src/remote/serializationHelper.cpp
-src/remote/serializationHelper.h
-src/remote/simpleChannelSearchManagerImpl.cpp
-src/remote/simpleChannelSearchManagerImpl.h
-src/remote/transportRegistry.cpp
-src/remote/transportRegistry.h
-src/remoteClient/clientContextImpl.cpp
-src/remoteClient/clientContextImpl.h
-src/remoteClient/Makefile
-src/rpcClient/Makefile
-src/rpcClient/rpcClient.cpp
-src/rpcClient/rpcClient.h
-src/rpcService/Makefile
-src/rpcService/rpcServer.cpp
-src/rpcService/rpcServer.h
-src/rpcService/rpcService.cpp
-src/rpcService/rpcService.h
-src/server/baseChannelRequester.cpp
-src/server/baseChannelRequester.h
-src/server/beaconEmitter.cpp
-src/server/beaconEmitter.h
-src/server/beaconServerStatusProvider.cpp
-src/server/beaconServerStatusProvider.h
-src/server/Makefile
-src/server/responseHandlers.cpp
-src/server/responseHandlers.h
-src/server/serverChannelImpl.cpp
-src/server/serverChannelImpl.h
-src/server/serverContext.cpp
-src/server/serverContext.h
-src/utils/configuration.cpp
-src/utils/configuration.h
-src/utils/hexDump.cpp
-src/utils/hexDump.h
-src/utils/inetAddressUtil.cpp
-src/utils/inetAddressUtil.h
-src/utils/introspectionRegistry.cpp
-src/utils/introspectionRegistry.h
-src/utils/likely.h
-src/utils/logger.cpp
-src/utils/logger.h
-src/utils/Makefile
-src/utils/namedLockPattern.h
-src/utils/referenceCountingLock.cpp
-src/utils/referenceCountingLock.h
-src/utils/wildcard.cpp
-src/utils/wildcard.h
-src/v3ioc/Makefile
-src/v3ioc/PVAClientRegister.cpp
-src/v3ioc/PVAServerRegister.cpp
-src/v3ioc/syncChannelFind.h
-src/Makefile
-testApp/O.darwin-x86/Makefile
-testApp/remote/O.darwin-x86/Makefile
-testApp/remote/channelAccessIFTest.cpp
-testApp/remote/channelAccessIFTest.h
-testApp/remote/epicsv4Grayscale.h
-testApp/remote/Makefile
-testApp/remote/rpcClientExample.cpp
-testApp/remote/rpcServiceExample.cpp
-testApp/remote/rpcWildServiceExample.cpp
-testApp/remote/syncTestRequesters.h
-testApp/remote/testADCSim.cpp
-testApp/remote/testChannelAccess.cpp
-testApp/remote/testChannelConnect.cpp
-testApp/remote/testCodec.cpp
-testApp/remote/testGetPerformance.cpp
-testApp/remote/testMonitorPerformance.cpp
-testApp/remote/testNTImage.cpp
-testApp/remote/testRemoteClientImpl.cpp
-testApp/remote/testServer.cpp
-testApp/remote/testServerContext.cpp
-testApp/utils/O.darwin-x86/Makefile
-testApp/utils/configurationTest.cpp
-testApp/utils/introspectionRegistryTest.cpp
-testApp/utils/loggerTest.cpp
-testApp/utils/Makefile
-testApp/utils/namedLockPatternTest.cpp
-testApp/utils/testAtomicBoolean.cpp
-testApp/utils/testHexDump.cpp
-testApp/utils/testInetAddressUtils.cpp
-testApp/utils/transportRegistryTest.cpp
-testApp/Makefile
-testApp/pvAccessAllTests.c
-Makefile
-testApp/remote/channelAccessIFTest.cpp
-testApp/remote/channelAccessIFTest.h
-testApp/remote/epicsv4Grayscale.h
-testApp/remote/rpcClientExample.cpp
-testApp/remote/rpcServiceExample.cpp
-testApp/remote/rpcWildServiceExample.cpp
-testApp/remote/syncTestRequesters.h
-testApp/remote/testADCSim.cpp
-testApp/remote/testChannelAccess.cpp
-testApp/remote/testChannelConnect.cpp
-testApp/remote/testCodec.cpp
-testApp/remote/testGetPerformance.cpp
-testApp/remote/testMonitorPerformance.cpp
-testApp/remote/testNTImage.cpp
-testApp/remote/testRemoteClientImpl.cpp
-testApp/remote/testServer.cpp
-testApp/remote/testServerContext.cpp
-testApp/utils/configurationTest.cpp
-testApp/utils/introspectionRegistryTest.cpp
-testApp/utils/loggerTest.cpp
-testApp/utils/namedLockPatternTest.cpp
-testApp/utils/testAtomicBoolean.cpp
-testApp/utils/testHexDump.cpp
-testApp/utils/testInetAddressUtils.cpp
-testApp/utils/transportRegistryTest.cpp
-testApp/pvAccessAllTests.c
-testApp/rtemsConfig.c
-testApp/rtemsNetworking.h
-testApp/rtemsTestHarness.c
-src/ca/caStatus.cpp
-src/ca/caStatus.h
-testApp/client/O.darwin-x86/Makefile
-testApp/O.darwin-x86/Makefile
-testApp/remote/O.darwin-x86/Makefile
-testApp/remote/channelAccessIFTest.cpp
-testApp/remote/channelAccessIFTest.h
-testApp/remote/epicsv4Grayscale.h
-testApp/remote/Makefile
-testApp/remote/rpcClientExample.cpp
-testApp/remote/rpcServiceAsyncExample.cpp
-testApp/remote/rpcServiceExample.cpp
-testApp/remote/rpcWildServiceExample.cpp
-testApp/remote/syncTestRequesters.h
-testApp/remote/testADCSim.cpp
-testApp/remote/testChannelAccess.cpp
-testApp/remote/testChannelConnect.cpp
-testApp/remote/testCodec.cpp
-testApp/remote/testGetPerformance.cpp
-testApp/remote/testMonitorPerformance.cpp
-testApp/remote/testNTImage.cpp
-testApp/remote/testRemoteClientImpl.cpp
-testApp/remote/testServer.cpp
-testApp/remote/testServerContext.cpp
-testApp/utils/O.darwin-x86/Makefile
-testApp/utils/configurationTest.cpp
-testApp/utils/introspectionRegistryTest.cpp
-testApp/utils/loggerTest.cpp
-testApp/utils/Makefile
-testApp/utils/namedLockPatternTest.cpp
-testApp/utils/testAtomicBoolean.cpp
-testApp/utils/testHexDump.cpp
-testApp/utils/testInetAddressUtils.cpp
-testApp/utils/transportRegistryTest.cpp
-testApp/Makefile
-testApp/pvAccessAllTests.c
-testApp/rtemsConfig.c
-testApp/rtemsNetworking.h
-testApp/rtemsTestHarness.c
diff --git a/pvAccessCPP.includes b/pvAccessCPP.includes
deleted file mode 100644
index bfb836e..0000000
--- a/pvAccessCPP.includes
+++ /dev/null
@@ -1,13 +0,0 @@
-/home/msekoranja/epicsV4/pvAccessCPP/pvAccessApp/ca
-/home/msekoranja/epicsV4/pvAccessCPP/pvAccessApp/client
-/home/msekoranja/epicsV4/pvAccessCPP/pvAccessApp/mb
-/home/msekoranja/epicsV4/pvAccessCPP/pvAccessApp/remote
-/home/msekoranja/epicsV4/pvAccessCPP/pvAccessApp/remoteClient
-/home/msekoranja/epicsV4/pvAccessCPP/pvAccessApp/rpcClient
-/home/msekoranja/epicsV4/pvAccessCPP/pvAccessApp/rpcService
-/home/msekoranja/epicsV4/pvAccessCPP/pvAccessApp/server
-/home/msekoranja/epicsV4/pvAccessCPP/pvAccessApp/utils
-/home/msekoranja/epicsV4/pvAccessCPP/testApp/remote
-/home/msekoranja/epicsV4/pvAccessCPP/testApp/client
-/home/msekoranja/epicsV4/pvAccessCPP/testApp/utils
-testApp