Implemented Shon's idea about forward declaration and includes.

gen/AVObject.h

@@ -5,6 +5,9 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _AVOBJECT_H_
 
 #include "NIF_IO.h"
+
+// Forward define of referenced blocks
+#include "Ref.h"
 class NiAVObject;
 
 /*!

gen/Bones.h

@@ -5,6 +5,9 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _BONES_H_
 
 #include "NIF_IO.h"
+
+// Forward define of referenced blocks
+#include "Ref.h"
 class NiNode;
 
 /*!

gen/ControllerLink.cpp

@@ -2,6 +2,9 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "gen/ControllerLink.h"
+#include "obj/NiInterpolator.h"
+#include "obj/NiObject.h"
+#include "obj/NiStringPalette.h"
 
 //Constructor
 ControllerLink::ControllerLink() : interpolator(NULL), unknownLink1(NULL), unknownLink2(NULL), unknownShort0((ushort)0), priority_((byte)0), stringPalette(NULL), nodeNameOffset((uint)0), propertyTypeOffset((uint)0), controllerTypeOffset((uint)0), variableOffset1((uint)0), variableOffset2((uint)0) {};

gen/ControllerLink.h

@@ -5,10 +5,12 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _CONTROLLERLINK_H_
 
 #include "NIF_IO.h"
+
+// Forward define of referenced blocks
 #include "Ref.h"
-#include "obj/NiInterpolator.h"
-#include "obj/NiObject.h"
-#include "obj/NiStringPalette.h"
+class NiInterpolator;
+class NiObject;
+class NiStringPalette;
 
 /*!
  * In a .kf file, this links to a controllable block, via its name (or

gen/Footer.cpp

@@ -2,6 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "gen/Footer.h"
+#include "obj/NiAVObject.h"
 
 //Constructor
 Footer::Footer() : numRoots((uint)0) {};

gen/Footer.h

@@ -5,8 +5,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _FOOTER_H_
 
 #include "NIF_IO.h"
+
+// Forward define of referenced blocks
 #include "Ref.h"
-#include "obj/NiAVObject.h"
+class NiAVObject;
 
 /*!
  * The NIF file footer.

gen/Header.h

@@ -5,6 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _HEADER_H_
 
 #include "NIF_IO.h"
+// Include structures
 #include "gen/ShortString.h"
 
 /*!

gen/NodeGroup.cpp

@@ -2,6 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "gen/NodeGroup.h"
+#include "obj/NiNode.h"
 
 //Constructor
 NodeGroup::NodeGroup() : numNodes((uint)0) {};

gen/NodeGroup.h

@@ -5,8 +5,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NODEGROUP_H_
 
 #include "NIF_IO.h"
+
+// Forward define of referenced blocks
 #include "Ref.h"
-#include "obj/NiNode.h"
+class NiNode;
 
 /*!
  * A group of NiNodes references.

gen/ShaderTexDesc.cpp

@@ -3,6 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "gen/ShaderTexDesc.h"
 #include "gen/TexDesc.h"
+#include "obj/NiSourceTexture.h"
 
 //Constructor
 ShaderTexDesc::ShaderTexDesc() : isUsed(false), unknownInt((uint)0) {};

gen/ShaderTexDesc.h

@@ -5,6 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _SHADERTEXDESC_H_
 
 #include "NIF_IO.h"
+// Include structures
 #include "gen/TexDesc.h"
 
 /*!

gen/SkinData.h

@@ -5,6 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _SKINDATA_H_
 
 #include "NIF_IO.h"
+// Include structures
 #include "gen/SkinWeight.h"
 
 /*!

gen/SkinShape.cpp

@@ -2,6 +2,8 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "gen/SkinShape.h"
+#include "obj/NiTriShape.h"
+#include "obj/NiSkinInstance.h"
 
 //Constructor
 SkinShape::SkinShape() : shape(NULL), skinInstance(NULL) {};

gen/SkinShape.h

@@ -5,9 +5,11 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _SKINSHAPE_H_
 
 #include "NIF_IO.h"
+
+// Forward define of referenced blocks
 #include "Ref.h"
-#include "obj/NiTriShape.h"
-#include "obj/NiSkinInstance.h"
+class NiTriShape;
+class NiSkinInstance;
 
 /*!
  * Reference to shape and skin instance.

gen/SkinShapeGroup.cpp

@@ -3,6 +3,8 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "gen/SkinShapeGroup.h"
 #include "gen/SkinShape.h"
+#include "obj/NiTriShape.h"
+#include "obj/NiSkinInstance.h"
 
 //Constructor
 SkinShapeGroup::SkinShapeGroup() : numLinkPairs((uint)0) {};

gen/SkinShapeGroup.h

@@ -5,6 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _SKINSHAPEGROUP_H_
 
 #include "NIF_IO.h"
+// Include structures
 #include "gen/SkinShape.h"
 
 /*!

gen/TexDesc.cpp

@@ -2,6 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "gen/TexDesc.h"
+#include "obj/NiSourceTexture.h"
 
 //Constructor
 TexDesc::TexDesc() : source(NULL), clampMode((TexClampMode)WRAP_S_WRAP_T), filterMode((TexFilterMode)FILTER_TRILERP), textureSet((uint)0), ps2L((ushort)0), ps2K((ushort)0xFFB5), unknown1((ushort)0), hasTextureTransform(false), wRotation(0.0f), transformType_((uint)0) {};

gen/TexDesc.h

@@ -5,8 +5,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _TEXDESC_H_
 
 #include "NIF_IO.h"
+
+// Forward define of referenced blocks
 #include "Ref.h"
-#include "obj/NiSourceTexture.h"
+class NiSourceTexture;
 
 /*!
  * Texture description.

gen/TexSource.cpp

@@ -2,6 +2,8 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "gen/TexSource.h"
+#include "obj/NiObject.h"
+#include "obj/NiPixelData.h"
 
 //Constructor
 TexSource::TexSource() : useExternal((byte)0), unknownLink(NULL), unknownByte((byte)0), pixelData(NULL) {};

gen/TexSource.h

@@ -5,9 +5,11 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _TEXSOURCE_H_
 
 #include "NIF_IO.h"
+
+// Forward define of referenced blocks
 #include "Ref.h"
-#include "obj/NiObject.h"
-#include "obj/NiPixelData.h"
+class NiObject;
+class NiPixelData;
 
 /*!
  * A texture source.