diff --git a/libretro-common/formats/png/test/rpng_test.c b/libretro-common/formats/png/test/rpng_test.c
index 5642eab9ac..57d37df356 100644
--- a/libretro-common/formats/png/test/rpng_test.c
+++ b/libretro-common/formats/png/test/rpng_test.c
@@ -30,6 +30,7 @@
 
 #include <file/nbio.h>
 #include <formats/rpng.h>
+#include <formats/image.h>
 
 static bool rpng_load_image_argb(const char *path, uint32_t **data,
       unsigned *width, unsigned *height)
@@ -87,9 +88,9 @@ static bool rpng_load_image_argb(const char *path, uint32_t **data,
    do
    {
       retval = rpng_nbio_load_image_argb_process(rpng, data, width, height);
-   }while(retval == PNG_PROCESS_NEXT);
+   }while(retval == IMAGE_PROCESS_NEXT);
 
-   if (retval == PNG_PROCESS_ERROR || retval == PNG_PROCESS_ERROR_END)
+   if (retval == IMAGE_PROCESS_ERROR || retval == IMAGE_PROCESS_ERROR_END)
       ret = false;
 
 end:
diff --git a/libretro-common/include/formats/rpng.h b/libretro-common/include/formats/rpng.h
index 6141e0f9db..94db62932f 100644
--- a/libretro-common/include/formats/rpng.h
+++ b/libretro-common/include/formats/rpng.h
@@ -35,9 +35,6 @@ RETRO_BEGIN_DECLS
 
 typedef struct rpng rpng_t;
 
-bool rpng_load_image_argb(const char *path, uint32_t **data,
-      unsigned *width, unsigned *height);
-
 rpng_t *rpng_nbio_load_image_argb_init(const char *path);
 
 bool rpng_is_valid(rpng_t *rpng);
diff --git a/libretro-common/streams/file_stream.c b/libretro-common/streams/file_stream.c
index d6ee69691e..d02c8ae616 100644
--- a/libretro-common/streams/file_stream.c
+++ b/libretro-common/streams/file_stream.c
@@ -477,11 +477,7 @@ int filestream_read_file(const char *path, void **buf, ssize_t *len)
 
    if (!file)
    {
-#if __STDC_VERSION__ >= 199901L
-      fprintf(stderr, "%s: Failed to open %s: %s\n", __FUNCTION__, path, strerror(errno));
-#else
       fprintf(stderr, "Failed to open %s: %s\n", path, strerror(errno));
-#endif
       goto error;
    }
 
@@ -502,11 +498,7 @@ int filestream_read_file(const char *path, void **buf, ssize_t *len)
    ret = filestream_read(file, content_buf, content_buf_size);
    if (ret < 0)
    {
-#if __STDC_VERSION__ >= 199901L
-      fprintf(stderr, "%s: Failed to read %s: %s\n", __FUNCTION__, path, strerror(errno));
-#else
       fprintf(stderr, "Failed to read %s: %s\n", path, strerror(errno));
-#endif
       goto error;
    }