diff --git a/src/mb/pv/pvAccessMB.h b/src/mb/pv/pvAccessMB.h
index 693e436..6a09bac 100644
--- a/src/mb/pv/pvAccessMB.h
+++ b/src/mb/pv/pvAccessMB.h
@@ -7,11 +7,6 @@
 #ifndef _PVACCESSMB_H_
 #define _PVACCESSMB_H_
 
-#ifdef epicsExportSharedSymbols
-#   define pvAccessMBEpicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #ifdef WITH_MICROBENCH
 
 #include <pv/mb.h>
@@ -44,12 +39,6 @@
 
 #endif
 
-
-#ifdef pvAccessMBEpicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#	undef pvAccessMBEpicsExportSharedSymbols
-#endif
-
 MB_DECLARE_EXTERN(channelGet);
 
 #endif
diff --git a/src/mb/pvAccessMB.cpp b/src/mb/pvAccessMB.cpp
index b5a8fbc..3b9bf55 100644
--- a/src/mb/pvAccessMB.cpp
+++ b/src/mb/pvAccessMB.cpp
@@ -4,6 +4,10 @@
  * in file LICENSE that is included with this distribution.
  */
 
+#include <pv/mb.h>
+
+#define epicsExportSharedSymbols
+
 #include "pv/pvAccessMB.h"
 
 MB_DECLARE(channelGet, 100000);
diff --git a/src/remote/codec.cpp b/src/remote/codec.cpp
index b62c71c..fb58723 100644
--- a/src/remote/codec.cpp
+++ b/src/remote/codec.cpp
@@ -8,23 +8,33 @@
 #endif
 
 
-#include <epicsThread.h>
-#include <osiSock.h>
-
-#include <sys/types.h>
-#include <sstream>
-#include <stdexcept>
-#include <limits>
-#include <vector>
-#include <string>
 #include <map>
+#include <string>
+#include <vector>
+#include <limits>
+#include <stdexcept>
+#include <sstream>
+#include <sys/types.h>
+
+#include <osiSock.h>
+#include <epicsTime.h>
+#include <epicsThread.h>
+#include <epicsVersion.h>
+
+#include <pv/byteBuffer.h>
+#include <pv/pvType.h>
+#include <pv/lock.h>
+#include <pv/timer.h>
+#include <pv/event.h>
 
 #define epicsExportSharedSymbols
 #include <pv/blockingTCP.h>
 #include <pv/remote.h>
+#include <pv/inetAddressUtil.h>
 #include <pv/namedLockPattern.h>
 #include <pv/hexDump.h>
 #include <pv/logger.h>
+#include <pv/likely.h>
 #include <pv/codec.h>
 #include <pv/serializationHelper.h>
 
diff --git a/src/remote/pv/codec.h b/src/remote/pv/codec.h
index 14d7a8b..3257f7c 100644
--- a/src/remote/pv/codec.h
+++ b/src/remote/pv/codec.h
@@ -11,13 +11,7 @@
 #include <map>
 #include <deque>
 
-#ifdef epicsExportSharedSymbols
-#   define abstractCodecEpicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include <shareLib.h>
-#include <osdSock.h>
 #include <osiSock.h>
 #include <epicsTime.h>
 #include <epicsThread.h>
@@ -37,11 +31,6 @@
 #include <pv/event.h>
 #include <pv/likely.h>
 
-#ifdef abstractCodecEpicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#	undef abstractCodecEpicsExportSharedSymbols
-#endif
-
 #include <pv/pvaConstants.h>
 #include <pv/remote.h>
 #include <pv/security.h>
@@ -50,7 +39,6 @@
 #include <pv/namedLockPattern.h>
 #include <pv/inetAddressUtil.h>
 
-#include <shareLib.h>
 
 namespace epics {
 namespace pvAccess {
diff --git a/src/remote/pv/serializationHelper.h b/src/remote/pv/serializationHelper.h
index 2669990..43ce206 100644
--- a/src/remote/pv/serializationHelper.h
+++ b/src/remote/pv/serializationHelper.h
@@ -8,22 +8,12 @@
 #ifndef SERIALIZATIONHELPER_H_
 #define SERIALIZATIONHELPER_H_
 
-#ifdef epicsExportSharedSymbols
-#   define serializationHelperEpicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include <pv/serialize.h>
 #include <pv/pvData.h>
 #include <pv/noDefaultMethods.h>
 #include <pv/pvIntrospect.h>
 #include <pv/byteBuffer.h>
 
-#ifdef serializationHelperEpicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#	undef serializationHelperEpicsExportSharedSymbols
-#endif
-
 #include <pv/pvaConstants.h>
 #include <pv/pvAccess.h>
 
diff --git a/src/remote/serializationHelper.cpp b/src/remote/serializationHelper.cpp
index 647d56a..94d94f4 100644
--- a/src/remote/serializationHelper.cpp
+++ b/src/remote/serializationHelper.cpp
@@ -4,6 +4,12 @@
  * in file LICENSE that is included with this distribution.
  */
 
+#include <pv/serialize.h>
+#include <pv/pvData.h>
+#include <pv/noDefaultMethods.h>
+#include <pv/pvIntrospect.h>
+#include <pv/byteBuffer.h>
+
 #define epicsExportSharedSymbols
 #include <pv/serializationHelper.h>
 #include <pv/introspectionRegistry.h>
diff --git a/src/server/pv/responseHandlers.h b/src/server/pv/responseHandlers.h
index 44447ed..8fedbad 100644
--- a/src/server/pv/responseHandlers.h
+++ b/src/server/pv/responseHandlers.h
@@ -7,18 +7,8 @@
 #ifndef RESPONSEHANDLERS_H_
 #define RESPONSEHANDLERS_H_
 
-#ifdef epicsExportSharedSymbols
-#   define responseHandlersEpicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include <pv/timer.h>
 
-#ifdef responseHandlersEpicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#	undef responseHandlersEpicsExportSharedSymbols
-#endif
-
 #include <pv/serverContext.h>
 #include <pv/remote.h>
 #include <pv/serverChannelImpl.h>
diff --git a/src/utils/pv/inetAddressUtil.h b/src/utils/pv/inetAddressUtil.h
index 196a14e..33db442 100644
--- a/src/utils/pv/inetAddressUtil.h
+++ b/src/utils/pv/inetAddressUtil.h
@@ -9,23 +9,12 @@
 
 #include <vector>
 
-#ifdef epicsExportSharedSymbols
-#   define inetAddressUtilExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
+#include <osiSock.h>
+#include <shareLib.h>
 
 #include <pv/pvType.h>
 #include <pv/byteBuffer.h>
 
-#include <osiSock.h>
-
-#ifdef inetAddressUtilExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   undef inetAddressUtilExportSharedSymbols
-#endif
-
-#include <shareLib.h>
-
 
 // TODO implement using smart pointers
 
diff --git a/src/utils/pv/logger.h b/src/utils/pv/logger.h
index 66456aa..cfdbdbb 100644
--- a/src/utils/pv/logger.h
+++ b/src/utils/pv/logger.h
@@ -7,18 +7,7 @@
 #ifndef LOGGER_H_
 #define LOGGER_H_
 
-#ifdef epicsExportSharedSymbols
-#   define loggerEpicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
-#include <pv/pvType.h>
-#include <errlog.h>
-
-#ifdef loggerEpicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#undef loggerEpicsExportSharedSymbols
-#endif
+#include <string>
 
 #include <shareLib.h>