diff --git a/src/pipelineService/pipelineServer.cpp b/src/pipelineService/pipelineServer.cpp
index 501fa5a..85f9975 100644
--- a/src/pipelineService/pipelineServer.cpp
+++ b/src/pipelineService/pipelineServer.cpp
@@ -16,8 +16,8 @@
 using namespace epics::pvData;
 using namespace std;
 
-namespace epics {
-namespace pvAccess {
+namespace {
+using namespace epics::pvAccess;
 
 class ChannelPipelineMonitorImpl :
     public PipelineMonitor,
@@ -500,6 +500,10 @@ public:
 Status PipelineChannel::notSupportedStatus(Status::STATUSTYPE_ERROR, "only monitor (aka pipeline) requests are supported by this channel");
 Status PipelineChannel::destroyedStatus(Status::STATUSTYPE_ERROR, "channel destroyed");
 
+} // namespace
+namespace epics {
+namespace pvAccess {
+
 Channel::shared_pointer createPipelineChannel(ChannelProvider::shared_pointer const & provider,
         std::string const & channelName,
         ChannelRequester::shared_pointer const & channelRequester,
@@ -513,6 +517,8 @@ Channel::shared_pointer createPipelineChannel(ChannelProvider::shared_pointer co
     return channel;
 }
 
+}} // epics::pvAccess
+namespace {
 
 class PipelineChannelProvider :
     public virtual ChannelProvider,
@@ -690,6 +696,10 @@ private:
 string PipelineChannelProvider::PROVIDER_NAME("PipelineService");
 Status PipelineChannelProvider::noSuchChannelStatus(Status::STATUSTYPE_ERROR, "no such channel");
 
+} //namespace
+
+namespace epics {
+namespace pvAccess {
 
 PipelineServer::PipelineServer()
 {
diff --git a/src/remoteClient/clientContextImpl.cpp b/src/remoteClient/clientContextImpl.cpp
index 5640cbe..3eabd11 100644
--- a/src/remoteClient/clientContextImpl.cpp
+++ b/src/remoteClient/clientContextImpl.cpp
@@ -47,14 +47,18 @@ using namespace epics::pvData;
 namespace epics {
 namespace pvAccess {
 
-class ChannelGetFieldRequestImpl;
-
 Status ChannelImpl::channelDestroyed(
     Status::STATUSTYPE_WARNING, "channel destroyed");
 Status ChannelImpl::channelDisconnected(
     Status::STATUSTYPE_WARNING, "channel disconnected");
 string emptyString;
 
+}}
+namespace {
+using namespace epics::pvAccess;
+
+class ChannelGetFieldRequestImpl;
+
 // TODO consider std::unordered_map
 //typedef std::tr1::unordered_map<pvAccessID, ResponseRequest::weak_pointer> IOIDResponseRequestMap;
 typedef std::map<pvAccessID, ResponseRequest::weak_pointer> IOIDResponseRequestMap;
@@ -4886,6 +4890,10 @@ void InternalClientContextImpl::InternalChannelImpl::getField(GetFieldRequester:
     // activate() stores self in channel
 }
 
+}//namespace
+namespace epics {
+namespace pvAccess {
+
 ChannelProvider::shared_pointer createClientProvider(const Configuration::shared_pointer& conf)
 {
     InternalClientContextImpl::shared_pointer internal(new InternalClientContextImpl(conf)),
diff --git a/src/remoteClient/pv/clientContextImpl.h b/src/remoteClient/pv/clientContextImpl.h
index e11408f..087c0e9 100644
--- a/src/remoteClient/pv/clientContextImpl.h
+++ b/src/remoteClient/pv/clientContextImpl.h
@@ -26,8 +26,6 @@
 
 #include <shareLib.h>
 
-class ChannelSearchManager;
-
 namespace epics {
 namespace pvAccess {
 
diff --git a/src/server/responseHandlers.cpp b/src/server/responseHandlers.cpp
index 46c9912..74d1dc9 100644
--- a/src/server/responseHandlers.cpp
+++ b/src/server/responseHandlers.cpp
@@ -496,6 +496,10 @@ private:
 
 };
 
+}}
+namespace {
+using namespace epics::pvAccess;
+
 // TODO move out to a separate class
 class ServerRPCService : public RPCService {
 
@@ -670,6 +674,10 @@ std::string ServerRPCService::helpString =
 //        "\t\t\t (no arguments)\n"
     "\n";
 
+}
+namespace epics {
+namespace pvAccess {
+
 std::string ServerCreateChannelHandler::SERVER_CHANNEL_NAME = "server";
 
 void ServerCreateChannelHandler::handleResponse(osiSockAddr* responseFrom,