diff --git a/Makefile.common b/Makefile.common
index f1ab7d58df..62b3312391 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -570,8 +570,8 @@ endif
 
 ifeq ($(HAVE_ZLIB), 1)
    ZLIB_OBJS =	decompress/zip_support.o 
-   OBJ += libretro-common/formats/png/rpng_nbio.o \
-			 libretro-common/formats/png/rpng.o \
+   OBJ += libretro-common/formats/png/rpng_decode_fnbio.o \
+			 libretro-common/formats/png/rpng_decode_fbio.o \
 			 libretro-common/formats/png/rpng_encode.o \
 			 file_extract.o
    OBJ += $(ZLIB_OBJS)
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 76774cb990..1337d18544 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -180,8 +180,8 @@ VIDEO IMAGE
 #include "../gfx/image/image_rpng.c"
 #endif
 
-#include "../libretro-common/formats/png/rpng.c"
-#include "../libretro-common/formats/png/rpng_nbio.c"
+#include "../libretro-common/formats/png/rpng_decode_fbio.c"
+#include "../libretro-common/formats/png/rpng_decode_fnbio.c"
 #include "../libretro-common/formats/png/rpng_encode.c"
 
 /*============================================================
diff --git a/libretro-common/formats/png/Makefile b/libretro-common/formats/png/Makefile
index 2c5b6a9fda..01ca70c167 100644
--- a/libretro-common/formats/png/Makefile
+++ b/libretro-common/formats/png/Makefile
@@ -8,7 +8,7 @@ CFLAGS += -DHAVE_IMLIB2
 LDFLAGS += -lImlib2
 endif
 
-SOURCES := rpng.c rpng_nbio.c rpng_encode.c rpng_test.c ../../file/nbio/nbio_stdio.c
+SOURCES := rpng_decode_fbio.c rpng_decode_fnbio.c rpng_encode.c rpng_test.c ../../file/nbio/nbio_stdio.c
 OBJS := $(SOURCES:.c=.o)
 
 CFLAGS += -Wall -pedantic -std=gnu99 -O0 -g -DHAVE_ZLIB -DHAVE_ZLIB_DEFLATE -DRPNG_TEST -I../../include
diff --git a/libretro-common/formats/png/rpng.c b/libretro-common/formats/png/rpng_decode_fbio.c
similarity index 100%
rename from libretro-common/formats/png/rpng.c
rename to libretro-common/formats/png/rpng_decode_fbio.c
diff --git a/libretro-common/formats/png/rpng_nbio.c b/libretro-common/formats/png/rpng_decode_fnbio.c
similarity index 100%
rename from libretro-common/formats/png/rpng_nbio.c
rename to libretro-common/formats/png/rpng_decode_fnbio.c