diff --git a/niflib.vcproj b/niflib.vcproj
index 503d1d29f14b9a43e8bf99aa465fd8a085e53e79..e47a643f7116c410252fb1dc23c6f6fd3fc4f667 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 327e37afa012ce1bcc90fc5e59b50bbc73616b3d..7aa92e724e1bba66d0f07d72a47ba75a890b7320 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 5403d712e2abe9c93ba7717d57ce9a7b457991bb..3e7001c38155784c542d40a1c81850a6c1d94411 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 e9bbd4a36f5c0ac3fac85d38973c0ed0006410f6..c7482aaf8eb9ffd1fa653293d08f2eb8eba2e171 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 c5043ade03d84bbb9f26a218715e4f34d5d71d11..bc194b5c44fda6b631dc9d2c839876746f2cdd52 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 52a0b33d184d0125706f78e43191bdc760935b8a..249361360878483dee0176039e7caa51b0600b56 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 8d7950f4aac1ef9ff39bc483effcc60009e320f1..7e25333ce1ee3f98396296de97256886feafdbb3 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 16c84980a60c4f25440bcd653282df1ddfb48ec2..235338d7151fabcfa700c89545b166d14fd69acb 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 ba3af249a5ed5b8f095374927014d298d98ac8a2..249bf6186d4202466fa97055bf9ea1c1c8beba7b 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 e4b418b4c4ccea4d196683a4c4e825c874794f42..120d5f03e8682aec62061cf6ad2b1b8821fec941 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 f948466dc0f44932a525191a3401eb3dde8fbd7e..ba4c35dd76251544375c33bba683d5628a4b6754 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 db3314f4f908e309108f6be2c04a3cb2bfd1d56c..784d93fff65b0d2ea2656428f47e363d72ecb1cc 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 a20dda48543a8423b1e9cfe4a487dbe055af721a..5a1a6d82660b209c6a4ad00435635d490c263d38 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 6f5d8955d6683b610f47d6732bd86c0709e12ace..e4c1b108fd70d3c914b7cf54577d7859eea9d551 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 01169af3ce5342aa9e2967a26baf46da92defa3e..f62db2aa7dc710ef35a2be10deb8b3634e447fd6 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 9f013e99951fa09b49f572efdf696fda4ff01794..a46c8ec53590cedd3071166753c262992ce81457 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 cf36491384e2870c2ce9e8b425e2dca9f0c068e1..0fffc19c1b3387fa57058de088314275a09f470a 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 30d0a593e65094542be108d2aa699b278bc7b333..0b50a025c49eae6bdd2ea1284fb12b75e16b18de 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 3842b3672c0d6afcf00b26f444713dc74692e3cf..83d8c54eae35cca4a605b2338e12a77c5d96731f 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 ce6a1e8b29bcc05a07e8c807b484792b18988868..87ecc8ad1025da898b9c2628d6521cbfda7e9fb2 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 bdee52d26f532c7d9f5dbe203a074b1696816e7c..6b668de27aa24995c5e2ea10dddd1d3bc16f52c2 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 07ca9a475778f2eb595278cfb30f30e672122d56..aaff7bc4cd1a0fca050b04c78be998bf55dc2066 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 ee42ad3e6fc75203bdcb5c52c4aaa381b4f33c74..915b09ad6a353602760c28cf0191489ada5ece6d 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 89e160011d0228dcf33e68547de27e5ff58f0278..7a1cf602ab998d550771923d51cc15d389d2f985 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 235ac487e4492c426fcaed63c23dc624a3b9bdc8..8f69607e26aed36f6df1981751a60aa615ce5dce 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 0a8af68d90b3dd0b959c26985eadc7272c27c4aa..48ffa41c96ad0a63b00ef3fca033b1fb85ccdfc4 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 415ba66fc7411dcb728dc218532007f2f9d33a12..a470cb8ccfdb2997a357b7a7463620dc60fe552a 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 4557174ac3b185802e0a5c14c63ebb97853a6142..59368cf9a325f5a6f12379ef9066aa4285e3eb2b 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 2ecbb94e11ac5cf8b4355deeac9d6f4a1b48d091..f541e0452499292309a0ed4eca342eabd20d4df6 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 1bb38454392c9c4d7ebcf4cec5cf8be94ca17beb..ae265b3bd9357725887922ac51ed6a5d0d7723e3 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 3e756907a81721783870940eda60356d8a84794f..8242eb4943b9b2deb3259b2c812e7e1b9106ba9f 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 8c2bd377e6ffcbd5e9f0c8ff6d02e4e0e0e50a47..747b340eab12c4df69df38149c96b32113a43f90 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 f17cecfb03493f28dad8e3ea4c24fe3d4107ed0b..1c779eb5581a0c72e30bbcf3f3600c09cc483926 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 647b73be984cd9fbd336600d5e97368c09a1d38a..729c5c5aafe129c2ebe073dcc4c984f3b1b21f9a 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 99a6dd13e8965e86380ccc2e56521f57dccbbfc2..e0df54b8f470f22b05be0db8cdf27c13ea33b029 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 81399a4f8d6b6b4ad0939ab5c470092fb5e82ae0..5dcb4cf50112251e1bb511521ebbf8a56aa68aa3 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 79cc7fcb900178d7c6a646c85dea2b9453cc3f4d..91023cf664cf71a4c7275389caf87a052887227e 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 bfb696200b242bf2bf671dc2c19b1e0da01d70fd..89ab6d0392e493667006178c6d64a75f2d9dd7f0 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 a3d47c39e2f71c7fcdde32b3d0e151079e630d74..1fbaf9cd22ef1fddc5052bae63bcf7c59ff74926 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 c85cfbf6f2eb2522bdde866efbe762be36439f8c..e201c7738b662d55fcaf9dc3726d4bb4331da9c0 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 e507939aef3a380681fb3b62a6cbf6ac1df843b1..31582f1b439432321b4f90e05c9af12ace521dd8 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 d9f09ff58fa02ccf4beae7010e8942d8939515d5..77be9b72efe7743796940c7c6caded65d222d1b2 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 7fa23b95b802040419679e0a15aa808f00513cb7..d2b604df245286785c00c5c4d7b4250a2794f103 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 9b0b72b29d149644ebcff65fa41d727c81ddd9b0..582cd5befc64f56f65a36e9eb97c049285417155 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 3a5578efd0511b79cce8fee330502cea3838b848..f638f6df3a96418e33bb95f975cf2ac89155819f 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 723ff37ba3266ebd9070c1af24ef7a1c4d51f1e1..1586183857715ad8f48b42e821f510061e5ddfe5 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 4ba8165ede1b271a795d325d4aa76aca8ad25f7d..f3c9f0749c99d61d81a2b2c85704649da5eeadda 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 f9a1369171c917c5dde5d2392c2aebfcb11bf93c..6e7d48a374f8b8e80444b3b172b371fa1bd670cc 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 f0c4fd9e5e519a3ca2e64120bc969c5fa505a18f..86ec09ca0ef25962328c54558b44d9221eb88e1a 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 0a88a4d6bd5505853d1c6442d7382272e6a0b852..c58ab24aa97c179c75685469bfb3128e3dc4c502 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 e09b57011dfcbcc91edab8184415c38742b4fade..4eb28f4b45200c61ff264ef3449adb1a64a617a1 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 8a95f2160c6cd7f42f73efb3a3eb4f78d88f5c06..66462f933e5d8c06059855349633e073d1525a8b 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 d5e997356ff27329e9cf2376d11b3c6420709eb3..6c545883445d654e00fb3047c53c75af93ebc332 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 761bbc1d55bc61a543883e29d0171f206a8c7324..87c339149d74cfdd6b2d45015372571bb06fdb7f 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 ff5cbebf92034be92d3ecb09ad69ab6d6a7ed86d..c63c7a80396ca4254faf30038ae0465579d4c531 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 a07b05b3536b1383382cfc79b55db3cc9f324de1..3e229c8da69867dff5b941292a56d6ce42cbbfcd 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 81e3a75008afaa9ab98939b7959f856d83bb4ff4..658b1215839259c21fdf4d39b4b4aac179daa8d6 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 b05637deb4b1c042acf8ef929388d49842f3549c..18e779f032a9cdcf0b40305908a016ed4a55a1aa 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 baec44a25f1b7ba08bf1c89a13820e2dc5735852..232db5a14fe5ba2ae70463aa539a9b98b8bee10b 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 af9ff5a7f4697c86c10d4d8c1c6796623b70b472..2b810bd87a30a5b4020529760ed1668a67c5dc1f 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 d1c25823dd044900df9d65a66f3b28575f3859c7..7511ff8643a60fafc8ff100a96b4beb854e1fdc9 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 cd795233d277c45d2cc4fe3204fda38ee95e49ec..b212c2a28a04f5a84e9fad135b65ff96cdd18ae3 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 815a96d54d3c82c682074c0a9b510471ffcdc4a8..bb257bf329894276c65c73389661bc03e3bb6ea1 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 7a95326980ea976c337a1865a53b9245ca6f0fb8..6fd795b20db9c52a2c6546c863f0c79e412d43e6 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 a1a2df754633ce57196ec5beb41b0fa73b1a6daa..b4d003fba0d92afe0ff5968fc3e8480d4938d895 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 319711cb3f6d5c73cca87750f5d8746df00c1e10..60d4ee9abfe2d337dcd78c26c62ebd8192ace2b4 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 18b50aac27ad67376c227f52a41503d078f24007..33e336e81908545087a76609314c8de8da8d2639 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 abe1fa6eb971d8476f0d319877d989578692f9ee..a45de58170ea214613d352f7be6fe6470d6ed93e 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 0e2d2d522c138b07a1972ebebac34e296e5c0a23..8ecf3bb9a1b67a7d9bb3858875ca34cae376d6bb 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 b5791f5c7c913951e6214201ead3af4d10d33777..fe9ea520557e3210058ee87815ddeb91400911b1 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 91cc61bbedaa575cd8a3e07e8a11dc24a01e4eea..c2fe71838e846bd12ed19adfd8e9123f227eab54 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 4a1d1dd29d66363d680976b3cde906f139e23f30..d159d874fc7d208b881386090c7d0a9621f20872 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 9eebfe9175a735da1e4279b66721f719c12d0097..14b82ffa4cc8345f8802f6beae22297c25013c52 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 3ac3982e17ecb3d74afdfbf81d45470754830f1e..462ca0eb7024d86fd49b25da648160d5e4864206 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 270fbb5215931ddd9ad780e9427a1d8642108cb8..2bf6e86ec18c182da64305eafc39422bbe2940d0 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 a488e850bdae11f2f6c15d6ce47b74181bd43aff..3b177c7a8f8e4e94eebd08dbb02e1c630ed243d8 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 38a796fc217ce40a5a11ab79983c64b47bd2c9c5..5f21ff2cfabba30d89eb85bf132710b9fdbe40fa 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 5322ffccf377d2aac9f74e98882d89acb38dd11d..1b48c8fcc3be941da30137051b320d65f265f1aa 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 888e6fbf551d0552101a8eae8fa525d034398045..c0ef29acc84b89cc482b8acd22adab48ca35ada0 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 8f25c4d11dd9fe3a670ab46b4eae1f4de232b3de..06405920b1d546912419869f5406a9e5e06f55c6 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 3696e6275f35590b383c506d697ea7a221210437..dc4160e93ff5f346eeb6055134b47abdedadb00a 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 d90140ce647ee5eb34bb68cd8b365d296d7fd720..ef47d79b22954ee729a17213e6f5fb92fd3b0af0 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 4875ca956accc49b0ad9199f4c9d1f156b802c4c..95dd6d24d11e9011ba92f715b91c4a9a70704a3f 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 6dc96548d0a5528c515f909c12be34f109ecea80..213798d36311882d13ec5eb9a44bd3fb41dcc5a0 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 0f708ba52bfc6d3bdc8abb714438a8c3c2bb4313..3495653ca6d9f9bde04420d30dd37c628bdf4a63 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 23743da5d01c2bab925abb2331c9b571d8a5b267..9f7b3f366b668e45c0cd0e4fad986d9b5cc2b57f 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 2a540adbc284bc74c6c94db3effb3140e57d5eb8..7780ace72492aeb0a3aee3be8dd9f429d4b5ad11 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 9dd50fcceae03c86a06a2dfae4e334d2a700a187..6f69fa245a1c32a2bfb12280d1a5420726758bb3 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 96de744a424b367e503b7c44994cfa3c38df5f7c..6c0604f94adaddfa74f771ae3e7592008d41a4fe 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 c2304cc26798b3050326ac58af3d2cab0a0be3df..b08e6f6329d691bc2cea6e1ddf432527f19cdbcd 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 f1b1c1fd283bdb7467440fabe82381b435722679..0abb5c94c024d358880842d7917e56ea50371c69 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 8d0679f41bbbd78650645e7b3a2604f962cf12e8..13696c3b4917438a201aa43ce9efef87e3050799 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 bf142a370d86f53eaad1ec27c2fa3d79e85b4d78..a26e8adb725274d6150508b8a0d5eaac23cdffc7 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 f916c6b9e4215ad182716c43b3910d43e9ec00c0..c0f868f41597f216381c1a8a1ffe4f2313cdc754 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 b474736f0ff36f655ee4338335b24a5d0607fc4a..88c1f15798d40edd16644be3d812e750c8a88746 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 9ba79c2018998757394dfd37dc25ea1e0d7e5a87..73c5555240c200d357238eef3dd065da8bb784ec 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 a752354e6a952e03138c512a274e1857d2e9e974..ae9711f5d6905b8ece5e63ce4bb5f9df50d13105 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 1794575e8bae932f6e3a8895a09d3e5c453cefee..8dc8d68880a8add04927a26d6505081f7830ba19 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 adee50161f8d39a5a910b3bf925e122087cf9afe..b11eff524a374fdca0d0e42533e9f1f90c1fea91 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 73342244a4d7ec4fe49758d25f91db3bdd3f37cb..4b4fd9b90270213df29e887c5220d3c81cb0fd9b 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 73f25f6817b9d4b7e572797c20472cf9b4348a88..9ea6f2effe5bc6877b6701a0ff85866844f7ef97 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 4d2c8080b09bd845c418d034c32f7eb047fdb3eb..bb673bf8bcc0e1b484b4e1d7333c5cdca0a3edbf 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 a93c4cd84a2fb154c3c97e871b500b054903ccbf..f89e4006e1fa9e8da50c1e61743ce228df7ab53a 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 740c2605ed31f4916a64d79365995f1d0daa34d6..41ef12163ae20298b2de51cff56740b0c5dfc24d 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 491fae86e179c6ed4e5b429ee01f3e531724c987..ee33a55e0ced281cbca1625f2f8017ca0898c26a 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 7876cc199afa8ef788079003da5c47f2984d16f4..f0bd28b8c43b71a2240a02d007f2d4d6db0d679b 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 555d0ebc8cb886bd3371feeeb9256bcac579af65..666724978e92e4b08ff1413055eda944f0bbec83 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 a8cf80bff774348129d535216dcdea3f191c4f5c..4d1b78a428bd9970bf42fe79d5a9b9d67f3b72cf 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 d079e6e2ea8c0dbd95bb4732ce7549e1104b9cd9..46d01d4a25ac64f84e42b7048b5e262d41bc29dc 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 c99f8edcbda960c19fe35fab40627a14a072b96f..2dac08ca8e75e4f2f18e5630b3bdb45d83e11ed8 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 830f9d3b4e4055d7685bcdb9532391587118d9ce..5029d088daf2cd61050a74c1591c575fa4c9288c 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 31ce01b0fd5ac466b4db39569fcd19eb36e201f9..f8b0d5c8d133eac6b98f329b79940b878db1fb42 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 4eeaf99a7da92401bd41236ab34372c6f822e08d..ccc1dcc8547f5845107280489d700f421b41d283 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 399d6b410a1f67e313296571833d77ac06a78277..80015abe6b800162c5b2cef7c93af0f82bae10c9 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 b6bbf7e9975f542586f08ae4fda81400efe4d65f..2d86c621fa8b89f2b77f70a70c76b15c06e150cf 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 81cc4d72f7ac8f935b4a4547d74b3ffb710a21e4..056ac84fb797d47797bacaa61b59dd174c914362 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 9cde9c8d1b28622095f79c231cc5bad464cdb068..4735a7f7aee0e717104e2a902c9bdbc171d1d538 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 67c00271f6fd0cf473da639e4a9a0a66c8f95a12..868be206853d8a43e7202c2d79792e7486029c49 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 96d3ab490ac33bdc8481a7770c1ff107be6f1b7b..0c036848d2a10ca7a1778321ebbaa23525b94b38 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 e907c48253817ba08bf61c00f62bda60a0ef9a72..f28a42c1f05753167fa9d6103981c81f8cd37338 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 25862bc3eccb08aa68699a7879e89a19d3c6b288..0126f8b610118364fbf28b2375256b1ce2499c31 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 609210587c48147a85a696a6390a50f255e2d964..e8dedfc2b9a61ea6b5d02314d5e03fcea4cd9e32 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 c17ca32ee0f609cbd09ec44b48a8bb2c261190ad..bb27778eb558d4be59ab957cfc331bbf38dc307d 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 3c6e3de8876a745a32f01e3276b773b536087a32..09efdbccdfc362973b14eccb3f9fbaec0422a7a6 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 e26439541916b9b9080b01f4d622566cb1b57082..e475ed56feffde8db94ec2a3c64c475b470e8aa3 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 183cd57a9b6a87fb9de16a529271ea032b970973..b0b42d350c59280f12220575acbd0514f85916c1 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 fb0805420e2ddd52c33e8c9c1ee01692d0e6cf80..cd011126e638693474ff41fbe143ab8f1b2521f3 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 42343ad5fb173abb8938d79babebd3cfd8142120..9eefaa97789abde9a23f9c93039aae3cc7782c65 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 94177a65ca995c6ff5dad37d01bd6c5695dca2ce..9a6a64a015ae16cdad2387a711efdad38317ac3c 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 a0ad435b5be3e0f778e19bd99520449c05b14456..5e73d22c4ad9efffe65476da167ec06866565686 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 335a1c8cd040f490ecc31993726ad590b7476503..d67b5fa42b6acf7dc870d4e4294be25eb24b2bd5 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 433a0c3fa8fe5d8d150280525d76f453d9823fd5..74947f329aa8485c07f50aea9c83412127b9b9d2 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 5b690b77052e8d63b9defa8c5d862235034a6fc8..aefe22e712229ff841183a22d6766f5273a96c32 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 f862ceeb53505c6e10911add480073e54b3650de..2b864c6f74fad07e8ab5654a25b9e08f7a19d97a 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 35c778543c9bed6aa4cdd1878140a494e5b6b813..1a79567b857062df619e6206fea79b3917a03233 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 714c00b394eba4f56ed5e10107d0f6ba89489df2..fe9c9c1120c8d9c494c054efaaa0b30e2ed23623 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 2befe0b58185eff82bf96674e8471e33013f327f..04284207c0345537e75afda130fb487f80d0a842 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 ca23c6b2faf8dac7fd71c308788a18eac4062f91..a41c24b04b6bf75567c5aef158e280fc5705ce94 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 1228b6e8908557853d943033300a2b49f73a6f15..ac8eeaa5165211e652a35d8e0e4b1e4efaa4dc06 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 0a2fac849ee2bf64e090ea885d10fa5f22491aa2..6b9827adaf258f9c1dfe9cc6f9161bdf19b94d41 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 216e0398aae8ee4db375a51baba95cc690ec0db9..2bd816b4bfe713289c5dbf154a17967ab6361483 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 baa85cfd475ecd0f65a307e4cf3fc3b7e1780987..be994f56333428270e058b5608c34b960cc13b65 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 af2281bd28f7ec2343475eede8c5986535308e0c..e1d26bffb23473867feee53347931092cdf24007 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 cf497845bd5e0ce1d481b43fed9e93e60ebf7b30..7635ecb9bdfe10d9cab071d5388669013a9b1b9f 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 b0f827fd64ed967b60308d6079e749a4f0872c2a..511d9c3f9f123ca9e54cb30d9143e61b417d784a 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 056aec1e8dcc312357f515dd5354f79f6a7727f3..e621f94b31557c5a85914af1eb0bcc14ba0d46f3 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 8db935b6c00b4015536549c458af8a7cde8d4779..b56f79083c42d1664e4cd736b6ce891168b639c8 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 08f9cb127af80a9961fba4c4a986d603d2a71d80..c5ed58cb54c06eccbb5e2fafeb9aaf2808f7d87a 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 afe39a244fb4a64d3ee0dec3cd5d40a6531c161e..597d69e0a2516016c44be8ce93a76ab7958512c4 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 e62d482575cbce6f8811b7fdafe2f2d85b02444b..adda1c705f3a544a982e614882352a672fff0304 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 89b71dc37f558569b9eff4fd635eab1b5756a860..8ed804b5b63764b4de712b355dfdf313e21f72b4 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 f45aea3225a47a5af893eea1f09f220be3f95bd5..a6d1d32b247ee27f33fcc304d6d1695a7ca5a2de 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 6880c46e52cb6827921bc027a7591c5167b61b0b..79c8b4a21e97388715d71fd606c8d26d9924cb38 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 5c3b9d013c08672bc35e3e56925b67a05f637072..3803caf06c704358ebe02e68defd80d483c1b1d3 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 b6f762f10499d344ae7a48c576916fb4372a02f7..983c1915d3ba31a6d21284ba089a931722919d22 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 30e291332e353e0912c688c42edbd156fa27a4b8..7382f8452cc7bda2c40865c21690c2e0d4ce68b5 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 09140e4bb0f3b909b69631d237f5ba0b4e0fa7a1..22db770fa50d23c32ed6cb4c86b7ee25f23bf8f0 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 d791054660adb28ee4025805301b062191ebbcef..4dd44345ecde81bc3e34a0049e423e5bb10bacf8 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 8d22a8112d5e455624b3f47e7420fde2210a5ef7..281d07301d07f7aadd6df8d4dc1f2da3058737cb 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 41eab7f552f9de1abc4e07ae5f423710493f9802..7d478d15f8287f38732a3dd1be41796574bcc3cf 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 3ffda74454249d6ccb21e1179aca3ef2a6b3e19e..8e4ae0eaef94f30d5dce3d35b588bca9ebe6f4ea 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 0b8be0213c77076f2bb007cf48030490394c5f19..a9f2a5fc31c1a9c85b59c78017ee5c371ee7f40f 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 49f30899a1ada3d0d9bcb51378bd44aa631b8ba4..11648910adf080f4290c5933bfa1f914b5d1157f 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 c7211558586a41d828da87c1f669bc7f932ec524..ffac7443f3382b3da2292375ef0c720184e84161 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 147d11a77e4466ce079bf42485ff11c1f301f67e..a2c45fb31ffb6a402373d1046fd6c22e8cef7c03 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 04e8e10d711fa1dff6e921ae0078db2c1f437a37..2bc7c7b00125fb6b482631b926ab24899852fc36 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 922102121b4817c4dfc00220fc07f0df358fe3e4..1513b329c0bb57d29dde99c34d345c6e5f177126 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 40c7542f8dea5fd37bfe4d60aae33157204a5336..47fb20716beadc450ff575e522a9f55d1865d2a1 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 ad540b698894a8e2e74ae7d642090d75dc9da576..7a2bae4c816c4715779ce80256cae09dcec10472 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 a64ef8d2960f8e8a207293411105dbabe037dc61..baea13ed32449470ba9efcba4929289437d730fe 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 3d41547b15c75c013af27502d1e3c5126c472c76..55424f12f49eab5bb523b1e54b877d5083b568cf 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 21ea60d882f273754f9f11f865b6c45d069073f8..659258459a6dc966037b44e892b17fea8a2c5e70 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 cae427a9ed282dfd3ac946a8cc41ed2356e227a2..5d35c9be1789f19abffa5ba56dfd1a82c0950126 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 760dd92c7a2ab6c03faf62f67ddb20e67634b538..f36292eb09f47eb7b56af76c6ad443dad586ef49 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 1b636d6aa7f1c7021849d7d48c2a798c27336fdf..6a4c3eeb0cfcde16f0c3f39cce412b82fd58945e 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 301d0f4dfc73038a12ed81c1050dd79c004c72f7..7cd51183c45b0749526831f292a24b8f5bc1947d 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 6a8776dfa0be434b96a95d9da28cd280e0513ea4..9bc3ea9b2e65e51210363a10e4b77c5b75014ef7 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 40b54a20a1d70ef2cdde00a1f9c25b6fb7c13c57..d2da921bfad5f4074ee531008e3fb1fdb98163c7 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 6fcbd96b5c1538abdfe7ac419ce231ae7221adcf..ef33e227040a3ae46fba70e023ca0d6464dfe585 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 53b677793bad14edfe93a47ee53259c90f76a493..a67771fdffd5854d0d4ffe917530d75563c5b4c0 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 2e2374ba9b77e1fef3e0af44933834b1e4d81630..9e2f4319fe4f2f72ae477a57f5613c99ed8d1b4b 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 779ac16ada8141c3d2bfdb26e3ac6ba1d892f586..f42cacaee3c8e3a4664e2f94ebc632714907a1bb 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 eba62af6c624e6862f5af31391fc69117724186f..0bfb79f6fdb4355d370162c89aa3df25c50ef9a5 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 314a53a4eebfdaf1cdcd1a72bbf234b386044e28..797faf4cc86adce2de3ba660f6788ace60cac9b2 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 38f49d65e061e20455af49c34b0c95ce16cca329..e87c0be4da5e9a60f80f72b83eb10a600bc8255b 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 8dc7ca5ccc71c1d682091ea2681eecf09b9d11ee..8c7c88d2a4d171a51f186e4a7602e20c61b001ef 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 62a326cf956b9dbe8d37a795088fe12164816503..282ad2521049a52962375e5d8c8f8f14e1792d0f 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 98b0969013817d84936b47f99da95c7e08999fd3..2f1001c6a817aa89eabf7764bfc2cfd15c4759d1 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 e2b0a699ba32cc26e2072992aa50fe66cf84d700..b817950276a0651a05f981696e8b37279540b6ee 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 c101f7035bd11a024fc019e49155d7d7d0b17ec4..23f1bf93d4ec84c0a9973a1b368977964c73c144 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 be7cb337c246ce42de0747e0fe76ee805f276604..e29db3fdefc91c28a47ba6b6a837a510c785d96c 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 777d420af86ab22aeb0a08c8a3d22fb128686209..4e11bbae9c6c7c1e93d34e1333ef5612eb114b46 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 686791051a9e80cc66b4f6b2d3f2d9c9e30f1971..820ae66a61dd39a4963c9ce3e8c0c66a035fe4d0 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 71ef07a4a4ffa2113a3f841441515ea6208a3b79..ddefbe2056bdae8d7d247f733958418ed5c846c9 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 59183a69f251fa28900014f13bf60729ef1b7d65..52a833d161734bad2f9fcf7f86ea04dc7baeef71 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 4bca39178026c8b8bfb79f2a67453b1b2a27b37b..a0ae5fd5cdd271853a0b2f30617bb725c4100078 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 1330e89977b99762e3a1131795e69ac38ab6b840..7eecc0e43b26cc758c31ae03e5989c1bbfded951 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 329b6e59e6974d8a794dfa30f4875ef407c71c46..0644dee7c1b081d097ef85a98f23db2aaa9fc7f8 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 9e29d019b9be85dadfd5e8cf0d5e38296bd61870..d2cf04a61ffec8feca2332ae116b990144803abe 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 7d83ef6d2de4912dc73f9fbccda1f8acd23efe1b..7cc875a31dc88a37a10aaf665958921a3153c277 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 b3380ddd09fab76d0c07fae1f84ba547d3cb99cb..bd76e052a72a1d87140f99a02e24f12abf9e0241 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 873bf3309ab8f0d7eb95574dd1ee166ff22aa794..090a098c003cbc07d21ac22f1df3eb094187540b 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 a0d20afb771defd0cc51d14c0eeebb331a93a923..7da3fb3c2c9f038a473351748aab94d86a68e885 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 1f280b75f0c7123b27df40950ae2572ef2a4e1e9..9c6b388bdd233b5843ea154d72112d5224e5ca32 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 8166162db34b16bc09ba82c3ed7f3b5d7e11f7b5..242fae9385ea0bbf2dd3b5640efa7548372f6408 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 3e50a1d075835d8cdf6da1d6c72e26dcbfdde144..ebcd114b4a48adc25496ead8c4454ed4a9e1f07f 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 534dc1b79e816017314914c09f96c3d04d360ce5..2210956fd60ea6e098869e5375aca5c2511a8360 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 5071c47a05a21eafbc62e9939f87299200b2fd83..090e9bbb48a730f7208eeca0ef747f9a2fb7bd98 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 7f1be51add23e13f83529270349486e6327ee1e0..4a248b8d25535735c7fd80b0bd3a7839574c4583 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 c56c927b064e18681edff5db4f1d89882a7410da..c20deffe461421975b5176fd1710004c213c38fe 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 26fab006b2aeaac4733047fd2d7d74f173bb170e..e2219b6fd20cb5fce6ed063dd5f9916939c2e432 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 d12497bfec7d5b955478b52a34cdefb8a00f0f0c..bcc144f48896416b202f00e08e0606b319581782 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 c93a0d1ad409cc2c3d236a1033c686a8f0bdde85..ba8f3a234ca2367d8155fb4325c15e0a9e9f6b4b 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 315a56f2fa4d22e855ce03e310b25abbc01505f6..6ed76fa2ba08abb7157a6ec4673510ddf76e40a6 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 93f1fe166c32c42428d6fd2bfd274b4d40d73ad5..84588863373e38cfe5c846fffb19915a6a6e36b5 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 1c476b60753a65150e04313851656b4529f5b3d9..598bbcd49c3738d8fee25c6e0f1a488868ffc782 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 0269926280d1b234765b6412beb474f745268e94..12e83ea5e326297f5ed4b1319009fc12002232d4 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 b546644e30f4c22b2fbccd9cf40d5331f43a4ca0..2bbae782df9866d77ed22664e663a598dbeb4b6d 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 94957cd8838469c8ee348fdc27d397d7060c19c8..af1a0a0cca269ad131a773e107cc284d9253ce50 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 c25f82a73a52ce713a69442716b911d4d2b250c8..97cfea29f5a0f438abfeeef7e3040e20e7f4ff06 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 af9667a879eae730b5fbe380976905b1d9ff0573..6657e2c3f7ad614bf51e32868d957edcb81b9073 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 24f9802d0933d5cfd9def4c64ad4103541e96c69..729c097b1e464fc5e46d41b9001f37281f2028e4 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 3272418bb383af890c4cc915e94a7407b5fe3059..1b63072a69287d0b13c2ef2bf5823057e7f056c3 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 48659864f581c4957d7a5431ca8998ead3e4cb86..7939a8c89b9a1169b50b459d75ec42e471fd741d 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 a4babe100cbffafff6a4691e95a812af387fd979..dcb89a538f8ccd7ee57d1dff5f44380010907e79 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 367a5c52f4f11e7bf6adc08526a46b3f0caed302..9d3665d4c68b4ce92e39d46302d38e60b02c2993 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 c5c26ffc51b11895324aa8f057f427eefd7703b6..895b9ceeb73709e1e33398fdea0e76afe0374387 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 ad52851bed880d3dcd59455cf7ea4a8fa73ff288..db0390264597e5f800a548faee39fc2a8521a400 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 56b910cc98bac8686535d842b6e42d36d2403d41..a6d859c1b2d47eaa686f455505ef48606192ef2d 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 f71b19d0f470b3ac3de0eca15b6072407efda9db..2a6cf72f0af6d0f36f1f266e9cfdf1d921686d37 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 9795ffdf160e287f55fe943617c2be445be4bbf4..d815a8ae613b45668965780cbc0972630f870b1a 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 d280f6a5282a89500353de931a1418e614bb9571..f21dd12b4d3a49a3e5083926a1f2ff2c79c3858d 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 51eb0eff79a2fb50263af2da798aff0d7fd0e45f..33f0df47b2266a3921688406ce9130b306224f91 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 64c2c4465adf504e163d4c6530746f75993a5d07..d2ad26d30fd2caa8d04b6278ac3deb1206b376ee 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 8072f58451c19d9357266a64cf5fd11b6131b95a..754ed15515538fede21b564711549fac18a19513 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 7435fdc9759a6cf0aa96b7d1aa49412e9c735651..763b96525cab4232847666aff7f68c1d27ce77a5 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 7fb5a847667cad8caf4976199023cabde570ebb0..d56bba086fa67d0a3d36eaaab99d5012571b81c7 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 49404360f3e620272820c9f5eb6461a56fecaa36..15fc5e3af4b60c4d5c48f763ca7f43f9b715f13b 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 84becc302f87b69095697d76031ba2c978505c40..53280ea735d5aa7fd2421da5a5ac60dfd4e7fbb3 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 7fde0c94a638452844ed32bed34291c609f25ffa..905a212d985072b479308a940773505eb5c056b7 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 4ffe3aa6bce5f022c00c0e86171494393257f5c5..db553c20de3553b42a4b64afc432c2f43e29e613 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 3304a0821fe60824c629c55112756b6bdee24383..44fb735f5db97d9c6a2d6da32f3b9082a3a6c8f5 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 205e46c1b6f8078c08c3ae848cafd08dedcd0247..46829d6b50a7485067cd499060bb98b04db89e05 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 b8287c7fb2c6d63e196168d197d9ea7e0e610bcf..65ba8927aa75e8db9237edd3edf160203c15ebe9 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 58f3e532ef14f9dd891fa897dc29aa16c49470cb..f1dd46f89aea476269ac93f8dd197d18fb021889 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 6d3c326bbf0e734748cf82401d52957b89d9773b..586fabd8c4e6906761c4f302b36a1975b3ff80fb 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 7e94f38f6c9b97624c17df4a10ff17589762b96f..10dc2c9abf62a37ce7bd01ed5b280ab8f0195c44 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 55364fcb06cd6b46ce5a68b8705ba6527a19b587..773b06d96589888ab51af0416e54e5848f3e2f6b 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 4d8d02c43c82fa69868f7deb268480019850b527..eaa7ea490a0e713d005d5aa828257353e14e1d95 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 c3086cb3c7381470ddcee12bdaad42e419ce9dbc..2d9c6f0c4f92f952f37a7d3e35058a606b1d10a9 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 199c5114ba2d004d89be286d9ca622496577e61e..e960609c71cc381d3dab6053c91a9b4f16ee7f20 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 d6178b06331f07f2853bd63f6d43fa61ba752ab1..11642ba8398f9e8ae2393d8f032fd8fc627c8a8a 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