diff --git a/src/ca/access.cpp b/src/ca/access.cpp
index 322ac967e..16d2cd5bd 100644
--- a/src/ca/access.cpp
+++ b/src/ca/access.cpp
@@ -37,8 +37,7 @@ epicsThreadPrivateId caClientContextId;
 
 static epicsThreadOnceId caClientContextIdOnce = EPICS_THREAD_ONCE_INIT;
 
-// extern "C"
-void ca_client_exit_handler ()
+extern "C" void ca_client_exit_handler ()
 {
     if ( caClientContextId ) {
         epicsThreadPrivateDelete ( caClientContextId );
@@ -47,8 +46,7 @@ void ca_client_exit_handler ()
 }
 
 // runs once only for each process
-// extern "C"
-void ca_init_client_context ( void * )
+extern "C" void ca_init_client_context ( void * )
 {
     caClientContextId = epicsThreadPrivateCreate ();
     if ( caClientContextId ) {
diff --git a/src/ca/cac.cpp b/src/ca/cac.cpp
index b89c3f567..8f40e1865 100644
--- a/src/ca/cac.cpp
+++ b/src/ca/cac.cpp
@@ -1568,7 +1568,7 @@ bool cac::writeNotifyExcep ( epicsGuard < callbackMutex > &, tcpiiu &,
     return true;
 }
 
-bool cac::exceptionRespAction ( epicsGuard < callbackMutex > & cbMutex, tcpiiu & iiu, 
+bool cac::exceptionRespAction ( epicsGuard < callbackMutex > & cbMutexIn, tcpiiu & iiu, 
                             const caHdrLargeArray & hdr, void * pMsgBdy )
 {
     const caHdr * pReq = reinterpret_cast < const caHdr * > ( pMsgBdy );
@@ -1605,7 +1605,7 @@ bool cac::exceptionRespAction ( epicsGuard < callbackMutex > & cbMutex, tcpiiu &
         pStub = cac::tcpExcepJumpTableCAC [req.m_cmmd];
     }
     const char *pCtx = reinterpret_cast < const char * > ( pLW );
-    return ( this->*pStub ) ( cbMutex, iiu, req, pCtx, hdr.m_available );
+    return ( this->*pStub ) ( cbMutexIn, iiu, req, pCtx, hdr.m_available );
 }
 
 bool cac::accessRightsRespAction ( epicsGuard < callbackMutex > &, tcpiiu &, 
@@ -1670,7 +1670,7 @@ bool cac::claimCIURespAction ( epicsGuard < callbackMutex > &, tcpiiu & iiu,
 }
 
 bool cac::verifyAndDisconnectChan ( 
-              epicsGuard < callbackMutex > & cbMutex, tcpiiu & /* iiu */, 
+              epicsGuard < callbackMutex > & cbMutexIn, tcpiiu & /* iiu */, 
               const caHdrLargeArray & hdr, void * /* pMsgBdy */ )
 {
     epicsGuard < epicsMutex > autoMutex ( this->mutex );
@@ -1679,7 +1679,7 @@ bool cac::verifyAndDisconnectChan (
         return true;
     }
     assert ( this->pudpiiu );
-    this->disconnectChannelPrivate ( cbMutex, autoMutex, 
+    this->disconnectChannelPrivate ( cbMutexIn, autoMutex, 
                                     *pChan, *this->pudpiiu );
     this->pSearchTmr->resetPeriod ( 0.0 );
     return true;
@@ -1892,7 +1892,7 @@ void cac::uninstallIIU ( tcpiiu & iiu )
     this->privateUninstallIIU ( cbGuard, iiu );
 }
 
-void cac::privateUninstallIIU ( epicsGuard < callbackMutex > & cbMutex, tcpiiu & iiu )
+void cac::privateUninstallIIU ( epicsGuard < callbackMutex > & cbMutexIn, tcpiiu & iiu )
 {
     epicsGuard < epicsMutex > autoMutexCAC ( this->mutex );
     if ( iiu.channelCount() ) {
@@ -1914,7 +1914,7 @@ void cac::privateUninstallIIU ( epicsGuard < callbackMutex > & cbMutex, tcpiiu &
     this->serverTable.remove ( iiu );
 
     assert ( this->pudpiiu );
-    this->removeAllChan ( cbMutex, autoMutexCAC, iiu, *this->pudpiiu );
+    this->removeAllChan ( cbMutexIn, autoMutexCAC, iiu, *this->pudpiiu );
 
     delete &iiu;
 
diff --git a/src/libCom/cxxTemplates/resourceLib.h b/src/libCom/cxxTemplates/resourceLib.h
index cc4a578e1..e2cca069f 100644
--- a/src/libCom/cxxTemplates/resourceLib.h
+++ b/src/libCom/cxxTemplates/resourceLib.h
@@ -510,19 +510,19 @@ void resTable<T,ID>::setTableSize ( const unsigned newTableSize )
 }
 
 template <class T, class ID>
-bool resTable<T,ID>::setTableSizePrivate ( unsigned logBaseTwoTableSize )
+bool resTable<T,ID>::setTableSizePrivate ( unsigned logBaseTwoTableSizeIn )
 {
     // dont shrink
-    if ( this->logBaseTwoTableSize >= logBaseTwoTableSize ) {
+    if ( this->logBaseTwoTableSize >= logBaseTwoTableSizeIn ) {
         return true;
     }
 
     // dont allow ridiculously small tables
-    if ( logBaseTwoTableSize < 4 ) {
-        logBaseTwoTableSize = 4;
+    if ( logBaseTwoTableSizeIn < 4 ) {
+        logBaseTwoTableSizeIn = 4;
     }
 
-    const unsigned newTableSize = 1 << logBaseTwoTableSize;
+    const unsigned newTableSize = 1 << logBaseTwoTableSizeIn;
 #   if ! defined (__GNUC__) || __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 92 )
         const unsigned oldTableSize = this->pTable ? 1 << this->logBaseTwoTableSize : 0;
 #   endif
@@ -555,15 +555,15 @@ bool resTable<T,ID>::setTableSizePrivate ( unsigned logBaseTwoTableSize )
 #   endif
 
     if ( ! this->pTable ) {
-        this->hashIxSplitMask = resTableBitMask ( logBaseTwoTableSize );
-        this->nBitsHashIxSplitMask = logBaseTwoTableSize;
+        this->hashIxSplitMask = resTableBitMask ( logBaseTwoTableSizeIn );
+        this->nBitsHashIxSplitMask = logBaseTwoTableSizeIn;
         this->hashIxMask = this->hashIxSplitMask >> 1;
         this->nextSplitIndex = 0;
     }
 
     operator delete ( this->pTable );
     this->pTable = pNewTable;
-    this->logBaseTwoTableSize = logBaseTwoTableSize;
+    this->logBaseTwoTableSize = logBaseTwoTableSizeIn;
 
     return true;
 }