diff --git a/libretro-common/formats/png/Makefile b/libretro-common/formats/png/Makefile
index ea84697cb4..b757cf4da2 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_nbio.c rpng_test.c ../../file/nbio/nbio_stdio.c
+SOURCES := rpng.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.c
index 5d536c154a..e7814be07b 100644
--- a/libretro-common/formats/png/rpng.c
+++ b/libretro-common/formats/png/rpng.c
@@ -630,14 +630,6 @@ bool rpng_load_image_argb_iterate(FILE *file, struct png_chunk *chunk,
       bool *has_ihdr, bool *has_idat,
       bool *has_iend, bool *has_plte, size_t *increment_size)
 {
-#ifdef RPNG_TEST
-   unsigned i;
-   for (i = 0; i < 4; i++)
-   {
-      fprintf(stderr, "chunktype: %c\n", chunk->type[i]);
-   }
-#endif
-   
    switch (png_chunk_type(chunk))
    {
       case PNG_CHUNK_NOOP:
@@ -706,12 +698,6 @@ bool rpng_load_image_argb_iterate(FILE *file, struct png_chunk *chunk,
             *increment_size = sizeof(uint32_t);
             idat_buf->size += chunk->size;
 
-            for (i = 0; i < idat_buf->size; i++)
-            {
-               fprintf(stderr, "%c", idat_buf->data[i]);
-            }
-            fprintf(stderr, "\n");
-
             *has_idat = true;
          }
          break;