diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index 5cc3080297..48efeed1cd 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -771,6 +771,10 @@
 		<Filter
 			Name="Header Files"
 			>
+			<File
+				RelativePath=".\..\src\ai\ai.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\aircraft.h"
 				>
@@ -879,6 +883,10 @@
 				RelativePath=".\..\src\video\dedicated_v.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\ai\default\default.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\depot.h"
 				>
@@ -995,6 +1003,18 @@
 				RelativePath=".\..\src\livery.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\lzoconf.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\map_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\map_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\core\math_func.hpp"
 				>
@@ -1003,6 +1023,10 @@
 				RelativePath=".\..\src\md5.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\minilzo.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\mixer.h"
 				>
@@ -1011,6 +1035,10 @@
 				RelativePath=".\..\src\music.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\namegen_func.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\network\network.h"
 				>
@@ -1103,6 +1131,10 @@
 				RelativePath=".\..\src\newgrf_storage.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\newgrf_string_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\newgrf_text.h"
 				>
@@ -1116,7 +1148,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\news.h"
+				RelativePath=".\..\src\news_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\news_type.h"
 				>
 			</File>
 			<File
@@ -1227,6 +1263,10 @@
 				RelativePath=".\..\src\screenshot.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\sdl.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\sound\sdl_s.h"
 				>
@@ -1379,6 +1419,10 @@
 				RelativePath=".\..\src\transparency_gui.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\ai\trolly\trolly.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\tunnelbridge.h"
 				>
@@ -1407,6 +1451,14 @@
 				RelativePath=".\..\src\vehicle_type.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\viewport_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\viewport_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\waypoint.h"
 				>
@@ -1423,6 +1475,14 @@
 				RelativePath=".\..\src\video\win32_v.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\water.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\win32.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\window_func.h"
 				>
@@ -1703,6 +1763,10 @@
 				RelativePath=".\..\src\table\autorail.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\table\bridge_land.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\table\build_industry.h"
 				>
@@ -1715,6 +1779,10 @@
 				RelativePath=".\..\src\table\clear_land.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\table\control_codes.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\table\elrail_data.h"
 				>
@@ -1723,6 +1791,10 @@
 				RelativePath=".\..\src\table\engines.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\table\files.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\table\genland.h"
 				>
@@ -1743,6 +1815,10 @@
 				RelativePath=".\..\src\table\palettes.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\table\railtypes.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\table\road_land.h"
 				>
@@ -1779,6 +1855,10 @@
 				RelativePath=".\..\src\table\tree_land.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\table\unicode.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\table\unmovable_land.h"
 				>
diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj
index 3c0119af1a..c7edde6e8d 100644
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -768,6 +768,10 @@
 		<Filter
 			Name="Header Files"
 			>
+			<File
+				RelativePath=".\..\src\ai\ai.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\aircraft.h"
 				>
@@ -876,6 +880,10 @@
 				RelativePath=".\..\src\video\dedicated_v.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\ai\default\default.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\depot.h"
 				>
@@ -992,6 +1000,18 @@
 				RelativePath=".\..\src\livery.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\lzoconf.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\map_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\map_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\core\math_func.hpp"
 				>
@@ -1000,6 +1020,10 @@
 				RelativePath=".\..\src\md5.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\minilzo.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\mixer.h"
 				>
@@ -1008,6 +1032,10 @@
 				RelativePath=".\..\src\music.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\namegen_func.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\network\network.h"
 				>
@@ -1100,6 +1128,10 @@
 				RelativePath=".\..\src\newgrf_storage.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\newgrf_string_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\newgrf_text.h"
 				>
@@ -1113,7 +1145,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\news.h"
+				RelativePath=".\..\src\news_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\news_type.h"
 				>
 			</File>
 			<File
@@ -1224,6 +1260,10 @@
 				RelativePath=".\..\src\screenshot.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\sdl.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\sound\sdl_s.h"
 				>
@@ -1376,6 +1416,10 @@
 				RelativePath=".\..\src\transparency_gui.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\ai\trolly\trolly.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\tunnelbridge.h"
 				>
@@ -1404,6 +1448,14 @@
 				RelativePath=".\..\src\vehicle_type.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\viewport_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\viewport_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\waypoint.h"
 				>
@@ -1420,6 +1472,14 @@
 				RelativePath=".\..\src\video\win32_v.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\water.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\win32.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\window_func.h"
 				>
@@ -1700,6 +1760,10 @@
 				RelativePath=".\..\src\table\autorail.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\table\bridge_land.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\table\build_industry.h"
 				>
@@ -1712,6 +1776,10 @@
 				RelativePath=".\..\src\table\clear_land.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\table\control_codes.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\table\elrail_data.h"
 				>
@@ -1720,6 +1788,10 @@
 				RelativePath=".\..\src\table\engines.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\table\files.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\table\genland.h"
 				>
@@ -1740,6 +1812,10 @@
 				RelativePath=".\..\src\table\palettes.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\table\railtypes.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\table\road_land.h"
 				>
@@ -1776,6 +1852,10 @@
 				RelativePath=".\..\src\table\tree_land.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\table\unicode.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\table\unmovable_land.h"
 				>
diff --git a/source.list b/source.list
index 306550a1d1..805452390c 100644
--- a/source.list
+++ b/source.list
@@ -101,6 +101,7 @@ widget.cpp
 window.cpp
 
 # Header Files
+ai/ai.h
 aircraft.h
 airport.h
 airport_movement.h
@@ -128,6 +129,7 @@ date_func.h
 date_type.h
 debug.h
 video/dedicated_v.h
+ai/default/default.h
 depot.h
 direction_func.h
 direction_type.h
@@ -157,10 +159,15 @@ industry.h
 industry_type.h
 landscape.h
 livery.h
+lzoconf.h
+map_func.h
+map_type.h
 core/math_func.hpp
 md5.h
+minilzo.h
 mixer.h
 music.h
+namegen_func.h
 network/network.h
 network/network_client.h
 network/network_data.h
@@ -184,10 +191,12 @@ newgrf_sound.h
 newgrf_spritegroup.h
 newgrf_station.h
 newgrf_storage.h
+newgrf_string_type.h
 newgrf_text.h
 newgrf_town.h
 newgrf_townname.h
-news.h
+news_func.h
+news_type.h
 npf.h
 music/null_m.h
 sound/null_s.h
@@ -215,6 +224,7 @@ road_type.h
 roadveh.h
 saveload.h
 screenshot.h
+sdl.h
 sound/sdl_s.h
 video/sdl_v.h
 settings_func.h
@@ -253,6 +263,7 @@ track_type.h
 train.h
 transparency.h
 transparency_gui.h
+ai/trolly/trolly.h
 tunnelbridge.h
 unmovable.h
 variables.h
@@ -260,15 +271,33 @@ vehicle_base.h
 vehicle_func.h
 vehicle_gui.h
 vehicle_type.h
+viewport_func.h
+viewport_type.h
 waypoint.h
 music/win32_m.h
 sound/win32_s.h
 video/win32_v.h
+water.h
+win32.h
 window_func.h
 window_gui.h
 window_type.h
 zoom_func.h
 zoom_type.h
+#if WIN32
+#else
+music/bemidi.h
+music/extmidi.h
+music/libtimidity.h
+music/os2_m.h
+music/qtmidi.h
+os/macosx/macos.h
+os/macosx/osx_stdafx.h
+os/macosx/splash.h
+sound/cocoa_s.h
+video/cocoa/cocoa_keys.h
+video/cocoa/cocoa_v.h
+#end
 
 # GUI Source Code
 aircraft_gui.cpp
@@ -337,16 +366,20 @@ water_cmd.cpp
 table/ai_rail.h
 table/animcursors.h
 table/autorail.h
+table/bridge_land.h
 table/build_industry.h
 table/cargo_const.h
 table/clear_land.h
+table/control_codes.h
 table/elrail_data.h
 table/engines.h
+table/files.h
 table/genland.h
 table/industry_land.h
 table/landscape_sprite.h
 table/namegen.h
 table/palettes.h
+table/railtypes.h
 table/road_land.h
 table/roadveh_movement.h
 table/sprites.h
@@ -356,6 +389,7 @@ table/town_land.h
 table/track_land.h
 table/train_cmd.h
 table/tree_land.h
+table/unicode.h
 table/unmovable_land.h
 table/water_land.h