diff --git a/src/ca/caProvider.cpp b/src/ca/caProvider.cpp
index a515e04..0ec6d3c 100644
--- a/src/ca/caProvider.cpp
+++ b/src/ca/caProvider.cpp
@@ -10,10 +10,8 @@
 #include <cadef.h>
 #include <epicsSignal.h>
 
-#include <pv/logger.h>
-
 #define epicsExportSharedSymbols
-
+#include <pv/logger.h>
 #include <pv/caProvider.h>
 #include <pv/caChannel.h>
 
diff --git a/src/pva/clientFactory.cpp b/src/pva/clientFactory.cpp
index 2e8cec8..9075e70 100644
--- a/src/pva/clientFactory.cpp
+++ b/src/pva/clientFactory.cpp
@@ -4,12 +4,14 @@
  * in file LICENSE that is included with this distribution.
  */
 
-#include <pv/lock.h>
-#include <pv/logger.h>
+#include <string>
 
 #include <epicsSignal.h>
 
+#include <pv/lock.h>
+
 #define epicsExportSharedSymbols
+#include <pv/logger.h>
 #include <pv/clientFactory.h>
 #include <pv/clientContextImpl.h>
 
diff --git a/src/remote/pv/channelSearchManager.h b/src/remote/pv/channelSearchManager.h
index 0544d9e..18bb5de 100644
--- a/src/remote/pv/channelSearchManager.h
+++ b/src/remote/pv/channelSearchManager.h
@@ -14,13 +14,13 @@
 
 #include <osiSock.h>
 
-#include <pv/remote.h>
-
 #ifdef channelSearchManagerEpicsExportSharedSymbols
 #   define epicsExportSharedSymbols
 #	undef channelSearchManagerEpicsExportSharedSymbols
 #endif
 
+#include <pv/remote.h>
+
 namespace epics {
 namespace pvAccess {
 
diff --git a/src/remote/pv/transportRegistry.h b/src/remote/pv/transportRegistry.h
index 128006f..652597e 100644
--- a/src/remote/pv/transportRegistry.h
+++ b/src/remote/pv/transportRegistry.h
@@ -21,8 +21,6 @@
 #include <pv/lock.h>
 #include <pv/pvType.h>
 #include <pv/epicsException.h>
-#include <pv/remote.h>
-#include <pv/inetAddressUtil.h>
 #include <pv/sharedPtr.h>
 
 #ifdef transportRegistryEpicsExportSharedSymbols
@@ -30,6 +28,9 @@
 #	undef transportRegistryEpicsExportSharedSymbols
 #endif
 
+#include <pv/remote.h>
+#include <pv/inetAddressUtil.h>
+
 namespace epics {
 namespace pvAccess {