diff --git a/motorExApp/NoAsyn/NoAsynInclude.dbd b/motorExApp/NoAsyn/NoAsynInclude.dbd
index 943bd565..dceb5753 100644
--- a/motorExApp/NoAsyn/NoAsynInclude.dbd
+++ b/motorExApp/NoAsyn/NoAsynInclude.dbd
@@ -1,4 +1,4 @@
 include "base.dbd"
 include "motorRecord.dbd"
-include "devOms.dbd"
 include "devSoftMotor.dbd"
+include "devMXmotor.dbd"
diff --git a/motorExApp/NoAsyn/NoAsynMain.c b/motorExApp/NoAsyn/NoAsynMain.c
new file mode 100644
index 00000000..9b873cc9
--- /dev/null
+++ b/motorExApp/NoAsyn/NoAsynMain.c
@@ -0,0 +1,21 @@
+/* NoMPFMain.c */
+/* Author:  Ron Sluiter */
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "epicsThread.h"
+#include "iocsh.h"
+
+int main(int argc,char *argv[])
+{
+    if(argc>=2) {    
+        iocsh(argv[1]);
+        epicsThreadSleep(.2);
+    }
+    iocsh(NULL);
+    return(0);
+}
diff --git a/motorExApp/NoAsyn/NoAsynVxInclude.dbd b/motorExApp/NoAsyn/NoAsynVxInclude.dbd
new file mode 100644
index 00000000..00e5d04c
--- /dev/null
+++ b/motorExApp/NoAsyn/NoAsynVxInclude.dbd
@@ -0,0 +1,4 @@
+include "base.dbd"
+include "motorRecord.dbd"
+include "devSoftMotor.dbd"
+include "devOms.dbd"
diff --git a/motorExApp/NoAsyn/NoMPFInclude.dbd b/motorExApp/NoAsyn/NoMPFInclude.dbd
index 943bd565..dceb5753 100644
--- a/motorExApp/NoAsyn/NoMPFInclude.dbd
+++ b/motorExApp/NoAsyn/NoMPFInclude.dbd
@@ -1,4 +1,4 @@
 include "base.dbd"
 include "motorRecord.dbd"
-include "devOms.dbd"
 include "devSoftMotor.dbd"
+include "devMXmotor.dbd"
diff --git a/motorExApp/NoAsyn/NoMPFMain.c b/motorExApp/NoAsyn/NoMPFMain.c
new file mode 100644
index 00000000..9b873cc9
--- /dev/null
+++ b/motorExApp/NoAsyn/NoMPFMain.c
@@ -0,0 +1,21 @@
+/* NoMPFMain.c */
+/* Author:  Ron Sluiter */
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "epicsThread.h"
+#include "iocsh.h"
+
+int main(int argc,char *argv[])
+{
+    if(argc>=2) {    
+        iocsh(argv[1]);
+        epicsThreadSleep(.2);
+    }
+    iocsh(NULL);
+    return(0);
+}
diff --git a/motorExApp/NoAsyn/NoMPFVxInclude.dbd b/motorExApp/NoAsyn/NoMPFVxInclude.dbd
new file mode 100644
index 00000000..00e5d04c
--- /dev/null
+++ b/motorExApp/NoAsyn/NoMPFVxInclude.dbd
@@ -0,0 +1,4 @@
+include "base.dbd"
+include "motorRecord.dbd"
+include "devSoftMotor.dbd"
+include "devOms.dbd"
diff --git a/motorExApp/NoMPF/NoMPFInclude.dbd b/motorExApp/NoMPF/NoMPFInclude.dbd
index 943bd565..dceb5753 100644
--- a/motorExApp/NoMPF/NoMPFInclude.dbd
+++ b/motorExApp/NoMPF/NoMPFInclude.dbd
@@ -1,4 +1,4 @@
 include "base.dbd"
 include "motorRecord.dbd"
-include "devOms.dbd"
 include "devSoftMotor.dbd"
+include "devMXmotor.dbd"
diff --git a/motorExApp/NoMPF/NoMPFMain.c b/motorExApp/NoMPF/NoMPFMain.c
new file mode 100644
index 00000000..9b873cc9
--- /dev/null
+++ b/motorExApp/NoMPF/NoMPFMain.c
@@ -0,0 +1,21 @@
+/* NoMPFMain.c */
+/* Author:  Ron Sluiter */
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "epicsThread.h"
+#include "iocsh.h"
+
+int main(int argc,char *argv[])
+{
+    if(argc>=2) {    
+        iocsh(argv[1]);
+        epicsThreadSleep(.2);
+    }
+    iocsh(NULL);
+    return(0);
+}
diff --git a/motorExApp/NoMPF/NoMPFVxInclude.dbd b/motorExApp/NoMPF/NoMPFVxInclude.dbd
new file mode 100644
index 00000000..00e5d04c
--- /dev/null
+++ b/motorExApp/NoMPF/NoMPFVxInclude.dbd
@@ -0,0 +1,4 @@
+include "base.dbd"
+include "motorRecord.dbd"
+include "devSoftMotor.dbd"
+include "devOms.dbd"
diff --git a/motorExApp/WithAsyn/WithAsynInclude.dbd b/motorExApp/WithAsyn/WithAsynInclude.dbd
index 97a6e274..3464d525 100644
--- a/motorExApp/WithAsyn/WithAsynInclude.dbd
+++ b/motorExApp/WithAsyn/WithAsynInclude.dbd
@@ -1,4 +1,6 @@
 include "base.dbd"
 include "motorRecord.dbd"
-include "devNewport.dbd"
+include "mpfSerial.dbd"
+include "devAcsMotor.dbd"
 include "devImsMotor.dbd"
+include "devNewport.dbd"
diff --git a/motorExApp/WithAsyn/WithMPFInclude.dbd b/motorExApp/WithAsyn/WithMPFInclude.dbd
index 97a6e274..3464d525 100644
--- a/motorExApp/WithAsyn/WithMPFInclude.dbd
+++ b/motorExApp/WithAsyn/WithMPFInclude.dbd
@@ -1,4 +1,6 @@
 include "base.dbd"
 include "motorRecord.dbd"
-include "devNewport.dbd"
+include "mpfSerial.dbd"
+include "devAcsMotor.dbd"
 include "devImsMotor.dbd"
+include "devNewport.dbd"
diff --git a/motorExApp/WithMPF/WithMPFInclude.dbd b/motorExApp/WithMPF/WithMPFInclude.dbd
index 97a6e274..3464d525 100644
--- a/motorExApp/WithMPF/WithMPFInclude.dbd
+++ b/motorExApp/WithMPF/WithMPFInclude.dbd
@@ -1,4 +1,6 @@
 include "base.dbd"
 include "motorRecord.dbd"
-include "devNewport.dbd"
+include "mpfSerial.dbd"
+include "devAcsMotor.dbd"
 include "devImsMotor.dbd"
+include "devNewport.dbd"