diff --git a/gen/AVObject.cpp b/gen/AVObject.cpp
index 87c360f0de5e59431c9dbfb5f4764b373c9f7964..c0fc28e03e9c1b1b27bc0befc28cd64a8ef7bb9d 100644
--- a/gen/AVObject.cpp
+++ b/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 "gen/AVObject.h"
-#include "obj/NiAVObject.h"
+#include "AVObject.h"
+#include "../obj/NiAVObject.h"
 
 //Constructor
 AVObject::AVObject() : object(NULL) {};
diff --git a/gen/AVObject.h b/gen/AVObject.h
index d7810069123984900fb37909f4c5e8cc1b8fd6f3..8aa16995bc73b4fd3003f917c597e80eb17e6994 100644
--- a/gen/AVObject.h
+++ b/gen/AVObject.h
@@ -4,10 +4,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #ifndef _AVOBJECT_H_
 #define _AVOBJECT_H_
 
-#include "NIF_IO.h"
+#include "../NIF_IO.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiAVObject;
 
 /*!
diff --git a/gen/Bones.cpp b/gen/Bones.cpp
index 8df625fc871fb74de03e5d1e3e8ca4a9c78df11d..78a6983fa53df362829944a0d990c94bc3c7aff4 100644
--- a/gen/Bones.cpp
+++ b/gen/Bones.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "gen/Bones.h"
-#include "obj/NiNode.h"
+#include "Bones.h"
+#include "../obj/NiNode.h"
 
 //Constructor
 Bones::Bones() : numBones((uint)0) {};
diff --git a/gen/Bones.h b/gen/Bones.h
index 4d52e49ccdba8deeaff91c8eff5b713e89f52813..edf6f230611c95ee0c5e64138906f655e7d48258 100644
--- a/gen/Bones.h
+++ b/gen/Bones.h
@@ -4,10 +4,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #ifndef _BONES_H_
 #define _BONES_H_
 
-#include "NIF_IO.h"
+#include "../NIF_IO.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiNode;
 
 /*!
diff --git a/gen/BoundingBox.cpp b/gen/BoundingBox.cpp
index 11e19c632425164eeccac34408be5d8811ae18fb..b3608db77fb6b75d18053ce2fab441027e7b5166 100644
--- a/gen/BoundingBox.cpp
+++ b/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 "gen/BoundingBox.h"
+#include "BoundingBox.h"
 
 //Constructor
 BoundingBox::BoundingBox() : unknownInt((uint)1) {};
diff --git a/gen/BoundingBox.h b/gen/BoundingBox.h
index 1846dcaef22036f73f826e453f2d2fb9036078e5..318463ae4fb71dca38d10038622f7d3251fcfe88 100644
--- a/gen/BoundingBox.h
+++ b/gen/BoundingBox.h
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #ifndef _BOUNDINGBOX_H_
 #define _BOUNDINGBOX_H_
 
-#include "NIF_IO.h"
+#include "../NIF_IO.h"
 
 
 /*!
diff --git a/gen/ByteArray.cpp b/gen/ByteArray.cpp
index 99f8f6e3c5111c0e7715875b02bea08fbb83ae76..4c40b47725aa6f107ec3eddb5d073e92af0229f8 100644
--- a/gen/ByteArray.cpp
+++ b/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 "gen/ByteArray.h"
+#include "ByteArray.h"
 
 //Constructor
 ByteArray::ByteArray() : dataSize((uint)0), unknownInt((uint)0) {};
diff --git a/gen/ByteArray.h b/gen/ByteArray.h
index c3881f137e5343c64f1bb3c8b995c119c1143344..016ea1d8b94784ce79f8aa02840b7295172c4381 100644
--- a/gen/ByteArray.h
+++ b/gen/ByteArray.h
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #ifndef _BYTEARRAY_H_
 #define _BYTEARRAY_H_
 
-#include "NIF_IO.h"
+#include "../NIF_IO.h"
 
 
 /*!
diff --git a/gen/ControllerLink.cpp b/gen/ControllerLink.cpp
index 8cbf106a0adb2794b96f6f41fe22cdfca41b7aa5..9c2fa65d8a91d038079085f426c8b6aff9124c9b 100644
--- a/gen/ControllerLink.cpp
+++ b/gen/ControllerLink.cpp
@@ -1,10 +1,10 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "gen/ControllerLink.h"
-#include "obj/NiInterpolator.h"
-#include "obj/NiObject.h"
-#include "obj/NiStringPalette.h"
+#include "ControllerLink.h"
+#include "../obj/NiInterpolator.h"
+#include "../obj/NiObject.h"
+#include "../obj/NiStringPalette.h"
 
 //Constructor
 ControllerLink::ControllerLink() : interpolator(NULL), unknownLink1(NULL), unknownLink2(NULL), unknownShort0((ushort)0), priority_((byte)0), stringPalette(NULL), nodeNameOffset((uint)0), propertyTypeOffset((uint)0), controllerTypeOffset((uint)0), variableOffset1((uint)0), variableOffset2((uint)0) {};
diff --git a/gen/ControllerLink.h b/gen/ControllerLink.h
index 87f5ea3ec3bef554fa48237f3f582c7aac6fcd70..c4f2020b5b704c7fd5961cc1f35eb79aa8a57ba1 100644
--- a/gen/ControllerLink.h
+++ b/gen/ControllerLink.h
@@ -4,10 +4,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #ifndef _CONTROLLERLINK_H_
 #define _CONTROLLERLINK_H_
 
-#include "NIF_IO.h"
+#include "../NIF_IO.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiInterpolator;
 class NiObject;
 class NiStringPalette;
diff --git a/gen/Footer.cpp b/gen/Footer.cpp
index a02f72384c891382970a8e87711df0a2d251bc4d..041e9c19aca602d6f6f3babc268549cc379d41b5 100644
--- a/gen/Footer.cpp
+++ b/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 "gen/Footer.h"
-#include "obj/NiAVObject.h"
+#include "Footer.h"
+#include "../obj/NiAVObject.h"
 
 //Constructor
 Footer::Footer() : numRoots((uint)0) {};
diff --git a/gen/Footer.h b/gen/Footer.h
index bfc14dacc5fccb368e43287b1d96d70d023b618f..e0593ebd239e3e96a0b9c8f45759e4f893a50fdc 100644
--- a/gen/Footer.h
+++ b/gen/Footer.h
@@ -4,12 +4,12 @@ All rights reserved.  Please see niflib.h for licence. */
 #ifndef _FOOTER_H_
 #define _FOOTER_H_
 
-#include "NIF_IO.h"
+#include "../NIF_IO.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiAVObject;
-#include "obj/NiObject.h"
+#include "../obj/NiObject.h"
 
 /*!
  * The NIF file footer.
diff --git a/gen/FurniturePosition.cpp b/gen/FurniturePosition.cpp
index c5b35b0e7ffa4c1c5c083520d4c68431648abfbc..702464e380ae002ae81549554a4b871b9acd38a4 100644
--- a/gen/FurniturePosition.cpp
+++ b/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 "gen/FurniturePosition.h"
+#include "FurniturePosition.h"
 
 //Constructor
 FurniturePosition::FurniturePosition() : orientation((ushort)0), positionRef1((byte)0), positionRef2((byte)0) {};
diff --git a/gen/FurniturePosition.h b/gen/FurniturePosition.h
index 6081f3885f800baaf7907133d3d084f281607a5a..5941fdafcd3bba6e277bac884da576f0707e6b2c 100644
--- a/gen/FurniturePosition.h
+++ b/gen/FurniturePosition.h
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #ifndef _FURNITUREPOSITION_H_
 #define _FURNITUREPOSITION_H_
 
-#include "NIF_IO.h"
+#include "../NIF_IO.h"
 
 
 /*!
diff --git a/gen/Header.cpp b/gen/Header.cpp
index ba59c6733a2d83cfe55e7fd5fb85d203418e64cd..91ef3097a8ec9034127e77bc213a75c9d3e22850 100644
--- a/gen/Header.cpp
+++ b/gen/Header.cpp
@@ -1,10 +1,10 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "gen/Header.h"
-#include "gen/ShortString.h"
-#include "gen/ShortString.h"
-#include "gen/ShortString.h"
+#include "Header.h"
+#include "ShortString.h"
+#include "ShortString.h"
+#include "ShortString.h"
 
 //Constructor
 Header::Header() : version((uint)0x04000002), endianType((byte)1), userVersion((uint)0), numBlocks((uint)0), unknownInt1((uint)0), unknownInt3((uint)0), numBlockTypes((ushort)0), unknownInt2((uint)0) {};
diff --git a/gen/Header.h b/gen/Header.h
index 35235f5e9869cfe43b12ef9f20e5cedcd9380a0b..486542a0c2f7e457bd31b2a7ae6d079bd996c6ca 100644
--- a/gen/Header.h
+++ b/gen/Header.h
@@ -4,10 +4,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #ifndef _HEADER_H_
 #define _HEADER_H_
 
-#include "NIF_IO.h"
+#include "../NIF_IO.h"
 // Include structures
-#include "gen/ShortString.h"
-#include "obj/NiObject.h"
+#include "ShortString.h"
+#include "../obj/NiObject.h"
 
 /*!
  * The NIF file header.
diff --git a/gen/KeyGroup.h b/gen/KeyGroup.h
index d9fb37af0dceac6e1d4fcf65eb07cddd4570588d..db6b7e4320baf657de47f550c796f8ba981d3bb6 100644
--- a/gen/KeyGroup.h
+++ b/gen/KeyGroup.h
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #ifndef _KEYGROUP_H_
 #define _KEYGROUP_H_
 
-#include "NIF_IO.h"
+#include "../NIF_IO.h"
 
 
 /*!
diff --git a/gen/LODRange.cpp b/gen/LODRange.cpp
index b66633dbd7214ba4ffcd7098f6cdab6ed34d2a5a..2e6d9101f00364201c1f8213a2551c6a75767ef9 100644
--- a/gen/LODRange.cpp
+++ b/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 "gen/LODRange.h"
+#include "LODRange.h"
 
 //Constructor
 LODRange::LODRange() : near(0.0f), far(0.0f) {};
diff --git a/gen/LODRange.h b/gen/LODRange.h
index 30b6888e5b89a4e6121a0c64dc26a6c01606de51..35bad2807bf3991665e4700f35fe36468bf34847 100644
--- a/gen/LODRange.h
+++ b/gen/LODRange.h
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #ifndef _LODRANGE_H_
 #define _LODRANGE_H_
 
-#include "NIF_IO.h"
+#include "../NIF_IO.h"
 
 
 /*!
diff --git a/gen/LimitedHingeDescriptor.cpp b/gen/LimitedHingeDescriptor.cpp
index 12c61d0dd3df8e972b8d64daed81c8f45ca26303..0f3bf91a3eb7436ba4d37f41199a94f37e190c4b 100644
--- a/gen/LimitedHingeDescriptor.cpp
+++ b/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 "gen/LimitedHingeDescriptor.h"
+#include "LimitedHingeDescriptor.h"
 
 //Constructor
 LimitedHingeDescriptor::LimitedHingeDescriptor() : minAngle(0.0f), maxAngle(0.0f), maxFriction(0.0f) {};
diff --git a/gen/LimitedHingeDescriptor.h b/gen/LimitedHingeDescriptor.h
index 5eaa401b5b461b634e58ba212c6be1f7927f4546..be3de4af32b8d1614e37776f84aac86fed9da389 100644
--- a/gen/LimitedHingeDescriptor.h
+++ b/gen/LimitedHingeDescriptor.h
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #ifndef _LIMITEDHINGEDESCRIPTOR_H_
 #define _LIMITEDHINGEDESCRIPTOR_H_
 
-#include "NIF_IO.h"
+#include "../NIF_IO.h"
 
 
 /*!
diff --git a/gen/MatchGroup.cpp b/gen/MatchGroup.cpp
index d7215d19f2a440c89f0213ce6c13e08eb4287fa4..58b46937723cb9e855db86790632dce6d0a53d4b 100644
--- a/gen/MatchGroup.cpp
+++ b/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 "gen/MatchGroup.h"
+#include "MatchGroup.h"
 
 //Constructor
 MatchGroup::MatchGroup() : numVertices((ushort)0) {};
diff --git a/gen/MatchGroup.h b/gen/MatchGroup.h
index e7e50e26414418919b02ea48d8354d128bb2b119..d580af31e5f91a0b9c56f6dde09d87ff9f3066e3 100644
--- a/gen/MatchGroup.h
+++ b/gen/MatchGroup.h
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #ifndef _MATCHGROUP_H_
 #define _MATCHGROUP_H_
 
-#include "NIF_IO.h"
+#include "../NIF_IO.h"
 
 
 /*!
diff --git a/gen/MipMap.cpp b/gen/MipMap.cpp
index 762b39687255bfd8c03b640796b48e8d8ac99111..cd673a5669f9e41c91e0385a41ac0798d3fc1639 100644
--- a/gen/MipMap.cpp
+++ b/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 "gen/MipMap.h"
+#include "MipMap.h"
 
 //Constructor
 MipMap::MipMap() : width((uint)0), height((uint)0), offset((uint)0) {};
diff --git a/gen/MipMap.h b/gen/MipMap.h
index 2615a4fa80a78c87a4484af73af387a4812418a9..5b354aa1e2a01c55d83594fe2f5c40747534c262 100644
--- a/gen/MipMap.h
+++ b/gen/MipMap.h
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #ifndef _MIPMAP_H_
 #define _MIPMAP_H_
 
-#include "NIF_IO.h"
+#include "../NIF_IO.h"
 
 
 /*!
diff --git a/gen/Morph.cpp b/gen/Morph.cpp
index 3dd16552746ce401270d3adce48ce267de8d27c1..ef314ed6a70e286b4a159494def7d0f5077d49ed 100644
--- a/gen/Morph.cpp
+++ b/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 "gen/Morph.h"
+#include "Morph.h"
 
 //Constructor
 Morph::Morph() : numMorphKeys((uint)0), morphInterpolation((KeyType)0), unknownInt((uint)0) {};
diff --git a/gen/Morph.h b/gen/Morph.h
index 980ef12d87ff945bf17f51a5e44d17d28915cdcb..46cb21c539f184f47a8dd35abaee550e56a664f1 100644
--- a/gen/Morph.h
+++ b/gen/Morph.h
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #ifndef _MORPH_H_
 #define _MORPH_H_
 
-#include "NIF_IO.h"
+#include "../NIF_IO.h"
 
 
 /*!
diff --git a/gen/NodeGroup.cpp b/gen/NodeGroup.cpp
index a020b6218ad6320e284ea7f18249d99b0d5a2794..699d6d6bb0558d1ed5b649371be7285959f1652b 100644
--- a/gen/NodeGroup.cpp
+++ b/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 "gen/NodeGroup.h"
-#include "obj/NiNode.h"
+#include "NodeGroup.h"
+#include "../obj/NiNode.h"
 
 //Constructor
 NodeGroup::NodeGroup() : numNodes((uint)0) {};
diff --git a/gen/NodeGroup.h b/gen/NodeGroup.h
index b7b987b6e8b9d448dd372ea2f8ad095b8e54ab6f..170549ca7f3371d9953c5a7e1a72d27fe9aa0357 100644
--- a/gen/NodeGroup.h
+++ b/gen/NodeGroup.h
@@ -4,10 +4,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #ifndef _NODEGROUP_H_
 #define _NODEGROUP_H_
 
-#include "NIF_IO.h"
+#include "../NIF_IO.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiNode;
 
 /*!
diff --git a/gen/Particle.cpp b/gen/Particle.cpp
index 962f92c02aca65a25e6e83517ac68ff5fa6a0203..5ba5c4579f28245733d43d21dcfacf04ff080259 100644
--- a/gen/Particle.cpp
+++ b/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 "gen/Particle.h"
+#include "Particle.h"
 
 //Constructor
 Particle::Particle() : lifetime(0.0f), lifespan(0.0f), timestamp(0.0f), unknownShort((ushort)0), vertexId((ushort)0) {};
diff --git a/gen/Particle.h b/gen/Particle.h
index ee3a5f700a13b7d7f293777d589520ff1b5fdcb1..28b5c6c9255754ac52e914043f90ed7338ad821a 100644
--- a/gen/Particle.h
+++ b/gen/Particle.h
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #ifndef _PARTICLE_H_
 #define _PARTICLE_H_
 
-#include "NIF_IO.h"
+#include "../NIF_IO.h"
 
 
 /*!
diff --git a/gen/QuaternionXYZW.cpp b/gen/QuaternionXYZW.cpp
index a0a163ea3df014116016e50d2f6c1ff6e8b541f7..36b23acb780c9a6b500075603279d3e768ea19a5 100644
--- a/gen/QuaternionXYZW.cpp
+++ b/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 "gen/QuaternionXYZW.h"
+#include "QuaternionXYZW.h"
 
 //Constructor
 QuaternionXYZW::QuaternionXYZW() : x(0.0f), y(0.0f), z(0.0f), w(0.0f) {};
diff --git a/gen/QuaternionXYZW.h b/gen/QuaternionXYZW.h
index ef54541c45dd78faa3485358a4906b8dbfaba563..7ff6b5e2c300cbbf34cb4d5f8fd6bd70800acfb0 100644
--- a/gen/QuaternionXYZW.h
+++ b/gen/QuaternionXYZW.h
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #ifndef _QUATERNIONXYZW_H_
 #define _QUATERNIONXYZW_H_
 
-#include "NIF_IO.h"
+#include "../NIF_IO.h"
 
 
 /*!
diff --git a/gen/RagDollDescriptor.cpp b/gen/RagDollDescriptor.cpp
index 02878c423ce540c8777cd3fe41b78a19814b3c38..caa89a77bf0f34a32a993294c161bd9509ada687 100644
--- a/gen/RagDollDescriptor.cpp
+++ b/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 "gen/RagDollDescriptor.h"
+#include "RagDollDescriptor.h"
 
 //Constructor
 RagDollDescriptor::RagDollDescriptor() : coneMinAngle(0.0f), planeMinAngle(0.0f), planeMaxAngle(0.0f), twistMinAngle(0.0f), twistMaxAngle(0.0f), maxFriction(0.0f) {};
diff --git a/gen/RagDollDescriptor.h b/gen/RagDollDescriptor.h
index 73b19529ba2b5c21ac9b2390132fdc2bb4c695a0..e7c9c15e9c1d5bd8965c377b586ef6ee1a39509c 100644
--- a/gen/RagDollDescriptor.h
+++ b/gen/RagDollDescriptor.h
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #ifndef _RAGDOLLDESCRIPTOR_H_
 #define _RAGDOLLDESCRIPTOR_H_
 
-#include "NIF_IO.h"
+#include "../NIF_IO.h"
 
 
 /*!
diff --git a/gen/RotationKeyArray.h b/gen/RotationKeyArray.h
index d8ac80e29b0bb5499d7f7ace2eb338d20562a955..c4d0ddb14ac8921915dacac06ee3b40ff89af823 100644
--- a/gen/RotationKeyArray.h
+++ b/gen/RotationKeyArray.h
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #ifndef _ROTATIONKEYARRAY_H_
 #define _ROTATIONKEYARRAY_H_
 
-#include "NIF_IO.h"
+#include "../NIF_IO.h"
 
 
 /*!
diff --git a/gen/ShaderTexDesc.cpp b/gen/ShaderTexDesc.cpp
index bceeb6230dee25f396576ebf38d98e4d600d1e02..32c5a37acc5fba7025afd55e5f6c0965d4576e61 100644
--- a/gen/ShaderTexDesc.cpp
+++ b/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 "gen/ShaderTexDesc.h"
-#include "gen/TexDesc.h"
-#include "obj/NiSourceTexture.h"
+#include "ShaderTexDesc.h"
+#include "TexDesc.h"
+#include "../obj/NiSourceTexture.h"
 
 //Constructor
 ShaderTexDesc::ShaderTexDesc() : isUsed(false), unknownInt((uint)0) {};
diff --git a/gen/ShaderTexDesc.h b/gen/ShaderTexDesc.h
index b3c1d06459983f36226bbe5338adc639b095885e..830db1be4be21007bbf56ace06a77bd823014a9a 100644
--- a/gen/ShaderTexDesc.h
+++ b/gen/ShaderTexDesc.h
@@ -4,9 +4,9 @@ All rights reserved.  Please see niflib.h for licence. */
 #ifndef _SHADERTEXDESC_H_
 #define _SHADERTEXDESC_H_
 
-#include "NIF_IO.h"
+#include "../NIF_IO.h"
 // Include structures
-#include "gen/TexDesc.h"
+#include "TexDesc.h"
 
 /*!
  * An extended texture description for shader textures.
diff --git a/gen/ShortString.cpp b/gen/ShortString.cpp
index c8babec259d2497b05d53ad2f790d658045a20c6..79d345964d9ce9fb44d1b2d8cac0b62019e14a10 100644
--- a/gen/ShortString.cpp
+++ b/gen/ShortString.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "gen/ShortString.h"
+#include "ShortString.h"
 
 //Constructor
 ShortString::ShortString() : length((byte)0) {};
diff --git a/gen/ShortString.h b/gen/ShortString.h
index 316562df8c9568f384d70a4c69e8b574e98cbc37..5492ca43fbcbb7bbd3a2c1a369fb3e9365f02948 100644
--- a/gen/ShortString.h
+++ b/gen/ShortString.h
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #ifndef _SHORTSTRING_H_
 #define _SHORTSTRING_H_
 
-#include "NIF_IO.h"
+#include "../NIF_IO.h"
 
 
 /*!
diff --git a/gen/SkinData.cpp b/gen/SkinData.cpp
index 901acfa10cf0c974ba33696f9d329e84b8cba563..d9e9d17d6d43894429e522acbd5c4c8811ad9c0f 100644
--- a/gen/SkinData.cpp
+++ b/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 "gen/SkinData.h"
-#include "gen/SkinWeight.h"
+#include "SkinData.h"
+#include "SkinWeight.h"
 
 //Constructor
 SkinData::SkinData() : scale(0.0f), numVertices((ushort)0) {};
diff --git a/gen/SkinData.h b/gen/SkinData.h
index 828e5bc9b3bc1c9d824c38b52077f4d2edc61634..ba217054b5217c3c502cc83382ae1cb3864574f0 100644
--- a/gen/SkinData.h
+++ b/gen/SkinData.h
@@ -4,9 +4,9 @@ All rights reserved.  Please see niflib.h for licence. */
 #ifndef _SKINDATA_H_
 #define _SKINDATA_H_
 
-#include "NIF_IO.h"
+#include "../NIF_IO.h"
 // Include structures
-#include "gen/SkinWeight.h"
+#include "SkinWeight.h"
 
 /*!
  * Skinning data component.
diff --git a/gen/SkinPartition.cpp b/gen/SkinPartition.cpp
index 881b9512c721232d66fb997743798a703427485f..7ac08c81325590c4240f92cae57740314fefb9e6 100644
--- a/gen/SkinPartition.cpp
+++ b/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 "gen/SkinPartition.h"
+#include "SkinPartition.h"
 
 //Constructor
 SkinPartition::SkinPartition() : numVertices((ushort)0), numTriangles((ushort)0), numBones((ushort)0), numStrips((ushort)0), numWeightsPerVertex((ushort)0), hasVertexMap(false), hasVertexWeights(false), hasStrips(false), hasBoneIndices(false) {};
diff --git a/gen/SkinPartition.h b/gen/SkinPartition.h
index 7946cd9e2bc1531e1389d96cc7921194b66da18d..9b10c56460c86cec4be3b3dd2609651ec02361c0 100644
--- a/gen/SkinPartition.h
+++ b/gen/SkinPartition.h
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #ifndef _SKINPARTITION_H_
 #define _SKINPARTITION_H_
 
-#include "NIF_IO.h"
+#include "../NIF_IO.h"
 
 
 /*!
diff --git a/gen/SkinShape.cpp b/gen/SkinShape.cpp
index cea98735d9bd7f1af7a4dc5c2c6bfa2dd40411e4..905d0e8f320479b72edfce19f3d85074c2966e0b 100644
--- a/gen/SkinShape.cpp
+++ b/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 "gen/SkinShape.h"
-#include "obj/NiTriShape.h"
-#include "obj/NiSkinInstance.h"
+#include "SkinShape.h"
+#include "../obj/NiTriShape.h"
+#include "../obj/NiSkinInstance.h"
 
 //Constructor
 SkinShape::SkinShape() : shape(NULL), skinInstance(NULL) {};
diff --git a/gen/SkinShape.h b/gen/SkinShape.h
index f1275a4d13438651e0f2df1c54ad260903bcae6e..46d310067d0fb943be99ed24db1d32b4503c7279 100644
--- a/gen/SkinShape.h
+++ b/gen/SkinShape.h
@@ -4,10 +4,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #ifndef _SKINSHAPE_H_
 #define _SKINSHAPE_H_
 
-#include "NIF_IO.h"
+#include "../NIF_IO.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiTriShape;
 class NiSkinInstance;
 
diff --git a/gen/SkinShapeGroup.cpp b/gen/SkinShapeGroup.cpp
index aa65e6767f2932b7b5ddbb51b0be8910290a20e8..893c737064bc5501af05b7396d1088c7aa36ace1 100644
--- a/gen/SkinShapeGroup.cpp
+++ b/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 "gen/SkinShapeGroup.h"
-#include "gen/SkinShape.h"
-#include "obj/NiTriShape.h"
-#include "obj/NiSkinInstance.h"
+#include "SkinShapeGroup.h"
+#include "SkinShape.h"
+#include "../obj/NiTriShape.h"
+#include "../obj/NiSkinInstance.h"
 
 //Constructor
 SkinShapeGroup::SkinShapeGroup() : numLinkPairs((uint)0) {};
diff --git a/gen/SkinShapeGroup.h b/gen/SkinShapeGroup.h
index e53394f335ab17f25082d66c143dd165609ae3e8..f48cf92d7a5c336198ae084a0b76b4e22ce414fd 100644
--- a/gen/SkinShapeGroup.h
+++ b/gen/SkinShapeGroup.h
@@ -4,9 +4,9 @@ All rights reserved.  Please see niflib.h for licence. */
 #ifndef _SKINSHAPEGROUP_H_
 #define _SKINSHAPEGROUP_H_
 
-#include "NIF_IO.h"
+#include "../NIF_IO.h"
 // Include structures
-#include "gen/SkinShape.h"
+#include "SkinShape.h"
 
 /*!
  * Unknown.
diff --git a/gen/SkinWeight.cpp b/gen/SkinWeight.cpp
index 05f8c8993fcac909c409921c234c82a69b660a3b..bb35f75dbf7bd4ad10eaa5cefcd561ef981743fa 100644
--- a/gen/SkinWeight.cpp
+++ b/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 "gen/SkinWeight.h"
+#include "SkinWeight.h"
 
 //Constructor
 SkinWeight::SkinWeight() : index((ushort)0), weight(0.0f) {};
diff --git a/gen/SkinWeight.h b/gen/SkinWeight.h
index 840c13954c2b9b0edffa2169c7677994e9c99f10..9000153638b595ca1f01b783dcecac81cfae1269 100644
--- a/gen/SkinWeight.h
+++ b/gen/SkinWeight.h
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #ifndef _SKINWEIGHT_H_
 #define _SKINWEIGHT_H_
 
-#include "NIF_IO.h"
+#include "../NIF_IO.h"
 
 
 /*!
diff --git a/gen/StringPalette.cpp b/gen/StringPalette.cpp
index e3ceb24029b9d1ab2224bec9423d736ceae332bf..4eeee30ed9746f320c20419f0e000f8c88673d4e 100644
--- a/gen/StringPalette.cpp
+++ b/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 "gen/StringPalette.h"
+#include "StringPalette.h"
 
 //Constructor
 StringPalette::StringPalette() : length((uint)0) {};
diff --git a/gen/StringPalette.h b/gen/StringPalette.h
index 4249502d31d4a70a35f842932834174cd7077315..ccec65a965181f8960fee3e4ff940e174a61ab0a 100644
--- a/gen/StringPalette.h
+++ b/gen/StringPalette.h
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #ifndef _STRINGPALETTE_H_
 #define _STRINGPALETTE_H_
 
-#include "NIF_IO.h"
+#include "../NIF_IO.h"
 
 
 /*!
diff --git a/gen/TBC.cpp b/gen/TBC.cpp
index 293f36fbda80793c1f23ab1b863fd54ab392a493..b11f4c33ee8644219802690b152481d1b5d1b30d 100644
--- a/gen/TBC.cpp
+++ b/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 "gen/TBC.h"
+#include "TBC.h"
 
 //Constructor
 TBC::TBC() : t(0.0f), b(0.0f), c(0.0f) {};
diff --git a/gen/TBC.h b/gen/TBC.h
index cb825043549b97e9c1bfd584135c62fff8a4d423..35e320fcaddd5ffd5c2b4fdc1c268779c138354d 100644
--- a/gen/TBC.h
+++ b/gen/TBC.h
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #ifndef _TBC_H_
 #define _TBC_H_
 
-#include "NIF_IO.h"
+#include "../NIF_IO.h"
 
 
 /*!
diff --git a/gen/TexDesc.cpp b/gen/TexDesc.cpp
index 877f21d717ea2a3572034e3de644b64867ec244c..66cf1cb346c3bb7bc1ea1f442ecfee977fc89ec8 100644
--- a/gen/TexDesc.cpp
+++ b/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 "gen/TexDesc.h"
-#include "obj/NiSourceTexture.h"
+#include "TexDesc.h"
+#include "../obj/NiSourceTexture.h"
 
 //Constructor
 TexDesc::TexDesc() : source(NULL), clampMode((TexClampMode)WRAP_S_WRAP_T), filterMode((TexFilterMode)FILTER_TRILERP), textureSet((uint)0), ps2L((ushort)0), ps2K((ushort)0xFFB5), unknown1((ushort)0), hasTextureTransform(false), wRotation(0.0f), transformType_((uint)0) {};
diff --git a/gen/TexDesc.h b/gen/TexDesc.h
index 719185e6363e14761f668953a19ac0260f90326a..61c245874d125193ffc57d55bb033ed6357a5d48 100644
--- a/gen/TexDesc.h
+++ b/gen/TexDesc.h
@@ -4,10 +4,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #ifndef _TEXDESC_H_
 #define _TEXDESC_H_
 
-#include "NIF_IO.h"
+#include "../NIF_IO.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiSourceTexture;
 
 /*!
diff --git a/gen/TexSource.cpp b/gen/TexSource.cpp
index 41abf21eb017b3e673e2c90659cd55a312895746..e3e35db7d5b6aeed081e498c4ab823154ddcabca 100644
--- a/gen/TexSource.cpp
+++ b/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 "gen/TexSource.h"
-#include "obj/NiObject.h"
-#include "obj/NiPixelData.h"
+#include "TexSource.h"
+#include "../obj/NiObject.h"
+#include "../obj/NiPixelData.h"
 
 //Constructor
 TexSource::TexSource() : useExternal((byte)0), unknownLink(NULL), unknownByte((byte)0), pixelData(NULL) {};
diff --git a/gen/TexSource.h b/gen/TexSource.h
index 77998aaaf14ce85062e6ee6902abf75c7ec87442..612478e8c3ae21a7046d93c81d0980dc42196541 100644
--- a/gen/TexSource.h
+++ b/gen/TexSource.h
@@ -4,10 +4,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #ifndef _TEXSOURCE_H_
 #define _TEXSOURCE_H_
 
-#include "NIF_IO.h"
+#include "../NIF_IO.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiObject;
 class NiPixelData;
 
diff --git a/gen/hkTriangle.cpp b/gen/hkTriangle.cpp
index 3639d4027be77d4995958f4eca5ef0be5b638ad3..e6c99c45bdcfed6e0bf333a2d64eeb6e18dbcb8b 100644
--- a/gen/hkTriangle.cpp
+++ b/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 "gen/hkTriangle.h"
+#include "hkTriangle.h"
 
 //Constructor
 hkTriangle::hkTriangle() : unknownShort((ushort)0) {};
diff --git a/gen/hkTriangle.h b/gen/hkTriangle.h
index 183c6b61d763dd5d3ed58b545496df954aaec045..411dda2e6bfc89f2cb85ac45cb075657829012c0 100644
--- a/gen/hkTriangle.h
+++ b/gen/hkTriangle.h
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #ifndef _HKTRIANGLE_H_
 #define _HKTRIANGLE_H_
 
-#include "NIF_IO.h"
+#include "../NIF_IO.h"
 
 
 /*!
diff --git a/gen/obj_defines.h b/gen/obj_defines.h
index c2fd45e35f045733ebe989c78d9424c52afeda2d..b42cf597224843826b14c49b44ceed121b937a5b 100644
--- a/gen/obj_defines.h
+++ b/gen/obj_defines.h
@@ -6,8 +6,8 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #define MAXARRAYDUMP 20
 
-#include "NIF_IO.h"
-#include "Ref.h"
+#include "../NIF_IO.h"
+#include "../Ref.h"
 #include <iostream>
 #include <fstream>
 #include <vector>
diff --git a/gen/obj_factories.cpp b/gen/obj_factories.cpp
index f3ae672dc856a72b8ff07c199ce4e1a3986b32a9..91046aa48d4a115a0496b5b842850fce664edf2c 100644
--- a/gen/obj_factories.cpp
+++ b/gen/obj_factories.cpp
@@ -1,369 +1,369 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "obj/NiObject.h"
+#include "../obj/NiObject.h"
 typedef NiObject*(*blk_factory_func)();
 extern map<string, blk_factory_func> global_block_map;
 
-#include "obj/bhkBlendCollisionObject.h"
+#include "../obj/bhkBlendCollisionObject.h"
 NiObject * CreatebhkBlendCollisionObject() { return new bhkBlendCollisionObject; }
-#include "obj/bhkBlendController.h"
+#include "../obj/bhkBlendController.h"
 NiObject * CreatebhkBlendController() { return new bhkBlendController; }
-#include "obj/bhkBoxShape.h"
+#include "../obj/bhkBoxShape.h"
 NiObject * CreatebhkBoxShape() { return new bhkBoxShape; }
-#include "obj/bhkCapsuleShape.h"
+#include "../obj/bhkCapsuleShape.h"
 NiObject * CreatebhkCapsuleShape() { return new bhkCapsuleShape; }
-#include "obj/bhkCollisionObject.h"
+#include "../obj/bhkCollisionObject.h"
 NiObject * CreatebhkCollisionObject() { return new bhkCollisionObject; }
-#include "obj/bhkConvexVerticesShape.h"
+#include "../obj/bhkConvexVerticesShape.h"
 NiObject * CreatebhkConvexVerticesShape() { return new bhkConvexVerticesShape; }
-#include "obj/bhkHingeConstraint.h"
+#include "../obj/bhkHingeConstraint.h"
 NiObject * CreatebhkHingeConstraint() { return new bhkHingeConstraint; }
-#include "obj/bhkLimitedHingeConstraint.h"
+#include "../obj/bhkLimitedHingeConstraint.h"
 NiObject * CreatebhkLimitedHingeConstraint() { return new bhkLimitedHingeConstraint; }
-#include "obj/bhkListShape.h"
+#include "../obj/bhkListShape.h"
 NiObject * CreatebhkListShape() { return new bhkListShape; }
-#include "obj/bhkMalleableConstraint.h"
+#include "../obj/bhkMalleableConstraint.h"
 NiObject * CreatebhkMalleableConstraint() { return new bhkMalleableConstraint; }
-#include "obj/bhkMoppBvTreeShape.h"
+#include "../obj/bhkMoppBvTreeShape.h"
 NiObject * CreatebhkMoppBvTreeShape() { return new bhkMoppBvTreeShape; }
-#include "obj/bhkMultiSphereShape.h"
+#include "../obj/bhkMultiSphereShape.h"
 NiObject * CreatebhkMultiSphereShape() { return new bhkMultiSphereShape; }
-#include "obj/bhkNiTriStripsShape.h"
+#include "../obj/bhkNiTriStripsShape.h"
 NiObject * CreatebhkNiTriStripsShape() { return new bhkNiTriStripsShape; }
-#include "obj/bhkPackedNiTriStripsShape.h"
+#include "../obj/bhkPackedNiTriStripsShape.h"
 NiObject * CreatebhkPackedNiTriStripsShape() { return new bhkPackedNiTriStripsShape; }
-#include "obj/bhkPrismaticConstraint.h"
+#include "../obj/bhkPrismaticConstraint.h"
 NiObject * CreatebhkPrismaticConstraint() { return new bhkPrismaticConstraint; }
-#include "obj/bhkRagdollConstraint.h"
+#include "../obj/bhkRagdollConstraint.h"
 NiObject * CreatebhkRagdollConstraint() { return new bhkRagdollConstraint; }
-#include "obj/bhkRigidBody.h"
+#include "../obj/bhkRigidBody.h"
 NiObject * CreatebhkRigidBody() { return new bhkRigidBody; }
-#include "obj/bhkRigidBodyT.h"
+#include "../obj/bhkRigidBodyT.h"
 NiObject * CreatebhkRigidBodyT() { return new bhkRigidBodyT; }
-#include "obj/bhkSimpleShapePhantom.h"
+#include "../obj/bhkSimpleShapePhantom.h"
 NiObject * CreatebhkSimpleShapePhantom() { return new bhkSimpleShapePhantom; }
-#include "obj/bhkSPCollisionObject.h"
+#include "../obj/bhkSPCollisionObject.h"
 NiObject * CreatebhkSPCollisionObject() { return new bhkSPCollisionObject; }
-#include "obj/bhkSphereShape.h"
+#include "../obj/bhkSphereShape.h"
 NiObject * CreatebhkSphereShape() { return new bhkSphereShape; }
-#include "obj/bhkStiffSpringConstraint.h"
+#include "../obj/bhkStiffSpringConstraint.h"
 NiObject * CreatebhkStiffSpringConstraint() { return new bhkStiffSpringConstraint; }
-#include "obj/bhkTransformShape.h"
+#include "../obj/bhkTransformShape.h"
 NiObject * CreatebhkTransformShape() { return new bhkTransformShape; }
-#include "obj/bhkConvexTransformShape.h"
+#include "../obj/bhkConvexTransformShape.h"
 NiObject * CreatebhkConvexTransformShape() { return new bhkConvexTransformShape; }
-#include "obj/BSBound.h"
+#include "../obj/BSBound.h"
 NiObject * CreateBSBound() { return new BSBound; }
-#include "obj/BSFurnitureMarker.h"
+#include "../obj/BSFurnitureMarker.h"
 NiObject * CreateBSFurnitureMarker() { return new BSFurnitureMarker; }
-#include "obj/BSParentVelocityModifier.h"
+#include "../obj/BSParentVelocityModifier.h"
 NiObject * CreateBSParentVelocityModifier() { return new BSParentVelocityModifier; }
-#include "obj/BSPSysArrayEmitter.h"
+#include "../obj/BSPSysArrayEmitter.h"
 NiObject * CreateBSPSysArrayEmitter() { return new BSPSysArrayEmitter; }
-#include "obj/BSXFlags.h"
+#include "../obj/BSXFlags.h"
 NiObject * CreateBSXFlags() { return new BSXFlags; }
-#include "obj/hkPackedNiTriStripsData.h"
+#include "../obj/hkPackedNiTriStripsData.h"
 NiObject * CreatehkPackedNiTriStripsData() { return new hkPackedNiTriStripsData; }
-#include "obj/NiAlphaController.h"
+#include "../obj/NiAlphaController.h"
 NiObject * CreateNiAlphaController() { return new NiAlphaController; }
-#include "obj/NiAlphaProperty.h"
+#include "../obj/NiAlphaProperty.h"
 NiObject * CreateNiAlphaProperty() { return new NiAlphaProperty; }
-#include "obj/NiAmbientLight.h"
+#include "../obj/NiAmbientLight.h"
 NiObject * CreateNiAmbientLight() { return new NiAmbientLight; }
-#include "obj/NiAutoNormalParticlesData.h"
+#include "../obj/NiAutoNormalParticlesData.h"
 NiObject * CreateNiAutoNormalParticlesData() { return new NiAutoNormalParticlesData; }
-#include "obj/NiBinaryExtraData.h"
+#include "../obj/NiBinaryExtraData.h"
 NiObject * CreateNiBinaryExtraData() { return new NiBinaryExtraData; }
-#include "obj/NiBlendBoolInterpolator.h"
+#include "../obj/NiBlendBoolInterpolator.h"
 NiObject * CreateNiBlendBoolInterpolator() { return new NiBlendBoolInterpolator; }
-#include "obj/NiBlendFloatInterpolator.h"
+#include "../obj/NiBlendFloatInterpolator.h"
 NiObject * CreateNiBlendFloatInterpolator() { return new NiBlendFloatInterpolator; }
-#include "obj/NiBlendPoint3Interpolator.h"
+#include "../obj/NiBlendPoint3Interpolator.h"
 NiObject * CreateNiBlendPoint3Interpolator() { return new NiBlendPoint3Interpolator; }
-#include "obj/NiBlendTransformInterpolator.h"
+#include "../obj/NiBlendTransformInterpolator.h"
 NiObject * CreateNiBlendTransformInterpolator() { return new NiBlendTransformInterpolator; }
-#include "obj/NiBoneLODController.h"
+#include "../obj/NiBoneLODController.h"
 NiObject * CreateNiBoneLODController() { return new NiBoneLODController; }
-#include "obj/NiBoolData.h"
+#include "../obj/NiBoolData.h"
 NiObject * CreateNiBoolData() { return new NiBoolData; }
-#include "obj/NiBooleanExtraData.h"
+#include "../obj/NiBooleanExtraData.h"
 NiObject * CreateNiBooleanExtraData() { return new NiBooleanExtraData; }
-#include "obj/NiBoolInterpolator.h"
+#include "../obj/NiBoolInterpolator.h"
 NiObject * CreateNiBoolInterpolator() { return new NiBoolInterpolator; }
-#include "obj/NiBoolTimelineInterpolator.h"
+#include "../obj/NiBoolTimelineInterpolator.h"
 NiObject * CreateNiBoolTimelineInterpolator() { return new NiBoolTimelineInterpolator; }
-#include "obj/NiBSBoneLODController.h"
+#include "../obj/NiBSBoneLODController.h"
 NiObject * CreateNiBSBoneLODController() { return new NiBSBoneLODController; }
-#include "obj/NiBSplineBasisData.h"
+#include "../obj/NiBSplineBasisData.h"
 NiObject * CreateNiBSplineBasisData() { return new NiBSplineBasisData; }
-#include "obj/NiBSplineCompFloatInterpolator.h"
+#include "../obj/NiBSplineCompFloatInterpolator.h"
 NiObject * CreateNiBSplineCompFloatInterpolator() { return new NiBSplineCompFloatInterpolator; }
-#include "obj/NiBSplineCompPoint3Interpolator.h"
+#include "../obj/NiBSplineCompPoint3Interpolator.h"
 NiObject * CreateNiBSplineCompPoint3Interpolator() { return new NiBSplineCompPoint3Interpolator; }
-#include "obj/NiBSplineCompTransformInterpolator.h"
+#include "../obj/NiBSplineCompTransformInterpolator.h"
 NiObject * CreateNiBSplineCompTransformInterpolator() { return new NiBSplineCompTransformInterpolator; }
-#include "obj/NiBSplineData.h"
+#include "../obj/NiBSplineData.h"
 NiObject * CreateNiBSplineData() { return new NiBSplineData; }
-#include "obj/NiCamera.h"
+#include "../obj/NiCamera.h"
 NiObject * CreateNiCamera() { return new NiCamera; }
-#include "obj/NiCollisionData.h"
+#include "../obj/NiCollisionData.h"
 NiObject * CreateNiCollisionData() { return new NiCollisionData; }
-#include "obj/NiColorData.h"
+#include "../obj/NiColorData.h"
 NiObject * CreateNiColorData() { return new NiColorData; }
-#include "obj/NiColorExtraData.h"
+#include "../obj/NiColorExtraData.h"
 NiObject * CreateNiColorExtraData() { return new NiColorExtraData; }
-#include "obj/NiControllerManager.h"
+#include "../obj/NiControllerManager.h"
 NiObject * CreateNiControllerManager() { return new NiControllerManager; }
-#include "obj/NiControllerSequence.h"
+#include "../obj/NiControllerSequence.h"
 NiObject * CreateNiControllerSequence() { return new NiControllerSequence; }
-#include "obj/NiDefaultAVObjectPalette.h"
+#include "../obj/NiDefaultAVObjectPalette.h"
 NiObject * CreateNiDefaultAVObjectPalette() { return new NiDefaultAVObjectPalette; }
-#include "obj/NiDirectionalLight.h"
+#include "../obj/NiDirectionalLight.h"
 NiObject * CreateNiDirectionalLight() { return new NiDirectionalLight; }
-#include "obj/NiDitherProperty.h"
+#include "../obj/NiDitherProperty.h"
 NiObject * CreateNiDitherProperty() { return new NiDitherProperty; }
-#include "obj/NiFlipController.h"
+#include "../obj/NiFlipController.h"
 NiObject * CreateNiFlipController() { return new NiFlipController; }
-#include "obj/NiFloatData.h"
+#include "../obj/NiFloatData.h"
 NiObject * CreateNiFloatData() { return new NiFloatData; }
-#include "obj/NiFloatExtraData.h"
+#include "../obj/NiFloatExtraData.h"
 NiObject * CreateNiFloatExtraData() { return new NiFloatExtraData; }
-#include "obj/NiFloatExtraDataController.h"
+#include "../obj/NiFloatExtraDataController.h"
 NiObject * CreateNiFloatExtraDataController() { return new NiFloatExtraDataController; }
-#include "obj/NiFloatInterpolator.h"
+#include "../obj/NiFloatInterpolator.h"
 NiObject * CreateNiFloatInterpolator() { return new NiFloatInterpolator; }
-#include "obj/NiFloatsExtraData.h"
+#include "../obj/NiFloatsExtraData.h"
 NiObject * CreateNiFloatsExtraData() { return new NiFloatsExtraData; }
-#include "obj/NiFogProperty.h"
+#include "../obj/NiFogProperty.h"
 NiObject * CreateNiFogProperty() { return new NiFogProperty; }
-#include "obj/NiGeomMorpherController.h"
+#include "../obj/NiGeomMorpherController.h"
 NiObject * CreateNiGeomMorpherController() { return new NiGeomMorpherController; }
-#include "obj/NiGravity.h"
+#include "../obj/NiGravity.h"
 NiObject * CreateNiGravity() { return new NiGravity; }
-#include "obj/NiIntegerExtraData.h"
+#include "../obj/NiIntegerExtraData.h"
 NiObject * CreateNiIntegerExtraData() { return new NiIntegerExtraData; }
-#include "obj/NiIntegersExtraData.h"
+#include "../obj/NiIntegersExtraData.h"
 NiObject * CreateNiIntegersExtraData() { return new NiIntegersExtraData; }
-#include "obj/NiKeyframeController.h"
+#include "../obj/NiKeyframeController.h"
 NiObject * CreateNiKeyframeController() { return new NiKeyframeController; }
-#include "obj/BSKeyframeController.h"
+#include "../obj/BSKeyframeController.h"
 NiObject * CreateBSKeyframeController() { return new BSKeyframeController; }
-#include "obj/NiKeyframeData.h"
+#include "../obj/NiKeyframeData.h"
 NiObject * CreateNiKeyframeData() { return new NiKeyframeData; }
-#include "obj/NiLightColorController.h"
+#include "../obj/NiLightColorController.h"
 NiObject * CreateNiLightColorController() { return new NiLightColorController; }
-#include "obj/NiLightDimmerController.h"
+#include "../obj/NiLightDimmerController.h"
 NiObject * CreateNiLightDimmerController() { return new NiLightDimmerController; }
-#include "obj/NiLookAtController.h"
+#include "../obj/NiLookAtController.h"
 NiObject * CreateNiLookAtController() { return new NiLookAtController; }
-#include "obj/NiLookAtInterpolator.h"
+#include "../obj/NiLookAtInterpolator.h"
 NiObject * CreateNiLookAtInterpolator() { return new NiLookAtInterpolator; }
-#include "obj/NiMaterialColorController.h"
+#include "../obj/NiMaterialColorController.h"
 NiObject * CreateNiMaterialColorController() { return new NiMaterialColorController; }
-#include "obj/NiMaterialProperty.h"
+#include "../obj/NiMaterialProperty.h"
 NiObject * CreateNiMaterialProperty() { return new NiMaterialProperty; }
-#include "obj/NiMeshPSysData.h"
+#include "../obj/NiMeshPSysData.h"
 NiObject * CreateNiMeshPSysData() { return new NiMeshPSysData; }
-#include "obj/NiMorphData.h"
+#include "../obj/NiMorphData.h"
 NiObject * CreateNiMorphData() { return new NiMorphData; }
-#include "obj/NiMultiTargetTransformController.h"
+#include "../obj/NiMultiTargetTransformController.h"
 NiObject * CreateNiMultiTargetTransformController() { return new NiMultiTargetTransformController; }
-#include "obj/NiNode.h"
+#include "../obj/NiNode.h"
 NiObject * CreateNiNode() { return new NiNode; }
-#include "obj/AvoidNode.h"
+#include "../obj/AvoidNode.h"
 NiObject * CreateAvoidNode() { return new AvoidNode; }
-#include "obj/FxWidget.h"
+#include "../obj/FxWidget.h"
 NiObject * CreateFxWidget() { return new FxWidget; }
-#include "obj/FxButton.h"
+#include "../obj/FxButton.h"
 NiObject * CreateFxButton() { return new FxButton; }
-#include "obj/FxRadioButton.h"
+#include "../obj/FxRadioButton.h"
 NiObject * CreateFxRadioButton() { return new FxRadioButton; }
-#include "obj/NiBillboardNode.h"
+#include "../obj/NiBillboardNode.h"
 NiObject * CreateNiBillboardNode() { return new NiBillboardNode; }
-#include "obj/NiBSAnimationNode.h"
+#include "../obj/NiBSAnimationNode.h"
 NiObject * CreateNiBSAnimationNode() { return new NiBSAnimationNode; }
-#include "obj/NiBSParticleNode.h"
+#include "../obj/NiBSParticleNode.h"
 NiObject * CreateNiBSParticleNode() { return new NiBSParticleNode; }
-#include "obj/NiLODNode.h"
+#include "../obj/NiLODNode.h"
 NiObject * CreateNiLODNode() { return new NiLODNode; }
-#include "obj/NiPalette.h"
+#include "../obj/NiPalette.h"
 NiObject * CreateNiPalette() { return new NiPalette; }
-#include "obj/NiParticleBomb.h"
+#include "../obj/NiParticleBomb.h"
 NiObject * CreateNiParticleBomb() { return new NiParticleBomb; }
-#include "obj/NiParticleColorModifier.h"
+#include "../obj/NiParticleColorModifier.h"
 NiObject * CreateNiParticleColorModifier() { return new NiParticleColorModifier; }
-#include "obj/NiParticleGrowFade.h"
+#include "../obj/NiParticleGrowFade.h"
 NiObject * CreateNiParticleGrowFade() { return new NiParticleGrowFade; }
-#include "obj/NiParticleMeshModifier.h"
+#include "../obj/NiParticleMeshModifier.h"
 NiObject * CreateNiParticleMeshModifier() { return new NiParticleMeshModifier; }
-#include "obj/NiParticleRotation.h"
+#include "../obj/NiParticleRotation.h"
 NiObject * CreateNiParticleRotation() { return new NiParticleRotation; }
-#include "obj/NiParticles.h"
+#include "../obj/NiParticles.h"
 NiObject * CreateNiParticles() { return new NiParticles; }
-#include "obj/NiAutoNormalParticles.h"
+#include "../obj/NiAutoNormalParticles.h"
 NiObject * CreateNiAutoNormalParticles() { return new NiAutoNormalParticles; }
-#include "obj/NiParticleMeshes.h"
+#include "../obj/NiParticleMeshes.h"
 NiObject * CreateNiParticleMeshes() { return new NiParticleMeshes; }
-#include "obj/NiParticlesData.h"
+#include "../obj/NiParticlesData.h"
 NiObject * CreateNiParticlesData() { return new NiParticlesData; }
-#include "obj/NiParticleMeshesData.h"
+#include "../obj/NiParticleMeshesData.h"
 NiObject * CreateNiParticleMeshesData() { return new NiParticleMeshesData; }
-#include "obj/NiParticleSystem.h"
+#include "../obj/NiParticleSystem.h"
 NiObject * CreateNiParticleSystem() { return new NiParticleSystem; }
-#include "obj/NiMeshParticleSystem.h"
+#include "../obj/NiMeshParticleSystem.h"
 NiObject * CreateNiMeshParticleSystem() { return new NiMeshParticleSystem; }
-#include "obj/NiParticleSystemController.h"
+#include "../obj/NiParticleSystemController.h"
 NiObject * CreateNiParticleSystemController() { return new NiParticleSystemController; }
-#include "obj/NiBSPArrayController.h"
+#include "../obj/NiBSPArrayController.h"
 NiObject * CreateNiBSPArrayController() { return new NiBSPArrayController; }
-#include "obj/NiPathController.h"
+#include "../obj/NiPathController.h"
 NiObject * CreateNiPathController() { return new NiPathController; }
-#include "obj/NiPathInterpolator.h"
+#include "../obj/NiPathInterpolator.h"
 NiObject * CreateNiPathInterpolator() { return new NiPathInterpolator; }
-#include "obj/NiPixelData.h"
+#include "../obj/NiPixelData.h"
 NiObject * CreateNiPixelData() { return new NiPixelData; }
-#include "obj/NiPlanarCollider.h"
+#include "../obj/NiPlanarCollider.h"
 NiObject * CreateNiPlanarCollider() { return new NiPlanarCollider; }
-#include "obj/NiPoint3Interpolator.h"
+#include "../obj/NiPoint3Interpolator.h"
 NiObject * CreateNiPoint3Interpolator() { return new NiPoint3Interpolator; }
-#include "obj/NiPointLight.h"
+#include "../obj/NiPointLight.h"
 NiObject * CreateNiPointLight() { return new NiPointLight; }
-#include "obj/NiPosData.h"
+#include "../obj/NiPosData.h"
 NiObject * CreateNiPosData() { return new NiPosData; }
-#include "obj/NiPSysAgeDeathModifier.h"
+#include "../obj/NiPSysAgeDeathModifier.h"
 NiObject * CreateNiPSysAgeDeathModifier() { return new NiPSysAgeDeathModifier; }
-#include "obj/NiPSysBombModifier.h"
+#include "../obj/NiPSysBombModifier.h"
 NiObject * CreateNiPSysBombModifier() { return new NiPSysBombModifier; }
-#include "obj/NiPSysBoundUpdateModifier.h"
+#include "../obj/NiPSysBoundUpdateModifier.h"
 NiObject * CreateNiPSysBoundUpdateModifier() { return new NiPSysBoundUpdateModifier; }
-#include "obj/NiPSysBoxEmitter.h"
+#include "../obj/NiPSysBoxEmitter.h"
 NiObject * CreateNiPSysBoxEmitter() { return new NiPSysBoxEmitter; }
-#include "obj/NiPSysColliderManager.h"
+#include "../obj/NiPSysColliderManager.h"
 NiObject * CreateNiPSysColliderManager() { return new NiPSysColliderManager; }
-#include "obj/NiPSysColorModifier.h"
+#include "../obj/NiPSysColorModifier.h"
 NiObject * CreateNiPSysColorModifier() { return new NiPSysColorModifier; }
-#include "obj/NiPSysCylinderEmitter.h"
+#include "../obj/NiPSysCylinderEmitter.h"
 NiObject * CreateNiPSysCylinderEmitter() { return new NiPSysCylinderEmitter; }
-#include "obj/NiPSysData.h"
+#include "../obj/NiPSysData.h"
 NiObject * CreateNiPSysData() { return new NiPSysData; }
-#include "obj/NiPSysDragModifier.h"
+#include "../obj/NiPSysDragModifier.h"
 NiObject * CreateNiPSysDragModifier() { return new NiPSysDragModifier; }
-#include "obj/NiPSysEmitterCtlr.h"
+#include "../obj/NiPSysEmitterCtlr.h"
 NiObject * CreateNiPSysEmitterCtlr() { return new NiPSysEmitterCtlr; }
-#include "obj/NiPSysEmitterCtlrData.h"
+#include "../obj/NiPSysEmitterCtlrData.h"
 NiObject * CreateNiPSysEmitterCtlrData() { return new NiPSysEmitterCtlrData; }
-#include "obj/NiPSysEmitterDeclinationCtlr.h"
+#include "../obj/NiPSysEmitterDeclinationCtlr.h"
 NiObject * CreateNiPSysEmitterDeclinationCtlr() { return new NiPSysEmitterDeclinationCtlr; }
-#include "obj/NiPSysEmitterDeclinationVarCtlr.h"
+#include "../obj/NiPSysEmitterDeclinationVarCtlr.h"
 NiObject * CreateNiPSysEmitterDeclinationVarCtlr() { return new NiPSysEmitterDeclinationVarCtlr; }
-#include "obj/NiPSysEmitterInitialRadiusCtlr.h"
+#include "../obj/NiPSysEmitterInitialRadiusCtlr.h"
 NiObject * CreateNiPSysEmitterInitialRadiusCtlr() { return new NiPSysEmitterInitialRadiusCtlr; }
-#include "obj/NiPSysEmitterLifeSpanCtlr.h"
+#include "../obj/NiPSysEmitterLifeSpanCtlr.h"
 NiObject * CreateNiPSysEmitterLifeSpanCtlr() { return new NiPSysEmitterLifeSpanCtlr; }
-#include "obj/NiPSysEmitterSpeedCtlr.h"
+#include "../obj/NiPSysEmitterSpeedCtlr.h"
 NiObject * CreateNiPSysEmitterSpeedCtlr() { return new NiPSysEmitterSpeedCtlr; }
-#include "obj/NiPSysGravityModifier.h"
+#include "../obj/NiPSysGravityModifier.h"
 NiObject * CreateNiPSysGravityModifier() { return new NiPSysGravityModifier; }
-#include "obj/NiPSysGravityStrengthCtlr.h"
+#include "../obj/NiPSysGravityStrengthCtlr.h"
 NiObject * CreateNiPSysGravityStrengthCtlr() { return new NiPSysGravityStrengthCtlr; }
-#include "obj/NiPSysGrowFadeModifier.h"
+#include "../obj/NiPSysGrowFadeModifier.h"
 NiObject * CreateNiPSysGrowFadeModifier() { return new NiPSysGrowFadeModifier; }
-#include "obj/NiPSysMeshEmitter.h"
+#include "../obj/NiPSysMeshEmitter.h"
 NiObject * CreateNiPSysMeshEmitter() { return new NiPSysMeshEmitter; }
-#include "obj/NiPSysMeshUpdateModifier.h"
+#include "../obj/NiPSysMeshUpdateModifier.h"
 NiObject * CreateNiPSysMeshUpdateModifier() { return new NiPSysMeshUpdateModifier; }
-#include "obj/NiPSysModifierActiveCtlr.h"
+#include "../obj/NiPSysModifierActiveCtlr.h"
 NiObject * CreateNiPSysModifierActiveCtlr() { return new NiPSysModifierActiveCtlr; }
-#include "obj/NiPSysPlanarCollider.h"
+#include "../obj/NiPSysPlanarCollider.h"
 NiObject * CreateNiPSysPlanarCollider() { return new NiPSysPlanarCollider; }
-#include "obj/NiPSysPositionModifier.h"
+#include "../obj/NiPSysPositionModifier.h"
 NiObject * CreateNiPSysPositionModifier() { return new NiPSysPositionModifier; }
-#include "obj/NiPSysResetOnLoopCtlr.h"
+#include "../obj/NiPSysResetOnLoopCtlr.h"
 NiObject * CreateNiPSysResetOnLoopCtlr() { return new NiPSysResetOnLoopCtlr; }
-#include "obj/NiPSysRotationModifier.h"
+#include "../obj/NiPSysRotationModifier.h"
 NiObject * CreateNiPSysRotationModifier() { return new NiPSysRotationModifier; }
-#include "obj/NiPSysSpawnModifier.h"
+#include "../obj/NiPSysSpawnModifier.h"
 NiObject * CreateNiPSysSpawnModifier() { return new NiPSysSpawnModifier; }
-#include "obj/NiPSysSphereEmitter.h"
+#include "../obj/NiPSysSphereEmitter.h"
 NiObject * CreateNiPSysSphereEmitter() { return new NiPSysSphereEmitter; }
-#include "obj/NiPSysUpdateCtlr.h"
+#include "../obj/NiPSysUpdateCtlr.h"
 NiObject * CreateNiPSysUpdateCtlr() { return new NiPSysUpdateCtlr; }
-#include "obj/NiRangeLODData.h"
+#include "../obj/NiRangeLODData.h"
 NiObject * CreateNiRangeLODData() { return new NiRangeLODData; }
-#include "obj/NiRotatingParticles.h"
+#include "../obj/NiRotatingParticles.h"
 NiObject * CreateNiRotatingParticles() { return new NiRotatingParticles; }
-#include "obj/NiRotatingParticlesData.h"
+#include "../obj/NiRotatingParticlesData.h"
 NiObject * CreateNiRotatingParticlesData() { return new NiRotatingParticlesData; }
-#include "obj/NiScreenLODData.h"
+#include "../obj/NiScreenLODData.h"
 NiObject * CreateNiScreenLODData() { return new NiScreenLODData; }
-#include "obj/NiSequenceStreamHelper.h"
+#include "../obj/NiSequenceStreamHelper.h"
 NiObject * CreateNiSequenceStreamHelper() { return new NiSequenceStreamHelper; }
-#include "obj/NiShadeProperty.h"
+#include "../obj/NiShadeProperty.h"
 NiObject * CreateNiShadeProperty() { return new NiShadeProperty; }
-#include "obj/NiSkinData.h"
+#include "../obj/NiSkinData.h"
 NiObject * CreateNiSkinData() { return new NiSkinData; }
-#include "obj/NiSkinInstance.h"
+#include "../obj/NiSkinInstance.h"
 NiObject * CreateNiSkinInstance() { return new NiSkinInstance; }
-#include "obj/NiSkinPartition.h"
+#include "../obj/NiSkinPartition.h"
 NiObject * CreateNiSkinPartition() { return new NiSkinPartition; }
-#include "obj/NiSourceTexture.h"
+#include "../obj/NiSourceTexture.h"
 NiObject * CreateNiSourceTexture() { return new NiSourceTexture; }
-#include "obj/NiSpecularProperty.h"
+#include "../obj/NiSpecularProperty.h"
 NiObject * CreateNiSpecularProperty() { return new NiSpecularProperty; }
-#include "obj/NiSphericalCollider.h"
+#include "../obj/NiSphericalCollider.h"
 NiObject * CreateNiSphericalCollider() { return new NiSphericalCollider; }
-#include "obj/NiSpotLight.h"
+#include "../obj/NiSpotLight.h"
 NiObject * CreateNiSpotLight() { return new NiSpotLight; }
-#include "obj/NiStencilProperty.h"
+#include "../obj/NiStencilProperty.h"
 NiObject * CreateNiStencilProperty() { return new NiStencilProperty; }
-#include "obj/NiStringExtraData.h"
+#include "../obj/NiStringExtraData.h"
 NiObject * CreateNiStringExtraData() { return new NiStringExtraData; }
-#include "obj/NiStringPalette.h"
+#include "../obj/NiStringPalette.h"
 NiObject * CreateNiStringPalette() { return new NiStringPalette; }
-#include "obj/NiStringsExtraData.h"
+#include "../obj/NiStringsExtraData.h"
 NiObject * CreateNiStringsExtraData() { return new NiStringsExtraData; }
-#include "obj/NiTextKeyExtraData.h"
+#include "../obj/NiTextKeyExtraData.h"
 NiObject * CreateNiTextKeyExtraData() { return new NiTextKeyExtraData; }
-#include "obj/NiTextureEffect.h"
+#include "../obj/NiTextureEffect.h"
 NiObject * CreateNiTextureEffect() { return new NiTextureEffect; }
-#include "obj/NiTextureTransformController.h"
+#include "../obj/NiTextureTransformController.h"
 NiObject * CreateNiTextureTransformController() { return new NiTextureTransformController; }
-#include "obj/NiTexturingProperty.h"
+#include "../obj/NiTexturingProperty.h"
 NiObject * CreateNiTexturingProperty() { return new NiTexturingProperty; }
-#include "obj/NiTransformController.h"
+#include "../obj/NiTransformController.h"
 NiObject * CreateNiTransformController() { return new NiTransformController; }
-#include "obj/NiTransformData.h"
+#include "../obj/NiTransformData.h"
 NiObject * CreateNiTransformData() { return new NiTransformData; }
-#include "obj/NiTransformInterpolator.h"
+#include "../obj/NiTransformInterpolator.h"
 NiObject * CreateNiTransformInterpolator() { return new NiTransformInterpolator; }
-#include "obj/NiTriShape.h"
+#include "../obj/NiTriShape.h"
 NiObject * CreateNiTriShape() { return new NiTriShape; }
-#include "obj/NiTriShapeData.h"
+#include "../obj/NiTriShapeData.h"
 NiObject * CreateNiTriShapeData() { return new NiTriShapeData; }
-#include "obj/NiTriStrips.h"
+#include "../obj/NiTriStrips.h"
 NiObject * CreateNiTriStrips() { return new NiTriStrips; }
-#include "obj/NiTriStripsData.h"
+#include "../obj/NiTriStripsData.h"
 NiObject * CreateNiTriStripsData() { return new NiTriStripsData; }
-#include "obj/NiUVController.h"
+#include "../obj/NiUVController.h"
 NiObject * CreateNiUVController() { return new NiUVController; }
-#include "obj/NiUVData.h"
+#include "../obj/NiUVData.h"
 NiObject * CreateNiUVData() { return new NiUVData; }
-#include "obj/NiVectorExtraData.h"
+#include "../obj/NiVectorExtraData.h"
 NiObject * CreateNiVectorExtraData() { return new NiVectorExtraData; }
-#include "obj/NiVertexColorProperty.h"
+#include "../obj/NiVertexColorProperty.h"
 NiObject * CreateNiVertexColorProperty() { return new NiVertexColorProperty; }
-#include "obj/NiVertWeightsExtraData.h"
+#include "../obj/NiVertWeightsExtraData.h"
 NiObject * CreateNiVertWeightsExtraData() { return new NiVertWeightsExtraData; }
-#include "obj/NiVisController.h"
+#include "../obj/NiVisController.h"
 NiObject * CreateNiVisController() { return new NiVisController; }
-#include "obj/NiVisData.h"
+#include "../obj/NiVisData.h"
 NiObject * CreateNiVisData() { return new NiVisData; }
-#include "obj/NiWireframeProperty.h"
+#include "../obj/NiWireframeProperty.h"
 NiObject * CreateNiWireframeProperty() { return new NiWireframeProperty; }
-#include "obj/NiZBufferProperty.h"
+#include "../obj/NiZBufferProperty.h"
 NiObject * CreateNiZBufferProperty() { return new NiZBufferProperty; }
-#include "obj/RootCollisionNode.h"
+#include "../obj/RootCollisionNode.h"
 NiObject * CreateRootCollisionNode() { return new RootCollisionNode; }
 
 //This function registers the factory functions with global_block_map which is used by CreateBlock
diff --git a/niflib.sln b/niflib.sln
index 37c137c992dc32a82b0f4a25aa64b09c45f5a7ef..a7f5f1ba72193df5b43055fc44a2c6811640cd92 100644
--- a/niflib.sln
+++ b/niflib.sln
@@ -1,28 +1,29 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual C++ Express 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NIFlib", "niflib.vcproj", "{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PyNiflib", "py_niflib.vcproj", "{7517F24D-B1A1-427C-B952-F5DD5DDAD7A7}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
 EndProject
 Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Release = Release
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		PyNiflib|Win32 = PyNiflib|Win32
+		Release|Win32 = Release|Win32
 	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Debug.ActiveCfg = Debug|Win32
-		{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Debug.Build.0 = Debug|Win32
-		{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Release.ActiveCfg = Release|Win32
-		{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Release.Build.0 = Release|Win32
-		{7517F24D-B1A1-427C-B952-F5DD5DDAD7A7}.Debug.ActiveCfg = Debug|Win32
-		{7517F24D-B1A1-427C-B952-F5DD5DDAD7A7}.Debug.Build.0 = Debug|Win32
-		{7517F24D-B1A1-427C-B952-F5DD5DDAD7A7}.Release.ActiveCfg = Release|Win32
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Debug|Win32.Build.0 = Debug|Win32
+		{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.PyNiflib|Win32.ActiveCfg = PyNiflib|Win32
+		{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.PyNiflib|Win32.Build.0 = PyNiflib|Win32
+		{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Release|Win32.ActiveCfg = Release|Win32
+		{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Release|Win32.Build.0 = Release|Win32
+		{7517F24D-B1A1-427C-B952-F5DD5DDAD7A7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7517F24D-B1A1-427C-B952-F5DD5DDAD7A7}.Debug|Win32.Build.0 = Debug|Win32
+		{7517F24D-B1A1-427C-B952-F5DD5DDAD7A7}.PyNiflib|Win32.ActiveCfg = PyNiflib|Win32
+		{7517F24D-B1A1-427C-B952-F5DD5DDAD7A7}.PyNiflib|Win32.Build.0 = PyNiflib|Win32
+		{7517F24D-B1A1-427C-B952-F5DD5DDAD7A7}.Release|Win32.ActiveCfg = Release|Win32
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
 	EndGlobalSection
 EndGlobal
diff --git a/niflib.vcproj b/niflib.vcproj
index dc6d0047b3a10e2d9fefbf1e5dc524b39f5770d4..bb526bfc7dc0a61ac13f2bdaac2cc6a7929f223c 100644
--- a/niflib.vcproj
+++ b/niflib.vcproj
@@ -1,130 +1,203 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="NIFlib"
 	ProjectGUID="{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}"
-	Keyword="Win32Proj">
+	Keyword="Win32Proj"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="../Debug"
 			IntermediateDirectory="../Debug"
 			ConfigurationType="4"
-			CharacterSet="2">
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="TRUE"
+				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="../bin/niflib.lib"/>
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCLibrarianTool"
+				OutputFile="../bin/niflib.lib"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="..\Release"
 			IntermediateDirectory="..\Release"
 			ConfigurationType="4"
-			CharacterSet="2">
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="0"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="../bin/niflib.lib"/>
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCLibrarianTool"
+				OutputFile="../bin/niflib.lib"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="PyNiflib|Win32"
 			OutputDirectory="$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
-			CharacterSet="2">
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="4"
+				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCLibrarianTool"/>
+				Name="VCResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCLibrarianTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -133,1530 +206,2032 @@
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
 			<File
-				RelativePath=".\NIF_IO.cpp">
+				RelativePath=".\NIF_IO.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\nif_math.cpp">
+				RelativePath=".\nif_math.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\niflib.cpp">
+				RelativePath=".\niflib.cpp"
+				>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						RuntimeLibrary="3"/>
+						RuntimeLibrary="3"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\Type.cpp">
+				RelativePath=".\Type.cpp"
+				>
 			</File>
 			<Filter
 				Name="obj"
-				Filter="">
+				>
 				<File
-					RelativePath=".\obj\AbhkConstraint.cpp">
+					RelativePath=".\obj\AbhkConstraint.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\AbhkRagdollConstraint.cpp">
+					RelativePath=".\obj\AbhkRagdollConstraint.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\AbhkShapeCollection.cpp">
+					RelativePath=".\obj\AbhkShapeCollection.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\ABoneLODController.cpp">
+					RelativePath=".\obj\ABoneLODController.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\AKeyedData.cpp">
+					RelativePath=".\obj\AKeyedData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\AParticleModifier.cpp">
+					RelativePath=".\obj\AParticleModifier.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\APSysCtlr.cpp">
+					RelativePath=".\obj\APSysCtlr.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\APSysData.cpp">
+					RelativePath=".\obj\APSysData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\AvoidNode.cpp">
+					RelativePath=".\obj\AvoidNode.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkBlendCollisionObject.cpp">
+					RelativePath=".\obj\bhkBlendCollisionObject.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkBlendController.cpp">
+					RelativePath=".\obj\bhkBlendController.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkBoxShape.cpp">
+					RelativePath=".\obj\bhkBoxShape.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkCapsuleShape.cpp">
+					RelativePath=".\obj\bhkCapsuleShape.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkCollisionObject.cpp">
+					RelativePath=".\obj\bhkCollisionObject.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkConvexShape.cpp">
+					RelativePath=".\obj\bhkConvexShape.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkConvexTransformShape.cpp">
+					RelativePath=".\obj\bhkConvexTransformShape.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkConvexVerticesShape.cpp">
+					RelativePath=".\obj\bhkConvexVerticesShape.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkEntity.cpp">
+					RelativePath=".\obj\bhkEntity.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkHingeConstraint.cpp">
+					RelativePath=".\obj\bhkHingeConstraint.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkLimitedHingeConstraint.cpp">
+					RelativePath=".\obj\bhkLimitedHingeConstraint.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkListShape.cpp">
+					RelativePath=".\obj\bhkListShape.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkMalleableConstraint.cpp">
+					RelativePath=".\obj\bhkMalleableConstraint.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkMoppBvTreeShape.cpp">
+					RelativePath=".\obj\bhkMoppBvTreeShape.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkMultiSphereShape.cpp">
+					RelativePath=".\obj\bhkMultiSphereShape.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkNiTriStripsShape.cpp">
+					RelativePath=".\obj\bhkNiTriStripsShape.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkPackedNiTriStripsShape.cpp">
+					RelativePath=".\obj\bhkPackedNiTriStripsShape.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkPrismaticConstraint.cpp">
+					RelativePath=".\obj\bhkPrismaticConstraint.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkRagdollConstraint.cpp">
+					RelativePath=".\obj\bhkRagdollConstraint.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkRefObject.cpp">
+					RelativePath=".\obj\bhkRefObject.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkRigidBody.cpp">
+					RelativePath=".\obj\bhkRigidBody.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkRigidBodyT.cpp">
+					RelativePath=".\obj\bhkRigidBodyT.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkSerializable.cpp">
+					RelativePath=".\obj\bhkSerializable.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkShape.cpp">
+					RelativePath=".\obj\bhkShape.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkSimpleShapePhantom.cpp">
+					RelativePath=".\obj\bhkSimpleShapePhantom.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkSPCollisionObject.cpp">
+					RelativePath=".\obj\bhkSPCollisionObject.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkSphereRepShape.cpp">
+					RelativePath=".\obj\bhkSphereRepShape.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkSphereShape.cpp">
+					RelativePath=".\obj\bhkSphereShape.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkStiffSpringConstraint.cpp">
+					RelativePath=".\obj\bhkStiffSpringConstraint.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkTransformShape.cpp">
+					RelativePath=".\obj\bhkTransformShape.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkWorldObject.cpp">
+					RelativePath=".\obj\bhkWorldObject.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\BSBound.cpp">
+					RelativePath=".\obj\BSBound.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\BSFurnitureMarker.cpp">
+					RelativePath=".\obj\BSFurnitureMarker.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\BSKeyframeController.cpp">
+					RelativePath=".\obj\BSKeyframeController.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\BSParentVelocityModifier.cpp">
+					RelativePath=".\obj\BSParentVelocityModifier.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\BSPSysArrayEmitter.cpp">
+					RelativePath=".\obj\BSPSysArrayEmitter.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\BSXFlags.cpp">
+					RelativePath=".\obj\BSXFlags.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\FxButton.cpp">
+					RelativePath=".\obj\FxButton.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\FxRadioButton.cpp">
+					RelativePath=".\obj\FxRadioButton.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\FxWidget.cpp">
+					RelativePath=".\obj\FxWidget.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\hkPackedNiTriStripsData.cpp">
+					RelativePath=".\obj\hkPackedNiTriStripsData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiAlphaController.cpp">
+					RelativePath=".\obj\NiAlphaController.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiAlphaProperty.cpp">
+					RelativePath=".\obj\NiAlphaProperty.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiAmbientLight.cpp">
+					RelativePath=".\obj\NiAmbientLight.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiAutoNormalParticles.cpp">
+					RelativePath=".\obj\NiAutoNormalParticles.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiAutoNormalParticlesData.cpp">
+					RelativePath=".\obj\NiAutoNormalParticlesData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiAVObject.cpp">
+					RelativePath=".\obj\NiAVObject.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBillboardNode.cpp">
+					RelativePath=".\obj\NiBillboardNode.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBinaryExtraData.cpp">
+					RelativePath=".\obj\NiBinaryExtraData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBlendBoolInterpolator.cpp">
+					RelativePath=".\obj\NiBlendBoolInterpolator.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBlendFloatInterpolator.cpp">
+					RelativePath=".\obj\NiBlendFloatInterpolator.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBlendInterpolator.cpp">
+					RelativePath=".\obj\NiBlendInterpolator.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBlendPoint3Interpolator.cpp">
+					RelativePath=".\obj\NiBlendPoint3Interpolator.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBlendTransformInterpolator.cpp">
+					RelativePath=".\obj\NiBlendTransformInterpolator.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBoneLODController.cpp">
+					RelativePath=".\obj\NiBoneLODController.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBoolData.cpp">
+					RelativePath=".\obj\NiBoolData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBooleanExtraData.cpp">
+					RelativePath=".\obj\NiBooleanExtraData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBoolInterpolator.cpp">
+					RelativePath=".\obj\NiBoolInterpolator.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBoolTimelineInterpolator.cpp">
+					RelativePath=".\obj\NiBoolTimelineInterpolator.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSAnimationNode.cpp">
+					RelativePath=".\obj\NiBSAnimationNode.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSBoneLODController.cpp">
+					RelativePath=".\obj\NiBSBoneLODController.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSPArrayController.cpp">
+					RelativePath=".\obj\NiBSPArrayController.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSParticleNode.cpp">
+					RelativePath=".\obj\NiBSParticleNode.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSplineBasisData.cpp">
+					RelativePath=".\obj\NiBSplineBasisData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSplineCompFloatInterpolator.cpp">
+					RelativePath=".\obj\NiBSplineCompFloatInterpolator.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSplineCompPoint3Interpolator.cpp">
+					RelativePath=".\obj\NiBSplineCompPoint3Interpolator.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSplineCompTransformInterpolator.cpp">
+					RelativePath=".\obj\NiBSplineCompTransformInterpolator.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSplineData.cpp">
+					RelativePath=".\obj\NiBSplineData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSplineInterpolator.cpp">
+					RelativePath=".\obj\NiBSplineInterpolator.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiCamera.cpp">
+					RelativePath=".\obj\NiCamera.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiCollisionData.cpp">
+					RelativePath=".\obj\NiCollisionData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiCollisionObject.cpp">
+					RelativePath=".\obj\NiCollisionObject.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiColorData.cpp">
+					RelativePath=".\obj\NiColorData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiColorExtraData.cpp">
+					RelativePath=".\obj\NiColorExtraData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiControllerManager.cpp">
+					RelativePath=".\obj\NiControllerManager.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiControllerSequence.cpp">
+					RelativePath=".\obj\NiControllerSequence.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiDefaultAVObjectPalette.cpp">
+					RelativePath=".\obj\NiDefaultAVObjectPalette.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiDirectionalLight.cpp">
+					RelativePath=".\obj\NiDirectionalLight.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiDitherProperty.cpp">
+					RelativePath=".\obj\NiDitherProperty.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiDynamicEffect.cpp">
+					RelativePath=".\obj\NiDynamicEffect.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiExtraData.cpp">
+					RelativePath=".\obj\NiExtraData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiFlipController.cpp">
+					RelativePath=".\obj\NiFlipController.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiFloatData.cpp">
+					RelativePath=".\obj\NiFloatData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiFloatExtraData.cpp">
+					RelativePath=".\obj\NiFloatExtraData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiFloatExtraDataController.cpp">
+					RelativePath=".\obj\NiFloatExtraDataController.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiFloatInterpolator.cpp">
+					RelativePath=".\obj\NiFloatInterpolator.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiFloatsExtraData.cpp">
+					RelativePath=".\obj\NiFloatsExtraData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiFogProperty.cpp">
+					RelativePath=".\obj\NiFogProperty.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiGeomMorpherController.cpp">
+					RelativePath=".\obj\NiGeomMorpherController.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiGravity.cpp">
+					RelativePath=".\obj\NiGravity.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiIntegerExtraData.cpp">
+					RelativePath=".\obj\NiIntegerExtraData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiIntegersExtraData.cpp">
+					RelativePath=".\obj\NiIntegersExtraData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiInterpolator.cpp">
+					RelativePath=".\obj\NiInterpolator.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiKeyframeController.cpp">
+					RelativePath=".\obj\NiKeyframeController.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiKeyframeData.cpp">
+					RelativePath=".\obj\NiKeyframeData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiLight.cpp">
+					RelativePath=".\obj\NiLight.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiLightColorController.cpp">
+					RelativePath=".\obj\NiLightColorController.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiLightDimmerController.cpp">
+					RelativePath=".\obj\NiLightDimmerController.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiLODNode.cpp">
+					RelativePath=".\obj\NiLODNode.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiLookAtController.cpp">
+					RelativePath=".\obj\NiLookAtController.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiLookAtInterpolator.cpp">
+					RelativePath=".\obj\NiLookAtInterpolator.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiMaterialColorController.cpp">
+					RelativePath=".\obj\NiMaterialColorController.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiMaterialProperty.cpp">
+					RelativePath=".\obj\NiMaterialProperty.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiMeshParticleSystem.cpp">
+					RelativePath=".\obj\NiMeshParticleSystem.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiMeshPSysData.cpp">
+					RelativePath=".\obj\NiMeshPSysData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiMorphData.cpp">
+					RelativePath=".\obj\NiMorphData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiMultiTargetTransformController.cpp">
+					RelativePath=".\obj\NiMultiTargetTransformController.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiNode.cpp">
+					RelativePath=".\obj\NiNode.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiObject.cpp">
+					RelativePath=".\obj\NiObject.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiObjectNET.cpp">
+					RelativePath=".\obj\NiObjectNET.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPalette.cpp">
+					RelativePath=".\obj\NiPalette.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticleBomb.cpp">
+					RelativePath=".\obj\NiParticleBomb.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticleColorModifier.cpp">
+					RelativePath=".\obj\NiParticleColorModifier.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticleGrowFade.cpp">
+					RelativePath=".\obj\NiParticleGrowFade.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticleMeshes.cpp">
+					RelativePath=".\obj\NiParticleMeshes.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticleMeshesData.cpp">
+					RelativePath=".\obj\NiParticleMeshesData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticleMeshModifier.cpp">
+					RelativePath=".\obj\NiParticleMeshModifier.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticleRotation.cpp">
+					RelativePath=".\obj\NiParticleRotation.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticles.cpp">
+					RelativePath=".\obj\NiParticles.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticlesData.cpp">
+					RelativePath=".\obj\NiParticlesData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticleSystem.cpp">
+					RelativePath=".\obj\NiParticleSystem.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticleSystemController.cpp">
+					RelativePath=".\obj\NiParticleSystemController.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPathController.cpp">
+					RelativePath=".\obj\NiPathController.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPathInterpolator.cpp">
+					RelativePath=".\obj\NiPathInterpolator.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPixelData.cpp">
+					RelativePath=".\obj\NiPixelData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPlanarCollider.cpp">
+					RelativePath=".\obj\NiPlanarCollider.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPoint3Interpolator.cpp">
+					RelativePath=".\obj\NiPoint3Interpolator.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPointLight.cpp">
+					RelativePath=".\obj\NiPointLight.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPosData.cpp">
+					RelativePath=".\obj\NiPosData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiProperty.cpp">
+					RelativePath=".\obj\NiProperty.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysAgeDeathModifier.cpp">
+					RelativePath=".\obj\NiPSysAgeDeathModifier.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysBombModifier.cpp">
+					RelativePath=".\obj\NiPSysBombModifier.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysBoundUpdateModifier.cpp">
+					RelativePath=".\obj\NiPSysBoundUpdateModifier.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysBoxEmitter.cpp">
+					RelativePath=".\obj\NiPSysBoxEmitter.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysColliderManager.cpp">
+					RelativePath=".\obj\NiPSysColliderManager.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysColorModifier.cpp">
+					RelativePath=".\obj\NiPSysColorModifier.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysCylinderEmitter.cpp">
+					RelativePath=".\obj\NiPSysCylinderEmitter.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysData.cpp">
+					RelativePath=".\obj\NiPSysData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysDragModifier.cpp">
+					RelativePath=".\obj\NiPSysDragModifier.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysEmitter.cpp">
+					RelativePath=".\obj\NiPSysEmitter.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysEmitterCtlr.cpp">
+					RelativePath=".\obj\NiPSysEmitterCtlr.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysEmitterCtlrData.cpp">
+					RelativePath=".\obj\NiPSysEmitterCtlrData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysEmitterDeclinationCtlr.cpp">
+					RelativePath=".\obj\NiPSysEmitterDeclinationCtlr.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysEmitterDeclinationVarCtlr.cpp">
+					RelativePath=".\obj\NiPSysEmitterDeclinationVarCtlr.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysEmitterInitialRadiusCtlr.cpp">
+					RelativePath=".\obj\NiPSysEmitterInitialRadiusCtlr.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysEmitterLifeSpanCtlr.cpp">
+					RelativePath=".\obj\NiPSysEmitterLifeSpanCtlr.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysEmitterSpeedCtlr.cpp">
+					RelativePath=".\obj\NiPSysEmitterSpeedCtlr.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysGravityModifier.cpp">
+					RelativePath=".\obj\NiPSysGravityModifier.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysGravityStrengthCtlr.cpp">
+					RelativePath=".\obj\NiPSysGravityStrengthCtlr.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysGrowFadeModifier.cpp">
+					RelativePath=".\obj\NiPSysGrowFadeModifier.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysMeshEmitter.cpp">
+					RelativePath=".\obj\NiPSysMeshEmitter.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysMeshUpdateModifier.cpp">
+					RelativePath=".\obj\NiPSysMeshUpdateModifier.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysModifier.cpp">
+					RelativePath=".\obj\NiPSysModifier.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysModifierActiveCtlr.cpp">
+					RelativePath=".\obj\NiPSysModifierActiveCtlr.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysPlanarCollider.cpp">
+					RelativePath=".\obj\NiPSysPlanarCollider.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysPositionModifier.cpp">
+					RelativePath=".\obj\NiPSysPositionModifier.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysResetOnLoopCtlr.cpp">
+					RelativePath=".\obj\NiPSysResetOnLoopCtlr.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysRotationModifier.cpp">
+					RelativePath=".\obj\NiPSysRotationModifier.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysSpawnModifier.cpp">
+					RelativePath=".\obj\NiPSysSpawnModifier.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysSphereEmitter.cpp">
+					RelativePath=".\obj\NiPSysSphereEmitter.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysUpdateCtlr.cpp">
+					RelativePath=".\obj\NiPSysUpdateCtlr.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysVolumeEmitter.cpp">
+					RelativePath=".\obj\NiPSysVolumeEmitter.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiRangeLODData.cpp">
+					RelativePath=".\obj\NiRangeLODData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiRotatingParticles.cpp">
+					RelativePath=".\obj\NiRotatingParticles.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiRotatingParticlesData.cpp">
+					RelativePath=".\obj\NiRotatingParticlesData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiScreenLODData.cpp">
+					RelativePath=".\obj\NiScreenLODData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiSequenceStreamHelper.cpp">
+					RelativePath=".\obj\NiSequenceStreamHelper.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiShadeProperty.cpp">
+					RelativePath=".\obj\NiShadeProperty.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiSingleInterpolatorController.cpp">
+					RelativePath=".\obj\NiSingleInterpolatorController.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiSkinData.cpp">
+					RelativePath=".\obj\NiSkinData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiSkinInstance.cpp">
+					RelativePath=".\obj\NiSkinInstance.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiSkinPartition.cpp">
+					RelativePath=".\obj\NiSkinPartition.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiSourceTexture.cpp">
+					RelativePath=".\obj\NiSourceTexture.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiSpecularProperty.cpp">
+					RelativePath=".\obj\NiSpecularProperty.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiSphericalCollider.cpp">
+					RelativePath=".\obj\NiSphericalCollider.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiSpotLight.cpp">
+					RelativePath=".\obj\NiSpotLight.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiStencilProperty.cpp">
+					RelativePath=".\obj\NiStencilProperty.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiStringExtraData.cpp">
+					RelativePath=".\obj\NiStringExtraData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiStringPalette.cpp">
+					RelativePath=".\obj\NiStringPalette.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiStringsExtraData.cpp">
+					RelativePath=".\obj\NiStringsExtraData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTextKeyExtraData.cpp">
+					RelativePath=".\obj\NiTextKeyExtraData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTextureEffect.cpp">
+					RelativePath=".\obj\NiTextureEffect.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTextureTransformController.cpp">
+					RelativePath=".\obj\NiTextureTransformController.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTexturingProperty.cpp">
+					RelativePath=".\obj\NiTexturingProperty.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTimeController.cpp">
+					RelativePath=".\obj\NiTimeController.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTransformController.cpp">
+					RelativePath=".\obj\NiTransformController.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTransformData.cpp">
+					RelativePath=".\obj\NiTransformData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTransformInterpolator.cpp">
+					RelativePath=".\obj\NiTransformInterpolator.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTriBasedGeom.cpp">
+					RelativePath=".\obj\NiTriBasedGeom.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTriBasedGeomData.cpp">
+					RelativePath=".\obj\NiTriBasedGeomData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTriShape.cpp">
+					RelativePath=".\obj\NiTriShape.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTriShapeData.cpp">
+					RelativePath=".\obj\NiTriShapeData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTriStrips.cpp">
+					RelativePath=".\obj\NiTriStrips.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTriStripsData.cpp">
+					RelativePath=".\obj\NiTriStripsData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiUVController.cpp">
+					RelativePath=".\obj\NiUVController.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiUVData.cpp">
+					RelativePath=".\obj\NiUVData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiVectorExtraData.cpp">
+					RelativePath=".\obj\NiVectorExtraData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiVertexColorProperty.cpp">
+					RelativePath=".\obj\NiVertexColorProperty.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiVertWeightsExtraData.cpp">
+					RelativePath=".\obj\NiVertWeightsExtraData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiVisController.cpp">
+					RelativePath=".\obj\NiVisController.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiVisData.cpp">
+					RelativePath=".\obj\NiVisData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiWireframeProperty.cpp">
+					RelativePath=".\obj\NiWireframeProperty.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiZBufferProperty.cpp">
+					RelativePath=".\obj\NiZBufferProperty.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\RootCollisionNode.cpp">
+					RelativePath=".\obj\RootCollisionNode.cpp"
+					>
 				</File>
 			</Filter>
 			<Filter
 				Name="gen"
-				Filter="">
+				>
 				<File
-					RelativePath=".\gen\AVObject.cpp">
+					RelativePath=".\gen\AVObject.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\Bones.cpp">
+					RelativePath=".\gen\Bones.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\BoundingBox.cpp">
+					RelativePath=".\gen\BoundingBox.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\ByteArray.cpp">
+					RelativePath=".\gen\ByteArray.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\ControllerLink.cpp">
+					RelativePath=".\gen\ControllerLink.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\Footer.cpp">
+					RelativePath=".\gen\Footer.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\FurniturePosition.cpp">
+					RelativePath=".\gen\FurniturePosition.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\Header.cpp">
+					RelativePath=".\gen\Header.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\hkTriangle.cpp">
+					RelativePath=".\gen\hkTriangle.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\LimitedHingeDescriptor.cpp">
+					RelativePath=".\gen\LimitedHingeDescriptor.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\LODRange.cpp">
+					RelativePath=".\gen\LODRange.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\MatchGroup.cpp">
+					RelativePath=".\gen\MatchGroup.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\MipMap.cpp">
+					RelativePath=".\gen\MipMap.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\Morph.cpp">
+					RelativePath=".\gen\Morph.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\NodeGroup.cpp">
+					RelativePath=".\gen\NodeGroup.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\obj_factories.cpp">
+					RelativePath=".\gen\obj_factories.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\Particle.cpp">
+					RelativePath=".\gen\Particle.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\QuaternionXYZW.cpp">
+					RelativePath=".\gen\QuaternionXYZW.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\RagDollDescriptor.cpp">
+					RelativePath=".\gen\RagDollDescriptor.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\ShaderTexDesc.cpp">
+					RelativePath=".\gen\ShaderTexDesc.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\ShortString.cpp">
+					RelativePath=".\gen\ShortString.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\SkinData.cpp">
+					RelativePath=".\gen\SkinData.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\SkinPartition.cpp">
+					RelativePath=".\gen\SkinPartition.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\SkinShape.cpp">
+					RelativePath=".\gen\SkinShape.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\SkinShapeGroup.cpp">
+					RelativePath=".\gen\SkinShapeGroup.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\SkinWeight.cpp">
+					RelativePath=".\gen\SkinWeight.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\StringPalette.cpp">
+					RelativePath=".\gen\StringPalette.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\TBC.cpp">
+					RelativePath=".\gen\TBC.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\TexDesc.cpp">
+					RelativePath=".\gen\TexDesc.cpp"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\TexSource.cpp">
+					RelativePath=".\gen\TexSource.cpp"
+					>
 				</File>
 			</Filter>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
 			<File
-				RelativePath=".\NIF_IO.h">
+				RelativePath=".\NIF_IO.h"
+				>
 			</File>
 			<File
-				RelativePath=".\nif_math.h">
+				RelativePath=".\nif_math.h"
+				>
 			</File>
 			<File
-				RelativePath=".\niflib.h">
+				RelativePath=".\niflib.h"
+				>
 			</File>
 			<File
-				RelativePath=".\Ref.h">
+				RelativePath=".\Ref.h"
+				>
 			</File>
 			<File
-				RelativePath=".\Type.h">
+				RelativePath=".\Type.h"
+				>
 			</File>
 			<Filter
 				Name="obj"
-				Filter="">
+				>
 				<File
-					RelativePath=".\obj\AbhkConstraint.h">
+					RelativePath=".\obj\AbhkConstraint.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\AbhkRagdollConstraint.h">
+					RelativePath=".\obj\AbhkRagdollConstraint.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\AbhkShapeCollection.h">
+					RelativePath=".\obj\AbhkShapeCollection.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\ABoneLODController.h">
+					RelativePath=".\obj\ABoneLODController.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\AKeyedData.h">
+					RelativePath=".\obj\AKeyedData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\AParticleModifier.h">
+					RelativePath=".\obj\AParticleModifier.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\APSysCtlr.h">
+					RelativePath=".\obj\APSysCtlr.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\APSysData.h">
+					RelativePath=".\obj\APSysData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\AvoidNode.h">
+					RelativePath=".\obj\AvoidNode.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkBlendCollisionObject.h">
+					RelativePath=".\obj\bhkBlendCollisionObject.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkBlendController.h">
+					RelativePath=".\obj\bhkBlendController.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkBoxShape.h">
+					RelativePath=".\obj\bhkBoxShape.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkCapsuleShape.h">
+					RelativePath=".\obj\bhkCapsuleShape.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkCollisionObject.h">
+					RelativePath=".\obj\bhkCollisionObject.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkConvexShape.h">
+					RelativePath=".\obj\bhkConvexShape.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkConvexTransformShape.h">
+					RelativePath=".\obj\bhkConvexTransformShape.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkConvexVerticesShape.h">
+					RelativePath=".\obj\bhkConvexVerticesShape.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkEntity.h">
+					RelativePath=".\obj\bhkEntity.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkHingeConstraint.h">
+					RelativePath=".\obj\bhkHingeConstraint.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkLimitedHingeConstraint.h">
+					RelativePath=".\obj\bhkLimitedHingeConstraint.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkListShape.h">
+					RelativePath=".\obj\bhkListShape.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkMalleableConstraint.h">
+					RelativePath=".\obj\bhkMalleableConstraint.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkMoppBvTreeShape.h">
+					RelativePath=".\obj\bhkMoppBvTreeShape.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkMultiSphereShape.h">
+					RelativePath=".\obj\bhkMultiSphereShape.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkNiTriStripsShape.h">
+					RelativePath=".\obj\bhkNiTriStripsShape.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkPackedNiTriStripsShape.h">
+					RelativePath=".\obj\bhkPackedNiTriStripsShape.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkPrismaticConstraint.h">
+					RelativePath=".\obj\bhkPrismaticConstraint.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkRagdollConstraint.h">
+					RelativePath=".\obj\bhkRagdollConstraint.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkRefObject.h">
+					RelativePath=".\obj\bhkRefObject.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkRigidBody.h">
+					RelativePath=".\obj\bhkRigidBody.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkRigidBodyT.h">
+					RelativePath=".\obj\bhkRigidBodyT.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkSerializable.h">
+					RelativePath=".\obj\bhkSerializable.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkShape.h">
+					RelativePath=".\obj\bhkShape.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkSimpleShapePhantom.h">
+					RelativePath=".\obj\bhkSimpleShapePhantom.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkSPCollisionObject.h">
+					RelativePath=".\obj\bhkSPCollisionObject.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkSphereRepShape.h">
+					RelativePath=".\obj\bhkSphereRepShape.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkSphereShape.h">
+					RelativePath=".\obj\bhkSphereShape.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkStiffSpringConstraint.h">
+					RelativePath=".\obj\bhkStiffSpringConstraint.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkTransformShape.h">
+					RelativePath=".\obj\bhkTransformShape.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\bhkWorldObject.h">
+					RelativePath=".\obj\bhkWorldObject.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\BSBound.h">
+					RelativePath=".\obj\BSBound.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\BSFurnitureMarker.h">
+					RelativePath=".\obj\BSFurnitureMarker.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\BSKeyframeController.h">
+					RelativePath=".\obj\BSKeyframeController.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\BSParentVelocityModifier.h">
+					RelativePath=".\obj\BSParentVelocityModifier.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\BSPSysArrayEmitter.h">
+					RelativePath=".\obj\BSPSysArrayEmitter.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\BSXFlags.h">
+					RelativePath=".\obj\BSXFlags.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\FxButton.h">
+					RelativePath=".\obj\FxButton.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\FxRadioButton.h">
+					RelativePath=".\obj\FxRadioButton.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\FxWidget.h">
+					RelativePath=".\obj\FxWidget.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\hkPackedNiTriStripsData.h">
+					RelativePath=".\obj\hkPackedNiTriStripsData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiAlphaController.h">
+					RelativePath=".\obj\NiAlphaController.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiAlphaProperty.h">
+					RelativePath=".\obj\NiAlphaProperty.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiAmbientLight.h">
+					RelativePath=".\obj\NiAmbientLight.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiAutoNormalParticles.h">
+					RelativePath=".\obj\NiAutoNormalParticles.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiAutoNormalParticlesData.h">
+					RelativePath=".\obj\NiAutoNormalParticlesData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiAVObject.h">
+					RelativePath=".\obj\NiAVObject.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBillboardNode.h">
+					RelativePath=".\obj\NiBillboardNode.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBinaryExtraData.h">
+					RelativePath=".\obj\NiBinaryExtraData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBlendBoolInterpolator.h">
+					RelativePath=".\obj\NiBlendBoolInterpolator.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBlendFloatInterpolator.h">
+					RelativePath=".\obj\NiBlendFloatInterpolator.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBlendInterpolator.h">
+					RelativePath=".\obj\NiBlendInterpolator.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBlendPoint3Interpolator.h">
+					RelativePath=".\obj\NiBlendPoint3Interpolator.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBlendTransformInterpolator.h">
+					RelativePath=".\obj\NiBlendTransformInterpolator.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBoneLODController.h">
+					RelativePath=".\obj\NiBoneLODController.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBoolData.h">
+					RelativePath=".\obj\NiBoolData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBooleanExtraData.h">
+					RelativePath=".\obj\NiBooleanExtraData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBoolInterpolator.h">
+					RelativePath=".\obj\NiBoolInterpolator.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBoolTimelineInterpolator.h">
+					RelativePath=".\obj\NiBoolTimelineInterpolator.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSAnimationNode.h">
+					RelativePath=".\obj\NiBSAnimationNode.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSBoneLODController.h">
+					RelativePath=".\obj\NiBSBoneLODController.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSPArrayController.h">
+					RelativePath=".\obj\NiBSPArrayController.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSParticleNode.h">
+					RelativePath=".\obj\NiBSParticleNode.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSplineBasisData.h">
+					RelativePath=".\obj\NiBSplineBasisData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSplineCompFloatInterpolator.h">
+					RelativePath=".\obj\NiBSplineCompFloatInterpolator.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSplineCompPoint3Interpolator.h">
+					RelativePath=".\obj\NiBSplineCompPoint3Interpolator.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSplineCompTransformInterpolator.h">
+					RelativePath=".\obj\NiBSplineCompTransformInterpolator.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSplineData.h">
+					RelativePath=".\obj\NiBSplineData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiBSplineInterpolator.h">
+					RelativePath=".\obj\NiBSplineInterpolator.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiCamera.h">
+					RelativePath=".\obj\NiCamera.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiCollisionData.h">
+					RelativePath=".\obj\NiCollisionData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiCollisionObject.h">
+					RelativePath=".\obj\NiCollisionObject.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiColorData.h">
+					RelativePath=".\obj\NiColorData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiColorExtraData.h">
+					RelativePath=".\obj\NiColorExtraData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiControllerManager.h">
+					RelativePath=".\obj\NiControllerManager.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiControllerSequence.h">
+					RelativePath=".\obj\NiControllerSequence.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiDefaultAVObjectPalette.h">
+					RelativePath=".\obj\NiDefaultAVObjectPalette.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiDirectionalLight.h">
+					RelativePath=".\obj\NiDirectionalLight.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiDitherProperty.h">
+					RelativePath=".\obj\NiDitherProperty.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiDynamicEffect.h">
+					RelativePath=".\obj\NiDynamicEffect.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiExtraData.h">
+					RelativePath=".\obj\NiExtraData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiFlipController.h">
+					RelativePath=".\obj\NiFlipController.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiFloatData.h">
+					RelativePath=".\obj\NiFloatData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiFloatExtraData.h">
+					RelativePath=".\obj\NiFloatExtraData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiFloatExtraDataController.h">
+					RelativePath=".\obj\NiFloatExtraDataController.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiFloatInterpolator.h">
+					RelativePath=".\obj\NiFloatInterpolator.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiFloatsExtraData.h">
+					RelativePath=".\obj\NiFloatsExtraData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiFogProperty.h">
+					RelativePath=".\obj\NiFogProperty.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiGeomMorpherController.h">
+					RelativePath=".\obj\NiGeomMorpherController.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiGravity.h">
+					RelativePath=".\obj\NiGravity.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiIntegerExtraData.h">
+					RelativePath=".\obj\NiIntegerExtraData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiIntegersExtraData.h">
+					RelativePath=".\obj\NiIntegersExtraData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiInterpolator.h">
+					RelativePath=".\obj\NiInterpolator.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiKeyframeController.h">
+					RelativePath=".\obj\NiKeyframeController.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiKeyframeData.h">
+					RelativePath=".\obj\NiKeyframeData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiLight.h">
+					RelativePath=".\obj\NiLight.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiLightColorController.h">
+					RelativePath=".\obj\NiLightColorController.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiLightDimmerController.h">
+					RelativePath=".\obj\NiLightDimmerController.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiLODNode.h">
+					RelativePath=".\obj\NiLODNode.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiLookAtController.h">
+					RelativePath=".\obj\NiLookAtController.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiLookAtInterpolator.h">
+					RelativePath=".\obj\NiLookAtInterpolator.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiMaterialColorController.h">
+					RelativePath=".\obj\NiMaterialColorController.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiMaterialProperty.h">
+					RelativePath=".\obj\NiMaterialProperty.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiMeshParticleSystem.h">
+					RelativePath=".\obj\NiMeshParticleSystem.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiMeshPSysData.h">
+					RelativePath=".\obj\NiMeshPSysData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiMorphData.h">
+					RelativePath=".\obj\NiMorphData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiMultiTargetTransformController.h">
+					RelativePath=".\obj\NiMultiTargetTransformController.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiNode.h">
+					RelativePath=".\obj\NiNode.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiObject.h">
+					RelativePath=".\obj\NiObject.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiObjectNET.h">
+					RelativePath=".\obj\NiObjectNET.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPalette.h">
+					RelativePath=".\obj\NiPalette.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticleBomb.h">
+					RelativePath=".\obj\NiParticleBomb.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticleColorModifier.h">
+					RelativePath=".\obj\NiParticleColorModifier.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticleGrowFade.h">
+					RelativePath=".\obj\NiParticleGrowFade.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticleMeshes.h">
+					RelativePath=".\obj\NiParticleMeshes.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticleMeshesData.h">
+					RelativePath=".\obj\NiParticleMeshesData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticleMeshModifier.h">
+					RelativePath=".\obj\NiParticleMeshModifier.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticleRotation.h">
+					RelativePath=".\obj\NiParticleRotation.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticles.h">
+					RelativePath=".\obj\NiParticles.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticlesData.h">
+					RelativePath=".\obj\NiParticlesData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticleSystem.h">
+					RelativePath=".\obj\NiParticleSystem.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiParticleSystemController.h">
+					RelativePath=".\obj\NiParticleSystemController.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPathController.h">
+					RelativePath=".\obj\NiPathController.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPathInterpolator.h">
+					RelativePath=".\obj\NiPathInterpolator.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPixelData.h">
+					RelativePath=".\obj\NiPixelData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPlanarCollider.h">
+					RelativePath=".\obj\NiPlanarCollider.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPoint3Interpolator.h">
+					RelativePath=".\obj\NiPoint3Interpolator.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPointLight.h">
+					RelativePath=".\obj\NiPointLight.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPosData.h">
+					RelativePath=".\obj\NiPosData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiProperty.h">
+					RelativePath=".\obj\NiProperty.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysAgeDeathModifier.h">
+					RelativePath=".\obj\NiPSysAgeDeathModifier.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysBombModifier.h">
+					RelativePath=".\obj\NiPSysBombModifier.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysBoundUpdateModifier.h">
+					RelativePath=".\obj\NiPSysBoundUpdateModifier.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysBoxEmitter.h">
+					RelativePath=".\obj\NiPSysBoxEmitter.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysColliderManager.h">
+					RelativePath=".\obj\NiPSysColliderManager.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysColorModifier.h">
+					RelativePath=".\obj\NiPSysColorModifier.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysCylinderEmitter.h">
+					RelativePath=".\obj\NiPSysCylinderEmitter.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysData.h">
+					RelativePath=".\obj\NiPSysData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysDragModifier.h">
+					RelativePath=".\obj\NiPSysDragModifier.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysEmitter.h">
+					RelativePath=".\obj\NiPSysEmitter.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysEmitterCtlr.h">
+					RelativePath=".\obj\NiPSysEmitterCtlr.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysEmitterCtlrData.h">
+					RelativePath=".\obj\NiPSysEmitterCtlrData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysEmitterDeclinationCtlr.h">
+					RelativePath=".\obj\NiPSysEmitterDeclinationCtlr.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysEmitterDeclinationVarCtlr.h">
+					RelativePath=".\obj\NiPSysEmitterDeclinationVarCtlr.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysEmitterInitialRadiusCtlr.h">
+					RelativePath=".\obj\NiPSysEmitterInitialRadiusCtlr.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysEmitterLifeSpanCtlr.h">
+					RelativePath=".\obj\NiPSysEmitterLifeSpanCtlr.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysEmitterSpeedCtlr.h">
+					RelativePath=".\obj\NiPSysEmitterSpeedCtlr.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysGravityModifier.h">
+					RelativePath=".\obj\NiPSysGravityModifier.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysGravityStrengthCtlr.h">
+					RelativePath=".\obj\NiPSysGravityStrengthCtlr.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysGrowFadeModifier.h">
+					RelativePath=".\obj\NiPSysGrowFadeModifier.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysMeshEmitter.h">
+					RelativePath=".\obj\NiPSysMeshEmitter.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysMeshUpdateModifier.h">
+					RelativePath=".\obj\NiPSysMeshUpdateModifier.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysModifier.h">
+					RelativePath=".\obj\NiPSysModifier.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysModifierActiveCtlr.h">
+					RelativePath=".\obj\NiPSysModifierActiveCtlr.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysPlanarCollider.h">
+					RelativePath=".\obj\NiPSysPlanarCollider.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysPositionModifier.h">
+					RelativePath=".\obj\NiPSysPositionModifier.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysResetOnLoopCtlr.h">
+					RelativePath=".\obj\NiPSysResetOnLoopCtlr.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysRotationModifier.h">
+					RelativePath=".\obj\NiPSysRotationModifier.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysSpawnModifier.h">
+					RelativePath=".\obj\NiPSysSpawnModifier.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysSphereEmitter.h">
+					RelativePath=".\obj\NiPSysSphereEmitter.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysUpdateCtlr.h">
+					RelativePath=".\obj\NiPSysUpdateCtlr.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiPSysVolumeEmitter.h">
+					RelativePath=".\obj\NiPSysVolumeEmitter.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiRangeLODData.h">
+					RelativePath=".\obj\NiRangeLODData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiRotatingParticles.h">
+					RelativePath=".\obj\NiRotatingParticles.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiRotatingParticlesData.h">
+					RelativePath=".\obj\NiRotatingParticlesData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiScreenLODData.h">
+					RelativePath=".\obj\NiScreenLODData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiSequenceStreamHelper.h">
+					RelativePath=".\obj\NiSequenceStreamHelper.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiShadeProperty.h">
+					RelativePath=".\obj\NiShadeProperty.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiSingleInterpolatorController.h">
+					RelativePath=".\obj\NiSingleInterpolatorController.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiSkinData.h">
+					RelativePath=".\obj\NiSkinData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiSkinInstance.h">
+					RelativePath=".\obj\NiSkinInstance.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiSkinPartition.h">
+					RelativePath=".\obj\NiSkinPartition.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiSourceTexture.h">
+					RelativePath=".\obj\NiSourceTexture.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiSpecularProperty.h">
+					RelativePath=".\obj\NiSpecularProperty.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiSphericalCollider.h">
+					RelativePath=".\obj\NiSphericalCollider.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiSpotLight.h">
+					RelativePath=".\obj\NiSpotLight.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiStencilProperty.h">
+					RelativePath=".\obj\NiStencilProperty.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiStringExtraData.h">
+					RelativePath=".\obj\NiStringExtraData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiStringPalette.h">
+					RelativePath=".\obj\NiStringPalette.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiStringsExtraData.h">
+					RelativePath=".\obj\NiStringsExtraData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTextKeyExtraData.h">
+					RelativePath=".\obj\NiTextKeyExtraData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTextureEffect.h">
+					RelativePath=".\obj\NiTextureEffect.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTextureTransformController.h">
+					RelativePath=".\obj\NiTextureTransformController.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTexturingProperty.h">
+					RelativePath=".\obj\NiTexturingProperty.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTimeController.h">
+					RelativePath=".\obj\NiTimeController.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTransformController.h">
+					RelativePath=".\obj\NiTransformController.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTransformData.h">
+					RelativePath=".\obj\NiTransformData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTransformInterpolator.h">
+					RelativePath=".\obj\NiTransformInterpolator.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTriBasedGeom.h">
+					RelativePath=".\obj\NiTriBasedGeom.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTriBasedGeomData.h">
+					RelativePath=".\obj\NiTriBasedGeomData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTriShape.h">
+					RelativePath=".\obj\NiTriShape.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTriShapeData.h">
+					RelativePath=".\obj\NiTriShapeData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTriStrips.h">
+					RelativePath=".\obj\NiTriStrips.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiTriStripsData.h">
+					RelativePath=".\obj\NiTriStripsData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiUVController.h">
+					RelativePath=".\obj\NiUVController.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiUVData.h">
+					RelativePath=".\obj\NiUVData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiVectorExtraData.h">
+					RelativePath=".\obj\NiVectorExtraData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiVertexColorProperty.h">
+					RelativePath=".\obj\NiVertexColorProperty.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiVertWeightsExtraData.h">
+					RelativePath=".\obj\NiVertWeightsExtraData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiVisController.h">
+					RelativePath=".\obj\NiVisController.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiVisData.h">
+					RelativePath=".\obj\NiVisData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiWireframeProperty.h">
+					RelativePath=".\obj\NiWireframeProperty.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\NiZBufferProperty.h">
+					RelativePath=".\obj\NiZBufferProperty.h"
+					>
 				</File>
 				<File
-					RelativePath=".\obj\RootCollisionNode.h">
+					RelativePath=".\obj\RootCollisionNode.h"
+					>
 				</File>
 			</Filter>
 			<Filter
 				Name="gen"
-				Filter="">
+				>
 				<File
-					RelativePath=".\gen\AVObject.h">
+					RelativePath=".\gen\AVObject.h"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\Bones.h">
+					RelativePath=".\gen\Bones.h"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\BoundingBox.h">
+					RelativePath=".\gen\BoundingBox.h"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\ByteArray.h">
+					RelativePath=".\gen\ByteArray.h"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\ControllerLink.h">
+					RelativePath=".\gen\ControllerLink.h"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\Footer.h">
+					RelativePath=".\gen\Footer.h"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\FurniturePosition.h">
+					RelativePath=".\gen\FurniturePosition.h"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\Header.h">
+					RelativePath=".\gen\Header.h"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\hkTriangle.h">
+					RelativePath=".\gen\hkTriangle.h"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\KeyGroup.h">
+					RelativePath=".\gen\KeyGroup.h"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\LimitedHingeDescriptor.h">
+					RelativePath=".\gen\LimitedHingeDescriptor.h"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\LODRange.h">
+					RelativePath=".\gen\LODRange.h"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\MatchGroup.h">
+					RelativePath=".\gen\MatchGroup.h"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\MipMap.h">
+					RelativePath=".\gen\MipMap.h"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\Morph.h">
+					RelativePath=".\gen\Morph.h"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\NodeGroup.h">
+					RelativePath=".\gen\NodeGroup.h"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\obj_defines.h">
+					RelativePath=".\gen\obj_defines.h"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\Particle.h">
+					RelativePath=".\gen\Particle.h"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\QuaternionXYZW.h">
+					RelativePath=".\gen\QuaternionXYZW.h"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\RagDollDescriptor.h">
+					RelativePath=".\gen\RagDollDescriptor.h"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\RotationKeyArray.h">
+					RelativePath=".\gen\RotationKeyArray.h"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\ShaderTexDesc.h">
+					RelativePath=".\gen\ShaderTexDesc.h"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\ShortString.h">
+					RelativePath=".\gen\ShortString.h"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\SkinData.h">
+					RelativePath=".\gen\SkinData.h"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\SkinPartition.h">
+					RelativePath=".\gen\SkinPartition.h"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\SkinShape.h">
+					RelativePath=".\gen\SkinShape.h"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\SkinShapeGroup.h">
+					RelativePath=".\gen\SkinShapeGroup.h"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\SkinWeight.h">
+					RelativePath=".\gen\SkinWeight.h"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\StringPalette.h">
+					RelativePath=".\gen\StringPalette.h"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\TBC.h">
+					RelativePath=".\gen\TBC.h"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\TexDesc.h">
+					RelativePath=".\gen\TexDesc.h"
+					>
 				</File>
 				<File
-					RelativePath=".\gen\TexSource.h">
+					RelativePath=".\gen\TexSource.h"
+					>
 				</File>
 			</Filter>
 		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/obj/ABoneLODController.cpp b/obj/ABoneLODController.cpp
index 4c9209dec7db3d9d4748acf9af27a71f7a598028..434a8d3012a0ece81a721d440da583b557745ae7 100644
--- a/obj/ABoneLODController.cpp
+++ b/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 "obj/ABoneLODController.h"
-#include "gen/NodeGroup.h"
-#include "obj/NiNode.h"
+#include "ABoneLODController.h"
+#include "../gen/NodeGroup.h"
+#include "NiNode.h"
 
 //Definition of TYPE constant
 const Type ABoneLODController::TYPE("ABoneLODController", &A_BONE_L_O_D_CONTROLLER_PARENT::TYPE );
diff --git a/obj/ABoneLODController.h b/obj/ABoneLODController.h
index 709e35f1a27d69344d3dad9873bbe511ef3fc34f..49137873c5f0431521c02c6fb6241405e976204b 100644
--- a/obj/ABoneLODController.h
+++ b/obj/ABoneLODController.h
@@ -6,9 +6,9 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiTimeController.h"
 // Include structures
-#include "gen/NodeGroup.h"
+#include "../gen/NodeGroup.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class ABoneLODController;
 typedef Ref<ABoneLODController> ABoneLODControllerRef;
diff --git a/obj/AKeyedData.cpp b/obj/AKeyedData.cpp
index a95f840e4a8f921143741c43ead38c3bdecbb400..69ca6f14ca455e5c8a7e078def7df69aedd478c7 100644
--- a/obj/AKeyedData.cpp
+++ b/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 "obj/AKeyedData.h"
+#include "AKeyedData.h"
 
 //Definition of TYPE constant
 const Type AKeyedData::TYPE("AKeyedData", &A_KEYED_DATA_PARENT::TYPE );
diff --git a/obj/AKeyedData.h b/obj/AKeyedData.h
index 12dfe621d9b3ede9f79d523d4a9cc073bc499913..7e7e5e22c8c79ccf254bdfa2d7f38db0a8aaf97e 100644
--- a/obj/AKeyedData.h
+++ b/obj/AKeyedData.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiObject.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class AKeyedData;
 typedef Ref<AKeyedData> AKeyedDataRef;
diff --git a/obj/APSysCtlr.cpp b/obj/APSysCtlr.cpp
index b8399d4835757711e2466022c060219b72f6b192..c5de4a9751c53f8f59172f0c47d59ebc2374689b 100644
--- a/obj/APSysCtlr.cpp
+++ b/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 "obj/APSysCtlr.h"
+#include "APSysCtlr.h"
 
 //Definition of TYPE constant
 const Type APSysCtlr::TYPE("APSysCtlr", &A_P_SYS_CTLR_PARENT::TYPE );
diff --git a/obj/APSysCtlr.h b/obj/APSysCtlr.h
index 809480765b18c406a6119292563951d49dee9240..75e53a69052f2fe9c7f2f7f54b9a3615582073b4 100644
--- a/obj/APSysCtlr.h
+++ b/obj/APSysCtlr.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiSingleInterpolatorController.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class APSysCtlr;
 typedef Ref<APSysCtlr> APSysCtlrRef;
diff --git a/obj/APSysData.cpp b/obj/APSysData.cpp
index dd08989bf85c217df6d75bf80969884af53b4401..e7d70fcf09b801bae7a061efcb57526b831fa1ca 100644
--- a/obj/APSysData.cpp
+++ b/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 "obj/APSysData.h"
+#include "APSysData.h"
 
 //Definition of TYPE constant
 const Type APSysData::TYPE("APSysData", &A_P_SYS_DATA_PARENT::TYPE );
diff --git a/obj/APSysData.h b/obj/APSysData.h
index f0d76990c83d082c03c09540f368fd6d2cf821e1..1e0503c78a2d4b87ecb14a0269f402b13a1e4620 100644
--- a/obj/APSysData.h
+++ b/obj/APSysData.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiTriBasedGeomData.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class APSysData;
 typedef Ref<APSysData> APSysDataRef;
diff --git a/obj/AParticleModifier.cpp b/obj/AParticleModifier.cpp
index acea912c2b4825390858e9833a8fe86be04f2e1c..69b0a48f3d3f7275a8e22cce9de85b875f8751fe 100644
--- a/obj/AParticleModifier.cpp
+++ b/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 "obj/AParticleModifier.h"
-#include "obj/NiParticleSystemController.h"
+#include "AParticleModifier.h"
+#include "NiParticleSystemController.h"
 
 //Definition of TYPE constant
 const Type AParticleModifier::TYPE("AParticleModifier", &A_PARTICLE_MODIFIER_PARENT::TYPE );
diff --git a/obj/AParticleModifier.h b/obj/AParticleModifier.h
index 655ba012300dfda0a7c5a7622b9026f95a3e7bfd..18c81f74f809ea7313756a9e19bfe5916e633960 100644
--- a/obj/AParticleModifier.h
+++ b/obj/AParticleModifier.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiObject.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiParticleSystemController;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class AParticleModifier;
 typedef Ref<AParticleModifier> AParticleModifierRef;
diff --git a/obj/AbhkConstraint.cpp b/obj/AbhkConstraint.cpp
index 667d56825fcc228ceed6d96d83822c8a7a5907d6..cec8550495a570d39ca670d247023689440cf238 100644
--- a/obj/AbhkConstraint.cpp
+++ b/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 "obj/AbhkConstraint.h"
-#include "obj/bhkShape.h"
+#include "AbhkConstraint.h"
+#include "bhkShape.h"
 
 //Definition of TYPE constant
 const Type AbhkConstraint::TYPE("AbhkConstraint", &ABHK_CONSTRAINT_PARENT::TYPE );
diff --git a/obj/AbhkConstraint.h b/obj/AbhkConstraint.h
index c1c15d7310a02822072173c43e05e46921898192..a23891e940aceeedcf91a2d3666a504b64864a14 100644
--- a/obj/AbhkConstraint.h
+++ b/obj/AbhkConstraint.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "bhkSerializable.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class bhkShape;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class AbhkConstraint;
 typedef Ref<AbhkConstraint> AbhkConstraintRef;
diff --git a/obj/AbhkRagdollConstraint.cpp b/obj/AbhkRagdollConstraint.cpp
index 59af5859659a124e68e46848d4d0909e6c5ee5c8..1384efcbfacff0f7e6940742d7a0438c70d0c24b 100644
--- a/obj/AbhkRagdollConstraint.cpp
+++ b/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 "obj/AbhkRagdollConstraint.h"
+#include "AbhkRagdollConstraint.h"
 
 //Definition of TYPE constant
 const Type AbhkRagdollConstraint::TYPE("AbhkRagdollConstraint", &ABHK_RAGDOLL_CONSTRAINT_PARENT::TYPE );
diff --git a/obj/AbhkRagdollConstraint.h b/obj/AbhkRagdollConstraint.h
index 4fb071d5555b706770d2ba731242707bea8cb148..dd1bc2b32981454781470d7180a4780758051141 100644
--- a/obj/AbhkRagdollConstraint.h
+++ b/obj/AbhkRagdollConstraint.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "AbhkConstraint.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class AbhkRagdollConstraint;
 typedef Ref<AbhkRagdollConstraint> AbhkRagdollConstraintRef;
diff --git a/obj/AbhkShapeCollection.cpp b/obj/AbhkShapeCollection.cpp
index 46f058a5be0079232f870f53a8a9c280dbef5ea3..0c670a0e18fc0c35dbaa6fa75f82ba6b9f219e83 100644
--- a/obj/AbhkShapeCollection.cpp
+++ b/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 "obj/AbhkShapeCollection.h"
+#include "AbhkShapeCollection.h"
 
 //Definition of TYPE constant
 const Type AbhkShapeCollection::TYPE("AbhkShapeCollection", &ABHK_SHAPE_COLLECTION_PARENT::TYPE );
diff --git a/obj/AbhkShapeCollection.h b/obj/AbhkShapeCollection.h
index b58cdccf4a1aa0312dec2080cde42b0d583db04b..3d2d3de94b2c0d6ad96ad3c31b31797eb5465ffe 100644
--- a/obj/AbhkShapeCollection.h
+++ b/obj/AbhkShapeCollection.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkShape.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class AbhkShapeCollection;
 typedef Ref<AbhkShapeCollection> AbhkShapeCollectionRef;
diff --git a/obj/AvoidNode.cpp b/obj/AvoidNode.cpp
index 86f2c76cf909ee993e27a8530088f3150337419f..7b487567f0929d096653f3768de09b231e3a3064 100644
--- a/obj/AvoidNode.cpp
+++ b/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 "obj/AvoidNode.h"
+#include "AvoidNode.h"
 
 //Definition of TYPE constant
 const Type AvoidNode::TYPE("AvoidNode", &AVOID_NODE_PARENT::TYPE );
diff --git a/obj/AvoidNode.h b/obj/AvoidNode.h
index 3fcb5a7521283576ad7e2b4f86fd1dae369462a8..d7d7d5254066e01ab1a238cb9de3fba761b582df 100644
--- a/obj/AvoidNode.h
+++ b/obj/AvoidNode.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiNode.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class AvoidNode;
 typedef Ref<AvoidNode> AvoidNodeRef;
diff --git a/obj/BSBound.cpp b/obj/BSBound.cpp
index 5d652ee86aabe2e4868eae33d8c4883029a1ebbf..6e0c0b118bac865c5ff83ef20dcb4b4e09416f33 100644
--- a/obj/BSBound.cpp
+++ b/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 "obj/BSBound.h"
+#include "BSBound.h"
 
 //Definition of TYPE constant
 const Type BSBound::TYPE("BSBound", &B_S_BOUND_PARENT::TYPE );
diff --git a/obj/BSBound.h b/obj/BSBound.h
index 834fb3a3e97cda98d1f384fd189e1d614aa2be63..56060dd3bd7c23a2f3fffe3c66eb1e0c4c647bfb 100644
--- a/obj/BSBound.h
+++ b/obj/BSBound.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiExtraData.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class BSBound;
 typedef Ref<BSBound> BSBoundRef;
diff --git a/obj/BSFurnitureMarker.cpp b/obj/BSFurnitureMarker.cpp
index 81d100c8a6992cd453cea00a85dcdc550fa75fc1..34b993faf549ec042e4e4878f3bec77354cad812 100644
--- a/obj/BSFurnitureMarker.cpp
+++ b/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 "obj/BSFurnitureMarker.h"
-#include "gen/FurniturePosition.h"
+#include "BSFurnitureMarker.h"
+#include "../gen/FurniturePosition.h"
 
 //Definition of TYPE constant
 const Type BSFurnitureMarker::TYPE("BSFurnitureMarker", &B_S_FURNITURE_MARKER_PARENT::TYPE );
diff --git a/obj/BSFurnitureMarker.h b/obj/BSFurnitureMarker.h
index a3b5a264a3279e8898352990a97ab68d60b9aa00..8476eb7aeeae52e45206614ee5c1dc173911227e 100644
--- a/obj/BSFurnitureMarker.h
+++ b/obj/BSFurnitureMarker.h
@@ -6,9 +6,9 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiExtraData.h"
 // Include structures
-#include "gen/FurniturePosition.h"
+#include "../gen/FurniturePosition.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class BSFurnitureMarker;
 typedef Ref<BSFurnitureMarker> BSFurnitureMarkerRef;
diff --git a/obj/BSKeyframeController.cpp b/obj/BSKeyframeController.cpp
index a7742b3e43287d1c4e1f8b6671006a964d6e04a7..c2965485bd566c382fd31387be151926f22279eb 100644
--- a/obj/BSKeyframeController.cpp
+++ b/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 "obj/BSKeyframeController.h"
-#include "obj/NiKeyframeData.h"
+#include "BSKeyframeController.h"
+#include "NiKeyframeData.h"
 
 //Definition of TYPE constant
 const Type BSKeyframeController::TYPE("BSKeyframeController", &B_S_KEYFRAME_CONTROLLER_PARENT::TYPE );
diff --git a/obj/BSKeyframeController.h b/obj/BSKeyframeController.h
index 3bbc7d2a9dc40459f5f977dbf6bd2cffaa0269f3..2d4cef822dda8439acd9dab280a54f7a00a875e3 100644
--- a/obj/BSKeyframeController.h
+++ b/obj/BSKeyframeController.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiKeyframeController.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiKeyframeData;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class BSKeyframeController;
 typedef Ref<BSKeyframeController> BSKeyframeControllerRef;
diff --git a/obj/BSPSysArrayEmitter.cpp b/obj/BSPSysArrayEmitter.cpp
index 03bc70d4fe12907ce346b7ed3e2fc640a6820b15..1438c4cae8f6dbbc8201b73303f7a8d4596cd158 100644
--- a/obj/BSPSysArrayEmitter.cpp
+++ b/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 "obj/BSPSysArrayEmitter.h"
+#include "BSPSysArrayEmitter.h"
 
 //Definition of TYPE constant
 const Type BSPSysArrayEmitter::TYPE("BSPSysArrayEmitter", &B_S_P_SYS_ARRAY_EMITTER_PARENT::TYPE );
diff --git a/obj/BSPSysArrayEmitter.h b/obj/BSPSysArrayEmitter.h
index 4b04506636ec34d86ea64a10ba0b277b79addf74..548a05aea7deba2229a6617e7c9c39bb42618f0b 100644
--- a/obj/BSPSysArrayEmitter.h
+++ b/obj/BSPSysArrayEmitter.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysVolumeEmitter.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class BSPSysArrayEmitter;
 typedef Ref<BSPSysArrayEmitter> BSPSysArrayEmitterRef;
diff --git a/obj/BSParentVelocityModifier.cpp b/obj/BSParentVelocityModifier.cpp
index 2403c7559ec37b276636fcef87c577ffdbb9ccfd..c60b776147aabe8c4be1ff2f490e575225beeb32 100644
--- a/obj/BSParentVelocityModifier.cpp
+++ b/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 "obj/BSParentVelocityModifier.h"
+#include "BSParentVelocityModifier.h"
 
 //Definition of TYPE constant
 const Type BSParentVelocityModifier::TYPE("BSParentVelocityModifier", &B_S_PARENT_VELOCITY_MODIFIER_PARENT::TYPE );
diff --git a/obj/BSParentVelocityModifier.h b/obj/BSParentVelocityModifier.h
index d454638f5539cc26d0bc987cbe4e0234d0f4010b..bce2015fabf11ab9e8a91a6d1be7e8b8c4a79165 100644
--- a/obj/BSParentVelocityModifier.h
+++ b/obj/BSParentVelocityModifier.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysModifier.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class BSParentVelocityModifier;
 typedef Ref<BSParentVelocityModifier> BSParentVelocityModifierRef;
diff --git a/obj/BSXFlags.cpp b/obj/BSXFlags.cpp
index 49f414c3b6c0bb0864094e4290b872cf4fe99063..3384a7051dbe3669a3f69da6c1ddf51275df5bd6 100644
--- a/obj/BSXFlags.cpp
+++ b/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 "obj/BSXFlags.h"
+#include "BSXFlags.h"
 
 //Definition of TYPE constant
 const Type BSXFlags::TYPE("BSXFlags", &B_S_X_FLAGS_PARENT::TYPE );
diff --git a/obj/BSXFlags.h b/obj/BSXFlags.h
index fcb5803b284f4ebd25cf0ed06d0c18014f7a98d9..2a6e33a4918546082fd7c0d521e9583c3d1687b0 100644
--- a/obj/BSXFlags.h
+++ b/obj/BSXFlags.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiExtraData.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class BSXFlags;
 typedef Ref<BSXFlags> BSXFlagsRef;
diff --git a/obj/FxButton.cpp b/obj/FxButton.cpp
index 7862411ae816909779f3b7a71dced3eb931edab6..e01df1a07047aac2f5b8b5551d8634af0442d34a 100644
--- a/obj/FxButton.cpp
+++ b/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 "obj/FxButton.h"
+#include "FxButton.h"
 
 //Definition of TYPE constant
 const Type FxButton::TYPE("FxButton", &FX_BUTTON_PARENT::TYPE );
diff --git a/obj/FxButton.h b/obj/FxButton.h
index ac4f4aea2b24ad2aa6b3b84dfeaa8162bcc9e636..5629c9e89af6f83bfa1e618d27d32312ac8640e3 100644
--- a/obj/FxButton.h
+++ b/obj/FxButton.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "FxWidget.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class FxButton;
 typedef Ref<FxButton> FxButtonRef;
diff --git a/obj/FxRadioButton.cpp b/obj/FxRadioButton.cpp
index ecbcee092ed3a25653e6b71cb77ccfbb5bd80fd5..63a17fa3fb3faf9615c580396206fd26b81f16b5 100644
--- a/obj/FxRadioButton.cpp
+++ b/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 "obj/FxRadioButton.h"
-#include "obj/NiObject.h"
+#include "FxRadioButton.h"
+#include "NiObject.h"
 
 //Definition of TYPE constant
 const Type FxRadioButton::TYPE("FxRadioButton", &FX_RADIO_BUTTON_PARENT::TYPE );
diff --git a/obj/FxRadioButton.h b/obj/FxRadioButton.h
index 0d9c763be5d2cc524811a17599160f20752293b1..533472e1467682b36f915f695d85e3f9c7578de6 100644
--- a/obj/FxRadioButton.h
+++ b/obj/FxRadioButton.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "FxWidget.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiObject;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class FxRadioButton;
 typedef Ref<FxRadioButton> FxRadioButtonRef;
diff --git a/obj/FxWidget.cpp b/obj/FxWidget.cpp
index 98d2af4b14de33c426a960e3c4719c58f32f8da8..cee33d13352256aa108d62be649215c4578c5799 100644
--- a/obj/FxWidget.cpp
+++ b/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 "obj/FxWidget.h"
+#include "FxWidget.h"
 
 //Definition of TYPE constant
 const Type FxWidget::TYPE("FxWidget", &FX_WIDGET_PARENT::TYPE );
diff --git a/obj/FxWidget.h b/obj/FxWidget.h
index ff973d634fc8f8da937a366a38063c97e4a52887..143b97721cfb394f6a9d21b64f75c49461a790d1 100644
--- a/obj/FxWidget.h
+++ b/obj/FxWidget.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiNode.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class FxWidget;
 typedef Ref<FxWidget> FxWidgetRef;
diff --git a/obj/NiAVObject.cpp b/obj/NiAVObject.cpp
index 1e2122ac5088bbbb48a3b0408d3ee1184989a2e2..62ab0c8d00cc42687441718ded0a05b61994fea0 100644
--- a/obj/NiAVObject.cpp
+++ b/obj/NiAVObject.cpp
@@ -104,3 +104,26 @@ Ref<NiNode> NiAVObject::GetParent() const {
 void NiAVObject::ResetSkinnedFlag() {
 
 }
+
+void NiAVObject::AddProperty( Ref<NiProperty> & obj ) {
+	properties.push_back( obj );
+}
+
+void NiAVObject::RemoveProperty( Ref<NiProperty> obj ) {
+	//Search property list for the one to remove
+	for ( vector< NiPropertyRef >::iterator it = properties.begin(); it != properties.end(); ) {
+		if ( *it == obj ) {
+			it = properties.erase( it );
+		} else {
+			++it;
+		}
+	}
+}
+
+void NiAVObject::ClearProperties() {
+	properties.clear();
+}
+
+vector< Ref<NiProperty> > NiAVObject::GetProperties() const {
+	return properties;
+}
diff --git a/obj/NiAVObject.h b/obj/NiAVObject.h
index 49aed8fb2a84f21821714cbc14ca02099bde3548..08f8fe6f7b465851dee80343491529c77fe450d8 100644
--- a/obj/NiAVObject.h
+++ b/obj/NiAVObject.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIAVOBJECT_H_
 
 // Includes
-#include "gen/BoundingBox.h"
+#include "../gen/BoundingBox.h"
 
 //Forward Defines
 class NiProperty;
@@ -13,7 +13,7 @@ class NiCollisionData;
 class NiCollisionObject;
 class NiNode;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 #include NI_A_V_OBJECT_INCLUDE
 
 /*
@@ -78,6 +78,11 @@ public:
 
 	Ref<NiNode> GetParent() const;
 
+	void AddProperty( Ref<NiProperty> & obj );
+	void RemoveProperty( Ref<NiProperty> obj );
+	void ClearProperties();
+	vector< Ref<NiProperty> > GetProperties() const;
+
 private:
 	NI_A_V_OBJECT_MEMBERS
 
diff --git a/obj/NiAlphaController.cpp b/obj/NiAlphaController.cpp
index 8b3e3979937a17e4523fb9dbfc87c579a31bc041..c8a4ac1e6b6d0f6af6314aaf91445a8dbaf0386f 100644
--- a/obj/NiAlphaController.cpp
+++ b/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 "obj/NiAlphaController.h"
-#include "obj/NiFloatData.h"
+#include "NiAlphaController.h"
+#include "NiFloatData.h"
 
 //Definition of TYPE constant
 const Type NiAlphaController::TYPE("NiAlphaController", &NI_ALPHA_CONTROLLER_PARENT::TYPE );
diff --git a/obj/NiAlphaController.h b/obj/NiAlphaController.h
index 265c25e7155e31241d2efdebee32df7d433ad46c..554590875cd64cb00deb4b42a6b2158fdf3bcc2c 100644
--- a/obj/NiAlphaController.h
+++ b/obj/NiAlphaController.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiSingleInterpolatorController.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiFloatData;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiAlphaController;
 typedef Ref<NiAlphaController> NiAlphaControllerRef;
diff --git a/obj/NiAlphaProperty.cpp b/obj/NiAlphaProperty.cpp
index dd76c18c241fafe87841e4a75404154753f306ac..e9d0d5f892e8b3deb095283a99c96509c0f3e498 100644
--- a/obj/NiAlphaProperty.cpp
+++ b/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 "obj/NiAlphaProperty.h"
+#include "NiAlphaProperty.h"
 
 //Definition of TYPE constant
 const Type NiAlphaProperty::TYPE("NiAlphaProperty", &NI_ALPHA_PROPERTY_PARENT::TYPE );
diff --git a/obj/NiAlphaProperty.h b/obj/NiAlphaProperty.h
index af66394d0f4820810c5fc02e2e6bae35b0f28abd..702a1a0c3fa234c405c2286021a04b3e7efde1a0 100644
--- a/obj/NiAlphaProperty.h
+++ b/obj/NiAlphaProperty.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiProperty.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiAlphaProperty;
 typedef Ref<NiAlphaProperty> NiAlphaPropertyRef;
diff --git a/obj/NiAmbientLight.cpp b/obj/NiAmbientLight.cpp
index 3728aa6598654fe6bd9a74f00091bf04571230f9..aad523e547fa451748545c49472d3cb218d236a6 100644
--- a/obj/NiAmbientLight.cpp
+++ b/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 "obj/NiAmbientLight.h"
+#include "NiAmbientLight.h"
 
 //Definition of TYPE constant
 const Type NiAmbientLight::TYPE("NiAmbientLight", &NI_AMBIENT_LIGHT_PARENT::TYPE );
diff --git a/obj/NiAmbientLight.h b/obj/NiAmbientLight.h
index d8cf9c6e23a90fa7026196af6e666223af37c866..674551201d3d2fb7704e719fd676462b0320ecdd 100644
--- a/obj/NiAmbientLight.h
+++ b/obj/NiAmbientLight.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiLight.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiAmbientLight;
 typedef Ref<NiAmbientLight> NiAmbientLightRef;
diff --git a/obj/NiAutoNormalParticles.cpp b/obj/NiAutoNormalParticles.cpp
index 8316c4937feda4b96b8edc2144e95e361cf6967c..b24dec33a55d716c4df0b00573f44222cb1d7ab1 100644
--- a/obj/NiAutoNormalParticles.cpp
+++ b/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 "obj/NiAutoNormalParticles.h"
+#include "NiAutoNormalParticles.h"
 
 //Definition of TYPE constant
 const Type NiAutoNormalParticles::TYPE("NiAutoNormalParticles", &NI_AUTO_NORMAL_PARTICLES_PARENT::TYPE );
diff --git a/obj/NiAutoNormalParticles.h b/obj/NiAutoNormalParticles.h
index 6c037f8205567c60b3c2dfdc5d3d117f098ed052..60785b6d608e6b9101a8d2dfb5ea5c1146744915 100644
--- a/obj/NiAutoNormalParticles.h
+++ b/obj/NiAutoNormalParticles.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiParticles.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiAutoNormalParticles;
 typedef Ref<NiAutoNormalParticles> NiAutoNormalParticlesRef;
diff --git a/obj/NiAutoNormalParticlesData.cpp b/obj/NiAutoNormalParticlesData.cpp
index 2757114fa836ead3b5c58d7c341cce8c795a18dd..faab59398f4be48194403f973d50cab34c422fa1 100644
--- a/obj/NiAutoNormalParticlesData.cpp
+++ b/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 "obj/NiAutoNormalParticlesData.h"
+#include "NiAutoNormalParticlesData.h"
 
 //Definition of TYPE constant
 const Type NiAutoNormalParticlesData::TYPE("NiAutoNormalParticlesData", &NI_AUTO_NORMAL_PARTICLES_DATA_PARENT::TYPE );
diff --git a/obj/NiAutoNormalParticlesData.h b/obj/NiAutoNormalParticlesData.h
index b667c4cbd3c59768736ff4a044a33fc899871458..39015c46cf0c62206d4e44f03bc3c64dfcc6e8f2 100644
--- a/obj/NiAutoNormalParticlesData.h
+++ b/obj/NiAutoNormalParticlesData.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiTriBasedGeomData.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiAutoNormalParticlesData;
 typedef Ref<NiAutoNormalParticlesData> NiAutoNormalParticlesDataRef;
diff --git a/obj/NiBSAnimationNode.cpp b/obj/NiBSAnimationNode.cpp
index ae9e47c4e7f8c4762f183c49d10143a1c7fade89..c35b5d43387ae1c8efeac7348859d8638aaa394f 100644
--- a/obj/NiBSAnimationNode.cpp
+++ b/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 "obj/NiBSAnimationNode.h"
+#include "NiBSAnimationNode.h"
 
 //Definition of TYPE constant
 const Type NiBSAnimationNode::TYPE("NiBSAnimationNode", &NI_B_S_ANIMATION_NODE_PARENT::TYPE );
diff --git a/obj/NiBSAnimationNode.h b/obj/NiBSAnimationNode.h
index b9df2c0537c239a4927d6bd4bdebc439ec606c8e..4dfa403cdd374da9c4e5d73d218c1ba8e969598a 100644
--- a/obj/NiBSAnimationNode.h
+++ b/obj/NiBSAnimationNode.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiNode.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiBSAnimationNode;
 typedef Ref<NiBSAnimationNode> NiBSAnimationNodeRef;
diff --git a/obj/NiBSBoneLODController.cpp b/obj/NiBSBoneLODController.cpp
index cd5dbd8cc6c230ebf6af371202494194bb4eba83..d057e41e34531d661455bd1fe70cee803e15a7cb 100644
--- a/obj/NiBSBoneLODController.cpp
+++ b/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 "obj/NiBSBoneLODController.h"
+#include "NiBSBoneLODController.h"
 
 //Definition of TYPE constant
 const Type NiBSBoneLODController::TYPE("NiBSBoneLODController", &NI_B_S_BONE_L_O_D_CONTROLLER_PARENT::TYPE );
diff --git a/obj/NiBSBoneLODController.h b/obj/NiBSBoneLODController.h
index 81eeb3c2a8a12693d3ecdb133fe0efba7b4ef8e2..feab116b0c60d716568ef173dccaca4b5ad98036 100644
--- a/obj/NiBSBoneLODController.h
+++ b/obj/NiBSBoneLODController.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "ABoneLODController.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiBSBoneLODController;
 typedef Ref<NiBSBoneLODController> NiBSBoneLODControllerRef;
diff --git a/obj/NiBSPArrayController.cpp b/obj/NiBSPArrayController.cpp
index 8fbe5ebecc5cfa7ff674bf671fae993ec0591dd4..018905e834c5734afc152e4f4c15f02823cba49a 100644
--- a/obj/NiBSPArrayController.cpp
+++ b/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 "obj/NiBSPArrayController.h"
+#include "NiBSPArrayController.h"
 
 //Definition of TYPE constant
 const Type NiBSPArrayController::TYPE("NiBSPArrayController", &NI_B_S_P_ARRAY_CONTROLLER_PARENT::TYPE );
diff --git a/obj/NiBSPArrayController.h b/obj/NiBSPArrayController.h
index c7420c934e1d4f25cf3695d037850377e397f197..ca81853873f7cf241d4534007df068666892043a 100644
--- a/obj/NiBSPArrayController.h
+++ b/obj/NiBSPArrayController.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiParticleSystemController.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiBSPArrayController;
 typedef Ref<NiBSPArrayController> NiBSPArrayControllerRef;
diff --git a/obj/NiBSParticleNode.cpp b/obj/NiBSParticleNode.cpp
index 21b67e0478ee5b573a43114cdfad784072a916df..1fe0c64e1139b26fc7149fc61f428271b30ec69d 100644
--- a/obj/NiBSParticleNode.cpp
+++ b/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 "obj/NiBSParticleNode.h"
+#include "NiBSParticleNode.h"
 
 //Definition of TYPE constant
 const Type NiBSParticleNode::TYPE("NiBSParticleNode", &NI_B_S_PARTICLE_NODE_PARENT::TYPE );
diff --git a/obj/NiBSParticleNode.h b/obj/NiBSParticleNode.h
index cec1b7beca08a9b098421053e8ff42bf29a0e46e..f0cf54bf1288a7a13bce5cc47e67187fdf714e17 100644
--- a/obj/NiBSParticleNode.h
+++ b/obj/NiBSParticleNode.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiNode.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiBSParticleNode;
 typedef Ref<NiBSParticleNode> NiBSParticleNodeRef;
diff --git a/obj/NiBSplineBasisData.cpp b/obj/NiBSplineBasisData.cpp
index 2583233b85b231d99f158522e9e2f1b6abbf29a8..26e71c5c5617f1a309c18b425229509dffecbf4b 100644
--- a/obj/NiBSplineBasisData.cpp
+++ b/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 "obj/NiBSplineBasisData.h"
+#include "NiBSplineBasisData.h"
 
 //Definition of TYPE constant
 const Type NiBSplineBasisData::TYPE("NiBSplineBasisData", &NI_B_SPLINE_BASIS_DATA_PARENT::TYPE );
diff --git a/obj/NiBSplineBasisData.h b/obj/NiBSplineBasisData.h
index f0027e0987619b20a1756ea79700f654380fdf16..84c01090214602836506c4ba8c17e1468b048696 100644
--- a/obj/NiBSplineBasisData.h
+++ b/obj/NiBSplineBasisData.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiObject.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiBSplineBasisData;
 typedef Ref<NiBSplineBasisData> NiBSplineBasisDataRef;
diff --git a/obj/NiBSplineCompFloatInterpolator.cpp b/obj/NiBSplineCompFloatInterpolator.cpp
index b60d88b7586f37f70922f584ee8dab14e448f10d..3aaff5a2fdbaa8307533f5d77a1e86fcf8ff2e3a 100644
--- a/obj/NiBSplineCompFloatInterpolator.cpp
+++ b/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 "obj/NiBSplineCompFloatInterpolator.h"
+#include "NiBSplineCompFloatInterpolator.h"
 
 //Definition of TYPE constant
 const Type NiBSplineCompFloatInterpolator::TYPE("NiBSplineCompFloatInterpolator", &NI_B_SPLINE_COMP_FLOAT_INTERPOLATOR_PARENT::TYPE );
diff --git a/obj/NiBSplineCompFloatInterpolator.h b/obj/NiBSplineCompFloatInterpolator.h
index 32d236c8f2627b5cc42cac23e352000bdd7b6de6..f0720b330f5ec23a28838a0f449f6cdb917e1161 100644
--- a/obj/NiBSplineCompFloatInterpolator.h
+++ b/obj/NiBSplineCompFloatInterpolator.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiBSplineInterpolator.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiBSplineCompFloatInterpolator;
 typedef Ref<NiBSplineCompFloatInterpolator> NiBSplineCompFloatInterpolatorRef;
diff --git a/obj/NiBSplineCompPoint3Interpolator.cpp b/obj/NiBSplineCompPoint3Interpolator.cpp
index d80c072df07a3b28d7ed710130190d5600bb6945..926746e4594fbc5b57434ad06cffdf0949e3e5bd 100644
--- a/obj/NiBSplineCompPoint3Interpolator.cpp
+++ b/obj/NiBSplineCompPoint3Interpolator.cpp
@@ -1,9 +1,9 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "obj/NiBSplineCompPoint3Interpolator.h"
-#include "obj/NiBSplineData.h"
-#include "obj/NiObject.h"
+#include "NiBSplineCompPoint3Interpolator.h"
+#include "NiBSplineData.h"
+#include "NiObject.h"
 
 //Definition of TYPE constant
 const Type NiBSplineCompPoint3Interpolator::TYPE("NiBSplineCompPoint3Interpolator", &NI_B_SPLINE_COMP_POINT3_INTERPOLATOR_PARENT::TYPE );
diff --git a/obj/NiBSplineCompPoint3Interpolator.h b/obj/NiBSplineCompPoint3Interpolator.h
index 5ce9ad4021588e5135a7465d36af2e65aa88f199..647f62733c9488d283aff8f56b1dcd282e638acf 100644
--- a/obj/NiBSplineCompPoint3Interpolator.h
+++ b/obj/NiBSplineCompPoint3Interpolator.h
@@ -7,11 +7,11 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiBSplineInterpolator.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiBSplineData;
 class NiObject;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiBSplineCompPoint3Interpolator;
 typedef Ref<NiBSplineCompPoint3Interpolator> NiBSplineCompPoint3InterpolatorRef;
diff --git a/obj/NiBSplineCompTransformInterpolator.cpp b/obj/NiBSplineCompTransformInterpolator.cpp
index c2d31476da6d1e534d575c913edf3f2ba7c08d33..26459294e7e0cabc7bf8fc9095656d33b361a28b 100644
--- a/obj/NiBSplineCompTransformInterpolator.cpp
+++ b/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 "obj/NiBSplineCompTransformInterpolator.h"
-#include "obj/NiBSplineData.h"
-#include "obj/NiBSplineBasisData.h"
+#include "NiBSplineCompTransformInterpolator.h"
+#include "NiBSplineData.h"
+#include "NiBSplineBasisData.h"
 
 //Definition of TYPE constant
 const Type NiBSplineCompTransformInterpolator::TYPE("NiBSplineCompTransformInterpolator", &NI_B_SPLINE_COMP_TRANSFORM_INTERPOLATOR_PARENT::TYPE );
diff --git a/obj/NiBSplineCompTransformInterpolator.h b/obj/NiBSplineCompTransformInterpolator.h
index 34dbfce810be86639e820d1cbf3b38c9262adb1b..cd0172666d5559f2afc3c37995220993e14998fb 100644
--- a/obj/NiBSplineCompTransformInterpolator.h
+++ b/obj/NiBSplineCompTransformInterpolator.h
@@ -7,11 +7,11 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiBSplineInterpolator.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiBSplineData;
 class NiBSplineBasisData;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiBSplineCompTransformInterpolator;
 typedef Ref<NiBSplineCompTransformInterpolator> NiBSplineCompTransformInterpolatorRef;
diff --git a/obj/NiBSplineData.cpp b/obj/NiBSplineData.cpp
index ccf6922ffb81e60d30347504267486c04a097218..30ad54b90f7bb42f8f039bf8c9a75edc11e71571 100644
--- a/obj/NiBSplineData.cpp
+++ b/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 "obj/NiBSplineData.h"
+#include "NiBSplineData.h"
 
 //Definition of TYPE constant
 const Type NiBSplineData::TYPE("NiBSplineData", &NI_B_SPLINE_DATA_PARENT::TYPE );
diff --git a/obj/NiBSplineData.h b/obj/NiBSplineData.h
index d53f576791b85c2c113f2ececa1344b42f34198b..230f384f08e316bb65cd7755064888f559b60def 100644
--- a/obj/NiBSplineData.h
+++ b/obj/NiBSplineData.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiObject.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiBSplineData;
 typedef Ref<NiBSplineData> NiBSplineDataRef;
diff --git a/obj/NiBSplineInterpolator.cpp b/obj/NiBSplineInterpolator.cpp
index bb53d9d579462101fb1cdd758fec399f257b3b43..775971bc0b437d565c1581b524f0be29873c63c2 100644
--- a/obj/NiBSplineInterpolator.cpp
+++ b/obj/NiBSplineInterpolator.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/NiBSplineInterpolator.h"
+#include "NiBSplineInterpolator.h"
 
 //Definition of TYPE constant
 const Type NiBSplineInterpolator::TYPE("NiBSplineInterpolator", &NI_B_SPLINE_INTERPOLATOR_PARENT::TYPE );
diff --git a/obj/NiBSplineInterpolator.h b/obj/NiBSplineInterpolator.h
index c168fbab1d96dd6d3c6ed715a9cb9c37c1455c2f..43ba9f2e9ee660d41ce2cfaa2f588ee052f6f6ec 100644
--- a/obj/NiBSplineInterpolator.h
+++ b/obj/NiBSplineInterpolator.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiInterpolator.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiBSplineInterpolator;
 typedef Ref<NiBSplineInterpolator> NiBSplineInterpolatorRef;
diff --git a/obj/NiBillboardNode.cpp b/obj/NiBillboardNode.cpp
index f43ee15e3800446abf71446df06ca858a89fd096..9732ebb86395c454a43a3ae9a4a3c4687943bf1b 100644
--- a/obj/NiBillboardNode.cpp
+++ b/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 "obj/NiBillboardNode.h"
+#include "NiBillboardNode.h"
 
 //Definition of TYPE constant
 const Type NiBillboardNode::TYPE("NiBillboardNode", &NI_BILLBOARD_NODE_PARENT::TYPE );
diff --git a/obj/NiBillboardNode.h b/obj/NiBillboardNode.h
index 9d4c47d74f1f3fc52f4b0afbf4a6357ede18e068..60d57abd429461ca77c5d8aa964bf704110caa90 100644
--- a/obj/NiBillboardNode.h
+++ b/obj/NiBillboardNode.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiNode.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiBillboardNode;
 typedef Ref<NiBillboardNode> NiBillboardNodeRef;
diff --git a/obj/NiBinaryExtraData.cpp b/obj/NiBinaryExtraData.cpp
index beb6939645768aec4190d4e0762bdc5cab3b1bcd..9b365daf6abe816ddad36d88e9ae879f6cbfb41c 100644
--- a/obj/NiBinaryExtraData.cpp
+++ b/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 "obj/NiBinaryExtraData.h"
-#include "gen/ByteArray.h"
+#include "NiBinaryExtraData.h"
+#include "../gen/ByteArray.h"
 
 //Definition of TYPE constant
 const Type NiBinaryExtraData::TYPE("NiBinaryExtraData", &NI_BINARY_EXTRA_DATA_PARENT::TYPE );
diff --git a/obj/NiBinaryExtraData.h b/obj/NiBinaryExtraData.h
index 6afbb3d8713e2b7223706e38fcb951d802605bc1..bf26579e15daedfd82f853a4cee33d08937c0fdc 100644
--- a/obj/NiBinaryExtraData.h
+++ b/obj/NiBinaryExtraData.h
@@ -6,9 +6,9 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiExtraData.h"
 // Include structures
-#include "gen/ByteArray.h"
+#include "../gen/ByteArray.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiBinaryExtraData;
 typedef Ref<NiBinaryExtraData> NiBinaryExtraDataRef;
diff --git a/obj/NiBlendBoolInterpolator.cpp b/obj/NiBlendBoolInterpolator.cpp
index d8255545f60d5059295e1c00ae5fc0370555226c..3a49974be2916e21912a1b264e23ad930f8c954a 100644
--- a/obj/NiBlendBoolInterpolator.cpp
+++ b/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 "obj/NiBlendBoolInterpolator.h"
+#include "NiBlendBoolInterpolator.h"
 
 //Definition of TYPE constant
 const Type NiBlendBoolInterpolator::TYPE("NiBlendBoolInterpolator", &NI_BLEND_BOOL_INTERPOLATOR_PARENT::TYPE );
diff --git a/obj/NiBlendBoolInterpolator.h b/obj/NiBlendBoolInterpolator.h
index 06658713d32e3cc130892676bdd4deca40cca768..e8cdef0d7e750acd8204842451acb3615beeedf8 100644
--- a/obj/NiBlendBoolInterpolator.h
+++ b/obj/NiBlendBoolInterpolator.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiBlendInterpolator.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiBlendBoolInterpolator;
 typedef Ref<NiBlendBoolInterpolator> NiBlendBoolInterpolatorRef;
diff --git a/obj/NiBlendFloatInterpolator.cpp b/obj/NiBlendFloatInterpolator.cpp
index 7516977f2f7e1104f9e96d93d7c64740a1b058c8..f012982588e747a0af7659bbc2e5c2beafcb377c 100644
--- a/obj/NiBlendFloatInterpolator.cpp
+++ b/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 "obj/NiBlendFloatInterpolator.h"
+#include "NiBlendFloatInterpolator.h"
 
 //Definition of TYPE constant
 const Type NiBlendFloatInterpolator::TYPE("NiBlendFloatInterpolator", &NI_BLEND_FLOAT_INTERPOLATOR_PARENT::TYPE );
diff --git a/obj/NiBlendFloatInterpolator.h b/obj/NiBlendFloatInterpolator.h
index 2b09474f83dcb60f1cfeb8fad69a8a6bdf0ae48d..0d529b49aaa202d913ab45e9dd0b47ae6a582dd0 100644
--- a/obj/NiBlendFloatInterpolator.h
+++ b/obj/NiBlendFloatInterpolator.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiBlendInterpolator.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiBlendFloatInterpolator;
 typedef Ref<NiBlendFloatInterpolator> NiBlendFloatInterpolatorRef;
diff --git a/obj/NiBlendInterpolator.cpp b/obj/NiBlendInterpolator.cpp
index 91f29de8ef196f077c61bf3aa5d18252573853e0..b806946b1e7c96e6bb238910839b46d477740f02 100644
--- a/obj/NiBlendInterpolator.cpp
+++ b/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 "obj/NiBlendInterpolator.h"
+#include "NiBlendInterpolator.h"
 
 //Definition of TYPE constant
 const Type NiBlendInterpolator::TYPE("NiBlendInterpolator", &NI_BLEND_INTERPOLATOR_PARENT::TYPE );
diff --git a/obj/NiBlendInterpolator.h b/obj/NiBlendInterpolator.h
index 8ceb67ac8553b7a786f4bb801027ab75710df02b..fb00799df9f2753235936f225d610b7a7a795ce2 100644
--- a/obj/NiBlendInterpolator.h
+++ b/obj/NiBlendInterpolator.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiInterpolator.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiBlendInterpolator;
 typedef Ref<NiBlendInterpolator> NiBlendInterpolatorRef;
diff --git a/obj/NiBlendPoint3Interpolator.cpp b/obj/NiBlendPoint3Interpolator.cpp
index 69c6f0f0913138174230c8e09f228fbedf0edd4f..4e41154925f19c298a5d6f1f5cb77f3dd7fb8e3a 100644
--- a/obj/NiBlendPoint3Interpolator.cpp
+++ b/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 "obj/NiBlendPoint3Interpolator.h"
+#include "NiBlendPoint3Interpolator.h"
 
 //Definition of TYPE constant
 const Type NiBlendPoint3Interpolator::TYPE("NiBlendPoint3Interpolator", &NI_BLEND_POINT3_INTERPOLATOR_PARENT::TYPE );
diff --git a/obj/NiBlendPoint3Interpolator.h b/obj/NiBlendPoint3Interpolator.h
index b98fdf66175982bdd49884cc16c399a1c096ed6e..350ba727f62dda150fd38917c955115c4a947774 100644
--- a/obj/NiBlendPoint3Interpolator.h
+++ b/obj/NiBlendPoint3Interpolator.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiBlendInterpolator.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiBlendPoint3Interpolator;
 typedef Ref<NiBlendPoint3Interpolator> NiBlendPoint3InterpolatorRef;
diff --git a/obj/NiBlendTransformInterpolator.cpp b/obj/NiBlendTransformInterpolator.cpp
index ae09f906b493b217d6792e5288d6666b82930185..ba5aeae24354408864a5c825ce30ec5eb3bf64f7 100644
--- a/obj/NiBlendTransformInterpolator.cpp
+++ b/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 "obj/NiBlendTransformInterpolator.h"
+#include "NiBlendTransformInterpolator.h"
 
 //Definition of TYPE constant
 const Type NiBlendTransformInterpolator::TYPE("NiBlendTransformInterpolator", &NI_BLEND_TRANSFORM_INTERPOLATOR_PARENT::TYPE );
diff --git a/obj/NiBlendTransformInterpolator.h b/obj/NiBlendTransformInterpolator.h
index 44fa2dc1dcf7e109b165e10c119fc0c5e4a64c02..c0503ef3635ff98faaec6dc886f9e8c1aa173668 100644
--- a/obj/NiBlendTransformInterpolator.h
+++ b/obj/NiBlendTransformInterpolator.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiBlendInterpolator.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiBlendTransformInterpolator;
 typedef Ref<NiBlendTransformInterpolator> NiBlendTransformInterpolatorRef;
diff --git a/obj/NiBoneLODController.cpp b/obj/NiBoneLODController.cpp
index 3663232a1367870aa326daff22bf3be129f35c4c..da426e5c10399fce986fd976099e480c8b12d372 100644
--- a/obj/NiBoneLODController.cpp
+++ b/obj/NiBoneLODController.cpp
@@ -1,12 +1,12 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "obj/NiBoneLODController.h"
-#include "gen/SkinShapeGroup.h"
-#include "gen/SkinShape.h"
-#include "obj/NiTriShape.h"
-#include "obj/NiSkinInstance.h"
-#include "obj/NiTriShape.h"
+#include "NiBoneLODController.h"
+#include "../gen/SkinShapeGroup.h"
+#include "../gen/SkinShape.h"
+#include "NiTriShape.h"
+#include "NiSkinInstance.h"
+#include "NiTriShape.h"
 
 //Definition of TYPE constant
 const Type NiBoneLODController::TYPE("NiBoneLODController", &NI_BONE_L_O_D_CONTROLLER_PARENT::TYPE );
diff --git a/obj/NiBoneLODController.h b/obj/NiBoneLODController.h
index 599dbb66c33c90b77841d2262ea5367cc28314bb..dd55df914cc0ddb7c1e0e2e96073bd86fa883a9d 100644
--- a/obj/NiBoneLODController.h
+++ b/obj/NiBoneLODController.h
@@ -6,13 +6,13 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "ABoneLODController.h"
 // Include structures
-#include "gen/SkinShapeGroup.h"
+#include "../gen/SkinShapeGroup.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiTriShape;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiBoneLODController;
 typedef Ref<NiBoneLODController> NiBoneLODControllerRef;
diff --git a/obj/NiBoolData.cpp b/obj/NiBoolData.cpp
index c61643a1d65fcf142fb7bc2168722864b4240abf..7546825abd5427c0492fb5191b6d676a0918434e 100644
--- a/obj/NiBoolData.cpp
+++ b/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 "obj/NiBoolData.h"
-#include "gen/KeyGroup.h"
+#include "NiBoolData.h"
+#include "../gen/KeyGroup.h"
 
 //Definition of TYPE constant
 const Type NiBoolData::TYPE("NiBoolData", &NI_BOOL_DATA_PARENT::TYPE );
diff --git a/obj/NiBoolData.h b/obj/NiBoolData.h
index 0fc6043eb97bffa25baa5d3f02a69c62c82fcb8a..c4eaad60f43b6a8a3c87d9e1c09d65bad3e3bc45 100644
--- a/obj/NiBoolData.h
+++ b/obj/NiBoolData.h
@@ -6,9 +6,9 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "AKeyedData.h"
 // Include structures
-#include "gen/KeyGroup.h"
+#include "../gen/KeyGroup.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiBoolData;
 typedef Ref<NiBoolData> NiBoolDataRef;
diff --git a/obj/NiBoolInterpolator.cpp b/obj/NiBoolInterpolator.cpp
index b1da301a5ce4b581e143ff27e1722fbc0403ec3b..b3e37e662b675a98fb92a3031718e883f5faf5a3 100644
--- a/obj/NiBoolInterpolator.cpp
+++ b/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 "obj/NiBoolInterpolator.h"
-#include "obj/NiBoolData.h"
+#include "NiBoolInterpolator.h"
+#include "NiBoolData.h"
 
 //Definition of TYPE constant
 const Type NiBoolInterpolator::TYPE("NiBoolInterpolator", &NI_BOOL_INTERPOLATOR_PARENT::TYPE );
diff --git a/obj/NiBoolInterpolator.h b/obj/NiBoolInterpolator.h
index 47030dbf25395852ce17bfb6d1b94f795bab9f1e..5aa7411927c5abfaf55764b3f45845361eab8ce1 100644
--- a/obj/NiBoolInterpolator.h
+++ b/obj/NiBoolInterpolator.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiInterpolator.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiBoolData;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiBoolInterpolator;
 typedef Ref<NiBoolInterpolator> NiBoolInterpolatorRef;
diff --git a/obj/NiBoolTimelineInterpolator.cpp b/obj/NiBoolTimelineInterpolator.cpp
index 445d75c6bf06b73fab1caa1bda96640ae82cb841..3955d0702ddf0ce33db08cdb97485c25a3856543 100644
--- a/obj/NiBoolTimelineInterpolator.cpp
+++ b/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 "obj/NiBoolTimelineInterpolator.h"
-#include "obj/NiBoolData.h"
+#include "NiBoolTimelineInterpolator.h"
+#include "NiBoolData.h"
 
 //Definition of TYPE constant
 const Type NiBoolTimelineInterpolator::TYPE("NiBoolTimelineInterpolator", &NI_BOOL_TIMELINE_INTERPOLATOR_PARENT::TYPE );
diff --git a/obj/NiBoolTimelineInterpolator.h b/obj/NiBoolTimelineInterpolator.h
index 21bb76a65171abcaa1c5c6cf40e2b99733df719c..a600099fc1a32bafd05dfff6e0d2702c00c9d206 100644
--- a/obj/NiBoolTimelineInterpolator.h
+++ b/obj/NiBoolTimelineInterpolator.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiInterpolator.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiBoolData;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiBoolTimelineInterpolator;
 typedef Ref<NiBoolTimelineInterpolator> NiBoolTimelineInterpolatorRef;
diff --git a/obj/NiBooleanExtraData.cpp b/obj/NiBooleanExtraData.cpp
index af89ba5bd749649c95390bde3b2c4463eca12c9f..a0cf6ebfc94079e4929b05ca8c9638a0e7171fed 100644
--- a/obj/NiBooleanExtraData.cpp
+++ b/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 "obj/NiBooleanExtraData.h"
+#include "NiBooleanExtraData.h"
 
 //Definition of TYPE constant
 const Type NiBooleanExtraData::TYPE("NiBooleanExtraData", &NI_BOOLEAN_EXTRA_DATA_PARENT::TYPE );
diff --git a/obj/NiBooleanExtraData.h b/obj/NiBooleanExtraData.h
index 53f8496f011893b8712ee0ee4a60cf71196eb3a6..4ede79d1ecab924a0129934ef8270ac1e03bd4d4 100644
--- a/obj/NiBooleanExtraData.h
+++ b/obj/NiBooleanExtraData.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiExtraData.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiBooleanExtraData;
 typedef Ref<NiBooleanExtraData> NiBooleanExtraDataRef;
diff --git a/obj/NiCamera.cpp b/obj/NiCamera.cpp
index aac5db86c3652bdd379f90f86053fa2a0abf9f98..addd98046d8074faaabb79e2289d6846808672c8 100644
--- a/obj/NiCamera.cpp
+++ b/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 "obj/NiCamera.h"
-#include "obj/NiObject.h"
+#include "NiCamera.h"
+#include "NiObject.h"
 
 //Definition of TYPE constant
 const Type NiCamera::TYPE("NiCamera", &NI_CAMERA_PARENT::TYPE );
diff --git a/obj/NiCamera.h b/obj/NiCamera.h
index 406aa81ad16de517a0f38e36214354887422b7a5..f19eafd3cadb5d9183b8b30a75acd34d7cdfe55f 100644
--- a/obj/NiCamera.h
+++ b/obj/NiCamera.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiAVObject.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiObject;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiCamera;
 typedef Ref<NiCamera> NiCameraRef;
diff --git a/obj/NiCollisionData.cpp b/obj/NiCollisionData.cpp
index 4a1fd80ffccef328957f54e2f3246a7db6deedb7..4c6f1402a10fd8aeb33d8984574b5a1100fa5e55 100644
--- a/obj/NiCollisionData.cpp
+++ b/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 "obj/NiCollisionData.h"
-#include "obj/NiNode.h"
+#include "NiCollisionData.h"
+#include "NiNode.h"
 
 //Definition of TYPE constant
 const Type NiCollisionData::TYPE("NiCollisionData", &NI_COLLISION_DATA_PARENT::TYPE );
diff --git a/obj/NiCollisionData.h b/obj/NiCollisionData.h
index afb046cc026fda9297275452febca338422e2fad..5ea10d88357bbed6cf68a9e31e47331025a4b434 100644
--- a/obj/NiCollisionData.h
+++ b/obj/NiCollisionData.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiObject.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiNode;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiCollisionData;
 typedef Ref<NiCollisionData> NiCollisionDataRef;
diff --git a/obj/NiCollisionObject.cpp b/obj/NiCollisionObject.cpp
index f7efdc6739a0fd3e7d9039a93e71221f68f518d4..44256d2b38f8dbeadd600b9a5ca07a536161eb08 100644
--- a/obj/NiCollisionObject.cpp
+++ b/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 "obj/NiCollisionObject.h"
-#include "obj/NiAVObject.h"
-#include "obj/NiObject.h"
+#include "NiCollisionObject.h"
+#include "NiAVObject.h"
+#include "NiObject.h"
 
 //Definition of TYPE constant
 const Type NiCollisionObject::TYPE("NiCollisionObject", &NI_COLLISION_OBJECT_PARENT::TYPE );
diff --git a/obj/NiCollisionObject.h b/obj/NiCollisionObject.h
index 8e82141bdeb4b898013c7ea3034819ff4c9d0866..3866c025bd25a21038c4c7e8ccfedaaf5847c4e9 100644
--- a/obj/NiCollisionObject.h
+++ b/obj/NiCollisionObject.h
@@ -7,11 +7,11 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiObject.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiAVObject;
 class NiObject;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiCollisionObject;
 typedef Ref<NiCollisionObject> NiCollisionObjectRef;
diff --git a/obj/NiColorData.cpp b/obj/NiColorData.cpp
index 12c74b89a9cbcbf85f1ab3215dc1c39161773cb9..a734d205b8c06628f5689bba648edd330dc532d4 100644
--- a/obj/NiColorData.cpp
+++ b/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 "obj/NiColorData.h"
-#include "gen/KeyGroup.h"
+#include "NiColorData.h"
+#include "../gen/KeyGroup.h"
 
 //Definition of TYPE constant
 const Type NiColorData::TYPE("NiColorData", &NI_COLOR_DATA_PARENT::TYPE );
diff --git a/obj/NiColorData.h b/obj/NiColorData.h
index 73e33c939931f14e1aac40392defe36ce9914042..cefd402b4f771377f5b699946b2fc81c5a551f28 100644
--- a/obj/NiColorData.h
+++ b/obj/NiColorData.h
@@ -6,9 +6,9 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "AKeyedData.h"
 // Include structures
-#include "gen/KeyGroup.h"
+#include "../gen/KeyGroup.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiColorData;
 typedef Ref<NiColorData> NiColorDataRef;
diff --git a/obj/NiColorExtraData.cpp b/obj/NiColorExtraData.cpp
index 8e3e523e4609f617c2d16a81090b2d71400a09db..2ed803758971a43a4f125d1ea356a4b288077ed8 100644
--- a/obj/NiColorExtraData.cpp
+++ b/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 "obj/NiColorExtraData.h"
+#include "NiColorExtraData.h"
 
 //Definition of TYPE constant
 const Type NiColorExtraData::TYPE("NiColorExtraData", &NI_COLOR_EXTRA_DATA_PARENT::TYPE );
diff --git a/obj/NiColorExtraData.h b/obj/NiColorExtraData.h
index 357740673cb870f573e7c1a9f1fe79e742d923b3..281cbc71551784931f78af10fb5beae648c59f7b 100644
--- a/obj/NiColorExtraData.h
+++ b/obj/NiColorExtraData.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiExtraData.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiColorExtraData;
 typedef Ref<NiColorExtraData> NiColorExtraDataRef;
diff --git a/obj/NiControllerManager.cpp b/obj/NiControllerManager.cpp
index f1aff87e83261d38e1578eeee8865e447c3f6e70..3e291bb14040e85c12faa2c59e8bb49d1a3b2deb 100644
--- a/obj/NiControllerManager.cpp
+++ b/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 "obj/NiControllerManager.h"
-#include "obj/NiControllerSequence.h"
-#include "obj/NiDefaultAVObjectPalette.h"
+#include "NiControllerManager.h"
+#include "NiControllerSequence.h"
+#include "NiDefaultAVObjectPalette.h"
 
 //Definition of TYPE constant
 const Type NiControllerManager::TYPE("NiControllerManager", &NI_CONTROLLER_MANAGER_PARENT::TYPE );
diff --git a/obj/NiControllerManager.h b/obj/NiControllerManager.h
index 370bee81dd3abab85713da5f864821f42cf7075b..33e0255da922b347f318f259a8222df957390f95 100644
--- a/obj/NiControllerManager.h
+++ b/obj/NiControllerManager.h
@@ -7,11 +7,11 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiTimeController.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiControllerSequence;
 class NiDefaultAVObjectPalette;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiControllerManager;
 typedef Ref<NiControllerManager> NiControllerManagerRef;
diff --git a/obj/NiControllerSequence.cpp b/obj/NiControllerSequence.cpp
index 6ee801395984fed2b6b378cd74c25a0c7cc0ac0f..a34c2c21cd6c28b2162c848e5079b657d6ede6be 100644
--- a/obj/NiControllerSequence.cpp
+++ b/obj/NiControllerSequence.cpp
@@ -1,18 +1,18 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "obj/NiControllerSequence.h"
-#include "gen/ControllerLink.h"
-#include "obj/NiInterpolator.h"
-#include "obj/NiObject.h"
-#include "obj/NiStringPalette.h"
-#include "gen/ControllerLink.h"
-#include "obj/NiInterpolator.h"
-#include "obj/NiObject.h"
-#include "obj/NiStringPalette.h"
-#include "obj/NiTextKeyExtraData.h"
-#include "obj/NiControllerManager.h"
-#include "obj/NiStringPalette.h"
+#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"
 
 //Definition of TYPE constant
 const Type NiControllerSequence::TYPE("NiControllerSequence", &NI_CONTROLLER_SEQUENCE_PARENT::TYPE );
diff --git a/obj/NiControllerSequence.h b/obj/NiControllerSequence.h
index b78a56107478e196641aa92ab05c695d046b8ac2..60d09152c4537f319be18f4d1a570c306770b30f 100644
--- a/obj/NiControllerSequence.h
+++ b/obj/NiControllerSequence.h
@@ -6,15 +6,15 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiObject.h"
 // Include structures
-#include "gen/ControllerLink.h"
+#include "../gen/ControllerLink.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiTextKeyExtraData;
 class NiControllerManager;
 class NiStringPalette;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiControllerSequence;
 typedef Ref<NiControllerSequence> NiControllerSequenceRef;
diff --git a/obj/NiDefaultAVObjectPalette.cpp b/obj/NiDefaultAVObjectPalette.cpp
index f333f9305e7d444ad9c080fe04190f649c216651..e1a7d5e0cd3db81642c10216585eab3d2ad40a9d 100644
--- a/obj/NiDefaultAVObjectPalette.cpp
+++ b/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 "obj/NiDefaultAVObjectPalette.h"
-#include "gen/AVObject.h"
-#include "obj/NiAVObject.h"
+#include "NiDefaultAVObjectPalette.h"
+#include "../gen/AVObject.h"
+#include "NiAVObject.h"
 
 //Definition of TYPE constant
 const Type NiDefaultAVObjectPalette::TYPE("NiDefaultAVObjectPalette", &NI_DEFAULT_A_V_OBJECT_PALETTE_PARENT::TYPE );
diff --git a/obj/NiDefaultAVObjectPalette.h b/obj/NiDefaultAVObjectPalette.h
index 40df635109bb6a2872e6786191361553f71d7002..3c8506da92175610dfa6988953cfd0530052fad6 100644
--- a/obj/NiDefaultAVObjectPalette.h
+++ b/obj/NiDefaultAVObjectPalette.h
@@ -6,9 +6,9 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiObject.h"
 // Include structures
-#include "gen/AVObject.h"
+#include "../gen/AVObject.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiDefaultAVObjectPalette;
 typedef Ref<NiDefaultAVObjectPalette> NiDefaultAVObjectPaletteRef;
diff --git a/obj/NiDirectionalLight.cpp b/obj/NiDirectionalLight.cpp
index 5fbf119ca7fef08af32b438665c2b834c804a103..46bd1b9f4f69344ea580f31491eac12b170489cd 100644
--- a/obj/NiDirectionalLight.cpp
+++ b/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 "obj/NiDirectionalLight.h"
+#include "NiDirectionalLight.h"
 
 //Definition of TYPE constant
 const Type NiDirectionalLight::TYPE("NiDirectionalLight", &NI_DIRECTIONAL_LIGHT_PARENT::TYPE );
diff --git a/obj/NiDirectionalLight.h b/obj/NiDirectionalLight.h
index 6eb15359c4d9251c9c33db69fa6d3333415f1cb9..92a7059e77e8ba5deae05ee657a23487b3c6e296 100644
--- a/obj/NiDirectionalLight.h
+++ b/obj/NiDirectionalLight.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiLight.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiDirectionalLight;
 typedef Ref<NiDirectionalLight> NiDirectionalLightRef;
diff --git a/obj/NiDitherProperty.cpp b/obj/NiDitherProperty.cpp
index 877feceb36be3b1ce79492b669c43723736e7a1d..6e3048b421c6d296c74ae37ab53b21005f94dd83 100644
--- a/obj/NiDitherProperty.cpp
+++ b/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 "obj/NiDitherProperty.h"
+#include "NiDitherProperty.h"
 
 //Definition of TYPE constant
 const Type NiDitherProperty::TYPE("NiDitherProperty", &NI_DITHER_PROPERTY_PARENT::TYPE );
diff --git a/obj/NiDitherProperty.h b/obj/NiDitherProperty.h
index bc66667226db91e0992c09bae1681bb6df2e9e6f..2773671a312dd7eb652122246dc9dbb2287c54f4 100644
--- a/obj/NiDitherProperty.h
+++ b/obj/NiDitherProperty.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiProperty.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiDitherProperty;
 typedef Ref<NiDitherProperty> NiDitherPropertyRef;
diff --git a/obj/NiDynamicEffect.cpp b/obj/NiDynamicEffect.cpp
index edcd12dc20cc18f46f03e42b0be5deb2a1d24481..b72939a30217e046d318de83c1589726a012e884 100644
--- a/obj/NiDynamicEffect.cpp
+++ b/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 "obj/NiDynamicEffect.h"
-#include "obj/NiAVObject.h"
+#include "NiDynamicEffect.h"
+#include "NiAVObject.h"
 
 //Definition of TYPE constant
 const Type NiDynamicEffect::TYPE("NiDynamicEffect", &NI_DYNAMIC_EFFECT_PARENT::TYPE );
diff --git a/obj/NiDynamicEffect.h b/obj/NiDynamicEffect.h
index cd20f686324946f5cbd210fa66b8e9031779db65..1458028abd64a508916b0cb1ae8ebb8b81ee8e67 100644
--- a/obj/NiDynamicEffect.h
+++ b/obj/NiDynamicEffect.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiAVObject.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiAVObject;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiDynamicEffect;
 typedef Ref<NiDynamicEffect> NiDynamicEffectRef;
diff --git a/obj/NiExtraData.cpp b/obj/NiExtraData.cpp
index d5926691da123c5ad5673451b87f463f78b9b59f..9139078496fd1695e80796b5b34df4241b79faee 100644
--- a/obj/NiExtraData.cpp
+++ b/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 "obj/NiExtraData.h"
+#include "NiExtraData.h"
 
 //Definition of TYPE constant
 const Type NiExtraData::TYPE("NiExtraData", &NI_EXTRA_DATA_PARENT::TYPE );
diff --git a/obj/NiExtraData.h b/obj/NiExtraData.h
index 2500ddb4175b82343af4917633ff1ff43ce126af..9e42e5abe77a9c0b54b309e0c0a7909edcf23631 100644
--- a/obj/NiExtraData.h
+++ b/obj/NiExtraData.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiObject.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiExtraData;
 typedef Ref<NiExtraData> NiExtraDataRef;
diff --git a/obj/NiFlipController.cpp b/obj/NiFlipController.cpp
index aa93c5f1ce8eaba74d6bda46d49b805de0c4fe07..2fca6941c3b3086765f6b7fedb037effd5cd82f2 100644
--- a/obj/NiFlipController.cpp
+++ b/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 "obj/NiFlipController.h"
-#include "obj/NiSourceTexture.h"
+#include "NiFlipController.h"
+#include "NiSourceTexture.h"
 
 //Definition of TYPE constant
 const Type NiFlipController::TYPE("NiFlipController", &NI_FLIP_CONTROLLER_PARENT::TYPE );
diff --git a/obj/NiFlipController.h b/obj/NiFlipController.h
index f928270ec4f441bd809a3810e0501bb2e7e7f3d5..5363514a4243526ffdbe5bc68bf958da8509b892 100644
--- a/obj/NiFlipController.h
+++ b/obj/NiFlipController.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiSingleInterpolatorController.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiSourceTexture;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiFlipController;
 typedef Ref<NiFlipController> NiFlipControllerRef;
diff --git a/obj/NiFloatData.cpp b/obj/NiFloatData.cpp
index a06a7c3bd9fe8727be2276a60f0ce9607fd235fb..022549bc78c3159866837204efb02bae37a2d5b8 100644
--- a/obj/NiFloatData.cpp
+++ b/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 "obj/NiFloatData.h"
-#include "gen/KeyGroup.h"
+#include "NiFloatData.h"
+#include "../gen/KeyGroup.h"
 
 //Definition of TYPE constant
 const Type NiFloatData::TYPE("NiFloatData", &NI_FLOAT_DATA_PARENT::TYPE );
diff --git a/obj/NiFloatData.h b/obj/NiFloatData.h
index 4cbc4fd9a3ac69e187ff83e9d0f70c4eed9e6085..15d026a251c8b7949d19471070d47781b8d225ca 100644
--- a/obj/NiFloatData.h
+++ b/obj/NiFloatData.h
@@ -6,9 +6,9 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "AKeyedData.h"
 // Include structures
-#include "gen/KeyGroup.h"
+#include "../gen/KeyGroup.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiFloatData;
 typedef Ref<NiFloatData> NiFloatDataRef;
diff --git a/obj/NiFloatExtraData.cpp b/obj/NiFloatExtraData.cpp
index bfd08c042b4d34d36cbce4515a14235f54e3d9fc..31fea3dceb88669f2f2d1b70d547b4aaee9d1f81 100644
--- a/obj/NiFloatExtraData.cpp
+++ b/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 "obj/NiFloatExtraData.h"
+#include "NiFloatExtraData.h"
 
 //Definition of TYPE constant
 const Type NiFloatExtraData::TYPE("NiFloatExtraData", &NI_FLOAT_EXTRA_DATA_PARENT::TYPE );
diff --git a/obj/NiFloatExtraData.h b/obj/NiFloatExtraData.h
index ea5d698acc2bfa0158a2a1f1ee5371a73fa94a0b..26f6e0b516e7aff6457342f14452357128b52d57 100644
--- a/obj/NiFloatExtraData.h
+++ b/obj/NiFloatExtraData.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiExtraData.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiFloatExtraData;
 typedef Ref<NiFloatExtraData> NiFloatExtraDataRef;
diff --git a/obj/NiFloatExtraDataController.cpp b/obj/NiFloatExtraDataController.cpp
index 3b8b8fd13edf508d7063daac55066990f4f4b6e5..74b9356bf063ea3d119a4b6a8dd3d089ac1ca31f 100644
--- a/obj/NiFloatExtraDataController.cpp
+++ b/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 "obj/NiFloatExtraDataController.h"
-#include "obj/NiObject.h"
+#include "NiFloatExtraDataController.h"
+#include "NiObject.h"
 
 //Definition of TYPE constant
 const Type NiFloatExtraDataController::TYPE("NiFloatExtraDataController", &NI_FLOAT_EXTRA_DATA_CONTROLLER_PARENT::TYPE );
diff --git a/obj/NiFloatExtraDataController.h b/obj/NiFloatExtraDataController.h
index e2e9c38fdb643f65ee760f0f72b003bb82e3431a..bcaae022b961a3ba58c44432928449345b2c9c45 100644
--- a/obj/NiFloatExtraDataController.h
+++ b/obj/NiFloatExtraDataController.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiTimeController.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiObject;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiFloatExtraDataController;
 typedef Ref<NiFloatExtraDataController> NiFloatExtraDataControllerRef;
diff --git a/obj/NiFloatInterpolator.cpp b/obj/NiFloatInterpolator.cpp
index c86003e0307465dc01c0c1fdeeac42193d84b00e..d0c306e039cc3855ea011bee4f3071150644744c 100644
--- a/obj/NiFloatInterpolator.cpp
+++ b/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 "obj/NiFloatInterpolator.h"
-#include "obj/NiFloatData.h"
+#include "NiFloatInterpolator.h"
+#include "NiFloatData.h"
 
 //Definition of TYPE constant
 const Type NiFloatInterpolator::TYPE("NiFloatInterpolator", &NI_FLOAT_INTERPOLATOR_PARENT::TYPE );
diff --git a/obj/NiFloatInterpolator.h b/obj/NiFloatInterpolator.h
index 1176d70aa0660b9be85fdb9770c7bd14e6470557..6b46c63d8c45e33a2cb04ae0dd2d91174b21d158 100644
--- a/obj/NiFloatInterpolator.h
+++ b/obj/NiFloatInterpolator.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiInterpolator.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiFloatData;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiFloatInterpolator;
 typedef Ref<NiFloatInterpolator> NiFloatInterpolatorRef;
diff --git a/obj/NiFloatsExtraData.cpp b/obj/NiFloatsExtraData.cpp
index ae47250be20c02536680ddea9aa78d85eaae41cb..6e39921719293a0b7733af7e54d174c67605ab18 100644
--- a/obj/NiFloatsExtraData.cpp
+++ b/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 "obj/NiFloatsExtraData.h"
+#include "NiFloatsExtraData.h"
 
 //Definition of TYPE constant
 const Type NiFloatsExtraData::TYPE("NiFloatsExtraData", &NI_FLOATS_EXTRA_DATA_PARENT::TYPE );
diff --git a/obj/NiFloatsExtraData.h b/obj/NiFloatsExtraData.h
index a5f54f93ff9a312418833cfd7009b8a9e1f550e5..553a7d51eb8a0a43f88dda89a9a3ef9c4f7273c1 100644
--- a/obj/NiFloatsExtraData.h
+++ b/obj/NiFloatsExtraData.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiExtraData.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiFloatsExtraData;
 typedef Ref<NiFloatsExtraData> NiFloatsExtraDataRef;
diff --git a/obj/NiFogProperty.cpp b/obj/NiFogProperty.cpp
index 52b724134499323d3257711e9113df29239c4de9..5bfd82dbd995162b709833d5992610b2b4074e18 100644
--- a/obj/NiFogProperty.cpp
+++ b/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 "obj/NiFogProperty.h"
+#include "NiFogProperty.h"
 
 //Definition of TYPE constant
 const Type NiFogProperty::TYPE("NiFogProperty", &NI_FOG_PROPERTY_PARENT::TYPE );
diff --git a/obj/NiFogProperty.h b/obj/NiFogProperty.h
index 737db3ca40ed84fc508567a2d1bfe9394f21fa90..da6b1ef822c8d35f43d7f10e22aea365fbe95406 100644
--- a/obj/NiFogProperty.h
+++ b/obj/NiFogProperty.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiProperty.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiFogProperty;
 typedef Ref<NiFogProperty> NiFogPropertyRef;
diff --git a/obj/NiGeomMorpherController.cpp b/obj/NiGeomMorpherController.cpp
index 3e73d3cf544dad8de0b01bb39239be1705daad2c..cbabac90e92875aee606eaa057b2d2732fe36d8b 100644
--- a/obj/NiGeomMorpherController.cpp
+++ b/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 "obj/NiGeomMorpherController.h"
-#include "obj/NiMorphData.h"
-#include "obj/NiInterpolator.h"
+#include "NiGeomMorpherController.h"
+#include "NiMorphData.h"
+#include "NiInterpolator.h"
 
 //Definition of TYPE constant
 const Type NiGeomMorpherController::TYPE("NiGeomMorpherController", &NI_GEOM_MORPHER_CONTROLLER_PARENT::TYPE );
diff --git a/obj/NiGeomMorpherController.h b/obj/NiGeomMorpherController.h
index a233b54577a2214d6425700231362f6f55c8f1d9..df1f823f511057fbf267f61b8ce22756e2f42ed7 100644
--- a/obj/NiGeomMorpherController.h
+++ b/obj/NiGeomMorpherController.h
@@ -7,11 +7,11 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiTimeController.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiMorphData;
 class NiInterpolator;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiGeomMorpherController;
 typedef Ref<NiGeomMorpherController> NiGeomMorpherControllerRef;
diff --git a/obj/NiGravity.cpp b/obj/NiGravity.cpp
index 0b9f9a0c52e60b889e246260d0f99bd1afec6764..78921b65cfae7ef583d65a5cb1a781405fe806de 100644
--- a/obj/NiGravity.cpp
+++ b/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 "obj/NiGravity.h"
+#include "NiGravity.h"
 
 //Definition of TYPE constant
 const Type NiGravity::TYPE("NiGravity", &NI_GRAVITY_PARENT::TYPE );
diff --git a/obj/NiGravity.h b/obj/NiGravity.h
index 4f26f0017f672ae563ec2aa430cedfc38e382461..d4ea6547555fb721b3da572d4e8f5a0bb06442fc 100644
--- a/obj/NiGravity.h
+++ b/obj/NiGravity.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "AParticleModifier.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiGravity;
 typedef Ref<NiGravity> NiGravityRef;
diff --git a/obj/NiIntegerExtraData.cpp b/obj/NiIntegerExtraData.cpp
index 2dd77c7819d22c5221bbbb5188e3a9cf9d66c500..93aef9f4656faed87fbc5099e1b1b60d265efab6 100644
--- a/obj/NiIntegerExtraData.cpp
+++ b/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 "obj/NiIntegerExtraData.h"
+#include "NiIntegerExtraData.h"
 
 //Definition of TYPE constant
 const Type NiIntegerExtraData::TYPE("NiIntegerExtraData", &NI_INTEGER_EXTRA_DATA_PARENT::TYPE );
diff --git a/obj/NiIntegerExtraData.h b/obj/NiIntegerExtraData.h
index de3cd10f55eb5e51f960e6280e52b56b9ed4fc67..c1d49dec3c6561b642388a02e6f84480044eb1fd 100644
--- a/obj/NiIntegerExtraData.h
+++ b/obj/NiIntegerExtraData.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiExtraData.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiIntegerExtraData;
 typedef Ref<NiIntegerExtraData> NiIntegerExtraDataRef;
diff --git a/obj/NiIntegersExtraData.cpp b/obj/NiIntegersExtraData.cpp
index 38eb94a36b73c164717599fac17a93e2c288b096..dec8b91917deb5e0a453c79ec3b796d0e34f921a 100644
--- a/obj/NiIntegersExtraData.cpp
+++ b/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 "obj/NiIntegersExtraData.h"
+#include "NiIntegersExtraData.h"
 
 //Definition of TYPE constant
 const Type NiIntegersExtraData::TYPE("NiIntegersExtraData", &NI_INTEGERS_EXTRA_DATA_PARENT::TYPE );
diff --git a/obj/NiIntegersExtraData.h b/obj/NiIntegersExtraData.h
index e5617ff8017c6f052c626d14a79c9506bb40e1b8..b24868dd5424b74344ed66f919e81c012f5951e9 100644
--- a/obj/NiIntegersExtraData.h
+++ b/obj/NiIntegersExtraData.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiExtraData.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiIntegersExtraData;
 typedef Ref<NiIntegersExtraData> NiIntegersExtraDataRef;
diff --git a/obj/NiInterpolator.cpp b/obj/NiInterpolator.cpp
index 69ad6bf3b958522c97811a7fc7299d0a58b4e7f1..4534325c876415ec75610fcab45cd38f60f46e34 100644
--- a/obj/NiInterpolator.cpp
+++ b/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 "obj/NiInterpolator.h"
+#include "NiInterpolator.h"
 
 //Definition of TYPE constant
 const Type NiInterpolator::TYPE("NiInterpolator", &NI_INTERPOLATOR_PARENT::TYPE );
diff --git a/obj/NiInterpolator.h b/obj/NiInterpolator.h
index dcd979e65ea4e244cdb7402704be010b0cb2acfa..1293595fa158dc81793c3f579e9a6a28c0858344 100644
--- a/obj/NiInterpolator.h
+++ b/obj/NiInterpolator.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiObject.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiInterpolator;
 typedef Ref<NiInterpolator> NiInterpolatorRef;
diff --git a/obj/NiKeyframeController.cpp b/obj/NiKeyframeController.cpp
index d373927babc6af1bcd340e1f8bb1e2ea39572ecd..27b5abc1a1844795196fd47ccb5b07fe2f9b5f88 100644
--- a/obj/NiKeyframeController.cpp
+++ b/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 "obj/NiKeyframeController.h"
-#include "obj/NiKeyframeData.h"
+#include "NiKeyframeController.h"
+#include "NiKeyframeData.h"
 
 //Definition of TYPE constant
 const Type NiKeyframeController::TYPE("NiKeyframeController", &NI_KEYFRAME_CONTROLLER_PARENT::TYPE );
diff --git a/obj/NiKeyframeController.h b/obj/NiKeyframeController.h
index 21629ec45780d5ba1bda98efce809a1c605db59e..da2238a6e947651c4807223eafbbde81e5e37243 100644
--- a/obj/NiKeyframeController.h
+++ b/obj/NiKeyframeController.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiTimeController.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiKeyframeData;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiKeyframeController;
 typedef Ref<NiKeyframeController> NiKeyframeControllerRef;
diff --git a/obj/NiKeyframeData.cpp b/obj/NiKeyframeData.cpp
index 709e4e36916ac39d37223607b4dfd1d0280d8671..e454b0473d36696c8aa6a772cb37105deeff6cc2 100644
--- a/obj/NiKeyframeData.cpp
+++ b/obj/NiKeyframeData.cpp
@@ -1,10 +1,10 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "obj/NiKeyframeData.h"
-#include "gen/KeyGroup.h"
-#include "gen/KeyGroup.h"
-#include "gen/KeyGroup.h"
+#include "NiKeyframeData.h"
+#include "../gen/KeyGroup.h"
+#include "../gen/KeyGroup.h"
+#include "../gen/KeyGroup.h"
 
 //Definition of TYPE constant
 const Type NiKeyframeData::TYPE("NiKeyframeData", &NI_KEYFRAME_DATA_PARENT::TYPE );
diff --git a/obj/NiKeyframeData.h b/obj/NiKeyframeData.h
index 5de527af3d2ecdc5e812c54cc237dbed57a934de..08768d799f496f93b612fae96ac780cae262cdbd 100644
--- a/obj/NiKeyframeData.h
+++ b/obj/NiKeyframeData.h
@@ -6,9 +6,9 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "AKeyedData.h"
 // Include structures
-#include "gen/KeyGroup.h"
+#include "../gen/KeyGroup.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiKeyframeData;
 typedef Ref<NiKeyframeData> NiKeyframeDataRef;
diff --git a/obj/NiLODNode.cpp b/obj/NiLODNode.cpp
index 2908d48ab6e3176825ab716b969dcb446c76ff4b..44e58e5dac1b1cf50b1622d2a9c90a47ba716333 100644
--- a/obj/NiLODNode.cpp
+++ b/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 "obj/NiLODNode.h"
-#include "gen/LODRange.h"
-#include "obj/NiRangeLODData.h"
+#include "NiLODNode.h"
+#include "../gen/LODRange.h"
+#include "NiRangeLODData.h"
 
 //Definition of TYPE constant
 const Type NiLODNode::TYPE("NiLODNode", &NI_L_O_D_NODE_PARENT::TYPE );
diff --git a/obj/NiLODNode.h b/obj/NiLODNode.h
index 05c85e1364ed86e8b979cce564a04db2827f91e7..5d3a3b37726dc9cb25ec7577cdc2dc95a72ff0ab 100644
--- a/obj/NiLODNode.h
+++ b/obj/NiLODNode.h
@@ -6,13 +6,13 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiNode.h"
 // Include structures
-#include "gen/LODRange.h"
+#include "../gen/LODRange.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiRangeLODData;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiLODNode;
 typedef Ref<NiLODNode> NiLODNodeRef;
diff --git a/obj/NiLight.cpp b/obj/NiLight.cpp
index fb414a7f57db81015032ce25aae4b81cbb0a59d7..0b357adf297c300f8af824393bbd4d1d339f70bb 100644
--- a/obj/NiLight.cpp
+++ b/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 "obj/NiLight.h"
+#include "NiLight.h"
 
 //Definition of TYPE constant
 const Type NiLight::TYPE("NiLight", &NI_LIGHT_PARENT::TYPE );
diff --git a/obj/NiLight.h b/obj/NiLight.h
index cd4cd567265fc0ef4f8cc761c11a30da8d5a8632..bdbaee95d98c842d90000943194a24f126680901 100644
--- a/obj/NiLight.h
+++ b/obj/NiLight.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiDynamicEffect.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiLight;
 typedef Ref<NiLight> NiLightRef;
diff --git a/obj/NiLightColorController.cpp b/obj/NiLightColorController.cpp
index 4a13fc550133da4be0db20626d4aed989c1624bd..79660454e775203f2b0ed1d117df1dd19640e2c2 100644
--- a/obj/NiLightColorController.cpp
+++ b/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 "obj/NiLightColorController.h"
-#include "obj/NiPosData.h"
-#include "obj/NiPoint3Interpolator.h"
+#include "NiLightColorController.h"
+#include "NiPosData.h"
+#include "NiPoint3Interpolator.h"
 
 //Definition of TYPE constant
 const Type NiLightColorController::TYPE("NiLightColorController", &NI_LIGHT_COLOR_CONTROLLER_PARENT::TYPE );
diff --git a/obj/NiLightColorController.h b/obj/NiLightColorController.h
index bacf8df2d920c2c72f0ae1796386251547207a87..f6769b1afca215887cbefe73f4d8ebebab8031b9 100644
--- a/obj/NiLightColorController.h
+++ b/obj/NiLightColorController.h
@@ -7,11 +7,11 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiTimeController.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiPosData;
 class NiPoint3Interpolator;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiLightColorController;
 typedef Ref<NiLightColorController> NiLightColorControllerRef;
diff --git a/obj/NiLightDimmerController.cpp b/obj/NiLightDimmerController.cpp
index c68b0dd09a6a284718265abd68a1f69b8e050684..7d7771c4ecbb39abd00eb86be351413a832a4f51 100644
--- a/obj/NiLightDimmerController.cpp
+++ b/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 "obj/NiLightDimmerController.h"
-#include "obj/NiInterpolator.h"
+#include "NiLightDimmerController.h"
+#include "NiInterpolator.h"
 
 //Definition of TYPE constant
 const Type NiLightDimmerController::TYPE("NiLightDimmerController", &NI_LIGHT_DIMMER_CONTROLLER_PARENT::TYPE );
diff --git a/obj/NiLightDimmerController.h b/obj/NiLightDimmerController.h
index 1be166c6277e8195b15d0d1eeb7cbb6c27ca8715..fed240bd2151534b613ee17926c52d63fc68f8ac 100644
--- a/obj/NiLightDimmerController.h
+++ b/obj/NiLightDimmerController.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiTimeController.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiInterpolator;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiLightDimmerController;
 typedef Ref<NiLightDimmerController> NiLightDimmerControllerRef;
diff --git a/obj/NiLookAtController.cpp b/obj/NiLookAtController.cpp
index 8f10301738eda304ff800cff75d294906c05b6c6..2477832e3d1f83ed84a6ebc13919deca2287c9ef 100644
--- a/obj/NiLookAtController.cpp
+++ b/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 "obj/NiLookAtController.h"
-#include "obj/NiNode.h"
+#include "NiLookAtController.h"
+#include "NiNode.h"
 
 //Definition of TYPE constant
 const Type NiLookAtController::TYPE("NiLookAtController", &NI_LOOK_AT_CONTROLLER_PARENT::TYPE );
diff --git a/obj/NiLookAtController.h b/obj/NiLookAtController.h
index 45f1e06703ecee56872e98d87e6a29a5448957fc..93f03834cf54b71c0e6c92ace3add9d3791fbb32 100644
--- a/obj/NiLookAtController.h
+++ b/obj/NiLookAtController.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiTimeController.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiNode;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiLookAtController;
 typedef Ref<NiLookAtController> NiLookAtControllerRef;
diff --git a/obj/NiLookAtInterpolator.cpp b/obj/NiLookAtInterpolator.cpp
index 4be3041de2a6b32143f9ab00b65f64edacca4927..0816952555de939edb3cdae87e3329755f01e73d 100644
--- a/obj/NiLookAtInterpolator.cpp
+++ b/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 "obj/NiLookAtInterpolator.h"
-#include "obj/NiNode.h"
-#include "obj/NiPoint3Interpolator.h"
-#include "obj/NiFloatInterpolator.h"
+#include "NiLookAtInterpolator.h"
+#include "NiNode.h"
+#include "NiPoint3Interpolator.h"
+#include "NiFloatInterpolator.h"
 
 //Definition of TYPE constant
 const Type NiLookAtInterpolator::TYPE("NiLookAtInterpolator", &NI_LOOK_AT_INTERPOLATOR_PARENT::TYPE );
diff --git a/obj/NiLookAtInterpolator.h b/obj/NiLookAtInterpolator.h
index 22c987afe606f4ee1e37aae4b3e7e52ddbbb80d1..a8a04a48231138dc48655a22cfd02ca224940324 100644
--- a/obj/NiLookAtInterpolator.h
+++ b/obj/NiLookAtInterpolator.h
@@ -7,12 +7,12 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiInterpolator.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiNode;
 class NiPoint3Interpolator;
 class NiFloatInterpolator;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiLookAtInterpolator;
 typedef Ref<NiLookAtInterpolator> NiLookAtInterpolatorRef;
diff --git a/obj/NiMaterialColorController.cpp b/obj/NiMaterialColorController.cpp
index 42d018474b6c50ed6a41e1b7e3fa0985a642f009..dced4c2ced3356b30d451ed532ba8c02c6607c1b 100644
--- a/obj/NiMaterialColorController.cpp
+++ b/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 "obj/NiMaterialColorController.h"
-#include "obj/NiPosData.h"
+#include "NiMaterialColorController.h"
+#include "NiPosData.h"
 
 //Definition of TYPE constant
 const Type NiMaterialColorController::TYPE("NiMaterialColorController", &NI_MATERIAL_COLOR_CONTROLLER_PARENT::TYPE );
diff --git a/obj/NiMaterialColorController.h b/obj/NiMaterialColorController.h
index 3ad2c87d0e5715ee4350f2fb8e6da80d05aa3c2b..ebc7b34dbcdf401fe3408f6945c16a8e077ddbdc 100644
--- a/obj/NiMaterialColorController.h
+++ b/obj/NiMaterialColorController.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiSingleInterpolatorController.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiPosData;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiMaterialColorController;
 typedef Ref<NiMaterialColorController> NiMaterialColorControllerRef;
diff --git a/obj/NiMaterialProperty.cpp b/obj/NiMaterialProperty.cpp
index d1508936319cf658fd09905286c1cdc1c5b1ad51..1d5df1d6ecbc9a2e13463185b328fa12707b772f 100644
--- a/obj/NiMaterialProperty.cpp
+++ b/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 "obj/NiMaterialProperty.h"
+#include "NiMaterialProperty.h"
 
 //Definition of TYPE constant
 const Type NiMaterialProperty::TYPE("NiMaterialProperty", &NI_MATERIAL_PROPERTY_PARENT::TYPE );
diff --git a/obj/NiMaterialProperty.h b/obj/NiMaterialProperty.h
index b60399bd3a932ccaa76b3973a5a63814a35b3a57..90a381f26ec73c4b22e26571628c0f66ac069b3d 100644
--- a/obj/NiMaterialProperty.h
+++ b/obj/NiMaterialProperty.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiProperty.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiMaterialProperty;
 typedef Ref<NiMaterialProperty> NiMaterialPropertyRef;
diff --git a/obj/NiMeshPSysData.cpp b/obj/NiMeshPSysData.cpp
index ed47946f34707aea551cad8dcc8ca1938d5c19da..da59ce2ddcc8e27c33e2cb69322442cf4ce274e2 100644
--- a/obj/NiMeshPSysData.cpp
+++ b/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 "obj/NiMeshPSysData.h"
-#include "obj/AParticleModifier.h"
-#include "obj/NiNode.h"
+#include "NiMeshPSysData.h"
+#include "AParticleModifier.h"
+#include "NiNode.h"
 
 //Definition of TYPE constant
 const Type NiMeshPSysData::TYPE("NiMeshPSysData", &NI_MESH_P_SYS_DATA_PARENT::TYPE );
diff --git a/obj/NiMeshPSysData.h b/obj/NiMeshPSysData.h
index 7ce70a1e2de9c2f7a4aae3bafbde04e306d11009..8056121866a6908fc839c3774755f1525e006add 100644
--- a/obj/NiMeshPSysData.h
+++ b/obj/NiMeshPSysData.h
@@ -7,11 +7,11 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "APSysData.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class AParticleModifier;
 class NiNode;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiMeshPSysData;
 typedef Ref<NiMeshPSysData> NiMeshPSysDataRef;
diff --git a/obj/NiMeshParticleSystem.cpp b/obj/NiMeshParticleSystem.cpp
index 24e61274c322ba60575da1d5875834e0cc961cf6..9a5c5dda9108593f4e17066997911c060f48e0da 100644
--- a/obj/NiMeshParticleSystem.cpp
+++ b/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 "obj/NiMeshParticleSystem.h"
+#include "NiMeshParticleSystem.h"
 
 //Definition of TYPE constant
 const Type NiMeshParticleSystem::TYPE("NiMeshParticleSystem", &NI_MESH_PARTICLE_SYSTEM_PARENT::TYPE );
diff --git a/obj/NiMeshParticleSystem.h b/obj/NiMeshParticleSystem.h
index dc271306480449f86c874e426ee905b7da37f33d..c79ebd0ed7afa8908536d33e525a8f35e634a4c7 100644
--- a/obj/NiMeshParticleSystem.h
+++ b/obj/NiMeshParticleSystem.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiParticleSystem.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiMeshParticleSystem;
 typedef Ref<NiMeshParticleSystem> NiMeshParticleSystemRef;
diff --git a/obj/NiMorphData.cpp b/obj/NiMorphData.cpp
index 094bd1f23671acffe6bc1c0be8b00111fbb15504..08536f5c6f63a8382ab7ccdc9f1e73b1850fc59e 100644
--- a/obj/NiMorphData.cpp
+++ b/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 "obj/NiMorphData.h"
-#include "gen/Morph.h"
+#include "NiMorphData.h"
+#include "../gen/Morph.h"
 
 //Definition of TYPE constant
 const Type NiMorphData::TYPE("NiMorphData", &NI_MORPH_DATA_PARENT::TYPE );
diff --git a/obj/NiMorphData.h b/obj/NiMorphData.h
index a79e9a702a73c2a1a2dccb3ccb9a54062b5fefd8..d10382f326124927904895d2d463495f18d6d6b3 100644
--- a/obj/NiMorphData.h
+++ b/obj/NiMorphData.h
@@ -6,9 +6,9 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiObject.h"
 // Include structures
-#include "gen/Morph.h"
+#include "../gen/Morph.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiMorphData;
 typedef Ref<NiMorphData> NiMorphDataRef;
diff --git a/obj/NiMultiTargetTransformController.cpp b/obj/NiMultiTargetTransformController.cpp
index 85cf25eaadbec0047fa4e37754bdabf0d57db260..1a4b96c18a3832348b7880d9bfc8a412cc8e48ae 100644
--- a/obj/NiMultiTargetTransformController.cpp
+++ b/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 "obj/NiMultiTargetTransformController.h"
-#include "obj/NiNode.h"
+#include "NiMultiTargetTransformController.h"
+#include "NiNode.h"
 
 //Definition of TYPE constant
 const Type NiMultiTargetTransformController::TYPE("NiMultiTargetTransformController", &NI_MULTI_TARGET_TRANSFORM_CONTROLLER_PARENT::TYPE );
diff --git a/obj/NiMultiTargetTransformController.h b/obj/NiMultiTargetTransformController.h
index 9f2ea7e8af4f9b17834aa72b9ce60455556ca3cc..d1bb94a95bd514f9fc2aa9321e92b08988f18346 100644
--- a/obj/NiMultiTargetTransformController.h
+++ b/obj/NiMultiTargetTransformController.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiTimeController.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiNode;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiMultiTargetTransformController;
 typedef Ref<NiMultiTargetTransformController> NiMultiTargetTransformControllerRef;
diff --git a/obj/NiNode.cpp b/obj/NiNode.cpp
index 4af7b9184db0c48c3086f2f2c6d8bd68856283e8..69645d24b5fce46afb2b6178cb73a9b51a3622a5 100644
--- a/obj/NiNode.cpp
+++ b/obj/NiNode.cpp
@@ -1,9 +1,9 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "obj/NiNode.h"
-#include "obj/NiAVObject.h"
-#include "obj/NiDynamicEffect.h"
+#include "NiNode.h"
+#include "NiAVObject.h"
+#include "NiDynamicEffect.h"
 
 //Definition of TYPE constant
 const Type NiNode::TYPE("NiNode", &NI_NODE_PARENT::TYPE );
diff --git a/obj/NiNode.h b/obj/NiNode.h
index eb104691b4250e835f638782bccae76186b1df82..57f80936f04cd9155f8d135fec145637b39c8c41 100644
--- a/obj/NiNode.h
+++ b/obj/NiNode.h
@@ -7,11 +7,11 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiAVObject.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiAVObject;
 class NiDynamicEffect;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiNode;
 typedef Ref<NiNode> NiNodeRef;
diff --git a/obj/NiObject.h b/obj/NiObject.h
index a61b798082716bfbdbc37f2f2f498ab06a3791aa..72d50ecc1d03dca66f7900ca4936180f7b51c69a 100644
--- a/obj/NiObject.h
+++ b/obj/NiObject.h
@@ -12,10 +12,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include <list>
 #include <map>
 #include <vector>
-#include "NIF_IO.h"
-#include "Ref.h"
-#include "Type.h"
-#include "gen/obj_defines.h"
+#include "../NIF_IO.h"
+#include "../Ref.h"
+#include "../Type.h"
+#include "../gen/obj_defines.h"
 
 using namespace std;
 
diff --git a/obj/NiObjectNET.h b/obj/NiObjectNET.h
index 7977fed15c61fb9d3ac05841a49087e33a07635d..cfd13e2a55a7e9dec992751faa478a20cdf5631a 100644
--- a/obj/NiObjectNET.h
+++ b/obj/NiObjectNET.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 class NiExtraData;
 class NiTimeController;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 #include NI_OBJECT_N_E_T_INCLUDE
 
 class NiObjectNET;
diff --git a/obj/NiPSysAgeDeathModifier.cpp b/obj/NiPSysAgeDeathModifier.cpp
index 7f287c1f16466f5f55914c8b0d54a122b0bbfb53..f3328aeca92368aea727105c1c64a9743768ac3f 100644
--- a/obj/NiPSysAgeDeathModifier.cpp
+++ b/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 "obj/NiPSysAgeDeathModifier.h"
-#include "obj/NiPSysSpawnModifier.h"
+#include "NiPSysAgeDeathModifier.h"
+#include "NiPSysSpawnModifier.h"
 
 //Definition of TYPE constant
 const Type NiPSysAgeDeathModifier::TYPE("NiPSysAgeDeathModifier", &NI_P_SYS_AGE_DEATH_MODIFIER_PARENT::TYPE );
diff --git a/obj/NiPSysAgeDeathModifier.h b/obj/NiPSysAgeDeathModifier.h
index 2f7e069575b8d32bf9049d9d9d325d2faf39e430..e3a580446a2126e62f8dc2a734f21c1623fe25fd 100644
--- a/obj/NiPSysAgeDeathModifier.h
+++ b/obj/NiPSysAgeDeathModifier.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiPSysModifier.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiPSysSpawnModifier;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPSysAgeDeathModifier;
 typedef Ref<NiPSysAgeDeathModifier> NiPSysAgeDeathModifierRef;
diff --git a/obj/NiPSysBombModifier.cpp b/obj/NiPSysBombModifier.cpp
index e0a48d7b920b90f47a3f6594cbd3be93fbc6f9ac..2329f5125af66e515df6e803574af204f593593f 100644
--- a/obj/NiPSysBombModifier.cpp
+++ b/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 "obj/NiPSysBombModifier.h"
-#include "obj/NiNode.h"
+#include "NiPSysBombModifier.h"
+#include "NiNode.h"
 
 //Definition of TYPE constant
 const Type NiPSysBombModifier::TYPE("NiPSysBombModifier", &NI_P_SYS_BOMB_MODIFIER_PARENT::TYPE );
diff --git a/obj/NiPSysBombModifier.h b/obj/NiPSysBombModifier.h
index 1e35149d54c5838d18bb90c0146d200f2ccb0cf2..4377d1e59e6a512025130a32261464d41ed97403 100644
--- a/obj/NiPSysBombModifier.h
+++ b/obj/NiPSysBombModifier.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiPSysModifier.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiNode;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPSysBombModifier;
 typedef Ref<NiPSysBombModifier> NiPSysBombModifierRef;
diff --git a/obj/NiPSysBoundUpdateModifier.cpp b/obj/NiPSysBoundUpdateModifier.cpp
index d888740b487dcb6d1d781ff5e036eb5acfcd21ca..ef548b1a7581d7ed618e1ad1a28888fe32d7df6c 100644
--- a/obj/NiPSysBoundUpdateModifier.cpp
+++ b/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 "obj/NiPSysBoundUpdateModifier.h"
+#include "NiPSysBoundUpdateModifier.h"
 
 //Definition of TYPE constant
 const Type NiPSysBoundUpdateModifier::TYPE("NiPSysBoundUpdateModifier", &NI_P_SYS_BOUND_UPDATE_MODIFIER_PARENT::TYPE );
diff --git a/obj/NiPSysBoundUpdateModifier.h b/obj/NiPSysBoundUpdateModifier.h
index cea0b2be7b2422d37c25c86103f2ff03462e520b..859e6eddd8fc373703adfb8ed3601cd5eb668297 100644
--- a/obj/NiPSysBoundUpdateModifier.h
+++ b/obj/NiPSysBoundUpdateModifier.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysModifier.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPSysBoundUpdateModifier;
 typedef Ref<NiPSysBoundUpdateModifier> NiPSysBoundUpdateModifierRef;
diff --git a/obj/NiPSysBoxEmitter.cpp b/obj/NiPSysBoxEmitter.cpp
index 4ab78b3fc36a476122526694c6525ef6e5543368..604a251cea3c3c416495630a8ea0acb0e5c26b75 100644
--- a/obj/NiPSysBoxEmitter.cpp
+++ b/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 "obj/NiPSysBoxEmitter.h"
+#include "NiPSysBoxEmitter.h"
 
 //Definition of TYPE constant
 const Type NiPSysBoxEmitter::TYPE("NiPSysBoxEmitter", &NI_P_SYS_BOX_EMITTER_PARENT::TYPE );
diff --git a/obj/NiPSysBoxEmitter.h b/obj/NiPSysBoxEmitter.h
index 8d6f2665804f706c5570a2f5dfcc2e699a14b2fb..4cd8c7629136371f72dc03372093fbec1829e082 100644
--- a/obj/NiPSysBoxEmitter.h
+++ b/obj/NiPSysBoxEmitter.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysVolumeEmitter.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPSysBoxEmitter;
 typedef Ref<NiPSysBoxEmitter> NiPSysBoxEmitterRef;
diff --git a/obj/NiPSysColliderManager.cpp b/obj/NiPSysColliderManager.cpp
index 83a2ed131ff0f0b8b8dec54161f2425dab21271a..f53d7c8079ca84d2d0b196b0b3e72f10cdb1abfd 100644
--- a/obj/NiPSysColliderManager.cpp
+++ b/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 "obj/NiPSysColliderManager.h"
-#include "obj/NiPSysPlanarCollider.h"
+#include "NiPSysColliderManager.h"
+#include "NiPSysPlanarCollider.h"
 
 //Definition of TYPE constant
 const Type NiPSysColliderManager::TYPE("NiPSysColliderManager", &NI_P_SYS_COLLIDER_MANAGER_PARENT::TYPE );
diff --git a/obj/NiPSysColliderManager.h b/obj/NiPSysColliderManager.h
index 97fd877a9869e79128b1093cf5dde67b75b3a389..d9c7c0b6cbfce49b1b643d84820c46683754da48 100644
--- a/obj/NiPSysColliderManager.h
+++ b/obj/NiPSysColliderManager.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiPSysModifier.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiPSysPlanarCollider;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPSysColliderManager;
 typedef Ref<NiPSysColliderManager> NiPSysColliderManagerRef;
diff --git a/obj/NiPSysColorModifier.cpp b/obj/NiPSysColorModifier.cpp
index e7307348122084a2ecf71a7a195c6438918aa6e7..002f88afb31d396211a7cfe74f7ba47134190f6b 100644
--- a/obj/NiPSysColorModifier.cpp
+++ b/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 "obj/NiPSysColorModifier.h"
-#include "obj/NiColorData.h"
+#include "NiPSysColorModifier.h"
+#include "NiColorData.h"
 
 //Definition of TYPE constant
 const Type NiPSysColorModifier::TYPE("NiPSysColorModifier", &NI_P_SYS_COLOR_MODIFIER_PARENT::TYPE );
diff --git a/obj/NiPSysColorModifier.h b/obj/NiPSysColorModifier.h
index cab731321e187b93057da1bd9de02a1a0f62eee2..8b571b6ae4841fa7b4b4ecadc58c4b5637a595ef 100644
--- a/obj/NiPSysColorModifier.h
+++ b/obj/NiPSysColorModifier.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiPSysModifier.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiColorData;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPSysColorModifier;
 typedef Ref<NiPSysColorModifier> NiPSysColorModifierRef;
diff --git a/obj/NiPSysCylinderEmitter.cpp b/obj/NiPSysCylinderEmitter.cpp
index 5481f5e680daa0d0dfd9b65c6c4b67577fc82029..b7d47deaf99473c936e22db9c50095ef7fdb23fd 100644
--- a/obj/NiPSysCylinderEmitter.cpp
+++ b/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 "obj/NiPSysCylinderEmitter.h"
+#include "NiPSysCylinderEmitter.h"
 
 //Definition of TYPE constant
 const Type NiPSysCylinderEmitter::TYPE("NiPSysCylinderEmitter", &NI_P_SYS_CYLINDER_EMITTER_PARENT::TYPE );
diff --git a/obj/NiPSysCylinderEmitter.h b/obj/NiPSysCylinderEmitter.h
index 1ec8536da4d1285213335c841465e1790fd3a2c0..5db148a8e96cac75aae70a8d28bf298f29e67693 100644
--- a/obj/NiPSysCylinderEmitter.h
+++ b/obj/NiPSysCylinderEmitter.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysVolumeEmitter.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPSysCylinderEmitter;
 typedef Ref<NiPSysCylinderEmitter> NiPSysCylinderEmitterRef;
diff --git a/obj/NiPSysData.cpp b/obj/NiPSysData.cpp
index 1245a3363ce3320f8446946ca67084f9d7b9d9a6..e931d7d97d3291a3afa2768078f87865cedea58b 100644
--- a/obj/NiPSysData.cpp
+++ b/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 "obj/NiPSysData.h"
+#include "NiPSysData.h"
 
 //Definition of TYPE constant
 const Type NiPSysData::TYPE("NiPSysData", &NI_P_SYS_DATA_PARENT::TYPE );
diff --git a/obj/NiPSysData.h b/obj/NiPSysData.h
index 8adebc9f19d43415566d55293e2b2d13fc1d9a4a..7dc0a9b94110b09192077bca0af58163d1fc8150 100644
--- a/obj/NiPSysData.h
+++ b/obj/NiPSysData.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "APSysData.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPSysData;
 typedef Ref<NiPSysData> NiPSysDataRef;
diff --git a/obj/NiPSysDragModifier.cpp b/obj/NiPSysDragModifier.cpp
index 0325e2fae140d417a5e532c6b9faa42fa52065e3..93ccc14d7b3470e578c23b38eb16f9ad7fce0f8f 100644
--- a/obj/NiPSysDragModifier.cpp
+++ b/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 "obj/NiPSysDragModifier.h"
-#include "obj/NiObject.h"
+#include "NiPSysDragModifier.h"
+#include "NiObject.h"
 
 //Definition of TYPE constant
 const Type NiPSysDragModifier::TYPE("NiPSysDragModifier", &NI_P_SYS_DRAG_MODIFIER_PARENT::TYPE );
diff --git a/obj/NiPSysDragModifier.h b/obj/NiPSysDragModifier.h
index 529da4e54930f24515d73b13bdad316485f7299c..ac2b989ffb7e49c91e31624e1cc679ddf02aff0f 100644
--- a/obj/NiPSysDragModifier.h
+++ b/obj/NiPSysDragModifier.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiPSysModifier.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiObject;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPSysDragModifier;
 typedef Ref<NiPSysDragModifier> NiPSysDragModifierRef;
diff --git a/obj/NiPSysEmitter.cpp b/obj/NiPSysEmitter.cpp
index fc2f14dbc640835c972533c1d4ce09de2cae204b..d0bb6ec2d64f6dddf850f4c37568b575193524cc 100644
--- a/obj/NiPSysEmitter.cpp
+++ b/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 "obj/NiPSysEmitter.h"
+#include "NiPSysEmitter.h"
 
 //Definition of TYPE constant
 const Type NiPSysEmitter::TYPE("NiPSysEmitter", &NI_P_SYS_EMITTER_PARENT::TYPE );
diff --git a/obj/NiPSysEmitter.h b/obj/NiPSysEmitter.h
index 52e7dd0165b9aa70ea4f08159d17d3bafadb6395..09e9b752643e52bc60eb9069917dd14b8523c195 100644
--- a/obj/NiPSysEmitter.h
+++ b/obj/NiPSysEmitter.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysModifier.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPSysEmitter;
 typedef Ref<NiPSysEmitter> NiPSysEmitterRef;
diff --git a/obj/NiPSysEmitterCtlr.cpp b/obj/NiPSysEmitterCtlr.cpp
index 128f7b0b7007426d7ac41b6f0c9c3c99a4957a94..ecb4c8501ba4489179e7be0789efff3f5f145e5f 100644
--- a/obj/NiPSysEmitterCtlr.cpp
+++ b/obj/NiPSysEmitterCtlr.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "obj/NiPSysEmitterCtlr.h"
-#include "obj/NiInterpolator.h"
+#include "NiPSysEmitterCtlr.h"
+#include "NiInterpolator.h"
 
 //Definition of TYPE constant
 const Type NiPSysEmitterCtlr::TYPE("NiPSysEmitterCtlr", &NI_P_SYS_EMITTER_CTLR_PARENT::TYPE );
diff --git a/obj/NiPSysEmitterCtlr.h b/obj/NiPSysEmitterCtlr.h
index c028cdae43cc0d5861b6f0c4df96b2bf5fa6cbb7..d805181aee7b6c6242046cab7810911662e99ef9 100644
--- a/obj/NiPSysEmitterCtlr.h
+++ b/obj/NiPSysEmitterCtlr.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "APSysCtlr.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiInterpolator;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPSysEmitterCtlr;
 typedef Ref<NiPSysEmitterCtlr> NiPSysEmitterCtlrRef;
diff --git a/obj/NiPSysEmitterCtlrData.cpp b/obj/NiPSysEmitterCtlrData.cpp
index 2d930bd2a3aaac2393bd75650236f2485793fc4c..a3d15315ed5a447fb8ca9d945930f9551b221e1e 100644
--- a/obj/NiPSysEmitterCtlrData.cpp
+++ b/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 "obj/NiPSysEmitterCtlrData.h"
-#include "gen/KeyGroup.h"
+#include "NiPSysEmitterCtlrData.h"
+#include "../gen/KeyGroup.h"
 
 //Definition of TYPE constant
 const Type NiPSysEmitterCtlrData::TYPE("NiPSysEmitterCtlrData", &NI_P_SYS_EMITTER_CTLR_DATA_PARENT::TYPE );
diff --git a/obj/NiPSysEmitterCtlrData.h b/obj/NiPSysEmitterCtlrData.h
index 06e685911f2b7a8447fd0f09c580466ad180d046..7376f58b6c4c9833692d5f9bb9279d569fb700e7 100644
--- a/obj/NiPSysEmitterCtlrData.h
+++ b/obj/NiPSysEmitterCtlrData.h
@@ -6,9 +6,9 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiObject.h"
 // Include structures
-#include "gen/KeyGroup.h"
+#include "../gen/KeyGroup.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPSysEmitterCtlrData;
 typedef Ref<NiPSysEmitterCtlrData> NiPSysEmitterCtlrDataRef;
diff --git a/obj/NiPSysEmitterDeclinationCtlr.cpp b/obj/NiPSysEmitterDeclinationCtlr.cpp
index ed8cffac90e51baba4a2561c6adea19ec4549f88..5402b15a333349f72fb0ee7b81bcfbd7c65d45bd 100644
--- a/obj/NiPSysEmitterDeclinationCtlr.cpp
+++ b/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 "obj/NiPSysEmitterDeclinationCtlr.h"
+#include "NiPSysEmitterDeclinationCtlr.h"
 
 //Definition of TYPE constant
 const Type NiPSysEmitterDeclinationCtlr::TYPE("NiPSysEmitterDeclinationCtlr", &NI_P_SYS_EMITTER_DECLINATION_CTLR_PARENT::TYPE );
diff --git a/obj/NiPSysEmitterDeclinationCtlr.h b/obj/NiPSysEmitterDeclinationCtlr.h
index cf40ffe0ea76ad6c18c6bbea51c0b03d91e201ef..37624c4646cc0a258749d8891bcefa78f7de1ffa 100644
--- a/obj/NiPSysEmitterDeclinationCtlr.h
+++ b/obj/NiPSysEmitterDeclinationCtlr.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "APSysCtlr.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPSysEmitterDeclinationCtlr;
 typedef Ref<NiPSysEmitterDeclinationCtlr> NiPSysEmitterDeclinationCtlrRef;
diff --git a/obj/NiPSysEmitterDeclinationVarCtlr.cpp b/obj/NiPSysEmitterDeclinationVarCtlr.cpp
index 50f9a42e68f30a27abaf3d3c7966cde05ba2b59d..975ed8c460909b817190a02f8a93dbe9c6b1fa5d 100644
--- a/obj/NiPSysEmitterDeclinationVarCtlr.cpp
+++ b/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 "obj/NiPSysEmitterDeclinationVarCtlr.h"
+#include "NiPSysEmitterDeclinationVarCtlr.h"
 
 //Definition of TYPE constant
 const Type NiPSysEmitterDeclinationVarCtlr::TYPE("NiPSysEmitterDeclinationVarCtlr", &NI_P_SYS_EMITTER_DECLINATION_VAR_CTLR_PARENT::TYPE );
diff --git a/obj/NiPSysEmitterDeclinationVarCtlr.h b/obj/NiPSysEmitterDeclinationVarCtlr.h
index ac4ecc5683f56cb713441ed1d939ef2790268dfa..60e1b094bcabc98208e23a6c033e6531a52d74bf 100644
--- a/obj/NiPSysEmitterDeclinationVarCtlr.h
+++ b/obj/NiPSysEmitterDeclinationVarCtlr.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "APSysCtlr.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPSysEmitterDeclinationVarCtlr;
 typedef Ref<NiPSysEmitterDeclinationVarCtlr> NiPSysEmitterDeclinationVarCtlrRef;
diff --git a/obj/NiPSysEmitterInitialRadiusCtlr.cpp b/obj/NiPSysEmitterInitialRadiusCtlr.cpp
index c2a015a4dfbaf53832aa8659f48f35afe6050701..a637fcfc87bf916440686c0f90e67951720f287c 100644
--- a/obj/NiPSysEmitterInitialRadiusCtlr.cpp
+++ b/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 "obj/NiPSysEmitterInitialRadiusCtlr.h"
+#include "NiPSysEmitterInitialRadiusCtlr.h"
 
 //Definition of TYPE constant
 const Type NiPSysEmitterInitialRadiusCtlr::TYPE("NiPSysEmitterInitialRadiusCtlr", &NI_P_SYS_EMITTER_INITIAL_RADIUS_CTLR_PARENT::TYPE );
diff --git a/obj/NiPSysEmitterInitialRadiusCtlr.h b/obj/NiPSysEmitterInitialRadiusCtlr.h
index c153228ba718268d4063b270b402512abe6dbc2e..8910ad2f87799aeee7f90651fd535ddfc134660a 100644
--- a/obj/NiPSysEmitterInitialRadiusCtlr.h
+++ b/obj/NiPSysEmitterInitialRadiusCtlr.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "APSysCtlr.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPSysEmitterInitialRadiusCtlr;
 typedef Ref<NiPSysEmitterInitialRadiusCtlr> NiPSysEmitterInitialRadiusCtlrRef;
diff --git a/obj/NiPSysEmitterLifeSpanCtlr.cpp b/obj/NiPSysEmitterLifeSpanCtlr.cpp
index f01929c92d6febf20489566e746e1b07907a74fb..c09b648b9d7fea214e6fef6e74f33f34b65d374f 100644
--- a/obj/NiPSysEmitterLifeSpanCtlr.cpp
+++ b/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 "obj/NiPSysEmitterLifeSpanCtlr.h"
+#include "NiPSysEmitterLifeSpanCtlr.h"
 
 //Definition of TYPE constant
 const Type NiPSysEmitterLifeSpanCtlr::TYPE("NiPSysEmitterLifeSpanCtlr", &NI_P_SYS_EMITTER_LIFE_SPAN_CTLR_PARENT::TYPE );
diff --git a/obj/NiPSysEmitterLifeSpanCtlr.h b/obj/NiPSysEmitterLifeSpanCtlr.h
index eb11647d495cb182ac03121f698aaaafac878933..c9135755cc6f228ad54e75e39a12a4c4a98df2dc 100644
--- a/obj/NiPSysEmitterLifeSpanCtlr.h
+++ b/obj/NiPSysEmitterLifeSpanCtlr.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "APSysCtlr.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPSysEmitterLifeSpanCtlr;
 typedef Ref<NiPSysEmitterLifeSpanCtlr> NiPSysEmitterLifeSpanCtlrRef;
diff --git a/obj/NiPSysEmitterSpeedCtlr.cpp b/obj/NiPSysEmitterSpeedCtlr.cpp
index b67b23c5b2d46fb613e28ab9c9868088d4145923..c16faf0375625ce4121fde885464dbf9c9e4ed91 100644
--- a/obj/NiPSysEmitterSpeedCtlr.cpp
+++ b/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 "obj/NiPSysEmitterSpeedCtlr.h"
+#include "NiPSysEmitterSpeedCtlr.h"
 
 //Definition of TYPE constant
 const Type NiPSysEmitterSpeedCtlr::TYPE("NiPSysEmitterSpeedCtlr", &NI_P_SYS_EMITTER_SPEED_CTLR_PARENT::TYPE );
diff --git a/obj/NiPSysEmitterSpeedCtlr.h b/obj/NiPSysEmitterSpeedCtlr.h
index e720f78b050865224cf34bfecf12ff0845d0b524..1476eda28a8316e59e7d1e02b30f357397ed9e03 100644
--- a/obj/NiPSysEmitterSpeedCtlr.h
+++ b/obj/NiPSysEmitterSpeedCtlr.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "APSysCtlr.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPSysEmitterSpeedCtlr;
 typedef Ref<NiPSysEmitterSpeedCtlr> NiPSysEmitterSpeedCtlrRef;
diff --git a/obj/NiPSysGravityModifier.cpp b/obj/NiPSysGravityModifier.cpp
index d3ee88a03676c81750a0ca434f3a636a665427ea..943f14ecc4fb06398fa568663ac61d8cc20e5bab 100644
--- a/obj/NiPSysGravityModifier.cpp
+++ b/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 "obj/NiPSysGravityModifier.h"
-#include "obj/NiNode.h"
+#include "NiPSysGravityModifier.h"
+#include "NiNode.h"
 
 //Definition of TYPE constant
 const Type NiPSysGravityModifier::TYPE("NiPSysGravityModifier", &NI_P_SYS_GRAVITY_MODIFIER_PARENT::TYPE );
diff --git a/obj/NiPSysGravityModifier.h b/obj/NiPSysGravityModifier.h
index d1862f3d8d6c5364b82c74aad485b2c1dff960c2..8135cd814028e704299bb03eabf9f7b189983bf9 100644
--- a/obj/NiPSysGravityModifier.h
+++ b/obj/NiPSysGravityModifier.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiPSysModifier.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiNode;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPSysGravityModifier;
 typedef Ref<NiPSysGravityModifier> NiPSysGravityModifierRef;
diff --git a/obj/NiPSysGravityStrengthCtlr.cpp b/obj/NiPSysGravityStrengthCtlr.cpp
index 1ab404ec1980cc0d20dff996401e6b17904d2339..322626dd74399d5b4a2ff46635bcb5148f641b47 100644
--- a/obj/NiPSysGravityStrengthCtlr.cpp
+++ b/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 "obj/NiPSysGravityStrengthCtlr.h"
+#include "NiPSysGravityStrengthCtlr.h"
 
 //Definition of TYPE constant
 const Type NiPSysGravityStrengthCtlr::TYPE("NiPSysGravityStrengthCtlr", &NI_P_SYS_GRAVITY_STRENGTH_CTLR_PARENT::TYPE );
diff --git a/obj/NiPSysGravityStrengthCtlr.h b/obj/NiPSysGravityStrengthCtlr.h
index 9fb2a7ad2a02f48c9062dbc2f8363dc5de0172b3..ce18fff7fd0b362196e877379e8b250efd76e582 100644
--- a/obj/NiPSysGravityStrengthCtlr.h
+++ b/obj/NiPSysGravityStrengthCtlr.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "APSysCtlr.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPSysGravityStrengthCtlr;
 typedef Ref<NiPSysGravityStrengthCtlr> NiPSysGravityStrengthCtlrRef;
diff --git a/obj/NiPSysGrowFadeModifier.cpp b/obj/NiPSysGrowFadeModifier.cpp
index 7c881c8053182126caa055ea5d3770da912377d1..b98670e01f59c246a949757e5f9a20ca5afe6dcc 100644
--- a/obj/NiPSysGrowFadeModifier.cpp
+++ b/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 "obj/NiPSysGrowFadeModifier.h"
+#include "NiPSysGrowFadeModifier.h"
 
 //Definition of TYPE constant
 const Type NiPSysGrowFadeModifier::TYPE("NiPSysGrowFadeModifier", &NI_P_SYS_GROW_FADE_MODIFIER_PARENT::TYPE );
diff --git a/obj/NiPSysGrowFadeModifier.h b/obj/NiPSysGrowFadeModifier.h
index f371ab1ab3372af08e72c3d915556f5ecc413402..a087d00d4a3e15b3a4affa179ce2baa62f115e06 100644
--- a/obj/NiPSysGrowFadeModifier.h
+++ b/obj/NiPSysGrowFadeModifier.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysModifier.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPSysGrowFadeModifier;
 typedef Ref<NiPSysGrowFadeModifier> NiPSysGrowFadeModifierRef;
diff --git a/obj/NiPSysMeshEmitter.cpp b/obj/NiPSysMeshEmitter.cpp
index 40aff6b6d9bfeefec691a0eee653fc60765b2747..52bebcb65fc092ef1a88512ead5792839a0ec4ca 100644
--- a/obj/NiPSysMeshEmitter.cpp
+++ b/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 "obj/NiPSysMeshEmitter.h"
-#include "obj/NiTriBasedGeom.h"
+#include "NiPSysMeshEmitter.h"
+#include "NiTriBasedGeom.h"
 
 //Definition of TYPE constant
 const Type NiPSysMeshEmitter::TYPE("NiPSysMeshEmitter", &NI_P_SYS_MESH_EMITTER_PARENT::TYPE );
diff --git a/obj/NiPSysMeshEmitter.h b/obj/NiPSysMeshEmitter.h
index 9d714800c5a977ef98865ef719212347ec71db01..fbe7db58a94695849ee43314dea87d6d5c10e3fd 100644
--- a/obj/NiPSysMeshEmitter.h
+++ b/obj/NiPSysMeshEmitter.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiPSysEmitter.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiTriBasedGeom;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPSysMeshEmitter;
 typedef Ref<NiPSysMeshEmitter> NiPSysMeshEmitterRef;
diff --git a/obj/NiPSysMeshUpdateModifier.cpp b/obj/NiPSysMeshUpdateModifier.cpp
index ff947d04e9e5ef69283a37e961f7feaafe8cbc51..bf86b452f4f3a88515ee99c71858f7c6bc8a25ae 100644
--- a/obj/NiPSysMeshUpdateModifier.cpp
+++ b/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 "obj/NiPSysMeshUpdateModifier.h"
-#include "obj/NiNode.h"
+#include "NiPSysMeshUpdateModifier.h"
+#include "NiNode.h"
 
 //Definition of TYPE constant
 const Type NiPSysMeshUpdateModifier::TYPE("NiPSysMeshUpdateModifier", &NI_P_SYS_MESH_UPDATE_MODIFIER_PARENT::TYPE );
diff --git a/obj/NiPSysMeshUpdateModifier.h b/obj/NiPSysMeshUpdateModifier.h
index 13abdf0ae0cf6d6c9fdb04eb46c9f2350dd1cc5f..320202984e5192dee209254b98dd2ecc851c2b33 100644
--- a/obj/NiPSysMeshUpdateModifier.h
+++ b/obj/NiPSysMeshUpdateModifier.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiPSysModifier.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiNode;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPSysMeshUpdateModifier;
 typedef Ref<NiPSysMeshUpdateModifier> NiPSysMeshUpdateModifierRef;
diff --git a/obj/NiPSysModifier.cpp b/obj/NiPSysModifier.cpp
index 64e9b3e1b84fc3f46a41a6e9f873ba54ee020d19..b3a7224dcee55c85d35a5a1b96cb24120031f7b8 100644
--- a/obj/NiPSysModifier.cpp
+++ b/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 "obj/NiPSysModifier.h"
-#include "obj/NiParticleSystem.h"
+#include "NiPSysModifier.h"
+#include "NiParticleSystem.h"
 
 //Definition of TYPE constant
 const Type NiPSysModifier::TYPE("NiPSysModifier", &NI_P_SYS_MODIFIER_PARENT::TYPE );
diff --git a/obj/NiPSysModifier.h b/obj/NiPSysModifier.h
index e79b34125c428036c48659ca948057f669637fd4..10e7d5076d2e32d407e0a6661476d205c84a0556 100644
--- a/obj/NiPSysModifier.h
+++ b/obj/NiPSysModifier.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiObject.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiParticleSystem;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPSysModifier;
 typedef Ref<NiPSysModifier> NiPSysModifierRef;
diff --git a/obj/NiPSysModifierActiveCtlr.cpp b/obj/NiPSysModifierActiveCtlr.cpp
index a75eaa22dfcd86fbf5f26ac7ae46dd46b0f0111f..d0852a8fefe80c4cb3649a7544831dfc1893a685 100644
--- a/obj/NiPSysModifierActiveCtlr.cpp
+++ b/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 "obj/NiPSysModifierActiveCtlr.h"
+#include "NiPSysModifierActiveCtlr.h"
 
 //Definition of TYPE constant
 const Type NiPSysModifierActiveCtlr::TYPE("NiPSysModifierActiveCtlr", &NI_P_SYS_MODIFIER_ACTIVE_CTLR_PARENT::TYPE );
diff --git a/obj/NiPSysModifierActiveCtlr.h b/obj/NiPSysModifierActiveCtlr.h
index 14cb1c36f779e3e5a33f96fcc70ccf8f43dadad4..3c4a56b1459383a3f8b99202e5de03fe6c9b9b0e 100644
--- a/obj/NiPSysModifierActiveCtlr.h
+++ b/obj/NiPSysModifierActiveCtlr.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "APSysCtlr.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPSysModifierActiveCtlr;
 typedef Ref<NiPSysModifierActiveCtlr> NiPSysModifierActiveCtlrRef;
diff --git a/obj/NiPSysPlanarCollider.cpp b/obj/NiPSysPlanarCollider.cpp
index 5f5a947ea8bf3e3afea6d9386628217505176020..da3313188a9798bcbc6f6cab8251ea91fd9ff3c7 100644
--- a/obj/NiPSysPlanarCollider.cpp
+++ b/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 "obj/NiPSysPlanarCollider.h"
-#include "obj/NiPSysSpawnModifier.h"
-#include "obj/NiObject.h"
-#include "obj/NiNode.h"
+#include "NiPSysPlanarCollider.h"
+#include "NiPSysSpawnModifier.h"
+#include "NiObject.h"
+#include "NiNode.h"
 
 //Definition of TYPE constant
 const Type NiPSysPlanarCollider::TYPE("NiPSysPlanarCollider", &NI_P_SYS_PLANAR_COLLIDER_PARENT::TYPE );
diff --git a/obj/NiPSysPlanarCollider.h b/obj/NiPSysPlanarCollider.h
index 0227d302e97abab5a12591de4bf817b9a11939cf..6dab1d5f9a7c345bce8e0ca36363d66f09c06035 100644
--- a/obj/NiPSysPlanarCollider.h
+++ b/obj/NiPSysPlanarCollider.h
@@ -7,12 +7,12 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiObject.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiPSysSpawnModifier;
 class NiObject;
 class NiNode;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPSysPlanarCollider;
 typedef Ref<NiPSysPlanarCollider> NiPSysPlanarColliderRef;
diff --git a/obj/NiPSysPositionModifier.cpp b/obj/NiPSysPositionModifier.cpp
index ab570e96be576d5a6fa5ee10911c6b6ab5f09c7a..9fb6d7f23e7aa99249d51853f55d0d2745d2fde4 100644
--- a/obj/NiPSysPositionModifier.cpp
+++ b/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 "obj/NiPSysPositionModifier.h"
+#include "NiPSysPositionModifier.h"
 
 //Definition of TYPE constant
 const Type NiPSysPositionModifier::TYPE("NiPSysPositionModifier", &NI_P_SYS_POSITION_MODIFIER_PARENT::TYPE );
diff --git a/obj/NiPSysPositionModifier.h b/obj/NiPSysPositionModifier.h
index 4459a92d94ccce84adc9004f788664625bb73d2b..2135ad01b800ddfd64c0101674bc0bc727ec8150 100644
--- a/obj/NiPSysPositionModifier.h
+++ b/obj/NiPSysPositionModifier.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysModifier.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPSysPositionModifier;
 typedef Ref<NiPSysPositionModifier> NiPSysPositionModifierRef;
diff --git a/obj/NiPSysResetOnLoopCtlr.cpp b/obj/NiPSysResetOnLoopCtlr.cpp
index 2b6abfd79e62778361f54e90ea947f83c2651ba3..8637b85b322308583226b8f3b28850b7a24c18a6 100644
--- a/obj/NiPSysResetOnLoopCtlr.cpp
+++ b/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 "obj/NiPSysResetOnLoopCtlr.h"
+#include "NiPSysResetOnLoopCtlr.h"
 
 //Definition of TYPE constant
 const Type NiPSysResetOnLoopCtlr::TYPE("NiPSysResetOnLoopCtlr", &NI_P_SYS_RESET_ON_LOOP_CTLR_PARENT::TYPE );
diff --git a/obj/NiPSysResetOnLoopCtlr.h b/obj/NiPSysResetOnLoopCtlr.h
index be028d6404e3796a84e037a2c66027a1d839c35a..b461a2a9bc1f5be44c7d6f3cc3fd29001e6a3c43 100644
--- a/obj/NiPSysResetOnLoopCtlr.h
+++ b/obj/NiPSysResetOnLoopCtlr.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiTimeController.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPSysResetOnLoopCtlr;
 typedef Ref<NiPSysResetOnLoopCtlr> NiPSysResetOnLoopCtlrRef;
diff --git a/obj/NiPSysRotationModifier.cpp b/obj/NiPSysRotationModifier.cpp
index 52633386fb18b8a1cca7b112e97458840d824639..921fd349ce38ec73794297ee508b8d1c18f9b6c7 100644
--- a/obj/NiPSysRotationModifier.cpp
+++ b/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 "obj/NiPSysRotationModifier.h"
+#include "NiPSysRotationModifier.h"
 
 //Definition of TYPE constant
 const Type NiPSysRotationModifier::TYPE("NiPSysRotationModifier", &NI_P_SYS_ROTATION_MODIFIER_PARENT::TYPE );
diff --git a/obj/NiPSysRotationModifier.h b/obj/NiPSysRotationModifier.h
index d36a16e87d71dedbb676e75f370ef3061ffb6854..f0ea5bbe807511df81d89bb782313bbe100f8356 100644
--- a/obj/NiPSysRotationModifier.h
+++ b/obj/NiPSysRotationModifier.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysModifier.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPSysRotationModifier;
 typedef Ref<NiPSysRotationModifier> NiPSysRotationModifierRef;
diff --git a/obj/NiPSysSpawnModifier.cpp b/obj/NiPSysSpawnModifier.cpp
index a7dd57bf7ab26260888122b43c42126ae5fe8a47..bb3fd884311896d06a9d63f60aafcdefbebd050a 100644
--- a/obj/NiPSysSpawnModifier.cpp
+++ b/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 "obj/NiPSysSpawnModifier.h"
+#include "NiPSysSpawnModifier.h"
 
 //Definition of TYPE constant
 const Type NiPSysSpawnModifier::TYPE("NiPSysSpawnModifier", &NI_P_SYS_SPAWN_MODIFIER_PARENT::TYPE );
diff --git a/obj/NiPSysSpawnModifier.h b/obj/NiPSysSpawnModifier.h
index 2ee4a636bef057fd099988ef9b7768e2d62cfa38..8695731e0c3933f504c1d8669f72ea7db1e459a4 100644
--- a/obj/NiPSysSpawnModifier.h
+++ b/obj/NiPSysSpawnModifier.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysModifier.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPSysSpawnModifier;
 typedef Ref<NiPSysSpawnModifier> NiPSysSpawnModifierRef;
diff --git a/obj/NiPSysSphereEmitter.cpp b/obj/NiPSysSphereEmitter.cpp
index 5279ed90c5b3a77b8ad298caeef406178ad63a65..3bb167f32edac434e25cf6c3b3332ab958177d57 100644
--- a/obj/NiPSysSphereEmitter.cpp
+++ b/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 "obj/NiPSysSphereEmitter.h"
+#include "NiPSysSphereEmitter.h"
 
 //Definition of TYPE constant
 const Type NiPSysSphereEmitter::TYPE("NiPSysSphereEmitter", &NI_P_SYS_SPHERE_EMITTER_PARENT::TYPE );
diff --git a/obj/NiPSysSphereEmitter.h b/obj/NiPSysSphereEmitter.h
index 834d5891a399094ee11abf37270d1d80e32bedd2..a94b4d1678a14674adb2879bba66c2d655acef04 100644
--- a/obj/NiPSysSphereEmitter.h
+++ b/obj/NiPSysSphereEmitter.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysVolumeEmitter.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPSysSphereEmitter;
 typedef Ref<NiPSysSphereEmitter> NiPSysSphereEmitterRef;
diff --git a/obj/NiPSysUpdateCtlr.cpp b/obj/NiPSysUpdateCtlr.cpp
index 0a312d7efdf8f8b513ea3a5414bdb685aad31171..c3a62dd7dd188e700173c676ef35bf13c3792857 100644
--- a/obj/NiPSysUpdateCtlr.cpp
+++ b/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 "obj/NiPSysUpdateCtlr.h"
+#include "NiPSysUpdateCtlr.h"
 
 //Definition of TYPE constant
 const Type NiPSysUpdateCtlr::TYPE("NiPSysUpdateCtlr", &NI_P_SYS_UPDATE_CTLR_PARENT::TYPE );
diff --git a/obj/NiPSysUpdateCtlr.h b/obj/NiPSysUpdateCtlr.h
index c44df3724d743a570a7cd67d11b98c04582dcfdb..7568bf3449f99fb83e311ca0a232e49b1dc1eb18 100644
--- a/obj/NiPSysUpdateCtlr.h
+++ b/obj/NiPSysUpdateCtlr.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiTimeController.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPSysUpdateCtlr;
 typedef Ref<NiPSysUpdateCtlr> NiPSysUpdateCtlrRef;
diff --git a/obj/NiPSysVolumeEmitter.cpp b/obj/NiPSysVolumeEmitter.cpp
index 6da5ccf647d1ade64f0b5cfde86f75ea988eeb01..8c1cb7a849ce2d27d6438fb706a815436a0207c4 100644
--- a/obj/NiPSysVolumeEmitter.cpp
+++ b/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 "obj/NiPSysVolumeEmitter.h"
-#include "obj/NiNode.h"
+#include "NiPSysVolumeEmitter.h"
+#include "NiNode.h"
 
 //Definition of TYPE constant
 const Type NiPSysVolumeEmitter::TYPE("NiPSysVolumeEmitter", &NI_P_SYS_VOLUME_EMITTER_PARENT::TYPE );
diff --git a/obj/NiPSysVolumeEmitter.h b/obj/NiPSysVolumeEmitter.h
index 70dfd1f3c6b59493dd04c5c21770000af3564619..d409b329b632dfaae6ad33908a271f8c2a6c642d 100644
--- a/obj/NiPSysVolumeEmitter.h
+++ b/obj/NiPSysVolumeEmitter.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiPSysEmitter.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiNode;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPSysVolumeEmitter;
 typedef Ref<NiPSysVolumeEmitter> NiPSysVolumeEmitterRef;
diff --git a/obj/NiPalette.cpp b/obj/NiPalette.cpp
index 45b848271094c92d3bc81c97830a1e568107030b..1c36095d21bc999a62f5181957cfd95ac1f140a8 100644
--- a/obj/NiPalette.cpp
+++ b/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 "obj/NiPalette.h"
+#include "NiPalette.h"
 
 //Definition of TYPE constant
 const Type NiPalette::TYPE("NiPalette", &NI_PALETTE_PARENT::TYPE );
diff --git a/obj/NiPalette.h b/obj/NiPalette.h
index 515ce1629b575025838e87b06aec3332d0813be8..88d356596340685d286e868912a7e6cebc0072a8 100644
--- a/obj/NiPalette.h
+++ b/obj/NiPalette.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiObject.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPalette;
 typedef Ref<NiPalette> NiPaletteRef;
diff --git a/obj/NiParticleBomb.cpp b/obj/NiParticleBomb.cpp
index 54cf02b74453613ae527e932b0d50fea2ef30ee1..a8af95648a0bb7321ce12e4ea3108786568e836d 100644
--- a/obj/NiParticleBomb.cpp
+++ b/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 "obj/NiParticleBomb.h"
+#include "NiParticleBomb.h"
 
 //Definition of TYPE constant
 const Type NiParticleBomb::TYPE("NiParticleBomb", &NI_PARTICLE_BOMB_PARENT::TYPE );
diff --git a/obj/NiParticleBomb.h b/obj/NiParticleBomb.h
index f09faf18821fb8e4dcce29022a003cede49f8ea6..a96902e5668987eeebba0c2673960639a841d246 100644
--- a/obj/NiParticleBomb.h
+++ b/obj/NiParticleBomb.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "AParticleModifier.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiParticleBomb;
 typedef Ref<NiParticleBomb> NiParticleBombRef;
diff --git a/obj/NiParticleColorModifier.cpp b/obj/NiParticleColorModifier.cpp
index d74c015ef62be38c960bba6e8616a507418dbf4b..44b6ca1570bfaada18befaf6508d9720f1b1bb66 100644
--- a/obj/NiParticleColorModifier.cpp
+++ b/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 "obj/NiParticleColorModifier.h"
-#include "obj/NiColorData.h"
+#include "NiParticleColorModifier.h"
+#include "NiColorData.h"
 
 //Definition of TYPE constant
 const Type NiParticleColorModifier::TYPE("NiParticleColorModifier", &NI_PARTICLE_COLOR_MODIFIER_PARENT::TYPE );
diff --git a/obj/NiParticleColorModifier.h b/obj/NiParticleColorModifier.h
index 62bb3ed353c28e5d3cb8e097535c10a6f422f626..75799ec760c4e06d6bdee30c711113f3df1aa692 100644
--- a/obj/NiParticleColorModifier.h
+++ b/obj/NiParticleColorModifier.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "AParticleModifier.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiColorData;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiParticleColorModifier;
 typedef Ref<NiParticleColorModifier> NiParticleColorModifierRef;
diff --git a/obj/NiParticleGrowFade.cpp b/obj/NiParticleGrowFade.cpp
index a7db7c60d48e6847ff46de859c7acdef661514bf..bfb412c59573c417c54623a94c82c944df0d042d 100644
--- a/obj/NiParticleGrowFade.cpp
+++ b/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 "obj/NiParticleGrowFade.h"
+#include "NiParticleGrowFade.h"
 
 //Definition of TYPE constant
 const Type NiParticleGrowFade::TYPE("NiParticleGrowFade", &NI_PARTICLE_GROW_FADE_PARENT::TYPE );
diff --git a/obj/NiParticleGrowFade.h b/obj/NiParticleGrowFade.h
index ed8eb918a9910b3f43aa8f3c00dd4b21d811926e..eb10da7948b8a6bd410aea3e94051f784896517a 100644
--- a/obj/NiParticleGrowFade.h
+++ b/obj/NiParticleGrowFade.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "AParticleModifier.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiParticleGrowFade;
 typedef Ref<NiParticleGrowFade> NiParticleGrowFadeRef;
diff --git a/obj/NiParticleMeshModifier.cpp b/obj/NiParticleMeshModifier.cpp
index 424d04827bd5a8693c711e784e72c9fb60988f0d..0b983126cb1b51f8db581a96ffd7d51e3d92b749 100644
--- a/obj/NiParticleMeshModifier.cpp
+++ b/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 "obj/NiParticleMeshModifier.h"
-#include "obj/NiTriBasedGeom.h"
+#include "NiParticleMeshModifier.h"
+#include "NiTriBasedGeom.h"
 
 //Definition of TYPE constant
 const Type NiParticleMeshModifier::TYPE("NiParticleMeshModifier", &NI_PARTICLE_MESH_MODIFIER_PARENT::TYPE );
diff --git a/obj/NiParticleMeshModifier.h b/obj/NiParticleMeshModifier.h
index 0faec260bd99052b0e761cad5eb37b557a562a9a..3a9353af40cb840cd41f4be3a54248278012511a 100644
--- a/obj/NiParticleMeshModifier.h
+++ b/obj/NiParticleMeshModifier.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "AParticleModifier.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiTriBasedGeom;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiParticleMeshModifier;
 typedef Ref<NiParticleMeshModifier> NiParticleMeshModifierRef;
diff --git a/obj/NiParticleMeshes.cpp b/obj/NiParticleMeshes.cpp
index f2bb6ab47699a71320dd691cde8b257bdf814c0d..5a4d6870461067fba87ecb8fda56a2d70fd01047 100644
--- a/obj/NiParticleMeshes.cpp
+++ b/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 "obj/NiParticleMeshes.h"
+#include "NiParticleMeshes.h"
 
 //Definition of TYPE constant
 const Type NiParticleMeshes::TYPE("NiParticleMeshes", &NI_PARTICLE_MESHES_PARENT::TYPE );
diff --git a/obj/NiParticleMeshes.h b/obj/NiParticleMeshes.h
index 185f26c706288b0998b8590373e4c5f00a8d00a5..4710914302b4d1b0421fd431494eed4cdd9cdbc1 100644
--- a/obj/NiParticleMeshes.h
+++ b/obj/NiParticleMeshes.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiParticles.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiParticleMeshes;
 typedef Ref<NiParticleMeshes> NiParticleMeshesRef;
diff --git a/obj/NiParticleMeshesData.cpp b/obj/NiParticleMeshesData.cpp
index 07a306f36b1fa3b57738ba968bd083622706e568..0c762e5d4f4ac15e72f2a6635dc4c88f2079092e 100644
--- a/obj/NiParticleMeshesData.cpp
+++ b/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 "obj/NiParticleMeshesData.h"
-#include "obj/NiTriBasedGeom.h"
+#include "NiParticleMeshesData.h"
+#include "NiTriBasedGeom.h"
 
 //Definition of TYPE constant
 const Type NiParticleMeshesData::TYPE("NiParticleMeshesData", &NI_PARTICLE_MESHES_DATA_PARENT::TYPE );
diff --git a/obj/NiParticleMeshesData.h b/obj/NiParticleMeshesData.h
index aeaf2967ea12fc6dda52aba0ca0f6ba15cc7c963..4cbd10e415ceacc44be1f9eddec1e71d029822fa 100644
--- a/obj/NiParticleMeshesData.h
+++ b/obj/NiParticleMeshesData.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiParticlesData.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiTriBasedGeom;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiParticleMeshesData;
 typedef Ref<NiParticleMeshesData> NiParticleMeshesDataRef;
diff --git a/obj/NiParticleRotation.cpp b/obj/NiParticleRotation.cpp
index ea62099e9abd8896bb6e69ca79983e680a499e0f..02384824a6920f219ff1f1b40ac92e33080a55ff 100644
--- a/obj/NiParticleRotation.cpp
+++ b/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 "obj/NiParticleRotation.h"
+#include "NiParticleRotation.h"
 
 //Definition of TYPE constant
 const Type NiParticleRotation::TYPE("NiParticleRotation", &NI_PARTICLE_ROTATION_PARENT::TYPE );
diff --git a/obj/NiParticleRotation.h b/obj/NiParticleRotation.h
index c88e4f4d6ef06ef57749ecd928c719212fbd4be6..f658c9c91f7da55f50fcd6e1cf6d039096bf8927 100644
--- a/obj/NiParticleRotation.h
+++ b/obj/NiParticleRotation.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "AParticleModifier.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiParticleRotation;
 typedef Ref<NiParticleRotation> NiParticleRotationRef;
diff --git a/obj/NiParticleSystem.cpp b/obj/NiParticleSystem.cpp
index ee8d17460cd2652feabf4c3097436e8a351a9648..540e8488c0c717c9b5a50533be2a11a32a9f0fc8 100644
--- a/obj/NiParticleSystem.cpp
+++ b/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 "obj/NiParticleSystem.h"
-#include "obj/NiPSysModifier.h"
+#include "NiParticleSystem.h"
+#include "NiPSysModifier.h"
 
 //Definition of TYPE constant
 const Type NiParticleSystem::TYPE("NiParticleSystem", &NI_PARTICLE_SYSTEM_PARENT::TYPE );
diff --git a/obj/NiParticleSystem.h b/obj/NiParticleSystem.h
index 19ac916c905899dc2231a3b93211fb7d4a5b9d1e..ff6bedb869249033e2b5da18f8ed3036b0b39a1b 100644
--- a/obj/NiParticleSystem.h
+++ b/obj/NiParticleSystem.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiParticles.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiPSysModifier;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiParticleSystem;
 typedef Ref<NiParticleSystem> NiParticleSystemRef;
diff --git a/obj/NiParticleSystemController.cpp b/obj/NiParticleSystemController.cpp
index 5ed4dd0c5908b6f16ecb7c04240e7bb970459d20..fcd3d2d38f35a29c3d3d60cd0eadc9752572d182 100644
--- a/obj/NiParticleSystemController.cpp
+++ b/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 "obj/NiParticleSystemController.h"
-#include "gen/Particle.h"
-#include "obj/NiObject.h"
-#include "obj/AParticleModifier.h"
+#include "NiParticleSystemController.h"
+#include "../gen/Particle.h"
+#include "NiObject.h"
+#include "AParticleModifier.h"
 
 //Definition of TYPE constant
 const Type NiParticleSystemController::TYPE("NiParticleSystemController", &NI_PARTICLE_SYSTEM_CONTROLLER_PARENT::TYPE );
diff --git a/obj/NiParticleSystemController.h b/obj/NiParticleSystemController.h
index 95412f1be834d704dab1218ee20cb3943e1250c8..8dec946827edbf7ce1154c2a2c702dfec2f6204c 100644
--- a/obj/NiParticleSystemController.h
+++ b/obj/NiParticleSystemController.h
@@ -6,14 +6,14 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiTimeController.h"
 // Include structures
-#include "gen/Particle.h"
+#include "../gen/Particle.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiObject;
 class AParticleModifier;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiParticleSystemController;
 typedef Ref<NiParticleSystemController> NiParticleSystemControllerRef;
diff --git a/obj/NiParticles.cpp b/obj/NiParticles.cpp
index 68ad6fce4615ed33be3c5238f4defa59dc91b1c8..95f0051f240aaf8073631e304776982ab74e2967 100644
--- a/obj/NiParticles.cpp
+++ b/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 "obj/NiParticles.h"
+#include "NiParticles.h"
 
 //Definition of TYPE constant
 const Type NiParticles::TYPE("NiParticles", &NI_PARTICLES_PARENT::TYPE );
diff --git a/obj/NiParticles.h b/obj/NiParticles.h
index cbc6e69c83728c9fc862ce07d2e5173039b6a52d..c0db8ad64e23de9a74f685bbc8d83ada18bc1b53 100644
--- a/obj/NiParticles.h
+++ b/obj/NiParticles.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiTriBasedGeom.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiParticles;
 typedef Ref<NiParticles> NiParticlesRef;
diff --git a/obj/NiParticlesData.cpp b/obj/NiParticlesData.cpp
index d34ee156819968e2cdf4880609b2b7f60c147f5e..c824746cc4be424b5cbc1f0cefc3c121838dbb43 100644
--- a/obj/NiParticlesData.cpp
+++ b/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 "obj/NiParticlesData.h"
+#include "NiParticlesData.h"
 
 //Definition of TYPE constant
 const Type NiParticlesData::TYPE("NiParticlesData", &NI_PARTICLES_DATA_PARENT::TYPE );
diff --git a/obj/NiParticlesData.h b/obj/NiParticlesData.h
index 90af61e8f0f753710601a0c32a7e82bc61e1aadd..ca84d4df4830c6171a8482f1e43997bf4e005c7b 100644
--- a/obj/NiParticlesData.h
+++ b/obj/NiParticlesData.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiAutoNormalParticlesData.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiParticlesData;
 typedef Ref<NiParticlesData> NiParticlesDataRef;
diff --git a/obj/NiPathController.cpp b/obj/NiPathController.cpp
index 8c46bac394fd6b0cdb4b02fdf68e1c2a1615ab6b..631c564af873db72ce1e1bc7026b7a6bf9eb58b0 100644
--- a/obj/NiPathController.cpp
+++ b/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 "obj/NiPathController.h"
-#include "obj/NiPosData.h"
-#include "obj/NiFloatData.h"
+#include "NiPathController.h"
+#include "NiPosData.h"
+#include "NiFloatData.h"
 
 //Definition of TYPE constant
 const Type NiPathController::TYPE("NiPathController", &NI_PATH_CONTROLLER_PARENT::TYPE );
diff --git a/obj/NiPathController.h b/obj/NiPathController.h
index dd7ef5de27da1f4b495676fe44f1bf81aa991c67..9fbd12809297665e5c0d8084257979166f4f96b3 100644
--- a/obj/NiPathController.h
+++ b/obj/NiPathController.h
@@ -7,11 +7,11 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiTimeController.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiPosData;
 class NiFloatData;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPathController;
 typedef Ref<NiPathController> NiPathControllerRef;
diff --git a/obj/NiPathInterpolator.cpp b/obj/NiPathInterpolator.cpp
index 148e93672d11fe454a0286be181b1c55cc05df01..9c1d3e53944d8a520d3a37e560ee867b82086884 100644
--- a/obj/NiPathInterpolator.cpp
+++ b/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 "obj/NiPathInterpolator.h"
-#include "obj/NiPosData.h"
-#include "obj/NiFloatData.h"
+#include "NiPathInterpolator.h"
+#include "NiPosData.h"
+#include "NiFloatData.h"
 
 //Definition of TYPE constant
 const Type NiPathInterpolator::TYPE("NiPathInterpolator", &NI_PATH_INTERPOLATOR_PARENT::TYPE );
diff --git a/obj/NiPathInterpolator.h b/obj/NiPathInterpolator.h
index ae6fb6beaeebc924be34862bbc919ddf74a3d6a8..89cf6cd27f147b94d787cee9bb0423d5e7b94e1e 100644
--- a/obj/NiPathInterpolator.h
+++ b/obj/NiPathInterpolator.h
@@ -7,11 +7,11 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiBlendInterpolator.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiPosData;
 class NiFloatData;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPathInterpolator;
 typedef Ref<NiPathInterpolator> NiPathInterpolatorRef;
diff --git a/obj/NiPixelData.cpp b/obj/NiPixelData.cpp
index ecf81206fd68fbdbe38f24efd72722feb1af426d..aec5f017c597d276c115755ba7b789c9b95f6d56 100644
--- a/obj/NiPixelData.cpp
+++ b/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 "obj/NiPixelData.h"
-#include "gen/MipMap.h"
-#include "gen/ByteArray.h"
-#include "obj/NiPalette.h"
+#include "NiPixelData.h"
+#include "../gen/MipMap.h"
+#include "../gen/ByteArray.h"
+#include "NiPalette.h"
 
 //Definition of TYPE constant
 const Type NiPixelData::TYPE("NiPixelData", &NI_PIXEL_DATA_PARENT::TYPE );
diff --git a/obj/NiPixelData.h b/obj/NiPixelData.h
index 188604e9090022dd3548b6566c352191ff32b133..54b7169a744c7558ba181936258a4356634db5e1 100644
--- a/obj/NiPixelData.h
+++ b/obj/NiPixelData.h
@@ -6,14 +6,14 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiObject.h"
 // Include structures
-#include "gen/MipMap.h"
-#include "gen/ByteArray.h"
+#include "../gen/MipMap.h"
+#include "../gen/ByteArray.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiPalette;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPixelData;
 typedef Ref<NiPixelData> NiPixelDataRef;
diff --git a/obj/NiPlanarCollider.cpp b/obj/NiPlanarCollider.cpp
index 1048a559ae56987cb7c1b5533a797e7925bc1e1f..67dd21ddddd5225d6bce2bf58612a04f2f1d09ce 100644
--- a/obj/NiPlanarCollider.cpp
+++ b/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 "obj/NiPlanarCollider.h"
+#include "NiPlanarCollider.h"
 
 //Definition of TYPE constant
 const Type NiPlanarCollider::TYPE("NiPlanarCollider", &NI_PLANAR_COLLIDER_PARENT::TYPE );
diff --git a/obj/NiPlanarCollider.h b/obj/NiPlanarCollider.h
index 76f8a483279e1bdc74a10f27f15884adfb39b887..1c1da9914878e2da4a05c58908d7d3c05f34c7c8 100644
--- a/obj/NiPlanarCollider.h
+++ b/obj/NiPlanarCollider.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "AParticleModifier.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPlanarCollider;
 typedef Ref<NiPlanarCollider> NiPlanarColliderRef;
diff --git a/obj/NiPoint3Interpolator.cpp b/obj/NiPoint3Interpolator.cpp
index 1bfeabb12e7ee85f3b698006bc3dbfcdddc7805a..9159f67af785621f33fd715c230e237e2d147306 100644
--- a/obj/NiPoint3Interpolator.cpp
+++ b/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 "obj/NiPoint3Interpolator.h"
-#include "obj/NiPosData.h"
+#include "NiPoint3Interpolator.h"
+#include "NiPosData.h"
 
 //Definition of TYPE constant
 const Type NiPoint3Interpolator::TYPE("NiPoint3Interpolator", &NI_POINT3_INTERPOLATOR_PARENT::TYPE );
diff --git a/obj/NiPoint3Interpolator.h b/obj/NiPoint3Interpolator.h
index d152ff97166e14a923185609772b4b275199d548..874effd1721c68faedf763ff5cc57a683e7eca11 100644
--- a/obj/NiPoint3Interpolator.h
+++ b/obj/NiPoint3Interpolator.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiInterpolator.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiPosData;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPoint3Interpolator;
 typedef Ref<NiPoint3Interpolator> NiPoint3InterpolatorRef;
diff --git a/obj/NiPointLight.cpp b/obj/NiPointLight.cpp
index 22e84bda9ae52f1a299385de7f6bd4d3a36a093f..38b2cf60e1ce540a41da0bb1f3179bc3422de0a2 100644
--- a/obj/NiPointLight.cpp
+++ b/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 "obj/NiPointLight.h"
+#include "NiPointLight.h"
 
 //Definition of TYPE constant
 const Type NiPointLight::TYPE("NiPointLight", &NI_POINT_LIGHT_PARENT::TYPE );
diff --git a/obj/NiPointLight.h b/obj/NiPointLight.h
index b3a8353aa17981001c71d10ab9303287e4cb5d15..f5520ab9e876ad2e5d125a40399b977d44fc700d 100644
--- a/obj/NiPointLight.h
+++ b/obj/NiPointLight.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiLight.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPointLight;
 typedef Ref<NiPointLight> NiPointLightRef;
diff --git a/obj/NiPosData.cpp b/obj/NiPosData.cpp
index c4e582107eb612790fb30c5dc5b6ff91d7ff1edf..b145240be0a0753e525049e79c075e76330294e3 100644
--- a/obj/NiPosData.cpp
+++ b/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 "obj/NiPosData.h"
-#include "gen/KeyGroup.h"
+#include "NiPosData.h"
+#include "../gen/KeyGroup.h"
 
 //Definition of TYPE constant
 const Type NiPosData::TYPE("NiPosData", &NI_POS_DATA_PARENT::TYPE );
diff --git a/obj/NiPosData.h b/obj/NiPosData.h
index a499a4e3bf8ae001112edfcc9ce482a2bcaf4433..8bfbe5ae5d0924746dce02fee1ffdbae3e00344f 100644
--- a/obj/NiPosData.h
+++ b/obj/NiPosData.h
@@ -6,9 +6,9 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "AKeyedData.h"
 // Include structures
-#include "gen/KeyGroup.h"
+#include "../gen/KeyGroup.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiPosData;
 typedef Ref<NiPosData> NiPosDataRef;
diff --git a/obj/NiProperty.cpp b/obj/NiProperty.cpp
index 9b0ff2d9721bfcbd564a62e7cf0b363e84b52f9c..51077e1ef03c61349fda89935263dd5dd3db00ba 100644
--- a/obj/NiProperty.cpp
+++ b/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 "obj/NiProperty.h"
+#include "NiProperty.h"
 
 //Definition of TYPE constant
 const Type NiProperty::TYPE("NiProperty", &NI_PROPERTY_PARENT::TYPE );
diff --git a/obj/NiProperty.h b/obj/NiProperty.h
index 6c50949f7e2542950365211eaf67666e382a7cdf..5b06bbc672c7b52c970268f98960aff015f9ac9e 100644
--- a/obj/NiProperty.h
+++ b/obj/NiProperty.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiObjectNET.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiProperty;
 typedef Ref<NiProperty> NiPropertyRef;
diff --git a/obj/NiRangeLODData.cpp b/obj/NiRangeLODData.cpp
index a4aca1ea918f07b1d76771be753299851df7bba1..67e4ae6501e31dd92e1447a7225bc674682a0b9d 100644
--- a/obj/NiRangeLODData.cpp
+++ b/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 "obj/NiRangeLODData.h"
-#include "gen/LODRange.h"
+#include "NiRangeLODData.h"
+#include "../gen/LODRange.h"
 
 //Definition of TYPE constant
 const Type NiRangeLODData::TYPE("NiRangeLODData", &NI_RANGE_L_O_D_DATA_PARENT::TYPE );
diff --git a/obj/NiRangeLODData.h b/obj/NiRangeLODData.h
index 9d02e4e446f3b20c50a43ede0e6ab81236740b14..c6d3fc86f2182dbf5e9d3be3119d43bfc05e789e 100644
--- a/obj/NiRangeLODData.h
+++ b/obj/NiRangeLODData.h
@@ -6,9 +6,9 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiObject.h"
 // Include structures
-#include "gen/LODRange.h"
+#include "../gen/LODRange.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiRangeLODData;
 typedef Ref<NiRangeLODData> NiRangeLODDataRef;
diff --git a/obj/NiRotatingParticles.cpp b/obj/NiRotatingParticles.cpp
index 183a2b49f266a2576385595ad2090d6e5adf1c14..a8895595ffbf39410371fabe24e3edd1170b3c5f 100644
--- a/obj/NiRotatingParticles.cpp
+++ b/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 "obj/NiRotatingParticles.h"
+#include "NiRotatingParticles.h"
 
 //Definition of TYPE constant
 const Type NiRotatingParticles::TYPE("NiRotatingParticles", &NI_ROTATING_PARTICLES_PARENT::TYPE );
diff --git a/obj/NiRotatingParticles.h b/obj/NiRotatingParticles.h
index 5272e874d0cd6bc3c2c745aa0e989b8cdb4f7527..ada62b291a784e80a3a8cf405ef5914ac3b4e846 100644
--- a/obj/NiRotatingParticles.h
+++ b/obj/NiRotatingParticles.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiParticles.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiRotatingParticles;
 typedef Ref<NiRotatingParticles> NiRotatingParticlesRef;
diff --git a/obj/NiRotatingParticlesData.cpp b/obj/NiRotatingParticlesData.cpp
index 0621c1d99f44f634ab0502ee86c7406c5048cfee..09f1b55d56b8e96ac7263b40b5c47b150a611797 100644
--- a/obj/NiRotatingParticlesData.cpp
+++ b/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 "obj/NiRotatingParticlesData.h"
+#include "NiRotatingParticlesData.h"
 
 //Definition of TYPE constant
 const Type NiRotatingParticlesData::TYPE("NiRotatingParticlesData", &NI_ROTATING_PARTICLES_DATA_PARENT::TYPE );
diff --git a/obj/NiRotatingParticlesData.h b/obj/NiRotatingParticlesData.h
index f7b081d951f4c1ae7d719f850e097a5d88e67368..fd0928c7c39fe6ce0f536b832f98731294304dac 100644
--- a/obj/NiRotatingParticlesData.h
+++ b/obj/NiRotatingParticlesData.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiParticlesData.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiRotatingParticlesData;
 typedef Ref<NiRotatingParticlesData> NiRotatingParticlesDataRef;
diff --git a/obj/NiScreenLODData.cpp b/obj/NiScreenLODData.cpp
index 984c453b47e4e23c9ec6b9621ee1d6e777d98db1..3e472ae226f5425ca0bdb501e0bc56b87d5755a8 100644
--- a/obj/NiScreenLODData.cpp
+++ b/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 "obj/NiScreenLODData.h"
+#include "NiScreenLODData.h"
 
 //Definition of TYPE constant
 const Type NiScreenLODData::TYPE("NiScreenLODData", &NI_SCREEN_L_O_D_DATA_PARENT::TYPE );
diff --git a/obj/NiScreenLODData.h b/obj/NiScreenLODData.h
index 2e2e1eb95b95bb4d14750271c6b8c30478e5fd38..bed0e92e7d2dd8fc5ab674d5b7ba94f42647f742 100644
--- a/obj/NiScreenLODData.h
+++ b/obj/NiScreenLODData.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiObject.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiScreenLODData;
 typedef Ref<NiScreenLODData> NiScreenLODDataRef;
diff --git a/obj/NiSequenceStreamHelper.cpp b/obj/NiSequenceStreamHelper.cpp
index 84bd59d81f42f3eb98f028a90c6ab2ed44b337e9..52839fef97a5e08e0d1ba5b689f5b117b368a5a5 100644
--- a/obj/NiSequenceStreamHelper.cpp
+++ b/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 "obj/NiSequenceStreamHelper.h"
+#include "NiSequenceStreamHelper.h"
 
 //Definition of TYPE constant
 const Type NiSequenceStreamHelper::TYPE("NiSequenceStreamHelper", &NI_SEQUENCE_STREAM_HELPER_PARENT::TYPE );
diff --git a/obj/NiSequenceStreamHelper.h b/obj/NiSequenceStreamHelper.h
index 973b92acfd5b69339a43ac978305a50dffdf19ff..6ab0af27e6150aaf48811226320aa8c65a6256e7 100644
--- a/obj/NiSequenceStreamHelper.h
+++ b/obj/NiSequenceStreamHelper.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiObjectNET.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiSequenceStreamHelper;
 typedef Ref<NiSequenceStreamHelper> NiSequenceStreamHelperRef;
diff --git a/obj/NiShadeProperty.cpp b/obj/NiShadeProperty.cpp
index 19fbcade55d6d7a0a0ecec3e2066daa18a868922..f956e0135cec096756f9f5f16c291bc9e1220e42 100644
--- a/obj/NiShadeProperty.cpp
+++ b/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 "obj/NiShadeProperty.h"
+#include "NiShadeProperty.h"
 
 //Definition of TYPE constant
 const Type NiShadeProperty::TYPE("NiShadeProperty", &NI_SHADE_PROPERTY_PARENT::TYPE );
diff --git a/obj/NiShadeProperty.h b/obj/NiShadeProperty.h
index ffba5cdd0c75c264bb8c9f08630fe61cc005a43d..6d1ee88655bf86e367288d575921015618bc7b5d 100644
--- a/obj/NiShadeProperty.h
+++ b/obj/NiShadeProperty.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiProperty.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiShadeProperty;
 typedef Ref<NiShadeProperty> NiShadePropertyRef;
diff --git a/obj/NiSingleInterpolatorController.cpp b/obj/NiSingleInterpolatorController.cpp
index 9178bb405aa1fcbdcd5b5159d4b0dbcf351593fb..d579594d30d3dad0747950dbdb167f06b356cb29 100644
--- a/obj/NiSingleInterpolatorController.cpp
+++ b/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 "obj/NiSingleInterpolatorController.h"
-#include "obj/NiInterpolator.h"
+#include "NiSingleInterpolatorController.h"
+#include "NiInterpolator.h"
 
 //Definition of TYPE constant
 const Type NiSingleInterpolatorController::TYPE("NiSingleInterpolatorController", &NI_SINGLE_INTERPOLATOR_CONTROLLER_PARENT::TYPE );
diff --git a/obj/NiSingleInterpolatorController.h b/obj/NiSingleInterpolatorController.h
index 07fbb3e2f59f60126a667e83df58983ded1701e9..381fc266cb9805ac007d28e9d56e072c6fae5d24 100644
--- a/obj/NiSingleInterpolatorController.h
+++ b/obj/NiSingleInterpolatorController.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiTimeController.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiInterpolator;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiSingleInterpolatorController;
 typedef Ref<NiSingleInterpolatorController> NiSingleInterpolatorControllerRef;
diff --git a/obj/NiSkinData.cpp b/obj/NiSkinData.cpp
index 040166df2be3319763ec410827c4cbae90d4c4fc..4a775f423fcda5ad794f13a1908a70472181818b 100644
--- a/obj/NiSkinData.cpp
+++ b/obj/NiSkinData.cpp
@@ -1,10 +1,10 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "obj/NiSkinData.h"
-#include "gen/SkinData.h"
-#include "gen/SkinWeight.h"
-#include "obj/NiSkinPartition.h"
+#include "NiSkinData.h"
+#include "../gen/SkinData.h"
+#include "../gen/SkinWeight.h"
+#include "NiSkinPartition.h"
 
 //Definition of TYPE constant
 const Type NiSkinData::TYPE("NiSkinData", &NI_SKIN_DATA_PARENT::TYPE );
diff --git a/obj/NiSkinData.h b/obj/NiSkinData.h
index fd9ada28782275e88e8eeef0467dd3acb9f5be27..118c816e1f277ef8676db6a62740fb4e24559de4 100644
--- a/obj/NiSkinData.h
+++ b/obj/NiSkinData.h
@@ -6,13 +6,13 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiObject.h"
 // Include structures
-#include "gen/SkinData.h"
+#include "../gen/SkinData.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiSkinPartition;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiSkinData;
 typedef Ref<NiSkinData> NiSkinDataRef;
diff --git a/obj/NiSkinInstance.cpp b/obj/NiSkinInstance.cpp
index 522ddefd3fa2a8939603fc53234a06606befb162..9bd21d50b76e38d96e8978cd94b1621f4ff1ee7a 100644
--- a/obj/NiSkinInstance.cpp
+++ b/obj/NiSkinInstance.cpp
@@ -1,12 +1,12 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "obj/NiSkinInstance.h"
-#include "gen/Bones.h"
-#include "obj/NiNode.h"
-#include "obj/NiSkinData.h"
-#include "obj/NiSkinPartition.h"
-#include "obj/NiNode.h"
+#include "NiSkinInstance.h"
+#include "../gen/Bones.h"
+#include "NiNode.h"
+#include "NiSkinData.h"
+#include "NiSkinPartition.h"
+#include "NiNode.h"
 
 //Definition of TYPE constant
 const Type NiSkinInstance::TYPE("NiSkinInstance", &NI_SKIN_INSTANCE_PARENT::TYPE );
diff --git a/obj/NiSkinInstance.h b/obj/NiSkinInstance.h
index b5b68b4f33fa7d51696b72790a14fe425ed31116..f98f8b242aa5ed386f1a78e557a0c8be730cba27 100644
--- a/obj/NiSkinInstance.h
+++ b/obj/NiSkinInstance.h
@@ -6,15 +6,15 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiObject.h"
 // Include structures
-#include "gen/Bones.h"
+#include "../gen/Bones.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiSkinData;
 class NiSkinPartition;
 class NiNode;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiSkinInstance;
 typedef Ref<NiSkinInstance> NiSkinInstanceRef;
diff --git a/obj/NiSkinPartition.cpp b/obj/NiSkinPartition.cpp
index 7acd62fd83849bee961496e4b3b309bee9712205..0b7ce03f840830d7dba8ec67fdc55a1302016e38 100644
--- a/obj/NiSkinPartition.cpp
+++ b/obj/NiSkinPartition.cpp
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "obj/NiSkinPartition.h"
-#include "gen/SkinPartition.h"
+#include "NiSkinPartition.h"
+#include "../gen/SkinPartition.h"
 
 //Definition of TYPE constant
 const Type NiSkinPartition::TYPE("NiSkinPartition", &NI_SKIN_PARTITION_PARENT::TYPE );
diff --git a/obj/NiSkinPartition.h b/obj/NiSkinPartition.h
index 56b5516a2e7366d105cd55b5cd9697a5ebc514af..a427f7165d5c8e70dd1366a7850c9185f3c67283 100644
--- a/obj/NiSkinPartition.h
+++ b/obj/NiSkinPartition.h
@@ -6,9 +6,9 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiObject.h"
 // Include structures
-#include "gen/SkinPartition.h"
+#include "../gen/SkinPartition.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiSkinPartition;
 typedef Ref<NiSkinPartition> NiSkinPartitionRef;
diff --git a/obj/NiSourceTexture.cpp b/obj/NiSourceTexture.cpp
index d635faa195db24ac9ebcb64b2917a63f2580fb3f..dd950235fed6152997456535004655447b42541b 100644
--- a/obj/NiSourceTexture.cpp
+++ b/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 "obj/NiSourceTexture.h"
-#include "obj/NiObject.h"
-#include "obj/NiPixelData.h"
+#include "NiSourceTexture.h"
+#include "NiObject.h"
+#include "NiPixelData.h"
 
 //Definition of TYPE constant
 const Type NiSourceTexture::TYPE("NiSourceTexture", &NI_SOURCE_TEXTURE_PARENT::TYPE );
diff --git a/obj/NiSourceTexture.h b/obj/NiSourceTexture.h
index cba1862d2a2d1e566e902959f3d6551fd83b64cb..1add5bd18fd6895f5af8e60fc387200971c96624 100644
--- a/obj/NiSourceTexture.h
+++ b/obj/NiSourceTexture.h
@@ -7,11 +7,11 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiObjectNET.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiObject;
 class NiPixelData;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiSourceTexture;
 typedef Ref<NiSourceTexture> NiSourceTextureRef;
diff --git a/obj/NiSpecularProperty.cpp b/obj/NiSpecularProperty.cpp
index 9a1a6b1ab8ca5761b480a1f6731a5b08fac7d35b..ff7c2a44c90aa742169efe6d42b9e2addff412d0 100644
--- a/obj/NiSpecularProperty.cpp
+++ b/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 "obj/NiSpecularProperty.h"
+#include "NiSpecularProperty.h"
 
 //Definition of TYPE constant
 const Type NiSpecularProperty::TYPE("NiSpecularProperty", &NI_SPECULAR_PROPERTY_PARENT::TYPE );
diff --git a/obj/NiSpecularProperty.h b/obj/NiSpecularProperty.h
index e8a0b8245f01ed47cde6406a46f91e28c771e496..01b4013aa7c9d82bcbce74321e42d024629a8eda 100644
--- a/obj/NiSpecularProperty.h
+++ b/obj/NiSpecularProperty.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiProperty.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiSpecularProperty;
 typedef Ref<NiSpecularProperty> NiSpecularPropertyRef;
diff --git a/obj/NiSphericalCollider.cpp b/obj/NiSphericalCollider.cpp
index d45c028aff12df156861cbcb05095903a893f00e..87651fac4fc88efcf5b3c90cd7d6d1cb2a1c6c9b 100644
--- a/obj/NiSphericalCollider.cpp
+++ b/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 "obj/NiSphericalCollider.h"
+#include "NiSphericalCollider.h"
 
 //Definition of TYPE constant
 const Type NiSphericalCollider::TYPE("NiSphericalCollider", &NI_SPHERICAL_COLLIDER_PARENT::TYPE );
diff --git a/obj/NiSphericalCollider.h b/obj/NiSphericalCollider.h
index 1026b30ace3534be80225f37b813a34aea14cc31..cac0b44291d9451435f1661b2df63a9bf8998ac1 100644
--- a/obj/NiSphericalCollider.h
+++ b/obj/NiSphericalCollider.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "AParticleModifier.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiSphericalCollider;
 typedef Ref<NiSphericalCollider> NiSphericalColliderRef;
diff --git a/obj/NiSpotLight.cpp b/obj/NiSpotLight.cpp
index e106c037895452e0a8642d6fdda3b963d1d8409e..6c7e3eb312483515006e33f5b34b4a13f685d5b9 100644
--- a/obj/NiSpotLight.cpp
+++ b/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 "obj/NiSpotLight.h"
+#include "NiSpotLight.h"
 
 //Definition of TYPE constant
 const Type NiSpotLight::TYPE("NiSpotLight", &NI_SPOT_LIGHT_PARENT::TYPE );
diff --git a/obj/NiSpotLight.h b/obj/NiSpotLight.h
index 05845497838ff7798e5f9d929523d68cb9ec8805..ad6e865bc88d8280266af3a2e9a42139bb8a2c16 100644
--- a/obj/NiSpotLight.h
+++ b/obj/NiSpotLight.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPointLight.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiSpotLight;
 typedef Ref<NiSpotLight> NiSpotLightRef;
diff --git a/obj/NiStencilProperty.cpp b/obj/NiStencilProperty.cpp
index 4f82d676bce8c54fb774bbde169f9a9e0085582c..935945789485c31bbe77d4e1b2ef8c3c5608a46e 100644
--- a/obj/NiStencilProperty.cpp
+++ b/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 "obj/NiStencilProperty.h"
+#include "NiStencilProperty.h"
 
 //Definition of TYPE constant
 const Type NiStencilProperty::TYPE("NiStencilProperty", &NI_STENCIL_PROPERTY_PARENT::TYPE );
diff --git a/obj/NiStencilProperty.h b/obj/NiStencilProperty.h
index 242c79636b56061f105445aa5bbbc1c853b96af7..ffb576885401f644037cb3c3dfdd95d7a09a6ccb 100644
--- a/obj/NiStencilProperty.h
+++ b/obj/NiStencilProperty.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiProperty.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiStencilProperty;
 typedef Ref<NiStencilProperty> NiStencilPropertyRef;
diff --git a/obj/NiStringExtraData.cpp b/obj/NiStringExtraData.cpp
index e7c5883a2ac319f8a2a747bd7b3be7378ba4e43a..abab2583d0447a13f461755f053beb6466c5df2f 100644
--- a/obj/NiStringExtraData.cpp
+++ b/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 "obj/NiStringExtraData.h"
+#include "NiStringExtraData.h"
 
 //Definition of TYPE constant
 const Type NiStringExtraData::TYPE("NiStringExtraData", &NI_STRING_EXTRA_DATA_PARENT::TYPE );
diff --git a/obj/NiStringExtraData.h b/obj/NiStringExtraData.h
index 62a9fb85f44a2645ff1bc39a71a9ce10ec3869b5..3656b4e31315e6939a12151fcc8b97c151489da3 100644
--- a/obj/NiStringExtraData.h
+++ b/obj/NiStringExtraData.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiExtraData.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiStringExtraData;
 typedef Ref<NiStringExtraData> NiStringExtraDataRef;
diff --git a/obj/NiStringPalette.cpp b/obj/NiStringPalette.cpp
index d1092c28c2df95b1fd41be14b3b9928bae1c40cc..8d7c6f266923fc2f34906a1b7f3a535a0ace17fb 100644
--- a/obj/NiStringPalette.cpp
+++ b/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 "obj/NiStringPalette.h"
-#include "gen/StringPalette.h"
+#include "NiStringPalette.h"
+#include "../gen/StringPalette.h"
 
 //Definition of TYPE constant
 const Type NiStringPalette::TYPE("NiStringPalette", &NI_STRING_PALETTE_PARENT::TYPE );
diff --git a/obj/NiStringPalette.h b/obj/NiStringPalette.h
index c6cd2da8e42cdbde3e70f5b98b8b00e6842a427d..ed0ac1c1229eda809847b9eaea571006137b0b52 100644
--- a/obj/NiStringPalette.h
+++ b/obj/NiStringPalette.h
@@ -6,9 +6,9 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiObject.h"
 // Include structures
-#include "gen/StringPalette.h"
+#include "../gen/StringPalette.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiStringPalette;
 typedef Ref<NiStringPalette> NiStringPaletteRef;
diff --git a/obj/NiStringsExtraData.cpp b/obj/NiStringsExtraData.cpp
index 6fcf4d8be40e364459276bebab1cb42fdfb29cb2..07b860a32e1ef1beede56e083cf36dc694184058 100644
--- a/obj/NiStringsExtraData.cpp
+++ b/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 "obj/NiStringsExtraData.h"
+#include "NiStringsExtraData.h"
 
 //Definition of TYPE constant
 const Type NiStringsExtraData::TYPE("NiStringsExtraData", &NI_STRINGS_EXTRA_DATA_PARENT::TYPE );
diff --git a/obj/NiStringsExtraData.h b/obj/NiStringsExtraData.h
index c6dde8e9af23318bee9f58bbae2c768fae4191e6..32ee24337ef09fa7476901f869dbe60f79b39a6c 100644
--- a/obj/NiStringsExtraData.h
+++ b/obj/NiStringsExtraData.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiExtraData.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiStringsExtraData;
 typedef Ref<NiStringsExtraData> NiStringsExtraDataRef;
diff --git a/obj/NiTextKeyExtraData.cpp b/obj/NiTextKeyExtraData.cpp
index bb9e22483286d3bfde0a549c7b88e3322c13b5ac..e9f8d82d0973d4b992d080c0b90fa375a85a5297 100644
--- a/obj/NiTextKeyExtraData.cpp
+++ b/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 "obj/NiTextKeyExtraData.h"
+#include "NiTextKeyExtraData.h"
 
 //Definition of TYPE constant
 const Type NiTextKeyExtraData::TYPE("NiTextKeyExtraData", &NI_TEXT_KEY_EXTRA_DATA_PARENT::TYPE );
diff --git a/obj/NiTextKeyExtraData.h b/obj/NiTextKeyExtraData.h
index f91a11878fefd135f24459de5bbf67a9e76d12a5..9ca116c673cf24adaf25a94c0de85dbf64ed8fa5 100644
--- a/obj/NiTextKeyExtraData.h
+++ b/obj/NiTextKeyExtraData.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiExtraData.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiTextKeyExtraData;
 typedef Ref<NiTextKeyExtraData> NiTextKeyExtraDataRef;
diff --git a/obj/NiTextureEffect.cpp b/obj/NiTextureEffect.cpp
index bb96acef461c7c5a0e405f570c51751c148e35cc..b7d1710ea66fce8cded0d9b1c97fcff23f94b854 100644
--- a/obj/NiTextureEffect.cpp
+++ b/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 "obj/NiTextureEffect.h"
-#include "obj/NiSourceTexture.h"
+#include "NiTextureEffect.h"
+#include "NiSourceTexture.h"
 
 //Definition of TYPE constant
 const Type NiTextureEffect::TYPE("NiTextureEffect", &NI_TEXTURE_EFFECT_PARENT::TYPE );
diff --git a/obj/NiTextureEffect.h b/obj/NiTextureEffect.h
index 85ccdd1a7e092c94c33665d4cc77e924759164d4..ee3b26f43d69796724fb00c109f512f2adfc2965 100644
--- a/obj/NiTextureEffect.h
+++ b/obj/NiTextureEffect.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiDynamicEffect.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiSourceTexture;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiTextureEffect;
 typedef Ref<NiTextureEffect> NiTextureEffectRef;
diff --git a/obj/NiTextureTransformController.cpp b/obj/NiTextureTransformController.cpp
index 2238711434d467dfdc38cd204a0080a23267fd0f..cd48cd3989a2e406a015f4b3cbaf22772ab17372 100644
--- a/obj/NiTextureTransformController.cpp
+++ b/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 "obj/NiTextureTransformController.h"
-#include "obj/NiFloatData.h"
+#include "NiTextureTransformController.h"
+#include "NiFloatData.h"
 
 //Definition of TYPE constant
 const Type NiTextureTransformController::TYPE("NiTextureTransformController", &NI_TEXTURE_TRANSFORM_CONTROLLER_PARENT::TYPE );
diff --git a/obj/NiTextureTransformController.h b/obj/NiTextureTransformController.h
index ca7c4e3a4e7fb43fdafdc29fd02153b03e7323e6..0fa0abdd098cc752549b7557067439c449cce8c1 100644
--- a/obj/NiTextureTransformController.h
+++ b/obj/NiTextureTransformController.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiSingleInterpolatorController.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiFloatData;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiTextureTransformController;
 typedef Ref<NiTextureTransformController> NiTextureTransformControllerRef;
diff --git a/obj/NiTexturingProperty.cpp b/obj/NiTexturingProperty.cpp
index a117b91e79f16501d807d6b28c8faa88ded749c4..eb44de5c323ac03b394a31f4bcad1cff6a83b948 100644
--- a/obj/NiTexturingProperty.cpp
+++ b/obj/NiTexturingProperty.cpp
@@ -1,26 +1,26 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "obj/NiTexturingProperty.h"
-#include "gen/TexDesc.h"
-#include "obj/NiSourceTexture.h"
-#include "gen/TexDesc.h"
-#include "obj/NiSourceTexture.h"
-#include "gen/TexDesc.h"
-#include "obj/NiSourceTexture.h"
-#include "gen/TexDesc.h"
-#include "obj/NiSourceTexture.h"
-#include "gen/TexDesc.h"
-#include "obj/NiSourceTexture.h"
-#include "gen/TexDesc.h"
-#include "obj/NiSourceTexture.h"
-#include "gen/TexDesc.h"
-#include "obj/NiSourceTexture.h"
-#include "gen/TexDesc.h"
-#include "obj/NiSourceTexture.h"
-#include "gen/ShaderTexDesc.h"
-#include "gen/TexDesc.h"
-#include "obj/NiSourceTexture.h"
+#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"
 
 //Definition of TYPE constant
 const Type NiTexturingProperty::TYPE("NiTexturingProperty", &NI_TEXTURING_PROPERTY_PARENT::TYPE );
diff --git a/obj/NiTexturingProperty.h b/obj/NiTexturingProperty.h
index 53de796ead52963be3e59c6b32309eb6f048a79b..a10eeb819df6adf6cece8a1e6d0022e05b4e1cbc 100644
--- a/obj/NiTexturingProperty.h
+++ b/obj/NiTexturingProperty.h
@@ -6,10 +6,10 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiProperty.h"
 // Include structures
-#include "gen/TexDesc.h"
-#include "gen/ShaderTexDesc.h"
+#include "../gen/TexDesc.h"
+#include "../gen/ShaderTexDesc.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiTexturingProperty;
 typedef Ref<NiTexturingProperty> NiTexturingPropertyRef;
diff --git a/obj/NiTimeController.cpp b/obj/NiTimeController.cpp
index ddc38f9b0b8246ab08a076dcecf5ba1fbfb50dcf..9fa87f720cb8ae5b86ef44a1745072681dde8691 100644
--- a/obj/NiTimeController.cpp
+++ b/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 "obj/NiTimeController.h"
-#include "obj/NiObject.h"
+#include "NiTimeController.h"
+#include "NiObject.h"
 
 //Definition of TYPE constant
 const Type NiTimeController::TYPE("NiTimeController", &NI_TIME_CONTROLLER_PARENT::TYPE );
diff --git a/obj/NiTimeController.h b/obj/NiTimeController.h
index 500ecbcc46588d27e7db02692a3dff43822a6785..3576dd3a52ebcd5aac773d4eb755e1e469bc8488 100644
--- a/obj/NiTimeController.h
+++ b/obj/NiTimeController.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiObject.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiObject;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiTimeController;
 typedef Ref<NiTimeController> NiTimeControllerRef;
diff --git a/obj/NiTransformController.cpp b/obj/NiTransformController.cpp
index d8bcc651aa9d25d208d2222e0091147ec6fa767a..bc1d4fec632e176c59f3293086e0eaf06b07779e 100644
--- a/obj/NiTransformController.cpp
+++ b/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 "obj/NiTransformController.h"
+#include "NiTransformController.h"
 
 //Definition of TYPE constant
 const Type NiTransformController::TYPE("NiTransformController", &NI_TRANSFORM_CONTROLLER_PARENT::TYPE );
diff --git a/obj/NiTransformController.h b/obj/NiTransformController.h
index 1f132611c307f52b779e3437f5799d9f2cfc19f0..6ba456a3e5915fe52b4f9fa4da97975517a954fb 100644
--- a/obj/NiTransformController.h
+++ b/obj/NiTransformController.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiSingleInterpolatorController.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiTransformController;
 typedef Ref<NiTransformController> NiTransformControllerRef;
diff --git a/obj/NiTransformData.cpp b/obj/NiTransformData.cpp
index 5a1030b5fccafe2a2fdecb223af5c105535284e3..811484030e2180aa4a6b68fbc7c040865a5844b6 100644
--- a/obj/NiTransformData.cpp
+++ b/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 "obj/NiTransformData.h"
+#include "NiTransformData.h"
 
 //Definition of TYPE constant
 const Type NiTransformData::TYPE("NiTransformData", &NI_TRANSFORM_DATA_PARENT::TYPE );
diff --git a/obj/NiTransformData.h b/obj/NiTransformData.h
index d7d7b4dd48c048ff93923352c843a308f21f9629..927aa5f811709663b1eae3545f6dfd3fe8b7e25c 100644
--- a/obj/NiTransformData.h
+++ b/obj/NiTransformData.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiKeyframeData.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiTransformData;
 typedef Ref<NiTransformData> NiTransformDataRef;
diff --git a/obj/NiTransformInterpolator.cpp b/obj/NiTransformInterpolator.cpp
index e552840113b37f5490aa49b0310f479546eafc70..0f3aa7b3cf28fe886cec10064c3b0f2d67de7a74 100644
--- a/obj/NiTransformInterpolator.cpp
+++ b/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 "obj/NiTransformInterpolator.h"
-#include "obj/NiTransformData.h"
+#include "NiTransformInterpolator.h"
+#include "NiTransformData.h"
 
 //Definition of TYPE constant
 const Type NiTransformInterpolator::TYPE("NiTransformInterpolator", &NI_TRANSFORM_INTERPOLATOR_PARENT::TYPE );
diff --git a/obj/NiTransformInterpolator.h b/obj/NiTransformInterpolator.h
index dad4044f43adac0def2b05dbd63a1af1c74c3eef..a93982b552ce2e5908c5883da2e6b397af843211 100644
--- a/obj/NiTransformInterpolator.h
+++ b/obj/NiTransformInterpolator.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiInterpolator.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiTransformData;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiTransformInterpolator;
 typedef Ref<NiTransformInterpolator> NiTransformInterpolatorRef;
diff --git a/obj/NiTriBasedGeom.cpp b/obj/NiTriBasedGeom.cpp
index 11814bbd38450a566f1c74b5eec057f9dd9c05a2..cfb0a011e20ce3f40398505a212b18633175d722 100644
--- a/obj/NiTriBasedGeom.cpp
+++ b/obj/NiTriBasedGeom.cpp
@@ -1,10 +1,10 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#include "obj/NiTriBasedGeom.h"
-#include "obj/NiTriBasedGeomData.h"
-#include "obj/NiSkinInstance.h"
-#include "obj/NiObject.h"
+#include "NiTriBasedGeom.h"
+#include "NiTriBasedGeomData.h"
+#include "NiSkinInstance.h"
+#include "NiObject.h"
 
 //Definition of TYPE constant
 const Type NiTriBasedGeom::TYPE("NiTriBasedGeom", &NI_TRI_BASED_GEOM_PARENT::TYPE );
diff --git a/obj/NiTriBasedGeom.h b/obj/NiTriBasedGeom.h
index 717575a460fb8443202cb0eadcf9c1933b77d222..cd4465099d46f9d4a189cc78eed2b917dae9d798 100644
--- a/obj/NiTriBasedGeom.h
+++ b/obj/NiTriBasedGeom.h
@@ -7,12 +7,12 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiAVObject.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiTriBasedGeomData;
 class NiSkinInstance;
 class NiObject;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiTriBasedGeom;
 typedef Ref<NiTriBasedGeom> NiTriBasedGeomRef;
diff --git a/obj/NiTriBasedGeomData.cpp b/obj/NiTriBasedGeomData.cpp
index c34b3a5c8fef9c3cb3b27842c0f9f8cf0a91f02c..7e0f91e2ffefc374d4d2add2d6b4e9d170d8b9c4 100644
--- a/obj/NiTriBasedGeomData.cpp
+++ b/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 "obj/NiTriBasedGeomData.h"
-#include "obj/NiObject.h"
+#include "NiTriBasedGeomData.h"
+#include "NiObject.h"
 
 //Definition of TYPE constant
 const Type NiTriBasedGeomData::TYPE("NiTriBasedGeomData", &NI_TRI_BASED_GEOM_DATA_PARENT::TYPE );
diff --git a/obj/NiTriBasedGeomData.h b/obj/NiTriBasedGeomData.h
index da3c3262c175d5e8837b2e5d067d345da307ccee..445845737827cdd8d7b0cd66bf451af0e4ddc6c4 100644
--- a/obj/NiTriBasedGeomData.h
+++ b/obj/NiTriBasedGeomData.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiObject.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiObject;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiTriBasedGeomData;
 typedef Ref<NiTriBasedGeomData> NiTriBasedGeomDataRef;
diff --git a/obj/NiTriShape.cpp b/obj/NiTriShape.cpp
index 4d429df329dd3970f28a6bb8a1f9309d228d2625..0b5d6475f4fde373b1af5a271a812b036432ba60 100644
--- a/obj/NiTriShape.cpp
+++ b/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 "obj/NiTriShape.h"
+#include "NiTriShape.h"
 
 //Definition of TYPE constant
 const Type NiTriShape::TYPE("NiTriShape", &NI_TRI_SHAPE_PARENT::TYPE );
diff --git a/obj/NiTriShape.h b/obj/NiTriShape.h
index 4b55fb5aaed56e856fad9bd95951d3f577db90d6..c428ff6cf2f7a53b553827d750cda76742b02185 100644
--- a/obj/NiTriShape.h
+++ b/obj/NiTriShape.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiTriBasedGeom.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiTriShape;
 typedef Ref<NiTriShape> NiTriShapeRef;
diff --git a/obj/NiTriShapeData.cpp b/obj/NiTriShapeData.cpp
index 1c3267b2a8c44cc65fa706e5e482bdd29e005d71..735a952fbbd139f67fa8cb11ef95533b4972e4b4 100644
--- a/obj/NiTriShapeData.cpp
+++ b/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 "obj/NiTriShapeData.h"
-#include "gen/MatchGroup.h"
+#include "NiTriShapeData.h"
+#include "../gen/MatchGroup.h"
 
 //Definition of TYPE constant
 const Type NiTriShapeData::TYPE("NiTriShapeData", &NI_TRI_SHAPE_DATA_PARENT::TYPE );
diff --git a/obj/NiTriShapeData.h b/obj/NiTriShapeData.h
index 97fb2d300ef43a75aac25a784599ac4806edcb39..34186db794a5828cfdffe0d7a135e2fb9c05d790 100644
--- a/obj/NiTriShapeData.h
+++ b/obj/NiTriShapeData.h
@@ -6,9 +6,9 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiTriBasedGeomData.h"
 // Include structures
-#include "gen/MatchGroup.h"
+#include "../gen/MatchGroup.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiTriShapeData;
 typedef Ref<NiTriShapeData> NiTriShapeDataRef;
diff --git a/obj/NiTriStrips.cpp b/obj/NiTriStrips.cpp
index 33242f9cba1573106898cc696016bee3b466716a..2b0a118cae314e3ba2b0b8579feb106c7574baa0 100644
--- a/obj/NiTriStrips.cpp
+++ b/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 "obj/NiTriStrips.h"
+#include "NiTriStrips.h"
 
 //Definition of TYPE constant
 const Type NiTriStrips::TYPE("NiTriStrips", &NI_TRI_STRIPS_PARENT::TYPE );
diff --git a/obj/NiTriStrips.h b/obj/NiTriStrips.h
index ab453e6838f663159c83c16665b84c227e85c147..e7f659afec21cfc06a29ee84a88608e9f0305f17 100644
--- a/obj/NiTriStrips.h
+++ b/obj/NiTriStrips.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiTriBasedGeom.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiTriStrips;
 typedef Ref<NiTriStrips> NiTriStripsRef;
diff --git a/obj/NiTriStripsData.cpp b/obj/NiTriStripsData.cpp
index 59995743ca50d13adb893cf9a7a4e84c80ee2e50..f8c5fcf59f53b5d5b2bfa8c7653ca8f2d242bd6d 100644
--- a/obj/NiTriStripsData.cpp
+++ b/obj/NiTriStripsData.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/NiTriStripsData.h"
+#include "NiTriStripsData.h"
 
 //Definition of TYPE constant
 const Type NiTriStripsData::TYPE("NiTriStripsData", &NI_TRI_STRIPS_DATA_PARENT::TYPE );
diff --git a/obj/NiTriStripsData.h b/obj/NiTriStripsData.h
index d7a42c41aa8dca2be29f870c169d4c4ae1ec3e09..9a669eb4aaefa5437e7fdf1f587717a679f16d4f 100644
--- a/obj/NiTriStripsData.h
+++ b/obj/NiTriStripsData.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiTriBasedGeomData.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiTriStripsData;
 typedef Ref<NiTriStripsData> NiTriStripsDataRef;
diff --git a/obj/NiUVController.cpp b/obj/NiUVController.cpp
index fe9b042f45af46d639eaea383571d45b8d436237..136a5d6a4165f208eea0057bcee8646885c06f5c 100644
--- a/obj/NiUVController.cpp
+++ b/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 "obj/NiUVController.h"
-#include "obj/NiUVData.h"
+#include "NiUVController.h"
+#include "NiUVData.h"
 
 //Definition of TYPE constant
 const Type NiUVController::TYPE("NiUVController", &NI_U_V_CONTROLLER_PARENT::TYPE );
diff --git a/obj/NiUVController.h b/obj/NiUVController.h
index d70ce62d51f9565ee8c6bc0039541f622910c3d6..11ad3f6f1685250f87f6f083e89030e246f7745c 100644
--- a/obj/NiUVController.h
+++ b/obj/NiUVController.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiTimeController.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiUVData;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiUVController;
 typedef Ref<NiUVController> NiUVControllerRef;
diff --git a/obj/NiUVData.cpp b/obj/NiUVData.cpp
index 378b55644797622c7d2e79891f1166f27c113482..5f6c2b592b8485c6f80c5e4a4017c41678a8619a 100644
--- a/obj/NiUVData.cpp
+++ b/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 "obj/NiUVData.h"
-#include "gen/KeyGroup.h"
+#include "NiUVData.h"
+#include "../gen/KeyGroup.h"
 
 //Definition of TYPE constant
 const Type NiUVData::TYPE("NiUVData", &NI_U_V_DATA_PARENT::TYPE );
diff --git a/obj/NiUVData.h b/obj/NiUVData.h
index 923597e3393f440f9703fe36c8545a2d302d5fe4..5609a7cc24ef78c9f5ca14094f2fb4e17a331158 100644
--- a/obj/NiUVData.h
+++ b/obj/NiUVData.h
@@ -6,9 +6,9 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiObject.h"
 // Include structures
-#include "gen/KeyGroup.h"
+#include "../gen/KeyGroup.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiUVData;
 typedef Ref<NiUVData> NiUVDataRef;
diff --git a/obj/NiVectorExtraData.cpp b/obj/NiVectorExtraData.cpp
index 848d7754993d66570524195558224a5f3497f362..2bd5ffae500096a0f9e2f6073afd7d3c03a0d155 100644
--- a/obj/NiVectorExtraData.cpp
+++ b/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 "obj/NiVectorExtraData.h"
+#include "NiVectorExtraData.h"
 
 //Definition of TYPE constant
 const Type NiVectorExtraData::TYPE("NiVectorExtraData", &NI_VECTOR_EXTRA_DATA_PARENT::TYPE );
diff --git a/obj/NiVectorExtraData.h b/obj/NiVectorExtraData.h
index 0846a15d0cd42d2411eaea36ec7f377001b3dcad..4e7f0852a41a972a928a82d1c285f8eb5459d4ea 100644
--- a/obj/NiVectorExtraData.h
+++ b/obj/NiVectorExtraData.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiExtraData.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiVectorExtraData;
 typedef Ref<NiVectorExtraData> NiVectorExtraDataRef;
diff --git a/obj/NiVertWeightsExtraData.cpp b/obj/NiVertWeightsExtraData.cpp
index 3e7cb3b293665916de1a3e4dc96288044977db45..ea2559cd2529a9069fe32834a3ea7683014a8cb8 100644
--- a/obj/NiVertWeightsExtraData.cpp
+++ b/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 "obj/NiVertWeightsExtraData.h"
+#include "NiVertWeightsExtraData.h"
 
 //Definition of TYPE constant
 const Type NiVertWeightsExtraData::TYPE("NiVertWeightsExtraData", &NI_VERT_WEIGHTS_EXTRA_DATA_PARENT::TYPE );
diff --git a/obj/NiVertWeightsExtraData.h b/obj/NiVertWeightsExtraData.h
index eff679e341f72971273d579075990663e565b667..f49134b50195dac833f4e1749c27b06692ca386e 100644
--- a/obj/NiVertWeightsExtraData.h
+++ b/obj/NiVertWeightsExtraData.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiExtraData.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiVertWeightsExtraData;
 typedef Ref<NiVertWeightsExtraData> NiVertWeightsExtraDataRef;
diff --git a/obj/NiVertexColorProperty.cpp b/obj/NiVertexColorProperty.cpp
index 3d41ef6f5d09638a66022498f27d842be6459d31..62fda8d266e8f36dc16fb5ecc65bd33601791379 100644
--- a/obj/NiVertexColorProperty.cpp
+++ b/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 "obj/NiVertexColorProperty.h"
+#include "NiVertexColorProperty.h"
 
 //Definition of TYPE constant
 const Type NiVertexColorProperty::TYPE("NiVertexColorProperty", &NI_VERTEX_COLOR_PROPERTY_PARENT::TYPE );
diff --git a/obj/NiVertexColorProperty.h b/obj/NiVertexColorProperty.h
index 0e200ec7a1582016b9bb389f70d31a082ff0ce4b..993d53bdc1c06e1b745e158c4e210b63d558fd4e 100644
--- a/obj/NiVertexColorProperty.h
+++ b/obj/NiVertexColorProperty.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiProperty.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiVertexColorProperty;
 typedef Ref<NiVertexColorProperty> NiVertexColorPropertyRef;
diff --git a/obj/NiVisController.cpp b/obj/NiVisController.cpp
index b8bc125df93d61ff60bfb6a4651b0b99f0b5ae18..b4330414119b1cbedbb19547c751bb2f02f2cb46 100644
--- a/obj/NiVisController.cpp
+++ b/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 "obj/NiVisController.h"
-#include "obj/NiVisData.h"
+#include "NiVisController.h"
+#include "NiVisData.h"
 
 //Definition of TYPE constant
 const Type NiVisController::TYPE("NiVisController", &NI_VIS_CONTROLLER_PARENT::TYPE );
diff --git a/obj/NiVisController.h b/obj/NiVisController.h
index 591626356097a64638d330b2c62938900dfe2cfd..9cea16f74bbf0d427ec384305e3f0acae70a463e 100644
--- a/obj/NiVisController.h
+++ b/obj/NiVisController.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiSingleInterpolatorController.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiVisData;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiVisController;
 typedef Ref<NiVisController> NiVisControllerRef;
diff --git a/obj/NiVisData.cpp b/obj/NiVisData.cpp
index 5bc4f4a0e2e7cf5cd39e9d6b30f5a93757ffd5c8..d6808f9a4ee9ee15b5b41a1e8d403bda88fb8f69 100644
--- a/obj/NiVisData.cpp
+++ b/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 "obj/NiVisData.h"
+#include "NiVisData.h"
 
 //Definition of TYPE constant
 const Type NiVisData::TYPE("NiVisData", &NI_VIS_DATA_PARENT::TYPE );
diff --git a/obj/NiVisData.h b/obj/NiVisData.h
index 4edbd5d5a2539d832961ad8701b6f580fb775bc2..cb8b2057797de41c6dc625959e8bf90420792cd0 100644
--- a/obj/NiVisData.h
+++ b/obj/NiVisData.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "AKeyedData.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiVisData;
 typedef Ref<NiVisData> NiVisDataRef;
diff --git a/obj/NiWireframeProperty.cpp b/obj/NiWireframeProperty.cpp
index 4d557cbb9173122f665ee325875ffc165b870ac8..c87a1044493e5c3c7ac34d316b9f93cf6d373bca 100644
--- a/obj/NiWireframeProperty.cpp
+++ b/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 "obj/NiWireframeProperty.h"
+#include "NiWireframeProperty.h"
 
 //Definition of TYPE constant
 const Type NiWireframeProperty::TYPE("NiWireframeProperty", &NI_WIREFRAME_PROPERTY_PARENT::TYPE );
diff --git a/obj/NiWireframeProperty.h b/obj/NiWireframeProperty.h
index 59bfcc851f3bf7e6bb5fdeaf8f4c8bb43db2a799..72f89cc9039622dbd319dbe15ebbf9f304d89941 100644
--- a/obj/NiWireframeProperty.h
+++ b/obj/NiWireframeProperty.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiProperty.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiWireframeProperty;
 typedef Ref<NiWireframeProperty> NiWireframePropertyRef;
diff --git a/obj/NiZBufferProperty.cpp b/obj/NiZBufferProperty.cpp
index 59207f72681e8bb625fb5b6220378808a4ab7d15..30d68868adc5d20a28d135e2db7e05d076fe76fb 100644
--- a/obj/NiZBufferProperty.cpp
+++ b/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 "obj/NiZBufferProperty.h"
+#include "NiZBufferProperty.h"
 
 //Definition of TYPE constant
 const Type NiZBufferProperty::TYPE("NiZBufferProperty", &NI_Z_BUFFER_PROPERTY_PARENT::TYPE );
diff --git a/obj/NiZBufferProperty.h b/obj/NiZBufferProperty.h
index 975f1b79657b5ca0472e70f4935a7c16d8385542..2ef1c9ac38489c5ad7a859c1fb531de3e149d882 100644
--- a/obj/NiZBufferProperty.h
+++ b/obj/NiZBufferProperty.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiProperty.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class NiZBufferProperty;
 typedef Ref<NiZBufferProperty> NiZBufferPropertyRef;
diff --git a/obj/RootCollisionNode.cpp b/obj/RootCollisionNode.cpp
index ab925beb73b4e371965e243a69db619baefbc814..f9fb9eaf5db513ed65edeb3dc6f7b109e7db340d 100644
--- a/obj/RootCollisionNode.cpp
+++ b/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 "obj/RootCollisionNode.h"
+#include "RootCollisionNode.h"
 
 //Definition of TYPE constant
 const Type RootCollisionNode::TYPE("RootCollisionNode", &ROOT_COLLISION_NODE_PARENT::TYPE );
diff --git a/obj/RootCollisionNode.h b/obj/RootCollisionNode.h
index 9250a3401485f3162e6ae936ac983e49401331fa..3d597ea3d4a5417b04c1ee51a2e502e0fcaf1365 100644
--- a/obj/RootCollisionNode.h
+++ b/obj/RootCollisionNode.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiNode.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class RootCollisionNode;
 typedef Ref<RootCollisionNode> RootCollisionNodeRef;
diff --git a/obj/bhkBlendCollisionObject.cpp b/obj/bhkBlendCollisionObject.cpp
index 5f11d44d2844a39439116d8433606b4f4165e4bc..884d618cdd156765dcb445441cfd2bafbeb89eaa 100644
--- a/obj/bhkBlendCollisionObject.cpp
+++ b/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 "obj/bhkBlendCollisionObject.h"
+#include "bhkBlendCollisionObject.h"
 
 //Definition of TYPE constant
 const Type bhkBlendCollisionObject::TYPE("bhkBlendCollisionObject", &BHK_BLEND_COLLISION_OBJECT_PARENT::TYPE );
diff --git a/obj/bhkBlendCollisionObject.h b/obj/bhkBlendCollisionObject.h
index 813b2ab37348ad143c88b37994541c4e5897f09a..07bc1fc49d09ee1ced4e09604019cf6b670a8740 100644
--- a/obj/bhkBlendCollisionObject.h
+++ b/obj/bhkBlendCollisionObject.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiCollisionObject.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class bhkBlendCollisionObject;
 typedef Ref<bhkBlendCollisionObject> bhkBlendCollisionObjectRef;
diff --git a/obj/bhkBlendController.cpp b/obj/bhkBlendController.cpp
index d639cda31bf5286fca4215b58b81dc13e289108f..36f3d2ff19d86b59405956d5a957b8e985524310 100644
--- a/obj/bhkBlendController.cpp
+++ b/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 "obj/bhkBlendController.h"
+#include "bhkBlendController.h"
 
 //Definition of TYPE constant
 const Type bhkBlendController::TYPE("bhkBlendController", &BHK_BLEND_CONTROLLER_PARENT::TYPE );
diff --git a/obj/bhkBlendController.h b/obj/bhkBlendController.h
index 6d094e0375a8043cefd58f15c36789d835b2a963..20ed17fda75268bfc1cef17f9d6e9ddcf130258a 100644
--- a/obj/bhkBlendController.h
+++ b/obj/bhkBlendController.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiTimeController.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class bhkBlendController;
 typedef Ref<bhkBlendController> bhkBlendControllerRef;
diff --git a/obj/bhkBoxShape.cpp b/obj/bhkBoxShape.cpp
index a6556422b36ceb56c8a608022d783c4dbb44c86f..4f80ca1bfdb62e85842d6b9e5cd9b08cd6311b27 100644
--- a/obj/bhkBoxShape.cpp
+++ b/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 "obj/bhkBoxShape.h"
+#include "bhkBoxShape.h"
 
 //Definition of TYPE constant
 const Type bhkBoxShape::TYPE("bhkBoxShape", &BHK_BOX_SHAPE_PARENT::TYPE );
diff --git a/obj/bhkBoxShape.h b/obj/bhkBoxShape.h
index f65b72adde33c68a2c8d4e5037b2419c8fea4880..e5deb885d4af4dc6bc0d6c6b0391e57e04e4087e 100644
--- a/obj/bhkBoxShape.h
+++ b/obj/bhkBoxShape.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkConvexShape.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class bhkBoxShape;
 typedef Ref<bhkBoxShape> bhkBoxShapeRef;
diff --git a/obj/bhkCapsuleShape.cpp b/obj/bhkCapsuleShape.cpp
index 5c20b0611625d08b3cb3a9e8d2816fe8be1936db..908736ec2cbbcd639993fedd19208e46a0348678 100644
--- a/obj/bhkCapsuleShape.cpp
+++ b/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 "obj/bhkCapsuleShape.h"
+#include "bhkCapsuleShape.h"
 
 //Definition of TYPE constant
 const Type bhkCapsuleShape::TYPE("bhkCapsuleShape", &BHK_CAPSULE_SHAPE_PARENT::TYPE );
diff --git a/obj/bhkCapsuleShape.h b/obj/bhkCapsuleShape.h
index dcebd38b3775e97998a2a8c1b0389a3f8adae0d8..6080792b91b82f3346bd905ca011ea5bad06a361 100644
--- a/obj/bhkCapsuleShape.h
+++ b/obj/bhkCapsuleShape.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkConvexShape.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class bhkCapsuleShape;
 typedef Ref<bhkCapsuleShape> bhkCapsuleShapeRef;
diff --git a/obj/bhkCollisionObject.cpp b/obj/bhkCollisionObject.cpp
index 959ad0ac0254cf217a8daa21650bb97b8783c440..d9894ec965420a28fdb28986cb7b333d23292368 100644
--- a/obj/bhkCollisionObject.cpp
+++ b/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 "obj/bhkCollisionObject.h"
+#include "bhkCollisionObject.h"
 
 //Definition of TYPE constant
 const Type bhkCollisionObject::TYPE("bhkCollisionObject", &BHK_COLLISION_OBJECT_PARENT::TYPE );
diff --git a/obj/bhkCollisionObject.h b/obj/bhkCollisionObject.h
index 96e4a6073ea44b51f6a2303ca7d557714566a735..076f0bf0ef5ff79b30fef1f3e50e82b0bafa2e1c 100644
--- a/obj/bhkCollisionObject.h
+++ b/obj/bhkCollisionObject.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiCollisionObject.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class bhkCollisionObject;
 typedef Ref<bhkCollisionObject> bhkCollisionObjectRef;
diff --git a/obj/bhkConvexShape.cpp b/obj/bhkConvexShape.cpp
index f41f1e955c7572f5d6b5345d8c4c394ad62471f7..b8aa4b29b87203d517dd4c56f860516ab05ba221 100644
--- a/obj/bhkConvexShape.cpp
+++ b/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 "obj/bhkConvexShape.h"
+#include "bhkConvexShape.h"
 
 //Definition of TYPE constant
 const Type bhkConvexShape::TYPE("bhkConvexShape", &BHK_CONVEX_SHAPE_PARENT::TYPE );
diff --git a/obj/bhkConvexShape.h b/obj/bhkConvexShape.h
index 24044d1aab83f7ff4a83817a189ab91abab32c8e..ee36507668b1c6ac793a185bb9e5cb51bb57b5a5 100644
--- a/obj/bhkConvexShape.h
+++ b/obj/bhkConvexShape.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkSphereRepShape.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class bhkConvexShape;
 typedef Ref<bhkConvexShape> bhkConvexShapeRef;
diff --git a/obj/bhkConvexTransformShape.cpp b/obj/bhkConvexTransformShape.cpp
index c7ee8ce1a3e033ad7e5364a70b22bd287b899113..59489caeaccd54b9e6ba888f94e77888462e3339 100644
--- a/obj/bhkConvexTransformShape.cpp
+++ b/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 "obj/bhkConvexTransformShape.h"
+#include "bhkConvexTransformShape.h"
 
 //Definition of TYPE constant
 const Type bhkConvexTransformShape::TYPE("bhkConvexTransformShape", &BHK_CONVEX_TRANSFORM_SHAPE_PARENT::TYPE );
diff --git a/obj/bhkConvexTransformShape.h b/obj/bhkConvexTransformShape.h
index b4fb87bc2fb2a4e8e5a55b6bd8e85decb6b9eff7..e75bf042b2e023fba01896165b4133245d2ca032 100644
--- a/obj/bhkConvexTransformShape.h
+++ b/obj/bhkConvexTransformShape.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkTransformShape.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class bhkConvexTransformShape;
 typedef Ref<bhkConvexTransformShape> bhkConvexTransformShapeRef;
diff --git a/obj/bhkConvexVerticesShape.cpp b/obj/bhkConvexVerticesShape.cpp
index 04c6d69ea5278e8e809cfb1235670b2a213537de..095f3a652f4427060af5a43b38957b3256e15aed 100644
--- a/obj/bhkConvexVerticesShape.cpp
+++ b/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 "obj/bhkConvexVerticesShape.h"
+#include "bhkConvexVerticesShape.h"
 
 //Definition of TYPE constant
 const Type bhkConvexVerticesShape::TYPE("bhkConvexVerticesShape", &BHK_CONVEX_VERTICES_SHAPE_PARENT::TYPE );
diff --git a/obj/bhkConvexVerticesShape.h b/obj/bhkConvexVerticesShape.h
index f3b2de39cfa71e10ee59285a17d414fc534f8431..05ec8a16258aca42eab059fafe937ef389ef82d1 100644
--- a/obj/bhkConvexVerticesShape.h
+++ b/obj/bhkConvexVerticesShape.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkSphereRepShape.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class bhkConvexVerticesShape;
 typedef Ref<bhkConvexVerticesShape> bhkConvexVerticesShapeRef;
diff --git a/obj/bhkEntity.cpp b/obj/bhkEntity.cpp
index 25a89e38e71a92b99864123d95ef697f549aaf79..e0a321476ee7ef5386029bba65969db3828d9ec6 100644
--- a/obj/bhkEntity.cpp
+++ b/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 "obj/bhkEntity.h"
-#include "obj/bhkShape.h"
+#include "bhkEntity.h"
+#include "bhkShape.h"
 
 //Definition of TYPE constant
 const Type bhkEntity::TYPE("bhkEntity", &BHK_ENTITY_PARENT::TYPE );
diff --git a/obj/bhkEntity.h b/obj/bhkEntity.h
index c51a451795c61dfbca7640bb02d07a40b953df4a..d365238e7c46ac6c329e2dff9fef9af395148a56 100644
--- a/obj/bhkEntity.h
+++ b/obj/bhkEntity.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "bhkWorldObject.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class bhkShape;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class bhkEntity;
 typedef Ref<bhkEntity> bhkEntityRef;
diff --git a/obj/bhkHingeConstraint.cpp b/obj/bhkHingeConstraint.cpp
index f7019635dea788cc5db8650b7b21f24744ca979e..e25a2697c528f197daa248e21d544fdf43c94f60 100644
--- a/obj/bhkHingeConstraint.cpp
+++ b/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 "obj/bhkHingeConstraint.h"
+#include "bhkHingeConstraint.h"
 
 //Definition of TYPE constant
 const Type bhkHingeConstraint::TYPE("bhkHingeConstraint", &BHK_HINGE_CONSTRAINT_PARENT::TYPE );
diff --git a/obj/bhkHingeConstraint.h b/obj/bhkHingeConstraint.h
index 7a6908be6e9f8026681222a733143a78b8b8c285..27a7af98ad0a8a8035084ac26a3ea2392c385d24 100644
--- a/obj/bhkHingeConstraint.h
+++ b/obj/bhkHingeConstraint.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "AbhkConstraint.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class bhkHingeConstraint;
 typedef Ref<bhkHingeConstraint> bhkHingeConstraintRef;
diff --git a/obj/bhkLimitedHingeConstraint.cpp b/obj/bhkLimitedHingeConstraint.cpp
index 6d26e47ec0089714f0b4287cdf13d83dcd468b9b..2bbd29e1bb13e4270e4ec72b6ee8fe3429851247 100644
--- a/obj/bhkLimitedHingeConstraint.cpp
+++ b/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 "obj/bhkLimitedHingeConstraint.h"
-#include "gen/LimitedHingeDescriptor.h"
+#include "bhkLimitedHingeConstraint.h"
+#include "../gen/LimitedHingeDescriptor.h"
 
 //Definition of TYPE constant
 const Type bhkLimitedHingeConstraint::TYPE("bhkLimitedHingeConstraint", &BHK_LIMITED_HINGE_CONSTRAINT_PARENT::TYPE );
diff --git a/obj/bhkLimitedHingeConstraint.h b/obj/bhkLimitedHingeConstraint.h
index a631b520e7681749fe3ed9cd40015dbe1093b063..5cbee63f0f224b7e272dc89b7257b0ef776b3966 100644
--- a/obj/bhkLimitedHingeConstraint.h
+++ b/obj/bhkLimitedHingeConstraint.h
@@ -6,9 +6,9 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "AbhkConstraint.h"
 // Include structures
-#include "gen/LimitedHingeDescriptor.h"
+#include "../gen/LimitedHingeDescriptor.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class bhkLimitedHingeConstraint;
 typedef Ref<bhkLimitedHingeConstraint> bhkLimitedHingeConstraintRef;
diff --git a/obj/bhkListShape.cpp b/obj/bhkListShape.cpp
index 8a1a959ac84f619392d03dc65d0e056cbbeffc7c..30c0ed2ba59c612215b2c718a2e09d77df973a48 100644
--- a/obj/bhkListShape.cpp
+++ b/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 "obj/bhkListShape.h"
-#include "obj/bhkShape.h"
+#include "bhkListShape.h"
+#include "bhkShape.h"
 
 //Definition of TYPE constant
 const Type bhkListShape::TYPE("bhkListShape", &BHK_LIST_SHAPE_PARENT::TYPE );
diff --git a/obj/bhkListShape.h b/obj/bhkListShape.h
index f7eb4539c96f3239dce27d76d42af09763ccbcab..5a91d72c1fa39755b787a0aa747465b34fa202d0 100644
--- a/obj/bhkListShape.h
+++ b/obj/bhkListShape.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "AbhkShapeCollection.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class bhkShape;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class bhkListShape;
 typedef Ref<bhkListShape> bhkListShapeRef;
diff --git a/obj/bhkMalleableConstraint.cpp b/obj/bhkMalleableConstraint.cpp
index a88d61af0e93593b8af92e02cc291f62a075f19c..cfc351519cc5e491e379b915bd52bf61ac017f4c 100644
--- a/obj/bhkMalleableConstraint.cpp
+++ b/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 "obj/bhkMalleableConstraint.h"
-#include "gen/RagDollDescriptor.h"
-#include "gen/LimitedHingeDescriptor.h"
-#include "obj/NiObject.h"
+#include "bhkMalleableConstraint.h"
+#include "../gen/RagDollDescriptor.h"
+#include "../gen/LimitedHingeDescriptor.h"
+#include "NiObject.h"
 
 //Definition of TYPE constant
 const Type bhkMalleableConstraint::TYPE("bhkMalleableConstraint", &BHK_MALLEABLE_CONSTRAINT_PARENT::TYPE );
diff --git a/obj/bhkMalleableConstraint.h b/obj/bhkMalleableConstraint.h
index 07e6761e34831234f43c6505d3a801da23f3be7f..2221ca89d20eb15bc1f40b298c9e62b5eb999700 100644
--- a/obj/bhkMalleableConstraint.h
+++ b/obj/bhkMalleableConstraint.h
@@ -6,14 +6,14 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "AbhkConstraint.h"
 // Include structures
-#include "gen/RagDollDescriptor.h"
-#include "gen/LimitedHingeDescriptor.h"
+#include "../gen/RagDollDescriptor.h"
+#include "../gen/LimitedHingeDescriptor.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiObject;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class bhkMalleableConstraint;
 typedef Ref<bhkMalleableConstraint> bhkMalleableConstraintRef;
diff --git a/obj/bhkMoppBvTreeShape.cpp b/obj/bhkMoppBvTreeShape.cpp
index 64ca780004d959c0de0fe3ad2b0b59d586fc0af5..b4c608577977d81a6a45d2133a3ec13c01bc398c 100644
--- a/obj/bhkMoppBvTreeShape.cpp
+++ b/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 "obj/bhkMoppBvTreeShape.h"
-#include "obj/bhkShape.h"
+#include "bhkMoppBvTreeShape.h"
+#include "bhkShape.h"
 
 //Definition of TYPE constant
 const Type bhkMoppBvTreeShape::TYPE("bhkMoppBvTreeShape", &BHK_MOPP_BV_TREE_SHAPE_PARENT::TYPE );
diff --git a/obj/bhkMoppBvTreeShape.h b/obj/bhkMoppBvTreeShape.h
index e2472815399a33a53256bf54fffa6f38b3700eed..d52b905fc3278a79abee591ac6c5fb68a561856a 100644
--- a/obj/bhkMoppBvTreeShape.h
+++ b/obj/bhkMoppBvTreeShape.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "bhkShape.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class bhkShape;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class bhkMoppBvTreeShape;
 typedef Ref<bhkMoppBvTreeShape> bhkMoppBvTreeShapeRef;
diff --git a/obj/bhkMultiSphereShape.cpp b/obj/bhkMultiSphereShape.cpp
index 84aca945f32e8a83688681deecf26bb77b82098f..cc28eaa84691f3000e960e259cd99af1d3930892 100644
--- a/obj/bhkMultiSphereShape.cpp
+++ b/obj/bhkMultiSphereShape.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/bhkMultiSphereShape.h"
+#include "bhkMultiSphereShape.h"
 
 //Definition of TYPE constant
 const Type bhkMultiSphereShape::TYPE("bhkMultiSphereShape", &BHK_MULTI_SPHERE_SHAPE_PARENT::TYPE );
diff --git a/obj/bhkMultiSphereShape.h b/obj/bhkMultiSphereShape.h
index 8f431c598be0eff7e9f1eb4d46b0eae9c74c4d44..c4f2842f13a6faf6ade3892983708845ff85b04a 100644
--- a/obj/bhkMultiSphereShape.h
+++ b/obj/bhkMultiSphereShape.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkSphereRepShape.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class bhkMultiSphereShape;
 typedef Ref<bhkMultiSphereShape> bhkMultiSphereShapeRef;
diff --git a/obj/bhkNiTriStripsShape.cpp b/obj/bhkNiTriStripsShape.cpp
index 7dd0bbe92a3b040cb5b18b6fc970d06dc9cce3f5..0a3ddb354346f1290fa8791e61fb6729a09fd586 100644
--- a/obj/bhkNiTriStripsShape.cpp
+++ b/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 "obj/bhkNiTriStripsShape.h"
-#include "obj/NiTriStripsData.h"
+#include "bhkNiTriStripsShape.h"
+#include "NiTriStripsData.h"
 
 //Definition of TYPE constant
 const Type bhkNiTriStripsShape::TYPE("bhkNiTriStripsShape", &BHK_NI_TRI_STRIPS_SHAPE_PARENT::TYPE );
diff --git a/obj/bhkNiTriStripsShape.h b/obj/bhkNiTriStripsShape.h
index 6c8f3700763d5e1d166e87755b0af9f6cf52810d..9b46ee6eef18b270876c88a17109121f98eda233 100644
--- a/obj/bhkNiTriStripsShape.h
+++ b/obj/bhkNiTriStripsShape.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "bhkSphereRepShape.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class NiTriStripsData;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class bhkNiTriStripsShape;
 typedef Ref<bhkNiTriStripsShape> bhkNiTriStripsShapeRef;
diff --git a/obj/bhkPackedNiTriStripsShape.cpp b/obj/bhkPackedNiTriStripsShape.cpp
index d25ab358305858528fcc689ed42d44a713b8bfbc..40f7635794e87881e4161b27711cfeb387f90357 100644
--- a/obj/bhkPackedNiTriStripsShape.cpp
+++ b/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 "obj/bhkPackedNiTriStripsShape.h"
-#include "obj/hkPackedNiTriStripsData.h"
+#include "bhkPackedNiTriStripsShape.h"
+#include "hkPackedNiTriStripsData.h"
 
 //Definition of TYPE constant
 const Type bhkPackedNiTriStripsShape::TYPE("bhkPackedNiTriStripsShape", &BHK_PACKED_NI_TRI_STRIPS_SHAPE_PARENT::TYPE );
diff --git a/obj/bhkPackedNiTriStripsShape.h b/obj/bhkPackedNiTriStripsShape.h
index 0c091024a0addcc77d33cfc70be631cfef8089af..76214d2650c73167f275ed7d2ea0c3fac60ee4d0 100644
--- a/obj/bhkPackedNiTriStripsShape.h
+++ b/obj/bhkPackedNiTriStripsShape.h
@@ -7,10 +7,10 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "AbhkShapeCollection.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class hkPackedNiTriStripsData;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class bhkPackedNiTriStripsShape;
 typedef Ref<bhkPackedNiTriStripsShape> bhkPackedNiTriStripsShapeRef;
diff --git a/obj/bhkPrismaticConstraint.cpp b/obj/bhkPrismaticConstraint.cpp
index 9cadff4f2899f6f599ead8c566c5a00f8ed99e6e..40d794f73c3d2cbd588c956ef9f170866f4145a1 100644
--- a/obj/bhkPrismaticConstraint.cpp
+++ b/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 "obj/bhkPrismaticConstraint.h"
+#include "bhkPrismaticConstraint.h"
 
 //Definition of TYPE constant
 const Type bhkPrismaticConstraint::TYPE("bhkPrismaticConstraint", &BHK_PRISMATIC_CONSTRAINT_PARENT::TYPE );
diff --git a/obj/bhkPrismaticConstraint.h b/obj/bhkPrismaticConstraint.h
index 8358c34c89271bd7b29deddb57765f359dd2d709..93c790d1af0eb6056205a876ed2952d47396c086 100644
--- a/obj/bhkPrismaticConstraint.h
+++ b/obj/bhkPrismaticConstraint.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "AbhkConstraint.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class bhkPrismaticConstraint;
 typedef Ref<bhkPrismaticConstraint> bhkPrismaticConstraintRef;
diff --git a/obj/bhkRagdollConstraint.cpp b/obj/bhkRagdollConstraint.cpp
index cb872b6206fdd3fb50fac937d1e3e7b0a7db18c4..eb8b3673bfe501efc8f6fe8f795ddb7d3b2c7de0 100644
--- a/obj/bhkRagdollConstraint.cpp
+++ b/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 "obj/bhkRagdollConstraint.h"
+#include "bhkRagdollConstraint.h"
 
 //Definition of TYPE constant
 const Type bhkRagdollConstraint::TYPE("bhkRagdollConstraint", &BHK_RAGDOLL_CONSTRAINT_PARENT::TYPE );
diff --git a/obj/bhkRagdollConstraint.h b/obj/bhkRagdollConstraint.h
index f56a79ac90e9f791f0d903b9204a81cf9a569775..f032529077e7f54e85cab3b2a07da1208723a539 100644
--- a/obj/bhkRagdollConstraint.h
+++ b/obj/bhkRagdollConstraint.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "AbhkRagdollConstraint.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class bhkRagdollConstraint;
 typedef Ref<bhkRagdollConstraint> bhkRagdollConstraintRef;
diff --git a/obj/bhkRefObject.cpp b/obj/bhkRefObject.cpp
index 3b21db78ee66c231bc177b7bcb910383430d4a2a..6fda87b3159504678ba97694d784f954a791d4a1 100644
--- a/obj/bhkRefObject.cpp
+++ b/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 "obj/bhkRefObject.h"
+#include "bhkRefObject.h"
 
 //Definition of TYPE constant
 const Type bhkRefObject::TYPE("bhkRefObject", &BHK_REF_OBJECT_PARENT::TYPE );
diff --git a/obj/bhkRefObject.h b/obj/bhkRefObject.h
index 2b3de3f16dbaf4ac412a566f7384ddb18004dbad..5e66d03b2c14fd4a851ebc0292ec3ad4988d54ec 100644
--- a/obj/bhkRefObject.h
+++ b/obj/bhkRefObject.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiObject.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class bhkRefObject;
 typedef Ref<bhkRefObject> bhkRefObjectRef;
diff --git a/obj/bhkRigidBody.cpp b/obj/bhkRigidBody.cpp
index 7ebf18329900e2b5e668738baf89d2ea90c914d5..775cee730963d13a117ecbc2b5690338f5b33e81 100644
--- a/obj/bhkRigidBody.cpp
+++ b/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 "obj/bhkRigidBody.h"
-#include "gen/QuaternionXYZW.h"
-#include "obj/AbhkConstraint.h"
+#include "bhkRigidBody.h"
+#include "../gen/QuaternionXYZW.h"
+#include "AbhkConstraint.h"
 
 //Definition of TYPE constant
 const Type bhkRigidBody::TYPE("bhkRigidBody", &BHK_RIGID_BODY_PARENT::TYPE );
diff --git a/obj/bhkRigidBody.h b/obj/bhkRigidBody.h
index 50759d236ff425f098935b49d335db521cbfd5c4..e9c986728bec317c0d2e58038319fcb713c89a9f 100644
--- a/obj/bhkRigidBody.h
+++ b/obj/bhkRigidBody.h
@@ -6,13 +6,13 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkEntity.h"
 // Include structures
-#include "gen/QuaternionXYZW.h"
+#include "../gen/QuaternionXYZW.h"
 
 // Forward define of referenced blocks
-#include "Ref.h"
+#include "../Ref.h"
 class AbhkConstraint;
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class bhkRigidBody;
 typedef Ref<bhkRigidBody> bhkRigidBodyRef;
diff --git a/obj/bhkRigidBodyT.cpp b/obj/bhkRigidBodyT.cpp
index fa444245537b4abb4224730323de8f0ce2f2a79f..a6baffd20c176f42f590f6bfdb0c08dbedad96a6 100644
--- a/obj/bhkRigidBodyT.cpp
+++ b/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 "obj/bhkRigidBodyT.h"
+#include "bhkRigidBodyT.h"
 
 //Definition of TYPE constant
 const Type bhkRigidBodyT::TYPE("bhkRigidBodyT", &BHK_RIGID_BODY_T_PARENT::TYPE );
diff --git a/obj/bhkRigidBodyT.h b/obj/bhkRigidBodyT.h
index 8436f91093c280ae5237c183bb1f252d4b3072ed..26b89681599bcd1874ed733285995d5ccdcf8a19 100644
--- a/obj/bhkRigidBodyT.h
+++ b/obj/bhkRigidBodyT.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkRigidBody.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class bhkRigidBodyT;
 typedef Ref<bhkRigidBodyT> bhkRigidBodyTRef;
diff --git a/obj/bhkSPCollisionObject.cpp b/obj/bhkSPCollisionObject.cpp
index c16d545aeb09662d74b4266e6f7beae34e3f7706..d403837def1832f309a056e92eca9d3f571643c2 100644
--- a/obj/bhkSPCollisionObject.cpp
+++ b/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 "obj/bhkSPCollisionObject.h"
+#include "bhkSPCollisionObject.h"
 
 //Definition of TYPE constant
 const Type bhkSPCollisionObject::TYPE("bhkSPCollisionObject", &BHK_S_P_COLLISION_OBJECT_PARENT::TYPE );
diff --git a/obj/bhkSPCollisionObject.h b/obj/bhkSPCollisionObject.h
index 4cd0256a532622056cbf3b57f7234a1013e48174..7d9a9b12b4ccc0760c5d4ea34f412e69dba0bc36 100644
--- a/obj/bhkSPCollisionObject.h
+++ b/obj/bhkSPCollisionObject.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiCollisionObject.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class bhkSPCollisionObject;
 typedef Ref<bhkSPCollisionObject> bhkSPCollisionObjectRef;
diff --git a/obj/bhkSerializable.cpp b/obj/bhkSerializable.cpp
index 706437ad615c023a268d80398c0906120da73e0a..9e0e22f9e7bbdf0c3420ee218dcf08bd784ab19a 100644
--- a/obj/bhkSerializable.cpp
+++ b/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 "obj/bhkSerializable.h"
+#include "bhkSerializable.h"
 
 //Definition of TYPE constant
 const Type bhkSerializable::TYPE("bhkSerializable", &BHK_SERIALIZABLE_PARENT::TYPE );
diff --git a/obj/bhkSerializable.h b/obj/bhkSerializable.h
index fc8ebe44f0ed6201f4b2f37a2b0df8358a1fb8fe..09a97d1ee5815c28f1631628ee87f283768accc1 100644
--- a/obj/bhkSerializable.h
+++ b/obj/bhkSerializable.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkRefObject.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class bhkSerializable;
 typedef Ref<bhkSerializable> bhkSerializableRef;
diff --git a/obj/bhkShape.cpp b/obj/bhkShape.cpp
index 1445590027932dddff8affcf36599544062ce797..a0c0c4724aba333574fc60426e19594240613928 100644
--- a/obj/bhkShape.cpp
+++ b/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 "obj/bhkShape.h"
+#include "bhkShape.h"
 
 //Definition of TYPE constant
 const Type bhkShape::TYPE("bhkShape", &BHK_SHAPE_PARENT::TYPE );
diff --git a/obj/bhkShape.h b/obj/bhkShape.h
index 5f919fe4ab6fc8c678ab2b669508d573dea6fafc..5ffd2c7aba20dc8f99e98c69c68d9f7ed5d3ad42 100644
--- a/obj/bhkShape.h
+++ b/obj/bhkShape.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkSerializable.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class bhkShape;
 typedef Ref<bhkShape> bhkShapeRef;
diff --git a/obj/bhkSimpleShapePhantom.cpp b/obj/bhkSimpleShapePhantom.cpp
index 344d93ebabf5c291695eda9f3ddfc7e0e08ef244..ce4b8c2957f10f428b9eaa84f749943ae3550555 100644
--- a/obj/bhkSimpleShapePhantom.cpp
+++ b/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 "obj/bhkSimpleShapePhantom.h"
+#include "bhkSimpleShapePhantom.h"
 
 //Definition of TYPE constant
 const Type bhkSimpleShapePhantom::TYPE("bhkSimpleShapePhantom", &BHK_SIMPLE_SHAPE_PHANTOM_PARENT::TYPE );
diff --git a/obj/bhkSimpleShapePhantom.h b/obj/bhkSimpleShapePhantom.h
index cfab6e6d32679171985cb3c8d3849f832423a37d..f7ef47d56e6ef0a6a88aa317a4b0cc951492df93 100644
--- a/obj/bhkSimpleShapePhantom.h
+++ b/obj/bhkSimpleShapePhantom.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkEntity.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class bhkSimpleShapePhantom;
 typedef Ref<bhkSimpleShapePhantom> bhkSimpleShapePhantomRef;
diff --git a/obj/bhkSphereRepShape.cpp b/obj/bhkSphereRepShape.cpp
index 7fb00a3134ade5ad75eb6ddbda461540dd2ec959..76747ba7bddb0f2064e430f7edc73da2c3be9e2c 100644
--- a/obj/bhkSphereRepShape.cpp
+++ b/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 "obj/bhkSphereRepShape.h"
+#include "bhkSphereRepShape.h"
 
 //Definition of TYPE constant
 const Type bhkSphereRepShape::TYPE("bhkSphereRepShape", &BHK_SPHERE_REP_SHAPE_PARENT::TYPE );
diff --git a/obj/bhkSphereRepShape.h b/obj/bhkSphereRepShape.h
index 85c38a2ccbaedd88a57162737f52501a70c62236..1b4f053862e2797b432857be8e9f669dba54d8ee 100644
--- a/obj/bhkSphereRepShape.h
+++ b/obj/bhkSphereRepShape.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkShape.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class bhkSphereRepShape;
 typedef Ref<bhkSphereRepShape> bhkSphereRepShapeRef;
diff --git a/obj/bhkSphereShape.cpp b/obj/bhkSphereShape.cpp
index 496e9e5ca0f2097ac3359795c7d6f798700d51b8..d8bb57472e3c1750f47c194887e8966d4247df91 100644
--- a/obj/bhkSphereShape.cpp
+++ b/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 "obj/bhkSphereShape.h"
+#include "bhkSphereShape.h"
 
 //Definition of TYPE constant
 const Type bhkSphereShape::TYPE("bhkSphereShape", &BHK_SPHERE_SHAPE_PARENT::TYPE );
diff --git a/obj/bhkSphereShape.h b/obj/bhkSphereShape.h
index e74ce5c2dbc94e5d7582693928cc5fd487425111..93980097727cc1c5fb04bd90010ec1377c95aec7 100644
--- a/obj/bhkSphereShape.h
+++ b/obj/bhkSphereShape.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkConvexShape.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class bhkSphereShape;
 typedef Ref<bhkSphereShape> bhkSphereShapeRef;
diff --git a/obj/bhkStiffSpringConstraint.cpp b/obj/bhkStiffSpringConstraint.cpp
index 665f8edc625117d1b6c69c93c2a47a20ff0659ff..d32730037b32ad4c3c4a9242e36ee694ce836059 100644
--- a/obj/bhkStiffSpringConstraint.cpp
+++ b/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 "obj/bhkStiffSpringConstraint.h"
+#include "bhkStiffSpringConstraint.h"
 
 //Definition of TYPE constant
 const Type bhkStiffSpringConstraint::TYPE("bhkStiffSpringConstraint", &BHK_STIFF_SPRING_CONSTRAINT_PARENT::TYPE );
diff --git a/obj/bhkStiffSpringConstraint.h b/obj/bhkStiffSpringConstraint.h
index 6b0ee7f5fda5786ddc6bd8ea7fbcb62b6d797880..cad63a490eeee4e09299ed2b65f35219a9dfdf33 100644
--- a/obj/bhkStiffSpringConstraint.h
+++ b/obj/bhkStiffSpringConstraint.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "AbhkConstraint.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class bhkStiffSpringConstraint;
 typedef Ref<bhkStiffSpringConstraint> bhkStiffSpringConstraintRef;
diff --git a/obj/bhkTransformShape.cpp b/obj/bhkTransformShape.cpp
index 699b102da4aa78c75c46e9bdd49794032a15a8e6..812719e2290d717db51f06a5b2858c0f0ff7f466 100644
--- a/obj/bhkTransformShape.cpp
+++ b/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 "obj/bhkTransformShape.h"
+#include "bhkTransformShape.h"
 
 //Definition of TYPE constant
 const Type bhkTransformShape::TYPE("bhkTransformShape", &BHK_TRANSFORM_SHAPE_PARENT::TYPE );
diff --git a/obj/bhkTransformShape.h b/obj/bhkTransformShape.h
index 07d66100db634ef15cce07d65e049c2242e4486b..9c18dc4c3b026a38d60bd855c57154544958f273 100644
--- a/obj/bhkTransformShape.h
+++ b/obj/bhkTransformShape.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkEntity.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class bhkTransformShape;
 typedef Ref<bhkTransformShape> bhkTransformShapeRef;
diff --git a/obj/bhkWorldObject.cpp b/obj/bhkWorldObject.cpp
index ab24fdbb851bbf1b3be0c5cf9088a850f61ee136..96b22e4a969c0bedf298b4488657d7c947f4c486 100644
--- a/obj/bhkWorldObject.cpp
+++ b/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 "obj/bhkWorldObject.h"
+#include "bhkWorldObject.h"
 
 //Definition of TYPE constant
 const Type bhkWorldObject::TYPE("bhkWorldObject", &BHK_WORLD_OBJECT_PARENT::TYPE );
diff --git a/obj/bhkWorldObject.h b/obj/bhkWorldObject.h
index b6fae5fbf96c2f6aa14686fc94290987a5a53cfc..38f464f236d84627a8700ef6b928e3e50c81011f 100644
--- a/obj/bhkWorldObject.h
+++ b/obj/bhkWorldObject.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkShape.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class bhkWorldObject;
 typedef Ref<bhkWorldObject> bhkWorldObjectRef;
diff --git a/obj/hkPackedNiTriStripsData.cpp b/obj/hkPackedNiTriStripsData.cpp
index 91d72dd354448fa6103e56bbe91b56d0467649d8..cf3363d6c3df17850f4d4d5940ae701e7db76992 100644
--- a/obj/hkPackedNiTriStripsData.cpp
+++ b/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 "obj/hkPackedNiTriStripsData.h"
-#include "gen/hkTriangle.h"
+#include "hkPackedNiTriStripsData.h"
+#include "../gen/hkTriangle.h"
 
 //Definition of TYPE constant
 const Type hkPackedNiTriStripsData::TYPE("hkPackedNiTriStripsData", &HK_PACKED_NI_TRI_STRIPS_DATA_PARENT::TYPE );
diff --git a/obj/hkPackedNiTriStripsData.h b/obj/hkPackedNiTriStripsData.h
index 087902bd54cac87a9bcf31264c73eba70a4bbd3f..b3b5c267bae59e95b1d456f23f220020390ea630 100644
--- a/obj/hkPackedNiTriStripsData.h
+++ b/obj/hkPackedNiTriStripsData.h
@@ -6,9 +6,9 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "AbhkShapeCollection.h"
 // Include structures
-#include "gen/hkTriangle.h"
+#include "../gen/hkTriangle.h"
 
-#include "gen/obj_defines.h"
+#include "../gen/obj_defines.h"
 
 class hkPackedNiTriStripsData;
 typedef Ref<hkPackedNiTriStripsData> hkPackedNiTriStripsDataRef;
diff --git a/py_niflib.vcproj b/py_niflib.vcproj
index 024bc618082f9fae14d2192b05d60c03561b2789..fe08a8b507a6f18bf29cbb791a8be8627758f20d 100644
--- a/py_niflib.vcproj
+++ b/py_niflib.vcproj
@@ -1,204 +1,305 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="PyNiflib"
 	ProjectGUID="{7517F24D-B1A1-427C-B952-F5DD5DDAD7A7}"
 	RootNamespace="PyNiflib"
-	Keyword="Win32Proj">
+	Keyword="Win32Proj"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="../Debug"
 			IntermediateDirectory="../Debug"
 			ConfigurationType="2"
-			CharacterSet="2">
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="TRUE"
+				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="4"/>
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="niflib.lib"
 				OutputFile="..\bin\_niflib.dll"
 				LinkIncremental="2"
-				GenerateDebugInformation="TRUE"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/PyNiflib.pdb"
 				SubSystem="1"
-				TargetMachine="1"/>
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="..\Release"
 			IntermediateDirectory="..\Release"
 			ConfigurationType="2"
-			CharacterSet="2">
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
 				WarningLevel="0"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="niflib.lib"
 				OutputFile="../bin/_niflib.dll"
 				LinkIncremental="1"
-				GenerateDebugInformation="TRUE"
+				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="PyNiflib|Win32"
 			OutputDirectory="$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
-			CharacterSet="2">
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="4"
+				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="../NIFlib/Release/NIFlib.lib"
 				OutputFile="$(OutDir)/_niflib.dll"
 				LinkIncremental="1"
-				GenerateDebugInformation="TRUE"
+				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
 		<ProjectReference
 			ReferencedProjectIdentifier="{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}"
-			Name="NIFlib"/>
+		/>
 	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
 			<File
-				RelativePath=".\py_wrap.cpp">
+				RelativePath=".\py_wrap.cpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
 		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
 			<File
-				RelativePath=".\pyniflib.i">
+				RelativePath=".\pyniflib.i"
+				>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Running SWIG..."
-						CommandLine="swig -c++ -python -outdir &quot;..\bin&quot; -o py_wrap.cpp pyniflib.i
-"
+						CommandLine="swig -c++ -python -outdir &quot;..\bin&quot; -o py_wrap.cpp pyniflib.i&#x0D;&#x0A;"
 						AdditionalDependencies="niflib.h"
-						Outputs="py_wrap.cpp"/>
+						Outputs="py_wrap.cpp"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Running SWIG..."
-						CommandLine="swig -c++ -python -outdir &quot;..\bin&quot; -o py_wrap.cpp pyniflib.i
-"
+						CommandLine="swig -c++ -python -outdir &quot;..\bin&quot; -o py_wrap.cpp pyniflib.i&#x0D;&#x0A;"
 						AdditionalDependencies="niflib.h"
-						Outputs="py_wrap.cpp"/>
+						Outputs="py_wrap.cpp"
+					/>
 				</FileConfiguration>
 			</File>
 		</Filter>