diff --git a/src/cas/generic/inBuf.h b/src/cas/generic/inBuf.h
index dfc1f66eb..b59d203de 100644
--- a/src/cas/generic/inBuf.h
+++ b/src/cas/generic/inBuf.h
@@ -31,7 +31,7 @@ class inBufCtx {
     friend class inBuf;
 public:
     enum pushCtxResult { pushCtxNoSpace, pushCtxSuccess };
-    inBufCtx ( const inBuf & ); // success
+    inBufCtx ( const class inBuf & ); // success
     inBufCtx (); // failure
     
     pushCtxResult pushResult () const;
diff --git a/src/cas/generic/outBuf.h b/src/cas/generic/outBuf.h
index 2d815b51a..5812023fc 100644
--- a/src/cas/generic/outBuf.h
+++ b/src/cas/generic/outBuf.h
@@ -33,7 +33,7 @@ class outBufCtx {
     friend class outBuf;
 public:
     enum pushCtxResult { pushCtxNoSpace, pushCtxSuccess };
-    outBufCtx ( const outBuf & ); // success
+    outBufCtx ( const class outBuf & ); // success
     outBufCtx (); // failure
 
     pushCtxResult pushResult () const;
diff --git a/src/cas/generic/st/casDGIntfOS.h b/src/cas/generic/st/casDGIntfOS.h
index a0a20bb93..e052061db 100644
--- a/src/cas/generic/st/casDGIntfOS.h
+++ b/src/cas/generic/st/casDGIntfOS.h
@@ -39,9 +39,9 @@ public:
 private:
     casDGIOWakeup ioWk;
     casDGEvWakeup evWk;
-	casDGReadReg * pRdReg;
-	casDGBCastReadReg * pBCastRdReg; // fix for solaris bug
-	casDGWriteReg * pWtReg;
+	class casDGReadReg * pRdReg;
+	class casDGBCastReadReg * pBCastRdReg; // fix for solaris bug
+	class casDGWriteReg * pWtReg;
 	bool sendBlocked;
 
     void armRecv ();
diff --git a/src/cas/generic/st/casIntfOS.h b/src/cas/generic/st/casIntfOS.h
index 7fa421c8f..439cdcc6b 100644
--- a/src/cas/generic/st/casIntfOS.h
+++ b/src/cas/generic/st/casIntfOS.h
@@ -37,7 +37,7 @@ public:
     caNetAddr serverAddress () const;
 private:
 	caServerI & cas;
-	casServerReg * pRdReg;
+	class casServerReg * pRdReg;
 
 	casIntfOS ( const casIntfOS & );
 	casIntfOS & operator = ( const casIntfOS & );