diff --git a/motorApp/NewportSrc/HXPDriver.cpp b/motorApp/NewportSrc/HXPDriver.cpp
index 674eee22..418944e7 100644
--- a/motorApp/NewportSrc/HXPDriver.cpp
+++ b/motorApp/NewportSrc/HXPDriver.cpp
@@ -18,9 +18,12 @@ Note: This driver was tested with the v1.3.x of the firmware
 
 #include <asynOctetSyncIO.h>
 
-#include "HXPDriver.h"
+#include "asynMotorController.h"
+#include "asynMotorAxis.h"
 #include "hxp_drivers.h"
+
 #include <epicsExport.h>
+#include "HXPDriver.h"
 
 #define NINT(f) (int)((f)>0 ? (f)+0.5 : (f)-0.5)
 #define NUM_AXES 6