Flattened third party include structure.

cocoapods/libxlsxwriter-umbrella.h

@@ -15,10 +15,11 @@
 #import "shared_strings.h"
 #import "styles.h"
 #import "theme.h"
-#import "third_party/minizip/ioapi.h"
-#import "third_party/minizip/zip.h"
+#import "third_party/ioapi.h"
 #import "third_party/queue.h"
+#import "third_party/tmpfileplus.h"
 #import "third_party/tree.h"
+#import "third_party/zip.h"
 #import "utility.h"
 #import "workbook.h"
 #import "worksheet.h"

include/xlsxwriter/packager.h

@@ -10,7 +10,7 @@
 #define __LXW_PACKAGER_H__
 
 #include <stdint.h>
-#include "xlsxwriter/third_party/minizip/zip.h"
+#include "xlsxwriter/third_party/zip.h"
 
 #include "common.h"
 #include "workbook.h"

libxlsxwriter.podspec

@@ -33,7 +33,7 @@ Pod::Spec.new do |s|
   s.author                = { "John McNamara" => "jmcnamara@cpan.org" }
 
   s.source                = { :git => "https://github.com/jmcnamara/libxlsxwriter.git", :tag => "RELEASE_" + s.version.to_s }
-  s.source_files          = "src/**/*.c", "third_party/**/{zip.c,ioapi.c}", "include/**/*.h"
+  s.source_files          = "src/**/*.c", "third_party/**/{zip.c,ioapi.c,tmpfileplus.c}", "include/**/*.h"
 
   s.header_dir            = "xlsxwriter"
   s.header_mappings_dir   = "include/xlsxwriter"

src/packager.c

@@ -37,7 +37,7 @@ STATIC uint8_t _add_file_to_zip(lxw_packager *self, FILE * file,
 #undef SLIST_ENTRY
 
 #include <windows.h>
-#include "../third_party/minizip/iowin32.h"
+#include "../third_party/iowin32.h"
 
 zipFile
 _open_zipfile_win32(const char *filename)