diff --git a/src/CreateZip.cpp b/src/CreateZip.cpp
index 0bd60cc6e6..9a26ff45e4 100644
--- a/src/CreateZip.cpp
+++ b/src/CreateZip.cpp
@@ -347,7 +347,7 @@ typedef struct iztimes {
 typedef struct zlist {
 	ush vem, ver, flg, how;       // See central header in zipfile.c for what vem..off are
 	ulg tim, crc, siz, len;
-	extent nam, ext, cext, com;   // offset of ext must be >= LOCHEAD
+	size_t nam, ext, cext, com;   // offset of ext must be >= LOCHEAD
 	ush dsk, att, lflg;           // offset of lflg must be >= LOCHEAD
 	ulg atx, off;
 	char name[MAX_PATH];          // File name in zip file
@@ -449,7 +449,7 @@ int putcentral(struct zlist *z, WRITEFUNC wfunc, void *param)
 }
 
 
-int putend(int n, ulg s, ulg c, extent m, char *z, WRITEFUNC wfunc, void *param)
+int putend(int n, ulg s, ulg c, size_t m, char *z, WRITEFUNC wfunc, void *param)
 {
 	// write the end of the central-directory-data to file *f.
 	PUTLG(ENDSIG, f);
@@ -530,7 +530,7 @@ const ulg crc_table[256] = {
 #define DO4(buf)  DO2(buf); DO2(buf)
 #define DO8(buf)  DO4(buf); DO4(buf)
 
-ulg crc32(ulg crc, const uch *buf, extent len)
+ulg crc32(ulg crc, const uch *buf, size_t len)
 {
 	if (buf==NULL) return 0L;
 	crc = crc ^ 0xffffffffL;