diff --git a/motorExApp/WithAsyn/Makefile b/motorExApp/WithAsyn/Makefile
index 1f563728..0d39d440 100644
--- a/motorExApp/WithAsyn/Makefile
+++ b/motorExApp/WithAsyn/Makefile
@@ -6,13 +6,23 @@
 TOP = ../..
 include $(TOP)/configure/CONFIG
 
-DBD += WithMPF.dbd
+ifeq ($(OS_CLASS), vxWorks)
 DBD += WithMPFVx.dbd
+endif
+ifeq ($(OS_CLASS), WIN32)
+DBD += WithMPFWin32.dbd
+else
+DBD += WithMPF.dbd
+endif
 
 PROD_IOC_DEFAULT = WithMPF
 PROD_IOC_vxWorks = WithMPFVx
 
+ifeq ($(OS_CLASS), WIN32) 
+WithMPF_SRCS   += WithMPFWin32_registerRecordDeviceDriver.cpp
+else
 WithMPF_SRCS   += WithMPF_registerRecordDeviceDriver.cpp
+endif
 WithMPFVx_SRCS += WithMPFVx_registerRecordDeviceDriver.cpp
 WithMPF_SRCS_DEFAULT += WithMPFMain.cpp
 
diff --git a/motorExApp/WithMPF/Makefile b/motorExApp/WithMPF/Makefile
index 1f563728..0d39d440 100644
--- a/motorExApp/WithMPF/Makefile
+++ b/motorExApp/WithMPF/Makefile
@@ -6,13 +6,23 @@
 TOP = ../..
 include $(TOP)/configure/CONFIG
 
-DBD += WithMPF.dbd
+ifeq ($(OS_CLASS), vxWorks)
 DBD += WithMPFVx.dbd
+endif
+ifeq ($(OS_CLASS), WIN32)
+DBD += WithMPFWin32.dbd
+else
+DBD += WithMPF.dbd
+endif
 
 PROD_IOC_DEFAULT = WithMPF
 PROD_IOC_vxWorks = WithMPFVx
 
+ifeq ($(OS_CLASS), WIN32) 
+WithMPF_SRCS   += WithMPFWin32_registerRecordDeviceDriver.cpp
+else
 WithMPF_SRCS   += WithMPF_registerRecordDeviceDriver.cpp
+endif
 WithMPFVx_SRCS += WithMPFVx_registerRecordDeviceDriver.cpp
 WithMPF_SRCS_DEFAULT += WithMPFMain.cpp