Use vs9to8.py to refresh the Visual Studio 2005 build files.

8 files changed, 985 insertions, 299 deletions

diff --git a/PC/VS8.0/_bsddb.vcproj b/PC/VS8.0/_bsddb.vcproj
index 434fed9..50da1ce 100644
--- a/PC/VS8.0/_bsddb.vcproj
+++ b/PC/VS8.0/_bsddb.vcproj
@@ -42,7 +42,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."
+				AdditionalIncludeDirectories="..\..\..\db-4.7.25.0\build_windows,..\..\..\db-4.7.25.0\build_windows\.."
+				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -55,6 +56,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="$(bsddbDepLibs)"
 				BaseAddress="0x1e180000"
 			/>
 			<Tool
@@ -103,7 +105,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."
+				AdditionalIncludeDirectories="..\..\..\db-4.7.25.0\build_windows,..\..\..\db-4.7.25.0\build_windows\.."
+				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -166,7 +169,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."
+				AdditionalIncludeDirectories="..\..\..\db-4.7.25.0\build_windows,..\..\..\db-4.7.25.0\build_windows\.."
+				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -229,7 +233,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."
+				AdditionalIncludeDirectories="..\..\..\db-4.7.25.0\build_windows,..\..\..\db-4.7.25.0\build_windows\.."
+				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -292,7 +297,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."
+				AdditionalIncludeDirectories="..\..\..\db-4.7.25.0\build_windows,..\..\..\db-4.7.25.0\build_windows\.."
+				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -355,7 +361,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."
+				AdditionalIncludeDirectories="..\..\..\db-4.7.25.0\build_windows,..\..\..\db-4.7.25.0\build_windows\.."
+				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -418,7 +425,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."
+				AdditionalIncludeDirectories="..\..\..\db-4.7.25.0\build_windows,..\..\..\db-4.7.25.0\build_windows\.."
+				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -481,7 +489,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\db-4.4.20\build_win32,..\..\..\db-4.4.20\build_win32\.."
+				AdditionalIncludeDirectories="..\..\..\db-4.7.25.0\build_windows,..\..\..\db-4.7.25.0\build_windows\.."
+				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -540,6 +549,914 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Berkeley DB 4.7.25 Source Files"
+			>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\crypto\aes_method.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\btree\bt_compact.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\btree\bt_compare.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\btree\bt_conv.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\btree\bt_curadj.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\btree\bt_cursor.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\btree\bt_delete.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\btree\bt_method.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\btree\bt_open.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\btree\bt_put.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\btree\bt_rec.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\btree\bt_reclaim.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\btree\bt_recno.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\btree\bt_rsearch.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\btree\bt_search.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\btree\bt_split.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\btree\bt_stat.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\btree\bt_upgrade.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\btree\bt_verify.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\btree\btree_auto.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\db\crdel_auto.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\db\crdel_rec.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\crypto\crypto.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\db\db.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\db\db_am.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\db\db_auto.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\common\db_byteorder.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\db\db_cam.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\db\db_cds.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\db\db_conv.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\db\db_dispatch.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\db\db_dup.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\common\db_err.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\common\db_getlong.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\common\db_idspace.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\db\db_iface.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\db\db_join.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\common\db_log2.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\db\db_meta.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\db\db_method.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\db\db_open.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\db\db_overflow.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\db\db_ovfl_vrfy.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\db\db_pr.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\db\db_rec.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\db\db_reclaim.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\db\db_remove.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\db\db_rename.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\db\db_ret.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\db\db_setid.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\db\db_setlsn.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\common\db_shash.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\db\db_stati.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\db\db_truncate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\db\db_upg.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\db\db_upg_opd.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\db\db_vrfy.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\db\db_vrfyutil.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\dbm\dbm.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\dbreg\dbreg.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\dbreg\dbreg_auto.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\dbreg\dbreg_rec.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\dbreg\dbreg_stat.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\dbreg\dbreg_util.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\common\dbt.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\env\env_alloc.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\env\env_config.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\env\env_failchk.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\env\env_file.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\env\env_globals.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\env\env_method.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\env\env_name.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\env\env_open.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\env\env_recover.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\env\env_region.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\env\env_register.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\env\env_sig.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\env\env_stat.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\fileops\fileops_auto.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\fileops\fop_basic.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\fileops\fop_rec.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\fileops\fop_util.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\hash\hash.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\hash\hash_auto.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\hash\hash_conv.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\hash\hash_dup.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\hash\hash_func.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\hash\hash_meta.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\hash\hash_method.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\hash\hash_open.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\hash\hash_page.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\hash\hash_rec.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\hash\hash_reclaim.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\hash\hash_stat.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\hash\hash_upgrade.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\hash\hash_verify.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\hmac\hmac.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\hsearch\hsearch.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\lock\lock.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\lock\lock_deadlock.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\lock\lock_failchk.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\lock\lock_id.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\lock\lock_list.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\lock\lock_method.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\lock\lock_region.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\lock\lock_stat.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\lock\lock_timer.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\lock\lock_util.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\log\log.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\log\log_archive.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\log\log_compare.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\log\log_debug.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\log\log_get.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\log\log_method.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\log\log_put.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\log\log_stat.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\common\mkpath.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\mp\mp_alloc.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\mp\mp_bh.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\mp\mp_fget.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\mp\mp_fmethod.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\mp\mp_fopen.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\mp\mp_fput.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\mp\mp_fset.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\mp\mp_method.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\mp\mp_mvcc.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\mp\mp_region.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\mp\mp_register.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\mp\mp_resize.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\mp\mp_stat.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\mp\mp_sync.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\mp\mp_trickle.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\crypto\mersenne\mt19937db.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\mutex\mut_alloc.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\mutex\mut_failchk.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\mutex\mut_method.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\mutex\mut_region.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\mutex\mut_stat.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\mutex\mut_win32.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\common\openflags.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\os\os_abort.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\os_windows\os_abs.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\os\os_addrinfo.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\os\os_alloc.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\os_windows\os_clock.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\os_windows\os_config.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\os_windows\os_cpu.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\os\os_ctime.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\os_windows\os_dir.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\os_windows\os_errno.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\os_windows\os_fid.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\os_windows\os_flock.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\os_windows\os_fsync.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\os_windows\os_getenv.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\os_windows\os_handle.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\os_windows\os_map.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\common\os_method.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\os_windows\os_mkdir.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\os_windows\os_open.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\os\os_pid.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\os_windows\os_rename.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\os\os_root.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\os\os_rpath.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\os_windows\os_rw.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\os_windows\os_seek.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\os\os_stack.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\os_windows\os_stat.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\os\os_tmpdir.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\os_windows\os_truncate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\os\os_uid.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\os_windows\os_unlink.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\os_windows\os_yield.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\qam\qam.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\qam\qam_auto.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\qam\qam_conv.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\qam\qam_files.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\qam\qam_method.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\qam\qam_open.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\qam\qam_rec.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\qam\qam_stat.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\qam\qam_upgrade.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\qam\qam_verify.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\rep\rep_auto.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\rep\rep_backup.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\rep\rep_elect.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\rep\rep_lease.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\rep\rep_log.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\rep\rep_method.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\rep\rep_record.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\rep\rep_region.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\rep\rep_stat.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\rep\rep_util.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\rep\rep_verify.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\repmgr\repmgr_auto.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\repmgr\repmgr_elect.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\repmgr\repmgr_method.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\repmgr\repmgr_msg.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\repmgr\repmgr_net.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\repmgr\repmgr_queue.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\repmgr\repmgr_sel.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\repmgr\repmgr_stat.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\repmgr\repmgr_util.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\repmgr\repmgr_windows.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\crypto\rijndael\rijndael-alg-fst.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\crypto\rijndael\rijndael-api-fst.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\sequence\seq_stat.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\sequence\sequence.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\hmac\sha1.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\clib\strsep.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\txn\txn.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\txn\txn_auto.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\txn\txn_chkpt.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\txn\txn_failchk.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\txn\txn_method.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\txn\txn_rec.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\txn\txn_recover.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\txn\txn_region.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\txn\txn_stat.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\txn\txn_util.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\common\util_cache.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\common\util_log.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\common\util_sig.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\xa\xa.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\xa\xa_db.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\xa\xa_map.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\db-4.7.25.0\build_windows\..\common\zerofill.c"
+				>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/PC/VS8.0/_ctypes.vcproj b/PC/VS8.0/_ctypes.vcproj
index 836f997..eb19943 100644
--- a/PC/VS8.0/_ctypes.vcproj
+++ b/PC/VS8.0/_ctypes.vcproj
@@ -642,7 +642,7 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="ml64 /nologo /c /Fo &quot;$(IntDir)\win64.obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+						CommandLine="ml64 /nologo /c /Zi /Fo &quot;$(IntDir)\win64.obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 						Outputs="$(IntDir)\win64.obj"
 					/>
 				</FileConfiguration>
diff --git a/PC/VS8.0/_multiprocessing.vcproj b/PC/VS8.0/_multiprocessing.vcproj
index 55b29ce..f3d0565 100644
--- a/PC/VS8.0/_multiprocessing.vcproj
+++ b/PC/VS8.0/_multiprocessing.vcproj
@@ -3,9 +3,10 @@
 	ProjectType="Visual C++"

 	Version="8.00"

 	Name="_multiprocessing"

-	ProjectGUID="{9E48B300-37D1-11DD-8C41-005056C00008}"

+	ProjectGUID="{9e48b300-37d1-11dd-8c41-005056c00008}"

 	RootNamespace="_multiprocessing"

 	Keyword="Win32Proj"

+	TargetFrameworkVersion="196613"

 	>

 	<Platforms>

 		<Platform

@@ -75,18 +76,14 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

-			Name="Release|Win32"

+			Name="Debug|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets=".\pyd.vsprops"

+			InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"

 			CharacterSet="0"

-			WholeProgramOptimization="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -102,6 +99,7 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

@@ -139,16 +137,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

-			Name="PGInstrument|Win32"

+			Name="Release|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -203,16 +198,13 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

-			Name="PGUpdate|Win32"

+			Name="Release|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -230,6 +222,7 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

@@ -267,17 +260,15 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug|x64"

+			Name="PGInstrument|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"

 			CharacterSet="0"

+			WholeProgramOptimization="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -293,7 +284,6 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TargetEnvironment="3"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

@@ -335,9 +325,9 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release|x64"

+			Name="PGInstrument|x64"

 			ConfigurationType="2"

-			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -373,6 +363,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2_32.lib"

 				BaseAddress="0x1e1D0000"

+				TargetMachine="17"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -397,9 +388,9 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="PGInstrument|x64"

+			Name="PGUpdate|Win32"

 			ConfigurationType="2"

-			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"

+			InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"

 			CharacterSet="0"

 			WholeProgramOptimization="1"

 			>

@@ -417,7 +408,6 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TargetEnvironment="3"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

@@ -435,7 +425,6 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2_32.lib"

 				BaseAddress="0x1e1D0000"

-				TargetMachine="17"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -530,11 +519,11 @@
 			Name="Header Files"

 			>

 			<File

-				RelativePath="..\..\Modules\_multiprocessing\connection.h"

+				RelativePath="..\..\Modules\_multiprocessing\multiprocessing.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\Modules\_multiprocessing\multiprocessing.h"

+				RelativePath="..\..\Modules\_multiprocessing\connection.h"

 				>

 			</File>

 		</Filter>

diff --git a/PC/VS8.0/_sqlite3.vcproj b/PC/VS8.0/_sqlite3.vcproj
index aa31ad6..cbd02cc 100644
--- a/PC/VS8.0/_sqlite3.vcproj
+++ b/PC/VS8.0/_sqlite3.vcproj
@@ -42,7 +42,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
+				AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
 				PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
 			/>
 			<Tool
@@ -104,7 +104,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
+				AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
 				PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
 			/>
 			<Tool
@@ -166,7 +166,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
+				AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
 				PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
 			/>
 			<Tool
@@ -229,7 +229,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
+				AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
 				PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
 			/>
 			<Tool
@@ -291,7 +291,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
+				AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
 				PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
 			/>
 			<Tool
@@ -354,7 +354,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
+				AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
 				PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
 			/>
 			<Tool
@@ -417,7 +417,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
+				AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
 				PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
 			/>
 			<Tool
@@ -480,7 +480,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
+				AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
 				PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
 			/>
 			<Tool
diff --git a/PC/VS8.0/pcbuild.sln b/PC/VS8.0/pcbuild.sln
index d8fc64e..5f43524 100644
--- a/PC/VS8.0/pcbuild.sln
+++ b/PC/VS8.0/pcbuild.sln
@@ -41,7 +41,6 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}"
 	ProjectSection(ProjectDependencies) = postProject
 		{6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
-		{62172C7D-B39E-409A-B352-370FF5098C19} = {62172C7D-B39E-409A-B352-370FF5098C19}
 		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
 	EndProjectSection
 EndProject
@@ -121,11 +120,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}
@@ -510,22 +504,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/VS8.0/pyproject.vsprops b/PC/VS8.0/pyproject.vsprops
index c117a38..72b459e 100644
--- a/PC/VS8.0/pyproject.vsprops
+++ b/PC/VS8.0/pyproject.vsprops
@@ -50,11 +50,11 @@
 	/>

 	<UserMacro

 		Name="bsddbDir"

-		Value="$(bsddb44Dir)"

+		Value="$(bsddb47Dir)"

 	/>

 	<UserMacro

 		Name="bsddbDepLibs"

-		Value="$(bsddb44DepLibs)"

+		Value="$(bsddb47DepLibs)"

 	/>

 	<UserMacro

 		Name="bsddb44Dir"

@@ -65,20 +65,20 @@
 		Value=""

 	/>

 	<UserMacro

-		Name="bsddb45Dir"

-		Value="$(externalsDir)\db-4.5.20.x\build_windows"

+		Name="bsddb47Dir"

+		Value="$(externalsDir)\db-4.7.25.0\build_windows"

 	/>

 	<UserMacro

-		Name="bsddb45DepLibs"

+		Name="bsddb47DepLibs"

 		Value="ws2_32.lib"

 	/>

 	<UserMacro

 		Name="sqlite3Dir"

-		Value="$(externalsDir)\sqlite-source-3.3.4"

+		Value="$(externalsDir)\sqlite-3.5.9"

 	/>

 	<UserMacro

 		Name="bz2Dir"

-		Value="$(externalsDir)\bzip2-1.0.3"

+		Value="$(externalsDir)\bzip2-1.0.5"

 	/>

 	<UserMacro

 		Name="opensslDir"

diff --git a/PC/VS8.0/sqlite3.vcproj b/PC/VS8.0/sqlite3.vcproj
index 93dda5d..071589a 100644
--- a/PC/VS8.0/sqlite3.vcproj
+++ b/PC/VS8.0/sqlite3.vcproj
@@ -42,7 +42,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
+				AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
+				PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -56,7 +57,6 @@
 			<Tool
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\$(ProjectName)_d.dll"
-				ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -104,7 +104,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
+				AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
+				PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -118,7 +119,6 @@
 			<Tool
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\$(ProjectName)_d.dll"
-				ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -166,7 +166,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
+				AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
+				PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -180,7 +181,6 @@
 			<Tool
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\$(ProjectName).dll"
-				ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -229,7 +229,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
+				AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
+				PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -243,7 +244,6 @@
 			<Tool
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\$(ProjectName).dll"
-				ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -291,7 +291,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
+				AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
+				PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -304,7 +305,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"
+				OutputFile="$(OutDir)\$(ProjectName).dll"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -353,7 +354,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
+				AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
+				PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -366,7 +368,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -414,7 +415,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
+				AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
+				PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -427,7 +429,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"
+				OutputFile="$(OutDir)\$(ProjectName).dll"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -476,7 +478,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\sqlite-source-3.3.4"
+				AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
+				PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -489,7 +492,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				ModuleDefinitionFile="..\..\..\sqlite-source-3.3.4\sqlite3.def"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -521,51 +523,11 @@
 			Name="Header Files"
 			>
 			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\btree.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\hash.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\keywordhash.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\opcodes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\os.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\os_common.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\pager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\parse.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\sqlite3.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\sqliteInt.h"
+				RelativePath="..\..\..\sqlite-3.5.9\sqlite3.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\vdbe.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\vdbeInt.h"
+				RelativePath="..\..\..\sqlite-3.5.9\sqlite3ext.h"
 				>
 			</File>
 		</Filter>
@@ -573,167 +535,7 @@
 			Name="Source Files"
 			>
 			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\alter.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\analyze.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\attach.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\auth.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\btree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\build.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\callback.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\complete.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\date.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\delete.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\expr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\func.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\hash.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\insert.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\legacy.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\main.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\opcodes.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\os.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\os_unix.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\os_win.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\pager.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\parse.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\pragma.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\prepare.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\printf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\random.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\select.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\shell.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\table.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\tokenize.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\trigger.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\update.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\utf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\util.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\vacuum.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\vdbe.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\vdbeapi.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\vdbeaux.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\vdbefifo.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\vdbemem.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sqlite-source-3.3.4\where.c"
+				RelativePath="..\..\..\sqlite-3.5.9\sqlite3.c"
 				>
 			</File>
 		</Filter>
diff --git a/PCbuild/vs9to8.py b/PCbuild/vs9to8.py
index c59dea4..2dfbd5d 100644
--- a/PCbuild/vs9to8.py
+++ b/PCbuild/vs9to8.py
@@ -24,9 +24,9 @@ def vs9to8(src, dest):
 
             # Bah. VS8.0 does not expand macros in file names.
             # Replace them here.
-            lines = lines.replace('$(sqlite3Dir)', '..\\..\\..\\sqlite-source-3.3.4')
-            lines = lines.replace('$(bsddbDir)\\..\\..', '..\\..\\..\\db-4.4.20\\build_win32\\..')
-            lines = lines.replace('$(bsddbDir)', '..\\..\\..\\db-4.4.20\\build_win32')
+            lines = lines.replace('$(sqlite3Dir)', '..\\..\\..\\sqlite-3.5.9')
+            lines = lines.replace('$(bsddbDir)\\..\\..', '..\\..\\..\\db-4.7.25.0\\build_windows\\..')
+            lines = lines.replace('$(bsddbDir)', '..\\..\\..\\db-4.7.25.0\\build_windows')
 
         with open(destname, 'wb') as fout:
             lines = lines.replace("\n", "\r\n")