diff --git a/src/ca/bhe.h b/src/ca/bhe.h
index d5174158b..6a8d7f83a 100644
--- a/src/ca/bhe.h
+++ b/src/ca/bhe.h
@@ -90,7 +90,7 @@ public:
     void * allocate ( size_t );
     void release ( void * );
 private:
-    tsFreeList < class bhe, 0x100 > freeList;
+    tsFreeList < bhe, 0x100 > freeList;
 };
 
 inline void * bhe::operator new ( size_t size, 
diff --git a/src/ca/cac.h b/src/ca/cac.h
index b5dd95df9..4cc070fd3 100644
--- a/src/ca/cac.h
+++ b/src/ca/cac.h
@@ -103,7 +103,7 @@ public:
     void * allocate ( size_t ) epicsThrows (( std::bad_alloc ));
     void release ( void * ) epicsThrows (());
 private:
-    tsFreeList < class comBuf, 0x20 > freeList;
+    tsFreeList < comBuf, 0x20 > freeList;
 };
 
 class cacDisconnectChannelPrivate { // X aCC 655
@@ -229,7 +229,7 @@ private:
     tsFreeList 
         < class netSubscription, 1024, epicsMutexNOOP > 
             freeListSubscription;
-    tsFreeList < class nciu, 1024 > channelFreeList;
+    tsFreeList < nciu, 1024 > channelFreeList;
     tsFreeList 
         < class msgForMultiplyDefinedPV, 16 > 
             mdpvFreeList;
diff --git a/src/ca/net_convert.h b/src/ca/net_convert.h
index 3c4b49eec..3ef22aaad 100644
--- a/src/ca/net_convert.h
+++ b/src/ca/net_convert.h
@@ -76,7 +76,8 @@ extern "C" {
  * net format: big endian and IEEE float
  */
 
-typedef void CACVRTFUNC (const void *pSrc, void *pDest, int hton, arrayElementCount count);
+typedef void CACVRTFUNC (const void *pSrc, void *pDest, 
+                         int hton, arrayElementCount count);
 
 #ifdef CONVERSION_REQUIRED
 /*  cvrt is (array of) (pointer to) (function returning) int */