diff --git a/motorApp/NewportSrc/XPSAsynInterpose.c b/motorApp/NewportSrc/XPSAsynInterpose.c
index f2525103..69f8e8b9 100644
--- a/motorApp/NewportSrc/XPSAsynInterpose.c
+++ b/motorApp/NewportSrc/XPSAsynInterpose.c
@@ -2,11 +2,11 @@
 #include <cantProceed.h>
 #include <epicsString.h>
 #include <errlog.h>
-#include <epicsExport.h>
 #include <iocsh.h>
 #include <asynDriver.h>
 #include <asynDrvUser.h>
 #include <XPSAsynInterpose.h>
+#include <epicsExport.h>
 
 typedef struct {
     XPSCommand command;
diff --git a/motorApp/NewportSrc/asynOctetSocket.cpp b/motorApp/NewportSrc/asynOctetSocket.cpp
index a83f4709..236932ad 100644
--- a/motorApp/NewportSrc/asynOctetSocket.cpp
+++ b/motorApp/NewportSrc/asynOctetSocket.cpp
@@ -21,12 +21,12 @@ typedef int BOOL;
 #include <time.h>
 #include <epicsThread.h>
 #include <epicsMutex.h>
-#include <epicsExport.h>
 #include <epicsString.h>
 #include <asynDriver.h>
 #include <asynOctetSyncIO.h>
 #include <asynCommonSyncIO.h>
 #include <drvAsynIPPort.h>
+#include <epicsExport.h>
 
 
 /* The maximum number of sockets to XPS controllers.  The driver uses
diff --git a/motorApp/NewportSrc/drvXPSAsynAux.c b/motorApp/NewportSrc/drvXPSAsynAux.c
index f2c7f925..5d11959c 100644
--- a/motorApp/NewportSrc/drvXPSAsynAux.c
+++ b/motorApp/NewportSrc/drvXPSAsynAux.c
@@ -12,7 +12,6 @@
 
 #include <cantProceed.h> /* !! for callocMustSucceed() */
 
-#include <epicsExport.h>
 #include <epicsMutex.h>
 #include <epicsEvent.h>
 #include <epicsThread.h>
@@ -26,6 +25,7 @@
 #include <asynDrvUser.h>
 
 #include <XPS_C8_drivers.h>
+#include <epicsExport.h>
 
 typedef struct {
     char *portName;