diff --git a/pvDataApp/factory/StandardField.cpp b/pvDataApp/factory/StandardField.cpp
index 0543b54..90a2ae7 100644
--- a/pvDataApp/factory/StandardField.cpp
+++ b/pvDataApp/factory/StandardField.cpp
@@ -10,8 +10,6 @@
 #include <string>
 #include <cstdio>
 #include <stdexcept>
-#include <epicsThread.h>
-#include <epicsExit.h>
 
 #define epicsExportSharedSymbols
 #include <pv/lock.h>
diff --git a/pvDataApp/factory/StandardPVField.cpp b/pvDataApp/factory/StandardPVField.cpp
index 7d3ffac..adb52fe 100644
--- a/pvDataApp/factory/StandardPVField.cpp
+++ b/pvDataApp/factory/StandardPVField.cpp
@@ -9,8 +9,6 @@
  */
 #include <string>
 #include <stdexcept>
-#include <epicsThread.h>
-#include <epicsExit.h>
 
 #define epicsExportSharedSymbols
 #include <pv/lock.h>
diff --git a/pvDataApp/misc/byteBuffer.h b/pvDataApp/misc/byteBuffer.h
index 79696ed..2be3eb8 100644
--- a/pvDataApp/misc/byteBuffer.h
+++ b/pvDataApp/misc/byteBuffer.h
@@ -12,8 +12,6 @@
 
 #include <string>
 #include <string.h>
-#include <pv/pvType.h>
-#include <pv/epicsException.h>
 
 #ifdef epicsExportSharedSymbols
 #define byteBufferepicsExportSharedSymbols
@@ -26,6 +24,10 @@
 #define epicsExportSharedSymbols
 #undef byteBufferepicsExportSharedSymbols
 #endif
+
+#include <pv/pvType.h>
+#include <pv/epicsException.h>
+
 #include <shareLib.h>
 
 namespace epics { 
diff --git a/pvDataApp/misc/event.h b/pvDataApp/misc/event.h
index 8c83097..82e5dce 100644
--- a/pvDataApp/misc/event.h
+++ b/pvDataApp/misc/event.h
@@ -12,8 +12,19 @@
 
 #include <memory>
 #include <vector>
+
+#ifdef epicsExportSharedSymbols
+#define eventepicsExportSharedSymbols
+#undef epicsExportSharedSymbols
+#endif
+
 #include <epicsEvent.h>
 
+#ifdef eventepicsExportSharedSymbols
+#define epicsExportSharedSymbols
+#undef eventepicsExportSharedSymbols
+#endif
+
 #include <pv/pvType.h>
 #include <pv/sharedPtr.h>
 
diff --git a/pvDataApp/misc/lock.h b/pvDataApp/misc/lock.h
index 2870b35..75defa6 100644
--- a/pvDataApp/misc/lock.h
+++ b/pvDataApp/misc/lock.h
@@ -11,8 +11,19 @@
 #define LOCK_H
 
 #include <stdexcept>
+
+#ifdef epicsExportSharedSymbols
+#define lockepicsExportSharedSymbols
+#undef epicsExportSharedSymbols
+#endif
+
 #include <epicsMutex.h>
 
+#ifdef lockepicsExportSharedSymbols
+#define epicsExportSharedSymbols
+#undef lockepicsExportSharedSymbols
+#endif
+
 #include <pv/noDefaultMethods.h>
 
 #include <shareLib.h>
diff --git a/pvDataApp/misc/thread.h b/pvDataApp/misc/thread.h
index ff0bacc..a4b9134 100644
--- a/pvDataApp/misc/thread.h
+++ b/pvDataApp/misc/thread.h
@@ -12,8 +12,18 @@
 
 #include <memory>
 
+#ifdef epicsExportSharedSymbols
+#define threadepicsExportSharedSymbols
+#undef epicsExportSharedSymbols
+#endif
+
 #include <epicsThread.h>
 
+#ifdef threadepicsExportSharedSymbols
+#define epicsExportSharedSymbols
+#undef threadepicsExportSharedSymbols
+#endif
+
 #include <pv/noDefaultMethods.h>
 #include <pv/pvType.h>
 
diff --git a/pvDataApp/misc/typeCast.h b/pvDataApp/misc/typeCast.h
index 1365576..32b485c 100644
--- a/pvDataApp/misc/typeCast.h
+++ b/pvDataApp/misc/typeCast.h
@@ -10,8 +10,18 @@
 #include <stdexcept>
 #include <sstream>
 
+#ifdef epicsExportSharedSymbols
+#define typeCastepicsExportSharedSymbols
+#undef epicsExportSharedSymbols
+#endif
+
 #include <epicsConvert.h>
 
+#ifdef typeCastepicsExportSharedSymbols
+#define epicsExportSharedSymbols
+#undef typeCastepicsExportSharedSymbols
+#endif
+
 #include <pv/pvType.h>
 #include <pv/pvIntrospect.h>
 #include <pv/templateMeta.h>
diff --git a/pvDataApp/property/timeStamp.h b/pvDataApp/property/timeStamp.h
index ace8479..f2f7b93 100644
--- a/pvDataApp/property/timeStamp.h
+++ b/pvDataApp/property/timeStamp.h
@@ -11,8 +11,19 @@
 #define TIMESTAMP_H
 
 #include <ctime>
+
+#ifdef epicsExportSharedSymbols
+#define timeStampepicsExportSharedSymbols
+#undef epicsExportSharedSymbols
+#endif
+
 #include <epicsTime.h>
 
+#ifdef timeStampepicsExportSharedSymbols
+#define epicsExportSharedSymbols
+#undef timeStampepicsExportSharedSymbols
+#endif
+
 #include <pv/pvType.h>
 
 #include <shareLib.h>
diff --git a/testApp/misc/testSerialization.cpp b/testApp/misc/testSerialization.cpp
index 50e8b6c..df96899 100644
--- a/testApp/misc/testSerialization.cpp
+++ b/testApp/misc/testSerialization.cpp
@@ -9,6 +9,9 @@
  *  Created on: Oct 25, 2010
  *      Author: Miha Vitorovic
  */
+#ifdef _WIN32
+#define NOMINMAX
+#endif
 #include <iostream>
 #include <fstream>