diff --git a/src/makeBaseApp/top/exampleApp/src/Makefile b/src/makeBaseApp/top/exampleApp/src/Makefile
index 0380f4bf8..625f2ca8d 100644
--- a/src/makeBaseApp/top/exampleApp/src/Makefile
+++ b/src/makeBaseApp/top/exampleApp/src/Makefile
@@ -1,3 +1,55 @@
 TOP=../..
-include $(TOP)/config/CONFIG_APP
-include $(TOP)/config/RULES_ARCHS
+include $(TOP)/configure/CONFIG
+#----------------------------------------
+#  ADD MACRO DEFINITIONS AFTER THIS LINE
+
+#USER_DBDFLAGS += 
+
+RECTYPES += xxxRecord.h
+DBDEXPAND = exampleInclude.dbd
+DBDNAME = exampleApp.dbd
+
+#USR_CFLAGS += 
+PROD_LIBS	+= ca
+PROD_LIBS	+= Db
+PROD_LIBS	+= Com
+PROD_LIBS	+= Osi
+ca_DIR  = $(EPICS_BASE_LIB)
+Db_DIR  = $(EPICS_BASE_LIB)
+Com_DIR = $(EPICS_BASE_LIB)
+
+PROD += caExample
+
+LIBOBJS += xxxRecord.o
+LIBOBJS += devXxxSoft.o
+LIBOBJS += sncExample.o
+
+LIBOBJS += $(EPICS_BASE_BIN)/iocCore
+LIBOBJS += $(EPICS_BASE_BIN)/seq
+
+#choose either
+
+#LIBOBJS += $(EPICS_BASE_BIN)/registerRecordDeviceDriver.o
+
+# or
+EXPANDED_DBD = exampleApp.dbd
+LIBOBJS += registerRecordDeviceDriver.o
+#end choices
+
+
+DBD = exampleApp.dbd
+
+include ../baseLIBOBJS
+
+LIBOBJS += $(EPICS_BASE_BIN)/iocCore
+LIBOBJS += $(EPICS_BASE_BIN)/seq
+
+IOC_LIBRARY = exampleLib
+
+#Note that the command line that builds the
+#library $(LIBNAME) may be HUGE (>3kB)
+#
+include $(TOP)/configure/RULES_BUILD
+include $(TOP)/config/RULES.registerRecordDeviceDriver
+#----------------------------------------
+#  ADD RULES AFTER THIS LINE
diff --git a/src/makeBaseApp/top/exampleApp/src/Makefile.Host b/src/makeBaseApp/top/exampleApp/src/Makefile.Host
deleted file mode 100644
index 3842c64b1..000000000
--- a/src/makeBaseApp/top/exampleApp/src/Makefile.Host
+++ /dev/null
@@ -1,24 +0,0 @@
-# Makefile.Host
-TOP = ../../..
-include $(TOP)/config/CONFIG_APP
-#----------------------------------------
-#  ADD MACRO DEFINITIONS AFTER THIS LINE
-
-#USER_DBDFLAGS += 
-RECTYPES += xxxRecord.h
-DBDEXPAND = exampleInclude.dbd
-DBDNAME = exampleApp.dbd
-
-#USR_CFLAGS += 
-PROD_LIBS	+= ca
-PROD_LIBS	+= Db
-PROD_LIBS	+= Com
-ca_DIR  = $(EPICS_BASE_LIB)
-Db_DIR  = $(EPICS_BASE_LIB)
-Com_DIR = $(EPICS_BASE_LIB)
-
-PROD += caExample
-
-include $(TOP)/config/RULES.Host
-#----------------------------------------
-#  ADD RULES AFTER THIS LINE
diff --git a/src/makeBaseApp/top/exampleApp/src/Makefile.Vx b/src/makeBaseApp/top/exampleApp/src/Makefile.Vx
deleted file mode 100644
index 1026c9adb..000000000
--- a/src/makeBaseApp/top/exampleApp/src/Makefile.Vx
+++ /dev/null
@@ -1,24 +0,0 @@
-# Makefile.Vx
-TOP = ../../..
-include $(TOP)/config/CONFIG_APP
-#----------------------------------------
-#  ADD MACRO DEFINITIONS AFTER THIS LINE
-
-SRCS.c += ../xxxRecord.c
-SRCS.c += ../devXxxSoft.c
-
-LIBOBJS += xxxRecord.o
-LIBOBJS += devXxxSoft.o
-LIBOBJS += sncExample.o
-
-include ../baseLIBOBJS
-
-LIBNAME = exampleLib
-INSTALLS += iocCore seq
-
-#Note that the command line that builds the
-#library $(LIBNAME) may be HUGE (>3kB)
-#
-include $(TOP)/config/RULES.Vx
-#----------------------------------------
-#  ADD RULES AFTER THIS LINE
diff --git a/src/makeBaseApp/top/exampleApp/src/devXxxSoft.c b/src/makeBaseApp/top/exampleApp/src/devXxxSoft.c
index 393613a31..e37d031b5 100644
--- a/src/makeBaseApp/top/exampleApp/src/devXxxSoft.c
+++ b/src/makeBaseApp/top/exampleApp/src/devXxxSoft.c
@@ -1,19 +1,19 @@
 /* devXxxSoft.c */
 /* Example device support module */
 
-#include	<vxWorks.h>
-#include	<stdlib.h>
-#include	<stdio.h>
-#include	<string.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 
-#include	<alarm.h>
-#include	<cvtTable.h>
-#include	<dbDefs.h>
-#include	<dbAccess.h>
-#include        <recSup.h>
-#include	<devSup.h>
-#include	<link.h>
-#include	<xxxRecord.h>
+#include "alarm.h"
+#include "cvtTable.h"
+#include "dbDefs.h"
+#include "dbAccess.h"
+#include "recSup.h"
+#include "devSup.h"
+#include "link.h"
+#include "xxxRecord.h"
 
 /*Create the dset for devXxxSoft */
 static long init_record();
diff --git a/src/makeBaseApp/top/exampleApp/src/xxxRecord.c b/src/makeBaseApp/top/exampleApp/src/xxxRecord.c
index cecf12d7b..8f17b6a39 100644
--- a/src/makeBaseApp/top/exampleApp/src/xxxRecord.c
+++ b/src/makeBaseApp/top/exampleApp/src/xxxRecord.c
@@ -1,22 +1,21 @@
 /* xxxRecord.c */
 /* Example record support module */
   
-#include <vxWorks.h>
 #include <stddef.h>
+#include <stdlib.h>
 #include <stdio.h>
-#include <lstLib.h>
 #include <string.h>
 
-#include <alarm.h>
-#include <dbEvent.h>
-#include <dbDefs.h>
-#include <dbAccess.h>
-#include <devSup.h>
-#include <errMdef.h>
-#include <recSup.h>
-#include <special.h>
+#include "alarm.h"
+#include "dbEvent.h"
+#include "dbDefs.h"
+#include "dbAccess.h"
+#include "devSup.h"
+#include "errMdef.h"
+#include "recSup.h"
+#include "special.h"
 #define GEN_SIZE_OFFSET
-#include <xxxRecord.h>
+#include "xxxRecord.h"
 #undef  GEN_SIZE_OFFSET
 
 /* Create RSET - Record Support Entry Table */