--- pgp/src/zip.c	2018/04/24 16:38:33	1.1.1.2
+++ pgp/src/zip.c	2018/04/24 16:39:14	1.1.1.3
@@ -7,11 +7,9 @@
 #include "fileio.h"
 #include "language.h"
 #include "pgp.h"
+#include "exitpgp.h"
 
-/* The following are defined in zip.h but it's easier to redefine them here
-   since the header files do wierd things with __STDC__-compatibility */
-
-#define ZE_MEM		4
+#include "ziperr.h" /* for ZE_MEM (and errors[] if ZIPDEBUG defined) */
 
 /* Clean error exit: c is a ZE_-class error, *msg is an error message.
    Issue a message for the error, clean up files and memory, and exit */