From 68db992e6673a98c893e73aaaa501b9e8b2cbc74 Mon Sep 17 00:00:00 2001
From: Shon Ferguson <shonferg@users.sourceforge.net>
Date: Fri, 15 Sep 2006 08:30:17 +0000
Subject: [PATCH] Fixed the relative include paths and tried to update
 solution, but havn't got the precompiled header working right.

---
 niflib.vcproj                                 | 1076 +++++++++--------
 src/ComplexShape.cpp                          |   26 +-
 src/NIF_IO.cpp                                |    2 +-
 src/Type.cpp                                  |    2 +-
 src/gen/AVObject.cpp                          |    4 +-
 src/gen/BoundingBox.cpp                       |    2 +-
 src/gen/ByteArray.cpp                         |    2 +-
 src/gen/ControllerLink.cpp                    |   10 +-
 src/gen/Footer.cpp                            |    4 +-
 src/gen/FurniturePosition.cpp                 |    2 +-
 src/gen/Header.cpp                            |    2 +-
 src/gen/LODRange.cpp                          |    2 +-
 src/gen/LimitedHingeDescriptor.cpp            |    2 +-
 src/gen/MatchGroup.cpp                        |    2 +-
 src/gen/MipMap.cpp                            |    2 +-
 src/gen/Morph.cpp                             |    2 +-
 src/gen/NodeGroup.cpp                         |    4 +-
 src/gen/Particle.cpp                          |    2 +-
 src/gen/QuaternionXYZW.cpp                    |    2 +-
 src/gen/RagDollDescriptor.cpp                 |    2 +-
 src/gen/ShaderTexDesc.cpp                     |    6 +-
 src/gen/SkinData.cpp                          |    4 +-
 src/gen/SkinPartition.cpp                     |    2 +-
 src/gen/SkinShape.cpp                         |    6 +-
 src/gen/SkinShapeGroup.cpp                    |    8 +-
 src/gen/SkinWeight.cpp                        |    2 +-
 src/gen/Sphere.cpp                            |    2 +-
 src/gen/StringPalette.cpp                     |    2 +-
 src/gen/TBC.cpp                               |    2 +-
 src/gen/TexDesc.cpp                           |    4 +-
 src/gen/TexSource.cpp                         |    6 +-
 src/gen/enums.cpp                             |    4 +-
 src/gen/hkTriangle.cpp                        |    2 +-
 src/gen/obj_factories.cpp                     |  362 +++---
 src/gen/obj_impl.cpp                          |  362 +++---
 src/kfm.cpp                                   |    8 +-
 src/nif_math.cpp                              |    2 +-
 src/niflib.cpp                                |   42 +-
 src/obj/ABoneLODController.cpp                |    6 +-
 src/obj/AKeyedData.cpp                        |    2 +-
 src/obj/APSysCtlr.cpp                         |    2 +-
 src/obj/APSysData.cpp                         |    2 +-
 src/obj/AParticleModifier.cpp                 |    4 +-
 src/obj/AbhkConstraint.cpp                    |    4 +-
 src/obj/AbhkRagdollConstraint.cpp             |    2 +-
 src/obj/AbhkShapeCollection.cpp               |    2 +-
 src/obj/AvoidNode.cpp                         |    2 +-
 src/obj/BSBound.cpp                           |    2 +-
 src/obj/BSFurnitureMarker.cpp                 |    4 +-
 src/obj/BSKeyframeController.cpp              |    4 +-
 src/obj/BSPSysArrayEmitter.cpp                |    2 +-
 src/obj/BSParentVelocityModifier.cpp          |    2 +-
 src/obj/BSXFlags.cpp                          |    2 +-
 src/obj/FxButton.cpp                          |    2 +-
 src/obj/FxRadioButton.cpp                     |    4 +-
 src/obj/FxWidget.cpp                          |    2 +-
 src/obj/NiAVObject.cpp                        |   10 +-
 src/obj/NiAlphaController.cpp                 |    4 +-
 src/obj/NiAlphaProperty.cpp                   |    2 +-
 src/obj/NiAmbientLight.cpp                    |    2 +-
 src/obj/NiAutoNormalParticles.cpp             |    2 +-
 src/obj/NiAutoNormalParticlesData.cpp         |    2 +-
 src/obj/NiBSAnimationNode.cpp                 |    2 +-
 src/obj/NiBSBoneLODController.cpp             |    2 +-
 src/obj/NiBSPArrayController.cpp              |    2 +-
 src/obj/NiBSParticleNode.cpp                  |    2 +-
 src/obj/NiBSplineBasisData.cpp                |    2 +-
 src/obj/NiBSplineCompFloatInterpolator.cpp    |    2 +-
 src/obj/NiBSplineCompPoint3Interpolator.cpp   |    2 +-
 .../NiBSplineCompTransformInterpolator.cpp    |    6 +-
 src/obj/NiBSplineData.cpp                     |    2 +-
 src/obj/NiBSplineInterpolator.cpp             |    6 +-
 src/obj/NiBillboardNode.cpp                   |    2 +-
 src/obj/NiBinaryExtraData.cpp                 |    4 +-
 src/obj/NiBlendBoolInterpolator.cpp           |    2 +-
 src/obj/NiBlendFloatInterpolator.cpp          |    2 +-
 src/obj/NiBlendInterpolator.cpp               |    2 +-
 src/obj/NiBlendPoint3Interpolator.cpp         |    2 +-
 src/obj/NiBlendTransformInterpolator.cpp      |    2 +-
 src/obj/NiBoneLODController.cpp               |   11 +-
 src/obj/NiBoolData.cpp                        |    4 +-
 src/obj/NiBoolInterpolator.cpp                |    4 +-
 src/obj/NiBoolTimelineInterpolator.cpp        |    4 +-
 src/obj/NiBooleanExtraData.cpp                |    2 +-
 src/obj/NiCamera.cpp                          |    4 +-
 src/obj/NiCollisionData.cpp                   |    4 +-
 src/obj/NiCollisionObject.cpp                 |    6 +-
 src/obj/NiColorData.cpp                       |    4 +-
 src/obj/NiColorExtraData.cpp                  |    2 +-
 src/obj/NiControllerManager.cpp               |    6 +-
 src/obj/NiControllerSequence.cpp              |   30 +-
 src/obj/NiDefaultAVObjectPalette.cpp          |    6 +-
 src/obj/NiDirectionalLight.cpp                |    2 +-
 src/obj/NiDitherProperty.cpp                  |    2 +-
 src/obj/NiDynamicEffect.cpp                   |    4 +-
 src/obj/NiExtraData.cpp                       |    2 +-
 src/obj/NiFlipController.cpp                  |    4 +-
 src/obj/NiFloatData.cpp                       |    4 +-
 src/obj/NiFloatExtraData.cpp                  |    2 +-
 src/obj/NiFloatExtraDataController.cpp        |    4 +-
 src/obj/NiFloatInterpolator.cpp               |    4 +-
 src/obj/NiFloatsExtraData.cpp                 |    2 +-
 src/obj/NiFogProperty.cpp                     |    2 +-
 src/obj/NiGeomMorpherController.cpp           |    6 +-
 src/obj/NiGravity.cpp                         |    2 +-
 src/obj/NiIntegerExtraData.cpp                |    2 +-
 src/obj/NiIntegersExtraData.cpp               |    2 +-
 src/obj/NiInterpolator.cpp                    |    2 +-
 src/obj/NiKeyframeController.cpp              |    4 +-
 src/obj/NiKeyframeData.cpp                    |    6 +-
 src/obj/NiLODData.cpp                         |    2 +-
 src/obj/NiLODNode.cpp                         |    6 +-
 src/obj/NiLight.cpp                           |    2 +-
 src/obj/NiLightColorController.cpp            |    6 +-
 src/obj/NiLightDimmerController.cpp           |    4 +-
 src/obj/NiLookAtController.cpp                |    4 +-
 src/obj/NiLookAtInterpolator.cpp              |    8 +-
 src/obj/NiMaterialColorController.cpp         |    4 +-
 src/obj/NiMaterialProperty.cpp                |    2 +-
 src/obj/NiMeshPSysData.cpp                    |    6 +-
 src/obj/NiMeshParticleSystem.cpp              |    2 +-
 src/obj/NiMorphData.cpp                       |    4 +-
 src/obj/NiMultiTargetTransformController.cpp  |    4 +-
 src/obj/NiNode.cpp                            |   12 +-
 src/obj/NiObject.cpp                          |    4 +-
 src/obj/NiObjectNET.cpp                       |    6 +-
 src/obj/NiPSysAgeDeathModifier.cpp            |    4 +-
 src/obj/NiPSysBombModifier.cpp                |    4 +-
 src/obj/NiPSysBoundUpdateModifier.cpp         |    2 +-
 src/obj/NiPSysBoxEmitter.cpp                  |    2 +-
 src/obj/NiPSysColliderManager.cpp             |    4 +-
 src/obj/NiPSysColorModifier.cpp               |    4 +-
 src/obj/NiPSysCylinderEmitter.cpp             |    2 +-
 src/obj/NiPSysData.cpp                        |    2 +-
 src/obj/NiPSysDragModifier.cpp                |    4 +-
 src/obj/NiPSysEmitter.cpp                     |    2 +-
 src/obj/NiPSysEmitterCtlr.cpp                 |    6 +-
 src/obj/NiPSysEmitterCtlrData.cpp             |    4 +-
 src/obj/NiPSysEmitterDeclinationCtlr.cpp      |    2 +-
 src/obj/NiPSysEmitterDeclinationVarCtlr.cpp   |    2 +-
 src/obj/NiPSysEmitterInitialRadiusCtlr.cpp    |    2 +-
 src/obj/NiPSysEmitterLifeSpanCtlr.cpp         |    2 +-
 src/obj/NiPSysEmitterSpeedCtlr.cpp            |    2 +-
 src/obj/NiPSysGravityModifier.cpp             |    4 +-
 src/obj/NiPSysGravityStrengthCtlr.cpp         |    2 +-
 src/obj/NiPSysGrowFadeModifier.cpp            |    2 +-
 src/obj/NiPSysMeshEmitter.cpp                 |    4 +-
 src/obj/NiPSysMeshUpdateModifier.cpp          |    4 +-
 src/obj/NiPSysModifier.cpp                    |    4 +-
 src/obj/NiPSysModifierActiveCtlr.cpp          |    2 +-
 src/obj/NiPSysPlanarCollider.cpp              |    8 +-
 src/obj/NiPSysPositionModifier.cpp            |    2 +-
 src/obj/NiPSysResetOnLoopCtlr.cpp             |    2 +-
 src/obj/NiPSysRotationModifier.cpp            |    2 +-
 src/obj/NiPSysSpawnModifier.cpp               |    2 +-
 src/obj/NiPSysSphereEmitter.cpp               |    2 +-
 src/obj/NiPSysUpdateCtlr.cpp                  |    2 +-
 src/obj/NiPSysVolumeEmitter.cpp               |    4 +-
 src/obj/NiPalette.cpp                         |    2 +-
 src/obj/NiParticleBomb.cpp                    |    2 +-
 src/obj/NiParticleColorModifier.cpp           |    4 +-
 src/obj/NiParticleGrowFade.cpp                |    2 +-
 src/obj/NiParticleMeshModifier.cpp            |    4 +-
 src/obj/NiParticleMeshes.cpp                  |    2 +-
 src/obj/NiParticleMeshesData.cpp              |    4 +-
 src/obj/NiParticleRotation.cpp                |    2 +-
 src/obj/NiParticleSystem.cpp                  |    4 +-
 src/obj/NiParticleSystemController.cpp        |    8 +-
 src/obj/NiParticles.cpp                       |    2 +-
 src/obj/NiParticlesData.cpp                   |    2 +-
 src/obj/NiPathController.cpp                  |    6 +-
 src/obj/NiPathInterpolator.cpp                |    6 +-
 src/obj/NiPixelData.cpp                       |    8 +-
 src/obj/NiPlanarCollider.cpp                  |    2 +-
 src/obj/NiPoint3Interpolator.cpp              |    4 +-
 src/obj/NiPointLight.cpp                      |    2 +-
 src/obj/NiPosData.cpp                         |    4 +-
 src/obj/NiProperty.cpp                        |    2 +-
 src/obj/NiRangeLODData.cpp                    |    4 +-
 src/obj/NiRotatingParticles.cpp               |    2 +-
 src/obj/NiRotatingParticlesData.cpp           |    2 +-
 src/obj/NiScreenLODData.cpp                   |    2 +-
 src/obj/NiSequenceStreamHelper.cpp            |    2 +-
 src/obj/NiShadeProperty.cpp                   |    2 +-
 src/obj/NiSingleInterpolatorController.cpp    |    4 +-
 src/obj/NiSkinData.cpp                        |   14 +-
 src/obj/NiSkinInstance.cpp                    |   10 +-
 src/obj/NiSkinPartition.cpp                   |   18 +-
 src/obj/NiSourceTexture.cpp                   |    6 +-
 src/obj/NiSpecularProperty.cpp                |    2 +-
 src/obj/NiSphericalCollider.cpp               |    2 +-
 src/obj/NiSpotLight.cpp                       |    2 +-
 src/obj/NiStencilProperty.cpp                 |    2 +-
 src/obj/NiStringExtraData.cpp                 |    2 +-
 src/obj/NiStringPalette.cpp                   |    4 +-
 src/obj/NiStringsExtraData.cpp                |    2 +-
 src/obj/NiTextKeyExtraData.cpp                |    2 +-
 src/obj/NiTextureEffect.cpp                   |    4 +-
 src/obj/NiTextureTransformController.cpp      |    4 +-
 src/obj/NiTexturingProperty.cpp               |   23 +-
 src/obj/NiTimeController.cpp                  |    4 +-
 src/obj/NiTransformController.cpp             |    2 +-
 src/obj/NiTransformData.cpp                   |    2 +-
 src/obj/NiTransformInterpolator.cpp           |    4 +-
 src/obj/NiTriBasedGeom.cpp                    |   12 +-
 src/obj/NiTriBasedGeomData.cpp                |    4 +-
 src/obj/NiTriShape.cpp                        |    2 +-
 src/obj/NiTriShapeData.cpp                    |    4 +-
 src/obj/NiTriStrips.cpp                       |    2 +-
 src/obj/NiTriStripsData.cpp                   |    4 +-
 src/obj/NiUVController.cpp                    |    4 +-
 src/obj/NiUVData.cpp                          |    4 +-
 src/obj/NiVectorExtraData.cpp                 |    2 +-
 src/obj/NiVertWeightsExtraData.cpp            |    2 +-
 src/obj/NiVertexColorProperty.cpp             |    2 +-
 src/obj/NiVisController.cpp                   |    4 +-
 src/obj/NiVisData.cpp                         |    2 +-
 src/obj/NiWireframeProperty.cpp               |    2 +-
 src/obj/NiZBufferProperty.cpp                 |    2 +-
 src/obj/RootCollisionNode.cpp                 |    2 +-
 src/obj/bhkBlendCollisionObject.cpp           |    2 +-
 src/obj/bhkBlendController.cpp                |    2 +-
 src/obj/bhkBoxShape.cpp                       |    2 +-
 src/obj/bhkCapsuleShape.cpp                   |    2 +-
 src/obj/bhkCollisionObject.cpp                |    2 +-
 src/obj/bhkConvexShape.cpp                    |    2 +-
 src/obj/bhkConvexTransformShape.cpp           |    2 +-
 src/obj/bhkConvexVerticesShape.cpp            |    2 +-
 src/obj/bhkEntity.cpp                         |    4 +-
 src/obj/bhkHingeConstraint.cpp                |    2 +-
 src/obj/bhkLimitedHingeConstraint.cpp         |    4 +-
 src/obj/bhkListShape.cpp                      |    4 +-
 src/obj/bhkMalleableConstraint.cpp            |    8 +-
 src/obj/bhkMoppBvTreeShape.cpp                |    4 +-
 src/obj/bhkMultiSphereShape.cpp               |    4 +-
 src/obj/bhkNiTriStripsShape.cpp               |    4 +-
 src/obj/bhkPackedNiTriStripsShape.cpp         |    4 +-
 src/obj/bhkPrismaticConstraint.cpp            |    2 +-
 src/obj/bhkRagdollConstraint.cpp              |    2 +-
 src/obj/bhkRefObject.cpp                      |    2 +-
 src/obj/bhkRigidBody.cpp                      |    6 +-
 src/obj/bhkRigidBodyT.cpp                     |    2 +-
 src/obj/bhkSPCollisionObject.cpp              |    2 +-
 src/obj/bhkSerializable.cpp                   |    2 +-
 src/obj/bhkShape.cpp                          |    2 +-
 src/obj/bhkSimpleShapePhantom.cpp             |    2 +-
 src/obj/bhkSphereRepShape.cpp                 |    2 +-
 src/obj/bhkSphereShape.cpp                    |    2 +-
 src/obj/bhkStiffSpringConstraint.cpp          |    2 +-
 src/obj/bhkTransformShape.cpp                 |    2 +-
 src/obj/bhkWorldObject.cpp                    |    2 +-
 src/obj/hkPackedNiTriStripsData.cpp           |    4 +-
 252 files changed, 1368 insertions(+), 1384 deletions(-)

diff --git a/niflib.vcproj b/niflib.vcproj
index 503d1d29..e47a643f 100644
--- a/niflib.vcproj
+++ b/niflib.vcproj
@@ -45,8 +45,8 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderThrough="$(ProjectDir)pch.h"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="$(ProjectDir)include/pch.h"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -61,7 +61,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(ProjectDir)../bin/niflibd.lib"
+				OutputFile="lib/niflib_debug.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -105,13 +105,12 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/FI&quot;$(ProjectDir)pch.h&quot;"
 				Optimization="0"
 				WholeProgramOptimization="false"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="$(ProjectDir)pch.h"
+				PrecompiledHeaderThrough="$(ProjectDir)include/pch.h"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -126,7 +125,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="../bin/niflib.lib"
+				OutputFile="lib/niflib.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -171,7 +170,8 @@
 				Name="VCCLCompilerTool"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="$(ProjectDir)include/pch.h"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -234,7 +234,7 @@
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;BUILDING_NIFLIB_DLL;USE_NIFLIB_DLL"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="pch.h"
+				PrecompiledHeaderThrough="$(ProjectDir)include/pch.h"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -308,7 +308,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="$(ProjectDir)pch.h"
+				PrecompiledHeaderThrough="$(ProjectDir)include/pch.h"
 				WarningLevel="3"
 				DebugInformationFormat="4"
 			/>
@@ -351,35 +351,43 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\ComplexShape.cpp"
+				RelativePath=".\src\ComplexShape.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\kfm.cpp"
+				RelativePath=".\src\kfm.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\NIF_IO.cpp"
+				RelativePath=".\src\NIF_IO.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\nif_math.cpp"
+				RelativePath=".\src\nif_math.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\niflib.cpp"
+				RelativePath=".\src\niflib.cpp"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PrecompiledHeaderThrough=""
+					/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\pch.cpp"
+				RelativePath=".\src\pch.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
+						UsePrecompiledHeader="1"
+						PrecompiledHeaderThrough="$(ProjectDir)include/pch.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -388,6 +396,16 @@
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"
+						PrecompiledHeaderThrough="$(ProjectDir)include/pch.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="PyNiflib|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+						PrecompiledHeaderThrough="$(ProjectDir)include/pch.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -396,6 +414,7 @@
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"
+						PrecompiledHeaderThrough="$(ProjectDir)include/pch.h"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -404,870 +423,871 @@
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"
+						PrecompiledHeaderThrough="$(ProjectDir)include/pch.h"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Type.cpp"
+				RelativePath=".\src\Type.cpp"
 				>
 			</File>
 			<Filter
 				Name="obj"
 				>
 				<File
-					RelativePath=".\obj\AbhkConstraint.cpp"
+					RelativePath=".\src\obj\AbhkConstraint.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\AbhkRagdollConstraint.cpp"
+					RelativePath=".\src\obj\AbhkRagdollConstraint.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\AbhkShapeCollection.cpp"
+					RelativePath=".\src\obj\AbhkShapeCollection.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\ABoneLODController.cpp"
+					RelativePath=".\src\obj\ABoneLODController.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\AKeyedData.cpp"
+					RelativePath=".\src\obj\AKeyedData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\AParticleModifier.cpp"
+					RelativePath=".\src\obj\AParticleModifier.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\APSysCtlr.cpp"
+					RelativePath=".\src\obj\APSysCtlr.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\APSysData.cpp"
+					RelativePath=".\src\obj\APSysData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\AvoidNode.cpp"
+					RelativePath=".\src\obj\AvoidNode.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkBlendCollisionObject.cpp"
+					RelativePath=".\src\obj\bhkBlendCollisionObject.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkBlendController.cpp"
+					RelativePath=".\src\obj\bhkBlendController.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkBoxShape.cpp"
+					RelativePath=".\src\obj\bhkBoxShape.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkCapsuleShape.cpp"
+					RelativePath=".\src\obj\bhkCapsuleShape.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkCollisionObject.cpp"
+					RelativePath=".\src\obj\bhkCollisionObject.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkConvexShape.cpp"
+					RelativePath=".\src\obj\bhkConvexShape.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkConvexTransformShape.cpp"
+					RelativePath=".\src\obj\bhkConvexTransformShape.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkConvexVerticesShape.cpp"
+					RelativePath=".\src\obj\bhkConvexVerticesShape.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkEntity.cpp"
+					RelativePath=".\src\obj\bhkEntity.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkHingeConstraint.cpp"
+					RelativePath=".\src\obj\bhkHingeConstraint.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkLimitedHingeConstraint.cpp"
+					RelativePath=".\src\obj\bhkLimitedHingeConstraint.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkListShape.cpp"
+					RelativePath=".\src\obj\bhkListShape.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkMalleableConstraint.cpp"
+					RelativePath=".\src\obj\bhkMalleableConstraint.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkMoppBvTreeShape.cpp"
+					RelativePath=".\src\obj\bhkMoppBvTreeShape.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkMultiSphereShape.cpp"
+					RelativePath=".\src\obj\bhkMultiSphereShape.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkNiTriStripsShape.cpp"
+					RelativePath=".\src\obj\bhkNiTriStripsShape.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkPackedNiTriStripsShape.cpp"
+					RelativePath=".\src\obj\bhkPackedNiTriStripsShape.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkPrismaticConstraint.cpp"
+					RelativePath=".\src\obj\bhkPrismaticConstraint.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkRagdollConstraint.cpp"
+					RelativePath=".\src\obj\bhkRagdollConstraint.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkRefObject.cpp"
+					RelativePath=".\src\obj\bhkRefObject.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkRigidBody.cpp"
+					RelativePath=".\src\obj\bhkRigidBody.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkRigidBodyT.cpp"
+					RelativePath=".\src\obj\bhkRigidBodyT.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkSerializable.cpp"
+					RelativePath=".\src\obj\bhkSerializable.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkShape.cpp"
+					RelativePath=".\src\obj\bhkShape.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkSimpleShapePhantom.cpp"
+					RelativePath=".\src\obj\bhkSimpleShapePhantom.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkSPCollisionObject.cpp"
+					RelativePath=".\src\obj\bhkSPCollisionObject.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkSphereRepShape.cpp"
+					RelativePath=".\src\obj\bhkSphereRepShape.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkSphereShape.cpp"
+					RelativePath=".\src\obj\bhkSphereShape.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkStiffSpringConstraint.cpp"
+					RelativePath=".\src\obj\bhkStiffSpringConstraint.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkTransformShape.cpp"
+					RelativePath=".\src\obj\bhkTransformShape.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkWorldObject.cpp"
+					RelativePath=".\src\obj\bhkWorldObject.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\BSBound.cpp"
+					RelativePath=".\src\obj\BSBound.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\BSFurnitureMarker.cpp"
+					RelativePath=".\src\obj\BSFurnitureMarker.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\BSKeyframeController.cpp"
+					RelativePath=".\src\obj\BSKeyframeController.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\BSParentVelocityModifier.cpp"
+					RelativePath=".\src\obj\BSParentVelocityModifier.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\BSPSysArrayEmitter.cpp"
+					RelativePath=".\src\obj\BSPSysArrayEmitter.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\BSXFlags.cpp"
+					RelativePath=".\src\obj\BSXFlags.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\FxButton.cpp"
+					RelativePath=".\src\obj\FxButton.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\FxRadioButton.cpp"
+					RelativePath=".\src\obj\FxRadioButton.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\FxWidget.cpp"
+					RelativePath=".\src\obj\FxWidget.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\hkPackedNiTriStripsData.cpp"
+					RelativePath=".\src\obj\hkPackedNiTriStripsData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiAlphaController.cpp"
+					RelativePath=".\src\obj\NiAlphaController.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiAlphaProperty.cpp"
+					RelativePath=".\src\obj\NiAlphaProperty.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiAmbientLight.cpp"
+					RelativePath=".\src\obj\NiAmbientLight.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiAutoNormalParticles.cpp"
+					RelativePath=".\src\obj\NiAutoNormalParticles.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiAutoNormalParticlesData.cpp"
+					RelativePath=".\src\obj\NiAutoNormalParticlesData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiAVObject.cpp"
+					RelativePath=".\src\obj\NiAVObject.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBillboardNode.cpp"
+					RelativePath=".\src\obj\NiBillboardNode.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBinaryExtraData.cpp"
+					RelativePath=".\src\obj\NiBinaryExtraData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBlendBoolInterpolator.cpp"
+					RelativePath=".\src\obj\NiBlendBoolInterpolator.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBlendFloatInterpolator.cpp"
+					RelativePath=".\src\obj\NiBlendFloatInterpolator.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBlendInterpolator.cpp"
+					RelativePath=".\src\obj\NiBlendInterpolator.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBlendPoint3Interpolator.cpp"
+					RelativePath=".\src\obj\NiBlendPoint3Interpolator.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBlendTransformInterpolator.cpp"
+					RelativePath=".\src\obj\NiBlendTransformInterpolator.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBoneLODController.cpp"
+					RelativePath=".\src\obj\NiBoneLODController.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBoolData.cpp"
+					RelativePath=".\src\obj\NiBoolData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBooleanExtraData.cpp"
+					RelativePath=".\src\obj\NiBooleanExtraData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBoolInterpolator.cpp"
+					RelativePath=".\src\obj\NiBoolInterpolator.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBoolTimelineInterpolator.cpp"
+					RelativePath=".\src\obj\NiBoolTimelineInterpolator.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSAnimationNode.cpp"
+					RelativePath=".\src\obj\NiBSAnimationNode.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSBoneLODController.cpp"
+					RelativePath=".\src\obj\NiBSBoneLODController.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSPArrayController.cpp"
+					RelativePath=".\src\obj\NiBSPArrayController.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSParticleNode.cpp"
+					RelativePath=".\src\obj\NiBSParticleNode.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSplineBasisData.cpp"
+					RelativePath=".\src\obj\NiBSplineBasisData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSplineCompFloatInterpolator.cpp"
+					RelativePath=".\src\obj\NiBSplineCompFloatInterpolator.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSplineCompPoint3Interpolator.cpp"
+					RelativePath=".\src\obj\NiBSplineCompPoint3Interpolator.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSplineCompTransformInterpolator.cpp"
+					RelativePath=".\src\obj\NiBSplineCompTransformInterpolator.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSplineData.cpp"
+					RelativePath=".\src\obj\NiBSplineData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSplineInterpolator.cpp"
+					RelativePath=".\src\obj\NiBSplineInterpolator.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiCamera.cpp"
+					RelativePath=".\src\obj\NiCamera.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiCollisionData.cpp"
+					RelativePath=".\src\obj\NiCollisionData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiCollisionObject.cpp"
+					RelativePath=".\src\obj\NiCollisionObject.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiColorData.cpp"
+					RelativePath=".\src\obj\NiColorData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiColorExtraData.cpp"
+					RelativePath=".\src\obj\NiColorExtraData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiControllerManager.cpp"
+					RelativePath=".\src\obj\NiControllerManager.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiControllerSequence.cpp"
+					RelativePath=".\src\obj\NiControllerSequence.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiDefaultAVObjectPalette.cpp"
+					RelativePath=".\src\obj\NiDefaultAVObjectPalette.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiDirectionalLight.cpp"
+					RelativePath=".\src\obj\NiDirectionalLight.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiDitherProperty.cpp"
+					RelativePath=".\src\obj\NiDitherProperty.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiDynamicEffect.cpp"
+					RelativePath=".\src\obj\NiDynamicEffect.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiExtraData.cpp"
+					RelativePath=".\src\obj\NiExtraData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiFlipController.cpp"
+					RelativePath=".\src\obj\NiFlipController.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiFloatData.cpp"
+					RelativePath=".\src\obj\NiFloatData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiFloatExtraData.cpp"
+					RelativePath=".\src\obj\NiFloatExtraData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiFloatExtraDataController.cpp"
+					RelativePath=".\src\obj\NiFloatExtraDataController.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiFloatInterpolator.cpp"
+					RelativePath=".\src\obj\NiFloatInterpolator.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiFloatsExtraData.cpp"
+					RelativePath=".\src\obj\NiFloatsExtraData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiFogProperty.cpp"
+					RelativePath=".\src\obj\NiFogProperty.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiGeomMorpherController.cpp"
+					RelativePath=".\src\obj\NiGeomMorpherController.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiGravity.cpp"
+					RelativePath=".\src\obj\NiGravity.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiIntegerExtraData.cpp"
+					RelativePath=".\src\obj\NiIntegerExtraData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiIntegersExtraData.cpp"
+					RelativePath=".\src\obj\NiIntegersExtraData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiInterpolator.cpp"
+					RelativePath=".\src\obj\NiInterpolator.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiKeyframeController.cpp"
+					RelativePath=".\src\obj\NiKeyframeController.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiKeyframeData.cpp"
+					RelativePath=".\src\obj\NiKeyframeData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiLight.cpp"
+					RelativePath=".\src\obj\NiLight.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiLightColorController.cpp"
+					RelativePath=".\src\obj\NiLightColorController.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiLightDimmerController.cpp"
+					RelativePath=".\src\obj\NiLightDimmerController.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiLODData.cpp"
+					RelativePath=".\src\obj\NiLODData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiLODNode.cpp"
+					RelativePath=".\src\obj\NiLODNode.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiLookAtController.cpp"
+					RelativePath=".\src\obj\NiLookAtController.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiLookAtInterpolator.cpp"
+					RelativePath=".\src\obj\NiLookAtInterpolator.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiMaterialColorController.cpp"
+					RelativePath=".\src\obj\NiMaterialColorController.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiMaterialProperty.cpp"
+					RelativePath=".\src\obj\NiMaterialProperty.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiMeshParticleSystem.cpp"
+					RelativePath=".\src\obj\NiMeshParticleSystem.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiMeshPSysData.cpp"
+					RelativePath=".\src\obj\NiMeshPSysData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiMorphData.cpp"
+					RelativePath=".\src\obj\NiMorphData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiMultiTargetTransformController.cpp"
+					RelativePath=".\src\obj\NiMultiTargetTransformController.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiNode.cpp"
+					RelativePath=".\src\obj\NiNode.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiObject.cpp"
+					RelativePath=".\src\obj\NiObject.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiObjectNET.cpp"
+					RelativePath=".\src\obj\NiObjectNET.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPalette.cpp"
+					RelativePath=".\src\obj\NiPalette.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticleBomb.cpp"
+					RelativePath=".\src\obj\NiParticleBomb.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticleColorModifier.cpp"
+					RelativePath=".\src\obj\NiParticleColorModifier.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticleGrowFade.cpp"
+					RelativePath=".\src\obj\NiParticleGrowFade.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticleMeshes.cpp"
+					RelativePath=".\src\obj\NiParticleMeshes.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticleMeshesData.cpp"
+					RelativePath=".\src\obj\NiParticleMeshesData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticleMeshModifier.cpp"
+					RelativePath=".\src\obj\NiParticleMeshModifier.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticleRotation.cpp"
+					RelativePath=".\src\obj\NiParticleRotation.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticles.cpp"
+					RelativePath=".\src\obj\NiParticles.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticlesData.cpp"
+					RelativePath=".\src\obj\NiParticlesData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticleSystem.cpp"
+					RelativePath=".\src\obj\NiParticleSystem.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticleSystemController.cpp"
+					RelativePath=".\src\obj\NiParticleSystemController.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPathController.cpp"
+					RelativePath=".\src\obj\NiPathController.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPathInterpolator.cpp"
+					RelativePath=".\src\obj\NiPathInterpolator.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPixelData.cpp"
+					RelativePath=".\src\obj\NiPixelData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPlanarCollider.cpp"
+					RelativePath=".\src\obj\NiPlanarCollider.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPoint3Interpolator.cpp"
+					RelativePath=".\src\obj\NiPoint3Interpolator.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPointLight.cpp"
+					RelativePath=".\src\obj\NiPointLight.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPosData.cpp"
+					RelativePath=".\src\obj\NiPosData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiProperty.cpp"
+					RelativePath=".\src\obj\NiProperty.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysAgeDeathModifier.cpp"
+					RelativePath=".\src\obj\NiPSysAgeDeathModifier.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysBombModifier.cpp"
+					RelativePath=".\src\obj\NiPSysBombModifier.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysBoundUpdateModifier.cpp"
+					RelativePath=".\src\obj\NiPSysBoundUpdateModifier.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysBoxEmitter.cpp"
+					RelativePath=".\src\obj\NiPSysBoxEmitter.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysColliderManager.cpp"
+					RelativePath=".\src\obj\NiPSysColliderManager.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysColorModifier.cpp"
+					RelativePath=".\src\obj\NiPSysColorModifier.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysCylinderEmitter.cpp"
+					RelativePath=".\src\obj\NiPSysCylinderEmitter.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysData.cpp"
+					RelativePath=".\src\obj\NiPSysData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysDragModifier.cpp"
+					RelativePath=".\src\obj\NiPSysDragModifier.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysEmitter.cpp"
+					RelativePath=".\src\obj\NiPSysEmitter.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysEmitterCtlr.cpp"
+					RelativePath=".\src\obj\NiPSysEmitterCtlr.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysEmitterCtlrData.cpp"
+					RelativePath=".\src\obj\NiPSysEmitterCtlrData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysEmitterDeclinationCtlr.cpp"
+					RelativePath=".\src\obj\NiPSysEmitterDeclinationCtlr.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysEmitterDeclinationVarCtlr.cpp"
+					RelativePath=".\src\obj\NiPSysEmitterDeclinationVarCtlr.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysEmitterInitialRadiusCtlr.cpp"
+					RelativePath=".\src\obj\NiPSysEmitterInitialRadiusCtlr.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysEmitterLifeSpanCtlr.cpp"
+					RelativePath=".\src\obj\NiPSysEmitterLifeSpanCtlr.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysEmitterSpeedCtlr.cpp"
+					RelativePath=".\src\obj\NiPSysEmitterSpeedCtlr.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysGravityModifier.cpp"
+					RelativePath=".\src\obj\NiPSysGravityModifier.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysGravityStrengthCtlr.cpp"
+					RelativePath=".\src\obj\NiPSysGravityStrengthCtlr.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysGrowFadeModifier.cpp"
+					RelativePath=".\src\obj\NiPSysGrowFadeModifier.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysMeshEmitter.cpp"
+					RelativePath=".\src\obj\NiPSysMeshEmitter.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysMeshUpdateModifier.cpp"
+					RelativePath=".\src\obj\NiPSysMeshUpdateModifier.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysModifier.cpp"
+					RelativePath=".\src\obj\NiPSysModifier.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysModifierActiveCtlr.cpp"
+					RelativePath=".\src\obj\NiPSysModifierActiveCtlr.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysPlanarCollider.cpp"
+					RelativePath=".\src\obj\NiPSysPlanarCollider.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysPositionModifier.cpp"
+					RelativePath=".\src\obj\NiPSysPositionModifier.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysResetOnLoopCtlr.cpp"
+					RelativePath=".\src\obj\NiPSysResetOnLoopCtlr.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysRotationModifier.cpp"
+					RelativePath=".\src\obj\NiPSysRotationModifier.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysSpawnModifier.cpp"
+					RelativePath=".\src\obj\NiPSysSpawnModifier.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysSphereEmitter.cpp"
+					RelativePath=".\src\obj\NiPSysSphereEmitter.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysUpdateCtlr.cpp"
+					RelativePath=".\src\obj\NiPSysUpdateCtlr.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysVolumeEmitter.cpp"
+					RelativePath=".\src\obj\NiPSysVolumeEmitter.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiRangeLODData.cpp"
+					RelativePath=".\src\obj\NiRangeLODData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiRotatingParticles.cpp"
+					RelativePath=".\src\obj\NiRotatingParticles.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiRotatingParticlesData.cpp"
+					RelativePath=".\src\obj\NiRotatingParticlesData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiScreenLODData.cpp"
+					RelativePath=".\src\obj\NiScreenLODData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiSequenceStreamHelper.cpp"
+					RelativePath=".\src\obj\NiSequenceStreamHelper.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiShadeProperty.cpp"
+					RelativePath=".\src\obj\NiShadeProperty.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiSingleInterpolatorController.cpp"
+					RelativePath=".\src\obj\NiSingleInterpolatorController.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiSkinData.cpp"
+					RelativePath=".\src\obj\NiSkinData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiSkinInstance.cpp"
+					RelativePath=".\src\obj\NiSkinInstance.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiSkinPartition.cpp"
+					RelativePath=".\src\obj\NiSkinPartition.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiSourceTexture.cpp"
+					RelativePath=".\src\obj\NiSourceTexture.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiSpecularProperty.cpp"
+					RelativePath=".\src\obj\NiSpecularProperty.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiSphericalCollider.cpp"
+					RelativePath=".\src\obj\NiSphericalCollider.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiSpotLight.cpp"
+					RelativePath=".\src\obj\NiSpotLight.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiStencilProperty.cpp"
+					RelativePath=".\src\obj\NiStencilProperty.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiStringExtraData.cpp"
+					RelativePath=".\src\obj\NiStringExtraData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiStringPalette.cpp"
+					RelativePath=".\src\obj\NiStringPalette.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiStringsExtraData.cpp"
+					RelativePath=".\src\obj\NiStringsExtraData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTextKeyExtraData.cpp"
+					RelativePath=".\src\obj\NiTextKeyExtraData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTextureEffect.cpp"
+					RelativePath=".\src\obj\NiTextureEffect.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTextureTransformController.cpp"
+					RelativePath=".\src\obj\NiTextureTransformController.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTexturingProperty.cpp"
+					RelativePath=".\src\obj\NiTexturingProperty.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTimeController.cpp"
+					RelativePath=".\src\obj\NiTimeController.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTransformController.cpp"
+					RelativePath=".\src\obj\NiTransformController.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTransformData.cpp"
+					RelativePath=".\src\obj\NiTransformData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTransformInterpolator.cpp"
+					RelativePath=".\src\obj\NiTransformInterpolator.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTriBasedGeom.cpp"
+					RelativePath=".\src\obj\NiTriBasedGeom.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTriBasedGeomData.cpp"
+					RelativePath=".\src\obj\NiTriBasedGeomData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTriShape.cpp"
+					RelativePath=".\src\obj\NiTriShape.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTriShapeData.cpp"
+					RelativePath=".\src\obj\NiTriShapeData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTriStrips.cpp"
+					RelativePath=".\src\obj\NiTriStrips.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTriStripsData.cpp"
+					RelativePath=".\src\obj\NiTriStripsData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiUVController.cpp"
+					RelativePath=".\src\obj\NiUVController.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiUVData.cpp"
+					RelativePath=".\src\obj\NiUVData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiVectorExtraData.cpp"
+					RelativePath=".\src\obj\NiVectorExtraData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiVertexColorProperty.cpp"
+					RelativePath=".\src\obj\NiVertexColorProperty.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiVertWeightsExtraData.cpp"
+					RelativePath=".\src\obj\NiVertWeightsExtraData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiVisController.cpp"
+					RelativePath=".\src\obj\NiVisController.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiVisData.cpp"
+					RelativePath=".\src\obj\NiVisData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiWireframeProperty.cpp"
+					RelativePath=".\src\obj\NiWireframeProperty.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiZBufferProperty.cpp"
+					RelativePath=".\src\obj\NiZBufferProperty.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\RootCollisionNode.cpp"
+					RelativePath=".\src\obj\RootCollisionNode.cpp"
 					>
 				</File>
 			</Filter>
@@ -1275,145 +1295,133 @@
 				Name="gen"
 				>
 				<File
-					RelativePath=".\gen\AVObject.cpp"
+					RelativePath=".\src\gen\AVObject.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\BoundingBox.cpp"
+					RelativePath=".\src\gen\BoundingBox.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\ByteArray.cpp"
+					RelativePath=".\src\gen\ByteArray.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\ControllerLink.cpp"
+					RelativePath=".\src\gen\ControllerLink.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\enums.cpp"
+					RelativePath=".\src\gen\enums.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\Footer.cpp"
+					RelativePath=".\src\gen\Footer.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\FurniturePosition.cpp"
+					RelativePath=".\src\gen\FurniturePosition.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\Header.cpp"
+					RelativePath=".\src\gen\Header.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\hkTriangle.cpp"
+					RelativePath=".\src\gen\hkTriangle.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\LimitedHingeDescriptor.cpp"
+					RelativePath=".\src\gen\LimitedHingeDescriptor.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\LODRange.cpp"
+					RelativePath=".\src\gen\LODRange.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\MatchGroup.cpp"
+					RelativePath=".\src\gen\MatchGroup.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\MipMap.cpp"
+					RelativePath=".\src\gen\MipMap.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\Morph.cpp"
+					RelativePath=".\src\gen\Morph.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\NodeGroup.cpp"
+					RelativePath=".\src\gen\NodeGroup.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\obj_factories.cpp"
+					RelativePath=".\src\gen\obj_factories.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\obj_impl.cpp"
+					RelativePath=".\src\gen\obj_impl.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\Particle.cpp"
+					RelativePath=".\src\gen\Particle.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\QuaternionXYZW.cpp"
+					RelativePath=".\src\gen\QuaternionXYZW.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\RagDollDescriptor.cpp"
+					RelativePath=".\src\gen\RagDollDescriptor.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\ShaderTexDesc.cpp"
+					RelativePath=".\src\gen\ShaderTexDesc.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\SkinData.cpp"
+					RelativePath=".\src\gen\SkinData.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\SkinPartition.cpp"
+					RelativePath=".\src\gen\SkinPartition.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\SkinShape.cpp"
+					RelativePath=".\src\gen\SkinShape.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\SkinShapeGroup.cpp"
+					RelativePath=".\src\gen\SkinShapeGroup.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\SkinWeight.cpp"
+					RelativePath=".\src\gen\SkinWeight.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\Sphere.cpp"
+					RelativePath=".\src\gen\Sphere.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\StringPalette.cpp"
+					RelativePath=".\src\gen\StringPalette.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\TBC.cpp"
+					RelativePath=".\src\gen\TBC.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\TexDesc.cpp"
+					RelativePath=".\src\gen\TexDesc.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\TexSource.cpp"
+					RelativePath=".\src\gen\TexSource.cpp"
 					>
 				</File>
 			</Filter>
 			<Filter
 				Name="NvTriStrip"
 				>
-				<File
-					RelativePath=".\NvTriStrip\NvTriStrip.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\NvTriStrip\NvTriStripObjects.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\NvTriStrip\VertexCache.cpp"
-					>
-				</File>
 			</Filter>
 			<Filter
 				Name="TriStripper"
@@ -1438,910 +1446,910 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath=".\ComplexShape.h"
+				RelativePath=".\include\ComplexShape.h"
 				>
 			</File>
 			<File
-				RelativePath=".\dll_export.h"
+				RelativePath=".\include\dll_export.h"
 				>
 			</File>
 			<File
-				RelativePath=".\Key.h"
+				RelativePath=".\include\Key.h"
 				>
 			</File>
 			<File
-				RelativePath=".\kfm.h"
+				RelativePath=".\include\kfm.h"
 				>
 			</File>
 			<File
-				RelativePath=".\nif_basic_types.h"
+				RelativePath=".\include\nif_basic_types.h"
 				>
 			</File>
 			<File
-				RelativePath=".\NIF_IO.h"
+				RelativePath=".\include\NIF_IO.h"
 				>
 			</File>
 			<File
-				RelativePath=".\nif_math.h"
+				RelativePath=".\include\nif_math.h"
 				>
 			</File>
 			<File
-				RelativePath=".\nif_versions.h"
+				RelativePath=".\include\nif_versions.h"
 				>
 			</File>
 			<File
-				RelativePath=".\niflib.h"
+				RelativePath=".\include\niflib.h"
 				>
 			</File>
 			<File
-				RelativePath=".\pch.h"
+				RelativePath=".\include\pch.h"
 				>
 			</File>
 			<File
-				RelativePath=".\Ref.h"
+				RelativePath=".\include\Ref.h"
 				>
 			</File>
 			<File
-				RelativePath=".\Type.h"
+				RelativePath=".\include\Type.h"
 				>
 			</File>
 			<Filter
 				Name="obj"
 				>
 				<File
-					RelativePath=".\obj\AbhkConstraint.h"
+					RelativePath=".\include\obj\AbhkConstraint.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\AbhkRagdollConstraint.h"
+					RelativePath=".\include\obj\AbhkRagdollConstraint.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\AbhkShapeCollection.h"
+					RelativePath=".\include\obj\AbhkShapeCollection.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\ABoneLODController.h"
+					RelativePath=".\include\obj\ABoneLODController.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\AKeyedData.h"
+					RelativePath=".\include\obj\AKeyedData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\AParticleModifier.h"
+					RelativePath=".\include\obj\AParticleModifier.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\APSysCtlr.h"
+					RelativePath=".\include\obj\APSysCtlr.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\APSysData.h"
+					RelativePath=".\include\obj\APSysData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\AvoidNode.h"
+					RelativePath=".\include\obj\AvoidNode.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkBlendCollisionObject.h"
+					RelativePath=".\include\obj\bhkBlendCollisionObject.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkBlendController.h"
+					RelativePath=".\include\obj\bhkBlendController.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkBoxShape.h"
+					RelativePath=".\include\obj\bhkBoxShape.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkCapsuleShape.h"
+					RelativePath=".\include\obj\bhkCapsuleShape.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkCollisionObject.h"
+					RelativePath=".\include\obj\bhkCollisionObject.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkConvexShape.h"
+					RelativePath=".\include\obj\bhkConvexShape.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkConvexTransformShape.h"
+					RelativePath=".\include\obj\bhkConvexTransformShape.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkConvexVerticesShape.h"
+					RelativePath=".\include\obj\bhkConvexVerticesShape.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkEntity.h"
+					RelativePath=".\include\obj\bhkEntity.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkHingeConstraint.h"
+					RelativePath=".\include\obj\bhkHingeConstraint.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkLimitedHingeConstraint.h"
+					RelativePath=".\include\obj\bhkLimitedHingeConstraint.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkListShape.h"
+					RelativePath=".\include\obj\bhkListShape.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkMalleableConstraint.h"
+					RelativePath=".\include\obj\bhkMalleableConstraint.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkMoppBvTreeShape.h"
+					RelativePath=".\include\obj\bhkMoppBvTreeShape.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkMultiSphereShape.h"
+					RelativePath=".\include\obj\bhkMultiSphereShape.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkNiTriStripsShape.h"
+					RelativePath=".\include\obj\bhkNiTriStripsShape.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkPackedNiTriStripsShape.h"
+					RelativePath=".\include\obj\bhkPackedNiTriStripsShape.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkPrismaticConstraint.h"
+					RelativePath=".\include\obj\bhkPrismaticConstraint.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkRagdollConstraint.h"
+					RelativePath=".\include\obj\bhkRagdollConstraint.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkRefObject.h"
+					RelativePath=".\include\obj\bhkRefObject.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkRigidBody.h"
+					RelativePath=".\include\obj\bhkRigidBody.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkRigidBodyT.h"
+					RelativePath=".\include\obj\bhkRigidBodyT.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkSerializable.h"
+					RelativePath=".\include\obj\bhkSerializable.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkShape.h"
+					RelativePath=".\include\obj\bhkShape.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkSimpleShapePhantom.h"
+					RelativePath=".\include\obj\bhkSimpleShapePhantom.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkSPCollisionObject.h"
+					RelativePath=".\include\obj\bhkSPCollisionObject.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkSphereRepShape.h"
+					RelativePath=".\include\obj\bhkSphereRepShape.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkSphereShape.h"
+					RelativePath=".\include\obj\bhkSphereShape.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkStiffSpringConstraint.h"
+					RelativePath=".\include\obj\bhkStiffSpringConstraint.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkTransformShape.h"
+					RelativePath=".\include\obj\bhkTransformShape.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkWorldObject.h"
+					RelativePath=".\include\obj\bhkWorldObject.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\BSBound.h"
+					RelativePath=".\include\obj\BSBound.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\BSFurnitureMarker.h"
+					RelativePath=".\include\obj\BSFurnitureMarker.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\BSKeyframeController.h"
+					RelativePath=".\include\obj\BSKeyframeController.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\BSParentVelocityModifier.h"
+					RelativePath=".\include\obj\BSParentVelocityModifier.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\BSPSysArrayEmitter.h"
+					RelativePath=".\include\obj\BSPSysArrayEmitter.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\BSXFlags.h"
+					RelativePath=".\include\obj\BSXFlags.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\FxButton.h"
+					RelativePath=".\include\obj\FxButton.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\FxRadioButton.h"
+					RelativePath=".\include\obj\FxRadioButton.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\FxWidget.h"
+					RelativePath=".\include\obj\FxWidget.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\hkPackedNiTriStripsData.h"
+					RelativePath=".\include\obj\hkPackedNiTriStripsData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiAlphaController.h"
+					RelativePath=".\include\obj\NiAlphaController.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiAlphaProperty.h"
+					RelativePath=".\include\obj\NiAlphaProperty.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiAmbientLight.h"
+					RelativePath=".\include\obj\NiAmbientLight.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiAutoNormalParticles.h"
+					RelativePath=".\include\obj\NiAutoNormalParticles.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiAutoNormalParticlesData.h"
+					RelativePath=".\include\obj\NiAutoNormalParticlesData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiAVObject.h"
+					RelativePath=".\include\obj\NiAVObject.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBillboardNode.h"
+					RelativePath=".\include\obj\NiBillboardNode.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBinaryExtraData.h"
+					RelativePath=".\include\obj\NiBinaryExtraData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBlendBoolInterpolator.h"
+					RelativePath=".\include\obj\NiBlendBoolInterpolator.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBlendFloatInterpolator.h"
+					RelativePath=".\include\obj\NiBlendFloatInterpolator.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBlendInterpolator.h"
+					RelativePath=".\include\obj\NiBlendInterpolator.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBlendPoint3Interpolator.h"
+					RelativePath=".\include\obj\NiBlendPoint3Interpolator.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBlendTransformInterpolator.h"
+					RelativePath=".\include\obj\NiBlendTransformInterpolator.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBoneLODController.h"
+					RelativePath=".\include\obj\NiBoneLODController.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBoolData.h"
+					RelativePath=".\include\obj\NiBoolData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBooleanExtraData.h"
+					RelativePath=".\include\obj\NiBooleanExtraData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBoolInterpolator.h"
+					RelativePath=".\include\obj\NiBoolInterpolator.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBoolTimelineInterpolator.h"
+					RelativePath=".\include\obj\NiBoolTimelineInterpolator.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSAnimationNode.h"
+					RelativePath=".\include\obj\NiBSAnimationNode.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSBoneLODController.h"
+					RelativePath=".\include\obj\NiBSBoneLODController.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSPArrayController.h"
+					RelativePath=".\include\obj\NiBSPArrayController.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSParticleNode.h"
+					RelativePath=".\include\obj\NiBSParticleNode.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSplineBasisData.h"
+					RelativePath=".\include\obj\NiBSplineBasisData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSplineCompFloatInterpolator.h"
+					RelativePath=".\include\obj\NiBSplineCompFloatInterpolator.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSplineCompPoint3Interpolator.h"
+					RelativePath=".\include\obj\NiBSplineCompPoint3Interpolator.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSplineCompTransformInterpolator.h"
+					RelativePath=".\include\obj\NiBSplineCompTransformInterpolator.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSplineData.h"
+					RelativePath=".\include\obj\NiBSplineData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSplineInterpolator.h"
+					RelativePath=".\include\obj\NiBSplineInterpolator.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiCamera.h"
+					RelativePath=".\include\obj\NiCamera.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiCollisionData.h"
+					RelativePath=".\include\obj\NiCollisionData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiCollisionObject.h"
+					RelativePath=".\include\obj\NiCollisionObject.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiColorData.h"
+					RelativePath=".\include\obj\NiColorData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiColorExtraData.h"
+					RelativePath=".\include\obj\NiColorExtraData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiControllerManager.h"
+					RelativePath=".\include\obj\NiControllerManager.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiControllerSequence.h"
+					RelativePath=".\include\obj\NiControllerSequence.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiDefaultAVObjectPalette.h"
+					RelativePath=".\include\obj\NiDefaultAVObjectPalette.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiDirectionalLight.h"
+					RelativePath=".\include\obj\NiDirectionalLight.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiDitherProperty.h"
+					RelativePath=".\include\obj\NiDitherProperty.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiDynamicEffect.h"
+					RelativePath=".\include\obj\NiDynamicEffect.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiExtraData.h"
+					RelativePath=".\include\obj\NiExtraData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiFlipController.h"
+					RelativePath=".\include\obj\NiFlipController.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiFloatData.h"
+					RelativePath=".\include\obj\NiFloatData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiFloatExtraData.h"
+					RelativePath=".\include\obj\NiFloatExtraData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiFloatExtraDataController.h"
+					RelativePath=".\include\obj\NiFloatExtraDataController.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiFloatInterpolator.h"
+					RelativePath=".\include\obj\NiFloatInterpolator.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiFloatsExtraData.h"
+					RelativePath=".\include\obj\NiFloatsExtraData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiFogProperty.h"
+					RelativePath=".\include\obj\NiFogProperty.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiGeomMorpherController.h"
+					RelativePath=".\include\obj\NiGeomMorpherController.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiGravity.h"
+					RelativePath=".\include\obj\NiGravity.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiIntegerExtraData.h"
+					RelativePath=".\include\obj\NiIntegerExtraData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiIntegersExtraData.h"
+					RelativePath=".\include\obj\NiIntegersExtraData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiInterpolator.h"
+					RelativePath=".\include\obj\NiInterpolator.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiKeyframeController.h"
+					RelativePath=".\include\obj\NiKeyframeController.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiKeyframeData.h"
+					RelativePath=".\include\obj\NiKeyframeData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiLight.h"
+					RelativePath=".\include\obj\NiLight.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiLightColorController.h"
+					RelativePath=".\include\obj\NiLightColorController.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiLightDimmerController.h"
+					RelativePath=".\include\obj\NiLightDimmerController.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiLODData.h"
+					RelativePath=".\include\obj\NiLODData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiLODNode.h"
+					RelativePath=".\include\obj\NiLODNode.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiLookAtController.h"
+					RelativePath=".\include\obj\NiLookAtController.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiLookAtInterpolator.h"
+					RelativePath=".\include\obj\NiLookAtInterpolator.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiMaterialColorController.h"
+					RelativePath=".\include\obj\NiMaterialColorController.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiMaterialProperty.h"
+					RelativePath=".\include\obj\NiMaterialProperty.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiMeshParticleSystem.h"
+					RelativePath=".\include\obj\NiMeshParticleSystem.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiMeshPSysData.h"
+					RelativePath=".\include\obj\NiMeshPSysData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiMorphData.h"
+					RelativePath=".\include\obj\NiMorphData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiMultiTargetTransformController.h"
+					RelativePath=".\include\obj\NiMultiTargetTransformController.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiNode.h"
+					RelativePath=".\include\obj\NiNode.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiObject.h"
+					RelativePath=".\include\obj\NiObject.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiObjectNET.h"
+					RelativePath=".\include\obj\NiObjectNET.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPalette.h"
+					RelativePath=".\include\obj\NiPalette.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticleBomb.h"
+					RelativePath=".\include\obj\NiParticleBomb.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticleColorModifier.h"
+					RelativePath=".\include\obj\NiParticleColorModifier.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticleGrowFade.h"
+					RelativePath=".\include\obj\NiParticleGrowFade.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticleMeshes.h"
+					RelativePath=".\include\obj\NiParticleMeshes.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticleMeshesData.h"
+					RelativePath=".\include\obj\NiParticleMeshesData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticleMeshModifier.h"
+					RelativePath=".\include\obj\NiParticleMeshModifier.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticleRotation.h"
+					RelativePath=".\include\obj\NiParticleRotation.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticles.h"
+					RelativePath=".\include\obj\NiParticles.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticlesData.h"
+					RelativePath=".\include\obj\NiParticlesData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticleSystem.h"
+					RelativePath=".\include\obj\NiParticleSystem.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticleSystemController.h"
+					RelativePath=".\include\obj\NiParticleSystemController.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPathController.h"
+					RelativePath=".\include\obj\NiPathController.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPathInterpolator.h"
+					RelativePath=".\include\obj\NiPathInterpolator.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPixelData.h"
+					RelativePath=".\include\obj\NiPixelData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPlanarCollider.h"
+					RelativePath=".\include\obj\NiPlanarCollider.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPoint3Interpolator.h"
+					RelativePath=".\include\obj\NiPoint3Interpolator.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPointLight.h"
+					RelativePath=".\include\obj\NiPointLight.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPosData.h"
+					RelativePath=".\include\obj\NiPosData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiProperty.h"
+					RelativePath=".\include\obj\NiProperty.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysAgeDeathModifier.h"
+					RelativePath=".\include\obj\NiPSysAgeDeathModifier.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysBombModifier.h"
+					RelativePath=".\include\obj\NiPSysBombModifier.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysBoundUpdateModifier.h"
+					RelativePath=".\include\obj\NiPSysBoundUpdateModifier.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysBoxEmitter.h"
+					RelativePath=".\include\obj\NiPSysBoxEmitter.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysColliderManager.h"
+					RelativePath=".\include\obj\NiPSysColliderManager.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysColorModifier.h"
+					RelativePath=".\include\obj\NiPSysColorModifier.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysCylinderEmitter.h"
+					RelativePath=".\include\obj\NiPSysCylinderEmitter.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysData.h"
+					RelativePath=".\include\obj\NiPSysData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysDragModifier.h"
+					RelativePath=".\include\obj\NiPSysDragModifier.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysEmitter.h"
+					RelativePath=".\include\obj\NiPSysEmitter.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysEmitterCtlr.h"
+					RelativePath=".\include\obj\NiPSysEmitterCtlr.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysEmitterCtlrData.h"
+					RelativePath=".\include\obj\NiPSysEmitterCtlrData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysEmitterDeclinationCtlr.h"
+					RelativePath=".\include\obj\NiPSysEmitterDeclinationCtlr.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysEmitterDeclinationVarCtlr.h"
+					RelativePath=".\include\obj\NiPSysEmitterDeclinationVarCtlr.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysEmitterInitialRadiusCtlr.h"
+					RelativePath=".\include\obj\NiPSysEmitterInitialRadiusCtlr.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysEmitterLifeSpanCtlr.h"
+					RelativePath=".\include\obj\NiPSysEmitterLifeSpanCtlr.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysEmitterSpeedCtlr.h"
+					RelativePath=".\include\obj\NiPSysEmitterSpeedCtlr.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysGravityModifier.h"
+					RelativePath=".\include\obj\NiPSysGravityModifier.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysGravityStrengthCtlr.h"
+					RelativePath=".\include\obj\NiPSysGravityStrengthCtlr.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysGrowFadeModifier.h"
+					RelativePath=".\include\obj\NiPSysGrowFadeModifier.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysMeshEmitter.h"
+					RelativePath=".\include\obj\NiPSysMeshEmitter.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysMeshUpdateModifier.h"
+					RelativePath=".\include\obj\NiPSysMeshUpdateModifier.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysModifier.h"
+					RelativePath=".\include\obj\NiPSysModifier.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysModifierActiveCtlr.h"
+					RelativePath=".\include\obj\NiPSysModifierActiveCtlr.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysPlanarCollider.h"
+					RelativePath=".\include\obj\NiPSysPlanarCollider.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysPositionModifier.h"
+					RelativePath=".\include\obj\NiPSysPositionModifier.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysResetOnLoopCtlr.h"
+					RelativePath=".\include\obj\NiPSysResetOnLoopCtlr.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysRotationModifier.h"
+					RelativePath=".\include\obj\NiPSysRotationModifier.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysSpawnModifier.h"
+					RelativePath=".\include\obj\NiPSysSpawnModifier.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysSphereEmitter.h"
+					RelativePath=".\include\obj\NiPSysSphereEmitter.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysUpdateCtlr.h"
+					RelativePath=".\include\obj\NiPSysUpdateCtlr.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysVolumeEmitter.h"
+					RelativePath=".\include\obj\NiPSysVolumeEmitter.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiRangeLODData.h"
+					RelativePath=".\include\obj\NiRangeLODData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiRotatingParticles.h"
+					RelativePath=".\include\obj\NiRotatingParticles.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiRotatingParticlesData.h"
+					RelativePath=".\include\obj\NiRotatingParticlesData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiScreenLODData.h"
+					RelativePath=".\include\obj\NiScreenLODData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiSequenceStreamHelper.h"
+					RelativePath=".\include\obj\NiSequenceStreamHelper.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiShadeProperty.h"
+					RelativePath=".\include\obj\NiShadeProperty.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiSingleInterpolatorController.h"
+					RelativePath=".\include\obj\NiSingleInterpolatorController.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiSkinData.h"
+					RelativePath=".\include\obj\NiSkinData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiSkinInstance.h"
+					RelativePath=".\include\obj\NiSkinInstance.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiSkinPartition.h"
+					RelativePath=".\include\obj\NiSkinPartition.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiSourceTexture.h"
+					RelativePath=".\include\obj\NiSourceTexture.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiSpecularProperty.h"
+					RelativePath=".\include\obj\NiSpecularProperty.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiSphericalCollider.h"
+					RelativePath=".\include\obj\NiSphericalCollider.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiSpotLight.h"
+					RelativePath=".\include\obj\NiSpotLight.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiStencilProperty.h"
+					RelativePath=".\include\obj\NiStencilProperty.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiStringExtraData.h"
+					RelativePath=".\include\obj\NiStringExtraData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiStringPalette.h"
+					RelativePath=".\include\obj\NiStringPalette.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiStringsExtraData.h"
+					RelativePath=".\include\obj\NiStringsExtraData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTextKeyExtraData.h"
+					RelativePath=".\include\obj\NiTextKeyExtraData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTextureEffect.h"
+					RelativePath=".\include\obj\NiTextureEffect.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTextureTransformController.h"
+					RelativePath=".\include\obj\NiTextureTransformController.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTexturingProperty.h"
+					RelativePath=".\include\obj\NiTexturingProperty.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTimeController.h"
+					RelativePath=".\include\obj\NiTimeController.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTransformController.h"
+					RelativePath=".\include\obj\NiTransformController.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTransformData.h"
+					RelativePath=".\include\obj\NiTransformData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTransformInterpolator.h"
+					RelativePath=".\include\obj\NiTransformInterpolator.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTriBasedGeom.h"
+					RelativePath=".\include\obj\NiTriBasedGeom.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTriBasedGeomData.h"
+					RelativePath=".\include\obj\NiTriBasedGeomData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTriShape.h"
+					RelativePath=".\include\obj\NiTriShape.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTriShapeData.h"
+					RelativePath=".\include\obj\NiTriShapeData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTriStrips.h"
+					RelativePath=".\include\obj\NiTriStrips.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTriStripsData.h"
+					RelativePath=".\include\obj\NiTriStripsData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiUVController.h"
+					RelativePath=".\include\obj\NiUVController.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiUVData.h"
+					RelativePath=".\include\obj\NiUVData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiVectorExtraData.h"
+					RelativePath=".\include\obj\NiVectorExtraData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiVertexColorProperty.h"
+					RelativePath=".\include\obj\NiVertexColorProperty.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiVertWeightsExtraData.h"
+					RelativePath=".\include\obj\NiVertWeightsExtraData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiVisController.h"
+					RelativePath=".\include\obj\NiVisController.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiVisData.h"
+					RelativePath=".\include\obj\NiVisData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiWireframeProperty.h"
+					RelativePath=".\include\obj\NiWireframeProperty.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\NiZBufferProperty.h"
+					RelativePath=".\include\obj\NiZBufferProperty.h"
 					>
 				</File>
 				<File
-					RelativePath=".\obj\RootCollisionNode.h"
+					RelativePath=".\include\obj\RootCollisionNode.h"
 					>
 				</File>
 			</Filter>
@@ -2349,135 +2357,135 @@
 				Name="gen"
 				>
 				<File
-					RelativePath=".\gen\AVObject.h"
+					RelativePath=".\include\gen\AVObject.h"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\BoundingBox.h"
+					RelativePath=".\include\gen\BoundingBox.h"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\ByteArray.h"
+					RelativePath=".\include\gen\ByteArray.h"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\ControllerLink.h"
+					RelativePath=".\include\gen\ControllerLink.h"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\enums.h"
+					RelativePath=".\include\gen\enums.h"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\enums_intl.h"
+					RelativePath=".\include\gen\enums_intl.h"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\Footer.h"
+					RelativePath=".\include\gen\Footer.h"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\FurniturePosition.h"
+					RelativePath=".\include\gen\FurniturePosition.h"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\Header.h"
+					RelativePath=".\include\gen\Header.h"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\hkTriangle.h"
+					RelativePath=".\include\gen\hkTriangle.h"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\KeyGroup.h"
+					RelativePath=".\include\gen\KeyGroup.h"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\LimitedHingeDescriptor.h"
+					RelativePath=".\include\gen\LimitedHingeDescriptor.h"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\LODRange.h"
+					RelativePath=".\include\gen\LODRange.h"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\MatchGroup.h"
+					RelativePath=".\include\gen\MatchGroup.h"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\MipMap.h"
+					RelativePath=".\include\gen\MipMap.h"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\Morph.h"
+					RelativePath=".\include\gen\Morph.h"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\NodeGroup.h"
+					RelativePath=".\include\gen\NodeGroup.h"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\obj_defines.h"
+					RelativePath=".\include\gen\obj_defines.h"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\Particle.h"
+					RelativePath=".\include\gen\Particle.h"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\QuaternionXYZW.h"
+					RelativePath=".\include\gen\QuaternionXYZW.h"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\RagDollDescriptor.h"
+					RelativePath=".\include\gen\RagDollDescriptor.h"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\RotationKeyArray.h"
+					RelativePath=".\include\gen\RotationKeyArray.h"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\ShaderTexDesc.h"
+					RelativePath=".\include\gen\ShaderTexDesc.h"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\SkinData.h"
+					RelativePath=".\include\gen\SkinData.h"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\SkinPartition.h"
+					RelativePath=".\include\gen\SkinPartition.h"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\SkinShape.h"
+					RelativePath=".\include\gen\SkinShape.h"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\SkinShapeGroup.h"
+					RelativePath=".\include\gen\SkinShapeGroup.h"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\SkinWeight.h"
+					RelativePath=".\include\gen\SkinWeight.h"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\Sphere.h"
+					RelativePath=".\include\gen\Sphere.h"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\StringPalette.h"
+					RelativePath=".\include\gen\StringPalette.h"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\TBC.h"
+					RelativePath=".\include\gen\TBC.h"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\TexDesc.h"
+					RelativePath=".\include\gen\TexDesc.h"
 					>
 				</File>
 				<File
-					RelativePath=".\gen\TexSource.h"
+					RelativePath=".\include\gen\TexSource.h"
 					>
 				</File>
 			</Filter>
diff --git a/src/ComplexShape.cpp b/src/ComplexShape.cpp
index 327e37af..7aa92e72 100644
--- a/src/ComplexShape.cpp
+++ b/src/ComplexShape.cpp
@@ -1,19 +1,19 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "ComplexShape.h"
-#include "obj/NiNode.h"
-#include "obj/NiProperty.h"
-#include "obj/NiAVObject.h"
-#include "obj/NiTriBasedGeom.h"
-#include "obj/NiTriShape.h"
-#include "obj/NiTriStrips.h"
-#include "obj/NiTriStripsData.h"
-#include "obj/NiTriShapeData.h"
-#include "obj/NiTexturingProperty.h"
-#include "obj/NiSkinInstance.h"
-#include "obj/NiSkinData.h"
-#include "gen/SkinWeight.h"
+#include "../include/ComplexShape.h"
+#include "../include/obj/NiNode.h"
+#include "../include/obj/NiProperty.h"
+#include "../include/obj/NiAVObject.h"
+#include "../include/obj/NiTriBasedGeom.h"
+#include "../include/obj/NiTriShape.h"
+#include "../include/obj/NiTriStrips.h"
+#include "../include/obj/NiTriStripsData.h"
+#include "../include/obj/NiTriShapeData.h"
+#include "../include/obj/NiTexturingProperty.h"
+#include "../include/obj/NiSkinInstance.h"
+#include "../include/obj/NiSkinData.h"
+#include "../include/gen/SkinWeight.h"
 #include <stdlib.h>
 
 using namespace Niflib;
diff --git a/src/NIF_IO.cpp b/src/NIF_IO.cpp
index 5403d712..3e7001c3 100644
--- a/src/NIF_IO.cpp
+++ b/src/NIF_IO.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NIF_IO.h"
+#include "../include/NIF_IO.h"
 namespace Niflib {
 
 int BlockSearch( istream& in ) {
diff --git a/src/Type.cpp b/src/Type.cpp
index e9bbd4a3..c7482aaf 100644
--- a/src/Type.cpp
+++ b/src/Type.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "Type.h"
+#include "../include/Type.h"
 using namespace Niflib;
 
 Type::Type (const string & type_name, const Type * par_type ) : name(type_name), base_type(par_type) {} 
diff --git a/src/gen/AVObject.cpp b/src/gen/AVObject.cpp
index c5043ade..bc194b5c 100644
--- a/src/gen/AVObject.cpp
+++ b/src/gen/AVObject.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "AVObject.h"
-#include "../obj/NiAVObject.h"
+#include "../../include/gen/AVObject.h"
+#include "../../include/obj/NiAVObject.h"
 using namespace Niflib;
 
 //Constructor
diff --git a/src/gen/BoundingBox.cpp b/src/gen/BoundingBox.cpp
index 52a0b33d..24936136 100644
--- a/src/gen/BoundingBox.cpp
+++ b/src/gen/BoundingBox.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "BoundingBox.h"
+#include "../../include/gen/BoundingBox.h"
 using namespace Niflib;
 
 //Constructor
diff --git a/src/gen/ByteArray.cpp b/src/gen/ByteArray.cpp
index 8d7950f4..7e25333c 100644
--- a/src/gen/ByteArray.cpp
+++ b/src/gen/ByteArray.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "ByteArray.h"
+#include "../../include/gen/ByteArray.h"
 using namespace Niflib;
 
 //Constructor
diff --git a/src/gen/ControllerLink.cpp b/src/gen/ControllerLink.cpp
index 16c84980..235338d7 100644
--- a/src/gen/ControllerLink.cpp
+++ b/src/gen/ControllerLink.cpp
@@ -1,11 +1,11 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "ControllerLink.h"
-#include "../obj/NiTimeController.h"
-#include "../obj/NiInterpolator.h"
-#include "../obj/NiObject.h"
-#include "../obj/NiStringPalette.h"
+#include "../../include/gen/ControllerLink.h"
+#include "../../include/obj/NiTimeController.h"
+#include "../../include/obj/NiInterpolator.h"
+#include "../../include/obj/NiObject.h"
+#include "../../include/obj/NiStringPalette.h"
 using namespace Niflib;
 
 //Constructor
diff --git a/src/gen/Footer.cpp b/src/gen/Footer.cpp
index ba3af249..249bf618 100644
--- a/src/gen/Footer.cpp
+++ b/src/gen/Footer.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "Footer.h"
-#include "../obj/NiObject.h"
+#include "../../include/gen/Footer.h"
+#include "../../include/obj/NiObject.h"
 using namespace Niflib;
 
 //Constructor
diff --git a/src/gen/FurniturePosition.cpp b/src/gen/FurniturePosition.cpp
index e4b418b4..120d5f03 100644
--- a/src/gen/FurniturePosition.cpp
+++ b/src/gen/FurniturePosition.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "FurniturePosition.h"
+#include "../../include/gen/FurniturePosition.h"
 using namespace Niflib;
 
 //Constructor
diff --git a/src/gen/Header.cpp b/src/gen/Header.cpp
index f948466d..ba4c35dd 100644
--- a/src/gen/Header.cpp
+++ b/src/gen/Header.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "Header.h"
+#include "../../include/gen/Header.h"
 using namespace Niflib;
 
 //Constructor
diff --git a/src/gen/LODRange.cpp b/src/gen/LODRange.cpp
index db3314f4..784d93ff 100644
--- a/src/gen/LODRange.cpp
+++ b/src/gen/LODRange.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "LODRange.h"
+#include "../../include/gen/LODRange.h"
 using namespace Niflib;
 
 //Constructor
diff --git a/src/gen/LimitedHingeDescriptor.cpp b/src/gen/LimitedHingeDescriptor.cpp
index a20dda48..5a1a6d82 100644
--- a/src/gen/LimitedHingeDescriptor.cpp
+++ b/src/gen/LimitedHingeDescriptor.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "LimitedHingeDescriptor.h"
+#include "../../include/gen/LimitedHingeDescriptor.h"
 using namespace Niflib;
 
 //Constructor
diff --git a/src/gen/MatchGroup.cpp b/src/gen/MatchGroup.cpp
index 6f5d8955..e4c1b108 100644
--- a/src/gen/MatchGroup.cpp
+++ b/src/gen/MatchGroup.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "MatchGroup.h"
+#include "../../include/gen/MatchGroup.h"
 using namespace Niflib;
 
 //Constructor
diff --git a/src/gen/MipMap.cpp b/src/gen/MipMap.cpp
index 01169af3..f62db2aa 100644
--- a/src/gen/MipMap.cpp
+++ b/src/gen/MipMap.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "MipMap.h"
+#include "../../include/gen/MipMap.h"
 using namespace Niflib;
 
 //Constructor
diff --git a/src/gen/Morph.cpp b/src/gen/Morph.cpp
index 9f013e99..a46c8ec5 100644
--- a/src/gen/Morph.cpp
+++ b/src/gen/Morph.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "Morph.h"
+#include "../../include/gen/Morph.h"
 using namespace Niflib;
 
 //Constructor
diff --git a/src/gen/NodeGroup.cpp b/src/gen/NodeGroup.cpp
index cf364913..0fffc19c 100644
--- a/src/gen/NodeGroup.cpp
+++ b/src/gen/NodeGroup.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NodeGroup.h"
-#include "../obj/NiNode.h"
+#include "../../include/gen/NodeGroup.h"
+#include "../../include/obj/NiNode.h"
 using namespace Niflib;
 
 //Constructor
diff --git a/src/gen/Particle.cpp b/src/gen/Particle.cpp
index 30d0a593..0b50a025 100644
--- a/src/gen/Particle.cpp
+++ b/src/gen/Particle.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "Particle.h"
+#include "../../include/gen/Particle.h"
 using namespace Niflib;
 
 //Constructor
diff --git a/src/gen/QuaternionXYZW.cpp b/src/gen/QuaternionXYZW.cpp
index 3842b367..83d8c54e 100644
--- a/src/gen/QuaternionXYZW.cpp
+++ b/src/gen/QuaternionXYZW.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "QuaternionXYZW.h"
+#include "../../include/gen/QuaternionXYZW.h"
 using namespace Niflib;
 
 //Constructor
diff --git a/src/gen/RagDollDescriptor.cpp b/src/gen/RagDollDescriptor.cpp
index ce6a1e8b..87ecc8ad 100644
--- a/src/gen/RagDollDescriptor.cpp
+++ b/src/gen/RagDollDescriptor.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "RagDollDescriptor.h"
+#include "../../include/gen/RagDollDescriptor.h"
 using namespace Niflib;
 
 //Constructor
diff --git a/src/gen/ShaderTexDesc.cpp b/src/gen/ShaderTexDesc.cpp
index bdee52d2..6b668de2 100644
--- a/src/gen/ShaderTexDesc.cpp
+++ b/src/gen/ShaderTexDesc.cpp
@@ -1,9 +1,9 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "ShaderTexDesc.h"
-#include "TexDesc.h"
-#include "../obj/NiSourceTexture.h"
+#include "../../include/gen/ShaderTexDesc.h"
+#include "../../include/gen/TexDesc.h"
+#include "../../include/obj/NiSourceTexture.h"
 using namespace Niflib;
 
 //Constructor
diff --git a/src/gen/SkinData.cpp b/src/gen/SkinData.cpp
index 07ca9a47..aaff7bc4 100644
--- a/src/gen/SkinData.cpp
+++ b/src/gen/SkinData.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "SkinData.h"
-#include "SkinWeight.h"
+#include "../../include/gen/SkinData.h"
+#include "../../include/gen/SkinWeight.h"
 using namespace Niflib;
 
 //Constructor
diff --git a/src/gen/SkinPartition.cpp b/src/gen/SkinPartition.cpp
index ee42ad3e..915b09ad 100644
--- a/src/gen/SkinPartition.cpp
+++ b/src/gen/SkinPartition.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "SkinPartition.h"
+#include "../../include/gen/SkinPartition.h"
 using namespace Niflib;
 
 //Constructor
diff --git a/src/gen/SkinShape.cpp b/src/gen/SkinShape.cpp
index 89e16001..7a1cf602 100644
--- a/src/gen/SkinShape.cpp
+++ b/src/gen/SkinShape.cpp
@@ -1,9 +1,9 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "SkinShape.h"
-#include "../obj/NiTriShape.h"
-#include "../obj/NiSkinInstance.h"
+#include "../../include/gen/SkinShape.h"
+#include "../../include/obj/NiTriShape.h"
+#include "../../include/obj/NiSkinInstance.h"
 using namespace Niflib;
 
 //Constructor
diff --git a/src/gen/SkinShapeGroup.cpp b/src/gen/SkinShapeGroup.cpp
index 235ac487..8f69607e 100644
--- a/src/gen/SkinShapeGroup.cpp
+++ b/src/gen/SkinShapeGroup.cpp
@@ -1,10 +1,10 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "SkinShapeGroup.h"
-#include "SkinShape.h"
-#include "../obj/NiTriShape.h"
-#include "../obj/NiSkinInstance.h"
+#include "../../include/gen/SkinShapeGroup.h"
+#include "../../include/gen/SkinShape.h"
+#include "../../include/obj/NiTriShape.h"
+#include "../../include/obj/NiSkinInstance.h"
 using namespace Niflib;
 
 //Constructor
diff --git a/src/gen/SkinWeight.cpp b/src/gen/SkinWeight.cpp
index 0a8af68d..48ffa41c 100644
--- a/src/gen/SkinWeight.cpp
+++ b/src/gen/SkinWeight.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "SkinWeight.h"
+#include "../../include/gen/SkinWeight.h"
 using namespace Niflib;
 
 //Constructor
diff --git a/src/gen/Sphere.cpp b/src/gen/Sphere.cpp
index 415ba66f..a470cb8c 100644
--- a/src/gen/Sphere.cpp
+++ b/src/gen/Sphere.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "Sphere.h"
+#include "../../include/gen/Sphere.h"
 using namespace Niflib;
 
 //Constructor
diff --git a/src/gen/StringPalette.cpp b/src/gen/StringPalette.cpp
index 4557174a..59368cf9 100644
--- a/src/gen/StringPalette.cpp
+++ b/src/gen/StringPalette.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "StringPalette.h"
+#include "../../include/gen/StringPalette.h"
 using namespace Niflib;
 
 //Constructor
diff --git a/src/gen/TBC.cpp b/src/gen/TBC.cpp
index 2ecbb94e..f541e045 100644
--- a/src/gen/TBC.cpp
+++ b/src/gen/TBC.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "TBC.h"
+#include "../../include/gen/TBC.h"
 using namespace Niflib;
 
 //Constructor
diff --git a/src/gen/TexDesc.cpp b/src/gen/TexDesc.cpp
index 1bb38454..ae265b3b 100644
--- a/src/gen/TexDesc.cpp
+++ b/src/gen/TexDesc.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "TexDesc.h"
-#include "../obj/NiSourceTexture.h"
+#include "../../include/gen/TexDesc.h"
+#include "../../include/obj/NiSourceTexture.h"
 using namespace Niflib;
 
 //Constructor
diff --git a/src/gen/TexSource.cpp b/src/gen/TexSource.cpp
index 3e756907..8242eb49 100644
--- a/src/gen/TexSource.cpp
+++ b/src/gen/TexSource.cpp
@@ -1,9 +1,9 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "TexSource.h"
-#include "../obj/NiObject.h"
-#include "../obj/NiPixelData.h"
+#include "../../include/gen/TexSource.h"
+#include "../../include/obj/NiObject.h"
+#include "../../include/obj/NiPixelData.h"
 using namespace Niflib;
 
 //Constructor
diff --git a/src/gen/enums.cpp b/src/gen/enums.cpp
index 8c2bd377..747b340e 100644
--- a/src/gen/enums.cpp
+++ b/src/gen/enums.cpp
@@ -3,8 +3,8 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include <string>
 #include <iostream>
-#include "enums.h"
-#include "enums_intl.h"
+#include "../../include/gen/enums.h"
+#include "../../include/gen/enums_intl.h"
 
 namespace Niflib {
 
diff --git a/src/gen/hkTriangle.cpp b/src/gen/hkTriangle.cpp
index f17cecfb..1c779eb5 100644
--- a/src/gen/hkTriangle.cpp
+++ b/src/gen/hkTriangle.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "hkTriangle.h"
+#include "../../include/gen/hkTriangle.h"
 using namespace Niflib;
 
 //Constructor
diff --git a/src/gen/obj_factories.cpp b/src/gen/obj_factories.cpp
index 647b73be..729c5c5a 100644
--- a/src/gen/obj_factories.cpp
+++ b/src/gen/obj_factories.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "../obj/NiObject.h"
+#include "../../include/obj/NiObject.h"
 using namespace Niflib;
 using namespace std;
 namespace Niflib {
@@ -9,365 +9,365 @@ typedef NiObject*(*blk_factory_func)();
 extern map<string, blk_factory_func> global_block_map;
 }
 
-#include "../obj/bhkBlendCollisionObject.h"
+#include "../../include/obj/bhkBlendCollisionObject.h"
 NiObject * CreatebhkBlendCollisionObject() { return new bhkBlendCollisionObject; }
-#include "../obj/bhkBlendController.h"
+#include "../../include/obj/bhkBlendController.h"
 NiObject * CreatebhkBlendController() { return new bhkBlendController; }
-#include "../obj/bhkBoxShape.h"
+#include "../../include/obj/bhkBoxShape.h"
 NiObject * CreatebhkBoxShape() { return new bhkBoxShape; }
-#include "../obj/bhkCapsuleShape.h"
+#include "../../include/obj/bhkCapsuleShape.h"
 NiObject * CreatebhkCapsuleShape() { return new bhkCapsuleShape; }
-#include "../obj/bhkCollisionObject.h"
+#include "../../include/obj/bhkCollisionObject.h"
 NiObject * CreatebhkCollisionObject() { return new bhkCollisionObject; }
-#include "../obj/bhkConvexVerticesShape.h"
+#include "../../include/obj/bhkConvexVerticesShape.h"
 NiObject * CreatebhkConvexVerticesShape() { return new bhkConvexVerticesShape; }
-#include "../obj/bhkHingeConstraint.h"
+#include "../../include/obj/bhkHingeConstraint.h"
 NiObject * CreatebhkHingeConstraint() { return new bhkHingeConstraint; }
-#include "../obj/bhkLimitedHingeConstraint.h"
+#include "../../include/obj/bhkLimitedHingeConstraint.h"
 NiObject * CreatebhkLimitedHingeConstraint() { return new bhkLimitedHingeConstraint; }
-#include "../obj/bhkListShape.h"
+#include "../../include/obj/bhkListShape.h"
 NiObject * CreatebhkListShape() { return new bhkListShape; }
-#include "../obj/bhkMalleableConstraint.h"
+#include "../../include/obj/bhkMalleableConstraint.h"
 NiObject * CreatebhkMalleableConstraint() { return new bhkMalleableConstraint; }
-#include "../obj/bhkMoppBvTreeShape.h"
+#include "../../include/obj/bhkMoppBvTreeShape.h"
 NiObject * CreatebhkMoppBvTreeShape() { return new bhkMoppBvTreeShape; }
-#include "../obj/bhkMultiSphereShape.h"
+#include "../../include/obj/bhkMultiSphereShape.h"
 NiObject * CreatebhkMultiSphereShape() { return new bhkMultiSphereShape; }
-#include "../obj/bhkNiTriStripsShape.h"
+#include "../../include/obj/bhkNiTriStripsShape.h"
 NiObject * CreatebhkNiTriStripsShape() { return new bhkNiTriStripsShape; }
-#include "../obj/bhkPackedNiTriStripsShape.h"
+#include "../../include/obj/bhkPackedNiTriStripsShape.h"
 NiObject * CreatebhkPackedNiTriStripsShape() { return new bhkPackedNiTriStripsShape; }
-#include "../obj/bhkPrismaticConstraint.h"
+#include "../../include/obj/bhkPrismaticConstraint.h"
 NiObject * CreatebhkPrismaticConstraint() { return new bhkPrismaticConstraint; }
-#include "../obj/bhkRagdollConstraint.h"
+#include "../../include/obj/bhkRagdollConstraint.h"
 NiObject * CreatebhkRagdollConstraint() { return new bhkRagdollConstraint; }
-#include "../obj/bhkRigidBody.h"
+#include "../../include/obj/bhkRigidBody.h"
 NiObject * CreatebhkRigidBody() { return new bhkRigidBody; }
-#include "../obj/bhkRigidBodyT.h"
+#include "../../include/obj/bhkRigidBodyT.h"
 NiObject * CreatebhkRigidBodyT() { return new bhkRigidBodyT; }
-#include "../obj/bhkSimpleShapePhantom.h"
+#include "../../include/obj/bhkSimpleShapePhantom.h"
 NiObject * CreatebhkSimpleShapePhantom() { return new bhkSimpleShapePhantom; }
-#include "../obj/bhkSPCollisionObject.h"
+#include "../../include/obj/bhkSPCollisionObject.h"
 NiObject * CreatebhkSPCollisionObject() { return new bhkSPCollisionObject; }
-#include "../obj/bhkSphereShape.h"
+#include "../../include/obj/bhkSphereShape.h"
 NiObject * CreatebhkSphereShape() { return new bhkSphereShape; }
-#include "../obj/bhkStiffSpringConstraint.h"
+#include "../../include/obj/bhkStiffSpringConstraint.h"
 NiObject * CreatebhkStiffSpringConstraint() { return new bhkStiffSpringConstraint; }
-#include "../obj/bhkTransformShape.h"
+#include "../../include/obj/bhkTransformShape.h"
 NiObject * CreatebhkTransformShape() { return new bhkTransformShape; }
-#include "../obj/bhkConvexTransformShape.h"
+#include "../../include/obj/bhkConvexTransformShape.h"
 NiObject * CreatebhkConvexTransformShape() { return new bhkConvexTransformShape; }
-#include "../obj/BSBound.h"
+#include "../../include/obj/BSBound.h"
 NiObject * CreateBSBound() { return new BSBound; }
-#include "../obj/BSFurnitureMarker.h"
+#include "../../include/obj/BSFurnitureMarker.h"
 NiObject * CreateBSFurnitureMarker() { return new BSFurnitureMarker; }
-#include "../obj/BSParentVelocityModifier.h"
+#include "../../include/obj/BSParentVelocityModifier.h"
 NiObject * CreateBSParentVelocityModifier() { return new BSParentVelocityModifier; }
-#include "../obj/BSPSysArrayEmitter.h"
+#include "../../include/obj/BSPSysArrayEmitter.h"
 NiObject * CreateBSPSysArrayEmitter() { return new BSPSysArrayEmitter; }
-#include "../obj/BSXFlags.h"
+#include "../../include/obj/BSXFlags.h"
 NiObject * CreateBSXFlags() { return new BSXFlags; }
-#include "../obj/hkPackedNiTriStripsData.h"
+#include "../../include/obj/hkPackedNiTriStripsData.h"
 NiObject * CreatehkPackedNiTriStripsData() { return new hkPackedNiTriStripsData; }
-#include "../obj/NiAlphaController.h"
+#include "../../include/obj/NiAlphaController.h"
 NiObject * CreateNiAlphaController() { return new NiAlphaController; }
-#include "../obj/NiAlphaProperty.h"
+#include "../../include/obj/NiAlphaProperty.h"
 NiObject * CreateNiAlphaProperty() { return new NiAlphaProperty; }
-#include "../obj/NiAmbientLight.h"
+#include "../../include/obj/NiAmbientLight.h"
 NiObject * CreateNiAmbientLight() { return new NiAmbientLight; }
-#include "../obj/NiAutoNormalParticlesData.h"
+#include "../../include/obj/NiAutoNormalParticlesData.h"
 NiObject * CreateNiAutoNormalParticlesData() { return new NiAutoNormalParticlesData; }
-#include "../obj/NiBinaryExtraData.h"
+#include "../../include/obj/NiBinaryExtraData.h"
 NiObject * CreateNiBinaryExtraData() { return new NiBinaryExtraData; }
-#include "../obj/NiBlendBoolInterpolator.h"
+#include "../../include/obj/NiBlendBoolInterpolator.h"
 NiObject * CreateNiBlendBoolInterpolator() { return new NiBlendBoolInterpolator; }
-#include "../obj/NiBlendFloatInterpolator.h"
+#include "../../include/obj/NiBlendFloatInterpolator.h"
 NiObject * CreateNiBlendFloatInterpolator() { return new NiBlendFloatInterpolator; }
-#include "../obj/NiBlendPoint3Interpolator.h"
+#include "../../include/obj/NiBlendPoint3Interpolator.h"
 NiObject * CreateNiBlendPoint3Interpolator() { return new NiBlendPoint3Interpolator; }
-#include "../obj/NiBlendTransformInterpolator.h"
+#include "../../include/obj/NiBlendTransformInterpolator.h"
 NiObject * CreateNiBlendTransformInterpolator() { return new NiBlendTransformInterpolator; }
-#include "../obj/NiBoneLODController.h"
+#include "../../include/obj/NiBoneLODController.h"
 NiObject * CreateNiBoneLODController() { return new NiBoneLODController; }
-#include "../obj/NiBoolData.h"
+#include "../../include/obj/NiBoolData.h"
 NiObject * CreateNiBoolData() { return new NiBoolData; }
-#include "../obj/NiBooleanExtraData.h"
+#include "../../include/obj/NiBooleanExtraData.h"
 NiObject * CreateNiBooleanExtraData() { return new NiBooleanExtraData; }
-#include "../obj/NiBoolInterpolator.h"
+#include "../../include/obj/NiBoolInterpolator.h"
 NiObject * CreateNiBoolInterpolator() { return new NiBoolInterpolator; }
-#include "../obj/NiBoolTimelineInterpolator.h"
+#include "../../include/obj/NiBoolTimelineInterpolator.h"
 NiObject * CreateNiBoolTimelineInterpolator() { return new NiBoolTimelineInterpolator; }
-#include "../obj/NiBSBoneLODController.h"
+#include "../../include/obj/NiBSBoneLODController.h"
 NiObject * CreateNiBSBoneLODController() { return new NiBSBoneLODController; }
-#include "../obj/NiBSplineBasisData.h"
+#include "../../include/obj/NiBSplineBasisData.h"
 NiObject * CreateNiBSplineBasisData() { return new NiBSplineBasisData; }
-#include "../obj/NiBSplineCompFloatInterpolator.h"
+#include "../../include/obj/NiBSplineCompFloatInterpolator.h"
 NiObject * CreateNiBSplineCompFloatInterpolator() { return new NiBSplineCompFloatInterpolator; }
-#include "../obj/NiBSplineCompPoint3Interpolator.h"
+#include "../../include/obj/NiBSplineCompPoint3Interpolator.h"
 NiObject * CreateNiBSplineCompPoint3Interpolator() { return new NiBSplineCompPoint3Interpolator; }
-#include "../obj/NiBSplineCompTransformInterpolator.h"
+#include "../../include/obj/NiBSplineCompTransformInterpolator.h"
 NiObject * CreateNiBSplineCompTransformInterpolator() { return new NiBSplineCompTransformInterpolator; }
-#include "../obj/NiBSplineData.h"
+#include "../../include/obj/NiBSplineData.h"
 NiObject * CreateNiBSplineData() { return new NiBSplineData; }
-#include "../obj/NiCamera.h"
+#include "../../include/obj/NiCamera.h"
 NiObject * CreateNiCamera() { return new NiCamera; }
-#include "../obj/NiCollisionData.h"
+#include "../../include/obj/NiCollisionData.h"
 NiObject * CreateNiCollisionData() { return new NiCollisionData; }
-#include "../obj/NiColorData.h"
+#include "../../include/obj/NiColorData.h"
 NiObject * CreateNiColorData() { return new NiColorData; }
-#include "../obj/NiColorExtraData.h"
+#include "../../include/obj/NiColorExtraData.h"
 NiObject * CreateNiColorExtraData() { return new NiColorExtraData; }
-#include "../obj/NiControllerManager.h"
+#include "../../include/obj/NiControllerManager.h"
 NiObject * CreateNiControllerManager() { return new NiControllerManager; }
-#include "../obj/NiControllerSequence.h"
+#include "../../include/obj/NiControllerSequence.h"
 NiObject * CreateNiControllerSequence() { return new NiControllerSequence; }
-#include "../obj/NiDefaultAVObjectPalette.h"
+#include "../../include/obj/NiDefaultAVObjectPalette.h"
 NiObject * CreateNiDefaultAVObjectPalette() { return new NiDefaultAVObjectPalette; }
-#include "../obj/NiDirectionalLight.h"
+#include "../../include/obj/NiDirectionalLight.h"
 NiObject * CreateNiDirectionalLight() { return new NiDirectionalLight; }
-#include "../obj/NiDitherProperty.h"
+#include "../../include/obj/NiDitherProperty.h"
 NiObject * CreateNiDitherProperty() { return new NiDitherProperty; }
-#include "../obj/NiFlipController.h"
+#include "../../include/obj/NiFlipController.h"
 NiObject * CreateNiFlipController() { return new NiFlipController; }
-#include "../obj/NiFloatData.h"
+#include "../../include/obj/NiFloatData.h"
 NiObject * CreateNiFloatData() { return new NiFloatData; }
-#include "../obj/NiFloatExtraData.h"
+#include "../../include/obj/NiFloatExtraData.h"
 NiObject * CreateNiFloatExtraData() { return new NiFloatExtraData; }
-#include "../obj/NiFloatExtraDataController.h"
+#include "../../include/obj/NiFloatExtraDataController.h"
 NiObject * CreateNiFloatExtraDataController() { return new NiFloatExtraDataController; }
-#include "../obj/NiFloatInterpolator.h"
+#include "../../include/obj/NiFloatInterpolator.h"
 NiObject * CreateNiFloatInterpolator() { return new NiFloatInterpolator; }
-#include "../obj/NiFloatsExtraData.h"
+#include "../../include/obj/NiFloatsExtraData.h"
 NiObject * CreateNiFloatsExtraData() { return new NiFloatsExtraData; }
-#include "../obj/NiFogProperty.h"
+#include "../../include/obj/NiFogProperty.h"
 NiObject * CreateNiFogProperty() { return new NiFogProperty; }
-#include "../obj/NiGeomMorpherController.h"
+#include "../../include/obj/NiGeomMorpherController.h"
 NiObject * CreateNiGeomMorpherController() { return new NiGeomMorpherController; }
-#include "../obj/NiGravity.h"
+#include "../../include/obj/NiGravity.h"
 NiObject * CreateNiGravity() { return new NiGravity; }
-#include "../obj/NiIntegerExtraData.h"
+#include "../../include/obj/NiIntegerExtraData.h"
 NiObject * CreateNiIntegerExtraData() { return new NiIntegerExtraData; }
-#include "../obj/NiIntegersExtraData.h"
+#include "../../include/obj/NiIntegersExtraData.h"
 NiObject * CreateNiIntegersExtraData() { return new NiIntegersExtraData; }
-#include "../obj/NiKeyframeController.h"
+#include "../../include/obj/NiKeyframeController.h"
 NiObject * CreateNiKeyframeController() { return new NiKeyframeController; }
-#include "../obj/BSKeyframeController.h"
+#include "../../include/obj/BSKeyframeController.h"
 NiObject * CreateBSKeyframeController() { return new BSKeyframeController; }
-#include "../obj/NiKeyframeData.h"
+#include "../../include/obj/NiKeyframeData.h"
 NiObject * CreateNiKeyframeData() { return new NiKeyframeData; }
-#include "../obj/NiLightColorController.h"
+#include "../../include/obj/NiLightColorController.h"
 NiObject * CreateNiLightColorController() { return new NiLightColorController; }
-#include "../obj/NiLightDimmerController.h"
+#include "../../include/obj/NiLightDimmerController.h"
 NiObject * CreateNiLightDimmerController() { return new NiLightDimmerController; }
-#include "../obj/NiLookAtController.h"
+#include "../../include/obj/NiLookAtController.h"
 NiObject * CreateNiLookAtController() { return new NiLookAtController; }
-#include "../obj/NiLookAtInterpolator.h"
+#include "../../include/obj/NiLookAtInterpolator.h"
 NiObject * CreateNiLookAtInterpolator() { return new NiLookAtInterpolator; }
-#include "../obj/NiMaterialColorController.h"
+#include "../../include/obj/NiMaterialColorController.h"
 NiObject * CreateNiMaterialColorController() { return new NiMaterialColorController; }
-#include "../obj/NiMaterialProperty.h"
+#include "../../include/obj/NiMaterialProperty.h"
 NiObject * CreateNiMaterialProperty() { return new NiMaterialProperty; }
-#include "../obj/NiMeshPSysData.h"
+#include "../../include/obj/NiMeshPSysData.h"
 NiObject * CreateNiMeshPSysData() { return new NiMeshPSysData; }
-#include "../obj/NiMorphData.h"
+#include "../../include/obj/NiMorphData.h"
 NiObject * CreateNiMorphData() { return new NiMorphData; }
-#include "../obj/NiMultiTargetTransformController.h"
+#include "../../include/obj/NiMultiTargetTransformController.h"
 NiObject * CreateNiMultiTargetTransformController() { return new NiMultiTargetTransformController; }
-#include "../obj/NiNode.h"
+#include "../../include/obj/NiNode.h"
 NiObject * CreateNiNode() { return new NiNode; }
-#include "../obj/AvoidNode.h"
+#include "../../include/obj/AvoidNode.h"
 NiObject * CreateAvoidNode() { return new AvoidNode; }
-#include "../obj/FxWidget.h"
+#include "../../include/obj/FxWidget.h"
 NiObject * CreateFxWidget() { return new FxWidget; }
-#include "../obj/FxButton.h"
+#include "../../include/obj/FxButton.h"
 NiObject * CreateFxButton() { return new FxButton; }
-#include "../obj/FxRadioButton.h"
+#include "../../include/obj/FxRadioButton.h"
 NiObject * CreateFxRadioButton() { return new FxRadioButton; }
-#include "../obj/NiBillboardNode.h"
+#include "../../include/obj/NiBillboardNode.h"
 NiObject * CreateNiBillboardNode() { return new NiBillboardNode; }
-#include "../obj/NiBSAnimationNode.h"
+#include "../../include/obj/NiBSAnimationNode.h"
 NiObject * CreateNiBSAnimationNode() { return new NiBSAnimationNode; }
-#include "../obj/NiBSParticleNode.h"
+#include "../../include/obj/NiBSParticleNode.h"
 NiObject * CreateNiBSParticleNode() { return new NiBSParticleNode; }
-#include "../obj/NiLODNode.h"
+#include "../../include/obj/NiLODNode.h"
 NiObject * CreateNiLODNode() { return new NiLODNode; }
-#include "../obj/NiPalette.h"
+#include "../../include/obj/NiPalette.h"
 NiObject * CreateNiPalette() { return new NiPalette; }
-#include "../obj/NiParticleBomb.h"
+#include "../../include/obj/NiParticleBomb.h"
 NiObject * CreateNiParticleBomb() { return new NiParticleBomb; }
-#include "../obj/NiParticleColorModifier.h"
+#include "../../include/obj/NiParticleColorModifier.h"
 NiObject * CreateNiParticleColorModifier() { return new NiParticleColorModifier; }
-#include "../obj/NiParticleGrowFade.h"
+#include "../../include/obj/NiParticleGrowFade.h"
 NiObject * CreateNiParticleGrowFade() { return new NiParticleGrowFade; }
-#include "../obj/NiParticleMeshModifier.h"
+#include "../../include/obj/NiParticleMeshModifier.h"
 NiObject * CreateNiParticleMeshModifier() { return new NiParticleMeshModifier; }
-#include "../obj/NiParticleRotation.h"
+#include "../../include/obj/NiParticleRotation.h"
 NiObject * CreateNiParticleRotation() { return new NiParticleRotation; }
-#include "../obj/NiParticles.h"
+#include "../../include/obj/NiParticles.h"
 NiObject * CreateNiParticles() { return new NiParticles; }
-#include "../obj/NiAutoNormalParticles.h"
+#include "../../include/obj/NiAutoNormalParticles.h"
 NiObject * CreateNiAutoNormalParticles() { return new NiAutoNormalParticles; }
-#include "../obj/NiParticleMeshes.h"
+#include "../../include/obj/NiParticleMeshes.h"
 NiObject * CreateNiParticleMeshes() { return new NiParticleMeshes; }
-#include "../obj/NiParticlesData.h"
+#include "../../include/obj/NiParticlesData.h"
 NiObject * CreateNiParticlesData() { return new NiParticlesData; }
-#include "../obj/NiParticleMeshesData.h"
+#include "../../include/obj/NiParticleMeshesData.h"
 NiObject * CreateNiParticleMeshesData() { return new NiParticleMeshesData; }
-#include "../obj/NiParticleSystem.h"
+#include "../../include/obj/NiParticleSystem.h"
 NiObject * CreateNiParticleSystem() { return new NiParticleSystem; }
-#include "../obj/NiMeshParticleSystem.h"
+#include "../../include/obj/NiMeshParticleSystem.h"
 NiObject * CreateNiMeshParticleSystem() { return new NiMeshParticleSystem; }
-#include "../obj/NiParticleSystemController.h"
+#include "../../include/obj/NiParticleSystemController.h"
 NiObject * CreateNiParticleSystemController() { return new NiParticleSystemController; }
-#include "../obj/NiBSPArrayController.h"
+#include "../../include/obj/NiBSPArrayController.h"
 NiObject * CreateNiBSPArrayController() { return new NiBSPArrayController; }
-#include "../obj/NiPathController.h"
+#include "../../include/obj/NiPathController.h"
 NiObject * CreateNiPathController() { return new NiPathController; }
-#include "../obj/NiPathInterpolator.h"
+#include "../../include/obj/NiPathInterpolator.h"
 NiObject * CreateNiPathInterpolator() { return new NiPathInterpolator; }
-#include "../obj/NiPixelData.h"
+#include "../../include/obj/NiPixelData.h"
 NiObject * CreateNiPixelData() { return new NiPixelData; }
-#include "../obj/NiPlanarCollider.h"
+#include "../../include/obj/NiPlanarCollider.h"
 NiObject * CreateNiPlanarCollider() { return new NiPlanarCollider; }
-#include "../obj/NiPoint3Interpolator.h"
+#include "../../include/obj/NiPoint3Interpolator.h"
 NiObject * CreateNiPoint3Interpolator() { return new NiPoint3Interpolator; }
-#include "../obj/NiPointLight.h"
+#include "../../include/obj/NiPointLight.h"
 NiObject * CreateNiPointLight() { return new NiPointLight; }
-#include "../obj/NiPosData.h"
+#include "../../include/obj/NiPosData.h"
 NiObject * CreateNiPosData() { return new NiPosData; }
-#include "../obj/NiPSysAgeDeathModifier.h"
+#include "../../include/obj/NiPSysAgeDeathModifier.h"
 NiObject * CreateNiPSysAgeDeathModifier() { return new NiPSysAgeDeathModifier; }
-#include "../obj/NiPSysBombModifier.h"
+#include "../../include/obj/NiPSysBombModifier.h"
 NiObject * CreateNiPSysBombModifier() { return new NiPSysBombModifier; }
-#include "../obj/NiPSysBoundUpdateModifier.h"
+#include "../../include/obj/NiPSysBoundUpdateModifier.h"
 NiObject * CreateNiPSysBoundUpdateModifier() { return new NiPSysBoundUpdateModifier; }
-#include "../obj/NiPSysBoxEmitter.h"
+#include "../../include/obj/NiPSysBoxEmitter.h"
 NiObject * CreateNiPSysBoxEmitter() { return new NiPSysBoxEmitter; }
-#include "../obj/NiPSysColliderManager.h"
+#include "../../include/obj/NiPSysColliderManager.h"
 NiObject * CreateNiPSysColliderManager() { return new NiPSysColliderManager; }
-#include "../obj/NiPSysColorModifier.h"
+#include "../../include/obj/NiPSysColorModifier.h"
 NiObject * CreateNiPSysColorModifier() { return new NiPSysColorModifier; }
-#include "../obj/NiPSysCylinderEmitter.h"
+#include "../../include/obj/NiPSysCylinderEmitter.h"
 NiObject * CreateNiPSysCylinderEmitter() { return new NiPSysCylinderEmitter; }
-#include "../obj/NiPSysData.h"
+#include "../../include/obj/NiPSysData.h"
 NiObject * CreateNiPSysData() { return new NiPSysData; }
-#include "../obj/NiPSysDragModifier.h"
+#include "../../include/obj/NiPSysDragModifier.h"
 NiObject * CreateNiPSysDragModifier() { return new NiPSysDragModifier; }
-#include "../obj/NiPSysEmitterCtlr.h"
+#include "../../include/obj/NiPSysEmitterCtlr.h"
 NiObject * CreateNiPSysEmitterCtlr() { return new NiPSysEmitterCtlr; }
-#include "../obj/NiPSysEmitterCtlrData.h"
+#include "../../include/obj/NiPSysEmitterCtlrData.h"
 NiObject * CreateNiPSysEmitterCtlrData() { return new NiPSysEmitterCtlrData; }
-#include "../obj/NiPSysEmitterDeclinationCtlr.h"
+#include "../../include/obj/NiPSysEmitterDeclinationCtlr.h"
 NiObject * CreateNiPSysEmitterDeclinationCtlr() { return new NiPSysEmitterDeclinationCtlr; }
-#include "../obj/NiPSysEmitterDeclinationVarCtlr.h"
+#include "../../include/obj/NiPSysEmitterDeclinationVarCtlr.h"
 NiObject * CreateNiPSysEmitterDeclinationVarCtlr() { return new NiPSysEmitterDeclinationVarCtlr; }
-#include "../obj/NiPSysEmitterInitialRadiusCtlr.h"
+#include "../../include/obj/NiPSysEmitterInitialRadiusCtlr.h"
 NiObject * CreateNiPSysEmitterInitialRadiusCtlr() { return new NiPSysEmitterInitialRadiusCtlr; }
-#include "../obj/NiPSysEmitterLifeSpanCtlr.h"
+#include "../../include/obj/NiPSysEmitterLifeSpanCtlr.h"
 NiObject * CreateNiPSysEmitterLifeSpanCtlr() { return new NiPSysEmitterLifeSpanCtlr; }
-#include "../obj/NiPSysEmitterSpeedCtlr.h"
+#include "../../include/obj/NiPSysEmitterSpeedCtlr.h"
 NiObject * CreateNiPSysEmitterSpeedCtlr() { return new NiPSysEmitterSpeedCtlr; }
-#include "../obj/NiPSysGravityModifier.h"
+#include "../../include/obj/NiPSysGravityModifier.h"
 NiObject * CreateNiPSysGravityModifier() { return new NiPSysGravityModifier; }
-#include "../obj/NiPSysGravityStrengthCtlr.h"
+#include "../../include/obj/NiPSysGravityStrengthCtlr.h"
 NiObject * CreateNiPSysGravityStrengthCtlr() { return new NiPSysGravityStrengthCtlr; }
-#include "../obj/NiPSysGrowFadeModifier.h"
+#include "../../include/obj/NiPSysGrowFadeModifier.h"
 NiObject * CreateNiPSysGrowFadeModifier() { return new NiPSysGrowFadeModifier; }
-#include "../obj/NiPSysMeshEmitter.h"
+#include "../../include/obj/NiPSysMeshEmitter.h"
 NiObject * CreateNiPSysMeshEmitter() { return new NiPSysMeshEmitter; }
-#include "../obj/NiPSysMeshUpdateModifier.h"
+#include "../../include/obj/NiPSysMeshUpdateModifier.h"
 NiObject * CreateNiPSysMeshUpdateModifier() { return new NiPSysMeshUpdateModifier; }
-#include "../obj/NiPSysModifierActiveCtlr.h"
+#include "../../include/obj/NiPSysModifierActiveCtlr.h"
 NiObject * CreateNiPSysModifierActiveCtlr() { return new NiPSysModifierActiveCtlr; }
-#include "../obj/NiPSysPlanarCollider.h"
+#include "../../include/obj/NiPSysPlanarCollider.h"
 NiObject * CreateNiPSysPlanarCollider() { return new NiPSysPlanarCollider; }
-#include "../obj/NiPSysPositionModifier.h"
+#include "../../include/obj/NiPSysPositionModifier.h"
 NiObject * CreateNiPSysPositionModifier() { return new NiPSysPositionModifier; }
-#include "../obj/NiPSysResetOnLoopCtlr.h"
+#include "../../include/obj/NiPSysResetOnLoopCtlr.h"
 NiObject * CreateNiPSysResetOnLoopCtlr() { return new NiPSysResetOnLoopCtlr; }
-#include "../obj/NiPSysRotationModifier.h"
+#include "../../include/obj/NiPSysRotationModifier.h"
 NiObject * CreateNiPSysRotationModifier() { return new NiPSysRotationModifier; }
-#include "../obj/NiPSysSpawnModifier.h"
+#include "../../include/obj/NiPSysSpawnModifier.h"
 NiObject * CreateNiPSysSpawnModifier() { return new NiPSysSpawnModifier; }
-#include "../obj/NiPSysSphereEmitter.h"
+#include "../../include/obj/NiPSysSphereEmitter.h"
 NiObject * CreateNiPSysSphereEmitter() { return new NiPSysSphereEmitter; }
-#include "../obj/NiPSysUpdateCtlr.h"
+#include "../../include/obj/NiPSysUpdateCtlr.h"
 NiObject * CreateNiPSysUpdateCtlr() { return new NiPSysUpdateCtlr; }
-#include "../obj/NiRangeLODData.h"
+#include "../../include/obj/NiRangeLODData.h"
 NiObject * CreateNiRangeLODData() { return new NiRangeLODData; }
-#include "../obj/NiScreenLODData.h"
+#include "../../include/obj/NiScreenLODData.h"
 NiObject * CreateNiScreenLODData() { return new NiScreenLODData; }
-#include "../obj/NiRotatingParticles.h"
+#include "../../include/obj/NiRotatingParticles.h"
 NiObject * CreateNiRotatingParticles() { return new NiRotatingParticles; }
-#include "../obj/NiRotatingParticlesData.h"
+#include "../../include/obj/NiRotatingParticlesData.h"
 NiObject * CreateNiRotatingParticlesData() { return new NiRotatingParticlesData; }
-#include "../obj/NiSequenceStreamHelper.h"
+#include "../../include/obj/NiSequenceStreamHelper.h"
 NiObject * CreateNiSequenceStreamHelper() { return new NiSequenceStreamHelper; }
-#include "../obj/NiShadeProperty.h"
+#include "../../include/obj/NiShadeProperty.h"
 NiObject * CreateNiShadeProperty() { return new NiShadeProperty; }
-#include "../obj/NiSkinData.h"
+#include "../../include/obj/NiSkinData.h"
 NiObject * CreateNiSkinData() { return new NiSkinData; }
-#include "../obj/NiSkinInstance.h"
+#include "../../include/obj/NiSkinInstance.h"
 NiObject * CreateNiSkinInstance() { return new NiSkinInstance; }
-#include "../obj/NiSkinPartition.h"
+#include "../../include/obj/NiSkinPartition.h"
 NiObject * CreateNiSkinPartition() { return new NiSkinPartition; }
-#include "../obj/NiSourceTexture.h"
+#include "../../include/obj/NiSourceTexture.h"
 NiObject * CreateNiSourceTexture() { return new NiSourceTexture; }
-#include "../obj/NiSpecularProperty.h"
+#include "../../include/obj/NiSpecularProperty.h"
 NiObject * CreateNiSpecularProperty() { return new NiSpecularProperty; }
-#include "../obj/NiSphericalCollider.h"
+#include "../../include/obj/NiSphericalCollider.h"
 NiObject * CreateNiSphericalCollider() { return new NiSphericalCollider; }
-#include "../obj/NiSpotLight.h"
+#include "../../include/obj/NiSpotLight.h"
 NiObject * CreateNiSpotLight() { return new NiSpotLight; }
-#include "../obj/NiStencilProperty.h"
+#include "../../include/obj/NiStencilProperty.h"
 NiObject * CreateNiStencilProperty() { return new NiStencilProperty; }
-#include "../obj/NiStringExtraData.h"
+#include "../../include/obj/NiStringExtraData.h"
 NiObject * CreateNiStringExtraData() { return new NiStringExtraData; }
-#include "../obj/NiStringPalette.h"
+#include "../../include/obj/NiStringPalette.h"
 NiObject * CreateNiStringPalette() { return new NiStringPalette; }
-#include "../obj/NiStringsExtraData.h"
+#include "../../include/obj/NiStringsExtraData.h"
 NiObject * CreateNiStringsExtraData() { return new NiStringsExtraData; }
-#include "../obj/NiTextKeyExtraData.h"
+#include "../../include/obj/NiTextKeyExtraData.h"
 NiObject * CreateNiTextKeyExtraData() { return new NiTextKeyExtraData; }
-#include "../obj/NiTextureEffect.h"
+#include "../../include/obj/NiTextureEffect.h"
 NiObject * CreateNiTextureEffect() { return new NiTextureEffect; }
-#include "../obj/NiTextureTransformController.h"
+#include "../../include/obj/NiTextureTransformController.h"
 NiObject * CreateNiTextureTransformController() { return new NiTextureTransformController; }
-#include "../obj/NiTexturingProperty.h"
+#include "../../include/obj/NiTexturingProperty.h"
 NiObject * CreateNiTexturingProperty() { return new NiTexturingProperty; }
-#include "../obj/NiTransformController.h"
+#include "../../include/obj/NiTransformController.h"
 NiObject * CreateNiTransformController() { return new NiTransformController; }
-#include "../obj/NiTransformData.h"
+#include "../../include/obj/NiTransformData.h"
 NiObject * CreateNiTransformData() { return new NiTransformData; }
-#include "../obj/NiTransformInterpolator.h"
+#include "../../include/obj/NiTransformInterpolator.h"
 NiObject * CreateNiTransformInterpolator() { return new NiTransformInterpolator; }
-#include "../obj/NiTriShape.h"
+#include "../../include/obj/NiTriShape.h"
 NiObject * CreateNiTriShape() { return new NiTriShape; }
-#include "../obj/NiTriShapeData.h"
+#include "../../include/obj/NiTriShapeData.h"
 NiObject * CreateNiTriShapeData() { return new NiTriShapeData; }
-#include "../obj/NiTriStrips.h"
+#include "../../include/obj/NiTriStrips.h"
 NiObject * CreateNiTriStrips() { return new NiTriStrips; }
-#include "../obj/NiTriStripsData.h"
+#include "../../include/obj/NiTriStripsData.h"
 NiObject * CreateNiTriStripsData() { return new NiTriStripsData; }
-#include "../obj/NiUVController.h"
+#include "../../include/obj/NiUVController.h"
 NiObject * CreateNiUVController() { return new NiUVController; }
-#include "../obj/NiUVData.h"
+#include "../../include/obj/NiUVData.h"
 NiObject * CreateNiUVData() { return new NiUVData; }
-#include "../obj/NiVectorExtraData.h"
+#include "../../include/obj/NiVectorExtraData.h"
 NiObject * CreateNiVectorExtraData() { return new NiVectorExtraData; }
-#include "../obj/NiVertexColorProperty.h"
+#include "../../include/obj/NiVertexColorProperty.h"
 NiObject * CreateNiVertexColorProperty() { return new NiVertexColorProperty; }
-#include "../obj/NiVertWeightsExtraData.h"
+#include "../../include/obj/NiVertWeightsExtraData.h"
 NiObject * CreateNiVertWeightsExtraData() { return new NiVertWeightsExtraData; }
-#include "../obj/NiVisController.h"
+#include "../../include/obj/NiVisController.h"
 NiObject * CreateNiVisController() { return new NiVisController; }
-#include "../obj/NiVisData.h"
+#include "../../include/obj/NiVisData.h"
 NiObject * CreateNiVisData() { return new NiVisData; }
-#include "../obj/NiWireframeProperty.h"
+#include "../../include/obj/NiWireframeProperty.h"
 NiObject * CreateNiWireframeProperty() { return new NiWireframeProperty; }
-#include "../obj/NiZBufferProperty.h"
+#include "../../include/obj/NiZBufferProperty.h"
 NiObject * CreateNiZBufferProperty() { return new NiZBufferProperty; }
-#include "../obj/RootCollisionNode.h"
+#include "../../include/obj/RootCollisionNode.h"
 NiObject * CreateRootCollisionNode() { return new RootCollisionNode; }
 
 namespace Niflib {
diff --git a/src/gen/obj_impl.cpp b/src/gen/obj_impl.cpp
index 99a6dd13..e0df54b8 100644
--- a/src/gen/obj_impl.cpp
+++ b/src/gen/obj_impl.cpp
@@ -1,190 +1,190 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "../obj/NiObject.h"
+#include "../../include/obj/NiObject.h"
 using namespace Niflib;
 using namespace std;
 
-#include "../obj/bhkBlendCollisionObject.h"
-#include "../obj/bhkBlendController.h"
-#include "../obj/bhkBoxShape.h"
-#include "../obj/bhkCapsuleShape.h"
-#include "../obj/bhkCollisionObject.h"
-#include "../obj/bhkConvexVerticesShape.h"
-#include "../obj/bhkHingeConstraint.h"
-#include "../obj/bhkLimitedHingeConstraint.h"
-#include "../obj/bhkListShape.h"
-#include "../obj/bhkMalleableConstraint.h"
-#include "../obj/bhkMoppBvTreeShape.h"
-#include "../obj/bhkMultiSphereShape.h"
-#include "../obj/bhkNiTriStripsShape.h"
-#include "../obj/bhkPackedNiTriStripsShape.h"
-#include "../obj/bhkPrismaticConstraint.h"
-#include "../obj/bhkRagdollConstraint.h"
-#include "../obj/bhkRigidBody.h"
-#include "../obj/bhkRigidBodyT.h"
-#include "../obj/bhkSimpleShapePhantom.h"
-#include "../obj/bhkSPCollisionObject.h"
-#include "../obj/bhkSphereShape.h"
-#include "../obj/bhkStiffSpringConstraint.h"
-#include "../obj/bhkTransformShape.h"
-#include "../obj/bhkConvexTransformShape.h"
-#include "../obj/BSBound.h"
-#include "../obj/BSFurnitureMarker.h"
-#include "../obj/BSParentVelocityModifier.h"
-#include "../obj/BSPSysArrayEmitter.h"
-#include "../obj/BSXFlags.h"
-#include "../obj/hkPackedNiTriStripsData.h"
-#include "../obj/NiAlphaController.h"
-#include "../obj/NiAlphaProperty.h"
-#include "../obj/NiAmbientLight.h"
-#include "../obj/NiAutoNormalParticlesData.h"
-#include "../obj/NiBinaryExtraData.h"
-#include "../obj/NiBlendBoolInterpolator.h"
-#include "../obj/NiBlendFloatInterpolator.h"
-#include "../obj/NiBlendPoint3Interpolator.h"
-#include "../obj/NiBlendTransformInterpolator.h"
-#include "../obj/NiBoneLODController.h"
-#include "../obj/NiBoolData.h"
-#include "../obj/NiBooleanExtraData.h"
-#include "../obj/NiBoolInterpolator.h"
-#include "../obj/NiBoolTimelineInterpolator.h"
-#include "../obj/NiBSBoneLODController.h"
-#include "../obj/NiBSplineBasisData.h"
-#include "../obj/NiBSplineCompFloatInterpolator.h"
-#include "../obj/NiBSplineCompPoint3Interpolator.h"
-#include "../obj/NiBSplineCompTransformInterpolator.h"
-#include "../obj/NiBSplineData.h"
-#include "../obj/NiCamera.h"
-#include "../obj/NiCollisionData.h"
-#include "../obj/NiColorData.h"
-#include "../obj/NiColorExtraData.h"
-#include "../obj/NiControllerManager.h"
-#include "../obj/NiControllerSequence.h"
-#include "../obj/NiDefaultAVObjectPalette.h"
-#include "../obj/NiDirectionalLight.h"
-#include "../obj/NiDitherProperty.h"
-#include "../obj/NiFlipController.h"
-#include "../obj/NiFloatData.h"
-#include "../obj/NiFloatExtraData.h"
-#include "../obj/NiFloatExtraDataController.h"
-#include "../obj/NiFloatInterpolator.h"
-#include "../obj/NiFloatsExtraData.h"
-#include "../obj/NiFogProperty.h"
-#include "../obj/NiGeomMorpherController.h"
-#include "../obj/NiGravity.h"
-#include "../obj/NiIntegerExtraData.h"
-#include "../obj/NiIntegersExtraData.h"
-#include "../obj/NiKeyframeController.h"
-#include "../obj/BSKeyframeController.h"
-#include "../obj/NiKeyframeData.h"
-#include "../obj/NiLightColorController.h"
-#include "../obj/NiLightDimmerController.h"
-#include "../obj/NiLookAtController.h"
-#include "../obj/NiLookAtInterpolator.h"
-#include "../obj/NiMaterialColorController.h"
-#include "../obj/NiMaterialProperty.h"
-#include "../obj/NiMeshPSysData.h"
-#include "../obj/NiMorphData.h"
-#include "../obj/NiMultiTargetTransformController.h"
-#include "../obj/NiNode.h"
-#include "../obj/AvoidNode.h"
-#include "../obj/FxWidget.h"
-#include "../obj/FxButton.h"
-#include "../obj/FxRadioButton.h"
-#include "../obj/NiBillboardNode.h"
-#include "../obj/NiBSAnimationNode.h"
-#include "../obj/NiBSParticleNode.h"
-#include "../obj/NiLODNode.h"
-#include "../obj/NiPalette.h"
-#include "../obj/NiParticleBomb.h"
-#include "../obj/NiParticleColorModifier.h"
-#include "../obj/NiParticleGrowFade.h"
-#include "../obj/NiParticleMeshModifier.h"
-#include "../obj/NiParticleRotation.h"
-#include "../obj/NiParticles.h"
-#include "../obj/NiAutoNormalParticles.h"
-#include "../obj/NiParticleMeshes.h"
-#include "../obj/NiParticlesData.h"
-#include "../obj/NiParticleMeshesData.h"
-#include "../obj/NiParticleSystem.h"
-#include "../obj/NiMeshParticleSystem.h"
-#include "../obj/NiParticleSystemController.h"
-#include "../obj/NiBSPArrayController.h"
-#include "../obj/NiPathController.h"
-#include "../obj/NiPathInterpolator.h"
-#include "../obj/NiPixelData.h"
-#include "../obj/NiPlanarCollider.h"
-#include "../obj/NiPoint3Interpolator.h"
-#include "../obj/NiPointLight.h"
-#include "../obj/NiPosData.h"
-#include "../obj/NiPSysAgeDeathModifier.h"
-#include "../obj/NiPSysBombModifier.h"
-#include "../obj/NiPSysBoundUpdateModifier.h"
-#include "../obj/NiPSysBoxEmitter.h"
-#include "../obj/NiPSysColliderManager.h"
-#include "../obj/NiPSysColorModifier.h"
-#include "../obj/NiPSysCylinderEmitter.h"
-#include "../obj/NiPSysData.h"
-#include "../obj/NiPSysDragModifier.h"
-#include "../obj/NiPSysEmitterCtlr.h"
-#include "../obj/NiPSysEmitterCtlrData.h"
-#include "../obj/NiPSysEmitterDeclinationCtlr.h"
-#include "../obj/NiPSysEmitterDeclinationVarCtlr.h"
-#include "../obj/NiPSysEmitterInitialRadiusCtlr.h"
-#include "../obj/NiPSysEmitterLifeSpanCtlr.h"
-#include "../obj/NiPSysEmitterSpeedCtlr.h"
-#include "../obj/NiPSysGravityModifier.h"
-#include "../obj/NiPSysGravityStrengthCtlr.h"
-#include "../obj/NiPSysGrowFadeModifier.h"
-#include "../obj/NiPSysMeshEmitter.h"
-#include "../obj/NiPSysMeshUpdateModifier.h"
-#include "../obj/NiPSysModifierActiveCtlr.h"
-#include "../obj/NiPSysPlanarCollider.h"
-#include "../obj/NiPSysPositionModifier.h"
-#include "../obj/NiPSysResetOnLoopCtlr.h"
-#include "../obj/NiPSysRotationModifier.h"
-#include "../obj/NiPSysSpawnModifier.h"
-#include "../obj/NiPSysSphereEmitter.h"
-#include "../obj/NiPSysUpdateCtlr.h"
-#include "../obj/NiRangeLODData.h"
-#include "../obj/NiScreenLODData.h"
-#include "../obj/NiRotatingParticles.h"
-#include "../obj/NiRotatingParticlesData.h"
-#include "../obj/NiSequenceStreamHelper.h"
-#include "../obj/NiShadeProperty.h"
-#include "../obj/NiSkinData.h"
-#include "../obj/NiSkinInstance.h"
-#include "../obj/NiSkinPartition.h"
-#include "../obj/NiSourceTexture.h"
-#include "../obj/NiSpecularProperty.h"
-#include "../obj/NiSphericalCollider.h"
-#include "../obj/NiSpotLight.h"
-#include "../obj/NiStencilProperty.h"
-#include "../obj/NiStringExtraData.h"
-#include "../obj/NiStringPalette.h"
-#include "../obj/NiStringsExtraData.h"
-#include "../obj/NiTextKeyExtraData.h"
-#include "../obj/NiTextureEffect.h"
-#include "../obj/NiTextureTransformController.h"
-#include "../obj/NiTexturingProperty.h"
-#include "../obj/NiTransformController.h"
-#include "../obj/NiTransformData.h"
-#include "../obj/NiTransformInterpolator.h"
-#include "../obj/NiTriShape.h"
-#include "../obj/NiTriShapeData.h"
-#include "../obj/NiTriStrips.h"
-#include "../obj/NiTriStripsData.h"
-#include "../obj/NiUVController.h"
-#include "../obj/NiUVData.h"
-#include "../obj/NiVectorExtraData.h"
-#include "../obj/NiVertexColorProperty.h"
-#include "../obj/NiVertWeightsExtraData.h"
-#include "../obj/NiVisController.h"
-#include "../obj/NiVisData.h"
-#include "../obj/NiWireframeProperty.h"
-#include "../obj/NiZBufferProperty.h"
-#include "../obj/RootCollisionNode.h"
+#include "../../include/obj/bhkBlendCollisionObject.h"
+#include "../../include/obj/bhkBlendController.h"
+#include "../../include/obj/bhkBoxShape.h"
+#include "../../include/obj/bhkCapsuleShape.h"
+#include "../../include/obj/bhkCollisionObject.h"
+#include "../../include/obj/bhkConvexVerticesShape.h"
+#include "../../include/obj/bhkHingeConstraint.h"
+#include "../../include/obj/bhkLimitedHingeConstraint.h"
+#include "../../include/obj/bhkListShape.h"
+#include "../../include/obj/bhkMalleableConstraint.h"
+#include "../../include/obj/bhkMoppBvTreeShape.h"
+#include "../../include/obj/bhkMultiSphereShape.h"
+#include "../../include/obj/bhkNiTriStripsShape.h"
+#include "../../include/obj/bhkPackedNiTriStripsShape.h"
+#include "../../include/obj/bhkPrismaticConstraint.h"
+#include "../../include/obj/bhkRagdollConstraint.h"
+#include "../../include/obj/bhkRigidBody.h"
+#include "../../include/obj/bhkRigidBodyT.h"
+#include "../../include/obj/bhkSimpleShapePhantom.h"
+#include "../../include/obj/bhkSPCollisionObject.h"
+#include "../../include/obj/bhkSphereShape.h"
+#include "../../include/obj/bhkStiffSpringConstraint.h"
+#include "../../include/obj/bhkTransformShape.h"
+#include "../../include/obj/bhkConvexTransformShape.h"
+#include "../../include/obj/BSBound.h"
+#include "../../include/obj/BSFurnitureMarker.h"
+#include "../../include/obj/BSParentVelocityModifier.h"
+#include "../../include/obj/BSPSysArrayEmitter.h"
+#include "../../include/obj/BSXFlags.h"
+#include "../../include/obj/hkPackedNiTriStripsData.h"
+#include "../../include/obj/NiAlphaController.h"
+#include "../../include/obj/NiAlphaProperty.h"
+#include "../../include/obj/NiAmbientLight.h"
+#include "../../include/obj/NiAutoNormalParticlesData.h"
+#include "../../include/obj/NiBinaryExtraData.h"
+#include "../../include/obj/NiBlendBoolInterpolator.h"
+#include "../../include/obj/NiBlendFloatInterpolator.h"
+#include "../../include/obj/NiBlendPoint3Interpolator.h"
+#include "../../include/obj/NiBlendTransformInterpolator.h"
+#include "../../include/obj/NiBoneLODController.h"
+#include "../../include/obj/NiBoolData.h"
+#include "../../include/obj/NiBooleanExtraData.h"
+#include "../../include/obj/NiBoolInterpolator.h"
+#include "../../include/obj/NiBoolTimelineInterpolator.h"
+#include "../../include/obj/NiBSBoneLODController.h"
+#include "../../include/obj/NiBSplineBasisData.h"
+#include "../../include/obj/NiBSplineCompFloatInterpolator.h"
+#include "../../include/obj/NiBSplineCompPoint3Interpolator.h"
+#include "../../include/obj/NiBSplineCompTransformInterpolator.h"
+#include "../../include/obj/NiBSplineData.h"
+#include "../../include/obj/NiCamera.h"
+#include "../../include/obj/NiCollisionData.h"
+#include "../../include/obj/NiColorData.h"
+#include "../../include/obj/NiColorExtraData.h"
+#include "../../include/obj/NiControllerManager.h"
+#include "../../include/obj/NiControllerSequence.h"
+#include "../../include/obj/NiDefaultAVObjectPalette.h"
+#include "../../include/obj/NiDirectionalLight.h"
+#include "../../include/obj/NiDitherProperty.h"
+#include "../../include/obj/NiFlipController.h"
+#include "../../include/obj/NiFloatData.h"
+#include "../../include/obj/NiFloatExtraData.h"
+#include "../../include/obj/NiFloatExtraDataController.h"
+#include "../../include/obj/NiFloatInterpolator.h"
+#include "../../include/obj/NiFloatsExtraData.h"
+#include "../../include/obj/NiFogProperty.h"
+#include "../../include/obj/NiGeomMorpherController.h"
+#include "../../include/obj/NiGravity.h"
+#include "../../include/obj/NiIntegerExtraData.h"
+#include "../../include/obj/NiIntegersExtraData.h"
+#include "../../include/obj/NiKeyframeController.h"
+#include "../../include/obj/BSKeyframeController.h"
+#include "../../include/obj/NiKeyframeData.h"
+#include "../../include/obj/NiLightColorController.h"
+#include "../../include/obj/NiLightDimmerController.h"
+#include "../../include/obj/NiLookAtController.h"
+#include "../../include/obj/NiLookAtInterpolator.h"
+#include "../../include/obj/NiMaterialColorController.h"
+#include "../../include/obj/NiMaterialProperty.h"
+#include "../../include/obj/NiMeshPSysData.h"
+#include "../../include/obj/NiMorphData.h"
+#include "../../include/obj/NiMultiTargetTransformController.h"
+#include "../../include/obj/NiNode.h"
+#include "../../include/obj/AvoidNode.h"
+#include "../../include/obj/FxWidget.h"
+#include "../../include/obj/FxButton.h"
+#include "../../include/obj/FxRadioButton.h"
+#include "../../include/obj/NiBillboardNode.h"
+#include "../../include/obj/NiBSAnimationNode.h"
+#include "../../include/obj/NiBSParticleNode.h"
+#include "../../include/obj/NiLODNode.h"
+#include "../../include/obj/NiPalette.h"
+#include "../../include/obj/NiParticleBomb.h"
+#include "../../include/obj/NiParticleColorModifier.h"
+#include "../../include/obj/NiParticleGrowFade.h"
+#include "../../include/obj/NiParticleMeshModifier.h"
+#include "../../include/obj/NiParticleRotation.h"
+#include "../../include/obj/NiParticles.h"
+#include "../../include/obj/NiAutoNormalParticles.h"
+#include "../../include/obj/NiParticleMeshes.h"
+#include "../../include/obj/NiParticlesData.h"
+#include "../../include/obj/NiParticleMeshesData.h"
+#include "../../include/obj/NiParticleSystem.h"
+#include "../../include/obj/NiMeshParticleSystem.h"
+#include "../../include/obj/NiParticleSystemController.h"
+#include "../../include/obj/NiBSPArrayController.h"
+#include "../../include/obj/NiPathController.h"
+#include "../../include/obj/NiPathInterpolator.h"
+#include "../../include/obj/NiPixelData.h"
+#include "../../include/obj/NiPlanarCollider.h"
+#include "../../include/obj/NiPoint3Interpolator.h"
+#include "../../include/obj/NiPointLight.h"
+#include "../../include/obj/NiPosData.h"
+#include "../../include/obj/NiPSysAgeDeathModifier.h"
+#include "../../include/obj/NiPSysBombModifier.h"
+#include "../../include/obj/NiPSysBoundUpdateModifier.h"
+#include "../../include/obj/NiPSysBoxEmitter.h"
+#include "../../include/obj/NiPSysColliderManager.h"
+#include "../../include/obj/NiPSysColorModifier.h"
+#include "../../include/obj/NiPSysCylinderEmitter.h"
+#include "../../include/obj/NiPSysData.h"
+#include "../../include/obj/NiPSysDragModifier.h"
+#include "../../include/obj/NiPSysEmitterCtlr.h"
+#include "../../include/obj/NiPSysEmitterCtlrData.h"
+#include "../../include/obj/NiPSysEmitterDeclinationCtlr.h"
+#include "../../include/obj/NiPSysEmitterDeclinationVarCtlr.h"
+#include "../../include/obj/NiPSysEmitterInitialRadiusCtlr.h"
+#include "../../include/obj/NiPSysEmitterLifeSpanCtlr.h"
+#include "../../include/obj/NiPSysEmitterSpeedCtlr.h"
+#include "../../include/obj/NiPSysGravityModifier.h"
+#include "../../include/obj/NiPSysGravityStrengthCtlr.h"
+#include "../../include/obj/NiPSysGrowFadeModifier.h"
+#include "../../include/obj/NiPSysMeshEmitter.h"
+#include "../../include/obj/NiPSysMeshUpdateModifier.h"
+#include "../../include/obj/NiPSysModifierActiveCtlr.h"
+#include "../../include/obj/NiPSysPlanarCollider.h"
+#include "../../include/obj/NiPSysPositionModifier.h"
+#include "../../include/obj/NiPSysResetOnLoopCtlr.h"
+#include "../../include/obj/NiPSysRotationModifier.h"
+#include "../../include/obj/NiPSysSpawnModifier.h"
+#include "../../include/obj/NiPSysSphereEmitter.h"
+#include "../../include/obj/NiPSysUpdateCtlr.h"
+#include "../../include/obj/NiRangeLODData.h"
+#include "../../include/obj/NiScreenLODData.h"
+#include "../../include/obj/NiRotatingParticles.h"
+#include "../../include/obj/NiRotatingParticlesData.h"
+#include "../../include/obj/NiSequenceStreamHelper.h"
+#include "../../include/obj/NiShadeProperty.h"
+#include "../../include/obj/NiSkinData.h"
+#include "../../include/obj/NiSkinInstance.h"
+#include "../../include/obj/NiSkinPartition.h"
+#include "../../include/obj/NiSourceTexture.h"
+#include "../../include/obj/NiSpecularProperty.h"
+#include "../../include/obj/NiSphericalCollider.h"
+#include "../../include/obj/NiSpotLight.h"
+#include "../../include/obj/NiStencilProperty.h"
+#include "../../include/obj/NiStringExtraData.h"
+#include "../../include/obj/NiStringPalette.h"
+#include "../../include/obj/NiStringsExtraData.h"
+#include "../../include/obj/NiTextKeyExtraData.h"
+#include "../../include/obj/NiTextureEffect.h"
+#include "../../include/obj/NiTextureTransformController.h"
+#include "../../include/obj/NiTexturingProperty.h"
+#include "../../include/obj/NiTransformController.h"
+#include "../../include/obj/NiTransformData.h"
+#include "../../include/obj/NiTransformInterpolator.h"
+#include "../../include/obj/NiTriShape.h"
+#include "../../include/obj/NiTriShapeData.h"
+#include "../../include/obj/NiTriStrips.h"
+#include "../../include/obj/NiTriStripsData.h"
+#include "../../include/obj/NiUVController.h"
+#include "../../include/obj/NiUVData.h"
+#include "../../include/obj/NiVectorExtraData.h"
+#include "../../include/obj/NiVertexColorProperty.h"
+#include "../../include/obj/NiVertWeightsExtraData.h"
+#include "../../include/obj/NiVisController.h"
+#include "../../include/obj/NiVisData.h"
+#include "../../include/obj/NiWireframeProperty.h"
+#include "../../include/obj/NiZBufferProperty.h"
+#include "../../include/obj/RootCollisionNode.h"
 
 void NiObject::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) {
 }
diff --git a/src/kfm.cpp b/src/kfm.cpp
index 81399a4f..5dcb4cf5 100644
--- a/src/kfm.cpp
+++ b/src/kfm.cpp
@@ -1,9 +1,9 @@
 //--Kfm Functions--//
 
-#include "kfm.h"
-#include "niflib.h"
-#include "NIF_IO.h"
-#include "obj/NiObject.h"
+#include "../include/kfm.h"
+#include "../include/niflib.h"
+#include "../include/NIF_IO.h"
+#include "../include/obj/NiObject.h"
 
 namespace Niflib {
 
diff --git a/src/nif_math.cpp b/src/nif_math.cpp
index 79cc7fcb..91023cf6 100644
--- a/src/nif_math.cpp
+++ b/src/nif_math.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "nif_math.h"
+#include "../include/nif_math.h"
 #include <iomanip>
 using namespace Niflib;
 
diff --git a/src/niflib.cpp b/src/niflib.cpp
index bfb69620..89ab6d03 100644
--- a/src/niflib.cpp
+++ b/src/niflib.cpp
@@ -7,27 +7,27 @@ All rights reserved.  Please see niflib.h for licence. */
 //#define DEBUG_LINK_PHASE
 //#define DEBUG_HEADER_FOOTER
 
-#include "niflib.h"
-#include "NIF_IO.h"
-#include "kfm.h"
-#include "obj/NiObject.h"
-#include "obj/NiNode.h"
-#include "obj/NiAVObject.h"
-#include "obj/NiTextKeyExtraData.h"
-#include "obj/NiSequenceStreamHelper.h"
-#include "obj/NiControllerSequence.h"
-#include "obj/NiStringPalette.h"
-#include "obj/NiSkinPartition.h"
-#include "obj/NiTimeController.h"
-#include "obj/NiSingleInterpolatorController.h"
-#include "obj/NiInterpolator.h"
-#include "obj/NiKeyframeController.h"
-#include "obj/NiKeyframeData.h"
-#include "obj/NiStringExtraData.h"
-#include "obj/NiExtraData.h"
-#include "obj/bhkRigidBody.h"
-#include "gen/header.h"
-#include "gen/footer.h"
+#include "../include/niflib.h"
+#include "../include/NIF_IO.h"
+#include "../include/kfm.h"
+#include "../include/obj/NiObject.h"
+#include "../include/obj/NiNode.h"
+#include "../include/obj/NiAVObject.h"
+#include "../include/obj/NiTextKeyExtraData.h"
+#include "../include/obj/NiSequenceStreamHelper.h"
+#include "../include/obj/NiControllerSequence.h"
+#include "../include/obj/NiStringPalette.h"
+#include "../include/obj/NiSkinPartition.h"
+#include "../include/obj/NiTimeController.h"
+#include "../include/obj/NiSingleInterpolatorController.h"
+#include "../include/obj/NiInterpolator.h"
+#include "../include/obj/NiKeyframeController.h"
+#include "../include/obj/NiKeyframeData.h"
+#include "../include/obj/NiStringExtraData.h"
+#include "../include/obj/NiExtraData.h"
+#include "../include/obj/bhkRigidBody.h"
+#include "../include/gen/header.h"
+#include "../include/gen/footer.h"
 
 namespace Niflib {
 
diff --git a/src/obj/ABoneLODController.cpp b/src/obj/ABoneLODController.cpp
index a3d47c39..1fbaf9cd 100644
--- a/src/obj/ABoneLODController.cpp
+++ b/src/obj/ABoneLODController.cpp
@@ -1,9 +1,9 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "ABoneLODController.h"
-#include "../gen/NodeGroup.h"
-#include "NiNode.h"
+#include "../../include/obj/ABoneLODController.h"
+#include "../../include/gen/NodeGroup.h"
+#include "../../include/obj/NiNode.h"
 #include <algorithm>
 using namespace Niflib;
 
diff --git a/src/obj/AKeyedData.cpp b/src/obj/AKeyedData.cpp
index c85cfbf6..e201c773 100644
--- a/src/obj/AKeyedData.cpp
+++ b/src/obj/AKeyedData.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "AKeyedData.h"
+#include "../../include/obj/AKeyedData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/APSysCtlr.cpp b/src/obj/APSysCtlr.cpp
index e507939a..31582f1b 100644
--- a/src/obj/APSysCtlr.cpp
+++ b/src/obj/APSysCtlr.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "APSysCtlr.h"
+#include "../../include/obj/APSysCtlr.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/APSysData.cpp b/src/obj/APSysData.cpp
index d9f09ff5..77be9b72 100644
--- a/src/obj/APSysData.cpp
+++ b/src/obj/APSysData.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "APSysData.h"
+#include "../../include/obj/APSysData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/AParticleModifier.cpp b/src/obj/AParticleModifier.cpp
index 7fa23b95..d2b604df 100644
--- a/src/obj/AParticleModifier.cpp
+++ b/src/obj/AParticleModifier.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "AParticleModifier.h"
-#include "NiParticleSystemController.h"
+#include "../../include/obj/AParticleModifier.h"
+#include "../../include/obj/NiParticleSystemController.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/AbhkConstraint.cpp b/src/obj/AbhkConstraint.cpp
index 9b0b72b2..582cd5be 100644
--- a/src/obj/AbhkConstraint.cpp
+++ b/src/obj/AbhkConstraint.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "AbhkConstraint.h"
-#include "bhkShape.h"
+#include "../../include/obj/AbhkConstraint.h"
+#include "../../include/obj/bhkShape.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/AbhkRagdollConstraint.cpp b/src/obj/AbhkRagdollConstraint.cpp
index 3a5578ef..f638f6df 100644
--- a/src/obj/AbhkRagdollConstraint.cpp
+++ b/src/obj/AbhkRagdollConstraint.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "AbhkRagdollConstraint.h"
+#include "../../include/obj/AbhkRagdollConstraint.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/AbhkShapeCollection.cpp b/src/obj/AbhkShapeCollection.cpp
index 723ff37b..15861838 100644
--- a/src/obj/AbhkShapeCollection.cpp
+++ b/src/obj/AbhkShapeCollection.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "AbhkShapeCollection.h"
+#include "../../include/obj/AbhkShapeCollection.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/AvoidNode.cpp b/src/obj/AvoidNode.cpp
index 4ba8165e..f3c9f074 100644
--- a/src/obj/AvoidNode.cpp
+++ b/src/obj/AvoidNode.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "AvoidNode.h"
+#include "../../include/obj/AvoidNode.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/BSBound.cpp b/src/obj/BSBound.cpp
index f9a13691..6e7d48a3 100644
--- a/src/obj/BSBound.cpp
+++ b/src/obj/BSBound.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "BSBound.h"
+#include "../../include/obj/BSBound.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/BSFurnitureMarker.cpp b/src/obj/BSFurnitureMarker.cpp
index f0c4fd9e..86ec09ca 100644
--- a/src/obj/BSFurnitureMarker.cpp
+++ b/src/obj/BSFurnitureMarker.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "BSFurnitureMarker.h"
-#include "../gen/FurniturePosition.h"
+#include "../../include/obj/BSFurnitureMarker.h"
+#include "../../include/gen/FurniturePosition.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/BSKeyframeController.cpp b/src/obj/BSKeyframeController.cpp
index 0a88a4d6..c58ab24a 100644
--- a/src/obj/BSKeyframeController.cpp
+++ b/src/obj/BSKeyframeController.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "BSKeyframeController.h"
-#include "NiKeyframeData.h"
+#include "../../include/obj/BSKeyframeController.h"
+#include "../../include/obj/NiKeyframeData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/BSPSysArrayEmitter.cpp b/src/obj/BSPSysArrayEmitter.cpp
index e09b5701..4eb28f4b 100644
--- a/src/obj/BSPSysArrayEmitter.cpp
+++ b/src/obj/BSPSysArrayEmitter.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "BSPSysArrayEmitter.h"
+#include "../../include/obj/BSPSysArrayEmitter.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/BSParentVelocityModifier.cpp b/src/obj/BSParentVelocityModifier.cpp
index 8a95f216..66462f93 100644
--- a/src/obj/BSParentVelocityModifier.cpp
+++ b/src/obj/BSParentVelocityModifier.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "BSParentVelocityModifier.h"
+#include "../../include/obj/BSParentVelocityModifier.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/BSXFlags.cpp b/src/obj/BSXFlags.cpp
index d5e99735..6c545883 100644
--- a/src/obj/BSXFlags.cpp
+++ b/src/obj/BSXFlags.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "BSXFlags.h"
+#include "../../include/obj/BSXFlags.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/FxButton.cpp b/src/obj/FxButton.cpp
index 761bbc1d..87c33914 100644
--- a/src/obj/FxButton.cpp
+++ b/src/obj/FxButton.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "FxButton.h"
+#include "../../include/obj/FxButton.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/FxRadioButton.cpp b/src/obj/FxRadioButton.cpp
index ff5cbebf..c63c7a80 100644
--- a/src/obj/FxRadioButton.cpp
+++ b/src/obj/FxRadioButton.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "FxRadioButton.h"
-#include "NiObject.h"
+#include "../../include/obj/FxRadioButton.h"
+#include "../../include/obj/NiObject.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/FxWidget.cpp b/src/obj/FxWidget.cpp
index a07b05b3..3e229c8d 100644
--- a/src/obj/FxWidget.cpp
+++ b/src/obj/FxWidget.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "FxWidget.h"
+#include "../../include/obj/FxWidget.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiAVObject.cpp b/src/obj/NiAVObject.cpp
index 81e3a750..658b1215 100644
--- a/src/obj/NiAVObject.cpp
+++ b/src/obj/NiAVObject.cpp
@@ -1,11 +1,11 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiAVObject.h"
-#include "NiNode.h"
-#include "NiProperty.h"
-#include "NiCollisionData.h"
-#include "NiCollisionObject.h"
+#include "../../include/obj/NiAVObject.h"
+#include "../../include/obj/NiNode.h"
+#include "../../include/obj/NiProperty.h"
+#include "../../include/obj/NiCollisionData.h"
+#include "../../include/obj/NiCollisionObject.h"
 using namespace Niflib;
 
 
diff --git a/src/obj/NiAlphaController.cpp b/src/obj/NiAlphaController.cpp
index b05637de..18e779f0 100644
--- a/src/obj/NiAlphaController.cpp
+++ b/src/obj/NiAlphaController.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiAlphaController.h"
-#include "NiFloatData.h"
+#include "../../include/obj/NiAlphaController.h"
+#include "../../include/obj/NiFloatData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiAlphaProperty.cpp b/src/obj/NiAlphaProperty.cpp
index baec44a2..232db5a1 100644
--- a/src/obj/NiAlphaProperty.cpp
+++ b/src/obj/NiAlphaProperty.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiAlphaProperty.h"
+#include "../../include/obj/NiAlphaProperty.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiAmbientLight.cpp b/src/obj/NiAmbientLight.cpp
index af9ff5a7..2b810bd8 100644
--- a/src/obj/NiAmbientLight.cpp
+++ b/src/obj/NiAmbientLight.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiAmbientLight.h"
+#include "../../include/obj/NiAmbientLight.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiAutoNormalParticles.cpp b/src/obj/NiAutoNormalParticles.cpp
index d1c25823..7511ff86 100644
--- a/src/obj/NiAutoNormalParticles.cpp
+++ b/src/obj/NiAutoNormalParticles.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiAutoNormalParticles.h"
+#include "../../include/obj/NiAutoNormalParticles.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiAutoNormalParticlesData.cpp b/src/obj/NiAutoNormalParticlesData.cpp
index cd795233..b212c2a2 100644
--- a/src/obj/NiAutoNormalParticlesData.cpp
+++ b/src/obj/NiAutoNormalParticlesData.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiAutoNormalParticlesData.h"
+#include "../../include/obj/NiAutoNormalParticlesData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiBSAnimationNode.cpp b/src/obj/NiBSAnimationNode.cpp
index 815a96d5..bb257bf3 100644
--- a/src/obj/NiBSAnimationNode.cpp
+++ b/src/obj/NiBSAnimationNode.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiBSAnimationNode.h"
+#include "../../include/obj/NiBSAnimationNode.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiBSBoneLODController.cpp b/src/obj/NiBSBoneLODController.cpp
index 7a953269..6fd795b2 100644
--- a/src/obj/NiBSBoneLODController.cpp
+++ b/src/obj/NiBSBoneLODController.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiBSBoneLODController.h"
+#include "../../include/obj/NiBSBoneLODController.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiBSPArrayController.cpp b/src/obj/NiBSPArrayController.cpp
index a1a2df75..b4d003fb 100644
--- a/src/obj/NiBSPArrayController.cpp
+++ b/src/obj/NiBSPArrayController.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiBSPArrayController.h"
+#include "../../include/obj/NiBSPArrayController.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiBSParticleNode.cpp b/src/obj/NiBSParticleNode.cpp
index 319711cb..60d4ee9a 100644
--- a/src/obj/NiBSParticleNode.cpp
+++ b/src/obj/NiBSParticleNode.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiBSParticleNode.h"
+#include "../../include/obj/NiBSParticleNode.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiBSplineBasisData.cpp b/src/obj/NiBSplineBasisData.cpp
index 18b50aac..33e336e8 100644
--- a/src/obj/NiBSplineBasisData.cpp
+++ b/src/obj/NiBSplineBasisData.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiBSplineBasisData.h"
+#include "../../include/obj/NiBSplineBasisData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiBSplineCompFloatInterpolator.cpp b/src/obj/NiBSplineCompFloatInterpolator.cpp
index abe1fa6e..a45de581 100644
--- a/src/obj/NiBSplineCompFloatInterpolator.cpp
+++ b/src/obj/NiBSplineCompFloatInterpolator.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiBSplineCompFloatInterpolator.h"
+#include "../../include/obj/NiBSplineCompFloatInterpolator.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiBSplineCompPoint3Interpolator.cpp b/src/obj/NiBSplineCompPoint3Interpolator.cpp
index 0e2d2d52..8ecf3bb9 100644
--- a/src/obj/NiBSplineCompPoint3Interpolator.cpp
+++ b/src/obj/NiBSplineCompPoint3Interpolator.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiBSplineCompPoint3Interpolator.h"
+#include "../../include/obj/NiBSplineCompPoint3Interpolator.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiBSplineCompTransformInterpolator.cpp b/src/obj/NiBSplineCompTransformInterpolator.cpp
index b5791f5c..fe9ea520 100644
--- a/src/obj/NiBSplineCompTransformInterpolator.cpp
+++ b/src/obj/NiBSplineCompTransformInterpolator.cpp
@@ -1,9 +1,9 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiBSplineCompTransformInterpolator.h"
-#include "NiBSplineBasisData.h"
-#include "NiBSplineData.h"
+#include "../../include/obj/NiBSplineCompTransformInterpolator.h"
+#include "../../include/obj/NiBSplineBasisData.h"
+#include "../../include/obj/NiBSplineData.h"
 using namespace Niflib;
 
 static const int SizeofQuat = 4;
diff --git a/src/obj/NiBSplineData.cpp b/src/obj/NiBSplineData.cpp
index 91cc61bb..c2fe7183 100644
--- a/src/obj/NiBSplineData.cpp
+++ b/src/obj/NiBSplineData.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiBSplineData.h"
+#include "../../include/obj/NiBSplineData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiBSplineInterpolator.cpp b/src/obj/NiBSplineInterpolator.cpp
index 4a1d1dd2..d159d874 100644
--- a/src/obj/NiBSplineInterpolator.cpp
+++ b/src/obj/NiBSplineInterpolator.cpp
@@ -1,9 +1,9 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiBSplineInterpolator.h"
-#include "NiBSplineData.h"
-#include "NiBSplineBasisData.h"
+#include "../../include/obj/NiBSplineInterpolator.h"
+#include "../../include/obj/NiBSplineData.h"
+#include "../../include/obj/NiBSplineBasisData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiBillboardNode.cpp b/src/obj/NiBillboardNode.cpp
index 9eebfe91..14b82ffa 100644
--- a/src/obj/NiBillboardNode.cpp
+++ b/src/obj/NiBillboardNode.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiBillboardNode.h"
+#include "../../include/obj/NiBillboardNode.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiBinaryExtraData.cpp b/src/obj/NiBinaryExtraData.cpp
index 3ac3982e..462ca0eb 100644
--- a/src/obj/NiBinaryExtraData.cpp
+++ b/src/obj/NiBinaryExtraData.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiBinaryExtraData.h"
-#include "../gen/ByteArray.h"
+#include "../../include/obj/NiBinaryExtraData.h"
+#include "../../include/gen/ByteArray.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiBlendBoolInterpolator.cpp b/src/obj/NiBlendBoolInterpolator.cpp
index 270fbb52..2bf6e86e 100644
--- a/src/obj/NiBlendBoolInterpolator.cpp
+++ b/src/obj/NiBlendBoolInterpolator.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiBlendBoolInterpolator.h"
+#include "../../include/obj/NiBlendBoolInterpolator.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiBlendFloatInterpolator.cpp b/src/obj/NiBlendFloatInterpolator.cpp
index a488e850..3b177c7a 100644
--- a/src/obj/NiBlendFloatInterpolator.cpp
+++ b/src/obj/NiBlendFloatInterpolator.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiBlendFloatInterpolator.h"
+#include "../../include/obj/NiBlendFloatInterpolator.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiBlendInterpolator.cpp b/src/obj/NiBlendInterpolator.cpp
index 38a796fc..5f21ff2c 100644
--- a/src/obj/NiBlendInterpolator.cpp
+++ b/src/obj/NiBlendInterpolator.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiBlendInterpolator.h"
+#include "../../include/obj/NiBlendInterpolator.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiBlendPoint3Interpolator.cpp b/src/obj/NiBlendPoint3Interpolator.cpp
index 5322ffcc..1b48c8fc 100644
--- a/src/obj/NiBlendPoint3Interpolator.cpp
+++ b/src/obj/NiBlendPoint3Interpolator.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiBlendPoint3Interpolator.h"
+#include "../../include/obj/NiBlendPoint3Interpolator.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiBlendTransformInterpolator.cpp b/src/obj/NiBlendTransformInterpolator.cpp
index 888e6fbf..c0ef29ac 100644
--- a/src/obj/NiBlendTransformInterpolator.cpp
+++ b/src/obj/NiBlendTransformInterpolator.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiBlendTransformInterpolator.h"
+#include "../../include/obj/NiBlendTransformInterpolator.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiBoneLODController.cpp b/src/obj/NiBoneLODController.cpp
index 8f25c4d1..06405920 100644
--- a/src/obj/NiBoneLODController.cpp
+++ b/src/obj/NiBoneLODController.cpp
@@ -1,12 +1,11 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiBoneLODController.h"
-#include "../gen/SkinShapeGroup.h"
-#include "../gen/SkinShape.h"
-#include "NiTriShape.h"
-#include "NiSkinInstance.h"
-#include "NiTriShape.h"
+#include "../../include/obj/NiBoneLODController.h"
+#include "../../include/gen/SkinShapeGroup.h"
+#include "../../include/gen/SkinShape.h"
+#include "../../include/obj/NiTriShape.h"
+#include "../../include/obj/NiSkinInstance.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiBoolData.cpp b/src/obj/NiBoolData.cpp
index 3696e627..dc4160e9 100644
--- a/src/obj/NiBoolData.cpp
+++ b/src/obj/NiBoolData.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiBoolData.h"
-#include "../gen/KeyGroup.h"
+#include "../../include/obj/NiBoolData.h"
+#include "../../include/gen/KeyGroup.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiBoolInterpolator.cpp b/src/obj/NiBoolInterpolator.cpp
index d90140ce..ef47d79b 100644
--- a/src/obj/NiBoolInterpolator.cpp
+++ b/src/obj/NiBoolInterpolator.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiBoolInterpolator.h"
-#include "NiBoolData.h"
+#include "../../include/obj/NiBoolInterpolator.h"
+#include "../../include/obj/NiBoolData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiBoolTimelineInterpolator.cpp b/src/obj/NiBoolTimelineInterpolator.cpp
index 4875ca95..95dd6d24 100644
--- a/src/obj/NiBoolTimelineInterpolator.cpp
+++ b/src/obj/NiBoolTimelineInterpolator.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiBoolTimelineInterpolator.h"
-#include "NiBoolData.h"
+#include "../../include/obj/NiBoolTimelineInterpolator.h"
+#include "../../include/obj/NiBoolData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiBooleanExtraData.cpp b/src/obj/NiBooleanExtraData.cpp
index 6dc96548..213798d3 100644
--- a/src/obj/NiBooleanExtraData.cpp
+++ b/src/obj/NiBooleanExtraData.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiBooleanExtraData.h"
+#include "../../include/obj/NiBooleanExtraData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiCamera.cpp b/src/obj/NiCamera.cpp
index 0f708ba5..3495653c 100644
--- a/src/obj/NiCamera.cpp
+++ b/src/obj/NiCamera.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiCamera.h"
-#include "NiObject.h"
+#include "../../include/obj/NiCamera.h"
+#include "../../include/obj/NiObject.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiCollisionData.cpp b/src/obj/NiCollisionData.cpp
index 23743da5..9f7b3f36 100644
--- a/src/obj/NiCollisionData.cpp
+++ b/src/obj/NiCollisionData.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiCollisionData.h"
-#include "NiNode.h"
+#include "../../include/obj/NiCollisionData.h"
+#include "../../include/obj/NiNode.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiCollisionObject.cpp b/src/obj/NiCollisionObject.cpp
index 2a540adb..7780ace7 100644
--- a/src/obj/NiCollisionObject.cpp
+++ b/src/obj/NiCollisionObject.cpp
@@ -1,9 +1,9 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiCollisionObject.h"
-#include "NiAVObject.h"
-#include "NiObject.h"
+#include "../../include/obj/NiCollisionObject.h"
+#include "../../include/obj/NiAVObject.h"
+#include "../../include/obj/NiObject.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiColorData.cpp b/src/obj/NiColorData.cpp
index 9dd50fcc..6f69fa24 100644
--- a/src/obj/NiColorData.cpp
+++ b/src/obj/NiColorData.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiColorData.h"
-#include "../gen/KeyGroup.h"
+#include "../../include/obj/NiColorData.h"
+#include "../../include/gen/KeyGroup.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiColorExtraData.cpp b/src/obj/NiColorExtraData.cpp
index 96de744a..6c0604f9 100644
--- a/src/obj/NiColorExtraData.cpp
+++ b/src/obj/NiColorExtraData.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiColorExtraData.h"
+#include "../../include/obj/NiColorExtraData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiControllerManager.cpp b/src/obj/NiControllerManager.cpp
index c2304cc2..b08e6f63 100644
--- a/src/obj/NiControllerManager.cpp
+++ b/src/obj/NiControllerManager.cpp
@@ -1,9 +1,9 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiControllerManager.h"
-#include "NiControllerSequence.h"
-#include "NiDefaultAVObjectPalette.h"
+#include "../../include/obj/NiControllerManager.h"
+#include "../../include/obj/NiControllerSequence.h"
+#include "../../include/obj/NiDefaultAVObjectPalette.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiControllerSequence.cpp b/src/obj/NiControllerSequence.cpp
index f1b1c1fd..0abb5c94 100644
--- a/src/obj/NiControllerSequence.cpp
+++ b/src/obj/NiControllerSequence.cpp
@@ -1,23 +1,19 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiControllerSequence.h"
-#include "../gen/ControllerLink.h"
-#include "NiInterpolator.h"
-#include "NiObject.h"
-#include "NiStringPalette.h"
-#include "../gen/ControllerLink.h"
-#include "NiInterpolator.h"
-#include "NiObject.h"
-#include "NiStringPalette.h"
-#include "NiTextKeyExtraData.h"
-#include "NiControllerManager.h"
-#include "NiStringPalette.h"
-#include "NiTimeController.h"
-#include "NiSingleInterpolatorController.h"
-#include "NiObjectNET.h"
-#include "NiProperty.h"
-#include "NiStringPalette.h"
+#include "../../include/obj/NiControllerSequence.h"
+#include "../../include/gen/ControllerLink.h"
+#include "../../include/obj/NiInterpolator.h"
+#include "../../include/obj/NiObject.h"
+#include "../../include/obj/NiStringPalette.h"
+#include "../../include/gen/ControllerLink.h"
+#include "../../include/obj/NiTextKeyExtraData.h"
+#include "../../include/obj/NiControllerManager.h"
+#include "../../include/obj/NiTimeController.h"
+#include "../../include/obj/NiSingleInterpolatorController.h"
+#include "../../include/obj/NiObjectNET.h"
+#include "../../include/obj/NiProperty.h"
+
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiDefaultAVObjectPalette.cpp b/src/obj/NiDefaultAVObjectPalette.cpp
index 8d0679f4..13696c3b 100644
--- a/src/obj/NiDefaultAVObjectPalette.cpp
+++ b/src/obj/NiDefaultAVObjectPalette.cpp
@@ -1,9 +1,9 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiDefaultAVObjectPalette.h"
-#include "../gen/AVObject.h"
-#include "NiAVObject.h"
+#include "../../include/obj/NiDefaultAVObjectPalette.h"
+#include "../../include/gen/AVObject.h"
+#include "../../include/obj/NiAVObject.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiDirectionalLight.cpp b/src/obj/NiDirectionalLight.cpp
index bf142a37..a26e8adb 100644
--- a/src/obj/NiDirectionalLight.cpp
+++ b/src/obj/NiDirectionalLight.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiDirectionalLight.h"
+#include "../../include/obj/NiDirectionalLight.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiDitherProperty.cpp b/src/obj/NiDitherProperty.cpp
index f916c6b9..c0f868f4 100644
--- a/src/obj/NiDitherProperty.cpp
+++ b/src/obj/NiDitherProperty.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiDitherProperty.h"
+#include "../../include/obj/NiDitherProperty.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiDynamicEffect.cpp b/src/obj/NiDynamicEffect.cpp
index b474736f..88c1f157 100644
--- a/src/obj/NiDynamicEffect.cpp
+++ b/src/obj/NiDynamicEffect.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiDynamicEffect.h"
-#include "NiAVObject.h"
+#include "../../include/obj/NiDynamicEffect.h"
+#include "../../include/obj/NiAVObject.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiExtraData.cpp b/src/obj/NiExtraData.cpp
index 9ba79c20..73c55552 100644
--- a/src/obj/NiExtraData.cpp
+++ b/src/obj/NiExtraData.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiExtraData.h"
+#include "../../include/obj/NiExtraData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiFlipController.cpp b/src/obj/NiFlipController.cpp
index a752354e..ae9711f5 100644
--- a/src/obj/NiFlipController.cpp
+++ b/src/obj/NiFlipController.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiFlipController.h"
-#include "NiSourceTexture.h"
+#include "../../include/obj/NiFlipController.h"
+#include "../../include/obj/NiSourceTexture.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiFloatData.cpp b/src/obj/NiFloatData.cpp
index 1794575e..8dc8d688 100644
--- a/src/obj/NiFloatData.cpp
+++ b/src/obj/NiFloatData.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiFloatData.h"
-#include "../gen/KeyGroup.h"
+#include "../../include/obj/NiFloatData.h"
+#include "../../include/gen/KeyGroup.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiFloatExtraData.cpp b/src/obj/NiFloatExtraData.cpp
index adee5016..b11eff52 100644
--- a/src/obj/NiFloatExtraData.cpp
+++ b/src/obj/NiFloatExtraData.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiFloatExtraData.h"
+#include "../../include/obj/NiFloatExtraData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiFloatExtraDataController.cpp b/src/obj/NiFloatExtraDataController.cpp
index 73342244..4b4fd9b9 100644
--- a/src/obj/NiFloatExtraDataController.cpp
+++ b/src/obj/NiFloatExtraDataController.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiFloatExtraDataController.h"
-#include "NiObject.h"
+#include "../../include/obj/NiFloatExtraDataController.h"
+#include "../../include/obj/NiObject.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiFloatInterpolator.cpp b/src/obj/NiFloatInterpolator.cpp
index 73f25f68..9ea6f2ef 100644
--- a/src/obj/NiFloatInterpolator.cpp
+++ b/src/obj/NiFloatInterpolator.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiFloatInterpolator.h"
-#include "NiFloatData.h"
+#include "../../include/obj/NiFloatInterpolator.h"
+#include "../../include/obj/NiFloatData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiFloatsExtraData.cpp b/src/obj/NiFloatsExtraData.cpp
index 4d2c8080..bb673bf8 100644
--- a/src/obj/NiFloatsExtraData.cpp
+++ b/src/obj/NiFloatsExtraData.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiFloatsExtraData.h"
+#include "../../include/obj/NiFloatsExtraData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiFogProperty.cpp b/src/obj/NiFogProperty.cpp
index a93c4cd8..f89e4006 100644
--- a/src/obj/NiFogProperty.cpp
+++ b/src/obj/NiFogProperty.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiFogProperty.h"
+#include "../../include/obj/NiFogProperty.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiGeomMorpherController.cpp b/src/obj/NiGeomMorpherController.cpp
index 740c2605..41ef1216 100644
--- a/src/obj/NiGeomMorpherController.cpp
+++ b/src/obj/NiGeomMorpherController.cpp
@@ -1,9 +1,9 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiGeomMorpherController.h"
-#include "NiMorphData.h"
-#include "NiInterpolator.h"
+#include "../../include/obj/NiGeomMorpherController.h"
+#include "../../include/obj/NiMorphData.h"
+#include "../../include/obj/NiInterpolator.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiGravity.cpp b/src/obj/NiGravity.cpp
index 491fae86..ee33a55e 100644
--- a/src/obj/NiGravity.cpp
+++ b/src/obj/NiGravity.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiGravity.h"
+#include "../../include/obj/NiGravity.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiIntegerExtraData.cpp b/src/obj/NiIntegerExtraData.cpp
index 7876cc19..f0bd28b8 100644
--- a/src/obj/NiIntegerExtraData.cpp
+++ b/src/obj/NiIntegerExtraData.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiIntegerExtraData.h"
+#include "../../include/obj/NiIntegerExtraData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiIntegersExtraData.cpp b/src/obj/NiIntegersExtraData.cpp
index 555d0ebc..66672497 100644
--- a/src/obj/NiIntegersExtraData.cpp
+++ b/src/obj/NiIntegersExtraData.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiIntegersExtraData.h"
+#include "../../include/obj/NiIntegersExtraData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiInterpolator.cpp b/src/obj/NiInterpolator.cpp
index a8cf80bf..4d1b78a4 100644
--- a/src/obj/NiInterpolator.cpp
+++ b/src/obj/NiInterpolator.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiInterpolator.h"
+#include "../../include/obj/NiInterpolator.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiKeyframeController.cpp b/src/obj/NiKeyframeController.cpp
index d079e6e2..46d01d4a 100644
--- a/src/obj/NiKeyframeController.cpp
+++ b/src/obj/NiKeyframeController.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiKeyframeController.h"
-#include "NiKeyframeData.h"
+#include "../../include/obj/NiKeyframeController.h"
+#include "../../include/obj/NiKeyframeData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiKeyframeData.cpp b/src/obj/NiKeyframeData.cpp
index c99f8edc..2dac08ca 100644
--- a/src/obj/NiKeyframeData.cpp
+++ b/src/obj/NiKeyframeData.cpp
@@ -1,10 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiKeyframeData.h"
-#include "../gen/KeyGroup.h"
-#include "../gen/KeyGroup.h"
-#include "../gen/KeyGroup.h"
+#include "../../include/obj/NiKeyframeData.h"
+#include "../../include/gen/KeyGroup.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiLODData.cpp b/src/obj/NiLODData.cpp
index 830f9d3b..5029d088 100644
--- a/src/obj/NiLODData.cpp
+++ b/src/obj/NiLODData.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiLODData.h"
+#include "../../include/obj/NiLODData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiLODNode.cpp b/src/obj/NiLODNode.cpp
index 31ce01b0..f8b0d5c8 100644
--- a/src/obj/NiLODNode.cpp
+++ b/src/obj/NiLODNode.cpp
@@ -1,9 +1,9 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiLODNode.h"
-#include "../gen/LODRange.h"
-#include "NiRangeLODData.h"
+#include "../../include/obj/NiLODNode.h"
+#include "../../include/gen/LODRange.h"
+#include "../../include/obj/NiRangeLODData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiLight.cpp b/src/obj/NiLight.cpp
index 4eeaf99a..ccc1dcc8 100644
--- a/src/obj/NiLight.cpp
+++ b/src/obj/NiLight.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiLight.h"
+#include "../../include/obj/NiLight.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiLightColorController.cpp b/src/obj/NiLightColorController.cpp
index 399d6b41..80015abe 100644
--- a/src/obj/NiLightColorController.cpp
+++ b/src/obj/NiLightColorController.cpp
@@ -1,9 +1,9 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiLightColorController.h"
-#include "NiPosData.h"
-#include "NiPoint3Interpolator.h"
+#include "../../include/obj/NiLightColorController.h"
+#include "../../include/obj/NiPosData.h"
+#include "../../include/obj/NiPoint3Interpolator.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiLightDimmerController.cpp b/src/obj/NiLightDimmerController.cpp
index b6bbf7e9..2d86c621 100644
--- a/src/obj/NiLightDimmerController.cpp
+++ b/src/obj/NiLightDimmerController.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiLightDimmerController.h"
-#include "NiInterpolator.h"
+#include "../../include/obj/NiLightDimmerController.h"
+#include "../../include/obj/NiInterpolator.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiLookAtController.cpp b/src/obj/NiLookAtController.cpp
index 81cc4d72..056ac84f 100644
--- a/src/obj/NiLookAtController.cpp
+++ b/src/obj/NiLookAtController.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiLookAtController.h"
-#include "NiNode.h"
+#include "../../include/obj/NiLookAtController.h"
+#include "../../include/obj/NiNode.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiLookAtInterpolator.cpp b/src/obj/NiLookAtInterpolator.cpp
index 9cde9c8d..4735a7f7 100644
--- a/src/obj/NiLookAtInterpolator.cpp
+++ b/src/obj/NiLookAtInterpolator.cpp
@@ -1,10 +1,10 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiLookAtInterpolator.h"
-#include "NiNode.h"
-#include "NiPoint3Interpolator.h"
-#include "NiFloatInterpolator.h"
+#include "../../include/obj/NiLookAtInterpolator.h"
+#include "../../include/obj/NiNode.h"
+#include "../../include/obj/NiPoint3Interpolator.h"
+#include "../../include/obj/NiFloatInterpolator.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiMaterialColorController.cpp b/src/obj/NiMaterialColorController.cpp
index 67c00271..868be206 100644
--- a/src/obj/NiMaterialColorController.cpp
+++ b/src/obj/NiMaterialColorController.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiMaterialColorController.h"
-#include "NiPosData.h"
+#include "../../include/obj/NiMaterialColorController.h"
+#include "../../include/obj/NiPosData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiMaterialProperty.cpp b/src/obj/NiMaterialProperty.cpp
index 96d3ab49..0c036848 100644
--- a/src/obj/NiMaterialProperty.cpp
+++ b/src/obj/NiMaterialProperty.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiMaterialProperty.h"
+#include "../../include/obj/NiMaterialProperty.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiMeshPSysData.cpp b/src/obj/NiMeshPSysData.cpp
index e907c482..f28a42c1 100644
--- a/src/obj/NiMeshPSysData.cpp
+++ b/src/obj/NiMeshPSysData.cpp
@@ -1,9 +1,9 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiMeshPSysData.h"
-#include "NiPSysModifier.h"
-#include "NiNode.h"
+#include "../../include/obj/NiMeshPSysData.h"
+#include "../../include/obj/NiPSysModifier.h"
+#include "../../include/obj/NiNode.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiMeshParticleSystem.cpp b/src/obj/NiMeshParticleSystem.cpp
index 25862bc3..0126f8b6 100644
--- a/src/obj/NiMeshParticleSystem.cpp
+++ b/src/obj/NiMeshParticleSystem.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiMeshParticleSystem.h"
+#include "../../include/obj/NiMeshParticleSystem.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiMorphData.cpp b/src/obj/NiMorphData.cpp
index 60921058..e8dedfc2 100644
--- a/src/obj/NiMorphData.cpp
+++ b/src/obj/NiMorphData.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiMorphData.h"
-#include "../gen/Morph.h"
+#include "../../include/obj/NiMorphData.h"
+#include "../../include/gen/Morph.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiMultiTargetTransformController.cpp b/src/obj/NiMultiTargetTransformController.cpp
index c17ca32e..bb27778e 100644
--- a/src/obj/NiMultiTargetTransformController.cpp
+++ b/src/obj/NiMultiTargetTransformController.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiMultiTargetTransformController.h"
-#include "NiNode.h"
+#include "../../include/obj/NiMultiTargetTransformController.h"
+#include "../../include/obj/NiNode.h"
 #include <algorithm>
 using namespace Niflib;
 
diff --git a/src/obj/NiNode.cpp b/src/obj/NiNode.cpp
index 3c6e3de8..09efdbcc 100644
--- a/src/obj/NiNode.cpp
+++ b/src/obj/NiNode.cpp
@@ -1,12 +1,12 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiNode.h"
-#include "NiAVObject.h"
-#include "NiDynamicEffect.h"
-#include "NiSkinInstance.h"
-#include "NiSkinData.h"
-#include "NiTriBasedGeom.h"
+#include "../../include/obj/NiNode.h"
+#include "../../include/obj/NiAVObject.h"
+#include "../../include/obj/NiDynamicEffect.h"
+#include "../../include/obj/NiSkinInstance.h"
+#include "../../include/obj/NiSkinData.h"
+#include "../../include/obj/NiTriBasedGeom.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiObject.cpp b/src/obj/NiObject.cpp
index e2643954..e475ed56 100644
--- a/src/obj/NiObject.cpp
+++ b/src/obj/NiObject.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiObject.h"
-#include "../niflib.h"
+#include "../../include/obj/NiObject.h"
+#include "../../include/niflib.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiObjectNET.cpp b/src/obj/NiObjectNET.cpp
index 183cd57a..b0b42d35 100644
--- a/src/obj/NiObjectNET.cpp
+++ b/src/obj/NiObjectNET.cpp
@@ -1,9 +1,9 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiObjectNET.h"
-#include "NiExtraData.h"
-#include "NiTimeController.h"
+#include "../../include/obj/NiObjectNET.h"
+#include "../../include/obj/NiExtraData.h"
+#include "../../include/obj/NiTimeController.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPSysAgeDeathModifier.cpp b/src/obj/NiPSysAgeDeathModifier.cpp
index fb080542..cd011126 100644
--- a/src/obj/NiPSysAgeDeathModifier.cpp
+++ b/src/obj/NiPSysAgeDeathModifier.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPSysAgeDeathModifier.h"
-#include "NiPSysSpawnModifier.h"
+#include "../../include/obj/NiPSysAgeDeathModifier.h"
+#include "../../include/obj/NiPSysSpawnModifier.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPSysBombModifier.cpp b/src/obj/NiPSysBombModifier.cpp
index 42343ad5..9eefaa97 100644
--- a/src/obj/NiPSysBombModifier.cpp
+++ b/src/obj/NiPSysBombModifier.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPSysBombModifier.h"
-#include "NiNode.h"
+#include "../../include/obj/NiPSysBombModifier.h"
+#include "../../include/obj/NiNode.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPSysBoundUpdateModifier.cpp b/src/obj/NiPSysBoundUpdateModifier.cpp
index 94177a65..9a6a64a0 100644
--- a/src/obj/NiPSysBoundUpdateModifier.cpp
+++ b/src/obj/NiPSysBoundUpdateModifier.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPSysBoundUpdateModifier.h"
+#include "../../include/obj/NiPSysBoundUpdateModifier.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPSysBoxEmitter.cpp b/src/obj/NiPSysBoxEmitter.cpp
index a0ad435b..5e73d22c 100644
--- a/src/obj/NiPSysBoxEmitter.cpp
+++ b/src/obj/NiPSysBoxEmitter.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPSysBoxEmitter.h"
+#include "../../include/obj/NiPSysBoxEmitter.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPSysColliderManager.cpp b/src/obj/NiPSysColliderManager.cpp
index 335a1c8c..d67b5fa4 100644
--- a/src/obj/NiPSysColliderManager.cpp
+++ b/src/obj/NiPSysColliderManager.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPSysColliderManager.h"
-#include "NiPSysPlanarCollider.h"
+#include "../../include/obj/NiPSysColliderManager.h"
+#include "../../include/obj/NiPSysPlanarCollider.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPSysColorModifier.cpp b/src/obj/NiPSysColorModifier.cpp
index 433a0c3f..74947f32 100644
--- a/src/obj/NiPSysColorModifier.cpp
+++ b/src/obj/NiPSysColorModifier.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPSysColorModifier.h"
-#include "NiColorData.h"
+#include "../../include/obj/NiPSysColorModifier.h"
+#include "../../include/obj/NiColorData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPSysCylinderEmitter.cpp b/src/obj/NiPSysCylinderEmitter.cpp
index 5b690b77..aefe22e7 100644
--- a/src/obj/NiPSysCylinderEmitter.cpp
+++ b/src/obj/NiPSysCylinderEmitter.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPSysCylinderEmitter.h"
+#include "../../include/obj/NiPSysCylinderEmitter.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPSysData.cpp b/src/obj/NiPSysData.cpp
index f862ceeb..2b864c6f 100644
--- a/src/obj/NiPSysData.cpp
+++ b/src/obj/NiPSysData.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPSysData.h"
+#include "../../include/obj/NiPSysData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPSysDragModifier.cpp b/src/obj/NiPSysDragModifier.cpp
index 35c77854..1a79567b 100644
--- a/src/obj/NiPSysDragModifier.cpp
+++ b/src/obj/NiPSysDragModifier.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPSysDragModifier.h"
-#include "NiObject.h"
+#include "../../include/obj/NiPSysDragModifier.h"
+#include "../../include/obj/NiObject.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPSysEmitter.cpp b/src/obj/NiPSysEmitter.cpp
index 714c00b3..fe9c9c11 100644
--- a/src/obj/NiPSysEmitter.cpp
+++ b/src/obj/NiPSysEmitter.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPSysEmitter.h"
+#include "../../include/obj/NiPSysEmitter.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPSysEmitterCtlr.cpp b/src/obj/NiPSysEmitterCtlr.cpp
index 2befe0b5..04284207 100644
--- a/src/obj/NiPSysEmitterCtlr.cpp
+++ b/src/obj/NiPSysEmitterCtlr.cpp
@@ -1,9 +1,9 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPSysEmitterCtlr.h"
-#include "NiPSysEmitterCtlrData.h"
-#include "NiInterpolator.h"
+#include "../../include/obj/NiPSysEmitterCtlr.h"
+#include "../../include/obj/NiPSysEmitterCtlrData.h"
+#include "../../include/obj/NiInterpolator.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPSysEmitterCtlrData.cpp b/src/obj/NiPSysEmitterCtlrData.cpp
index ca23c6b2..a41c24b0 100644
--- a/src/obj/NiPSysEmitterCtlrData.cpp
+++ b/src/obj/NiPSysEmitterCtlrData.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPSysEmitterCtlrData.h"
-#include "../gen/KeyGroup.h"
+#include "../../include/obj/NiPSysEmitterCtlrData.h"
+#include "../../include/gen/KeyGroup.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPSysEmitterDeclinationCtlr.cpp b/src/obj/NiPSysEmitterDeclinationCtlr.cpp
index 1228b6e8..ac8eeaa5 100644
--- a/src/obj/NiPSysEmitterDeclinationCtlr.cpp
+++ b/src/obj/NiPSysEmitterDeclinationCtlr.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPSysEmitterDeclinationCtlr.h"
+#include "../../include/obj/NiPSysEmitterDeclinationCtlr.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPSysEmitterDeclinationVarCtlr.cpp b/src/obj/NiPSysEmitterDeclinationVarCtlr.cpp
index 0a2fac84..6b9827ad 100644
--- a/src/obj/NiPSysEmitterDeclinationVarCtlr.cpp
+++ b/src/obj/NiPSysEmitterDeclinationVarCtlr.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPSysEmitterDeclinationVarCtlr.h"
+#include "../../include/obj/NiPSysEmitterDeclinationVarCtlr.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPSysEmitterInitialRadiusCtlr.cpp b/src/obj/NiPSysEmitterInitialRadiusCtlr.cpp
index 216e0398..2bd816b4 100644
--- a/src/obj/NiPSysEmitterInitialRadiusCtlr.cpp
+++ b/src/obj/NiPSysEmitterInitialRadiusCtlr.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPSysEmitterInitialRadiusCtlr.h"
+#include "../../include/obj/NiPSysEmitterInitialRadiusCtlr.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPSysEmitterLifeSpanCtlr.cpp b/src/obj/NiPSysEmitterLifeSpanCtlr.cpp
index baa85cfd..be994f56 100644
--- a/src/obj/NiPSysEmitterLifeSpanCtlr.cpp
+++ b/src/obj/NiPSysEmitterLifeSpanCtlr.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPSysEmitterLifeSpanCtlr.h"
+#include "../../include/obj/NiPSysEmitterLifeSpanCtlr.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPSysEmitterSpeedCtlr.cpp b/src/obj/NiPSysEmitterSpeedCtlr.cpp
index af2281bd..e1d26bff 100644
--- a/src/obj/NiPSysEmitterSpeedCtlr.cpp
+++ b/src/obj/NiPSysEmitterSpeedCtlr.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPSysEmitterSpeedCtlr.h"
+#include "../../include/obj/NiPSysEmitterSpeedCtlr.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPSysGravityModifier.cpp b/src/obj/NiPSysGravityModifier.cpp
index cf497845..7635ecb9 100644
--- a/src/obj/NiPSysGravityModifier.cpp
+++ b/src/obj/NiPSysGravityModifier.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPSysGravityModifier.h"
-#include "NiNode.h"
+#include "../../include/obj/NiPSysGravityModifier.h"
+#include "../../include/obj/NiNode.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPSysGravityStrengthCtlr.cpp b/src/obj/NiPSysGravityStrengthCtlr.cpp
index b0f827fd..511d9c3f 100644
--- a/src/obj/NiPSysGravityStrengthCtlr.cpp
+++ b/src/obj/NiPSysGravityStrengthCtlr.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPSysGravityStrengthCtlr.h"
+#include "../../include/obj/NiPSysGravityStrengthCtlr.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPSysGrowFadeModifier.cpp b/src/obj/NiPSysGrowFadeModifier.cpp
index 056aec1e..e621f94b 100644
--- a/src/obj/NiPSysGrowFadeModifier.cpp
+++ b/src/obj/NiPSysGrowFadeModifier.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPSysGrowFadeModifier.h"
+#include "../../include/obj/NiPSysGrowFadeModifier.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPSysMeshEmitter.cpp b/src/obj/NiPSysMeshEmitter.cpp
index 8db935b6..b56f7908 100644
--- a/src/obj/NiPSysMeshEmitter.cpp
+++ b/src/obj/NiPSysMeshEmitter.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPSysMeshEmitter.h"
-#include "NiTriBasedGeom.h"
+#include "../../include/obj/NiPSysMeshEmitter.h"
+#include "../../include/obj/NiTriBasedGeom.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPSysMeshUpdateModifier.cpp b/src/obj/NiPSysMeshUpdateModifier.cpp
index 08f9cb12..c5ed58cb 100644
--- a/src/obj/NiPSysMeshUpdateModifier.cpp
+++ b/src/obj/NiPSysMeshUpdateModifier.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPSysMeshUpdateModifier.h"
-#include "NiNode.h"
+#include "../../include/obj/NiPSysMeshUpdateModifier.h"
+#include "../../include/obj/NiNode.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPSysModifier.cpp b/src/obj/NiPSysModifier.cpp
index afe39a24..597d69e0 100644
--- a/src/obj/NiPSysModifier.cpp
+++ b/src/obj/NiPSysModifier.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPSysModifier.h"
-#include "NiParticleSystem.h"
+#include "../../include/obj/NiPSysModifier.h"
+#include "../../include/obj/NiParticleSystem.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPSysModifierActiveCtlr.cpp b/src/obj/NiPSysModifierActiveCtlr.cpp
index e62d4825..adda1c70 100644
--- a/src/obj/NiPSysModifierActiveCtlr.cpp
+++ b/src/obj/NiPSysModifierActiveCtlr.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPSysModifierActiveCtlr.h"
+#include "../../include/obj/NiPSysModifierActiveCtlr.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPSysPlanarCollider.cpp b/src/obj/NiPSysPlanarCollider.cpp
index 89b71dc3..8ed804b5 100644
--- a/src/obj/NiPSysPlanarCollider.cpp
+++ b/src/obj/NiPSysPlanarCollider.cpp
@@ -1,10 +1,10 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPSysPlanarCollider.h"
-#include "NiPSysSpawnModifier.h"
-#include "NiObject.h"
-#include "NiNode.h"
+#include "../../include/obj/NiPSysPlanarCollider.h"
+#include "../../include/obj/NiPSysSpawnModifier.h"
+#include "../../include/obj/NiObject.h"
+#include "../../include/obj/NiNode.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPSysPositionModifier.cpp b/src/obj/NiPSysPositionModifier.cpp
index f45aea32..a6d1d32b 100644
--- a/src/obj/NiPSysPositionModifier.cpp
+++ b/src/obj/NiPSysPositionModifier.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPSysPositionModifier.h"
+#include "../../include/obj/NiPSysPositionModifier.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPSysResetOnLoopCtlr.cpp b/src/obj/NiPSysResetOnLoopCtlr.cpp
index 6880c46e..79c8b4a2 100644
--- a/src/obj/NiPSysResetOnLoopCtlr.cpp
+++ b/src/obj/NiPSysResetOnLoopCtlr.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPSysResetOnLoopCtlr.h"
+#include "../../include/obj/NiPSysResetOnLoopCtlr.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPSysRotationModifier.cpp b/src/obj/NiPSysRotationModifier.cpp
index 5c3b9d01..3803caf0 100644
--- a/src/obj/NiPSysRotationModifier.cpp
+++ b/src/obj/NiPSysRotationModifier.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPSysRotationModifier.h"
+#include "../../include/obj/NiPSysRotationModifier.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPSysSpawnModifier.cpp b/src/obj/NiPSysSpawnModifier.cpp
index b6f762f1..983c1915 100644
--- a/src/obj/NiPSysSpawnModifier.cpp
+++ b/src/obj/NiPSysSpawnModifier.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPSysSpawnModifier.h"
+#include "../../include/obj/NiPSysSpawnModifier.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPSysSphereEmitter.cpp b/src/obj/NiPSysSphereEmitter.cpp
index 30e29133..7382f845 100644
--- a/src/obj/NiPSysSphereEmitter.cpp
+++ b/src/obj/NiPSysSphereEmitter.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPSysSphereEmitter.h"
+#include "../../include/obj/NiPSysSphereEmitter.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPSysUpdateCtlr.cpp b/src/obj/NiPSysUpdateCtlr.cpp
index 09140e4b..22db770f 100644
--- a/src/obj/NiPSysUpdateCtlr.cpp
+++ b/src/obj/NiPSysUpdateCtlr.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPSysUpdateCtlr.h"
+#include "../../include/obj/NiPSysUpdateCtlr.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPSysVolumeEmitter.cpp b/src/obj/NiPSysVolumeEmitter.cpp
index d7910546..4dd44345 100644
--- a/src/obj/NiPSysVolumeEmitter.cpp
+++ b/src/obj/NiPSysVolumeEmitter.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPSysVolumeEmitter.h"
-#include "NiNode.h"
+#include "../../include/obj/NiPSysVolumeEmitter.h"
+#include "../../include/obj/NiNode.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPalette.cpp b/src/obj/NiPalette.cpp
index 8d22a811..281d0730 100644
--- a/src/obj/NiPalette.cpp
+++ b/src/obj/NiPalette.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPalette.h"
+#include "../../include/obj/NiPalette.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiParticleBomb.cpp b/src/obj/NiParticleBomb.cpp
index 41eab7f5..7d478d15 100644
--- a/src/obj/NiParticleBomb.cpp
+++ b/src/obj/NiParticleBomb.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiParticleBomb.h"
+#include "../../include/obj/NiParticleBomb.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiParticleColorModifier.cpp b/src/obj/NiParticleColorModifier.cpp
index 3ffda744..8e4ae0ea 100644
--- a/src/obj/NiParticleColorModifier.cpp
+++ b/src/obj/NiParticleColorModifier.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiParticleColorModifier.h"
-#include "NiColorData.h"
+#include "../../include/obj/NiParticleColorModifier.h"
+#include "../../include/obj/NiColorData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiParticleGrowFade.cpp b/src/obj/NiParticleGrowFade.cpp
index 0b8be021..a9f2a5fc 100644
--- a/src/obj/NiParticleGrowFade.cpp
+++ b/src/obj/NiParticleGrowFade.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiParticleGrowFade.h"
+#include "../../include/obj/NiParticleGrowFade.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiParticleMeshModifier.cpp b/src/obj/NiParticleMeshModifier.cpp
index 49f30899..11648910 100644
--- a/src/obj/NiParticleMeshModifier.cpp
+++ b/src/obj/NiParticleMeshModifier.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiParticleMeshModifier.h"
-#include "NiAVObject.h"
+#include "../../include/obj/NiParticleMeshModifier.h"
+#include "../../include/obj/NiAVObject.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiParticleMeshes.cpp b/src/obj/NiParticleMeshes.cpp
index c7211558..ffac7443 100644
--- a/src/obj/NiParticleMeshes.cpp
+++ b/src/obj/NiParticleMeshes.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiParticleMeshes.h"
+#include "../../include/obj/NiParticleMeshes.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiParticleMeshesData.cpp b/src/obj/NiParticleMeshesData.cpp
index 147d11a7..a2c45fb3 100644
--- a/src/obj/NiParticleMeshesData.cpp
+++ b/src/obj/NiParticleMeshesData.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiParticleMeshesData.h"
-#include "NiAVObject.h"
+#include "../../include/obj/NiParticleMeshesData.h"
+#include "../../include/obj/NiAVObject.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiParticleRotation.cpp b/src/obj/NiParticleRotation.cpp
index 04e8e10d..2bc7c7b0 100644
--- a/src/obj/NiParticleRotation.cpp
+++ b/src/obj/NiParticleRotation.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiParticleRotation.h"
+#include "../../include/obj/NiParticleRotation.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiParticleSystem.cpp b/src/obj/NiParticleSystem.cpp
index 92210212..1513b329 100644
--- a/src/obj/NiParticleSystem.cpp
+++ b/src/obj/NiParticleSystem.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiParticleSystem.h"
-#include "NiPSysModifier.h"
+#include "../../include/obj/NiParticleSystem.h"
+#include "../../include/obj/NiPSysModifier.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiParticleSystemController.cpp b/src/obj/NiParticleSystemController.cpp
index 40c7542f..47fb2071 100644
--- a/src/obj/NiParticleSystemController.cpp
+++ b/src/obj/NiParticleSystemController.cpp
@@ -1,10 +1,10 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiParticleSystemController.h"
-#include "../gen/Particle.h"
-#include "NiObject.h"
-#include "AParticleModifier.h"
+#include "../../include/obj/NiParticleSystemController.h"
+#include "../../include/gen/Particle.h"
+#include "../../include/obj/NiObject.h"
+#include "../../include/obj/AParticleModifier.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiParticles.cpp b/src/obj/NiParticles.cpp
index ad540b69..7a2bae4c 100644
--- a/src/obj/NiParticles.cpp
+++ b/src/obj/NiParticles.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiParticles.h"
+#include "../../include/obj/NiParticles.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiParticlesData.cpp b/src/obj/NiParticlesData.cpp
index a64ef8d2..baea13ed 100644
--- a/src/obj/NiParticlesData.cpp
+++ b/src/obj/NiParticlesData.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiParticlesData.h"
+#include "../../include/obj/NiParticlesData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPathController.cpp b/src/obj/NiPathController.cpp
index 3d41547b..55424f12 100644
--- a/src/obj/NiPathController.cpp
+++ b/src/obj/NiPathController.cpp
@@ -1,9 +1,9 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPathController.h"
-#include "NiPosData.h"
-#include "NiFloatData.h"
+#include "../../include/obj/NiPathController.h"
+#include "../../include/obj/NiPosData.h"
+#include "../../include/obj/NiFloatData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPathInterpolator.cpp b/src/obj/NiPathInterpolator.cpp
index 21ea60d8..65925845 100644
--- a/src/obj/NiPathInterpolator.cpp
+++ b/src/obj/NiPathInterpolator.cpp
@@ -1,9 +1,9 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPathInterpolator.h"
-#include "NiPosData.h"
-#include "NiFloatData.h"
+#include "../../include/obj/NiPathInterpolator.h"
+#include "../../include/obj/NiPosData.h"
+#include "../../include/obj/NiFloatData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPixelData.cpp b/src/obj/NiPixelData.cpp
index cae427a9..5d35c9be 100644
--- a/src/obj/NiPixelData.cpp
+++ b/src/obj/NiPixelData.cpp
@@ -1,10 +1,10 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPixelData.h"
-#include "../gen/MipMap.h"
-#include "../gen/ByteArray.h"
-#include "NiPalette.h"
+#include "../../include/obj/NiPixelData.h"
+#include "../../include/gen/MipMap.h"
+#include "../../include/gen/ByteArray.h"
+#include "../../include/obj/NiPalette.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPlanarCollider.cpp b/src/obj/NiPlanarCollider.cpp
index 760dd92c..f36292eb 100644
--- a/src/obj/NiPlanarCollider.cpp
+++ b/src/obj/NiPlanarCollider.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPlanarCollider.h"
+#include "../../include/obj/NiPlanarCollider.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPoint3Interpolator.cpp b/src/obj/NiPoint3Interpolator.cpp
index 1b636d6a..6a4c3eeb 100644
--- a/src/obj/NiPoint3Interpolator.cpp
+++ b/src/obj/NiPoint3Interpolator.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPoint3Interpolator.h"
-#include "NiPosData.h"
+#include "../../include/obj/NiPoint3Interpolator.h"
+#include "../../include/obj/NiPosData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPointLight.cpp b/src/obj/NiPointLight.cpp
index 301d0f4d..7cd51183 100644
--- a/src/obj/NiPointLight.cpp
+++ b/src/obj/NiPointLight.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPointLight.h"
+#include "../../include/obj/NiPointLight.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiPosData.cpp b/src/obj/NiPosData.cpp
index 6a8776df..9bc3ea9b 100644
--- a/src/obj/NiPosData.cpp
+++ b/src/obj/NiPosData.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiPosData.h"
-#include "../gen/KeyGroup.h"
+#include "../../include/obj/NiPosData.h"
+#include "../../include/gen/KeyGroup.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiProperty.cpp b/src/obj/NiProperty.cpp
index 40b54a20..d2da921b 100644
--- a/src/obj/NiProperty.cpp
+++ b/src/obj/NiProperty.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiProperty.h"
+#include "../../include/obj/NiProperty.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiRangeLODData.cpp b/src/obj/NiRangeLODData.cpp
index 6fcbd96b..ef33e227 100644
--- a/src/obj/NiRangeLODData.cpp
+++ b/src/obj/NiRangeLODData.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiRangeLODData.h"
-#include "../gen/LODRange.h"
+#include "../../include/obj/NiRangeLODData.h"
+#include "../../include/gen/LODRange.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiRotatingParticles.cpp b/src/obj/NiRotatingParticles.cpp
index 53b67779..a67771fd 100644
--- a/src/obj/NiRotatingParticles.cpp
+++ b/src/obj/NiRotatingParticles.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiRotatingParticles.h"
+#include "../../include/obj/NiRotatingParticles.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiRotatingParticlesData.cpp b/src/obj/NiRotatingParticlesData.cpp
index 2e2374ba..9e2f4319 100644
--- a/src/obj/NiRotatingParticlesData.cpp
+++ b/src/obj/NiRotatingParticlesData.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiRotatingParticlesData.h"
+#include "../../include/obj/NiRotatingParticlesData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiScreenLODData.cpp b/src/obj/NiScreenLODData.cpp
index 779ac16a..f42cacae 100644
--- a/src/obj/NiScreenLODData.cpp
+++ b/src/obj/NiScreenLODData.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiScreenLODData.h"
+#include "../../include/obj/NiScreenLODData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiSequenceStreamHelper.cpp b/src/obj/NiSequenceStreamHelper.cpp
index eba62af6..0bfb79f6 100644
--- a/src/obj/NiSequenceStreamHelper.cpp
+++ b/src/obj/NiSequenceStreamHelper.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiSequenceStreamHelper.h"
+#include "../../include/obj/NiSequenceStreamHelper.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiShadeProperty.cpp b/src/obj/NiShadeProperty.cpp
index 314a53a4..797faf4c 100644
--- a/src/obj/NiShadeProperty.cpp
+++ b/src/obj/NiShadeProperty.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiShadeProperty.h"
+#include "../../include/obj/NiShadeProperty.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiSingleInterpolatorController.cpp b/src/obj/NiSingleInterpolatorController.cpp
index 38f49d65..e87c0be4 100644
--- a/src/obj/NiSingleInterpolatorController.cpp
+++ b/src/obj/NiSingleInterpolatorController.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiSingleInterpolatorController.h"
-#include "NiInterpolator.h"
+#include "../../include/obj/NiSingleInterpolatorController.h"
+#include "../../include/obj/NiInterpolator.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiSkinData.cpp b/src/obj/NiSkinData.cpp
index 8dc7ca5c..8c7c88d2 100644
--- a/src/obj/NiSkinData.cpp
+++ b/src/obj/NiSkinData.cpp
@@ -1,13 +1,13 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiSkinData.h"
-#include "NiNode.h"
-#include "../gen/SkinData.h"
-#include "../gen/SkinWeight.h"
-#include "NiSkinPartition.h"
-#include "NiTriBasedGeom.h"
-#include "NiSkinInstance.h"
+#include "../../include/obj/NiSkinData.h"
+#include "../../include/obj/NiNode.h"
+#include "../../include/gen/SkinData.h"
+#include "../../include/gen/SkinWeight.h"
+#include "../../include/obj/NiSkinPartition.h"
+#include "../../include/obj/NiTriBasedGeom.h"
+#include "../../include/obj/NiSkinInstance.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiSkinInstance.cpp b/src/obj/NiSkinInstance.cpp
index 62a326cf..282ad252 100644
--- a/src/obj/NiSkinInstance.cpp
+++ b/src/obj/NiSkinInstance.cpp
@@ -1,11 +1,11 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiSkinInstance.h"
-#include "NiNode.h"
-#include "NiSkinData.h"
-#include "NiSkinPartition.h"
-#include "NiNode.h"
+#include "../../include/obj/NiSkinInstance.h"
+#include "../../include/obj/NiNode.h"
+#include "../../include/obj/NiSkinData.h"
+#include "../../include/obj/NiSkinPartition.h"
+#include "../../include/obj/NiNode.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiSkinPartition.cpp b/src/obj/NiSkinPartition.cpp
index 98b09690..2f1001c6 100644
--- a/src/obj/NiSkinPartition.cpp
+++ b/src/obj/NiSkinPartition.cpp
@@ -1,15 +1,15 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiSkinPartition.h"
-#include "../gen/SkinPartition.h"
-#include "NiSkinInstance.h"
-#include "NiSkinData.h"
-#include "NiTriBasedGeom.h"
-#include "NiTriBasedGeomData.h"
-#include "NiTriStripsData.h"
-#include "../gen/SkinWeight.h"
-#include "../NvTriStrip/NvTriStrip.h"
+#include "../../include/obj/NiSkinPartition.h"
+#include "../../include/gen/SkinPartition.h"
+#include "../../include/obj/NiSkinInstance.h"
+#include "../../include/obj/NiSkinData.h"
+#include "../../include/obj/NiTriBasedGeom.h"
+#include "../../include/obj/NiTriBasedGeomData.h"
+#include "../../include/obj/NiTriStripsData.h"
+#include "../../include/gen/SkinWeight.h"
+#include "../../NvTriStrip/NvTriStrip.h"
 using namespace Niflib;
 
 typedef vector<SkinWeight> SkinWeightList;
diff --git a/src/obj/NiSourceTexture.cpp b/src/obj/NiSourceTexture.cpp
index e2b0a699..b8179502 100644
--- a/src/obj/NiSourceTexture.cpp
+++ b/src/obj/NiSourceTexture.cpp
@@ -1,9 +1,9 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiSourceTexture.h"
-#include "NiObject.h"
-#include "NiPixelData.h"
+#include "../../include/obj/NiSourceTexture.h"
+#include "../../include/obj/NiObject.h"
+#include "../../include/obj/NiPixelData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiSpecularProperty.cpp b/src/obj/NiSpecularProperty.cpp
index c101f703..23f1bf93 100644
--- a/src/obj/NiSpecularProperty.cpp
+++ b/src/obj/NiSpecularProperty.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiSpecularProperty.h"
+#include "../../include/obj/NiSpecularProperty.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiSphericalCollider.cpp b/src/obj/NiSphericalCollider.cpp
index be7cb337..e29db3fd 100644
--- a/src/obj/NiSphericalCollider.cpp
+++ b/src/obj/NiSphericalCollider.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiSphericalCollider.h"
+#include "../../include/obj/NiSphericalCollider.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiSpotLight.cpp b/src/obj/NiSpotLight.cpp
index 777d420a..4e11bbae 100644
--- a/src/obj/NiSpotLight.cpp
+++ b/src/obj/NiSpotLight.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiSpotLight.h"
+#include "../../include/obj/NiSpotLight.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiStencilProperty.cpp b/src/obj/NiStencilProperty.cpp
index 68679105..820ae66a 100644
--- a/src/obj/NiStencilProperty.cpp
+++ b/src/obj/NiStencilProperty.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiStencilProperty.h"
+#include "../../include/obj/NiStencilProperty.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiStringExtraData.cpp b/src/obj/NiStringExtraData.cpp
index 71ef07a4..ddefbe20 100644
--- a/src/obj/NiStringExtraData.cpp
+++ b/src/obj/NiStringExtraData.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiStringExtraData.h"
+#include "../../include/obj/NiStringExtraData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiStringPalette.cpp b/src/obj/NiStringPalette.cpp
index 59183a69..52a833d1 100644
--- a/src/obj/NiStringPalette.cpp
+++ b/src/obj/NiStringPalette.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiStringPalette.h"
-#include "../gen/StringPalette.h"
+#include "../../include/obj/NiStringPalette.h"
+#include "../../include/gen/StringPalette.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiStringsExtraData.cpp b/src/obj/NiStringsExtraData.cpp
index 4bca3917..a0ae5fd5 100644
--- a/src/obj/NiStringsExtraData.cpp
+++ b/src/obj/NiStringsExtraData.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiStringsExtraData.h"
+#include "../../include/obj/NiStringsExtraData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiTextKeyExtraData.cpp b/src/obj/NiTextKeyExtraData.cpp
index 1330e899..7eecc0e4 100644
--- a/src/obj/NiTextKeyExtraData.cpp
+++ b/src/obj/NiTextKeyExtraData.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiTextKeyExtraData.h"
+#include "../../include/obj/NiTextKeyExtraData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiTextureEffect.cpp b/src/obj/NiTextureEffect.cpp
index 329b6e59..0644dee7 100644
--- a/src/obj/NiTextureEffect.cpp
+++ b/src/obj/NiTextureEffect.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiTextureEffect.h"
-#include "NiSourceTexture.h"
+#include "../../include/obj/NiTextureEffect.h"
+#include "../../include/obj/NiSourceTexture.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiTextureTransformController.cpp b/src/obj/NiTextureTransformController.cpp
index 9e29d019..d2cf04a6 100644
--- a/src/obj/NiTextureTransformController.cpp
+++ b/src/obj/NiTextureTransformController.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiTextureTransformController.h"
-#include "NiFloatData.h"
+#include "../../include/obj/NiTextureTransformController.h"
+#include "../../include/obj/NiFloatData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiTexturingProperty.cpp b/src/obj/NiTexturingProperty.cpp
index 7d83ef6d..7cc875a3 100644
--- a/src/obj/NiTexturingProperty.cpp
+++ b/src/obj/NiTexturingProperty.cpp
@@ -1,26 +1,9 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiTexturingProperty.h"
-#include "../gen/TexDesc.h"
-#include "NiSourceTexture.h"
-#include "../gen/TexDesc.h"
-#include "NiSourceTexture.h"
-#include "../gen/TexDesc.h"
-#include "NiSourceTexture.h"
-#include "../gen/TexDesc.h"
-#include "NiSourceTexture.h"
-#include "../gen/TexDesc.h"
-#include "NiSourceTexture.h"
-#include "../gen/TexDesc.h"
-#include "NiSourceTexture.h"
-#include "../gen/TexDesc.h"
-#include "NiSourceTexture.h"
-#include "../gen/TexDesc.h"
-#include "NiSourceTexture.h"
-#include "../gen/ShaderTexDesc.h"
-#include "../gen/TexDesc.h"
-#include "NiSourceTexture.h"
+#include "../../include/obj/NiTexturingProperty.h"
+#include "../../include/gen/TexDesc.h"
+#include "../../include/obj/NiSourceTexture.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiTimeController.cpp b/src/obj/NiTimeController.cpp
index b3380ddd..bd76e052 100644
--- a/src/obj/NiTimeController.cpp
+++ b/src/obj/NiTimeController.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiTimeController.h"
-#include "NiObjectNET.h"
+#include "../../include/obj/NiTimeController.h"
+#include "../../include/obj/NiObjectNET.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiTransformController.cpp b/src/obj/NiTransformController.cpp
index 873bf330..090a098c 100644
--- a/src/obj/NiTransformController.cpp
+++ b/src/obj/NiTransformController.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiTransformController.h"
+#include "../../include/obj/NiTransformController.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiTransformData.cpp b/src/obj/NiTransformData.cpp
index a0d20afb..7da3fb3c 100644
--- a/src/obj/NiTransformData.cpp
+++ b/src/obj/NiTransformData.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiTransformData.h"
+#include "../../include/obj/NiTransformData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiTransformInterpolator.cpp b/src/obj/NiTransformInterpolator.cpp
index 1f280b75..9c6b388b 100644
--- a/src/obj/NiTransformInterpolator.cpp
+++ b/src/obj/NiTransformInterpolator.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiTransformInterpolator.h"
-#include "NiTransformData.h"
+#include "../../include/obj/NiTransformInterpolator.h"
+#include "../../include/obj/NiTransformData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiTriBasedGeom.cpp b/src/obj/NiTriBasedGeom.cpp
index 8166162d..242fae93 100644
--- a/src/obj/NiTriBasedGeom.cpp
+++ b/src/obj/NiTriBasedGeom.cpp
@@ -1,12 +1,12 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiTriBasedGeom.h"
-#include "NiTriBasedGeomData.h"
-#include "NiSkinInstance.h"
-#include "NiObject.h"
-#include "NiSkinData.h"
-#include "NiSkinPartition.h"
+#include "../../include/obj/NiTriBasedGeom.h"
+#include "../../include/obj/NiTriBasedGeomData.h"
+#include "../../include/obj/NiSkinInstance.h"
+#include "../../include/obj/NiObject.h"
+#include "../../include/obj/NiSkinData.h"
+#include "../../include/obj/NiSkinPartition.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiTriBasedGeomData.cpp b/src/obj/NiTriBasedGeomData.cpp
index 3e50a1d0..ebcd114b 100644
--- a/src/obj/NiTriBasedGeomData.cpp
+++ b/src/obj/NiTriBasedGeomData.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiTriBasedGeomData.h"
-#include "NiObject.h"
+#include "../../include/obj/NiTriBasedGeomData.h"
+#include "../../include/obj/NiObject.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiTriShape.cpp b/src/obj/NiTriShape.cpp
index 534dc1b7..2210956f 100644
--- a/src/obj/NiTriShape.cpp
+++ b/src/obj/NiTriShape.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiTriShape.h"
+#include "../../include/obj/NiTriShape.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiTriShapeData.cpp b/src/obj/NiTriShapeData.cpp
index 5071c47a..090e9bbb 100644
--- a/src/obj/NiTriShapeData.cpp
+++ b/src/obj/NiTriShapeData.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiTriShapeData.h"
-#include "../gen/MatchGroup.h"
+#include "../../include/obj/NiTriShapeData.h"
+#include "../../include/gen/MatchGroup.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiTriStrips.cpp b/src/obj/NiTriStrips.cpp
index 7f1be51a..4a248b8d 100644
--- a/src/obj/NiTriStrips.cpp
+++ b/src/obj/NiTriStrips.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiTriStrips.h"
+#include "../../include/obj/NiTriStrips.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiTriStripsData.cpp b/src/obj/NiTriStripsData.cpp
index c56c927b..c20deffe 100644
--- a/src/obj/NiTriStripsData.cpp
+++ b/src/obj/NiTriStripsData.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiTriStripsData.h"
-#include "../NvTriStrip/NvTriStrip.h"
+#include "../../include/obj/NiTriStripsData.h"
+#include "../../NvTriStrip/NvTriStrip.h"
 
 using namespace Niflib;
 
diff --git a/src/obj/NiUVController.cpp b/src/obj/NiUVController.cpp
index 26fab006..e2219b6f 100644
--- a/src/obj/NiUVController.cpp
+++ b/src/obj/NiUVController.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiUVController.h"
-#include "NiUVData.h"
+#include "../../include/obj/NiUVController.h"
+#include "../../include/obj/NiUVData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiUVData.cpp b/src/obj/NiUVData.cpp
index d12497bf..bcc144f4 100644
--- a/src/obj/NiUVData.cpp
+++ b/src/obj/NiUVData.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiUVData.h"
-#include "../gen/KeyGroup.h"
+#include "../../include/obj/NiUVData.h"
+#include "../../include/gen/KeyGroup.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiVectorExtraData.cpp b/src/obj/NiVectorExtraData.cpp
index c93a0d1a..ba8f3a23 100644
--- a/src/obj/NiVectorExtraData.cpp
+++ b/src/obj/NiVectorExtraData.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiVectorExtraData.h"
+#include "../../include/obj/NiVectorExtraData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiVertWeightsExtraData.cpp b/src/obj/NiVertWeightsExtraData.cpp
index 315a56f2..6ed76fa2 100644
--- a/src/obj/NiVertWeightsExtraData.cpp
+++ b/src/obj/NiVertWeightsExtraData.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiVertWeightsExtraData.h"
+#include "../../include/obj/NiVertWeightsExtraData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiVertexColorProperty.cpp b/src/obj/NiVertexColorProperty.cpp
index 93f1fe16..84588863 100644
--- a/src/obj/NiVertexColorProperty.cpp
+++ b/src/obj/NiVertexColorProperty.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiVertexColorProperty.h"
+#include "../../include/obj/NiVertexColorProperty.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiVisController.cpp b/src/obj/NiVisController.cpp
index 1c476b60..598bbcd4 100644
--- a/src/obj/NiVisController.cpp
+++ b/src/obj/NiVisController.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiVisController.h"
-#include "NiVisData.h"
+#include "../../include/obj/NiVisController.h"
+#include "../../include/obj/NiVisData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiVisData.cpp b/src/obj/NiVisData.cpp
index 02699262..12e83ea5 100644
--- a/src/obj/NiVisData.cpp
+++ b/src/obj/NiVisData.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiVisData.h"
+#include "../../include/obj/NiVisData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiWireframeProperty.cpp b/src/obj/NiWireframeProperty.cpp
index b546644e..2bbae782 100644
--- a/src/obj/NiWireframeProperty.cpp
+++ b/src/obj/NiWireframeProperty.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiWireframeProperty.h"
+#include "../../include/obj/NiWireframeProperty.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/NiZBufferProperty.cpp b/src/obj/NiZBufferProperty.cpp
index 94957cd8..af1a0a0c 100644
--- a/src/obj/NiZBufferProperty.cpp
+++ b/src/obj/NiZBufferProperty.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "NiZBufferProperty.h"
+#include "../../include/obj/NiZBufferProperty.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/RootCollisionNode.cpp b/src/obj/RootCollisionNode.cpp
index c25f82a7..97cfea29 100644
--- a/src/obj/RootCollisionNode.cpp
+++ b/src/obj/RootCollisionNode.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "RootCollisionNode.h"
+#include "../../include/obj/RootCollisionNode.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/bhkBlendCollisionObject.cpp b/src/obj/bhkBlendCollisionObject.cpp
index af9667a8..6657e2c3 100644
--- a/src/obj/bhkBlendCollisionObject.cpp
+++ b/src/obj/bhkBlendCollisionObject.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "bhkBlendCollisionObject.h"
+#include "../../include/obj/bhkBlendCollisionObject.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/bhkBlendController.cpp b/src/obj/bhkBlendController.cpp
index 24f9802d..729c097b 100644
--- a/src/obj/bhkBlendController.cpp
+++ b/src/obj/bhkBlendController.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "bhkBlendController.h"
+#include "../../include/obj/bhkBlendController.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/bhkBoxShape.cpp b/src/obj/bhkBoxShape.cpp
index 3272418b..1b63072a 100644
--- a/src/obj/bhkBoxShape.cpp
+++ b/src/obj/bhkBoxShape.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "bhkBoxShape.h"
+#include "../../include/obj/bhkBoxShape.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/bhkCapsuleShape.cpp b/src/obj/bhkCapsuleShape.cpp
index 48659864..7939a8c8 100644
--- a/src/obj/bhkCapsuleShape.cpp
+++ b/src/obj/bhkCapsuleShape.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "bhkCapsuleShape.h"
+#include "../../include/obj/bhkCapsuleShape.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/bhkCollisionObject.cpp b/src/obj/bhkCollisionObject.cpp
index a4babe10..dcb89a53 100644
--- a/src/obj/bhkCollisionObject.cpp
+++ b/src/obj/bhkCollisionObject.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "bhkCollisionObject.h"
+#include "../../include/obj/bhkCollisionObject.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/bhkConvexShape.cpp b/src/obj/bhkConvexShape.cpp
index 367a5c52..9d3665d4 100644
--- a/src/obj/bhkConvexShape.cpp
+++ b/src/obj/bhkConvexShape.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "bhkConvexShape.h"
+#include "../../include/obj/bhkConvexShape.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/bhkConvexTransformShape.cpp b/src/obj/bhkConvexTransformShape.cpp
index c5c26ffc..895b9cee 100644
--- a/src/obj/bhkConvexTransformShape.cpp
+++ b/src/obj/bhkConvexTransformShape.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "bhkConvexTransformShape.h"
+#include "../../include/obj/bhkConvexTransformShape.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/bhkConvexVerticesShape.cpp b/src/obj/bhkConvexVerticesShape.cpp
index ad52851b..db039026 100644
--- a/src/obj/bhkConvexVerticesShape.cpp
+++ b/src/obj/bhkConvexVerticesShape.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "bhkConvexVerticesShape.h"
+#include "../../include/obj/bhkConvexVerticesShape.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/bhkEntity.cpp b/src/obj/bhkEntity.cpp
index 56b910cc..a6d859c1 100644
--- a/src/obj/bhkEntity.cpp
+++ b/src/obj/bhkEntity.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "bhkEntity.h"
-#include "bhkShape.h"
+#include "../../include/obj/bhkEntity.h"
+#include "../../include/obj/bhkShape.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/bhkHingeConstraint.cpp b/src/obj/bhkHingeConstraint.cpp
index f71b19d0..2a6cf72f 100644
--- a/src/obj/bhkHingeConstraint.cpp
+++ b/src/obj/bhkHingeConstraint.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "bhkHingeConstraint.h"
+#include "../../include/obj/bhkHingeConstraint.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/bhkLimitedHingeConstraint.cpp b/src/obj/bhkLimitedHingeConstraint.cpp
index 9795ffdf..d815a8ae 100644
--- a/src/obj/bhkLimitedHingeConstraint.cpp
+++ b/src/obj/bhkLimitedHingeConstraint.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "bhkLimitedHingeConstraint.h"
-#include "../gen/LimitedHingeDescriptor.h"
+#include "../../include/obj/bhkLimitedHingeConstraint.h"
+#include "../../include/gen/LimitedHingeDescriptor.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/bhkListShape.cpp b/src/obj/bhkListShape.cpp
index d280f6a5..f21dd12b 100644
--- a/src/obj/bhkListShape.cpp
+++ b/src/obj/bhkListShape.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "bhkListShape.h"
-#include "bhkShape.h"
+#include "../../include/obj/bhkListShape.h"
+#include "../../include/obj/bhkShape.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/bhkMalleableConstraint.cpp b/src/obj/bhkMalleableConstraint.cpp
index 51eb0eff..33f0df47 100644
--- a/src/obj/bhkMalleableConstraint.cpp
+++ b/src/obj/bhkMalleableConstraint.cpp
@@ -1,10 +1,10 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "bhkMalleableConstraint.h"
-#include "../gen/RagDollDescriptor.h"
-#include "../gen/LimitedHingeDescriptor.h"
-#include "NiObject.h"
+#include "../../include/obj/bhkMalleableConstraint.h"
+#include "../../include/gen/RagDollDescriptor.h"
+#include "../../include/gen/LimitedHingeDescriptor.h"
+#include "../../include/obj/NiObject.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/bhkMoppBvTreeShape.cpp b/src/obj/bhkMoppBvTreeShape.cpp
index 64c2c446..d2ad26d3 100644
--- a/src/obj/bhkMoppBvTreeShape.cpp
+++ b/src/obj/bhkMoppBvTreeShape.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "bhkMoppBvTreeShape.h"
-#include "bhkShape.h"
+#include "../../include/obj/bhkMoppBvTreeShape.h"
+#include "../../include/obj/bhkShape.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/bhkMultiSphereShape.cpp b/src/obj/bhkMultiSphereShape.cpp
index 8072f584..754ed155 100644
--- a/src/obj/bhkMultiSphereShape.cpp
+++ b/src/obj/bhkMultiSphereShape.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "bhkMultiSphereShape.h"
-#include "../gen/Sphere.h"
+#include "../../include/obj/bhkMultiSphereShape.h"
+#include "../../include/gen/Sphere.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/bhkNiTriStripsShape.cpp b/src/obj/bhkNiTriStripsShape.cpp
index 7435fdc9..763b9652 100644
--- a/src/obj/bhkNiTriStripsShape.cpp
+++ b/src/obj/bhkNiTriStripsShape.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "bhkNiTriStripsShape.h"
-#include "NiTriStripsData.h"
+#include "../../include/obj/bhkNiTriStripsShape.h"
+#include "../../include/obj/NiTriStripsData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/bhkPackedNiTriStripsShape.cpp b/src/obj/bhkPackedNiTriStripsShape.cpp
index 7fb5a847..d56bba08 100644
--- a/src/obj/bhkPackedNiTriStripsShape.cpp
+++ b/src/obj/bhkPackedNiTriStripsShape.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "bhkPackedNiTriStripsShape.h"
-#include "hkPackedNiTriStripsData.h"
+#include "../../include/obj/bhkPackedNiTriStripsShape.h"
+#include "../../include/obj/hkPackedNiTriStripsData.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/bhkPrismaticConstraint.cpp b/src/obj/bhkPrismaticConstraint.cpp
index 49404360..15fc5e3a 100644
--- a/src/obj/bhkPrismaticConstraint.cpp
+++ b/src/obj/bhkPrismaticConstraint.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "bhkPrismaticConstraint.h"
+#include "../../include/obj/bhkPrismaticConstraint.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/bhkRagdollConstraint.cpp b/src/obj/bhkRagdollConstraint.cpp
index 84becc30..53280ea7 100644
--- a/src/obj/bhkRagdollConstraint.cpp
+++ b/src/obj/bhkRagdollConstraint.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "bhkRagdollConstraint.h"
+#include "../../include/obj/bhkRagdollConstraint.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/bhkRefObject.cpp b/src/obj/bhkRefObject.cpp
index 7fde0c94..905a212d 100644
--- a/src/obj/bhkRefObject.cpp
+++ b/src/obj/bhkRefObject.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "bhkRefObject.h"
+#include "../../include/obj/bhkRefObject.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/bhkRigidBody.cpp b/src/obj/bhkRigidBody.cpp
index 4ffe3aa6..db553c20 100644
--- a/src/obj/bhkRigidBody.cpp
+++ b/src/obj/bhkRigidBody.cpp
@@ -1,9 +1,9 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "bhkRigidBody.h"
-#include "../gen/QuaternionXYZW.h"
-#include "AbhkConstraint.h"
+#include "../../include/obj/bhkRigidBody.h"
+#include "../../include/gen/QuaternionXYZW.h"
+#include "../../include/obj/AbhkConstraint.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/bhkRigidBodyT.cpp b/src/obj/bhkRigidBodyT.cpp
index 3304a082..44fb735f 100644
--- a/src/obj/bhkRigidBodyT.cpp
+++ b/src/obj/bhkRigidBodyT.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "bhkRigidBodyT.h"
+#include "../../include/obj/bhkRigidBodyT.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/bhkSPCollisionObject.cpp b/src/obj/bhkSPCollisionObject.cpp
index 205e46c1..46829d6b 100644
--- a/src/obj/bhkSPCollisionObject.cpp
+++ b/src/obj/bhkSPCollisionObject.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "bhkSPCollisionObject.h"
+#include "../../include/obj/bhkSPCollisionObject.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/bhkSerializable.cpp b/src/obj/bhkSerializable.cpp
index b8287c7f..65ba8927 100644
--- a/src/obj/bhkSerializable.cpp
+++ b/src/obj/bhkSerializable.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "bhkSerializable.h"
+#include "../../include/obj/bhkSerializable.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/bhkShape.cpp b/src/obj/bhkShape.cpp
index 58f3e532..f1dd46f8 100644
--- a/src/obj/bhkShape.cpp
+++ b/src/obj/bhkShape.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "bhkShape.h"
+#include "../../include/obj/bhkShape.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/bhkSimpleShapePhantom.cpp b/src/obj/bhkSimpleShapePhantom.cpp
index 6d3c326b..586fabd8 100644
--- a/src/obj/bhkSimpleShapePhantom.cpp
+++ b/src/obj/bhkSimpleShapePhantom.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "bhkSimpleShapePhantom.h"
+#include "../../include/obj/bhkSimpleShapePhantom.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/bhkSphereRepShape.cpp b/src/obj/bhkSphereRepShape.cpp
index 7e94f38f..10dc2c9a 100644
--- a/src/obj/bhkSphereRepShape.cpp
+++ b/src/obj/bhkSphereRepShape.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "bhkSphereRepShape.h"
+#include "../../include/obj/bhkSphereRepShape.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/bhkSphereShape.cpp b/src/obj/bhkSphereShape.cpp
index 55364fcb..773b06d9 100644
--- a/src/obj/bhkSphereShape.cpp
+++ b/src/obj/bhkSphereShape.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "bhkSphereShape.h"
+#include "../../include/obj/bhkSphereShape.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/bhkStiffSpringConstraint.cpp b/src/obj/bhkStiffSpringConstraint.cpp
index 4d8d02c4..eaa7ea49 100644
--- a/src/obj/bhkStiffSpringConstraint.cpp
+++ b/src/obj/bhkStiffSpringConstraint.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "bhkStiffSpringConstraint.h"
+#include "../../include/obj/bhkStiffSpringConstraint.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/bhkTransformShape.cpp b/src/obj/bhkTransformShape.cpp
index c3086cb3..2d9c6f0c 100644
--- a/src/obj/bhkTransformShape.cpp
+++ b/src/obj/bhkTransformShape.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "bhkTransformShape.h"
+#include "../../include/obj/bhkTransformShape.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/bhkWorldObject.cpp b/src/obj/bhkWorldObject.cpp
index 199c5114..e960609c 100644
--- a/src/obj/bhkWorldObject.cpp
+++ b/src/obj/bhkWorldObject.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "bhkWorldObject.h"
+#include "../../include/obj/bhkWorldObject.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
diff --git a/src/obj/hkPackedNiTriStripsData.cpp b/src/obj/hkPackedNiTriStripsData.cpp
index d6178b06..11642ba8 100644
--- a/src/obj/hkPackedNiTriStripsData.cpp
+++ b/src/obj/hkPackedNiTriStripsData.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "hkPackedNiTriStripsData.h"
-#include "../gen/hkTriangle.h"
+#include "../../include/obj/hkPackedNiTriStripsData.h"
+#include "../../include/gen/hkTriangle.h"
 using namespace Niflib;
 
 //Definition of TYPE constant
-- 
GitLab