diff --git a/src/iocsh/dbBkptRegister.c b/src/iocsh/dbBkptRegister.c
index d47c68af7..200bde029 100644
--- a/src/iocsh/dbBkptRegister.c
+++ b/src/iocsh/dbBkptRegister.c
@@ -14,7 +14,7 @@ of this distribution.
 
 #include "ellLib.h"
 #include "osiThread.h"
-#include "osiSem.h"
+#include "epicsEvent.h"
 #include "tsStamp.h"
 #include "errlog.h"
 #include "alarm.h"
diff --git a/src/iocsh/iocUtil.c b/src/iocsh/iocUtil.c
index 03d308fd8..2762ab9aa 100644
--- a/src/iocsh/iocUtil.c
+++ b/src/iocsh/iocUtil.c
@@ -120,11 +120,10 @@ static const ioccrfFuncDef putenvFuncDef = {"putenv",1,putenvArgs};
 static void putenvCallFunc(const ioccrfArgBuf *args)
 {
     const char *cp = args[0].sval;
-    int putenv(const char *);
 
     if (!cp)
         return;
-    if (putenv (cp))
+    if (putenv ((char *)cp))
         printf ("putenv(%s) failed.\n", cp);
 }
 
diff --git a/src/iocsh/ioccrf.cpp b/src/iocsh/ioccrf.cpp
index 60a7cb95d..3bcd61912 100644
--- a/src/iocsh/ioccrf.cpp
+++ b/src/iocsh/ioccrf.cpp
@@ -19,7 +19,7 @@ of this distribution.
 #include "errlog.h"
 #include "dbAccess.h"
 #include "osiThread.h"
-#include "osiMutex.h"
+#include "epicsMutex.h"
 #include "registry.h"
 #define epicsExportSharedSymbols
 #include "ioccrf.h"
@@ -35,15 +35,15 @@ struct ioccrfCommand {
 };
 static struct ioccrfCommand *ioccrfCommandHead;
 static char ioccrfID[] = "ioccrf";
-static semMutexId commandTableMutex;
+static epicsMutexId commandTableMutex;
 static threadOnceId commandTableOnceId = OSITHREAD_ONCE_INIT;
 
 /*
  * Set up command table mutex
  */
-static void commandTableOnce (void *arg)
+static void commandTableOnce (void *)
 {
-    commandTableMutex = semMutexMustCreate ();
+    commandTableMutex = epicsMutexMustCreate ();
 }
 
 /*
@@ -53,7 +53,7 @@ static void
 commandTableLock (void)
 {
     threadOnce (&commandTableOnceId, commandTableOnce, NULL);
-    semMutexTake (commandTableMutex);
+    epicsMutexMustLock (commandTableMutex);
 }
 
 /*
@@ -63,7 +63,7 @@ static void
 commandTableUnlock (void)
 {
     threadOnce (&commandTableOnceId, commandTableOnce, NULL);
-    semMutexGive (commandTableMutex);
+    epicsMutexUnlock (commandTableMutex);
 }
 
 /*
@@ -523,14 +523,14 @@ static const ioccrfArg helpArg0 = { "command",ioccrfArgInt};
 static const ioccrfArg *helpArgs[1] = {&helpArg0};
 static const ioccrfFuncDef helpFuncDef =
     {"help",1,helpArgs};
-static void helpCallFunc(const ioccrfArgBuf *args)
+static void helpCallFunc(const ioccrfArgBuf *)
 {
 }
 
 /* exit */
 static const ioccrfFuncDef exitFuncDef =
     {"exit",0,0};
-static void exitCallFunc(const ioccrfArgBuf *args)
+static void exitCallFunc(const ioccrfArgBuf *)
 {
 }