diff --git a/projectfiles/VC9/wesnoth.vcproj b/projectfiles/VC9/wesnoth.vcproj
index 21e8bf15be6..d9dc433dd90 100644
--- a/projectfiles/VC9/wesnoth.vcproj
+++ b/projectfiles/VC9/wesnoth.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="wesnoth"
 	ProjectGUID="{65ACA13F-5F5C-4768-A89A-ECF6C16F1512}"
 	RootNamespace="wesnoth"
@@ -216,7 +216,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libintl.lib SDL.lib SDL_image.lib SDL_ttf.lib SDL_mixer.lib SDL_net.lib cairo.lib winmm.lib ws2_32.lib SDLmain.lib pango-1.0.lib pangocairo-1.0.lib gobject-2.0.lib glib-2.0.lib lua51.lib"
+				AdditionalDependencies="libintl.lib SDL.lib SDL_image.lib SDL_ttf.lib SDL_mixer.lib SDL_net.lib cairo.lib winmm.lib ws2_32.lib jpeg.lib libpng13.lib libogg.lib libvorbisfile.lib SDLmain.lib pango-1.0.lib pangocairo-1.0.lib gobject-2.0.lib glib-2.0.lib lua51.lib"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
@@ -988,34 +988,6 @@
 							/>
 						</FileConfiguration>
 					</File>
-					<File
-						RelativePath="..\..\src\gui\widgets\canvas.cpp"
-						>
-						<FileConfiguration
-							Name="Debug|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)\Gui\Widgets\"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)\Gui\Widgets\"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug (fast)|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)\Gui\Widgets\"
-							/>
-						</FileConfiguration>
-					</File>
 					<File
 						RelativePath="..\..\src\gui\widgets\container.cpp"
 						>
@@ -1636,34 +1608,6 @@
 							/>
 						</FileConfiguration>
 					</File>
-					<File
-						RelativePath="..\..\src\gui\widgets\window_builder.cpp"
-						>
-						<FileConfiguration
-							Name="Debug|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)\Gui\Widgets\"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)\Gui\Widgets\"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug (fast)|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)\Gui\Widgets\"
-							/>
-						</FileConfiguration>
-					</File>
 				</Filter>
 				<Filter
 					Name="Dialogs"
@@ -1924,6 +1868,10 @@
 				<Filter
 					Name="Auxiliary"
 					>
+					<File
+						RelativePath="..\..\src\gui\auxiliary\canvas.cpp"
+						>
+					</File>
 					<File
 						RelativePath="..\..\src\gui\auxiliary\log.cpp"
 						>
@@ -1952,6 +1900,10 @@
 							/>
 						</FileConfiguration>
 					</File>
+					<File
+						RelativePath="..\..\src\gui\auxiliary\window_builder.cpp"
+						>
+					</File>
 				</Filter>
 			</Filter>
 			<Filter
@@ -2710,7 +2662,7 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\storyscreen\page.cpp"
+					RelativePath="..\..\src\storyscreen\part.cpp"
 					>
 				</File>
 				<File
@@ -3455,10 +3407,30 @@
 				<Filter
 					Name="Auxiliary"
 					>
+					<File
+						RelativePath="..\..\src\gui\auxiliary\canvas.hpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\gui\auxiliary\formula.hpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\gui\auxiliary\layout_exception.hpp"
+						>
+					</File>
 					<File
 						RelativePath="..\..\src\gui\auxiliary\log.hpp"
 						>
 					</File>
+					<File
+						RelativePath="..\..\src\gui\auxiliary\window_builder.hpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\src\gui\auxiliary\window_builder_private.hpp"
+						>
+					</File>
 				</Filter>
 			</Filter>
 			<Filter
@@ -3529,7 +3501,7 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\storyscreen\page.hpp"
+					RelativePath="..\..\src\storyscreen\part.hpp"
 					>
 				</File>
 				<File