diff --git a/libretro-common/formats/png/rpng_common.h b/libretro-common/formats/png/rpng_common.h
index 06ecf10fa8..b16d8e0600 100644
--- a/libretro-common/formats/png/rpng_common.h
+++ b/libretro-common/formats/png/rpng_common.h
@@ -58,12 +58,6 @@ struct png_ihdr
    uint8_t interlace;
 };
 
-struct idat_buffer
-{
-   uint8_t *data;
-   size_t size;
-};
-
 enum png_chunk_type
 {
    PNG_CHUNK_NOOP = 0,
diff --git a/libretro-common/formats/png/rpng_nbio.c b/libretro-common/formats/png/rpng_nbio.c
index 430420af12..08fba47264 100644
--- a/libretro-common/formats/png/rpng_nbio.c
+++ b/libretro-common/formats/png/rpng_nbio.c
@@ -170,7 +170,7 @@ static bool png_read_plte_into_buf(uint32_t *buffer, unsigned entries)
 bool rpng_nbio_load_image_argb_iterate(uint8_t *buf,
       struct png_chunk *chunk,
       uint32_t *palette,
-      struct png_ihdr *ihdr, struct idat_buffer *idat_buf,
+      struct png_ihdr *ihdr,
       struct rpng_t *rpng)
 {
    unsigned i;
@@ -233,15 +233,15 @@ bool rpng_nbio_load_image_argb_iterate(uint8_t *buf,
          if (!(rpng->has_ihdr) || rpng->has_iend || (ihdr->color_type == 3 && !(rpng->has_plte)))
             return false;
 
-         if (!png_realloc_idat(chunk, idat_buf))
+         if (!png_realloc_idat(chunk, &rpng->idat_buf))
             return false;
 
          buf += 8;
 
          for (i = 0; i < chunk->size; i++)
-            idat_buf->data[i + idat_buf->size] = buf[i];
+            rpng->idat_buf.data[i + rpng->idat_buf.size] = buf[i];
 
-         idat_buf->size += chunk->size;
+         rpng->idat_buf.size += chunk->size;
 
          rpng->has_idat = true;
          break;
@@ -259,7 +259,7 @@ bool rpng_nbio_load_image_argb_iterate(uint8_t *buf,
 
 bool rpng_nbio_load_image_argb_process(struct rpng_t *rpng,
       struct png_ihdr *ihdr,
-      struct idat_buffer *idat_buf, uint32_t **data,
+      uint32_t **data,
       uint32_t *palette,
       unsigned *width, unsigned *height)
 {
@@ -278,8 +278,8 @@ bool rpng_nbio_load_image_argb_process(struct rpng_t *rpng,
    if (!rpng->inflate_buf)
       return false;
 
-   stream.next_in   = idat_buf->data;
-   stream.avail_in  = idat_buf->size;
+   stream.next_in   = rpng->idat_buf.data;
+   stream.avail_in  = rpng->idat_buf.size;
    stream.avail_out = inflate_buf_size;
    stream.next_out  = rpng->inflate_buf;
 
@@ -319,7 +319,6 @@ bool rpng_nbio_load_image_argb(const char *path, uint32_t **data,
 {
    size_t file_len;
    struct nbio_t* nbread = NULL;
-   struct idat_buffer idat_buf = {0};
    struct png_ihdr ihdr = {0};
    uint32_t palette[256] = {0};
    struct rpng_t rpng = {0};
@@ -361,7 +360,7 @@ bool rpng_nbio_load_image_argb(const char *path, uint32_t **data,
          GOTO_END_ERROR();
 
       if (!rpng_nbio_load_image_argb_iterate(
-            rpng.buff_data, &chunk, palette, &ihdr, &idat_buf,
+            rpng.buff_data, &chunk, palette, &ihdr,
             &rpng))
          break;
 
@@ -378,15 +377,15 @@ bool rpng_nbio_load_image_argb(const char *path, uint32_t **data,
       GOTO_END_ERROR();
    
    rpng_nbio_load_image_argb_process(&rpng,
-         &ihdr, &idat_buf, data, palette,
+         &ihdr, data, palette,
          width, height);
 
 end:
    nbio_free(nbread);
    if (!ret)
       free(*data);
-   if (idat_buf.data)
-      free(idat_buf.data);
+   if (rpng.idat_buf.data)
+      free(rpng.idat_buf.data);
    if (rpng.inflate_buf)
       free(rpng.inflate_buf);
    return ret;
diff --git a/libretro-common/include/formats/rpng.h b/libretro-common/include/formats/rpng.h
index 554c503599..6f56bb5d5a 100644
--- a/libretro-common/include/formats/rpng.h
+++ b/libretro-common/include/formats/rpng.h
@@ -24,6 +24,7 @@
 #define __LIBRETRO_SDK_FORMAT_RPNG_H__
 
 #include <stdint.h>
+#include <stddef.h>
 
 #include <boolean.h>
 
@@ -35,12 +36,19 @@
 extern "C" {
 #endif
 
+struct idat_buffer
+{
+   uint8_t *data;
+   size_t size;
+};
+
 struct rpng_t
 {
    bool has_ihdr;
    bool has_idat;
    bool has_iend;
    bool has_plte;
+   struct idat_buffer idat_buf;
    uint8_t *inflate_buf;
    uint8_t *buff_data;
 };