diff --git a/Misc/NEWS b/Misc/NEWS
index 198e266aeb0..1dd15d6cf25 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -160,6 +160,13 @@ Tools/Demos
 - Fix Misc/gdbinit so it works.
 
 
+Build
+-----
+
+- Issue #3791: Remove the bsddb module from the Windows installer, and the
+  core bsddb library from the Windows build files.
+
+
 What's new in Python 3.0b3?
 ===========================
 
diff --git a/PC/VS8.0/_bsddb44.vcproj b/PC/VS8.0/_bsddb44.vcproj
deleted file mode 100644
index b7bc5197727..00000000000
--- a/PC/VS8.0/_bsddb44.vcproj
+++ /dev/null
@@ -1,1252 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="_bsddb44"
-	ProjectGUID="{62172C7D-B39E-409A-B352-370FF5098C19}"
-	RootNamespace="_bsddb44"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets=".\pyd_d.vsprops"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32;..\..\..\db-4.4.20\build_win32\.."
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="4"
-			InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32;..\..\..\db-4.4.20\build_win32\.."
-				PreprocessorDefinitions="DIAGNOSTIC"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets=".\pyd.vsprops"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32;..\..\..\db-4.4.20\build_win32\.."
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="4"
-			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32;..\..\..\db-4.4.20\build_win32\.."
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="PGInstrument|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32;..\..\..\db-4.4.20\build_win32\.."
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="PGInstrument|x64"
-			ConfigurationType="4"
-			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32;..\..\..\db-4.4.20\build_win32\.."
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="PGUpdate|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32;..\..\..\db-4.4.20\build_win32\.."
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="PGUpdate|x64"
-			ConfigurationType="4"
-			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32;..\..\..\db-4.4.20\build_win32\.."
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_compact.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_compare.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_conv.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_curadj.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_cursor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_delete.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_method.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_open.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_put.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_rec.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_reclaim.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_recno.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_rsearch.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_search.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_split.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_stat.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_upgrade.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\bt_verify.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\btree\btree_auto.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\crdel_auto.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\crdel_rec.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\common\crypto_stub.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_am.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_auto.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\common\db_byteorder.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_cam.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\common\db_clock.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_conv.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_dispatch.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_dup.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\common\db_err.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\common\db_getlong.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\common\db_idspace.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_iface.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_join.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\common\db_log2.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_meta.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_method.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_open.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_overflow.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_ovfl_vrfy.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_pr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_rec.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_reclaim.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_remove.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_rename.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_ret.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\env\db_salloc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_setid.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_setlsn.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\env\db_shash.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_stati.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_truncate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_upg.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_upg_opd.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_vrfy.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\db\db_vrfyutil.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\dbm\dbm.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\dbreg\dbreg.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\dbreg\dbreg_auto.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\dbreg\dbreg_rec.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\dbreg\dbreg_stat.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\dbreg\dbreg_util.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\env\env_failchk.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\env\env_file.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\env\env_method.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\env\env_open.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\env\env_recover.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\env\env_region.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\env\env_register.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\env\env_stat.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\fileops\fileops_auto.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\fileops\fop_basic.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\fileops\fop_rec.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\fileops\fop_util.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_auto.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_conv.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_dup.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_func.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_meta.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_method.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_open.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_page.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_rec.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_reclaim.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_stat.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_upgrade.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\hash\hash_verify.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\hmac\hmac.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\hsearch\hsearch.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\lock\lock.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\lock\lock_deadlock.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\lock\lock_failchk.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\lock\lock_id.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\lock\lock_list.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\lock\lock_method.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\lock\lock_region.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\lock\lock_stat.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\lock\lock_timer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\lock\lock_util.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\log\log.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\log\log_archive.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\log\log_compare.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\log\log_debug.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\log\log_get.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\log\log_method.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\log\log_put.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\log\log_stat.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_alloc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_bh.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_fget.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_fmethod.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_fopen.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_fput.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_fset.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_method.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_region.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_register.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_stat.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_sync.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\mp\mp_trickle.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\mutex\mut_alloc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\mutex\mut_method.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\mutex\mut_region.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\mutex\mut_stat.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\mutex\mut_win32.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_abs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\os\os_alloc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_clock.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_config.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_dir.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_errno.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_fid.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_flock.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_fsync.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_handle.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\os\os_id.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_map.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\os\os_method.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\os\os_mkdir.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\os\os_oflags.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_open.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\os\os_region.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_rename.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\os\os_root.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\os\os_rpath.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_rw.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_seek.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_sleep.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_spin.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_stat.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\os\os_tmpdir.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_truncate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\os_win32\os_unlink.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\qam\qam.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\qam\qam_auto.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\qam\qam_conv.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\qam\qam_files.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\qam\qam_method.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\qam\qam_open.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\qam\qam_rec.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\qam\qam_stat.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\qam\qam_upgrade.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\qam\qam_verify.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\rep\rep_auto.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\rep\rep_backup.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\rep\rep_elect.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\rep\rep_log.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\rep\rep_method.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\rep\rep_record.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\rep\rep_region.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\rep\rep_stat.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\rep\rep_util.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\rep\rep_verify.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\sequence\seq_stat.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\sequence\sequence.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\hmac\sha1.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\clib\strcasecmp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\txn\txn.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\txn\txn_auto.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\txn\txn_chkpt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\txn\txn_failchk.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\txn\txn_method.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\txn\txn_rec.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\txn\txn_recover.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\txn\txn_region.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\txn\txn_stat.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\txn\txn_util.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\common\util_cache.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\common\util_log.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\common\util_sig.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\xa\xa.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\xa\xa_db.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\db-4.4.20\build_win32\..\xa\xa_map.c"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/PC/VS8.0/pcbuild.sln b/PC/VS8.0/pcbuild.sln
index 89c0cfa2b93..5d904b95f7f 100644
--- a/PC/VS8.0/pcbuild.sln
+++ b/PC/VS8.0/pcbuild.sln
@@ -114,11 +114,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj
 		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb44", "_bsddb44.vcproj", "{62172C7D-B39E-409A-B352-370FF5098C19}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}"
 	ProjectSection(ProjectDependencies) = postProject
 		{6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
@@ -487,22 +482,6 @@ Global
 		{447F05A8-F581-4CAC-A466-5AC7936E207E}.Release|Win32.Build.0 = Release|Win32
 		{447F05A8-F581-4CAC-A466-5AC7936E207E}.Release|x64.ActiveCfg = Release|x64
 		{447F05A8-F581-4CAC-A466-5AC7936E207E}.Release|x64.Build.0 = Release|x64
-		{62172C7D-B39E-409A-B352-370FF5098C19}.Debug|Win32.ActiveCfg = Debug|Win32
-		{62172C7D-B39E-409A-B352-370FF5098C19}.Debug|Win32.Build.0 = Debug|Win32
-		{62172C7D-B39E-409A-B352-370FF5098C19}.Debug|x64.ActiveCfg = Debug|x64
-		{62172C7D-B39E-409A-B352-370FF5098C19}.Debug|x64.Build.0 = Debug|x64
-		{62172C7D-B39E-409A-B352-370FF5098C19}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
-		{62172C7D-B39E-409A-B352-370FF5098C19}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
-		{62172C7D-B39E-409A-B352-370FF5098C19}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
-		{62172C7D-B39E-409A-B352-370FF5098C19}.PGInstrument|x64.Build.0 = PGInstrument|x64
-		{62172C7D-B39E-409A-B352-370FF5098C19}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
-		{62172C7D-B39E-409A-B352-370FF5098C19}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
-		{62172C7D-B39E-409A-B352-370FF5098C19}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
-		{62172C7D-B39E-409A-B352-370FF5098C19}.PGUpdate|x64.Build.0 = PGUpdate|x64
-		{62172C7D-B39E-409A-B352-370FF5098C19}.Release|Win32.ActiveCfg = Release|Win32
-		{62172C7D-B39E-409A-B352-370FF5098C19}.Release|Win32.Build.0 = Release|Win32
-		{62172C7D-B39E-409A-B352-370FF5098C19}.Release|x64.ActiveCfg = Release|x64
-		{62172C7D-B39E-409A-B352-370FF5098C19}.Release|x64.Build.0 = Release|x64
 		{A1A295E5-463C-437F-81CA-1F32367685DA}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A1A295E5-463C-437F-81CA-1F32367685DA}.Debug|Win32.Build.0 = Debug|Win32
 		{A1A295E5-463C-437F-81CA-1F32367685DA}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/PC/dllbase_nt.txt b/PC/dllbase_nt.txt
index c06e497e751..93a15d12bf8 100644
--- a/PC/dllbase_nt.txt
+++ b/PC/dllbase_nt.txt
@@ -16,7 +16,7 @@ Python.dll                 - 1e000000 - 1e100000 (-1)
 
 Standard Extension Modules 1e100000 - 1e200000  ""
  - _symtable                 1e100000 - 1e110000    pyd removed in 2.4
- - bsddb                     1e180000 - 1e188000
+ - bsddb                     1e180000 - 1e188000    pyd removed in 3.0
  - _tkinter                  1e190000 - 1e1A0000
  - parser                    1e1A0000 - 1e1B0000    pyd removed in 2.4
  - zlib                      1e1B0000 - 1e1C0000
diff --git a/PCbuild/_bsddb44.vcproj b/PCbuild/_bsddb44.vcproj
deleted file mode 100644
index 2085be5b9bc..00000000000
--- a/PCbuild/_bsddb44.vcproj
+++ /dev/null
@@ -1,1252 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="_bsddb44"
-	ProjectGUID="{62172C7D-B39E-409A-B352-370FF5098C19}"
-	RootNamespace="_bsddb44"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets=".\pyd_d.vsprops"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\.."
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="4"
-			InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\.."
-				PreprocessorDefinitions="DIAGNOSTIC"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets=".\pyd.vsprops"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\.."
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="4"
-			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\.."
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="PGInstrument|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\.."
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="PGInstrument|x64"
-			ConfigurationType="4"
-			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\.."
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="PGUpdate|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\.."
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="PGUpdate|x64"
-			ConfigurationType="4"
-			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\.."
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			>
-			<File
-				RelativePath="$(bsddbDir)\..\btree\bt_compact.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\btree\bt_compare.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\btree\bt_conv.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\btree\bt_curadj.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\btree\bt_cursor.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\btree\bt_delete.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\btree\bt_method.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\btree\bt_open.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\btree\bt_put.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\btree\bt_rec.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\btree\bt_reclaim.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\btree\bt_recno.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\btree\bt_rsearch.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\btree\bt_search.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\btree\bt_split.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\btree\bt_stat.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\btree\bt_upgrade.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\btree\bt_verify.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\btree\btree_auto.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\db\crdel_auto.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\db\crdel_rec.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\common\crypto_stub.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\db\db.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\db\db_am.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\db\db_auto.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\common\db_byteorder.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\db\db_cam.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\common\db_clock.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\db\db_conv.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\db\db_dispatch.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\db\db_dup.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\common\db_err.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\common\db_getlong.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\common\db_idspace.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\db\db_iface.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\db\db_join.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\common\db_log2.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\db\db_meta.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\db\db_method.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\db\db_open.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\db\db_overflow.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\db\db_ovfl_vrfy.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\db\db_pr.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\db\db_rec.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\db\db_reclaim.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\db\db_remove.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\db\db_rename.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\db\db_ret.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\env\db_salloc.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\db\db_setid.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\db\db_setlsn.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\env\db_shash.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\db\db_stati.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\db\db_truncate.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\db\db_upg.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\db\db_upg_opd.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\db\db_vrfy.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\db\db_vrfyutil.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\dbm\dbm.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\dbreg\dbreg.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\dbreg\dbreg_auto.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\dbreg\dbreg_rec.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\dbreg\dbreg_stat.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\dbreg\dbreg_util.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\env\env_failchk.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\env\env_file.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\env\env_method.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\env\env_open.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\env\env_recover.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\env\env_region.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\env\env_register.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\env\env_stat.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\fileops\fileops_auto.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\fileops\fop_basic.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\fileops\fop_rec.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\fileops\fop_util.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\hash\hash.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\hash\hash_auto.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\hash\hash_conv.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\hash\hash_dup.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\hash\hash_func.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\hash\hash_meta.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\hash\hash_method.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\hash\hash_open.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\hash\hash_page.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\hash\hash_rec.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\hash\hash_reclaim.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\hash\hash_stat.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\hash\hash_upgrade.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\hash\hash_verify.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\hmac\hmac.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\hsearch\hsearch.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\lock\lock.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\lock\lock_deadlock.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\lock\lock_failchk.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\lock\lock_id.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\lock\lock_list.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\lock\lock_method.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\lock\lock_region.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\lock\lock_stat.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\lock\lock_timer.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\lock\lock_util.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\log\log.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\log\log_archive.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\log\log_compare.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\log\log_debug.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\log\log_get.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\log\log_method.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\log\log_put.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\log\log_stat.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\mp\mp_alloc.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\mp\mp_bh.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\mp\mp_fget.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\mp\mp_fmethod.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\mp\mp_fopen.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\mp\mp_fput.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\mp\mp_fset.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\mp\mp_method.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\mp\mp_region.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\mp\mp_register.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\mp\mp_stat.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\mp\mp_sync.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\mp\mp_trickle.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\mutex\mut_alloc.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\mutex\mut_method.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\mutex\mut_region.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\mutex\mut_stat.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\mutex\mut_win32.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\os_win32\os_abs.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\os\os_alloc.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\os_win32\os_clock.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\os_win32\os_config.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\os_win32\os_dir.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\os_win32\os_errno.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\os_win32\os_fid.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\os_win32\os_flock.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\os_win32\os_fsync.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\os_win32\os_handle.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\os\os_id.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\os_win32\os_map.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\os\os_method.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\os\os_mkdir.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\os\os_oflags.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\os_win32\os_open.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\os\os_region.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\os_win32\os_rename.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\os\os_root.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\os\os_rpath.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\os_win32\os_rw.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\os_win32\os_seek.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\os_win32\os_sleep.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\os_win32\os_spin.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\os_win32\os_stat.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\os\os_tmpdir.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\os_win32\os_truncate.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\os_win32\os_unlink.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\qam\qam.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\qam\qam_auto.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\qam\qam_conv.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\qam\qam_files.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\qam\qam_method.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\qam\qam_open.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\qam\qam_rec.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\qam\qam_stat.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\qam\qam_upgrade.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\qam\qam_verify.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\rep\rep_auto.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\rep\rep_backup.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\rep\rep_elect.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\rep\rep_log.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\rep\rep_method.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\rep\rep_record.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\rep\rep_region.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\rep\rep_stat.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\rep\rep_util.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\rep\rep_verify.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\sequence\seq_stat.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\sequence\sequence.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\hmac\sha1.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\clib\strcasecmp.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\txn\txn.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\txn\txn_auto.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\txn\txn_chkpt.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\txn\txn_failchk.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\txn\txn_method.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\txn\txn_rec.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\txn\txn_recover.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\txn\txn_region.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\txn\txn_stat.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\txn\txn_util.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\common\util_cache.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\common\util_log.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\common\util_sig.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\xa\xa.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\xa\xa_db.c"
-				>
-			</File>
-			<File
-				RelativePath="$(bsddbDir)\..\xa\xa_map.c"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln
index 1e6b2f9528f..86c9be829a0 100644
--- a/PCbuild/pcbuild.sln
+++ b/PCbuild/pcbuild.sln
@@ -114,11 +114,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj
 		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb44", "_bsddb44.vcproj", "{62172C7D-B39E-409A-B352-370FF5098C19}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}"
 	ProjectSection(ProjectDependencies) = postProject
 		{6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
@@ -487,22 +482,6 @@ Global
 		{447F05A8-F581-4CAC-A466-5AC7936E207E}.Release|Win32.Build.0 = Release|Win32
 		{447F05A8-F581-4CAC-A466-5AC7936E207E}.Release|x64.ActiveCfg = Release|x64
 		{447F05A8-F581-4CAC-A466-5AC7936E207E}.Release|x64.Build.0 = Release|x64
-		{62172C7D-B39E-409A-B352-370FF5098C19}.Debug|Win32.ActiveCfg = Debug|Win32
-		{62172C7D-B39E-409A-B352-370FF5098C19}.Debug|Win32.Build.0 = Debug|Win32
-		{62172C7D-B39E-409A-B352-370FF5098C19}.Debug|x64.ActiveCfg = Debug|x64
-		{62172C7D-B39E-409A-B352-370FF5098C19}.Debug|x64.Build.0 = Debug|x64
-		{62172C7D-B39E-409A-B352-370FF5098C19}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
-		{62172C7D-B39E-409A-B352-370FF5098C19}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
-		{62172C7D-B39E-409A-B352-370FF5098C19}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
-		{62172C7D-B39E-409A-B352-370FF5098C19}.PGInstrument|x64.Build.0 = PGInstrument|x64
-		{62172C7D-B39E-409A-B352-370FF5098C19}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
-		{62172C7D-B39E-409A-B352-370FF5098C19}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
-		{62172C7D-B39E-409A-B352-370FF5098C19}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
-		{62172C7D-B39E-409A-B352-370FF5098C19}.PGUpdate|x64.Build.0 = PGUpdate|x64
-		{62172C7D-B39E-409A-B352-370FF5098C19}.Release|Win32.ActiveCfg = Release|Win32
-		{62172C7D-B39E-409A-B352-370FF5098C19}.Release|Win32.Build.0 = Release|Win32
-		{62172C7D-B39E-409A-B352-370FF5098C19}.Release|x64.ActiveCfg = Release|x64
-		{62172C7D-B39E-409A-B352-370FF5098C19}.Release|x64.Build.0 = Release|x64
 		{A1A295E5-463C-437F-81CA-1F32367685DA}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A1A295E5-463C-437F-81CA-1F32367685DA}.Debug|Win32.Build.0 = Debug|Win32
 		{A1A295E5-463C-437F-81CA-1F32367685DA}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 66457fbb1a4..fa80dfb0b16 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -83,7 +83,6 @@
     'unicodedata.pyd',
     'winsound.pyd',
     '_elementtree.pyd',
-    '_bsddb.pyd',
     '_socket.pyd',
     '_ssl.pyd',
     '_testcapi.pyd',
@@ -951,7 +950,7 @@ def add_files(db):
                 continue
             tcltk.set_current()
         elif dir in ['test', 'tests', 'data', 'output']:
-            # test: Lib, Lib/email, Lib/bsddb, Lib/ctypes, Lib/sqlite3
+            # test: Lib, Lib/email, Lib/ctypes, Lib/sqlite3
             # tests: Lib/distutils
             # data: Lib/email/test
             # output: Lib/test