diff --git a/Documentation/sources/Guide/Code/NMakefileCommon b/Documentation/sources/Guide/Code/NMakefileCommon
index 6ff02151..9d2d6681 100644
--- a/Documentation/sources/Guide/Code/NMakefileCommon
+++ b/Documentation/sources/Guide/Code/NMakefileCommon
@@ -19,7 +19,6 @@ OS_LDFLAGS = /NOLOGO /DLL /MANIFEST $(LD_OPTIMISE)
 OS_BUNDLE_DIR = Win$(ABI)	# 32 or 64
 
 # set up flags
-CXXDEFINES=/DWIN32 # OFX includes need this, Windows only auto-defines _WIN32
 CXXFLAGS = $(OFX_INC_DIR) $(CXXDEFINES) $(OPTIMISE) $(OS_CXXFLAGS) $(VERBOSE)
 LDFLAGS = $(LD_OPTIMISE) $(OS_LDFLAGS)
 
diff --git a/Examples/Basic/Basic_2005.vcproj b/Examples/Basic/Basic_2005.vcproj
index 2adf54f6..bdb33f43 100644
--- a/Examples/Basic/Basic_2005.vcproj
+++ b/Examples/Basic/Basic_2005.vcproj
@@ -45,7 +45,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\Include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BASIC_2005_EXPORTS"
+				PreprocessorDefinitions="_DEBUG;_USRDLL;BASIC_2005_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -123,7 +123,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\..\Include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BASIC_2005_EXPORTS"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;BASIC_2005_EXPORTS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -203,7 +203,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\Include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BASIC_2005_EXPORTS"
+				PreprocessorDefinitions="_DEBUG;_USRDLL;BASIC_2005_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -282,7 +282,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\..\Include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BASIC_2005_EXPORTS"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;BASIC_2005_EXPORTS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
diff --git a/Examples/Custom/Custom_2005.vcproj b/Examples/Custom/Custom_2005.vcproj
index 0e6e24a3..648b414b 100644
--- a/Examples/Custom/Custom_2005.vcproj
+++ b/Examples/Custom/Custom_2005.vcproj
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\Include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CUSTOM_2005_EXPORTS"
+				PreprocessorDefinitions="_DEBUG;_USRDLL;CUSTOM_2005_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -120,7 +120,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\..\Include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CUSTOM_2005_EXPORTS"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;CUSTOM_2005_EXPORTS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
diff --git a/Examples/Custom/custom.cpp b/Examples/Custom/custom.cpp
index 4573ccf3..1a37651c 100644
--- a/Examples/Custom/custom.cpp
+++ b/Examples/Custom/custom.cpp
@@ -8,7 +8,8 @@
   crafted piece of image processing software.
  */
 
-#ifdef WIN32
+#ifdef _WIN32
+#define NOMINMAX
 #include <windows.h>
 #endif 
 
@@ -71,7 +72,7 @@ parseCustomParam(char *str, double &x, double &y)
 void
 writeCustomParam(char *str, int strlen, double x, double y)
 {
-#ifdef WIN32
+#ifdef _WIN32
   _snprintf(str, strlen, "%lg %lg", x, y);
 #else
   snprintf(str, strlen, "%lg %lg", x, y);
diff --git a/Examples/DepthConverter/DepthConverter_2005.vcproj b/Examples/DepthConverter/DepthConverter_2005.vcproj
index 6a35eaff..8a7ee4cb 100644
--- a/Examples/DepthConverter/DepthConverter_2005.vcproj
+++ b/Examples/DepthConverter/DepthConverter_2005.vcproj
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\Include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DEPTHCONVERTER_EXPORTS"
+				PreprocessorDefinitions="_DEBUG;_USRDLL;DEPTHCONVERTER_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -119,7 +119,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\..\Include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DEPTHCONVERTER_EXPORTS"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;DEPTHCONVERTER_EXPORTS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
diff --git a/Examples/DrawSuite/DrawSuite_2005.vcproj b/Examples/DrawSuite/DrawSuite_2005.vcproj
index a5437d45..f515ab98 100644
--- a/Examples/DrawSuite/DrawSuite_2005.vcproj
+++ b/Examples/DrawSuite/DrawSuite_2005.vcproj
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\Include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OVERLAY_2005_EXPORTS"
+				PreprocessorDefinitions="_DEBUG;_USRDLL;OVERLAY_2005_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -120,7 +120,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\..\Include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OVERLAY_2005_EXPORTS"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;OVERLAY_2005_EXPORTS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
diff --git a/Examples/DrawSuite/drawsuite.cpp b/Examples/DrawSuite/drawsuite.cpp
index 6e96b77f..cc91c312 100644
--- a/Examples/DrawSuite/drawsuite.cpp
+++ b/Examples/DrawSuite/drawsuite.cpp
@@ -12,7 +12,8 @@
   and so do nothing.
  */
 
-#ifdef WIN32
+#ifdef _WIN32
+#define NOMINMAX
 #include <windows.h>
 #endif
  
diff --git a/Examples/Invert/Invert_2005.vcproj b/Examples/Invert/Invert_2005.vcproj
index 3f9d79cd..166a211d 100644
--- a/Examples/Invert/Invert_2005.vcproj
+++ b/Examples/Invert/Invert_2005.vcproj
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\Include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;INVERT_2005_EXPORTS"
+				PreprocessorDefinitions="_DEBUG;_USRDLL;INVERT_2005_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -119,7 +119,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\..\Include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;INVERT_2005_EXPORTS"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;INVERT_2005_EXPORTS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
diff --git a/Examples/OpenGL/opengl.cpp b/Examples/OpenGL/opengl.cpp
index cb33e6cd..be5dee04 100644
--- a/Examples/OpenGL/opengl.cpp
+++ b/Examples/OpenGL/opengl.cpp
@@ -11,7 +11,8 @@
 #ifdef __APPLE__
 #include <OpenGL/gl.h>
 #else
-#if defined(WINDOWS)
+#if defined(_WIN32)
+#define NOMINMAX
 #include <windows.h>
 #endif
 #include <GL/gl.h>
diff --git a/Examples/Overlay/Overlay_2005.vcproj b/Examples/Overlay/Overlay_2005.vcproj
index fb12e91f..d4da0084 100644
--- a/Examples/Overlay/Overlay_2005.vcproj
+++ b/Examples/Overlay/Overlay_2005.vcproj
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\Include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OVERLAY_2005_EXPORTS"
+				PreprocessorDefinitions="_DEBUG;_USRDLL;OVERLAY_2005_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -120,7 +120,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\..\Include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OVERLAY_2005_EXPORTS"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;OVERLAY_2005_EXPORTS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
diff --git a/Examples/Overlay/overlay.cpp b/Examples/Overlay/overlay.cpp
index d1bc97ce..99f9764e 100644
--- a/Examples/Overlay/overlay.cpp
+++ b/Examples/Overlay/overlay.cpp
@@ -12,7 +12,8 @@
   and so do nothing.
  */
 
-#ifdef WIN32
+#ifdef _WIN32
+#define NOMINMAX
 #include <windows.h>
 #endif
  
diff --git a/Examples/Rectangle/Rectangle_2005.vcproj b/Examples/Rectangle/Rectangle_2005.vcproj
index fb270abc..e91ce786 100644
--- a/Examples/Rectangle/Rectangle_2005.vcproj
+++ b/Examples/Rectangle/Rectangle_2005.vcproj
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\Include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;RECTANGLE_2005_EXPORTS"
+				PreprocessorDefinitions="_DEBUG;_USRDLL;RECTANGLE_2005_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -119,7 +119,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\..\Include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;RECTANGLE_2005_EXPORTS"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;RECTANGLE_2005_EXPORTS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
diff --git a/Examples/Test/Test_2005.vcproj b/Examples/Test/Test_2005.vcproj
index fef8573b..d4e83740 100644
--- a/Examples/Test/Test_2005.vcproj
+++ b/Examples/Test/Test_2005.vcproj
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\Include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TEST_2005_EXPORTS"
+				PreprocessorDefinitions="_DEBUG;_USRDLL;TEST_2005_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -119,7 +119,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\..\Include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TEST_2005_EXPORTS"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;TEST_2005_EXPORTS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
diff --git a/HostSupport/HostSupport.vcproj b/HostSupport/HostSupport.vcproj
index 618ad270..83dfc3e8 100644
--- a/HostSupport/HostSupport.vcproj
+++ b/HostSupport/HostSupport.vcproj
@@ -43,7 +43,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
-				PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
+				PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;COMPILED_FROM_DSP;XML_STATIC"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -107,7 +107,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
-				PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
+				PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;COMPILED_FROM_DSP;XML_STATIC"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -173,7 +173,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
-				PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
+				PreprocessorDefinitions="COMPILED_FROM_DSP;XML_STATIC"
 				RuntimeLibrary="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -238,7 +238,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
-				PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
+				PreprocessorDefinitions="COMPILED_FROM_DSP;XML_STATIC"
 				RuntimeLibrary="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -299,7 +299,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
-				PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
+				PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;COMPILED_FROM_DSP;XML_STATIC"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -363,7 +363,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
-				PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
+				PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;COMPILED_FROM_DSP;XML_STATIC"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -426,7 +426,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
-				PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
+				PreprocessorDefinitions="COMPILED_FROM_DSP;XML_STATIC"
 				RuntimeLibrary="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -488,7 +488,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\include;include;expat-2.0.1\lib"
-				PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
+				PreprocessorDefinitions="COMPILED_FROM_DSP;XML_STATIC"
 				RuntimeLibrary="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
diff --git a/HostSupport/examples/CacheDemo.vcproj b/HostSupport/examples/CacheDemo.vcproj
index c7e36978..ff5ac11e 100644
--- a/HostSupport/examples/CacheDemo.vcproj
+++ b/HostSupport/examples/CacheDemo.vcproj
@@ -43,7 +43,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\include;..\..\include;..\expat-2.0.1\lib"
-				PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
+				PreprocessorDefinitions="COMPILED_FROM_DSP;XML_STATIC"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -121,7 +121,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				AdditionalIncludeDirectories="..\include;..\..\include;..\expat-2.0.1\lib"
-				PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
+				PreprocessorDefinitions="COMPILED_FROM_DSP;XML_STATIC"
 				RuntimeLibrary="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -197,7 +197,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\include;..\..\include;..\expat-2.0.1\lib"
-				PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
+				PreprocessorDefinitions="COMPILED_FROM_DSP;XML_STATIC"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -276,7 +276,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				AdditionalIncludeDirectories="..\include;..\..\include;..\expat-2.0.1\lib"
-				PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
+				PreprocessorDefinitions="COMPILED_FROM_DSP;XML_STATIC"
 				RuntimeLibrary="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
diff --git a/HostSupport/examples/hostDemo.vcproj b/HostSupport/examples/hostDemo.vcproj
index 40131894..1eb7213d 100755
--- a/HostSupport/examples/hostDemo.vcproj
+++ b/HostSupport/examples/hostDemo.vcproj
@@ -43,7 +43,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\include;..\..\include;..\expat-2.0.1\lib"
-				PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
+				PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;COMPILED_FROM_DSP;XML_STATIC"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -121,7 +121,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				AdditionalIncludeDirectories="..\include;..\..\include;..\expat-2.0.1\lib"
-				PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
+				PreprocessorDefinitions="COMPILED_FROM_DSP;XML_STATIC"
 				RuntimeLibrary="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -197,7 +197,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\include;..\..\include;..\expat-2.0.1\lib"
-				PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
+				PreprocessorDefinitions="_CRTDBG_MAP_ALLOC;COMPILED_FROM_DSP;XML_STATIC"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -276,7 +276,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				AdditionalIncludeDirectories="..\include;..\..\include;..\expat-2.0.1\lib"
-				PreprocessorDefinitions="WIN32;WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
+				PreprocessorDefinitions="COMPILED_FROM_DSP;XML_STATIC"
 				RuntimeLibrary="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
diff --git a/HostSupport/include/ofxhBinary.h b/HostSupport/include/ofxhBinary.h
index 20e9caa0..6c04b96b 100644
--- a/HostSupport/include/ofxhBinary.h
+++ b/HostSupport/include/ofxhBinary.h
@@ -6,7 +6,7 @@
 #include <string>
 #include <iostream>
 
-#if defined(WIN32) || defined(WIN64)
+#ifdef _WIN32
 #define I386
 #elif defined(__linux__) || defined(__FreeBSD__)
 #define UNIX
@@ -25,7 +25,8 @@
 
 #if defined(UNIX)
 #include <dlfcn.h>
-#elif defined (WINDOWS)
+#elif defined (_WIN32)
+#define NOMINMAX
 #include "windows.h"
 #include <assert.h>
 #endif
@@ -44,7 +45,7 @@ namespace OFX
     bool _invalid;
 #if defined(UNIX)
     void *_dlHandle;
-#elif defined (WINDOWS)
+#elif defined (_WIN32)
     HINSTANCE _dlHandle;
 #endif
     time_t _time;
diff --git a/HostSupport/include/ofxhPropertySuite.h b/HostSupport/include/ofxhPropertySuite.h
index 6c53ba12..bfce9778 100644
--- a/HostSupport/include/ofxhPropertySuite.h
+++ b/HostSupport/include/ofxhPropertySuite.h
@@ -305,18 +305,18 @@ namespace OFX {
         // get multiple values
         void getValueN(APIType *value, int count) const;
 
-#ifdef WINDOWS
-#pragma warning( disable : 4181 )	
-#endif		
+#ifdef _WIN32
+#pragma warning( disable : 4181 )
+#endif
         /// get one value
         const ReturnType getValue(int index=0) const;
 
         /// get one value, without going through the getHook
         const ReturnType getValueRaw(int index=0) const;
 
-#ifdef WINDOWS
-#pragma warning( default : 4181 )	
-#endif				
+#ifdef _WIN32
+#pragma warning( default : 4181 )
+#endif
         // get multiple values, without going through the getHook
         void getValueNRaw(APIType *value, int count) const;
 
diff --git a/HostSupport/src/ofxhBinary.cpp b/HostSupport/src/ofxhBinary.cpp
index 6e39853e..5f5a7c4c 100755
--- a/HostSupport/src/ofxhBinary.cpp
+++ b/HostSupport/src/ofxhBinary.cpp
@@ -61,7 +61,7 @@ void Binary::unload() {
   if (_dlHandle != 0) {
 #if defined (UNIX)
     dlclose(_dlHandle);
-#elif defined (WINDOWS)
+#elif defined (_WIN32)
     FreeLibrary(_dlHandle);
 #endif
     _dlHandle = 0;
@@ -74,7 +74,7 @@ void *Binary::findSymbol(const std::string &symbol) {
   if (_dlHandle != 0) {
 #if defined(UNIX)
     return dlsym(_dlHandle, symbol.c_str());
-#elif defined (WINDOWS)
+#elif defined (_WIN32)
     return (void*)GetProcAddress(_dlHandle, symbol.c_str());
 #endif
   } else {
diff --git a/HostSupport/src/ofxhImageEffectAPI.cpp b/HostSupport/src/ofxhImageEffectAPI.cpp
index f8348b40..224d3271 100755
--- a/HostSupport/src/ofxhImageEffectAPI.cpp
+++ b/HostSupport/src/ofxhImageEffectAPI.cpp
@@ -34,7 +34,7 @@ namespace OFX {
       OFX::Host::ImageEffect::Host *gImageEffectHost;
 
       /// ctor
-#ifdef WINDOWS
+#ifdef _WIN32
 #pragma warning( disable : 4355 )
 #endif
       ImageEffectPlugin::ImageEffectPlugin(PluginCache &pc, PluginBinary *pb, int pi, OfxPlugin *pl)
@@ -63,7 +63,7 @@ namespace OFX {
         _baseDescriptor = gImageEffectHost->makeDescriptor(this);
       }
 
-#ifdef WINDOWS
+#ifdef _WIN32
 #pragma warning( default : 4355 )
 #endif
 
diff --git a/HostSupport/src/ofxhPluginCache.cpp b/HostSupport/src/ofxhPluginCache.cpp
index 3baaed7d..bff65993 100644
--- a/HostSupport/src/ofxhPluginCache.cpp
+++ b/HostSupport/src/ofxhPluginCache.cpp
@@ -64,7 +64,7 @@ static const char *getArchStr()
 #define DIRSEP "/"
 #include <dirent.h>
 
-#elif defined (WINDOWS)
+#elif defined (_WIN32)
 #define DIRLIST_SEP_CHARS ";"
 #ifdef _WIN64
 #define ARCHSTR "win64"
@@ -73,6 +73,7 @@ static const char *getArchStr()
 #endif
 #define DIRSEP "\\"
 
+#define NOMINMAX
 #include "shlobj.h"
 #include "tchar.h"
 #endif
@@ -157,7 +158,7 @@ PluginHandle::~PluginHandle() {
 }
 
 
-#if defined (WINDOWS)
+#if defined (_WIN32)
 const TCHAR *getStdOFXPluginPath(const std::string &hostId = "Plugins")
 {
   static TCHAR buffer[MAX_PATH];
@@ -174,7 +175,7 @@ const TCHAR *getStdOFXPluginPath(const std::string &hostId = "Plugins")
 static
 std::string OFXGetEnv(const char* e)
 {
-#if defined(WINDOWS) && !defined(__MINGW32__)
+#if defined(_WIN32) && !defined(__MINGW32__)
   size_t requiredSize;
   getenv_s(&requiredSize, 0, 0, e);
   std::vector<char> buffer(requiredSize);
@@ -239,8 +240,8 @@ PluginCache::PluginCache() : _hostSpec(0), _xmlCurrentBinary(0), _xmlCurrentPlug
     
     _pluginPath.push_back(path);
   }
-  
-#if defined(WINDOWS)
+
+#if defined(_WIN32)
   _pluginPath.push_back(getStdOFXPluginPath());
   _pluginPath.push_back("C:\\Program Files\\Common Files\\OFX\\Plugins");
 #endif
@@ -253,7 +254,7 @@ PluginCache::PluginCache() : _hostSpec(0), _xmlCurrentBinary(0), _xmlCurrentPlug
 }
 
 void PluginCache::setPluginHostPath(const std::string &hostId) {
-#if defined(WINDOWS)
+#if defined(_WIN32)
   _pluginPath.push_back(getStdOFXPluginPath(hostId));
   _pluginPath.push_back("C:\\Program Files\\Common Files\\OFX\\" + hostId);
 #endif
@@ -270,8 +271,8 @@ void PluginCache::scanDirectory(std::set<std::string> &foundBinFiles, const std:
 #ifdef CACHE_DEBUG
   printf("looking in %s for plugins\n", dir.c_str());
 #endif
-  
-#if defined (WINDOWS)
+
+#if defined (_WIN32)
   WIN32_FIND_DATA findData;
   HANDLE findHandle;
 #else
@@ -285,7 +286,7 @@ void PluginCache::scanDirectory(std::set<std::string> &foundBinFiles, const std:
   
 #if defined (UNIX)
   while (dirent *de = readdir(d))
-#elif defined (WINDOWS)
+#elif defined (_WIN32)
     findHandle = FindFirstFile((dir + "\\*").c_str(), &findData);
   
   if (findHandle == INVALID_HANDLE_VALUE) 
@@ -369,7 +370,7 @@ void PluginCache::scanDirectory(std::set<std::string> &foundBinFiles, const std:
           scanDirectory(foundBinFiles, dir + DIRSEP + name, recurse);
         }
       }
-#if defined(WINDOWS)
+#if defined(_WIN32)
       int rval = FindNextFile(findHandle, &findData);
       
       if (rval == 0) {
diff --git a/HostSupport/src/ofxhPropertySuite.cpp b/HostSupport/src/ofxhPropertySuite.cpp
index fcd463cc..c9970a10 100644
--- a/HostSupport/src/ofxhPropertySuite.cpp
+++ b/HostSupport/src/ofxhPropertySuite.cpp
@@ -221,10 +221,10 @@ namespace OFX {
         : Property(pt)													    
         , _value(pt._value)												    
         , _defaultValue(pt._defaultValue)										    
-      {															    
+      {
       }
 
-#ifdef WINDOWS
+#ifdef _WIN32
 #pragma warning( disable : 4181 )
 #endif
       /// get one value
@@ -238,7 +238,7 @@ namespace OFX {
           return getValueRaw(index);
         }
       }
-#ifdef WINDOWS
+#ifdef _WIN32
 #pragma warning( default : 4181 )
 #endif
       // get multiple values
@@ -252,7 +252,7 @@ namespace OFX {
         }
       }
 
-#ifdef WINDOWS
+#ifdef _WIN32
 #pragma warning( disable : 4181 )
 #endif
       /// get one value, without going through the getHook
@@ -264,9 +264,9 @@ namespace OFX {
         }
         return _value[index];
       }
-#ifdef WINDOWS
+#ifdef _WIN32
 #pragma warning( default : 4181 )
-#endif      
+#endif
       // get multiple values, without going through the getHook
       template<class T> 
       void PropertyTemplate<T>::getValueNRaw(APIType *value, int count) const
diff --git a/Support/Library/ofxSupport.dsp b/Support/Library/ofxSupport.dsp
index ea7f25c1..97d7afe7 100755
--- a/Support/Library/ofxSupport.dsp
+++ b/Support/Library/ofxSupport.dsp
@@ -40,8 +40,8 @@ RSC=rc.exe
 # PROP Output_Dir "Release"
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../include" /I "../../include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../include" /I "../../include" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
 # ADD RSC /l 0x809 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -63,8 +63,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "Debug"
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../include" /I "../../include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../include" /I "../../include" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
 # ADD RSC /l 0x809 /d "_DEBUG"
 BSC32=bscmake.exe
diff --git a/Support/Library/ofxsupport.vcproj b/Support/Library/ofxsupport.vcproj
index d16f6aa6..9436a63f 100755
--- a/Support/Library/ofxsupport.vcproj
+++ b/Support/Library/ofxsupport.vcproj
@@ -46,7 +46,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../include,../../include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				PreprocessorDefinitions="_DEBUG;_LIB"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -122,7 +122,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="../include,../../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				PreprocessorDefinitions="NDEBUG;_LIB"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -197,7 +197,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../include,../../include"
-				PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
+				PreprocessorDefinitions="_DEBUG;_LIB"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -274,7 +274,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="../include,../../include"
-				PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+				PreprocessorDefinitions="NDEBUG;_LIB"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
diff --git a/Support/Plugins/Basic/basic.cpp b/Support/Plugins/Basic/basic.cpp
index 83ce9d06..4bbd05aa 100644
--- a/Support/Plugins/Basic/basic.cpp
+++ b/Support/Plugins/Basic/basic.cpp
@@ -1,7 +1,8 @@
 // Copyright OpenFX and contributors to the OpenFX project.
 // SPDX-License-Identifier: BSD-3-Clause
 
-#ifdef _WINDOWS
+#ifdef _WIN32
+#define NOMINMAX
 #include <windows.h>
 #endif
 
diff --git a/Support/Plugins/Basic/basic.dsp b/Support/Plugins/Basic/basic.dsp
index 671c0dcc..d9c8728d 100755
--- a/Support/Plugins/Basic/basic.dsp
+++ b/Support/Plugins/Basic/basic.dsp
@@ -42,8 +42,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../include" /I "../../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /c
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../include" /I "../../../include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -68,8 +68,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../../include" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
diff --git a/Support/Plugins/Basic/basic.vcproj b/Support/Plugins/Basic/basic.vcproj
index 22a7afdf..3af20adc 100755
--- a/Support/Plugins/Basic/basic.vcproj
+++ b/Support/Plugins/Basic/basic.vcproj
@@ -52,7 +52,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../include,../../../include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PROPTESTER_EXPORTS"
+				PreprocessorDefinitions="_DEBUG;_USRDLL;PROPTESTER_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -148,7 +148,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../include,../../../include"
-				PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS;_USRDLL;"
+				PreprocessorDefinitions="_DEBUG;_USRDLL;"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -245,7 +245,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="../../include,../../../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PROPTESTER_EXPORTS"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;PROPTESTER_EXPORTS"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -340,7 +340,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="../../include,../../../include"
-				PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS;_USRDLL;"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;"
 				StringPooling="false"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
diff --git a/Support/Plugins/ChoiceParams/choiceparams.cpp b/Support/Plugins/ChoiceParams/choiceparams.cpp
index c0a1fafd..7168313a 100644
--- a/Support/Plugins/ChoiceParams/choiceparams.cpp
+++ b/Support/Plugins/ChoiceParams/choiceparams.cpp
@@ -1,7 +1,8 @@
 // Copyright OpenFX and contributors to the OpenFX project.
 // SPDX-License-Identifier: BSD-3-Clause
 
-#ifdef _WINDOWS
+#ifdef _WIN32
+#define NOMINMAX
 #include <windows.h>
 #endif
 
diff --git a/Support/Plugins/Field/field.cpp b/Support/Plugins/Field/field.cpp
index f7e74142..77c14cd6 100644
--- a/Support/Plugins/Field/field.cpp
+++ b/Support/Plugins/Field/field.cpp
@@ -1,7 +1,8 @@
 // Copyright OpenFX and contributors to the OpenFX project.
 // SPDX-License-Identifier: BSD-3-Clause
 
-#ifdef _WINDOWS
+#ifdef _WIN32
+#define NOMINMAX
 #include <windows.h>
 #endif
 
diff --git a/Support/Plugins/Field/field.vcproj b/Support/Plugins/Field/field.vcproj
index d4e50e76..e225a36b 100755
--- a/Support/Plugins/Field/field.vcproj
+++ b/Support/Plugins/Field/field.vcproj
@@ -52,7 +52,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../include,../../../include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PROPTESTER_EXPORTS"
+				PreprocessorDefinitions="_DEBUG;_USRDLL;PROPTESTER_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -148,7 +148,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../include,../../../include"
-				PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS;_USRDLL;"
+				PreprocessorDefinitions="_DEBUG;_USRDLL;"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -245,7 +245,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="../../include,../../../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PROPTESTER_EXPORTS"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;PROPTESTER_EXPORTS"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -340,7 +340,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="../../include,../../../include"
-				PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS;_USRDLL;"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;"
 				StringPooling="false"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
diff --git a/Support/Plugins/GPUGain/GPUGain.vcxproj b/Support/Plugins/GPUGain/GPUGain.vcxproj
index fc45ab91..637ccdbe 100644
--- a/Support/Plugins/GPUGain/GPUGain.vcxproj
+++ b/Support/Plugins/GPUGain/GPUGain.vcxproj
@@ -65,7 +65,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -96,7 +96,7 @@ copy /Y "$(TargetPath)" /B "$(OutDir)GPUGain.ofx.bundle\Contents\Win64\GPUGain.o
     </Midl>
     <ClCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
diff --git a/Support/Plugins/Generator/noise.dsp b/Support/Plugins/Generator/noise.dsp
index 9ea58e9a..69a1b333 100755
--- a/Support/Plugins/Generator/noise.dsp
+++ b/Support/Plugins/Generator/noise.dsp
@@ -42,8 +42,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../include" /I "../../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /c
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../include" /I "../../../include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -68,8 +68,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../../include" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
diff --git a/Support/Plugins/Generator/noise.vcproj b/Support/Plugins/Generator/noise.vcproj
index 837daeac..044232ee 100755
--- a/Support/Plugins/Generator/noise.vcproj
+++ b/Support/Plugins/Generator/noise.vcproj
@@ -52,7 +52,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../include,../../../include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PROPTESTER_EXPORTS"
+				PreprocessorDefinitions="_DEBUG;_USRDLL;PROPTESTER_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -148,7 +148,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../include,../../../include"
-				PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS;_USRDLL;"
+				PreprocessorDefinitions="_DEBUG;_USRDLL;"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -245,7 +245,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="../../include,../../../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PROPTESTER_EXPORTS"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;PROPTESTER_EXPORTS"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -340,7 +340,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="../../include,../../../include"
-				PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS;_USRDLL;"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;"
 				StringPooling="false"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
diff --git a/Support/Plugins/Invert/invert.cpp b/Support/Plugins/Invert/invert.cpp
index 27b88caa..e85d0ad1 100644
--- a/Support/Plugins/Invert/invert.cpp
+++ b/Support/Plugins/Invert/invert.cpp
@@ -1,7 +1,8 @@
 // Copyright OpenFX and contributors to the OpenFX project.
 // SPDX-License-Identifier: BSD-3-Clause
 
-#ifdef _WINDOWS
+#ifdef _WIN32
+#define NOMINMAX
 #include <windows.h>
 #endif
 
diff --git a/Support/Plugins/Invert/invert.vcproj b/Support/Plugins/Invert/invert.vcproj
index 98b9db40..aeb1714f 100755
--- a/Support/Plugins/Invert/invert.vcproj
+++ b/Support/Plugins/Invert/invert.vcproj
@@ -52,7 +52,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../include,../../../include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PROPTESTER_EXPORTS"
+				PreprocessorDefinitions="_DEBUG;_USRDLL;PROPTESTER_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -148,7 +148,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../include,../../../include"
-				PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS;_USRDLL;"
+				PreprocessorDefinitions="_DEBUG;_USRDLL;"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -245,7 +245,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="../../include,../../../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PROPTESTER_EXPORTS"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;PROPTESTER_EXPORTS"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -340,7 +340,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="../../include,../../../include"
-				PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS;_USRDLL;"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;"
 				StringPooling="false"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
diff --git a/Support/Plugins/MultiBundle/multibundle.vcproj b/Support/Plugins/MultiBundle/multibundle.vcproj
index 2dd94624..01817af8 100755
--- a/Support/Plugins/MultiBundle/multibundle.vcproj
+++ b/Support/Plugins/MultiBundle/multibundle.vcproj
@@ -52,7 +52,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../include,../../../include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PROPTESTER_EXPORTS"
+				PreprocessorDefinitions="_DEBUG;_USRDLL;PROPTESTER_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -149,7 +149,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="../../include,../../../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PROPTESTER_EXPORTS"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;PROPTESTER_EXPORTS"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -243,7 +243,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../include,../../../include"
-				PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS;_USRDLL;"
+				PreprocessorDefinitions="_DEBUG;_USRDLL;"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -340,7 +340,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="../../include,../../../include"
-				PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS;_USRDLL;"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;"
 				StringPooling="false"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
diff --git a/Support/Plugins/MultiBundle/multibundle1.cpp b/Support/Plugins/MultiBundle/multibundle1.cpp
index 8d0ac8c3..bc1e9444 100755
--- a/Support/Plugins/MultiBundle/multibundle1.cpp
+++ b/Support/Plugins/MultiBundle/multibundle1.cpp
@@ -1,7 +1,8 @@
 // Copyright OpenFX and contributors to the OpenFX project.
 // SPDX-License-Identifier: BSD-3-Clause
 
-#ifdef _WINDOWS
+#ifdef _WIN32
+#define NOMINMAX
 #include <windows.h>
 #endif
 
diff --git a/Support/Plugins/MultiBundle/multibundle2.cpp b/Support/Plugins/MultiBundle/multibundle2.cpp
index 739d3226..30919e8b 100644
--- a/Support/Plugins/MultiBundle/multibundle2.cpp
+++ b/Support/Plugins/MultiBundle/multibundle2.cpp
@@ -1,7 +1,8 @@
 // Copyright OpenFX and contributors to the OpenFX project.
 // SPDX-License-Identifier: BSD-3-Clause
 
-#ifdef _WINDOWS
+#ifdef _WIN32
+#define NOMINMAX
 #include <windows.h>
 #endif
 
diff --git a/Support/Plugins/Retimer/retimer.dsp b/Support/Plugins/Retimer/retimer.dsp
index 8a99589f..76ccd13b 100755
--- a/Support/Plugins/Retimer/retimer.dsp
+++ b/Support/Plugins/Retimer/retimer.dsp
@@ -42,8 +42,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../include" /I "../../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /c
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../include" /I "../../../include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -68,8 +68,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../../include" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
diff --git a/Support/Plugins/Retimer/retimer.vcproj b/Support/Plugins/Retimer/retimer.vcproj
index ed934eb5..02a59b85 100755
--- a/Support/Plugins/Retimer/retimer.vcproj
+++ b/Support/Plugins/Retimer/retimer.vcproj
@@ -52,7 +52,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../include,../../../include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PROPTESTER_EXPORTS"
+				PreprocessorDefinitions="_DEBUG;_USRDLL;PROPTESTER_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -148,7 +148,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../include,../../../include"
-				PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS;_USRDLL;"
+				PreprocessorDefinitions="_DEBUG;_USRDLL;"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -245,7 +245,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="../../include,../../../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PROPTESTER_EXPORTS"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;PROPTESTER_EXPORTS"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -340,7 +340,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="../../include,../../../include"
-				PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS;_USRDLL;"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;"
 				StringPooling="false"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
diff --git a/Support/Plugins/Tester/Tester.cpp b/Support/Plugins/Tester/Tester.cpp
index 1cf901dc..e89cf7d9 100644
--- a/Support/Plugins/Tester/Tester.cpp
+++ b/Support/Plugins/Tester/Tester.cpp
@@ -1,7 +1,8 @@
 // Copyright OpenFX and contributors to the OpenFX project.
 // SPDX-License-Identifier: BSD-3-Clause
 
-#ifdef _WINDOWS
+#ifdef _WIN32
+#define NOMINMAX
 #include <windows.h>
 #endif
 
diff --git a/Support/Plugins/Tester/Tester.vcproj b/Support/Plugins/Tester/Tester.vcproj
index 35220a0b..82917863 100644
--- a/Support/Plugins/Tester/Tester.vcproj
+++ b/Support/Plugins/Tester/Tester.vcproj
@@ -52,7 +52,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../include,../../../include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PROPTESTER_EXPORTS"
+				PreprocessorDefinitions="_DEBUG;_USRDLL;PROPTESTER_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -148,7 +148,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../include,../../../include"
-				PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS;_USRDLL;"
+				PreprocessorDefinitions="_DEBUG;_USRDLL;"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -245,7 +245,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="../../include,../../../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PROPTESTER_EXPORTS"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;PROPTESTER_EXPORTS"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -340,7 +340,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="../../include,../../../include"
-				PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS;_USRDLL;"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;"
 				StringPooling="false"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
diff --git a/Support/Plugins/Transition/crossFade.dsp b/Support/Plugins/Transition/crossFade.dsp
index 3f103469..27acf2bd 100755
--- a/Support/Plugins/Transition/crossFade.dsp
+++ b/Support/Plugins/Transition/crossFade.dsp
@@ -42,8 +42,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../include" /I "../../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /c
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../include" /I "../../../include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -68,8 +68,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../../include" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
diff --git a/Support/Plugins/Transition/crossFade.vcproj b/Support/Plugins/Transition/crossFade.vcproj
index 930d5237..baafa81c 100755
--- a/Support/Plugins/Transition/crossFade.vcproj
+++ b/Support/Plugins/Transition/crossFade.vcproj
@@ -52,7 +52,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../include,../../../include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PROPTESTER_EXPORTS"
+				PreprocessorDefinitions="_DEBUG;_USRDLL;PROPTESTER_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -148,7 +148,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../include,../../../include"
-				PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS;_USRDLL;"
+				PreprocessorDefinitions="_DEBUG;_USRDLL;"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -245,7 +245,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="../../include,../../../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PROPTESTER_EXPORTS"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;PROPTESTER_EXPORTS"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -340,7 +340,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="../../include,../../../include"
-				PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS;_USRDLL;"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;"
 				StringPooling="false"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
diff --git a/Support/PropTester/propTester.cpp b/Support/PropTester/propTester.cpp
index 3e578ac4..f1de22ce 100644
--- a/Support/PropTester/propTester.cpp
+++ b/Support/PropTester/propTester.cpp
@@ -1,6 +1,7 @@
 // Copyright OpenFX and contributors to the OpenFX project.
 // SPDX-License-Identifier: BSD-3-Clause
-#ifdef _WINDOWS
+#ifdef _WIN32
+#define NOMINMAX
 #include <windows.h>
 #endif
 
diff --git a/Support/PropTester/propTester.dsp b/Support/PropTester/propTester.dsp
index 5e8e1a5d..fd2376d4 100755
--- a/Support/PropTester/propTester.dsp
+++ b/Support/PropTester/propTester.dsp
@@ -42,8 +42,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../include" /I "../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /c
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../include" /I "../../include" /D "NDEBUG" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -68,8 +68,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /GB /Zp8 /MDd /W3 /Gm /GX /ZI /Od /I "../include" /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /GB /Zp8 /MDd /W3 /Gm /GX /ZI /Od /I "../include" /I "../../include" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "PROPTESTER_EXPORTS" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
diff --git a/Support/PropTester/propTester.vcproj b/Support/PropTester/propTester.vcproj
index 83c4e650..c5a10794 100755
--- a/Support/PropTester/propTester.vcproj
+++ b/Support/PropTester/propTester.vcproj
@@ -52,7 +52,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../include,../../include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PROPTESTER_EXPORTS"
+				PreprocessorDefinitions="_DEBUG;_USRDLL;PROPTESTER_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -149,7 +149,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="../include,../../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PROPTESTER_EXPORTS"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;PROPTESTER_EXPORTS"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -243,7 +243,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../include,../../include"
-				PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS;_USRDLL;"
+				PreprocessorDefinitions="_DEBUG;_USRDLL;"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -340,7 +340,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="../include,../../include"
-				PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS;_USRDLL;"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;"
 				StringPooling="false"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
diff --git a/conanfile.py b/conanfile.py
index a721d315..71284337 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -51,9 +51,6 @@ def generate(self):
 		deps.generate()
 
 		tc = CMakeToolchain(self)
-		if self.settings.os == "Windows":
-			tc.preprocessor_definitions["WINDOWS"] = 1
-			tc.preprocessor_definitions["NOMINMAX"] = 1
 		tc.generate()
 
 	def build(self):
@@ -85,9 +82,3 @@ def package_info(self):
 		self.cpp_info.components["Support"].libs = [i for i in libs if "OfxSupport" in i]
 		self.cpp_info.components["Support"].includedirs = ["Support/include"]
 		self.cpp_info.components["Support"].requires = ["opengl::opengl"]
-
-		if self.settings.os == "Windows":
-			win_defines = ["WINDOWS", "NOMINMAX"]
-			self.cpp_info.components["Api"].defines = win_defines
-			self.cpp_info.components["HostSupport"].defines = win_defines
-			self.cpp_info.components["Support"].defines = win_defines
diff --git a/include/ofxCore.h b/include/ofxCore.h
index 0fff10bd..8de9bc0b 100644
--- a/include/ofxCore.h
+++ b/include/ofxCore.h
@@ -22,7 +22,7 @@ Contains the core OFX architectural struct and function definitions. For more de
  * This macro is to be used before any symbol that is to be
  * exported from a plug-in. This is OS/compiler dependent.
  */
-#if defined(WIN32) || defined(WIN64)
+#if defined(_WIN32)
 	#define OfxExport extern __declspec(dllexport)
 #else
 	#define OfxExport extern