diff --git a/code/3DSLoader.h b/code/3DSLoader.h
index 1578603d5..84c17e3d4 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/assimp/aiTypes.h"
+#include "../include/assimp/types.h"
 
 struct aiNode;
 #include "3DSHelper.h"
diff --git a/code/ACLoader.h b/code/ACLoader.h
index 7d16ede41..b0144b766 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/assimp/aiTypes.h"
+#include "../include/assimp/types.h"
 
 namespace Assimp	{
 
diff --git a/code/ASELoader.h b/code/ASELoader.h
index 90e476e76..a4b67659b 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/assimp/aiTypes.h"
+#include "../include/assimp/types.h"
 
 struct aiNode;
 #include "ASEParser.h"
diff --git a/code/ASEParser.h b/code/ASEParser.h
index 76bd58d7c..84192e5c9 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/assimp/aiTypes.h"
-#include "../include/assimp/aiMesh.h"
-#include "../include/assimp/aiAnim.h"
+#include "../include/assimp/types.h"
+#include "../include/assimp/mesh.h"
+#include "../include/assimp/anim.h"
 
 // for some helper routines like IsSpace()
 #include "ParsingUtils.h"
diff --git a/code/Assimp.cpp b/code/Assimp.cpp
index 7c5b9e20c..3d5dfe7ae 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/assimp.h"
+#include "../include/assimp/cimport.h"
 
 #include "GenericProperty.h"
 #include "CInterfaceIOWrapper.h"
diff --git a/code/AssimpPCH.cpp b/code/AssimpPCH.cpp
index 846a89402..d6dcde619 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/assimp/aiVersion.h"
+#include "./../include/assimp/version.h"
 
 // --------------------------------------------------------------------------------
 // Legal information string - dont't remove this.
diff --git a/code/AssimpPCH.h b/code/AssimpPCH.h
index 400008872..004e11283 100644
--- a/code/AssimpPCH.h
+++ b/code/AssimpPCH.h
@@ -48,11 +48,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define ASSIMP_INTERNAL_BUILD
 
 // ----------------------------------------------------------------------------------------
-/* General compile config taken from aiDefines.h. It is important that the user compiles
- * using exactly the same settings in aiDefines.h. Settings in AssimpPCH.h may differ,
+/* General compile config taken from defs.h. It is important that the user compiles
+ * using exactly the same settings in defs.h. Settings in AssimpPCH.h may differ,
  * they won't affect the public API.
  */
-#include "../include/assimp/aiDefines.h"
+#include "../include/assimp/defs.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/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"
+#include "../include/assimp/DefaultLogger.hpp"
+#include "../include/assimp/IOStream.hpp"
+#include "../include/assimp/IOSystem.hpp"
+#include "../include/assimp/scene.h"
+#include "../include/assimp/postprocess.h"
+#include "../include/assimp/Importer.hpp"
+#include "../include/assimp/Exporter.hpp"
 
 // Internal utility headers
 #include "BaseImporter.h"
diff --git a/code/B3DImporter.h b/code/B3DImporter.h
index 397d5a776..47b35a74a 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/assimp/aiTypes.h"
-#include "../include/assimp/aiMesh.h"
-#include "../include/assimp/aiMaterial.h"
+#include "../include/assimp/types.h"
+#include "../include/assimp/mesh.h"
+#include "../include/assimp/material.h"
 
 #include <string>
 #include <vector>
diff --git a/code/BaseImporter.h b/code/BaseImporter.h
index 61a4970d1..9511629dd 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/assimp/aiTypes.h"
+#include "./../include/assimp/types.h"
 
 struct aiScene;
 
diff --git a/code/BaseProcess.h b/code/BaseProcess.h
index 7df232a8f..45e677b7b 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/assimp/aiTypes.h"
+#include "../include/assimp/types.h"
 #include "GenericProperty.h"
 
 struct aiScene;
diff --git a/code/ByteSwap.h b/code/ByteSwap.h
index 0b94e35db..a90c1a84c 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/assimp/aiAssert.h"
-#include "../include/assimp/aiTypes.h"
+#include "../include/assimp/assert.h"
+#include "../include/assimp/types.h"
 
 #if _MSC_VER >= 1400 
 #include <stdlib.h>
diff --git a/code/CInterfaceIOWrapper.h b/code/CInterfaceIOWrapper.h
index 901cad919..01fcc7422 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/assimp/aiFileIO.h"
+#include "../include/assimp/cfileio.h"
 
 namespace Assimp	{
 	
diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index 29cf9de9b..184967c90 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -18,44 +18,44 @@ SET( COMPILER_HEADERS
 SOURCE_GROUP( Compiler FILES ${COMPILER_HEADERS})
 
 SET( PUBLIC_HEADERS
-	${HEADER_PATH}/aiAnim.h
-	${HEADER_PATH}/aiAssert.h
-	${HEADER_PATH}/aiCamera.h
-	${HEADER_PATH}/aiColor4D.h
-	${HEADER_PATH}/aiColor4D.inl
-	${HEADER_PATH}/aiConfig.h
-	${HEADER_PATH}/aiDefines.h
-	${HEADER_PATH}/aiFileIO.h
-	${HEADER_PATH}/aiLight.h
-	${HEADER_PATH}/aiMaterial.h
-	${HEADER_PATH}/aiMaterial.inl
-	${HEADER_PATH}/aiMatrix3x3.h
-	${HEADER_PATH}/aiMatrix3x3.inl
-	${HEADER_PATH}/aiMatrix4x4.h
-	${HEADER_PATH}/aiMatrix4x4.inl
-	${HEADER_PATH}/aiMesh.h
-	${HEADER_PATH}/aiPostProcess.h
-	${HEADER_PATH}/aiQuaternion.h
-	${HEADER_PATH}/aiQuaternion.inl
-	${HEADER_PATH}/aiScene.h
-	${HEADER_PATH}/aiTexture.h
-	${HEADER_PATH}/aiTypes.h
-	${HEADER_PATH}/aiVector2D.h
-	${HEADER_PATH}/aiVector2D.inl
-	${HEADER_PATH}/aiVector3D.h
-	${HEADER_PATH}/aiVector3D.inl
-	${HEADER_PATH}/aiVersion.h
-	${HEADER_PATH}/assimp.h
-	${HEADER_PATH}/assimp.hpp
-	${HEADER_PATH}/DefaultLogger.h
-	${HEADER_PATH}/ProgressHandler.h
-	${HEADER_PATH}/IOStream.h
-	${HEADER_PATH}/IOSystem.h
-	${HEADER_PATH}/Logger.h
-	${HEADER_PATH}/LogStream.h
-	${HEADER_PATH}/NullLogger.h
-	${HEADER_PATH}/export.h
-	${HEADER_PATH}/export.hpp
+	${HEADER_PATH}/anim.h
+	${HEADER_PATH}/assert.h
+	${HEADER_PATH}/camera.h
+	${HEADER_PATH}/color4.h
+	${HEADER_PATH}/color4.inl
+	${HEADER_PATH}/config.h
+	${HEADER_PATH}/defs.h
+	${HEADER_PATH}/cfileio.h
+	${HEADER_PATH}/light.h
+	${HEADER_PATH}/material.h
+	${HEADER_PATH}/material.inl
+	${HEADER_PATH}/matrix3x3.h
+	${HEADER_PATH}/matrix3x3.inl
+	${HEADER_PATH}/matrix4x4.h
+	${HEADER_PATH}/matrix4x4.inl
+	${HEADER_PATH}/mesh.h
+	${HEADER_PATH}/postprocess.h
+	${HEADER_PATH}/quaternion.h
+	${HEADER_PATH}/quaternion.inl
+	${HEADER_PATH}/scene.h
+	${HEADER_PATH}/texture.h
+	${HEADER_PATH}/types.h
+	${HEADER_PATH}/vector2.h
+	${HEADER_PATH}/vector2.inl
+	${HEADER_PATH}/vector3.h
+	${HEADER_PATH}/vector3.inl
+	${HEADER_PATH}/version.h
+	${HEADER_PATH}/cimport.h
+	${HEADER_PATH}/Importer.hpp
+	${HEADER_PATH}/DefaultLogger.hpp
+	${HEADER_PATH}/ProgressHandler.hpp
+	${HEADER_PATH}/IOStream.hpp
+	${HEADER_PATH}/IOSystem.hpp
+	${HEADER_PATH}/Logger.hpp
+	${HEADER_PATH}/LogStream.hpp
+	${HEADER_PATH}/NullLogger.hpp
+	${HEADER_PATH}/cexport.h
+	${HEADER_PATH}/Exporter.hpp
 )
 
 SET( Core_SRCS
@@ -79,11 +79,11 @@ SET( Boost_SRCS
 SOURCE_GROUP(Boost FILES ${Boost_SRCS})
 
 SET( Logging_SRCS
-	${HEADER_PATH}/DefaultLogger.h
-	${HEADER_PATH}/IOStream.h
-	${HEADER_PATH}/LogStream.h
-	${HEADER_PATH}/Logger.h
-	${HEADER_PATH}/NullLogger.h
+	${HEADER_PATH}/DefaultLogger.hpp
+	${HEADER_PATH}/IOStream.hpp
+	${HEADER_PATH}/LogStream.hpp
+	${HEADER_PATH}/Logger.hpp
+	${HEADER_PATH}/NullLogger.hpp
 	Win32DebugLogStream.h
 	DefaultLogger.cpp
 	FileLogStream.h
diff --git a/code/ColladaExporter.h b/code/ColladaExporter.h
index 3644ad884..c4fd2f6f2 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/assimp/aiAssert.h"
+#include "../include/assimp/assert.h"
 #include <sstream>
 
 struct aiScene;
diff --git a/code/ColladaLoader.cpp b/code/ColladaLoader.cpp
index ae8e5b784..781562ba2 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/assimp/aiAnim.h"
+#include "../include/assimp/anim.h"
 #include "ColladaLoader.h"
 #include "ColladaParser.h"
 
diff --git a/code/ComputeUVMappingProcess.h b/code/ComputeUVMappingProcess.h
index db6d440fe..99db239d5 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/assimp/aiMesh.h"
+#include "../include/assimp/mesh.h"
 
 class ComputeUVMappingTest;
 namespace Assimp
diff --git a/code/ConvertToLHProcess.h b/code/ConvertToLHProcess.h
index bdb29f333..c11491294 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/assimp/aiTypes.h"
+#include "../include/assimp/types.h"
 #include "BaseProcess.h"
 
 struct aiMesh;
diff --git a/code/DeboneProcess.h b/code/DeboneProcess.h
index 3831ed094..966c388ce 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/assimp/aiMesh.h"
-#include "../include/assimp/aiScene.h"
+#include "../include/assimp/mesh.h"
+#include "../include/assimp/scene.h"
 
 class DeboneTest;
 
diff --git a/code/DefaultIOStream.h b/code/DefaultIOStream.h
index f1bdb942b..da1eed0b8 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/assimp/IOStream.h"
+#include "../include/assimp/IOStream.hpp"
 
 namespace Assimp	{
 
diff --git a/code/DefaultIOSystem.h b/code/DefaultIOSystem.h
index d7e4cedc6..fa3e4c625 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/assimp/IOSystem.h"
+#include "../include/assimp/IOSystem.hpp"
 
 namespace Assimp	{
 
diff --git a/code/DefaultProgressHandler.h b/code/DefaultProgressHandler.h
index 76bf97f30..0ae8bbf10 100644
--- a/code/DefaultProgressHandler.h
+++ b/code/DefaultProgressHandler.h
@@ -38,13 +38,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ----------------------------------------------------------------------
 */
 
-/** @file ProgressHandler.h
+/** @file ProgressHandler.hpp
  *  @brief Abstract base class 'ProgressHandler'.
  */
 #ifndef INCLUDED_AI_DEFAULTPROGRESSHANDLER_H
 #define INCLUDED_AI_DEFAULTPROGRESSHANDLER_H
 
-#include "../include/assimp/ProgressHandler.h"
+#include "../include/assimp/ProgressHandler.hpp"
 namespace Assimp	{
 
 // ------------------------------------------------------------------------------------
diff --git a/code/FileLogStream.h b/code/FileLogStream.h
index c9e3a7201..3dda412ed 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/assimp/LogStream.h"
-#include "../include/assimp/IOStream.h"
+#include "../include/assimp/LogStream.hpp"
+#include "../include/assimp/IOStream.hpp"
 
 namespace Assimp	{
 
diff --git a/code/FileSystemFilter.h b/code/FileSystemFilter.h
index 753396619..66793beb4 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/assimp/IOSystem.h"
+#include "../include/assimp/IOSystem.hpp"
 #include "fast_atof.h"
 #include "ParsingUtils.h"
 namespace Assimp	{
diff --git a/code/FindDegenerates.h b/code/FindDegenerates.h
index e137ffa69..b63cdd600 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/assimp/aiMesh.h"
+#include "../include/assimp/mesh.h"
 
 class FindDegeneratesProcessTest;
 namespace Assimp	{
diff --git a/code/FindInvalidDataProcess.h b/code/FindInvalidDataProcess.h
index b0547063b..4f9f6259e 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/assimp/aiTypes.h"
+#include "../include/assimp/types.h"
 
 struct aiMesh;
 class FindInvalidDataProcessTest;
diff --git a/code/GenFaceNormalsProcess.h b/code/GenFaceNormalsProcess.h
index 69d9d6677..4c094bc10 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/assimp/aiMesh.h"
+#include "../include/assimp/mesh.h"
 
 namespace Assimp
 {
diff --git a/code/GenVertexNormalsProcess.h b/code/GenVertexNormalsProcess.h
index 70d5dd49c..9b103892c 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/assimp/aiMesh.h"
+#include "../include/assimp/mesh.h"
 
 class GenNormalsTest;
 
diff --git a/code/GenericProperty.h b/code/GenericProperty.h
index fefd71081..32d846850 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/assimp.hpp"
+#include "./../include/assimp/Importer.hpp"
 #include "Hash.h"
 
 // ------------------------------------------------------------------------------------------------
diff --git a/code/HMPLoader.h b/code/HMPLoader.h
index 08bc1f4c4..12f2cb71f 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/assimp/aiTypes.h"
-#include "../include/assimp/aiTexture.h"
-#include "../include/assimp/aiMaterial.h"
+#include "../include/assimp/types.h"
+#include "../include/assimp/texture.h"
+#include "../include/assimp/material.h"
 
 // internal headers
 #include "BaseImporter.h"
diff --git a/code/Importer.cpp b/code/Importer.cpp
index 9a7080e12..d3c1025c8 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/assimp/aiVersion.h"
+#include "../include/assimp/version.h"
 
 // ------------------------------------------------------------------------------------------------
 /* Uncomment this line to prevent Assimp from catching unknown exceptions.
diff --git a/code/ImproveCacheLocality.h b/code/ImproveCacheLocality.h
index ad4a9150f..10c1ee17b 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/assimp/aiTypes.h"
+#include "../include/assimp/types.h"
 
 struct aiMesh;
 
diff --git a/code/JoinVerticesProcess.h b/code/JoinVerticesProcess.h
index 45cfd0e43..a004b2528 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/assimp/aiTypes.h"
+#include "../include/assimp/types.h"
 
 namespace Assimp
 {
diff --git a/code/LWOFileData.h b/code/LWOFileData.h
index 32fbc8e4d..524880afd 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/assimp/aiMesh.h"
+#include "../include/assimp/mesh.h"
 
 // internal headers
 #include "IFF.h"
diff --git a/code/LWOLoader.h b/code/LWOLoader.h
index afa75d6e6..46a269502 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/assimp/aiTypes.h"
-#include "../include/assimp/DefaultLogger.h"
+#include "../include/assimp/types.h"
+#include "../include/assimp/DefaultLogger.hpp"
 
 #include "LWOFileData.h"
 #include "BaseImporter.h"
diff --git a/code/MD2FileData.h b/code/MD2FileData.h
index f1ddd1e08..f1cbf8e4e 100644
--- a/code/MD2FileData.h
+++ b/code/MD2FileData.h
@@ -45,9 +45,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_MD2FILEHELPER_H_INC
 #define AI_MD2FILEHELPER_H_INC
 
-#include "../include/assimp/aiTypes.h"
-#include "../include/assimp/aiMesh.h"
-#include "../include/assimp/aiAnim.h"
+#include "../include/assimp/types.h"
+#include "../include/assimp/mesh.h"
+#include "../include/assimp/anim.h"
 
 #include "./../include/assimp/Compiler/pushpack1.h"
 
diff --git a/code/MD2Loader.h b/code/MD2Loader.h
index 035424bed..6a29b13e9 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/assimp/aiTypes.h"
+#include "../include/assimp/types.h"
 
 struct aiNode;
 #include "MD2FileData.h"
diff --git a/code/MD3FileData.h b/code/MD3FileData.h
index 0004d3164..8261315ca 100644
--- a/code/MD3FileData.h
+++ b/code/MD3FileData.h
@@ -50,9 +50,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <vector>
 #include <sstream>
 
-#include "../include/assimp/aiTypes.h"
-#include "../include/assimp/aiMesh.h"
-#include "../include/assimp/aiAnim.h"
+#include "../include/assimp/types.h"
+#include "../include/assimp/mesh.h"
+#include "../include/assimp/anim.h"
 
 #include "./../include/assimp/Compiler/pushpack1.h"
 
diff --git a/code/MD3Loader.h b/code/MD3Loader.h
index 71f6ecc1d..22559f53c 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/assimp/aiTypes.h"
+#include "../include/assimp/types.h"
 
 #include "MD3FileData.h"
 namespace Assimp	{
diff --git a/code/MD5Loader.h b/code/MD5Loader.h
index c4524a088..55c9ec1db 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/assimp/aiTypes.h"
+#include "../include/assimp/types.h"
 
 namespace Assimp	{
 
diff --git a/code/MD5Parser.h b/code/MD5Parser.h
index bc2318b14..b55ce1889 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/assimp/aiTypes.h"
+#include "../include/assimp/types.h"
 #include "ParsingUtils.h"
 
 struct aiFace;
diff --git a/code/MDCFileData.h b/code/MDCFileData.h
index 966abcfb5..337cb601e 100644
--- a/code/MDCFileData.h
+++ b/code/MDCFileData.h
@@ -49,9 +49,9 @@ http://themdcfile.planetwolfenstein.gamespy.com/MDC_File_Format.pdf
 #ifndef AI_MDCFILEHELPER_H_INC
 #define AI_MDCFILEHELPER_H_INC
 
-#include "../include/assimp/aiTypes.h"
-#include "../include/assimp/aiMesh.h"
-#include "../include/assimp/aiAnim.h"
+#include "../include/assimp/types.h"
+#include "../include/assimp/mesh.h"
+#include "../include/assimp/anim.h"
 
 #include "./../include/assimp/Compiler/pushpack1.h"
 
diff --git a/code/MDCLoader.h b/code/MDCLoader.h
index aa9bb8ef6..63c7e67c6 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/assimp/aiTypes.h"
+#include "../include/assimp/types.h"
 
 #include "BaseImporter.h"
 #include "MDCFileData.h"
diff --git a/code/NFFLoader.h b/code/NFFLoader.h
index 11f3a0fa6..74533008f 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/assimp/aiTypes.h"
+#include "../include/assimp/types.h"
 
 namespace Assimp	{
 
diff --git a/code/OFFLoader.h b/code/OFFLoader.h
index 64bdee741..012b716cb 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/assimp/aiTypes.h"
+#include "../include/assimp/types.h"
 #include <vector>
 
 namespace Assimp	{
diff --git a/code/ObjExporter.cpp b/code/ObjExporter.cpp
index 9dce9cc39..4bd65a338 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/assimp/aiVersion.h"
+#include "../include/assimp/version.h"
 
 using namespace Assimp;
 namespace Assimp	{
diff --git a/code/ObjFileData.h b/code/ObjFileData.h
index 16a421359..5bfbadad4 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/assimp/aiTypes.h"
-#include "../include/assimp/aiMesh.h"
+#include "../include/assimp/types.h"
+#include "../include/assimp/mesh.h"
 
 namespace Assimp
 {
diff --git a/code/ObjFileParser.cpp b/code/ObjFileParser.cpp
index 90a42a823..970bd7d69 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/assimp/aiTypes.h"
+#include "../include/assimp/types.h"
 #include "DefaultIOSystem.h"
 
 namespace Assimp	
diff --git a/code/OptimizeGraph.h b/code/OptimizeGraph.h
index 85ba2eb68..78bdeefe4 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/assimp/aiTypes.h"
+#include "../include/assimp/types.h"
 
 struct aiMesh;
 class OptimizeGraphProcessTest;
diff --git a/code/OptimizeMeshes.h b/code/OptimizeMeshes.h
index 243e8a4db..5e67b0548 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/assimp/aiTypes.h"
+#include "../include/assimp/types.h"
 
 struct aiMesh;
 class OptimizeMeshesProcessTest;
diff --git a/code/PlyLoader.h b/code/PlyLoader.h
index 928ecf60d..cdd0c2c79 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/assimp/aiTypes.h"
+#include "../include/assimp/types.h"
 
 struct aiNode;
 
diff --git a/code/PretransformVertices.h b/code/PretransformVertices.h
index 79ca234a7..bfe2c84c8 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/assimp/aiMesh.h"
+#include "../include/assimp/mesh.h"
 
 class PretransformVerticesTest;
 namespace Assimp	{
diff --git a/code/ProcessHelper.h b/code/ProcessHelper.h
index e280a7381..1c95c61f3 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/assimp/aiPostProcess.h"
+#include "../include/assimp/postprocess.h"
 
 #include "SpatialSort.h"
 #include "BaseProcess.h"
diff --git a/code/Profiler.h b/code/Profiler.h
index 6c7eec313..a0dda9f61 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/assimp/DefaultLogger.h"
+#include "../include/assimp/DefaultLogger.hpp"
 #include "TinyFormatter.h"
 
 namespace Assimp {
diff --git a/code/Q3BSPFileImporter.cpp b/code/Q3BSPFileImporter.cpp
index bde16c4fb..a19ed7c8c 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/assimp/aiTypes.h"
-#include "../include/assimp/aiMesh.h"
+#include "../include/assimp/types.h"
+#include "../include/assimp/mesh.h"
 #include <vector>
 
 namespace Assimp
diff --git a/code/Q3BSPZipArchive.h b/code/Q3BSPZipArchive.h
index 22b4d4676..06d8370e3 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/assimp/IOStream.h"
-#include "../include/assimp/IOSystem.h"
+#include "../include/assimp/IOStream.hpp"
+#include "../include/assimp/IOSystem.hpp"
 #include <string>
 #include <vector>
 #include <map>
diff --git a/code/Q3DLoader.h b/code/Q3DLoader.h
index c02e94ddf..78194233c 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/assimp/aiTypes.h"
+#include "../include/assimp/types.h"
 #include <vector>
 
 namespace Assimp	{
diff --git a/code/RawLoader.h b/code/RawLoader.h
index 54513a90c..4654261f8 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/assimp/aiTypes.h"
+#include "../include/assimp/types.h"
 #include <vector>
 
 namespace Assimp	{
diff --git a/code/RemoveComments.h b/code/RemoveComments.h
index eb3bf2ad9..4b5e28cee 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/assimp/aiAssert.h"
+#include "../include/assimp/assert.h"
 
 namespace Assimp	{
 
diff --git a/code/RemoveRedundantMaterials.h b/code/RemoveRedundantMaterials.h
index d7904a742..07496b489 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/assimp/aiMesh.h"
+#include "../include/assimp/mesh.h"
 
 class RemoveRedundantMatsTest;
 namespace Assimp	{
diff --git a/code/RemoveVCProcess.h b/code/RemoveVCProcess.h
index 8a89d8b27..79cc0fbea 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/assimp/aiMesh.h"
+#include "../include/assimp/mesh.h"
 
 class RemoveVCProcessTest;
 namespace Assimp	{
diff --git a/code/SGSpatialSort.h b/code/SGSpatialSort.h
index 6a953c5f4..c14fa7361 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/assimp/aiTypes.h"
+#include "../include/assimp/types.h"
 
 namespace Assimp	{
 
diff --git a/code/SMDLoader.h b/code/SMDLoader.h
index 6b7f74837..ba00c1ae2 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/assimp/aiTypes.h"
-#include "../include/assimp/aiTexture.h"
-#include "../include/assimp/aiAnim.h"
-#include "../include/assimp/aiMaterial.h"
+#include "../include/assimp/types.h"
+#include "../include/assimp/texture.h"
+#include "../include/assimp/anim.h"
+#include "../include/assimp/material.h"
 struct aiNode;
 
 // STL headers
diff --git a/code/STLExporter.cpp b/code/STLExporter.cpp
index 03f8bcf7e..b71cea66e 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/assimp/aiVersion.h"
+#include "../include/assimp/version.h"
 
 using namespace Assimp;
 namespace Assimp	{
diff --git a/code/STLLoader.h b/code/STLLoader.h
index d56f32eed..afa634720 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/assimp/aiTypes.h"
+#include "../include/assimp/types.h"
 
 namespace Assimp	{
 
diff --git a/code/SceneCombiner.h b/code/SceneCombiner.h
index d2a407bc2..a4be54c6b 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/assimp/aiAssert.h"
+#include "../include/assimp/assert.h"
 
 namespace Assimp	{
 
diff --git a/code/SkeletonMeshBuilder.cpp b/code/SkeletonMeshBuilder.cpp
index f2ea5665e..7e477cac0 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/assimp/aiScene.h"
+#include "../include/assimp/scene.h"
 #include "SkeletonMeshBuilder.h"
 
 using namespace Assimp;
diff --git a/code/SkeletonMeshBuilder.h b/code/SkeletonMeshBuilder.h
index f1dbd9a49..80b49b0cc 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/assimp/aiMesh.h"
+#include "../include/assimp/mesh.h"
 
 struct aiScene;
 struct aiNode;
diff --git a/code/SortByPTypeProcess.h b/code/SortByPTypeProcess.h
index 86d82c879..556dd2038 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/assimp/aiMesh.h"
+#include "../include/assimp/mesh.h"
 
 class SortByPTypeProcessTest;
 namespace Assimp	{
diff --git a/code/SpatialSort.h b/code/SpatialSort.h
index 703eda263..a8854f2f0 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/assimp/aiTypes.h"
+#include "../include/assimp/types.h"
 
 namespace Assimp
 {
diff --git a/code/SplitByBoneCountProcess.h b/code/SplitByBoneCountProcess.h
index ddcdd076a..ad0d5687d 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/assimp/aiMesh.h"
-#include "../include/assimp/aiScene.h"
+#include "../include/assimp/mesh.h"
+#include "../include/assimp/scene.h"
 
 namespace Assimp
 {
diff --git a/code/SplitLargeMeshes.h b/code/SplitLargeMeshes.h
index b69324d8e..8623150d2 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/assimp/aiMesh.h"
-#include "../include/assimp/aiScene.h"
+#include "../include/assimp/mesh.h"
+#include "../include/assimp/scene.h"
 
 class SplitLargeMeshesTest;
 namespace Assimp
diff --git a/code/StdOStreamLogStream.h b/code/StdOStreamLogStream.h
index b54c47564..cb79f0d16 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/assimp/LogStream.h"
+#include "../include/assimp/LogStream.hpp"
 #include <ostream>
 
 namespace Assimp	{
diff --git a/code/ValidateDataStructure.h b/code/ValidateDataStructure.h
index 0c625ebbe..e33bb5b82 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/assimp/aiTypes.h"
+#include "../include/assimp/types.h"
 #include "BaseProcess.h"
 
 struct aiBone;
diff --git a/code/VertexTriangleAdjacency.h b/code/VertexTriangleAdjacency.h
index 72733abbc..462d5796e 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/assimp/aiTypes.h"
-#include "../include/assimp/aiAssert.h"
+#include "../include/assimp/types.h"
+#include "../include/assimp/assert.h"
 
 struct aiMesh;
 namespace Assimp	{
diff --git a/code/Win32DebugLogStream.h b/code/Win32DebugLogStream.h
index 23acbe634..b7327335a 100644
--- a/code/Win32DebugLogStream.h
+++ b/code/Win32DebugLogStream.h
@@ -3,7 +3,7 @@
 
 #ifdef WIN32
 
-#include "../include/assimp/LogStream.h"
+#include "../include/assimp/LogStream.hpp"
 #include "windows.h"
 
 namespace Assimp	{
diff --git a/code/XFileHelper.h b/code/XFileHelper.h
index d8d4b609d..8ba731d4f 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/assimp/aiTypes.h"
-#include "../include/assimp/aiQuaternion.h"
-#include "../include/assimp/aiMesh.h"
-#include "../include/assimp/aiAnim.h"
+#include "../include/assimp/types.h"
+#include "../include/assimp/quaternion.h"
+#include "../include/assimp/mesh.h"
+#include "../include/assimp/anim.h"
 
 namespace Assimp
 {
diff --git a/code/XFileImporter.h b/code/XFileImporter.h
index 64d404921..a92d4f8e2 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/assimp/aiTypes.h"
+#include "../include/assimp/types.h"
 
 struct aiNode;
 
diff --git a/code/XFileParser.h b/code/XFileParser.h
index 1e06f950b..549f03261 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/assimp/aiTypes.h"
+#include "../include/assimp/types.h"
 
 namespace Assimp
 {
diff --git a/code/irrXMLWrapper.h b/code/irrXMLWrapper.h
index a1ca48dde..f5e9c3059 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/assimp/IOStream.h"
+#include "./../include/assimp/IOStream.hpp"
 namespace Assimp	{
 
 // ---------------------------------------------------------------------------------
diff --git a/include/assimp/DefaultLogger.h b/include/assimp/DefaultLogger.hpp
similarity index 96%
rename from include/assimp/DefaultLogger.h
rename to include/assimp/DefaultLogger.hpp
index a22bbf074..7efd11750 100644
--- a/include/assimp/DefaultLogger.h
+++ b/include/assimp/DefaultLogger.hpp
@@ -43,9 +43,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef INCLUDED_AI_DEFAULTLOGGER
 #define INCLUDED_AI_DEFAULTLOGGER
 
-#include "Logger.h"
-#include "LogStream.h"
-#include "NullLogger.h"
+#include "Logger.hpp"
+#include "LogStream.hpp"
+#include "NullLogger.hpp"
 #include <vector>
 
 namespace Assimp	{
diff --git a/include/assimp/export.hpp b/include/assimp/Exporter.hpp
similarity index 97%
rename from include/assimp/export.hpp
rename to include/assimp/Exporter.hpp
index 1ad525b12..30db01508 100644
--- a/include/assimp/export.hpp
+++ b/include/assimp/Exporter.hpp
@@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef ASSIMP_BUILD_NO_EXPORT
 
-#include "export.h"
+#include "cexport.h"
 
 namespace Assimp	{
 	class ExporterPimpl;
diff --git a/include/assimp/IOStream.h b/include/assimp/IOStream.hpp
similarity index 96%
rename from include/assimp/IOStream.h
rename to include/assimp/IOStream.hpp
index 8943b6e62..54684442d 100644
--- a/include/assimp/IOStream.h
+++ b/include/assimp/IOStream.hpp
@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_IOSTREAM_H_INC
 #define AI_IOSTREAM_H_INC
 
-#include "aiTypes.h"
+#include "types.h"
 
 #ifndef __cplusplus
 #	error This header requires C++ to be used. aiFileIO.h is the \
diff --git a/include/assimp/IOSystem.h b/include/assimp/IOSystem.hpp
similarity index 97%
rename from include/assimp/IOSystem.h
rename to include/assimp/IOSystem.hpp
index e1926d5fe..76135146b 100644
--- a/include/assimp/IOSystem.h
+++ b/include/assimp/IOSystem.hpp
@@ -52,7 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	corresponding C interface.
 #endif
 
-#include "aiTypes.h"
+#include "types.h"
 namespace Assimp	{
 class IOStream;
 
diff --git a/include/assimp/assimp.hpp b/include/assimp/Importer.hpp
similarity index 97%
rename from include/assimp/assimp.hpp
rename to include/assimp/Importer.hpp
index dde630fe5..d78a26ed0 100644
--- a/include/assimp/assimp.hpp
+++ b/include/assimp/Importer.hpp
@@ -50,9 +50,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endif
 
 // Public ASSIMP data structures
-#include "aiTypes.h"
-#include "aiConfig.h"
-#include "aiAssert.h"
+#include "types.h"
+#include "config.h"
+#include "assert.h"
 
 namespace Assimp	{
 	// =======================================================================
diff --git a/include/assimp/LogStream.h b/include/assimp/LogStream.hpp
similarity index 97%
rename from include/assimp/LogStream.h
rename to include/assimp/LogStream.hpp
index 3d0a30103..afd35a2fc 100644
--- a/include/assimp/LogStream.h
+++ b/include/assimp/LogStream.hpp
@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef INCLUDED_AI_LOGSTREAM_H
 #define INCLUDED_AI_LOGSTREAM_H
-#include "aiTypes.h"
+#include "types.h"
 namespace Assimp	{
 class IOSystem;
 
diff --git a/include/assimp/Logger.h b/include/assimp/Logger.hpp
similarity index 96%
rename from include/assimp/Logger.h
rename to include/assimp/Logger.hpp
index 698c5acb7..1c3d224ea 100644
--- a/include/assimp/Logger.h
+++ b/include/assimp/Logger.hpp
@@ -38,13 +38,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ----------------------------------------------------------------------
 */
 
-/** @file Logger.h
+/** @file Logger.hpp
  *  @brief Abstract base class 'Logger', base of the logging system. 
  */
 #ifndef INCLUDED_AI_LOGGER_H
 #define INCLUDED_AI_LOGGER_H
 
-#include "aiTypes.h"
+#include "types.h"
 namespace Assimp	{
 class LogStream;
 
diff --git a/include/assimp/NullLogger.h b/include/assimp/NullLogger.hpp
similarity index 96%
rename from include/assimp/NullLogger.h
rename to include/assimp/NullLogger.hpp
index 4eadb3028..38472b0c2 100644
--- a/include/assimp/NullLogger.h
+++ b/include/assimp/NullLogger.hpp
@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef INCLUDED_AI_NULLLOGGER_H
 #define INCLUDED_AI_NULLLOGGER_H
 
-#include "Logger.h"
+#include "Logger.hpp"
 namespace Assimp	{
 // ---------------------------------------------------------------------------
 /** @brief CPP-API: Empty logging implementation.
diff --git a/include/assimp/ProgressHandler.h b/include/assimp/ProgressHandler.hpp
similarity index 96%
rename from include/assimp/ProgressHandler.h
rename to include/assimp/ProgressHandler.hpp
index 9a80c87a7..26f79566a 100644
--- a/include/assimp/ProgressHandler.h
+++ b/include/assimp/ProgressHandler.hpp
@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef INCLUDED_AI_PROGRESSHANDLER_H
 #define INCLUDED_AI_PROGRESSHANDLER_H
-#include "aiTypes.h"
+#include "types.h"
 namespace Assimp	{
 
 // ------------------------------------------------------------------------------------
diff --git a/include/assimp/aiAnim.h b/include/assimp/anim.h
similarity index 96%
rename from include/assimp/aiAnim.h
rename to include/assimp/anim.h
index 763f61781..6d1e8213f 100644
--- a/include/assimp/aiAnim.h
+++ b/include/assimp/anim.h
@@ -39,15 +39,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------------
 */
 
-/** @file aiAnim.h
+/** @file anim.h
  *  @brief Defines the data structures in which the imported animations
  *  are returned.
  */
 #ifndef AI_ANIM_H_INC
 #define AI_ANIM_H_INC
 
-#include "aiTypes.h"
-#include "aiQuaternion.h"
+#include "types.h"
+#include "quaternion.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/assimp/aiAssert.h b/include/assimp/assert.h
similarity index 84%
rename from include/assimp/aiAssert.h
rename to include/assimp/assert.h
index 8b7b41444..3ad7fd32c 100644
--- a/include/assimp/aiAssert.h
+++ b/include/assimp/assert.h
@@ -1,4 +1,4 @@
-/** @file aiAssert.h
+/** @file assert.h
  */
 #ifndef AI_DEBUG_H_INC
 #define AI_DEBUG_H_INC
diff --git a/include/assimp/aiCamera.h b/include/assimp/camera.h
similarity index 96%
rename from include/assimp/aiCamera.h
rename to include/assimp/camera.h
index c4909c9a2..83a8080df 100644
--- a/include/assimp/aiCamera.h
+++ b/include/assimp/camera.h
@@ -39,14 +39,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------------
 */
 
-/** @file aiCamera.h
+/** @file camera.h
  *  @brief Defines the aiCamera data structure
  */
 
 #ifndef AI_CAMERA_H_INC
 #define AI_CAMERA_H_INC
 
-#include "aiTypes.h"
+#include "types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/assimp/export.h b/include/assimp/cexport.h
similarity index 99%
rename from include/assimp/export.h
rename to include/assimp/cexport.h
index 5f10b1e98..4050b438e 100644
--- a/include/assimp/export.h
+++ b/include/assimp/cexport.h
@@ -39,7 +39,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------------
 */
 
-/** @file  export.h
+/** @file  cexport.h
 *  @brief Defines the C-API for the Assimp export interface
 */
 #ifndef AI_EXPORT_H_INC
@@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef ASSIMP_BUILD_NO_EXPORT
 
-#include "aiTypes.h"
+#include "types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/assimp/aiFileIO.h b/include/assimp/cfileio.h
similarity index 96%
rename from include/assimp/aiFileIO.h
rename to include/assimp/cfileio.h
index d444b4924..221198d1c 100644
--- a/include/assimp/aiFileIO.h
+++ b/include/assimp/cfileio.h
@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_FILEIO_H_INC
 #define AI_FILEIO_H_INC
 
-#include "aiTypes.h"
+#include "types.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/assimp/assimp.h b/include/assimp/cimport.h
similarity index 96%
rename from include/assimp/assimp.h
rename to include/assimp/cimport.h
index 086f3fa83..92b6e0b7a 100644
--- a/include/assimp/assimp.h
+++ b/include/assimp/cimport.h
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef AI_ASSIMP_H_INC
 #define AI_ASSIMP_H_INC
-#include "aiTypes.h"
+#include "types.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -354,7 +354,7 @@ ASSIMP_API void aiReleasePropertyStore(C_STRUCT aiPropertyStore* p);
  *  specify them per import.
  *
  * @param szName Name of the configuration property to be set. All supported 
- *   public properties are defined in the aiConfig.h header file (#AI_CONFIG_XXX).
+ *   public properties are defined in the config.h header file (#AI_CONFIG_XXX).
  * @param value New value for the property
  */
 ASSIMP_API void aiSetImportPropertyInteger(
@@ -370,7 +370,7 @@ ASSIMP_API void aiSetImportPropertyInteger(
  *  specify them per import.
  *
  * @param szName Name of the configuration property to be set. All supported 
- *   public properties are defined in the aiConfig.h header file (#AI_CONFIG_XXX).
+ *   public properties are defined in the config.h header file (#AI_CONFIG_XXX).
  * @param value New value for the property
  */
 ASSIMP_API void aiSetImportPropertyFloat(
@@ -387,7 +387,7 @@ ASSIMP_API void aiSetImportPropertyFloat(
  *
  * @param property store to modify. Use #aiCreatePropertyStore to obtain a store.
  * @param szName Name of the configuration property to be set. All supported 
- *   public properties are defined in the aiConfig.h header file (#AI_CONFIG_XXX).
+ *   public properties are defined in the config.h header file (#AI_CONFIG_XXX).
  * @param value New value for the property
  */
 ASSIMP_API void aiSetImportPropertyString(
diff --git a/include/assimp/aiColor4D.h b/include/assimp/color4.h
similarity index 100%
rename from include/assimp/aiColor4D.h
rename to include/assimp/color4.h
diff --git a/include/assimp/aiColor4D.inl b/include/assimp/color4.inl
similarity index 97%
rename from include/assimp/aiColor4D.inl
rename to include/assimp/color4.inl
index 33252182c..f4f9126de 100644
--- a/include/assimp/aiColor4D.inl
+++ b/include/assimp/color4.inl
@@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_COLOR4D_INL_INC
 
 #ifdef __cplusplus
-#include "aiColor4D.h"
+#include "color4.h"
 
 // ------------------------------------------------------------------------------------------------
 template <typename TReal>
diff --git a/include/assimp/aiConfig.h b/include/assimp/config.h
similarity index 97%
rename from include/assimp/aiConfig.h
rename to include/assimp/config.h
index 9f813015b..73e41ca2f 100644
--- a/include/assimp/aiConfig.h
+++ b/include/assimp/config.h
@@ -39,7 +39,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------------
 */
 
-/** @file aiConfig.h
+/** @file config.h
  *  @brief Defines constants for configurable properties for the library
  *
  *  Typically these properties are set via 
diff --git a/include/assimp/aiDefines.h b/include/assimp/defs.h
similarity index 100%
rename from include/assimp/aiDefines.h
rename to include/assimp/defs.h
diff --git a/include/assimp/aiLight.h b/include/assimp/light.h
similarity index 96%
rename from include/assimp/aiLight.h
rename to include/assimp/light.h
index 7bdb73838..9e62033d3 100644
--- a/include/assimp/aiLight.h
+++ b/include/assimp/light.h
@@ -39,14 +39,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------------
 */
 
-/** @file aiLight.h
+/** @file light.h
  *  @brief Defines the aiLight data structure
  */
 
 #ifndef __AI_LIGHT_H_INC__
 #define __AI_LIGHT_H_INC__
 
-#include "aiTypes.h"
+#include "types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/assimp/aiMaterial.h b/include/assimp/material.h
similarity index 96%
rename from include/assimp/aiMaterial.h
rename to include/assimp/material.h
index ecf51044d..4d8ac2b6c 100644
--- a/include/assimp/aiMaterial.h
+++ b/include/assimp/material.h
@@ -39,14 +39,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------------
 */
 
-/** @file aiMaterial.h
+/** @file material.h
  *  @brief Defines the material system of the library
  */
 
 #ifndef AI_MATERIAL_H_INC
 #define AI_MATERIAL_H_INC
 
-#include "aiTypes.h"
+#include "types.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -1485,7 +1485,7 @@ C_ENUM aiReturn aiGetMaterialTexture(const C_STRUCT aiMaterial* mat,
 #ifdef __cplusplus
 }
 
-#include "aiMaterial.inl"
+#include "material.inl"
 
 #endif //!__cplusplus
 #endif //!!AI_MATERIAL_H_INC
diff --git a/include/assimp/aiMaterial.inl b/include/assimp/material.inl
similarity index 100%
rename from include/assimp/aiMaterial.inl
rename to include/assimp/material.inl
diff --git a/include/assimp/aiMatrix3x3.h b/include/assimp/matrix3x3.h
similarity index 96%
rename from include/assimp/aiMatrix3x3.h
rename to include/assimp/matrix3x3.h
index 75d9135d6..029284111 100644
--- a/include/assimp/aiMatrix3x3.h
+++ b/include/assimp/matrix3x3.h
@@ -39,7 +39,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------------
 */
 
-/** @file aiMatrix3x3.h
+/** @file matrix3x3.h
  *  @brief Definition of a 3x3 matrix, including operators when compiling in C++
  */
 #ifndef AI_MATRIX3x3_H_INC
diff --git a/include/assimp/aiMatrix3x3.inl b/include/assimp/matrix3x3.inl
similarity index 96%
rename from include/assimp/aiMatrix3x3.inl
rename to include/assimp/matrix3x3.inl
index ce4078645..f47d2b78d 100644
--- a/include/assimp/aiMatrix3x3.inl
+++ b/include/assimp/matrix3x3.inl
@@ -46,9 +46,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_MATRIX3x3_INL_INC
 
 #ifdef __cplusplus
-#include "aiMatrix3x3.h"
+#include "matrix3x3.h"
 
-#include "aiMatrix4x4.h"
+#include "matrix4x4.h"
 #include <algorithm>
 #include <limits>
 
diff --git a/include/assimp/aiMatrix4x4.h b/include/assimp/matrix4x4.h
similarity index 97%
rename from include/assimp/aiMatrix4x4.h
rename to include/assimp/matrix4x4.h
index 89a82ae04..6041bac1a 100644
--- a/include/assimp/aiMatrix4x4.h
+++ b/include/assimp/matrix4x4.h
@@ -38,7 +38,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------------
 */
-/** @file aiMatrix4x4.h
+/** @file matrix4x4.h
  *  @brief 4x4 matrix structure, including operators when compiling in C++
  */
 #ifndef AI_MATRIX4X4_H_INC
diff --git a/include/assimp/aiMatrix4x4.inl b/include/assimp/matrix4x4.inl
similarity index 96%
rename from include/assimp/aiMatrix4x4.inl
rename to include/assimp/matrix4x4.inl
index d57de1371..15edbf4ab 100644
--- a/include/assimp/aiMatrix4x4.inl
+++ b/include/assimp/matrix4x4.inl
@@ -47,9 +47,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifdef __cplusplus
 
-#include "aiMatrix4x4.h"
-#include "aiMatrix3x3.h"
-#include "aiQuaternion.h"
+#include "matrix4x4.h"
+#include "matrix3x3.h"
+#include "quaternion.h"
 
 #include <algorithm>
 #include <limits>
diff --git a/include/assimp/aiMesh.h b/include/assimp/mesh.h
similarity index 96%
rename from include/assimp/aiMesh.h
rename to include/assimp/mesh.h
index bfa730cb4..26084c77e 100644
--- a/include/assimp/aiMesh.h
+++ b/include/assimp/mesh.h
@@ -39,14 +39,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------------
 */
 
-/** @file aiMesh.h
+/** @file mesh.h
  *  @brief Declares the data structures in which the imported geometry is 
     returned by ASSIMP: aiMesh, aiFace and aiBone data structures.
  */
 #ifndef INCLUDED_AI_MESH_H
 #define INCLUDED_AI_MESH_H
 
-#include "aiTypes.h"
+#include "types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/assimp/aiPostProcess.h b/include/assimp/postprocess.h
similarity index 97%
rename from include/assimp/aiPostProcess.h
rename to include/assimp/postprocess.h
index b35004938..e7cd3ee9c 100644
--- a/include/assimp/aiPostProcess.h
+++ b/include/assimp/postprocess.h
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_POSTPROCESS_H_INC
 #define AI_POSTPROCESS_H_INC
 
-#include "aiTypes.h"
+#include "types.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -223,7 +223,7 @@ enum aiPostProcessSteps
 	* important vertex weights are removed and the remaining vertex weights are
 	* renormalized so that the weights still sum up to 1.
 	* The default bone weight limit is 4 (defined as <tt>#AI_LMW_MAX_WEIGHTS</tt> in
-	* aiConfig.h), but you can use the <tt>#AI_CONFIG_PP_LBW_MAX_WEIGHTS</tt> setting to
+	* config.h), but you can use the <tt>#AI_CONFIG_PP_LBW_MAX_WEIGHTS</tt> setting to
 	* supply your own limit to the post processing step.
 	*
 	* If you intend to perform the skinning in hardware, this post processing 
diff --git a/include/assimp/aiQuaternion.h b/include/assimp/quaternion.h
similarity index 96%
rename from include/assimp/aiQuaternion.h
rename to include/assimp/quaternion.h
index 3df95975a..c404af5ea 100644
--- a/include/assimp/aiQuaternion.h
+++ b/include/assimp/quaternion.h
@@ -38,7 +38,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ----------------------------------------------------------------------
 */
 
-/** @file aiQuaternion.h
+/** @file quaternion.h
  *  @brief Quaternion structure, including operators when compiling in C++
  */
 #ifndef AI_QUATERNION_H_INC
diff --git a/include/assimp/aiQuaternion.inl b/include/assimp/quaternion.inl
similarity index 96%
rename from include/assimp/aiQuaternion.inl
rename to include/assimp/quaternion.inl
index af6349632..b6394b8a3 100644
--- a/include/assimp/aiQuaternion.inl
+++ b/include/assimp/quaternion.inl
@@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_QUATERNION_INL_INC
 
 #ifdef __cplusplus
-#include "aiQuaternion.h"
+#include "quaternion.h"
 
 // ---------------------------------------------------------------------------
 template<typename TReal>
diff --git a/include/assimp/aiScene.h b/include/assimp/scene.h
similarity index 95%
rename from include/assimp/aiScene.h
rename to include/assimp/scene.h
index 29eed0a17..db3db795d 100644
--- a/include/assimp/aiScene.h
+++ b/include/assimp/scene.h
@@ -45,13 +45,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __AI_SCENE_H_INC__
 #define __AI_SCENE_H_INC__
 
-#include "aiTypes.h"
-#include "aiTexture.h"
-#include "aiMesh.h"
-#include "aiLight.h"
-#include "aiCamera.h"
-#include "aiMaterial.h"
-#include "aiAnim.h"
+#include "types.h"
+#include "texture.h"
+#include "mesh.h"
+#include "light.h"
+#include "camera.h"
+#include "material.h"
+#include "anim.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/assimp/aiTexture.h b/include/assimp/texture.h
similarity index 96%
rename from include/assimp/aiTexture.h
rename to include/assimp/texture.h
index 53d9c85f2..5b8d88a70 100644
--- a/include/assimp/aiTexture.h
+++ b/include/assimp/texture.h
@@ -39,7 +39,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------------
 */
 
-/** @file aiTexture.h
+/** @file texture.h
  *  @brief Defines texture helper structures for the library
  *
  * Used for file formats which embed their textures into the model file.
@@ -51,7 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_TEXTURE_H_INC
 #define AI_TEXTURE_H_INC
 
-#include "aiTypes.h"
+#include "types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/assimp/aiTypes.h b/include/assimp/types.h
similarity index 94%
rename from include/assimp/aiTypes.h
rename to include/assimp/types.h
index d35efa88f..dc75f4db4 100644
--- a/include/assimp/aiTypes.h
+++ b/include/assimp/types.h
@@ -39,7 +39,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------------
 */
 
-/** @file aiTypes.h
+/** @file types.h
  *  Basic data types and primitives, such as vectors or colors. 
  */
 #ifndef AI_TYPES_H_INC
@@ -52,15 +52,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <stddef.h>
 
 // Our compile configuration
-#include "aiDefines.h"
+#include "defs.h"
 
 // Some types moved to separate header due to size of operators
-#include "aiVector3D.h"
-#include "aiVector2D.h"
-#include "aiColor4D.h"
-#include "aiMatrix3x3.h"
-#include "aiMatrix4x4.h"
-#include "aiQuaternion.h"
+#include "vector3.h"
+#include "vector2.h"
+#include "color4.h"
+#include "matrix3x3.h"
+#include "matrix4x4.h"
+#include "quaternion.h"
 
 #ifdef __cplusplus
 #include <new>		// for std::nothrow_t
@@ -490,10 +490,10 @@ struct aiMemoryInfo
 #endif //!  __cplusplus
 
 // Include implementation files
-#include "aiVector2D.inl"
-#include "aiVector3D.inl"
-#include "aiColor4D.inl"
-#include "aiQuaternion.inl"
-#include "aiMatrix3x3.inl"
-#include "aiMatrix4x4.inl"
+#include "vector2.inl"
+#include "vector3.inl"
+#include "color4.inl"
+#include "quaternion.inl"
+#include "matrix3x3.inl"
+#include "matrix4x4.inl"
 #endif 
diff --git a/include/assimp/aiVector2D.h b/include/assimp/vector2.h
similarity index 100%
rename from include/assimp/aiVector2D.h
rename to include/assimp/vector2.h
diff --git a/include/assimp/aiVector2D.inl b/include/assimp/vector2.inl
similarity index 96%
rename from include/assimp/aiVector2D.inl
rename to include/assimp/vector2.inl
index c4789aad3..04d11c56c 100644
--- a/include/assimp/aiVector2D.inl
+++ b/include/assimp/vector2.inl
@@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_VECTOR2D_INL_INC
 
 #ifdef __cplusplus
-#include "aiVector2D.h"
+#include "vector2.h"
 
 // ------------------------------------------------------------------------------------------------
 template <typename TReal>
diff --git a/include/assimp/aiVector3D.h b/include/assimp/vector3.h
similarity index 100%
rename from include/assimp/aiVector3D.h
rename to include/assimp/vector3.h
diff --git a/include/assimp/aiVector3D.inl b/include/assimp/vector3.inl
similarity index 97%
rename from include/assimp/aiVector3D.inl
rename to include/assimp/vector3.inl
index 49631e865..c03437980 100644
--- a/include/assimp/aiVector3D.inl
+++ b/include/assimp/vector3.inl
@@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_VECTOR3D_INL_INC
 
 #ifdef __cplusplus
-#include "aiVector3D.h"
+#include "vector3.h"
 
 // ------------------------------------------------------------------------------------------------
 /** Transformation of a vector by a 3x3 matrix */
diff --git a/include/assimp/aiVersion.h b/include/assimp/version.h
similarity index 100%
rename from include/assimp/aiVersion.h
rename to include/assimp/version.h
diff --git a/test/unit/CCompilerTest.c b/test/unit/CCompilerTest.c
index ca9cf14ca..36c27496e 100644
--- a/test/unit/CCompilerTest.c
+++ b/test/unit/CCompilerTest.c
@@ -1,9 +1,9 @@
 
 // This is just a small test to check whether Assimp's API compiles from C
 
-#include <aiTypes.h>
-#include <aiPostProcess.h>
-#include <aiScene.h>
-#include <aiVersion.h>
-#include <aiConfig.h>
-#include <assimp.h>
\ No newline at end of file
+#include <types.h>
+#include <postprocess.h>
+#include <scene.h>
+#include <version.h>
+#include <config.h>
+#include <cimport.h>
\ No newline at end of file
diff --git a/test/unit/UnitTestPCH.h b/test/unit/UnitTestPCH.h
index 56bbaa29f..d363919b8 100644
--- a/test/unit/UnitTestPCH.h
+++ b/test/unit/UnitTestPCH.h
@@ -6,7 +6,7 @@
 
 // We need to be sure to have the same STL settings as Assimp
 #include <AssimpPCH.h>
-#include "assimp.h"
+#include "cimport.h"
 
 // CPPUNIT
 #include <cppunit/TestFixture.h>
diff --git a/test/unit/utExport.h b/test/unit/utExport.h
index 2d43f92ef..ceb1ad67e 100644
--- a/test/unit/utExport.h
+++ b/test/unit/utExport.h
@@ -3,8 +3,8 @@
 
 #ifndef ASSIMP_BUILD_NO_EXPORT
 
-#include <export.h>
-#include <export.hpp>
+#include <cexport.h>
+#include <Exporter.hpp>
 
 using namespace Assimp;
 
diff --git a/test/unit/utGenNormals.h b/test/unit/utGenNormals.h
index ea5a7cb09..bedf7b7b7 100644
--- a/test/unit/utGenNormals.h
+++ b/test/unit/utGenNormals.h
@@ -4,9 +4,9 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <aiTypes.h>
-#include <aiMesh.h>
-#include <aiScene.h>
+#include <types.h>
+#include <mesh.h>
+#include <scene.h>
 #include <GenVertexNormalsProcess.h>
 
 
diff --git a/test/unit/utImporter.h b/test/unit/utImporter.h
index baec140b1..12d939b2e 100644
--- a/test/unit/utImporter.h
+++ b/test/unit/utImporter.h
@@ -4,7 +4,7 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <assimp.hpp>
+#include <Importer.hpp>
 #include <BaseImporter.h>
 
 using namespace std;
diff --git a/test/unit/utJoinVertices.h b/test/unit/utJoinVertices.h
index e1c293959..7d5f30cdf 100644
--- a/test/unit/utJoinVertices.h
+++ b/test/unit/utJoinVertices.h
@@ -4,7 +4,7 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <aiScene.h>
+#include <scene.h>
 #include <JoinVerticesProcess.h>
 
 
diff --git a/test/unit/utLimitBoneWeights.h b/test/unit/utLimitBoneWeights.h
index 61495874b..3affcd0f2 100644
--- a/test/unit/utLimitBoneWeights.h
+++ b/test/unit/utLimitBoneWeights.h
@@ -4,7 +4,7 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <aiScene.h>
+#include <scene.h>
 #include <LimitBoneWeightsProcess.h>
 
 
diff --git a/test/unit/utMaterialSystem.h b/test/unit/utMaterialSystem.h
index 307907023..f31a58b4e 100644
--- a/test/unit/utMaterialSystem.h
+++ b/test/unit/utMaterialSystem.h
@@ -4,9 +4,9 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <aiTypes.h>
-#include <aiMesh.h>
-#include <aiScene.h>
+#include <types.h>
+#include <mesh.h>
+#include <scene.h>
 #include <MaterialSystem.h>
 
 
diff --git a/test/unit/utPretransformVertices.h b/test/unit/utPretransformVertices.h
index edb95cae9..af77725ec 100644
--- a/test/unit/utPretransformVertices.h
+++ b/test/unit/utPretransformVertices.h
@@ -4,7 +4,7 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <aiScene.h>
+#include <scene.h>
 #include <PretransformVertices.h>
 
 
diff --git a/test/unit/utRemoveComments.h b/test/unit/utRemoveComments.h
index 9ed17e2da..ca723975e 100644
--- a/test/unit/utRemoveComments.h
+++ b/test/unit/utRemoveComments.h
@@ -4,7 +4,7 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include "aiTypes.h"
+#include "types.h"
 #include <RemoveComments.h>
 
 
diff --git a/test/unit/utRemoveComponent.h b/test/unit/utRemoveComponent.h
index a06bddd2a..bb2d86f90 100644
--- a/test/unit/utRemoveComponent.h
+++ b/test/unit/utRemoveComponent.h
@@ -4,7 +4,7 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <aiScene.h>
+#include <scene.h>
 #include <RemoveVCProcess.h>
 #include <MaterialSystem.h>
 
diff --git a/test/unit/utRemoveRedundantMaterials.h b/test/unit/utRemoveRedundantMaterials.h
index b0b310669..ef9f8c888 100644
--- a/test/unit/utRemoveRedundantMaterials.h
+++ b/test/unit/utRemoveRedundantMaterials.h
@@ -4,9 +4,9 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <aiTypes.h>
-#include <aiMesh.h>
-#include <aiScene.h>
+#include <types.h>
+#include <mesh.h>
+#include <scene.h>
 #include <RemoveRedundantMaterials.h>
 #include <MaterialSystem.h>
 
diff --git a/test/unit/utScenePreprocessor.h b/test/unit/utScenePreprocessor.h
index d1b51b7fd..80ef6d797 100644
--- a/test/unit/utScenePreprocessor.h
+++ b/test/unit/utScenePreprocessor.h
@@ -7,9 +7,9 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <aiMesh.h>
-#include <aiScene.h>
-#include <assimp.hpp>
+#include <mesh.h>
+#include <scene.h>
+#include <Importer.hpp>
 #include <ScenePreprocessor.h>
 
 using namespace std;
diff --git a/test/unit/utSharedPPData.h b/test/unit/utSharedPPData.h
index 14fd23fea..f9262767e 100644
--- a/test/unit/utSharedPPData.h
+++ b/test/unit/utSharedPPData.h
@@ -4,8 +4,8 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <aiTypes.h>
-#include <aiScene.h>
+#include <types.h>
+#include <scene.h>
 #include <BaseProcess.h>
 
 
diff --git a/test/unit/utSortByPType.h b/test/unit/utSortByPType.h
index 997ba8355..27500d3bd 100644
--- a/test/unit/utSortByPType.h
+++ b/test/unit/utSortByPType.h
@@ -4,8 +4,8 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <aiTypes.h>
-#include <aiScene.h>
+#include <types.h>
+#include <scene.h>
 #include <SortByPTypeProcess.h>
 
 
diff --git a/test/unit/utSplitLargeMeshes.h b/test/unit/utSplitLargeMeshes.h
index c63d3c2ba..9fc299f0e 100644
--- a/test/unit/utSplitLargeMeshes.h
+++ b/test/unit/utSplitLargeMeshes.h
@@ -4,9 +4,9 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <aiTypes.h>
-#include <aiMesh.h>
-#include <aiScene.h>
+#include <types.h>
+#include <mesh.h>
+#include <scene.h>
 #include <SplitLargeMeshes.h>
 
 
diff --git a/test/unit/utTriangulate.h b/test/unit/utTriangulate.h
index 2d6568642..5e33f7331 100644
--- a/test/unit/utTriangulate.h
+++ b/test/unit/utTriangulate.h
@@ -4,9 +4,9 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <aiTypes.h>
-#include <aiMesh.h>
-#include <aiScene.h>
+#include <types.h>
+#include <mesh.h>
+#include <scene.h>
 #include <TriangulateProcess.h>
 
 
diff --git a/test/unit/utVertexTriangleAdjacency.h b/test/unit/utVertexTriangleAdjacency.h
index 70334f89d..8a59cf28d 100644
--- a/test/unit/utVertexTriangleAdjacency.h
+++ b/test/unit/utVertexTriangleAdjacency.h
@@ -4,8 +4,8 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include "aiTypes.h"
-#include "aiMesh.h"
+#include "types.h"
+#include "mesh.h"
 #include <VertexTriangleAdjacency.h>
 
 
diff --git a/tools/assimp_cmd/Main.h b/tools/assimp_cmd/Main.h
index ca04c3e50..4a45c9f4f 100644
--- a/tools/assimp_cmd/Main.h
+++ b/tools/assimp_cmd/Main.h
@@ -53,14 +53,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <time.h>
 #include <limits>
 
-#include <assimp/aiPostProcess.h>
-#include <assimp/aiVersion.h>
-#include <assimp/aiScene.h>
-#include <assimp/assimp.hpp>
-#include <assimp/DefaultLogger.h>
+#include <assimp/postprocess.h>
+#include <assimp/version.h>
+#include <assimp/scene.h>
+#include <assimp/Importer.hpp>
+#include <assimp/DefaultLogger.hpp>
 
 #ifndef ASSIMP_BUILD_NO_EXPORT
-#	include <assimp/export.hpp>
+#	include <assimp/Exporter.hpp>
 #endif
 
 #include <../code/AssimpPCH.h> /* to get stdint.h */
diff --git a/tools/assimp_view/assimp_view.h b/tools/assimp_view/assimp_view.h
index a96b137dd..f8bdf54e4 100644
--- a/tools/assimp_view/assimp_view.h
+++ b/tools/assimp_view/assimp_view.h
@@ -48,16 +48,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "resource.h"
 
 // Include ASSIMP headers (XXX: do we really need all of them?)
-#include <assimp/assimp.h>
-#include <assimp/assimp.hpp>
-#include <assimp/aiAssert.h>
-#include <assimp/aiFileIO.h>
-#include <assimp/aiPostProcess.h>
-#include <assimp/aiScene.h>
-#include <assimp/IOSystem.h>
-#include <assimp/IOStream.h>
-#include <assimp/LogStream.h>
-#include <assimp/DefaultLogger.h>
+#include <assimp/cimport.h>
+#include <assimp/Importer.hpp>
+#include <assimp/assert.h>
+#include <assimp/cfileio.h>
+#include <assimp/postprocess.h>
+#include <assimp/scene.h>
+#include <assimp/IOSystem.hpp>
+#include <assimp/IOStream.hpp>
+#include <assimp/LogStream.hpp>
+#include <assimp/DefaultLogger.hpp>
 
 #include "../../code/AssimpPCH.h" /* HACK */
  
diff --git a/workspaces/vc9/assimp.vcproj b/workspaces/vc9/assimp.vcproj
index cb045f3e6..1e24aa78b 100644
--- a/workspaces/vc9/assimp.vcproj
+++ b/workspaces/vc9/assimp.vcproj
@@ -1105,59 +1105,51 @@
 				Name="Compiler"
 				>
 				<File
-					RelativePath="..\..\include\Compiler\poppack1.h"
+					RelativePath="..\..\include\assimp\Compiler\poppack1.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\code\pstdint.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\include\Compiler\pushpack1.h"
+					RelativePath="..\..\include\assimp\Compiler\pushpack1.h"
 					>
 				</File>
 			</Filter>
 			<Filter
-				Name="Cpp"
+				Name="C++"
 				>
 				<File
-					RelativePath="..\..\include\aiAssert.h"
+					RelativePath="..\..\include\assimp\DefaultLogger.hpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\assimp.hpp"
+					RelativePath="..\..\include\assimp\Exporter.hpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\DefaultLogger.h"
+					RelativePath="..\..\include\assimp\Importer.hpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\export.hpp"
+					RelativePath="..\..\include\assimp\IOStream.hpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IOStream.h"
+					RelativePath="..\..\include\assimp\IOSystem.hpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IOSystem.h"
+					RelativePath="..\..\include\assimp\Logger.hpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\Logger.h"
+					RelativePath="..\..\include\assimp\LogStream.hpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\LogStream.h"
+					RelativePath="..\..\include\assimp\NullLogger.hpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\NullLogger.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\include\ProgressHandler.h"
+					RelativePath="..\..\include\assimp\ProgressHandler.hpp"
 					>
 				</File>
 			</Filter>
@@ -1165,19 +1157,15 @@
 				Name="C"
 				>
 				<File
-					RelativePath="..\..\include\aiFileIO.h"
+					RelativePath="..\..\include\assimp\cexport.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\aiVersion.h"
+					RelativePath="..\..\include\assimp\cfileio.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\assimp.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\include\export.h"
+					RelativePath="..\..\include\assimp\cimport.h"
 					>
 				</File>
 			</Filter>
@@ -1185,99 +1173,107 @@
 				Name="Common"
 				>
 				<File
-					RelativePath="..\..\include\aiAnim.h"
+					RelativePath="..\..\include\assimp\anim.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\aiCamera.h"
+					RelativePath="..\..\include\assimp\assert.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\aiColor4D.h"
+					RelativePath="..\..\include\assimp\camera.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\aiColor4D.inl"
+					RelativePath="..\..\include\assimp\color4.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\aiConfig.h"
+					RelativePath="..\..\include\assimp\color4.inl"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\aiDefines.h"
+					RelativePath="..\..\include\assimp\config.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\aiLight.h"
+					RelativePath="..\..\include\assimp\defs.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\aiMaterial.h"
+					RelativePath="..\..\include\assimp\light.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\aiMaterial.inl"
+					RelativePath="..\..\include\assimp\material.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\aiMatrix3x3.h"
+					RelativePath="..\..\include\assimp\material.inl"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\aiMatrix3x3.inl"
+					RelativePath="..\..\include\assimp\matrix3x3.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\aiMatrix4x4.h"
+					RelativePath="..\..\include\assimp\matrix3x3.inl"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\aiMatrix4x4.inl"
+					RelativePath="..\..\include\assimp\matrix4x4.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\aiMesh.h"
+					RelativePath="..\..\include\assimp\matrix4x4.inl"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\aiPostProcess.h"
+					RelativePath="..\..\include\assimp\mesh.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\aiQuaternion.h"
+					RelativePath="..\..\include\assimp\postprocess.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\aiQuaternion.inl"
+					RelativePath="..\..\include\assimp\quaternion.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\aiScene.h"
+					RelativePath="..\..\include\assimp\quaternion.inl"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\aiTexture.h"
+					RelativePath="..\..\include\assimp\scene.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\aiTypes.h"
+					RelativePath="..\..\include\assimp\texture.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\aiVector2D.h"
+					RelativePath="..\..\include\assimp\types.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\aiVector2D.inl"
+					RelativePath="..\..\include\assimp\vector2.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\aiVector3D.h"
+					RelativePath="..\..\include\assimp\vector2.inl"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\aiVector3D.inl"
+					RelativePath="..\..\include\assimp\vector3.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\include\assimp\vector3.inl"
+					>
+				</File>
+				<File
+					RelativePath="..\..\include\assimp\version.h"
 					>
 				</File>
 			</Filter>