From 0c5df42c28f3c5450293c54ab1d2f98985e62607 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?=
 <martin.horenovsky@gmail.com>
Date: Fri, 23 Feb 2018 12:40:12 +0100
Subject: [PATCH] Fix how windows.h is included in our files.

To prevent bugs with stitching system headers inside Catch,
the proxy header is responsible for guarding against inclusion
on Linux, rather than the includers.

Might be related to #1197
---
 include/internal/catch_debug_console.cpp | 6 ++++--
 include/internal/catch_fatal_condition.h | 4 ++--
 include/internal/catch_session.cpp       | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/include/internal/catch_debug_console.cpp b/include/internal/catch_debug_console.cpp
index d817c561..5d25f651 100644
--- a/include/internal/catch_debug_console.cpp
+++ b/include/internal/catch_debug_console.cpp
@@ -9,21 +9,23 @@
 #include "catch_debug_console.h"
 #include "catch_stream.h"
 #include "catch_platform.h"
+#include "catch_windows_h_proxy.h"
 
 #ifdef CATCH_PLATFORM_WINDOWS
 
-#include "catch_windows_h_proxy.h"
-
     namespace Catch {
         void writeToDebugConsole( std::string const& text ) {
             ::OutputDebugStringA( text.c_str() );
         }
     }
+
 #else
+
     namespace Catch {
         void writeToDebugConsole( std::string const& text ) {
             // !TBD: Need a version for Mac/ XCode and other IDEs
             Catch::cout() << text;
         }
     }
+
 #endif // Platform
diff --git a/include/internal/catch_fatal_condition.h b/include/internal/catch_fatal_condition.h
index 9977702a..29e3b692 100644
--- a/include/internal/catch_fatal_condition.h
+++ b/include/internal/catch_fatal_condition.h
@@ -9,13 +9,13 @@
 #ifndef TWOBLUECUBES_CATCH_FATAL_CONDITION_H_INCLUDED
 #define TWOBLUECUBES_CATCH_FATAL_CONDITION_H_INCLUDED
 
-#include <string>
 #include "catch_platform.h"
 #include "catch_compiler_capabilities.h"
+#include "catch_windows_h_proxy.h"
 
 
 #if defined ( CATCH_PLATFORM_WINDOWS ) /////////////////////////////////////////
-#include "catch_windows_h_proxy.h"
+
 
 #  if !defined ( CATCH_CONFIG_WINDOWS_SEH )
 
diff --git a/include/internal/catch_session.cpp b/include/internal/catch_session.cpp
index 71317eba..9ccb16f8 100644
--- a/include/internal/catch_session.cpp
+++ b/include/internal/catch_session.cpp
@@ -19,6 +19,7 @@
 #include "catch_startup_exception_registry.h"
 #include "catch_text.h"
 #include "catch_stream.h"
+#include "catch_windows_h_proxy.h"
 
 #include <cstdlib>
 #include <iomanip>