diff --git a/src/client/pv/monitor.h b/src/client/pv/monitor.h
index 5fb70a6..394707f 100644
--- a/src/client/pv/monitor.h
+++ b/src/client/pv/monitor.h
@@ -9,13 +9,24 @@
 #ifndef MONITOR_H
 #define MONITOR_H
 
+#ifdef epicsExportSharedSymbols
+#   define monitorEpicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
+#endif
+
 #include <pv/status.h>
-#include <pv/destroyable.h>
 #include <pv/pvData.h>
 #include <pv/sharedPtr.h>
 #include <pv/bitSet.h>
 #include <pv/requester.h>
 
+#ifdef monitorEpicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#	undef monitorEpicsExportSharedSymbols
+#endif
+
+#include <pv/destroyable.h>
+
 #include <shareLib.h>
 
 namespace epics { namespace pvAccess {
diff --git a/src/client/pv/pvAccess.h b/src/client/pv/pvAccess.h
index 5e09e4d..25970c3 100644
--- a/src/client/pv/pvAccess.h
+++ b/src/client/pv/pvAccess.h
@@ -18,7 +18,6 @@
 #include <pv/pvData.h>
 #include <pv/createRequest.h>
 #include <pv/status.h>
-#include <pv/monitor.h>
 #include <pv/bitSet.h>
 
 #ifdef pvAccessEpicsExportSharedSymbols
@@ -28,6 +27,7 @@
 
 #include <pv/pvaVersion.h>
 #include <pv/destroyable.h>
+#include <pv/monitor.h>
 
 #include <shareLib.h>
 
diff --git a/src/server/pv/serverChannelImpl.h b/src/server/pv/serverChannelImpl.h
index afe9a19..eac44c0 100644
--- a/src/server/pv/serverChannelImpl.h
+++ b/src/server/pv/serverChannelImpl.h
@@ -7,18 +7,7 @@
 #ifndef SERVERCHANNEL_H_
 #define SERVERCHANNEL_H_
 
-#ifdef epicsExportSharedSymbols
-#   define serverChannelImplEpicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include <pv/destroyable.h>
-
-#ifdef serverChannelImplEpicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#	undef serverChannelImplEpicsExportSharedSymbols
-#endif
-
 #include <pv/remote.h>
 #include <pv/clientContextImpl.h>
 #include <pv/security.h>