--- a/misc/unzip.h
+++ b/misc/unzip.h
@@ -49,6 +49,10 @@
 #include "zlib.h"
 #endif
 
+#ifndef OF
+#define OF(x) x
+#endif
+
 #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
 /* like the STRICT of WIN32, we define a pointer that cannot be converted
     from (void*) without cast */
--- a/libdiscmage/unzip.h
+++ b/libdiscmage/unzip.h
@@ -48,6 +48,9 @@
 #ifndef _ZLIB_H
 #include "zlib.h"
 #endif
+#ifndef OF
+#define OF(x) x
+#endif
 
 #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
 /* like the STRICT of WIN32, we define a pointer that cannot be converted
--- a/libdiscmage/misc_z.c
+++ b/libdiscmage/misc_z.c
@@ -27,6 +27,7 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/stat.h>
+#define Z_SOLO
 #include <zlib.h>
 #include "misc_z.h"
 #include "misc.h"
--- a/misc/archive.c
+++ b/misc/archive.c
@@ -27,6 +27,7 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/stat.h>
+#define Z_SOLO
 #include <zlib.h>
 #ifdef  HAVE_BYTESWAP_H
 #include <byteswap.h>