diff --git a/Makefile.common b/Makefile.common
index 898003a5b1..56c2297c65 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1127,20 +1127,20 @@ ifdef HAVE_COMPRESSION
 endif
 
 ifeq ($(HAVE_BUILTINZLIB),1)
-   OBJ += $(DEPS_DIR)/zlib/adler32.o \
-          $(DEPS_DIR)/zlib/compress.o \
-          $(DEPS_DIR)/zlib/crc32.o \
-          $(DEPS_DIR)/zlib/deflate.o \
-          $(DEPS_DIR)/zlib/gzclose.o \
-          $(DEPS_DIR)/zlib/gzlib.o \
-          $(DEPS_DIR)/zlib/gzread.o \
-          $(DEPS_DIR)/zlib/gzwrite.o \
-          $(DEPS_DIR)/zlib/inffast.o \
-          $(DEPS_DIR)/zlib/inflate.o \
-          $(DEPS_DIR)/zlib/inftrees.o \
-          $(DEPS_DIR)/zlib/trees.o \
-          $(DEPS_DIR)/zlib/uncompr.o \
-          $(DEPS_DIR)/zlib/zutil.o
+   OBJ += $(DEPS_DIR)/libz/adler32.o \
+          $(DEPS_DIR)/libz/compress.o \
+          $(DEPS_DIR)/libz/crc32.o \
+          $(DEPS_DIR)/libz/deflate.o \
+          $(DEPS_DIR)/libz/gzclose.o \
+          $(DEPS_DIR)/libz/gzlib.o \
+          $(DEPS_DIR)/libz/gzread.o \
+          $(DEPS_DIR)/libz/gzwrite.o \
+          $(DEPS_DIR)/libz/inffast.o \
+          $(DEPS_DIR)/libz/inflate.o \
+          $(DEPS_DIR)/libz/inftrees.o \
+          $(DEPS_DIR)/libz/trees.o \
+          $(DEPS_DIR)/libz/uncompr.o \
+          $(DEPS_DIR)/libz/zutil.o
 else
 ifeq ($(HAVE_ZLIB),1)
 OBJ += $(ZLIB_OBJS)
diff --git a/Makefile.ctr b/Makefile.ctr
index 5c6ed2669b..34e658c347 100644
--- a/Makefile.ctr
+++ b/Makefile.ctr
@@ -142,7 +142,7 @@ ifeq ($(WHOLE_ARCHIVE_LINK), 1)
    WHOLE_END := -Wl,--no-whole-archive
 endif
 
-CFLAGS += -I. -Ideps/zlib -Ideps/7zip -Ilibretro-common/include
+CFLAGS += -I. -Ideps/libz -Ideps/7zip -Ilibretro-common/include
 
 CFLAGS += -DRARCH_INTERNAL -DRARCH_CONSOLE -DSINC_LOWEST_QUALITY
 CFLAGS += -DHAVE_FILTERS_BUILTIN $(DEFINES)
diff --git a/Makefile.ctr.salamander b/Makefile.ctr.salamander
index 0ca6e01103..f3f1a780f3 100644
--- a/Makefile.ctr.salamander
+++ b/Makefile.ctr.salamander
@@ -74,7 +74,7 @@ else
    CFLAGS	+= -O3
 endif
 
-CFLAGS += -I. -Ideps/zlib -Ideps/7zip -Ilibretro-common/include
+CFLAGS += -I. -Ideps/libz -Ideps/7zip -Ilibretro-common/include
 
 #CFLAGS += -DRARCH_INTERNAL
 CFLAGS += -DRARCH_CONSOLE -DIS_SALAMANDER
diff --git a/Makefile.emscripten b/Makefile.emscripten
index 908072621f..3b9bcf5775 100644
--- a/Makefile.emscripten
+++ b/Makefile.emscripten
@@ -72,7 +72,7 @@ OBJ += libretro-common/audio/dsp_filters/phaser.o
 OBJ += libretro-common/audio/dsp_filters/reverb.o
 OBJ += libretro-common/audio/dsp_filters/wahwah.o
 
-CFLAGS += -Ideps/zlib/
+CFLAGS += -Ideps/libz/
 libretro = libretro_emscripten.bc
 
 ifneq ($(V), 1)
@@ -111,7 +111,7 @@ $(TARGET): $(OBJ)
 
 clean:
 	rm -f *.o
-	rm -f deps/zlib/*.o
+	rm -f deps/libz/*.o
 	rm -f frontend/*.o
 	rm -f menu/*.o
 	rm -f menu/disp/*.o
diff --git a/Makefile.griffin b/Makefile.griffin
index e2c7616d12..c152619e2e 100644
--- a/Makefile.griffin
+++ b/Makefile.griffin
@@ -89,7 +89,7 @@ else ifeq ($(libogc_platform), 1)
   EXT_TARGET := $(TARGET_NAME)_$(platform).dol
   EXT_INTER_TARGET := $(TARGET_NAME)_$(platform).elf
 
-  INCLUDE += -I. -I$(DEVKITPRO)/libogc/include -Ideps/zlib
+  INCLUDE += -I. -I$(DEVKITPRO)/libogc/include -Ideps/libz
 
 ifeq ($(platform), ngc)
   LIBDIRS += -L$(DEVKITPRO)/libogc/lib/cube
@@ -213,7 +213,7 @@ else ifeq ($(platform), vita)
   MACHDEP := -DVITA
   WANT_ZLIB						:= 1
   INCLUDE += -Ideps/libvita2d/include
-  INCLUDE += -Ideps/zlib
+  INCLUDE += -Ideps/libz
   PLATCFLAGS := -marm -mfloat-abi=hard -fsingle-precision-constant \
        -mword-relocations -fno-unwind-tables -fno-asynchronous-unwind-tables -ftree-vectorize -fno-optimize-sibling-calls
   LIBS += -lSceDisplay_stub -lSceGxm_stub -lSceNet_stub -lSceNetCtl_stub\
diff --git a/Makefile.ps3 b/Makefile.ps3
index 4af7a1e088..d09aeccfa7 100644
--- a/Makefile.ps3
+++ b/Makefile.ps3
@@ -34,7 +34,7 @@ EBOOT_PATH		= pkg/ps3/USRDIR/EBOOT.BIN
 CORE_PATH		= pkg/ps3/USRDIR/cores/CORE.SELF
 
 LDDIRS = -L. -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt
-INCDIRS = -I. -Idefines -Ideps/zlib -Ilibretro-common/include
+INCDIRS = -I. -Idefines -Ideps/libz -Ilibretro-common/include
 
 # system platform
 system_platform = unix
diff --git a/Makefile.ps3.salamander b/Makefile.ps3.salamander
index 028c77f1e6..5d9e553091 100644
--- a/Makefile.ps3.salamander
+++ b/Makefile.ps3.salamander
@@ -18,7 +18,7 @@ endif
 
 STRIP			= $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-strip.exe
 
-PPU_CFLAGS		+= -I. -Ilibretro-common/include -Ideps/zlib -D__CELLOS_LV2__ -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_SYSUTILS -DHAVE_SYSMODULES -DHAVE_RARCH_EXEC
+PPU_CFLAGS		+= -I. -Ilibretro-common/include -Ideps/libz -D__CELLOS_LV2__ -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_SYSUTILS -DHAVE_SYSMODULES -DHAVE_RARCH_EXEC
 PPU_SRCS		= frontend/frontend_salamander.c \
 				  frontend/frontend_driver.c \
 				  frontend/drivers/platform_ps3.c \
diff --git a/Makefile.psl1ght b/Makefile.psl1ght
index 2ca0fefbef..341fa5dbbf 100644
--- a/Makefile.psl1ght
+++ b/Makefile.psl1ght
@@ -17,7 +17,7 @@ ELF_TARGET := retroarch_psl1ght.elf
 EBOOT_PATH		= pkg/ps3/USRDIR/EBOOT.BIN
 CORE_PATH		= pkg/ps3/USRDIR/cores/CORE.SELF
 
-INCLUDE := -I. -I$(PS3DEV)/ppu/include -Ideps/zlib -Ips3/gcmgl/include/export -Ips3/include
+INCLUDE := -I. -I$(PS3DEV)/ppu/include -Ideps/libz -Ips3/gcmgl/include/export -Ips3/include
 LIBDIRS := -L$(PS3DEV)/ppu/lib -L$(PS3DEV)/portlibs/ppu/lib -L.
 
 MACHDEP := -D__CELLOS_LV2__ -D__PSL1GHT__
diff --git a/Makefile.psp1 b/Makefile.psp1
index f88d5062cb..2127d3e3bb 100644
--- a/Makefile.psp1
+++ b/Makefile.psp1
@@ -19,7 +19,7 @@ ifeq ($(WHOLE_ARCHIVE_LINK), 1)
    WHOLE_END := -Wl,--no-whole-archive
 endif
 
-INCDIR = deps/zlib deps/7zip libretro-common/include
+INCDIR = deps/libz deps/7zip libretro-common/include
 CFLAGS = $(OPTIMIZE_LV) -G0 -std=gnu99 -ffast-math
 ASFLAGS = $(CFLAGS)
 
diff --git a/Makefile.vita b/Makefile.vita
index 9b27cb4b32..9d6708e89e 100644
--- a/Makefile.vita
+++ b/Makefile.vita
@@ -97,7 +97,7 @@ STRIP   := $(PREFIX)strip
 NM      := $(PREFIX)nm
 LD      := $(CXX)
 
-INCDIRS := -I. -Ideps/zlib -Ideps/7zip -Ilibretro-common/include
+INCDIRS := -I. -Ideps/libz -Ideps/7zip -Ilibretro-common/include
 LIBDIRS := -L.
 
 ARCHFLAGS := -march=armv7-a -mfpu=neon -mfloat-abi=hard -DVITA
diff --git a/Makefile.wii.salamander b/Makefile.wii.salamander
index 11db3bdb90..bf7058d441 100644
--- a/Makefile.wii.salamander
+++ b/Makefile.wii.salamander
@@ -29,7 +29,7 @@ ELF2DOL = $(DEVKITPPC)/bin/elf2dol$(EXE_EXT)
 DOL_TARGET := retroarch-salamander_wii.dol
 ELF_TARGET := retroarch-salamander_wii.elf
 
-INCLUDE := -I. -I$(DEVKITPRO)/libogc/include -Ilibretro-common/include -Ideps/zlib
+INCLUDE := -I. -I$(DEVKITPRO)/libogc/include -Ilibretro-common/include -Ideps/libz
 LIBDIRS := -L$(DEVKITPRO)/libogc/lib/wii -L.
 
 MACHDEP := -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float
diff --git a/Makefile.wiiu b/Makefile.wiiu
index 89f12510cc..25b1eb775c 100644
--- a/Makefile.wiiu
+++ b/Makefile.wiiu
@@ -101,7 +101,7 @@ else
 endif
 
 
-INCDIRS := -I. -Ideps/zlib -Ideps/7zip -Ilibretro-common/include -Iwiiu -Iwiiu/include -I$(DEVKITPRO)/portlibs/ppc/include
+INCDIRS := -I. -Ideps/libz -Ideps/7zip -Ilibretro-common/include -Iwiiu -Iwiiu/include -I$(DEVKITPRO)/portlibs/ppc/include
 LIBDIRS := -L. -L$(DEVKITPRO)/portlibs/ppc/lib
 
 CFLAGS  := -mwup -mcpu=750 -meabi -mhard-float
diff --git a/Makefile.wiiu.salamander b/Makefile.wiiu.salamander
index 66e406752d..4a292d99fd 100644
--- a/Makefile.wiiu.salamander
+++ b/Makefile.wiiu.salamander
@@ -59,7 +59,7 @@ else
 endif
 
 
-INCDIRS := -I. -Ideps/zlib -Ideps/7zip -Ilibretro-common/include -Iwiiu -Iwiiu/include -I$(DEVKITPRO)/portlibs/ppc/include
+INCDIRS := -I. -Ideps/libz -Ideps/7zip -Ilibretro-common/include -Iwiiu -Iwiiu/include -I$(DEVKITPRO)/portlibs/ppc/include
 LIBDIRS := -L. -L$(DEVKITPRO)/portlibs/ppc/lib
 
 CFLAGS  := -mwup -mcpu=750 -meabi -mhard-float
diff --git a/deps/zlib/adler32.c b/deps/libz/zlib/adler32.c
similarity index 100%
rename from deps/zlib/adler32.c
rename to deps/libz/zlib/adler32.c
diff --git a/deps/zlib/compress.c b/deps/libz/zlib/compress.c
similarity index 100%
rename from deps/zlib/compress.c
rename to deps/libz/zlib/compress.c
diff --git a/deps/zlib/crc32.c b/deps/libz/zlib/crc32.c
similarity index 100%
rename from deps/zlib/crc32.c
rename to deps/libz/zlib/crc32.c
diff --git a/deps/zlib/deflate.c b/deps/libz/zlib/deflate.c
similarity index 100%
rename from deps/zlib/deflate.c
rename to deps/libz/zlib/deflate.c
diff --git a/deps/zlib/deflate.h b/deps/libz/zlib/deflate.h
similarity index 100%
rename from deps/zlib/deflate.h
rename to deps/libz/zlib/deflate.h
diff --git a/deps/zlib/gzclose.c b/deps/libz/zlib/gzclose.c
similarity index 100%
rename from deps/zlib/gzclose.c
rename to deps/libz/zlib/gzclose.c
diff --git a/deps/zlib/gzfile.h b/deps/libz/zlib/gzfile.h
similarity index 100%
rename from deps/zlib/gzfile.h
rename to deps/libz/zlib/gzfile.h
diff --git a/deps/zlib/gzguts.h b/deps/libz/zlib/gzguts.h
similarity index 100%
rename from deps/zlib/gzguts.h
rename to deps/libz/zlib/gzguts.h
diff --git a/deps/zlib/gzlib.c b/deps/libz/zlib/gzlib.c
similarity index 100%
rename from deps/zlib/gzlib.c
rename to deps/libz/zlib/gzlib.c
diff --git a/deps/zlib/gzread.c b/deps/libz/zlib/gzread.c
similarity index 100%
rename from deps/zlib/gzread.c
rename to deps/libz/zlib/gzread.c
diff --git a/deps/zlib/gzwrite.c b/deps/libz/zlib/gzwrite.c
similarity index 100%
rename from deps/zlib/gzwrite.c
rename to deps/libz/zlib/gzwrite.c
diff --git a/deps/zlib/infback.c b/deps/libz/zlib/infback.c
similarity index 100%
rename from deps/zlib/infback.c
rename to deps/libz/zlib/infback.c
diff --git a/deps/zlib/inffast.c b/deps/libz/zlib/inffast.c
similarity index 100%
rename from deps/zlib/inffast.c
rename to deps/libz/zlib/inffast.c
diff --git a/deps/zlib/inffast.h b/deps/libz/zlib/inffast.h
similarity index 100%
rename from deps/zlib/inffast.h
rename to deps/libz/zlib/inffast.h
diff --git a/deps/zlib/inffixed.h b/deps/libz/zlib/inffixed.h
similarity index 100%
rename from deps/zlib/inffixed.h
rename to deps/libz/zlib/inffixed.h
diff --git a/deps/zlib/inflate.c b/deps/libz/zlib/inflate.c
similarity index 100%
rename from deps/zlib/inflate.c
rename to deps/libz/zlib/inflate.c
diff --git a/deps/zlib/inflate.h b/deps/libz/zlib/inflate.h
similarity index 100%
rename from deps/zlib/inflate.h
rename to deps/libz/zlib/inflate.h
diff --git a/deps/zlib/inftrees.c b/deps/libz/zlib/inftrees.c
similarity index 100%
rename from deps/zlib/inftrees.c
rename to deps/libz/zlib/inftrees.c
diff --git a/deps/zlib/inftrees.h b/deps/libz/zlib/inftrees.h
similarity index 100%
rename from deps/zlib/inftrees.h
rename to deps/libz/zlib/inftrees.h
diff --git a/deps/zlib/trees.c b/deps/libz/zlib/trees.c
similarity index 100%
rename from deps/zlib/trees.c
rename to deps/libz/zlib/trees.c
diff --git a/deps/zlib/trees.h b/deps/libz/zlib/trees.h
similarity index 100%
rename from deps/zlib/trees.h
rename to deps/libz/zlib/trees.h
diff --git a/deps/zlib/uncompr.c b/deps/libz/zlib/uncompr.c
similarity index 100%
rename from deps/zlib/uncompr.c
rename to deps/libz/zlib/uncompr.c
diff --git a/deps/zlib/zconf.h b/deps/libz/zlib/zconf.h
similarity index 100%
rename from deps/zlib/zconf.h
rename to deps/libz/zlib/zconf.h
diff --git a/deps/zlib/zconf.h.in b/deps/libz/zlib/zconf.h.in
similarity index 100%
rename from deps/zlib/zconf.h.in
rename to deps/libz/zlib/zconf.h.in
diff --git a/deps/zlib/zutil.c b/deps/libz/zlib/zutil.c
similarity index 100%
rename from deps/zlib/zutil.c
rename to deps/libz/zlib/zutil.c
diff --git a/griffin/griffin.c b/griffin/griffin.c
index a6e5897ca5..ede0fa99c0 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -1075,20 +1075,20 @@ extern "C" {
 DEPENDENCIES
 ============================================================ */
 #ifdef WANT_ZLIB
-#include "../deps/zlib/adler32.c"
-#include "../deps/zlib/compress.c"
-#include "../deps/zlib/crc32.c"
-#include "../deps/zlib/deflate.c"
-#include "../deps/zlib/gzclose.c"
-#include "../deps/zlib/gzlib.c"
-#include "../deps/zlib/gzread.c"
-#include "../deps/zlib/gzwrite.c"
-#include "../deps/zlib/inffast.c"
-#include "../deps/zlib/inflate.c"
-#include "../deps/zlib/inftrees.c"
-#include "../deps/zlib/trees.c"
-#include "../deps/zlib/uncompr.c"
-#include "../deps/zlib/zutil.c"
+#include "../deps/libz/adler32.c"
+#include "../deps/libz/compress.c"
+#include "../deps/libz/crc32.c"
+#include "../deps/libz/deflate.c"
+#include "../deps/libz/gzclose.c"
+#include "../deps/libz/gzlib.c"
+#include "../deps/libz/gzread.c"
+#include "../deps/libz/gzwrite.c"
+#include "../deps/libz/inffast.c"
+#include "../deps/libz/inflate.c"
+#include "../deps/libz/inftrees.c"
+#include "../deps/libz/trees.c"
+#include "../deps/libz/uncompr.c"
+#include "../deps/libz/zutil.c"
 #endif
 
 #ifdef HAVE_7ZIP