diff --git a/src/pvAccess/channelProviderLocal.cpp b/src/pvAccess/channelProviderLocal.cpp
index ebe9cf1..7799493 100644
--- a/src/pvAccess/channelProviderLocal.cpp
+++ b/src/pvAccess/channelProviderLocal.cpp
@@ -10,7 +10,6 @@
  */
 
 #include <epicsThread.h>
-#include <epicsExport.h>
 #include <pv/serverContext.h>
 #include <pv/syncChannelFind.h>
 #include <pv/pvTimeStamp.h>
diff --git a/src/pvAccess/registerChannelProviderLocal.cpp b/src/pvAccess/registerChannelProviderLocal.cpp
index 8ab0d43..4a12c42 100644
--- a/src/pvAccess/registerChannelProviderLocal.cpp
+++ b/src/pvAccess/registerChannelProviderLocal.cpp
@@ -11,12 +11,12 @@
 
 /* Author: Marty Kraimer */
 
-#include <epicsExport.h>
 #include <iocsh.h>
 #include <pv/pvAccess.h>
 #include <pv/serverContext.h>
 
-
+// The following must be the last include for code pvDatabase uses
+#include <epicsExport.h>
 #define epicsExportSharedSymbols
 #include "pv/pvDatabase.h"
 #include "pv/channelProviderLocal.h"
diff --git a/src/special/processRecordRegister.cpp b/src/special/processRecordRegister.cpp
index ed34350..5fb38ea 100644
--- a/src/special/processRecordRegister.cpp
+++ b/src/special/processRecordRegister.cpp
@@ -11,7 +11,6 @@
 
 /* Author: Marty Kraimer */
 
-#include <epicsExport.h>
 #include <epicsThread.h>
 #include <iocsh.h>
 #include <pv/event.h>
@@ -21,6 +20,8 @@
 #include <pv/pvTimeStamp.h>
 #include <pv/rpcService.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"
diff --git a/src/special/removeRecordRegister.cpp b/src/special/removeRecordRegister.cpp
index bfc443b..c55f34a 100644
--- a/src/special/removeRecordRegister.cpp
+++ b/src/special/removeRecordRegister.cpp
@@ -10,7 +10,6 @@
 
 
 /* Author: Marty Kraimer */
-#include <epicsExport.h>
 #include <epicsThread.h>
 #include <iocsh.h>
 #include <pv/event.h>
@@ -20,6 +19,8 @@
 #include <pv/pvTimeStamp.h>
 #include <pv/rpcService.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"
diff --git a/src/special/traceRecordRegister.cpp b/src/special/traceRecordRegister.cpp
index 64bdacb..57d20f4 100644
--- a/src/special/traceRecordRegister.cpp
+++ b/src/special/traceRecordRegister.cpp
@@ -11,7 +11,6 @@
 
 /* Author: Marty Kraimer */
 
-#include <epicsExport.h>
 #include <epicsThread.h>
 #include <iocsh.h>
 #include <pv/event.h>
@@ -21,6 +20,8 @@
 #include <pv/pvTimeStamp.h>
 #include <pv/rpcService.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"