diff --git a/src/Include/xrAPI/xrAPI.h b/src/Include/xrAPI/xrAPI.h
index a9620fd0dec..3eb59ec44dc 100644
--- a/src/Include/xrAPI/xrAPI.h
+++ b/src/Include/xrAPI/xrAPI.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "Common/Platform.hpp"
-
 #ifdef XRAPI_EXPORTS
 #define XRAPI_API XR_EXPORT
 #else
diff --git a/src/utils/xrAI/factory_api.h b/src/utils/xrAI/factory_api.h
index 869d8851cac..71cbdd34343 100644
--- a/src/utils/xrAI/factory_api.h
+++ b/src/utils/xrAI/factory_api.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "Common/Platform.hpp"
-
 extern "C" {
 typedef XR_IMPORT IServerEntity* __stdcall Factory_Create(LPCSTR section);
 typedef XR_IMPORT void __stdcall Factory_Destroy(IServerEntity*&);
diff --git a/src/utils/xrLCUtil/xrLCUtil.hpp b/src/utils/xrLCUtil/xrLCUtil.hpp
index f23376c8c88..62b95933dc3 100644
--- a/src/utils/xrLCUtil/xrLCUtil.hpp
+++ b/src/utils/xrLCUtil/xrLCUtil.hpp
@@ -4,8 +4,6 @@
 #pragma comment(lib, "winmm.lib")
 #pragma comment(lib, "comctl32.lib")
 
-#include "Common/Platform.hpp"
-
 #ifdef XRLCUTIL_EXPORTS
 #define XRLCUTIL_API XR_EXPORT
 #else
diff --git a/src/utils/xrLC_Light/xrLC_Light.h b/src/utils/xrLC_Light/xrLC_Light.h
index b24022e12ad..62bfc5e9dcf 100644
--- a/src/utils/xrLC_Light/xrLC_Light.h
+++ b/src/utils/xrLC_Light/xrLC_Light.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "Common/Platform.hpp"
 #include "xrCore/xrCore.h"
 #ifdef XRLC_LIGHT_EXPORTS
 #define XRLC_LIGHT_API XR_EXPORT
diff --git a/src/utils/xrLC_Light/xrLight_Implicit.cpp b/src/utils/xrLC_Light/xrLight_Implicit.cpp
index b836fc7641e..3318628145a 100644
--- a/src/utils/xrLC_Light/xrLight_Implicit.cpp
+++ b/src/utils/xrLC_Light/xrLight_Implicit.cpp
@@ -1,7 +1,5 @@
 #include "stdafx.h"
 
-#include "Common/Platform.hpp"
-
 #include "xrLight_Implicit.h"
 #include "xrLight_ImplicitDeflector.h"
 #include "xrLight_ImplicitRun.h"
diff --git a/src/xrAICore/xrAICore.hpp b/src/xrAICore/xrAICore.hpp
index 783231d866b..c9c7f9c96f7 100644
--- a/src/xrAICore/xrAICore.hpp
+++ b/src/xrAICore/xrAICore.hpp
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "Common/Platform.hpp"
-
 #ifdef XRAICORE_EXPORTS
 #define XRAICORE_API XR_EXPORT
 #else
diff --git a/src/xrCDB/ISpatial.h b/src/xrCDB/ISpatial.h
index d4dd26d29d9..90a5fd56bf3 100644
--- a/src/xrCDB/ISpatial.h
+++ b/src/xrCDB/ISpatial.h
@@ -2,7 +2,6 @@
 #ifndef XRENGINE_ISPATIAL_H_INCLUDED
 #define XRENGINE_ISPATIAL_H_INCLUDED
 
-#include "Common/Platform.hpp"
 #include "xrCore/xrPool.h"
 //#include "xr_collide_defs.h"
 #include "xrCore/_types.h"
diff --git a/src/xrCDB/xrCDB.h b/src/xrCDB/xrCDB.h
index d905665fccd..4e94e70dbb4 100644
--- a/src/xrCDB/xrCDB.h
+++ b/src/xrCDB/xrCDB.h
@@ -2,7 +2,6 @@
 #ifndef XRCDB_H
 #define XRCDB_H
 
-#include "Common/Platform.hpp"
 #include "xrCore/Threading/Lock.hpp" // XXX: Remove from header. Put in .cpp.
 
 // The following ifdef block is the standard way of creating macros which make exporting
diff --git a/src/xrCore/Debug/StackTrace.cpp b/src/xrCore/Debug/StackTrace.cpp
index f44aa54f39a..e8ed966cf83 100644
--- a/src/xrCore/Debug/StackTrace.cpp
+++ b/src/xrCore/Debug/StackTrace.cpp
@@ -13,8 +13,6 @@ Copyright (c) 1997-2000 John Robbins -- All rights reserved.
 #include <psapi.h>
 #pragma comment(lib, "psapi.lib")
 
-#include "Common/Platform.hpp"
-
 /*//////////////////////////////////////////////////////////////////////
 File Scope Defines
 //////////////////////////////////////////////////////////////////////*/
diff --git a/src/xrCore/Debug/SymbolEngine.h b/src/xrCore/Debug/SymbolEngine.h
index 5764becedca..43ca6554cf7 100644
--- a/src/xrCore/Debug/SymbolEngine.h
+++ b/src/xrCore/Debug/SymbolEngine.h
@@ -14,8 +14,6 @@ scope, so I didn’t wrap them with this class.
 #include <DbgHelp.h>
 #include <tchar.h>
 
-#include "Common/Platform.hpp"
-
 // Include these in case the user forgets to link against them.
 #pragma comment(lib, "dbghelp.lib")
 #pragma comment(lib, "version.lib")
diff --git a/src/xrCore/FS_impl.h b/src/xrCore/FS_impl.h
index 6a78d7150c2..2eea9a9b402 100644
--- a/src/xrCore/FS_impl.h
+++ b/src/xrCore/FS_impl.h
@@ -1,8 +1,6 @@
 #ifndef FS_IMPL_H_INCLUDED
 #define FS_IMPL_H_INCLUDED
 
-#include "Common/Platform.hpp"
-
 // 1: default
 // 1.5: check next chunk first heuristics
 // 2: vector population heuristics
diff --git a/src/xrCore/Math/MathUtil.hpp b/src/xrCore/Math/MathUtil.hpp
index fa770ee01ae..0ed6011c720 100644
--- a/src/xrCore/Math/MathUtil.hpp
+++ b/src/xrCore/Math/MathUtil.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "Common/Platform.hpp"
 #include "xrCore/xrCore.h"
 #include "xrCore/_vector3d.h"
 
diff --git a/src/xrCore/Math/SkinXW_CPP.cpp b/src/xrCore/Math/SkinXW_CPP.cpp
index 13c7b0c4d0c..2de56b4d5f3 100644
--- a/src/xrCore/Math/SkinXW_CPP.cpp
+++ b/src/xrCore/Math/SkinXW_CPP.cpp
@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#include "Common/Platform.hpp"
 #include "SkinXW_CPP.hpp"
 #ifdef _EDITOR
 #include "SkeletonX.h"
diff --git a/src/xrCore/Math/SkinXW_SSE.cpp b/src/xrCore/Math/SkinXW_SSE.cpp
index bafaa69d7e1..86e7f23cf12 100644
--- a/src/xrCore/Math/SkinXW_SSE.cpp
+++ b/src/xrCore/Math/SkinXW_SSE.cpp
@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#include "Common/Platform.hpp"
 #include "SkinXW_SSE.hpp"
 #ifdef _EDITOR
 #include "SkeletonX.h"
diff --git a/src/xrCore/XML/XMLDocument.hpp b/src/xrCore/XML/XMLDocument.hpp
index cd0fc602c92..1ef97a6b785 100644
--- a/src/xrCore/XML/XMLDocument.hpp
+++ b/src/xrCore/XML/XMLDocument.hpp
@@ -2,8 +2,6 @@
 #ifndef xrXMLParserH
 #define xrXMLParserH
 
-#include "Common/Platform.hpp"
-
 #if !XRAY_EXCEPTIONS
 #define PUGIXML_NO_EXCEPTIONS
 #endif
diff --git a/src/xrCore/_std_extensions.h b/src/xrCore/_std_extensions.h
index e44081ce2af..2ba71178417 100644
--- a/src/xrCore/_std_extensions.h
+++ b/src/xrCore/_std_extensions.h
@@ -5,7 +5,6 @@
 #include <math.h>
 #include <float.h>
 #include <stdio.h>
-#include "Common/Platform.hpp"
 #include "xrCore/xrCore_impexp.h"
 #include "xrCommon/math_funcs_inline.h"
 
diff --git a/src/xrCore/_vector4.h b/src/xrCore/_vector4.h
index 23a6c252e3d..e56c566ede7 100644
--- a/src/xrCore/_vector4.h
+++ b/src/xrCore/_vector4.h
@@ -2,7 +2,6 @@
 #define _VECTOR4_H
 #pragma once
 
-#include "Common/Platform.hpp"
 #include "_types.h"
 
 template <class T>
diff --git a/src/xrCore/log.h b/src/xrCore/log.h
index 549b5907426..e8aaac809b3 100644
--- a/src/xrCore/log.h
+++ b/src/xrCore/log.h
@@ -1,7 +1,6 @@
 #pragma once
 #ifndef logH
 #define logH
-#include "Common/Platform.hpp"
 #include "xrCore_impexp.h"
 #include "xrCommon/xr_vector.h"
 
diff --git a/src/xrCore/xrCore_impexp.h b/src/xrCore/xrCore_impexp.h
index bb81659c34b..f1495c97168 100644
--- a/src/xrCore/xrCore_impexp.h
+++ b/src/xrCore/xrCore_impexp.h
@@ -1,7 +1,6 @@
 #pragma once
 #ifndef XRCORE_IMPEXP_H
 #define XRCORE_IMPEXP_H
-#include "Common/ImportExportMacros.inl"
 
 #ifdef XRCORE_EXPORTS
 #define XRCORE_API XR_EXPORT
diff --git a/src/xrCore/xrDebug.h b/src/xrCore/xrDebug.h
index 98f4a11841e..89fe84483b0 100644
--- a/src/xrCore/xrDebug.h
+++ b/src/xrCore/xrDebug.h
@@ -1,5 +1,4 @@
 #pragma once
-#include "Common/Platform.hpp"
 #include "xrCore/_types.h"
 #include <string>
 
diff --git a/src/xrCore/xr_trims.h b/src/xrCore/xr_trims.h
index cbc1f84c7cf..727c1233069 100644
--- a/src/xrCore/xr_trims.h
+++ b/src/xrCore/xr_trims.h
@@ -2,7 +2,6 @@
 #ifndef xr_trimsH
 #define xr_trimsH
 //#include "xrCore/_stl_extensions.h"
-#include "Common/Platform.hpp" // LPCSTR etc
 #include "xrCore/xr_vector_defs.h"
 
 // refs
diff --git a/src/xrCore/xr_vector_defs.h b/src/xrCore/xr_vector_defs.h
index 60a0d6cd570..6fec1dccede 100644
--- a/src/xrCore/xr_vector_defs.h
+++ b/src/xrCore/xr_vector_defs.h
@@ -1,7 +1,6 @@
 #pragma once
 #include "xrCore/_types.h"
 #include "xrCommon/xr_vector.h"
-#include "Common/Platform.hpp"
 #include "xrCore/_rect.h"
 #include "xrCore/_vector2.h"
 #include "xrCore/_vector3d.h"
diff --git a/src/xrD3D9-Null/xrD3D9-Null.h b/src/xrD3D9-Null/xrD3D9-Null.h
index 0bde6229f96..a8727eb12c2 100644
--- a/src/xrD3D9-Null/xrD3D9-Null.h
+++ b/src/xrD3D9-Null/xrD3D9-Null.h
@@ -3,8 +3,6 @@
 #include <d3d9caps.h>
 #include "IDirect3D9.h"
 
-#include "Common/Platform.hpp"
-
 #ifdef XRD3D9NULL_EXPORTS
 #define XRD3D9NULL_API XR_EXPORT
 #else
diff --git a/src/xrEngine/Engine.h b/src/xrEngine/Engine.h
index 885a1fb99b5..5eb25d97219 100644
--- a/src/xrEngine/Engine.h
+++ b/src/xrEngine/Engine.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "Common/Platform.hpp"
-
 // you must define ENGINE_BUILD then building the engine itself
 // and not define it if you are about to build DLL
 
diff --git a/src/xrGameSpy/xrGameSpy.h b/src/xrGameSpy/xrGameSpy.h
index 11a340ad984..ed8ad506ac2 100644
--- a/src/xrGameSpy/xrGameSpy.h
+++ b/src/xrGameSpy/xrGameSpy.h
@@ -1,5 +1,4 @@
 #pragma once
-#include "Common/Platform.hpp"
 
 #ifdef XRGAMESPY_EXPORTS
 #define XRGAMESPY_API XR_EXPORT
diff --git a/src/xrNetServer/NET_Shared.h b/src/xrNetServer/NET_Shared.h
index 309471fd60c..ac9c3e4286b 100644
--- a/src/xrNetServer/NET_Shared.h
+++ b/src/xrNetServer/NET_Shared.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "Common/Platform.hpp"
 #include "xrCore/_types.h"
 
 #ifdef XR_NETSERVER_EXPORTS
diff --git a/src/xrParticles/psystem.h b/src/xrParticles/psystem.h
index 2a7a25ff6b6..30d80fff18e 100644
--- a/src/xrParticles/psystem.h
+++ b/src/xrParticles/psystem.h
@@ -2,7 +2,6 @@
 #ifndef PSystemH
 #define PSystemH
 
-#include "Common/Platform.hpp"
 #include "xrCore/_vector3d.h"
 
 #ifdef XR_PARTICLES_EXPORTS
diff --git a/src/xrPhysics/xrPhysics.h b/src/xrPhysics/xrPhysics.h
index 7066898c2a3..dbea519eb2a 100644
--- a/src/xrPhysics/xrPhysics.h
+++ b/src/xrPhysics/xrPhysics.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "Common/Platform.hpp"
-
 #ifdef XRPHYSICS_EXPORTS
 #define XRPHYSICS_API XR_EXPORT
 #else
diff --git a/src/xrScriptEngine/LuaStudio/Backend/Interfaces.hpp b/src/xrScriptEngine/LuaStudio/Backend/Interfaces.hpp
index 88a1d02f772..d3ed91dd503 100644
--- a/src/xrScriptEngine/LuaStudio/Backend/Interfaces.hpp
+++ b/src/xrScriptEngine/LuaStudio/Backend/Interfaces.hpp
@@ -8,8 +8,6 @@
 
 #pragma once
 
-#include "Common/Platform.hpp"
-
 #include "xrScriptEngine/LuaStudio/Config.hpp"
 
 #define CS_LUA_STUDIO_BACKEND_CALL __stdcall
diff --git a/src/xrScriptEngine/xrScriptEngine.hpp b/src/xrScriptEngine/xrScriptEngine.hpp
index 1e08fdf1d87..85ccc006ec4 100644
--- a/src/xrScriptEngine/xrScriptEngine.hpp
+++ b/src/xrScriptEngine/xrScriptEngine.hpp
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "Common/Platform.hpp"
-
 #ifdef XRSCRIPTENGINE_EXPORTS
 #define XRSCRIPTENGINE_API XR_EXPORT
 #else
diff --git a/src/xrServerEntities/xrEProps.h b/src/xrServerEntities/xrEProps.h
index 641e3a6bb67..2cc257bef93 100644
--- a/src/xrServerEntities/xrEProps.h
+++ b/src/xrServerEntities/xrEProps.h
@@ -1,8 +1,6 @@
 #ifndef xrEPropsH
 #define xrEPropsH
 
-#include "Common/Platform.hpp"
-
 #ifdef XR_EPROPS_EXPORTS
 #define XR_EPROPS_API XR_EXPORT
 #else
diff --git a/src/xrSound/Sound.h b/src/xrSound/Sound.h
index f8d53ebece9..7fb63a22738 100644
--- a/src/xrSound/Sound.h
+++ b/src/xrSound/Sound.h
@@ -2,7 +2,6 @@
 #ifndef SoundH
 #define SoundH
 
-#include "Common/Platform.hpp"
 #include "xrCore/_types.h"
 #include "xrCore/_flags.h"
 #include "xrCore/xr_resource.h"