diff --git a/src/client/pv/pvAccess.h b/src/client/pv/pvAccess.h
index 54d10e4..5e09e4d 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/destroyable.h>
 #include <pv/monitor.h>
 #include <pv/bitSet.h>
 
@@ -28,6 +27,7 @@
 #endif
 
 #include <pv/pvaVersion.h>
+#include <pv/destroyable.h>
 
 #include <shareLib.h>
 
diff --git a/src/server/pv/baseChannelRequester.h b/src/server/pv/baseChannelRequester.h
index 1287b7e..144acfa 100644
--- a/src/server/pv/baseChannelRequester.h
+++ b/src/server/pv/baseChannelRequester.h
@@ -13,13 +13,12 @@
 #endif
 
 #include <pv/requester.h>
-#include <pv/destroyable.h>
-
 #ifdef baseChannelRequesterEpicsExportSharedSymbols
 #   define epicsExportSharedSymbols
 #	undef baseChannelRequesterEpicsExportSharedSymbols
 #endif
 
+#include <pv/destroyable.h>
 #include <pv/serverContextImpl.h>
 #include <pv/serverChannelImpl.h>