diff --git a/src/rec/timerRecord.c b/src/rec/timerRecord.c
index af2e08da7..a410e3f52 100644
--- a/src/rec/timerRecord.c
+++ b/src/rec/timerRecord.c
@@ -54,23 +54,23 @@
  * .20  03-30-94        mcn     converted to fast links
  */
 
-#include	<vxWorks.h>
-#include	<types.h>
-#include	<stdioLib.h>
-#include	<lstLib.h>
+#include <vxWorks.h>
+#include <types.h>
+#include <stdioLib.h>
+#include <lstLib.h>
 
 #include "dbDefs.h"
 #include "epicsPrint.h"
-#include	<alarm.h>
-#include	<dbAccess.h>
-#include	<dbEvent.h>
-#include	<dbFldTypes.h>
-#include	<devSup.h>
-#include	<errMdef.h>
-#include	<recSup.h>
-#include	<module_types.h>
+#include "alarm.h"
+#include "dbAccess.h"
+#include "dbEvent.h"
+#include "dbFldTypes.h"
+#include "devSup.h"
+#include "errMdef.h"
+#include "recSup.h"
+#include "module_types.h"
 #define GEN_SIZE_OFFSET
-#include	<timerRecord.h>
+#include "timerRecord.h"
 #undef  GEN_SIZE_OFFSET
 
 /* Create RSET - Record Support Entry Table*/
diff --git a/src/rec/waitRecord.c b/src/rec/waitRecord.c
index b47ed123f..a3472ccff 100644
--- a/src/rec/waitRecord.c
+++ b/src/rec/waitRecord.c
@@ -77,8 +77,9 @@
 #include        <wdLib.h>
 #include        <sysLib.h>
 
+#include "dbDefs.h"
+#include "epicsPrint.h"
 #include	<alarm.h>
-#include	<dbDefs.h>
 #include	<dbAccess.h>
 #include	<dbEvent.h>
 #include	<dbScan.h>
@@ -469,8 +470,6 @@ static long special(paddr,after)
                         "wait: init_record: Illegal CALC field");
         }
         db_post_events(pwait,&pwait->clcv,DBE_VALUE);
-        db_post_events(pwait,pwait->calc,DBE_VALUE);
-        db_post_events(pwait,&pwait->clcv,DBE_VALUE);
         return(0);
     }
     else if(paddr->pfield==(void *)&pwait->prio) {
diff --git a/src/rec/waveformRecord.c b/src/rec/waveformRecord.c
index e6ec15f88..2a8a8cded 100644
--- a/src/rec/waveformRecord.c
+++ b/src/rec/waveformRecord.c
@@ -67,8 +67,9 @@
 #include	<stdlib.h>
 #include	<string.h>
 
+#include "dbDefs.h"
+#include "epicsPrint.h"
 #include	<alarm.h>
-#include	<dbDefs.h>
 #include	<dbAccess.h>
 #include	<dbEvent.h>
 #include	<dbFldTypes.h>