diff --git a/src/remote/pv/blockingUDP.h b/src/remote/pv/blockingUDP.h
index 4674ac3..5f34b86 100644
--- a/src/remote/pv/blockingUDP.h
+++ b/src/remote/pv/blockingUDP.h
@@ -511,7 +511,7 @@ private:
 
 typedef std::vector<BlockingUDPTransport::shared_pointer> BlockingUDPTransportVector;
 
-epicsShareFunc void initializeUDPTransports(
+void initializeUDPTransports(
     bool serverFlag,
     BlockingUDPTransportVector& udpTransports,
     const IfaceNodeVector& ifaceList,
diff --git a/src/remote/pv/codec.h b/src/remote/pv/codec.h
index 88f075d..afa082c 100644
--- a/src/remote/pv/codec.h
+++ b/src/remote/pv/codec.h
@@ -292,7 +292,7 @@ private:
 };
 
 
-class epicsShareClass BlockingTCPTransportCodec:
+class BlockingTCPTransportCodec:
     public AbstractCodec,
     public SecurityPluginControl,
     public std::tr1::enable_shared_from_this<BlockingTCPTransportCodec>
@@ -488,7 +488,7 @@ private:
     epics::pvData::Event _verifiedEvent;
 };
 
-class epicsShareClass BlockingServerTCPTransportCodec :
+class BlockingServerTCPTransportCodec :
     public BlockingTCPTransportCodec,
     public ChannelHostingTransport,
     public TransportSender {
@@ -611,7 +611,7 @@ private:
 
 };
 
-class epicsShareClass BlockingClientTCPTransportCodec :
+class BlockingClientTCPTransportCodec :
     public BlockingTCPTransportCodec,
     public TransportSender,
     public epics::pvData::TimerCallback {
diff --git a/src/remoteClient/pv/clientContextImpl.h b/src/remoteClient/pv/clientContextImpl.h
index 087c0e9..1f37a1f 100644
--- a/src/remoteClient/pv/clientContextImpl.h
+++ b/src/remoteClient/pv/clientContextImpl.h
@@ -123,7 +123,7 @@ public:
     virtual void destroy() = 0;
 };
 
-epicsShareFunc ChannelProvider::shared_pointer createClientProvider(const Configuration::shared_pointer& conf);
+ChannelProvider::shared_pointer createClientProvider(const Configuration::shared_pointer& conf);
 
 }
 }
diff --git a/src/server/Makefile b/src/server/Makefile
index 2e841be..d0e2f08 100644
--- a/src/server/Makefile
+++ b/src/server/Makefile
@@ -3,7 +3,6 @@
 SRC_DIRS += $(PVACCESS_SRC)/server
 
 INC += pv/serverContext.h
-INC += pv/serverChannelImpl.h
 INC += pv/beaconServerStatusProvider.h
 
 LIBSRCS += responseHandlers.cpp