diff --git a/src/as/asCa.c b/src/as/asCa.c
index 725ce1f79..61fea16f3 100644
--- a/src/as/asCa.c
+++ b/src/as/asCa.c
@@ -39,7 +39,7 @@ of this distribution.
 #define epicsExportSharedSymbols
 
 int asCaDebug = 0;
-epicsShareExtern ASBASE volatile *pasbase;
+epicsShareDef ASBASE volatile *pasbase;
 LOCAL int firstTime = TRUE;
 LOCAL threadId threadid=0;
 LOCAL int caInitializing=FALSE;
diff --git a/src/as/asDbLib.c b/src/as/asDbLib.c
index 5a8c91f65..9b834afee 100644
--- a/src/as/asDbLib.c
+++ b/src/as/asDbLib.c
@@ -38,8 +38,6 @@ of this distribution.
 #include "dbCommon.h"
 #include "recSup.h"
 
-extern struct dbBase *pdbbase;
-
 static char	*pacf=NULL;
 static char	*psubstitutions=NULL;
 static threadId	asInitTheadId=0;
diff --git a/src/as/asLibRoutines.c b/src/as/asLibRoutines.c
index 671b8fef5..d210b7f6a 100644
--- a/src/as/asLibRoutines.c
+++ b/src/as/asLibRoutines.c
@@ -40,7 +40,6 @@ static semMutexId asLock;
 #define UNLOCK semMutexGive(asLock)
 
 #define epicsExportSharedSymbols
-#include "shareLib.h"
 #include "asLib.h"
 
 static int          asLockInit=TRUE;
diff --git a/src/bpt/cvtBpt.c b/src/bpt/cvtBpt.c
index af16b7531..a305c53ae 100644
--- a/src/bpt/cvtBpt.c
+++ b/src/bpt/cvtBpt.c
@@ -42,7 +42,6 @@
 #include "epicsPrint.h"
 
 #define epicsExportSharedSymbols
-#include <shareLib.h>
 #include "cvtTable.h"
 
 epicsShareExtern struct dbBase *pdbbase;
@@ -66,7 +65,7 @@ static brkTable *findBrkTable(short linr)
     return(dbFindBrkTable(pdbbase,pdbMenu->papChoiceValue[linr]));
 }
 
-epicsShareFunc long epicsShareAPI cvtRawToEngBpt(double *pval,short linr,short init, void **ppbrk,
+long epicsShareAPI cvtRawToEngBpt(double *pval,short linr,short init, void **ppbrk,
 	short *plbrk)
 { 
     double	val=*pval;
@@ -116,7 +115,7 @@ epicsShareFunc long epicsShareAPI cvtRawToEngBpt(double *pval,short linr,short i
     return(status);
 }
 
-epicsShareFunc long epicsShareAPI cvtEngToRawBpt(double *pval,short linr,short init,
+long epicsShareAPI cvtEngToRawBpt(double *pval,short linr,short init,
 	 void **ppbrk,short *plbrk)
 { 
      double	val=*pval;
diff --git a/src/bpt/cvtTable.h b/src/bpt/cvtTable.h
index c45c8e923..e29807679 100644
--- a/src/bpt/cvtTable.h
+++ b/src/bpt/cvtTable.h
@@ -35,11 +35,13 @@
 #ifndef INCcvtTableh
 #define INCcvtTableh	1
 
-/* Global Routines*/
-epicsShareFunc long epicsShareAPI cvtEngToRawBpt(double *pval,short linr,short init,
-     void **ppbrk,short *plbrk);
+#include "shareLib.h"
 
-epicsShareFunc long epicsShareAPI cvtRawToEngBpt(double *pval,short linr,short init,
-     void **ppbrk, short *plbrk);
+/* Global Routines*/
+epicsShareFunc long epicsShareAPI cvtEngToRawBpt(
+    double *pval,short linr,short init,void **ppbrk,short *plbrk);
+
+epicsShareFunc long epicsShareAPI cvtRawToEngBpt(
+    double *pval,short linr,short init,void **ppbrk, short *plbrk);
 
 #endif
diff --git a/src/db/callback.c b/src/db/callback.c
index ea8f42460..bc547a511 100644
--- a/src/db/callback.c
+++ b/src/db/callback.c
@@ -23,7 +23,13 @@ of this distribution.
 #include "osiInterrupt.h"
 #include "osiTimer.h"
 #include "osiRing.h"
+#include "tsStamp.h"
 #include "errlog.h"
+#include "dbStaticLib.h"
+#include "dbBase.h"
+#include "link.h"
+#include "dbAddr.h"
+#include "dbFldTypes.h"
 #include "dbAccess.h"
 #include "recSup.h"
 #include "taskwd.h"
diff --git a/src/db/dbAccess.c b/src/db/dbAccess.c
index 075595b17..73fd3626a 100644
--- a/src/db/dbAccess.c
+++ b/src/db/dbAccess.c
@@ -54,18 +54,19 @@ of this distribution.
 #include "alarm.h"
 #include "ellLib.h"
 #include "dbStaticLib.h"
+#include "dbBase.h"
 #include "link.h"
+#include "dbAddr.h"
+#include "dbFldTypes.h"
 #include "recSup.h"
 #include "caeventmask.h"
-#include "dbScan.h"
+#include "db_field_log.h"
 #include "dbCommon.h"
+#include "dbScan.h"
 #include "dbLock.h"
 #include "callback.h"
-#include "dbAddr.h"
-#include "dbBase.h"
 #include "dbFldTypes.h"
 #include "dbEvent.h"
-#include "db_field_log.h"
 #include "errMdef.h"
 #include "recGbl.h"
 #include "special.h"
diff --git a/src/db/dbBkpt.c b/src/db/dbBkpt.c
index 891dbdec5..94dced534 100644
--- a/src/db/dbBkpt.c
+++ b/src/db/dbBkpt.c
@@ -14,6 +14,9 @@ of this distribution.
 /* Modification Log:
  * -----------------
  *  $Log$
+ *  Revision 1.16  2000/02/25 22:01:24  mrk
+ *  changes for creating DLLs
+ *
  *  Revision 1.15  2000/02/08 20:14:59  norume
  *  Remove task argument to threadSuspend().
  *
@@ -87,9 +90,12 @@ of this distribution.
 #include "errlog.h"
 #include "alarm.h"
 #include "dbBase.h"
+#include "dbFldTypes.h"
+#include "link.h"
+#include "dbAddr.h"
 #include "dbAccess.h"
-#include "dbScan.h"
 #include "dbCommon.h"
+#include "dbScan.h"
 #include "dbLock.h"
 #include "dbFldTypes.h"
 #include "db_field_log.h"
diff --git a/src/db/dbConvert.c b/src/db/dbConvert.c
index b7a9ad8c0..f12fea02b 100644
--- a/src/db/dbConvert.c
+++ b/src/db/dbConvert.c
@@ -20,11 +20,14 @@ of this distribution.
 #include "dbDefs.h"
 #include "errlog.h"
 #include "cvtFast.h"
+#include "tsStamp.h"
 #include "dbBase.h"
+#include "link.h"
+#include "dbAddr.h"
+#include "dbFldTypes.h"
 #include "dbAccess.h"
 #include "dbConvert.h"
 #include "dbStaticLib.h"
-#include "dbFldTypes.h"
 #include "errMdef.h"
 #include "recSup.h"
 #include "recGbl.h"
diff --git a/src/db/dbEvent.h b/src/db/dbEvent.h
index fe7fa9813..4e7498946 100644
--- a/src/db/dbEvent.h
+++ b/src/db/dbEvent.h
@@ -46,7 +46,7 @@ typedef void OVRFFUNC (void *overflow_arg, unsigned count);
 typedef void EXTRALABORFUNC (void *extralabor_arg);
 epicsShareFunc dbEventCtx epicsShareAPI db_init_events (void);
 epicsShareFunc int epicsShareAPI db_start_events (
-    dbEventCtx ctx, char *taskname, int (*init_func)(threadId), 
+    dbEventCtx ctx, char *taskname, int (*init_func)(void *), 
     void *init_func_arg, int priority_offset);
 epicsShareFunc void epicsShareAPI db_close_events (dbEventCtx ctx);
 epicsShareFunc void epicsShareAPI db_event_flow_ctrl_mode_on (dbEventCtx ctx);
diff --git a/src/db/dbFastLinkConv.c b/src/db/dbFastLinkConv.c
index 556df0d08..4f46bcb56 100644
--- a/src/db/dbFastLinkConv.c
+++ b/src/db/dbFastLinkConv.c
@@ -36,8 +36,12 @@
 #include "dbDefs.h"
 #include "errlog.h"
 #include "cvtFast.h"
+#include "tsStamp.h"
 #include "alarm.h"
 #include "dbBase.h"
+#include "link.h"
+#include "dbAddr.h"
+#include "dbFldTypes.h"
 #include "dbAccess.h"
 #include "dbConvert.h"
 #include "dbStaticLib.h"
diff --git a/src/db/dbLock.c b/src/db/dbLock.c
index 4931f45ac..f02942b69 100644
--- a/src/db/dbLock.c
+++ b/src/db/dbLock.c
@@ -71,12 +71,15 @@ since this will delay all other threads.
 #include "osiThread.h"
 #include "cantProceed.h"
 #include "ellLib.h"
-#include "dbAccess.h"
+#include "dbBase.h"
 #include "dbStaticLib.h"
+#include "dbFldTypes.h"
+#include "link.h"
+#include "dbAddr.h"
+#include "dbAccess.h"
 #include "dbConvert.h"
 #include "dbCommon.h"
 #include "epicsPrint.h"
-#include "dbFldTypes.h"
 #include "errMdef.h"
 #define epicsExportSharedSymbols
 #include "dbLock.h"
diff --git a/src/db/dbNotify.c b/src/db/dbNotify.c
index 49677d705..7fc0c9ac7 100644
--- a/src/db/dbNotify.c
+++ b/src/db/dbNotify.c
@@ -46,8 +46,8 @@
 #include "dbStaticLib.h"
 #include "dbFldTypes.h"
 #include "link.h"
-#include "dbScan.h"
 #include "dbCommon.h"
+#include "dbScan.h"
 #include "dbLock.h"
 #include "callback.h"
 #include "dbAddr.h"
diff --git a/src/db/dbTest.c b/src/db/dbTest.c
index dc56e967a..fd2c9d0fe 100644
--- a/src/db/dbTest.c
+++ b/src/db/dbTest.c
@@ -22,18 +22,23 @@ of this distribution.
 #include "errlog.h"
 #include "ellLib.h"
 #include "osiSem.h"
-#include "dbAccess.h"
+#include "tsStamp.h"
+#include "ellLib.h"
 #include "dbBase.h"
-#include "dbCommon.h"
-#include "dbLock.h"
+#include "dbStaticLib.h"
+#include "link.h"
+#include "dbAddr.h"
+#include "dbFldTypes.h"
 #include "recSup.h"
 #include "devSup.h"
 #include "drvSup.h"
+#include "dbCommon.h"
+#include "dbLock.h"
+#include "dbAccess.h"
 #include "recGbl.h"
 #include "special.h"
-#include "dbStaticLib.h"
+#include "db_field_log.h"
 #include "dbEvent.h"
-#include "ellLib.h"
 #include "callback.h"
 #define epicsExportSharedSymbols
 #include "dbTest.h"
diff --git a/src/db/db_access.c b/src/db/db_access.c
index 7b35705a3..5087c1e7d 100644
--- a/src/db/db_access.c
+++ b/src/db/db_access.c
@@ -45,20 +45,24 @@
  ***	the presumed order in dbAccess.c's dbGetField() routine
  ***/
 
-#include        <stddef.h>
-#include        <stdlib.h>
-#include        <stdarg.h>
-#include        <string.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
 
-#include        "dbDefs.h"
-#include        "errlog.h"
-#include        "dbStaticLib.h"
-#include        "dbAccess.h"
-#include        "dbCommon.h"
-#include        "errMdef.h"
-#include        "recSup.h"
+#include "dbDefs.h"
+#include "errlog.h"
+#include "ellLib.h"
+#include "tsStamp.h"
+#include "dbStaticLib.h"
+#include "dbBase.h"
+#include "dbAddr.h"
+#include "dbAccess.h"
+#include "dbCommon.h"
+#include "errMdef.h"
+#include "recSup.h"
 
-#include	"alarm.h"
+#include "alarm.h"
 
 extern struct dbBase *pdbbase;
 
diff --git a/src/db/iocInit.c b/src/db/iocInit.c
index d68735cff..af0de2173 100644
--- a/src/db/iocInit.c
+++ b/src/db/iocInit.c
@@ -55,16 +55,22 @@ of this distribution.
 #include "osiThread.h"
 #include "osiSem.h"
 #include "epicsPrint.h"
+#include "tsStamp.h"
 #include "ellLib.h"
 #include "dbDefs.h"
 #include "dbBase.h"
+#include "caeventmask.h"
+#include "dbAddr.h"
+#include "dbFldTypes.h"
+#include "link.h"
+#include "dbLock.h"
 #include "dbAccess.h"
+#include "dbCa.h"
 #include "dbScan.h"
 #include "taskwd.h"
 #include "callback.h"
 #include "dbCommon.h"
 #include "dbLock.h"
-#include "dbFldTypes.h"
 #include "devSup.h"
 #include "drvSup.h"
 #include "registryRecordType.h"