diff --git a/src/xrAICore/Navigation/builder_allocator_constructor.h b/src/xrAICore/Navigation/builder_allocator_constructor.h
index 1b2712cc085..e615bab2024 100644
--- a/src/xrAICore/Navigation/builder_allocator_constructor.h
+++ b/src/xrAICore/Navigation/builder_allocator_constructor.h
@@ -20,17 +20,19 @@ class BuilderAllocatorDataStorage :
 public:
     typedef typename _path_builder::template CDataStorage<_vertex>	CDataStorageBase;
     typedef typename _vertex_allocator::template CDataStorage<
-        typename _path_builder::template CDataStorage<
-			_vertex
-		>::CGraphVertex
-	>												CDataStorageAllocator;
+        typename _path_builder::template CDataStorage<_vertex>::CGraphVertex> CDataStorageAllocator;
 	typedef typename CDataStorageBase::CGraphVertex CGraphVertex;
 	typedef typename CGraphVertex::_index_type		_index_type;
 
 public:
-	IC							BuilderAllocatorDataStorage(const u32 vertex_count);
-	virtual						~BuilderAllocatorDataStorage();
-	IC		void				init			();
+    BuilderAllocatorDataStorage(const u32 vertex_count) :
+        CDataStorageBase(vertex_count),
+        CDataStorageAllocator()
+    {}
+    virtual ~BuilderAllocatorDataStorage() {}
+    void init()
+    {
+        CDataStorageBase::init();
+        CDataStorageAllocator::init();
+    }
 };
-
-#include "xrAICore/Navigation/builder_allocator_constructor_inline.h"
\ No newline at end of file
diff --git a/src/xrAICore/Navigation/builder_allocator_constructor_inline.h b/src/xrAICore/Navigation/builder_allocator_constructor_inline.h
deleted file mode 100644
index 32d54cc1344..00000000000
--- a/src/xrAICore/Navigation/builder_allocator_constructor_inline.h
+++ /dev/null
@@ -1,36 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-//	Module 		: builder_allocator_constructor_inline.h
-//	Created 	: 21.03.2002
-//  Modified 	: 28.02.2004
-//	Author		: Dmitriy Iassenev
-//	Description : Builder allocator constructor inline functions
-////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#define TEMPLATE_SPECIALIZATION \
-	template <template <typename _T> class _vertex, typename _1,typename _2> 
-
-#define CConstructorBuilderAllocator BuilderAllocatorDataStorage<_vertex,_1,_2>
-
-TEMPLATE_SPECIALIZATION
-IC	CConstructorBuilderAllocator::BuilderAllocatorDataStorage(const u32 vertex_count) :
-	CDataStorageBase			(vertex_count),
-	CDataStorageAllocator		()
-{
-}
-
-TEMPLATE_SPECIALIZATION
-CConstructorBuilderAllocator::~BuilderAllocatorDataStorage()
-{
-}
-
-TEMPLATE_SPECIALIZATION
-IC	void CConstructorBuilderAllocator::init		()
-{
-	CDataStorageBase::init		();
-	CDataStorageAllocator::init ();
-}
-
-#undef TEMPLATE_SPECIALIZATION
-#undef CConstructorBuilderAllocator
\ No newline at end of file
diff --git a/src/xrAICore/Navigation/data_storage_constructor.h b/src/xrAICore/Navigation/data_storage_constructor.h
index a5e2968cb71..74feabd9c23 100644
--- a/src/xrAICore/Navigation/data_storage_constructor.h
+++ b/src/xrAICore/Navigation/data_storage_constructor.h
@@ -18,7 +18,7 @@ template <
 	typename _manager, // CVertexManagerFixed|CVertexManagerHashFixed
 	typename _builder, // CEdgePath|CVertexPath
 	typename _allocator, // CVertexAllocatorFixed
-	template <typename _T> class _vertex = CEmptyClassTemplate
+	template <typename _T> class _vertex = CEmptyClassTemplate // _Vertex
 >
 struct CDataStorageConstructor : // CDataStorageBucketList::CDataStorage<CManagerBuilderAllocatorConstructor<manager, path, allocator> >
     public _algorithm::template CDataStorage<
diff --git a/src/xrAICore/Navigation/manager_builder_allocator_constructor.h b/src/xrAICore/Navigation/manager_builder_allocator_constructor.h
index 2ea21af2f6b..f23a2f7f2c1 100644
--- a/src/xrAICore/Navigation/manager_builder_allocator_constructor.h
+++ b/src/xrAICore/Navigation/manager_builder_allocator_constructor.h
@@ -35,11 +35,12 @@ struct CManagerBuilderAllocatorConstructor {
 		typedef typename CGraphVertex::_index_type	_index_type;
 
 	public:
-		IC							CDataStorage	(const u32 vertex_count);
-		virtual						~CDataStorage	();
-		IC		void				init			();
-		IC		CGraphVertex		&create_vertex	(const _index_type &vertex_id);
+        CDataStorage(const u32 vertex_count) :
+            inherited(vertex_count)
+        {}
+        virtual ~CDataStorage() {}
+        void init() { inherited::init(); }
+        CGraphVertex &create_vertex(const _index_type &vertex_id)
+        { return inherited::create_vertex(inherited_allocator::create_vertex(), vertex_id); }
 	};
 };
-
-#include "xrAICore/Navigation/manager_builder_allocator_constructor_inline.h"
\ No newline at end of file
diff --git a/src/xrAICore/Navigation/manager_builder_allocator_constructor_inline.h b/src/xrAICore/Navigation/manager_builder_allocator_constructor_inline.h
deleted file mode 100644
index 23fa520cfa9..00000000000
--- a/src/xrAICore/Navigation/manager_builder_allocator_constructor_inline.h
+++ /dev/null
@@ -1,53 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-//	Module 		: vertex_builder_allocator_constructor_inline.h
-//	Created 	: 21.03.2002
-//  Modified 	: 28.02.2004
-//	Author		: Dmitriy Iassenev
-//	Description : Manager builder allocator constructor inline functions
-////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#define TEMPLATE_SPECIALIZATION \
-	template<\
-		typename _manager,\
-		typename _builder,\
-		typename _allocator\
-	>\
-	template <\
-		template <typename T> class _vertex,\
-		template <typename T1, typename T2> class _index_vertex\
-	>
-
-#define CConstructorManagerBuilderAllocator \
-	CManagerBuilderAllocatorConstructor<\
-		_manager,\
-		_builder,\
-		_allocator\
-	>::CDataStorage<_vertex,_index_vertex>
-
-TEMPLATE_SPECIALIZATION
-IC	CConstructorManagerBuilderAllocator::CDataStorage	(const u32 vertex_count) :
-		inherited				(vertex_count)
-{
-}
-
-TEMPLATE_SPECIALIZATION
-CConstructorManagerBuilderAllocator::~CDataStorage	()
-{
-}
-
-TEMPLATE_SPECIALIZATION
-IC	void CConstructorManagerBuilderAllocator::init	()
-{
-	inherited::init				();
-}
-
-TEMPLATE_SPECIALIZATION
-IC	typename CConstructorManagerBuilderAllocator::CGraphVertex &CConstructorManagerBuilderAllocator::create_vertex	(const _index_type &vertex_id)
-{
-	return						(inherited::create_vertex(inherited_allocator::create_vertex(),vertex_id));
-}
-
-#undef TEMPLATE_SPECIALIZATION
-#undef CConstructorManagerBuilderAllocator
\ No newline at end of file
diff --git a/src/xrAICore/xrAICore.vcxproj b/src/xrAICore/xrAICore.vcxproj
index b6bd147c432..b821a0ac3f8 100644
--- a/src/xrAICore/xrAICore.vcxproj
+++ b/src/xrAICore/xrAICore.vcxproj
@@ -262,7 +262,6 @@
     <ClInclude Include="Navigation\a_star.h" />
     <ClInclude Include="Navigation\a_star_inline.h" />
     <ClInclude Include="Navigation\builder_allocator_constructor.h" />
-    <ClInclude Include="Navigation\builder_allocator_constructor_inline.h" />
     <ClInclude Include="Navigation\data_storage_binary_heap.h" />
     <ClInclude Include="Navigation\data_storage_binary_heap_inline.h" />
     <ClInclude Include="Navigation\data_storage_bucket_list.h" />
@@ -291,7 +290,6 @@
     <ClInclude Include="Navigation\level_graph_space.h" />
     <ClInclude Include="Navigation\level_graph_vertex_inline.h" />
     <ClInclude Include="Navigation\manager_builder_allocator_constructor.h" />
-    <ClInclude Include="Navigation\manager_builder_allocator_constructor_inline.h" />
     <ClInclude Include="Navigation\PathManagers\path_manager.h" />
     <ClInclude Include="Navigation\PathManagers\path_manager_game.h" />
     <ClInclude Include="Navigation\PathManagers\path_manager_game_inline.h" />
diff --git a/src/xrAICore/xrAICore.vcxproj.filters b/src/xrAICore/xrAICore.vcxproj.filters
index 76cb19be5cf..c074899b52f 100644
--- a/src/xrAICore/xrAICore.vcxproj.filters
+++ b/src/xrAICore/xrAICore.vcxproj.filters
@@ -183,18 +183,12 @@
     <ClInclude Include="Navigation\builder_allocator_constructor.h">
       <Filter>AI\Navigation\Pathfinding\DataStorages\Constructors</Filter>
     </ClInclude>
-    <ClInclude Include="Navigation\builder_allocator_constructor_inline.h">
-      <Filter>AI\Navigation\Pathfinding\DataStorages\Constructors</Filter>
-    </ClInclude>
     <ClInclude Include="Navigation\data_storage_constructor.h">
       <Filter>AI\Navigation\Pathfinding\DataStorages\Constructors</Filter>
     </ClInclude>
     <ClInclude Include="Navigation\manager_builder_allocator_constructor.h">
       <Filter>AI\Navigation\Pathfinding\DataStorages\Constructors</Filter>
     </ClInclude>
-    <ClInclude Include="Navigation\manager_builder_allocator_constructor_inline.h">
-      <Filter>AI\Navigation\Pathfinding\DataStorages\Constructors</Filter>
-    </ClInclude>
     <ClInclude Include="Navigation\edge_path.h">
       <Filter>AI\Navigation\Pathfinding\DataStorages\PathBuilders</Filter>
     </ClInclude>