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.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.h b/code/ACLoader.h
index 2724053e4..20fa000ca 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"
 
+class aiNode;
+class aiMesh;
+class aiMaterial;
+class aiLight;
+
+
 namespace Assimp	{
 
 // ---------------------------------------------------------------------------
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/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.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.h b/code/BaseImporter.h
index c12ff256e..82b369850 100644
--- a/code/BaseImporter.h
+++ b/code/BaseImporter.h
@@ -47,7 +47,9 @@ 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;
 
diff --git a/code/Bitmap.h b/code/Bitmap.h
index 36f80363e..68873613f 100644
--- a/code/Bitmap.h
+++ b/code/Bitmap.h
@@ -48,6 +48,11 @@ 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;
+struct IOStream;
+
 namespace Assimp {
 
 class Bitmap {
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 4804d9251..2880ba3fe 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.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/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/BlobIOSystem.h b/code/BlobIOSystem.h
index cd48b8826..4ba8afcd3 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.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/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.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/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 f249a28d5..10040d55f 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.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.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.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.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/DefaultIOStream.h b/code/DefaultIOStream.h
index 3ab0669be..5adb21e1d 100644
--- a/code/DefaultIOStream.h
+++ b/code/DefaultIOStream.h
@@ -44,6 +44,11 @@ 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"
+
+#if (!defined SIZE_MAX)
+#       define SIZE_MAX (~((size_t)0))
+#endif
 
 namespace Assimp	{
 
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/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/FBXDocument.h b/code/FBXDocument.h
index b4099550b..9008a9c3a 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.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/FBXParser.h b/code/FBXParser.h
index e6fa25d22..6d27de210 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.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.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/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/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/GenericProperty.h b/code/GenericProperty.h
index 32d846850..058371c3d 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/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/IFCUtil.h b/code/IFCUtil.h
index 8d329c5d6..1a1e26f37 100644
--- a/code/IFCUtil.h
+++ b/code/IFCUtil.h
@@ -47,6 +47,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "IFCReaderGen.h"
 #include "IFCLoader.h"
+#include "STEPFile.h"
+
+struct aiMaterial;
+struct aiNode;
 
 namespace Assimp {
 namespace IFC {
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/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.h b/code/Importer.h
index c61d32456..a7e556f1d 100644
--- a/code/Importer.h
+++ b/code/Importer.h
@@ -42,8 +42,17 @@ 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"
 
+class aiScene;
+class SharedPostProcessInfo;
+
+namespace Assimp	{
+	class ProgressHandler;
+	class IOSystem;
 	class BaseImporter;
 	class BaseProcess;
 
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.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/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/LWSLoader.h b/code/LWSLoader.h
index 7cca75b3a..15ecc2b4b 100644
--- a/code/LWSLoader.h
+++ b/code/LWSLoader.h
@@ -46,6 +46,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "LWOFileData.h"
 #include "SceneCombiner.h"
+#include "BaseImporter.h"
+
+struct IOSystem;
+struct aiImporterDesc;
+struct Importer;
+struct BatchLoader;
 
 namespace Assimp	{
 	namespace LWS	{
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.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.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.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.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/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.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/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/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.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.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.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/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.h b/code/ObjFileImporter.h
index 716cf65d1..049f00fda 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/ObjFileParser.h b/code/ObjFileParser.h
index 500e8d0f9..1bb23d240 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/OgreParsingUtils.h b/code/OgreParsingUtils.h
index d3a7aa8bf..173a8589e 100644
--- a/code/OgreParsingUtils.h
+++ b/code/OgreParsingUtils.h
@@ -45,6 +45,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "ParsingUtils.h"
 #include <functional>
+#include <algorithm>
+#include <stdint.h>
+#include <sstream>
 
 namespace Assimp
 {
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.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 25495fd51..66ccf9311 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.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.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.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/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.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.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/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/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/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/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/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/SceneCombiner.h b/code/SceneCombiner.h
index 0c4cfc2ee..71e1ba647 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 <stddef.h>
+#include <set>
+#include <list>
+#include <stdint.h>
+#include <vector>
+#include "../include/assimp/Compiler/pstdint.h"
+
+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.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.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/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..428fe084a 100644
--- a/code/StreamReader.h
+++ b/code/StreamReader.h
@@ -46,6 +46,9 @@ 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"
 
 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..9d15a542c 100644
--- a/code/StringComparison.h
+++ b/code/StringComparison.h
@@ -51,6 +51,9 @@ 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>
 
 namespace Assimp	{
 
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.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/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/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.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/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.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.h b/code/XFileExporter.h
index fa4e6d38e..39932951c 100644
--- a/code/XFileExporter.h
+++ b/code/XFileExporter.h
@@ -47,10 +47,14 @@ 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 <sstream>
 
 struct aiScene;
 struct aiNode;
+struct aiMesh;
+struct aiString;
+struct IOSystem;
 
 namespace Assimp	
 {
diff --git a/code/XFileHelper.h b/code/XFileHelper.h
index 62ce3f220..1b80b9d67 100644
--- a/code/XFileHelper.h
+++ b/code/XFileHelper.h
@@ -45,6 +45,7 @@ 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"
diff --git a/code/XGLLoader.h b/code/XGLLoader.h
index e9675af01..4857c8ff9 100644
--- a/code/XGLLoader.h
+++ b/code/XGLLoader.h
@@ -47,6 +47,12 @@ 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>
+
+struct aiMesh;
+struct aiMaterial;
+struct aiLight;
+struct aiNode;
 
 namespace Assimp	{
 
diff --git a/code/fast_atof.h b/code/fast_atof.h
index bc6c96d1a..dfa1f1dde 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/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