--- hatari/src/includes/unzip.h	2019/04/09 08:52:02	1.1.1.3
+++ hatari/src/includes/unzip.h	2019/04/09 08:56:52	1.1.1.6
@@ -46,7 +46,7 @@
    PkWare has also a specification at :
       ftp://ftp.pkware.com/probdesc.zip */
 
-#ifndef _unz_H
+#if !defined(_unz_H) && defined(HAVE_ZLIB_H)
 #define _unz_H
 
 #ifdef __cplusplus
@@ -54,7 +54,7 @@ extern "C" {
 #endif
 
 #ifndef _ZLIB_H
-#include "zlib.h"
+#include <zlib.h>
 #endif
 
 #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
@@ -124,8 +124,8 @@ extern int ZEXPORT unzStringFileNameComp
 					     int iCaseSensitivity);
 /*
    Compare two filename (fileName1,fileName2).
-   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
-   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
+   If iCaseSenisivity = 1, comparison is case sensitivity (like strcmp)
+   If iCaseSenisivity = 2, comparison is not case sensitivity (like strcmpi
 								or strcasecmp)
    If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
 	(like 1 on Unix, 2 on Windows)
@@ -158,16 +158,6 @@ extern int ZEXPORT unzGetGlobalInfo (unz
   return UNZ_OK if there is no problem. */
 
 
-extern int ZEXPORT unzGetGlobalComment (unzFile file,
-					char *szComment,
-					uLong uSizeBuf);
-/*
-  Get the global comment string of the ZipFile, in the szComment buffer.
-  uSizeBuf is the size of the szComment buffer.
-  return the number of byte copied or an error code <0
-*/
-
-
 /***************************************************************************/
 /* Unzip package allow you browse the directory of the zipfile */
 
@@ -260,22 +250,6 @@ extern int ZEXPORT unzeof (unzFile file)
   return 1 if the end of file was reached, 0 elsewhere 
 */
 
-extern int ZEXPORT unzGetLocalExtrafield (unzFile file,
-					  voidp buf,
-					  unsigned len);
-/*
-  Read extra field from the current file (opened by unzOpenCurrentFile)
-  This is the local-header version of the extra field (sometimes, there is
-    more info in the local-header version than in the central-header)
-
-  if buf==NULL, it return the size of the local extra field
-
-  if buf!=NULL, len is the size of the buffer, the extra header is copied in
-	buf.
-  the return value is the number of bytes copied in buf, or (if <0) 
-	the error code
-*/
-
 #ifdef __cplusplus
 }
 #endif