Integrated FileIO as part of Common instead of a separate subproject

src/Core/Resource/CLight.h

@@ -1,8 +1,8 @@
 #ifndef CLIGHT_H
 #define CLIGHT_H
 
-#include <FileIO/IInputStream.h>
 #include <Common/CColor.h>
+#include <Common/FileIO/IInputStream.h>
 #include <Math/CVector3f.h>
 
 /* CLight is currently heavily based on the lights system from Metroid Prime,

src/Core/Resource/CMaterial.h

@@ -12,7 +12,7 @@
 #include <Common/EGame.h>
 #include <Common/Flags.h>
 #include <Common/types.h>
-#include <FileIO/IInputStream.h>
+#include <Common/FileIO/IInputStream.h>
 
 class CMaterialSet;
 

src/Core/Resource/CMaterialSet.h

@@ -3,8 +3,8 @@
 
 #include "CMaterial.h"
 #include "CTexture.h"
-#include <FileIO/IInputStream.h>
 #include <Common/EGame.h>
+#include <Common/FileIO/IInputStream.h>
 
 class CMaterialSet
 {

src/Core/Resource/CTexture.h

@@ -3,7 +3,7 @@
 
 #include "CResource.h"
 #include "ETexelFormat.h"
-#include <FileIO/FileIO.h>
+#include <Common/FileIO.h>
 #include <Common/types.h>
 #include <Math/CVector2f.h>
 

src/Core/Resource/Cooker/CAreaCooker.h

@@ -3,8 +3,8 @@
 
 #include "CSectionMgrOut.h"
 #include "Core/Resource/Area/CGameArea.h"
-#include <FileIO/FileIO.h>
 #include <Common/EGame.h>
+#include <Common/FileIO.h>
 
 class CAreaCooker
 {

src/Core/Resource/Cooker/CModelCooker.h

@@ -2,8 +2,8 @@
 #define CMODELCOOKER_H
 
 #include "Core/Resource/Model/CModel.h"
-#include <FileIO/FileIO.h>
 #include <Common/EGame.h>
+#include <Common/FileIO.h>
 
 class CModelCooker
 {

src/Core/Resource/Cooker/CPoiToWorldCooker.h

@@ -2,7 +2,7 @@
 #define CPOITOWORLDCOOKER_H
 
 #include "Core/Resource/CPoiToWorld.h"
-#include <FileIO/FileIO.h>
+#include <Common/FileIO.h>
 
 class CPoiToWorldCooker
 {

src/Core/Resource/Cooker/CScriptCooker.h

@@ -3,8 +3,8 @@
 
 #include "Core/Resource/Script/CScriptLayer.h"
 #include "Core/Resource/Script/CScriptObject.h"
-#include <FileIO/FileIO.h>
 #include <Common/EGame.h>
+#include <Common/FileIO.h>
 
 class CScriptCooker
 {

src/Core/Resource/Cooker/CSectionMgrOut.h

@@ -2,7 +2,7 @@
 #define CBLOCKMGROUT_H
 
 #include <Common/types.h>
-#include <FileIO/IOutputStream.h>
+#include <Common/FileIO/IOutputStream.h>
 #include <vector>
 
 // Small class to manage file sections for CMDL/MREA output

src/Core/Resource/Factory/CAreaLoader.h

@@ -6,8 +6,7 @@
 #include "Core/Resource/Area/CGameArea.h"
 #include "Core/Resource/Script/CLink.h"
 #include <Common/EGame.h>
-
-#include <FileIO/FileIO.h>
+#include <Common/FileIO.h>
 
 class CAreaLoader
 {

src/Core/Resource/Factory/CMaterialLoader.h

@@ -5,7 +5,7 @@
 #include "Core/Resource/CMaterialSet.h"
 #include <Common/EGame.h>
 
-#include <FileIO/FileIO.h>
+#include <Common/FileIO.h>
 #include <assimp/scene.h>
 
 class CMaterialLoader

src/Core/Resource/Factory/CModelLoader.h

@@ -6,9 +6,9 @@
 #include "Core/Resource/Model/CBasicModel.h"
 #include "Core/Resource/Model/CModel.h"
 #include <Common/EGame.h>
+#include <Common/FileIO.h>
 #include <Common/Flags.h>
 
-#include <FileIO/FileIO.h>
 #include <assimp/scene.h>
 
 class CModelLoader

src/Core/Resource/Factory/CSectionMgrIn.h

@@ -1,8 +1,8 @@
 #ifndef CSECTIONMGRIN_H
 #define CSECTIONMGRIN_H
 
-#include <FileIO/IInputStream.h>
 #include <Common/types.h>
+#include <Common/FileIO/IInputStream.h>
 #include <vector>
 
 // The purpose of this class is to keep track of data block navigation - required to read CMDL and MREA files correctly

src/Core/Resource/Factory/CTextureDecoder.h

@@ -6,7 +6,7 @@
 #include <Common/CColor.h>
 #include <Common/types.h>
 
-#include <FileIO/FileIO.h>
+#include <Common/FileIO.h>
 
 class CTextureDecoder
 {

src/Core/Resource/Factory/CWorldLoader.h

@@ -4,8 +4,7 @@
 #include "Core/GameProject/CResourceStore.h"
 #include "Core/Resource/CWorld.h"
 #include <Common/EGame.h>
-
-#include <FileIO/FileIO.h>
+#include <Common/FileIO.h>
 
 class CWorldLoader
 {