diff --git a/pvtoolsSrc/eget.cpp b/pvtoolsSrc/eget.cpp
index 3e792a6..589ef06 100644
--- a/pvtoolsSrc/eget.cpp
+++ b/pvtoolsSrc/eget.cpp
@@ -1,6 +1,3 @@
-#if defined(_WIN32) && !defined(NOMINMAX)
-#define NOMINMAX
-#endif
 
 #include <iostream>
 #include <pv/pvAccess.h>
diff --git a/src/remote/codec.cpp b/src/remote/codec.cpp
index 8efa03c..7859970 100644
--- a/src/remote/codec.cpp
+++ b/src/remote/codec.cpp
@@ -4,11 +4,6 @@
 * in file LICENSE that is included with this distribution.
 */
 
-#if defined(_WIN32) && !defined(NOMINMAX)
-#define NOMINMAX
-#endif
-
-
 #include <map>
 #include <string>
 #include <vector>
diff --git a/src/server/beaconEmitter.cpp b/src/server/beaconEmitter.cpp
index 9001085..5341f3c 100644
--- a/src/server/beaconEmitter.cpp
+++ b/src/server/beaconEmitter.cpp
@@ -4,10 +4,6 @@
  * in file LICENSE that is included with this distribution.
  */
 
-#if defined(_WIN32) && !defined(NOMINMAX)
-#define NOMINMAX
-#endif
-
 #include <algorithm>
 
 #define epicsExportSharedSymbols
diff --git a/src/server/responseHandlers.cpp b/src/server/responseHandlers.cpp
index 1b97405..e529b9f 100644
--- a/src/server/responseHandlers.cpp
+++ b/src/server/responseHandlers.cpp
@@ -4,10 +4,6 @@
  * in file LICENSE that is included with this distribution.
  */
 
-#if defined(_WIN32) && !defined(NOMINMAX)
-#define NOMINMAX
-#endif
-
 #include <sstream>
 #include <time.h>
 #include <stdlib.h>
diff --git a/testApp/remote/testCodec.cpp b/testApp/remote/testCodec.cpp
index 3d1be6b..0ad7959 100644
--- a/testApp/remote/testCodec.cpp
+++ b/testApp/remote/testCodec.cpp
@@ -2,11 +2,6 @@
 * testCodec.cpp
 */
 
-#if defined(_WIN32) && !defined(NOMINMAX)
-#define NOMINMAX
-#endif
-
-
 #include <epicsExit.h>
 #include <epicsUnitTest.h>
 #include <testMain.h>
diff --git a/testApp/remote/testServer.cpp b/testApp/remote/testServer.cpp
index c1c84a0..8c12916 100644
--- a/testApp/remote/testServer.cpp
+++ b/testApp/remote/testServer.cpp
@@ -2,10 +2,6 @@
  * testServer.cpp
  */
 
-#if defined(_WIN32) && !defined(NOMINMAX)
-#define NOMINMAX
-#endif
-
 // disable buggy boost enable_shared_from_this assert code
 #define BOOST_DISABLE_ASSERTS