diff --git a/openttd.dsp b/openttd.dsp
index 7ab85bc401..cd20b037f9 100644
--- a/openttd.dsp
+++ b/openttd.dsp
@@ -147,10 +147,6 @@ SOURCE=.\aystar.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\bridge_map.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\command.c
 # End Source File
 # Begin Source File
@@ -363,10 +359,6 @@ SOURCE=.\rail.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\road_map.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\saveload.c
 # End Source File
 # Begin Source File
@@ -458,10 +450,6 @@ SOURCE=.\tile.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\tunnel_map.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\unix.c
 # PROP Exclude_From_Build 1
 # End Source File
@@ -1145,6 +1133,62 @@ SOURCE=.\network_server.h
 SOURCE=.\network_udp.h
 # End Source File
 # End Group
+# Begin Group "Map Accessors"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\bridge_map.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\bridge_map.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\clear_map.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\industry_map.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\rail_map.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\road_map.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\road_map.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\station_map.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\town_map.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\tree_map.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\tunnel_map.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\tunnel_map.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\unmovable_map.h
+# End Source File
+# End Group
 # Begin Source File
 
 SOURCE=.\changelog.txt
diff --git a/openttd.vcproj b/openttd.vcproj
index b7e36f79c4..4760ea3ca3 100644
--- a/openttd.vcproj
+++ b/openttd.vcproj
@@ -166,9 +166,6 @@
 			<File
 				RelativePath=".\aystar.c">
 			</File>
-			<File
-				RelativePath=".\bridge_map.c">
-			</File>
 			<File
 				RelativePath=".\callback_table.c">
 			</File>
@@ -866,9 +863,15 @@
 		<Filter
 			Name="Map Accessors"
 			Filter="">
+			<File
+				RelativePath=".\bridge_map.c">
+			</File>
 			<File
 				RelativePath=".\clear_map.h">
 			</File>
+			<File
+				RelativePath=".\industry_map.h">
+			</File>
 			<File
 				RelativePath=".\rail_map.h">
 			</File>
@@ -878,6 +881,12 @@
 			<File
 				RelativePath=".\road_map.h">
 			</File>
+			<File
+				RelativePath=".\station_map.h">
+			</File>
+			<File
+				RelativePath=".\town_map.h">
+			</File>
 			<File
 				RelativePath=".\tree_map.h">
 			</File>
diff --git a/pathfind.h b/pathfind.h
index ec358b5db9..748ec5ab99 100644
--- a/pathfind.h
+++ b/pathfind.h
@@ -66,7 +66,7 @@ typedef struct {
 	TileIndex tile;
 	int length;
 } FindLengthOfTunnelResult;
-FindLengthOfTunnelResult FindLengthOfTunnel(TileIndex tile, uint direction);
+FindLengthOfTunnelResult FindLengthOfTunnel(TileIndex tile, DiagDirection direction);
 
 void NewTrainPathfind(TileIndex tile, TileIndex dest, DiagDirection direction, NTPEnumProc* enum_proc, void* data);