fix "headercheck":

part of https://github.com/assimp/assimp/issues/534

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	
 {

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	{

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	{
 

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	{
 
 // ---------------------------------------------------------------------------

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	{

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{

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
 {
 

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;
 

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 {

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

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 {
 

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)
 

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	{
 	

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 {
 

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 {
 

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;
 

code/BoostWorkaround/boost/format.hpp

@@ -13,6 +13,7 @@
 
 #include <string>
 #include <vector>
+#include <sstream> 
 
 namespace boost
 {

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 {

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
+#endif  // BOOST_TIMER_HPP

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>

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;
 

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	{
 	

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;
 	

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 {

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	{
 
 // ---------------------------------------------------------------------------

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;

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		{
 

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
 {
 

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
 {

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
 	{
 

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	{
 

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 {

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	{
 

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

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 {
 

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 {

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 {

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"

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 {

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 {

code/FileLogStream.h

@@ -3,6 +3,7 @@
 
 #include "../include/assimp/LogStream.hpp"
 #include "../include/assimp/IOStream.hpp"
+#include "DefaultIOSystem.h"
 
 namespace Assimp	{
 

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) {

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;

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>

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")

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	{

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

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 {

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	{
 

code/IRRShared.h

@@ -9,6 +9,8 @@
 
 #include "irrXMLWrapper.h"
 #include "BaseImporter.h"
+#include <stdint.h>
+class aiMaterial;
 
 namespace Assimp	{
 

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;
 

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
 {

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 {
 

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;

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	{

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 {
 

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"
 

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	{
 

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"

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	{
 
 

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
+#endif // !! AI_MD4FILEHELPER_H_INC

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	{
 

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;
 

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 {

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	{

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	{
 
 

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	{
 
 // ----------------------------------------------------------------------------------------------

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	{
 
 // ---------------------------------------------------------------------------

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	{
 
 // ------------------------------------------------------------------------------

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

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	{
 
 // ---------------------------------------------------------------------------

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	{
 

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	
 {

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;

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
 {

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
 {

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
 {

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;

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	{
 
 // ---------------------------------------------------------------------------

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 {
 

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	
 {

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	{
 

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

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 {
 
 // -------------------------------------------------------------------------------

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	{
 

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

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 {
 

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 {

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
 {

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	{
 

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	{
 

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	{
 

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___)

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	
 {

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	{
 

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	{
 

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	{
 

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;
 

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