From 4dea46f6dcadbf4a76b4364123f3f014d938b49b Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 30 Mar 2015 18:29:51 +0200
Subject: [PATCH] Include <formats/rpng.h> once in rpng_common.h

---
 libretro-common/formats/png/rpng_common.h | 1 +
 libretro-common/formats/png/rpng_decode.c | 1 -
 libretro-common/formats/png/rpng_encode.c | 1 -
 libretro-common/formats/png/rpng_fbio.c   | 2 --
 libretro-common/formats/png/rpng_nbio.c   | 6 ------
 5 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/libretro-common/formats/png/rpng_common.h b/libretro-common/formats/png/rpng_common.h
index 289b77129a..bd613800b3 100644
--- a/libretro-common/formats/png/rpng_common.h
+++ b/libretro-common/formats/png/rpng_common.h
@@ -24,6 +24,7 @@
 #define _RPNG_COMMON_H
 
 #include <retro_inline.h>
+#include <formats/rpng.h>
 #include <stdint.h>
 
 #undef GOTO_END_ERROR
diff --git a/libretro-common/formats/png/rpng_decode.c b/libretro-common/formats/png/rpng_decode.c
index 1c6916c972..a8e640d74c 100644
--- a/libretro-common/formats/png/rpng_decode.c
+++ b/libretro-common/formats/png/rpng_decode.c
@@ -20,7 +20,6 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <formats/rpng.h>
 #include <file/file_extract.h>
 
 #include <stdio.h>
diff --git a/libretro-common/formats/png/rpng_encode.c b/libretro-common/formats/png/rpng_encode.c
index 10feba552a..7efb1773e7 100644
--- a/libretro-common/formats/png/rpng_encode.c
+++ b/libretro-common/formats/png/rpng_encode.c
@@ -20,7 +20,6 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <formats/rpng.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/libretro-common/formats/png/rpng_fbio.c b/libretro-common/formats/png/rpng_fbio.c
index 758ef1750c..81f4ee494a 100644
--- a/libretro-common/formats/png/rpng_fbio.c
+++ b/libretro-common/formats/png/rpng_fbio.c
@@ -20,8 +20,6 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <formats/rpng.h>
-
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/libretro-common/formats/png/rpng_nbio.c b/libretro-common/formats/png/rpng_nbio.c
index 0a58767e74..07d727efb0 100644
--- a/libretro-common/formats/png/rpng_nbio.c
+++ b/libretro-common/formats/png/rpng_nbio.c
@@ -20,16 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <formats/rpng.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef GEKKO
-#include <malloc.h>
-#endif
-
 #include "rpng_common.h"
 #include "rpng_decode.h"