diff --git a/projects/generate b/projects/generate
index 477dcf5975..8414958853 100755
--- a/projects/generate
+++ b/projects/generate
@@ -111,8 +111,7 @@ load_lang_data() {
 		i=`basename $i | sed s/.txt$//g`
 		RES="$RES
 		<File
-			RelativePath=\"..\\src\\lang\\"$i".txt\"
-			>
+			RelativePath=\"..\\src\\lang\\"$i".txt\">
 			<FileConfiguration
 				Name=\"Debug|Win32\">
 				<Tool
@@ -120,8 +119,7 @@ load_lang_data() {
 					Description=\"Generating "$i" language file\"
 					CommandLine=\"..\\objs\\strgen\\strgen.exe -s ..\\src\\lang -d ..\\bin\\lang &quot;\$(InputPath)&quot;&#x0D;&#x0A;\"
 					AdditionalDependencies=\"\"
-					Outputs=\"..\\bin\\lang\\"$i".lng\"
-				/>
+					Outputs=\"..\\bin\\lang\\"$i".lng\"/>
 			</FileConfiguration>
 		</File>"
 	done
@@ -141,7 +139,15 @@ generate() {
 	' > \"$ROOT_DIR/projects/$2\"`"
 
 	# The files-list
-	echo "$1" >> "$ROOT_DIR/projects/$2"
+	if [ "$3" = "msvc2003" ]; then
+		echo "$1" | sed 's@\&#x0D;\&#x0A;@\n@' >> "$ROOT_DIR/projects/$2"
+	else
+		echo "$1" | sed '
+			s@Filter="">@>@;
+			s@^\([	]*\)\([^	<].*[^/]\)>$@\1\2\n\1>@g;
+			s@^	\([	]*\)\([^	<].*\)/>$@	\1\2\n\1/>@g;
+		' >> "$ROOT_DIR/projects/$2"
+	fi
 
 	# Everything below the !!FILES!! marker
 	RES="`cat \"$ROOT_DIR/projects/$2\".in | tr '\r' '\n' | awk '
@@ -158,7 +164,7 @@ generate() {
 load_main_data "$ROOT_DIR/source.list" openttd
 load_lang_data "$ROOT_DIR/src/lang/*.txt" lang
 
-generate "$openttd" "openttd.vcproj"
-generate "$openttd" "openttd_vs80.vcproj"
-generate "$lang" "langs_vs80.vcproj"
-generate "$lang" "langs.vcproj"
+generate "$openttd" "openttd.vcproj"      "msvc2003"
+generate "$openttd" "openttd_vs80.vcproj" "msvc2005"
+generate "$lang" "langs.vcproj"           "msvc2003"
+generate "$lang" "langs_vs80.vcproj"      "msvc2005"
diff --git a/projects/langs.vcproj b/projects/langs.vcproj
index aa904a95a5..add665e781 100644
--- a/projects/langs.vcproj
+++ b/projects/langs.vcproj
@@ -39,493 +39,458 @@
 	<Files>
 
 		<File
-			RelativePath="..\src\lang\american.txt"
-			>
+			RelativePath="..\src\lang\american.txt">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating american language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\american.lng"
-				/>
+					Outputs="..\bin\lang\american.lng"/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\brazilian_portuguese.txt"
-			>
+			RelativePath="..\src\lang\brazilian_portuguese.txt">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating brazilian_portuguese language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\brazilian_portuguese.lng"
-				/>
+					Outputs="..\bin\lang\brazilian_portuguese.lng"/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\bulgarian.txt"
-			>
+			RelativePath="..\src\lang\bulgarian.txt">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating bulgarian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\bulgarian.lng"
-				/>
+					Outputs="..\bin\lang\bulgarian.lng"/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\catalan.txt"
-			>
+			RelativePath="..\src\lang\catalan.txt">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating catalan language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\catalan.lng"
-				/>
+					Outputs="..\bin\lang\catalan.lng"/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\czech.txt"
-			>
+			RelativePath="..\src\lang\czech.txt">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating czech language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\czech.lng"
-				/>
+					Outputs="..\bin\lang\czech.lng"/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\danish.txt"
-			>
+			RelativePath="..\src\lang\danish.txt">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating danish language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\danish.lng"
-				/>
+					Outputs="..\bin\lang\danish.lng"/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\dutch.txt"
-			>
+			RelativePath="..\src\lang\dutch.txt">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating dutch language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\dutch.lng"
-				/>
+					Outputs="..\bin\lang\dutch.lng"/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\english.txt"
-			>
+			RelativePath="..\src\lang\english.txt">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating english language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\english.lng"
-				/>
+					Outputs="..\bin\lang\english.lng"/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\esperanto.txt"
-			>
+			RelativePath="..\src\lang\esperanto.txt">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating esperanto language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\esperanto.lng"
-				/>
+					Outputs="..\bin\lang\esperanto.lng"/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\estonian.txt"
-			>
+			RelativePath="..\src\lang\estonian.txt">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating estonian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\estonian.lng"
-				/>
+					Outputs="..\bin\lang\estonian.lng"/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\finnish.txt"
-			>
+			RelativePath="..\src\lang\finnish.txt">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating finnish language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\finnish.lng"
-				/>
+					Outputs="..\bin\lang\finnish.lng"/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\french.txt"
-			>
+			RelativePath="..\src\lang\french.txt">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating french language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\french.lng"
-				/>
+					Outputs="..\bin\lang\french.lng"/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\galician.txt"
-			>
+			RelativePath="..\src\lang\galician.txt">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating galician language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\galician.lng"
-				/>
+					Outputs="..\bin\lang\galician.lng"/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\german.txt"
-			>
+			RelativePath="..\src\lang\german.txt">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating german language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\german.lng"
-				/>
+					Outputs="..\bin\lang\german.lng"/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\hungarian.txt"
-			>
+			RelativePath="..\src\lang\hungarian.txt">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating hungarian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\hungarian.lng"
-				/>
+					Outputs="..\bin\lang\hungarian.lng"/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\icelandic.txt"
-			>
+			RelativePath="..\src\lang\icelandic.txt">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating icelandic language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\icelandic.lng"
-				/>
+					Outputs="..\bin\lang\icelandic.lng"/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\italian.txt"
-			>
+			RelativePath="..\src\lang\italian.txt">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating italian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\italian.lng"
-				/>
+					Outputs="..\bin\lang\italian.lng"/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\japanese.txt"
-			>
+			RelativePath="..\src\lang\japanese.txt">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating japanese language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\japanese.lng"
-				/>
+					Outputs="..\bin\lang\japanese.lng"/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\korean.txt"
-			>
+			RelativePath="..\src\lang\korean.txt">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating korean language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\korean.lng"
-				/>
+					Outputs="..\bin\lang\korean.lng"/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\lithuanian.txt"
-			>
+			RelativePath="..\src\lang\lithuanian.txt">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating lithuanian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\lithuanian.lng"
-				/>
+					Outputs="..\bin\lang\lithuanian.lng"/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\norwegian_bokmal.txt"
-			>
+			RelativePath="..\src\lang\norwegian_bokmal.txt">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating norwegian_bokmal language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\norwegian_bokmal.lng"
-				/>
+					Outputs="..\bin\lang\norwegian_bokmal.lng"/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\norwegian_nynorsk.txt"
-			>
+			RelativePath="..\src\lang\norwegian_nynorsk.txt">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating norwegian_nynorsk language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\norwegian_nynorsk.lng"
-				/>
+					Outputs="..\bin\lang\norwegian_nynorsk.lng"/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\origveh.txt"
-			>
+			RelativePath="..\src\lang\origveh.txt">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating origveh language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\origveh.lng"
-				/>
+					Outputs="..\bin\lang\origveh.lng"/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\polish.txt"
-			>
+			RelativePath="..\src\lang\polish.txt">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating polish language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\polish.lng"
-				/>
+					Outputs="..\bin\lang\polish.lng"/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\portuguese.txt"
-			>
+			RelativePath="..\src\lang\portuguese.txt">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating portuguese language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\portuguese.lng"
-				/>
+					Outputs="..\bin\lang\portuguese.lng"/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\romanian.txt"
-			>
+			RelativePath="..\src\lang\romanian.txt">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating romanian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\romanian.lng"
-				/>
+					Outputs="..\bin\lang\romanian.lng"/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\russian.txt"
-			>
+			RelativePath="..\src\lang\russian.txt">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating russian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\russian.lng"
-				/>
+					Outputs="..\bin\lang\russian.lng"/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\simplified_chinese.txt"
-			>
+			RelativePath="..\src\lang\simplified_chinese.txt">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating simplified_chinese language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\simplified_chinese.lng"
-				/>
+					Outputs="..\bin\lang\simplified_chinese.lng"/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\slovak.txt"
-			>
+			RelativePath="..\src\lang\slovak.txt">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating slovak language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\slovak.lng"
-				/>
+					Outputs="..\bin\lang\slovak.lng"/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\slovenian.txt"
-			>
+			RelativePath="..\src\lang\slovenian.txt">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating slovenian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\slovenian.lng"
-				/>
+					Outputs="..\bin\lang\slovenian.lng"/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\spanish.txt"
-			>
+			RelativePath="..\src\lang\spanish.txt">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating spanish language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\spanish.lng"
-				/>
+					Outputs="..\bin\lang\spanish.lng"/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\swedish.txt"
-			>
+			RelativePath="..\src\lang\swedish.txt">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating swedish language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\swedish.lng"
-				/>
+					Outputs="..\bin\lang\swedish.lng"/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\traditional_chinese.txt"
-			>
+			RelativePath="..\src\lang\traditional_chinese.txt">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating traditional_chinese language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\traditional_chinese.lng"
-				/>
+					Outputs="..\bin\lang\traditional_chinese.lng"/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\turkish.txt"
-			>
+			RelativePath="..\src\lang\turkish.txt">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating turkish language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\turkish.lng"
-				/>
+					Outputs="..\bin\lang\turkish.lng"/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\lang\ukrainian.txt"
-			>
+			RelativePath="..\src\lang\ukrainian.txt">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating ukrainian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;
+"
 					AdditionalDependencies=""
-					Outputs="..\bin\lang\ukrainian.lng"
-				/>
+					Outputs="..\bin\lang\ukrainian.lng"/>
 			</FileConfiguration>
 		</File>
 	</Files>
diff --git a/projects/langs_vs80.vcproj b/projects/langs_vs80.vcproj
index bce41c1498..6e80741eb8 100644
--- a/projects/langs_vs80.vcproj
+++ b/projects/langs_vs80.vcproj
@@ -24,6 +24,11 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				Description="Generating strings.h"
+				CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\objs\langs\table"
+			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
@@ -35,11 +40,6 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
-			<Tool
-				Name="VCPreBuildEventTool"
-				Description="Generating strings.h"
-				CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\objs\langs\table"
-			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -50,7 +50,8 @@
 			RelativePath="..\src\lang\american.txt"
 			>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating american language file"
@@ -64,7 +65,8 @@
 			RelativePath="..\src\lang\brazilian_portuguese.txt"
 			>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating brazilian_portuguese language file"
@@ -78,7 +80,8 @@
 			RelativePath="..\src\lang\bulgarian.txt"
 			>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating bulgarian language file"
@@ -92,7 +95,8 @@
 			RelativePath="..\src\lang\catalan.txt"
 			>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating catalan language file"
@@ -106,7 +110,8 @@
 			RelativePath="..\src\lang\czech.txt"
 			>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating czech language file"
@@ -120,7 +125,8 @@
 			RelativePath="..\src\lang\danish.txt"
 			>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating danish language file"
@@ -134,7 +140,8 @@
 			RelativePath="..\src\lang\dutch.txt"
 			>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating dutch language file"
@@ -148,7 +155,8 @@
 			RelativePath="..\src\lang\english.txt"
 			>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating english language file"
@@ -162,7 +170,8 @@
 			RelativePath="..\src\lang\esperanto.txt"
 			>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating esperanto language file"
@@ -176,7 +185,8 @@
 			RelativePath="..\src\lang\estonian.txt"
 			>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating estonian language file"
@@ -190,7 +200,8 @@
 			RelativePath="..\src\lang\finnish.txt"
 			>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating finnish language file"
@@ -204,7 +215,8 @@
 			RelativePath="..\src\lang\french.txt"
 			>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating french language file"
@@ -218,7 +230,8 @@
 			RelativePath="..\src\lang\galician.txt"
 			>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating galician language file"
@@ -232,7 +245,8 @@
 			RelativePath="..\src\lang\german.txt"
 			>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating german language file"
@@ -246,7 +260,8 @@
 			RelativePath="..\src\lang\hungarian.txt"
 			>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating hungarian language file"
@@ -260,7 +275,8 @@
 			RelativePath="..\src\lang\icelandic.txt"
 			>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating icelandic language file"
@@ -274,7 +290,8 @@
 			RelativePath="..\src\lang\italian.txt"
 			>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating italian language file"
@@ -288,7 +305,8 @@
 			RelativePath="..\src\lang\japanese.txt"
 			>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating japanese language file"
@@ -302,7 +320,8 @@
 			RelativePath="..\src\lang\korean.txt"
 			>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating korean language file"
@@ -316,7 +335,8 @@
 			RelativePath="..\src\lang\lithuanian.txt"
 			>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating lithuanian language file"
@@ -330,7 +350,8 @@
 			RelativePath="..\src\lang\norwegian_bokmal.txt"
 			>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating norwegian_bokmal language file"
@@ -344,7 +365,8 @@
 			RelativePath="..\src\lang\norwegian_nynorsk.txt"
 			>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating norwegian_nynorsk language file"
@@ -358,7 +380,8 @@
 			RelativePath="..\src\lang\origveh.txt"
 			>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating origveh language file"
@@ -372,7 +395,8 @@
 			RelativePath="..\src\lang\polish.txt"
 			>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating polish language file"
@@ -386,7 +410,8 @@
 			RelativePath="..\src\lang\portuguese.txt"
 			>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating portuguese language file"
@@ -400,7 +425,8 @@
 			RelativePath="..\src\lang\romanian.txt"
 			>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating romanian language file"
@@ -414,7 +440,8 @@
 			RelativePath="..\src\lang\russian.txt"
 			>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating russian language file"
@@ -428,7 +455,8 @@
 			RelativePath="..\src\lang\simplified_chinese.txt"
 			>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating simplified_chinese language file"
@@ -442,7 +470,8 @@
 			RelativePath="..\src\lang\slovak.txt"
 			>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating slovak language file"
@@ -456,7 +485,8 @@
 			RelativePath="..\src\lang\slovenian.txt"
 			>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating slovenian language file"
@@ -470,7 +500,8 @@
 			RelativePath="..\src\lang\spanish.txt"
 			>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating spanish language file"
@@ -484,7 +515,8 @@
 			RelativePath="..\src\lang\swedish.txt"
 			>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating swedish language file"
@@ -498,7 +530,8 @@
 			RelativePath="..\src\lang\traditional_chinese.txt"
 			>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating traditional_chinese language file"
@@ -512,7 +545,8 @@
 			RelativePath="..\src\lang\turkish.txt"
 			>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating turkish language file"
@@ -526,7 +560,8 @@
 			RelativePath="..\src\lang\ukrainian.txt"
 			>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating ukrainian language file"
diff --git a/projects/langs_vs80.vcproj.in b/projects/langs_vs80.vcproj.in
index 8cbc5467a4..4bace433a8 100644
--- a/projects/langs_vs80.vcproj.in
+++ b/projects/langs_vs80.vcproj.in
@@ -24,6 +24,11 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				Description="Generating strings.h"
+				CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\objs\langs\table"
+			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
@@ -35,11 +40,6 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
-			<Tool
-				Name="VCPreBuildEventTool"
-				Description="Generating strings.h"
-				CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\objs\langs\table"
-			/>
 		</Configuration>
 	</Configurations>
 	<References>
diff --git a/projects/openttd.sln b/projects/openttd.sln
index 2efed0a99b..81e7bd6a36 100644
--- a/projects/openttd.sln
+++ b/projects/openttd.sln
@@ -19,17 +19,15 @@ Global
 		Debug = Debug
 		Release = Release
 	EndGlobalSection
-	GlobalSection(ProjectDependencies) = postSolution
-	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
-		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug.ActiveCfg = Release|Win32
-		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug.Build.0 = Release|Win32
-		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release.ActiveCfg = Release|Win32
-		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release.Build.0 = Release|Win32
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Debug.ActiveCfg = Debug|Win32
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Debug.Build.0 = Debug|Win32
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Release.ActiveCfg = Release|Win32
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Release.Build.0 = Release|Win32
+		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug.ActiveCfg = Release|Win32
+		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug.Build.0 = Release|Win32
+		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release.ActiveCfg = Release|Win32
+		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release.Build.0 = Release|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug.ActiveCfg = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug.Build.0 = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release.ActiveCfg = Debug|Win32
diff --git a/projects/openttd.vcproj b/projects/openttd.vcproj
index c4ad8b602a..995936cc79 100644
--- a/projects/openttd.vcproj
+++ b/projects/openttd.vcproj
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="openttd"
-	RootNameSpace="openttd"
+	RootNamespace="openttd"
 	SccProjectName=""
 	SccLocalPath="">
 	<Platforms>
@@ -262,18 +262,6 @@
 			<File
 				RelativePath=".\..\src\namegen.cpp">
 			</File>
-			<File
-				RelativePath=".\..\src\network\core\core.cpp">
-			</File>
-			<File
-				RelativePath=".\..\src\network\core\packet.cpp">
-			</File>
-			<File
-				RelativePath=".\..\src\network\core\tcp.cpp">
-			</File>
-			<File
-				RelativePath=".\..\src\network\core\udp.cpp">
-			</File>
 			<File
 				RelativePath=".\..\src\network\network.cpp">
 			</File>
@@ -437,15 +425,15 @@
 			<File
 				RelativePath=".\..\src\engine.h">
 			</File>
-			<File
-				RelativePath=".\..\src\fontcache.h">
-			</File>
 			<File
 				RelativePath=".\..\src\fileio.h">
 			</File>
 			<File
 				RelativePath=".\..\src\fios.h">
 			</File>
+			<File
+				RelativePath=".\..\src\fontcache.h">
+			</File>
 			<File
 				RelativePath=".\..\src\functions.h">
 			</File>
@@ -491,27 +479,6 @@
 			<File
 				RelativePath=".\..\src\music.h">
 			</File>
-			<File
-				RelativePath=".\..\src\network\core\config.h">
-			</File>
-			<File
-				RelativePath=".\..\src\network\core\core.h">
-			</File>
-			<File
-				RelativePath=".\..\src\network\core\game.h">
-			</File>
-			<File
-				RelativePath=".\..\src\network\core\os_abstraction.h">
-			</File>
-			<File
-				RelativePath=".\..\src\network\core\packet.h">
-			</File>
-			<File
-				RelativePath=".\..\src\network\core\tcp.h">
-			</File>
-			<File
-				RelativePath=".\..\src\network\core\udp.h">
-			</File>
 			<File
 				RelativePath=".\..\src\network\network.h">
 			</File>
@@ -925,10 +892,10 @@
 				RelativePath=".\..\src\ai\ai.cpp">
 			</File>
 			<File
-				RelativePath=".\..\src\ai\default\default.cpp">
+				RelativePath=".\..\src\ai\trolly\build.cpp">
 			</File>
 			<File
-				RelativePath=".\..\src\ai\trolly\build.cpp">
+				RelativePath=".\..\src\ai\default\default.cpp">
 			</File>
 			<File
 				RelativePath=".\..\src\ai\trolly\pathfinder.cpp">
@@ -1051,6 +1018,43 @@
 				RelativePath=".\..\src\misc\hashtable.hpp">
 			</File>
 		</Filter>
+		<Filter
+			Name="Network Core"
+			Filter="">
+			<File
+				RelativePath=".\..\src\network\core\config.h">
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\core.cpp">
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\core.h">
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\game.h">
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\os_abstraction.h">
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\packet.cpp">
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\packet.h">
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\tcp.cpp">
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\tcp.h">
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\udp.cpp">
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\udp.h">
+			</File>
+		</Filter>
 		<Filter
 			Name="YAPF"
 			Filter="">
diff --git a/projects/openttd.vcproj.in b/projects/openttd.vcproj.in
index 6a38fdeb48..ab6c2a2ca7 100644
--- a/projects/openttd.vcproj.in
+++ b/projects/openttd.vcproj.in
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="openttd"
-	RootNameSpace="openttd"
+	RootNamespace="openttd"
 	SccProjectName=""
 	SccLocalPath="">
 	<Platforms>
diff --git a/projects/openttd_vs80.sln b/projects/openttd_vs80.sln
index 2b3f180f41..2eae8e5f61 100644
--- a/projects/openttd_vs80.sln
+++ b/projects/openttd_vs80.sln
@@ -21,14 +21,6 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|Win32.Build.0 = Debug|Win32
-		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|x64.ActiveCfg = Debug|Win32
-		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|x64.Build.0 = Debug|Win32
-		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|Win32.ActiveCfg = Debug|Win32
-		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|Win32.Build.0 = Debug|Win32
-		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|x64.ActiveCfg = Debug|Win32
-		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|x64.Build.0 = Debug|Win32
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|Win32.Build.0 = Debug|Win32
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|x64.ActiveCfg = Debug|x64
@@ -37,6 +29,14 @@ Global
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Release|Win32.Build.0 = Release|Win32
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Release|x64.ActiveCfg = Release|x64
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Release|x64.Build.0 = Release|x64
+		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|Win32.Build.0 = Debug|Win32
+		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|x64.ActiveCfg = Debug|Win32
+		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|x64.Build.0 = Debug|Win32
+		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|Win32.ActiveCfg = Debug|Win32
+		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|Win32.Build.0 = Debug|Win32
+		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|x64.ActiveCfg = Debug|Win32
+		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|x64.Build.0 = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|Win32.Build.0 = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|x64.ActiveCfg = Debug|Win32
diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index 33de811c83..151c800dc7 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -442,1002 +442,1322 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="">
+			>
 			<File
-				RelativePath=".\..\src\airport.cpp">
+				RelativePath=".\..\src\airport.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\aystar.cpp">
+				RelativePath=".\..\src\aystar.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\bmp.cpp">
+				RelativePath=".\..\src\bmp.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\callback_table.cpp">
+				RelativePath=".\..\src\callback_table.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\cargotype.cpp">
+				RelativePath=".\..\src\cargotype.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\command.cpp">
+				RelativePath=".\..\src\command.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\console.cpp">
+				RelativePath=".\..\src\console.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\console_cmds.cpp">
+				RelativePath=".\..\src\console_cmds.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\currency.cpp">
+				RelativePath=".\..\src\currency.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\date.cpp">
+				RelativePath=".\..\src\date.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\debug.cpp">
+				RelativePath=".\..\src\debug.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\dedicated.cpp">
+				RelativePath=".\..\src\dedicated.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\depot.cpp">
+				RelativePath=".\..\src\depot.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\driver.cpp">
+				RelativePath=".\..\src\driver.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\economy.cpp">
+				RelativePath=".\..\src\economy.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\elrail.cpp">
+				RelativePath=".\..\src\elrail.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\engine.cpp">
+				RelativePath=".\..\src\engine.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\fileio.cpp">
+				RelativePath=".\..\src\fileio.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\fios.cpp">
+				RelativePath=".\..\src\fios.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\fontcache.cpp">
+				RelativePath=".\..\src\fontcache.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\genworld.cpp">
+				RelativePath=".\..\src\genworld.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\gfx.cpp">
+				RelativePath=".\..\src\gfx.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\gfxinit.cpp">
+				RelativePath=".\..\src\gfxinit.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\heightmap.cpp">
+				RelativePath=".\..\src\heightmap.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\helpers.cpp">
+				RelativePath=".\..\src\helpers.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\landscape.cpp">
+				RelativePath=".\..\src\landscape.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\map.cpp">
+				RelativePath=".\..\src\map.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\md5.cpp">
+				RelativePath=".\..\src\md5.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\mersenne.cpp">
+				RelativePath=".\..\src\mersenne.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\minilzo.cpp">
+				RelativePath=".\..\src\minilzo.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\misc.cpp">
+				RelativePath=".\..\src\misc.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\mixer.cpp">
+				RelativePath=".\..\src\mixer.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\music.cpp">
+				RelativePath=".\..\src\music.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\namegen.cpp">
+				RelativePath=".\..\src\namegen.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\network\core\core.cpp">
+				RelativePath=".\..\src\network\network.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\network\core\packet.cpp">
+				RelativePath=".\..\src\network\network_client.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\network\core\tcp.cpp">
+				RelativePath=".\..\src\network\network_data.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\network\core\udp.cpp">
+				RelativePath=".\..\src\network\network_gamelist.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\network\network.cpp">
+				RelativePath=".\..\src\network\network_server.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\network\network_client.cpp">
+				RelativePath=".\..\src\network\network_udp.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\network\network_data.cpp">
+				RelativePath=".\..\src\npf.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\network\network_gamelist.cpp">
+				RelativePath=".\..\src\oldloader.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\network\network_server.cpp">
+				RelativePath=".\..\src\oldpool.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\network\network_udp.cpp">
+				RelativePath=".\..\src\openttd.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\npf.cpp">
+				RelativePath=".\..\src\os_timer.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\oldloader.cpp">
+				RelativePath=".\..\src\ottdres.rc"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\oldpool.cpp">
+				RelativePath=".\..\src\pathfind.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\openttd.cpp">
+				RelativePath=".\..\src\players.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\os_timer.cpp">
+				RelativePath=".\..\src\queue.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\ottdres.rc">
+				RelativePath=".\..\src\rail.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\pathfind.cpp">
+				RelativePath=".\..\src\saveload.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\players.cpp">
+				RelativePath=".\..\src\screenshot.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\queue.cpp">
+				RelativePath=".\..\src\sdl.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\rail.cpp">
+				RelativePath=".\..\src\settings.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\saveload.cpp">
+				RelativePath=".\..\src\signs.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\screenshot.cpp">
+				RelativePath=".\..\src\sound.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\sdl.cpp">
+				RelativePath=".\..\src\spritecache.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\settings.cpp">
+				RelativePath=".\..\src\station.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\signs.cpp">
+				RelativePath=".\..\src\string.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\sound.cpp">
+				RelativePath=".\..\src\strings.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\spritecache.cpp">
+				RelativePath=".\..\src\texteff.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\station.cpp">
+				RelativePath=".\..\src\tgp.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\string.cpp">
+				RelativePath=".\..\src\thread.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\strings.cpp">
+				RelativePath=".\..\src\tile.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\texteff.cpp">
+				RelativePath=".\..\src\vehicle.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\tgp.cpp">
+				RelativePath=".\..\src\viewport.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\thread.cpp">
+				RelativePath=".\..\src\waypoint.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\tile.cpp">
+				RelativePath=".\..\src\widget.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\vehicle.cpp">
+				RelativePath=".\..\src\win32.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\viewport.cpp">
-			</File>
-			<File
-				RelativePath=".\..\src\waypoint.cpp">
-			</File>
-			<File
-				RelativePath=".\..\src\widget.cpp">
-			</File>
-			<File
-				RelativePath=".\..\src\win32.cpp">
-			</File>
-			<File
-				RelativePath=".\..\src\window.cpp">
+				RelativePath=".\..\src\window.cpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="">
+			>
 			<File
-				RelativePath=".\..\src\aircraft.h">
+				RelativePath=".\..\src\aircraft.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\airport.h">
+				RelativePath=".\..\src\airport.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\airport_movement.h">
+				RelativePath=".\..\src\airport_movement.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\aystar.h">
+				RelativePath=".\..\src\aystar.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\bmp.h">
+				RelativePath=".\..\src\bmp.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\cargotype.h">
+				RelativePath=".\..\src\cargotype.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\command.h">
+				RelativePath=".\..\src\command.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\console.h">
+				RelativePath=".\..\src\console.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\currency.h">
+				RelativePath=".\..\src\currency.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\date.h">
+				RelativePath=".\..\src\date.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\debug.h">
+				RelativePath=".\..\src\debug.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\video\dedicated_v.h">
+				RelativePath=".\..\src\video\dedicated_v.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\depot.h">
+				RelativePath=".\..\src\depot.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\music\dmusic.h">
+				RelativePath=".\..\src\music\dmusic.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\driver.h">
+				RelativePath=".\..\src\driver.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\economy.h">
+				RelativePath=".\..\src\economy.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\engine.h">
+				RelativePath=".\..\src\engine.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\fontcache.h">
+				RelativePath=".\..\src\fileio.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\fileio.h">
+				RelativePath=".\..\src\fios.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\fios.h">
+				RelativePath=".\..\src\fontcache.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\functions.h">
+				RelativePath=".\..\src\functions.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\genworld.h">
+				RelativePath=".\..\src\genworld.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\gfx.h">
+				RelativePath=".\..\src\gfx.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\gfxinit.h">
+				RelativePath=".\..\src\gfxinit.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\gui.h">
+				RelativePath=".\..\src\gui.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\hal.h">
+				RelativePath=".\..\src\hal.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\heightmap.h">
+				RelativePath=".\..\src\heightmap.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\helpers.hpp">
+				RelativePath=".\..\src\helpers.hpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\industry.h">
+				RelativePath=".\..\src\industry.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\livery.h">
+				RelativePath=".\..\src\livery.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\macros.h">
+				RelativePath=".\..\src\macros.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\map.h">
+				RelativePath=".\..\src\map.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\md5.h">
+				RelativePath=".\..\src\md5.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\mixer.h">
+				RelativePath=".\..\src\mixer.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\music.h">
+				RelativePath=".\..\src\music.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\network\core\config.h">
+				RelativePath=".\..\src\network\network.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\network\core\core.h">
+				RelativePath=".\..\src\network\network_client.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\network\core\game.h">
+				RelativePath=".\..\src\network\network_data.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\network\core\os_abstraction.h">
+				RelativePath=".\..\src\network\network_gamelist.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\network\core\packet.h">
+				RelativePath=".\..\src\network\network_gui.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\network\core\tcp.h">
+				RelativePath=".\..\src\network\network_server.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\network\core\udp.h">
+				RelativePath=".\..\src\network\network_udp.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\network\network.h">
+				RelativePath=".\..\src\newgrf.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\network\network_client.h">
+				RelativePath=".\..\src\newgrf_callbacks.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\network\network_data.h">
+				RelativePath=".\..\src\newgrf_cargo.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\network\network_gamelist.h">
+				RelativePath=".\..\src\newgrf_config.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\network\network_gui.h">
+				RelativePath=".\..\src\newgrf_engine.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\network\network_server.h">
+				RelativePath=".\..\src\newgrf_sound.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\network\network_udp.h">
+				RelativePath=".\..\src\newgrf_spritegroup.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\newgrf.h">
+				RelativePath=".\..\src\newgrf_station.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\newgrf_callbacks.h">
+				RelativePath=".\..\src\newgrf_text.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\newgrf_cargo.h">
+				RelativePath=".\..\src\news.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\newgrf_config.h">
+				RelativePath=".\..\src\npf.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\newgrf_engine.h">
+				RelativePath=".\..\src\music\null_m.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\newgrf_sound.h">
+				RelativePath=".\..\src\sound\null_s.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\newgrf_spritegroup.h">
+				RelativePath=".\..\src\video\null_v.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\newgrf_station.h">
+				RelativePath=".\..\src\oldpool.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\newgrf_text.h">
+				RelativePath=".\..\src\openttd.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\news.h">
+				RelativePath=".\..\src\pathfind.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\npf.h">
+				RelativePath=".\..\src\player.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\music\null_m.h">
+				RelativePath=".\..\src\queue.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\sound\null_s.h">
+				RelativePath=".\..\src\rail.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\video\null_v.h">
+				RelativePath=".\..\src\road_cmd.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\oldpool.h">
+				RelativePath=".\..\src\saveload.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\openttd.h">
+				RelativePath=".\..\src\screenshot.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\pathfind.h">
+				RelativePath=".\..\src\sound\sdl_s.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\player.h">
+				RelativePath=".\..\src\video\sdl_v.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\queue.h">
+				RelativePath=".\..\src\settings.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\rail.h">
+				RelativePath=".\..\src\signs.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\road_cmd.h">
+				RelativePath=".\..\src\slope.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\saveload.h">
+				RelativePath=".\..\src\sound.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\screenshot.h">
+				RelativePath=".\..\src\sprite.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\sound\sdl_s.h">
+				RelativePath=".\..\src\station.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\video\sdl_v.h">
+				RelativePath=".\..\src\stdafx.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\settings.h">
+				RelativePath=".\..\src\string.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\signs.h">
+				RelativePath=".\..\src\tgp.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\slope.h">
+				RelativePath=".\..\src\thread.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\sound.h">
+				RelativePath=".\..\src\tile.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\sprite.h">
+				RelativePath=".\..\src\town.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\station.h">
+				RelativePath=".\..\src\train.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\stdafx.h">
+				RelativePath=".\..\src\variables.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\string.h">
+				RelativePath=".\..\src\vehicle.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\tgp.h">
+				RelativePath=".\..\src\vehicle_gui.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\thread.h">
+				RelativePath=".\..\src\viewport.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\tile.h">
+				RelativePath=".\..\src\waypoint.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\town.h">
+				RelativePath=".\..\src\music\win32_m.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\train.h">
+				RelativePath=".\..\src\sound\win32_s.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\variables.h">
+				RelativePath=".\..\src\video\win32_v.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\vehicle.h">
-			</File>
-			<File
-				RelativePath=".\..\src\vehicle_gui.h">
-			</File>
-			<File
-				RelativePath=".\..\src\viewport.h">
-			</File>
-			<File
-				RelativePath=".\..\src\waypoint.h">
-			</File>
-			<File
-				RelativePath=".\..\src\music\win32_m.h">
-			</File>
-			<File
-				RelativePath=".\..\src\sound\win32_s.h">
-			</File>
-			<File
-				RelativePath=".\..\src\video\win32_v.h">
-			</File>
-			<File
-				RelativePath=".\..\src\window.h">
+				RelativePath=".\..\src\window.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="GUI Source Code"
-			Filter="">
+			>
 			<File
-				RelativePath=".\..\src\aircraft_gui.cpp">
+				RelativePath=".\..\src\aircraft_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\airport_gui.cpp">
+				RelativePath=".\..\src\airport_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\autoreplace_gui.cpp">
+				RelativePath=".\..\src\autoreplace_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\bridge_gui.cpp">
+				RelativePath=".\..\src\bridge_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\build_vehicle_gui.cpp">
+				RelativePath=".\..\src\build_vehicle_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\depot_gui.cpp">
+				RelativePath=".\..\src\depot_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\dock_gui.cpp">
+				RelativePath=".\..\src\dock_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\engine_gui.cpp">
+				RelativePath=".\..\src\engine_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\genworld_gui.cpp">
+				RelativePath=".\..\src\genworld_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\graph_gui.cpp">
+				RelativePath=".\..\src\graph_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\industry_gui.cpp">
+				RelativePath=".\..\src\industry_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\intro_gui.cpp">
+				RelativePath=".\..\src\intro_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\main_gui.cpp">
+				RelativePath=".\..\src\main_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\misc_gui.cpp">
+				RelativePath=".\..\src\misc_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\music_gui.cpp">
+				RelativePath=".\..\src\music_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\network\network_gui.cpp">
+				RelativePath=".\..\src\network\network_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\newgrf_gui.cpp">
+				RelativePath=".\..\src\newgrf_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\news_gui.cpp">
+				RelativePath=".\..\src\news_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\order_gui.cpp">
+				RelativePath=".\..\src\order_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\player_gui.cpp">
+				RelativePath=".\..\src\player_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\rail_gui.cpp">
+				RelativePath=".\..\src\rail_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\road_gui.cpp">
+				RelativePath=".\..\src\road_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\roadveh_gui.cpp">
+				RelativePath=".\..\src\roadveh_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\settings_gui.cpp">
+				RelativePath=".\..\src\settings_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\ship_gui.cpp">
+				RelativePath=".\..\src\ship_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\signs_gui.cpp">
+				RelativePath=".\..\src\signs_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\smallmap_gui.cpp">
+				RelativePath=".\..\src\smallmap_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\station_gui.cpp">
+				RelativePath=".\..\src\station_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\subsidy_gui.cpp">
+				RelativePath=".\..\src\subsidy_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\terraform_gui.cpp">
+				RelativePath=".\..\src\terraform_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\town_gui.cpp">
+				RelativePath=".\..\src\town_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\train_gui.cpp">
+				RelativePath=".\..\src\train_gui.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\vehicle_gui.cpp">
+				RelativePath=".\..\src\vehicle_gui.cpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Landscape"
-			Filter="">
+			>
 			<File
-				RelativePath=".\..\src\aircraft_cmd.cpp">
+				RelativePath=".\..\src\aircraft_cmd.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\clear_cmd.cpp">
+				RelativePath=".\..\src\clear_cmd.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\disaster_cmd.cpp">
+				RelativePath=".\..\src\disaster_cmd.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\dummy_land.cpp">
+				RelativePath=".\..\src\dummy_land.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\industry_cmd.cpp">
+				RelativePath=".\..\src\industry_cmd.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\misc_cmd.cpp">
+				RelativePath=".\..\src\misc_cmd.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\order_cmd.cpp">
+				RelativePath=".\..\src\order_cmd.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\rail_cmd.cpp">
+				RelativePath=".\..\src\rail_cmd.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\road_cmd.cpp">
+				RelativePath=".\..\src\road_cmd.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\roadveh_cmd.cpp">
+				RelativePath=".\..\src\roadveh_cmd.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\ship_cmd.cpp">
+				RelativePath=".\..\src\ship_cmd.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\station_cmd.cpp">
+				RelativePath=".\..\src\station_cmd.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\town_cmd.cpp">
+				RelativePath=".\..\src\town_cmd.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\train_cmd.cpp">
+				RelativePath=".\..\src\train_cmd.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\tree_cmd.cpp">
+				RelativePath=".\..\src\tree_cmd.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\tunnelbridge_cmd.cpp">
+				RelativePath=".\..\src\tunnelbridge_cmd.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\unmovable_cmd.cpp">
+				RelativePath=".\..\src\unmovable_cmd.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\water_cmd.cpp">
+				RelativePath=".\..\src\water_cmd.cpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Tables"
-			Filter="">
+			>
 			<File
-				RelativePath=".\..\src\table\ai_rail.h">
+				RelativePath=".\..\src\table\ai_rail.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\allstrings.h">
+				RelativePath=".\..\src\table\allstrings.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\animcursors.h">
+				RelativePath=".\..\src\table\animcursors.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\autorail.h">
+				RelativePath=".\..\src\table\autorail.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\build_industry.h">
+				RelativePath=".\..\src\table\build_industry.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\cargo_const.h">
+				RelativePath=".\..\src\table\cargo_const.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\clear_land.h">
+				RelativePath=".\..\src\table\clear_land.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\elrail_data.h">
+				RelativePath=".\..\src\table\elrail_data.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\engines.h">
+				RelativePath=".\..\src\table\engines.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\genland.h">
+				RelativePath=".\..\src\table\genland.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\industry_land.h">
+				RelativePath=".\..\src\table\industry_land.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\landscape_sprite.h">
+				RelativePath=".\..\src\table\landscape_sprite.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\namegen.h">
+				RelativePath=".\..\src\table\namegen.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\palettes.h">
+				RelativePath=".\..\src\table\palettes.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\road_land.h">
+				RelativePath=".\..\src\table\road_land.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\roadveh.h">
+				RelativePath=".\..\src\table\roadveh.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\sprites.h">
+				RelativePath=".\..\src\table\sprites.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\station_land.h">
+				RelativePath=".\..\src\table\station_land.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\strings.h">
+				RelativePath=".\..\src\table\strings.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\town_land.h">
+				RelativePath=".\..\src\table\town_land.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\track_land.h">
+				RelativePath=".\..\src\table\track_land.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\train_cmd.h">
+				RelativePath=".\..\src\table\train_cmd.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\tree_land.h">
+				RelativePath=".\..\src\table\tree_land.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\tunnel_land.h">
+				RelativePath=".\..\src\table\tunnel_land.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\unmovable_land.h">
+				RelativePath=".\..\src\table\unmovable_land.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\water_land.h">
+				RelativePath=".\..\src\table\water_land.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="AI Files"
-			Filter="">
+			>
 			<File
-				RelativePath=".\..\src\ai\ai.cpp">
+				RelativePath=".\..\src\ai\ai.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\ai\default\default.cpp">
+				RelativePath=".\..\src\ai\trolly\build.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\ai\trolly\build.cpp">
+				RelativePath=".\..\src\ai\default\default.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\ai\trolly\pathfinder.cpp">
+				RelativePath=".\..\src\ai\trolly\pathfinder.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\ai\trolly\shared.cpp">
+				RelativePath=".\..\src\ai\trolly\shared.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\ai\trolly\trolly.cpp">
+				RelativePath=".\..\src\ai\trolly\trolly.cpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="NewGRF"
-			Filter="">
+			>
 			<File
-				RelativePath=".\..\src\newgrf.cpp">
+				RelativePath=".\..\src\newgrf.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\newgrf_cargo.cpp">
+				RelativePath=".\..\src\newgrf_cargo.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\newgrf_config.cpp">
+				RelativePath=".\..\src\newgrf_config.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\newgrf_engine.cpp">
+				RelativePath=".\..\src\newgrf_engine.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\newgrf_sound.cpp">
+				RelativePath=".\..\src\newgrf_sound.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\newgrf_spritegroup.cpp">
+				RelativePath=".\..\src\newgrf_spritegroup.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\newgrf_station.cpp">
+				RelativePath=".\..\src\newgrf_station.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\newgrf_text.cpp">
+				RelativePath=".\..\src\newgrf_text.cpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Map Accessors"
-			Filter="">
+			>
 			<File
-				RelativePath=".\..\src\bridge_map.cpp">
+				RelativePath=".\..\src\bridge_map.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\bridge_map.h">
+				RelativePath=".\..\src\bridge_map.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\clear_map.h">
+				RelativePath=".\..\src\clear_map.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\industry_map.h">
+				RelativePath=".\..\src\industry_map.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\rail_map.h">
+				RelativePath=".\..\src\rail_map.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\road_map.cpp">
+				RelativePath=".\..\src\road_map.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\road_map.h">
+				RelativePath=".\..\src\road_map.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\station_map.cpp">
+				RelativePath=".\..\src\station_map.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\station_map.h">
+				RelativePath=".\..\src\station_map.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\town_map.h">
+				RelativePath=".\..\src\town_map.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\tree_map.h">
+				RelativePath=".\..\src\tree_map.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\tunnel_map.cpp">
+				RelativePath=".\..\src\tunnel_map.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\tunnel_map.h">
+				RelativePath=".\..\src\tunnel_map.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\unmovable_map.h">
+				RelativePath=".\..\src\unmovable_map.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\void_map.h">
+				RelativePath=".\..\src\void_map.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\water_map.h">
+				RelativePath=".\..\src\water_map.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Misc"
-			Filter="">
+			>
 			<File
-				RelativePath=".\..\src\misc\array.hpp">
+				RelativePath=".\..\src\misc\array.hpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\misc\autocopyptr.hpp">
+				RelativePath=".\..\src\misc\autocopyptr.hpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\misc\autoptr.hpp">
+				RelativePath=".\..\src\misc\autoptr.hpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\misc\binaryheap.hpp">
+				RelativePath=".\..\src\misc\binaryheap.hpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\misc\blob.hpp">
+				RelativePath=".\..\src\misc\blob.hpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\misc\countedptr.hpp">
+				RelativePath=".\..\src\misc\countedptr.hpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\misc\crc32.hpp">
+				RelativePath=".\..\src\misc\crc32.hpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\misc\fixedsizearray.hpp">
+				RelativePath=".\..\src\misc\fixedsizearray.hpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\misc\hashtable.hpp">
+				RelativePath=".\..\src\misc\hashtable.hpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Network Core"
+			>
+			<File
+				RelativePath=".\..\src\network\core\config.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\core.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\core.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\game.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\os_abstraction.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\packet.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\packet.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\tcp.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\tcp.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\udp.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\udp.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="YAPF"
-			Filter="">
+			>
 			<File
-				RelativePath=".\..\src\yapf\follow_track.cpp">
+				RelativePath=".\..\src\yapf\follow_track.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\follow_track.hpp">
+				RelativePath=".\..\src\yapf\follow_track.hpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\nodelist.hpp">
+				RelativePath=".\..\src\yapf\nodelist.hpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\track_dir.hpp">
+				RelativePath=".\..\src\yapf\track_dir.hpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\yapf.h">
+				RelativePath=".\..\src\yapf\yapf.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\yapf.hpp">
+				RelativePath=".\..\src\yapf\yapf.hpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\yapf_base.hpp">
+				RelativePath=".\..\src\yapf\yapf_base.hpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\yapf_common.cpp">
+				RelativePath=".\..\src\yapf\yapf_common.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\yapf_common.hpp">
+				RelativePath=".\..\src\yapf\yapf_common.hpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\yapf_costbase.hpp">
+				RelativePath=".\..\src\yapf\yapf_costbase.hpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\yapf_costcache.hpp">
+				RelativePath=".\..\src\yapf\yapf_costcache.hpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\yapf_costrail.hpp">
+				RelativePath=".\..\src\yapf\yapf_costrail.hpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\yapf_destrail.hpp">
+				RelativePath=".\..\src\yapf\yapf_destrail.hpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\yapf_node.hpp">
+				RelativePath=".\..\src\yapf\yapf_node.hpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\yapf_node_rail.hpp">
+				RelativePath=".\..\src\yapf\yapf_node_rail.hpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\yapf_node_road.hpp">
+				RelativePath=".\..\src\yapf\yapf_node_road.hpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\yapf_rail.cpp">
+				RelativePath=".\..\src\yapf\yapf_rail.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\yapf_road.cpp">
+				RelativePath=".\..\src\yapf\yapf_road.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\yapf_settings.h">
+				RelativePath=".\..\src\yapf\yapf_settings.h"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\yapf\yapf_ship.cpp">
+				RelativePath=".\..\src\yapf\yapf_ship.cpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Video"
-			Filter="">
+			>
 			<File
-				RelativePath=".\..\src\video\dedicated_v.cpp">
+				RelativePath=".\..\src\video\dedicated_v.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\video\null_v.cpp">
+				RelativePath=".\..\src\video\null_v.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\video\sdl_v.cpp">
+				RelativePath=".\..\src\video\sdl_v.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\video\win32_v.cpp">
+				RelativePath=".\..\src\video\win32_v.cpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Music"
-			Filter="">
+			>
 			<File
-				RelativePath=".\..\src\music\dmusic.cpp">
+				RelativePath=".\..\src\music\dmusic.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\music\null_m.cpp">
+				RelativePath=".\..\src\music\null_m.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\music\win32_m.cpp">
+				RelativePath=".\..\src\music\win32_m.cpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Sound"
-			Filter="">
+			>
 			<File
-				RelativePath=".\..\src\sound\null_s.cpp">
+				RelativePath=".\..\src\sound\null_s.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\sound\sdl_s.cpp">
+				RelativePath=".\..\src\sound\sdl_s.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\..\src\sound\win32_s.cpp">
+				RelativePath=".\..\src\sound\win32_s.cpp"
+				>
 			</File>
 		</Filter>
 		<Filter
@@ -1484,13 +1804,16 @@
 			</File>
 		</Filter>
 		<File
-			RelativePath=".\..\media\mainicon.ico">
+			RelativePath=".\..\media\mainicon.ico"
+			>
 		</File>
 		<File
-			RelativePath=".\..\media\openttd.ico">
+			RelativePath=".\..\media\openttd.ico"
+			>
 		</File>
 		<File
-			RelativePath=".\..\readme.txt">
+			RelativePath=".\..\readme.txt"
+			>
 		</File>
 	</Files>
 	<Globals>
diff --git a/projects/openttd_vs80.vcproj.in b/projects/openttd_vs80.vcproj.in
index 7ec0f03b9b..4796e09ce4 100644
--- a/projects/openttd_vs80.vcproj.in
+++ b/projects/openttd_vs80.vcproj.in
@@ -485,13 +485,16 @@
 			</File>
 		</Filter>
 		<File
-			RelativePath=".\..\media\mainicon.ico">
+			RelativePath=".\..\media\mainicon.ico"
+			>
 		</File>
 		<File
-			RelativePath=".\..\media\openttd.ico">
+			RelativePath=".\..\media\openttd.ico"
+			>
 		</File>
 		<File
-			RelativePath=".\..\readme.txt">
+			RelativePath=".\..\readme.txt"
+			>
 		</File>
 	</Files>
 	<Globals>
diff --git a/projects/strgen_vs80.vcproj b/projects/strgen_vs80.vcproj
index f55b810e79..caefd85077 100644
--- a/projects/strgen_vs80.vcproj
+++ b/projects/strgen_vs80.vcproj
@@ -44,7 +44,6 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="1"
-				GlobalOptimizations="TRUE"
 				FavorSizeOrSpeed="2"
 				PreprocessorDefinitions="STRGEN;WIN32;_DEBUG;_CONSOLE"
 				BasicRuntimeChecks="0"
@@ -121,12 +120,14 @@
 				RelativePath="..\src\string.cpp"
 				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-				</File>
+						ObjectFile="$(IntDir)/$(InputName)1.obj"
+					/>
+				</FileConfiguration>
+			</File>
 		</Filter>
 		<File
 			RelativePath="..\src\macros.h"
diff --git a/source.list b/source.list
index b4e4b2c6f1..571b5fc3cc 100644
--- a/source.list
+++ b/source.list
@@ -33,10 +33,6 @@ misc.cpp
 mixer.cpp
 music.cpp
 namegen.cpp
-network/core/core.cpp
-network/core/packet.cpp
-network/core/tcp.cpp
-network/core/udp.cpp
 network/network.cpp
 network/network_client.cpp
 network/network_data.cpp
@@ -113,9 +109,9 @@ music/dmusic.h
 driver.h
 economy.h
 engine.h
-fontcache.h
 fileio.h
 fios.h
+fontcache.h
 functions.h
 genworld.h
 gfx.h
@@ -131,13 +127,6 @@ map.h
 md5.h
 mixer.h
 music.h
-network/core/config.h
-network/core/core.h
-network/core/game.h
-network/core/os_abstraction.h
-network/core/packet.h
-network/core/tcp.h
-network/core/udp.h
 network/network.h
 network/network_client.h
 network/network_data.h
@@ -278,8 +267,8 @@ table/water_land.h
 
 # AI Files
 ai/ai.cpp
-ai/default/default.cpp
 ai/trolly/build.cpp
+ai/default/default.cpp
 ai/trolly/pathfinder.cpp
 ai/trolly/shared.cpp
 ai/trolly/trolly.cpp
@@ -323,6 +312,19 @@ misc/crc32.hpp
 misc/fixedsizearray.hpp
 misc/hashtable.hpp
 
+# Network Core
+network/core/config.h
+network/core/core.cpp
+network/core/core.h
+network/core/game.h
+network/core/os_abstraction.h
+network/core/packet.cpp
+network/core/packet.h
+network/core/tcp.cpp
+network/core/tcp.h
+network/core/udp.cpp
+network/core/udp.h
+
 # YAPF
 yapf/follow_track.cpp
 yapf/follow_track.hpp