diff --git a/.gitignore b/.gitignore
index 8f7ce29016cd..df851e0d0c96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,7 +30,7 @@ INSTALL.vcproj
 PACKAGE.vcproj
 ZERO_CHECK.vcproj
 uninstall.vcproj
-*.vcproj.*.user
+projectfiles/VC*/*.user
 projectfiles/VC[12]*
 src/**/*.vcproj
 /WindowsTimeout.ilk
diff --git a/projectfiles/VC9/wesnoth.vcproj b/projectfiles/VC9/wesnoth.vcproj
index 9348d449f4b0..72c6d7cf73f0 100644
--- a/projectfiles/VC9/wesnoth.vcproj
+++ b/projectfiles/VC9/wesnoth.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
@@ -1664,7 +1664,7 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\ai\composite\engine_default.cpp"
+					RelativePath="..\..\src\ai\composite\goal.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -1716,11 +1716,15 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\src\ai\composite\engine_default.hpp"
+					RelativePath="..\..\src\ai\composite\goal.hpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\ai\composite\engine_fai.cpp"
+					RelativePath="..\..\src\ai\composite\property_handler.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\ai\composite\rca.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -1772,11 +1776,11 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\src\ai\composite\engine_fai.hpp"
+					RelativePath="..\..\src\ai\composite\rca.hpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\ai\composite\engine_lua.cpp"
+					RelativePath="..\..\src\ai\composite\stage.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -1828,18 +1832,26 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\src\ai\composite\engine_lua.hpp"
+					RelativePath="..\..\src\ai\composite\stage.hpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\ai\composite\goal.cpp"
+					RelativePath="..\..\src\ai\composite\value_translator.hpp"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="default"
+				>
+				<File
+					RelativePath="..\..\src\ai\default\aspect_attacks.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\composite\"
+							ObjectFile="$(IntDir)\ai\default\"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -1847,7 +1859,7 @@
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\composite\"
+							ObjectFile="$(IntDir)\ai\default\"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -1855,7 +1867,7 @@
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\composite\"
+							ObjectFile="$(IntDir)\ai\default\"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -1863,7 +1875,7 @@
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\composite\"
+							ObjectFile="$(IntDir)\ai\default\"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -1871,7 +1883,7 @@
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\composite\"
+							ObjectFile="$(IntDir)\ai\default\"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -1879,27 +1891,23 @@
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\composite\"
+							ObjectFile="$(IntDir)\ai\default\"
 						/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\src\ai\composite\goal.hpp"
+					RelativePath="..\..\src\ai\default\aspect_attacks.hpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\ai\composite\property_handler.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\ai\composite\rca.cpp"
+					RelativePath="..\..\src\ai\default\attack.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\composite\"
+							ObjectFile="$(IntDir)\ai\default\"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -1907,7 +1915,7 @@
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\composite\"
+							ObjectFile="$(IntDir)\ai\default\"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -1915,7 +1923,7 @@
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\composite\"
+							ObjectFile="$(IntDir)\ai\default\"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -1923,7 +1931,7 @@
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\composite\"
+							ObjectFile="$(IntDir)\ai\default\"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -1931,7 +1939,7 @@
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\composite\"
+							ObjectFile="$(IntDir)\ai\default\"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -1939,23 +1947,19 @@
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\composite\"
+							ObjectFile="$(IntDir)\ai\default\"
 						/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\src\ai\composite\rca.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\ai\composite\stage.cpp"
+					RelativePath="..\..\src\ai\default\ca.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\composite\"
+							ObjectFile="$(IntDir)\ai\default\"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -1963,7 +1967,7 @@
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\composite\"
+							ObjectFile="$(IntDir)\ai\default\"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -1971,7 +1975,7 @@
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\composite\"
+							ObjectFile="$(IntDir)\ai\default\"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -1979,7 +1983,7 @@
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\composite\"
+							ObjectFile="$(IntDir)\ai\default\"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -1987,7 +1991,7 @@
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\composite\"
+							ObjectFile="$(IntDir)\ai\default\"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -1995,24 +1999,16 @@
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\composite\"
+							ObjectFile="$(IntDir)\ai\default\"
 						/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\src\ai\composite\stage.hpp"
+					RelativePath="..\..\src\ai\default\ca.hpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\ai\composite\value_translator.hpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="default"
-				>
-				<File
-					RelativePath="..\..\src\ai\default\attack.cpp"
+					RelativePath="..\..\src\ai\default\contexts.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -2064,7 +2060,11 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\src\ai\default\contexts.cpp"
+					RelativePath="..\..\src\ai\default\contexts.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\ai\default\engine_cpp.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -2116,22 +2116,18 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\src\ai\default\contexts.hpp"
+					RelativePath="..\..\src\ai\default\engine_cpp.hpp"
 					>
 				</File>
-			</Filter>
-			<Filter
-				Name="testing"
-				>
 				<File
-					RelativePath="..\..\src\ai\testing\aspect_attacks.cpp"
+					RelativePath="..\..\src\ai\default\recruitment.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\testing\"
+							ObjectFile="$(IntDir)\ai\default\"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -2139,7 +2135,7 @@
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\testing\"
+							ObjectFile="$(IntDir)\ai\default\"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -2147,7 +2143,7 @@
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\testing\"
+							ObjectFile="$(IntDir)\ai\default\"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -2155,7 +2151,7 @@
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\testing\"
+							ObjectFile="$(IntDir)\ai\default\"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -2163,7 +2159,7 @@
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\testing\"
+							ObjectFile="$(IntDir)\ai\default\"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -2171,23 +2167,23 @@
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\testing\"
+							ObjectFile="$(IntDir)\ai\default\"
 						/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\src\ai\testing\aspect_attacks.hpp"
+					RelativePath="..\..\src\ai\default\recruitment.hpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\ai\testing\ca.cpp"
+					RelativePath="..\..\src\ai\default\stage_rca.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\testing\"
+							ObjectFile="$(IntDir)\ai\default\"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -2195,7 +2191,7 @@
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\testing\"
+							ObjectFile="$(IntDir)\ai\default\"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -2203,7 +2199,7 @@
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\testing\"
+							ObjectFile="$(IntDir)\ai\default\"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -2211,7 +2207,7 @@
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\testing\"
+							ObjectFile="$(IntDir)\ai\default\"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -2219,7 +2215,7 @@
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\testing\"
+							ObjectFile="$(IntDir)\ai\default\"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -2227,14 +2223,18 @@
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\testing\"
+							ObjectFile="$(IntDir)\ai\default\"
 						/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\src\ai\testing\ca.hpp"
+					RelativePath="..\..\src\ai\default\stage_rca.hpp"
 					>
 				</File>
+			</Filter>
+			<Filter
+				Name="testing"
+				>
 				<File
 					RelativePath="..\..\src\ai\testing\ca_testing_move_to_targets.cpp"
 					>
@@ -2348,7 +2348,7 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\ai\testing\stage_rca.cpp"
+					RelativePath="..\..\src\ai\testing\stage_sf_with_rca.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -2400,18 +2400,22 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\src\ai\testing\stage_rca.hpp"
+					RelativePath="..\..\src\ai\testing\stage_sf_with_rca.hpp"
 					>
 				</File>
+			</Filter>
+			<Filter
+				Name="formula"
+				>
 				<File
-					RelativePath="..\..\src\ai\testing\stage_sf_with_rca.cpp"
+					RelativePath="..\..\src\ai\formula\ai.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\testing\"
+							ObjectFile="$(IntDir)\ai\formula\"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -2419,7 +2423,7 @@
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\testing\"
+							ObjectFile="$(IntDir)\ai\formula\"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -2427,7 +2431,7 @@
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\testing\"
+							ObjectFile="$(IntDir)\ai\formula\"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -2435,7 +2439,7 @@
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\testing\"
+							ObjectFile="$(IntDir)\ai\formula\"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -2443,7 +2447,7 @@
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\testing\"
+							ObjectFile="$(IntDir)\ai\formula\"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -2451,20 +2455,16 @@
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\testing\"
+							ObjectFile="$(IntDir)\ai\formula\"
 						/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\src\ai\testing\stage_sf_with_rca.hpp"
+					RelativePath="..\..\src\ai\formula\ai.hpp"
 					>
 				</File>
-			</Filter>
-			<Filter
-				Name="formula"
-				>
 				<File
-					RelativePath="..\..\src\ai\formula\ai.cpp"
+					RelativePath="..\..\src\ai\formula\callable_objects.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -2516,11 +2516,11 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\src\ai\formula\ai.hpp"
+					RelativePath="..\..\src\ai\formula\callable_objects.hpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\ai\formula\callable_objects.cpp"
+					RelativePath="..\..\src\ai\formula\candidates.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -2572,11 +2572,11 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\src\ai\formula\callable_objects.hpp"
+					RelativePath="..\..\src\ai\formula\candidates.hpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\ai\formula\candidates.cpp"
+					RelativePath="..\..\src\ai\formula\engine_fai.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -2628,7 +2628,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\src\ai\formula\candidates.hpp"
+					RelativePath="..\..\src\ai\formula\engine_fai.hpp"
 					>
 				</File>
 				<File
@@ -2804,7 +2804,7 @@
 				Name="lua"
 				>
 				<File
-					RelativePath="..\..\src\ai\lua\core.cpp"
+					RelativePath="..\..\src\ai\lua\aspect_advancements.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -2856,11 +2856,11 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\src\ai\lua\core.hpp"
+					RelativePath="..\..\src\ai\lua\aspect_advancements.hpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\ai\lua\lua_object.cpp"
+					RelativePath="..\..\src\ai\lua\core.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -2912,11 +2912,11 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\src\ai\lua\lua_object.hpp"
+					RelativePath="..\..\src\ai\lua\core.hpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\ai\lua\unit_advancements_aspect.cpp"
+					RelativePath="..\..\src\ai\lua\engine_lua.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -2968,22 +2968,18 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\src\ai\lua\unit_advancements_aspect.hpp"
+					RelativePath="..\..\src\ai\lua\engine_lua.hpp"
 					>
 				</File>
-			</Filter>
-			<Filter
-				Name="recruitment"
-				>
 				<File
-					RelativePath="..\..\src\ai\recruitment\recruitment.cpp"
+					RelativePath="..\..\src\ai\lua\lua_object.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\recruitment\"
+							ObjectFile="$(IntDir)\ai\lua\"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -2991,7 +2987,7 @@
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\recruitment\"
+							ObjectFile="$(IntDir)\ai\lua\"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -2999,7 +2995,7 @@
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\recruitment\"
+							ObjectFile="$(IntDir)\ai\lua\"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -3007,7 +3003,7 @@
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\recruitment\"
+							ObjectFile="$(IntDir)\ai\lua\"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -3015,7 +3011,7 @@
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\recruitment\"
+							ObjectFile="$(IntDir)\ai\lua\"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
@@ -3023,12 +3019,12 @@
 						>
 						<Tool
 							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\ai\recruitment\"
+							ObjectFile="$(IntDir)\ai\lua\"
 						/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\src\ai\recruitment\recruitment.hpp"
+					RelativePath="..\..\src\ai\lua\lua_object.hpp"
 					>
 				</File>
 			</Filter>
diff --git a/projectfiles/VC9/wesnoth.vcproj.user b/projectfiles/VC9/wesnoth.vcproj.user
deleted file mode 100644
index 4a33a85ea40f..000000000000
--- a/projectfiles/VC9/wesnoth.vcproj.user
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioUserFile
-	ProjectType="Visual C++"
-	Version="9.00"
-	ShowAllFiles="false"
-	>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			>
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)..\..\"
-				Environment="OMP_WAIT_POLICY=PASSIVE"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			>
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)..\..\"
-				Environment="OMP_WAIT_POLICY=PASSIVE"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_with_VLD|Win32"
-			>
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)..\..\"
-				Environment="OMP_WAIT_POLICY=PASSIVE"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseDEBUG|Win32"
-			>
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)..\..\"
-				Environment="OMP_WAIT_POLICY=PASSIVE"
-			/>
-		</Configuration>
-	</Configurations>
-</VisualStudioUserFile>
diff --git a/projectfiles/VC9/wesnoth.vcxproj.user b/projectfiles/VC9/wesnoth.vcxproj.user
deleted file mode 100644
index 7cbf527059e2..000000000000
--- a/projectfiles/VC9/wesnoth.vcxproj.user
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LocalDebuggerWorkingDirectory>$(SolutionDir)..\..\</LocalDebuggerWorkingDirectory>
-    <LocalDebuggerEnvironment>OMP_WAIT_POLICY=PASSIVE</LocalDebuggerEnvironment>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">
-    <LocalDebuggerWorkingDirectory>$(SolutionDir)..\..\</LocalDebuggerWorkingDirectory>
-    <LocalDebuggerEnvironment>OMP_WAIT_POLICY=PASSIVE</LocalDebuggerEnvironment>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerWorkingDirectory>$(SolutionDir)..\..\</LocalDebuggerWorkingDirectory>
-    <LocalDebuggerEnvironment>OMP_WAIT_POLICY=PASSIVE</LocalDebuggerEnvironment>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_with_VLD|Win32'">
-    <LocalDebuggerWorkingDirectory>$(SolutionDir)..\..\</LocalDebuggerWorkingDirectory>
-    <LocalDebuggerEnvironment>OMP_WAIT_POLICY=PASSIVE</LocalDebuggerEnvironment>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/projectfiles/VC9/wesnothd.vcproj.user b/projectfiles/VC9/wesnothd.vcproj.user
deleted file mode 100644
index 59f62e386277..000000000000
--- a/projectfiles/VC9/wesnothd.vcproj.user
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioUserFile
-	ProjectType="Visual C++"
-	Version="9.00"
-	ShowAllFiles="false"
-	>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			>
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)..\..\"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			>
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)..\..\"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_with_VLD|Win32"
-			>
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)..\..\"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseDEBUG|Win32"
-			>
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)..\..\"
-			/>
-		</Configuration>
-	</Configurations>
-</VisualStudioUserFile>
diff --git a/projectfiles/VC9/wesnothd.vcxproj.user b/projectfiles/VC9/wesnothd.vcxproj.user
deleted file mode 100644
index 67b1b7ed2515..000000000000
--- a/projectfiles/VC9/wesnothd.vcxproj.user
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LocalDebuggerWorkingDirectory>$(SolutionDir)..\..\</LocalDebuggerWorkingDirectory>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">
-    <LocalDebuggerWorkingDirectory>$(SolutionDir)..\..\</LocalDebuggerWorkingDirectory>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerWorkingDirectory>$(SolutionDir)..\..\</LocalDebuggerWorkingDirectory>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_with_VLD|Win32'">
-    <LocalDebuggerWorkingDirectory>$(SolutionDir)..\..\</LocalDebuggerWorkingDirectory>
-  </PropertyGroup>
-</Project>
\ No newline at end of file