Move types.h out of 3ds section.

source/3ds/3ds.h

@@ -3,7 +3,6 @@
 
 #include "cbmd.h"
 #include "lz11.h"
-#include "types.h"
 #include "util.h"
 
 #endif

source/3ds/cbmd.h

@@ -1,7 +1,7 @@
 #ifndef __CBMD_H__
 #define __CBMD_H__
 
-#include "types.h"
+#include "../types.h"
 
 typedef enum {
     CGFX_COMMON,

source/3ds/lz11.h

@@ -1,7 +1,7 @@
 #ifndef __LZ11_H__
 #define __LZ11_H__
 
-#include "types.h"
+#include "../types.h"
 
 u8* lz11_compress(u8* input, u32 inputSize, u32* size);
 

source/3ds/util.h

@@ -1,7 +1,7 @@
 #ifndef __UTIL_H__
 #define __UTIL_H__
 
-#include "types.h"
+#include "../types.h"
 
 u8* image_to_tiles(const char* image, u32 width, u32 height, u32* size);
 

source/main.cpp

@@ -1,13 +1,12 @@
 #include "3ds/3ds.h"
-#include "data.h"
 #include "commandline.h"
+#include "data.h"
+#include "types.h"
 
 #include <stdio.h>
 #include <malloc.h>
 #include <string.h>
 
-#include <map>
-
 u8* convert_to_cgfx(const char* image, u32 width, u32 height, u32* size) {
     u32 convertedSize = 0;
     u8* converted = image_to_tiles(image, width, height, &convertedSize);