diff --git a/motorExApp/WithAsyn/Makefile b/motorExApp/WithAsyn/Makefile
index a7ce7a6b..3fa78242 100644
--- a/motorExApp/WithAsyn/Makefile
+++ b/motorExApp/WithAsyn/Makefile
@@ -33,6 +33,7 @@ WithMPF_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary
 #!WithMPFVx_LDOBJS_vxWorks += $(IPAC_BIN)/ipacLib
 #!WithMPFVx_OBJS_vxWorks   += $(IPAC_BIN)/tyGSOctal
 
+#!WithMPF_LIBS   += oms
 #!WithMPF_LIBS   += Mclennan
 #!WithMPF_LIBS   += Micos
 #!WithMPF_LIBS   += MicroMo
@@ -48,6 +49,7 @@ WithMPF_LIBS   += asyn
 #!WithMPF_LIBS   += seq pv
 WithMPF_LIBS   += $(EPICS_BASE_IOC_LIBS)
 
+#!WithMPFVx_LIBS += oms
 #!WithMPFVx_LIBS += Mclennan
 #!WithMPFVx_LIBS += Micos
 #!WithMPFVx_LIBS += MicroMo
diff --git a/motorExApp/WithAsyn/WithAsynInclude.dbd b/motorExApp/WithAsyn/WithAsynInclude.dbd
index c82fc5cf..92cdeb35 100644
--- a/motorExApp/WithAsyn/WithAsynInclude.dbd
+++ b/motorExApp/WithAsyn/WithAsynInclude.dbd
@@ -8,6 +8,7 @@ include "drvAsynSerialPort.dbd"
 #include "devMicroMo.dbd"
 #include "devNewport.dbd"
 #include "devPIMotor.dbd"
+#include "devOms.dbd"
 #include "devSoftMotor.dbd"
 #include "motorSimSupport.dbd"
 
diff --git a/motorExApp/WithAsyn/WithAsynVxInclude.dbd b/motorExApp/WithAsyn/WithAsynVxInclude.dbd
index dd2b2da3..a81927ef 100644
--- a/motorExApp/WithAsyn/WithAsynVxInclude.dbd
+++ b/motorExApp/WithAsyn/WithAsynVxInclude.dbd
@@ -8,6 +8,7 @@ include "drvAsynSerialPort.dbd"
 #include "devMicroMo.dbd"
 #include "devNewport.dbd"
 #include "devPIMotor.dbd"
+#include "devOms.dbd"
 #include "devSoftMotor.dbd"
 #include "motorSimSupport.dbd"
 # Only for IPAC R2.7 and above.
diff --git a/motorExApp/WithAsyn/WithMPFInclude.dbd b/motorExApp/WithAsyn/WithMPFInclude.dbd
index c82fc5cf..92cdeb35 100644
--- a/motorExApp/WithAsyn/WithMPFInclude.dbd
+++ b/motorExApp/WithAsyn/WithMPFInclude.dbd
@@ -8,6 +8,7 @@ include "drvAsynSerialPort.dbd"
 #include "devMicroMo.dbd"
 #include "devNewport.dbd"
 #include "devPIMotor.dbd"
+#include "devOms.dbd"
 #include "devSoftMotor.dbd"
 #include "motorSimSupport.dbd"
 
diff --git a/motorExApp/WithAsyn/WithMPFVxInclude.dbd b/motorExApp/WithAsyn/WithMPFVxInclude.dbd
index dd2b2da3..a81927ef 100644
--- a/motorExApp/WithAsyn/WithMPFVxInclude.dbd
+++ b/motorExApp/WithAsyn/WithMPFVxInclude.dbd
@@ -8,6 +8,7 @@ include "drvAsynSerialPort.dbd"
 #include "devMicroMo.dbd"
 #include "devNewport.dbd"
 #include "devPIMotor.dbd"
+#include "devOms.dbd"
 #include "devSoftMotor.dbd"
 #include "motorSimSupport.dbd"
 # Only for IPAC R2.7 and above.
diff --git a/motorExApp/WithMPF/Makefile b/motorExApp/WithMPF/Makefile
index a7ce7a6b..3fa78242 100644
--- a/motorExApp/WithMPF/Makefile
+++ b/motorExApp/WithMPF/Makefile
@@ -33,6 +33,7 @@ WithMPF_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary
 #!WithMPFVx_LDOBJS_vxWorks += $(IPAC_BIN)/ipacLib
 #!WithMPFVx_OBJS_vxWorks   += $(IPAC_BIN)/tyGSOctal
 
+#!WithMPF_LIBS   += oms
 #!WithMPF_LIBS   += Mclennan
 #!WithMPF_LIBS   += Micos
 #!WithMPF_LIBS   += MicroMo
@@ -48,6 +49,7 @@ WithMPF_LIBS   += asyn
 #!WithMPF_LIBS   += seq pv
 WithMPF_LIBS   += $(EPICS_BASE_IOC_LIBS)
 
+#!WithMPFVx_LIBS += oms
 #!WithMPFVx_LIBS += Mclennan
 #!WithMPFVx_LIBS += Micos
 #!WithMPFVx_LIBS += MicroMo
diff --git a/motorExApp/WithMPF/WithMPFInclude.dbd b/motorExApp/WithMPF/WithMPFInclude.dbd
index c82fc5cf..92cdeb35 100644
--- a/motorExApp/WithMPF/WithMPFInclude.dbd
+++ b/motorExApp/WithMPF/WithMPFInclude.dbd
@@ -8,6 +8,7 @@ include "drvAsynSerialPort.dbd"
 #include "devMicroMo.dbd"
 #include "devNewport.dbd"
 #include "devPIMotor.dbd"
+#include "devOms.dbd"
 #include "devSoftMotor.dbd"
 #include "motorSimSupport.dbd"
 
diff --git a/motorExApp/WithMPF/WithMPFVxInclude.dbd b/motorExApp/WithMPF/WithMPFVxInclude.dbd
index dd2b2da3..a81927ef 100644
--- a/motorExApp/WithMPF/WithMPFVxInclude.dbd
+++ b/motorExApp/WithMPF/WithMPFVxInclude.dbd
@@ -8,6 +8,7 @@ include "drvAsynSerialPort.dbd"
 #include "devMicroMo.dbd"
 #include "devNewport.dbd"
 #include "devPIMotor.dbd"
+#include "devOms.dbd"
 #include "devSoftMotor.dbd"
 #include "motorSimSupport.dbd"
 # Only for IPAC R2.7 and above.