diff --git a/src/libCom/assertUNIX.c b/src/libCom/assertUNIX.c
index b975916c9..8f728ea4c 100644
--- a/src/libCom/assertUNIX.c
+++ b/src/libCom/assertUNIX.c
@@ -32,8 +32,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include <assert.h>
 
+#include <epicsAssert.h>
 #include <epicsPrint.h>
 
 
diff --git a/src/libCom/assertVX.c b/src/libCom/assertVX.c
index f688def0b..27ba6d1b8 100644
--- a/src/libCom/assertVX.c
+++ b/src/libCom/assertVX.c
@@ -30,7 +30,6 @@
  */
 
 #include <stdio.h>
-#include <assert.h>
 #include <stdarg.h>
 #include <string.h>
 #include <errno.h>
@@ -38,6 +37,7 @@
 #include <vxWorks.h>
 #include <taskLib.h>
 
+#include <epicsAssert.h>
 #include <epicsPrint.h>
 
 
diff --git a/src/libCom/bucketLib.c b/src/libCom/bucketLib.c
index 93d4ea380..80098f818 100644
--- a/src/libCom/bucketLib.c
+++ b/src/libCom/bucketLib.c
@@ -35,12 +35,12 @@
  */
 
 #include <stdio.h>
-#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
 #include <time.h>
 
+#include <epicsAssert.h>
 #include <bucketLib.h>
 
 #ifndef NBBY
diff --git a/src/libCom/bucketLib/bucketLib.c b/src/libCom/bucketLib/bucketLib.c
index 93d4ea380..80098f818 100644
--- a/src/libCom/bucketLib/bucketLib.c
+++ b/src/libCom/bucketLib/bucketLib.c
@@ -35,12 +35,12 @@
  */
 
 #include <stdio.h>
-#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
 #include <time.h>
 
+#include <epicsAssert.h>
 #include <bucketLib.h>
 
 #ifndef NBBY
diff --git a/src/libCom/errPrintfUNIX.c b/src/libCom/errPrintfUNIX.c
index 9933143bf..12b327dd4 100644
--- a/src/libCom/errPrintfUNIX.c
+++ b/src/libCom/errPrintfUNIX.c
@@ -40,8 +40,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include <assert.h>
 
+#include <epicsAssert.h>
 #include <dbDefs.h>
 #include <errMdef.h>
 #include <epicsPrint.h>
diff --git a/src/libCom/errPrintfVX.c b/src/libCom/errPrintfVX.c
index 4fd20dd58..a69d96696 100644
--- a/src/libCom/errPrintfVX.c
+++ b/src/libCom/errPrintfVX.c
@@ -31,7 +31,6 @@
  */
 
 #include <stdio.h>
-#include <assert.h>
 #include <stdarg.h>
 #include <string.h>
 #include <errno.h>
@@ -46,6 +45,7 @@
 #include <error.h>
 #include <logLib.h>
 
+#include <epicsAssert.h>
 #include <ellLib.h>
 #include <dbDefs.h>
 #include <task_params.h>
diff --git a/src/libCom/fdmgr.c b/src/libCom/fdmgr.c
index 5eca1ec34..041de96c4 100644
--- a/src/libCom/fdmgr.c
+++ b/src/libCom/fdmgr.c
@@ -95,7 +95,6 @@ static char	*pSccsId = "@(#) $Id$";
  * ANSI
  */
 #include <stdio.h>
-#include <assert.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -109,6 +108,7 @@ static char	*pSccsId = "@(#) $Id$";
 #include <selectLib.h>
 #endif
 
+#include <epicsAssert.h>
 #include <fdmgr.h>
 
 #ifndef TRUE
diff --git a/src/libCom/memDebugLib.c b/src/libCom/memDebugLib.c
index 1eb1698f3..e9a9d7274 100644
--- a/src/libCom/memDebugLib.c
+++ b/src/libCom/memDebugLib.c
@@ -30,10 +30,10 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <assert.h>
 #include <string.h>
 #include <time.h>
 
+#include <epicsAssert.h>
 #include <ellLib.h>
 
 #ifdef vxWorks
diff --git a/src/libCom/nextFieldSubr.c b/src/libCom/nextFieldSubr.c
index 619d109b6..23bd6c626 100644
--- a/src/libCom/nextFieldSubr.c
+++ b/src/libCom/nextFieldSubr.c
@@ -140,7 +140,7 @@
 #   include <ctype.h>
 #   include <stdio.h>
 #endif
-#include <assert.h>
+#include <epicsAssert.h>
 
 /*-----------------------------------------------------------------------------
 *    the preamble skips over leading white space, stopping either at
diff --git a/src/libCom/tsSubr.c b/src/libCom/tsSubr.c
index 496580538..106a400fb 100644
--- a/src/libCom/tsSubr.c
+++ b/src/libCom/tsSubr.c
@@ -130,7 +130,7 @@
 #endif
 #endif
 
-#   include <assert.h>
+#include <epicsAssert.h>
 
 #include <envDefs.h>
 #define TS_PRIVATE_DATA
@@ -598,7 +598,6 @@ TS_STAMP *pStamp;	/* O pointer to time stamp buffer */
     	long	retStat=S_ts_OK;/* return status to caller */
 
 #ifdef vxWorks
-<<<<<<< tsSubr.c
 	retStat = TScurrentTimeStamp((struct timespec*)pStamp);
 	if (retStat == 0) {
 		return S_ts_OK;
@@ -606,16 +605,6 @@ TS_STAMP *pStamp;	/* O pointer to time stamp buffer */
 	else {
 		return S_ts_sysTimeError;
 	}
-=======
-#  if 0	/* 'test' code, for ioc core without time of day service */
-    assert(pStamp != NULL);
-    pStamp->nsec = 987000000;
-    pStamp->secPastEpoch = 30 * 86400 + 495;	/* 0815 Jan 31 of epoch year */
-#  else
-	if(!TScurrentTimeStamp((struct timespec*)pStamp)) return(S_ts_OK);
-	return(S_ts_sysTimeError);
-#  endif
->>>>>>> 1.16
 #else
     	struct timeval curtime;
 
diff --git a/src/rsrv/camessage.c b/src/rsrv/camessage.c
index 3e3b7e8ab..7d5b9f26d 100644
--- a/src/rsrv/camessage.c
+++ b/src/rsrv/camessage.c
@@ -52,7 +52,6 @@
 
 static char *sccsId = "%W% %G%";
 
-#include <assert.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/src/rsrv/caservertask.c b/src/rsrv/caservertask.c
index b16fa9abb..1b53e581c 100644
--- a/src/rsrv/caservertask.c
+++ b/src/rsrv/caservertask.c
@@ -46,7 +46,6 @@
 
 static char *sccsId = "@(#) $Id$";
 #include <stdio.h>
-#include <assert.h>
 #include <unistd.h>
 
 #include <vxWorks.h>
diff --git a/src/rsrv/cast_server.c b/src/rsrv/cast_server.c
index d43433c58..7b5497a6f 100644
--- a/src/rsrv/cast_server.c
+++ b/src/rsrv/cast_server.c
@@ -58,7 +58,6 @@
 
 static char	*sccsId = "@(#) $Id$";
 
-#include <assert.h>
 #include <string.h>
 
 #include <vxWorks.h>
diff --git a/src/rsrv/online_notify.c b/src/rsrv/online_notify.c
index 3f6452507..8ba0d8aad 100644
--- a/src/rsrv/online_notify.c
+++ b/src/rsrv/online_notify.c
@@ -38,7 +38,6 @@ static char *sccsId = "@(#) $Id$";
 /*
  * ansi includes
  */
-#include <assert.h>
 #include <string.h>
 
 /*
diff --git a/src/rsrv/server.h b/src/rsrv/server.h
index e66706147..7134962bd 100644
--- a/src/rsrv/server.h
+++ b/src/rsrv/server.h
@@ -55,6 +55,8 @@ typedef int SOCKET;
 
 #define APIENTRY
 
+#include <epicsAssert.h>
+
 #include <vxLib.h>
 #include <ellLib.h>
 #include <fast_lock.h>