diff --git a/src/utils/xrAI/compiler.h b/src/utils/xrAI/compiler.h
index c5053c1f791..324f1e0db68 100644
--- a/src/utils/xrAI/compiler.h
+++ b/src/utils/xrAI/compiler.h
@@ -1,11 +1,11 @@
 #pragma once
 
 #include "xrCDB/xrCDB.h"
-#include "AIMapExport.h"
 #include "utils/Shader_xrLC.h"
 #include "xrAICore/Navigation/level_graph.h"
 #include "editors/LevelEditor/Engine/communicate.h"
 #include "Layers/xrRender/ETextureParams.h"
+#include "AIMapExport.h"
 
 // base patch used all the time up to merging
 const u32 InvalidNode = (1 << 24) - 1;
diff --git a/src/utils/xrAI/factory_api.h b/src/utils/xrAI/factory_api.h
index dbf3981dc59..a35ce1b61cc 100644
--- a/src/utils/xrAI/factory_api.h
+++ b/src/utils/xrAI/factory_api.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "xrServer_Object_Base.h"
+#include "xrServerEntities/xrServer_Object_Base.h"
 
 extern "C" {
 typedef XR_IMPORT IServerEntity* __stdcall Factory_Create(LPCSTR section);
diff --git a/src/utils/xrAI/game_graph_builder.cpp b/src/utils/xrAI/game_graph_builder.cpp
index c10c399b3ce..721d637c86d 100644
--- a/src/utils/xrAI/game_graph_builder.cpp
+++ b/src/utils/xrAI/game_graph_builder.cpp
@@ -8,9 +8,7 @@
 
 #include "stdafx.h"
 #include "game_graph_builder.h"
-#include "xrAICore/Navigation/graph_abstract.h"
-#include "xrAICore/Navigation/graph_engine.h"
-#include "xrServer_Objects_ALife.h"
+#include "xrServerEntities/xrServer_Objects_ALife.h"
 #include "factory_api.h"
 #include "guid_generator.h"
 
diff --git a/src/utils/xrAI/game_graph_builder.h b/src/utils/xrAI/game_graph_builder.h
index 38e31dadef0..6e6142dcc77 100644
--- a/src/utils/xrAI/game_graph_builder.h
+++ b/src/utils/xrAI/game_graph_builder.h
@@ -8,36 +8,14 @@
 
 #pragma once
 
-#include "Common/LevelStructure.hpp"
-#include "alife_space.h"
-#include <loki/EmptyType.h>
-
-class CLevelGraph;
-class CGameLevelCrossTable;
-
-template
-<
-    typename _data_type /*= Loki::EmptyType*/,
-    typename _edge_weight_type /*= float*/,
-    typename _vertex_id_type/* = u32*/,
-    typename _edge_data_type = Loki::EmptyType
->
-class CGraphAbstract;
-
-namespace GameGraph
-{
-struct CVertex;
-};
-
-class NET_Packet;
-
-class CGraphEngine;
+#include "xrAICore/Navigation/graph_abstract.h"
+#include "xrAICore/Navigation/graph_engine.h"
 
 class CGameGraphBuilder
 {
 private:
     typedef GameGraph::CVertex vertex_type;
-    typedef CGraphAbstract<vertex_type, float, u32> graph_type;
+    typedef CGraphAbstract<vertex_type, float, u32, Loki::EmptyType> graph_type;
     typedef xr_vector<xr_vector<u32>> DISTANCES;
     typedef std::pair<u32, u32> PAIR;
     typedef std::pair<float, PAIR> TRIPPLE;
diff --git a/src/utils/xrAI/game_spawn_constructor.cpp b/src/utils/xrAI/game_spawn_constructor.cpp
index 3fe59c200dd..dc20b435090 100644
--- a/src/utils/xrAI/game_spawn_constructor.cpp
+++ b/src/utils/xrAI/game_spawn_constructor.cpp
@@ -8,10 +8,9 @@
 
 #include "stdafx.h"
 #include "game_spawn_constructor.h"
-#include "level_spawn_constructor.h"
-#include "xrServer_Objects_ALife_All.h"
 #include "xrAICore/Navigation/graph_engine.h"
 #include "xrAICore/Navigation/PatrolPath/patrol_path_storage.h"
+#include "level_spawn_constructor.h"
 #include "xrAI.h"
 
 extern LPCSTR GAME_CONFIG;
diff --git a/src/utils/xrAI/game_spawn_constructor.h b/src/utils/xrAI/game_spawn_constructor.h
index e838b563783..093e61178b6 100644
--- a/src/utils/xrAI/game_spawn_constructor.h
+++ b/src/utils/xrAI/game_spawn_constructor.h
@@ -8,17 +8,15 @@
 
 #pragma once
 
-#include "alife_space.h"
 #include "xr_graph_merge.h"
 #include "xrAICore/Navigation/graph_abstract.h"
+#include "xrServerEntities/alife_space.h"
+#include "level_spawn_constructor.h"
 #include "spawn_constructor_space.h"
 #include "server_entity_wrapper.h"
 #include "guid_generator.h"
 
-class CSE_Abstract;
 class CLevelSpawnConstructor;
-class CSE_ALifeCreatureAbstract;
-class CPatrolPathStorage;
 
 class CGameSpawnConstructor
 {
diff --git a/src/utils/xrAI/level_spawn_constructor.cpp b/src/utils/xrAI/level_spawn_constructor.cpp
index 7dd9f369ce2..3514268b4ca 100644
--- a/src/utils/xrAI/level_spawn_constructor.cpp
+++ b/src/utils/xrAI/level_spawn_constructor.cpp
@@ -8,14 +8,9 @@
 
 #include "stdafx.h"
 #include "level_spawn_constructor.h"
-#include "xrAICore/Navigation/graph_engine.h"
-#include "xrAICore/Navigation/PatrolPath/patrol_path_storage.h"
-#include "xrServer_Objects_ALife_All.h"
+#include "xrServerEntities/restriction_space.h"
+#include "xrServerEntities/clsid_game.h"
 #include "factory_api.h"
-#include "clsid_game.h"
-#include "game_spawn_constructor.h"
-#include "space_restrictor_wrapper.h"
-#include "restriction_space.h"
 
 #define IGNORE_ZERO_SPAWN_POSITIONS
 
diff --git a/src/utils/xrAI/level_spawn_constructor.h b/src/utils/xrAI/level_spawn_constructor.h
index 6eb276cfc7c..61f98d475b7 100644
--- a/src/utils/xrAI/level_spawn_constructor.h
+++ b/src/utils/xrAI/level_spawn_constructor.h
@@ -8,22 +8,13 @@
 
 #pragma once
 
+#include "xrAICore/Navigation/PatrolPath/patrol_path_storage.h"
 #include "utils/xrLCUtil/xrThread.hpp"
 #include "spawn_constructor_space.h"
+#include "space_restrictor_wrapper.h"
+#include "game_spawn_constructor.h"
 
-class CLevelGraph;
-class CGameLevelCrossTable;
 class CGameSpawnConstructor;
-class CSE_ALifeCreatureActor;
-class CGraphEngine;
-class CSE_Abstract;
-class CSE_ALifeObject;
-class CSE_ALifeGraphPoint;
-// class CSE_SpawnGroup;
-class CSE_ALifeAnomalousZone;
-class CSpaceRestrictorWrapper;
-class CPatrolPathStorage;
-class CSE_ALifeDynamicObject;
 
 class CLevelSpawnConstructor : public CThread
 {
diff --git a/src/utils/xrAI/server_entity_wrapper.cpp b/src/utils/xrAI/server_entity_wrapper.cpp
index bbda0faa17c..b64a9f8d5e1 100644
--- a/src/utils/xrAI/server_entity_wrapper.cpp
+++ b/src/utils/xrAI/server_entity_wrapper.cpp
@@ -8,8 +8,8 @@
 
 #include "stdafx.h"
 #include "server_entity_wrapper.h"
-#include "xrServer_Objects.h"
-#include "xrmessages.h"
+#include "xrServerEntities/xrServer_Objects.h"
+#include "xrServerEntities/xrmessages.h"
 
 #ifdef AI_COMPILER
 #include "factory_api.h"
diff --git a/src/utils/xrAI/server_entity_wrapper.h b/src/utils/xrAI/server_entity_wrapper.h
index 7ceed11c6e3..52a174efece 100644
--- a/src/utils/xrAI/server_entity_wrapper.h
+++ b/src/utils/xrAI/server_entity_wrapper.h
@@ -8,9 +8,7 @@
 
 #pragma once
 
-#include "Common/object_interfaces.h"
-
-class CSE_Abstract;
+#include "xrServerEntities/xrServer_Object_Base.h"
 
 class CServerEntityWrapper : public ISerializable
 {
diff --git a/src/utils/xrAI/space_restrictor_wrapper.cpp b/src/utils/xrAI/space_restrictor_wrapper.cpp
index e1c909bc6c8..eb6c1bc0076 100644
--- a/src/utils/xrAI/space_restrictor_wrapper.cpp
+++ b/src/utils/xrAI/space_restrictor_wrapper.cpp
@@ -8,8 +8,6 @@
 
 #include "stdafx.h"
 #include "space_restrictor_wrapper.h"
-#include "xrServer_Objects_ALife.h"
-#include "xrAICore/Navigation/graph_engine.h"
 
 IC Fvector construct_position(CLevelGraph& level_graph, u32 level_vertex_id, float x, float z)
 {
diff --git a/src/utils/xrAI/space_restrictor_wrapper.h b/src/utils/xrAI/space_restrictor_wrapper.h
index 0b5074179bf..667789f24bf 100644
--- a/src/utils/xrAI/space_restrictor_wrapper.h
+++ b/src/utils/xrAI/space_restrictor_wrapper.h
@@ -8,11 +8,10 @@
 
 #pragma once
 
-#include "shapedata.h"
-
-class CSE_ALifeSpaceRestrictor;
-class CLevelGraph;
-class CGraphEngine;
+#include "xrAICore/Navigation/graph_abstract.h"
+#include "xrAICore/Navigation/graph_engine.h"
+#include "xrServerEntities/shapedata.h"
+#include "xrServerEntities/xrServer_Objects_ALife.h"
 
 class CSpaceRestrictorWrapper
 {
diff --git a/src/utils/xrAI/spawn_constructor_space.h b/src/utils/xrAI/spawn_constructor_space.h
index 10d98fe30fa..888bab9423e 100644
--- a/src/utils/xrAI/spawn_constructor_space.h
+++ b/src/utils/xrAI/spawn_constructor_space.h
@@ -9,8 +9,7 @@
 #pragma once
 
 #include "xrAICore/Navigation/game_graph.h"
-
-class CSE_ALifeLevelChanger;
+#include "xrServerEntities/xrServer_Objects_ALife_All.h"
 
 namespace SpawnConstructorSpace
 {
diff --git a/src/utils/xrAI/xrAI.vcxproj b/src/utils/xrAI/xrAI.vcxproj
index 21f76f17578..d8a8caf0fe8 100644
--- a/src/utils/xrAI/xrAI.vcxproj
+++ b/src/utils/xrAI/xrAI.vcxproj
@@ -95,7 +95,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)xrServerEntities;$(xrExternals)FreeMagic\Include;$(xrExternals)FreeImage\Dist\x32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(xrExternals)FreeMagic\Include;$(xrExternals)FreeImage\Dist\x32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>AI_COMPILER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -105,7 +105,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)xrServerEntities;$(xrExternals)FreeMagic\Include;$(xrExternals)FreeImage\Dist\x32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(xrExternals)FreeMagic\Include;$(xrExternals)FreeImage\Dist\x32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>AI_COMPILER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -115,7 +115,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)xrServerEntities;$(xrExternals)FreeMagic\Include;$(xrExternals)FreeImage\Dist\x32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(xrExternals)FreeMagic\Include;$(xrExternals)FreeImage\Dist\x32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>AI_COMPILER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -125,7 +125,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)xrServerEntities;$(xrExternals)FreeMagic\Include;$(xrExternals)FreeImage\Dist\x32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(xrExternals)FreeMagic\Include;$(xrExternals)FreeImage\Dist\x32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>AI_COMPILER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -135,7 +135,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)xrServerEntities;$(xrExternals)FreeMagic\Include;$(xrExternals)FreeImage\Dist\x32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(xrExternals)FreeMagic\Include;$(xrExternals)FreeImage\Dist\x32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>AI_COMPILER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -145,7 +145,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)xrServerEntities;$(xrExternals)FreeMagic\Include;$(xrExternals)FreeImage\Dist\x32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(xrExternals)FreeMagic\Include;$(xrExternals)FreeImage\Dist\x32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>AI_COMPILER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
diff --git a/src/utils/xrAI/xr_graph_merge.cpp b/src/utils/xrAI/xr_graph_merge.cpp
index f68ec5da739..118bc151fa9 100644
--- a/src/utils/xrAI/xr_graph_merge.cpp
+++ b/src/utils/xrAI/xr_graph_merge.cpp
@@ -9,10 +9,8 @@
 #include "stdafx.h"
 #include "xr_graph_merge.h"
 #include "xrAI.h"
-#include "xrServer_Objects_ALife_All.h"
 #include "factory_api.h"
 #include "Common/object_broker.h"
-#include "xrAICore/Navigation/level_graph.h"
 #include "spawn_constructor_space.h"
 #include "guid_generator.h"
 #include "game_graph_builder.h"
@@ -23,8 +21,6 @@ extern LPCSTR GAME_CONFIG;
 using namespace SpawnConstructorSpace;
 using namespace ALife;
 
-class CLevelGameGraph;
-
 typedef struct tagSConnectionVertex
 {
     LPSTR caConnectName;