diff --git a/contrib/extractor/VC71_AD.sln b/contrib/extractor/VC71_AD.sln
deleted file mode 100644
index f914661b1..000000000
--- a/contrib/extractor/VC71_AD.sln
+++ /dev/null
@@ -1,19 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ad", "VC71_ad.vcproj", "{D7552D4F-408F-4F8E-859B-366659150CF4}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D7552D4F-408F-4F8E-859B-366659150CF4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D7552D4F-408F-4F8E-859B-366659150CF4}.Debug|Win32.Build.0 = Debug|Win32
-		{D7552D4F-408F-4F8E-859B-366659150CF4}.Release|Win32.ActiveCfg = Release|Win32
-		{D7552D4F-408F-4F8E-859B-366659150CF4}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/contrib/extractor/VC71_ad.vcproj b/contrib/extractor/VC71_ad.vcproj
deleted file mode 100644
index 541540cea..000000000
--- a/contrib/extractor/VC71_ad.vcproj
+++ /dev/null
@@ -1,324 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="ad"
-	ProjectGUID="{D7552D4F-408F-4F8E-859B-366659150CF4}"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="."
-			IntermediateDirectory=".\debug\"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="./ad.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="libmpq"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile="$(IntDir)ad.pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1049"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="zlib.lib"
-				OutputFile="ad debug.exe"
-				LinkIncremental="0"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="./debug/"
-				IgnoreDefaultLibraryNames="LIBCD.lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="./ad debug.pdb"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="."
-			IntermediateDirectory=".\release"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="./ad.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="libmpq"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile="$(IntDir)ad.pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1049"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="zlib.lib"
-				OutputFile="./ad.exe"
-				LinkIncremental="0"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="./release/"
-				IgnoreDefaultLibraryNames="LIBC.lib"
-				ProgramDatabaseFile="./ad.pdb"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath=".\loadlib\loadlib.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\loadlib\adt.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\loadlib\wdt.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\libmpq\common.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\dbcfile.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\libmpq\explode.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\libmpq\extract.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\libmpq\huffman.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\libmpq\mpq.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\mpq_libmpq.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\libmpq\parser.cpp"
-				>
-			</File>
-			<File
-				RelativePath="system.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="3"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\libmpq\wave.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath=".\libmpq\common.h"
-				>
-			</File>
-			<File
-				RelativePath=".\dbcfile.h"
-				>
-			</File>
-			<File
-				RelativePath=".\libmpq\explode.h"
-				>
-			</File>
-			<File
-				RelativePath=".\libmpq\huffman.h"
-				>
-			</File>
-			<File
-				RelativePath=".\libmpq\mpq.h"
-				>
-			</File>
-			<File
-				RelativePath=".\mpq_libmpq.h"
-				>
-			</File>
-			<File
-				RelativePath=".\libmpq\wave.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/contrib/extractor/VC80_ad.vcproj b/contrib/extractor/VC80_ad.vcproj
index a20ff016c..e31f4f68c 100644
--- a/contrib/extractor/VC80_ad.vcproj
+++ b/contrib/extractor/VC80_ad.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="ad"
 	ProjectGUID="{D7552D4F-408F-4F8E-859B-366659150CF4}"
 	RootNamespace="ad"
@@ -310,6 +310,10 @@
 				RelativePath=".\mpq_libmpq.h"
 				>
 			</File>
+			<File
+				RelativePath=".\loadlib\wdt.h"
+				>
+			</File>
 			<Filter
 				Name="libmpq"
 				>
@@ -325,6 +329,10 @@
 					RelativePath=".\libmpq\huffman.h"
 					>
 				</File>
+				<File
+					RelativePath=".\loadlib\loadlib.h"
+					>
+				</File>
 				<File
 					RelativePath=".\libmpq\mpq.h"
 					>
@@ -333,6 +341,10 @@
 					RelativePath=".\libmpq\wave.h"
 					>
 				</File>
+				<File
+					RelativePath=".\libmpq\wdt.h"
+					>
+				</File>
 				<File
 					RelativePath=".\libmpq\zconf.h"
 					>
diff --git a/contrib/extractor/VC90_ad.vcproj b/contrib/extractor/VC90_ad.vcproj
index 9a039a0fb..a485ee953 100644
--- a/contrib/extractor/VC90_ad.vcproj
+++ b/contrib/extractor/VC90_ad.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="ad"
 	ProjectGUID="{D7552D4F-408F-4F8E-859B-366659150CF4}"
 	RootNamespace="ad"
@@ -215,18 +215,10 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
-			<File
-				RelativePath=".\loadlib\loadlib.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\loadlib\adt.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\loadlib\wdt.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\libmpq\common.cpp"
 				>
@@ -247,6 +239,10 @@
 				RelativePath=".\libmpq\huffman.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\loadlib\loadlib.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\libmpq\mpq.cpp"
 				>
@@ -287,11 +283,19 @@
 				RelativePath=".\libmpq\wave.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\loadlib\wdt.cpp"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl"
 			>
+			<File
+				RelativePath=".\loadlib\adt.h"
+				>
+			</File>
 			<File
 				RelativePath=".\libmpq\common.h"
 				>
@@ -308,6 +312,10 @@
 				RelativePath=".\libmpq\huffman.h"
 				>
 			</File>
+			<File
+				RelativePath=".\loadlib\loadlib.h"
+				>
+			</File>
 			<File
 				RelativePath=".\libmpq\mpq.h"
 				>
@@ -320,6 +328,10 @@
 				RelativePath=".\libmpq\wave.h"
 				>
 			</File>
+			<File
+				RelativePath=".\loadlib\wdt.h"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 309ef0abe..65a4f25fe 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "8618"
+ #define REVISION_NR "8619"
 #endif // __REVISION_NR_H__