diff --git a/code/3DSHelper.h b/code/3DSHelper.h
index 0bfa1e2b1..115f396e9 100644
--- a/code/3DSHelper.h
+++ b/code/3DSHelper.h
@@ -50,7 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 namespace Assimp	{
 namespace D3DS	{
 
-#include "./../include/Compiler/pushpack1.h"
+#include "./../include/assimp/Compiler/pushpack1.h"
 
 // ---------------------------------------------------------------------------
 /** Discreet3DS class: Helper class for loading 3ds files. Defines chunks
@@ -352,7 +352,7 @@ struct Texture
 	int iUVSrc;
 };
 
-#include "./../include/Compiler/poppack1.h"
+#include "./../include/assimp/Compiler/poppack1.h"
 
 // ---------------------------------------------------------------------------
 /** Helper structure representing a 3ds material */
diff --git a/code/3DSLoader.h b/code/3DSLoader.h
index b240ed2f2..1578603d5 100644
--- a/code/3DSLoader.h
+++ b/code/3DSLoader.h
@@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_3DSIMPORTER_H_INC
 
 #include "BaseImporter.h"
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 struct aiNode;
 #include "3DSHelper.h"
diff --git a/code/ACLoader.h b/code/ACLoader.h
index a1ee4025f..7d16ede41 100644
--- a/code/ACLoader.h
+++ b/code/ACLoader.h
@@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <vector>
 
 #include "BaseImporter.h"
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 namespace Assimp	{
 
diff --git a/code/ASELoader.h b/code/ASELoader.h
index 17a4740e4..90e476e76 100644
--- a/code/ASELoader.h
+++ b/code/ASELoader.h
@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_ASELOADER_H_INCLUDED
 
 #include "BaseImporter.h"
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 struct aiNode;
 #include "ASEParser.h"
diff --git a/code/ASEParser.h b/code/ASEParser.h
index 4c5802713..76bd58d7c 100644
--- a/code/ASEParser.h
+++ b/code/ASEParser.h
@@ -49,9 +49,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <list>
 
 // public ASSIMP headers
-#include "../include/aiTypes.h"
-#include "../include/aiMesh.h"
-#include "../include/aiAnim.h"
+#include "../include/assimp/aiTypes.h"
+#include "../include/assimp/aiMesh.h"
+#include "../include/assimp/aiAnim.h"
 
 // for some helper routines like IsSpace()
 #include "ParsingUtils.h"
diff --git a/code/Assimp.cpp b/code/Assimp.cpp
index 8cfa6321d..7c5b9e20c 100644
--- a/code/Assimp.cpp
+++ b/code/Assimp.cpp
@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "AssimpPCH.h"
-#include "../include/assimp.h"
+#include "../include/assimp/assimp.h"
 
 #include "GenericProperty.h"
 #include "CInterfaceIOWrapper.h"
diff --git a/code/AssimpPCH.cpp b/code/AssimpPCH.cpp
index 01e539ecc..846a89402 100644
--- a/code/AssimpPCH.cpp
+++ b/code/AssimpPCH.cpp
@@ -2,7 +2,7 @@
 // Actually just a dummy, used by the compiler to build the precompiled header.
 
 #include "AssimpPCH.h"
-#include "./../include/aiVersion.h"
+#include "./../include/assimp/aiVersion.h"
 
 // --------------------------------------------------------------------------------
 // Legal information string - dont't remove this.
diff --git a/code/AssimpPCH.h b/code/AssimpPCH.h
index b5931317d..400008872 100644
--- a/code/AssimpPCH.h
+++ b/code/AssimpPCH.h
@@ -52,7 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * using exactly the same settings in aiDefines.h. Settings in AssimpPCH.h may differ,
  * they won't affect the public API.
  */
-#include "../include/aiDefines.h"
+#include "../include/assimp/aiDefines.h"
 
 // Include our stdint.h replacement header for MSVC, take the global header for gcc/mingw
 #if defined( _MSC_VER) && (_MSC_VER < 1600)
@@ -132,13 +132,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <boost/lexical_cast.hpp>
 
 // Public ASSIMP headers
-#include "../include/DefaultLogger.h"
-#include "../include/IOStream.h"
-#include "../include/IOSystem.h"
-#include "../include/aiScene.h"
-#include "../include/aiPostProcess.h"
-#include "../include/assimp.hpp"
-#include "../include/export.hpp"
+#include "../include/assimp/DefaultLogger.h"
+#include "../include/assimp/IOStream.h"
+#include "../include/assimp/IOSystem.h"
+#include "../include/assimp/aiScene.h"
+#include "../include/assimp/aiPostProcess.h"
+#include "../include/assimp/assimp.hpp"
+#include "../include/assimp/export.hpp"
 
 // Internal utility headers
 #include "BaseImporter.h"
diff --git a/code/B3DImporter.h b/code/B3DImporter.h
index 50ffcd4dd..397d5a776 100644
--- a/code/B3DImporter.h
+++ b/code/B3DImporter.h
@@ -44,9 +44,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_B3DIMPORTER_H_INC
 #define AI_B3DIMPORTER_H_INC
 
-#include "../include/aiTypes.h"
-#include "../include/aiMesh.h"
-#include "../include/aiMaterial.h"
+#include "../include/assimp/aiTypes.h"
+#include "../include/assimp/aiMesh.h"
+#include "../include/assimp/aiMaterial.h"
 
 #include <string>
 #include <vector>
diff --git a/code/BaseImporter.h b/code/BaseImporter.h
index e5c5a0b50..61a4970d1 100644
--- a/code/BaseImporter.h
+++ b/code/BaseImporter.h
@@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <string>
 #include <map>
 #include <vector>
-#include "./../include/aiTypes.h"
+#include "./../include/assimp/aiTypes.h"
 
 struct aiScene;
 
diff --git a/code/BaseProcess.h b/code/BaseProcess.h
index 366fb31f8..7df232a8f 100644
--- a/code/BaseProcess.h
+++ b/code/BaseProcess.h
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <map>
 
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 #include "GenericProperty.h"
 
 struct aiScene;
diff --git a/code/ByteSwap.h b/code/ByteSwap.h
index 544c9af4d..0b94e35db 100644
--- a/code/ByteSwap.h
+++ b/code/ByteSwap.h
@@ -43,8 +43,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_BYTESWAP_H_INC
 #define AI_BYTESWAP_H_INC
 
-#include "../include/aiAssert.h"
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiAssert.h"
+#include "../include/assimp/aiTypes.h"
 
 #if _MSC_VER >= 1400 
 #include <stdlib.h>
diff --git a/code/CInterfaceIOWrapper.h b/code/CInterfaceIOWrapper.h
index 98ecc6544..901cad919 100644
--- a/code/CInterfaceIOWrapper.h
+++ b/code/CInterfaceIOWrapper.h
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_CIOSYSTEM_H_INCLUDED
 #define AI_CIOSYSTEM_H_INCLUDED
 
-#include "../include/aiFileIO.h"
+#include "../include/assimp/aiFileIO.h"
 
 namespace Assimp	{
 	
diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index 393131dcd..29cf9de9b 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -8,7 +8,7 @@ SET( LIBRARY_SOVERSION "2" )
 # 3) Add libassimp using the file lists (eliminates duplication of file names between
 #    source groups and library command)
 #
-SET( HEADER_PATH ../include )
+SET( HEADER_PATH ../include/assimp )
 
 SET( COMPILER_HEADERS
 	${HEADER_PATH}/Compiler/pushpack1.h
diff --git a/code/ColladaExporter.h b/code/ColladaExporter.h
index 131ccf1ea..3644ad884 100644
--- a/code/ColladaExporter.h
+++ b/code/ColladaExporter.h
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_COLLADAEXPORTER_H_INC
 #define AI_COLLADAEXPORTER_H_INC
 
-#include "../include/aiAssert.h"
+#include "../include/assimp/aiAssert.h"
 #include <sstream>
 
 struct aiScene;
diff --git a/code/ColladaLoader.cpp b/code/ColladaLoader.cpp
index 394848b2d..ae8e5b784 100644
--- a/code/ColladaLoader.cpp
+++ b/code/ColladaLoader.cpp
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "AssimpPCH.h"
 #ifndef ASSIMP_BUILD_NO_DAE_IMPORTER
 
-#include "../include/aiAnim.h"
+#include "../include/assimp/aiAnim.h"
 #include "ColladaLoader.h"
 #include "ColladaParser.h"
 
diff --git a/code/ComputeUVMappingProcess.h b/code/ComputeUVMappingProcess.h
index 9d066a573..db6d440fe 100644
--- a/code/ComputeUVMappingProcess.h
+++ b/code/ComputeUVMappingProcess.h
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_COMPUTEUVMAPPING_H_INC
 
 #include "BaseProcess.h"
-#include "../include/aiMesh.h"
+#include "../include/assimp/aiMesh.h"
 
 class ComputeUVMappingTest;
 namespace Assimp
diff --git a/code/ConvertToLHProcess.h b/code/ConvertToLHProcess.h
index 8acbf1a0a..bdb29f333 100644
--- a/code/ConvertToLHProcess.h
+++ b/code/ConvertToLHProcess.h
@@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_CONVERTTOLHPROCESS_H_INC
 #define AI_CONVERTTOLHPROCESS_H_INC
 
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 #include "BaseProcess.h"
 
 struct aiMesh;
diff --git a/code/DeboneProcess.h b/code/DeboneProcess.h
index 6a8747fe0..3831ed094 100644
--- a/code/DeboneProcess.h
+++ b/code/DeboneProcess.h
@@ -46,8 +46,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <utility>
 #include "BaseProcess.h"
 
-#include "../include/aiMesh.h"
-#include "../include/aiScene.h"
+#include "../include/assimp/aiMesh.h"
+#include "../include/assimp/aiScene.h"
 
 class DeboneTest;
 
diff --git a/code/DefaultIOStream.h b/code/DefaultIOStream.h
index 178a2536c..f1bdb942b 100644
--- a/code/DefaultIOStream.h
+++ b/code/DefaultIOStream.h
@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_DEFAULTIOSTREAM_H_INC
 
 #include <stdio.h>
-#include "../include/IOStream.h"
+#include "../include/assimp/IOStream.h"
 
 namespace Assimp	{
 
diff --git a/code/DefaultIOSystem.h b/code/DefaultIOSystem.h
index a471be64c..d7e4cedc6 100644
--- a/code/DefaultIOSystem.h
+++ b/code/DefaultIOSystem.h
@@ -42,7 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_DEFAULTIOSYSTEM_H_INC
 #define AI_DEFAULTIOSYSTEM_H_INC
 
-#include "../include/IOSystem.h"
+#include "../include/assimp/IOSystem.h"
 
 namespace Assimp	{
 
diff --git a/code/DefaultProgressHandler.h b/code/DefaultProgressHandler.h
index e859c6c47..76bf97f30 100644
--- a/code/DefaultProgressHandler.h
+++ b/code/DefaultProgressHandler.h
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef INCLUDED_AI_DEFAULTPROGRESSHANDLER_H
 #define INCLUDED_AI_DEFAULTPROGRESSHANDLER_H
 
-#include "../include/ProgressHandler.h"
+#include "../include/assimp/ProgressHandler.h"
 namespace Assimp	{
 
 // ------------------------------------------------------------------------------------
diff --git a/code/FileLogStream.h b/code/FileLogStream.h
index 2ab624ce1..c9e3a7201 100644
--- a/code/FileLogStream.h
+++ b/code/FileLogStream.h
@@ -1,8 +1,8 @@
 #ifndef ASSIMP_FILELOGSTREAM_H_INC
 #define ASSIMP_FILELOGSTREAM_H_INC
 
-#include "../include/LogStream.h"
-#include "../include/IOStream.h"
+#include "../include/assimp/LogStream.h"
+#include "../include/assimp/IOStream.h"
 
 namespace Assimp	{
 
diff --git a/code/FileSystemFilter.h b/code/FileSystemFilter.h
index 0fab4bccc..753396619 100644
--- a/code/FileSystemFilter.h
+++ b/code/FileSystemFilter.h
@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_FILESYSTEMFILTER_H_INC
 #define AI_FILESYSTEMFILTER_H_INC
 
-#include "../include/IOSystem.h"
+#include "../include/assimp/IOSystem.h"
 #include "fast_atof.h"
 #include "ParsingUtils.h"
 namespace Assimp	{
diff --git a/code/FindDegenerates.h b/code/FindDegenerates.h
index 7e5d11da3..e137ffa69 100644
--- a/code/FindDegenerates.h
+++ b/code/FindDegenerates.h
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_FINDDEGENERATESPROCESS_H_INC
 
 #include "BaseProcess.h"
-#include "../include/aiMesh.h"
+#include "../include/assimp/aiMesh.h"
 
 class FindDegeneratesProcessTest;
 namespace Assimp	{
diff --git a/code/FindInvalidDataProcess.h b/code/FindInvalidDataProcess.h
index ce7536109..b0547063b 100644
--- a/code/FindInvalidDataProcess.h
+++ b/code/FindInvalidDataProcess.h
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_FINDINVALIDDATA_H_INC
 
 #include "BaseProcess.h"
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 struct aiMesh;
 class FindInvalidDataProcessTest;
diff --git a/code/GenFaceNormalsProcess.h b/code/GenFaceNormalsProcess.h
index 03dba556e..69d9d6677 100644
--- a/code/GenFaceNormalsProcess.h
+++ b/code/GenFaceNormalsProcess.h
@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_GENFACENORMALPROCESS_H_INC
 
 #include "BaseProcess.h"
-#include "../include/aiMesh.h"
+#include "../include/assimp/aiMesh.h"
 
 namespace Assimp
 {
diff --git a/code/GenVertexNormalsProcess.h b/code/GenVertexNormalsProcess.h
index c0e37ab96..70d5dd49c 100644
--- a/code/GenVertexNormalsProcess.h
+++ b/code/GenVertexNormalsProcess.h
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_GENVERTEXNORMALPROCESS_H_INC
 
 #include "BaseProcess.h"
-#include "../include/aiMesh.h"
+#include "../include/assimp/aiMesh.h"
 
 class GenNormalsTest;
 
diff --git a/code/GenericProperty.h b/code/GenericProperty.h
index 6a62d1ba9..fefd71081 100644
--- a/code/GenericProperty.h
+++ b/code/GenericProperty.h
@@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_GENERIC_PROPERTY_H_INCLUDED
 #define AI_GENERIC_PROPERTY_H_INCLUDED
 
-#include "./../include/assimp.hpp"
+#include "./../include/assimp/assimp.hpp"
 #include "Hash.h"
 
 // ------------------------------------------------------------------------------------------------
diff --git a/code/HMPFileData.h b/code/HMPFileData.h
index 832e6c2a0..ba0f3ac36 100644
--- a/code/HMPFileData.h
+++ b/code/HMPFileData.h
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 namespace Assimp	{
 namespace HMP	{
 
-#include "./../include/Compiler/pushpack1.h"
+#include "./../include/assimp/Compiler/pushpack1.h"
 
 // to make it easier for us, we test the magic word against both "endianesses"
 #define AI_HMP_MAGIC_NUMBER_BE_4	AI_MAKE_MAGIC("HMP4")
@@ -128,7 +128,7 @@ struct Vertex_HMP7
 	int8_t normal_x,normal_y;
 } PACK_STRUCT;
 
-#include "./../include/Compiler/poppack1.h"
+#include "./../include/assimp/Compiler/poppack1.h"
 
 } //! namespace HMP
 } //! namespace Assimp
diff --git a/code/HMPLoader.h b/code/HMPLoader.h
index 4db57fa4a..08bc1f4c4 100644
--- a/code/HMPLoader.h
+++ b/code/HMPLoader.h
@@ -45,9 +45,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_HMPLOADER_H_INCLUDED
 
 // public ASSIMP headers
-#include "../include/aiTypes.h"
-#include "../include/aiTexture.h"
-#include "../include/aiMaterial.h"
+#include "../include/assimp/aiTypes.h"
+#include "../include/assimp/aiTexture.h"
+#include "../include/assimp/aiMaterial.h"
 
 // internal headers
 #include "BaseImporter.h"
diff --git a/code/HalfLifeFileData.h b/code/HalfLifeFileData.h
index 21c8c9c1c..6eeaf41b8 100644
--- a/code/HalfLifeFileData.h
+++ b/code/HalfLifeFileData.h
@@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_MDLFILEHELPER2_H_INC
 #define AI_MDLFILEHELPER2_H_INC
 
-#include "./../include/Compiler/pushpack1.h"
+#include "./../include/assimp/Compiler/pushpack1.h"
 
 #include "MDLFileData.h"
 
@@ -142,7 +142,7 @@ struct Header_HL2
 	int32_t			transitionindex;
 } PACK_STRUCT;
 
-#include "./../include/Compiler/poppack1.h"
+#include "./../include/assimp/Compiler/poppack1.h"
 
 }
 } // end namespaces
diff --git a/code/IFF.h b/code/IFF.h
index 3272f5154..f730427c2 100644
--- a/code/IFF.h
+++ b/code/IFF.h
@@ -12,7 +12,7 @@
 namespace Assimp	{
 namespace IFF		{
 
-#include "./../include/Compiler/pushpack1.h"
+#include "./../include/assimp/Compiler/pushpack1.h"
 
 /////////////////////////////////////////////////////////////////////////////////
 //! Describes an IFF chunk header
@@ -39,7 +39,7 @@ struct SubChunkHeader
 	uint16_t length;
 } PACK_STRUCT;
 
-#include "./../include/Compiler/poppack1.h"
+#include "./../include/assimp/Compiler/poppack1.h"
 
 
 #define AI_IFF_FOURCC(a,b,c,d) ((uint32_t) (((uint8_t)a << 24u) | \
diff --git a/code/Importer.cpp b/code/Importer.cpp
index 450959f35..9a7080e12 100644
--- a/code/Importer.cpp
+++ b/code/Importer.cpp
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "AssimpPCH.h"
-#include "../include/aiVersion.h"
+#include "../include/assimp/aiVersion.h"
 
 // ------------------------------------------------------------------------------------------------
 /* Uncomment this line to prevent Assimp from catching unknown exceptions.
diff --git a/code/ImproveCacheLocality.h b/code/ImproveCacheLocality.h
index 03c1c502b..ad4a9150f 100644
--- a/code/ImproveCacheLocality.h
+++ b/code/ImproveCacheLocality.h
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_IMPROVECACHELOCALITY_H_INC
 
 #include "BaseProcess.h"
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 struct aiMesh;
 
diff --git a/code/JoinVerticesProcess.h b/code/JoinVerticesProcess.h
index 777b944c7..45cfd0e43 100644
--- a/code/JoinVerticesProcess.h
+++ b/code/JoinVerticesProcess.h
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_JOINVERTICESPROCESS_H_INC
 
 #include "BaseProcess.h"
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 namespace Assimp
 {
diff --git a/code/LWOFileData.h b/code/LWOFileData.h
index f5be357bf..32fbc8e4d 100644
--- a/code/LWOFileData.h
+++ b/code/LWOFileData.h
@@ -52,7 +52,7 @@ The chunks are taken from the official LightWave SDK headers.
 #include <list>
 
 // public ASSIMP headers
-#include "../include/aiMesh.h"
+#include "../include/assimp/aiMesh.h"
 
 // internal headers
 #include "IFF.h"
diff --git a/code/LWOLoader.h b/code/LWOLoader.h
index a68ce9232..afa75d6e6 100644
--- a/code/LWOLoader.h
+++ b/code/LWOLoader.h
@@ -42,8 +42,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_LWOLOADER_H_INCLUDED
 #define AI_LWOLOADER_H_INCLUDED
 
-#include "../include/aiTypes.h"
-#include "../include/DefaultLogger.h"
+#include "../include/assimp/aiTypes.h"
+#include "../include/assimp/DefaultLogger.h"
 
 #include "LWOFileData.h"
 #include "BaseImporter.h"
diff --git a/code/MD2FileData.h b/code/MD2FileData.h
index fdc4736e7..f1ddd1e08 100644
--- a/code/MD2FileData.h
+++ b/code/MD2FileData.h
@@ -45,11 +45,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_MD2FILEHELPER_H_INC
 #define AI_MD2FILEHELPER_H_INC
 
-#include "../include/aiTypes.h"
-#include "../include/aiMesh.h"
-#include "../include/aiAnim.h"
+#include "../include/assimp/aiTypes.h"
+#include "../include/assimp/aiMesh.h"
+#include "../include/assimp/aiAnim.h"
 
-#include "./../include/Compiler/pushpack1.h"
+#include "./../include/assimp/Compiler/pushpack1.h"
 
 namespace Assimp	{
 namespace MD2	{
@@ -146,7 +146,7 @@ struct Skin
 	char name[AI_MD2_MAXQPATH];              /* texture file name */
 } PACK_STRUCT;
 
-#include "./../include/Compiler/poppack1.h"
+#include "./../include/assimp/Compiler/poppack1.h"
 
 
 // ---------------------------------------------------------------------------
diff --git a/code/MD2Loader.h b/code/MD2Loader.h
index c1d0b9ce6..035424bed 100644
--- a/code/MD2Loader.h
+++ b/code/MD2Loader.h
@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_MD2LOADER_H_INCLUDED
 
 #include "BaseImporter.h"
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 struct aiNode;
 #include "MD2FileData.h"
diff --git a/code/MD3FileData.h b/code/MD3FileData.h
index 9b4ea2a71..0004d3164 100644
--- a/code/MD3FileData.h
+++ b/code/MD3FileData.h
@@ -50,11 +50,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <vector>
 #include <sstream>
 
-#include "../include/aiTypes.h"
-#include "../include/aiMesh.h"
-#include "../include/aiAnim.h"
+#include "../include/assimp/aiTypes.h"
+#include "../include/assimp/aiMesh.h"
+#include "../include/assimp/aiAnim.h"
 
-#include "./../include/Compiler/pushpack1.h"
+#include "./../include/assimp/Compiler/pushpack1.h"
 
 namespace Assimp	{
 namespace MD3	{
@@ -246,7 +246,7 @@ struct Vertex
 	uint16_t  NORMAL;
 } PACK_STRUCT;
 
-#include "./../include/Compiler/poppack1.h"
+#include "./../include/assimp/Compiler/poppack1.h"
 
 // -------------------------------------------------------------------------------
 /**	@brief Unpack a Q3 16 bit vector to its full float3 representation
diff --git a/code/MD3Loader.h b/code/MD3Loader.h
index 7a2f88af4..71f6ecc1d 100644
--- a/code/MD3Loader.h
+++ b/code/MD3Loader.h
@@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "BaseImporter.h"
 #include "ByteSwap.h"
 
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 #include "MD3FileData.h"
 namespace Assimp	{
diff --git a/code/MD5Loader.h b/code/MD5Loader.h
index 48d060688..c4524a088 100644
--- a/code/MD5Loader.h
+++ b/code/MD5Loader.h
@@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "BaseImporter.h"
 #include "MD5Parser.h"
 
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 namespace Assimp	{
 
diff --git a/code/MD5Parser.h b/code/MD5Parser.h
index 98809ae65..bc2318b14 100644
--- a/code/MD5Parser.h
+++ b/code/MD5Parser.h
@@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_MD5PARSER_H_INCLUDED
 #define AI_MD5PARSER_H_INCLUDED
 
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 #include "ParsingUtils.h"
 
 struct aiFace;
diff --git a/code/MDCFileData.h b/code/MDCFileData.h
index 4b93c8ae5..966abcfb5 100644
--- a/code/MDCFileData.h
+++ b/code/MDCFileData.h
@@ -49,11 +49,11 @@ http://themdcfile.planetwolfenstein.gamespy.com/MDC_File_Format.pdf
 #ifndef AI_MDCFILEHELPER_H_INC
 #define AI_MDCFILEHELPER_H_INC
 
-#include "../include/aiTypes.h"
-#include "../include/aiMesh.h"
-#include "../include/aiAnim.h"
+#include "../include/assimp/aiTypes.h"
+#include "../include/assimp/aiMesh.h"
+#include "../include/assimp/aiAnim.h"
 
-#include "./../include/Compiler/pushpack1.h"
+#include "./../include/assimp/Compiler/pushpack1.h"
 
 
 namespace Assimp {
@@ -183,7 +183,7 @@ struct Shader
 
 } PACK_STRUCT;
 
-#include "./../include/Compiler/poppack1.h"
+#include "./../include/assimp/Compiler/poppack1.h"
 
 
 // ---------------------------------------------------------------------------
diff --git a/code/MDCLoader.h b/code/MDCLoader.h
index 1d20ffd14..aa9bb8ef6 100644
--- a/code/MDCLoader.h
+++ b/code/MDCLoader.h
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_MDCLOADER_H_INCLUDED
 #define AI_MDCLOADER_H_INCLUDED
 
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 #include "BaseImporter.h"
 #include "MDCFileData.h"
diff --git a/code/MDLFileData.h b/code/MDLFileData.h
index e98c4e732..b9b28af7d 100644
--- a/code/MDLFileData.h
+++ b/code/MDLFileData.h
@@ -52,7 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_MDLFILEHELPER_H_INC
 #define AI_MDLFILEHELPER_H_INC
 
-#include "./../include/Compiler/pushpack1.h"
+#include "./../include/assimp/Compiler/pushpack1.h"
 
 namespace Assimp	{
 namespace MDL	{
@@ -724,7 +724,7 @@ struct GroupFrame
 	SimpleFrame *frames; 
 } PACK_STRUCT;
 
-#include "./../include/Compiler/poppack1.h"
+#include "./../include/assimp/Compiler/poppack1.h"
 
 // -------------------------------------------------------------------------------------
 /** \struct IntFace_MDL7
diff --git a/code/NFFLoader.h b/code/NFFLoader.h
index 6572fa5c1..11f3a0fa6 100644
--- a/code/NFFLoader.h
+++ b/code/NFFLoader.h
@@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "BaseImporter.h"
 #include <vector>
 
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 namespace Assimp	{
 
diff --git a/code/OFFLoader.h b/code/OFFLoader.h
index 721129e5e..64bdee741 100644
--- a/code/OFFLoader.h
+++ b/code/OFFLoader.h
@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_OFFLOADER_H_INCLUDED
 
 #include "BaseImporter.h"
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 #include <vector>
 
 namespace Assimp	{
diff --git a/code/ObjExporter.cpp b/code/ObjExporter.cpp
index 796b2641b..9dce9cc39 100644
--- a/code/ObjExporter.cpp
+++ b/code/ObjExporter.cpp
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ASSIMP_BUILD_NO_OBJ_EXPORTER
 
 #include "ObjExporter.h"
-#include "../include/aiVersion.h"
+#include "../include/assimp/aiVersion.h"
 
 using namespace Assimp;
 namespace Assimp	{
diff --git a/code/ObjFileData.h b/code/ObjFileData.h
index 41924a1d0..16a421359 100644
--- a/code/ObjFileData.h
+++ b/code/ObjFileData.h
@@ -43,8 +43,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <vector>
 #include <map>
-#include "../include/aiTypes.h"
-#include "../include/aiMesh.h"
+#include "../include/assimp/aiTypes.h"
+#include "../include/assimp/aiMesh.h"
 
 namespace Assimp
 {
diff --git a/code/ObjFileParser.cpp b/code/ObjFileParser.cpp
index 0e4e72396..90a42a823 100644
--- a/code/ObjFileParser.cpp
+++ b/code/ObjFileParser.cpp
@@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ObjTools.h"
 #include "ObjFileData.h"
 #include "ParsingUtils.h"
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 #include "DefaultIOSystem.h"
 
 namespace Assimp	
diff --git a/code/OptimizeGraph.h b/code/OptimizeGraph.h
index 2fb841292..85ba2eb68 100644
--- a/code/OptimizeGraph.h
+++ b/code/OptimizeGraph.h
@@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "BaseProcess.h"
 #include "ProcessHelper.h"
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 struct aiMesh;
 class OptimizeGraphProcessTest;
diff --git a/code/OptimizeMeshes.h b/code/OptimizeMeshes.h
index 9bc692721..243e8a4db 100644
--- a/code/OptimizeMeshes.h
+++ b/code/OptimizeMeshes.h
@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_OPTIMIZEMESHESPROCESS_H_INC
 
 #include "BaseProcess.h"
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 struct aiMesh;
 class OptimizeMeshesProcessTest;
diff --git a/code/PlyLoader.h b/code/PlyLoader.h
index e6b13122f..928ecf60d 100644
--- a/code/PlyLoader.h
+++ b/code/PlyLoader.h
@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_PLYLOADER_H_INCLUDED
 
 #include "BaseImporter.h"
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 struct aiNode;
 
diff --git a/code/PretransformVertices.h b/code/PretransformVertices.h
index cf1ab4d1f..79ca234a7 100644
--- a/code/PretransformVertices.h
+++ b/code/PretransformVertices.h
@@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_PRETRANSFORMVERTICES_H_INC
 
 #include "BaseProcess.h"
-#include "../include/aiMesh.h"
+#include "../include/assimp/aiMesh.h"
 
 class PretransformVerticesTest;
 namespace Assimp	{
diff --git a/code/ProcessHelper.h b/code/ProcessHelper.h
index 4243a07f3..e280a7381 100644
--- a/code/ProcessHelper.h
+++ b/code/ProcessHelper.h
@@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_PROCESS_HELPER_H_INCLUDED
 #define AI_PROCESS_HELPER_H_INCLUDED
 
-#include "../include/aiPostProcess.h"
+#include "../include/assimp/aiPostProcess.h"
 
 #include "SpatialSort.h"
 #include "BaseProcess.h"
diff --git a/code/Profiler.h b/code/Profiler.h
index c4c50c8dd..6c7eec313 100644
--- a/code/Profiler.h
+++ b/code/Profiler.h
@@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "boost/timer.hpp"
 
-#include "../include/DefaultLogger.h"
+#include "../include/assimp/DefaultLogger.h"
 #include "TinyFormatter.h"
 
 namespace Assimp {
diff --git a/code/Q3BSPFileImporter.cpp b/code/Q3BSPFileImporter.cpp
index 67cd36688..bde16c4fb 100644
--- a/code/Q3BSPFileImporter.cpp
+++ b/code/Q3BSPFileImporter.cpp
@@ -53,8 +53,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #	include "../contrib/zlib/zlib.h"
 #endif
 
-#include "../include/aiTypes.h"
-#include "../include/aiMesh.h"
+#include "../include/assimp/aiTypes.h"
+#include "../include/assimp/aiMesh.h"
 #include <vector>
 
 namespace Assimp
diff --git a/code/Q3BSPZipArchive.h b/code/Q3BSPZipArchive.h
index e4b79b0ac..22b4d4676 100644
--- a/code/Q3BSPZipArchive.h
+++ b/code/Q3BSPZipArchive.h
@@ -41,8 +41,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_Q3BSP_ZIPARCHIVE_H_INC
 
 #include "../contrib/unzip/unzip.h"
-#include "../include/IOStream.h"
-#include "../include/IOSystem.h"
+#include "../include/assimp/IOStream.h"
+#include "../include/assimp/IOSystem.h"
 #include <string>
 #include <vector>
 #include <map>
diff --git a/code/Q3DLoader.h b/code/Q3DLoader.h
index a7f061e30..c02e94ddf 100644
--- a/code/Q3DLoader.h
+++ b/code/Q3DLoader.h
@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_Q3DLOADER_H_INCLUDED
 
 #include "BaseImporter.h"
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 #include <vector>
 
 namespace Assimp	{
diff --git a/code/RawLoader.h b/code/RawLoader.h
index edff37e5a..54513a90c 100644
--- a/code/RawLoader.h
+++ b/code/RawLoader.h
@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_RAWLOADER_H_INCLUDED
 
 #include "BaseImporter.h"
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 #include <vector>
 
 namespace Assimp	{
diff --git a/code/RemoveComments.h b/code/RemoveComments.h
index 6dd031cf0..eb3bf2ad9 100644
--- a/code/RemoveComments.h
+++ b/code/RemoveComments.h
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_REMOVE_COMMENTS_H_INC
 #define AI_REMOVE_COMMENTS_H_INC
 
-#include "../include/aiAssert.h"
+#include "../include/assimp/aiAssert.h"
 
 namespace Assimp	{
 
diff --git a/code/RemoveRedundantMaterials.h b/code/RemoveRedundantMaterials.h
index ea45d7b3b..d7904a742 100644
--- a/code/RemoveRedundantMaterials.h
+++ b/code/RemoveRedundantMaterials.h
@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_REMOVEREDUNDANTMATERIALS_H_INC
 
 #include "BaseProcess.h"
-#include "../include/aiMesh.h"
+#include "../include/assimp/aiMesh.h"
 
 class RemoveRedundantMatsTest;
 namespace Assimp	{
diff --git a/code/RemoveVCProcess.h b/code/RemoveVCProcess.h
index c41ee20e1..8a89d8b27 100644
--- a/code/RemoveVCProcess.h
+++ b/code/RemoveVCProcess.h
@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_REMOVEVCPROCESS_H_INCLUDED
 
 #include "BaseProcess.h"
-#include "../include/aiMesh.h"
+#include "../include/assimp/aiMesh.h"
 
 class RemoveVCProcessTest;
 namespace Assimp	{
diff --git a/code/SGSpatialSort.h b/code/SGSpatialSort.h
index 725d900ac..6a953c5f4 100644
--- a/code/SGSpatialSort.h
+++ b/code/SGSpatialSort.h
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_D3DSSPATIALSORT_H_INC
 
 #include <vector>
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 namespace Assimp	{
 
diff --git a/code/SMDLoader.h b/code/SMDLoader.h
index be6777303..6b7f74837 100644
--- a/code/SMDLoader.h
+++ b/code/SMDLoader.h
@@ -50,10 +50,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ParsingUtils.h"
 
 // public Assimp headers
-#include "../include/aiTypes.h"
-#include "../include/aiTexture.h"
-#include "../include/aiAnim.h"
-#include "../include/aiMaterial.h"
+#include "../include/assimp/aiTypes.h"
+#include "../include/assimp/aiTexture.h"
+#include "../include/assimp/aiAnim.h"
+#include "../include/assimp/aiMaterial.h"
 struct aiNode;
 
 // STL headers
diff --git a/code/STLExporter.cpp b/code/STLExporter.cpp
index 62d17c3de..03f8bcf7e 100644
--- a/code/STLExporter.cpp
+++ b/code/STLExporter.cpp
@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #if !defined(ASSIMP_BUILD_NO_EXPORT) && !defined(ASSIMP_BUILD_NO_STL_EXPORTER)
 
 #include "STLExporter.h"
-#include "../include/aiVersion.h"
+#include "../include/assimp/aiVersion.h"
 
 using namespace Assimp;
 namespace Assimp	{
diff --git a/code/STLLoader.h b/code/STLLoader.h
index d0b4e242e..d56f32eed 100644
--- a/code/STLLoader.h
+++ b/code/STLLoader.h
@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_STLLOADER_H_INCLUDED
 
 #include "BaseImporter.h"
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 namespace Assimp	{
 
diff --git a/code/SceneCombiner.h b/code/SceneCombiner.h
index 936585ade..d2a407bc2 100644
--- a/code/SceneCombiner.h
+++ b/code/SceneCombiner.h
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_SCENE_COMBINER_H_INC
 #define AI_SCENE_COMBINER_H_INC
 
-#include "../include/aiAssert.h"
+#include "../include/assimp/aiAssert.h"
 
 namespace Assimp	{
 
diff --git a/code/SkeletonMeshBuilder.cpp b/code/SkeletonMeshBuilder.cpp
index 6139e47f5..f2ea5665e 100644
--- a/code/SkeletonMeshBuilder.cpp
+++ b/code/SkeletonMeshBuilder.cpp
@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "AssimpPCH.h"
-#include "../include/aiScene.h"
+#include "../include/assimp/aiScene.h"
 #include "SkeletonMeshBuilder.h"
 
 using namespace Assimp;
diff --git a/code/SkeletonMeshBuilder.h b/code/SkeletonMeshBuilder.h
index 005cbaa3a..f1dbd9a49 100644
--- a/code/SkeletonMeshBuilder.h
+++ b/code/SkeletonMeshBuilder.h
@@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_SKELETONMESHBUILDER_H_INC
 
 #include <vector>
-#include "../include/aiMesh.h"
+#include "../include/assimp/aiMesh.h"
 
 struct aiScene;
 struct aiNode;
diff --git a/code/SortByPTypeProcess.h b/code/SortByPTypeProcess.h
index 11a20e29d..86d82c879 100644
--- a/code/SortByPTypeProcess.h
+++ b/code/SortByPTypeProcess.h
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_SORTBYPTYPEPROCESS_H_INC
 
 #include "BaseProcess.h"
-#include "../include/aiMesh.h"
+#include "../include/assimp/aiMesh.h"
 
 class SortByPTypeProcessTest;
 namespace Assimp	{
diff --git a/code/SpatialSort.h b/code/SpatialSort.h
index 50cd3f848..703eda263 100644
--- a/code/SpatialSort.h
+++ b/code/SpatialSort.h
@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_SPATIALSORT_H_INC
 
 #include <vector>
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 namespace Assimp
 {
diff --git a/code/SplitByBoneCountProcess.h b/code/SplitByBoneCountProcess.h
index fb247898e..ddcdd076a 100644
--- a/code/SplitByBoneCountProcess.h
+++ b/code/SplitByBoneCountProcess.h
@@ -46,8 +46,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <vector>
 #include "BaseProcess.h"
 
-#include "../include/aiMesh.h"
-#include "../include/aiScene.h"
+#include "../include/assimp/aiMesh.h"
+#include "../include/assimp/aiScene.h"
 
 namespace Assimp
 {
diff --git a/code/SplitLargeMeshes.h b/code/SplitLargeMeshes.h
index 61cb2c7f3..b69324d8e 100644
--- a/code/SplitLargeMeshes.h
+++ b/code/SplitLargeMeshes.h
@@ -46,8 +46,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <vector>
 #include "BaseProcess.h"
 
-#include "../include/aiMesh.h"
-#include "../include/aiScene.h"
+#include "../include/assimp/aiMesh.h"
+#include "../include/assimp/aiScene.h"
 
 class SplitLargeMeshesTest;
 namespace Assimp
diff --git a/code/StdOStreamLogStream.h b/code/StdOStreamLogStream.h
index 241510bf1..b54c47564 100644
--- a/code/StdOStreamLogStream.h
+++ b/code/StdOStreamLogStream.h
@@ -1,7 +1,7 @@
 #ifndef AI_STROSTREAMLOGSTREAM_H_INC
 #define AI_STROSTREAMLOGSTREAM_H_INC
 
-#include "../include/LogStream.h"
+#include "../include/assimp/LogStream.h"
 #include <ostream>
 
 namespace Assimp	{
diff --git a/code/ValidateDataStructure.h b/code/ValidateDataStructure.h
index e6d47781c..0c625ebbe 100644
--- a/code/ValidateDataStructure.h
+++ b/code/ValidateDataStructure.h
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_VALIDATEPROCESS_H_INC
 #define AI_VALIDATEPROCESS_H_INC
 
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 #include "BaseProcess.h"
 
 struct aiBone;
diff --git a/code/VertexTriangleAdjacency.h b/code/VertexTriangleAdjacency.h
index 4a58f35a6..72733abbc 100644
--- a/code/VertexTriangleAdjacency.h
+++ b/code/VertexTriangleAdjacency.h
@@ -43,8 +43,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_VTADJACENCY_H_INC
 
 #include "BaseProcess.h"
-#include "../include/aiTypes.h"
-#include "../include/aiAssert.h"
+#include "../include/assimp/aiTypes.h"
+#include "../include/assimp/aiAssert.h"
 
 struct aiMesh;
 namespace Assimp	{
diff --git a/code/Win32DebugLogStream.h b/code/Win32DebugLogStream.h
index 353a99f11..23acbe634 100644
--- a/code/Win32DebugLogStream.h
+++ b/code/Win32DebugLogStream.h
@@ -3,7 +3,7 @@
 
 #ifdef WIN32
 
-#include "../include/LogStream.h"
+#include "../include/assimp/LogStream.h"
 #include "windows.h"
 
 namespace Assimp	{
diff --git a/code/XFileHelper.h b/code/XFileHelper.h
index f6ec8cc36..d8d4b609d 100644
--- a/code/XFileHelper.h
+++ b/code/XFileHelper.h
@@ -46,10 +46,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <string>
 #include <vector>
 
-#include "../include/aiTypes.h"
-#include "../include/aiQuaternion.h"
-#include "../include/aiMesh.h"
-#include "../include/aiAnim.h"
+#include "../include/assimp/aiTypes.h"
+#include "../include/assimp/aiQuaternion.h"
+#include "../include/assimp/aiMesh.h"
+#include "../include/assimp/aiAnim.h"
 
 namespace Assimp
 {
diff --git a/code/XFileImporter.h b/code/XFileImporter.h
index 76bf589e3..64d404921 100644
--- a/code/XFileImporter.h
+++ b/code/XFileImporter.h
@@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "XFileHelper.h"
 #include "BaseImporter.h"
 
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 struct aiNode;
 
diff --git a/code/XFileParser.h b/code/XFileParser.h
index e6912879f..1e06f950b 100644
--- a/code/XFileParser.h
+++ b/code/XFileParser.h
@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <string>
 #include <vector>
 
-#include "../include/aiTypes.h"
+#include "../include/assimp/aiTypes.h"
 
 namespace Assimp
 {
diff --git a/code/irrXMLWrapper.h b/code/irrXMLWrapper.h
index 99948fa47..a1ca48dde 100644
--- a/code/irrXMLWrapper.h
+++ b/code/irrXMLWrapper.h
@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 // some long includes ....
 #include "./../contrib/irrXML/irrXML.h"
-#include "./../include/IOStream.h"
+#include "./../include/assimp/IOStream.h"
 namespace Assimp	{
 
 // ---------------------------------------------------------------------------------
diff --git a/include/Compiler/poppack1.h b/include/assimp/Compiler/poppack1.h
similarity index 100%
rename from include/Compiler/poppack1.h
rename to include/assimp/Compiler/poppack1.h
diff --git a/include/Compiler/pushpack1.h b/include/assimp/Compiler/pushpack1.h
similarity index 100%
rename from include/Compiler/pushpack1.h
rename to include/assimp/Compiler/pushpack1.h
diff --git a/include/DefaultLogger.h b/include/assimp/DefaultLogger.h
similarity index 100%
rename from include/DefaultLogger.h
rename to include/assimp/DefaultLogger.h
diff --git a/include/IOStream.h b/include/assimp/IOStream.h
similarity index 100%
rename from include/IOStream.h
rename to include/assimp/IOStream.h
diff --git a/include/IOSystem.h b/include/assimp/IOSystem.h
similarity index 100%
rename from include/IOSystem.h
rename to include/assimp/IOSystem.h
diff --git a/include/LogStream.h b/include/assimp/LogStream.h
similarity index 100%
rename from include/LogStream.h
rename to include/assimp/LogStream.h
diff --git a/include/Logger.h b/include/assimp/Logger.h
similarity index 100%
rename from include/Logger.h
rename to include/assimp/Logger.h
diff --git a/include/NullLogger.h b/include/assimp/NullLogger.h
similarity index 100%
rename from include/NullLogger.h
rename to include/assimp/NullLogger.h
diff --git a/include/ProgressHandler.h b/include/assimp/ProgressHandler.h
similarity index 100%
rename from include/ProgressHandler.h
rename to include/assimp/ProgressHandler.h
diff --git a/include/aiAnim.h b/include/assimp/aiAnim.h
similarity index 100%
rename from include/aiAnim.h
rename to include/assimp/aiAnim.h
diff --git a/include/aiAssert.h b/include/assimp/aiAssert.h
similarity index 100%
rename from include/aiAssert.h
rename to include/assimp/aiAssert.h
diff --git a/include/aiCamera.h b/include/assimp/aiCamera.h
similarity index 100%
rename from include/aiCamera.h
rename to include/assimp/aiCamera.h
diff --git a/include/aiColor4D.h b/include/assimp/aiColor4D.h
similarity index 100%
rename from include/aiColor4D.h
rename to include/assimp/aiColor4D.h
diff --git a/include/aiColor4D.inl b/include/assimp/aiColor4D.inl
similarity index 100%
rename from include/aiColor4D.inl
rename to include/assimp/aiColor4D.inl
diff --git a/include/aiConfig.h b/include/assimp/aiConfig.h
similarity index 100%
rename from include/aiConfig.h
rename to include/assimp/aiConfig.h
diff --git a/include/aiDefines.h b/include/assimp/aiDefines.h
similarity index 100%
rename from include/aiDefines.h
rename to include/assimp/aiDefines.h
diff --git a/include/aiFileIO.h b/include/assimp/aiFileIO.h
similarity index 100%
rename from include/aiFileIO.h
rename to include/assimp/aiFileIO.h
diff --git a/include/aiLight.h b/include/assimp/aiLight.h
similarity index 100%
rename from include/aiLight.h
rename to include/assimp/aiLight.h
diff --git a/include/aiMaterial.h b/include/assimp/aiMaterial.h
similarity index 100%
rename from include/aiMaterial.h
rename to include/assimp/aiMaterial.h
diff --git a/include/aiMaterial.inl b/include/assimp/aiMaterial.inl
similarity index 100%
rename from include/aiMaterial.inl
rename to include/assimp/aiMaterial.inl
diff --git a/include/aiMatrix3x3.h b/include/assimp/aiMatrix3x3.h
similarity index 100%
rename from include/aiMatrix3x3.h
rename to include/assimp/aiMatrix3x3.h
diff --git a/include/aiMatrix3x3.inl b/include/assimp/aiMatrix3x3.inl
similarity index 100%
rename from include/aiMatrix3x3.inl
rename to include/assimp/aiMatrix3x3.inl
diff --git a/include/aiMatrix4x4.h b/include/assimp/aiMatrix4x4.h
similarity index 100%
rename from include/aiMatrix4x4.h
rename to include/assimp/aiMatrix4x4.h
diff --git a/include/aiMatrix4x4.inl b/include/assimp/aiMatrix4x4.inl
similarity index 100%
rename from include/aiMatrix4x4.inl
rename to include/assimp/aiMatrix4x4.inl
diff --git a/include/aiMesh.h b/include/assimp/aiMesh.h
similarity index 100%
rename from include/aiMesh.h
rename to include/assimp/aiMesh.h
diff --git a/include/aiPostProcess.h b/include/assimp/aiPostProcess.h
similarity index 100%
rename from include/aiPostProcess.h
rename to include/assimp/aiPostProcess.h
diff --git a/include/aiQuaternion.h b/include/assimp/aiQuaternion.h
similarity index 100%
rename from include/aiQuaternion.h
rename to include/assimp/aiQuaternion.h
diff --git a/include/aiQuaternion.inl b/include/assimp/aiQuaternion.inl
similarity index 100%
rename from include/aiQuaternion.inl
rename to include/assimp/aiQuaternion.inl
diff --git a/include/aiScene.h b/include/assimp/aiScene.h
similarity index 100%
rename from include/aiScene.h
rename to include/assimp/aiScene.h
diff --git a/include/aiTexture.h b/include/assimp/aiTexture.h
similarity index 100%
rename from include/aiTexture.h
rename to include/assimp/aiTexture.h
diff --git a/include/aiTypes.h b/include/assimp/aiTypes.h
similarity index 100%
rename from include/aiTypes.h
rename to include/assimp/aiTypes.h
diff --git a/include/aiVector2D.h b/include/assimp/aiVector2D.h
similarity index 100%
rename from include/aiVector2D.h
rename to include/assimp/aiVector2D.h
diff --git a/include/aiVector2D.inl b/include/assimp/aiVector2D.inl
similarity index 100%
rename from include/aiVector2D.inl
rename to include/assimp/aiVector2D.inl
diff --git a/include/aiVector3D.h b/include/assimp/aiVector3D.h
similarity index 100%
rename from include/aiVector3D.h
rename to include/assimp/aiVector3D.h
diff --git a/include/aiVector3D.inl b/include/assimp/aiVector3D.inl
similarity index 100%
rename from include/aiVector3D.inl
rename to include/assimp/aiVector3D.inl
diff --git a/include/aiVersion.h b/include/assimp/aiVersion.h
similarity index 100%
rename from include/aiVersion.h
rename to include/assimp/aiVersion.h
diff --git a/include/assimp.h b/include/assimp/assimp.h
similarity index 100%
rename from include/assimp.h
rename to include/assimp/assimp.h
diff --git a/include/assimp.hpp b/include/assimp/assimp.hpp
similarity index 100%
rename from include/assimp.hpp
rename to include/assimp/assimp.hpp
diff --git a/include/export.h b/include/assimp/export.h
similarity index 100%
rename from include/export.h
rename to include/assimp/export.h
diff --git a/include/export.hpp b/include/assimp/export.hpp
similarity index 100%
rename from include/export.hpp
rename to include/assimp/export.hpp