diff --git a/common/utilities.h b/common/utilities.h
index 76b5d45..556060b 100644
--- a/common/utilities.h
+++ b/common/utilities.h
@@ -16,8 +16,6 @@
 #include "weakmap.h"
 #include "weakset.h"
 
-#include <shareLib.h>
-
 struct TestPV;
 struct TestPVChannel;
 struct TestPVMonitor;
diff --git a/p2pApp/chancache.h b/p2pApp/chancache.h
index 52a25f1..0afafc0 100644
--- a/p2pApp/chancache.h
+++ b/p2pApp/chancache.h
@@ -14,8 +14,6 @@
 #include "weakmap.h"
 #include "weakset.h"
 
-#include <shareLib.h>
-
 struct ChannelCache;
 struct ChannelCacheEntry;
 struct MonitorUser;
diff --git a/p2pApp/channel.h b/p2pApp/channel.h
index b8e31d9..8bb5bf6 100644
--- a/p2pApp/channel.h
+++ b/p2pApp/channel.h
@@ -3,8 +3,6 @@
 
 #include <pv/pvAccess.h>
 
-#include <shareLib.h>
-
 #include "chancache.h"
 
 struct GWChannel : public epics::pvAccess::Channel
diff --git a/p2pApp/pva2pva.h b/p2pApp/pva2pva.h
index 2329b6d..ca0d67f 100644
--- a/p2pApp/pva2pva.h
+++ b/p2pApp/pva2pva.h
@@ -5,8 +5,6 @@
 
 #include <pv/pvAccess.h>
 
-#include <shareLib.h>
-
 typedef epicsGuard<epicsMutex> Guard;
 typedef epicsGuardRelease<epicsMutex> UnGuard;
 
diff --git a/p2pApp/server.h b/p2pApp/server.h
index 941b586..1bfac49 100644
--- a/p2pApp/server.h
+++ b/p2pApp/server.h
@@ -6,8 +6,6 @@
 #include "chancache.h"
 #include "channel.h"
 
-#include <shareLib.h>
-
 struct GWServerChannelProvider :
         public epics::pvAccess::ChannelProvider,
         public epics::pvAccess::ChannelFind,
diff --git a/pdbApp/pdb.h b/pdbApp/pdb.h
index a457d89..f1f88a7 100644
--- a/pdbApp/pdb.h
+++ b/pdbApp/pdb.h
@@ -8,7 +8,7 @@
 
 #include "weakmap.h"
 
-#include <shareLib.h>
+#include <pv/qsrv.h>
 
 struct PDBProvider;
 
diff --git a/pdbApp/pdbgroup.h b/pdbApp/pdbgroup.h
index 11414c9..0abb26e 100644
--- a/pdbApp/pdbgroup.h
+++ b/pdbApp/pdbgroup.h
@@ -17,8 +17,6 @@
 #include "pvif.h"
 #include "pdb.h"
 
-#include <shareLib.h>
-
 struct QSRV_API GroupConfig
 {
     struct QSRV_API Field {
diff --git a/pdbApp/pdbsingle.h b/pdbApp/pdbsingle.h
index 267924c..cad5793 100644
--- a/pdbApp/pdbsingle.h
+++ b/pdbApp/pdbsingle.h
@@ -16,8 +16,6 @@
 #include "pvif.h"
 #include "pdb.h"
 
-#include <shareLib.h>
-
 struct PDBSingleMonitor;
 
 struct QSRV_API PDBSinglePV : public PDBPV
diff --git a/pdbApp/tpool.h b/pdbApp/tpool.h
index d855834..f53d5ce 100644
--- a/pdbApp/tpool.h
+++ b/pdbApp/tpool.h
@@ -13,8 +13,6 @@
 
 #include <pv/sharedPtr.h>
 
-#include <shareLib.h>
-
 struct WorkQueue : private epicsThreadRunable
 {
     typedef std::tr1::weak_ptr<epicsThreadRunable> value_type;