diff --git a/src/cas/generic/casClient.cc b/src/cas/generic/casClient.cc
index 1ba0249be..af1bdccfd 100644
--- a/src/cas/generic/casClient.cc
+++ b/src/cas/generic/casClient.cc
@@ -29,6 +29,9 @@
  *
  * History
  * $Log$
+ * Revision 1.7  1997/04/10 19:34:01  jhill
+ * API changes
+ *
  * Revision 1.6  1996/12/11 00:58:35  jhill
  * better diagnostic
  *
@@ -60,8 +63,6 @@
 #include "casPVIIL.h" // inline func for casPVI 
 #include "db_access.h"
 
-VERSIONID(camsgtaskc,"%W% %G%")
-
 static const caHdr nill_msg = {0u,0u,0u,0u,0u,0u};
 
 
@@ -201,7 +202,7 @@ casClient::~casClient ()
 //
 void casClient::show(unsigned level) const
 {
-	printf ("casClient at %x\n", (unsigned) this);
+	printf ("casClient at %p\n", this);
 	this->casCoreClient::show(level);
 }
 
diff --git a/src/cas/generic/casCtx.cc b/src/cas/generic/casCtx.cc
index 73d9d18fb..e1b466cd3 100644
--- a/src/cas/generic/casCtx.cc
+++ b/src/cas/generic/casCtx.cc
@@ -6,14 +6,14 @@
 //
 void casCtx::show (unsigned level) const
 {
-	printf ("casCtx at %lx\n", (unsigned long) this);
+	printf ("casCtx at %p\n", this);
 	if (level >= 3u) {
-		printf ("\tpMsg = %lx\n", (unsigned long) &this->msg);
-		printf ("\tpData = %lx\n", (unsigned long) pData);
-		printf ("\tpCAS = %lx\n", (unsigned long) pCAS);
-		printf ("\tpClient = %lx\n", (unsigned long) pClient);
-		printf ("\tpChannel = %lx\n", (unsigned long) pChannel);
-		printf ("\tpPV = %lx\n", (unsigned long) pPV);
+		printf ("\tpMsg = %p\n", &this->msg);
+		printf ("\tpData = %p\n", pData);
+		printf ("\tpCAS = %p\n", pCAS);
+		printf ("\tpClient = %p\n", pClient);
+		printf ("\tpChannel = %p\n", pChannel);
+		printf ("\tpPV = %p\n", pPV);
 	}
 }
 
diff --git a/src/cas/generic/casDGClient.cc b/src/cas/generic/casDGClient.cc
index f44dc63c6..78b2d2fd6 100644
--- a/src/cas/generic/casDGClient.cc
+++ b/src/cas/generic/casDGClient.cc
@@ -29,6 +29,9 @@
  *
  * History
  * $Log$
+ * Revision 1.10  1997/06/13 09:15:56  jhill
+ * connect proto changes
+ *
  * Revision 1.9  1997/04/10 19:34:06  jhill
  * API changes
  *
@@ -116,7 +119,7 @@ void casDGClient::destroy()
 void casDGClient::show(unsigned level) const
 {
 	this->casClient::show(level);
-	printf("casDGClient at %x\n", (unsigned) this);
+	printf("casDGClient at %p\n", this);
         this->dgInBuf::show(level);
 	this->dgOutBuf::show(level);
 }
diff --git a/src/cas/generic/casEventSys.cc b/src/cas/generic/casEventSys.cc
index 649f42d6c..d8b520e36 100644
--- a/src/cas/generic/casEventSys.cc
+++ b/src/cas/generic/casEventSys.cc
@@ -29,6 +29,9 @@
  *
  * History
  * $Log$
+ * Revision 1.5  1997/04/10 19:34:09  jhill
+ * API changes
+ *
  * Revision 1.4  1996/11/02 00:54:12  jhill
  * many improvements
  *
@@ -60,14 +63,14 @@
 //
 void casEventSys::show(unsigned level) const
 {
-	printf ("casEventSys at %x\n", (unsigned) this);
+	printf ("casEventSys at %p\n", this);
 	if (level>=1u) {
-		printf ("\thas coreClient at %x\n", (unsigned) &this->coreClient);
+		printf ("\thas coreClient at %p\n", &this->coreClient);
 		printf ("\tnumEventBlocks = %d, maxLogEntries = %d\n",
 			this->numEventBlocks, this->maxLogEntries);	
 		printf ("\tthere are %d events in the queue\n",
 			this->eventLogQue.count());
-		printf ("\tevents off =  %d\n", this->eventsOff);
+		printf ("\tevents off = %d\n", this->eventsOff);
 	}
 }
 
diff --git a/src/cas/generic/casStrmClient.cc b/src/cas/generic/casStrmClient.cc
index 15fe738e6..265b42c32 100644
--- a/src/cas/generic/casStrmClient.cc
+++ b/src/cas/generic/casStrmClient.cc
@@ -29,6 +29,9 @@
  *
  * History
  * $Log$
+ * Revision 1.16  1997/06/13 09:16:00  jhill
+ * connect proto changes
+ *
  * Revision 1.15  1997/04/10 19:34:18  jhill
  * API changes
  *
@@ -89,8 +92,6 @@
 #include "gddApps.h"
 #include "net_convert.h"	// byte order conversion from libca
 
-VERSIONID(casStrmClientcc,"%W% %G%")
-
 static const caHdr nill_msg = {0u,0u,0u,0u,0u,0u};
 
 //
@@ -240,7 +241,7 @@ inline casClientMon *caServerI::resIdToClientMon(const caResId &idIn)
 void casStrmClient::show (unsigned level) const
 {
 	this->casClient::show (level);
-	printf ("casStrmClient at %x\n", (unsigned) this);
+	printf ("casStrmClient at %p\n", this);
 	if (level > 1u) {
 		printf ("\tuser %s at %s\n", this->pUserName, this->pHostName);
 	}
diff --git a/src/cas/generic/server.h b/src/cas/generic/server.h
index ca859165d..3f0d8b73f 100644
--- a/src/cas/generic/server.h
+++ b/src/cas/generic/server.h
@@ -29,6 +29,9 @@
  *
  * History
  * $Log$
+ * Revision 1.17  1997/06/13 09:16:06  jhill
+ * connect proto changes
+ *
  * Revision 1.16  1997/04/10 19:34:23  jhill
  * API changes
  *
@@ -80,22 +83,6 @@
 #ifndef INCLserverh
 #define INCLserverh
 
-#ifdef __STDC__
-#       define VERSIONID(NAME,VERS) \
-                const char *EPICS_CAS_VID_ ## NAME = VERS;
-#else /*__STDC__*/
-#       define VERSIONID(NAME,VERS) \
-                const char *EPICS_CAS_VID_/* */NAME = VERS;
-#endif /*__STDC__*/
-
-#if defined(CAS_VERSION_GLOBAL) && 0
-#       define HDRVERSIONID(NAME,VERS) VERSIONID(NAME,VERS)
-#else /*CAS_VERSION_GLOBAL*/
-#       define HDRVERSIONID(NAME,VERS)
-#endif /*CAS_VERSION_GLOBAL*/
-
-HDRVERSIONID(serverh, "%W% %G%")
-
 //
 // ANSI C
 //
@@ -104,7 +91,7 @@ HDRVERSIONID(serverh, "%W% %G%")
 //
 // EPICS
 //
-#define	 epicsAssertAuthor "Jeff Hill johill@lanl.gov"
+#define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
 #include "epicsAssert.h"
 
 //
diff --git a/src/cas/generic/st/casDGIntfOS.cc b/src/cas/generic/st/casDGIntfOS.cc
index aab1903a5..39057d126 100644
--- a/src/cas/generic/st/casDGIntfOS.cc
+++ b/src/cas/generic/st/casDGIntfOS.cc
@@ -55,7 +55,7 @@ casDGIntfOS::~casDGIntfOS()
 //
 void casDGIntfOS::show(unsigned level) const
 {
-	printf ("casDGIntfOS at %x\n", (unsigned) this);
+	printf ("casDGIntfOS at %p\n", this);
 	if (this->pRdReg) {
 		this->pRdReg->show(level);
 	}
@@ -97,6 +97,6 @@ casDGReadReg::~casDGReadReg()
 void casDGReadReg::show(unsigned level) const
 {
 	this->fdReg::show(level);
-	printf("casDGReadReg at %x\n", (unsigned) this);
+	printf("casDGReadReg at %p\n", this);
 }
 
diff --git a/src/cas/generic/st/casDGOS.cc b/src/cas/generic/st/casDGOS.cc
index 220812a19..52f0e45a6 100644
--- a/src/cas/generic/st/casDGOS.cc
+++ b/src/cas/generic/st/casDGOS.cc
@@ -6,6 +6,9 @@
  *
  *
  * $Log$
+ * Revision 1.2  1997/04/10 19:34:30  jhill
+ * API changes
+ *
  * Revision 1.1  1996/11/02 01:01:29  jhill
  * installed
  *
@@ -62,7 +65,7 @@ const char *casDGEvWakeup::name() const
 void casDGEvWakeup::show(unsigned level) const
 {
 	this->osiTimer::show(level);
-	printf("casDGEvWakeup at %x\n", (unsigned) this);
+	printf("casDGEvWakeup at %p\n", this);
 }
 
 //
@@ -139,7 +142,7 @@ casDGOS::~casDGOS()
 //
 void casDGOS::show(unsigned level) const
 {
-	printf ("casDGOS at %lx\n", (unsigned long) this);
+	printf ("casDGOS at %p\n", this);
 	this->casDGClient::show(level);
 	if (this->pEvWk) {
 		this->pEvWk->show(level);
diff --git a/src/cas/generic/st/casStreamOS.cc b/src/cas/generic/st/casStreamOS.cc
index 649ad49fc..19e4ce1a3 100644
--- a/src/cas/generic/st/casStreamOS.cc
+++ b/src/cas/generic/st/casStreamOS.cc
@@ -4,6 +4,9 @@
 //
 //
 // $Log$
+// Revision 1.5  1997/04/10 19:34:32  jhill
+// API changes
+//
 // Revision 1.4  1996/12/12 21:24:17  jhill
 // moved casStreamOS *pStrmOS decl down
 //
@@ -163,7 +166,7 @@ const char *casStreamEvWakeup::name() const
 //
 void casStreamEvWakeup::show(unsigned level) const
 {
-	printf ("casStreamEvWakeup at %x {\n", (unsigned) this);
+	printf ("casStreamEvWakeup at %p {\n", this);
 	this->osiTimer::show(level);
 	printf ("}\n");
 }
@@ -233,7 +236,7 @@ const char *casStreamIOWakeup::name() const
 //
 void casStreamIOWakeup::show(unsigned level) const
 {
-	printf ("casStreamIOWakeup at %x {\n", (unsigned) this);
+	printf ("casStreamIOWakeup at %p {\n", this);
 	this->osiTimer::show(level);
 	printf ("}\n");
 }
@@ -410,7 +413,7 @@ casStreamOS::~casStreamOS()
 void casStreamOS::show(unsigned level) const
 {
 	this->casStrmClient::show(level);
-	printf("casStreamOS at %x\n", (unsigned) this);
+	printf("casStreamOS at %p\n", this);
 	printf("\tsendBlocked = %d\n", this->sendBlocked);
 	if (this->pWtReg) {
 		this->pWtReg->show(level);
@@ -440,7 +443,7 @@ caStatus casStreamOS::start()
 void casStreamReadReg::show(unsigned level) const
 {
 	this->fdReg::show(level);
-	printf ("casStreamReadReg at %x\n", (unsigned) this);
+	printf ("casStreamReadReg at %p\n", this);
 }
 
 //
@@ -499,7 +502,7 @@ void casStreamOS::sendBlockSignal()
 void casStreamWriteReg::show(unsigned level) const
 {
 	this->fdReg::show (level);
-	printf ("casStreamWriteReg at %x\n", (unsigned) this);
+	printf ("casStreamWriteReg at %p\n", this);
 }