diff --git a/src/special/addRecordRegister.cpp b/src/special/addRecordRegister.cpp
index 4dee555..4a14fa3 100644
--- a/src/special/addRecordRegister.cpp
+++ b/src/special/addRecordRegister.cpp
@@ -18,12 +18,12 @@
 #include <pv/pvData.h>
 #include <pv/pvTimeStamp.h>
 #include <pv/rpcService.h>
+#include "pv/pvStructureCopy.h"
+#include "pv/pvDatabase.h"
 
 // The following must be the last include for code pvDatabase uses
 #include <epicsExport.h>
 #define epicsExportSharedSymbols
-#include "pv/pvStructureCopy.h"
-#include "pv/pvDatabase.h"
 #include "pv/addRecord.h"
 
 using namespace epics::pvData;
diff --git a/src/special/processRecordRegister.cpp b/src/special/processRecordRegister.cpp
index 985f476..137c9b7 100644
--- a/src/special/processRecordRegister.cpp
+++ b/src/special/processRecordRegister.cpp
@@ -19,12 +19,12 @@
 #include <pv/pvData.h>
 #include <pv/pvTimeStamp.h>
 #include <pv/rpcService.h>
+#include "pv/pvStructureCopy.h"
+#include "pv/pvDatabase.h"
 
 // The following must be the last include for code pvDatabase uses
 #include <epicsExport.h>
 #define epicsExportSharedSymbols
-#include "pv/pvStructureCopy.h"
-#include "pv/pvDatabase.h"
 #include "pv/processRecord.h"
 
 
diff --git a/src/special/removeRecordRegister.cpp b/src/special/removeRecordRegister.cpp
index 4976c3e..efba5fb 100644
--- a/src/special/removeRecordRegister.cpp
+++ b/src/special/removeRecordRegister.cpp
@@ -18,12 +18,12 @@
 #include <pv/pvData.h>
 #include <pv/pvTimeStamp.h>
 #include <pv/rpcService.h>
+#include "pv/pvStructureCopy.h"
+#include "pv/pvDatabase.h"
 
 // The following must be the last include for code pvDatabase uses
 #include <epicsExport.h>
 #define epicsExportSharedSymbols
-#include "pv/pvStructureCopy.h"
-#include "pv/pvDatabase.h"
 #include "pv/removeRecord.h"
 
 using namespace epics::pvData;
diff --git a/src/special/traceRecordRegister.cpp b/src/special/traceRecordRegister.cpp
index 3c60400..3f56f01 100644
--- a/src/special/traceRecordRegister.cpp
+++ b/src/special/traceRecordRegister.cpp
@@ -19,12 +19,12 @@
 #include <pv/pvData.h>
 #include <pv/pvTimeStamp.h>
 #include <pv/rpcService.h>
+#include "pv/pvStructureCopy.h"
+#include "pv/pvDatabase.h"
 
 // The following must be the last include for code pvDatabase uses
 #include <epicsExport.h>
 #define epicsExportSharedSymbols
-#include "pv/pvStructureCopy.h"
-#include "pv/pvDatabase.h"
 #include "pv/traceRecord.h"
 
 using namespace epics::pvData;