diff --git a/src/db/cvtBpt.c b/src/db/cvtBpt.c
index 7a0c1d610..77ba67e9f 100644
--- a/src/db/cvtBpt.c
+++ b/src/db/cvtBpt.c
@@ -39,10 +39,10 @@
 #include "ellLib.h"
 #include "dbBase.h"
 #include "dbStaticLib.h"
-#include "dbAccess.h"
 #include "epicsPrint.h"
 
 #define epicsExportSharedSymbols
+#include "dbAccess.h"
 #include "cvtTable.h"
 
 static brkTable *findBrkTable(short linr)
diff --git a/src/db/dbAccess.h b/src/db/dbAccess.h
index 80841b9d4..d4b81c670 100644
--- a/src/db/dbAccess.h
+++ b/src/db/dbAccess.h
@@ -14,13 +14,13 @@ of this distribution.
 #ifndef INCdbAccessh
 #define INCdbAccessh
 
-#include "shareLib.h"
 #include "dbDefs.h"
 #include "tsStamp.h"
-#include "dbBase.h"
+#include "caeventmask.h"
 #include "dbFldTypes.h"
 #include "link.h"
-#include "caeventmask.h"
+#include "dbBase.h"
+#include "shareLib.h"
 #include "dbAddr.h"
 #include "dbLock.h"
 #include "dbAccessDefs.h"
@@ -28,5 +28,4 @@ of this distribution.
 #include "dbCommon.h"
 #include "db_field_log.h"
 
-
 #endif /*INCdbAccessh*/
diff --git a/src/db/dbCa.c b/src/db/dbCa.c
index c2eb4168f..ea4e0ce0a 100644
--- a/src/db/dbCa.c
+++ b/src/db/dbCa.c
@@ -41,8 +41,6 @@ of this distribution.
 #include "epicsPrint.h"
 #include "dbCommon.h"
 #include "cadef.h"
-#include "db_access.h"
-#include "caerr.h"
 /*following because we cant include dbStaticLib.h*/
 epicsShareFunc void * epicsShareAPI dbCalloc(size_t nobj,size_t size);
 #define epicsExportSharedSymbols
diff --git a/src/db/dbConvert.h b/src/db/dbConvert.h
index 2aa897ba0..51e199ca3 100644
--- a/src/db/dbConvert.h
+++ b/src/db/dbConvert.h
@@ -14,8 +14,9 @@ of this distribution.
 #ifndef INCdbConverth
 #define INCdbConverth
 
-#include "shareLib.h"
 #include "dbFldTypes.h"
+#include "shareLib.h"
+
 epicsShareExtern long (*dbGetConvertRoutine[DBF_DEVICE+1][DBR_ENUM+1])
     (DBADDR *paddr, void *pbuffer,long nRequest, long no_elements, long offset);
 epicsShareExtern long (*dbPutConvertRoutine[DBR_ENUM+1][DBF_DEVICE+1])
diff --git a/src/db/dbConvertFast.h b/src/db/dbConvertFast.h
index 18131056c..cceb0affd 100644
--- a/src/db/dbConvertFast.h
+++ b/src/db/dbConvertFast.h
@@ -14,8 +14,8 @@ of this distribution.
 #ifndef INCdbConvertFasth
 #define INCdbConvertFasth
 
-#include "shareLib.h"
 #include "dbFldTypes.h"
+#include "shareLib.h"
 
 epicsShareExtern long (*dbFastGetConvertRoutine[DBF_DEVICE+1][DBR_ENUM+1])();
 epicsShareExtern long (*dbFastPutConvertRoutine[DBR_ENUM+1][DBF_DEVICE+1])();
diff --git a/src/db/db_access_routines.h b/src/db/db_access_routines.h
index 0b0912283..4b12727ca 100644
--- a/src/db/db_access_routines.h
+++ b/src/db/db_access_routines.h
@@ -24,6 +24,7 @@ of this distribution.
 extern "C" {
 #endif
 
+#include "shareLib.h"
 #include "dbAddr.h"
 
 epicsShareExtern struct dbBase *pdbbase;
diff --git a/src/db/db_convert.h b/src/db/db_convert.h
index 0739d6a81..725309670 100644
--- a/src/db/db_convert.h
+++ b/src/db/db_convert.h
@@ -20,6 +20,7 @@ of this distribution.
 extern "C" {
 #endif
 
+#include "shareLib.h"
 #include "dbAddr.h"
 
 epicsShareExtern struct dbBase *pdbbase;
diff --git a/src/db/dbcar.c b/src/db/dbcar.c
index 75d40aeb3..eca82e178 100644
--- a/src/db/dbcar.c
+++ b/src/db/dbcar.c
@@ -41,12 +41,8 @@ of this distribution.
 #include "dbDefs.h"
 #include "epicsPrint.h"
 #include "dbCommon.h"
-#include "shareLib.h"
 #define epicsExportSharedSymbols
 
-/*define DB_TEXT_GLBLSOURCE temporily; ca will do this later */
-#define DB_TEXT_GLBLSOURCE
-
 /*define DB_CONVERT_GBLSOURCE because db_access.c does not include db_access.h*/
 #define DB_CONVERT_GBLSOURCE
 #include "db_access_routines.h"
diff --git a/src/db/recGbl.h b/src/db/recGbl.h
index e92d9e393..925dcc9fa 100644
--- a/src/db/recGbl.h
+++ b/src/db/recGbl.h
@@ -31,7 +31,6 @@
 #ifndef INCrecGblh
 #define INCrecGblh 1
 
-
 #include "shareLib.h"
 
 /*************************************************************************/