diff --git a/SConstruct b/SConstruct
index 9d1bd35fddd687409a3e7c32dc6e4301dd586e3e..9545cc39d7a8603f354c460d7a313c43732712fa 100644
--- a/SConstruct
+++ b/SConstruct
@@ -24,7 +24,7 @@ elif sys.platform == 'win32':
     python_include = [sysconfig.get_python_inc()]
     python_libpath = [sysconfig.get_python_lib(1, 1) + '/../libs']
     python_lib = ['python24']
-    cppflags = '/EHsc /O2 /ML /GS /Zi /TP'
+    cppflags = '/EHsc /O2 /GS /Zi /TP'
 else:
     print "Error: Platform %s not supported."%sys.platform
     Exit(1)
diff --git a/Type.h b/Type.h
index 364e4196e767b01929f67cec4a24f4e124f6882d..2902cc72dac483aae5063262538ea6cc9cbbce8e 100644
--- a/Type.h
+++ b/Type.h
@@ -5,6 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _TYPE_H_
 
 #include <string>
+#include "dll_export.h"
 
 using namespace std;
 
diff --git a/gen/AVObject.h b/gen/AVObject.h
index daf775fba4553c1e031a57c2192abe0b32eb6eaa..08231cdc0c97d18d06890a617b761f943171a48f 100644
--- a/gen/AVObject.h
+++ b/gen/AVObject.h
@@ -7,7 +7,6 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "../NIF_IO.h"
 
 // Forward define of referenced blocks
-#include "../Ref.h"
 class NiAVObject;
 
 /*!
diff --git a/gen/Bones.h b/gen/Bones.h
index 8834b7748c451635cd0fd0fd3791d4871b1a70da..c818805982fa88a5c9d16eee6ae8515ea21c9fd1 100644
--- a/gen/Bones.h
+++ b/gen/Bones.h
@@ -7,7 +7,6 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "../NIF_IO.h"
 
 // Forward define of referenced blocks
-#include "../Ref.h"
 class NiNode;
 
 /*!
diff --git a/gen/ControllerLink.h b/gen/ControllerLink.h
index e65fda6d0ece0f29171c4ce6c82a36105fe189dc..ce949b5dad54dc9c76e752684145a612de230749 100644
--- a/gen/ControllerLink.h
+++ b/gen/ControllerLink.h
@@ -6,8 +6,10 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "../NIF_IO.h"
 
-// Forward define of referenced blocks
+// Include structures
 #include "../Ref.h"
+
+// Forward define of referenced blocks
 class NiInterpolator;
 class NiObject;
 class NiStringPalette;
diff --git a/gen/Footer.h b/gen/Footer.h
index 2b223aecf82a68ec81809c018f8cbea6b14e613e..0537e040b1a80bbc8766aa699f6af733c3b75959 100644
--- a/gen/Footer.h
+++ b/gen/Footer.h
@@ -6,8 +6,10 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "../NIF_IO.h"
 
-// Forward define of referenced blocks
+// Include structures
 #include "../Ref.h"
+
+// Forward define of referenced blocks
 class NiAVObject;
 #include "../obj/NiObject.h"
 
diff --git a/gen/Header.h b/gen/Header.h
index 0c0fc722b73d728343c4a533f98da3f0b540f4c5..575863cf453d16a81dc15768f6014f4fda0759d4 100644
--- a/gen/Header.h
+++ b/gen/Header.h
@@ -5,6 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _HEADER_H_
 
 #include "../NIF_IO.h"
+
 // Include structures
 #include "ShortString.h"
 #include "../obj/NiObject.h"
diff --git a/gen/NodeGroup.h b/gen/NodeGroup.h
index 8eb6ae8306347b32b191b8fccd63ae3df96f77b4..12354302ab36c1255fc974c9a9098f0ef17212fd 100644
--- a/gen/NodeGroup.h
+++ b/gen/NodeGroup.h
@@ -6,8 +6,10 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "../NIF_IO.h"
 
-// Forward define of referenced blocks
+// Include structures
 #include "../Ref.h"
+
+// Forward define of referenced blocks
 class NiNode;
 
 /*!
diff --git a/gen/ShaderTexDesc.h b/gen/ShaderTexDesc.h
index e837edb7731ff04d1d65531c67ee9b2317cd4c55..4b7388184fd7addd17ae3e838393af805b037467 100644
--- a/gen/ShaderTexDesc.h
+++ b/gen/ShaderTexDesc.h
@@ -5,6 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _SHADERTEXDESC_H_
 
 #include "../NIF_IO.h"
+
 // Include structures
 #include "TexDesc.h"
 
diff --git a/gen/SkinData.h b/gen/SkinData.h
index aa0cb209fe85ece61cf1b2f9f49adc2987f26c3d..8e4e78fca10c584e3a2b9d11d098cbb432c8481b 100644
--- a/gen/SkinData.h
+++ b/gen/SkinData.h
@@ -5,6 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _SKINDATA_H_
 
 #include "../NIF_IO.h"
+
 // Include structures
 #include "SkinWeight.h"
 
diff --git a/gen/SkinShape.h b/gen/SkinShape.h
index 9e84582cf340aea382d4ef6b02d21f360294d289..51fab5277e95e8d0b48a41adfa846d360f707c4a 100644
--- a/gen/SkinShape.h
+++ b/gen/SkinShape.h
@@ -6,8 +6,10 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "../NIF_IO.h"
 
-// Forward define of referenced blocks
+// Include structures
 #include "../Ref.h"
+
+// Forward define of referenced blocks
 class NiTriShape;
 class NiSkinInstance;
 
diff --git a/gen/SkinShapeGroup.h b/gen/SkinShapeGroup.h
index 250c0c649c8e7ca69811344495f497d5e3df49b8..6cf484431344182402d921b1dbd5a1285b7cb36d 100644
--- a/gen/SkinShapeGroup.h
+++ b/gen/SkinShapeGroup.h
@@ -5,6 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _SKINSHAPEGROUP_H_
 
 #include "../NIF_IO.h"
+
 // Include structures
 #include "SkinShape.h"
 
diff --git a/gen/TexDesc.h b/gen/TexDesc.h
index 12fd17d415b3c212451e23543710ffb4167d44cc..e3291f34d305cd35d88fcb80dc5652fae1151925 100644
--- a/gen/TexDesc.h
+++ b/gen/TexDesc.h
@@ -6,8 +6,10 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "../NIF_IO.h"
 
-// Forward define of referenced blocks
+// Include structures
 #include "../Ref.h"
+
+// Forward define of referenced blocks
 class NiSourceTexture;
 
 /*!
diff --git a/gen/TexSource.h b/gen/TexSource.h
index 22f1a2376353f8d723cf0cd6641718711c27cd03..0dd4faa2513488677873ea75709b2f4c44107be3 100644
--- a/gen/TexSource.h
+++ b/gen/TexSource.h
@@ -6,8 +6,10 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "../NIF_IO.h"
 
-// Forward define of referenced blocks
+// Include structures
 #include "../Ref.h"
+
+// Forward define of referenced blocks
 class NiObject;
 class NiPixelData;
 
diff --git a/gen/obj_defines.h b/gen/obj_defines.h
index 5ee6156630f5d033069121a201be1cc6e060bac4..895fa5a2b677e9a9c42f992e8eab453bf1ff12e2 100644
--- a/gen/obj_defines.h
+++ b/gen/obj_defines.h
@@ -1130,7 +1130,6 @@ for (uint i0 = 0; i0 < affectedNodes.size(); i0++) { \
 return refs; \
 
 #define NI_LIGHT_MEMBERS \
-public: \
 float dimmer; \
 Color3 ambientColor; \
 Color3 diffuseColor; \