diff --git a/src/db/Makefile b/src/db/Makefile
index d0b057b61..c2001b0ab 100644
--- a/src/db/Makefile
+++ b/src/db/Makefile
@@ -8,6 +8,7 @@ INC += dbAccess.h
 INC += dbAddr.h
 INC += dbBkpt.h
 INC += dbConvert.h
+INC += dbConvertFast.h
 INC += dbEvent.h
 INC += dbLock.h
 INC += dbNotify.h
diff --git a/src/db/callback.c b/src/db/callback.c
index b8b01252e..da0b9043a 100644
--- a/src/db/callback.c
+++ b/src/db/callback.c
@@ -28,15 +28,15 @@ of this distribution.
 #include "dbStaticLib.h"
 #include "dbBase.h"
 #include "link.h"
-#include "dbAddr.h"
 #include "dbFldTypes.h"
-#include "dbAccess.h"
 #include "recSup.h"
 #include "taskwd.h"
 #include "errMdef.h"
 #include "dbCommon.h"
-#include "dbLock.h"
 #define epicsExportSharedSymbols
+#include "dbAddr.h"
+#include "dbAccess.h"
+#include "dbLock.h"
 #include "callback.h"
 
 int callbackQueueSize = 2000;
diff --git a/src/db/dbAccess.c b/src/db/dbAccess.c
index 73fd3626a..943122141 100644
--- a/src/db/dbAccess.c
+++ b/src/db/dbAccess.c
@@ -62,20 +62,21 @@ of this distribution.
 #include "caeventmask.h"
 #include "db_field_log.h"
 #include "dbCommon.h"
+#include "dbFldTypes.h"
+#include "special.h"
+#define epicsExportSharedSymbols
+#include "callback.h"
 #include "dbScan.h"
 #include "dbLock.h"
-#include "callback.h"
-#include "dbFldTypes.h"
 #include "dbEvent.h"
 #include "errMdef.h"
-#include "recGbl.h"
-#include "special.h"
 #include "dbConvert.h"
+#include "dbConvertFast.h"
 #include "dbCa.h"
 #include "dbBkpt.h"
 #include "dbNotify.h"
-#define epicsExportSharedSymbols
 #include "dbAccess.h"
+#include "recGbl.h"
 
 extern long lset_stack_not_empty;
 epicsShareDef struct dbBase *pdbbase;
diff --git a/src/db/dbAccess.h b/src/db/dbAccess.h
index 6ce12f1c6..9a20923cf 100644
--- a/src/db/dbAccess.h
+++ b/src/db/dbAccess.h
@@ -165,7 +165,7 @@ struct dbr_alDouble     {DBRalDouble};
 #define dbr_alDouble_size sizeof(struct dbr_alDouble)
 
 #ifndef INCerrMdefh
-#include <errMdef.h>
+#include "errMdef.h"
 #endif
 #define S_db_notFound 	(M_dbAccess| 1) /*Process Variable Not Found*/
 #define S_db_badDbrtype	(M_dbAccess| 3) /*Illegal Database Request Type*/
diff --git a/src/db/dbBkpt.c b/src/db/dbBkpt.c
index 4d8f13b66..675d0d55c 100644
--- a/src/db/dbBkpt.c
+++ b/src/db/dbBkpt.c
@@ -14,6 +14,9 @@ of this distribution.
 /* Modification Log:
  * -----------------
  *  $Log$
+ *  Revision 1.18  2000/02/26 23:45:22  norume
+ *  Reflect routine name change from threadSuspend() to threadSuspendSelf().
+ *
  *  Revision 1.17  2000/02/25 22:26:38  mrk
  *  more changes for creating dlls
  *
@@ -98,16 +101,16 @@ of this distribution.
 #include "dbAddr.h"
 #include "dbAccess.h"
 #include "dbCommon.h"
-#include "dbScan.h"
-#include "dbLock.h"
 #include "dbFldTypes.h"
 #include "db_field_log.h"
 #include "errMdef.h"
 #include "recSup.h"
-#include "recGbl.h"
 #include "special.h"
-#include "dbTest.h"
 #define epicsExportSharedSymbols
+#include "dbScan.h"
+#include "dbLock.h"
+#include "recGbl.h"
+#include "dbTest.h"
 #include "dbBkpt.h"
 
 /* private routines */
diff --git a/src/db/dbCa.c b/src/db/dbCa.c
index 445317015..c0a417b5f 100644
--- a/src/db/dbCa.c
+++ b/src/db/dbCa.c
@@ -43,14 +43,12 @@ of this distribution.
 #include "errMdef.h"
 #include "epicsPrint.h"
 #include "dbCommon.h"
-#define epicsExportSharedSymbols
-#include "dbCa.h"
+/*following because we cant include dbStaticLib.h*/
+epicsShareFunc void * epicsShareAPI dbCalloc(size_t nobj,size_t size);
 #include "dbCaPvt.h"
-/*Following is because we cant include dbAccess.h*/
-void *dbCalloc(size_t nobj,size_t size);
-/*Following is because dbScan.h causes include for dbAccess.h*/
-void scanOnce(void *precord);
-extern volatile int interruptAccept;
+#define epicsExportSharedSymbols
+#include "dbScan.h"
+#include "dbCa.h"
 
 static ELLLIST caList;	/* Work list for dbCaTask */
 static semMutexId caListSem; /*Mutual exclusions semaphores for caList*/
diff --git a/src/db/dbConvert.c b/src/db/dbConvert.c
index f12fea02b..6b9ba8580 100644
--- a/src/db/dbConvert.c
+++ b/src/db/dbConvert.c
@@ -25,12 +25,13 @@ of this distribution.
 #include "link.h"
 #include "dbAddr.h"
 #include "dbFldTypes.h"
-#include "dbAccess.h"
-#include "dbConvert.h"
 #include "dbStaticLib.h"
 #include "errMdef.h"
 #include "recSup.h"
+#define epicsExportSharedSymbols
+#include "dbAccess.h"
 #include "recGbl.h"
+#include "dbConvert.h"
 
 /* DATABASE ACCESS GET CONVERSION SUPPORT */
 
@@ -4345,7 +4346,7 @@ static long putEnumEnum(
  DBR_LONG,        DBR_ULONG,       DBR_FLOAT,       DBR_DOUBLE,      DBR_ENUM
  ***************************************************************************/
 
-long (*dbGetConvertRoutine[DBF_DEVICE+1][DBR_ENUM+1])() = {
+epicsShareDef long (*dbGetConvertRoutine[DBF_DEVICE+1][DBR_ENUM+1])() = {
 
 /* source is a DBF_STRING		*/
 {getStringString, getStringChar,   getStringUchar,  getStringShort,  getStringUshort,
@@ -4395,7 +4396,7 @@ long (*dbGetConvertRoutine[DBF_DEVICE+1][DBR_ENUM+1])() = {
  DBF_MENU,        DBF_DEVICE
  ***************************************************************************/
 
-long (*dbPutConvertRoutine[DBR_ENUM+1][DBF_DEVICE+1])() = {
+epicsShareDef long (*dbPutConvertRoutine[DBR_ENUM+1][DBF_DEVICE+1])() = {
 /* source is a DBR_STRING		*/
 {putStringString, putStringChar,   putStringUchar,  putStringShort,  putStringUshort,
  putStringLong,   putStringUlong,  putStringFloat,  putStringDouble, putStringEnum,
diff --git a/src/db/dbConvert.h b/src/db/dbConvert.h
index f42b0ec48..2aa897ba0 100644
--- a/src/db/dbConvert.h
+++ b/src/db/dbConvert.h
@@ -1,41 +1,25 @@
 /* dbConvert.h */
-/*
- *      Author:	Marty Kraimer
- *      Date:	13OCT95
- *
- *      Experimental Physics and Industrial Control System (EPICS)
- *
- *      Copyright 1991, the Regents of the University of California,
- *      and the University of Chicago Board of Governors.
- *
- *      This software was produced under  U.S. Government contracts:
- *      (W-7405-ENG-36) at the Los Alamos National Laboratory,
- *      and (W-31-109-ENG-38) at Argonne National Laboratory.
- *
- *      Initial development by:
- *              The Controls and Automation Group (AT-8)
- *              Ground Test Accelerator
- *              Accelerator Technology Division
- *              Los Alamos National Laboratory
- *
- *      Co-developed with
- *              The Controls and Computing Group
- *              Accelerator Systems Division
- *              Advanced Photon Source
- *              Argonne National Laboratory
- *
- * Modification Log:
- * -----------------
- * .01  13OCT95	mrk	Created header file as part of extracting convert from
- *			dbLink
- */
 
+/*****************************************************************
+                          COPYRIGHT NOTIFICATION
+*****************************************************************
 
-#include <dbFldTypes.h>
-extern long (*dbGetConvertRoutine[DBF_DEVICE+1][DBR_ENUM+1])
+(C)  COPYRIGHT 1993 UNIVERSITY OF CHICAGO
+
+This software was developed under a United States Government license
+described on the COPYRIGHT_UniversityOfChicago file included as part
+of this distribution.
+**********************************************************************/
+
+#ifndef INCdbConverth
+#define INCdbConverth
+
+#include "shareLib.h"
+#include "dbFldTypes.h"
+epicsShareExtern long (*dbGetConvertRoutine[DBF_DEVICE+1][DBR_ENUM+1])
     (DBADDR *paddr, void *pbuffer,long nRequest, long no_elements, long offset);
-extern long (*dbPutConvertRoutine[DBR_ENUM+1][DBF_DEVICE+1])
+epicsShareExtern long (*dbPutConvertRoutine[DBR_ENUM+1][DBF_DEVICE+1])
     (DBADDR *paddr, const void *pbuffer,long nRequest, long no_elements,
     long offset);
-extern long (*dbFastGetConvertRoutine[DBF_DEVICE+1][DBR_ENUM+1])();
-extern long (*dbFastPutConvertRoutine[DBR_ENUM+1][DBF_DEVICE+1])();
+
+#endif /*INCdbConverth*/
diff --git a/src/db/dbEvent.c b/src/db/dbEvent.c
index 6b87ca15f..27e24ca99 100644
--- a/src/db/dbEvent.c
+++ b/src/db/dbEvent.c
@@ -35,14 +35,14 @@ of this distribution.
 #include "dbBase.h"
 #include "dbFldTypes.h"
 #include "dbAddr.h"
-#include "dbLock.h"
 #include "link.h"
 #include "tsStamp.h"
 #include "dbCommon.h"
-#include "dbAccess.h"
 #include "caeventmask.h"
 #include "db_field_log.h"
 #define epicsExportSharedSymbols
+#include "dbLock.h"
+#include "dbAccess.h"
 #include "dbEvent.h"
 
 #define EVENTSPERQUE    32
diff --git a/src/db/dbFastLinkConv.c b/src/db/dbFastLinkConv.c
index 4f46bcb56..2126cd5fc 100644
--- a/src/db/dbFastLinkConv.c
+++ b/src/db/dbFastLinkConv.c
@@ -40,17 +40,18 @@
 #include "alarm.h"
 #include "dbBase.h"
 #include "link.h"
-#include "dbAddr.h"
 #include "dbFldTypes.h"
-#include "dbAccess.h"
-#include "dbConvert.h"
+#include "dbAddr.h"
 #include "dbStaticLib.h"
 #include "dbCommon.h"
 #include "dbFldTypes.h"
 #include "errMdef.h"
 #include "recSup.h"
-#include "recGbl.h"
 #include "special.h"
+#define epicsExportSharedSymbols
+#include "dbAccess.h"
+#include "recGbl.h"
+#include "dbConvertFast.h"
  
 
 /*
@@ -1100,7 +1101,7 @@ static long cvt_device_st(
  *  NULL implies the conversion is not supported.
  */
 
-long (*dbFastGetConvertRoutine[DBF_DEVICE+1][DBR_ENUM+1])() = {
+epicsShareDef long (*dbFastGetConvertRoutine[DBF_DEVICE+1][DBR_ENUM+1])() = {
 
  /* Convert DBF_STRING to ... */
 { cvt_st_st, cvt_st_c, cvt_st_uc, cvt_st_s, cvt_st_us, cvt_st_l, cvt_st_ul, cvt_st_f, cvt_st_d, cvt_st_e },
@@ -1150,7 +1151,7 @@ long (*dbFastGetConvertRoutine[DBF_DEVICE+1][DBR_ENUM+1])() = {
  *  NULL implies the conversion is not supported.
  */
 
-long (*dbFastPutConvertRoutine[DBR_ENUM+1][DBF_DEVICE+1])() = {
+epicsShareDef long (*dbFastPutConvertRoutine[DBR_ENUM+1][DBF_DEVICE+1])() = {
 
  /* Convert DBR_STRING to ... */
 { cvt_st_st, cvt_st_c, cvt_st_uc, cvt_st_s, cvt_st_us, cvt_st_l, cvt_st_ul, cvt_st_f, cvt_st_d, cvt_st_e, cvt_st_menu, cvt_st_device},
diff --git a/src/db/dbLock.c b/src/db/dbLock.c
index 70d128241..949b16872 100644
--- a/src/db/dbLock.c
+++ b/src/db/dbLock.c
@@ -76,12 +76,11 @@ since this will delay all other threads.
 #include "dbFldTypes.h"
 #include "link.h"
 #include "dbAddr.h"
-#include "dbAccess.h"
-#include "dbConvert.h"
 #include "dbCommon.h"
 #include "epicsPrint.h"
 #include "errMdef.h"
 #define epicsExportSharedSymbols
+#include "dbAccess.h"
 #include "dbLock.h"
 
 #define STATIC static
diff --git a/src/db/dbNotify.c b/src/db/dbNotify.c
index 5d5450f88..13045fa27 100644
--- a/src/db/dbNotify.c
+++ b/src/db/dbNotify.c
@@ -47,13 +47,13 @@
 #include "dbFldTypes.h"
 #include "link.h"
 #include "dbCommon.h"
+#include "dbAddr.h"
+#define epicsExportSharedSymbols
 #include "dbScan.h"
 #include "dbLock.h"
 #include "callback.h"
-#include "dbAddr.h"
 #include "dbAccess.h"
 #include "recGbl.h"
-#define epicsExportSharedSymbols
 #include "dbNotify.h"
 
 /*NODE structure attached to ppnn field of each record in list*/
diff --git a/src/db/dbScan.c b/src/db/dbScan.c
index 2212fbd8c..b5f4aabbd 100644
--- a/src/db/dbScan.c
+++ b/src/db/dbScan.c
@@ -65,12 +65,12 @@
 #include "dbFldTypes.h"
 #include "link.h"
 #include "devSup.h"
+#include "dbCommon.h"
+#define epicsExportSharedSymbols
 #include "callback.h"
 #include "dbAccess.h"
-#include "dbCommon.h"
 #include "dbLock.h"
 #include "recGbl.h"
-#define epicsExportSharedSymbols
 #include "dbScan.h"
 
 
diff --git a/src/db/dbTest.c b/src/db/dbTest.c
index fd2c9d0fe..65cc15756 100644
--- a/src/db/dbTest.c
+++ b/src/db/dbTest.c
@@ -33,14 +33,14 @@ of this distribution.
 #include "devSup.h"
 #include "drvSup.h"
 #include "dbCommon.h"
+#include "special.h"
+#include "db_field_log.h"
+#define epicsExportSharedSymbols
 #include "dbLock.h"
 #include "dbAccess.h"
 #include "recGbl.h"
-#include "special.h"
-#include "db_field_log.h"
 #include "dbEvent.h"
 #include "callback.h"
-#define epicsExportSharedSymbols
 #include "dbTest.h"
 
 extern struct dbBase *pdbbase;
diff --git a/src/db/recGbl.c b/src/db/recGbl.c
index 24f461fcd..f91a7c540 100644
--- a/src/db/recGbl.c
+++ b/src/db/recGbl.c
@@ -55,18 +55,17 @@
 #include "dbFldTypes.h"
 #include "link.h"
 #include "dbAddr.h"
-#include "dbAccess.h"
 #include "db_field_log.h"
-#include "dbNotify.h"
-#include "dbCa.h"
-#include "dbEvent.h"
 #include "errlog.h"
-#include "dbConvert.h"
-#include "dbScan.h"
 #include "devSup.h"
 #include "dbCommon.h"
 #include "caeventmask.h"
 #define epicsExportSharedSymbols
+#include "dbAccess.h"
+#include "dbNotify.h"
+#include "dbCa.h"
+#include "dbEvent.h"
+#include "dbScan.h"
 #include "recGbl.h"