diff --git a/src/iocsh/ioccrf.cpp b/src/iocsh/ioccrf.cpp
index dfef0f0ff..2e77fd0d2 100644
--- a/src/iocsh/ioccrf.cpp
+++ b/src/iocsh/ioccrf.cpp
@@ -21,7 +21,6 @@ of this distribution.
 #include "dbAccess.h"
 #define epicsExportSharedSymbols
 #include "ioccrf.h"
-#include "ioccrfRegisterCommon.h"
 #include "epicsReadline.h"
 
 class IoccrfFunc {
@@ -482,8 +481,10 @@ static void localRegister (void)
 /*
  * Register commands on application startup
  */
+#include "ioccrfRegisterCommon.h"
+#include "registerRecordDeviceDriverRegister.h"
 class IoccrfRegister {
   public:
-    IoccrfRegister() { localRegister(); ioccrfRegisterCommon(); }
+    IoccrfRegister() { localRegister(); ioccrfRegisterCommon(); registerRecordDeviceDriverRegister(); }
 };
 static IoccrfRegister ioccrfRegisterObj;
diff --git a/src/libCom/osi/os/RTEMS/rtems_init.c b/src/libCom/osi/os/RTEMS/rtems_init.c
index 33978e12a..ca3a3b65d 100644
--- a/src/libCom/osi/os/RTEMS/rtems_init.c
+++ b/src/libCom/osi/os/RTEMS/rtems_init.c
@@ -26,7 +26,6 @@
 #include <osiThread.h>
 #include <logClient.h>
 #include <ioccrf.h>
-#include <registerRecordDeviceDriverRegister.h>
 #include <dbStaticLib.h>
 
 /*
@@ -319,7 +318,6 @@ Init (rtems_task_argument ignored)
      */
     printf ("***** Executing EPICS startup script *****\n");
     ioccrfRegisterRTEMS ();
-    registerRecordDeviceDriverRegister ();
     ioccrf ("st.cmd");
 
     /*
diff --git a/src/makeBaseApp/top/exampleApp/src/exampleMain.c b/src/makeBaseApp/top/exampleApp/src/exampleMain.c
index 7af000b4c..a62b27577 100644
--- a/src/makeBaseApp/top/exampleApp/src/exampleMain.c
+++ b/src/makeBaseApp/top/exampleApp/src/exampleMain.c
@@ -14,16 +14,10 @@ of this distribution.
 #include <stdio.h>
 
 #include "osiThread.h"
-#include "dbAccess.h"
-#include "errlog.h"
-#include "dbTest.h"
-#include "registryRecordType.h"
 #include "ioccrf.h"
-#include "registerRecordDeviceDriverRegister.h"
 
 int main(int argc,char *argv[])
 {
-    registerRecordDeviceDriverRegister();
     if(argc>=2) {    
         ioccrf(argv[1]);
         threadSleep(.2);