diff --git a/Editor/AnimationWindow.cpp b/Editor/AnimationWindow.cpp
index d47c2a60e..e9c7d1bc6 100644
--- a/Editor/AnimationWindow.cpp
+++ b/Editor/AnimationWindow.cpp
@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "AnimationWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;
diff --git a/Editor/AnimationWindow.h b/Editor/AnimationWindow.h
index c1ca004fe..c30179caf 100644
--- a/Editor/AnimationWindow.h
+++ b/Editor/AnimationWindow.h
@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class AnimationWindow : public wi::gui::Window
diff --git a/Editor/ArmatureWindow.cpp b/Editor/ArmatureWindow.cpp
index c3acc87b1..d20289697 100644
--- a/Editor/ArmatureWindow.cpp
+++ b/Editor/ArmatureWindow.cpp
@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "ArmatureWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;
diff --git a/Editor/ArmatureWindow.h b/Editor/ArmatureWindow.h
index 574cd5682..6e34da3a9 100644
--- a/Editor/ArmatureWindow.h
+++ b/Editor/ArmatureWindow.h
@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class ArmatureWindow : public wi::gui::Window
diff --git a/Editor/CameraComponentWindow.cpp b/Editor/CameraComponentWindow.cpp
index 02da29f09..3d7c8c6c9 100644
--- a/Editor/CameraComponentWindow.cpp
+++ b/Editor/CameraComponentWindow.cpp
@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "CameraComponentWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;
diff --git a/Editor/CameraComponentWindow.h b/Editor/CameraComponentWindow.h
index e5f9536e8..81eba3a14 100644
--- a/Editor/CameraComponentWindow.h
+++ b/Editor/CameraComponentWindow.h
@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class CameraComponentWindow : public wi::gui::Window
diff --git a/Editor/CameraWindow.cpp b/Editor/CameraWindow.cpp
index fea03d046..d91bfe49c 100644
--- a/Editor/CameraWindow.cpp
+++ b/Editor/CameraWindow.cpp
@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "CameraWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;
diff --git a/Editor/CameraWindow.h b/Editor/CameraWindow.h
index 11210605e..2a7900565 100644
--- a/Editor/CameraWindow.h
+++ b/Editor/CameraWindow.h
@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class CameraWindow : public wi::gui::Window
diff --git a/Editor/ColliderWindow.cpp b/Editor/ColliderWindow.cpp
index eb356aa8b..b4f8ae9cc 100644
--- a/Editor/ColliderWindow.cpp
+++ b/Editor/ColliderWindow.cpp
@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "ColliderWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;
diff --git a/Editor/ColliderWindow.h b/Editor/ColliderWindow.h
index 1c1b38975..6a7b9bc49 100644
--- a/Editor/ColliderWindow.h
+++ b/Editor/ColliderWindow.h
@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class ColliderWindow : public wi::gui::Window
diff --git a/Editor/ComponentsWindow.cpp b/Editor/ComponentsWindow.cpp
index 659dff07e..714daf172 100644
--- a/Editor/ComponentsWindow.cpp
+++ b/Editor/ComponentsWindow.cpp
@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "ComponentsWindow.h"
-#include "Editor.h"
 
 using namespace wi::graphics;
 using namespace wi::ecs;
diff --git a/Editor/ComponentsWindow.h b/Editor/ComponentsWindow.h
index 13a25c145..fd1663854 100644
--- a/Editor/ComponentsWindow.h
+++ b/Editor/ComponentsWindow.h
@@ -1,5 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
 #include "MaterialWindow.h"
 #include "WeatherWindow.h"
 #include "ObjectWindow.h"
diff --git a/Editor/DecalWindow.cpp b/Editor/DecalWindow.cpp
index 08343267d..8e3f76417 100644
--- a/Editor/DecalWindow.cpp
+++ b/Editor/DecalWindow.cpp
@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "DecalWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;
diff --git a/Editor/DecalWindow.h b/Editor/DecalWindow.h
index 9adc45201..d9d27fcca 100644
--- a/Editor/DecalWindow.h
+++ b/Editor/DecalWindow.h
@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class DecalWindow : public wi::gui::Window
diff --git a/Editor/Editor.cpp b/Editor/Editor.cpp
index c58bb73ac..e3756eb31 100644
--- a/Editor/Editor.cpp
+++ b/Editor/Editor.cpp
@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#include "Editor.h"
 #include "wiRenderer.h"
 #include "wiScene_BindLua.h"
 
@@ -9,11 +8,6 @@
 #include "FontAwesomeV6.h" // font TTF data
 #include "yumin.h" // yumin.ttf font
 
-#include <string>
-#include <cassert>
-#include <cmath>
-#include <limits>
-
 using namespace wi::graphics;
 using namespace wi::primitive;
 using namespace wi::scene;
diff --git a/Editor/Editor.h b/Editor/Editor.h
index 08319ee61..5e5b1b1be 100644
--- a/Editor/Editor.h
+++ b/Editor/Editor.h
@@ -1,11 +1,9 @@
 #pragma once
-#include "WickedEngine.h"
 #include "Translator.h"
 #include "wiScene_BindLua.h"
 #include "OptionsWindow.h"
 #include "ComponentsWindow.h"
 #include "ProfilerWindow.h"
-
 #include "IconDefinitions.h"
 
 class EditorLoadingScreen : public wi::LoadingScreen
diff --git a/Editor/Editor_SOURCE.vcxitems b/Editor/Editor_SOURCE.vcxitems
index 54211d443..ee2121308 100644
--- a/Editor/Editor_SOURCE.vcxitems
+++ b/Editor/Editor_SOURCE.vcxitems
@@ -182,6 +182,7 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)Translator.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)WeatherWindow.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)xatlas.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)yumin.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)config.ini">
@@ -250,6 +251,20 @@
     </Image>
   </ItemGroup>
   <ItemGroup>
+    <Text Include="$(MSBuildThisFileDirectory)languages\readme.txt">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </Text>
     <Text Include="$(MSBuildThisFileDirectory)terrain\licenses.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <Xml Include="$(MSBuildThisFileDirectory)languages\Magyar.xml">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </Xml>
+    <Xml Include="$(MSBuildThisFileDirectory)languages\日本語.xml">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </Xml>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Editor/Editor_SOURCE.vcxitems.filters b/Editor/Editor_SOURCE.vcxitems.filters
index bab6d0622..305267db6 100644
--- a/Editor/Editor_SOURCE.vcxitems.filters
+++ b/Editor/Editor_SOURCE.vcxitems.filters
@@ -138,6 +138,7 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)HumanoidWindow.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)GeneralWindow.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)ProfilerWindow.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)yumin.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)startup.lua" />
@@ -159,6 +160,9 @@
     <Filter Include="terrain">
       <UniqueIdentifier>{9a5b997d-f07e-45c5-849a-717f15cba0ab}</UniqueIdentifier>
     </Filter>
+    <Filter Include="languages">
+      <UniqueIdentifier>{beae58b9-9c06-4b1f-9e03-a27712d6a579}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <Image Include="$(MSBuildThisFileDirectory)terrain\base.jpg">
@@ -193,5 +197,16 @@
     <Text Include="$(MSBuildThisFileDirectory)terrain\licenses.txt">
       <Filter>terrain</Filter>
     </Text>
+    <Text Include="$(MSBuildThisFileDirectory)languages\readme.txt">
+      <Filter>languages</Filter>
+    </Text>
+  </ItemGroup>
+  <ItemGroup>
+    <Xml Include="$(MSBuildThisFileDirectory)languages\Magyar.xml">
+      <Filter>languages</Filter>
+    </Xml>
+    <Xml Include="$(MSBuildThisFileDirectory)languages\日本語.xml">
+      <Filter>languages</Filter>
+    </Xml>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Editor/EmitterWindow.cpp b/Editor/EmitterWindow.cpp
index 865ba1ad5..220612607 100644
--- a/Editor/EmitterWindow.cpp
+++ b/Editor/EmitterWindow.cpp
@@ -1,8 +1,5 @@
 #include "stdafx.h"
 #include "EmitterWindow.h"
-#include "Editor.h"
-
-#include <string>
 
 using namespace wi::ecs;
 using namespace wi::scene;
diff --git a/Editor/EmitterWindow.h b/Editor/EmitterWindow.h
index 18fac91f3..0f04b416c 100644
--- a/Editor/EmitterWindow.h
+++ b/Editor/EmitterWindow.h
@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class MaterialWindow;
diff --git a/Editor/EnvProbeWindow.cpp b/Editor/EnvProbeWindow.cpp
index 46512ac5c..ed87636d3 100644
--- a/Editor/EnvProbeWindow.cpp
+++ b/Editor/EnvProbeWindow.cpp
@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "EnvProbeWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;
diff --git a/Editor/EnvProbeWindow.h b/Editor/EnvProbeWindow.h
index 287f55e18..079c05657 100644
--- a/Editor/EnvProbeWindow.h
+++ b/Editor/EnvProbeWindow.h
@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class EnvProbeWindow : public wi::gui::Window
diff --git a/Editor/ExpressionWindow.cpp b/Editor/ExpressionWindow.cpp
index 6f6e2b34d..4b3e49a3b 100644
--- a/Editor/ExpressionWindow.cpp
+++ b/Editor/ExpressionWindow.cpp
@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "ExpressionWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;
diff --git a/Editor/ExpressionWindow.h b/Editor/ExpressionWindow.h
index 0f4dcedf5..70a6ab2ee 100644
--- a/Editor/ExpressionWindow.h
+++ b/Editor/ExpressionWindow.h
@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class ExpressionWindow : public wi::gui::Window
diff --git a/Editor/ForceFieldWindow.cpp b/Editor/ForceFieldWindow.cpp
index 93731fe7d..52859fc73 100644
--- a/Editor/ForceFieldWindow.cpp
+++ b/Editor/ForceFieldWindow.cpp
@@ -1,11 +1,9 @@
 #include "stdafx.h"
 #include "ForceFieldWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;
 
-
 void ForceFieldWindow::Create(EditorComponent* _editor)
 {
 	editor = _editor;
diff --git a/Editor/ForceFieldWindow.h b/Editor/ForceFieldWindow.h
index dfefef8b4..66cf8013e 100644
--- a/Editor/ForceFieldWindow.h
+++ b/Editor/ForceFieldWindow.h
@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class ForceFieldWindow : public wi::gui::Window
diff --git a/Editor/GeneralWindow.cpp b/Editor/GeneralWindow.cpp
index 858caaa9d..a4c563a81 100644
--- a/Editor/GeneralWindow.cpp
+++ b/Editor/GeneralWindow.cpp
@@ -1,8 +1,5 @@
 #include "stdafx.h"
 #include "GeneralWindow.h"
-#include "Editor.h"
-
-#include <filesystem>
 
 using namespace wi::graphics;
 using namespace wi::ecs;
diff --git a/Editor/GeneralWindow.h b/Editor/GeneralWindow.h
index c6ef21ff0..9311c63f2 100644
--- a/Editor/GeneralWindow.h
+++ b/Editor/GeneralWindow.h
@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class GeneralWindow : public wi::gui::Window
diff --git a/Editor/GraphicsWindow.cpp b/Editor/GraphicsWindow.cpp
index aa531836d..cb45df770 100644
--- a/Editor/GraphicsWindow.cpp
+++ b/Editor/GraphicsWindow.cpp
@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "GraphicsWindow.h"
-#include "Editor.h"
 #include "shaders/ShaderInterop_DDGI.h"
 
 using namespace wi::graphics;
diff --git a/Editor/GraphicsWindow.h b/Editor/GraphicsWindow.h
index 444f93fb0..9da11da75 100644
--- a/Editor/GraphicsWindow.h
+++ b/Editor/GraphicsWindow.h
@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class GraphicsWindow : public wi::gui::Window
diff --git a/Editor/HairParticleWindow.cpp b/Editor/HairParticleWindow.cpp
index 48151fd71..73b5ebff9 100644
--- a/Editor/HairParticleWindow.cpp
+++ b/Editor/HairParticleWindow.cpp
@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "HairParticleWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;
diff --git a/Editor/HairParticleWindow.h b/Editor/HairParticleWindow.h
index 96ea7a365..f60451d3e 100644
--- a/Editor/HairParticleWindow.h
+++ b/Editor/HairParticleWindow.h
@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class MaterialWindow;
diff --git a/Editor/HierarchyWindow.cpp b/Editor/HierarchyWindow.cpp
index b5ee3acd9..c48894d20 100644
--- a/Editor/HierarchyWindow.cpp
+++ b/Editor/HierarchyWindow.cpp
@@ -1,11 +1,9 @@
 #include "stdafx.h"
 #include "HierarchyWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;
 
-
 void HierarchyWindow::Create(EditorComponent* _editor)
 {
 	editor = _editor;
diff --git a/Editor/HierarchyWindow.h b/Editor/HierarchyWindow.h
index a8b5ca2ac..cc179109d 100644
--- a/Editor/HierarchyWindow.h
+++ b/Editor/HierarchyWindow.h
@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class HierarchyWindow : public wi::gui::Window
diff --git a/Editor/HumanoidWindow.cpp b/Editor/HumanoidWindow.cpp
index 5d1da2165..be47e7bdb 100644
--- a/Editor/HumanoidWindow.cpp
+++ b/Editor/HumanoidWindow.cpp
@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "HumanoidWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;
diff --git a/Editor/HumanoidWindow.h b/Editor/HumanoidWindow.h
index 57402a5bd..20ca597fd 100644
--- a/Editor/HumanoidWindow.h
+++ b/Editor/HumanoidWindow.h
@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class HumanoidWindow : public wi::gui::Window
diff --git a/Editor/IKWindow.cpp b/Editor/IKWindow.cpp
index 3dea7f26e..426960acf 100644
--- a/Editor/IKWindow.cpp
+++ b/Editor/IKWindow.cpp
@@ -1,11 +1,9 @@
 #include "stdafx.h"
 #include "IKWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;
 
-
 void IKWindow::Create(EditorComponent* _editor)
 {
 	editor = _editor;
diff --git a/Editor/IKWindow.h b/Editor/IKWindow.h
index f58eb7b18..be0b330d6 100644
--- a/Editor/IKWindow.h
+++ b/Editor/IKWindow.h
@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class IKWindow : public wi::gui::Window
diff --git a/Editor/LayerWindow.cpp b/Editor/LayerWindow.cpp
index 0209608a7..ab5cb1c5a 100644
--- a/Editor/LayerWindow.cpp
+++ b/Editor/LayerWindow.cpp
@@ -1,11 +1,9 @@
 #include "stdafx.h"
 #include "LayerWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;
 
-
 void LayerWindow::Create(EditorComponent* _editor)
 {
 	editor = _editor;
diff --git a/Editor/LayerWindow.h b/Editor/LayerWindow.h
index 31489be3b..73152c8d5 100644
--- a/Editor/LayerWindow.h
+++ b/Editor/LayerWindow.h
@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class LayerWindow : public wi::gui::Window
diff --git a/Editor/LightWindow.cpp b/Editor/LightWindow.cpp
index c1dbbc94e..907e30ef3 100644
--- a/Editor/LightWindow.cpp
+++ b/Editor/LightWindow.cpp
@@ -1,14 +1,10 @@
 #include "stdafx.h"
 #include "LightWindow.h"
-#include "Editor.h"
-
-#include <string>
 
 using namespace wi::ecs;
 using namespace wi::graphics;
 using namespace wi::scene;
 
-
 void LightWindow::Create(EditorComponent* _editor)
 {
 	editor = _editor;
diff --git a/Editor/LightWindow.h b/Editor/LightWindow.h
index 43c369e73..6e9e154d8 100644
--- a/Editor/LightWindow.h
+++ b/Editor/LightWindow.h
@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class LightWindow : public wi::gui::Window
diff --git a/Editor/MaterialPickerWindow.cpp b/Editor/MaterialPickerWindow.cpp
index 3f299162c..834a91635 100644
--- a/Editor/MaterialPickerWindow.cpp
+++ b/Editor/MaterialPickerWindow.cpp
@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "MaterialWindow.h"
-#include "Editor.h"
 
 using namespace wi::graphics;
 using namespace wi::ecs;
@@ -18,7 +17,6 @@ void MaterialPickerWindow::Create(EditorComponent* _editor)
 	SetCollapsed(true);
 }
 
-
 void MaterialPickerWindow::RecreateButtons()
 {
 	if (editor == nullptr)
diff --git a/Editor/MaterialPickerWindow.h b/Editor/MaterialPickerWindow.h
index 71d7edca4..fbe578199 100644
--- a/Editor/MaterialPickerWindow.h
+++ b/Editor/MaterialPickerWindow.h
@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class MaterialPickerWindow : public wi::gui::Window
diff --git a/Editor/MaterialWindow.cpp b/Editor/MaterialWindow.cpp
index 2da86dc83..abe25a3e4 100644
--- a/Editor/MaterialWindow.cpp
+++ b/Editor/MaterialWindow.cpp
@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "MaterialWindow.h"
-#include "Editor.h"
 
 using namespace wi::graphics;
 using namespace wi::ecs;
diff --git a/Editor/MaterialWindow.h b/Editor/MaterialWindow.h
index f4c199479..177626964 100644
--- a/Editor/MaterialWindow.h
+++ b/Editor/MaterialWindow.h
@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class MaterialWindow : public wi::gui::Window
diff --git a/Editor/MeshWindow.cpp b/Editor/MeshWindow.cpp
index 5fa8dee8a..f6bf411c6 100644
--- a/Editor/MeshWindow.cpp
+++ b/Editor/MeshWindow.cpp
@@ -1,13 +1,10 @@
 #include "stdafx.h"
 #include "MeshWindow.h"
-#include "Editor.h"
 
 #include "Utility/stb_image.h"
 
 #include "meshoptimizer/meshoptimizer.h"
 
-#include <string>
-
 using namespace wi::ecs;
 using namespace wi::scene;
 
diff --git a/Editor/MeshWindow.h b/Editor/MeshWindow.h
index c69d5872b..34428c931 100644
--- a/Editor/MeshWindow.h
+++ b/Editor/MeshWindow.h
@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class MeshWindow : public wi::gui::Window
diff --git a/Editor/ModelImporter.h b/Editor/ModelImporter.h
index c88197142..b5009efc9 100644
--- a/Editor/ModelImporter.h
+++ b/Editor/ModelImporter.h
@@ -1,10 +1,4 @@
 #pragma once
-#include <string>
-
-namespace wi::scene
-{
-	struct Scene;
-}
 
 void ImportModel_OBJ(const std::string& fileName, wi::scene::Scene& scene);
 void ImportModel_GLTF(const std::string& fileName, wi::scene::Scene& scene);
diff --git a/Editor/ModelImporter_GLTF.cpp b/Editor/ModelImporter_GLTF.cpp
index 1182dc618..8683e4d03 100644
--- a/Editor/ModelImporter_GLTF.cpp
+++ b/Editor/ModelImporter_GLTF.cpp
@@ -5,11 +5,6 @@
 
 #include "Utility/stb_image.h"
 
-#include <mutex>
-#include <string>
-#include <limits>
-#include <fstream>
-
 #define TINYGLTF_IMPLEMENTATION
 #define TINYGLTF_NO_FS
 #define TINYGLTF_NO_STB_IMAGE
diff --git a/Editor/ModelImporter_OBJ.cpp b/Editor/ModelImporter_OBJ.cpp
index 286ab75bd..fa759d6b6 100644
--- a/Editor/ModelImporter_OBJ.cpp
+++ b/Editor/ModelImporter_OBJ.cpp
@@ -5,10 +5,6 @@
 #define TINYOBJLOADER_IMPLEMENTATION
 #include "tiny_obj_loader.h"
 
-#include <string>
-#include <istream>
-#include <streambuf>
-
 using namespace wi::graphics;
 using namespace wi::scene;
 using namespace wi::ecs;
diff --git a/Editor/NameWindow.cpp b/Editor/NameWindow.cpp
index 3446a7a45..df769ded3 100644
--- a/Editor/NameWindow.cpp
+++ b/Editor/NameWindow.cpp
@@ -1,11 +1,9 @@
 #include "stdafx.h"
 #include "NameWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;
 
-
 void NameWindow::Create(EditorComponent* _editor)
 {
 	editor = _editor;
diff --git a/Editor/NameWindow.h b/Editor/NameWindow.h
index 109d4767c..529639a58 100644
--- a/Editor/NameWindow.h
+++ b/Editor/NameWindow.h
@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class NameWindow : public wi::gui::Window
diff --git a/Editor/ObjectWindow.cpp b/Editor/ObjectWindow.cpp
index ac6e260ed..312992c82 100644
--- a/Editor/ObjectWindow.cpp
+++ b/Editor/ObjectWindow.cpp
@@ -1,16 +1,12 @@
 #include "stdafx.h"
-#include "Editor.h"
 #include "ObjectWindow.h"
 #include "wiScene.h"
 
 #include "xatlas.h"
 
-#include <string>
-
 using namespace wi::ecs;
 using namespace wi::scene;
 
-
 static void SetPixel(uint8_t *dest, int destWidth, int x, int y, const uint8_t *color)
 {
 	uint8_t *pixel = &dest[x * 4 + y * (destWidth * 4)];
diff --git a/Editor/ObjectWindow.h b/Editor/ObjectWindow.h
index cd4e4c076..bb8f9b520 100644
--- a/Editor/ObjectWindow.h
+++ b/Editor/ObjectWindow.h
@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class ObjectWindow : public wi::gui::Window
diff --git a/Editor/OptionsWindow.cpp b/Editor/OptionsWindow.cpp
index 64fdeca9b..34b209dfc 100644
--- a/Editor/OptionsWindow.cpp
+++ b/Editor/OptionsWindow.cpp
@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "OptionsWindow.h"
-#include "Editor.h"
 
 using namespace wi::graphics;
 using namespace wi::ecs;
diff --git a/Editor/OptionsWindow.h b/Editor/OptionsWindow.h
index 763276a4d..a95560586 100644
--- a/Editor/OptionsWindow.h
+++ b/Editor/OptionsWindow.h
@@ -1,5 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
 #include "GraphicsWindow.h"
 #include "CameraWindow.h"
 #include "MaterialPickerWindow.h"
diff --git a/Editor/PaintToolWindow.cpp b/Editor/PaintToolWindow.cpp
index 58c768169..8bb951cb7 100644
--- a/Editor/PaintToolWindow.cpp
+++ b/Editor/PaintToolWindow.cpp
@@ -1,10 +1,7 @@
 #include "stdafx.h"
-#include "Editor.h"
 #include "PaintToolWindow.h"
 #include "shaders/ShaderInterop_Renderer.h"
 
-#include <cmath>
-
 using namespace wi::ecs;
 using namespace wi::scene;
 using namespace wi::graphics;
diff --git a/Editor/PaintToolWindow.h b/Editor/PaintToolWindow.h
index 960d396a3..499432db0 100644
--- a/Editor/PaintToolWindow.h
+++ b/Editor/PaintToolWindow.h
@@ -1,8 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
-#include <deque>
-
 class EditorComponent;
 
 class PaintToolWindow : public wi::gui::Window
diff --git a/Editor/ProfilerWindow.h b/Editor/ProfilerWindow.h
index e274536f1..dfff1b04e 100644
--- a/Editor/ProfilerWindow.h
+++ b/Editor/ProfilerWindow.h
@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class ProfilerWidget : public wi::gui::Widget
diff --git a/Editor/RigidBodyWindow.cpp b/Editor/RigidBodyWindow.cpp
index 8d80d344b..bb035d790 100644
--- a/Editor/RigidBodyWindow.cpp
+++ b/Editor/RigidBodyWindow.cpp
@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "RigidBodyWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;
diff --git a/Editor/RigidBodyWindow.h b/Editor/RigidBodyWindow.h
index d223756ab..a3bcb74ce 100644
--- a/Editor/RigidBodyWindow.h
+++ b/Editor/RigidBodyWindow.h
@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class RigidBodyWindow : public wi::gui::Window
diff --git a/Editor/ScriptWindow.cpp b/Editor/ScriptWindow.cpp
index 47867e96d..1bfed85cf 100644
--- a/Editor/ScriptWindow.cpp
+++ b/Editor/ScriptWindow.cpp
@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "ScriptWindow.h"
-#include "Editor.h"
 
 void ScriptWindow::Create(EditorComponent* _editor)
 {
diff --git a/Editor/ScriptWindow.h b/Editor/ScriptWindow.h
index d3f93f4f0..04c7cd895 100644
--- a/Editor/ScriptWindow.h
+++ b/Editor/ScriptWindow.h
@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class ScriptWindow : public wi::gui::Window
diff --git a/Editor/SoftBodyWindow.cpp b/Editor/SoftBodyWindow.cpp
index 34c9b6563..9dc398914 100644
--- a/Editor/SoftBodyWindow.cpp
+++ b/Editor/SoftBodyWindow.cpp
@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "SoftBodyWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;
diff --git a/Editor/SoftBodyWindow.h b/Editor/SoftBodyWindow.h
index 1af83c0a2..1e73eb40c 100644
--- a/Editor/SoftBodyWindow.h
+++ b/Editor/SoftBodyWindow.h
@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class SoftBodyWindow : public wi::gui::Window
diff --git a/Editor/SoundWindow.cpp b/Editor/SoundWindow.cpp
index 44603d6a1..73f7110c8 100644
--- a/Editor/SoundWindow.cpp
+++ b/Editor/SoundWindow.cpp
@@ -1,7 +1,6 @@
 #include "stdafx.h"
 #include "SoundWindow.h"
 #include "wiAudio.h"
-#include "Editor.h"
 
 using namespace wi::graphics;
 using namespace wi::ecs;
diff --git a/Editor/SoundWindow.h b/Editor/SoundWindow.h
index 77c3832ce..0ae763454 100644
--- a/Editor/SoundWindow.h
+++ b/Editor/SoundWindow.h
@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class WaveGraph : public wi::gui::Widget
diff --git a/Editor/SpringWindow.cpp b/Editor/SpringWindow.cpp
index 9eb874a9a..184bed229 100644
--- a/Editor/SpringWindow.cpp
+++ b/Editor/SpringWindow.cpp
@@ -1,11 +1,9 @@
 #include "stdafx.h"
 #include "SpringWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;
 
-
 void SpringWindow::Create(EditorComponent* _editor)
 {
 	editor = _editor;
diff --git a/Editor/SpringWindow.h b/Editor/SpringWindow.h
index 2015e7470..d32957e64 100644
--- a/Editor/SpringWindow.h
+++ b/Editor/SpringWindow.h
@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class SpringWindow : public wi::gui::Window
diff --git a/Editor/TerrainWindow.cpp b/Editor/TerrainWindow.cpp
index cd24a70c5..57ca69d89 100644
--- a/Editor/TerrainWindow.cpp
+++ b/Editor/TerrainWindow.cpp
@@ -1,11 +1,8 @@
 #include "stdafx.h"
 #include "TerrainWindow.h"
-#include "Editor.h"
 
 #include "Utility/stb_image.h"
 
-#include <unordered_map>
-
 using namespace wi::ecs;
 using namespace wi::scene;
 
diff --git a/Editor/TerrainWindow.h b/Editor/TerrainWindow.h
index 8c989999b..15a91cf0b 100644
--- a/Editor/TerrainWindow.h
+++ b/Editor/TerrainWindow.h
@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 struct ModifierWindow : public wi::gui::Window
diff --git a/Editor/TransformWindow.cpp b/Editor/TransformWindow.cpp
index 63ae2646c..9e20850cb 100644
--- a/Editor/TransformWindow.cpp
+++ b/Editor/TransformWindow.cpp
@@ -1,11 +1,9 @@
 #include "stdafx.h"
 #include "TransformWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;
 
-
 void TransformWindow::Create(EditorComponent* _editor)
 {
 	editor = _editor;
diff --git a/Editor/TransformWindow.h b/Editor/TransformWindow.h
index 5ca1aceaf..71007d452 100644
--- a/Editor/TransformWindow.h
+++ b/Editor/TransformWindow.h
@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class TransformWindow : public wi::gui::Window
diff --git a/Editor/Translator.h b/Editor/Translator.h
index 79a41fbce..41c5c540a 100644
--- a/Editor/Translator.h
+++ b/Editor/Translator.h
@@ -1,8 +1,4 @@
 #pragma once
-#include "CommonInclude.h"
-#include "wiCanvas.h"
-#include "wiVector.h"
-#include "wiUnorderedSet.h"
 
 class Translator
 {
diff --git a/Editor/WeatherWindow.cpp b/Editor/WeatherWindow.cpp
index 4798375b3..d410a9a25 100644
--- a/Editor/WeatherWindow.cpp
+++ b/Editor/WeatherWindow.cpp
@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "WeatherWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;
diff --git a/Editor/WeatherWindow.h b/Editor/WeatherWindow.h
index 505898981..94f72dd48 100644
--- a/Editor/WeatherWindow.h
+++ b/Editor/WeatherWindow.h
@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class WeatherWindow : public wi::gui::Window
diff --git a/Editor/main_Windows.cpp b/Editor/main_Windows.cpp
index 39730ca82..ebc0e6e98 100644
--- a/Editor/main_Windows.cpp
+++ b/Editor/main_Windows.cpp
@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "main_Windows.h"
-#include "Editor.h"
 
 #include <fstream>
 #include <thread>
diff --git a/Editor/stdafx.h b/Editor/stdafx.h
index c2c4fc9a4..2d386ce1a 100644
--- a/Editor/stdafx.h
+++ b/Editor/stdafx.h
@@ -1,2 +1,16 @@
 #pragma once
-#include "WickedEngine.h"
\ No newline at end of file
+#include <string>
+#include <cassert>
+#include <cmath>
+#include <deque>
+#include <limits>
+#include <filesystem>
+#include <mutex>
+#include <limits>
+#include <fstream>
+#include <istream>
+#include <streambuf>
+#include <unordered_map>
+
+#include "WickedEngine.h"
+#include "Editor.h"
diff --git a/Tests/Tests.cpp b/Tests/Tests.cpp
index c7d91a3da..58e823a45 100644
--- a/Tests/Tests.cpp
+++ b/Tests/Tests.cpp
@@ -1,11 +1,4 @@
 #include "stdafx.h"
-#include "Tests.h"
-
-#include <string>
-#include <fstream>
-#include <thread>
-#include <unordered_map>
-#include <vector>
 
 using namespace wi::ecs;
 using namespace wi::scene;
diff --git a/Tests/Tests.h b/Tests/Tests.h
index 763a8e86c..10bc5f1e5 100644
--- a/Tests/Tests.h
+++ b/Tests/Tests.h
@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 
 class TestsRenderer : public wi::RenderPath3D
 {
diff --git a/Tests/stdafx.h b/Tests/stdafx.h
index ac5e2ea61..927ef4dd4 100644
--- a/Tests/stdafx.h
+++ b/Tests/stdafx.h
@@ -1,3 +1,9 @@
 #pragma once
+#include <string>
+#include <fstream>
+#include <thread>
+#include <unordered_map>
+#include <vector>
+
 #include "WickedEngine.h"
 #include "Tests.h"
diff --git a/WickedEngine/CommonInclude.h b/WickedEngine/CommonInclude.h
index 67db9d04e..0b8ad304f 100644
--- a/WickedEngine/CommonInclude.h
+++ b/WickedEngine/CommonInclude.h
@@ -4,8 +4,6 @@
 // This is a helper include file pasted into all engine headers, try to keep it minimal!
 // Do not include engine features in this file!
 
-#include <cstdlib>
-#include <cstring>
 #include <cstdint>
 #include <type_traits>
 
diff --git a/WickedEngine/shaders/ShaderInterop_Renderer.h b/WickedEngine/shaders/ShaderInterop_Renderer.h
index fed01f01d..1ad432324 100644
--- a/WickedEngine/shaders/ShaderInterop_Renderer.h
+++ b/WickedEngine/shaders/ShaderInterop_Renderer.h
@@ -412,6 +412,9 @@ struct ShaderTypeBin
 
 	uint4 padding2[14]; // force 256-byte alignment that's necessary for constant buffers :(
 };
+#ifdef __cplusplus
+static_assert(sizeof(ShaderTypeBin) == 256); // 256 byte forced constant buffer alignment for DX12
+#endif // __cplusplus
 static const uint SHADERTYPE_BIN_COUNT = 10;
 
 struct VisibilityTile
diff --git a/WickedEngine/wiTerrain.cpp b/WickedEngine/wiTerrain.cpp
index 2fb1b989d..4caae3050 100644
--- a/WickedEngine/wiTerrain.cpp
+++ b/WickedEngine/wiTerrain.cpp
@@ -11,6 +11,9 @@
 #include "wiBacklog.h"
 
 #include <mutex>
+#include <string>
+#include <atomic>
+#include <random>
 
 using namespace wi::ecs;
 using namespace wi::scene;
diff --git a/WickedEngine/wiTerrain.h b/WickedEngine/wiTerrain.h
index 5f109ef3e..77bfd4749 100644
--- a/WickedEngine/wiTerrain.h
+++ b/WickedEngine/wiTerrain.h
@@ -7,9 +7,6 @@
 #include "wiColor.h"
 #include "wiHairParticle.h"
 
-#include <random>
-#include <string>
-#include <atomic>
 #include <memory>
 
 namespace wi::terrain