diff --git a/src/db/callback.c b/src/db/callback.c
index e72fe462e..45c38eb18 100644
--- a/src/db/callback.c
+++ b/src/db/callback.c
@@ -20,7 +20,7 @@ of this distribution.
 #include "dbDefs.h"
 #include "epicsEvent.h"
 #include "epicsThread.h"
-#include "osiInterrupt.h"
+#include "epicsInterrupt.h"
 #include "osiTimer.h"
 #include "epicsRingPointer.h"
 #include "tsStamp.h"
@@ -100,9 +100,9 @@ void epicsShareAPI callbackRequest(CALLBACK *pcallback)
 	return;
     }
     if(ringOverflow[priority]) return;
-    lockKey = interruptLock();
+    lockKey = epicsInterruptLock();
     pushOK = epicsRingPointerPush(callbackQ[priority],(void *)pcallback);
-    interruptUnlock(lockKey);
+    epicsInterruptUnlock(lockKey);
     if(!pushOK) {
 	epicsPrintf("callbackRequest ring buffer full\n");
 	ringOverflow[priority] = TRUE;
diff --git a/src/db/dbScan.c b/src/db/dbScan.c
index 3e8364372..7c53a1dca 100644
--- a/src/db/dbScan.c
+++ b/src/db/dbScan.c
@@ -54,7 +54,7 @@
 #include "taskwd.h"
 #include "epicsMutex.h"
 #include "epicsEvent.h"
-#include "osiInterrupt.h"
+#include "epicsInterrupt.h"
 #include "epicsThread.h"
 #include "tsStamp.h"
 #include "cantProceed.h"
@@ -445,9 +445,9 @@ void epicsShareAPI scanOnce(void *precord)
     int lockKey;
     int pushOK;
 
-    lockKey = interruptLock();
+    lockKey = epicsInterruptLock();
     pushOK = epicsRingPointerPush(onceQ,precord);
-    interruptUnlock(lockKey);
+    epicsInterruptUnlock(lockKey);
     if(!pushOK) {
 	if(newOverflow)errMessage(0,"rngBufPut overflow in scanOnce");
 	newOverflow = FALSE;