From f871802f51cccba4abc7269ee3ad324c35311aa2 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Mon, 6 Sep 2010 19:35:01 -0400
Subject: [PATCH] Cleaned up some #includes.

---
 src/archiver_dir.c      |  5 -----
 src/archiver_grp.c      |  5 -----
 src/archiver_hog.c      |  5 -----
 src/archiver_iso9660.c  |  2 --
 src/archiver_lzma.c     |  6 ------
 src/archiver_mvl.c      |  5 -----
 src/archiver_qpak.c     |  5 -----
 src/archiver_unpacked.c |  5 -----
 src/archiver_wad.c      |  5 -----
 src/archiver_zip.c      |  5 +----
 src/physfs.c            |  5 -----
 src/physfs_byteorder.c  |  3 ---
 src/physfs_internal.h   | 10 ++++------
 src/physfs_unicode.c    |  2 --
 src/platform_beos.cpp   |  3 ---
 src/platform_os2.c      |  3 ---
 src/platform_pocketpc.c |  1 -
 src/platform_posix.c    |  3 ---
 src/platform_unix.c     |  3 ---
 src/platform_windows.c  |  3 ---
 20 files changed, 5 insertions(+), 79 deletions(-)

diff --git a/src/archiver_dir.c b/src/archiver_dir.c
index 0301c3fb..5ad39233 100644
--- a/src/archiver_dir.c
+++ b/src/archiver_dir.c
@@ -6,11 +6,6 @@
  *  This file written by Ryan C. Gordon.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "physfs.h"
-
 #define __PHYSICSFS_INTERNAL__
 #include "physfs_internal.h"
 
diff --git a/src/archiver_grp.c b/src/archiver_grp.c
index 6c0cf9cf..fc5fcf84 100644
--- a/src/archiver_grp.c
+++ b/src/archiver_grp.c
@@ -26,11 +26,6 @@
 
 #if (defined PHYSFS_SUPPORTS_GRP)
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "physfs.h"
-
 #define __PHYSICSFS_INTERNAL__
 #include "physfs_internal.h"
 
diff --git a/src/archiver_hog.c b/src/archiver_hog.c
index 49b297ca..8f218548 100644
--- a/src/archiver_hog.c
+++ b/src/archiver_hog.c
@@ -31,11 +31,6 @@
 
 #if (defined PHYSFS_SUPPORTS_HOG)
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "physfs.h"
-
 #define __PHYSICSFS_INTERNAL__
 #include "physfs_internal.h"
 
diff --git a/src/archiver_iso9660.c b/src/archiver_iso9660.c
index ac102588..68156e36 100644
--- a/src/archiver_iso9660.c
+++ b/src/archiver_iso9660.c
@@ -29,8 +29,6 @@
 #define __PHYSICSFS_INTERNAL__
 #include "physfs_internal.h"
 
-#include <stdio.h>
-#include <string.h>
 #include <time.h>
 
 /* cache files smaller than this completely in memory */
diff --git a/src/archiver_lzma.c b/src/archiver_lzma.c
index b824b3e4..18197b40 100644
--- a/src/archiver_lzma.c
+++ b/src/archiver_lzma.c
@@ -9,12 +9,6 @@
 
 #if (defined PHYSFS_SUPPORTS_7Z)
 
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include "physfs.h"
-
 #define __PHYSICSFS_INTERNAL__
 #include "physfs_internal.h"
 
diff --git a/src/archiver_mvl.c b/src/archiver_mvl.c
index 1d49a48e..95bb49be 100644
--- a/src/archiver_mvl.c
+++ b/src/archiver_mvl.c
@@ -29,11 +29,6 @@
 
 #if (defined PHYSFS_SUPPORTS_MVL)
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "physfs.h"
-
 #define __PHYSICSFS_INTERNAL__
 #include "physfs_internal.h"
 
diff --git a/src/archiver_qpak.c b/src/archiver_qpak.c
index d5b65df7..b74cb4e0 100644
--- a/src/archiver_qpak.c
+++ b/src/archiver_qpak.c
@@ -31,11 +31,6 @@
 
 #if (defined PHYSFS_SUPPORTS_QPAK)
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "physfs.h"
-
 #define __PHYSICSFS_INTERNAL__
 #include "physfs_internal.h"
 
diff --git a/src/archiver_unpacked.c b/src/archiver_unpacked.c
index cc58cf50..22275671 100644
--- a/src/archiver_unpacked.c
+++ b/src/archiver_unpacked.c
@@ -14,11 +14,6 @@
  *  This file written by Ryan C. Gordon.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "physfs.h"
-
 #define __PHYSICSFS_INTERNAL__
 #include "physfs_internal.h"
 
diff --git a/src/archiver_wad.c b/src/archiver_wad.c
index 179358da..2542434a 100644
--- a/src/archiver_wad.c
+++ b/src/archiver_wad.c
@@ -44,11 +44,6 @@
 
 #if (defined PHYSFS_SUPPORTS_WAD)
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "physfs.h"
-
 #define __PHYSICSFS_INTERNAL__
 #include "physfs_internal.h"
 
diff --git a/src/archiver_zip.c b/src/archiver_zip.c
index 053c0b0a..584bf62a 100644
--- a/src/archiver_zip.c
+++ b/src/archiver_zip.c
@@ -9,14 +9,11 @@
 
 #if (defined PHYSFS_SUPPORTS_ZIP)
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #ifndef _WIN32_WCE
 #include <errno.h>
 #include <time.h>
 #endif
-#include "physfs.h"
+
 #include "zlib.h"
 
 #define __PHYSICSFS_INTERNAL__
diff --git a/src/physfs.c b/src/physfs.c
index 240cf7de..d3504ee1 100644
--- a/src/physfs.c
+++ b/src/physfs.c
@@ -10,11 +10,6 @@
 
 /* !!! FIXME: ERR_PAST_EOF shouldn't trigger for reads. Just return zero. */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "physfs.h"
-
 #define __PHYSICSFS_INTERNAL__
 #include "physfs_internal.h"
 
diff --git a/src/physfs_byteorder.c b/src/physfs_byteorder.c
index e5f72dc6..5b826a7e 100644
--- a/src/physfs_byteorder.c
+++ b/src/physfs_byteorder.c
@@ -8,9 +8,6 @@
  *  This file written by Ryan C. Gordon.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #define __PHYSICSFS_INTERNAL__
 #include "physfs_internal.h"
 
diff --git a/src/physfs_internal.h b/src/physfs_internal.h
index 3379b1dd..d69f152d 100644
--- a/src/physfs_internal.h
+++ b/src/physfs_internal.h
@@ -16,7 +16,10 @@
 
 #include "physfs.h"
 
-#include <stdlib.h>  /* make sure NULL is defined... */
+/* The holy trinity. */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #ifdef HAVE_ASSERT_H
 #include <assert.h>
@@ -29,11 +32,6 @@
 #include <malloc.h>
 #endif
 
-/* !!! FIXME: if HAVE_ALLOCA_H would be good, too. */
-#if sun
-#include <alloca.h>
-#endif
-
 #if defined(__sun) || defined(sun)
 #include <alloca.h>
 #endif
diff --git a/src/physfs_unicode.c b/src/physfs_unicode.c
index 68557343..f90421fb 100644
--- a/src/physfs_unicode.c
+++ b/src/physfs_unicode.c
@@ -1,5 +1,3 @@
-#include "physfs.h"
-
 #define __PHYSICSFS_INTERNAL__
 #include "physfs_internal.h"
 
diff --git a/src/platform_beos.cpp b/src/platform_beos.cpp
index c2a12e98..ffe02572 100644
--- a/src/platform_beos.cpp
+++ b/src/platform_beos.cpp
@@ -35,9 +35,6 @@
 #include <be/support/Locker.h>
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <errno.h>
 #include <unistd.h>
 
diff --git a/src/platform_os2.c b/src/platform_os2.c
index 9b549522..797c1b77 100644
--- a/src/platform_os2.c
+++ b/src/platform_os2.c
@@ -22,10 +22,7 @@
 #define INCL_DOSMISC
 #include <os2.h>
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <errno.h>
-#include <string.h>
 #include <time.h>
 #include <ctype.h>
 
diff --git a/src/platform_pocketpc.c b/src/platform_pocketpc.c
index c94bdc1e..49f6028e 100644
--- a/src/platform_pocketpc.c
+++ b/src/platform_pocketpc.c
@@ -11,7 +11,6 @@
 
 #ifdef PHYSFS_PLATFORM_POCKETPC
 
-#include <stdio.h>
 #include <windows.h>
 
 #include "physfs_internal.h"
diff --git a/src/platform_posix.c b/src/platform_posix.c
index 2a67bf3a..3a6f5b60 100644
--- a/src/platform_posix.c
+++ b/src/platform_posix.c
@@ -11,9 +11,6 @@
 
 #ifdef PHYSFS_PLATFORM_POSIX
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 #include <ctype.h>
 #include <sys/types.h>
diff --git a/src/platform_unix.c b/src/platform_unix.c
index 0ccaeb0f..4dcd366d 100644
--- a/src/platform_unix.c
+++ b/src/platform_unix.c
@@ -11,9 +11,6 @@
 
 #ifdef PHYSFS_PLATFORM_UNIX
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 #include <unistd.h>
 #include <sys/types.h>
diff --git a/src/platform_windows.c b/src/platform_windows.c
index b286578d..6aa73945 100644
--- a/src/platform_windows.c
+++ b/src/platform_windows.c
@@ -17,9 +17,6 @@
 #endif
 
 #include <windows.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <errno.h>
 #include <ctype.h>
 #include <time.h>