diff --git a/Source/BansheeUtility/Allocators/BsFreeAlloc.h b/Source/BansheeUtility/Allocators/BsFreeAlloc.h
index d9ec441dc..237c5d1e8 100644
--- a/Source/BansheeUtility/Allocators/BsFreeAlloc.h
+++ b/Source/BansheeUtility/Allocators/BsFreeAlloc.h
@@ -2,8 +2,6 @@
 //**************** Copyright (c) 2017 Marko Pintera (marko.pintera@gmail.com). All rights reserved. **********************//
 #pragma once

-#include "Prerequisites/BsPrerequisitesUtil.h"
-
 namespace bs
 {
 	/** @addtogroup Internal-Utility
diff --git a/Source/BansheeUtility/Allocators/BsPoolAlloc.h b/Source/BansheeUtility/Allocators/BsPoolAlloc.h
index 6c79338c7..48f706ad4 100644
--- a/Source/BansheeUtility/Allocators/BsPoolAlloc.h
+++ b/Source/BansheeUtility/Allocators/BsPoolAlloc.h
@@ -2,6 +2,8 @@
 //**************** Copyright (c) 2017 Marko Pintera (marko.pintera@gmail.com). All rights reserved. **********************//
 #pragma once

+#include <climits>
+
 #include "Prerequisites/BsPrerequisitesUtil.h"

 namespace bs
diff --git a/Source/BansheeUtility/Error/BsCrashHandler.h b/Source/BansheeUtility/Error/BsCrashHandler.h
index 0c116c33f..c9d83b9a3 100644
--- a/Source/BansheeUtility/Error/BsCrashHandler.h
+++ b/Source/BansheeUtility/Error/BsCrashHandler.h
@@ -2,6 +2,8 @@
 //**************** Copyright (c) 2016 Marko Pintera (marko.pintera@gmail.com). All rights reserved. **********************//
 #pragma once

+#include "Prerequisites/BsPrerequisitesUtil.h"
+
 #define BS_MAX_STACKTRACE_DEPTH 200
 #define BS_MAX_STACKTRACE_NAME_BYTES 1024

diff --git a/Source/BansheeUtility/Math/BsRadian.h b/Source/BansheeUtility/Math/BsRadian.h
index 2772acd6f..d3039c131 100644
--- a/Source/BansheeUtility/Math/BsRadian.h
+++ b/Source/BansheeUtility/Math/BsRadian.h
@@ -2,7 +2,8 @@
 //**************** Copyright (c) 2016 Marko Pintera (marko.pintera@gmail.com). All rights reserved. **********************//
 #pragma once

-#include "Prerequisites/BsPrerequisitesUtil.h"
+#include "Prerequisites/BsPlatformDefines.h"
+#include "Prerequisites/BsRTTIPrerequisites.h"

 namespace bs
 {
diff --git a/Source/BansheeUtility/Utility/BsOctree.h b/Source/BansheeUtility/Utility/BsOctree.h
index c6ea43e84..4b1807aec 100644
--- a/Source/BansheeUtility/Utility/BsOctree.h
+++ b/Source/BansheeUtility/Utility/BsOctree.h
@@ -709,7 +709,7 @@ namespace bs
 				{
 					// Create the child node if needed, and add the element to it
 					if (!node->mChildren[child.index])
-						node->mChildren[child.index] = mNodeAlloc.construct<Node>(node);
+						node->mChildren[child.index] = mNodeAlloc.construct(node);

 					addElementToNode(elem, node->mChildren[child.index], nodeBounds.getChild(child));
 				}
@@ -739,8 +739,8 @@ namespace bs
 			UINT32 freeIdx = elements.count % Options::MaxElementsPerNode;
 			if(freeIdx == 0) // New group needed
 			{
-				ElementGroup* elementGroup = (ElementGroup*)mElemAlloc.construct<ElementGroup>();
-				ElementBoundGroup* boundGroup = (ElementBoundGroup*)mElemBoundsAlloc.construct<ElementBoundGroup>();
+				ElementGroup* elementGroup = (ElementGroup*)mElemAlloc.construct();
+				ElementBoundGroup* boundGroup = (ElementBoundGroup*)mElemBoundsAlloc.construct();

 				elementGroup->next = elements.values;
 				boundGroup->next = elements.bounds;
diff --git a/Source/RenderBeast/BsPostProcessing.h b/Source/RenderBeast/BsPostProcessing.h
index 19c68d72c..55fe1c0b4 100644
--- a/Source/RenderBeast/BsPostProcessing.h
+++ b/Source/RenderBeast/BsPostProcessing.h
@@ -315,8 +315,8 @@ namespace bs { namespace ct
 		static ShaderVariation VAR_##x##_NoAutoExposure_NoMSAA;

 #define VARIATION_VOLUME_LUT(x)			\
-		VARIATION_GAMMA(##x##_Gamma)	\
-		VARIATION_GAMMA(##x##_NoGamma)
+		VARIATION_GAMMA(x##_Gamma)	\
+		VARIATION_GAMMA(x##_NoGamma)

 		VARIATION_VOLUME_LUT(VolumeLUT)
 		VARIATION_VOLUME_LUT(NoVolumeLUT)
diff --git a/Source/SBansheeEngine/CMakeLists.txt b/Source/SBansheeEngine/CMakeLists.txt
index 8a07bf656..ec5981201 100644
--- a/Source/SBansheeEngine/CMakeLists.txt
+++ b/Source/SBansheeEngine/CMakeLists.txt
@@ -10,7 +10,6 @@ set(SBansheeEngine_INC
 	"../BansheeUtility"
 	"../BansheeCore"
 	"../BansheeEngine"
-	"../BansheeEditor"
 	"../BansheeMono"
 	"${PROJECT_BINARY_DIR}/Generated/Engine/Include")

@@ -27,7 +26,7 @@ target_compile_definitions(SBansheeEngine PRIVATE -DBS_SCR_BE_EXPORTS)

 # Libraries
 ## Local libs
-target_link_libraries(SBansheeEngine BansheeMono BansheeEditor BansheeEngine BansheeUtility BansheeCore)
+target_link_libraries(SBansheeEngine BansheeMono BansheeEngine BansheeUtility BansheeCore)

 # IDE specific
-set_property(TARGET SBansheeEngine PROPERTY FOLDER Script)
\ No newline at end of file
+set_property(TARGET SBansheeEngine PROPERTY FOLDER Script)