From 832294ace69d22894cd643e4fbf52d0224025473 Mon Sep 17 00:00:00 2001
From: Thomas Fussell <thomas.fussell@gmail.com>
Date: Sun, 1 Nov 2015 09:47:52 -0500
Subject: [PATCH] use new windows include in all files

---
 build/cmake/xlnt.test/CMakeLists.txt  | 1 +
 source/common/zip_file.cpp            | 9 +++------
 tests/helpers/temporary_directory.hpp | 5 +----
 tests/helpers/temporary_file.hpp      | 5 +----
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/build/cmake/xlnt.test/CMakeLists.txt b/build/cmake/xlnt.test/CMakeLists.txt
index ea980e35..79358011 100644
--- a/build/cmake/xlnt.test/CMakeLists.txt
+++ b/build/cmake/xlnt.test/CMakeLists.txt
@@ -1,6 +1,7 @@
 project(xlnt.test)
 
 include_directories(../../../include)
+include_directories(../../../source)
 include_directories(../../../third-party/pugixml/src)
 include_directories(../../../third-party/cxxtest)
 
diff --git a/source/common/zip_file.cpp b/source/common/zip_file.cpp
index 88ffbb00..a19c406a 100644
--- a/source/common/zip_file.cpp
+++ b/source/common/zip_file.cpp
@@ -4,14 +4,11 @@
 #include <fstream>
 #include <iterator>
 
-#ifdef _WIN32
-#define NOMINMAX
-#include <Windows.h>
-#endif
-
-#include <xlnt/common/zip_file.hpp>
 #include <miniz.h>
 
+#include <detail/include_windows.hpp>
+#include <xlnt/common/zip_file.hpp>
+
 namespace {
 
 std::string get_working_directory()
diff --git a/tests/helpers/temporary_directory.hpp b/tests/helpers/temporary_directory.hpp
index c2cf0f64..9d9a91d6 100644
--- a/tests/helpers/temporary_directory.hpp
+++ b/tests/helpers/temporary_directory.hpp
@@ -4,10 +4,7 @@
 #include <cstdio>
 #include <string>
 
-#ifdef _WIN32
-#define NOMINMAX
-#include <Windows.h>
-#endif
+#include <detail/include_windows.hpp>
 
 #include "PathHelper.h"
 
diff --git a/tests/helpers/temporary_file.hpp b/tests/helpers/temporary_file.hpp
index f1fa66fc..481a7f92 100644
--- a/tests/helpers/temporary_file.hpp
+++ b/tests/helpers/temporary_file.hpp
@@ -4,10 +4,7 @@
 #include <cstdio>
 #include <string>
 
-#ifdef _WIN32
-#define NOMINMAX
-#include <Windows.h>
-#endif
+#include <detail/include_windows.hpp>
 
 #include "path_helper.hpp"