diff --git a/src/Include/xrAPI/xrAPI.h b/src/Include/xrAPI/xrAPI.h
index 58b7202b347..fe68bcac9f1 100644
--- a/src/Include/xrAPI/xrAPI.h
+++ b/src/Include/xrAPI/xrAPI.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "xrCore/Platform.h"
+#include "xrCore/Platform.hpp"
 
 #ifdef XRAPI_EXPORTS
 #define XRAPI_API XR_EXPORT
diff --git a/src/editors/ECore/Editor/EditObjectImport.cpp b/src/editors/ECore/Editor/EditObjectImport.cpp
index 6ed4f3be468..2c01d009ece 100644
--- a/src/editors/ECore/Editor/EditObjectImport.cpp
+++ b/src/editors/ECore/Editor/EditObjectImport.cpp
@@ -18,7 +18,7 @@ extern "C"
 #ifdef _EDITOR
 #include "Layers/xrRender/ResourceManager.h"
 
-#include "xrCore/Platform.h"
+#include "xrCore/Platform.hpp"
 extern "C" XR_IMPORT lwObject* LWOImportObject(char* filename);
 extern "C" XR_IMPORT void LWOCloseFile(lwObject* object);
 #endif
diff --git a/src/utils/xrAI/factory_api.h b/src/utils/xrAI/factory_api.h
index cf8e690e6ec..3693b6876de 100644
--- a/src/utils/xrAI/factory_api.h
+++ b/src/utils/xrAI/factory_api.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "xrCore/Platform.h"
+#include "xrCore/Platform.hpp"
 
 extern "C" {
     typedef XR_IMPORT  IServerEntity*   __stdcall Factory_Create    (LPCSTR section);
diff --git a/src/utils/xrLC/Build.h b/src/utils/xrLC/Build.h
index adaf2223bee..06f739eb761 100644
--- a/src/utils/xrLC/Build.h
+++ b/src/utils/xrLC/Build.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "xrCore/Platform.h"
+#include "xrCore/Platform.hpp"
 #include "xrCore/FS.h"
 #include "utils/Shader_xrLC.h"
 struct STextureParams;
diff --git a/src/utils/xrLCUtil/xrLCUtil.hpp b/src/utils/xrLCUtil/xrLCUtil.hpp
index 665aee5fa26..9241d371fde 100644
--- a/src/utils/xrLCUtil/xrLCUtil.hpp
+++ b/src/utils/xrLCUtil/xrLCUtil.hpp
@@ -4,7 +4,7 @@
 #pragma comment(lib, "winmm.lib")
 #pragma comment(lib, "comctl32.lib")
 
-#include "xrCore/Platform.h"
+#include "xrCore/Platform.hpp"
 
 #ifdef XRLCUTIL_EXPORTS
 #define XRLCUTIL_API XR_EXPORT
diff --git a/src/utils/xrLC_Light/xrLC_Light.h b/src/utils/xrLC_Light/xrLC_Light.h
index 23222bb57c7..123626b8718 100644
--- a/src/utils/xrLC_Light/xrLC_Light.h
+++ b/src/utils/xrLC_Light/xrLC_Light.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "xrCore/Platform.h"
+#include "xrCore/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 bc9eeadd8d6..dc7d1bf335a 100644
--- a/src/utils/xrLC_Light/xrLight_Implicit.cpp
+++ b/src/utils/xrLC_Light/xrLight_Implicit.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 
-#include "xrCore/Platform.h"
+#include "xrCore/Platform.hpp"
 
 #include "xrlight_implicit.h"
 #include "xrLight_ImplicitDeflector.h"
diff --git a/src/utils/xrLC_LightStab/xrLC_LightStab.h b/src/utils/xrLC_LightStab/xrLC_LightStab.h
index 461e9bf604f..f54d6c25c18 100644
--- a/src/utils/xrLC_LightStab/xrLC_LightStab.h
+++ b/src/utils/xrLC_LightStab/xrLC_LightStab.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "xrCore/Platform.h"
+#include "xrCore/Platform.hpp"
 
 #ifdef XRLC_LIGHT_STAB_EXPORTS
 #	define XRLC_LIGHT_STUB_API XR_EXPORT
diff --git a/src/xrAICore/xrAICore.hpp b/src/xrAICore/xrAICore.hpp
index e3ddd0ca5a1..425ae1318f2 100644
--- a/src/xrAICore/xrAICore.hpp
+++ b/src/xrAICore/xrAICore.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "xrCore/Platform.h"
+#include "xrCore/Platform.hpp"
 
 #ifdef XRAICORE_EXPORTS
 #define XRAICORE_API XR_EXPORT
diff --git a/src/xrCDB/ISpatial.h b/src/xrCDB/ISpatial.h
index 469d4a17c4e..36d42e760d6 100644
--- a/src/xrCDB/ISpatial.h
+++ b/src/xrCDB/ISpatial.h
@@ -2,7 +2,7 @@
 #define XRENGINE_ISPATIAL_H_INCLUDED
 
 //#pragma once
-#include "xrCore/Platform.h"
+#include "xrCore/Platform.hpp"
 #include "xrCore/xrPool.h"
 #include "xr_collide_defs.h"
 
diff --git a/src/xrCDB/xrCDB.h b/src/xrCDB/xrCDB.h
index a3523238607..e0f421d3338 100644
--- a/src/xrCDB/xrCDB.h
+++ b/src/xrCDB/xrCDB.h
@@ -1,7 +1,7 @@
 #ifndef XRCDB_H
 #define XRCDB_H
 
-#include "xrCore/Platform.h"
+#include "xrCore/Platform.hpp"
 
 //#pragma once
 // The following ifdef block is the standard way of creating macros which make exporting
diff --git a/src/xrCore/FS_impl.h b/src/xrCore/FS_impl.h
index 04546030229..9fac3b10edf 100644
--- a/src/xrCore/FS_impl.h
+++ b/src/xrCore/FS_impl.h
@@ -1,7 +1,7 @@
 #ifndef FS_IMPL_H_INCLUDED
 #define FS_IMPL_H_INCLUDED
 
-#include "Platform.h"
+#include "Platform.hpp"
 
 // 1: default
 // 1.5: check next chunk first heuristics
diff --git a/src/xrCore/Platform.h b/src/xrCore/Platform.hpp
similarity index 100%
rename from src/xrCore/Platform.h
rename to src/xrCore/Platform.hpp
diff --git a/src/xrCore/_vector3d.h b/src/xrCore/_vector3d.h
index 4015564ce63..ca8bc12a33a 100644
--- a/src/xrCore/_vector3d.h
+++ b/src/xrCore/_vector3d.h
@@ -1,7 +1,7 @@
 #ifndef __V3D__
 #define __V3D__
 
-#include "Platform.h"
+#include "Platform.hpp"
 
 template <class T>
 struct _vector3
diff --git a/src/xrCore/_vector4.h b/src/xrCore/_vector4.h
index 74ac7d5f5c4..80dc5e1e684 100644
--- a/src/xrCore/_vector4.h
+++ b/src/xrCore/_vector4.h
@@ -2,7 +2,7 @@
 #define _VECTOR4_H
 #pragma once
 
-#include "Platform.h"
+#include "Platform.hpp"
 
 template <class T>
 struct _vector4
diff --git a/src/xrCore/stdafx.h b/src/xrCore/stdafx.h
index 63786714903..7b903263efd 100644
--- a/src/xrCore/stdafx.h
+++ b/src/xrCore/stdafx.h
@@ -9,7 +9,7 @@
 #pragma warning (disable:4661)
 
 #include "xrCore.h"
-#include "Platform.h"
+#include "Platform.hpp"
 #include "Common/Util.hpp"
 //.#include "Include/xrAPI/xrAPI.h"
 #endif
diff --git a/src/xrCore/xrCore.h b/src/xrCore/xrCore.h
index 974645fd8a1..fdd412f3cc2 100644
--- a/src/xrCore/xrCore.h
+++ b/src/xrCore/xrCore.h
@@ -40,7 +40,7 @@
 #define XRAY_EXCEPTIONS 1
 #endif
 
-#include "Platform.h"
+#include "Platform.hpp"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/xrCore/xrCore.vcxproj b/src/xrCore/xrCore.vcxproj
index e86434015c0..9ca83db03b6 100644
--- a/src/xrCore/xrCore.vcxproj
+++ b/src/xrCore/xrCore.vcxproj
@@ -375,7 +375,7 @@
     <ClInclude Include="vector.h" />
     <ClInclude Include="xrCore.h" />
     <ClInclude Include="ModuleLookup.hpp" />
-    <ClInclude Include="Platform.h" />
+    <ClInclude Include="Platform.hpp" />
     <ClInclude Include="xrDebug.h" />
     <ClInclude Include="xrDebug_macros.h" />
     <ClInclude Include="xrMemory.h" />
diff --git a/src/xrCore/xrCore.vcxproj.filters b/src/xrCore/xrCore.vcxproj.filters
index b64ca7a8d35..b0caa77f9e9 100644
--- a/src/xrCore/xrCore.vcxproj.filters
+++ b/src/xrCore/xrCore.vcxproj.filters
@@ -377,9 +377,6 @@
     <ClInclude Include="ModuleLookup.hpp">
       <Filter>Kernel</Filter>
     </ClInclude>
-    <ClInclude Include="Platform.h">
-      <Filter>Kernel</Filter>
-    </ClInclude>
     <ClInclude Include="_bitwise.h">
       <Filter>Math</Filter>
     </ClInclude>
@@ -776,6 +773,9 @@
     <ClInclude Include="..\Common\Noncopyable.hpp">
       <Filter>Common</Filter>
     </ClInclude>
+    <ClInclude Include="Platform.hpp">
+      <Filter>Kernel</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="xrCore.rc">
diff --git a/src/xrD3D9-Null/xrD3D9-Null.h b/src/xrD3D9-Null/xrD3D9-Null.h
index 3fda887bbac..d17f1e7da4d 100644
--- a/src/xrD3D9-Null/xrD3D9-Null.h
+++ b/src/xrD3D9-Null/xrD3D9-Null.h
@@ -3,7 +3,7 @@
 #include <d3d9caps.h>
 #include "IDirect3D9.h"
 
-#include "xrCore/Platform.h"
+#include "xrCore/Platform.hpp"
 
 #ifdef XRD3D9NULL_EXPORTS
 #define XRD3D9NULL_API XR_EXPORT
diff --git a/src/xrEngine/Engine.h b/src/xrEngine/Engine.h
index 758e426bfd1..d26e9d6ab12 100644
--- a/src/xrEngine/Engine.h
+++ b/src/xrEngine/Engine.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "xrCore/Platform.h"
+#include "xrCore/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/xrEngine/psystem.h b/src/xrEngine/psystem.h
index 7de56ee367b..8ba2173563f 100644
--- a/src/xrEngine/psystem.h
+++ b/src/xrEngine/psystem.h
@@ -2,7 +2,7 @@
 #define PSystemH
 #pragma once
 
-#include "xrCore/Platform.h"
+#include "xrCore/Platform.hpp"
 
 #ifdef XR_PARTICLES_EXPORTS
 #define PARTICLES_API XR_EXPORT
diff --git a/src/xrGameSpy/xrGameSpy.h b/src/xrGameSpy/xrGameSpy.h
index 7dd9e0ebe45..4e88277d9ea 100644
--- a/src/xrGameSpy/xrGameSpy.h
+++ b/src/xrGameSpy/xrGameSpy.h
@@ -1,4 +1,4 @@
-#include "xrCore/Platform.h"
+#include "xrCore/Platform.hpp"
 
 // The following ifdef block is the standard way of creating macros which make exporting 
 // from a DLL simpler. All files within this DLL are compiled with the XRGAMESPY_EXPORTS
diff --git a/src/xrGameSpy/xrGameSpy_MainDefs.h b/src/xrGameSpy/xrGameSpy_MainDefs.h
index a6aa30be67c..78a4fbbc659 100644
--- a/src/xrGameSpy/xrGameSpy_MainDefs.h
+++ b/src/xrGameSpy/xrGameSpy_MainDefs.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "xrCore/Platform.h"
+#include "xrCore/Platform.hpp"
 
 #define QRCDKEY_INTEGRATION
 #define SB_ICMP_SUPPORT
diff --git a/src/xrNetServer/NET_Shared.h b/src/xrNetServer/NET_Shared.h
index 1f226c4813b..50f0e0bc05a 100644
--- a/src/xrNetServer/NET_Shared.h
+++ b/src/xrNetServer/NET_Shared.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "xrCore/Platform.h"
+#include "xrCore/Platform.hpp"
 
 #ifdef XR_NETSERVER_EXPORTS
 	#define XRNETSERVER_API XR_EXPORT
diff --git a/src/xrParticles/psystem.h b/src/xrParticles/psystem.h
index 146745ce42e..77057835b03 100644
--- a/src/xrParticles/psystem.h
+++ b/src/xrParticles/psystem.h
@@ -2,7 +2,7 @@
 #define PSystemH
 #pragma once
 
-#include "xrCore/Platform.h"
+#include "xrCore/Platform.hpp"
 
 #ifdef XR_PARTICLES_EXPORTS
 	#define PARTICLES_API XR_EXPORT
diff --git a/src/xrPhysics/xrPhysics.h b/src/xrPhysics/xrPhysics.h
index aa1fee9c507..61fc66b9cad 100644
--- a/src/xrPhysics/xrPhysics.h
+++ b/src/xrPhysics/xrPhysics.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "xrCore/Platform.h"
+#include "xrCore/Platform.hpp"
 
 #ifdef XRPHYSICS_EXPORTS
 #define XRPHYSICS_API XR_EXPORT
diff --git a/src/xrScriptEngine/LuaStudio/Backend/Interfaces.hpp b/src/xrScriptEngine/LuaStudio/Backend/Interfaces.hpp
index 92debf60e9b..ae88c7cc89e 100644
--- a/src/xrScriptEngine/LuaStudio/Backend/Interfaces.hpp
+++ b/src/xrScriptEngine/LuaStudio/Backend/Interfaces.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "xrCore/Platform.h"
+#include "xrCore/Platform.hpp"
 
 #include "xrScriptEngine/LuaStudio/Config.hpp"
 
diff --git a/src/xrScriptEngine/script_thread.cpp b/src/xrScriptEngine/script_thread.cpp
index 2a3bfa2b546..eddc14ce96c 100644
--- a/src/xrScriptEngine/script_thread.cpp
+++ b/src/xrScriptEngine/script_thread.cpp
@@ -11,7 +11,7 @@
 #include "script_engine.hpp"
 #include "Include/xrAPI/xrAPI.h"
 
-// #include "xrCore/Platform.h"
+// #include "xrCore/Platform.hpp"
 
 #ifdef USE_DEBUGGER
 #ifndef USE_LUA_STUDIO
diff --git a/src/xrScriptEngine/xrScriptEngine.hpp b/src/xrScriptEngine/xrScriptEngine.hpp
index 8790c1073f6..e8f9f35a9a6 100644
--- a/src/xrScriptEngine/xrScriptEngine.hpp
+++ b/src/xrScriptEngine/xrScriptEngine.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "xrCore/Platform.h"
+#include "xrCore/Platform.hpp"
 
 #ifdef XRSCRIPTENGINE_EXPORTS
 #define XRSCRIPTENGINE_API XR_EXPORT
diff --git a/src/xrServerEntities/xrEProps.h b/src/xrServerEntities/xrEProps.h
index cb2311a4818..46db78110db 100644
--- a/src/xrServerEntities/xrEProps.h
+++ b/src/xrServerEntities/xrEProps.h
@@ -1,7 +1,7 @@
 #ifndef xrEPropsH
 #define xrEPropsH
 
-#include "xrCore/Platform.h"
+#include "xrCore/Platform.hpp"
 
 #ifdef XR_EPROPS_EXPORTS
 #define XR_EPROPS_API XR_EXPORT
diff --git a/src/xrSound/Sound.h b/src/xrSound/Sound.h
index 3de7d74c19a..0c02c42d9a1 100644
--- a/src/xrSound/Sound.h
+++ b/src/xrSound/Sound.h
@@ -2,7 +2,7 @@
 #define SoundH
 #pragma once
 
-#include "xrCore/Platform.h"
+#include "xrCore/Platform.hpp"
 
 #ifdef XRSOUND_EXPORTS
 	#define XRSOUND_API XR_EXPORT
diff --git a/src/xrXMLParser/xrXMLParser.h b/src/xrXMLParser/xrXMLParser.h
index ecaef2953cf..76457825c60 100644
--- a/src/xrXMLParser/xrXMLParser.h
+++ b/src/xrXMLParser/xrXMLParser.h
@@ -2,7 +2,7 @@
 #define xrXMLParserH
 #pragma once
 
-#include "xrCore/Platform.h"
+#include "xrCore/Platform.hpp"
 
 #ifdef XRXMLPARSER_EXPORTS
 	#define XRXMLPARSER_API XR_EXPORT