From 9d29a4ba62c5e7326f15736faa48192aba1b6990 Mon Sep 17 00:00:00 2001
From: jakcron <jkrcarr@gmail.com>
Date: Wed, 25 Nov 2015 11:54:05 +0800
Subject: [PATCH] [makerom/ctrtool] Misc #include cleanup.

---
 ctrtool/ivfc.c   |  1 -
 ctrtool/oschar.h |  4 +---
 ctrtool/romfs.c  |  3 ---
 ctrtool/utils.c  | 10 ++--------
 makerom/oschar.h |  4 +---
 makerom/utils.c  |  4 ----
 6 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/ctrtool/ivfc.c b/ctrtool/ivfc.c
index 7fbb5fc..90df381 100644
--- a/ctrtool/ivfc.c
+++ b/ctrtool/ivfc.c
@@ -5,7 +5,6 @@
 #include "utils.h"
 #include "ivfc.h"
 #include "ctr.h"
-#include <inttypes.h>
 
 void ivfc_init(ivfc_context* ctx)
 {
diff --git a/ctrtool/oschar.h b/ctrtool/oschar.h
index 570a6ca..9c788b0 100644
--- a/ctrtool/oschar.h
+++ b/ctrtool/oschar.h
@@ -3,9 +3,7 @@
 #include <string.h>
 #include <inttypes.h>
 #include <sys/stat.h>
-#include <dirent.h>
 #ifdef _WIN32
-#include <direct.h>
 #include <wchar.h>
 #endif
 
@@ -19,7 +17,7 @@ typedef wchar_t oschar_t; // UTF16-LE
 typedef char oschar_t; // UTF8
 #endif
 
-					   // Simple redirect macros for functions and types
+// Simple redirect macros for functions and types
 #ifdef _WIN32
 #define os_strlen wcslen
 #define os_strcmp wcscmp
diff --git a/ctrtool/romfs.c b/ctrtool/romfs.c
index 3ff49df..05ce5c6 100644
--- a/ctrtool/romfs.c
+++ b/ctrtool/romfs.c
@@ -1,8 +1,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-
 #include "types.h"
 #include "romfs.h"
 #include "utils.h"
diff --git a/ctrtool/utils.c b/ctrtool/utils.c
index bda20d9..d2d4adb 100644
--- a/ctrtool/utils.c
+++ b/ctrtool/utils.c
@@ -1,16 +1,10 @@
-
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
 #include <sys/stat.h>
-#include <sys/types.h>
-#include "utils.h"
-
 #ifdef _WIN32
 #include <direct.h>
-#include <wchar.h>
 #endif
+#include "utils.h"
+
 
 
 u32 align(u32 offset, u32 alignment)
diff --git a/makerom/oschar.h b/makerom/oschar.h
index 570a6ca..9c788b0 100644
--- a/makerom/oschar.h
+++ b/makerom/oschar.h
@@ -3,9 +3,7 @@
 #include <string.h>
 #include <inttypes.h>
 #include <sys/stat.h>
-#include <dirent.h>
 #ifdef _WIN32
-#include <direct.h>
 #include <wchar.h>
 #endif
 
@@ -19,7 +17,7 @@ typedef wchar_t oschar_t; // UTF16-LE
 typedef char oschar_t; // UTF8
 #endif
 
-					   // Simple redirect macros for functions and types
+// Simple redirect macros for functions and types
 #ifdef _WIN32
 #define os_strlen wcslen
 #define os_strcmp wcscmp
diff --git a/makerom/utils.c b/makerom/utils.c
index 92303ed..999433e 100644
--- a/makerom/utils.c
+++ b/makerom/utils.c
@@ -1,8 +1,4 @@
 #include "lib.h"
-#ifndef _WIN32
-#include <iconv.h>
-#endif
-
 #include "polarssl/base64.h"
 
 #define IO_BLOCKSIZE 5*MB