diff --git a/src/iocsh/Makefile b/src/iocsh/Makefile
index 00ef41231..3ffc1932b 100644
--- a/src/iocsh/Makefile
+++ b/src/iocsh/Makefile
@@ -5,6 +5,7 @@ include $(TOP)/configure/CONFIG
 #
 
 INC += ioccrf.h
+INC += osiRegister.h
 INC += iocUtilRegister.h
 INC += dbStaticRegister.h
 INC += dbTestRegister.h
@@ -14,6 +15,7 @@ INC += caTestRegister.h
 INC += dbAccessRegister.h
 INC += ioccrfRegister.h
 INC += asTestRegister.h
+INC += registerRecordDeviceDriverRegister.h
 
 
 #       general contents of library on all platforms
@@ -24,19 +26,20 @@ INC += asTestRegister.h
 #
 
 LIBSRCS += ioccrf.c
+LIBSRCS += osiRegister.c
+LIBSRCS += dbStaticRegister.c
+LIBSRCS += dbTestRegister.c
+LIBSRCS += dbBkptRegister.c
+LIBSRCS += dbCaTestRegister.c
+LIBSRCS += caTestRegister.c
+LIBSRCS += dbAccessRegister.c
+LIBSRCS += ioccrfRegister.c
+LIBSRCS += asTestRegister.c
 LIBSRCS += iocUtil.c
-LIBSRCS += dbStaticRegister
-LIBSRCS += dbTestRegister
-LIBSRCS += dbBkptRegister
-LIBSRCS += dbCaTestRegister
-LIBSRCS += caTestRegister
-LIBSRCS += dbAccessRegister
-LIBSRCS += ioccrfRegister
-LIBSRCS += asTestRegister
 
 LIBRARY_IOC = iocsh
 
-iocsh_OBJS += $(EPICS_BASE_BIN)/registerRecordDeviceDriver.o
+OBJS += registerRecordDeviceDriverRegister
 
 iocsh_DLL_LIBS  = Com registryIoc dbStaticIoc dbIoc asIoc rsrvIoc dbtoolsIoc miscIoc 
 registryIoc_DIR=$(EPICS_BASE_LIB)
diff --git a/src/iocsh/dbAccessRegister.c b/src/iocsh/dbAccessRegister.c
index 1b3d66604..d588d2b03 100644
--- a/src/iocsh/dbAccessRegister.c
+++ b/src/iocsh/dbAccessRegister.c
@@ -12,13 +12,12 @@ of this distribution.
 #include <stdio.h>
 #include <ctype.h>
 
+#include "dbAccess.h" 
 #include "iocInit.h"
-#include "dbAccess.h"
 #include "dbLoadTemplate.h"
 #define epicsExportSharedSymbols
 #include "registryRecordType.h"
 #include "dbAccessRegister.h"
-#include "ioccrf.h"
 
 #ifdef __rtems__
 # define dbLoadDatabase dbLoadDatabaseRTEMS
@@ -61,17 +60,6 @@ static void dbLoadTemplateCallFunc(ioccrfArg **args)
     dbLoadTemplate((char *)args[0]->value);
 }
 
-/* registerRecordDeviceDriver */
-static ioccrfArg registerRecordDeviceDriverArg0 = { "pdbbase",ioccrfArgPdbbase,0};
-static ioccrfArg *registerRecordDeviceDriverArgs[1] =
-    {&registerRecordDeviceDriverArg0};
-static ioccrfFuncDef registerRecordDeviceDriverFuncDef =
-    {"registerRecordDeviceDriver",1,registerRecordDeviceDriverArgs};
-static void registerRecordDeviceDriverCallFunc(ioccrfArg **args)
-{
-    registerRecordDeviceDriverBase(pdbbase);
-}
-
 /* iocInit */
 static ioccrfFuncDef iocInitFuncDef =
     {"iocInit",0,0};
@@ -85,7 +73,5 @@ void epicsShareAPI dbAccessRegister(void)
     ioccrfRegister(&dbLoadDatabaseFuncDef,dbLoadDatabaseCallFunc);
     ioccrfRegister(&dbLoadRecordsFuncDef,dbLoadRecordsCallFunc);
     ioccrfRegister(&dbLoadTemplateFuncDef,dbLoadTemplateCallFunc);
-    ioccrfRegister(&registerRecordDeviceDriverFuncDef,
-        registerRecordDeviceDriverCallFunc);
     ioccrfRegister(&iocInitFuncDef,iocInitCallFunc);
 }
diff --git a/src/iocsh/iocUtil.c b/src/iocsh/iocUtil.c
index d9e922ef7..38fbdfb04 100644
--- a/src/iocsh/iocUtil.c
+++ b/src/iocsh/iocUtil.c
@@ -11,6 +11,7 @@
 
 #define epicsExportSharedSymbols
 #include "ioccrf.h"
+#include "iocUtilRegister.h"
 
 
 /* < (runScript) command */
diff --git a/src/iocsh/registerRecordDeviceDriverRegister.c b/src/iocsh/registerRecordDeviceDriverRegister.c
new file mode 100644
index 000000000..8a2c68859
--- /dev/null
+++ b/src/iocsh/registerRecordDeviceDriverRegister.c
@@ -0,0 +1,36 @@
+/* registerRecordDeviceDriverRegister.c */
+/* Author:  Marty Kraimer Date: 04MAY2000 */
+
+/********************COPYRIGHT NOTIFICATION**********************************
+This software was developed under a United States Government license
+described on the COPYRIGHT_UniversityOfChicago file included as part
+of this distribution.
+****************************************************************************/
+#include <stddef.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <ctype.h>
+
+#include "dbAccess.h"
+#include "ioccrf.h"
+#define epicsExportSharedSymbols
+#include "registerRecordDeviceDriverRegister.h"
+
+/* registerRecordDeviceDriver */
+static ioccrfArg registerRecordDeviceDriverArg0 =
+    { "pdbbase",ioccrfArgPdbbase,0};
+static ioccrfArg *registerRecordDeviceDriverArgs[1] =
+    {&registerRecordDeviceDriverArg0};
+static ioccrfFuncDef registerRecordDeviceDriverFuncDef =
+    {"registerRecordDeviceDriver",1,registerRecordDeviceDriverArgs};
+static void registerRecordDeviceDriverCallFunc(ioccrfArg **args)
+{
+    registerRecordDeviceDriver(pdbbase);
+}
+
+void epicsShareAPI registerRecordDeviceDriverRegister(void)
+{
+    ioccrfRegister(
+        &registerRecordDeviceDriverFuncDef,registerRecordDeviceDriverCallFunc);
+}
diff --git a/src/iocsh/registerRecordDeviceDriverRegister.h b/src/iocsh/registerRecordDeviceDriverRegister.h
new file mode 100644
index 000000000..45d709cb9
--- /dev/null
+++ b/src/iocsh/registerRecordDeviceDriverRegister.h
@@ -0,0 +1,25 @@
+/* registerRecordDeviceDriverRegister.h */
+/* Author:  Marty Kraimer Date: 02MAY2000 */
+
+/********************COPYRIGHT NOTIFICATION**********************************
+This software was developed under a United States Government license
+described on the COPYRIGHT_UniversityOfChicago file included as part
+of this distribution.
+****************************************************************************/
+
+#ifndef INCregisterRecordDeviceDriverRegisterH
+#define INCregisterRecordDeviceDriverRegisterH
+
+#include "shareLib.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+epicsShareFunc void epicsShareAPI registerRecordDeviceDriverRegister(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*INCregisterRecordDeviceDriverRegisterH*/