diff --git a/libretro-common/utils/Makefile b/libretro-common/utils/Makefile
index 6056f17e84..7b97b1a47c 100644
--- a/libretro-common/utils/Makefile
+++ b/libretro-common/utils/Makefile
@@ -59,7 +59,7 @@ CC      := $(compiler)
 CXX     := $(subst CC,++,$(compiler))
 flags   := -fPIC $(extra_flags) -I../../libretro-common/include
 asflags := -fPIC  $(extra_flags)
-LDFLAGS := -lz
+LDFLAGS := 
 flags   += -std=c99 -DMD5_BUILD_UTILITY
 
 
diff --git a/libretro-common/utils/crc32.c b/libretro-common/utils/crc32.c
index d56c0702d3..ca76d4d095 100644
--- a/libretro-common/utils/crc32.c
+++ b/libretro-common/utils/crc32.c
@@ -4,7 +4,7 @@
 #include <errno.h>
 #include <string.h>
 
-#include <compat/zlib.h>
+#include <encodings/crc32.h>
 
 int main(int argc, const char* argv[])
 {
@@ -18,7 +18,7 @@ int main(int argc, const char* argv[])
 
    if (file)
    {
-      uLong crc = crc32(0L, Z_NULL, 0 );
+      uLong crc = encoding_crc32(0L, Z_NULL, 0 );
 
       for (;;)
       {
@@ -27,7 +27,7 @@ int main(int argc, const char* argv[])
          int numread = fread((void*)buffer, 1, sizeof(buffer), file);
 
          if (numread > 0)
-            crc = crc32( crc, buffer, numread );
+            crc = encoding_crc32( crc, buffer, numread );
          else
             break;
       }