diff --git a/src/special/addRecord.cpp b/src/special/addRecord.cpp
index 7e4fa0b..698c8d4 100644
--- a/src/special/addRecord.cpp
+++ b/src/special/addRecord.cpp
@@ -25,10 +25,10 @@
 #include <pv/pvAccess.h>
 #include <pv/status.h>
 #include <pv/serverContext.h>
-#include "pv/pvStructureCopy.h"
-#include "pv/pvDatabase.h"
 
 #define epicsExportSharedSymbols
+#include "pv/pvStructureCopy.h"
+#include "pv/pvDatabase.h"
 #include "pv/addRecord.h"
 
 using std::tr1::static_pointer_cast;
diff --git a/src/special/addRecordRegister.cpp b/src/special/addRecordRegister.cpp
index 03fa2c4..3306044 100644
--- a/src/special/addRecordRegister.cpp
+++ b/src/special/addRecordRegister.cpp
@@ -17,11 +17,11 @@
 #include <pv/pvTimeStamp.h>
 #include <pv/alarm.h>
 #include <pv/pvAlarm.h>
-#include <pv/pvDatabase.h>
 
 // The following must be the last include for code pvDatabase uses
 #include <epicsExport.h>
 #define epicsExportSharedSymbols
+#include "pv/pvDatabase.h"
 #include "pv/addRecord.h"
 
 using namespace epics::pvData;
diff --git a/src/special/processRecord.cpp b/src/special/processRecord.cpp
index 936b20e..c93ea3f 100644
--- a/src/special/processRecord.cpp
+++ b/src/special/processRecord.cpp
@@ -27,10 +27,10 @@
 #include <pv/pvAccess.h>
 #include <pv/status.h>
 #include <pv/serverContext.h>
-#include "pv/pvStructureCopy.h"
-#include "pv/pvDatabase.h"
 
 #define epicsExportSharedSymbols
+#include "pv/pvStructureCopy.h"
+#include "pv/pvDatabase.h"
 #include "pv/processRecord.h"
 
 using std::tr1::static_pointer_cast;
diff --git a/src/special/processRecordRegister.cpp b/src/special/processRecordRegister.cpp
index bebc999..d69cda3 100644
--- a/src/special/processRecordRegister.cpp
+++ b/src/special/processRecordRegister.cpp
@@ -17,11 +17,11 @@
 #include <pv/pvTimeStamp.h>
 #include <pv/alarm.h>
 #include <pv/pvAlarm.h>
-#include <pv/pvDatabase.h>
 
 // The following must be the last include for code pvDatabase uses
 #include <epicsExport.h>
 #define epicsExportSharedSymbols
+#include "pv/pvDatabase.h"
 #include "pv/processRecord.h"
 
 
diff --git a/src/special/pvdbcrAddRecordRegister.cpp b/src/special/pvdbcrAddRecordRegister.cpp
index e1cd121..5a8878c 100644
--- a/src/special/pvdbcrAddRecordRegister.cpp
+++ b/src/special/pvdbcrAddRecordRegister.cpp
@@ -14,12 +14,11 @@
 #include <pv/pvTimeStamp.h>
 #include <pv/alarm.h>
 #include <pv/pvAlarm.h>
-#include <pv/pvDatabase.h>
 
 // The following must be the last include for code exampleLink uses
 #include <epicsExport.h>
 #define epicsExportSharedSymbols
-
+#include "pv/pvDatabase.h"
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;
 using namespace epics::pvAccess;
diff --git a/src/special/pvdbcrProcessRecordRegister.cpp b/src/special/pvdbcrProcessRecordRegister.cpp
index e7f1c38..9252fe2 100644
--- a/src/special/pvdbcrProcessRecordRegister.cpp
+++ b/src/special/pvdbcrProcessRecordRegister.cpp
@@ -8,6 +8,7 @@
  * @date 2021.03.12
  */
 #include <epicsThread.h>
+#include <epicsGuard.h>
 #include <pv/event.h>
 #include <pv/lock.h>
 #include <iocsh.h>
@@ -17,12 +18,10 @@
 #include <pv/pvTimeStamp.h>
 #include <pv/alarm.h>
 #include <pv/pvAlarm.h>
-#include <pv/pvDatabase.h>
 
-// The following must be the last include for code exampleLink uses
 #include <epicsExport.h>
 #define epicsExportSharedSymbols
-
+#include "pv/pvDatabase.h"
 using namespace epics::pvData;
 using namespace epics::pvAccess;
 using namespace epics::pvDatabase;
diff --git a/src/special/pvdbcrRemoveRecordRegister.cpp b/src/special/pvdbcrRemoveRecordRegister.cpp
index 6fb00ec..60ba8ac 100644
--- a/src/special/pvdbcrRemoveRecordRegister.cpp
+++ b/src/special/pvdbcrRemoveRecordRegister.cpp
@@ -14,12 +14,10 @@
 #include <pv/pvTimeStamp.h>
 #include <pv/alarm.h>
 #include <pv/pvAlarm.h>
-#include <pv/pvDatabase.h>
 
-// The following must be the last include for code exampleLink uses
 #include <epicsExport.h>
 #define epicsExportSharedSymbols
-
+#include "pv/pvDatabase.h"
 using namespace epics::pvData;
 using namespace epics::pvAccess;
 using namespace epics::pvDatabase;
diff --git a/src/special/pvdbcrScalarArrayRegister.cpp b/src/special/pvdbcrScalarArrayRegister.cpp
index 5e0a3da..d384486 100644
--- a/src/special/pvdbcrScalarArrayRegister.cpp
+++ b/src/special/pvdbcrScalarArrayRegister.cpp
@@ -12,11 +12,11 @@
 /* Author: Marty Kraimer */
 #include <iocsh.h>
 #include <pv/standardField.h>
-#include <pv/pvDatabase.h>
-// The following must be the last include for code exampleLink uses
+
+// The following must be the last include for code pvDatabase implements
 #include <epicsExport.h>
 #define epicsExportSharedSymbols
-
+#include "pv/pvDatabase.h"
 using namespace epics::pvData;
 using namespace epics::pvDatabase;
 using namespace std;
diff --git a/src/special/pvdbcrScalarRegister.cpp b/src/special/pvdbcrScalarRegister.cpp
index c6688cc..2230b30 100644
--- a/src/special/pvdbcrScalarRegister.cpp
+++ b/src/special/pvdbcrScalarRegister.cpp
@@ -9,11 +9,10 @@
  */
 #include <iocsh.h>
 #include <pv/standardField.h>
-#include <pv/pvDatabase.h>
-// The following must be the last include for code exampleLink uses
+// The following must be the last include for code pvDatabase implements
 #include <epicsExport.h>
 #define epicsExportSharedSymbols
-
+#include "pv/pvDatabase.h"
 using namespace epics::pvData;
 using namespace epics::pvDatabase;
 using namespace std;
diff --git a/src/special/pvdbcrTraceRecordRegister.cpp b/src/special/pvdbcrTraceRecordRegister.cpp
index 8d06762..d6f2b28 100644
--- a/src/special/pvdbcrTraceRecordRegister.cpp
+++ b/src/special/pvdbcrTraceRecordRegister.cpp
@@ -14,11 +14,11 @@
 #include <pv/pvTimeStamp.h>
 #include <pv/alarm.h>
 #include <pv/pvAlarm.h>
-#include <pv/pvDatabase.h>
 
-// The following must be the last include for code exampleLink uses
+// The following must be the last include
 #include <epicsExport.h>
 #define epicsExportSharedSymbols
+#include "pv/pvDatabase.h"
 
 using namespace epics::pvData;
 using namespace epics::pvAccess;
diff --git a/src/special/removeRecord.cpp b/src/special/removeRecord.cpp
index c0e12a7..6bfc975 100644
--- a/src/special/removeRecord.cpp
+++ b/src/special/removeRecord.cpp
@@ -24,10 +24,10 @@
 #include <pv/pvAccess.h>
 #include <pv/status.h>
 #include <pv/serverContext.h>
-#include "pv/pvStructureCopy.h"
-#include "pv/pvDatabase.h"
 
 #define epicsExportSharedSymbols
+#include "pv/pvStructureCopy.h"
+#include "pv/pvDatabase.h"
 #include "pv/removeRecord.h"
 
 using std::tr1::static_pointer_cast;
diff --git a/src/special/removeRecordRegister.cpp b/src/special/removeRecordRegister.cpp
index 418a9a3..280ee17 100644
--- a/src/special/removeRecordRegister.cpp
+++ b/src/special/removeRecordRegister.cpp
@@ -18,11 +18,11 @@
 #include <pv/pvTimeStamp.h>
 #include <pv/alarm.h>
 #include <pv/pvAlarm.h>
-#include <pv/pvDatabase.h>
 
 // The following must be the last include for code pvDatabase uses
 #include <epicsExport.h>
 #define epicsExportSharedSymbols
+#include "pv/pvDatabase.h"
 #include "pv/removeRecord.h"
 
 using namespace epics::pvData;
diff --git a/src/special/traceRecord.cpp b/src/special/traceRecord.cpp
index ba079e0..1a32bcb 100644
--- a/src/special/traceRecord.cpp
+++ b/src/special/traceRecord.cpp
@@ -24,10 +24,10 @@
 #include <pv/pvAccess.h>
 #include <pv/status.h>
 #include <pv/serverContext.h>
-#include "pv/pvStructureCopy.h"
-#include "pv/channelProviderLocal.h"
 
 #define epicsExportSharedSymbols
+#include "pv/pvStructureCopy.h"
+#include "pv/channelProviderLocal.h"
 #include "pv/traceRecord.h"
 
 using std::tr1::static_pointer_cast;