diff --git a/src/iocsh/iocsh.cpp b/src/iocsh/iocsh.cpp
index a4d6ed4e0..de98e938c 100644
--- a/src/iocsh/iocsh.cpp
+++ b/src/iocsh/iocsh.cpp
@@ -891,11 +891,10 @@ static void localRegister (void)
 } /* extern "C" */
 
 /*
- * Register commands on application startup
+ * Register local commands on application startup
  */
-#include "iocshRegisterCommon.h"
 class IocshRegister {
   public:
-    IocshRegister() { localRegister(); iocshRegisterCommon(); }
+    IocshRegister() { localRegister(); }
 };
 static IocshRegister iocshRegisterObj;
diff --git a/src/registry/registerRecordDeviceDriver.pl b/src/registry/registerRecordDeviceDriver.pl
index 4b383c508..dfa31a15d 100755
--- a/src/registry/registerRecordDeviceDriver.pl
+++ b/src/registry/registerRecordDeviceDriver.pl
@@ -185,9 +185,13 @@ static void registerRecordDeviceDriverCallFunc(const iocshArgBuf *)
 /*
  * Register commands on application startup
  */
+#include "iocshRegisterCommon.h"
 class IoccrfReg {
   public:
-    IoccrfReg() { iocshRegister(&registerRecordDeviceDriverFuncDef,registerRecordDeviceDriverCallFunc);}
+    IoccrfReg() {
+        iocshRegisterCommon();
+        iocshRegister(&registerRecordDeviceDriverFuncDef,registerRecordDeviceDriverCallFunc);
+    }
 };
 #if !defined(__GNUC__) || !(__GNUC__<2 || (__GNUC__==2 && __GNUC_MINOR__<=95))
 namespace { IoccrfReg iocshReg; }