miniz archive type is forward declared so move include into zip_file.cpp where it's needed

build/premake/premake4.lua

@@ -12,9 +12,9 @@ project "xlnt.test"
     targetdir "../../bin"
     includedirs { 
        "../../include",
-       "../../third-party/pugixml/src",
+       "../../third-party/cxxtest",
        "../../third-party/miniz",
-       "../../third-party/cxxtest"
+       "../../third-party/pugixml/src"
     }
     files { 
        "../../tests/*.hpp",
@@ -33,8 +33,8 @@ project "xlnt"
     targetdir "../../lib/"
     includedirs { 
        "../../include",
-       "../../third-party/pugixml/src",
-       "../../third-party/miniz"
+       "../../third-party/miniz",
+       "../../third-party/pugixml/src"
     }
     files {
        "../../source/**.cpp",

build/premake/premake5.lua

@@ -15,9 +15,9 @@ project "xlnt.test"
     targetdir "../../bin"
     includedirs { 
        "../../include",
-       "../../third-party/pugixml/src",
+       "../../third-party/cxxtest",
        "../../third-party/miniz",
-       "../../third-party/cxxtest"
+       "../../third-party/pugixml/src"
     }
     files { 
        "../../tests/*.hpp",

include/xlnt/xlnt.hpp

@@ -50,6 +50,3 @@ const std::string download_url = "https://github.com/tfussell/xlnt/archive/maste
 #include "workbook/document_properties.hpp"
 #include "cell/value.hpp"
 #include "cell/comment.hpp"
-#include "common/miniz.h"
-
-//#pragma comment(lib, "xlnt.lib")

source/zip_file.cpp

@@ -2,6 +2,8 @@
 #include <cstring>
 #include <fstream>
 
+#include <miniz.h>
+
 #ifdef _WIN32
 #define NOMINMAX
 #include <Windows.h>
@@ -10,7 +12,6 @@
 #endif
 
 #include <xlnt/common/zip_file.hpp>
-#include <xlnt/common/miniz.h>
 
 namespace {
 

third-party/miniz/miniz.h

@@ -4,4 +4,4 @@
 #define MINIZ_LITTLE_ENDIAN 1
 #define MINIZ_HAS_64BIT_REGISTERS 1
 
-#include "../../../third-party/miniz/miniz.c"
+#include "miniz.c"