diff --git a/KREngine/KREngine.xcodeproj/project.pbxproj b/KREngine/KREngine.xcodeproj/project.pbxproj
index 1355ebd..46ea3a3 100644
--- a/KREngine/KREngine.xcodeproj/project.pbxproj
+++ b/KREngine/KREngine.xcodeproj/project.pbxproj
@@ -193,7 +193,7 @@
 		E4B2A4391523B027004CB0EC /* KRMaterial.h in Headers */ = {isa = PBXBuildFile; fileRef = E491017D13C99BDC0098455B /* KRMaterial.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		E4B2A43B1523B02E004CB0EC /* KRMaterial.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E491017C13C99BDC0098455B /* KRMaterial.cpp */; };
 		E4BBBB8A1512A40300F43B5B /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = E4BBBB881512A40300F43B5B /* InfoPlist.strings */; };
-		E4BBBB8E1512A40300F43B5B /* krengine_osx.m in Sources */ = {isa = PBXBuildFile; fileRef = E4BBBB8D1512A40300F43B5B /* krengine_osx.m */; };
+		E4BBBB8E1512A40300F43B5B /* krengine_osx.mm in Sources */ = {isa = PBXBuildFile; fileRef = E4BBBB8D1512A40300F43B5B /* krengine_osx.mm */; };
 		E4BBBB9C1512A4A900F43B5B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4BBBB9A1512A48200F43B5B /* Foundation.framework */; };
 		E4BBBB9D1512A4AC00F43B5B /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4BBBB981512A47500F43B5B /* CoreData.framework */; };
 		E4BBBB9E1512A4AE00F43B5B /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4BBBB961512A46700F43B5B /* AppKit.framework */; };
@@ -292,9 +292,9 @@
 		E414BAE6143557D200A668C4 /* KRScene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = KRScene.h; path = Classes/KRScene.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		E414BAE81435585A00A668C4 /* KRScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = KRScene.cpp; path = Classes/KRScene.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		E414F9A41694D977000B3D58 /* KRUnknownManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = KRUnknownManager.cpp; path = Classes/KRUnknownManager.cpp; sourceTree = "<group>"; };
-		E414F9A51694D977000B3D58 /* KRUnknownManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KRUnknownManager.h; path = Classes/KRUnknownManager.h; sourceTree = "<group>"; };
+		E414F9A51694D977000B3D58 /* KRUnknownManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = KRUnknownManager.h; path = Classes/KRUnknownManager.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		E414F9AA1694DA37000B3D58 /* KRUnknown.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = KRUnknown.cpp; path = Classes/KRUnknown.cpp; sourceTree = "<group>"; };
-		E414F9AB1694DA37000B3D58 /* KRUnknown.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KRUnknown.h; path = Classes/KRUnknown.h; sourceTree = "<group>"; };
+		E414F9AB1694DA37000B3D58 /* KRUnknown.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = KRUnknown.h; path = Classes/KRUnknown.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		E416AA9816713749000F6786 /* KRAnimationCurveManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KRAnimationCurveManager.h; path = Classes/KRAnimationCurveManager.h; sourceTree = "<group>"; };
 		E416AA9B1671375C000F6786 /* KRAnimationCurveManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = KRAnimationCurveManager.cpp; path = Classes/KRAnimationCurveManager.cpp; sourceTree = "<group>"; };
 		E41B841D16260C5600C7A771 /* sky_box.fsh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; name = sky_box.fsh; path = Shaders/sky_box.fsh; sourceTree = "<group>"; };
@@ -347,7 +347,7 @@
 		E461A15B152E563000F2044A /* KRDirectionalLight.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = KRDirectionalLight.h; path = Classes/KRDirectionalLight.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		E461A15E152E565700F2044A /* KRDirectionalLight.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = KRDirectionalLight.cpp; path = Classes/KRDirectionalLight.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		E461A164152E56C000F2044A /* KRSpotLight.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = KRSpotLight.cpp; path = Classes/KRSpotLight.cpp; sourceTree = "<group>"; };
-		E461A167152E570500F2044A /* KRSpotLight.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KRSpotLight.h; path = Classes/KRSpotLight.h; sourceTree = "<group>"; };
+		E461A167152E570500F2044A /* KRSpotLight.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = KRSpotLight.h; path = Classes/KRSpotLight.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		E46A6B6C1559E97D000DBD37 /* KRResource+blend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "KRResource+blend.cpp"; path = "Classes/KRResource+blend.cpp"; sourceTree = "<group>"; };
 		E46A6B6F1559EF0A000DBD37 /* KRResource+blend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "KRResource+blend.h"; path = "Classes/KRResource+blend.h"; sourceTree = "<group>"; };
 		E46C214115364BC8009CABF3 /* tinyxml2_readme.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = tinyxml2_readme.txt; path = KREngine/Classes/tinyxml2_readme.txt; sourceTree = "<group>"; };
@@ -407,7 +407,7 @@
 		E4924C2A15EE96AA00B965C6 /* KROctreeNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KROctreeNode.h; path = Classes/KROctreeNode.h; sourceTree = "<group>"; };
 		E494322F169E08D200BCB891 /* KRReverbZone.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = KRReverbZone.cpp; path = Classes/KRReverbZone.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		E4943230169E08D200BCB891 /* KRReverbZone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KRReverbZone.h; path = Classes/KRReverbZone.h; sourceTree = "<group>"; };
-		E497B943151BA93400D3DC67 /* KRVector2.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = KRVector2.h; path = Classes/KRVector2.h; sourceTree = "<group>"; };
+		E497B943151BA93400D3DC67 /* KRVector2.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = KRVector2.h; path = Classes/KRVector2.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		E497B945151BA99400D3DC67 /* KRVector2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = KRVector2.cpp; path = Classes/KRVector2.cpp; sourceTree = "<group>"; };
 		E497B949151BCEE900D3DC67 /* KRResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KRResource.h; path = Classes/KRResource.h; sourceTree = "<group>"; };
 		E497B94C151BCF2500D3DC67 /* KRResource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = KRResource.cpp; path = Classes/KRResource.cpp; sourceTree = "<group>"; };
@@ -418,7 +418,7 @@
 		E4A9DEBD154120C4009DF363 /* light_point.fsh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; lineEnding = 0; name = light_point.fsh; path = Shaders/light_point.fsh; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.glsl; };
 		E4A9DEC0154120E8009DF363 /* light_point.vsh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; name = light_point.vsh; path = Shaders/light_point.vsh; sourceTree = "<group>"; };
 		E4B175AA161F5A1000B8FB80 /* KRTexture.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = KRTexture.cpp; path = Classes/KRTexture.cpp; sourceTree = "<group>"; };
-		E4B175AB161F5A1000B8FB80 /* KRTexture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KRTexture.h; path = Classes/KRTexture.h; sourceTree = "<group>"; };
+		E4B175AB161F5A1000B8FB80 /* KRTexture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = KRTexture.h; path = Classes/KRTexture.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		E4B175B0161F5FAE00B8FB80 /* KRTextureCube.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = KRTextureCube.cpp; path = Classes/KRTextureCube.cpp; sourceTree = "<group>"; };
 		E4B175B1161F5FAF00B8FB80 /* KRTextureCube.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KRTextureCube.h; path = Classes/KRTextureCube.h; sourceTree = "<group>"; };
 		E4BBBB7E1512A40300F43B5B /* krengine_osx.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = krengine_osx.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -426,7 +426,7 @@
 		E4BBBB891512A40300F43B5B /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		E4BBBB8B1512A40300F43B5B /* krengine_osx-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "krengine_osx-Prefix.pch"; sourceTree = "<group>"; };
 		E4BBBB8C1512A40300F43B5B /* krengine_osx.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = krengine_osx.h; sourceTree = "<group>"; };
-		E4BBBB8D1512A40300F43B5B /* krengine_osx.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = krengine_osx.m; sourceTree = "<group>"; };
+		E4BBBB8D1512A40300F43B5B /* krengine_osx.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = krengine_osx.mm; sourceTree = "<group>"; };
 		E4BBBB941512A45500F43B5B /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = ../../../../MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		E4BBBB961512A46700F43B5B /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = ../../../../MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
 		E4BBBB981512A47500F43B5B /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = ../../../../MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
@@ -438,7 +438,7 @@
 		E4C454B7167BD235003586CD /* KRHitInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KRHitInfo.h; path = Classes/KRHitInfo.h; sourceTree = "<group>"; };
 		E4C454BA167BD248003586CD /* KRHitInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = KRHitInfo.cpp; path = Classes/KRHitInfo.cpp; sourceTree = "<group>"; };
 		E4CA10E41637BD0A005D9400 /* KRTexturePVR.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KRTexturePVR.h; path = Classes/KRTexturePVR.h; sourceTree = "<group>"; };
-		E4CA10E81637BD2B005D9400 /* KRTexturePVR.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = KRTexturePVR.cpp; path = Classes/KRTexturePVR.cpp; sourceTree = "<group>"; };
+		E4CA10E81637BD2B005D9400 /* KRTexturePVR.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = KRTexturePVR.cpp; path = Classes/KRTexturePVR.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		E4CA10EB1637BD47005D9400 /* KRTextureTGA.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KRTextureTGA.h; path = Classes/KRTextureTGA.h; sourceTree = "<group>"; };
 		E4CA10EE1637BD58005D9400 /* KRTextureTGA.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = KRTextureTGA.cpp; path = Classes/KRTextureTGA.cpp; sourceTree = "<group>"; };
 		E4CA10F51638BCAE005D9400 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; };
@@ -882,7 +882,7 @@
 			isa = PBXGroup;
 			children = (
 				E4BBBB8C1512A40300F43B5B /* krengine_osx.h */,
-				E4BBBB8D1512A40300F43B5B /* krengine_osx.m */,
+				E4BBBB8D1512A40300F43B5B /* krengine_osx.mm */,
 				E4BBBB861512A40300F43B5B /* Supporting Files */,
 			);
 			path = krengine_osx;
@@ -1226,7 +1226,7 @@
 				E461A175152E5C4800F2044A /* KRLight.cpp in Sources */,
 				E4BBBBA71512A6DC00F43B5B /* KRVector3.cpp in Sources */,
 				E4B2A43B1523B02E004CB0EC /* KRMaterial.cpp in Sources */,
-				E4BBBB8E1512A40300F43B5B /* krengine_osx.m in Sources */,
+				E4BBBB8E1512A40300F43B5B /* krengine_osx.mm in Sources */,
 				E497B947151BA99500D3DC67 /* KRVector2.cpp in Sources */,
 				E497B94E151BCF2500D3DC67 /* KRResource.cpp in Sources */,
 				E497B951151BD2CE00D3DC67 /* KRResource+obj.cpp in Sources */,
diff --git a/KREngine/KREngine/Classes/KRAnimation.cpp b/KREngine/KREngine/Classes/KRAnimation.cpp
index 6f7fe6e..38af95f 100644
--- a/KREngine/KREngine/Classes/KRAnimation.cpp
+++ b/KREngine/KREngine/Classes/KRAnimation.cpp
@@ -35,7 +35,7 @@
 #include "KRNode.h"
 #include "KRAnimationCurve.h"
 
-#import "tinyxml2.h"
+#include "tinyxml2.h"
 
 KRAnimation::KRAnimation(KRContext &context, std::string name) : KRResource(context, name)
 {
diff --git a/KREngine/KREngine/Classes/KRAnimation.h b/KREngine/KREngine/Classes/KRAnimation.h
index 5710305..b84e400 100644
--- a/KREngine/KREngine/Classes/KRAnimation.h
+++ b/KREngine/KREngine/Classes/KRAnimation.h
@@ -32,12 +32,12 @@
 #ifndef KRANIMATION_H
 #define KRANIMATION_H
 
-#import "KREngine-common.h"
-#import "KRContextObject.h"
-#import "KRDataBlock.h"
-#import "KRResource.h"
-#import "KRAnimationLayer.h"
-#import <map>
+#include "KREngine-common.h"
+#include "KRContextObject.h"
+#include "KRDataBlock.h"
+#include "KRResource.h"
+#include "KRAnimationLayer.h"
+
 
 class KRAnimation : public KRResource {
     
diff --git a/KREngine/KREngine/Classes/KRAnimationAttribute.h b/KREngine/KREngine/Classes/KRAnimationAttribute.h
index 0a23eed..7ddcfb8 100644
--- a/KREngine/KREngine/Classes/KRAnimationAttribute.h
+++ b/KREngine/KREngine/Classes/KRAnimationAttribute.h
@@ -32,11 +32,11 @@
 #ifndef KRANIMATIONATTRIBUTE_H
 #define KRANIMATIONATTRIBUTE_H
 
-#import "KRContextObject.h"
-#import "KREngine-common.h"
-#import "tinyxml2.h"
-#import "KRNode.h"
-#import "KRAnimationCurve.h"
+#include "KRContextObject.h"
+#include "KREngine-common.h"
+#include "tinyxml2.h"
+#include "KRNode.h"
+#include "KRAnimationCurve.h"
 
 class KRAnimationAttribute : public KRContextObject {
 public:
diff --git a/KREngine/KREngine/Classes/KRAnimationCurve.h b/KREngine/KREngine/Classes/KRAnimationCurve.h
index 905b770..5e4b823 100644
--- a/KREngine/KREngine/Classes/KRAnimationCurve.h
+++ b/KREngine/KREngine/Classes/KRAnimationCurve.h
@@ -32,11 +32,10 @@
 #ifndef KRANIMATIONCURVE_H
 #define KRANIMATIONCURVE_H
 
-#import "KREngine-common.h"
-#import "KRContextObject.h"
-#import "KRDataBlock.h"
-#import "KRResource.h"
-#import <map>
+#include "KREngine-common.h"
+#include "KRContextObject.h"
+#include "KRDataBlock.h"
+#include "KRResource.h"
 
 class KRAnimationCurve : public KRResource {
     
diff --git a/KREngine/KREngine/Classes/KRAnimationCurveManager.h b/KREngine/KREngine/Classes/KRAnimationCurveManager.h
index 7944722..6c5f232 100644
--- a/KREngine/KREngine/Classes/KRAnimationCurveManager.h
+++ b/KREngine/KREngine/Classes/KRAnimationCurveManager.h
@@ -32,15 +32,12 @@
 #ifndef KRANIMATIONCURVEMANAGER_H
 #define KRANIMATIONCURVEMANAGER_H
 
-#import "KREngine-common.h"
+#include "KREngine-common.h"
 
 #include "KRAnimationCurve.h"
 #include "KRContextObject.h"
 #include "KRDataBlock.h"
 
-#include <map>
-#import <string>
-
 using std::map;
 
 class KRAnimationCurveManager : public KRContextObject {
diff --git a/KREngine/KREngine/Classes/KRAnimationLayer.h b/KREngine/KREngine/Classes/KRAnimationLayer.h
index 8652436..557cfe0 100644
--- a/KREngine/KREngine/Classes/KRAnimationLayer.h
+++ b/KREngine/KREngine/Classes/KRAnimationLayer.h
@@ -32,10 +32,10 @@
 #ifndef KRANIMATIONLAYER_H
 #define KRANIMATIONLAYER_H
 
-#import "KRContextObject.h"
-#import "KREngine-common.h"
-#import "tinyxml2.h"
-#import "KRAnimationAttribute.h"
+#include "KRContextObject.h"
+#include "KREngine-common.h"
+#include "tinyxml2.h"
+#include "KRAnimationAttribute.h"
 
 class KRAnimationLayer : public KRContextObject {
 public:
diff --git a/KREngine/KREngine/Classes/KRAnimationManager.h b/KREngine/KREngine/Classes/KRAnimationManager.h
index 0a7cc11..8ae0f17 100644
--- a/KREngine/KREngine/Classes/KRAnimationManager.h
+++ b/KREngine/KREngine/Classes/KRAnimationManager.h
@@ -32,18 +32,13 @@
 #ifndef KRANIMATIONMANAGER_H
 #define KRANIMATIONMANAGER_H
 
-#import "KREngine-common.h"
+#include "KREngine-common.h"
 
 #include "KRAnimation.h"
 #include "KRContextObject.h"
 #include "KRDataBlock.h"
 
-#include <map>
-#include <set>
-#import <string>
 
-using std::map;
-using std::set;
 
 class KRAnimationManager : public KRContextObject {
 public:
diff --git a/KREngine/KREngine/Classes/KRAudioManager.h b/KREngine/KREngine/Classes/KRAudioManager.h
index e8f4a61..84737ef 100644
--- a/KREngine/KREngine/Classes/KRAudioManager.h
+++ b/KREngine/KREngine/Classes/KRAudioManager.h
@@ -32,19 +32,12 @@
 #ifndef KRAUDIO_MANAGER_H
 #define KRAUDIO_MANAGER_H
 
-#import "KREngine-common.h"
+#include "KREngine-common.h"
 
 #include "KRAudioSample.h"
 #include "KRContextObject.h"
 #include "KRDataBlock.h"
-#include "KRmat4.h"
-
-#include <map>
-#include <set>
-#include <string>
-
-using std::map;
-using std::set;
+#include "KRMat4.h"
 
 const int KRENGINE_AUDIO_MAX_POOL_SIZE = 32;
 const int KRENGINE_AUDIO_MAX_BUFFER_SIZE = 64*1024;
diff --git a/KREngine/KREngine/Classes/KRAudioSample.h b/KREngine/KREngine/Classes/KRAudioSample.h
index 48f86fa..e295c3f 100644
--- a/KREngine/KREngine/Classes/KRAudioSample.h
+++ b/KREngine/KREngine/Classes/KRAudioSample.h
@@ -32,11 +32,10 @@
 #ifndef KRAUDIOSAMPLE_H
 #define KRAUDIOSAMPLE_H
 
-#import "KREngine-common.h"
-#import "KRContextObject.h"
-#import "KRDataBlock.h"
-#import "KRResource.h"
-#import <map>
+#include "KREngine-common.h"
+#include "KRContextObject.h"
+#include "KRDataBlock.h"
+#include "KRResource.h"
 
 class KRAudioBuffer;
 
diff --git a/KREngine/KREngine/Classes/KRAudioSource.h b/KREngine/KREngine/Classes/KRAudioSource.h
index 2f4890c..c7541c9 100644
--- a/KREngine/KREngine/Classes/KRAudioSource.h
+++ b/KREngine/KREngine/Classes/KRAudioSource.h
@@ -32,11 +32,10 @@
 #ifndef KRAUDIOSOURCE_H
 #define KRAUDIOSOURCE_H
 
-#import "KRResource.h"
-#import "KRNode.h"
-#import "KRTexture.h"
-
-#include <queue>
+#include "KREngine-common.h"
+#include "KRResource.h"
+#include "KRNode.h"
+#include "KRTexture.h"
 
 class KRAudioSample;
 class KRAudioBuffer;
diff --git a/KREngine/KREngine/Classes/KRBone.h b/KREngine/KREngine/Classes/KRBone.h
index b0225ea..07d3a68 100644
--- a/KREngine/KREngine/Classes/KRBone.h
+++ b/KREngine/KREngine/Classes/KRBone.h
@@ -9,9 +9,9 @@
 #ifndef KRBONE_H
 #define KRBONE_H
 
-#import "KRResource.h"
-#import "KRNode.h"
-#import "KRTexture.h"
+#include "KRResource.h"
+#include "KRNode.h"
+#include "KRTexture.h"
 
 class KRBone : public KRNode {
 public:
diff --git a/KREngine/KREngine/Classes/KRBundle.cpp b/KREngine/KREngine/Classes/KRBundle.cpp
index 3cb9a65..5173695 100644
--- a/KREngine/KREngine/Classes/KRBundle.cpp
+++ b/KREngine/KREngine/Classes/KRBundle.cpp
@@ -31,8 +31,7 @@
 
 #include "KRBundle.h"
 #include "KRContext.h"
-#include <assert.h>
-#include <time.h>
+#include "KREngine-common.h"
 
 const int KRENGINE_KRBUNDLE_HEADER_SIZE = 512;
 
diff --git a/KREngine/KREngine/Classes/KRBundle.h b/KREngine/KREngine/Classes/KRBundle.h
index e443b22..fbe4b3b 100644
--- a/KREngine/KREngine/Classes/KRBundle.h
+++ b/KREngine/KREngine/Classes/KRBundle.h
@@ -31,9 +31,9 @@
 #ifndef KRBUNDLE_H
 #define KRBUNDLE_H
 
-#import "KREngine-common.h"
-#import "KRResource.h"
-#import "KRDataBlock.h"
+#include "KREngine-common.h"
+#include "KRResource.h"
+#include "KRDataBlock.h"
 
 class KRBundle : public KRResource {
 public:
diff --git a/KREngine/KREngine/Classes/KRBundleManager.cpp b/KREngine/KREngine/Classes/KRBundleManager.cpp
index 99dbc5d..e902438 100644
--- a/KREngine/KREngine/Classes/KRBundleManager.cpp
+++ b/KREngine/KREngine/Classes/KRBundleManager.cpp
@@ -31,7 +31,7 @@
 
 #include "KRBundleManager.h"
 
-#import "KRBundle.h"
+#include "KRBundle.h"
 
 KRBundleManager::KRBundleManager(KRContext &context) : KRContextObject(context) {
     
diff --git a/KREngine/KREngine/Classes/KRBundleManager.h b/KREngine/KREngine/Classes/KRBundleManager.h
index aeaba2e..687c63e 100644
--- a/KREngine/KREngine/Classes/KRBundleManager.h
+++ b/KREngine/KREngine/Classes/KRBundleManager.h
@@ -33,17 +33,13 @@
 #ifndef KRBUNDLEMANAGER_H
 #define KRBUNDLEMANAGER_H
 
-#import "KREngine-common.h"
-#import "KRContextObject.h"
-#import "KRDataBlock.h"
+#include "KREngine-common.h"
+#include "KRContextObject.h"
+#include "KRDataBlock.h"
 
 class KRContext;
 class KRBundle;
 
-#include <map>
-#import <string>
-using std::map;
-
 class KRBundleManager : public KRContextObject {
 public:
     KRBundleManager(KRContext &context);
diff --git a/KREngine/KREngine/Classes/KRCamera.cpp b/KREngine/KREngine/Classes/KRCamera.cpp
index a1b37c2..949a69f 100644
--- a/KREngine/KREngine/Classes/KRCamera.cpp
+++ b/KREngine/KREngine/Classes/KRCamera.cpp
@@ -29,17 +29,11 @@
 //  or implied, of Kearwood Gilbert.
 //
 
-#import <string>
-#include <iostream>
-#include <sstream>
-#include <fstream>
-#import <assert.h>
-#include <stack.h>
-
-#import "KRVector2.h"
-#import "KRCamera.h"
-#import "KRStockGeometry.h"
-#import "KRDirectionalLight.h"
+#include "KREngine-common.h"
+#include "KRVector2.h"
+#include "KRCamera.h"
+#include "KRStockGeometry.h"
+#include "KRDirectionalLight.h"
 
 KRCamera::KRCamera(KRScene &scene, std::string name) : KRNode(scene, name) {
     m_particlesAbsoluteTime = 0.0f;
diff --git a/KREngine/KREngine/Classes/KRCamera.h b/KREngine/KREngine/Classes/KRCamera.h
index ba05ffa..86437fb 100644
--- a/KREngine/KREngine/Classes/KRCamera.h
+++ b/KREngine/KREngine/Classes/KRCamera.h
@@ -32,17 +32,17 @@
 #ifndef KRCAMERA_H
 #define KRCAMERA_H
 
-#import "KREngine-common.h"
+#include "KREngine-common.h"
 
-#import "KRMat4.h"
-#import "KRVector2.h"
-#import "KRAABB.h"
-#import "KRShader.h"
-#import "KRContextObject.h"
-#import "KRTexture.h"
-#import "KRContext.h"
-#import "KRViewport.h"
-#import "KRRenderSettings.h"
+#include "KRMat4.h"
+#include "KRVector2.h"
+#include "KRAABB.h"
+#include "KRShader.h"
+#include "KRContextObject.h"
+#include "KRTexture.h"
+#include "KRContext.h"
+#include "KRViewport.h"
+#include "KRRenderSettings.h"
 
 class KRModel;
 class KRScene;
diff --git a/KREngine/KREngine/Classes/KRCollider.cpp b/KREngine/KREngine/Classes/KRCollider.cpp
index 2116d41..72f55c7 100644
--- a/KREngine/KREngine/Classes/KRCollider.cpp
+++ b/KREngine/KREngine/Classes/KRCollider.cpp
@@ -29,12 +29,12 @@
 //  or implied, of Kearwood Gilbert.
 //
 
-#include <iostream>
+#include "KREngine-common.h"
 #include "KRCollider.h"
-#import "KRContext.h"
-#import "KRMesh.h"
-#import "KRQuaternion.h"
-#include <assert.h>
+#include "KRContext.h"
+#include "KRMesh.h"
+#include "KRQuaternion.h"
+
 
 KRCollider::KRCollider(KRScene &scene, std::string collider_name, std::string model_name, unsigned int layer_mask, float audio_occlusion) : KRNode(scene, collider_name) {
     m_model_name = model_name;
diff --git a/KREngine/KREngine/Classes/KRCollider.h b/KREngine/KREngine/Classes/KRCollider.h
index f5f8fa9..41aa669 100644
--- a/KREngine/KREngine/Classes/KRCollider.h
+++ b/KREngine/KREngine/Classes/KRCollider.h
@@ -29,7 +29,7 @@
 //  or implied, of Kearwood Gilbert.
 //
 
-#import "KREngine-common.h"
+#include "KREngine-common.h"
 
 #ifndef KRCOLLIDER_H
 #define KRCOLLIDER_H
@@ -37,16 +37,16 @@
 #define KRAKEN_COLLIDER_PHYSICS 1
 #define KRAKEN_COLLIDER_AUDIO 2
 
-#import "KRMesh.h"
-#import "KRMat4.h"
-#import "KRVector3.h"
-#import "KRModel.h"
-#import "KRCamera.h"
-#import "KRMeshManager.h"
-#import "KRNode.h"
-#import "KRContext.h"
-#import "KRMesh.h"
-#import "KRTexture.h"
+#include "KRMesh.h"
+#include "KRMat4.h"
+#include "KRVector3.h"
+#include "KRModel.h"
+#include "KRCamera.h"
+#include "KRMeshManager.h"
+#include "KRNode.h"
+#include "KRContext.h"
+#include "KRMesh.h"
+#include "KRTexture.h"
 
 class KRCollider : public KRNode {
     
diff --git a/KREngine/KREngine/Classes/KRContext.cpp b/KREngine/KREngine/Classes/KRContext.cpp
index 9b0b48c..9addd42 100644
--- a/KREngine/KREngine/Classes/KRContext.cpp
+++ b/KREngine/KREngine/Classes/KRContext.cpp
@@ -6,7 +6,7 @@
 //  Copyright (c) 2012 Kearwood Software. All rights reserved.
 //
 
-#include <iostream>
+#include "KREngine-common.h"
 
 #include "KRContext.h"
 #include "KRCamera.h"
diff --git a/KREngine/KREngine/Classes/KRContext.h b/KREngine/KREngine/Classes/KRContext.h
index 3480df4..17f88b6 100644
--- a/KREngine/KREngine/Classes/KRContext.h
+++ b/KREngine/KREngine/Classes/KRContext.h
@@ -9,17 +9,17 @@
 #ifndef KREngine_KRContext_h
 #define KREngine_KRContext_h
 
-#import "KREngine-common.h"
-#import "KRBundleManager.h"
-#import "KRSceneManager.h"
-#import "KRTextureManager.h"
-#import "KRMaterialManager.h"
-#import "KRShaderManager.h"
-#import "KRMeshManager.h"
-#import "KRAnimationManager.h"
-#import "KRAnimationCurveManager.h"
-#import "KRAudioManager.h"
-#import "KRUnknownManager.h"
+#include "KREngine-common.h"
+#include "KRBundleManager.h"
+#include "KRSceneManager.h"
+#include "KRTextureManager.h"
+#include "KRMaterialManager.h"
+#include "KRShaderManager.h"
+#include "KRMeshManager.h"
+#include "KRAnimationManager.h"
+#include "KRAnimationCurveManager.h"
+#include "KRAudioManager.h"
+#include "KRUnknownManager.h"
 
 class KRContext {
 public:
diff --git a/KREngine/KREngine/Classes/KRDataBlock.cpp b/KREngine/KREngine/Classes/KRDataBlock.cpp
index a61bd9b..66fff6a 100644
--- a/KREngine/KREngine/Classes/KRDataBlock.cpp
+++ b/KREngine/KREngine/Classes/KRDataBlock.cpp
@@ -29,15 +29,7 @@
 //  or implied, of Kearwood Gilbert.
 //
 
-#include <iostream>
-
 #include "KRDataBlock.h"
-#include <stdint.h>
-#include <sys/mman.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <assert.h>
 
 KRDataBlock::KRDataBlock() {
     m_data = NULL;
diff --git a/KREngine/KREngine/Classes/KRDataBlock.h b/KREngine/KREngine/Classes/KRDataBlock.h
index 6b1a4c8..b67dba8 100644
--- a/KREngine/KREngine/Classes/KRDataBlock.h
+++ b/KREngine/KREngine/Classes/KRDataBlock.h
@@ -32,6 +32,8 @@
 #ifndef KREngine_KRDataBlock_h
 #define KREngine_KRDataBlock_h
 
+#include "KREngine-common.h"
+
 class KRDataBlock {
 public:
     KRDataBlock();
diff --git a/KREngine/KREngine/Classes/KRDirectionalLight.cpp b/KREngine/KREngine/Classes/KRDirectionalLight.cpp
index 4f7e00e..5e575c0 100644
--- a/KREngine/KREngine/Classes/KRDirectionalLight.cpp
+++ b/KREngine/KREngine/Classes/KRDirectionalLight.cpp
@@ -6,14 +6,14 @@
 //  Copyright (c) 2012 Kearwood Software. All rights reserved.
 //
 
-#include <iostream>
+#include "KREngine-common.h"
 
-#import "KRDirectionalLight.h"
-#import "KRShader.h"
-#import "KRContext.h"
-#import "KRMat4.h"
-#import "assert.h"
-#import "KRStockGeometry.h"
+#include "KRDirectionalLight.h"
+#include "KRShader.h"
+#include "KRContext.h"
+#include "KRMat4.h"
+#include "assert.h"
+#include "KRStockGeometry.h"
 
 KRDirectionalLight::KRDirectionalLight(KRScene &scene, std::string name) : KRLight(scene, name)
 {
diff --git a/KREngine/KREngine/Classes/KRDirectionalLight.h b/KREngine/KREngine/Classes/KRDirectionalLight.h
index b5cb3bb..37dee4f 100644
--- a/KREngine/KREngine/Classes/KRDirectionalLight.h
+++ b/KREngine/KREngine/Classes/KRDirectionalLight.h
@@ -9,8 +9,8 @@
 #ifndef KREngine_KRDirectionalLight_h
 #define KREngine_KRDirectionalLight_h
 
-#import "KRLight.h"
-#import "KRMat4.h"
+#include "KRLight.h"
+#include "KRMat4.h"
 
 class KRDirectionalLight : public KRLight {
     
diff --git a/KREngine/KREngine/Classes/KREngine-common.h b/KREngine/KREngine/Classes/KREngine-common.h
index ef38744..d8775c0 100644
--- a/KREngine/KREngine/Classes/KREngine-common.h
+++ b/KREngine/KREngine/Classes/KREngine-common.h
@@ -16,27 +16,55 @@
 float const PI = 3.141592653589793f;
 float const D2R = PI * 2 / 360;
 
-#import <stdint.h>
-#import <vector>
-#import <string>
-#import <set>
-#import <list>
+#include <stdint.h>
+#include <vector>
+#include <string>
+#include <set>
+#include <list>
+#include <map>
+#include <stack>
+#include <queue>
+#include <iostream>
+#include <sstream>
+#include <fstream>
+#include <stdint.h>
+#include <stdio.h>
+#include <sys/mman.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <assert.h>
+#include <time.h>
+#include <limits>
+#include <unistd.h>
+#include <iostream>
+#include <math.h>
+
+
+
+using std::vector;
+using std::string;
+using std::set;
+using std::list;
+using std::map;
+using std::stack;
+using std::queue;
 
 #ifdef __APPLE__
 #include "TargetConditionals.h"
-#import <Accelerate/Accelerate.h>
+#include <Accelerate/Accelerate.h>
 #endif
 
 #if TARGET_OS_IPHONE
 
-#import <OpenGLES/ES2/gl.h>
-#import <OpenGLES/ES2/glext.h>
+#include <OpenGLES/ES2/gl.h>
+#include <OpenGLES/ES2/glext.h>
 
 
 #else
 
-#import <OpenGL/gl3.h>
-#import <OpenGL/gl3ext.h>
+#include <OpenGL/gl3.h>
+#include <OpenGL/gl3ext.h>
 
 // OpenGL ES 2.0 mapping to OpenGL 3.2 mappings
 #define glDepthRangef glDepthRange
@@ -51,15 +79,16 @@ float const D2R = PI * 2 / 360;
 
 #endif
 
-#import <AudioToolbox/AudioToolbox.h>
-#import <AudioToolbox/AudioFile.h>
-#import <AudioToolbox/ExtendedAudioFile.h>
-#import <OpenAL/al.h>
-#import <OpenAL/alc.h>
+#include <AudioToolbox/AudioToolbox.h>
+#include <AudioToolbox/AudioFile.h>
+#include <AudioToolbox/ExtendedAudioFile.h>
+#include <OpenAL/al.h>
+#include <OpenAL/alc.h>
 #if TARGET_OS_IPHONE
-#import <OpenAL/oalMacOSX_OALExtensions.h>
+#include <UIKit/UIKit.h>
+#include <OpenAL/oalMacOSX_OALExtensions.h>
 #else
-#import <OpenAL/MacOSX_OALExtensions.h>
+#include <OpenAL/MacOSX_OALExtensions.h>
 #endif
 
 #endif
diff --git a/KREngine/KREngine/Classes/KREngine.h b/KREngine/KREngine/Classes/KREngine.h
index 5a8887b..34a3290 100644
--- a/KREngine/KREngine/Classes/KREngine.h
+++ b/KREngine/KREngine/Classes/KREngine.h
@@ -29,16 +29,15 @@
 //  or implied, of Kearwood Gilbert.
 //
 
-// #import "KRTextureManager.h"
-#import <map>
-#import "KRMat4.h"
-#import "KRVector3.h"
-#import "KRMesh.h"
-#import "KRScene.h"
-#import "KRContext.h"
-#import "KRCamera.h"
+// #include "KRTextureManager.h"
+#include "KRMat4.h"
+#include "KRVector3.h"
+#include "KRMesh.h"
+#include "KRScene.h"
+#include "KRContext.h"
+#include "KRCamera.h"
 
-#import "KREngine-common.h"
+#include "KREngine-common.h"
 
 typedef enum KREngineParameterType {KRENGINE_PARAMETER_INT, KRENGINE_PARAMETER_FLOAT, KRENGINE_PARAMETER_BOOL} KREngineParameterType;
 
diff --git a/KREngine/KREngine/Classes/KREngine.mm b/KREngine/KREngine/Classes/KREngine.mm
index 500dfc0..33b9792 100644
--- a/KREngine/KREngine/Classes/KREngine.mm
+++ b/KREngine/KREngine/Classes/KREngine.mm
@@ -29,16 +29,14 @@
 //  or implied, of Kearwood Gilbert.
 //
 
-#import <UIKit/UIKit.h>
 
-#import "KREngine.h"
-#import "KRVector3.h"
-#import "KRScene.h"
-#import "KRSceneManager.h"
-#import "KRNode.h"
+#include "KREngine-common.h"
 
-#import <string>
-#import <sstream> 
+#include "KREngine.h"
+#include "KRVector3.h"
+#include "KRScene.h"
+#include "KRSceneManager.h"
+#include "KRNode.h"
 
 using namespace std;
 
diff --git a/KREngine/KREngine/Classes/KRHitInfo.h b/KREngine/KREngine/Classes/KRHitInfo.h
index d3e3a14..e63c5a6 100644
--- a/KREngine/KREngine/Classes/KRHitInfo.h
+++ b/KREngine/KREngine/Classes/KRHitInfo.h
@@ -32,8 +32,8 @@
 #ifndef KRHITINFO_H
 #define KRHITINFO_H
 
-#import "KRVector3.h"
-#import "KRNode.h"
+#include "KRVector3.h"
+#include "KRNode.h"
 
 class KRHitInfo {
 public:
diff --git a/KREngine/KREngine/Classes/KRLight.cpp b/KREngine/KREngine/Classes/KRLight.cpp
index 55e8f66..a1a3137 100644
--- a/KREngine/KREngine/Classes/KRLight.cpp
+++ b/KREngine/KREngine/Classes/KRLight.cpp
@@ -6,22 +6,20 @@
 //  Copyright (c) 2012 Kearwood Software. All rights reserved.
 //
 
-#include <iostream>
 
+#include "KREngine-common.h"
+#include "KRLight.h"
 
+#include "KRNode.h"
+#include "KRMat4.h"
+#include "KRVector3.h"
+#include "KRCamera.h"
+#include "KRContext.h"
 
-#import "KRLight.h"
+#include "KRShaderManager.h"
+#include "KRShader.h"
+#include "KRStockGeometry.h"
 
-#import "KRNode.h"
-#import "KRMat4.h"
-#import "KRVector3.h"
-#import "KRCamera.h"
-#import "KRContext.h"
-
-#import "KRShaderManager.h"
-#import "KRShader.h"
-#import "KRStockGeometry.h"
-#import "assert.h"
 
 KRLight::KRLight(KRScene &scene, std::string name) : KRNode(scene, name)
 {
diff --git a/KREngine/KREngine/Classes/KRLight.h b/KREngine/KREngine/Classes/KRLight.h
index b4fb4c8..9136500 100644
--- a/KREngine/KREngine/Classes/KRLight.h
+++ b/KREngine/KREngine/Classes/KRLight.h
@@ -9,9 +9,9 @@
 #ifndef KRLIGHT_H
 #define KRLIGHT_H
 
-#import "KRResource.h"
-#import "KRNode.h"
-#import "KRTexture.h"
+#include "KRResource.h"
+#include "KRNode.h"
+#include "KRTexture.h"
 
 static const float KRLIGHT_MIN_INFLUENCE = 0.15f; // 0.05f
 
diff --git a/KREngine/KREngine/Classes/KRMat4.cpp b/KREngine/KREngine/Classes/KRMat4.cpp
index fdd734c..eb90f6f 100644
--- a/KREngine/KREngine/Classes/KRMat4.cpp
+++ b/KREngine/KREngine/Classes/KRMat4.cpp
@@ -29,9 +29,7 @@
 //  or implied, of Kearwood Gilbert.
 //
 
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
+#include "KREngine-common.h"
 
 #include "KRMat4.h"
 #include "KRQuaternion.h"
diff --git a/KREngine/KREngine/Classes/KRMat4.h b/KREngine/KREngine/Classes/KRMat4.h
index 3b10925..1e39bb6 100644
--- a/KREngine/KREngine/Classes/KRMat4.h
+++ b/KREngine/KREngine/Classes/KRMat4.h
@@ -30,9 +30,9 @@
 //
 
 
-#import "KRVector3.h"
+#include "KRVector3.h"
 
-#import "KREngine-common.h"
+#include "KREngine-common.h"
 
 #ifndef KRMAT4_I
 #define KRMAT4_I
diff --git a/KREngine/KREngine/Classes/KRMaterial.cpp b/KREngine/KREngine/Classes/KRMaterial.cpp
index 43fac66..8ed5721 100644
--- a/KREngine/KREngine/Classes/KRMaterial.cpp
+++ b/KREngine/KREngine/Classes/KRMaterial.cpp
@@ -29,17 +29,12 @@
 //  or implied, of Kearwood Gilbert.
 //
 
+#include "KREngine-common.h"
+
 #include "KRMaterial.h"
 #include "KRTextureManager.h"
-#include <sys/mman.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <iostream>
-#include <sstream>
-#include <fcntl.h>
-#include <stdio.h>
 
-#import "KRcontext.h"
+#include "KRcontext.h"
 
 KRMaterial::KRMaterial(KRContext &context, const char *szName) : KRResource(context, szName) {
     strcpy(m_szName, szName);
@@ -83,7 +78,7 @@ std::string KRMaterial::getExtension() {
 bool KRMaterial::save(KRDataBlock &data) {
     std::stringstream stream;
     stream.precision(std::numeric_limits<long double>::digits10);
-    stream.setf(ios::fixed,ios::floatfield);
+    stream.setf(std::ios::fixed,std::ios::floatfield);
     
     stream << "newmtl " << m_szName;
     stream << "\nka " << m_ambientColor.x << " " << m_ambientColor.y << " " << m_ambientColor.z;
diff --git a/KREngine/KREngine/Classes/KRMaterial.h b/KREngine/KREngine/Classes/KRMaterial.h
index 7c15cf9..4d6d3fc 100644
--- a/KREngine/KREngine/Classes/KRMaterial.h
+++ b/KREngine/KREngine/Classes/KRMaterial.h
@@ -29,22 +29,16 @@
 //  or implied, of Kearwood Gilbert.
 //
 
-#import <stdint.h>
-#import <list>
-#import <string>
+#include "KREngine-common.h"
 
-#import "KREngine-common.h"
-
-using std::list;
-
-#import "KRTexture.h"
-#import "KRShaderManager.h"
-#import "KRShader.h"
-#import "KRCamera.h"
-#import "KRResource.h"
-#import "KRVector2.h"
-#import "KRScene.h"
-#import "KRBone.h"
+#include "KRTexture.h"
+#include "KRShaderManager.h"
+#include "KRShader.h"
+#include "KRCamera.h"
+#include "KRResource.h"
+#include "KRVector2.h"
+#include "KRScene.h"
+#include "KRBone.h"
 
 #ifndef KRMATERIAL_H
 #define KRMATERIAL_H
diff --git a/KREngine/KREngine/Classes/KRMaterialManager.cpp b/KREngine/KREngine/Classes/KRMaterialManager.cpp
index c3de57a..ce8ec0b 100644
--- a/KREngine/KREngine/Classes/KRMaterialManager.cpp
+++ b/KREngine/KREngine/Classes/KRMaterialManager.cpp
@@ -29,15 +29,9 @@
 //  or implied, of Kearwood Gilbert.
 //
 
+#include "KREngine-common.h"
 #include "KRMaterialManager.h"
 
-#import <stdint.h>
-#include <sys/mman.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-
 
 KRMaterialManager::KRMaterialManager(KRContext &context, KRTextureManager *pTextureManager, KRShaderManager *pShaderManager) : KRContextObject(context)
 {
diff --git a/KREngine/KREngine/Classes/KRMaterialManager.h b/KREngine/KREngine/Classes/KRMaterialManager.h
index 2a049f3..26cf811 100644
--- a/KREngine/KREngine/Classes/KRMaterialManager.h
+++ b/KREngine/KREngine/Classes/KRMaterialManager.h
@@ -35,15 +35,12 @@
 
 
 
-#import "KREngine-common.h"
+#include "KREngine-common.h"
 
 #include "KRMaterial.h"
 #include "KRTextureManager.h"
-
 #include "KRMaterialManager.h"
 
-#include <map>
-#import <string>
 
 using std::map;
 
diff --git a/KREngine/KREngine/Classes/KRMesh.cpp b/KREngine/KREngine/Classes/KRMesh.cpp
index 2ead845..c48f661 100644
--- a/KREngine/KREngine/Classes/KRMesh.cpp
+++ b/KREngine/KREngine/Classes/KRMesh.cpp
@@ -29,22 +29,15 @@
 //  or implied, of Kearwood Gilbert.
 //
 
-#import <stdint.h>
-#include <sys/mman.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#include <assert.h>
 
+#include "KREngine-common.h"
 
 #include "KRMesh.h"
 
 #include "KRVector3.h"
-#import "KRShader.h"
-#import "KRShaderManager.h"
-#import "KRContext.h"
+#include "KRShader.h"
+#include "KRShaderManager.h"
+#include "KRContext.h"
 
 
 KRMesh::KRMesh(KRContext &context, std::string name) : KRResource(context, name)  {
diff --git a/KREngine/KREngine/Classes/KRMesh.h b/KREngine/KREngine/Classes/KRMesh.h
index f080069..b172ec3 100644
--- a/KREngine/KREngine/Classes/KRMesh.h
+++ b/KREngine/KREngine/Classes/KRMesh.h
@@ -28,20 +28,13 @@
 //  authors and should not be interpreted as representing official policies, either expressed
 //  or implied, of Kearwood Gilbert.
 //
-#import <stdint.h>
-#import <vector>
-#import <set>
-#import <string>
-#import "KRVector2.h"
-#import "KRContext.h"
-#import "KRBone.h"
+#include "KREngine-common.h"
 
-#import "KREngine-common.h"
-
-using std::vector;
-using std::set;
-using std::list;
+#include "KRVector2.h"
+#include "KRContext.h"
+#include "KRBone.h"
 
+#include "KREngine-common.h"
 
 #define MAX_VBO_SIZE 65535
 #define KRENGINE_MAX_BONE_WEIGHTS_PER_VERTEX 4
@@ -53,10 +46,10 @@ using std::list;
 #ifndef KRMesh_I
 #define KRMesh_I
 
-#import "KRMaterialManager.h"
-#import "KRCamera.h"
-#import "KRViewport.h"
-#import "KRHitInfo.h"
+#include "KRMaterialManager.h"
+#include "KRCamera.h"
+#include "KRViewport.h"
+#include "KRHitInfo.h"
 
 class KRMaterial;
 class KRNode;
diff --git a/KREngine/KREngine/Classes/KRMeshManager.cpp b/KREngine/KREngine/Classes/KRMeshManager.cpp
index 637ddc0..5cdb619 100644
--- a/KREngine/KREngine/Classes/KRMeshManager.cpp
+++ b/KREngine/KREngine/Classes/KRMeshManager.cpp
@@ -29,12 +29,13 @@
 //  or implied, of Kearwood Gilbert.
 //
 
-#include "KRMeshManager.h"
-#include <assert.h>
+#include "KREngine-common.h"
 
-#import "KRMesh.h"
-#import "KRMeshCube.h"
-#import "KRMeshSphere.h"
+#include "KRMeshManager.h"
+
+#include "KRMesh.h"
+#include "KRMeshCube.h"
+#include "KRMeshSphere.h"
 
 KRMeshManager::KRMeshManager(KRContext &context) : KRContextObject(context) {
     m_currentVBO.vbo_handle = 0;
diff --git a/KREngine/KREngine/Classes/KRMeshManager.h b/KREngine/KREngine/Classes/KRMeshManager.h
index d5aac50..9004a19 100644
--- a/KREngine/KREngine/Classes/KRMeshManager.h
+++ b/KREngine/KREngine/Classes/KRMeshManager.h
@@ -32,17 +32,13 @@
 #ifndef KRMESHMANAGER_H
 #define KRMESHMANAGER_H
 
-#import "KREngine-common.h"
-#import "KRContextObject.h"
-#import "KRDataBlock.h"
+#include "KREngine-common.h"
+#include "KRContextObject.h"
+#include "KRDataBlock.h"
 
 class KRContext;
 class KRMesh;
 
-#include <map>
-#import <string>
-using std::map;
-
 class KRMeshManager : public KRContextObject {
 public:
     static const int KRENGINE_MAX_VOLUMETRIC_PLANES=500;
diff --git a/KREngine/KREngine/Classes/KRModel.cpp b/KREngine/KREngine/Classes/KRModel.cpp
index e307a82..9705f45 100644
--- a/KREngine/KREngine/Classes/KRModel.cpp
+++ b/KREngine/KREngine/Classes/KRModel.cpp
@@ -29,12 +29,12 @@
 //  or implied, of Kearwood Gilbert.
 //
 
-#include <iostream>
-#import "KRModel.h"
-#import "KRContext.h"
-#import "KRMesh.h"
-#import "KRQuaternion.h"
-#include <assert.h>
+#include "KREngine-common.h"
+
+#include "KRModel.h"
+#include "KRContext.h"
+#include "KRMesh.h"
+#include "KRQuaternion.h"
 
 KRModel::KRModel(KRScene &scene, std::string instance_name, std::string model_name, std::string light_map, float lod_min_coverage, bool receives_shadow, bool faces_camera) : KRNode(scene, instance_name) {
     m_lightMap = light_map;
diff --git a/KREngine/KREngine/Classes/KRModel.h b/KREngine/KREngine/Classes/KRModel.h
index 0477cd1..3136d00 100644
--- a/KREngine/KREngine/Classes/KRModel.h
+++ b/KREngine/KREngine/Classes/KRModel.h
@@ -31,22 +31,22 @@
 
 
 
-#import "KREngine-common.h"
+#include "KREngine-common.h"
 
 #ifndef KRMODEL_H
 #define KRMODEL_H
 
-#import "KRMesh.h"
-#import "KRMat4.h"
-#import "KRVector3.h"
-#import "KRModel.h"
-#import "KRCamera.h"
-#import "KRMeshManager.h"
-#import "KRNode.h"
-#import "KRContext.h"
-#import "KRMesh.h"
-#import "KRTexture.h"
-#import "KRBone.h"
+#include "KRMesh.h"
+#include "KRMat4.h"
+#include "KRVector3.h"
+#include "KRModel.h"
+#include "KRCamera.h"
+#include "KRMeshManager.h"
+#include "KRNode.h"
+#include "KRContext.h"
+#include "KRMesh.h"
+#include "KRTexture.h"
+#include "KRBone.h"
 
 class KRModel : public KRNode {
     
diff --git a/KREngine/KREngine/Classes/KRNode.cpp b/KREngine/KREngine/Classes/KRNode.cpp
index 738fe71..910efd6 100644
--- a/KREngine/KREngine/Classes/KRNode.cpp
+++ b/KREngine/KREngine/Classes/KRNode.cpp
@@ -6,23 +6,21 @@
 //  Copyright (c) 2012 Kearwood Software. All rights reserved.
 //
 
-#include <iostream>
-#include <assert.h>
-#include <limits>
+#include "KREngine-common.h"
 
-#import "KRNode.h"
-#import "KRPointLight.h"
-#import "KRSpotLight.h"
-#import "KRDirectionalLight.h"
-#import "KRModel.h"
-#import "KRCollider.h"
-#import "KRParticleSystem.h"
-#import "KRParticleSystemNewtonian.h"
-#import "KRAABB.h"
-#import "KRQuaternion.h"
-#import "KRBone.h"
-#import "KRAudioSource.h"
-#import "KRReverbZone.h"
+#include "KRNode.h"
+#include "KRPointLight.h"
+#include "KRSpotLight.h"
+#include "KRDirectionalLight.h"
+#include "KRModel.h"
+#include "KRCollider.h"
+#include "KRParticleSystem.h"
+#include "KRParticleSystemNewtonian.h"
+#include "KRAABB.h"
+#include "KRQuaternion.h"
+#include "KRBone.h"
+#include "KRAudioSource.h"
+#include "KRReverbZone.h"
 
 
 KRNode::KRNode(KRScene &scene, std::string name) : KRContextObject(scene.getContext())
@@ -233,7 +231,7 @@ KRNode *KRNode::LoadXML(KRScene &scene, tinyxml2::XMLElement *e) {
         }
         new_node = new KRModel(scene, szName, e->Attribute("mesh"), e->Attribute("light_map"), lod_min_coverage, receives_shadow, faces_camera);
     } else if(strcmp(szElementName, "collider") == 0) {
-        new_node = new KRCollider(scene, szName, e->Attribute("collider_name"), 65535, 1.0f);
+        new_node = new KRCollider(scene, szName, e->Attribute("mesh"), 65535, 1.0f);
     } else if(strcmp(szElementName, "bone") == 0) {
         new_node = new KRBone(scene, szName);
     } else if(strcmp(szElementName, "audio_source") == 0) {
diff --git a/KREngine/KREngine/Classes/KRNode.h b/KREngine/KREngine/Classes/KRNode.h
index 6fbcf81..1d84e0f 100644
--- a/KREngine/KREngine/Classes/KRNode.h
+++ b/KREngine/KREngine/Classes/KRNode.h
@@ -9,11 +9,10 @@
 #ifndef KRNODE_H
 #define KRNODE_H
 
-#import "KRResource.h"
-#import "KRVector3.h"
-#import "KRViewport.h"
-#import "tinyxml2.h"
-#import <stack.h>
+#include "KRResource.h"
+#include "KRVector3.h"
+#include "KRViewport.h"
+#include "tinyxml2.h"
 
 class KRCamera;
 class KRShaderManager;
diff --git a/KREngine/KREngine/Classes/KROctree.h b/KREngine/KREngine/Classes/KROctree.h
index 9ee9189..5a97c5e 100644
--- a/KREngine/KREngine/Classes/KROctree.h
+++ b/KREngine/KREngine/Classes/KROctree.h
@@ -9,7 +9,7 @@
 #ifndef KROCTREE_H
 #define KROCTREE_H
 
-#import "KREngine-common.h"
+#include "KREngine-common.h"
 #include "KROctreeNode.h"
 #include "KRMat4.h"
 #include "KRHitInfo.h"
diff --git a/KREngine/KREngine/Classes/KROctreeNode.h b/KREngine/KREngine/Classes/KROctreeNode.h
index 6c820d0..b33ab65 100644
--- a/KREngine/KREngine/Classes/KROctreeNode.h
+++ b/KREngine/KREngine/Classes/KROctreeNode.h
@@ -9,7 +9,7 @@
 #ifndef KROCTREENODE_H
 #define KROCTREENODE_H
 
-#import "KREngine-common.h"
+#include "KREngine-common.h"
 #include "KRVector3.h"
 #include "KRAABB.h"
 #include "KRHitInfo.h"
diff --git a/KREngine/KREngine/Classes/KRParticleSystem.h b/KREngine/KREngine/Classes/KRParticleSystem.h
index e1a5f0d..f938b32 100644
--- a/KREngine/KREngine/Classes/KRParticleSystem.h
+++ b/KREngine/KREngine/Classes/KRParticleSystem.h
@@ -9,7 +9,7 @@
 #ifndef KRPARTICLESYSTEM_H
 #define KRPARTICLESYSTEM_H
 
-#import "KRNode.h"
+#include "KRNode.h"
 
 class KRParticleSystem : public KRNode {
 public:
diff --git a/KREngine/KREngine/Classes/KRParticleSystemNewtonian.h b/KREngine/KREngine/Classes/KRParticleSystemNewtonian.h
index b4a4ab3..2ccc74f 100644
--- a/KREngine/KREngine/Classes/KRParticleSystemNewtonian.h
+++ b/KREngine/KREngine/Classes/KRParticleSystemNewtonian.h
@@ -9,7 +9,7 @@
 #ifndef KRPARTICLESYSTEMNEWTONIAN_H
 #define KRPARTICLESYSTEMNEWTONIAN_H
 
-#import "KRParticleSystem.h"
+#include "KRParticleSystem.h"
 
 class KRParticleSystemNewtonian : public KRParticleSystem {
 public:
diff --git a/KREngine/KREngine/Classes/KRPointLight.cpp b/KREngine/KREngine/Classes/KRPointLight.cpp
index 6e65642..cf7f1be 100644
--- a/KREngine/KREngine/Classes/KRPointLight.cpp
+++ b/KREngine/KREngine/Classes/KRPointLight.cpp
@@ -6,16 +6,14 @@
 //  Copyright (c) 2012 Kearwood Software. All rights reserved.
 //
 
-#include <iostream>
-#include <math.h>
+#include "KREngine-common.h"
 
-#import "KRPointLight.h"
-#import "KRMat4.h"
-#import "KRVector3.h"
-#import "KRCamera.h"
-#import "KRContext.h"
-#import "KRStockGeometry.h"
-#import "assert.h"
+#include "KRPointLight.h"
+#include "KRMat4.h"
+#include "KRVector3.h"
+#include "KRCamera.h"
+#include "KRContext.h"
+#include "KRStockGeometry.h"
 
 KRPointLight::KRPointLight(KRScene &scene, std::string name) : KRLight(scene, name)
 {
diff --git a/KREngine/KREngine/Classes/KRPointLight.h b/KREngine/KREngine/Classes/KRPointLight.h
index 8a91a94..34b84cb 100644
--- a/KREngine/KREngine/Classes/KRPointLight.h
+++ b/KREngine/KREngine/Classes/KRPointLight.h
@@ -9,8 +9,8 @@
 #ifndef KRPOINTLIGHT_H
 #define KRPOINTLIGHT_H
 
-#import "KRLight.h"
-#import "KRMat4.h"
+#include "KRLight.h"
+#include "KRMat4.h"
 
 class KRPointLight : public KRLight {
     
diff --git a/KREngine/KREngine/Classes/KRQuaternion.h b/KREngine/KREngine/Classes/KRQuaternion.h
index 444dec6..c1d508b 100644
--- a/KREngine/KREngine/Classes/KRQuaternion.h
+++ b/KREngine/KREngine/Classes/KRQuaternion.h
@@ -31,10 +31,9 @@
 
 #ifndef KRQUATERNION_H
 #define KRQUATERNION_H
-#include <math.h>
 
-#import "KREngine-common.h"
-#import "KRMat4.h"
+#include "KREngine-common.h"
+#include "KRMat4.h"
 
 class KRVector3;
 
diff --git a/KREngine/KREngine/Classes/KRResource+blend.cpp b/KREngine/KREngine/Classes/KRResource+blend.cpp
index 424e4ba..5d4f7c2 100644
--- a/KREngine/KREngine/Classes/KRResource+blend.cpp
+++ b/KREngine/KREngine/Classes/KRResource+blend.cpp
@@ -6,15 +6,7 @@
 //  Copyright (c) 2012 Kearwood Software. All rights reserved.
 //
 
-#include <iostream>
-#include <stdint.h>
-#include <sys/mman.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#include <assert.h>
+#include "KREngine-common.h"
 
 #include "KRResource.h"
 #include "KRScene.h"
diff --git a/KREngine/KREngine/Classes/KRResource+fbx.cpp b/KREngine/KREngine/Classes/KRResource+fbx.cpp
index 7d93d8a..69fe394 100644
--- a/KREngine/KREngine/Classes/KRResource+fbx.cpp
+++ b/KREngine/KREngine/Classes/KRResource+fbx.cpp
@@ -6,18 +6,7 @@
 //  Copyright (c) 2012 Kearwood Software. All rights reserved.
 //
 
-#include <iostream>
-#include <stdio.h>
-#include <stdint.h>
-#include <sys/mman.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#include <sstream>
-#include <assert.h>
-#include <vector.h>
+#include "KREngine-common.h"
 
 #include <fbxsdk.h>
 
@@ -121,8 +110,10 @@ std::vector<KRResource *> KRResource::LoadFbx(KRContext &context, const std::str
         FbxAnimStack *animation = pFbxScene->GetSrcObject<FbxAnimStack>(i);
         printf("  Animation %i of %i: %s\n", i+1, animation_count, animation->GetName());
         KRAnimation *new_animation = LoadAnimation(context, animation);
-        context.getAnimationManager()->addAnimation(new_animation);
-        resources.push_back(new_animation);
+        if(new_animation) {
+            context.getAnimationManager()->addAnimation(new_animation);
+            resources.push_back(new_animation);
+        }
     }
     
     // ----====---- Import Animation Curves ----====----
@@ -132,8 +123,10 @@ std::vector<KRResource *> KRResource::LoadFbx(KRContext &context, const std::str
         FbxAnimCurve *curve = pFbxScene->GetSrcObject<FbxAnimCurve>(i);
         printf("  Animation Curve %i of %i: %s\n", i+1, curve_count, curve->GetName());
         KRAnimationCurve *new_curve = LoadAnimationCurve(context, curve);
-        context.getAnimationCurveManager()->addAnimationCurve(new_curve);
-        resources.push_back(new_curve);
+        if(new_curve) {
+            context.getAnimationCurveManager()->addAnimationCurve(new_curve);
+            resources.push_back(new_curve);
+        }
     }
     
     // ----====---- Import Meshes ----====----
@@ -179,7 +172,7 @@ std::vector<KRResource *> KRResource::LoadFbx(KRContext &context, const std::str
     KRBundle *main_bundle = new KRBundle(context, base_name);
     KRBundle texture_bundle(context, base_name + "_textures");
     KRBundle animation_bundle(context, base_name + "_animations");
-//    KRBundle material_bundle(context, base_name + "_materials");
+    KRBundle material_bundle(context, base_name + "_materials");
     KRBundle meshes_bundle(context, base_name + "_meshes");
     
     for(std::vector<KRResource *>::iterator resource_itr=resources.begin(); resource_itr != resources.end(); resource_itr++) {
@@ -188,8 +181,10 @@ std::vector<KRResource *> KRResource::LoadFbx(KRContext &context, const std::str
             texture_bundle.append(*resource);
         } else if(dynamic_cast<KRAnimation *>(resource) != NULL) {
             animation_bundle.append(*resource);
-//        } else if(dynamic_cast<KRMaterial *>(resource) != NULL) {
-//            material_bundle.append(*resource);
+        } else if(dynamic_cast<KRAnimationCurve *>(resource) != NULL) {
+            animation_bundle.append(*resource);
+        } else if(dynamic_cast<KRMaterial *>(resource) != NULL) {
+            material_bundle.append(*resource);
         } else if(dynamic_cast<KRMesh *>(resource) != NULL) {
             meshes_bundle.append(*resource);
         } else {
@@ -199,7 +194,7 @@ std::vector<KRResource *> KRResource::LoadFbx(KRContext &context, const std::str
     
     main_bundle->append(texture_bundle);
     main_bundle->append(animation_bundle);
-//    main_bundle->append(material_bundle);
+    main_bundle->append(material_bundle);
     main_bundle->append(meshes_bundle);
     
     std::vector<KRResource *> output_resources;
diff --git a/KREngine/KREngine/Classes/KRResource+obj.cpp b/KREngine/KREngine/Classes/KRResource+obj.cpp
index afafda7..2915081 100644
--- a/KREngine/KREngine/Classes/KRResource+obj.cpp
+++ b/KREngine/KREngine/Classes/KRResource+obj.cpp
@@ -6,15 +6,7 @@
 //  Copyright (c) 2012 Kearwood Software. All rights reserved.
 //
 
-#include <iostream>
-#include <stdint.h>
-#include <sys/mman.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#include <assert.h>
+#include "KREngine-common.h"
 
 #include "KRResource.h"
 #include "KRMesh.h"
diff --git a/KREngine/KREngine/Classes/KRResource.cpp b/KREngine/KREngine/Classes/KRResource.cpp
index 671184d..4a18d9a 100644
--- a/KREngine/KREngine/Classes/KRResource.cpp
+++ b/KREngine/KREngine/Classes/KRResource.cpp
@@ -6,9 +6,8 @@
 //  Copyright (c) 2012 Kearwood Software. All rights reserved.
 //
 
-#include <iostream>
-
-#import "KRResource.h"
+#include "KREngine-common.h"
+#include "KRResource.h"
 
 KRResource::KRResource(KRContext &context, std::string name) : KRContextObject(context) {
     m_name = name;
diff --git a/KREngine/KREngine/Classes/KRResource.h b/KREngine/KREngine/Classes/KRResource.h
index a52e187..1401097 100644
--- a/KREngine/KREngine/Classes/KRResource.h
+++ b/KREngine/KREngine/Classes/KRResource.h
@@ -6,14 +6,9 @@
 //  Copyright (c) 2012 Kearwood Software. All rights reserved.
 //
 
-#import <stdint.h>
-#import <vector>
-#import <set>
-#import <list>
-#import <string>
-#import "KREngine-common.h"
-#import "KRContextObject.h"
-#import "KRDataBlock.h"
+#include "KREngine-common.h"
+#include "KRContextObject.h"
+#include "KRDataBlock.h"
 
 #ifndef KRRESOURCE_H
 #define KRRESOURCE_H
diff --git a/KREngine/KREngine/Classes/KRReverbZone.h b/KREngine/KREngine/Classes/KRReverbZone.h
index 5b47f77..c18e76d 100644
--- a/KREngine/KREngine/Classes/KRReverbZone.h
+++ b/KREngine/KREngine/Classes/KRReverbZone.h
@@ -9,9 +9,9 @@
 #ifndef KRREVERB_ZONE_H
 #define KRREVERB_ZONE_H
 
-#import "KRResource.h"
-#import "KRNode.h"
-#import "KRTexture.h"
+#include "KRResource.h"
+#include "KRNode.h"
+#include "KRTexture.h"
 
 class KRReverbZone : public KRNode {
 public:
diff --git a/KREngine/KREngine/Classes/KRScene.cpp b/KREngine/KREngine/Classes/KRScene.cpp
index 0d8af27..270468d 100644
--- a/KREngine/KREngine/Classes/KRScene.cpp
+++ b/KREngine/KREngine/Classes/KRScene.cpp
@@ -29,21 +29,20 @@
 //  or implied, of Kearwood Gilbert.
 //
 
-#include <iostream>
+#include "KREngine-common.h"
+#include "KRVector3.h"
+#include "KRMat4.h"
+#include "tinyxml2.h"
 
-#import "KRVector3.h"
-#import "KRMat4.h"
-#import "tinyxml2.h"
+#include "KRLight.h"
 
-#import "KRLight.h"
-
-#import "KRScene.h"
-#import "KRNode.h"
-#import "KRStockGeometry.h"
-#import "KRDirectionalLight.h"
-#import "KRSpotLight.h"
-#import "KRPointLight.h"
-#import "KRQuaternion.h"
+#include "KRScene.h"
+#include "KRNode.h"
+#include "KRStockGeometry.h"
+#include "KRDirectionalLight.h"
+#include "KRSpotLight.h"
+#include "KRPointLight.h"
+#include "KRQuaternion.h"
 
 const long KRENGINE_OCCLUSION_TEST_EXPIRY = 60;
 
diff --git a/KREngine/KREngine/Classes/KRScene.h b/KREngine/KREngine/Classes/KRScene.h
index 457d968..926750a 100644
--- a/KREngine/KREngine/Classes/KRScene.h
+++ b/KREngine/KREngine/Classes/KRScene.h
@@ -32,16 +32,15 @@
 #ifndef KRSCENE_H
 #define KRSCENE_H
 
-#import "KREngine-common.h"
+#include "KREngine-common.h"
 
-#import <vector>
-#import "KRModel.h"
-#import "KRMat4.h"
-#import "KRMesh.h"
-#import "KRCamera.h"
-#import "KRMeshManager.h"
-#import "KRNode.h"
-#import "KROctree.h"
+#include "KRModel.h"
+#include "KRMat4.h"
+#include "KRMesh.h"
+#include "KRCamera.h"
+#include "KRMeshManager.h"
+#include "KRNode.h"
+#include "KROctree.h"
 class KRModel;
 class KRLight;
 
diff --git a/KREngine/KREngine/Classes/KRSceneManager.cpp b/KREngine/KREngine/Classes/KRSceneManager.cpp
index bf9e321..aacc3f9 100644
--- a/KREngine/KREngine/Classes/KRSceneManager.cpp
+++ b/KREngine/KREngine/Classes/KRSceneManager.cpp
@@ -29,8 +29,8 @@
 //  or implied, of Kearwood Gilbert.
 //
 
-#import "KRSceneManager.h"
-#import "KRScene.h"
+#include "KRSceneManager.h"
+#include "KRScene.h"
 
 KRSceneManager::KRSceneManager(KRContext &context) : KRContextObject(context){
 }
diff --git a/KREngine/KREngine/Classes/KRSceneManager.h b/KREngine/KREngine/Classes/KRSceneManager.h
index 98de495..0460680 100644
--- a/KREngine/KREngine/Classes/KRSceneManager.h
+++ b/KREngine/KREngine/Classes/KRSceneManager.h
@@ -32,16 +32,12 @@
 #ifndef KRENGINE_KRSCENEMANAGER_H
 #define KRENGINE_KRSCENEMANAGER_H
 
-#import "KREngine-common.h"
-#import "KRContextObject.h"
-#import "KRDataBlock.h"
+#include "KREngine-common.h"
+#include "KRContextObject.h"
+#include "KRDataBlock.h"
 
 class KRScene;
 
-#include <map>
-#import <string>
-using std::map;
-
 
 class KRSceneManager : public KRContextObject {
 public:
diff --git a/KREngine/KREngine/Classes/KRShader.cpp b/KREngine/KREngine/Classes/KRShader.cpp
index 456a9d7..dc47dfd 100644
--- a/KREngine/KREngine/Classes/KRShader.cpp
+++ b/KREngine/KREngine/Classes/KRShader.cpp
@@ -30,7 +30,7 @@
 //
 
 #include "KRShader.h"
-#import "assert.h"
+#include "assert.h"
 #include "KRLight.h"
 #include "KRDirectionalLight.h"
 #include "KRSpotLight.h"
diff --git a/KREngine/KREngine/Classes/KRShader.h b/KREngine/KREngine/Classes/KRShader.h
index bbe1bae..71d8206 100644
--- a/KREngine/KREngine/Classes/KRShader.h
+++ b/KREngine/KREngine/Classes/KRShader.h
@@ -29,24 +29,17 @@
 //  or implied, of Kearwood Gilbert.
 //
 
-#import <stdint.h>
-#import <vector>
-#import <string>
-#import <stack>
 
-#import "KREngine-common.h"
-
-
-using std::vector;
 
 #ifndef KRSHADER_H
 #define KRSHADER_H
 
-#import "KRShader.h"
-#import "KRMat4.h"
-#import "KRCamera.h"
-#import "KRNode.h"
-#import "KRViewport.h"
+#include "KREngine-common.h"
+#include "KRShader.h"
+#include "KRMat4.h"
+#include "KRCamera.h"
+#include "KRNode.h"
+#include "KRViewport.h"
 
 class KRShader  : public KRContextObject {
 public:
diff --git a/KREngine/KREngine/Classes/KRShaderManager.cpp b/KREngine/KREngine/Classes/KRShaderManager.cpp
index f3de56e..407a742 100644
--- a/KREngine/KREngine/Classes/KRShaderManager.cpp
+++ b/KREngine/KREngine/Classes/KRShaderManager.cpp
@@ -29,11 +29,9 @@
 //  or implied, of Kearwood Gilbert.
 //
 
-#include "KRShaderManager.h"
-#include <iostream>
-#include <sstream>
-#include <fstream>
+#include "KREngine-common.h"
 
+#include "KRShaderManager.h"
 #include "KRLight.h"
 #include "KRDirectionalLight.h"
 #include "KRSpotLight.h"
diff --git a/KREngine/KREngine/Classes/KRShaderManager.h b/KREngine/KREngine/Classes/KRShaderManager.h
index 76a7742..226aa86 100644
--- a/KREngine/KREngine/Classes/KRShaderManager.h
+++ b/KREngine/KREngine/Classes/KRShaderManager.h
@@ -29,13 +29,12 @@
 //  or implied, of Kearwood Gilbert.
 //
 
-#import <stdint.h>
-#import <vector>
-#import <map>
-#import <string>
-#import "KRCamera.h"
-#import "KRDataBlock.h"
-#import "KRNode.h"
+
+#include "KREngine-common.h"
+
+#include "KRCamera.h"
+#include "KRDataBlock.h"
+#include "KRNode.h"
 
 using std::map;
 using std::vector;
diff --git a/KREngine/KREngine/Classes/KRSpotLight.cpp b/KREngine/KREngine/Classes/KRSpotLight.cpp
index f937074..0ca149c 100644
--- a/KREngine/KREngine/Classes/KRSpotLight.cpp
+++ b/KREngine/KREngine/Classes/KRSpotLight.cpp
@@ -6,9 +6,8 @@
 //  Copyright (c) 2012 Kearwood Software. All rights reserved.
 //
 
-#include <iostream>
-
-#import "KRSpotLight.h"
+#include "KREngine-common.h"
+#include "KRSpotLight.h"
 
 KRSpotLight::KRSpotLight(KRScene &scene, std::string name) : KRLight(scene, name)
 {
diff --git a/KREngine/KREngine/Classes/KRSpotLight.h b/KREngine/KREngine/Classes/KRSpotLight.h
index 02f2a9e..6ea1b60 100644
--- a/KREngine/KREngine/Classes/KRSpotLight.h
+++ b/KREngine/KREngine/Classes/KRSpotLight.h
@@ -9,7 +9,7 @@
 #ifndef KREngine_KRSpotLight_h
 #define KREngine_KRSpotLight_h
 
-#import "KRLight.h"
+#include "KRLight.h"
 
 class KRSpotLight : public KRLight {
 public:
diff --git a/KREngine/KREngine/Classes/KRTexture.cpp b/KREngine/KREngine/Classes/KRTexture.cpp
index 84469f0..da111af 100644
--- a/KREngine/KREngine/Classes/KRTexture.cpp
+++ b/KREngine/KREngine/Classes/KRTexture.cpp
@@ -6,7 +6,7 @@
 //  Copyright (c) 2012 Kearwood Software. All rights reserved.
 //
 
-#include <assert.h>
+#include "KREngine-common.h"
 #include "KRTexture.h"
 #include "KRDataBlock.h"
 #include "KRContext.h"
diff --git a/KREngine/KREngine/Classes/KRTexture.h b/KREngine/KREngine/Classes/KRTexture.h
index 306b06f..4a7ef4a 100644
--- a/KREngine/KREngine/Classes/KRTexture.h
+++ b/KREngine/KREngine/Classes/KRTexture.h
@@ -34,9 +34,9 @@
 #ifndef KRTEXTURE_H
 #define KRTEXTURE_H
 
-#import "KREngine-common.h"
-#import "KRContextObject.h"
-#import "KRResource.h"
+#include "KREngine-common.h"
+#include "KRContextObject.h"
+#include "KRResource.h"
 
 
 class KRDataBlock;
diff --git a/KREngine/KREngine/Classes/KRTexture2D.cpp b/KREngine/KREngine/Classes/KRTexture2D.cpp
index d03b101..7508853 100644
--- a/KREngine/KREngine/Classes/KRTexture2D.cpp
+++ b/KREngine/KREngine/Classes/KRTexture2D.cpp
@@ -29,18 +29,10 @@
 //  or implied, of Kearwood Gilbert.
 //
 
+#include "KREngine-common.h"
 #include "KRTexture2D.h"
 #include "KRTextureManager.h"
 
-#import <stdint.h>
-#include <sys/mman.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#import <stdint.h>
-#import <assert.h>
-
 KRTexture2D::KRTexture2D(KRContext &context, KRDataBlock *data, std::string name) : KRTexture(context, name) {
     m_current_lod_max_dim = 0;
     m_pData = data;
diff --git a/KREngine/KREngine/Classes/KRTexture2D.h b/KREngine/KREngine/Classes/KRTexture2D.h
index fba1aa8..ff2510c 100644
--- a/KREngine/KREngine/Classes/KRTexture2D.h
+++ b/KREngine/KREngine/Classes/KRTexture2D.h
@@ -29,12 +29,8 @@
 //  or implied, of Kearwood Gilbert.
 //
 
-#import <stdint.h>
-#import <list>
-#import <string>
-
-#import "KREngine-common.h"
-#import "KRDataBlock.h"
+#include "KREngine-common.h"
+#include "KRDataBlock.h"
 
 using std::list;
 
diff --git a/KREngine/KREngine/Classes/KRTextureAnimated.cpp b/KREngine/KREngine/Classes/KRTextureAnimated.cpp
index de0138b..450c8a1 100644
--- a/KREngine/KREngine/Classes/KRTextureAnimated.cpp
+++ b/KREngine/KREngine/Classes/KRTextureAnimated.cpp
@@ -29,7 +29,7 @@
 //  or implied, of Kearwood Gilbert.
 //
 
-#import <assert.h>
+#include "KREngine-common.h"
 #include "KRTextureAnimated.h"
 #include "KRTexture2D.h"
 #include "KRContext.h"
diff --git a/KREngine/KREngine/Classes/KRTextureCube.cpp b/KREngine/KREngine/Classes/KRTextureCube.cpp
index 8a2fa70..4463eae 100644
--- a/KREngine/KREngine/Classes/KRTextureCube.cpp
+++ b/KREngine/KREngine/Classes/KRTextureCube.cpp
@@ -29,7 +29,6 @@
 //  or implied, of Kearwood Gilbert.
 //
 
-#import <assert.h>
 #include "KRTextureCube.h"
 #include "KRTexture2D.h"
 #include "KRContext.h"
diff --git a/KREngine/KREngine/Classes/KRTextureManager.cpp b/KREngine/KREngine/Classes/KRTextureManager.cpp
index b6482a4..12b7e8b 100644
--- a/KREngine/KREngine/Classes/KRTextureManager.cpp
+++ b/KREngine/KREngine/Classes/KRTextureManager.cpp
@@ -29,6 +29,7 @@
 //  or implied, of Kearwood Gilbert.
 //
 
+#include "KREngine-common.h"
 #include "KRTextureManager.h"
 #include "KRContext.h"
 #include "KRTexture2D.h"
@@ -37,7 +38,6 @@
 #include "KRTextureCube.h"
 #include "KRTextureAnimated.h"
 #include "KRContext.h"
-#include <string.h>
 
 KRTextureManager::KRTextureManager(KRContext &context) : KRContextObject(context) {
     m_textureMemUsed = 0;
diff --git a/KREngine/KREngine/Classes/KRTextureManager.h b/KREngine/KREngine/Classes/KRTextureManager.h
index ad3f835..f8437b4 100644
--- a/KREngine/KREngine/Classes/KRTextureManager.h
+++ b/KREngine/KREngine/Classes/KRTextureManager.h
@@ -32,18 +32,14 @@
 #ifndef KRTEXTUREMANAGER_H
 #define KRTEXTUREMANAGER_H
 
+#include "KREngine-common.h"
+
 #include "KRTexture.h"
 #include "KRContextObject.h"
 #include "KREngine-common.h"
 #include "KRDataBlock.h"
 #include "KRContext.h"
 
-#include <map>
-#include <set>
-#import <string>
-
-using std::map;
-
 class KRTextureManager : public KRContextObject {
 public:
     KRTextureManager(KRContext &context);
diff --git a/KREngine/KREngine/Classes/KRTexturePVR.cpp b/KREngine/KREngine/Classes/KRTexturePVR.cpp
index d797ebc..b326bee 100644
--- a/KREngine/KREngine/Classes/KRTexturePVR.cpp
+++ b/KREngine/KREngine/Classes/KRTexturePVR.cpp
@@ -32,15 +32,7 @@
 #include "KRTexturePVR.h"
 #include "KRTextureManager.h"
 
-#import <stdint.h>
-#include <sys/mman.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#import <stdint.h>
-#import <assert.h>
-#import "KREngine-common.h"
+#include "KREngine-common.h"
 
 
 #define PVR_TEXTURE_FLAG_TYPE_MASK	0xff
diff --git a/KREngine/KREngine/Classes/KRUnknown.h b/KREngine/KREngine/Classes/KRUnknown.h
index 3d9d7b0..6196b78 100644
--- a/KREngine/KREngine/Classes/KRUnknown.h
+++ b/KREngine/KREngine/Classes/KRUnknown.h
@@ -32,11 +32,10 @@
 #ifndef KRUNKNOWN_H
 #define KRUNKNOWN_H
 
-#import "KREngine-common.h"
-#import "KRContextObject.h"
-#import "KRDataBlock.h"
-#import "KRResource.h"
-#import <map>
+#include "KREngine-common.h"
+#include "KRContextObject.h"
+#include "KRDataBlock.h"
+#include "KRResource.h"
 
 class KRUnknown : public KRResource {
     
diff --git a/KREngine/KREngine/Classes/KRUnknownManager.cpp b/KREngine/KREngine/Classes/KRUnknownManager.cpp
index 2b8dd79..2909c1e 100644
--- a/KREngine/KREngine/Classes/KRUnknownManager.cpp
+++ b/KREngine/KREngine/Classes/KRUnknownManager.cpp
@@ -55,7 +55,7 @@ void KRUnknownManager::add(KRUnknown *unknown)
     
     map<std::string, map<std::string, KRUnknown *> >::iterator extension_itr = m_unknowns.find(lower_extension);
     if(extension_itr == m_unknowns.end()) {
-        m_unknowns[lower_name] = map<std::string, KRUnknown *>();
+        m_unknowns[lower_extension] = map<std::string, KRUnknown *>();
         extension_itr = m_unknowns.find(lower_extension);
     }
     
@@ -64,7 +64,7 @@ void KRUnknownManager::add(KRUnknown *unknown)
         delete (*name_itr).second;
         (*name_itr).second = unknown;
     } else {
-        (*extension_itr).second[lower_extension] = unknown;
+        (*extension_itr).second[lower_name] = unknown;
     }
 }
 
diff --git a/KREngine/KREngine/Classes/KRUnknownManager.h b/KREngine/KREngine/Classes/KRUnknownManager.h
index fbb0dfd..0d929b2 100644
--- a/KREngine/KREngine/Classes/KRUnknownManager.h
+++ b/KREngine/KREngine/Classes/KRUnknownManager.h
@@ -32,19 +32,12 @@
 #ifndef KRUNKNOWN_MANAGER_H
 #define KRUNKNOWN_MANAGER_H
 
-#import "KREngine-common.h"
+#include "KREngine-common.h"
 
 #include "KRUnknown.h"
 #include "KRContextObject.h"
 #include "KRDataBlock.h"
 
-#include <map>
-#include <set>
-#include <string>
-
-using std::map;
-using std::set;
-
 class KRUnknownManager : public KRContextObject {
 public:
     KRUnknownManager(KRContext &context);
diff --git a/KREngine/KREngine/Classes/KRVector2.cpp b/KREngine/KREngine/Classes/KRVector2.cpp
index 74a4ad1..213d57f 100644
--- a/KREngine/KREngine/Classes/KRVector2.cpp
+++ b/KREngine/KREngine/Classes/KRVector2.cpp
@@ -6,8 +6,7 @@
 //  Copyright (c) 2012 Kearwood Software. All rights reserved.
 //
 
-#include <iostream>
-#include <math.h>
+#include "KREngine-common.h"
 
 #include "KRVector2.h"
 
diff --git a/KREngine/KREngine/Classes/KRVector2.h b/KREngine/KREngine/Classes/KRVector2.h
index bea9caf..5616976 100644
--- a/KREngine/KREngine/Classes/KRVector2.h
+++ b/KREngine/KREngine/Classes/KRVector2.h
@@ -32,7 +32,7 @@
 #ifndef KRVECTOR2
 #define KRVECTOR2
 
-#import "KREngine-common.h"
+#include "KREngine-common.h"
 
 class KRVector2 {
     
diff --git a/KREngine/KREngine/Classes/KRVector3.cpp b/KREngine/KREngine/Classes/KRVector3.cpp
index 129bef4..d46d959 100644
--- a/KREngine/KREngine/Classes/KRVector3.cpp
+++ b/KREngine/KREngine/Classes/KRVector3.cpp
@@ -29,11 +29,9 @@
 //  or implied, of Kearwood Gilbert.
 //
 
+#include "KREngine-common.h"
 #include "KRVector3.h"
 
-#include <math.h>
-#include <limits.h>
-
 //default constructor
 KRVector3::KRVector3()
 {
diff --git a/KREngine/KREngine/Classes/KRVector3.h b/KREngine/KREngine/Classes/KRVector3.h
index c28b8f1..26f7150 100644
--- a/KREngine/KREngine/Classes/KRVector3.h
+++ b/KREngine/KREngine/Classes/KRVector3.h
@@ -32,7 +32,7 @@
 #ifndef KRVECTOR3
 #define KRVECTOR3
 
-#import "KREngine-common.h"
+#include "KREngine-common.h"
 
 class KRVector3 {
 
diff --git a/KREngine/KREngine/Classes/KRViewport.h b/KREngine/KREngine/Classes/KRViewport.h
index 438e4e9..9c8e865 100644
--- a/KREngine/KREngine/Classes/KRViewport.h
+++ b/KREngine/KREngine/Classes/KRViewport.h
@@ -9,10 +9,10 @@
 #ifndef KRENGINE_KRVIEWPORT_H
 #define KRENGINE_KRVIEWPORT_H
 
+#include "KREngine-common.h"
 #include "KRVector2.h"
 #include "KRMat4.h"
 #include "KRAABB.h"
-#include <map.h>
 
 class KRLight;
 
diff --git a/KREngine/KREngine/KREngine-Prefix.pch b/KREngine/KREngine/KREngine-Prefix.pch
index debee03..6bf368e 100644
--- a/KREngine/KREngine/KREngine-Prefix.pch
+++ b/KREngine/KREngine/KREngine-Prefix.pch
@@ -3,5 +3,7 @@
 //
 
 #ifdef __OBJC__
-    #import <Foundation/Foundation.h>
+    #include <Foundation/Foundation.h>
 #endif
+
+#include "KREngine-common.h"
\ No newline at end of file
diff --git a/KREngine/krengine_osx/krengine_osx-Prefix.pch b/KREngine/krengine_osx/krengine_osx-Prefix.pch
index 706ac2e..db93262 100644
--- a/KREngine/krengine_osx/krengine_osx-Prefix.pch
+++ b/KREngine/krengine_osx/krengine_osx-Prefix.pch
@@ -3,5 +3,7 @@
 //
 
 #ifdef __OBJC__
-    #import <Cocoa/Cocoa.h>
+    #include <Cocoa/Cocoa.h>
 #endif
+
+#include "KREngine-common.h"
diff --git a/KREngine/krengine_osx/krengine_osx.h b/KREngine/krengine_osx/krengine_osx.h
index 2b1ef80..44e4f2d 100644
--- a/KREngine/krengine_osx/krengine_osx.h
+++ b/KREngine/krengine_osx/krengine_osx.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2012 Kearwood Software. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
+#include <Foundation/Foundation.h>
 
 @interface krengine_osx : NSObject
 
diff --git a/KREngine/krengine_osx/krengine_osx.m b/KREngine/krengine_osx/krengine_osx.mm
similarity index 87%
rename from KREngine/krengine_osx/krengine_osx.m
rename to KREngine/krengine_osx/krengine_osx.mm
index df2d1b8..fe4318f 100644
--- a/KREngine/krengine_osx/krengine_osx.m
+++ b/KREngine/krengine_osx/krengine_osx.mm
@@ -6,7 +6,7 @@
 //  Copyright (c) 2012 Kearwood Software. All rights reserved.
 //
 
-#import "krengine_osx.h"
+#include "krengine_osx.h"
 
 @implementation krengine_osx