diff --git a/src/ca/access.cpp b/src/ca/access.cpp
index 997cf7af5..cbe686714 100644
--- a/src/ca/access.cpp
+++ b/src/ca/access.cpp
@@ -22,6 +22,7 @@
  */
 
 #include <new>
+#include <float.h>
 
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
 
@@ -41,6 +42,7 @@
 #include "iocinf.h"
 #include "oldAccess.h"
 #include "autoPtrDestroy.h"
+#include "cac.h"
 
 epicsThreadPrivateId caClientContextId;
 
diff --git a/src/ca/ca_client_context.cpp b/src/ca/ca_client_context.cpp
index ddb3b42fb..8a5f971f3 100644
--- a/src/ca/ca_client_context.cpp
+++ b/src/ca/ca_client_context.cpp
@@ -34,6 +34,7 @@
 #define epicsExportSharedSymbols
 #include "iocinf.h"
 #include "oldAccess.h"
+#include "cac.h"
 
 extern epicsThreadPrivateId caClientContextId;
 
@@ -550,3 +551,56 @@ void ca_client_context::changeConnCallBack (
     }
     pConnCallBack = pfunc;
 }
+
+void ca_client_context::registerService ( cacService &service )
+{
+    this->pClientCtx->registerService ( service );
+}
+
+cacChannel & ca_client_context::createChannel ( const char * name_str, 
+             oldChannelNotify & chan, cacChannel::priLev pri )
+{
+    return this->pClientCtx->createChannel ( name_str, chan, pri );
+}
+
+void ca_client_context::flushRequest ()
+{
+    this->pClientCtx->flushRequest ();
+}
+
+unsigned ca_client_context::connectionCount () const
+{
+    return this->pClientCtx->connectionCount ();
+}
+
+unsigned ca_client_context::beaconAnomaliesSinceProgramStart () const
+{
+    return this->pClientCtx->beaconAnomaliesSinceProgramStart ();
+}
+
+CASG * ca_client_context::lookupCASG ( unsigned id )
+{
+    return this->pClientCtx->lookupCASG ( id );
+}
+
+void ca_client_context::installCASG ( CASG &sg )
+{
+    this->pClientCtx->installCASG ( sg );
+}
+
+void ca_client_context::uninstallCASG ( CASG &sg )
+{
+    this->pClientCtx->uninstallCASG ( sg );
+}
+
+void ca_client_context::vSignal ( int ca_status, const char *pfilenm, 
+                     int lineno, const char *pFormat, va_list args )
+{
+    this->pClientCtx->vSignal ( ca_status, pfilenm, 
+                     lineno, pFormat, args );
+}
+
+void ca_client_context::selfTest ()
+{
+    this->pClientCtx->selfTest ();
+}
diff --git a/src/ca/cac.h b/src/ca/cac.h
index 5da33e455..96b994818 100644
--- a/src/ca/cac.h
+++ b/src/ca/cac.h
@@ -49,6 +49,7 @@
 #include "cacIO.h"
 #include "netIO.h"
 #include "localHostName.h"
+#include "virtualCircuit.h"
 
 class netWriteNotifyIO;
 class netReadNotifyIO;
diff --git a/src/ca/oldAccess.h b/src/ca/oldAccess.h
index 82e155038..ad92360cf 100644
--- a/src/ca/oldAccess.h
+++ b/src/ca/oldAccess.h
@@ -32,17 +32,17 @@
 #   undef epicsExportSharedSymbols
 #endif
 
-#include "virtualCircuit.h"
 #include "tsFreeList.h"
 #include "epicsMemory.h"
 #include "cxxCompilerDependencies.h"
+#include "osiSock.h"
 
 #ifdef oldAccessh_restore_epicsExportSharedSymbols
 #   define epicsExportSharedSymbols
 #   include "shareLib.h"
 #endif
 
-#include "cac.h"
+#include "caProto.h"
 #include "cacIO.h"
 #include "cadef.h"
 #include "syncGroup.h"
@@ -285,7 +285,7 @@ private:
     epicsMutex callbackMutex; 
     epicsEvent ioDone;
     epicsEvent callbackThreadActivityComplete;
-    epics_auto_ptr < cac > pClientCtx;
+    epics_auto_ptr < class cac > pClientCtx;
     epics_auto_ptr < epicsGuard < epicsMutex > > pCallbackGuard;
     caExceptionHandler * ca_exception_func;
     void * ca_exception_arg;
@@ -537,59 +537,6 @@ inline void getCallback::operator delete ( void *pCadaver,
 }
 #endif
 
-inline void ca_client_context::registerService ( cacService &service )
-{
-    this->pClientCtx->registerService ( service );
-}
-
-inline cacChannel & ca_client_context::createChannel ( const char * name_str, 
-             oldChannelNotify & chan, cacChannel::priLev pri )
-{
-    return this->pClientCtx->createChannel ( name_str, chan, pri );
-}
-
-inline void ca_client_context::flushRequest ()
-{
-    this->pClientCtx->flushRequest ();
-}
-
-inline unsigned ca_client_context::connectionCount () const
-{
-    return this->pClientCtx->connectionCount ();
-}
-
-inline unsigned ca_client_context::beaconAnomaliesSinceProgramStart () const
-{
-    return this->pClientCtx->beaconAnomaliesSinceProgramStart ();
-}
-
-inline CASG * ca_client_context::lookupCASG ( unsigned id )
-{
-    return this->pClientCtx->lookupCASG ( id );
-}
-
-inline void ca_client_context::installCASG ( CASG &sg )
-{
-    this->pClientCtx->installCASG ( sg );
-}
-
-inline void ca_client_context::uninstallCASG ( CASG &sg )
-{
-    this->pClientCtx->uninstallCASG ( sg );
-}
-
-inline void ca_client_context::vSignal ( int ca_status, const char *pfilenm, 
-                     int lineno, const char *pFormat, va_list args )
-{
-    this->pClientCtx->vSignal ( ca_status, pfilenm, 
-                     lineno, pFormat, args );
-}
-
-inline void ca_client_context::selfTest ()
-{
-    this->pClientCtx->selfTest ();
-}
-
 inline bool ca_client_context::preemptiveCallbakIsEnabled () const
 {
     return ! this->pCallbackGuard.get ();