diff --git a/motorApp/ImsSrc/devIM483PL.cc b/motorApp/ImsSrc/devIM483PL.cc
index 1dc95735..425e19f2 100644
--- a/motorApp/ImsSrc/devIM483PL.cc
+++ b/motorApp/ImsSrc/devIM483PL.cc
@@ -3,9 +3,9 @@ FILENAME...	devIM483PL.cc
 USAGE...	Motor record device level support for Intelligent Motion
 		Systems, Inc. IM483(I/IE).
 
-Version:	$Revision: 1.2 $
+Version:	$Revision: 1.3 $
 Modified By:	$Author: sluiter $
-Last Modified:	$Date: 2003-05-16 19:18:07 $
+Last Modified:	$Date: 2003-05-19 17:08:02 $
 */
 
 /*
@@ -43,25 +43,12 @@ Last Modified:	$Date: 2003-05-16 19:18:07 $
  * .05  03/07/03 rls R3.14 conversion.
  */
 
-
-#include	<errlog.h>
-#include	<registry.h>
-#include	<string.h>
-#include	<alarm.h>
-#include	<callback.h>
-#include	<dbDefs.h>
-#include	<dbAccess.h>
-#include	<dbCommon.h>
-#include	<recSup.h>
-#include	<devSup.h>
-#include	<drvSup.h>
-
-#include	"motorRecord.h"
-#include	"motor.h"
-#include	"motordevCom.h"
-#include	"drvIM483.h"
-
-#include	"epicsExport.h"
+#include <string.h>
+#include "motorRecord.h"
+#include "motor.h"
+#include "motordevCom.h"
+#include "drvIM483.h"
+#include "epicsExport.h"
 
 #define STATIC static
 
diff --git a/motorApp/ImsSrc/devIM483SM.cc b/motorApp/ImsSrc/devIM483SM.cc
index f88fc82d..a0b46e8e 100644
--- a/motorApp/ImsSrc/devIM483SM.cc
+++ b/motorApp/ImsSrc/devIM483SM.cc
@@ -3,9 +3,9 @@ FILENAME...	devIM483SM.cc
 USAGE...	Motor record device level support for Intelligent Motion
 		Systems, Inc. IM483(I/IE).
 
-Version:	$Revision: 1.2 $
+Version:	$Revision: 1.3 $
 Modified By:	$Author: sluiter $
-Last Modified:	$Date: 2003-05-16 19:20:14 $
+Last Modified:	$Date: 2003-05-19 17:08:26 $
 */
 
 /*
@@ -43,25 +43,12 @@ Last Modified:	$Date: 2003-05-16 19:20:14 $
  * .05  03/07/03 rls R3.14 conversion.
  */
 
-
-#include	<errlog.h>
-#include	<registry.h>
-#include	<string.h>
-#include	<alarm.h>
-#include	<callback.h>
-#include	<dbDefs.h>
-#include	<dbAccess.h>
-#include	<dbCommon.h>
-#include	<recSup.h>
-#include	<devSup.h>
-#include	<drvSup.h>
-
-#include	"motorRecord.h"
-#include	"motor.h"
-#include	"motordevCom.h"
-#include	"drvIM483.h"
-
-#include	"epicsExport.h"
+#include <string.h>
+#include "motorRecord.h"
+#include "motor.h"
+#include "motordevCom.h"
+#include "drvIM483.h"
+#include "epicsExport.h"
 
 #define STATIC static
 
diff --git a/motorApp/ImsSrc/drvIM483PL.cc b/motorApp/ImsSrc/drvIM483PL.cc
index 3ed853e0..e7578905 100644
--- a/motorApp/ImsSrc/drvIM483PL.cc
+++ b/motorApp/ImsSrc/drvIM483PL.cc
@@ -3,9 +3,9 @@ FILENAME...	drvIM483PL.cc
 USAGE...	Motor record driver level support for Intelligent Motion
 		Systems, Inc. IM483(I/IE).
 
-Version:	$Revision: 1.1 $
+Version:	$Revision: 1.2 $
 Modified By:	$Author: sluiter $
-Last Modified:	$Date: 2003-05-15 13:00:12 $
+Last Modified:	$Date: 2003-05-19 17:09:07 $
 */
 
 /*****************************************************************
@@ -47,23 +47,13 @@ DESIGN LIMITATIONS...
 	Translation between the IM483 and the ACCL/BACC fields is not obvious.
 */
 
-#include	<string.h>
-#include	<math.h>
-
-#include 	<epicsThread.h>
-#include	<alarm.h>
-#include	<dbDefs.h>
-#include	<dbAccess.h>
-#include	<recSup.h>
-#include	<devSup.h>
-#include        <errMdef.h>
-#include	<ctype.h>
-
-#include	"motor.h"
-#include	"drvIM483.h"
-#include        "serialIO.h"
-
-#include	"epicsExport.h"
+#include <string.h>
+#include <epicsThread.h>
+#include <drvSup.h>
+#include "motor.h"
+#include "drvIM483.h"
+#include "serialIO.h"
+#include "epicsExport.h"
 
 #define STATIC static
 
@@ -473,7 +463,7 @@ STATIC int recv_mess(int card, char *com, int flag)
     else
 	timeout	= SERIAL_TIMEOUT;
 
-    len = serialIORecv(cntrl->serialInfo, com, BUFF_SIZE, "\n", timeout);
+    len = serialIORecv(cntrl->serialInfo, com, BUFF_SIZE, (char *) "\n", timeout);
 
     if (len == 0)
 	com[0] = '\0';
@@ -577,7 +567,7 @@ STATIC int motor_init()
 	    continue;
 	
 	brdptr = motor_state[card_index];
-	brdptr->ident[0] = NULL;	/* No controller identification message. */
+	brdptr->ident[0] = (char) NULL;	/* No controller identification message. */
 	brdptr->cmnd_response = true;
 	total_cards = card_index + 1;
 	cntrl = (struct IM483controller *) brdptr->DevicePrivate;
@@ -627,7 +617,7 @@ STATIC int motor_init()
 		motor_info->status |= EA_PRESENT;
 
                 /* Determine if encoder present based on open/closed loop mode. */
-		loop_state = NULL;
+		loop_state = 0;
 		if (loop_state != 0)
 		{
 		    motor_info->pid_present = YES;