diff --git a/iocBoot/Makefile b/iocBoot/Makefile
index d64511f3762c73dad6928ec92405f41c0e048ee0..252a13709bab25761af481bb547d79945ce50c64 100644
--- a/iocBoot/Makefile
+++ b/iocBoot/Makefile
@@ -1,4 +1,3 @@
 TOP = ..
-include $(TOP)/config/CONFIG_APP
-DIRS += $(wildcard *ioc*)
-include $(TOP)/config/RULES.iocBoot
+include $(TOP)/configure/CONFIG
+include $(TOP)/configure/RULES.iocBoot
diff --git a/iocBoot/iocxxx/st.cmd b/iocBoot/iocxxx/st.cmd
index 701b14d8136952d986a9dceedcf998c09637226b..22fdb9f9cbb17185469036e91b76f823e8c5ec17 100644
--- a/iocBoot/iocxxx/st.cmd
+++ b/iocBoot/iocxxx/st.cmd
@@ -94,7 +94,7 @@ xxxVX_registerRecordDeviceDriver(pdbbase)
 #dbLoadRecords("$(STD)/stdApp/Db/interp.db", "P=xxx:")
 
 # 4-step measurement
-#dbLoadRecords("$(STD)/stdApp/Db/4step.db", "P=xxx:")
+dbLoadRecords("$(STD)/stdApp/Db/4step.db", "P=xxx:")
 
 # X-ray Instrumentation Associates Huber Slit Controller
 # supported by a customized version of the SNL program written by Pete Jemian
@@ -456,7 +456,6 @@ dbLoadRecords("$(STD)/stdApp/Db/misc.db","P=xxx:")
 ###############################################################################
 # Set shell prompt (otherwise it is left at mv167 or mv162)
 shellPromptSet "iocxxx> "
-#reboot_restoreDebug=5
 iocLogDisable=1
 iocInit
 
diff --git a/iocBoot/nfsCommands b/iocBoot/nfsCommands
index a7db82c52a47c5ea1923db1a7eadfc5a86a05cda..eeb7086186791a8853e05d64a725b4a84b834b85 100644
--- a/iocBoot/nfsCommands
+++ b/iocBoot/nfsCommands
@@ -13,8 +13,8 @@ routeShow
 # rather than FTP, for booting the VME crate, and generally for reading
 # and writing files on the server.
 #
-#hostAdd("beams","164.54.100.5")
-#nfsMount("beams","/export/homeb","/home/beams")
+hostAdd("beams","164.54.100.5")
+nfsMount("beams","/export/homeb","/home/beams")
 hostAdd("oxygen","164.54.52.4")
 nfsMount("oxygen","/home/oxygen","/home/oxygen")
 nfsMount("oxygen","/home/oxygen4","/home/oxygen4")
diff --git a/xxxApp/src/Makefile b/xxxApp/src/Makefile
index 42d9efdaaced688afeca80a931e0aaee320d97e5..d1e8078a6745d251c6f15b78efe5150c6ebfc05b 100644
--- a/xxxApp/src/Makefile
+++ b/xxxApp/src/Makefile
@@ -112,7 +112,7 @@ seqDev_DIR = $(SEQ_LIB)
 xxx_LIBS += std
 std_DIR = $(STD_LIB)
 
-xxx_LIBS += mpf mpfEpics mpfSerial
+xxx_LIBS += mpfSerial mpf mpfEpics
 mpf_DIR = $(MPF_LIB)
 mpfEpics_DIR = $(MPF_LIB)
 mpfSerial_DIR = $(MPF_LIB)
diff --git a/xxxApp/src/xxxInclude.dbd b/xxxApp/src/xxxInclude.dbd
index 19fc3c202c44a213dd00aabab26731acca7ea56b..4481115bdfd1fe9549f2ba00c210ffe4104d15dd 100644
--- a/xxxApp/src/xxxInclude.dbd
+++ b/xxxApp/src/xxxInclude.dbd
@@ -1,5 +1,7 @@
+# stuff for non-vxWorks ioc
 include "shareBase.dbd"
 include "stdSupport.dbd"
+include "mpf.dbd"
 include "mpfSerial.dbd"
 include "motorRecord.dbd"
 include "devSoftMotor.dbd"
diff --git a/xxxApp/src/xxxVXInclude.dbd b/xxxApp/src/xxxVXInclude.dbd
index de8b9c93b304ffdc61ce3f40ea96506e0eac608e..4ca5d2c5a2fbc5b62ede9f81dc8f2ccc5b691c2c 100644
--- a/xxxApp/src/xxxVXInclude.dbd
+++ b/xxxApp/src/xxxVXInclude.dbd
@@ -1,5 +1,15 @@
-# stuff to be added only for vxWorks ioc
-include "xxxInclude.dbd"
+# stuff for vxWorks ioc
+include "shareBase.dbd"
+include "stdSupport.dbd"
+
+include "motorRecord.dbd"
+include "devSoftMotor.dbd"
+include "devOms.dbd"
+#include "devAcsMotor.dbd"
+#include "devImsMotor.dbd"
+#include "devMclennanMotor.dbd"
+#include "devNewport.dbd"
+
 
 include "stdVXSupport.dbd"
 
@@ -15,20 +25,18 @@ include "devAoDAC128V.dbd"
 
 include "devIp330.dbd"
 
-include "devOms.dbd"
-#include "devAcsMotor.dbd"
-#include "devImsMotor.dbd"
-#include "devMXmotor.dbd"
-#include "devMclennanMotor.dbd"
-#include "devNewport.dbd"
-
 #include "camacSupport.dbd"
 #include "devCamacSupport.dbd"
 #include "dxpCamacSupport.dbd"
+
 #include "allenBradley.dbd"
 include "devLove.dbd"
 include "drvIpac.dbd"
 
+include "mpf.dbd"
+include "devStringMpf.dbd"
+include "mpfSerialVx.dbd"
+
 # Locally defined stuff that needs to be registered
 #registrar(myRegistrar)
 #variable(myDebug)