diff --git a/src/ca/acctst.c b/src/ca/acctst.c
index ef28143ec..1c1f52c46 100644
--- a/src/ca/acctst.c
+++ b/src/ca/acctst.c
@@ -988,8 +988,8 @@ void verifyLongIO ( chid chan )
         for ( iter = cl.lower_ctrl_limit; 
             iter <= cl.upper_ctrl_limit; iter+=incr ) {
 
-            status = ca_put ( DBR_LONG, chan, &iter );
-            status = ca_get ( DBR_LONG, chan, &rdbk );
+            ca_put ( DBR_LONG, chan, &iter );
+            ca_get ( DBR_LONG, chan, &rdbk );
             status = ca_pend_io ( 10.0 );
             SEVCHK ( status, "get pend failed\n" );
             assert ( iter == rdbk );
@@ -1032,8 +1032,8 @@ void verifyShortIO ( chid chan )
         for ( iter = (dbr_short_t) cl.lower_ctrl_limit; 
             iter <= (dbr_short_t) cl.upper_ctrl_limit; iter += incr ) {
 
-            status = ca_put ( DBR_SHORT, chan, &iter );
-            status = ca_get ( DBR_SHORT, chan, &rdbk );
+            ca_put ( DBR_SHORT, chan, &iter );
+            ca_get ( DBR_SHORT, chan, &rdbk );
             status = ca_pend_io ( 10.0 );
             SEVCHK ( status, "get pend failed\n" );
             assert ( iter == rdbk );
diff --git a/src/ca/cac.cpp b/src/ca/cac.cpp
index daa50f941..f37b1ead9 100644
--- a/src/ca/cac.cpp
+++ b/src/ca/cac.cpp
@@ -21,7 +21,6 @@
 #include "cac.h"
 #include "inetAddrID.h"
 #include "virtualCircuit.h"
-#include "netIO.h"
 #include "syncGroup.h"
 #include "nciu.h"
 #include "autoPtrRecycle.h"
@@ -1508,7 +1507,7 @@ bool cac::claimCIURespAction ( tcpiiu &iiu,
     return true; 
 }
 
-bool cac::verifyAndDisconnectChan ( tcpiiu & iiu, 
+bool cac::verifyAndDisconnectChan ( tcpiiu & /* iiu */, 
               const caHdrLargeArray & hdr, void * /* pMsgBdy */ )
 {
     nciu * pChan;
diff --git a/src/ca/cac.h b/src/ca/cac.h
index 4157c4296..36bb12107 100644
--- a/src/ca/cac.h
+++ b/src/ca/cac.h
@@ -28,6 +28,7 @@
 #define epicsExportSharedSymbols
 #include "bhe.h"
 #include "cacIO.h"
+#include "netIO.h"
 #undef epicsExportSharedSymbols
 
 class netWriteNotifyIO;
diff --git a/src/ca/catime.c b/src/ca/catime.c
index 1f47021b6..dba7cfa8c 100644
--- a/src/ca/catime.c
+++ b/src/ca/catime.c
@@ -226,8 +226,8 @@ unsigned    *pInlineIter
     }
 #ifdef WAIT_FOR_ACK
     status = ca_array_get (DBR_INT, 1, pItems[0].chix, &val);
-        SEVCHK (status, NULL);
-    status = ca_pend_io(100.0);
+    SEVCHK (status, NULL);
+    ca_pend_io(100.0);
 #endif
     status = ca_array_put(
             pItems[0].type,
diff --git a/src/ca/convert.cpp b/src/ca/convert.cpp
index 466799f71..d7046e040 100644
--- a/src/ca/convert.cpp
+++ b/src/ca/convert.cpp
@@ -57,10 +57,10 @@ typedef unsigned long arrayElementCount;
  *
  */
 LOCAL void cvrt_string(
-const void          *s,         /* source           */
-void                *d,         /* destination          */
-int                 encode,     /* cvrt HOST to NET if T    */
-arrayElementCount   num         /* number of values     */
+const void          *s,             /* source           */
+void                *d,             /* destination          */
+int                 /* encode */,   /* cvrt HOST to NET if T    */
+arrayElementCount   num             /* number of values     */
 )
 {
     char        *pSrc = (char *) s;
@@ -83,7 +83,7 @@ arrayElementCount   num         /* number of values     */
 LOCAL void cvrt_short(
 const void          *s,         /* source           */
 void                *d,         /* destination          */
-int                 encode,     /* cvrt HOST to NET if T    */
+int                 /*encode*/, /* cvrt HOST to NET if T    */
 arrayElementCount   num         /* number of values     */
 )
 {
@@ -111,7 +111,7 @@ arrayElementCount   num         /* number of values     */
 LOCAL void cvrt_char(
 const void          *s,         /* source           */
 void                *d,         /* destination          */
-int                 encode,     /* cvrt HOST to NET if T    */
+int                 /*encode*/, /* cvrt HOST to NET if T    */
 arrayElementCount   num         /* number of values     */
 )
 {
@@ -133,7 +133,7 @@ arrayElementCount   num         /* number of values     */
 LOCAL void cvrt_long(
 const void          *s,         /* source           */
 void                *d,         /* destination          */
-int                 encode,     /* cvrt HOST to NET if T    */
+int                 /*encode*/, /* cvrt HOST to NET if T    */
 arrayElementCount   num         /* number of values     */
 )
 {
@@ -161,7 +161,7 @@ arrayElementCount   num         /* number of values     */
 LOCAL void cvrt_enum(
 const void          *s,         /* source           */
 void                *d,         /* destination          */
-int                 encode,     /* cvrt HOST to NET if T    */
+int                 /*encode*/, /* cvrt HOST to NET if T    */
 arrayElementCount   num         /* number of values     */
 )
 {
@@ -261,7 +261,7 @@ arrayElementCount   num         /* number of values     */
 LOCAL void cvrt_sts_string(
 const void          *s,         /* source           */
 void                *d,         /* destination          */
-int                 encode,     /* cvrt HOST to NET if T    */
+int                 /*encode*/, /* cvrt HOST to NET if T    */
 arrayElementCount   num         /* number of values     */
 )
 {
@@ -454,7 +454,7 @@ arrayElementCount   num         /* number of values     */
 LOCAL void cvrt_gr_char(
 const void          *s,         /* source           */
 void                *d,         /* destination          */
-int                 encode,     /* cvrt HOST to NET if T    */
+int                 /*encode*/, /* cvrt HOST to NET if T    */
 arrayElementCount   num         /* number of values     */
 )
 {
@@ -771,7 +771,7 @@ arrayElementCount   num         /* number of values     */
 LOCAL void cvrt_ctrl_char(
 const void          *s,         /* source           */
 void                *d,         /* destination          */
-int                 encode,     /* cvrt HOST to NET if T    */
+int                 /*encode*/, /* cvrt HOST to NET if T    */
 arrayElementCount   num         /* number of values     */
 )
 {
@@ -972,7 +972,7 @@ arrayElementCount   num         /* number of values     */
 LOCAL void cvrt_sts_char(
 const void          *s,         /* source           */
 void                *d,         /* destination          */
-int                 encode,     /* cvrt HOST to NET if T    */
+int                 /*encode*/, /* cvrt HOST to NET if T    */
 arrayElementCount   num         /* number of values     */
 )
 {
@@ -1035,7 +1035,7 @@ arrayElementCount   num         /* number of values     */
 LOCAL void cvrt_time_string(
 const void          *s,         /* source           */
 void                *d,         /* destination          */
-int                 encode,     /* cvrt HOST to NET if T    */
+int                 /*encode*/, /* cvrt HOST to NET if T    */
 arrayElementCount   num         /* number of values     */
 )
 {
@@ -1188,7 +1188,7 @@ arrayElementCount   num         /* number of values     */
 LOCAL void cvrt_time_char(
 const void          *s,         /* source           */
 void                *d,         /* destination          */
-int                 encode,     /* cvrt HOST to NET if T    */
+int                 /*encode*/, /* cvrt HOST to NET if T    */
 arrayElementCount   num         /* number of values     */
 )
 {
@@ -1251,7 +1251,7 @@ arrayElementCount   num         /* number of values     */
 LOCAL void cvrt_put_ackt(
 const void          *s,         /* source           */
 void                *d,         /* destination          */
-int                 encode,     /* cvrt HOST to NET if T    */
+int                 /*encode*/, /* cvrt HOST to NET if T    */
 arrayElementCount   num         /* number of values     */
 )
 {
@@ -1285,7 +1285,7 @@ arrayElementCount   num         /* number of values     */
 LOCAL void cvrt_stsack_string(
 const void          *s,         /* source           */
 void                *d,         /* destination          */
-int                 encode,         /* cvrt HOST to NET if T    */
+int                 /*encode*/, /* cvrt HOST to NET if T    */
 arrayElementCount   num         /* number of values     */
 )
 {
diff --git a/src/ca/nciu.cpp b/src/ca/nciu.cpp
index b2f9c15a3..118280589 100644
--- a/src/ca/nciu.cpp
+++ b/src/ca/nciu.cpp
@@ -24,7 +24,6 @@
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
 
 #include "iocinf.h"
-#include "netIO.h"
 #include "cac.h"
 
 #define epicsExportSharedSymbols
diff --git a/src/ca/netReadNotifyIO.cpp b/src/ca/netReadNotifyIO.cpp
index 5d6a8560a..ae9cd5a4b 100644
--- a/src/ca/netReadNotifyIO.cpp
+++ b/src/ca/netReadNotifyIO.cpp
@@ -14,7 +14,6 @@
 
 #include "iocinf.h"
 #include "nciu.h"
-#include "netIO.h"
 #include "cac.h"
 
 netReadNotifyIO::netReadNotifyIO ( nciu &chan, cacReadNotify &notify ) :
diff --git a/src/ca/netSubscription.cpp b/src/ca/netSubscription.cpp
index 23b3a217b..fffebe6d0 100644
--- a/src/ca/netSubscription.cpp
+++ b/src/ca/netSubscription.cpp
@@ -14,7 +14,6 @@
 
 #include "iocinf.h"
 #include "nciu.h"
-#include "netIO.h"
 #include "cac.h"
 
 #define epicsExportSharedSymbols
diff --git a/src/ca/netWriteNotifyIO.cpp b/src/ca/netWriteNotifyIO.cpp
index 8ca7972aa..b706be995 100644
--- a/src/ca/netWriteNotifyIO.cpp
+++ b/src/ca/netWriteNotifyIO.cpp
@@ -14,7 +14,6 @@
 
 #include "iocinf.h"
 #include "nciu.h"
-#include "netIO.h"
 #include "cac.h"
 
 netWriteNotifyIO::netWriteNotifyIO ( nciu &chan, cacWriteNotify &notifyIn ) :
diff --git a/src/ca/netiiu.cpp b/src/ca/netiiu.cpp
index 0bbd945ae..b4648f9ae 100644
--- a/src/ca/netiiu.cpp
+++ b/src/ca/netiiu.cpp
@@ -18,7 +18,6 @@
 #include "iocinf.h"
 #include "cac.h"
 #include "netiiu.h"
-#include "netIO.h"
 
 netiiu::netiiu ( cac *pClientCtxIn ) : pClientCtx ( pClientCtxIn )
 {
diff --git a/src/ca/tcpiiu.cpp b/src/ca/tcpiiu.cpp
index e75a0d719..5e26eb271 100644
--- a/src/ca/tcpiiu.cpp
+++ b/src/ca/tcpiiu.cpp
@@ -18,7 +18,6 @@
 #include "inetAddrID.h"
 #include "cac.h"
 #include "netiiu.h"
-#include "netIO.h"
 #include "msgForMultiplyDefinedPV.h"
 
 #define epicsExportSharedSymbols