diff --git a/motorApp/NewportSrc/Makefile b/motorApp/NewportSrc/Makefile
index a0864285..f7325580 100644
--- a/motorApp/NewportSrc/Makefile
+++ b/motorApp/NewportSrc/Makefile
@@ -34,6 +34,9 @@ Newport_SRCS += asynOctetSocket.cpp
 Newport_SRCS += XPS_C8_drivers.cpp drvXPSAsyn.c drvXPSAsynAux.c XPSAsynInterpose.c xps_ftp.c
 Newport_SRCS += XPS_trajectoryScan.st
 
+# strtok_r needed on WIN32
+Newport_SRCS_WIN32 += strtok_r.cpp
+
 # XPS Gathering test function
 Newport_SRCS += XPSGathering.c
 Newport_SRCS += XPSGatheringRegister.c
diff --git a/motorApp/NewportSrc/XPS_C8_drivers.cpp b/motorApp/NewportSrc/XPS_C8_drivers.cpp
index 7b227ff2..4bdd4431 100644
--- a/motorApp/NewportSrc/XPS_C8_drivers.cpp
+++ b/motorApp/NewportSrc/XPS_C8_drivers.cpp
@@ -15,6 +15,7 @@
         #else
             #define DLL
         #endif
+        #include "strtok_r.h"
 #else
 	#define DLL 
 #endif
@@ -3846,7 +3847,7 @@ int __stdcall PositionerCorrectorPIDFFAccelerationGet (int SocketIndex, char * P
 { 
 	int ret = -1; 
 	char ExecuteMethod[SIZE_EXECUTE_METHOD];
-        int temp; 
+        int temp;
 	char *ReturnedValue = (char *) malloc (sizeof(char) * SIZE_SMALL); 
 
 	/* Convert to string */