diff --git a/code/3DSConverter.cpp b/code/3DSConverter.cpp
index ef3788f99..d5a83461c 100644
--- a/code/3DSConverter.cpp
+++ b/code/3DSConverter.cpp
@@ -41,12 +41,17 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /** @file Implementation of the 3ds importer class */
 
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_3DS_IMPORTER
 
 // internal headers
 #include "3DSLoader.h"
-#include "TargetAnimation.h"
+#include "TargetAnimation.h"
+#include "../include/assimp/scene.h"
+#include "../include/assimp/DefaultLogger.hpp"
+#include "StringComparison.h"
+#include <boost/scoped_array.hpp>
+#include <cctype>
 
 using namespace Assimp;
 
diff --git a/code/3DSExporter.cpp b/code/3DSExporter.cpp
index 56480bc93..b16a3b2c7 100644
--- a/code/3DSExporter.cpp
+++ b/code/3DSExporter.cpp
@@ -38,7 +38,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ----------------------------------------------------------------------
 */
 
-#include "AssimpPCH.h"
 
 #ifndef ASSIMP_BUILD_NO_EXPORT
 #ifndef ASSIMP_BUILD_NO_3DS_EXPORTER
@@ -47,6 +46,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "3DSLoader.h"
 #include "SceneCombiner.h"
 #include "SplitLargeMeshes.h"
+#include "StringComparison.h"
+#include "../include/assimp/IOSystem.hpp"
+#include "../include/assimp/DefaultLogger.hpp"
+#include "../include/assimp/Exporter.hpp"
+#include <memory>
 
 using namespace Assimp;
 namespace Assimp	{
diff --git a/code/3DSExporter.h b/code/3DSExporter.h
index 9742abb0c..c662bb0f0 100644
--- a/code/3DSExporter.h
+++ b/code/3DSExporter.h
@@ -45,11 +45,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_3DSEXPORTER_H_INC
 
 #include <map>
+#include <boost/shared_ptr.hpp>
 
 #include "StreamWriter.h"
+#include "./../include/assimp/material.h"
 
 struct aiScene;
 struct aiNode;
+struct aiMaterial;
+struct aiMesh;
 
 namespace Assimp	
 {
diff --git a/code/3DSHelper.h b/code/3DSHelper.h
index 28b31c2b6..aa916fb13 100644
--- a/code/3DSHelper.h
+++ b/code/3DSHelper.h
@@ -46,6 +46,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "SpatialSort.h"
 #include "SmoothingGroups.h"
+#include "qnan.h"
+#include "./../include/assimp/material.h"
+#include "./../include/assimp/camera.h"
+#include "./../include/assimp/light.h"
+#include "./../include/assimp/anim.h"
+#include <stdio.h> //sprintf
 
 namespace Assimp	{
 namespace D3DS	{
diff --git a/code/3DSLoader.cpp b/code/3DSLoader.cpp
index 6a51fb84f..914648ae8 100644
--- a/code/3DSLoader.cpp
+++ b/code/3DSLoader.cpp
@@ -45,11 +45,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  http://www.the-labs.com/Blender/3DS-details.html
  */
 
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_3DS_IMPORTER
 
 // internal headers
-#include "3DSLoader.h"
+#include "3DSLoader.h"
+#include "Macros.h"
+#include "../include/assimp/IOSystem.hpp"
+#include "../include/assimp/scene.h"
+#include "../include/assimp/DefaultLogger.hpp"
+#include "StringComparison.h"
 
 using namespace Assimp;
 
diff --git a/code/3DSLoader.h b/code/3DSLoader.h
index 2b1dd26f8..3b02eae2e 100644
--- a/code/3DSLoader.h
+++ b/code/3DSLoader.h
@@ -50,8 +50,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef ASSIMP_BUILD_NO_3DS_IMPORTER
 
-struct aiNode;
 #include "3DSHelper.h"
+#include "StreamReader.h"
+
+struct aiNode;
 
 namespace Assimp	{
 
diff --git a/code/ACLoader.cpp b/code/ACLoader.cpp
index fc00316bf..58d31bf5d 100644
--- a/code/ACLoader.cpp
+++ b/code/ACLoader.cpp
@@ -42,7 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /** @file Implementation of the AC3D importer class */
 
-#include "AssimpPCH.h"
+
 
 #ifndef ASSIMP_BUILD_NO_AC_IMPORTER
 
@@ -50,7 +50,17 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ACLoader.h"
 #include "ParsingUtils.h"
 #include "fast_atof.h"
-#include "Subdivision.h"
+#include "Subdivision.h"
+#include "Importer.h"
+#include "BaseImporter.h"
+#include "../include/assimp/Importer.hpp"
+#include "../include/assimp/light.h"
+#include "../include/assimp/DefaultLogger.hpp"
+#include "../include/assimp/material.h"
+#include "../include/assimp/scene.h"
+#include "../include/assimp/config.h"
+#include "../include/assimp/IOSystem.hpp"
+#include <boost/scoped_ptr.hpp>
 
 using namespace Assimp;
 
diff --git a/code/ACLoader.h b/code/ACLoader.h
index 2724053e4..0f713dc99 100644
--- a/code/ACLoader.h
+++ b/code/ACLoader.h
@@ -49,6 +49,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "BaseImporter.h"
 #include "../include/assimp/types.h"
 
+struct aiNode;
+struct aiMesh;
+struct aiMaterial;
+struct aiLight;
+
+
 namespace Assimp	{
 
 // ---------------------------------------------------------------------------
diff --git a/code/ASELoader.cpp b/code/ASELoader.cpp
index f84978509..3a78e066f 100644
--- a/code/ASELoader.cpp
+++ b/code/ASELoader.cpp
@@ -43,7 +43,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Implementation of the ASE importer class
  */
 
-#include "AssimpPCH.h"
 #ifndef ASSIMP_BUILD_NO_ASE_IMPORTER
 
 // internal headers
@@ -51,6 +50,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "StringComparison.h"
 #include "SkeletonMeshBuilder.h"
 #include "TargetAnimation.h"
+#include "../include/assimp/Importer.hpp"
+#include <boost/scoped_ptr.hpp>
+#include "../include/assimp/IOSystem.hpp"
+#include "../include/assimp/DefaultLogger.hpp"
+#include "../include/assimp/scene.h"
+
 
 // utilities
 #include "fast_atof.h"
diff --git a/code/ASEParser.cpp b/code/ASEParser.cpp
index 98dd30457..7e16c43ed 100644
--- a/code/ASEParser.cpp
+++ b/code/ASEParser.cpp
@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Implementation of the ASE parser class 
  */
 
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_ASE_IMPORTER
 
 // internal headers
@@ -51,6 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ASELoader.h"
 #include "MaterialSystem.h"
 #include "fast_atof.h"
+#include "../include/assimp/DefaultLogger.hpp"
 
 using namespace Assimp;
 using namespace Assimp::ASE;
diff --git a/code/AssbinExporter.cpp b/code/AssbinExporter.cpp
index 405b676be..9ab21def9 100644
--- a/code/AssbinExporter.cpp
+++ b/code/AssbinExporter.cpp
@@ -40,10 +40,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /** @file  AssbinExporter.cpp
  *  ASSBIN exporter main code
  */
-#include "AssimpPCH.h"
 #include "assbin_chunks.h"
-#include "./../include/assimp/version.h"
+#include "../include/assimp/version.h"
+#include "../include/assimp/IOStream.hpp"
+#include "../include/assimp/IOSystem.hpp"
+#include "../include/assimp/Exporter.hpp"
 #include "ProcessHelper.h"
+#include "Exceptional.h"
+#include <boost/static_assert.hpp>
 
 #ifdef ASSIMP_BUILD_NO_OWN_ZLIB
 #	include <zlib.h>
diff --git a/code/AssbinLoader.cpp b/code/AssbinLoader.cpp
index bb73e10b3..6818929fb 100644
--- a/code/AssbinLoader.cpp
+++ b/code/AssbinLoader.cpp
@@ -45,13 +45,17 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  see assbin_chunks.h
  */
 
-#include "AssimpPCH.h"
 #ifndef ASSIMP_BUILD_NO_ASSBIN_IMPORTER
 
 // internal headers
 #include "AssbinLoader.h"
 #include "assbin_chunks.h"
 #include "MemoryIOWrapper.h"
+#include "../include/assimp/mesh.h"
+#include "../include/assimp/anim.h"
+#include "../include/assimp/scene.h"
+#include <boost/static_assert.hpp>
+
 #ifdef ASSIMP_BUILD_NO_OWN_ZLIB
 #	include <zlib.h>
 #else
diff --git a/code/AssbinLoader.h b/code/AssbinLoader.h
index f4e6e059a..1bcd2711b 100644
--- a/code/AssbinLoader.h
+++ b/code/AssbinLoader.h
@@ -48,6 +48,17 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "BaseImporter.h"
 #include "../include/assimp/types.h"
 
+class aiMesh;
+class aiNode;
+class aiBone;
+class aiMaterial;
+class aiMaterialProperty;
+class aiNodeAnim;
+class aiAnimation;
+class aiTexture;
+class aiLight;
+class aiCamera;
+
 #ifndef ASSIMP_BUILD_NO_ASSBIN_IMPORTER
 
 namespace Assimp	{
diff --git a/code/Assimp.cpp b/code/Assimp.cpp
index 89b62d110..a8a22314c 100644
--- a/code/Assimp.cpp
+++ b/code/Assimp.cpp
@@ -42,13 +42,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Implementation of the Plain-C API
  */
 
-#include "AssimpPCH.h"
 #include "../include/assimp/cimport.h"
+#include "../include/assimp/LogStream.hpp"
+#include "../include/assimp/DefaultLogger.hpp"
+#include "../include/assimp/importerdesc.h"
+#include "../include/assimp/scene.h"
 
 #include "GenericProperty.h"
 #include "CInterfaceIOWrapper.h"
-#include "../include/assimp/importerdesc.h"
-#include "Importer.h"
+#include "Importer.h"
+#include "Exceptional.h"
+#include "ScenePrivate.h"
+#include "BaseImporter.h"
+#include <list>
 
 // ------------------------------------------------------------------------------------------------
 #ifndef ASSIMP_BUILD_SINGLETHREADED
diff --git a/code/AssimpCExport.cpp b/code/AssimpCExport.cpp
index 70a5177da..47fa8d9f8 100644
--- a/code/AssimpCExport.cpp
+++ b/code/AssimpCExport.cpp
@@ -43,11 +43,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 Assimp C export interface. See Exporter.cpp for some notes.
 */
 
-#include "AssimpPCH.h"
-
 #ifndef ASSIMP_BUILD_NO_EXPORT
-#include "CInterfaceIOWrapper.h" 
-#include "SceneCombiner.h"
+#include "CInterfaceIOWrapper.h"
+#include "SceneCombiner.h"
+#include "ScenePrivate.h"
+#include "../include/assimp/Exporter.hpp"
 
 using namespace Assimp;
 
diff --git a/code/AssimpPCH.h b/code/AssimpPCH.h
deleted file mode 100644
index 548d13175..000000000
--- a/code/AssimpPCH.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
----------------------------------------------------------------------------
-Open Asset Import Library (assimp)
----------------------------------------------------------------------------
-
-Copyright (c) 2006-2012, assimp team
-
-All rights reserved.
-
-Redistribution and use of this software in source and binary forms, 
-with or without modification, are permitted provided that the following 
-conditions are met:
-
-* Redistributions of source code must retain the above
-  copyright notice, this list of conditions and the
-  following disclaimer.
-
-* Redistributions in binary form must reproduce the above
-  copyright notice, this list of conditions and the
-  following disclaimer in the documentation and/or other
-  materials provided with the distribution.
-
-* Neither the name of the assimp team, nor the names of its
-  contributors may be used to endorse or promote products
-  derived from this software without specific prior
-  written permission of the assimp team.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
----------------------------------------------------------------------------
-*/
-
-/** @file AssimpPCH.h
- *  PCH master include. Every unit in Assimp has to include it.
- */
-
-#ifndef ASSIMP_PCH_INCLUDED
-#define ASSIMP_PCH_INCLUDED
-#define ASSIMP_INTERNAL_BUILD
-
-// ----------------------------------------------------------------------------------------
-/* 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/defs.h"
-
-// Include our stdint.h replacement header for MSVC, take the global header for gcc/mingw
-#if defined( _MSC_VER) && (_MSC_VER < 1600)
-#	include "../include/assimp/Compiler/pstdint.h"
-#else
-#	include <stdint.h>
-#endif
-
-/* Undefine the min/max macros defined by some platform headers (namely Windows.h) to 
- * avoid obvious conflicts with std::min() and std::max(). 
- */
-#undef min
-#undef max
-
-/* Concatenate two tokens after evaluating them
- */
-#define _AI_CONCAT(a,b)  a ## b
-#define  AI_CONCAT(a,b)  _AI_CONCAT(a,b)
-
-/* Helper macro to set a pointer to NULL in debug builds
- */
-#if (defined ASSIMP_BUILD_DEBUG)
-#	define AI_DEBUG_INVALIDATE_PTR(x) x = NULL;
-#else
-#	define AI_DEBUG_INVALIDATE_PTR(x)
-#endif
-
-/* Beginning with MSVC8 some C string manipulation functions are mapped to their _safe_
- * counterparts (e.g. _itoa_s). This avoids a lot of trouble with deprecation warnings.
- */
-#if _MSC_VER >= 1400 && !(defined _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES)
-#	define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES 1
-#endif
-
-/* size_t to unsigned int, possible loss of data. The compiler is right with his warning
- * but this loss of data won't be a problem for us. So shut up, little boy.
- */
-#ifdef _MSC_VER
-#	pragma warning (disable : 4267)
-#endif
-
-// ----------------------------------------------------------------------------------------
-/* Actually that's not required for MSVC. It is included somewhere in the deeper parts of
- * the MSVC STL but it's necessary for proper build with STLport.
- */
-#include <ctype.h>
-
-// Runtime/STL headers
-#include <vector>
-#include <list>
-#include <map>
-#include <set>
-#include <string>
-#include <sstream>
-#include <iomanip>
-#include <cassert>
-#include <stack>
-#include <queue>
-#include <iostream>
-#include <algorithm>
-#include <numeric>
-#include <new>
-#include <cstdio>
-#include <limits.h>
-#include <memory>
-
-// Boost headers
-#include <boost/pointer_cast.hpp>
-#include <boost/scoped_ptr.hpp>
-#include <boost/scoped_array.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/shared_array.hpp>
-#include <boost/make_shared.hpp>
-#include <boost/format.hpp>
-#include <boost/foreach.hpp>
-#include <boost/static_assert.hpp>
-#include <boost/lexical_cast.hpp>
-
-// Public ASSIMP headers
-#include "../include/assimp/DefaultLogger.hpp"
-#include "../include/assimp/IOStream.hpp"
-#include "../include/assimp/IOSystem.hpp"
-#include "../include/assimp/scene.h"
-#include "../include/assimp/importerdesc.h"
-#include "../include/assimp/postprocess.h"
-#include "../include/assimp/Importer.hpp"
-#include "../include/assimp/Exporter.hpp"
-
-// Internal utility headers
-#include "BaseImporter.h"
-#include "StringComparison.h"
-#include "StreamReader.h"
-#include "qnan.h"
-#include "ScenePrivate.h" 
-
-
-// We need those constants, workaround for any platforms where nobody defined them yet
-#if (!defined SIZE_MAX)
-#	define SIZE_MAX (~((size_t)0))
-#endif
-
-#if (!defined UINT_MAX)
-#	define UINT_MAX (~((unsigned int)0))
-#endif
-
-
-#endif // !! ASSIMP_PCH_INCLUDED
diff --git a/code/AssxmlExporter.cpp b/code/AssxmlExporter.cpp
index b6aabd393..7bab7b1fe 100644
--- a/code/AssxmlExporter.cpp
+++ b/code/AssxmlExporter.cpp
@@ -41,9 +41,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  ASSXML exporter main code
  */
 #include <stdarg.h>
-#include "AssimpPCH.h"
 #include "./../include/assimp/version.h"
 #include "ProcessHelper.h"
+#include "../include/assimp/IOStream.hpp"
+#include "../include/assimp/IOSystem.hpp"
+#include "../include/assimp/Exporter.hpp"
 
 #ifdef ASSIMP_BUILD_NO_OWN_ZLIB
 #	include <zlib.h>
@@ -52,6 +54,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endif
 
 #include <time.h>
+#include <stdio.h>
 
 #ifndef ASSIMP_BUILD_NO_EXPORT
 #ifndef ASSIMP_BUILD_NO_ASSXML_EXPORTER
diff --git a/code/B3DImporter.cpp b/code/B3DImporter.cpp
index aa862a1fe..a2f8b5593 100644
--- a/code/B3DImporter.cpp
+++ b/code/B3DImporter.cpp
@@ -43,13 +43,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Implementation of the b3d importer class
  */
 
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_B3D_IMPORTER
 
 // internal headers
 #include "B3DImporter.h"
 #include "TextureTransform.h"
-#include "ConvertToLHProcess.h"
+#include "ConvertToLHProcess.h"
+#include <boost/scoped_ptr.hpp>
+#include "../include/assimp/IOSystem.hpp"
+#include "../include/assimp/anim.h"
+#include "../include/assimp/scene.h"
+#include "../include/assimp/DefaultLogger.hpp"
+
 
 using namespace Assimp;
 using namespace std;
diff --git a/code/B3DImporter.h b/code/B3DImporter.h
index d27a8c3a0..ed7375685 100644
--- a/code/B3DImporter.h
+++ b/code/B3DImporter.h
@@ -47,10 +47,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../include/assimp/types.h"
 #include "../include/assimp/mesh.h"
 #include "../include/assimp/material.h"
+#include "BaseImporter.h"
 
 #include <string>
 #include <vector>
 
+struct aiNodeAnim;
+struct aiNode;
+struct aiAnimation;
+
 namespace Assimp{
 
 class B3DImporter : public BaseImporter{
diff --git a/code/BVHLoader.cpp b/code/BVHLoader.cpp
index 6f512eaf2..94472debf 100644
--- a/code/BVHLoader.cpp
+++ b/code/BVHLoader.cpp
@@ -40,12 +40,17 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------------
 */
 
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_BVH_IMPORTER
 
 #include "BVHLoader.h"
 #include "fast_atof.h"
-#include "SkeletonMeshBuilder.h"
+#include "SkeletonMeshBuilder.h"
+#include "../include/assimp/Importer.hpp"
+#include <boost/scoped_ptr.hpp>
+#include <boost/format.hpp>
+#include "../include/assimp/IOSystem.hpp"
+#include "../include/assimp/scene.h"
 
 using namespace Assimp;
 
diff --git a/code/BVHLoader.h b/code/BVHLoader.h
index 64e67e9f1..3d36b2d75 100644
--- a/code/BVHLoader.h
+++ b/code/BVHLoader.h
@@ -49,6 +49,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "BaseImporter.h"
 
+struct aiNode;
+
 namespace Assimp
 {
 
diff --git a/code/BaseImporter.cpp b/code/BaseImporter.cpp
index b43c1c40f..3eb0826ae 100644
--- a/code/BaseImporter.cpp
+++ b/code/BaseImporter.cpp
@@ -43,11 +43,20 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Implementation of BaseImporter 
  */
 
-#include "AssimpPCH.h"
 #include "BaseImporter.h"
 #include "FileSystemFilter.h"
-
-#include "Importer.h"
+#include "Importer.h"
+#include "ByteSwap.h"
+#include "../include/assimp/scene.h"
+#include "../include/assimp/Importer.hpp"
+#include "../include/assimp/postprocess.h"
+#include <ios>
+#include <list>
+#include <boost/scoped_ptr.hpp>
+#include <boost/scoped_array.hpp>
+#include <sstream>
+#include <cctype>
+
 
 using namespace Assimp;
 
diff --git a/code/BaseImporter.h b/code/BaseImporter.h
index c12ff256e..06b013f5e 100644
--- a/code/BaseImporter.h
+++ b/code/BaseImporter.h
@@ -47,18 +47,20 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <string>
 #include <map>
 #include <vector>
-#include "./../include/assimp/types.h"
+#include <set>
+#include "../include/assimp/types.h"
+#include "../include/assimp/ProgressHandler.hpp"
 
 struct aiScene;
 
 namespace Assimp	{
-
-class IOSystem;
+
 class Importer;
-class BaseImporter;
+class IOSystem;
 class BaseProcess;
 class SharedPostProcessInfo;
-class IOStream;
+class IOStream;
+
 
 // utility to do char4 to uint32 in a portable manner
 #define AI_MAKE_MAGIC(string) ((uint32_t)((string[0] << 24) + \
diff --git a/code/BaseProcess.cpp b/code/BaseProcess.cpp
index a1261d7a1..379324c58 100644
--- a/code/BaseProcess.cpp
+++ b/code/BaseProcess.cpp
@@ -41,10 +41,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /** @file Implementation of BaseProcess */
 
-#include "AssimpPCH.h"
 #include "BaseImporter.h"
 #include "BaseProcess.h"
-
+#include "../include/assimp/DefaultLogger.hpp"
+#include "../include/assimp/scene.h"
 #include "Importer.h"
 
 using namespace Assimp;
diff --git a/code/Bitmap.cpp b/code/Bitmap.cpp
index 30b5744ad..6e62939d8 100644
--- a/code/Bitmap.cpp
+++ b/code/Bitmap.cpp
@@ -45,9 +45,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * Used for file formats which embed their textures into the model file.
  */
 
-#include "AssimpPCH.h"
 
 #include "Bitmap.h"
+#include "../include/assimp/texture.h"
+#include "../include/assimp/IOStream.hpp"
+#include "ByteSwap.h"
 
 namespace Assimp {
 
diff --git a/code/Bitmap.h b/code/Bitmap.h
index 36f80363e..582f39565 100644
--- a/code/Bitmap.h
+++ b/code/Bitmap.h
@@ -48,8 +48,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_BITMAP_H_INC
 #define AI_BITMAP_H_INC
 
+#include <stdint.h>
+#include <cstddef>
+struct aiTexture;
+
 namespace Assimp {
 
+class IOStream;
 class Bitmap {
 
 	protected:
diff --git a/code/BlenderBMesh.cpp b/code/BlenderBMesh.cpp
index 4dbf1d104..c41b46301 100644
--- a/code/BlenderBMesh.cpp
+++ b/code/BlenderBMesh.cpp
@@ -42,7 +42,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Conversion of Blender's new BMesh stuff
  */
 
-#include "AssimpPCH.h"
 
 #ifndef ASSIMP_BUILD_NO_BLEND_IMPORTER
 
diff --git a/code/BlenderDNA.cpp b/code/BlenderDNA.cpp
index 16e639ecf..3e443383e 100644
--- a/code/BlenderDNA.cpp
+++ b/code/BlenderDNA.cpp
@@ -42,12 +42,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Implementation of the Blender `DNA`, that is its own
  *    serialized set of data structures.
  */
-#include "AssimpPCH.h"
+
 
 #ifndef ASSIMP_BUILD_NO_BLEND_IMPORTER
 #include "BlenderDNA.h"
 #include "StreamReader.h"
-#include "fast_atof.h"
+#include "fast_atof.h"
+#include <boost/foreach.hpp>
 
 using namespace Assimp;
 using namespace Assimp::Blender;
diff --git a/code/BlenderDNA.h b/code/BlenderDNA.h
index 7cc2708e4..b61ee19ce 100644
--- a/code/BlenderDNA.h
+++ b/code/BlenderDNA.h
@@ -47,6 +47,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "BaseImporter.h"
 #include "TinyFormatter.h"
+#include "StreamReader.h"
+#include "../include/assimp/DefaultLogger.hpp"
+#include <stdint.h>
+#include <boost/shared_ptr.hpp>
+
 
 // enable verbose log output. really verbose, so be careful.
 #ifdef ASSIMP_BUILD_DEBUG
diff --git a/code/BlenderDNA.inl b/code/BlenderDNA.inl
index af3e6c993..b43b0adb2 100644
--- a/code/BlenderDNA.inl
+++ b/code/BlenderDNA.inl
@@ -45,6 +45,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef INCLUDED_AI_BLEND_DNA_INL
 #define INCLUDED_AI_BLEND_DNA_INL
 
+#include <boost/shared_ptr.hpp>
+
 namespace Assimp	{
 	namespace Blender {
 
diff --git a/code/BlenderIntermediate.h b/code/BlenderIntermediate.h
index 05f80f33b..7dfa38534 100644
--- a/code/BlenderIntermediate.h
+++ b/code/BlenderIntermediate.h
@@ -49,6 +49,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "BlenderDNA.h"
 #include "BlenderScene.h"
 #include "BlenderSceneGen.h"
+#include <boost/foreach.hpp>
+#include <deque>
+#include "./../include/assimp/material.h"
+
+struct aiTexture;
 
 #define for_each(x,y) BOOST_FOREACH(x,y)
 
diff --git a/code/BlenderLoader.cpp b/code/BlenderLoader.cpp
index c9419b400..ae7df0b64 100644
--- a/code/BlenderLoader.cpp
+++ b/code/BlenderLoader.cpp
@@ -42,7 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /** @file  BlenderLoader.cpp
  *  @brief Implementation of the Blender3D importer class.
  */
-#include "AssimpPCH.h"
+
 
 //#define ASSIMP_BUILD_NO_COMPRESSED_BLEND
 // Uncomment this to disable support for (gzip)compressed .BLEND files
@@ -52,9 +52,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "BlenderIntermediate.h"
 #include "BlenderModifier.h"
 #include "BlenderBMesh.h"
+#include "../include/assimp/scene.h"
+#include "StringComparison.h"
 
 #include "StreamReader.h"
 #include "MemoryIOWrapper.h"
+#include <cctype>
+
 
 // zlib is needed for compressed blend files 
 #ifndef ASSIMP_BUILD_NO_COMPRESSED_BLEND
diff --git a/code/BlenderLoader.h b/code/BlenderLoader.h
index 4b44d2c7d..07ae84df5 100644
--- a/code/BlenderLoader.h
+++ b/code/BlenderLoader.h
@@ -46,6 +46,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "BaseImporter.h"
 #include "LogAux.h"
+#include <boost/shared_ptr.hpp>
+
+struct aiNode;
+struct aiMesh;
+struct aiLight;
+struct aiCamera;
+struct aiMaterial;
 
 namespace Assimp	{
 	
diff --git a/code/BlenderModifier.cpp b/code/BlenderModifier.cpp
index 74410d0a0..fb35b0c5b 100644
--- a/code/BlenderModifier.cpp
+++ b/code/BlenderModifier.cpp
@@ -41,12 +41,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /** @file  BlenderModifier.cpp
  *  @brief Implementation of some blender modifiers (i.e subdivision, mirror).
  */
-#include "AssimpPCH.h"
+
 
 #ifndef ASSIMP_BUILD_NO_BLEND_IMPORTER
 #include "BlenderModifier.h"
 #include "SceneCombiner.h"
-#include "Subdivision.h"
+#include "Subdivision.h"
+#include "../include/assimp/scene.h"
+#include <boost/scoped_ptr.hpp>
+#include <boost/scoped_array.hpp>
+#include <boost/pointer_cast.hpp>
 
 #include <functional>
 
diff --git a/code/BlenderScene.cpp b/code/BlenderScene.cpp
index 16f889c72..fa05076c8 100644
--- a/code/BlenderScene.cpp
+++ b/code/BlenderScene.cpp
@@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /** @file  BlenderScene.cpp
  *  @brief MACHINE GENERATED BY ./scripts/BlenderImporter/genblenddna.py
  */
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_BLEND_IMPORTER
 
 #include "BlenderDNA.h"
diff --git a/code/BlenderScene.h b/code/BlenderScene.h
index 24f5007dc..7d92918ee 100644
--- a/code/BlenderScene.h
+++ b/code/BlenderScene.h
@@ -44,6 +44,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef INCLUDED_AI_BLEND_SCENE_H
 #define INCLUDED_AI_BLEND_SCENE_H
 
+#include "BlenderDNA.h"
+
 namespace Assimp	{
 	namespace Blender {
 
diff --git a/code/BlenderSceneGen.h b/code/BlenderSceneGen.h
index 9e2f4b3ac..71019d136 100644
--- a/code/BlenderSceneGen.h
+++ b/code/BlenderSceneGen.h
@@ -44,6 +44,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef INCLUDED_AI_BLEND_SCENEGEN_H
 #define INCLUDED_AI_BLEND_SCENEGEN_H
 
+#include "BlenderDNA.h"
+#include "BlenderScene.h"
+
 namespace Assimp	{
 	namespace Blender {
 
diff --git a/code/BlenderTessellator.cpp b/code/BlenderTessellator.cpp
index 98ccbad6a..b8e6f3f39 100644
--- a/code/BlenderTessellator.cpp
+++ b/code/BlenderTessellator.cpp
@@ -42,7 +42,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief A simple tessellation wrapper
  */
 
-#include "AssimpPCH.h"
 
 #ifndef ASSIMP_BUILD_NO_BLEND_IMPORTER
 
diff --git a/code/BlobIOSystem.h b/code/BlobIOSystem.h
index 3e4889cfd..65ce3734e 100644
--- a/code/BlobIOSystem.h
+++ b/code/BlobIOSystem.h
@@ -45,6 +45,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_BLOBIOSYSTEM_H_INCLUDED
 #define AI_BLOBIOSYSTEM_H_INCLUDED
 
+#include "./../include/assimp/IOStream.hpp"
+#include "./../include/assimp/cexport.h"
+#include "./../include/assimp/IOSystem.hpp"
+#include "./../include/assimp/DefaultLogger.hpp"
+#include <boost/foreach.hpp>
+#include <stdint.h>
+#include <set>
+#include <vector>
+
 namespace Assimp	{
 	class BlobIOSystem;
 
diff --git a/code/BoostWorkaround/boost/format.hpp b/code/BoostWorkaround/boost/format.hpp
index 855d3ef81..e65499a6a 100644
--- a/code/BoostWorkaround/boost/format.hpp
+++ b/code/BoostWorkaround/boost/format.hpp
@@ -13,6 +13,7 @@
 
 #include <string>
 #include <vector>
+#include <sstream> 
 
 namespace boost
 {
diff --git a/code/BoostWorkaround/boost/shared_ptr.hpp b/code/BoostWorkaround/boost/shared_ptr.hpp
index 590e2ce87..d3d91f3fe 100644
--- a/code/BoostWorkaround/boost/shared_ptr.hpp
+++ b/code/BoostWorkaround/boost/shared_ptr.hpp
@@ -6,6 +6,9 @@
 
 // ------------------------------
 // Internal stub
+
+#include <stddef.h> //NULL
+#include <algorithm> //std::swap
 namespace boost {
 	namespace detail {
 		class controller {
diff --git a/code/BoostWorkaround/boost/timer.hpp b/code/BoostWorkaround/boost/timer.hpp
index 0fc826620..edc32378e 100644
--- a/code/BoostWorkaround/boost/timer.hpp
+++ b/code/BoostWorkaround/boost/timer.hpp
@@ -19,6 +19,7 @@
 
 //#include <boost/config.hpp>
 #include <ctime>
+#include <limits>
 //#include <boost/limits.hpp>
 
 # ifdef BOOST_NO_STDC_NAMESPACE
@@ -69,4 +70,4 @@ class timer
 
 } // namespace boost
 
-#endif  // BOOST_TIMER_HPP
\ No newline at end of file
+#endif  // BOOST_TIMER_HPP
diff --git a/code/ByteSwap.h b/code/ByteSwap.h
index 4be039599..53af1580c 100644
--- a/code/ByteSwap.h
+++ b/code/ByteSwap.h
@@ -45,6 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "../include/assimp/ai_assert.h"
 #include "../include/assimp/types.h"
+#include <stdint.h>
 
 #if _MSC_VER >= 1400 
 #include <stdlib.h>
diff --git a/code/C4DImporter.cpp b/code/C4DImporter.cpp
index 533967022..07ac29f70 100644
--- a/code/C4DImporter.cpp
+++ b/code/C4DImporter.cpp
@@ -41,7 +41,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /** @file  C4DImporter.cpp
  *  @brief Implementation of the Cinema4D importer class.
  */
-#include "AssimpPCH.h"
 #ifndef ASSIMP_BUILD_NO_C4D_IMPORTER
 
 // no #ifdefing here, Cinema4D support is carried out in a branch of assimp
@@ -642,3 +641,4 @@ unsigned int C4DImporter::ResolveMaterial(PolygonObject* obj)
 }
 
 #endif // ASSIMP_BUILD_NO_C4D_IMPORTER
+
diff --git a/code/C4DImporter.h b/code/C4DImporter.h
index 3c8526eb2..cff52fdbc 100644
--- a/code/C4DImporter.h
+++ b/code/C4DImporter.h
@@ -48,6 +48,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "LogAux.h"
 
 #include <set>
+struct aiNode;
+struct aiMesh;
+struct aiMaterial;
 
 struct aiImporterDesc;
 
diff --git a/code/CInterfaceIOWrapper.h b/code/CInterfaceIOWrapper.h
index 8508e4f54..1c0eb2faf 100644
--- a/code/CInterfaceIOWrapper.h
+++ b/code/CInterfaceIOWrapper.h
@@ -45,6 +45,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_CIOSYSTEM_H_INCLUDED
 
 #include "../include/assimp/cfileio.h"
+#include "../include/assimp/IOStream.hpp"
+#include "../include/assimp/IOSystem.hpp"
 
 namespace Assimp	{
 	
diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index e14215838..e74af87e9 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -145,6 +145,7 @@ SET( Common_SRCS
 	Bitmap.cpp
 	Bitmap.h
 	XMLTools.h
+	Version.cpp
 )
 SOURCE_GROUP(Common FILES ${Common_SRCS})
 
@@ -738,10 +739,6 @@ SET( assimp_src
 	${PUBLIC_HEADERS}
 	${COMPILER_HEADERS}
 
-	# Old precompiled header
-	# (removed because the precompiled header is not updated when visual studio switch configuration which leads to failed compilation.
-	# Moreover it's a drag to recompile assimp entirely each time a modification is made to one of the included header, which is definitely counter-productive.)
-	AssimpPCH.cpp
 )
 add_definitions( -DOPENDDLPARSER_BUILD )
 
@@ -754,8 +751,6 @@ IF (ASSIMP_BUILD_NONFREE_C4D_IMPORTER)
 	INCLUDE_DIRECTORIES(${C4D_INCLUDES})
 ENDIF (ASSIMP_BUILD_NONFREE_C4D_IMPORTER)
 
-#ADD_MSVC_PRECOMPILED_HEADER("AssimpPCH.h" "AssimpPCH.cpp" assimp_src)
-
 ADD_LIBRARY( assimp ${assimp_src} )
 
 TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES} )
diff --git a/code/COBLoader.cpp b/code/COBLoader.cpp
index 0b90067c5..86209121a 100644
--- a/code/COBLoader.cpp
+++ b/code/COBLoader.cpp
@@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /** @file  COBLoader.cpp
  *  @brief Implementation of the TrueSpace COB/SCN importer class.
  */
-#include "AssimpPCH.h"
+
 
 #ifndef ASSIMP_BUILD_NO_COB_IMPORTER
 #include "COBLoader.h"
@@ -52,7 +52,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "fast_atof.h"
 
 #include "LineSplitter.h"
-#include "TinyFormatter.h"
+#include "TinyFormatter.h"
+#include <boost/scoped_ptr.hpp>
+#include <boost/foreach.hpp>
+#include "../include/assimp/IOSystem.hpp"
+#include "../include/assimp/DefaultLogger.hpp"
+#include "../include/assimp/scene.h"
+
 
 using namespace Assimp;
 using namespace Assimp::COB;
diff --git a/code/COBLoader.h b/code/COBLoader.h
index 1982801c4..095233afa 100644
--- a/code/COBLoader.h
+++ b/code/COBLoader.h
@@ -45,6 +45,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define INCLUDED_AI_COB_LOADER_H
 
 #include "BaseImporter.h"
+#include "StreamReader.h"
+
+struct aiNode;
+
 namespace Assimp	{
 	class LineSplitter;
 	
diff --git a/code/COBScene.h b/code/COBScene.h
index 251d2a6d2..0adb3bb39 100644
--- a/code/COBScene.h
+++ b/code/COBScene.h
@@ -45,7 +45,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define INCLUDED_AI_COB_SCENE_H
 
 #include <boost/shared_ptr.hpp>
+#include <deque>
+
 #include "BaseImporter.h"
+#include "./../include/assimp/material.h"
 
 namespace Assimp	{
 	namespace COB {
diff --git a/code/CSMLoader.cpp b/code/CSMLoader.cpp
index 643eb75ed..7310068a7 100644
--- a/code/CSMLoader.cpp
+++ b/code/CSMLoader.cpp
@@ -43,14 +43,21 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  Implementation of the CSM importer class.
  */
 
-#include "AssimpPCH.h"
+
 
 #ifndef ASSIMP_BUILD_NO_CSM_IMPORTER
 
 #include "CSMLoader.h"
 #include "SkeletonMeshBuilder.h"
 #include "ParsingUtils.h"
-#include "fast_atof.h"
+#include "fast_atof.h"
+#include "../include/assimp/Importer.hpp"
+#include <boost/scoped_ptr.hpp>
+#include "../include/assimp/IOSystem.hpp"
+#include "../include/assimp/anim.h"
+#include "../include/assimp/DefaultLogger.hpp"
+#include "../include/assimp/scene.h"
+
 
 using namespace Assimp;
 
diff --git a/code/CSMLoader.h b/code/CSMLoader.h
index d3fae27c1..79c73b75e 100644
--- a/code/CSMLoader.h
+++ b/code/CSMLoader.h
@@ -43,6 +43,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef INCLUDED_AI_CSM_LOADER_H
 #define INCLUDED_AI_CSM_LOADER_H
+
+#include "BaseImporter.h"
+
 namespace Assimp	{
 
 // ---------------------------------------------------------------------------
diff --git a/code/CalcTangentsProcess.cpp b/code/CalcTangentsProcess.cpp
index 10e70ba13..60c7e1d18 100644
--- a/code/CalcTangentsProcess.cpp
+++ b/code/CalcTangentsProcess.cpp
@@ -43,12 +43,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  tangents and bitangents for all imported meshes
  */
 
-#include "AssimpPCH.h"
-
 // internal headers
 #include "CalcTangentsProcess.h"
 #include "ProcessHelper.h"
-#include "TinyFormatter.h"
+#include "TinyFormatter.h"
+#include "qnan.h"
 
 using namespace Assimp;
 
diff --git a/code/ColladaExporter.cpp b/code/ColladaExporter.cpp
index e4cbab02c..380b971f2 100644
--- a/code/ColladaExporter.cpp
+++ b/code/ColladaExporter.cpp
@@ -38,7 +38,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ----------------------------------------------------------------------
 */
 
-#include "AssimpPCH.h"
+
 
 #ifndef ASSIMP_BUILD_NO_EXPORT
 #ifndef ASSIMP_BUILD_NO_COLLADA_EXPORTER
@@ -46,9 +46,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "Bitmap.h"
 #include "fast_atof.h"
-#include "SceneCombiner.h" 
+#include "SceneCombiner.h"
 #include "XMLTools.h"
-
+#include "../include/assimp/IOSystem.hpp"
+#include "../include/assimp/Exporter.hpp"
+#include "../include/assimp/scene.h"
+
+#include "Exceptional.h"
+
+#include <boost/scoped_ptr.hpp>
 #include <ctime>
 #include <set>
 
diff --git a/code/ColladaExporter.h b/code/ColladaExporter.h
index 47b8405e0..9456508ce 100644
--- a/code/ColladaExporter.h
+++ b/code/ColladaExporter.h
@@ -45,7 +45,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_COLLADAEXPORTER_H_INC
 
 #include "../include/assimp/ai_assert.h"
+#include "../include/assimp/material.h"
+#include "../include/assimp/mesh.h"
+#include "../include/assimp/Exporter.hpp"
 #include <sstream>
+#include <vector>
+#include <map>
+#include <boost/lexical_cast.hpp>
 
 struct aiScene;
 struct aiNode;
diff --git a/code/ColladaHelper.h b/code/ColladaHelper.h
index 99bbee269..2c94cd100 100644
--- a/code/ColladaHelper.h
+++ b/code/ColladaHelper.h
@@ -43,6 +43,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_COLLADAHELPER_H_INC
 #define AI_COLLADAHELPER_H_INC
 
+#include <string>
+#include <map>
+#include <vector>
+#include <stdint.h>
+#include "../include/assimp/types.h"
+#include "../include/assimp/mesh.h"
+#include "../include/assimp/material.h"
+
+struct aiMaterial;
+
 namespace Assimp	{
 namespace Collada		{
 
diff --git a/code/ColladaLoader.cpp b/code/ColladaLoader.cpp
index 33340cf9f..2f59e161a 100644
--- a/code/ColladaLoader.cpp
+++ b/code/ColladaLoader.cpp
@@ -41,18 +41,26 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /** @file Implementation of the Collada loader */
 
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_COLLADA_IMPORTER
 
 #include "../include/assimp/anim.h"
+#include "../include/assimp/scene.h"
 #include "ColladaLoader.h"
 #include "ColladaParser.h"
 
 #include "fast_atof.h"
 #include "ParsingUtils.h"
 #include "SkeletonMeshBuilder.h"
+#include "Defines.h"
+
+#include "time.h"
+#include <boost/foreach.hpp>
+#include "../include/assimp/DefaultLogger.hpp"
+#include "../include/assimp/Importer.hpp"
+#include <numeric>
+#include "Defines.h"
 
-#include "time.h"
 
 using namespace Assimp;
 
diff --git a/code/ColladaLoader.h b/code/ColladaLoader.h
index 392c8f359..e268bf086 100644
--- a/code/ColladaLoader.h
+++ b/code/ColladaLoader.h
@@ -46,6 +46,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "BaseImporter.h"
 #include "ColladaParser.h"
 
+struct aiNode;
+struct aiCamera;
+struct aiLight;
+struct aiTexture;
+struct aiAnimation;
+
 namespace Assimp
 {
 
diff --git a/code/ColladaParser.cpp b/code/ColladaParser.cpp
index 22d620f55..4e12a03dc 100644
--- a/code/ColladaParser.cpp
+++ b/code/ColladaParser.cpp
@@ -43,12 +43,18 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Implementation of the Collada parser helper
  */
 
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_COLLADA_IMPORTER
 
 #include "ColladaParser.h"
 #include "fast_atof.h"
-#include "ParsingUtils.h"
+#include "ParsingUtils.h"
+#include <boost/scoped_ptr.hpp>
+#include <boost/foreach.hpp>
+#include "../include/assimp/DefaultLogger.hpp"
+#include "../include/assimp/IOSystem.hpp"
+#include "../include/assimp/light.h"
+
 
 using namespace Assimp;
 using namespace Assimp::Collada;
diff --git a/code/ColladaParser.h b/code/ColladaParser.h
index 553f9caf4..57beeb4a5 100644
--- a/code/ColladaParser.h
+++ b/code/ColladaParser.h
@@ -47,6 +47,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "irrXMLWrapper.h"
 #include "ColladaHelper.h"
+#include "../include/assimp/ai_assert.h"
+#include <boost/format.hpp>
 
 namespace Assimp
 {
diff --git a/code/ComputeUVMappingProcess.cpp b/code/ComputeUVMappingProcess.cpp
index 2f037edb1..172268b66 100644
--- a/code/ComputeUVMappingProcess.cpp
+++ b/code/ComputeUVMappingProcess.cpp
@@ -41,9 +41,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /** @file GenUVCoords step */
 
 
-#include "AssimpPCH.h"
 #include "ComputeUVMappingProcess.h"
-#include "ProcessHelper.h"
+#include "ProcessHelper.h"
+#include "Exceptional.h"
 
 using namespace Assimp;
 
diff --git a/code/ComputeUVMappingProcess.h b/code/ComputeUVMappingProcess.h
index 99db239d5..c7498773e 100644
--- a/code/ComputeUVMappingProcess.h
+++ b/code/ComputeUVMappingProcess.h
@@ -45,8 +45,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "BaseProcess.h"
 #include "../include/assimp/mesh.h"
+#include "../include/assimp/material.h"
+#include "../include/assimp/types.h"
 
 class ComputeUVMappingTest;
+
 namespace Assimp
 	{
 
diff --git a/code/ConvertToLHProcess.cpp b/code/ConvertToLHProcess.cpp
index 4f5b40840..6f66bff2c 100644
--- a/code/ConvertToLHProcess.cpp
+++ b/code/ConvertToLHProcess.cpp
@@ -47,8 +47,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  better location.
  */
 
-#include "AssimpPCH.h"
-#include "ConvertToLHProcess.h"
+
+#include "ConvertToLHProcess.h"
+#include "../include/assimp/scene.h"
+#include "../include/assimp/postprocess.h"
+#include "../include/assimp/DefaultLogger.hpp"
 
 using namespace Assimp;
 
diff --git a/code/ConvertToLHProcess.h b/code/ConvertToLHProcess.h
index c11491294..5230cd0c1 100644
--- a/code/ConvertToLHProcess.h
+++ b/code/ConvertToLHProcess.h
@@ -54,6 +54,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 struct aiMesh;
 struct aiNodeAnim;
+struct aiNode;
+struct aiMaterial;
 
 namespace Assimp	{
 
diff --git a/code/DXFHelper.h b/code/DXFHelper.h
index 2b5cd00fe..f7966517a 100644
--- a/code/DXFHelper.h
+++ b/code/DXFHelper.h
@@ -48,6 +48,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "LineSplitter.h"
 #include "TinyFormatter.h"
 #include "StreamReader.h"
+#include "fast_atof.h"
+#include <vector>
+#include "../include/assimp/DefaultLogger.hpp"
 
 namespace Assimp {
 	namespace DXF {
diff --git a/code/DXFLoader.cpp b/code/DXFLoader.cpp
index db443a772..f2c58406f 100644
--- a/code/DXFLoader.cpp
+++ b/code/DXFLoader.cpp
@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Implementation of the DXF importer class
  */
 
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_DXF_IMPORTER
 
 #include "DXFLoader.h"
@@ -52,6 +52,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "fast_atof.h"
 
 #include "DXFHelper.h"
+#include "../include/assimp/IOSystem.hpp"
+#include "../include/assimp/scene.h"
+#include <boost/foreach.hpp>
+#include <numeric>
 
 using namespace Assimp;
 
diff --git a/code/DeboneProcess.cpp b/code/DeboneProcess.cpp
index e22e2fb00..025a2ca76 100644
--- a/code/DeboneProcess.cpp
+++ b/code/DeboneProcess.cpp
@@ -41,11 +41,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /// @file DeboneProcess.cpp
 /** Implementation of the DeboneProcess post processing step */
 
-#include "AssimpPCH.h"
+
 
 // internal headers of the post-processing framework
 #include "ProcessHelper.h"
-#include "DeboneProcess.h"
+#include "DeboneProcess.h"
+#include <stdio.h>
 
 
 using namespace Assimp;
diff --git a/code/DefaultIOStream.cpp b/code/DefaultIOStream.cpp
index 1553bd8c1..e75138a8b 100644
--- a/code/DefaultIOStream.cpp
+++ b/code/DefaultIOStream.cpp
@@ -42,11 +42,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Default File I/O implementation for #Importer 
  */
 
-#include "AssimpPCH.h"
-
-#include "DefaultIOStream.h"
-#include <sys/types.h> 
-#include <sys/stat.h> 
+
+#include "../include/assimp/ai_assert.h"
+#include "DefaultIOStream.h"
+#include <boost/static_assert.hpp>
+#include <sys/types.h>
+#include <sys/stat.h>
 
 using namespace Assimp;
 
diff --git a/code/DefaultIOStream.h b/code/DefaultIOStream.h
index 3ab0669be..694527d81 100644
--- a/code/DefaultIOStream.h
+++ b/code/DefaultIOStream.h
@@ -44,6 +44,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <stdio.h>
 #include "../include/assimp/IOStream.hpp"
+#include "../include/assimp/importerdesc.h"
+#include "Defines.h"
 
 namespace Assimp	{
 
diff --git a/code/DefaultIOSystem.cpp b/code/DefaultIOSystem.cpp
index df932bee7..58a84aafa 100644
--- a/code/DefaultIOSystem.cpp
+++ b/code/DefaultIOSystem.cpp
@@ -39,12 +39,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------------
 */
 /** @file Default implementation of IOSystem using the standard C file functions */
-
-#include "AssimpPCH.h"
-
-#include <stdlib.h>
+
 #include "DefaultIOSystem.h"
-#include "DefaultIOStream.h"
+#include "DefaultIOStream.h"
+#include "StringComparison.h"
+
+#include "../include/assimp/DefaultLogger.hpp"
+#include "../include/assimp/ai_assert.h"
+#include <stdlib.h>
+
 
 #ifdef __unix__
 #include <sys/param.h>
diff --git a/code/DefaultLogger.cpp b/code/DefaultLogger.cpp
index 1b9167c55..b78b2abd6 100644
--- a/code/DefaultLogger.cpp
+++ b/code/DefaultLogger.cpp
@@ -43,13 +43,17 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Implementation of DefaultLogger (and Logger)
  */
 
-#include "AssimpPCH.h"
 #include "DefaultIOSystem.h"
 
 // Default log streams
 #include "Win32DebugLogStream.h"
 #include "StdOStreamLogStream.h"
-#include "FileLogStream.h"
+#include "FileLogStream.h"
+#include "../include/assimp/NullLogger.hpp"
+#include "../include/assimp/DefaultLogger.hpp"
+#include "../include/assimp/ai_assert.h"
+#include <iostream>
+#include <stdio.h>
 
 #ifndef ASSIMP_BUILD_SINGLETHREADED
 #	include <boost/thread/thread.hpp>
diff --git a/code/Defines.h b/code/Defines.h
new file mode 100644
index 000000000..e1e444378
--- /dev/null
+++ b/code/Defines.h
@@ -0,0 +1,49 @@
+/*
+Open Asset Import Library (assimp)
+----------------------------------------------------------------------
+
+Copyright (c) 2006-2012, assimp team
+All rights reserved.
+
+Redistribution and use of this software in source and binary forms, 
+with or without modification, are permitted provided that the 
+following conditions are met:
+
+* Redistributions of source code must retain the above
+  copyright notice, this list of conditions and the
+  following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+  copyright notice, this list of conditions and the
+  following disclaimer in the documentation and/or other
+  materials provided with the distribution.
+
+* Neither the name of the assimp team, nor the names of its
+  contributors may be used to endorse or promote products
+  derived from this software without specific prior
+  written permission of the assimp team.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+----------------------------------------------------------------------
+*/
+
+// We need those constants, workaround for any platforms where nobody defined them yet
+#if (!defined SIZE_MAX)
+#	define SIZE_MAX (~((size_t)0))
+#endif
+
+#if (!defined UINT_MAX)
+#	define UINT_MAX (~((unsigned int)0))
+#endif
+
diff --git a/code/Exceptional.h b/code/Exceptional.h
index 75a2fc04a..fd705f504 100644
--- a/code/Exceptional.h
+++ b/code/Exceptional.h
@@ -42,6 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define INCLUDED_EXCEPTIONAL_H
 
 #include <stdexcept>
+#include "DefaultIOStream.h"
 using std::runtime_error;
 
 #ifdef _MSC_VER
diff --git a/code/Exporter.cpp b/code/Exporter.cpp
index c6fea8856..f8744503d 100644
--- a/code/Exporter.cpp
+++ b/code/Exporter.cpp
@@ -50,19 +50,25 @@ description strings.
 Here we implement only the C++ interface (Assimp::Exporter).
 */
 
-#include "AssimpPCH.h"
-
 #ifndef ASSIMP_BUILD_NO_EXPORT
 
 #include "DefaultIOSystem.h"
-#include "BlobIOSystem.h" 
-#include "SceneCombiner.h" 
-#include "BaseProcess.h" 
-#include "Importer.h" // need this for GetPostProcessingStepInstanceList()
+#include "BlobIOSystem.h"
+#include "SceneCombiner.h"
+#include "BaseProcess.h"
+#include "Importer.h" // need this for GetPostProcessingStepInstanceList()
 
 #include "JoinVerticesProcess.h"
 #include "MakeVerboseFormat.h"
-#include "ConvertToLHProcess.h"
+#include "ConvertToLHProcess.h"
+#include "Exceptional.h"
+#include "ScenePrivate.h"
+#include <boost/shared_ptr.hpp>
+#include "../include/assimp/Exporter.hpp"
+#include "../include/assimp/mesh.h"
+#include "../include/assimp/postprocess.h"
+#include "../include/assimp/scene.h"
+#include <memory>
 
 namespace Assimp {
 
diff --git a/code/FBXAnimation.cpp b/code/FBXAnimation.cpp
index 3bf60acd4..dd8d9551d 100644
--- a/code/FBXAnimation.cpp
+++ b/code/FBXAnimation.cpp
@@ -42,7 +42,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Assimp::FBX::AnimationCurve, Assimp::FBX::AnimationCurveNode, 
  *         Assimp::FBX::AnimationLayer, Assimp::FBX::AnimationStack 
  */
-#include "AssimpPCH.h"
 
 #ifndef ASSIMP_BUILD_NO_FBX_IMPORTER
 
@@ -52,6 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "FBXImportSettings.h"
 #include "FBXDocumentUtil.h"
 #include "FBXProperties.h"
+#include <boost/foreach.hpp>
 
 namespace Assimp {
 namespace FBX {
diff --git a/code/FBXBinaryTokenizer.cpp b/code/FBXBinaryTokenizer.cpp
index 9d5e6ac7e..528a8919a 100644
--- a/code/FBXBinaryTokenizer.cpp
+++ b/code/FBXBinaryTokenizer.cpp
@@ -42,12 +42,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *    we emit tokens so the parser needs almost no special handling
  *    for binary files.
  */
-#include "AssimpPCH.h"
 
 #ifndef ASSIMP_BUILD_NO_FBX_IMPORTER
 
 #include "FBXTokenizer.h"
 #include "FBXUtil.h"
+#include "../include/assimp/defs.h"
+#include <stdint.h>
+#include "Exceptional.h"
+#include "ByteSwap.h"
 
 namespace Assimp {
 namespace FBX {
diff --git a/code/FBXConverter.cpp b/code/FBXConverter.cpp
index 1698d6d93..264d396eb 100644
--- a/code/FBXConverter.cpp
+++ b/code/FBXConverter.cpp
@@ -41,20 +41,23 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /** @file  FBXConverter.cpp
  *  @brief Implementation of the FBX DOM -> aiScene converter
  */
-#include "AssimpPCH.h"
 
 #ifndef ASSIMP_BUILD_NO_FBX_IMPORTER
 
 #include <iterator>
 #include <sstream>
 #include <boost/tuple/tuple.hpp>
-
+#include <vector>
 #include "FBXParser.h"
 #include "FBXConverter.h"
 #include "FBXDocument.h"
 #include "FBXUtil.h"
 #include "FBXProperties.h"
 #include "FBXImporter.h"
+#include "../include/assimp/scene.h"
+#include <boost/foreach.hpp>
+#include <boost/scoped_array.hpp>
+
 
 namespace Assimp {
 namespace FBX {
@@ -1209,7 +1212,7 @@ private:
 
 	// ------------------------------------------------------------------------------------------------
 	/** - if materialIndex == NO_MATERIAL_SEPARATION, materials are not taken into
-	 *  account when determining which weights to include. 
+	 *  account when determining which weights to include.
 	 *  - outputVertStartIndices is only used when a material index is specified, it gives for
 	 *    each output vertex the DOM index it maps to. */
 	void ConvertWeights(aiMesh* out, const Model& model, const MeshGeometry& geo, 
diff --git a/code/FBXConverter.h b/code/FBXConverter.h
index 0585bf5cf..b6250451d 100644
--- a/code/FBXConverter.h
+++ b/code/FBXConverter.h
@@ -44,6 +44,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef INCLUDED_AI_FBX_CONVERTER_H
 #define INCLUDED_AI_FBX_CONVERTER_H
 
+class aiScene;
+
 namespace Assimp {
 namespace FBX {
 
diff --git a/code/FBXDeformer.cpp b/code/FBXDeformer.cpp
index 22e8aa25b..d7b8d35e4 100644
--- a/code/FBXDeformer.cpp
+++ b/code/FBXDeformer.cpp
@@ -41,7 +41,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /** @file  FBXNoteAttribute.cpp
  *  @brief Assimp::FBX::NodeAttribute (and subclasses) implementation
  */
-#include "AssimpPCH.h"
 
 #ifndef ASSIMP_BUILD_NO_FBX_IMPORTER
 
@@ -51,6 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "FBXImportSettings.h"
 #include "FBXDocumentUtil.h"
 #include "FBXProperties.h"
+#include <boost/foreach.hpp>
 
 namespace Assimp {
 namespace FBX {
diff --git a/code/FBXDocument.cpp b/code/FBXDocument.cpp
index fc27c8874..849842449 100644
--- a/code/FBXDocument.cpp
+++ b/code/FBXDocument.cpp
@@ -41,7 +41,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /** @file  FBXDocument.cpp
  *  @brief Implementation of the FBX DOM classes
  */
-#include "AssimpPCH.h"
 
 #ifndef ASSIMP_BUILD_NO_FBX_IMPORTER
 
@@ -54,6 +53,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "FBXImportSettings.h"
 #include "FBXDocumentUtil.h"
 #include "FBXProperties.h"
+#include <boost/foreach.hpp>
+#include <boost/make_shared.hpp>
 
 namespace Assimp {
 namespace FBX {
diff --git a/code/FBXDocument.h b/code/FBXDocument.h
index 9f1849132..48fc6db51 100644
--- a/code/FBXDocument.h
+++ b/code/FBXDocument.h
@@ -47,8 +47,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <vector>
 #include <map>
 #include <string>
-
+#include <stdint.h>
+#include <numeric>
+#include <boost/scoped_ptr.hpp>
+#include "../include/assimp/ai_assert.h"
+#include "../include/assimp/vector3.h"
+#include "../include/assimp/vector2.h"
+#include "../include/assimp/color4.h"
+#include "../include/assimp/mesh.h"
 #include "FBXProperties.h"
+#include "FBXParser.h"
+
+#define _AI_CONCAT(a,b)  a ## b
+#define  AI_CONCAT(a,b)  _AI_CONCAT(a,b)
 
 namespace Assimp {
 namespace FBX {
diff --git a/code/FBXDocumentUtil.cpp b/code/FBXDocumentUtil.cpp
index 5efbcb2b7..04c48bb6e 100644
--- a/code/FBXDocumentUtil.cpp
+++ b/code/FBXDocumentUtil.cpp
@@ -41,7 +41,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /** @file  FBXDocumentUtil.cpp
  *  @brief Implementation of the FBX DOM utility functions declared in FBXDocumentUtil.h
  */
-#include "AssimpPCH.h"
 
 #ifndef ASSIMP_BUILD_NO_FBX_IMPORTER
 
@@ -50,6 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "FBXUtil.h"
 #include "FBXDocumentUtil.h"
 #include "FBXProperties.h"
+#include <boost/make_shared.hpp>
 
 namespace Assimp {
 namespace FBX {
diff --git a/code/FBXDocumentUtil.h b/code/FBXDocumentUtil.h
index 6f150b6d5..07588a523 100644
--- a/code/FBXDocumentUtil.h
+++ b/code/FBXDocumentUtil.h
@@ -44,6 +44,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef INCLUDED_AI_FBX_DOCUMENT_UTIL_H
 #define INCLUDED_AI_FBX_DOCUMENT_UTIL_H
 
+#include "../include/assimp/defs.h"
+#include <string>
+#include <boost/shared_ptr.hpp>
+#include "FBXDocument.h"
+
+struct Token;
+struct Element;
+
 namespace Assimp {
 namespace FBX {
 namespace Util {
diff --git a/code/FBXImporter.cpp b/code/FBXImporter.cpp
index 9ecea6365..621868487 100644
--- a/code/FBXImporter.cpp
+++ b/code/FBXImporter.cpp
@@ -41,7 +41,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /** @file  FBXImporter.cpp
  *  @brief Implementation of the FBX importer.
  */
-#include "AssimpPCH.h"
 
 #ifndef ASSIMP_BUILD_NO_FBX_IMPORTER
 
@@ -59,6 +58,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "StreamReader.h"
 #include "MemoryIOWrapper.h"
+#include "../include/assimp/Importer.hpp"
 
 namespace Assimp {
 	template<> const std::string LogFunctions<FBXImporter>::log_prefix = "FBX: ";
diff --git a/code/FBXMaterial.cpp b/code/FBXMaterial.cpp
index fffa14fd3..576f4b3dd 100644
--- a/code/FBXMaterial.cpp
+++ b/code/FBXMaterial.cpp
@@ -41,7 +41,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /** @file  FBXMaterial.cpp
  *  @brief Assimp::FBX::Material and Assimp::FBX::Texture implementation
  */
-#include "AssimpPCH.h"
 
 #ifndef ASSIMP_BUILD_NO_FBX_IMPORTER
 
@@ -51,6 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "FBXImportSettings.h"
 #include "FBXDocumentUtil.h"
 #include "FBXProperties.h"
+#include <boost/foreach.hpp>
 
 namespace Assimp {
 namespace FBX {
diff --git a/code/FBXMeshGeometry.cpp b/code/FBXMeshGeometry.cpp
index ebc75f48e..0fedfbcf6 100644
--- a/code/FBXMeshGeometry.cpp
+++ b/code/FBXMeshGeometry.cpp
@@ -41,7 +41,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /** @file  FBXMeshGeometry.cpp
  *  @brief Assimp::FBX::MeshGeometry implementation
  */
-#include "AssimpPCH.h"
 
 #ifndef ASSIMP_BUILD_NO_FBX_IMPORTER
 
@@ -52,6 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "FBXImporter.h"
 #include "FBXImportSettings.h"
 #include "FBXDocumentUtil.h"
+#include <boost/foreach.hpp>
 
 
 namespace Assimp {
diff --git a/code/FBXModel.cpp b/code/FBXModel.cpp
index d6d329801..3391aa82a 100644
--- a/code/FBXModel.cpp
+++ b/code/FBXModel.cpp
@@ -41,7 +41,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /** @file  FBXModel.cpp
  *  @brief Assimp::FBX::Model implementation
  */
-#include "AssimpPCH.h"
 
 #ifndef ASSIMP_BUILD_NO_FBX_IMPORTER
 
@@ -51,6 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "FBXImportSettings.h"
 #include "FBXDocumentUtil.h"
 #include "FBXProperties.h"
+#include <boost/foreach.hpp>
 
 namespace Assimp {
 namespace FBX {
diff --git a/code/FBXNodeAttribute.cpp b/code/FBXNodeAttribute.cpp
index 1b7314666..69052c491 100644
--- a/code/FBXNodeAttribute.cpp
+++ b/code/FBXNodeAttribute.cpp
@@ -41,7 +41,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /** @file  FBXNoteAttribute.cpp
  *  @brief Assimp::FBX::NodeAttribute (and subclasses) implementation
  */
-#include "AssimpPCH.h"
 
 #ifndef ASSIMP_BUILD_NO_FBX_IMPORTER
 
diff --git a/code/FBXParser.cpp b/code/FBXParser.cpp
index f4d140fb3..99c40f746 100644
--- a/code/FBXParser.cpp
+++ b/code/FBXParser.cpp
@@ -41,7 +41,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /** @file  FBXParser.cpp
  *  @brief Implementation of the FBX parser and the rudimentary DOM that we use
  */
-#include "AssimpPCH.h"
 
 #ifndef ASSIMP_BUILD_NO_FBX_IMPORTER
 
@@ -59,6 +58,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "ParsingUtils.h"
 #include "fast_atof.h"
+#include <boost/foreach.hpp>
+#include "ByteSwap.h"
 
 using namespace Assimp;
 using namespace Assimp::FBX;
diff --git a/code/FBXParser.h b/code/FBXParser.h
index 150b6267a..a21516575 100644
--- a/code/FBXParser.h
+++ b/code/FBXParser.h
@@ -48,9 +48,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <map>
 #include <string>
 #include <utility>
+#include <stdint.h>
 
 #include <boost/shared_ptr.hpp>
-
+#include <boost/scoped_ptr.hpp>
 #include "LogAux.h"
 
 #include "FBXCompileConfig.h"
diff --git a/code/FBXProperties.cpp b/code/FBXProperties.cpp
index 5676d9d5e..3127ef88e 100644
--- a/code/FBXProperties.cpp
+++ b/code/FBXProperties.cpp
@@ -41,7 +41,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /** @file  FBXProperties.cpp
  *  @brief Implementation of the FBX dynamic properties system
  */
-#include "AssimpPCH.h"
 
 #ifndef ASSIMP_BUILD_NO_FBX_IMPORTER
 
@@ -50,6 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "FBXDocument.h"
 #include "FBXDocumentUtil.h"
 #include "FBXProperties.h"
+#include <boost/foreach.hpp>
 
 namespace Assimp {
 namespace FBX {
diff --git a/code/FBXProperties.h b/code/FBXProperties.h
index bcbdc8a30..739d8b382 100644
--- a/code/FBXProperties.h
+++ b/code/FBXProperties.h
@@ -46,6 +46,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <map>
 #include <string>
+#include "FBXCompileConfig.h"
+#include <boost/shared_ptr.hpp>
 
 namespace Assimp {
 namespace FBX {
diff --git a/code/FBXTokenizer.cpp b/code/FBXTokenizer.cpp
index 88ac1257d..fa7613b68 100644
--- a/code/FBXTokenizer.cpp
+++ b/code/FBXTokenizer.cpp
@@ -41,7 +41,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /** @file  FBXTokenizer.cpp
  *  @brief Implementation of the FBX broadphase lexer
  */
-#include "AssimpPCH.h"
 
 #ifndef ASSIMP_BUILD_NO_FBX_IMPORTER
 
@@ -52,6 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "FBXTokenizer.h"
 #include "FBXUtil.h"
+#include "Exceptional.h"
 
 namespace Assimp {
 namespace FBX {
diff --git a/code/FBXTokenizer.h b/code/FBXTokenizer.h
index 0a4339a50..9510163c6 100644
--- a/code/FBXTokenizer.h
+++ b/code/FBXTokenizer.h
@@ -45,8 +45,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define INCLUDED_AI_FBX_TOKENIZER_H
 
 #include <boost/shared_ptr.hpp>
-
 #include "FBXCompileConfig.h"
+#include "../include/assimp/ai_assert.h"
+#include <vector>
+#include <string>
 
 namespace Assimp {
 namespace FBX {
diff --git a/code/FBXUtil.cpp b/code/FBXUtil.cpp
index aaf311d03..6fbd273e3 100644
--- a/code/FBXUtil.cpp
+++ b/code/FBXUtil.cpp
@@ -41,7 +41,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /** @file  FBXUtil.cpp
  *  @brief Implementation of internal FBX utility functions
  */
-#include "AssimpPCH.h"
 
 #include "FBXUtil.h"
 #include "FBXTokenizer.h"
diff --git a/code/FileLogStream.h b/code/FileLogStream.h
index 3dda412ed..79151c489 100644
--- a/code/FileLogStream.h
+++ b/code/FileLogStream.h
@@ -3,6 +3,7 @@
 
 #include "../include/assimp/LogStream.hpp"
 #include "../include/assimp/IOStream.hpp"
+#include "DefaultIOSystem.h"
 
 namespace Assimp	{
 
diff --git a/code/FileSystemFilter.h b/code/FileSystemFilter.h
index 517009028..a2ad85160 100644
--- a/code/FileSystemFilter.h
+++ b/code/FileSystemFilter.h
@@ -46,8 +46,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_FILESYSTEMFILTER_H_INC
 
 #include "../include/assimp/IOSystem.hpp"
+#include "../include/assimp/DefaultLogger.hpp"
 #include "fast_atof.h"
 #include "ParsingUtils.h"
+
 namespace Assimp	{
 
 inline bool IsHex(char s) {
diff --git a/code/FindDegenerates.cpp b/code/FindDegenerates.cpp
index bfa32487d..11b91f1cf 100644
--- a/code/FindDegenerates.cpp
+++ b/code/FindDegenerates.cpp
@@ -43,11 +43,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Implementation of the FindDegenerates post-process step.
 */
 
-#include "AssimpPCH.h"
+
 
 // internal headers
 #include "ProcessHelper.h"
-#include "FindDegenerates.h"
+#include "FindDegenerates.h"
+#include "Exceptional.h"
 
 using namespace Assimp;
 
diff --git a/code/FindInstancesProcess.cpp b/code/FindInstancesProcess.cpp
index 3b8578142..117051a4a 100644
--- a/code/FindInstancesProcess.cpp
+++ b/code/FindInstancesProcess.cpp
@@ -43,8 +43,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Implementation of the aiProcess_FindInstances postprocessing step
 */
 
-#include "AssimpPCH.h"
-#include "FindInstancesProcess.h"
+
+#include "FindInstancesProcess.h"
+#include <boost/scoped_array.hpp>
+#include <stdio.h>
 
 using namespace Assimp;
 
diff --git a/code/FindInvalidDataProcess.cpp b/code/FindInvalidDataProcess.cpp
index 4e7be4258..450c5f873 100644
--- a/code/FindInvalidDataProcess.cpp
+++ b/code/FindInvalidDataProcess.cpp
@@ -42,13 +42,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /** @file Defines a post processing step to search an importer's output
     for data that is obviously invalid  */
 
-#include "AssimpPCH.h"
+
 
 #ifndef ASSIMP_BUILD_NO_FINDINVALIDDATA_PROCESS
 
 // internal headers
 #include "FindInvalidDataProcess.h"
-#include "ProcessHelper.h"
+#include "ProcessHelper.h"
+#include "Macros.h"
+#include "Exceptional.h"
+#include "qnan.h"
 
 using namespace Assimp;
 
diff --git a/code/FindInvalidDataProcess.h b/code/FindInvalidDataProcess.h
index 8b47a65a8..c06560c1e 100644
--- a/code/FindInvalidDataProcess.h
+++ b/code/FindInvalidDataProcess.h
@@ -45,6 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "BaseProcess.h"
 #include "../include/assimp/types.h"
+#include "../include/assimp/anim.h"
 
 struct aiMesh;
 class FindInvalidDataProcessTest;
diff --git a/code/FixNormalsStep.cpp b/code/FixNormalsStep.cpp
index 19e5dece3..d3d53ac15 100644
--- a/code/FixNormalsStep.cpp
+++ b/code/FixNormalsStep.cpp
@@ -43,10 +43,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * all normals in meshes with infacing normals.
  */
 
-#include "AssimpPCH.h"
-
 // internal headers
-#include "FixNormalsStep.h"
+#include "FixNormalsStep.h"
+#include "../include/assimp/DefaultLogger.hpp"
+#include "../include/assimp/postprocess.h"
+#include "../include/assimp/scene.h"
+#include <stdio.h>
+
 
 using namespace Assimp;
 
diff --git a/code/GenFaceNormalsProcess.cpp b/code/GenFaceNormalsProcess.cpp
index fb081e5a3..18e31e948 100644
--- a/code/GenFaceNormalsProcess.cpp
+++ b/code/GenFaceNormalsProcess.cpp
@@ -43,8 +43,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * normals for all imported faces.
 */
 
-#include "AssimpPCH.h"
-#include "GenFaceNormalsProcess.h"
+
+#include "GenFaceNormalsProcess.h"
+#include "../include/assimp/postprocess.h"
+#include "../include/assimp/scene.h"
+#include "../include/assimp/DefaultLogger.hpp"
+#include "Exceptional.h"
+#include "qnan.h"
 
 
 using namespace Assimp;
diff --git a/code/GenVertexNormalsProcess.cpp b/code/GenVertexNormalsProcess.cpp
index 09b446fa3..5de11e0b0 100644
--- a/code/GenVertexNormalsProcess.cpp
+++ b/code/GenVertexNormalsProcess.cpp
@@ -43,11 +43,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * normals for all imported faces.
 */
 
-#include "AssimpPCH.h"
+
 
 // internal headers
 #include "GenVertexNormalsProcess.h"
-#include "ProcessHelper.h"
+#include "ProcessHelper.h"
+#include "Exceptional.h"
+#include "qnan.h"
 
 using namespace Assimp;
 
diff --git a/code/GenericProperty.h b/code/GenericProperty.h
index 0e89015ab..26897e47e 100644
--- a/code/GenericProperty.h
+++ b/code/GenericProperty.h
@@ -42,7 +42,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_GENERIC_PROPERTY_H_INCLUDED
 
 #include "./../include/assimp/Importer.hpp"
+#include "./../include/assimp/ai_assert.h"
 #include "Hash.h"
+#include <map>
+
 
 // ------------------------------------------------------------------------------------------------
 template <class T>
diff --git a/code/HMPFileData.h b/code/HMPFileData.h
index ba0f3ac36..658672878 100644
--- a/code/HMPFileData.h
+++ b/code/HMPFileData.h
@@ -45,6 +45,7 @@ namespace Assimp	{
 namespace HMP	{
 
 #include "./../include/assimp/Compiler/pushpack1.h"
+#include <stdint.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")
diff --git a/code/HMPLoader.cpp b/code/HMPLoader.cpp
index f5eb31bff..e35c518e4 100644
--- a/code/HMPLoader.cpp
+++ b/code/HMPLoader.cpp
@@ -41,12 +41,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /** @file Implementation of the MDL importer class */
 
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_HMP_IMPORTER
 
 // internal headers
 #include "HMPLoader.h"
-#include "MD2FileData.h"
+#include "MD2FileData.h"
+#include <boost/scoped_ptr.hpp>
+#include "../include/assimp/IOSystem.hpp"
+#include "../include/assimp/DefaultLogger.hpp"
+#include "../include/assimp/scene.h"
 
 using namespace Assimp;
 
diff --git a/code/HalfLifeFileData.h b/code/HalfLifeFileData.h
index 6eeaf41b8..dbb8df4d7 100644
--- a/code/HalfLifeFileData.h
+++ b/code/HalfLifeFileData.h
@@ -49,9 +49,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_MDLFILEHELPER2_H_INC
 #define AI_MDLFILEHELPER2_H_INC
 
-#include "./../include/assimp/Compiler/pushpack1.h"
-
 #include "MDLFileData.h"
+#include "./../include/assimp/Compiler/pushpack1.h"
 
 namespace Assimp	{
 namespace MDL	{
diff --git a/code/Hash.h b/code/Hash.h
index 08c707ad1..d0c608d79 100644
--- a/code/Hash.h
+++ b/code/Hash.h
@@ -41,6 +41,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_HASH_H_INCLUDED
 #define AI_HASH_H_INCLUDED
 
+#include <stdint.h>
+#include <string.h>
+
 // ------------------------------------------------------------------------------------------------
 // Hashing function taken from 
 // http://www.azillionmonkeys.com/qed/hash.html
diff --git a/code/IFCBoolean.cpp b/code/IFCBoolean.cpp
index c1b43695c..c5307121a 100644
--- a/code/IFCBoolean.cpp
+++ b/code/IFCBoolean.cpp
@@ -42,12 +42,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Implements a subset of Ifc boolean operations
  */
 
-#include "AssimpPCH.h"
 
 #ifndef ASSIMP_BUILD_NO_IFC_IMPORTER
 #include "IFCUtil.h"
 #include "PolyTools.h"
 #include "ProcessHelper.h"
+#include "Defines.h"
 
 #include <iterator>
 #include <boost/tuple/tuple.hpp>
diff --git a/code/IFCCurve.cpp b/code/IFCCurve.cpp
index e696bed9a..0625ea631 100644
--- a/code/IFCCurve.cpp
+++ b/code/IFCCurve.cpp
@@ -42,7 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Read profile and curves entities from IFC files
  */
 
-#include "AssimpPCH.h"
+
 
 #ifndef ASSIMP_BUILD_NO_IFC_IMPORTER
 #include "IFCUtil.h"
diff --git a/code/IFCGeometry.cpp b/code/IFCGeometry.cpp
index 1e62147e3..c38294b61 100644
--- a/code/IFCGeometry.cpp
+++ b/code/IFCGeometry.cpp
@@ -42,7 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Geometry conversion and synthesis for IFC
  */
 
-#include "AssimpPCH.h"
+
 
 #ifndef ASSIMP_BUILD_NO_IFC_IMPORTER
 #include "IFCUtil.h"
@@ -50,7 +50,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ProcessHelper.h"
 
 #include "../contrib/poly2tri/poly2tri/poly2tri.h"
-#include "../contrib/clipper/clipper.hpp"
+#include "../contrib/clipper/clipper.hpp"
+#include <boost/make_shared.hpp>
 
 #include <iterator>
 
diff --git a/code/IFCLoader.cpp b/code/IFCLoader.cpp
index 24ed772e0..34f176c89 100644
--- a/code/IFCLoader.cpp
+++ b/code/IFCLoader.cpp
@@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /** @file  IFCLoad.cpp
  *  @brief Implementation of the Industry Foundation Classes loader.
  */
-#include "AssimpPCH.h"
+
 
 #ifndef ASSIMP_BUILD_NO_IFC_IMPORTER
 
@@ -60,6 +60,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "StreamReader.h"
 #include "MemoryIOWrapper.h"
+#include "../include/assimp/scene.h"
+#include "../include/assimp/Importer.hpp"
+
 
 namespace Assimp {
 	template<> const std::string LogFunctions<IFCImporter>::log_prefix = "IFC: ";
diff --git a/code/IFCMaterial.cpp b/code/IFCMaterial.cpp
index 5b9bab00d..72a8aa78a 100644
--- a/code/IFCMaterial.cpp
+++ b/code/IFCMaterial.cpp
@@ -42,11 +42,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Implementation of conversion routines to convert IFC materials to aiMaterial
  */
 
-#include "AssimpPCH.h"
+
 
 #ifndef ASSIMP_BUILD_NO_IFC_IMPORTER
 #include "IFCUtil.h"
 #include <limits>
+#include "../include/assimp/material.h"
 
 namespace Assimp {
 	namespace IFC {
diff --git a/code/IFCOpenings.cpp b/code/IFCOpenings.cpp
index c47f8254a..9eaca8756 100644
--- a/code/IFCOpenings.cpp
+++ b/code/IFCOpenings.cpp
@@ -43,7 +43,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   *    holes for windows and doors into walls.
  */
 
-#include "AssimpPCH.h"
 
 #ifndef ASSIMP_BUILD_NO_IFC_IMPORTER
 #include "IFCUtil.h"
diff --git a/code/IFCProfile.cpp b/code/IFCProfile.cpp
index 495852be4..42d090d9d 100644
--- a/code/IFCProfile.cpp
+++ b/code/IFCProfile.cpp
@@ -42,7 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Read profile and curves entities from IFC files
  */
 
-#include "AssimpPCH.h"
+
 
 #ifndef ASSIMP_BUILD_NO_IFC_IMPORTER
 #include "IFCUtil.h"
diff --git a/code/IFCReaderGen.cpp b/code/IFCReaderGen.cpp
index 411ee1fc3..e4c4cde98 100644
--- a/code/IFCReaderGen.cpp
+++ b/code/IFCReaderGen.cpp
@@ -40,7 +40,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /** MACHINE-GENERATED by scripts/ICFImporter/CppGenerator.py */
 
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_IFC_IMPORTER
 
 #include "IFCReaderGen.h"
diff --git a/code/IFCUtil.cpp b/code/IFCUtil.cpp
index 800ffd3ed..dfaf19427 100644
--- a/code/IFCUtil.cpp
+++ b/code/IFCUtil.cpp
@@ -42,13 +42,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Implementation of conversion routines for some common Ifc helper entities.
  */
 
-#include "AssimpPCH.h"
+
 
 #ifndef ASSIMP_BUILD_NO_IFC_IMPORTER
 
 #include "IFCUtil.h"
 #include "PolyTools.h"
 #include "ProcessHelper.h"
+#include "Defines.h"
 
 namespace Assimp {
 	namespace IFC {
diff --git a/code/IFCUtil.h b/code/IFCUtil.h
index 9a84c30ef..dcfdaddb9 100644
--- a/code/IFCUtil.h
+++ b/code/IFCUtil.h
@@ -47,6 +47,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "IFCReaderGen.h"
 #include "IFCLoader.h"
+#include "STEPFile.h"
+#include "../include/assimp/mesh.h"
+#include "../include/assimp/material.h"
+
+
+struct aiNode;
 
 namespace Assimp {
 namespace IFC {
diff --git a/code/IRRLoader.cpp b/code/IRRLoader.cpp
index 36ee9cfcc..b082168c1 100644
--- a/code/IRRLoader.cpp
+++ b/code/IRRLoader.cpp
@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Implementation of the Irr importer class 
  */
 
-#include "AssimpPCH.h"
+
 
 #ifndef ASSIMP_BUILD_NO_IRR_IMPORTER
 
@@ -57,7 +57,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "Importer.h"
 
 // We need boost::common_factor to compute the lcm/gcd of a number
-#include <boost/math/common_factor_rt.hpp>
+#include <boost/math/common_factor_rt.hpp>
+#include <boost/scoped_ptr.hpp>
+#include "../include/assimp/DefaultLogger.hpp"
+#include "../include/assimp/mesh.h"
+#include "../include/assimp/material.h"
+#include "../include/assimp/scene.h"
+#include "../include/assimp/IOSystem.hpp"
+#include "../include/assimp/postprocess.h"
+
 
 using namespace Assimp;
 using namespace irr;
diff --git a/code/IRRLoader.h b/code/IRRLoader.h
index 673c83074..b98967245 100644
--- a/code/IRRLoader.h
+++ b/code/IRRLoader.h
@@ -48,6 +48,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "IRRShared.h"
 #include "SceneCombiner.h"
+#include "Importer.h"
+#include "../include/assimp/anim.h"
 
 namespace Assimp	{
 
diff --git a/code/IRRMeshLoader.cpp b/code/IRRMeshLoader.cpp
index 1ee472a1c..ab9c0cb38 100644
--- a/code/IRRMeshLoader.cpp
+++ b/code/IRRMeshLoader.cpp
@@ -41,13 +41,21 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /** @file Implementation of the IrrMesh importer class */
 
-#include "AssimpPCH.h"
+
 
 #ifndef ASSIMP_BUILD_NO_IRRMESH_IMPORTER
 
 #include "IRRMeshLoader.h"
 #include "ParsingUtils.h"
-#include "fast_atof.h"
+#include "fast_atof.h"
+#include <boost/scoped_ptr.hpp>
+#include "../include/assimp/IOSystem.hpp"
+#include "../include/assimp/mesh.h"
+#include "../include/assimp/DefaultLogger.hpp"
+#include "../include/assimp/material.h"
+#include "../include/assimp/scene.h"
+#include "Macros.h"
+
 
 using namespace Assimp;
 using namespace irr;
diff --git a/code/IRRShared.cpp b/code/IRRShared.cpp
index f03239398..0e86b0586 100644
--- a/code/IRRShared.cpp
+++ b/code/IRRShared.cpp
@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Shared utilities for the IRR and IRRMESH loaders
  */
 
-#include "AssimpPCH.h"
+
 
 //This section should be excluded only if both the Irrlicht AND the Irrlicht Mesh importers were omitted.
 #if !(defined(ASSIMP_BUILD_NO_IRR_IMPORTER) && defined(ASSIMP_BUILD_NO_IRRMESH_IMPORTER))
@@ -51,6 +51,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "IRRShared.h"
 #include "ParsingUtils.h"
 #include "fast_atof.h"
+#include "../include/assimp/DefaultLogger.hpp"
+#include "../include/assimp/material.h"
+
 
 using namespace Assimp;
 using namespace irr;
diff --git a/code/IRRShared.h b/code/IRRShared.h
index 20b0984de..55745dadd 100644
--- a/code/IRRShared.h
+++ b/code/IRRShared.h
@@ -9,6 +9,8 @@
 
 #include "irrXMLWrapper.h"
 #include "BaseImporter.h"
+#include <stdint.h>
+class aiMaterial;
 
 namespace Assimp	{
 
diff --git a/code/Importer.cpp b/code/Importer.cpp
index a9173cddc..9c9bdbf8d 100644
--- a/code/Importer.cpp
+++ b/code/Importer.cpp
@@ -43,7 +43,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Implementation of the CPP-API class #Importer
  */
 
-#include "AssimpPCH.h"
 #include "../include/assimp/version.h"
 
 // ------------------------------------------------------------------------------------------------
@@ -61,7 +60,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // ------------------------------------------------------------------------------------------------
 // Internal headers
 // ------------------------------------------------------------------------------------------------
-#include "Importer.h"
+#include "Importer.h"
+#include "BaseImporter.h"
 #include "BaseProcess.h"
 
 #include "DefaultIOStream.h"
@@ -69,10 +69,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "DefaultProgressHandler.h"
 #include "GenericProperty.h"
 #include "ProcessHelper.h"
-#include "ScenePreprocessor.h"
+#include "ScenePreprocessor.h"
+#include "ScenePrivate.h"
 #include "MemoryIOWrapper.h"
 #include "Profiler.h"
-#include "TinyFormatter.h"
+#include "TinyFormatter.h"
+#include "Exceptional.h"
+#include "Profiler.h"
+#include <set>
+#include <boost/scoped_ptr.hpp>
+#include <cctype>
 
 #ifndef ASSIMP_BUILD_NO_VALIDATEDS_PROCESS
 #	include "ValidateDataStructure.h"
diff --git a/code/Importer.h b/code/Importer.h
index c61d32456..c1f508fc4 100644
--- a/code/Importer.h
+++ b/code/Importer.h
@@ -42,10 +42,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef INCLUDED_AI_IMPORTER_H
 #define INCLUDED_AI_IMPORTER_H
 
-namespace Assimp	{
+#include <map>
+#include <string>
+#include <vector>
+#include "../include/assimp/matrix4x4.h"
 
+struct aiScene;
+
+namespace Assimp	{
+	class ProgressHandler;
+	class IOSystem;
 	class BaseImporter;
 	class BaseProcess;
+	class SharedPostProcessInfo;
 
 	
 //! @cond never
diff --git a/code/ImporterRegistry.cpp b/code/ImporterRegistry.cpp
index b2f7d2686..16f1ca22d 100644
--- a/code/ImporterRegistry.cpp
+++ b/code/ImporterRegistry.cpp
@@ -46,8 +46,6 @@ directly (unless you are adding new loaders), instead use the
 corresponding preprocessor flag to selectively disable formats.
 */
 
-#include "AssimpPCH.h"
-
 // ------------------------------------------------------------------------------------------------
 // Importers
 // (include_new_importers_here)
diff --git a/code/ImproveCacheLocality.cpp b/code/ImproveCacheLocality.cpp
index 59f8f3898..81617cc49 100644
--- a/code/ImproveCacheLocality.cpp
+++ b/code/ImproveCacheLocality.cpp
@@ -46,11 +46,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *   .. although overdraw rduction isn't implemented yet ...
  */
 
-#include "AssimpPCH.h"
+
 
 // internal headers
 #include "ImproveCacheLocality.h"
-#include "VertexTriangleAdjacency.h"
+#include "VertexTriangleAdjacency.h"
+#include "../include/assimp/postprocess.h"
+#include "../include/assimp/scene.h"
+#include "../include/assimp/DefaultLogger.hpp"
+#include <stdio.h>
+#include <stack>
 
 using namespace Assimp;
 
diff --git a/code/JoinVerticesProcess.cpp b/code/JoinVerticesProcess.cpp
index 817d1870c..1dbe6dd39 100644
--- a/code/JoinVerticesProcess.cpp
+++ b/code/JoinVerticesProcess.cpp
@@ -43,13 +43,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * for all imported meshes
  */
 
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_JOINVERTICES_PROCESS
 
 #include "JoinVerticesProcess.h"
 #include "ProcessHelper.h"
 #include "Vertex.h"
-#include "TinyFormatter.h"
+#include "TinyFormatter.h"
+#include <stdio.h>
+#include <boost/static_assert.hpp>
 
 using namespace Assimp;
 // ------------------------------------------------------------------------------------------------
diff --git a/code/JoinVerticesProcess.h b/code/JoinVerticesProcess.h
index 1413ad2dc..960f8a534 100644
--- a/code/JoinVerticesProcess.h
+++ b/code/JoinVerticesProcess.h
@@ -45,6 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "BaseProcess.h"
 #include "../include/assimp/types.h"
+struct aiMesh;
 
 namespace Assimp
 {
diff --git a/code/LWOAnimation.cpp b/code/LWOAnimation.cpp
index f9308baef..27ea3e4dc 100644
--- a/code/LWOAnimation.cpp
+++ b/code/LWOAnimation.cpp
@@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  implementation of LightWave envelopes of which I know.
 */
 
-#include "AssimpPCH.h"
+
 #if (!defined ASSIMP_BUILD_NO_LWO_IMPORTER) && (!defined ASSIMP_BUILD_NO_LWS_IMPORTER)
 
 #include <functional>
diff --git a/code/LWOAnimation.h b/code/LWOAnimation.h
index 89095c63f..4612ca690 100644
--- a/code/LWOAnimation.h
+++ b/code/LWOAnimation.h
@@ -47,6 +47,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_LWO_ANIMATION_INCLUDED
 #define AI_LWO_ANIMATION_INCLUDED
 
+#include "../include/assimp/anim.h"
+#include <vector>
+#include <list>
+
+struct aiNodeAnim;
+
 namespace Assimp {
 namespace LWO {
 
diff --git a/code/LWOBLoader.cpp b/code/LWOBLoader.cpp
index 6c9b0560a..02f38182e 100644
--- a/code/LWOBLoader.cpp
+++ b/code/LWOBLoader.cpp
@@ -42,7 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /** @file Implementation of the LWO importer class for the older LWOB 
     file formats, including materials */
 
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_LWO_IMPORTER
 
 // Internal headers
diff --git a/code/LWOLoader.cpp b/code/LWOLoader.cpp
index 5dda7de9b..52d32eb16 100644
--- a/code/LWOLoader.cpp
+++ b/code/LWOLoader.cpp
@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Implementation of the LWO importer class
  */
 
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_LWO_IMPORTER
 
 // internal headers
@@ -52,7 +52,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "SGSpatialSort.h"
 #include "ByteSwap.h"
 #include "ProcessHelper.h"
-#include "ConvertToLHProcess.h"
+#include "ConvertToLHProcess.h"
+#include <boost/scoped_ptr.hpp>
+#include "../include/assimp/IOSystem.hpp"
+#include <sstream>
+#include <iomanip>
+
 
 using namespace Assimp;
 
diff --git a/code/LWOLoader.h b/code/LWOLoader.h
index e06cdc796..c61ca6917 100644
--- a/code/LWOLoader.h
+++ b/code/LWOLoader.h
@@ -43,6 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_LWOLOADER_H_INCLUDED
 
 #include "../include/assimp/types.h"
+#include "../include/assimp/material.h"
 #include "../include/assimp/DefaultLogger.hpp"
 
 #include "LWOFileData.h"
@@ -50,6 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 struct aiTexture;
 struct aiNode;
+struct aiMaterial;
 
 namespace Assimp	{
 using namespace LWO;
diff --git a/code/LWOMaterial.cpp b/code/LWOMaterial.cpp
index 0e8c5661c..b6cb4e460 100644
--- a/code/LWOMaterial.cpp
+++ b/code/LWOMaterial.cpp
@@ -42,12 +42,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /** @file Implementation of the material oart of the LWO importer class */
 
 
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_LWO_IMPORTER
 
 // internal headers
 #include "LWOLoader.h"
-#include "ByteSwap.h"
+#include "ByteSwap.h"
+#include <boost/static_assert.hpp>
+
 
 using namespace Assimp;
 
diff --git a/code/LWSLoader.cpp b/code/LWSLoader.cpp
index bfd4b395c..cb0daf2e9 100644
--- a/code/LWSLoader.cpp
+++ b/code/LWSLoader.cpp
@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Implementation of the LWS importer class 
  */
 
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_LWS_IMPORTER
 
 #include "LWSLoader.h"
@@ -55,6 +55,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "SkeletonMeshBuilder.h"
 #include "ConvertToLHProcess.h"
 #include "Importer.h"
+#include "../include/assimp/DefaultLogger.hpp"
+#include "../include/assimp/scene.h"
+#include "../include/assimp/IOSystem.hpp"
+#include <boost/scoped_ptr.hpp>
+
 
 using namespace Assimp;
 
diff --git a/code/LWSLoader.h b/code/LWSLoader.h
index 7cca75b3a..996c4c705 100644
--- a/code/LWSLoader.h
+++ b/code/LWSLoader.h
@@ -46,8 +46,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "LWOFileData.h"
 #include "SceneCombiner.h"
+#include "BaseImporter.h"
+
+struct aiImporterDesc;
 
 namespace Assimp	{
+	struct BatchLoader;
+	struct Importer;
+	struct IOSystem;
+
 	namespace LWS	{
 
 // ---------------------------------------------------------------------------
diff --git a/code/LimitBoneWeightsProcess.cpp b/code/LimitBoneWeightsProcess.cpp
index f7a83a970..3f46dd100 100644
--- a/code/LimitBoneWeightsProcess.cpp
+++ b/code/LimitBoneWeightsProcess.cpp
@@ -40,9 +40,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /** Implementation of the LimitBoneWeightsProcess post processing step */
 
-#include "AssimpPCH.h"
-#include "LimitBoneWeightsProcess.h"
 
+#include "LimitBoneWeightsProcess.h"
+#include "../include/assimp/postprocess.h"
+#include "../include/assimp/DefaultLogger.hpp"
+#include "../include/assimp/scene.h"
+#include <stdio.h>
 
 using namespace Assimp;
 
diff --git a/code/LogAux.h b/code/LogAux.h
index 58a605215..c10e9690c 100644
--- a/code/LogAux.h
+++ b/code/LogAux.h
@@ -45,6 +45,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define INCLUDED_AI_LOGAUX_H
 
 #include "TinyFormatter.h"
+#include "Exceptional.h"
+#include "../include/assimp/DefaultLogger.hpp"
 
 namespace Assimp {
 
diff --git a/code/MD2FileData.h b/code/MD2FileData.h
index f1cbf8e4e..c0b486f37 100644
--- a/code/MD2FileData.h
+++ b/code/MD2FileData.h
@@ -48,6 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../include/assimp/types.h"
 #include "../include/assimp/mesh.h"
 #include "../include/assimp/anim.h"
+#include <stdint.h>
 
 #include "./../include/assimp/Compiler/pushpack1.h"
 
diff --git a/code/MD2Loader.cpp b/code/MD2Loader.cpp
index 3ecaa1f8b..52fbbddae 100644
--- a/code/MD2Loader.cpp
+++ b/code/MD2Loader.cpp
@@ -39,13 +39,20 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------------
 */
 
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_MD2_IMPORTER
 
 /** @file Implementation of the MD2 importer class */
 #include "MD2Loader.h"
 #include "ByteSwap.h"
-#include "MD2NormalTable.h" // shouldn't be included by other units
+#include "MD2NormalTable.h" // shouldn't be included by other units
+#include "../include/assimp/DefaultLogger.hpp"
+#include "../include/assimp/Importer.hpp"
+#include <boost/scoped_ptr.hpp>
+#include "../include/assimp/IOSystem.hpp"
+#include "../include/assimp/scene.h"
+
+
 
 using namespace Assimp;
 using namespace Assimp::MD2;
diff --git a/code/MD2Loader.h b/code/MD2Loader.h
index f78112056..9a60e67fa 100644
--- a/code/MD2Loader.h
+++ b/code/MD2Loader.h
@@ -46,9 +46,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "BaseImporter.h"
 #include "../include/assimp/types.h"
+#include "ByteSwap.h"
 
-struct aiNode;
 #include "MD2FileData.h"
+struct aiNode;
 
 namespace Assimp	{
 
diff --git a/code/MD3FileData.h b/code/MD3FileData.h
index b89110030..6ab97c635 100644
--- a/code/MD3FileData.h
+++ b/code/MD3FileData.h
@@ -49,6 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <string>
 #include <vector>
 #include <sstream>
+#include <stdint.h>
 
 #include "../include/assimp/types.h"
 #include "../include/assimp/mesh.h"
diff --git a/code/MD3Loader.cpp b/code/MD3Loader.cpp
index 49cecd1bf..9517747b2 100644
--- a/code/MD3Loader.cpp
+++ b/code/MD3Loader.cpp
@@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *     http://www.heppler.com/shader/shader/
  */
 
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_MD3_IMPORTER
 
 #include "MD3Loader.h"
@@ -57,7 +57,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "GenericProperty.h"
 #include "RemoveComments.h"
 #include "ParsingUtils.h"
-#include "Importer.h"
+#include "Importer.h"
+#include "../include/assimp/DefaultLogger.hpp"
+#include <boost/scoped_ptr.hpp>
+#include "../include/assimp/IOSystem.hpp"
+#include "../include/assimp/material.h"
+#include "../include/assimp/scene.h"
+#include <cctype>
+
+
 
 using namespace Assimp;
 
diff --git a/code/MD3Loader.h b/code/MD3Loader.h
index 155c9ce37..feca9e16f 100644
--- a/code/MD3Loader.h
+++ b/code/MD3Loader.h
@@ -46,10 +46,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "BaseImporter.h"
 #include "ByteSwap.h"
-
+#include "MD3FileData.h"
+#include "StringComparison.h"
 #include "../include/assimp/types.h"
 
-#include "MD3FileData.h"
+#include <list>
+
+struct aiMaterial;
+
 namespace Assimp	{
 
 
diff --git a/code/MD4FileData.h b/code/MD4FileData.h
index bd28bf016..97254d12b 100644
--- a/code/MD4FileData.h
+++ b/code/MD4FileData.h
@@ -46,9 +46,9 @@ 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/types.h"
+#include "../include/assimp/mesh.h"
+#include "../include/assimp/anim.h"
 
 #if defined(_MSC_VER) ||  defined(__BORLANDC__) ||	defined (__BCPLUSPLUS__)
 #	pragma pack(push,1)
@@ -215,4 +215,4 @@ struct Frame
 };
 };
 
-#endif // !! AI_MD4FILEHELPER_H_INC
\ No newline at end of file
+#endif // !! AI_MD4FILEHELPER_H_INC
diff --git a/code/MD5Loader.cpp b/code/MD5Loader.cpp
index 858cdcacf..a34338ac8 100644
--- a/code/MD5Loader.cpp
+++ b/code/MD5Loader.cpp
@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Implementation of the MD5 importer class 
  */
 
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_MD5_IMPORTER
 
 // internal headers
@@ -51,7 +51,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "MD5Loader.h"
 #include "StringComparison.h"
 #include "fast_atof.h"
-#include "SkeletonMeshBuilder.h"
+#include "SkeletonMeshBuilder.h"
+#include "../include/assimp/Importer.hpp"
+#include "../include/assimp/scene.h"
+#include <boost/scoped_ptr.hpp>
+#include "../include/assimp/IOSystem.hpp"
+#include "../include/assimp/DefaultLogger.hpp"
+
+
 
 using namespace Assimp;
 
diff --git a/code/MD5Loader.h b/code/MD5Loader.h
index f7aa63c79..709a85ba2 100644
--- a/code/MD5Loader.h
+++ b/code/MD5Loader.h
@@ -50,6 +50,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "MD5Parser.h"
 
 #include "../include/assimp/types.h"
+struct aiNode;
+struct aiNodeAnim;
 
 namespace Assimp	{
 
diff --git a/code/MD5Parser.cpp b/code/MD5Parser.cpp
index 2ca348b64..6be956593 100644
--- a/code/MD5Parser.cpp
+++ b/code/MD5Parser.cpp
@@ -42,14 +42,18 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /** @file  MD5Parser.cpp 
  *  @brief Implementation of the MD5 parser class
  */
-#include "AssimpPCH.h"
+
 
 // internal headers
 #include "MD5Loader.h"
 #include "MaterialSystem.h"
 #include "fast_atof.h"
 #include "ParsingUtils.h"
-#include "StringComparison.h"
+#include "StringComparison.h"
+#include "../include/assimp/DefaultLogger.hpp"
+#include "../include/assimp/mesh.h"
+
+
 
 using namespace Assimp;
 using namespace Assimp::MD5;
diff --git a/code/MD5Parser.h b/code/MD5Parser.h
index 31b0e2038..54def7216 100644
--- a/code/MD5Parser.h
+++ b/code/MD5Parser.h
@@ -48,6 +48,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "../include/assimp/types.h"
 #include "ParsingUtils.h"
+#include <vector>
+#include <stdint.h>
 
 struct aiFace;
 
diff --git a/code/MDCFileData.h b/code/MDCFileData.h
index d3f7c33c0..cf55f9362 100644
--- a/code/MDCFileData.h
+++ b/code/MDCFileData.h
@@ -54,7 +54,7 @@ http://themdcfile.planetwolfenstein.gamespy.com/MDC_File_Format.pdf
 #include "../include/assimp/anim.h"
 
 #include "./../include/assimp/Compiler/pushpack1.h"
-
+#include <stdint.h>
 
 namespace Assimp {
 namespace MDC {
diff --git a/code/MDCLoader.cpp b/code/MDCLoader.cpp
index f8b0cb8c2..b5ac51a5d 100644
--- a/code/MDCLoader.cpp
+++ b/code/MDCLoader.cpp
@@ -41,13 +41,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /** @file Implementation of the MDC importer class */
 
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_MDC_IMPORTER
 
 // internal headers
 #include "MDCLoader.h"
 #include "MD3FileData.h"
-#include "MDCNormalTable.h" // shouldn't be included by other units
+#include "MDCNormalTable.h" // shouldn't be included by other units
+#include "../include/assimp/DefaultLogger.hpp"
+#include "../include/assimp/Importer.hpp"
+#include <boost/scoped_ptr.hpp>
+#include "../include/assimp/IOSystem.hpp"
+#include "../include/assimp/scene.h"
+
 
 using namespace Assimp;
 using namespace Assimp::MDC;
diff --git a/code/MDLFileData.h b/code/MDLFileData.h
index fd7754e0a..366d8b1b2 100644
--- a/code/MDLFileData.h
+++ b/code/MDLFileData.h
@@ -52,7 +52,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_MDLFILEHELPER_H_INC
 #define AI_MDLFILEHELPER_H_INC
 
+#include "ByteSwap.h"
+#include "./../include/assimp/anim.h"
+#include "./../include/assimp/mesh.h"
 #include "./../include/assimp/Compiler/pushpack1.h"
+#include <stdint.h>
+#include <vector>
+
+class aiMaterial;
 
 namespace Assimp	{
 namespace MDL	{
diff --git a/code/MDLLoader.cpp b/code/MDLLoader.cpp
index 1ce0347ef..b2de6bfe5 100644
--- a/code/MDLLoader.cpp
+++ b/code/MDLLoader.cpp
@@ -45,12 +45,20 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 // internal headers
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_MDL_IMPORTER
 
 #include "MDLLoader.h"
 #include "MDLDefaultColorMap.h"
-#include "MD2FileData.h" 
+#include "MD2FileData.h"
+#include "../include/assimp/Importer.hpp"
+#include <boost/scoped_ptr.hpp>
+#include "../include/assimp/IOSystem.hpp"
+#include "../include/assimp/scene.h"
+#include "../include/assimp/DefaultLogger.hpp"
+#include "Macros.h"
+#include "qnan.h"
+
 
 using namespace Assimp;
 
diff --git a/code/MDLLoader.h b/code/MDLLoader.h
index 81706736d..401858f9e 100644
--- a/code/MDLLoader.h
+++ b/code/MDLLoader.h
@@ -47,11 +47,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_MDLLOADER_H_INCLUDED
 
 #include "BaseImporter.h"
-
-struct aiNode;
 #include "MDLFileData.h"
 #include "HalfLifeFileData.h"
 
+struct aiNode;
+struct aiTexture;
+
 namespace Assimp	{
 
 
diff --git a/code/MDLMaterialLoader.cpp b/code/MDLMaterialLoader.cpp
index dfa438b3a..6f5baee4e 100644
--- a/code/MDLMaterialLoader.cpp
+++ b/code/MDLMaterialLoader.cpp
@@ -41,12 +41,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /** @file Implementation of the material part of the MDL importer class */
 
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_MDL_IMPORTER
 
 // internal headers
 #include "MDLLoader.h"
-#include "MDLDefaultColorMap.h"
+#include "MDLDefaultColorMap.h"
+#include "../include/assimp/texture.h"
+#include "../include/assimp/IOSystem.hpp"
+#include "../include/assimp/DefaultLogger.hpp"
+#include "../include/assimp/scene.h"
+#include "qnan.h"
+#include "Defines.h"
+
 
 using namespace Assimp;
 static aiTexel* const bad_texel = reinterpret_cast<aiTexel*>(SIZE_MAX);
diff --git a/code/MS3DLoader.cpp b/code/MS3DLoader.cpp
index 455446bce..341ee6674 100644
--- a/code/MS3DLoader.cpp
+++ b/code/MS3DLoader.cpp
@@ -44,12 +44,17 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  Written against http://chumbalum.swissquake.ch/ms3d/ms3dspec.txt
  */
 
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_MS3D_IMPORTER
 
 // internal headers
 #include "MS3DLoader.h"
-#include "StreamReader.h"
+#include "StreamReader.h"
+#include "../include/assimp/DefaultLogger.hpp"
+#include "../include/assimp/scene.h"
+#include "../include/assimp/IOSystem.hpp"
+
+
 using namespace Assimp;
 
 static const aiImporterDesc desc = {
diff --git a/code/MS3DLoader.h b/code/MS3DLoader.h
index d060808d6..34f648bcd 100644
--- a/code/MS3DLoader.h
+++ b/code/MS3DLoader.h
@@ -45,6 +45,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_MS3DLOADER_H_INCLUDED
 
 #include "BaseImporter.h"
+#include "StreamReader.h"
+struct aiNode;
+
 namespace Assimp	{
 
 // ----------------------------------------------------------------------------------------------
diff --git a/code/Macros.h b/code/Macros.h
new file mode 100644
index 000000000..dfe0c20b4
--- /dev/null
+++ b/code/Macros.h
@@ -0,0 +1,49 @@
+/*
+---------------------------------------------------------------------------
+Open Asset Import Library (assimp)
+---------------------------------------------------------------------------
+
+Copyright (c) 2006-2012, assimp team
+
+All rights reserved.
+
+Redistribution and use of this software in source and binary forms, 
+with or without modification, are permitted provided that the following 
+conditions are met:
+
+* Redistributions of source code must retain the above
+  copyright notice, this list of conditions and the
+  following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+  copyright notice, this list of conditions and the
+  following disclaimer in the documentation and/or other
+  materials provided with the distribution.
+
+* Neither the name of the assimp team, nor the names of its
+  contributors may be used to endorse or promote products
+  derived from this software without specific prior
+  written permission of the assimp team.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+---------------------------------------------------------------------------
+*/
+
+/* Helper macro to set a pointer to NULL in debug builds
+ */
+#if (defined ASSIMP_BUILD_DEBUG)
+#	define AI_DEBUG_INVALIDATE_PTR(x) x = NULL;
+#else
+#	define AI_DEBUG_INVALIDATE_PTR(x)
+#endif
+
diff --git a/code/MakeVerboseFormat.cpp b/code/MakeVerboseFormat.cpp
index b85f04f86..19d0bdb10 100644
--- a/code/MakeVerboseFormat.cpp
+++ b/code/MakeVerboseFormat.cpp
@@ -41,8 +41,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /** @file Implementation of the post processing step "MakeVerboseFormat"
 */
 
-#include "AssimpPCH.h"
+
 #include "MakeVerboseFormat.h"
+#include "../include/assimp/scene.h"
+#include "../include/assimp/DefaultLogger.hpp"
 
 using namespace Assimp;
 
diff --git a/code/MakeVerboseFormat.h b/code/MakeVerboseFormat.h
index ebb71cce7..73fcd22a3 100644
--- a/code/MakeVerboseFormat.h
+++ b/code/MakeVerboseFormat.h
@@ -45,6 +45,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_MAKEVERBOSEFORMAT_H_INC
 
 #include "BaseProcess.h"
+struct aiMesh;
+
 namespace Assimp	{
 
 // ---------------------------------------------------------------------------
diff --git a/code/MaterialSystem.cpp b/code/MaterialSystem.cpp
index 1921c7f78..b2366b9fb 100644
--- a/code/MaterialSystem.cpp
+++ b/code/MaterialSystem.cpp
@@ -42,12 +42,17 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Implementation of the material system of the library
  */
 
-#include "AssimpPCH.h"
+
 
 #include "Hash.h"
 #include "fast_atof.h"
 #include "ParsingUtils.h"
 #include "MaterialSystem.h"
+#include "../include/assimp/types.h"
+#include "../include/assimp/material.h"
+#include "../include/assimp/DefaultLogger.hpp"
+#include "Macros.h"
+
 
 using namespace Assimp;
 
diff --git a/code/MaterialSystem.h b/code/MaterialSystem.h
index 32fdb9237..d9a54a75e 100644
--- a/code/MaterialSystem.h
+++ b/code/MaterialSystem.h
@@ -45,6 +45,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_MATERIALSYSTEM_H_INC
 #define AI_MATERIALSYSTEM_H_INC
 
+#include <stdint.h>
+
+struct aiMaterial;
+
 namespace Assimp	{
 
 // ------------------------------------------------------------------------------
diff --git a/code/MemoryIOWrapper.h b/code/MemoryIOWrapper.h
index ccb255fed..f2e40ff8f 100644
--- a/code/MemoryIOWrapper.h
+++ b/code/MemoryIOWrapper.h
@@ -42,6 +42,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  Handy IOStream/IOSystem implemetation to read directly from a memory buffer */
 #ifndef AI_MEMORYIOSTREAM_H_INC
 #define AI_MEMORYIOSTREAM_H_INC
+
+#include "../include/assimp/IOStream.hpp"
+#include "../include/assimp/IOSystem.hpp"
+#include "../include/assimp/ai_assert.h"
+#include <stdint.h>
+
 namespace Assimp	{
 #define AI_MEMORYIO_MAGIC_FILENAME "$$$___magic___$$$"
 #define AI_MEMORYIO_MAGIC_FILENAME_LENGTH 17
diff --git a/code/NDOLoader.cpp b/code/NDOLoader.cpp
index a8862d181..1704763b3 100644
--- a/code/NDOLoader.cpp
+++ b/code/NDOLoader.cpp
@@ -43,9 +43,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  Implementation of the NDO importer class.
  */
 
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_NDO_IMPORTER
 #include "NDOLoader.h"
+#include "../include/assimp/DefaultLogger.hpp"
+#include "../include/assimp/IOSystem.hpp"
+#include "../include/assimp/scene.h"
+#include "StreamReader.h"
+#include <boost/foreach.hpp>
 
 using namespace Assimp;
 #define for_each BOOST_FOREACH
diff --git a/code/NDOLoader.h b/code/NDOLoader.h
index 9922df42d..3c569f217 100644
--- a/code/NDOLoader.h
+++ b/code/NDOLoader.h
@@ -43,6 +43,18 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef INCLUDED_AI_NDO_LOADER_H
 #define INCLUDED_AI_NDO_LOADER_H
+
+#include "../include/assimp/vector3.h"
+#include "BaseImporter.h"
+#include <stdint.h>
+#include <string>
+#include <vector>
+
+class IOSystem;
+class Importer;
+struct aiImporterDesc;
+struct aiScene;
+
 namespace Assimp	{
 
 // ---------------------------------------------------------------------------
diff --git a/code/NFFLoader.cpp b/code/NFFLoader.cpp
index 968c79b5d..f180ba988 100644
--- a/code/NFFLoader.cpp
+++ b/code/NFFLoader.cpp
@@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /** @file Implementation of the STL importer class */
 
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_NFF_IMPORTER
 
 // internal headers
@@ -49,7 +49,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ParsingUtils.h"
 #include "StandardShapes.h"
 #include "fast_atof.h"
-#include "RemoveComments.h"
+#include "RemoveComments.h"
+#include <boost/scoped_ptr.hpp>
+#include "../include/assimp/IOSystem.hpp"
+#include "../include/assimp/DefaultLogger.hpp"
+#include "../include/assimp/scene.h"
+#include "qnan.h"
+
 
 using namespace Assimp;
 
diff --git a/code/NFFLoader.h b/code/NFFLoader.h
index ecc3d7ab4..06a5607a0 100644
--- a/code/NFFLoader.h
+++ b/code/NFFLoader.h
@@ -45,9 +45,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_NFFLOADER_H_INCLUDED
 
 #include "BaseImporter.h"
+#include "../include/assimp/types.h"
+#include "../include/assimp/material.h"
 #include <vector>
 
-#include "../include/assimp/types.h"
 
 namespace Assimp	{
 
diff --git a/code/OFFLoader.cpp b/code/OFFLoader.cpp
index ca440a458..aeb44fa67 100644
--- a/code/OFFLoader.cpp
+++ b/code/OFFLoader.cpp
@@ -43,13 +43,17 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Implementation of the OFF importer class 
  */
 
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_OFF_IMPORTER
 
 // internal headers
 #include "OFFLoader.h"
 #include "ParsingUtils.h"
-#include "fast_atof.h"
+#include "fast_atof.h"
+#include <boost/scoped_ptr.hpp>
+#include "../include/assimp/IOSystem.hpp"
+#include "../include/assimp/scene.h"
+#include "../include/assimp/DefaultLogger.hpp"
 
 
 using namespace Assimp;
diff --git a/code/ObjExporter.cpp b/code/ObjExporter.cpp
index c10c367b4..099b337da 100644
--- a/code/ObjExporter.cpp
+++ b/code/ObjExporter.cpp
@@ -38,13 +38,22 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ----------------------------------------------------------------------
 */
 
-#include "AssimpPCH.h"
+
 
 #ifndef ASSIMP_BUILD_NO_EXPORT
 #ifndef ASSIMP_BUILD_NO_OBJ_EXPORTER
 
 #include "ObjExporter.h"
-#include "../include/assimp/version.h"
+#include "../include/assimp/version.h"
+#include "../include/assimp/IOSystem.hpp"
+#include "../include/assimp/Exporter.hpp"
+#include <boost/scoped_ptr.hpp>
+#include "Exceptional.h"
+#include "../include/assimp/material.h"
+#include "../include/assimp/scene.h"
+#include "StringComparison.h"
+#include <boost/foreach.hpp>
+
 
 using namespace Assimp;
 namespace Assimp	{
diff --git a/code/ObjExporter.h b/code/ObjExporter.h
index e1ec7a9a6..5c864a0bd 100644
--- a/code/ObjExporter.h
+++ b/code/ObjExporter.h
@@ -44,10 +44,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_OBJEXPORTER_H_INC
 #define AI_OBJEXPORTER_H_INC
 
+#include "../include/assimp/types.h"
 #include <sstream>
+#include <vector>
+#include <map>
 
 struct aiScene;
 struct aiNode;
+struct aiMesh;
 
 namespace Assimp	
 {
diff --git a/code/ObjFileData.h b/code/ObjFileData.h
old mode 100755
new mode 100644
diff --git a/code/ObjFileImporter.cpp b/code/ObjFileImporter.cpp
index ef294536d..db02dbb23 100644
--- a/code/ObjFileImporter.cpp
+++ b/code/ObjFileImporter.cpp
@@ -39,13 +39,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------------
 */
 
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_OBJ_IMPORTER
 
 #include "DefaultIOSystem.h"
 #include "ObjFileImporter.h"
 #include "ObjFileParser.h"
-#include "ObjFileData.h"
+#include "ObjFileData.h"
+#include <boost/scoped_ptr.hpp>
+#include "../include/assimp/Importer.hpp"
+#include "../include/assimp/scene.h"
+#include "../include/assimp/ai_assert.h"
+#include "../include/assimp/DefaultLogger.hpp"
+
 
 static const aiImporterDesc desc = {
     "Wavefront Object Importer",
diff --git a/code/ObjFileImporter.h b/code/ObjFileImporter.h
index 5a40984b9..9d1383bfb 100644
--- a/code/ObjFileImporter.h
+++ b/code/ObjFileImporter.h
@@ -43,6 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define OBJ_FILE_IMPORTER_H_INC
 
 #include "BaseImporter.h"
+#include "../include/assimp/material.h"
 #include <vector>
 
 struct aiMesh;
diff --git a/code/ObjFileMtlImporter.cpp b/code/ObjFileMtlImporter.cpp
index 56229b7b0..91703e6d6 100644
--- a/code/ObjFileMtlImporter.cpp
+++ b/code/ObjFileMtlImporter.cpp
@@ -39,14 +39,17 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------------
 */
 
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_OBJ_IMPORTER
 
 #include "ObjFileMtlImporter.h"
 #include "ObjTools.h"
 #include "ObjFileData.h"
 #include "fast_atof.h"
-#include "ParsingUtils.h"
+#include "ParsingUtils.h"
+#include "../include/assimp/material.h"
+#include "../include/assimp/DefaultLogger.hpp"
+
 
 namespace Assimp	{
 
diff --git a/code/ObjFileParser.cpp b/code/ObjFileParser.cpp
index c4dff0ba0..37c16a2a9 100644
--- a/code/ObjFileParser.cpp
+++ b/code/ObjFileParser.cpp
@@ -39,7 +39,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------------
 */
 
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_OBJ_IMPORTER
 
 #include "ObjFileParser.h"
@@ -48,7 +48,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ObjFileData.h"
 #include "ParsingUtils.h"
 #include "../include/assimp/types.h"
-#include "DefaultIOSystem.h"
+#include "DefaultIOSystem.h"
+#include "BaseImporter.h"
+#include "../include/assimp/DefaultLogger.hpp"
+#include "../include/assimp/material.h"
+#include "../include/assimp/Importer.hpp"
+
 
 namespace Assimp {
 
diff --git a/code/ObjFileParser.h b/code/ObjFileParser.h
index d22ca3d8e..1883b7260 100644
--- a/code/ObjFileParser.h
+++ b/code/ObjFileParser.h
@@ -43,6 +43,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <vector>
 #include <string>
 #include <map>
+#include "../include/assimp/vector2.h"
+#include "../include/assimp/vector3.h"
+#include "../include/assimp/mesh.h"
 
 namespace Assimp
 {
diff --git a/code/ObjTools.h b/code/ObjTools.h
index a785d41a4..652f7f865 100644
--- a/code/ObjTools.h
+++ b/code/ObjTools.h
@@ -46,6 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "fast_atof.h"
 #include "ParsingUtils.h"
+#include <vector>
 
 namespace Assimp
 {
diff --git a/code/OgreBinarySerializer.cpp b/code/OgreBinarySerializer.cpp
index 2908ca056..6b1ffe257 100644
--- a/code/OgreBinarySerializer.cpp
+++ b/code/OgreBinarySerializer.cpp
@@ -43,6 +43,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "OgreParsingUtils.h"
 
 #include "TinyFormatter.h"
+#include "../include/assimp/DefaultLogger.hpp"
+
 
 #ifndef ASSIMP_BUILD_NO_OGRE_IMPORTER
 
diff --git a/code/OgreBinarySerializer.h b/code/OgreBinarySerializer.h
index 1080b226a..138951f14 100644
--- a/code/OgreBinarySerializer.h
+++ b/code/OgreBinarySerializer.h
@@ -44,6 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ASSIMP_BUILD_NO_OGRE_IMPORTER
 
 #include "OgreStructs.h"
+#include "StreamReader.h"
 
 namespace Assimp
 {
diff --git a/code/OgreImporter.cpp b/code/OgreImporter.cpp
index fbb50cfc3..eca9d531d 100644
--- a/code/OgreImporter.cpp
+++ b/code/OgreImporter.cpp
@@ -40,11 +40,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef ASSIMP_BUILD_NO_OGRE_IMPORTER
 
-#include "AssimpPCH.h"
+
 
 #include "OgreImporter.h"
 #include "OgreBinarySerializer.h"
-#include "OgreXmlSerializer.h"
+#include "OgreXmlSerializer.h"
+#include "../include/assimp/Importer.hpp"
+#include <boost/scoped_ptr.hpp>
 
 static const aiImporterDesc desc = {
 	"Ogre3D Mesh Importer",
diff --git a/code/OgreImporter.h b/code/OgreImporter.h
index 1185eeeb0..1b4b608f6 100644
--- a/code/OgreImporter.h
+++ b/code/OgreImporter.h
@@ -36,63 +36,65 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ----------------------------------------------------------------------
-*/
-
+*/
+
 #ifndef AI_OGREIMPORTER_H_INC
 #define AI_OGREIMPORTER_H_INC
 
 #ifndef ASSIMP_BUILD_NO_OGRE_IMPORTER
-
-#include "BaseImporter.h"
-
-#include "OgreStructs.h"
-#include "OgreParsingUtils.h"
-
-namespace Assimp
-{
-namespace Ogre
-{
-
+
+#include "BaseImporter.h"
+
+#include "OgreStructs.h"
+#include "OgreParsingUtils.h"
+
+#include "../include/assimp/material.h"
+
+namespace Assimp
+{
+namespace Ogre
+{
+
 /**	Importer for Ogre mesh, skeleton and material formats.
-	@todo Support vertex colors.
-	@todo Support poses/animations from the mesh file. 
-	Currently only skeleton file animations are supported. */
-class OgreImporter : public BaseImporter
-{
-public:
-	/// BaseImporter override.
-	virtual bool CanRead(const std::string &pFile, IOSystem *pIOHandler, bool checkSig) const;
-	
-	/// BaseImporter override.
+	@todo Support vertex colors.
+	@todo Support poses/animations from the mesh file. 
+	Currently only skeleton file animations are supported. */
+class OgreImporter : public BaseImporter
+{
+public:
+	/// BaseImporter override.
+	virtual bool CanRead(const std::string &pFile, IOSystem *pIOHandler, bool checkSig) const;
+	
+	/// BaseImporter override.
 	virtual void InternReadFile(const std::string &pFile, aiScene *pScene, IOSystem *pIOHandler);
 	
 	/// BaseImporter override.
-	virtual const aiImporterDesc *GetInfo() const;
-	
-	/// BaseImporter override.
-	virtual void SetupProperties(const Importer *pImp);
-
-private:
-	/// Read materials referenced by the @c mesh to @c pScene.
-	void ReadMaterials(const std::string &pFile, Assimp::IOSystem *pIOHandler, aiScene *pScene, Mesh *mesh);
-	void ReadMaterials(const std::string &pFile, Assimp::IOSystem *pIOHandler, aiScene *pScene, MeshXml *mesh);
-	void AssignMaterials(aiScene *pScene, std::vector<aiMaterial*> &materials);
-	
-	/// Reads material
-	aiMaterial* ReadMaterial(const std::string &pFile, Assimp::IOSystem *pIOHandler, const std::string MaterialName);
-
-	// These functions parse blocks from a material file from @c ss. Starting parsing from "{" and ending it to "}".
-	bool ReadTechnique(const std::string &techniqueName, std::stringstream &ss, aiMaterial *material);
-	bool ReadPass(const std::string &passName, std::stringstream &ss, aiMaterial *material);	
-	bool ReadTextureUnit(const std::string &textureUnitName, std::stringstream &ss, aiMaterial *material);
-
-	std::string m_userDefinedMaterialLibFile;
-	bool m_detectTextureTypeFromFilename;
-	
-	std::map<aiTextureType, unsigned int> m_textures;
-};
-} // Ogre
-} // Assimp
-
+	virtual const aiImporterDesc *GetInfo() const;
+	
+	/// BaseImporter override.
+	virtual void SetupProperties(const Importer *pImp);
+
+private:
+	/// Read materials referenced by the @c mesh to @c pScene.
+	void ReadMaterials(const std::string &pFile, Assimp::IOSystem *pIOHandler, aiScene *pScene, Mesh *mesh);
+	void ReadMaterials(const std::string &pFile, Assimp::IOSystem *pIOHandler, aiScene *pScene, MeshXml *mesh);
+	void AssignMaterials(aiScene *pScene, std::vector<aiMaterial*> &materials);
+	
+	/// Reads material
+	aiMaterial* ReadMaterial(const std::string &pFile, Assimp::IOSystem *pIOHandler, const std::string MaterialName);
+
+	// These functions parse blocks from a material file from @c ss. Starting parsing from "{" and ending it to "}".
+	bool ReadTechnique(const std::string &techniqueName, std::stringstream &ss, aiMaterial *material);
+	bool ReadPass(const std::string &passName, std::stringstream &ss, aiMaterial *material);	
+	bool ReadTextureUnit(const std::string &textureUnitName, std::stringstream &ss, aiMaterial *material);
+
+	std::string m_userDefinedMaterialLibFile;
+	bool m_detectTextureTypeFromFilename;
+	
+	std::map<aiTextureType, unsigned int> m_textures;
+};
+} // Ogre
+} // Assimp
+
 #endif // ASSIMP_BUILD_NO_OGRE_IMPORTER
 #endif // AI_OGREIMPORTER_H_INC
diff --git a/code/OgreMaterial.cpp b/code/OgreMaterial.cpp
index 4ef4b44ec..cf8951549 100644
--- a/code/OgreMaterial.cpp
+++ b/code/OgreMaterial.cpp
@@ -38,17 +38,20 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ----------------------------------------------------------------------
 */
 
-#include "AssimpPCH.h"
+
 
 #ifndef ASSIMP_BUILD_NO_OGRE_IMPORTER
 
 #include "OgreImporter.h"
-#include "TinyFormatter.h"
-
+#include "TinyFormatter.h"
+#include "../include/assimp/material.h"
+#include "../include/assimp/scene.h"
+#include "../include/assimp/DefaultLogger.hpp"
 #include "fast_atof.h"
 
 #include <vector>
-#include <sstream>
+#include <sstream>
+#include <boost/scoped_ptr.hpp>
 
 using namespace std;
 
diff --git a/code/OgreParsingUtils.h b/code/OgreParsingUtils.h
index d3a7aa8bf..91dfecb00 100644
--- a/code/OgreParsingUtils.h
+++ b/code/OgreParsingUtils.h
@@ -45,6 +45,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "ParsingUtils.h"
 #include <functional>
+#include <algorithm>
+#include <stdint.h>
+#include <sstream>
+#include <cctype>
 
 namespace Assimp
 {
diff --git a/code/OgreStructs.cpp b/code/OgreStructs.cpp
index 2009214cc..1e466d061 100644
--- a/code/OgreStructs.cpp
+++ b/code/OgreStructs.cpp
@@ -42,6 +42,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "OgreStructs.h"
 #include "TinyFormatter.h"
+#include "../include/assimp/scene.h"
+#include "../include/assimp/DefaultLogger.hpp"
+#include "Exceptional.h"
+
 
 namespace Assimp
 {
diff --git a/code/OgreStructs.h b/code/OgreStructs.h
index 75cadf4b7..ce41ca732 100644
--- a/code/OgreStructs.h
+++ b/code/OgreStructs.h
@@ -43,8 +43,18 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef ASSIMP_BUILD_NO_OGRE_IMPORTER
 
-#include "AssimpPCH.h"
 #include "MemoryIOWrapper.h"
+#include <boost/shared_ptr.hpp>
+#include "../include/assimp/mesh.h"
+#include <map>
+#include <vector>
+#include <set>
+
+struct aiNodeAnim;
+struct aiAnimation;
+struct aiNode;
+struct aiMaterial;
+struct aiScene;
 
 /** @note Parts of this implementation, for example enums, deserialization constants and logic
 	has been copied directly with minor modifications from the MIT licensed Ogre3D code base.
diff --git a/code/OgreXmlSerializer.cpp b/code/OgreXmlSerializer.cpp
index ffda7967e..f72cc6e5c 100644
--- a/code/OgreXmlSerializer.cpp
+++ b/code/OgreXmlSerializer.cpp
@@ -43,6 +43,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "OgreParsingUtils.h"
 
 #include "TinyFormatter.h"
+#include "../include/assimp/DefaultLogger.hpp"
+#include <boost/scoped_ptr.hpp>
 
 #ifndef ASSIMP_BUILD_NO_OGRE_IMPORTER
 
diff --git a/code/OpenGEXImporter.cpp b/code/OpenGEXImporter.cpp
index 9dd2197a7..1c85923ce 100644
--- a/code/OpenGEXImporter.cpp
+++ b/code/OpenGEXImporter.cpp
@@ -39,12 +39,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #ifndef ASSIMP_BUILD_NO_OPENGEX_IMPORTER
 
-#include "AssimpPCH.h"
 #include "OpenGEXImporter.h"
 #include "DefaultIOSystem.h"
 #include "MakeVerboseFormat.h"
 
 #include <openddlparser/OpenDDLParser.h>
+#include "../include/assimp/scene.h"
+
 
 #include <vector>
 
diff --git a/code/OpenGEXImporter.h b/code/OpenGEXImporter.h
index f5c328ff7..8e65a2536 100644
--- a/code/OpenGEXImporter.h
+++ b/code/OpenGEXImporter.h
@@ -43,13 +43,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ASSIMP_BUILD_NO_OPENGEX_IMPORTER
 
 #include "BaseImporter.h"
+#include "../include/assimp/mesh.h"
 
 #include <vector>
+#include <list>
 
 namespace ODDLParser {
     class DDLNode;
     struct Context;
 }
+struct aiNode;
 
 namespace Assimp {
 namespace OpenGEX {
diff --git a/code/OptimizeGraph.cpp b/code/OptimizeGraph.cpp
index fbb824c68..d418655bf 100644
--- a/code/OptimizeGraph.cpp
+++ b/code/OptimizeGraph.cpp
@@ -43,13 +43,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Implementation of the aiProcess_OptimizGraph step
  */
 
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_OPTIMIZEGRAPH_PROCESS
 
-using namespace Assimp;
 #include "OptimizeGraph.h"
 #include "ProcessHelper.h"
-#include "SceneCombiner.h"
+#include "SceneCombiner.h"
+#include "Exceptional.h"
+#include <stdio.h>
+
+using namespace Assimp;
 
 #define AI_RESERVED_NODE_NAME "$Reserved_And_Evil"
 
diff --git a/code/OptimizeGraph.h b/code/OptimizeGraph.h
index 78bdeefe4..876383ab8 100644
--- a/code/OptimizeGraph.h
+++ b/code/OptimizeGraph.h
@@ -47,6 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "BaseProcess.h"
 #include "ProcessHelper.h"
 #include "../include/assimp/types.h"
+#include <set>
 
 struct aiMesh;
 class OptimizeGraphProcessTest;
diff --git a/code/OptimizeMeshes.cpp b/code/OptimizeMeshes.cpp
index f19d110b1..cbd5ea693 100644
--- a/code/OptimizeMeshes.cpp
+++ b/code/OptimizeMeshes.cpp
@@ -43,14 +43,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Implementation of the aiProcess_OptimizeMeshes step
  */
 
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_OPTIMIZEMESHES_PROCESS
 
-using namespace Assimp;
 
 #include "OptimizeMeshes.h"
 #include "ProcessHelper.h"
-#include "SceneCombiner.h"
+#include "SceneCombiner.h"
+#include "Exceptional.h"
+
+using namespace Assimp;
 
 static const unsigned int NotSet   = 0xffffffff;
 static const unsigned int DeadBeef = 0xdeadbeef;
diff --git a/code/OptimizeMeshes.h b/code/OptimizeMeshes.h
index 5e67b0548..88e81629c 100644
--- a/code/OptimizeMeshes.h
+++ b/code/OptimizeMeshes.h
@@ -46,9 +46,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "BaseProcess.h"
 #include "../include/assimp/types.h"
+#include <vector>
 
 struct aiMesh;
+struct aiNode;
 class OptimizeMeshesProcessTest;
+
 namespace Assimp	{
 
 // ---------------------------------------------------------------------------
diff --git a/code/ParsingUtils.h b/code/ParsingUtils.h
index 93a44d0a6..5b76e0b77 100644
--- a/code/ParsingUtils.h
+++ b/code/ParsingUtils.h
@@ -46,6 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_PARSING_UTILS_H_INC
 
 #include "StringComparison.h"
+#include "../include/assimp/defs.h"
 
 namespace Assimp {
 
diff --git a/code/PlyExporter.cpp b/code/PlyExporter.cpp
index 692b02668..d790f9d31 100644
--- a/code/PlyExporter.cpp
+++ b/code/PlyExporter.cpp
@@ -38,12 +38,18 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ----------------------------------------------------------------------
 */
 
-#include "AssimpPCH.h"
+
 
 #if !defined(ASSIMP_BUILD_NO_EXPORT) && !defined(ASSIMP_BUILD_NO_PLY_EXPORTER)
 
 #include "PlyExporter.h"
-#include "../include/assimp/version.h"
+#include <boost/scoped_ptr.hpp>
+#include "Exceptional.h"
+#include "../include/assimp/scene.h"
+#include "../include/assimp/version.h"
+#include "../include/assimp/IOSystem.hpp"
+#include "../include/assimp/Exporter.hpp"
+
 
 using namespace Assimp;
 namespace Assimp	{
diff --git a/code/PlyExporter.h b/code/PlyExporter.h
index 522821b1a..ec20903d7 100644
--- a/code/PlyExporter.h
+++ b/code/PlyExporter.h
@@ -48,6 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 struct aiScene;
 struct aiNode;
+struct aiMesh;
 
 namespace Assimp	
 {
diff --git a/code/PlyLoader.cpp b/code/PlyLoader.cpp
index f1864b0f6..0ca04782c 100644
--- a/code/PlyLoader.cpp
+++ b/code/PlyLoader.cpp
@@ -43,11 +43,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Implementation of the PLY importer class
  */
 
-#include "AssimpPCH.h"
 #ifndef ASSIMP_BUILD_NO_PLY_IMPORTER
 
 // internal headers
-#include "PlyLoader.h"
+#include "PlyLoader.h"
+#include "Macros.h"
+#include <boost/scoped_ptr.hpp>
+#include "../include/assimp/IOSystem.hpp"
+#include "../include/assimp/scene.h"
+
 
 using namespace Assimp;
 
diff --git a/code/PlyLoader.h b/code/PlyLoader.h
index d00c7926a..7592c8bd5 100644
--- a/code/PlyLoader.h
+++ b/code/PlyLoader.h
@@ -46,10 +46,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "BaseImporter.h"
 #include "../include/assimp/types.h"
+#include "PlyParser.h"
+#include <vector>
 
 struct aiNode;
-
-#include "PlyParser.h"
+struct aiMaterial;
+struct aiMesh;
 
 namespace Assimp	{
 
diff --git a/code/PlyParser.cpp b/code/PlyParser.cpp
index 7b869ecd0..c11af1a0a 100644
--- a/code/PlyParser.cpp
+++ b/code/PlyParser.cpp
@@ -41,11 +41,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /** @file Implementation of the PLY parser class */
 
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_PLY_IMPORTER
 
 #include "PlyLoader.h"
-#include "fast_atof.h"
+#include "fast_atof.h"
+#include "../include/assimp/DefaultLogger.hpp"
+#include "ByteSwap.h"
+
 
 using namespace Assimp;
 
diff --git a/code/PlyParser.h b/code/PlyParser.h
index 47ea1c265..8a9273f53 100644
--- a/code/PlyParser.h
+++ b/code/PlyParser.h
@@ -45,6 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 #include "ParsingUtils.h"
+#include <vector>
 
 
 namespace Assimp
diff --git a/code/PolyTools.h b/code/PolyTools.h
index 8fbf9c4d9..cbf684e9f 100644
--- a/code/PolyTools.h
+++ b/code/PolyTools.h
@@ -43,6 +43,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_POLYTOOLS_H_INCLUDED
 #define AI_POLYTOOLS_H_INCLUDED
 
+#include "../include/assimp/material.h"
+#include "../include/assimp/ai_assert.h"
+
 namespace Assimp {
 
 // -------------------------------------------------------------------------------
diff --git a/code/PostStepRegistry.cpp b/code/PostStepRegistry.cpp
index 5593a7f41..c4d96b3b0 100644
--- a/code/PostStepRegistry.cpp
+++ b/code/PostStepRegistry.cpp
@@ -46,7 +46,6 @@ directly (unless you are adding new steps), instead use the
 corresponding preprocessor flag to selectively disable steps.
 */
 
-#include "AssimpPCH.h"
 #include "ProcessHelper.h"
 
 #ifndef ASSIMP_BUILD_NO_CALCTANGENTS_PROCESS
diff --git a/code/PretransformVertices.cpp b/code/PretransformVertices.cpp
index 007897c93..1c7a9a4e0 100644
--- a/code/PretransformVertices.cpp
+++ b/code/PretransformVertices.cpp
@@ -43,10 +43,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Implementation of the "PretransformVertices" post processing step 
 */
 
-#include "AssimpPCH.h"
+
 #include "PretransformVertices.h"
 #include "ProcessHelper.h"
-#include "SceneCombiner.h"
+#include "SceneCombiner.h"
+#include "Exceptional.h"
 
 using namespace Assimp;
 
diff --git a/code/PretransformVertices.h b/code/PretransformVertices.h
index f69875587..45c5376d4 100644
--- a/code/PretransformVertices.h
+++ b/code/PretransformVertices.h
@@ -47,7 +47,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "BaseProcess.h"
 #include "../include/assimp/mesh.h"
+#include <list>
+#include <vector>
 
+struct aiNode;
 class PretransformVerticesTest;
 namespace Assimp	{
 
diff --git a/code/ProcessHelper.cpp b/code/ProcessHelper.cpp
index 9250b239e..70e883df4 100644
--- a/code/ProcessHelper.cpp
+++ b/code/ProcessHelper.cpp
@@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /// @file ProcessHelper.cpp
 /** Implement shared utility functions for postprocessing steps */
 
-#include "AssimpPCH.h"
+
 #include "ProcessHelper.h"
 
 
diff --git a/code/ProcessHelper.h b/code/ProcessHelper.h
index 1c95c61f3..4dc80972a 100644
--- a/code/ProcessHelper.h
+++ b/code/ProcessHelper.h
@@ -42,11 +42,18 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_PROCESS_HELPER_H_INCLUDED
 
 #include "../include/assimp/postprocess.h"
+#include "../include/assimp/anim.h"
+#include "../include/assimp/mesh.h"
+#include "../include/assimp/material.h"
+#include "../include/assimp/DefaultLogger.hpp"
+#include "../include/assimp/scene.h"
 
 #include "SpatialSort.h"
 #include "BaseProcess.h"
 #include "ParsingUtils.h"
 
+#include <list>
+
 // -------------------------------------------------------------------------------
 // Some extensions to std namespace. Mainly std::min and std::max for all
 // flat data types in the aiScene. They're used to quickly determine the
diff --git a/code/Profiler.h b/code/Profiler.h
index a0dda9f61..72e0ab3a4 100644
--- a/code/Profiler.h
+++ b/code/Profiler.h
@@ -45,10 +45,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define INCLUDED_PROFILER_H
 
 #include "boost/timer.hpp"
-
 #include "../include/assimp/DefaultLogger.hpp"
 #include "TinyFormatter.h"
 
+#include <map>
+
 namespace Assimp {
 	namespace Profiling {
 
diff --git a/code/Q3BSPFileData.h b/code/Q3BSPFileData.h
index 452f83122..da025aa97 100644
--- a/code/Q3BSPFileData.h
+++ b/code/Q3BSPFileData.h
@@ -41,6 +41,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define ASSIMP_Q3BSPFILEDATA_H_INC
 
 #include <vector>
+#include <string.h> //memset
+#include <string>
 
 namespace Assimp {
 namespace Q3BSP {
diff --git a/code/Q3BSPFileImporter.cpp b/code/Q3BSPFileImporter.cpp
index 2c87d2a82..8d8ebecb3 100644
--- a/code/Q3BSPFileImporter.cpp
+++ b/code/Q3BSPFileImporter.cpp
@@ -37,10 +37,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ---------------------------------------------------------------------------------------------------
 */
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_Q3BSP_IMPORTER
 
-//#include <windows.h> 
+//#include <windows.h>
 #include "DefaultIOSystem.h"
 #include "Q3BSPFileImporter.h"
 #include "Q3BSPZipArchive.h"
@@ -54,9 +54,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endif
 
 #include "../include/assimp/types.h"
-#include "../include/assimp/mesh.h"
-#include <vector>
-
+#include "../include/assimp/mesh.h"
+#include "../include/assimp/scene.h"
+#include "../include/assimp/ai_assert.h"
+#include <vector>
+#include <sstream>
+#include "StringComparison.h"
 
 static const aiImporterDesc desc = {
 	"Quake III BSP Importer",
diff --git a/code/Q3BSPFileImporter.h b/code/Q3BSPFileImporter.h
index 6d0e8287a..7d8a96782 100644
--- a/code/Q3BSPFileImporter.h
+++ b/code/Q3BSPFileImporter.h
@@ -43,6 +43,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "BaseImporter.h"
 
 struct aiMesh;
+struct aiNode;
+struct aiFace;
+struct aiMaterial;
+struct aiTexture;
 
 namespace Assimp
 {
diff --git a/code/Q3BSPFileParser.cpp b/code/Q3BSPFileParser.cpp
index 600a20f2b..0aa182037 100644
--- a/code/Q3BSPFileParser.cpp
+++ b/code/Q3BSPFileParser.cpp
@@ -37,7 +37,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ----------------------------------------------------------------------
 */
-#include "AssimpPCH.h"
+
 
 #ifndef ASSIMP_BUILD_NO_Q3BSP_IMPORTER
 
@@ -45,7 +45,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "DefaultIOSystem.h"
 #include "Q3BSPFileData.h"
 #include "Q3BSPZipArchive.h"
-#include <vector>
+#include <vector>
+#include "../include/assimp/ai_assert.h"
+
 
 namespace Assimp
 {
diff --git a/code/Q3BSPZipArchive.cpp b/code/Q3BSPZipArchive.cpp
index e683e63f8..ebbf77206 100644
--- a/code/Q3BSPZipArchive.cpp
+++ b/code/Q3BSPZipArchive.cpp
@@ -38,13 +38,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ----------------------------------------------------------------------
 */
 
-#include "AssimpPCH.h"
+
 
 #ifndef ASSIMP_BUILD_NO_Q3BSP_IMPORTER
 
 #include "Q3BSPZipArchive.h"
 #include <algorithm>
-#include <cassert>
+#include <cassert>
+#include "../include/assimp/ai_assert.h"
+
 
 namespace Assimp {
 namespace Q3BSP {
diff --git a/code/Q3DLoader.cpp b/code/Q3DLoader.cpp
index 9fc3a80c2..393bd99fb 100644
--- a/code/Q3DLoader.cpp
+++ b/code/Q3DLoader.cpp
@@ -43,13 +43,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Implementation of the Q3D importer class
  */
 
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_Q3D_IMPORTER
 
 // internal headers
 #include "Q3DLoader.h"
 #include "StreamReader.h"
-#include "fast_atof.h"
+#include "fast_atof.h"
+#include "../include/assimp/IOSystem.hpp"
+#include "../include/assimp/DefaultLogger.hpp"
+#include "../include/assimp/scene.h"
 
 using namespace Assimp;
 
diff --git a/code/Q3DLoader.h b/code/Q3DLoader.h
index 55fda7303..16e7c3e00 100644
--- a/code/Q3DLoader.h
+++ b/code/Q3DLoader.h
@@ -47,6 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "BaseImporter.h"
 #include "../include/assimp/types.h"
 #include <vector>
+#include <stdint.h>
 
 namespace Assimp	{
 
diff --git a/code/RawLoader.cpp b/code/RawLoader.cpp
index be6736307..b14ad2884 100644
--- a/code/RawLoader.cpp
+++ b/code/RawLoader.cpp
@@ -43,13 +43,18 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Implementation of the RAW importer class 
  */
 
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_RAW_IMPORTER
 
 // internal headers
 #include "RawLoader.h"
 #include "ParsingUtils.h"
-#include "fast_atof.h"
+#include "fast_atof.h"
+#include <boost/scoped_ptr.hpp>
+#include "../include/assimp/IOSystem.hpp"
+#include "../include/assimp/DefaultLogger.hpp"
+#include "../include/assimp/scene.h"
+
 
 using namespace Assimp;
 
diff --git a/code/RemoveComments.cpp b/code/RemoveComments.cpp
index a04624412..c92f8ea36 100644
--- a/code/RemoveComments.cpp
+++ b/code/RemoveComments.cpp
@@ -42,7 +42,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Defines the CommentRemover utility class
  */
 
-#include "AssimpPCH.h"
 #include "RemoveComments.h"
 #include "ParsingUtils.h"
 
diff --git a/code/RemoveComments.h b/code/RemoveComments.h
index fd372618b..7f89e1ebb 100644
--- a/code/RemoveComments.h
+++ b/code/RemoveComments.h
@@ -45,6 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_REMOVE_COMMENTS_H_INC
 
 #include "../include/assimp/ai_assert.h"
+#include "../include/assimp/defs.h"
 
 namespace Assimp	{
 
diff --git a/code/RemoveRedundantMaterials.cpp b/code/RemoveRedundantMaterials.cpp
index b5052877b..2c760db0c 100644
--- a/code/RemoveRedundantMaterials.cpp
+++ b/code/RemoveRedundantMaterials.cpp
@@ -43,11 +43,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 // internal headers
-#include "AssimpPCH.h"
+
 #include "RemoveRedundantMaterials.h"
 #include "ParsingUtils.h"
 #include "ProcessHelper.h"
-#include "MaterialSystem.h"
+#include "MaterialSystem.h"
+#include <stdio.h>
 
 using namespace Assimp;
 
diff --git a/code/RemoveVCProcess.cpp b/code/RemoveVCProcess.cpp
index 2643dea14..2b551bacf 100644
--- a/code/RemoveVCProcess.cpp
+++ b/code/RemoveVCProcess.cpp
@@ -42,8 +42,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *        any parts of the mesh structure from the imported data.
 */
 
-#include "AssimpPCH.h"
+
 #include "RemoveVCProcess.h"
+#include "../include/assimp/postprocess.h"
+#include "../include/assimp/DefaultLogger.hpp"
+#include "../include/assimp/scene.h"
+
 
 using namespace Assimp;
 
diff --git a/code/SGSpatialSort.cpp b/code/SGSpatialSort.cpp
index 2edf55697..9489b8b63 100644
--- a/code/SGSpatialSort.cpp
+++ b/code/SGSpatialSort.cpp
@@ -43,7 +43,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 vertices close to a given position. Special implementation for 
 the 3ds loader handling smooth groups correctly  */
 
-#include "AssimpPCH.h"
 #include "SGSpatialSort.h"
 
 using namespace Assimp;
diff --git a/code/SGSpatialSort.h b/code/SGSpatialSort.h
index c14fa7361..39e5207d4 100644
--- a/code/SGSpatialSort.h
+++ b/code/SGSpatialSort.h
@@ -43,8 +43,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_D3DSSPATIALSORT_H_INC
 #define AI_D3DSSPATIALSORT_H_INC
 
-#include <vector>
 #include "../include/assimp/types.h"
+#include <vector>
+#include <stdint.h>
 
 namespace Assimp	{
 
diff --git a/code/SMDLoader.cpp b/code/SMDLoader.cpp
index 2bc73abec..31c8c4fda 100644
--- a/code/SMDLoader.cpp
+++ b/code/SMDLoader.cpp
@@ -43,13 +43,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Implementation of the SMD importer class 
  */
 
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_SMD_IMPORTER
 
 // internal headers
 #include "SMDLoader.h"
 #include "fast_atof.h"
-#include "SkeletonMeshBuilder.h"
+#include "SkeletonMeshBuilder.h"
+#include "../include/assimp/Importer.hpp"
+#include "../include/assimp/IOSystem.hpp"
+#include <boost/scoped_ptr.hpp>
+#include "../include/assimp/scene.h"
+#include "../include/assimp/DefaultLogger.hpp"
+
 
 using namespace Assimp;
 
diff --git a/code/STEPFile.h b/code/STEPFile.h
index 510e051ae..0ce9da7dc 100644
--- a/code/STEPFile.h
+++ b/code/STEPFile.h
@@ -42,9 +42,17 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define INCLUDED_AI_STEPFILE_H
 
 #include <boost/noncopyable.hpp>
+#include <boost/static_assert.hpp>
+#include <boost/foreach.hpp>
 #include <bitset>
 #include <memory>
 #include <typeinfo>
+#include <vector>
+#include <map>
+#include <set>
+
+#include "FBXDocument.h" //ObjectMap::value_type
+#include "../include/assimp/DefaultLogger.hpp"
 
 //
 #if _MSC_VER > 1500 || (defined __GNUC___)
diff --git a/code/STEPFileEncoding.cpp b/code/STEPFileEncoding.cpp
index e56a1ba42..3d2ab4933 100644
--- a/code/STEPFileEncoding.cpp
+++ b/code/STEPFileEncoding.cpp
@@ -41,11 +41,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /** @file  STEPFileEncoding.cpp
  *  @brief STEP character handling, string unescaping
  */
-#include "AssimpPCH.h"
 #include "STEPFileEncoding.h"
 #include "fast_atof.h"
 
 #include "../contrib/ConvertUTF/ConvertUTF.h"
+#include <boost/scoped_array.hpp>
 
 using namespace Assimp;
 
diff --git a/code/STEPFileReader.cpp b/code/STEPFileReader.cpp
index 96db1d433..113ab50a1 100644
--- a/code/STEPFileReader.cpp
+++ b/code/STEPFileReader.cpp
@@ -42,11 +42,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Implementation of the STEP file parser, which fills a 
  *     STEP::DB with data read from a file.
  */
-#include "AssimpPCH.h"
+
 #include "STEPFileReader.h"
 #include "STEPFileEncoding.h"
 #include "TinyFormatter.h"
-#include "fast_atof.h"
+#include "fast_atof.h"
+#include <boost/make_shared.hpp>
 
 
 using namespace Assimp;
diff --git a/code/STLExporter.cpp b/code/STLExporter.cpp
index d45ece1ec..580620f94 100644
--- a/code/STLExporter.cpp
+++ b/code/STLExporter.cpp
@@ -38,12 +38,18 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ----------------------------------------------------------------------
 */
 
-#include "AssimpPCH.h"
+
 
 #if !defined(ASSIMP_BUILD_NO_EXPORT) && !defined(ASSIMP_BUILD_NO_STL_EXPORTER)
 
 #include "STLExporter.h"
-#include "../include/assimp/version.h"
+#include "../include/assimp/version.h"
+#include "../include/assimp/IOSystem.hpp"
+#include "../include/assimp/scene.h"
+#include "../include/assimp/Exporter.hpp"
+#include <boost/scoped_ptr.hpp>
+#include "Exceptional.h"
+#include "ByteSwap.h"
 
 using namespace Assimp;
 namespace Assimp	{
diff --git a/code/STLExporter.h b/code/STLExporter.h
index 0ed60d812..3284650c3 100644
--- a/code/STLExporter.h
+++ b/code/STLExporter.h
@@ -48,6 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 struct aiScene;
 struct aiNode;
+struct aiMesh;
 
 namespace Assimp	
 {
diff --git a/code/STLLoader.cpp b/code/STLLoader.cpp
index 987de89d0..425c00c7d 100644
--- a/code/STLLoader.cpp
+++ b/code/STLLoader.cpp
@@ -41,13 +41,18 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /** @file Implementation of the STL importer class */
 
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_STL_IMPORTER
 
 // internal headers
 #include "STLLoader.h"
 #include "ParsingUtils.h"
-#include "fast_atof.h"
+#include "fast_atof.h"
+#include <boost/scoped_ptr.hpp>
+#include "../include/assimp/IOSystem.hpp"
+#include "../include/assimp/scene.h"
+#include "../include/assimp/DefaultLogger.hpp"
+
 
 using namespace Assimp;
 
diff --git a/code/SceneCombiner.cpp b/code/SceneCombiner.cpp
index 26ed94712..087a2a4c8 100644
--- a/code/SceneCombiner.cpp
+++ b/code/SceneCombiner.cpp
@@ -49,11 +49,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *    OptimizeGraph step.
  */
 // ----------------------------------------------------------------------------
-#include "AssimpPCH.h"
 #include "SceneCombiner.h"
 #include "fast_atof.h"
 #include "Hash.h"
 #include "time.h"
+#include "../include/assimp/DefaultLogger.hpp"
+#include "../include/assimp/scene.h"
+#include <stdio.h>
+#include "ScenePrivate.h"
 
 namespace Assimp	{
 
diff --git a/code/SceneCombiner.h b/code/SceneCombiner.h
index 0c4cfc2ee..34337ed81 100644
--- a/code/SceneCombiner.h
+++ b/code/SceneCombiner.h
@@ -45,6 +45,25 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_SCENE_COMBINER_H_INC
 
 #include "../include/assimp/ai_assert.h"
+#include "../include/assimp/types.h"
+#include "Defines.h"
+#include <stddef.h>
+#include <set>
+#include <list>
+#include <stdint.h>
+#include <vector>
+
+struct aiScene;
+struct aiNode;
+struct aiMaterial;
+struct aiTexture;
+struct aiCamera;
+struct aiLight;
+struct aiMetadata;
+struct aiBone;
+struct aiMesh;
+struct aiAnimation;
+struct aiNodeAnim;
 
 namespace Assimp	{
 
diff --git a/code/ScenePreprocessor.cpp b/code/ScenePreprocessor.cpp
index feb515679..d51ef29e1 100644
--- a/code/ScenePreprocessor.cpp
+++ b/code/ScenePreprocessor.cpp
@@ -38,8 +38,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ----------------------------------------------------------------------
 */
 
-#include "AssimpPCH.h"
 #include "ScenePreprocessor.h"
+#include "../include/assimp/ai_assert.h"
+#include "../include/assimp/scene.h"
+#include "../include/assimp/DefaultLogger.hpp"
+
 
 using namespace Assimp;
 
diff --git a/code/ScenePreprocessor.h b/code/ScenePreprocessor.h
index 062c069b7..5133b625b 100644
--- a/code/ScenePreprocessor.h
+++ b/code/ScenePreprocessor.h
@@ -43,6 +43,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_SCENE_PREPROCESSOR_H_INC
 #define AI_SCENE_PREPROCESSOR_H_INC
 
+#include "../include/assimp/defs.h"
+#include <stddef.h>
+
+struct aiScene;
+struct aiAnimation;
+struct aiMesh;
+
 class ScenePreprocessorTest;
 namespace Assimp	{
 
diff --git a/code/ScenePrivate.h b/code/ScenePrivate.h
index 8e9fde7ac..9bbdd64bd 100644
--- a/code/ScenePrivate.h
+++ b/code/ScenePrivate.h
@@ -43,6 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_SCENEPRIVATE_H_INCLUDED
 #define AI_SCENEPRIVATE_H_INCLUDED
 
+#include "../include/assimp/scene.h"
 
 namespace Assimp	{
 
diff --git a/code/SkeletonMeshBuilder.cpp b/code/SkeletonMeshBuilder.cpp
index bca9792fd..3332cf259 100644
--- a/code/SkeletonMeshBuilder.cpp
+++ b/code/SkeletonMeshBuilder.cpp
@@ -42,7 +42,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Implementation of a little class to construct a dummy mesh for a skeleton 
  */
 
-#include "AssimpPCH.h"
 #include "../include/assimp/scene.h"
 #include "SkeletonMeshBuilder.h"
 
diff --git a/code/SkeletonMeshBuilder.h b/code/SkeletonMeshBuilder.h
index 80b49b0cc..4c9343e67 100644
--- a/code/SkeletonMeshBuilder.h
+++ b/code/SkeletonMeshBuilder.h
@@ -51,6 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <vector>
 #include "../include/assimp/mesh.h"
 
+struct aiMaterial;
 struct aiScene;
 struct aiNode;
 
diff --git a/code/SmoothingGroups.h b/code/SmoothingGroups.h
index 41311f73d..48f8ca1c7 100644
--- a/code/SmoothingGroups.h
+++ b/code/SmoothingGroups.h
@@ -44,6 +44,10 @@ http://www.jalix.org/ressources/graphics/3DS/_unofficials/3ds-unofficial.txt */
 #ifndef AI_SMOOTHINGGROUPS_H_INC
 #define AI_SMOOTHINGGROUPS_H_INC
 
+#include "../include/assimp/vector3.h"
+#include <stdint.h>
+#include <vector>
+
 // ---------------------------------------------------------------------------
 /** Helper structure representing a face with smoothing groups assigned */
 struct FaceWithSmoothingGroup
diff --git a/code/SortByPTypeProcess.cpp b/code/SortByPTypeProcess.cpp
index 51e9066ea..096b3fcf1 100644
--- a/code/SortByPTypeProcess.cpp
+++ b/code/SortByPTypeProcess.cpp
@@ -43,11 +43,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  SortByPTypeProcess post-process steps.
 */
 
-#include "AssimpPCH.h"
+
 
 // internal headers
 #include "ProcessHelper.h"
-#include "SortByPTypeProcess.h"
+#include "SortByPTypeProcess.h"
+#include "Exceptional.h"
 
 using namespace Assimp;
 
diff --git a/code/SpatialSort.cpp b/code/SpatialSort.cpp
index 085862300..497548fa3 100644
--- a/code/SpatialSort.cpp
+++ b/code/SpatialSort.cpp
@@ -41,8 +41,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /** @file Implementation of the helper class to quickly find vertices close to a given position */
 
-#include "AssimpPCH.h"
-#include "SpatialSort.h"
+#include "SpatialSort.h"
+#include <boost/static_assert.hpp>
+#include "../include/assimp/ai_assert.h"
 
 using namespace Assimp;
 
diff --git a/code/SplitByBoneCountProcess.cpp b/code/SplitByBoneCountProcess.cpp
index 1bbbded20..dc868e3dd 100644
--- a/code/SplitByBoneCountProcess.cpp
+++ b/code/SplitByBoneCountProcess.cpp
@@ -42,12 +42,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /// @file SplitByBoneCountProcess.cpp 
 /// Implementation of the SplitByBoneCount postprocessing step
 
-#include "AssimpPCH.h"
-
 // internal headers of the post-processing framework
-#include "SplitByBoneCountProcess.h"
+#include "SplitByBoneCountProcess.h"
+#include "../include/assimp/postprocess.h"
+#include "../include/assimp/DefaultLogger.hpp"
 
-#include <limits>
+#include <limits>
+#include <boost/format.hpp>
 
 using namespace Assimp;
 
diff --git a/code/SplitLargeMeshes.cpp b/code/SplitLargeMeshes.cpp
index d8c14ccb4..b8c917c37 100644
--- a/code/SplitLargeMeshes.cpp
+++ b/code/SplitLargeMeshes.cpp
@@ -42,7 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /** @file Implementation of the SplitLargeMeshes postprocessing step
 */
 
-#include "AssimpPCH.h"
+
 
 // internal headers of the post-processing framework
 #include "SplitLargeMeshes.h"
diff --git a/code/StandardShapes.cpp b/code/StandardShapes.cpp
index 7b42abd78..e9b135421 100644
--- a/code/StandardShapes.cpp
+++ b/code/StandardShapes.cpp
@@ -45,8 +45,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  http://geometrictools.com/Documentation/PlatonicSolids.pdf.
  */
 
-#include "AssimpPCH.h"
-#include "StandardShapes.h"
+#include "StandardShapes.h"
+#include "StringComparison.h"
+#include "Defines.h"
+#include <stddef.h>
+#include "../include/assimp/mesh.h"
 
 namespace Assimp	{
 
diff --git a/code/StandardShapes.h b/code/StandardShapes.h
index 577f45bd2..0e1cf6c1e 100644
--- a/code/StandardShapes.h
+++ b/code/StandardShapes.h
@@ -44,8 +44,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_STANDARD_SHAPES_H_INC
 #define AI_STANDARD_SHAPES_H_INC
 
+#include "../include/assimp/vector3.h"
 #include <vector>
 
+struct aiMesh;
 
 namespace Assimp	{
 
diff --git a/code/StreamReader.h b/code/StreamReader.h
index 8301d1b27..bb96a20ce 100644
--- a/code/StreamReader.h
+++ b/code/StreamReader.h
@@ -46,6 +46,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_STREAMREADER_H_INCLUDED
 
 #include "ByteSwap.h"
+#include "Exceptional.h"
+#include <boost/shared_ptr.hpp>
+#include "../include/assimp/IOStream.hpp"
+#include "Defines.h"
 
 namespace Assimp {
 
diff --git a/code/StreamWriter.h b/code/StreamWriter.h
index afa8d2489..522999365 100644
--- a/code/StreamWriter.h
+++ b/code/StreamWriter.h
@@ -46,6 +46,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_STREAMWRITER_H_INCLUDED
 
 #include "ByteSwap.h"
+#include "../include/assimp/IOStream.hpp"
+
+#include <boost/shared_ptr.hpp>
+#include <vector>
 
 namespace Assimp {
 
diff --git a/code/StringComparison.h b/code/StringComparison.h
index a85a41804..1f0ab1d9b 100644
--- a/code/StringComparison.h
+++ b/code/StringComparison.h
@@ -51,6 +51,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define INCLUDED_AI_STRING_WORKERS_H
 
 #include "../include/assimp/ai_assert.h"
+#include <string.h>
+#include <stdint.h>
+#include <string>
+#include <cctype>
 
 namespace Assimp	{
 
diff --git a/code/Subdivision.cpp b/code/Subdivision.cpp
index 4bc39c268..e2db09979 100644
--- a/code/Subdivision.cpp
+++ b/code/Subdivision.cpp
@@ -38,13 +38,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ----------------------------------------------------------------------
 */
 
-#include "AssimpPCH.h"
-
 #include "Subdivision.h"
 #include "SceneCombiner.h"
 #include "SpatialSort.h"
 #include "ProcessHelper.h"
-#include "Vertex.h"
+#include "Vertex.h"
+#include <stdio.h>
 
 using namespace Assimp;
 void mydummy() {}
diff --git a/code/Subdivision.h b/code/Subdivision.h
index 5d019f521..e6d1ce6ff 100644
--- a/code/Subdivision.h
+++ b/code/Subdivision.h
@@ -41,6 +41,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /** @file Defines a helper class to evaluate subdivision surfaces.*/
 #ifndef AI_SUBDISIVION_H_INC
 #define AI_SUBDISIVION_H_INC
+
+#include <cstddef>
+struct aiMesh;
+
 namespace Assimp	{
 
 // ------------------------------------------------------------------------------
diff --git a/code/TargetAnimation.cpp b/code/TargetAnimation.cpp
index 82c4ae2ca..9f8db3a4d 100644
--- a/code/TargetAnimation.cpp
+++ b/code/TargetAnimation.cpp
@@ -38,9 +38,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ----------------------------------------------------------------------
 */
 
-#include "AssimpPCH.h"
 #include "TargetAnimation.h"
-#include <algorithm>
+#include <algorithm>
+#include "../include/assimp/ai_assert.h"
 
 using namespace Assimp;
 
diff --git a/code/TargetAnimation.h b/code/TargetAnimation.h
index 3b21e8755..9803cdf3a 100644
--- a/code/TargetAnimation.h
+++ b/code/TargetAnimation.h
@@ -43,6 +43,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_TARGET_ANIMATION_H_INC
 #define AI_TARGET_ANIMATION_H_INC
 
+#include "../include/assimp/anim.h"
+#include <vector>
 
 namespace Assimp	{
 
diff --git a/code/TerragenLoader.cpp b/code/TerragenLoader.cpp
index fc4ac64b8..458b8490d 100644
--- a/code/TerragenLoader.cpp
+++ b/code/TerragenLoader.cpp
@@ -41,10 +41,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /** @file Implementation of the Terragen importer class */
 
-#include "AssimpPCH.h"
+
 
 #ifndef ASSIMP_BUILD_NO_TERRAGEN_IMPORTER
-#include "TerragenLoader.h"
+#include "TerragenLoader.h"
+#include "../include/assimp/Importer.hpp"
+#include "../include/assimp/IOSystem.hpp"
+#include "StreamReader.h"
+#include "../include/assimp/scene.h"
+#include "../include/assimp/DefaultLogger.hpp"
+
 
 using namespace Assimp;
 
diff --git a/code/TextureTransform.cpp b/code/TextureTransform.cpp
index ca4f4ce73..b40f9250f 100644
--- a/code/TextureTransform.cpp
+++ b/code/TextureTransform.cpp
@@ -41,8 +41,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /** @file A helper class that processes texture transformations */
 
 
-#include "AssimpPCH.h"
-#include "TextureTransform.h"
+
+#include "TextureTransform.h"
+#include "../include/assimp/postprocess.h"
+#include "../include/assimp/DefaultLogger.hpp"
+#include "../include/assimp/scene.h"
+
 
 using namespace Assimp;
 
diff --git a/code/TextureTransform.h b/code/TextureTransform.h
index 2da237cf5..bceba5445 100644
--- a/code/TextureTransform.h
+++ b/code/TextureTransform.h
@@ -45,7 +45,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "BaseImporter.h"
 #include "BaseProcess.h"
 
+#include "../include/assimp/material.h"
+#include <list>
+
 struct aiNode;
+struct aiMaterial;
 
 namespace Assimp	{
 
diff --git a/code/TriangulateProcess.cpp b/code/TriangulateProcess.cpp
index f34bcb3c5..cbe287c10 100644
--- a/code/TriangulateProcess.cpp
+++ b/code/TriangulateProcess.cpp
@@ -58,12 +58,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *     a file
  */
 
-#include "AssimpPCH.h"
+
 
 #ifndef ASSIMP_BUILD_NO_TRIANGULATE_PROCESS
 #include "TriangulateProcess.h"
 #include "ProcessHelper.h"
-#include "PolyTools.h"
+#include "PolyTools.h"
+#include <boost/scoped_array.hpp>
 
 //#define AI_BUILD_TRIANGULATE_COLOR_FACE_WINDING
 //#define AI_BUILD_TRIANGULATE_DEBUG_POLYS
diff --git a/code/UnrealLoader.cpp b/code/UnrealLoader.cpp
index 599803610..6115693c4 100644
--- a/code/UnrealLoader.cpp
+++ b/code/UnrealLoader.cpp
@@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *    http://local.wasp.uwa.edu.au/~pbourke/dataformats/unreal/
  */
 
-#include "AssimpPCH.h"
+
 
 #ifndef ASSIMP_BUILD_NO_3D_IMPORTER
 
@@ -54,7 +54,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "StreamReader.h"
 #include "ParsingUtils.h"
 #include "fast_atof.h"
-#include "ConvertToLHProcess.h"
+#include "ConvertToLHProcess.h"
+#include "../include/assimp/DefaultLogger.hpp"
+#include "../include/assimp/IOSystem.hpp"
+#include "../include/assimp/scene.h"
+#include <boost/scoped_ptr.hpp>
 
 using namespace Assimp;
 
diff --git a/code/UnrealLoader.h b/code/UnrealLoader.h
index 1dd4d8823..11dd6eff2 100644
--- a/code/UnrealLoader.h
+++ b/code/UnrealLoader.h
@@ -45,6 +45,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define INCLUDED_AI_3D_LOADER_H
 
 #include "BaseImporter.h"
+#include <stdint.h>
+
 namespace Assimp	{
 namespace Unreal {
 
diff --git a/code/ValidateDataStructure.cpp b/code/ValidateDataStructure.cpp
index 937d3830e..98d16be5e 100644
--- a/code/ValidateDataStructure.cpp
+++ b/code/ValidateDataStructure.cpp
@@ -44,13 +44,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *    the data structure returned by Assimp.
  */
 
-#include "AssimpPCH.h"
+
 
 // internal headers
 #include "ValidateDataStructure.h"
 #include "BaseImporter.h"
 #include "fast_atof.h"
 #include "ProcessHelper.h"
+#include <boost/scoped_array.hpp>
 
 // CRT headers
 #include <stdarg.h>
diff --git a/code/ValidateDataStructure.h b/code/ValidateDataStructure.h
index 4a3ec86d2..f5667dbb2 100644
--- a/code/ValidateDataStructure.h
+++ b/code/ValidateDataStructure.h
@@ -45,6 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_VALIDATEPROCESS_H_INC
 
 #include "../include/assimp/types.h"
+#include "../include/assimp/material.h"
 #include "BaseProcess.h"
 
 struct aiBone;
@@ -55,6 +56,8 @@ struct aiTexture;
 struct aiMaterial;
 struct aiNode;
 struct aiString;
+struct aiCamera;
+struct aiLight;
 
 namespace Assimp	{
 
diff --git a/code/AssimpPCH.cpp b/code/Version.cpp
similarity index 90%
rename from code/AssimpPCH.cpp
rename to code/Version.cpp
index 62df955de..75b5dbc72 100644
--- a/code/AssimpPCH.cpp
+++ b/code/Version.cpp
@@ -1,8 +1,9 @@
 
 // Actually just a dummy, used by the compiler to build the precompiled header.
 
-#include "AssimpPCH.h"
 #include "./../include/assimp/version.h"
+#include "./../include/assimp/scene.h"
+#include "ScenePrivate.h"
 
 static const unsigned int MajorVersion = 3;
 static const unsigned int MinorVersion = 1;
@@ -100,32 +101,32 @@ ASSIMP_API aiScene::~aiScene()
 	// To make sure we won't crash if the data is invalid it's
 	// much better to check whether both mNumXXX and mXXX are
 	// valid instead of relying on just one of them.
-	if (mNumMeshes && mMeshes) 
+	if (mNumMeshes && mMeshes)
 		for( unsigned int a = 0; a < mNumMeshes; a++)
 			delete mMeshes[a];
 	delete [] mMeshes;
 
-	if (mNumMaterials && mMaterials) 
+	if (mNumMaterials && mMaterials)
 		for( unsigned int a = 0; a < mNumMaterials; a++)
 			delete mMaterials[a];
 	delete [] mMaterials;
 
-	if (mNumAnimations && mAnimations) 
+	if (mNumAnimations && mAnimations)
 		for( unsigned int a = 0; a < mNumAnimations; a++)
 			delete mAnimations[a];
 	delete [] mAnimations;
 
-	if (mNumTextures && mTextures) 
+	if (mNumTextures && mTextures)
 		for( unsigned int a = 0; a < mNumTextures; a++)
 			delete mTextures[a];
 	delete [] mTextures;
 
-	if (mNumLights && mLights) 
+	if (mNumLights && mLights)
 		for( unsigned int a = 0; a < mNumLights; a++)
 			delete mLights[a];
 	delete [] mLights;
 
-	if (mNumCameras && mCameras) 
+	if (mNumCameras && mCameras)
 		for( unsigned int a = 0; a < mNumCameras; a++)
 			delete mCameras[a];
 	delete [] mCameras;
diff --git a/code/Vertex.h b/code/Vertex.h
index a29211d53..9f96f0ca5 100644
--- a/code/Vertex.h
+++ b/code/Vertex.h
@@ -48,6 +48,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_VERTEX_H_INC
 #define AI_VERTEX_H_INC
 
+#include "../include/assimp/vector3.h"
+#include "../include/assimp/mesh.h"
+#include "../include/assimp/ai_assert.h"
 #include <functional>
 
 namespace Assimp	{
diff --git a/code/VertexTriangleAdjacency.cpp b/code/VertexTriangleAdjacency.cpp
index 79e2a2e0d..8ede90122 100644
--- a/code/VertexTriangleAdjacency.cpp
+++ b/code/VertexTriangleAdjacency.cpp
@@ -42,10 +42,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /** @file Implementation of the VertexTriangleAdjacency helper class
  */
 
-#include "AssimpPCH.h"
-
 // internal headers
-#include "VertexTriangleAdjacency.h"
+#include "VertexTriangleAdjacency.h"
+#include "../include/assimp/mesh.h"
+
 
 using namespace Assimp;
 
diff --git a/code/VertexTriangleAdjacency.h b/code/VertexTriangleAdjacency.h
index d2341e973..69c4c142f 100644
--- a/code/VertexTriangleAdjacency.h
+++ b/code/VertexTriangleAdjacency.h
@@ -47,6 +47,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../include/assimp/ai_assert.h"
 
 struct aiMesh;
+struct aiFace;
+
 namespace Assimp	{
 
 // --------------------------------------------------------------------------------------------
diff --git a/code/XFileExporter.cpp b/code/XFileExporter.cpp
index ce87f3168..48f7e6697 100644
--- a/code/XFileExporter.cpp
+++ b/code/XFileExporter.cpp
@@ -39,18 +39,25 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ----------------------------------------------------------------------
 */
 
-#include "AssimpPCH.h"
 
 #ifndef ASSIMP_BUILD_NO_EXPORT
 #ifndef ASSIMP_BUILD_NO_XFILE_EXPORTER
 #include "XFileExporter.h"
 #include "ConvertToLHProcess.h"
 #include "Bitmap.h"
+#include "BaseImporter.h"
 #include "fast_atof.h"
-#include "SceneCombiner.h" 
+#include "SceneCombiner.h"
 
 #include <ctime>
 #include <set>
+#include <boost/scoped_ptr.hpp>
+#include "Exceptional.h"
+#include "../include/assimp/IOSystem.hpp"
+#include "../include/assimp/scene.h"
+#include "../include/assimp/light.h"
+
+
 
 using namespace Assimp;
 
diff --git a/code/XFileExporter.h b/code/XFileExporter.h
index 5c9f56701..b99856f29 100644
--- a/code/XFileExporter.h
+++ b/code/XFileExporter.h
@@ -47,13 +47,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_XFILEEXPORTER_H_INC
 
 #include "../include/assimp/ai_assert.h"
+#include "../include/assimp/matrix4x4.h"
+#include "../include/assimp/Exporter.hpp"
 #include <sstream>
 
 struct aiScene;
 struct aiNode;
+struct aiMesh;
+struct aiString;
 
-namespace Assimp	
+namespace Assimp
 {
+struct IOSystem;
+
 
 /// Helper class to export a given scene to a X-file.
 /// Note: an xFile uses a left hand system. Assimp used a right hand system (OpenGL), therefore we have to transform everything
diff --git a/code/XFileHelper.h b/code/XFileHelper.h
index 62ce3f220..35a893ad7 100644
--- a/code/XFileHelper.h
+++ b/code/XFileHelper.h
@@ -45,11 +45,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <string>
 #include <vector>
+#include <stdint.h>
 
 #include "../include/assimp/types.h"
 #include "../include/assimp/quaternion.h"
 #include "../include/assimp/mesh.h"
 #include "../include/assimp/anim.h"
+#include "Defines.h"
 
 namespace Assimp
 {
diff --git a/code/XFileImporter.cpp b/code/XFileImporter.cpp
index 6f16d7451..41b8b411f 100644
--- a/code/XFileImporter.cpp
+++ b/code/XFileImporter.cpp
@@ -42,12 +42,21 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Implementation of the XFile importer class 
  */
 
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_X_IMPORTER
 
 #include "XFileImporter.h"
 #include "XFileParser.h"
-#include "ConvertToLHProcess.h"
+#include "ConvertToLHProcess.h"
+#include "../include/assimp/IOSystem.hpp"
+#include <boost/scoped_ptr.hpp>
+#include "../include/assimp/scene.h"
+#include "../include/assimp/DefaultLogger.hpp"
+#include <boost/format.hpp>
+#include "Defines.h"
+#include <cctype>
+
+
 
 using namespace Assimp;
 
diff --git a/code/XFileParser.cpp b/code/XFileParser.cpp
index 96fb89cae..c2a888870 100644
--- a/code/XFileParser.cpp
+++ b/code/XFileParser.cpp
@@ -41,12 +41,18 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /** @file Implementation of the XFile parser helper class */
 
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_X_IMPORTER
 
 #include "XFileParser.h"
 #include "XFileHelper.h"
-#include "fast_atof.h"
+#include "fast_atof.h"
+#include "Exceptional.h"
+#include <boost/format.hpp>
+#include <boost/lexical_cast.hpp>
+#include "ByteSwap.h"
+#include "../include/assimp/DefaultLogger.hpp"
+
 
 using namespace Assimp;
 using namespace Assimp::XFile;
diff --git a/code/XGLLoader.cpp b/code/XGLLoader.cpp
index f8d85aa84..8187b2b12 100644
--- a/code/XGLLoader.cpp
+++ b/code/XGLLoader.cpp
@@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /** @file Implementation of the XGL/ZGL importer class */
 
-#include "AssimpPCH.h"
+
 #ifndef ASSIMP_BUILD_NO_XGL_IMPORTER
 
 #include "XGLLoader.h"
@@ -49,7 +49,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "fast_atof.h"
 
 #include "StreamReader.h"
-#include "MemoryIOWrapper.h"
+#include "MemoryIOWrapper.h"
+#include <boost/scoped_ptr.hpp>
+#include "../include/assimp/mesh.h"
+#include "../include/assimp/scene.h"
+#include <cctype>
+
+
 
 using namespace Assimp;
 using namespace irr;
diff --git a/code/XGLLoader.h b/code/XGLLoader.h
index 232b50c8f..60f0918f5 100644
--- a/code/XGLLoader.h
+++ b/code/XGLLoader.h
@@ -47,6 +47,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "BaseImporter.h"
 #include "irrXMLWrapper.h"
 #include "LogAux.h"
+#include <boost/foreach.hpp>
+#include "../include/assimp/material.h"
+#include "../include/assimp/Importer.hpp"
+#include "../include/assimp/mesh.h"
+#include "../include/assimp/light.h"
+
+struct aiNode;
 
 namespace Assimp	{
 
diff --git a/code/fast_atof.h b/code/fast_atof.h
index 35b1e6b94..81b54d6d2 100644
--- a/code/fast_atof.h
+++ b/code/fast_atof.h
@@ -15,10 +15,13 @@
 #ifndef __FAST_A_TO_F_H_INCLUDED__
 #define __FAST_A_TO_F_H_INCLUDED__
 
-#include <math.h>
+#include <cmath>
 #include <limits>
+#include <stdint.h>
+#include <stdexcept>
 
 #include "StringComparison.h"
+#include "../include/assimp/Compiler/pstdint.h"
 
 namespace Assimp
 {
diff --git a/code/irrXMLWrapper.h b/code/irrXMLWrapper.h
index 134c2f8dd..896805f73 100644
--- a/code/irrXMLWrapper.h
+++ b/code/irrXMLWrapper.h
@@ -44,6 +44,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // some long includes ....
 #include "./../contrib/irrXML/irrXML.h"
 #include "./../include/assimp/IOStream.hpp"
+#include "BaseImporter.h"
+#include <vector>
+
 namespace Assimp	{
 
 // ---------------------------------------------------------------------------------
diff --git a/code/qnan.h b/code/qnan.h
index 68d49a645..1642454f1 100644
--- a/code/qnan.h
+++ b/code/qnan.h
@@ -52,6 +52,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_QNAN_H_INCLUDED
 #define AI_QNAN_H_INCLUDED
 
+#include "../include/assimp/defs.h"
+#include <limits>
+#include <stdint.h>
+
 // ---------------------------------------------------------------------------
 /** Data structure to represent the bit pattern of a 32 Bit 
  *         IEEE 754 floating-point number. */
diff --git a/contrib/irrXML/irrXML.cpp b/contrib/irrXML/irrXML.cpp
index 0840f7d16..eaaf2a264 100644
--- a/contrib/irrXML/irrXML.cpp
+++ b/contrib/irrXML/irrXML.cpp
@@ -5,7 +5,6 @@
 // Need to include Assimp, too. We're using Assimp's version of fast_atof
 // so we need stdint.h. But no PCH.
 
-#include "./../../code/AssimpPCH.h"
 
 #include "irrXML.h"
 #include "irrString.h"
diff --git a/include/assimp/matrix4x4.h b/include/assimp/matrix4x4.h
index 33f5a15b1..4a1414821 100644
--- a/include/assimp/matrix4x4.h
+++ b/include/assimp/matrix4x4.h
@@ -44,6 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_MATRIX4X4_H_INC
 #define AI_MATRIX4X4_H_INC
 
+#include "vector3.h"
 #include "./Compiler/pushpack1.h"
 
 #ifdef __cplusplus
diff --git a/include/assimp/version.h b/include/assimp/version.h
index 7d2bbdb31..d35a8914d 100644
--- a/include/assimp/version.h
+++ b/include/assimp/version.h
@@ -45,6 +45,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef INCLUDED_AI_VERSION_H
 #define INCLUDED_AI_VERSION_H
+
+#include "defs.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 3a8bbe82d..f4b67bad6 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -47,8 +47,7 @@ SOURCE_GROUP( tests FILES  ${TEST_SRCS} )
 add_executable( unit
     unit/CCompilerTest.c
     unit/Main.cpp
-    unit/UnitTestPCH.cpp
-    unit/UnitTestPCH.h
+    ../code/Version.cpp
     ${TEST_SRCS}
 )
 
@@ -59,3 +58,5 @@ target_link_libraries( unit assimp
 	debug ${GTEST_DEBUG_LIBRARIES}
 	optimized ${GTEST_RELEASE_LIBRARIES}
 )
+add_subdirectory(headercheck)
+
diff --git a/test/headercheck/.gitignore b/test/headercheck/.gitignore
new file mode 100644
index 000000000..879a87fd5
--- /dev/null
+++ b/test/headercheck/.gitignore
@@ -0,0 +1 @@
+src-generated/
diff --git a/test/headercheck/CMakeLists.txt b/test/headercheck/CMakeLists.txt
new file mode 100644
index 000000000..273608542
--- /dev/null
+++ b/test/headercheck/CMakeLists.txt
@@ -0,0 +1,37 @@
+# This file is part of the Spring engine (GPL v2 or later), see LICENSE.html
+
+OPTION(ASSIMP_HEADERCHECK "adds the target headercheck which compiles every header file, default disabled because it adds many targets" OFF)
+if(ASSIMP_HEADERCHECK)
+include_directories(
+		${Assimp_SOURCE_DIR}/code/BoostWorkaround
+	)
+
+FILE(GLOB_RECURSE headers
+		${Assimp_SOURCE_DIR}/code/*.h
+	)
+
+set(headerchecklibs "")
+
+FOREACH( HEADER ${headers} )
+
+	#pseudo unique name
+	string(REPLACE "${Spring_SOURCE_DIR}" "" PLIST "${HEADER}")
+	string(REPLACE "/" ";" PLIST "${PLIST}")
+	SET(TEST_NAME "headercheck_")
+
+	foreach(name ${PLIST})
+		SET(TEST_NAME "${TEST_NAME}_${name}")
+	endforeach()
+
+	SET(TEST_FILE ${CMAKE_CURRENT_BINARY_DIR}/src-generated/${TEST_NAME}.cpp)
+
+	# create test file
+	configure_file( headercheck.cpp.in ${TEST_FILE} )
+	# add library
+	add_library( ${TEST_NAME} EXCLUDE_FROM_ALL ${TEST_FILE} )
+	list(APPEND headerchecklibs ${TEST_NAME})
+ENDFOREACH( HEADER )
+
+add_custom_target(headercheck DEPENDS ${headerchecklibs})
+
+endif()
diff --git a/test/headercheck/headercheck.cpp.in b/test/headercheck/headercheck.cpp.in
new file mode 100644
index 000000000..af1985617
--- /dev/null
+++ b/test/headercheck/headercheck.cpp.in
@@ -0,0 +1,6 @@
+#include "@HEADER@"
+
+int main(int,char**)
+{
+	return 0;
+}
\ No newline at end of file
diff --git a/test/regression/run.py b/test/regression/run.py
old mode 100644
new mode 100755
diff --git a/test/unit/Main.cpp b/test/unit/Main.cpp
index 4c9b52cb6..92c953594 100644
--- a/test/unit/Main.cpp
+++ b/test/unit/Main.cpp
@@ -1,4 +1,5 @@
-#include "UnitTestPCH.h"
+#include "UnitTestPCH.h"
+#include "../../include/assimp/DefaultLogger.hpp"
 
 #include <math.h>
 #include <time.h>
diff --git a/test/unit/UnitTestPCH.cpp b/test/unit/UnitTestPCH.cpp
deleted file mode 100644
index 873454c2e..000000000
--- a/test/unit/UnitTestPCH.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-
-// Unit used to build the precompiled header
-#include "UnitTestPCH.h"
\ No newline at end of file
diff --git a/test/unit/UnitTestPCH.h b/test/unit/UnitTestPCH.h
index b57f523f0..48be8b9cc 100644
--- a/test/unit/UnitTestPCH.h
+++ b/test/unit/UnitTestPCH.h
@@ -5,7 +5,7 @@
 // #endif
 
 // We need to be sure to have the same STL settings as Assimp
-#include <AssimpPCH.h>
+
 #include <assimp/cimport.h>
 
 #include <gtest/gtest.h>
diff --git a/test/unit/utFindInvalidData.cpp b/test/unit/utFindInvalidData.cpp
index 5c94ae6e7..a8a439b26 100644
--- a/test/unit/utFindInvalidData.cpp
+++ b/test/unit/utFindInvalidData.cpp
@@ -1,6 +1,7 @@
 #include "UnitTestPCH.h"
 
-#include <FindInvalidDataProcess.h>
+#include <FindInvalidDataProcess.h>
+#include "../../include/assimp/mesh.h"
 
 
 using namespace std;
diff --git a/test/unit/utImporter.cpp b/test/unit/utImporter.cpp
index d55791c81..44a7e1b0b 100644
--- a/test/unit/utImporter.cpp
+++ b/test/unit/utImporter.cpp
@@ -1,5 +1,7 @@
 #include "UnitTestPCH.h"
-
+
+#include "../../include/assimp/postprocess.h"
+#include "../../include/assimp/scene.h"
 #include <assimp/Importer.hpp>
 #include <BaseImporter.h>
 
diff --git a/tools/assimp_cmd/CompareDump.cpp b/tools/assimp_cmd/CompareDump.cpp
index 7ddd40b5b..a3e71109a 100644
--- a/tools/assimp_cmd/CompareDump.cpp
+++ b/tools/assimp_cmd/CompareDump.cpp
@@ -54,7 +54,13 @@ const char* AICMD_MSG_CMPDUMP_HELP =
 #include "../../code/assbin_chunks.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-#include "generic_inserter.hpp"
+#include "generic_inserter.hpp"
+#include <map>
+#include <deque>
+#include <stack>
+#include <sstream>
+#include <iostream>
+#include "../../include/assimp/ai_assert.h"
 
 // get << for aiString
 template <typename char_t, typename traits_t>
diff --git a/tools/assimp_cmd/Main.h b/tools/assimp_cmd/Main.h
index 4a45c9f4f..01bd74530 100644
--- a/tools/assimp_cmd/Main.h
+++ b/tools/assimp_cmd/Main.h
@@ -63,7 +63,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #	include <assimp/Exporter.hpp>
 #endif
 
-#include <../code/AssimpPCH.h> /* to get stdint.h */
 #ifdef ASSIMP_BUILD_NO_OWN_ZLIB
 #include <zlib.h>
 #else
diff --git a/tools/assimp_cmd/WriteDumb.cpp b/tools/assimp_cmd/WriteDumb.cpp
index 185d4c4dc..bcaf03c46 100644
--- a/tools/assimp_cmd/WriteDumb.cpp
+++ b/tools/assimp_cmd/WriteDumb.cpp
@@ -57,7 +57,8 @@ const char* AICMD_MSG_DUMP_HELP =
 "\t -cfull    Fires almost all post processing steps \n"
 ;
 
-#include "../../code/assbin_chunks.h"
+#include "../../code/assbin_chunks.h"
+#include <boost/static_assert.hpp>
 
 FILE* out = NULL;
 bool shortened = false;