diff --git a/src/db/dbCAC.h b/src/db/dbCAC.h
index c9eee678e..4ec9aa078 100644
--- a/src/db/dbCAC.h
+++ b/src/db/dbCAC.h
@@ -82,7 +82,7 @@ public:
     void * operator new ( size_t size );
     void operator delete ( void *pCadaver, size_t size );
 private:
-    osiEvent block;
+    epicsEvent block;
     dbPutNotifyIO *pPN;
     dbChannelIO &chan;
 
@@ -150,6 +150,6 @@ private:
     dbEventCtx ctx;
     char *pEventCallbackCache;
     unsigned long eventCallbackCacheSize;
-    osiMutex mutex;
+    epicsMutex mutex;
 };
 
diff --git a/src/db/dbCa.c b/src/db/dbCa.c
index 4506c4da1..8c39ac880 100644
--- a/src/db/dbCa.c
+++ b/src/db/dbCa.c
@@ -626,7 +626,8 @@ void dbCaTask()
     short	link_action;
     int		status;
 
-    SEVCHK(ca_context_create(enablePreemption),"dbCaTask calling ca_task_initialize");
+    SEVCHK(ca_context_create(enablePreemption),
+        "dbCaTask calling ca_context_create");
     SEVCHK(ca_add_exception_event(exceptionCallback,NULL),
 	"ca_add_exception_event");
     /*Dont do anything until iocInit initializes database*/
diff --git a/src/db/dbChannelIO.cpp b/src/db/dbChannelIO.cpp
index 44ca39ba2..08a6d103e 100644
--- a/src/db/dbChannelIO.cpp
+++ b/src/db/dbChannelIO.cpp
@@ -20,7 +20,7 @@
 #include "cadef.h"
 #include "cacIO.h"
 #include "tsFreeList.h"
-#include "osiMutex.h"
+#include "epicsMutex.h"
 
 #define epicsExportSharedSymbols
 #include "db_access_routines.h"
diff --git a/src/db/dbPutNotifyBlocker.cpp b/src/db/dbPutNotifyBlocker.cpp
index 53bc4a876..42f50189b 100644
--- a/src/db/dbPutNotifyBlocker.cpp
+++ b/src/db/dbPutNotifyBlocker.cpp
@@ -19,7 +19,7 @@
 #include "limits.h"
 #include "string.h"
 
-#include "osiMutex.h"
+#include "epicsMutex.h"
 #include "osiTime.h"
 #include "tsFreeList.h"
 #include "errMdef.h"
diff --git a/src/db/dbPutNotifyIO.cpp b/src/db/dbPutNotifyIO.cpp
index 03af3ef84..7b4119f32 100644
--- a/src/db/dbPutNotifyIO.cpp
+++ b/src/db/dbPutNotifyIO.cpp
@@ -19,7 +19,7 @@
 #include "limits.h"
 #include "string.h"
 
-#include "osiMutex.h"
+#include "epicsMutex.h"
 #include "tsFreeList.h"
 #include "errMdef.h"
 
diff --git a/src/db/dbServiceIO.cpp b/src/db/dbServiceIO.cpp
index e5a127345..2f7604e66 100644
--- a/src/db/dbServiceIO.cpp
+++ b/src/db/dbServiceIO.cpp
@@ -17,7 +17,7 @@
 
 #include "limits.h"
 
-#include "osiMutex.h"
+#include "epicsMutex.h"
 #include "tsFreeList.h"
 
 #include "cadef.h"
diff --git a/src/db/dbSubscriptionIO.cpp b/src/db/dbSubscriptionIO.cpp
index 940e8c6a1..82ec8d9b4 100644
--- a/src/db/dbSubscriptionIO.cpp
+++ b/src/db/dbSubscriptionIO.cpp
@@ -17,7 +17,7 @@
 
 #include "limits.h"
 
-#include "osiMutex.h"
+#include "epicsMutex.h"
 #include "tsFreeList.h"
 
 #include "cadef.h"