diff --git a/pvAccessApp/remote/blockingTCP.h b/pvAccessApp/remote/blockingTCP.h
index a4906e8..63a2ca5 100644
--- a/pvAccessApp/remote/blockingTCP.h
+++ b/pvAccessApp/remote/blockingTCP.h
@@ -16,6 +16,7 @@
 #   undef epicsExportSharedSymbols
 #endif
 
+#include <shareLib.h>
 #include <osdSock.h>
 #include <osiSock.h>
 #include <epicsTime.h>
diff --git a/pvAccessApp/remote/blockingTCPTransport.cpp b/pvAccessApp/remote/blockingTCPTransport.cpp
index 7d6176d..9d076ff 100644
--- a/pvAccessApp/remote/blockingTCPTransport.cpp
+++ b/pvAccessApp/remote/blockingTCPTransport.cpp
@@ -4,6 +4,12 @@
  * in file LICENSE that is included with this distribution.
  */
  
+#ifdef _WIN32
+#define NOMINMAX
+#include <BaseTsd.h>
+typedef SSIZE_T ssize_t;
+#endif
+
 #define __STDC_LIMIT_MACROS 1
 #include <pv/blockingTCP.h>
 #include <pv/inetAddressUtil.h>
@@ -25,11 +31,6 @@
 #include <algorithm>
 #include <sstream>
 
-#ifdef _WIN32
-#include <BaseTsd.h>
-typedef SSIZE_T ssize_t;
-#endif
-
 using namespace epics::pvData;
 
 using std::max;
diff --git a/pvAccessApp/remote/blockingUDP.h b/pvAccessApp/remote/blockingUDP.h
index 117a195..c467a20 100644
--- a/pvAccessApp/remote/blockingUDP.h
+++ b/pvAccessApp/remote/blockingUDP.h
@@ -12,6 +12,7 @@
 #   undef epicsExportSharedSymbols
 #endif
 
+#include <shareLib.h>
 #include <osdSock.h>
 #include <osiSock.h>
 #include <epicsThread.h>
diff --git a/testApp/remote/testADCSim.cpp b/testApp/remote/testADCSim.cpp
index 396767a..07ec006 100644
--- a/testApp/remote/testADCSim.cpp
+++ b/testApp/remote/testADCSim.cpp
@@ -7,7 +7,7 @@
 #include <string>
 #include <vector>
 #include <typeinfo>
-#include <tr1/memory>
+#include <pv/sharedPtr.h>
 
 struct baseValue {
     bool remoteWritable;
@@ -114,7 +114,7 @@ baseValue::baseValue()
 #ifndef SIM_H
 #define SIM_H
 
-#include <tr1/functional>
+//#include <tr1/functional>
 
 #include <epicsThread.h>
 #include <epicsEvent.h>
diff --git a/testApp/remote/testServer.cpp b/testApp/remote/testServer.cpp
index bda0f7f..eccb720 100644
--- a/testApp/remote/testServer.cpp
+++ b/testApp/remote/testServer.cpp
@@ -2,6 +2,10 @@
  * testServer.cpp
  */
 
+#ifdef _WIN32
+#define NOMINMAX
+#endif
+
 #include <pv/serverContext.h>
 #include <pv/clientContextImpl.h>
 #include <epicsExit.h>