diff --git a/projects/openttd.vcproj b/projects/openttd.vcproj
index d9880d3a41..a439556d21 100644
--- a/projects/openttd.vcproj
+++ b/projects/openttd.vcproj
@@ -392,9 +392,6 @@
 			<File
 				RelativePath=".\..\src\articulated_vehicles.h">
 			</File>
-			<File
-				RelativePath=".\..\src\autoreplace_cmd.h">
-			</File>
 			<File
 				RelativePath=".\..\src\aystar.h">
 			</File>
@@ -479,6 +476,9 @@
 			<File
 				RelativePath=".\..\src\industry.h">
 			</File>
+			<File
+				RelativePath=".\..\src\landscape.h">
+			</File>
 			<File
 				RelativePath=".\..\src\livery.h">
 			</File>
@@ -869,9 +869,6 @@
 			<File
 				RelativePath=".\..\src\table\ai_rail.h">
 			</File>
-			<File
-				RelativePath=".\..\src\table\allstrings.h">
-			</File>
 			<File
 				RelativePath=".\..\src\table\animcursors.h">
 			</File>
@@ -921,7 +918,7 @@
 				RelativePath=".\..\src\table\station_land.h">
 			</File>
 			<File
-				RelativePath=".\..\src\table\strings.h">
+				RelativePath=".\..\src\..\objs\langs\table\strings.h">
 			</File>
 			<File
 				RelativePath=".\..\src\table\town_land.h">
@@ -935,9 +932,6 @@
 			<File
 				RelativePath=".\..\src\table\tree_land.h">
 			</File>
-			<File
-				RelativePath=".\..\src\table\tunnel_land.h">
-			</File>
 			<File
 				RelativePath=".\..\src\table\unmovable_land.h">
 			</File>
@@ -970,6 +964,12 @@
 		<Filter
 			Name="Blitters"
 			Filter="">
+			<File
+				RelativePath=".\..\src\blitter\32bpp_anim.cpp">
+			</File>
+			<File
+				RelativePath=".\..\src\blitter\32bpp_anim.hpp">
+			</File>
 			<File
 				RelativePath=".\..\src\blitter\32bpp_base.cpp">
 			</File>
diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index 407232275e..f3129305a8 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -751,10 +751,6 @@
 				RelativePath=".\..\src\articulated_vehicles.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\autoreplace_cmd.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\aystar.h"
 				>
@@ -867,6 +863,10 @@
 				RelativePath=".\..\src\industry.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\landscape.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\livery.h"
 				>
@@ -1383,10 +1383,6 @@
 				RelativePath=".\..\src\table\ai_rail.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\table\allstrings.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\table\animcursors.h"
 				>
@@ -1452,7 +1448,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\strings.h"
+				RelativePath=".\..\src\..\objs\langs\table\strings.h"
 				>
 			</File>
 			<File
@@ -1471,10 +1467,6 @@
 				RelativePath=".\..\src\table\tree_land.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\table\tunnel_land.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\table\unmovable_land.h"
 				>
@@ -1515,6 +1507,14 @@
 		<Filter
 			Name="Blitters"
 			>
+			<File
+				RelativePath=".\..\src\blitter\32bpp_anim.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\blitter\32bpp_anim.hpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\blitter\32bpp_base.cpp"
 				>
diff --git a/source.list b/source.list
index 8dc549b7e1..6445d213bc 100644
--- a/source.list
+++ b/source.list
@@ -98,7 +98,6 @@ aircraft.h
 airport.h
 airport_movement.h
 articulated_vehicles.h
-autoreplace_cmd.h
 aystar.h
 bmp.h
 cargotype.h
@@ -127,6 +126,7 @@ hal.h
 heightmap.h
 helpers.hpp
 industry.h
+landscape.h
 livery.h
 macros.h
 map.h
@@ -259,7 +259,6 @@ water_cmd.cpp
 
 # Tables
 table/ai_rail.h
-table/allstrings.h
 table/animcursors.h
 table/autorail.h
 table/build_industry.h
@@ -276,12 +275,11 @@ table/road_land.h
 table/roadveh.h
 table/sprites.h
 table/station_land.h
-table/strings.h
+../objs/langs/table/strings.h
 table/town_land.h
 table/track_land.h
 table/train_cmd.h
 table/tree_land.h
-table/tunnel_land.h
 table/unmovable_land.h
 table/water_land.h