diff --git a/libretro-common/utils/Makefile b/libretro-common/utils/Makefile
index 7b97b1a47c..ead7a8f837 100644
--- a/libretro-common/utils/Makefile
+++ b/libretro-common/utils/Makefile
@@ -79,7 +79,7 @@ md5$(DYLIB): md5.o
 
 sha1$(DYLIB): sha1.o
 
-crc32$(DYLIB): crc32.o
+crc32$(DYLIB): crc32.o ../encodings/encoding_crc32.o
 
 %.o: %.S
 	$(CC) -c -o $@ $(asflags) $(LDFLAGS)  $(ASMFLAGS)  $<
diff --git a/libretro-common/utils/crc32.c b/libretro-common/utils/crc32.c
index ca76d4d095..b9ecc4f1b1 100644
--- a/libretro-common/utils/crc32.c
+++ b/libretro-common/utils/crc32.c
@@ -18,11 +18,11 @@ int main(int argc, const char* argv[])
 
    if (file)
    {
-      uLong crc = encoding_crc32(0L, Z_NULL, 0 );
+      uint32_t crc = encoding_crc32(0L, NULL, 0 );
 
       for (;;)
       {
-         Bytef buffer[16384];
+         uint8_t buffer[16384];
 
          int numread = fread((void*)buffer, 1, sizeof(buffer), file);