From 2612484c54cf7397b3bce87be79ce6b1e7ca45e6 Mon Sep 17 00:00:00 2001
From: rogerman <rogerman@users.noreply.github.com>
Date: Sat, 26 Nov 2016 17:11:39 -0800
Subject: [PATCH] Core: Update some include paths.

---
 desmume/src/texcache.cpp                                  | 2 +-
 desmume/src/utils/colorspacehandler/colorspacehandler.cpp | 3 ---
 desmume/src/utils/emufat.h                                | 8 ++++----
 desmume/src/utils/fsnitro.h                               | 4 ++--
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/desmume/src/texcache.cpp b/desmume/src/texcache.cpp
index 30e76cbcb..a8f3534e8 100644
--- a/desmume/src/texcache.cpp
+++ b/desmume/src/texcache.cpp
@@ -23,7 +23,7 @@
 
 #include "texcache.h"
 
-#include "bits.h"
+#include "./utils/bits.h"
 #include "common.h"
 #include "debug.h"
 #include "gfx3d.h"
diff --git a/desmume/src/utils/colorspacehandler/colorspacehandler.cpp b/desmume/src/utils/colorspacehandler/colorspacehandler.cpp
index a0b10ae78..e10fc08f4 100644
--- a/desmume/src/utils/colorspacehandler/colorspacehandler.cpp
+++ b/desmume/src/utils/colorspacehandler/colorspacehandler.cpp
@@ -18,13 +18,10 @@
 #include "colorspacehandler.h"
 
 #if defined(ENABLE_AVX2)
-	#include "colorspacehandler_AVX2.h"
 	#include "colorspacehandler_AVX2.cpp"
 #elif defined(ENABLE_SSE2)
-	#include "colorspacehandler_SSE2.h"
 	#include "colorspacehandler_SSE2.cpp"
 #elif defined(ENABLE_ALTIVEC)
-	#include "colorspacehandler_AltiVec.h"
 	#include "colorspacehandler_AltiVec.cpp"
 #endif
 
diff --git a/desmume/src/utils/emufat.h b/desmume/src/utils/emufat.h
index 6b60461eb..bcfd82806 100644
--- a/desmume/src/utils/emufat.h
+++ b/desmume/src/utils/emufat.h
@@ -25,8 +25,8 @@
 //Copyright (C) 1998 H. Peter Anvin <hpa@zytor.com>
 //Copyright (C) 1998-2005 Roman Hodek <Roman.Hodek@informatik.uni-erlangen.de>
 
-//based on libfat
-//Copyright (c) 2006 Michael "Chishm" Chisholm
+//based on libfat
+//Copyright (c) 2006 Michael "Chishm" Chisholm
 
 #ifndef EMUFAT_H
 #define EMUFAT_H
@@ -73,7 +73,7 @@ static const u8 BOOTSIG1 = 0XAA;
 static void (*dateTime_)(u16* date, u16* time) = NULL;
 
 
-#include "PACKED.h"
+#include "../PACKED.h"
 
 //A partition table entry for a MBR formatted storage device.
 //The MBR partition table has four entries.
@@ -262,7 +262,7 @@ struct __PACKED TFat32BootSector {
 	u8 boot_sign[2];
 };
 
-#include "PACKED_END.h"
+#include "../PACKED_END.h"
 
 // End Of Chain values for FAT entries
 //FAT16 end of chain value used by Microsoft. 
diff --git a/desmume/src/utils/fsnitro.h b/desmume/src/utils/fsnitro.h
index b90a9bcf6..80c33f47a 100644
--- a/desmume/src/utils/fsnitro.h
+++ b/desmume/src/utils/fsnitro.h
@@ -34,7 +34,7 @@ enum FNT_TYPES
 	FS_RESERVED = 3,
 };
 
-#include "PACKED.h"
+#include "../PACKED.h"
 struct FAT_NITRO
 {
 	FAT_NITRO()
@@ -91,7 +91,7 @@ struct OVR_NITRO
 	u32 fileID;
 	u32 reserved;
 };
-#include "PACKED_END.h"
+#include "../PACKED_END.h"
 
 class FS_NITRO
 {