diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index ce52d627da..58414e67e0 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -783,6 +783,22 @@
 				RelativePath=".\..\src\articulated_vehicles.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\autoreplace_base.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\autoreplace_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\autoreplace_gui.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\autoreplace_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\autoslope.h"
 				>
@@ -795,6 +811,18 @@
 				RelativePath=".\..\src\bmp.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\bridge.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\callback_table.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\cargo_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\cargopacket.h"
 				>
@@ -803,6 +831,18 @@
 				RelativePath=".\..\src\cargotype.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\cmd_helper.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\command_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\command_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\console.h"
 				>
@@ -823,6 +863,14 @@
 				RelativePath=".\..\src\currency.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\date_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\date_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\debug.h"
 				>
@@ -835,6 +883,14 @@
 				RelativePath=".\..\src\depot.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\direction_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\direction_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\music\dmusic.h"
 				>
@@ -843,6 +899,14 @@
 				RelativePath=".\..\src\driver.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\economy_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\economy_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\engine.h"
 				>
@@ -867,6 +931,14 @@
 				RelativePath=".\..\src\genworld.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\gfx_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\gfx_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\gfxinit.h"
 				>
@@ -875,6 +947,10 @@
 				RelativePath=".\..\src\group.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\group_gui.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\gui.h"
 				>
@@ -887,6 +963,10 @@
 				RelativePath=".\..\src\industry.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\industry_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\landscape.h"
 				>
@@ -1031,14 +1111,34 @@
 				RelativePath=".\..\src\openttd.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\order.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\pathfind.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\player_base.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\player_face.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\player_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\player_gui.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\player_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\queue.h"
 				>
@@ -1047,10 +1147,38 @@
 				RelativePath=".\..\src\rail.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\rail_gui.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\rail_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\road_cmd.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\road_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\road_gui.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\road_internal.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\road_type.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\roadveh.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\saveload.h"
 				>
@@ -1068,13 +1196,45 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\signs.h"
+				RelativePath=".\..\src\settings_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\settings_internal.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\settings_type.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\ship.h"
 				>
 			</File>
 			<File
 				RelativePath=".\..\src\signal_func.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\signs.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\slope_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\slope_type.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\sound_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\sound_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\sprite.h"
 				>
@@ -1095,6 +1255,30 @@
 				RelativePath=".\..\src\stdafx.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\string_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\string_type.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\strings_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\strings_type.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\terraform_gui.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\textbuf_gui.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\texteff.hpp"
 				>
@@ -1107,6 +1291,14 @@
 				RelativePath=".\..\src\thread.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\tile_cmd.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\tile_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\timetable.h"
 				>
@@ -1115,6 +1307,18 @@
 				RelativePath=".\..\src\town.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\town_type.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\track_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\track_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\train.h"
 				>
@@ -1131,18 +1335,46 @@
 				RelativePath=".\..\src\tunnelbridge.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\unmovable.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\variables.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\vehicle_base.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\vehicle_func.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\vehicle_gui.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\vehicle_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\waypoint.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\window_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\window_gui.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\window_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\music\win32_m.h"
 				>
@@ -1163,6 +1395,14 @@
 				RelativePath=".\..\src\widgets\dropdown_func.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\zoom_type.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\zoom_func.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="GUI Source Code"
diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj
index 2ba7615179..a6c167989a 100644
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -780,6 +780,22 @@
 				RelativePath=".\..\src\articulated_vehicles.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\autoreplace_base.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\autoreplace_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\autoreplace_gui.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\autoreplace_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\autoslope.h"
 				>
@@ -792,6 +808,18 @@
 				RelativePath=".\..\src\bmp.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\bridge.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\callback_table.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\cargo_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\cargopacket.h"
 				>
@@ -800,6 +828,18 @@
 				RelativePath=".\..\src\cargotype.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\cmd_helper.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\command_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\command_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\console.h"
 				>
@@ -820,6 +860,14 @@
 				RelativePath=".\..\src\currency.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\date_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\date_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\debug.h"
 				>
@@ -832,6 +880,14 @@
 				RelativePath=".\..\src\depot.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\direction_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\direction_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\music\dmusic.h"
 				>
@@ -840,6 +896,14 @@
 				RelativePath=".\..\src\driver.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\economy_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\economy_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\engine.h"
 				>
@@ -864,6 +928,14 @@
 				RelativePath=".\..\src\genworld.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\gfx_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\gfx_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\gfxinit.h"
 				>
@@ -872,6 +944,10 @@
 				RelativePath=".\..\src\group.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\group_gui.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\gui.h"
 				>
@@ -884,6 +960,10 @@
 				RelativePath=".\..\src\industry.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\industry_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\landscape.h"
 				>
@@ -1028,14 +1108,34 @@
 				RelativePath=".\..\src\openttd.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\order.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\pathfind.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\player_base.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\player_face.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\player_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\player_gui.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\player_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\queue.h"
 				>
@@ -1044,10 +1144,38 @@
 				RelativePath=".\..\src\rail.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\rail_gui.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\rail_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\road_cmd.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\road_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\road_gui.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\road_internal.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\road_type.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\roadveh.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\saveload.h"
 				>
@@ -1065,13 +1193,45 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\signs.h"
+				RelativePath=".\..\src\settings_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\settings_internal.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\settings_type.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\ship.h"
 				>
 			</File>
 			<File
 				RelativePath=".\..\src\signal_func.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\signs.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\slope_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\slope_type.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\sound_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\sound_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\sprite.h"
 				>
@@ -1092,6 +1252,30 @@
 				RelativePath=".\..\src\stdafx.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\string_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\string_type.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\strings_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\strings_type.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\terraform_gui.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\textbuf_gui.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\texteff.hpp"
 				>
@@ -1104,6 +1288,14 @@
 				RelativePath=".\..\src\thread.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\tile_cmd.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\tile_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\timetable.h"
 				>
@@ -1112,6 +1304,18 @@
 				RelativePath=".\..\src\town.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\town_type.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\track_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\track_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\train.h"
 				>
@@ -1128,18 +1332,46 @@
 				RelativePath=".\..\src\tunnelbridge.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\unmovable.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\variables.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\vehicle_base.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\vehicle_func.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\vehicle_gui.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\vehicle_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\waypoint.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\window_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\window_gui.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\window_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\music\win32_m.h"
 				>
@@ -1160,6 +1392,14 @@
 				RelativePath=".\..\src\widgets\dropdown_func.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\zoom_type.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\zoom_func.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="GUI Source Code"
diff --git a/source.list b/source.list
index 351471cf96..af71608d70 100644
--- a/source.list
+++ b/source.list
@@ -104,32 +104,52 @@ aircraft.h
 airport.h
 airport_movement.h
 articulated_vehicles.h
+autoreplace_base.h
+autoreplace_func.h
+autoreplace_gui.h
+autoreplace_type.h
 autoslope.h
 aystar.h
 bmp.h
+bridge.h
+callback_table.h
+cargo_type.h
 cargopacket.h
 cargotype.h
+cmd_helper.h
+command_func.h
+command_type.h
 console.h
 core/bitmath_func.hpp
 core/math_func.hpp
 core/random_func.hpp
 currency.h
+date_func.h
+date_type.h
 debug.h
 video/dedicated_v.h
 depot.h
+direction_func.h
+direction_type.h
 music/dmusic.h
 driver.h
+economy_func.h
+economy_type.h
 engine.h
 fileio.h
 fios.h
 fontcache.h
 functions.h
 genworld.h
+gfx_func.h
+gfx_type.h
 gfxinit.h
 group.h
+group_gui.h
 gui.h
 heightmap.h
 industry.h
+industry_type.h
 landscape.h
 livery.h
 md5.h
@@ -166,39 +186,79 @@ sound/null_s.h
 video/null_v.h
 oldpool.h
 openttd.h
+order.h
 pathfind.h
+player_base.h
 player_face.h
+player_func.h
+player_gui.h
+player_type.h
 queue.h
 rail.h
+rail_gui.h
+rail_type.h
 road_cmd.h
+road_func.h
+road_gui.h
+road_internal.h
+road_type.h
+roadveh.h
 saveload.h
 screenshot.h
 sound/sdl_s.h
 video/sdl_v.h
-signs.h
+settings_func.h
+settings_internal.h
+settings_type.h
+ship.h
 signal_func.h
+signs.h
+slope_func.h
+slope_type.h
+sound_func.h
+sound_type.h
 sprite.h
 spritecache.h
 station.h
 station_gui.h
 stdafx.h
+string_func.h
+string_type.h
+strings_func.h
+strings_type.h
+terraform_gui.h
+textbuf_gui.h
 texteff.hpp
 tgp.h
 thread.h
+tile_cmd.h
+tile_type.h
 timetable.h
 town.h
+town_type.h
+track_func.h
+track_type.h
 train.h
 transparency.h
 transparency_gui.h
 tunnelbridge.h
+unmovable.h
 variables.h
+vehicle_base.h
+vehicle_func.h
 vehicle_gui.h
+vehicle_type.h
 waypoint.h
+window_func.h
+window_gui.h
+window_type.h
 music/win32_m.h
 sound/win32_s.h
 video/win32_v.h
 widgets/dropdown_type.h
 widgets/dropdown_func.h
+zoom_type.h
+zoom_func.h
 
 # GUI Source Code
 aircraft_gui.cpp