diff --git a/src/editors/ActorEditor/stdafx.h b/src/editors/ActorEditor/stdafx.h
index 592ce8652c9..c2d123c6fea 100644
--- a/src/editors/ActorEditor/stdafx.h
+++ b/src/editors/ActorEditor/stdafx.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Common/Common.hpp"
+
 #pragma warn - pck
 
 #define sqrtf(a) sqrt(a)
diff --git a/src/editors/ECore/ECore.vcxproj b/src/editors/ECore/ECore.vcxproj
index 4d5b8f84bb7..0245d2b7e19 100644
--- a/src/editors/ECore/ECore.vcxproj
+++ b/src/editors/ECore/ECore.vcxproj
@@ -185,6 +185,7 @@
     <ClInclude Include="Engine\nv_math.h" />
     <ClInclude Include="Engine\nv_mathdecl.h" />
     <ClInclude Include="Engine\Texture.h" />
+    <ClInclude Include="stdafx.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Editor\bone.cpp" />
@@ -262,6 +263,7 @@
     <ClCompile Include="Engine\Image.cpp" />
     <ClCompile Include="Engine\NVMeshMender.cpp" />
     <ClCompile Include="Engine\nv_algebra.cpp" />
+    <ClCompile Include="stdafx.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/src/editors/ECore/ECore.vcxproj.filters b/src/editors/ECore/ECore.vcxproj.filters
index 2966f3fe968..d15f7f0fc15 100644
--- a/src/editors/ECore/ECore.vcxproj.filters
+++ b/src/editors/ECore/ECore.vcxproj.filters
@@ -175,6 +175,7 @@
     <ClInclude Include="Engine\Texture.h">
       <Filter>engine</Filter>
     </ClInclude>
+    <ClInclude Include="stdafx.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Editor\bone.cpp">
@@ -375,5 +376,6 @@
     <ClCompile Include="Engine\NVMeshMender.cpp">
       <Filter>engine</Filter>
     </ClCompile>
+    <ClCompile Include="stdafx.cpp" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/editors/ECore/stdafx.h b/src/editors/ECore/stdafx.h
index 913e5b5b959..e42097e62ab 100644
--- a/src/editors/ECore/stdafx.h
+++ b/src/editors/ECore/stdafx.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Common/Common.hpp"
+
 #pragma warn - pck
 
 #define sqrtf(a) sqrt(a)
diff --git a/src/editors/LevelEditor/LevelEditor.vcxproj.filters b/src/editors/LevelEditor/LevelEditor.vcxproj.filters
index 19a57137e73..b8ebebaeaf6 100644
--- a/src/editors/LevelEditor/LevelEditor.vcxproj.filters
+++ b/src/editors/LevelEditor/LevelEditor.vcxproj.filters
@@ -142,9 +142,6 @@
     <ClInclude Include="Splash.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="stdafx.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
     <ClInclude Include="TopBar.h">
       <Filter>Source Files</Filter>
     </ClInclude>
@@ -325,6 +322,7 @@
     <ClInclude Include="Edit\SceneSummaryInfo.h">
       <Filter>Scene</Filter>
     </ClInclude>
+    <ClInclude Include="stdafx.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="BottomBar.cpp">
@@ -432,9 +430,6 @@
     <ClCompile Include="Splash.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="stdafx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="TopBar.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -720,6 +715,7 @@
     <ClCompile Include="Edit\SceneUtil.cpp">
       <Filter>Scene</Filter>
     </ClCompile>
+    <ClCompile Include="stdafx.cpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="LevelEditor.todo" />
diff --git a/src/editors/LevelEditor/stdafx.h b/src/editors/LevelEditor/stdafx.h
index de1a30dab86..2cbc5083b14 100644
--- a/src/editors/LevelEditor/stdafx.h
+++ b/src/editors/LevelEditor/stdafx.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Common/Common.hpp"
+
 #pragma warn - pck
 
 #define sqrtf(a) sqrt(a)
diff --git a/src/editors/PPEditor/stdafx.h b/src/editors/PPEditor/stdafx.h
index a3cd69e21bb..77f5943c2cc 100644
--- a/src/editors/PPEditor/stdafx.h
+++ b/src/editors/PPEditor/stdafx.h
@@ -1,4 +1,8 @@
-#define ENGINE_API
+#pragma once
+
+#define NO_ENGINE_API
+#include "Common/Common.hpp"
+
 #include <xrCore/xrCore.h>
 #include "PostprocessAnimator.h"
 #include <vcl.h>
diff --git a/src/editors/ParticleEditor/stdafx.h b/src/editors/ParticleEditor/stdafx.h
index 9d58411aa50..c5956137ceb 100644
--- a/src/editors/ParticleEditor/stdafx.h
+++ b/src/editors/ParticleEditor/stdafx.h
@@ -4,6 +4,8 @@
 #ifndef stdafxH
 #define stdafxH
 
+#include "Common/Common.hpp"
+
 #pragma once
 
 #pragma warn - pck
diff --git a/src/editors/ShaderEditor/stdafx.h b/src/editors/ShaderEditor/stdafx.h
index 8cff95baf3a..bc434f7cef8 100644
--- a/src/editors/ShaderEditor/stdafx.h
+++ b/src/editors/ShaderEditor/stdafx.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Common/Common.hpp"
+
 #pragma warn - pck
 
 #define sqrtf(a) sqrt(a)
diff --git a/src/editors/xrEProps/stdafx.h b/src/editors/xrEProps/stdafx.h
index 883bd7e1e6d..acc6750d441 100644
--- a/src/editors/xrEProps/stdafx.h
+++ b/src/editors/xrEProps/stdafx.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#define NO_ENGINE_API
+#include "Common/Common.hpp"
+
 #include <xrCore/xrCore.h>
 
 #define smart_cast dynamic_cast
@@ -14,8 +17,6 @@ class MODEL;
 
 #include "FolderLib.h"
 
-#include "Common/Platform.hpp"
-
 #define ENGINE_API
 #define DLL_API XR_IMPORT
 #define ECORE_API XR_EXPORT
diff --git a/src/editors/xrManagedApi/Pch.hpp b/src/editors/xrManagedApi/Pch.hpp
index 691ad6f2656..934d24a15cb 100644
--- a/src/editors/xrManagedApi/Pch.hpp
+++ b/src/editors/xrManagedApi/Pch.hpp
@@ -1,3 +1,2 @@
 #pragma once
-#include "Common/Platform.hpp"
 #include "Common/Common.hpp"
diff --git a/src/editors/xrWeatherEditor/pch.hpp b/src/editors/xrWeatherEditor/pch.hpp
index 569b0e3bbcf..6cc586c657b 100644
--- a/src/editors/xrWeatherEditor/pch.hpp
+++ b/src/editors/xrWeatherEditor/pch.hpp
@@ -9,7 +9,6 @@
 #pragma once
 
 #pragma managed(push, off)
-#include "Common/Platform.hpp"
 #include "Common/Common.hpp"
 #include "xrCommon/inlining_macros.h"
 #include "xrCore/xrstring.h"