diff --git a/include/catch.hpp b/include/catch.hpp
index 377cb31e..edb588d1 100644
--- a/include/catch.hpp
+++ b/include/catch.hpp
@@ -62,10 +62,7 @@
 #endif
 
 #ifdef CATCH_IMPL
-  #ifdef CATCH_PLATFORM_WINDOWS
-    #include "internal/catch_windows_h_proxy.h"
-  #endif
-
+#include "internal/catch_windows_h_proxy.h"
 #include "internal/catch_impl.hpp"
 #endif
 
diff --git a/include/internal/catch_windows_h_proxy.h b/include/internal/catch_windows_h_proxy.h
index bbb1ee82..a7a19c8e 100644
--- a/include/internal/catch_windows_h_proxy.h
+++ b/include/internal/catch_windows_h_proxy.h
@@ -11,14 +11,14 @@
 #include "catch_platform.h"
 
 #if defined(CATCH_PLATFORM_WINDOWS)
-#  if !defined(NOMINMAX) && !defined(CATCH_CONFIG_NO_NOMINMAX)
-#    define CATCH_DEFINED_NOMINMAX
-#    define NOMINMAX
-#  endif
-#  if !defined(WIN32_LEAN_AND_MEAN) && !defined(CATCH_CONFIG_NO_WIN32_LEAN_AND_MEAN)
-#    define CATCH_DEFINED_WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
+
+#if !defined(NOMINMAX) && !defined(CATCH_CONFIG_NO_NOMINMAX)
+#  define CATCH_DEFINED_NOMINMAX
+#  define NOMINMAX
+#endif
+#if !defined(WIN32_LEAN_AND_MEAN) && !defined(CATCH_CONFIG_NO_WIN32_LEAN_AND_MEAN)
+#  define CATCH_DEFINED_WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
 #endif
 
 #ifdef __AFXDLL
@@ -34,5 +34,6 @@
 #  undef WIN32_LEAN_AND_MEAN
 #endif
 
+#endif // defined(CATCH_PLATFORM_WINDOWS)
 
 #endif // TWOBLUECUBES_CATCH_WINDOWS_H_PROXY_H_INCLUDED