diff --git a/src/db/dbAccess.c b/src/db/dbAccess.c
index 6f6c02c97..fdb87f6c7 100644
--- a/src/db/dbAccess.c
+++ b/src/db/dbAccess.c
@@ -81,6 +81,7 @@ of this distribution.
 extern long lset_stack_not_empty;
 
 epicsShareDef struct dbBase *pdbbase = 0;
+epicsShareDef volatile int interruptAccept=FALSE;
 
 static short mapDBFToDBR[DBF_NTYPES] = {
 	DBR_STRING, DBR_CHAR, DBR_UCHAR, DBR_SHORT, DBR_USHORT, 
diff --git a/src/db/dbAccess.h b/src/db/dbAccess.h
index 9a20923cf..c05d0621f 100644
--- a/src/db/dbAccess.h
+++ b/src/db/dbAccess.h
@@ -33,6 +33,7 @@ of this distribution.
 #include "shareLib.h"
 
 epicsShareExtern struct dbBase *pdbbase;
+epicsShareExtern volatile int interruptAccept;
 
 /*  The database field and request types are defined in dbFldTypes.h*/
 /* Data Base Request Options	*/
diff --git a/src/db/dbCa.c b/src/db/dbCa.c
index 0b23e5146..bbb56cd2c 100644
--- a/src/db/dbCa.c
+++ b/src/db/dbCa.c
@@ -40,15 +40,15 @@ of this distribution.
 #include "errMdef.h"
 #include "epicsPrint.h"
 #include "dbCommon.h"
-/*following because we cant include dbStaticLib.h*/
-epicsShareFunc void * epicsShareAPI dbCalloc(size_t nobj,size_t size);
-#include "dbCaPvt.h"
-#define epicsExportSharedSymbols
 #include "cadef.h"
 #include "caerr.h"
+/*following because we cant include dbStaticLib.h*/
+epicsShareFunc void * epicsShareAPI dbCalloc(size_t nobj,size_t size);
+#define epicsExportSharedSymbols
 #include "db_access.h"
 #include "dbScan.h"
 #include "dbCa.h"
+#include "dbCaPvt.h"
 
 static ELLLIST caList;	/* Work list for dbCaTask */
 static semMutexId caListSem; /*Mutual exclusions semaphores for caList*/
diff --git a/src/db/db_access.h b/src/db/db_access.h
index 3673d16f2..229492e37 100644
--- a/src/db/db_access.h
+++ b/src/db/db_access.h
@@ -101,6 +101,10 @@ extern "C" {
 #include "ellLib.h"
 #include "dbAddr.h"
 
+epicsShareExtern struct dbBase *pdbbase;
+epicsShareExtern volatile int interruptAccept;
+
+
 #define MAX_UNITS_SIZE		8	
 #define MAX_ENUM_STRING_SIZE	26
 #define MAX_ENUM_STATES		16	
diff --git a/src/db/dbcar.c b/src/db/dbcar.c
index fa3fc860d..475ecde78 100644
--- a/src/db/dbcar.c
+++ b/src/db/dbcar.c
@@ -41,9 +41,12 @@ of this distribution.
 #include "epicsPrint.h"
 #include "dbCommon.h"
 #include "shareLib.h"
-#include "dbCaPvt.h"
 epicsShareExtern struct dbBase *pdbbase;
 #define epicsExportSharedSymbols
+/*define DB_TEXT_GLBLSOURCE because db_access.d does not include db_access.h*/
+#define DB_TEXT_GLBLSOURCE
+#include "db_access.h"
+#include "dbCaPvt.h"
 #include "dbCa.h"
 
 long dbcar(char	*precordname,int level)
diff --git a/src/db/iocInit.c b/src/db/iocInit.c
index 2caa3e6c8..b2e5abedb 100644
--- a/src/db/iocInit.c
+++ b/src/db/iocInit.c
@@ -84,9 +84,6 @@ of this distribution.
 
 LOCAL int initialized=FALSE;
 
-/* The following is for use by interrupt routines */
-volatile int interruptAccept=FALSE;
-
 /* define forward references*/
 LOCAL void initDrvSup(void);
 LOCAL void initRecSup(void);