diff --git a/motorApp/MclennanSrc/drvPM304.cc b/motorApp/MclennanSrc/drvPM304.cc
index af3416e5..64d4f8a9 100644
--- a/motorApp/MclennanSrc/drvPM304.cc
+++ b/motorApp/MclennanSrc/drvPM304.cc
@@ -32,8 +32,9 @@
 
 
 #include    <string.h>
+#include    <stdio.h>
 #include    <epicsThread.h>
-#include    <epicsStrtok_r.h>
+#include    <epicsString.h>
 #include    <drvSup.h>
 #include        "motor.h"
 #include        "drvPM304.h"
diff --git a/motorApp/NewportSrc/drvMM3000.cc b/motorApp/NewportSrc/drvMM3000.cc
index 541da9a8..25db9eb8 100644
--- a/motorApp/NewportSrc/drvMM3000.cc
+++ b/motorApp/NewportSrc/drvMM3000.cc
@@ -2,9 +2,9 @@
 FILENAME... drvMM3000.cc
 USAGE...    Motor record driver level support for Newport MM3000.
 
-Version:    $Revision: 1.20 $
+Version:    $Revision: 1.21 $
 Modified By:    $Author: rivers $
-Last Modified:  $Date: 2005-12-08 00:03:35 $
+Last Modified:  $Date: 2005-12-15 20:19:02 $
 */
 
 /*
@@ -63,8 +63,9 @@ Last Modified:  $Date: 2005-12-08 00:03:35 $
  */
 
 #include <string.h>
+#include <stdio.h>
 #include <epicsThread.h>
-#include <epicsStrtok_r.h>
+#include <epicsString.h>
 #include <drvSup.h>
 #include "motor.h"
 #include "NewportRegister.h"
diff --git a/motorApp/NewportSrc/drvMM4000.cc b/motorApp/NewportSrc/drvMM4000.cc
index c7030365..1497280d 100644
--- a/motorApp/NewportSrc/drvMM4000.cc
+++ b/motorApp/NewportSrc/drvMM4000.cc
@@ -2,9 +2,9 @@
 FILENAME... drvMM4000.cc
 USAGE...    Motor record driver level support for Newport MM4000.
 
-Version:    $Revision: 1.20 $
+Version:    $Revision: 1.21 $
 Modified By:    $Author: rivers $
-Last Modified:  $Date: 2005-12-08 00:04:13 $
+Last Modified:  $Date: 2005-12-15 20:19:02 $
 */
 
 /*
@@ -64,8 +64,9 @@ Last Modified:  $Date: 2005-12-08 00:04:13 $
 
 #include <string.h>
 #include <math.h>
+#include <stdio.h>
 #include <epicsThread.h>
-#include <epicsStrtok_r.h>
+#include <epicsString.h>
 #include <drvSup.h>
 #include "motor.h"
 #include "NewportRegister.h"