diff --git a/src/shared/vmap/VMapManager2.cpp b/src/shared/vmap/VMapManager2.cpp
index c4c13fe795..1e8a84aee5 100644
--- a/src/shared/vmap/VMapManager2.cpp
+++ b/src/shared/vmap/VMapManager2.cpp
@@ -56,7 +56,7 @@ namespace VMAP
     Vector3 VMapManager2::convertPositionToInternalRep(float x, float y, float z) const
     {
         Vector3 pos;
-        const float mid = 0.5 * 64.0 * 533.33333333;
+        const float mid = 0.5 * 64.0 * 533.33333333f;
         pos.x = mid - x;
         pos.y = mid - y;
         pos.z = z;
@@ -69,7 +69,7 @@ namespace VMAP
     Vector3 VMapManager2::convertPositionToMangosRep(float x, float y, float z) const
     {
         Vector3 pos;
-        const float mid = 0.5 * 64.0 * 533.33333333;
+        const float mid = 0.5 * 64.0 * 533.33333333f;
         pos.x = mid - x;
         pos.y = mid - y;
         pos.z = z;
diff --git a/win/VC90/g3dlite.vcproj b/win/VC90/g3dlite.vcproj
index 5d4dcf70a8..a926043efb 100644
--- a/win/VC90/g3dlite.vcproj
+++ b/win/VC90/g3dlite.vcproj
@@ -464,6 +464,10 @@
 				RelativePath="..\..\dep\src\g3dlite\Vector4.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\dep\src\g3dlite\RegistryUtil.cpp"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/win/VC90/shared.vcproj b/win/VC90/shared.vcproj
index 7914bfd265..685a5c037d 100644
--- a/win/VC90/shared.vcproj
+++ b/win/VC90/shared.vcproj
@@ -565,31 +565,15 @@
 			Name="vmaps"
 			>
 			<File
-				RelativePath="..\..\src\shared\vmap\AABSPTree.h"
+				RelativePath="..\..\src\shared\vmap\BIH.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\shared\vmap\BaseModel.cpp"
+				RelativePath="..\..\src\shared\vmap\BIH.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\shared\vmap\BaseModel.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\vmap\CoordModelMapping.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\vmap\CoordModelMapping.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\vmap\DebugCmdLogger.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\vmap\DebugCmdLogger.h"
+				RelativePath="..\..\src\shared\vmap\CMakeLists.txt"
 				>
 			</File>
 			<File
@@ -597,39 +581,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\shared\vmap\ManagedModelContainer.cpp"
+				RelativePath="..\..\src\shared\vmap\MapTree.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\shared\vmap\ManagedModelContainer.h"
+				RelativePath="..\..\src\shared\vmap\MapTree.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\shared\vmap\ModelContainer.cpp"
+				RelativePath="..\..\src\shared\vmap\ModelInstance.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\shared\vmap\ModelContainer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\vmap\NodeValueAccess.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\vmap\ShortBox.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\vmap\ShortVector.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\vmap\SubModel.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\vmap\SubModel.h"
+				RelativePath="..\..\src\shared\vmap\ModelInstance.h"
 				>
 			</File>
 			<File
@@ -640,14 +604,6 @@
 				RelativePath="..\..\src\shared\vmap\TileAssembler.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\shared\vmap\TreeNode.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\shared\vmap\TreeNode.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\shared\vmap\VMapDefinitions.h"
 				>
@@ -661,17 +617,25 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\shared\vmap\VMapManager.cpp"
+				RelativePath="..\..\src\shared\vmap\VMapManager2.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\shared\vmap\VMapManager.h"
+				RelativePath="..\..\src\shared\vmap\VMapManager2.h"
 				>
 			</File>
 			<File
 				RelativePath="..\..\src\shared\vmap\VMapTools.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\shared\vmap\WorldModel.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\shared\vmap\WorldModel.h"
+				>
+			</File>
 		</Filter>
 		<File
 			RelativePath="..\..\src\shared\Common.cpp"
@@ -749,7 +713,7 @@
 			RelativePath="..\..\src\shared\ServiceWin32.h"
 			>
 		</File>
-        <File
+		<File
 			RelativePath="..\..\src\shared\SignalHandler.h"
 			>
 		</File>