Index: PCbuild8/pyproject.vsprops
===================================================================
--- PCbuild8/pyproject.vsprops	(revision 57528)
+++ PCbuild8/pyproject.vsprops	(working copy)
@@ -21,7 +21,7 @@
 	/>
 	<UserMacro
 		Name="PyDllName"
-		Value="python26"
+		Value="python30"
 	/>
 	<UserMacro
 		Name="bsddbDir"
Index: PCbuild8/pythoncore/pythoncore.vcproj
===================================================================
--- PCbuild8/pythoncore/pythoncore.vcproj	(revision 57528)
+++ PCbuild8/pythoncore/pythoncore.vcproj	(working copy)
@@ -60,6 +60,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="Advapi32.lib User32.lib"
 				OutputFile="$(OutDir)\$(PyDllName)_d.dll"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -205,6 +206,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="Advapi32.lib User32.lib"
 				OutputFile="$(OutDir)\$(PyDllName).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -352,6 +354,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="Advapi32.lib User32.lib"
 				OutputFile="$(OutDir)\$(PyDllName).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -499,6 +502,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="Advapi32.lib User32.lib"
 				OutputFile="$(OutDir)\$(PyDllName).dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -740,6 +744,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\Python\formatter_unicode.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\Python\Python-ast.c"
 				>
 			</File>
@@ -788,6 +796,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\Objects\bytesobject.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\Objects\cellobject.c"
 				>
 			</File>
@@ -820,6 +832,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\Objects\memoryobject.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\Objects\enumobject.c"
 				>
 			</File>
@@ -1018,6 +1034,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\Include\memoryobject.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\Include\enumobject.h"
 				>
 			</File>
@@ -1394,6 +1414,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\Modules\_fileio.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\Modules\_functoolsmodule.c"
 				>
 			</File>
@@ -1438,6 +1462,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\Modules\atexitmodule.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\Modules\audioop.c"
 				>
 			</File>
@@ -1466,10 +1494,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\Modules\imageop.c"
-				>
-			</File>
-			<File
 				RelativePath="..\..\Modules\itertoolsmodule.c"
 				>
 			</File>
@@ -1482,18 +1506,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\Modules\md5.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Modules\md5.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Modules\md5module.c"
-				>
-			</File>
-			<File
 				RelativePath="..\..\Modules\mmapmodule.c"
 				>
 			</File>
@@ -1526,10 +1538,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\Modules\shamodule.c"
-				>
-			</File>
-			<File
 				RelativePath="..\..\Modules\signalmodule.c"
 				>
 			</File>
Index: PCbuild8/_ctypes/_ctypes.vcproj
===================================================================
--- PCbuild8/_ctypes/_ctypes.vcproj	(revision 57528)
+++ PCbuild8/_ctypes/_ctypes.vcproj	(working copy)
@@ -68,6 +68,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="ole32.lib oleaut32.lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -219,6 +220,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="ole32.lib oleaut32.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -374,6 +376,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="ole32.lib oleaut32.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -529,6 +532,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="ole32.lib oleaut32.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"
Index: PCbuild8/make_buildinfo/make_buildinfo.vcproj
===================================================================
--- PCbuild8/make_buildinfo/make_buildinfo.vcproj	(revision 57528)
+++ PCbuild8/make_buildinfo/make_buildinfo.vcproj	(working copy)
@@ -60,6 +60,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="Advapi32.lib"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="1"
Index: PCbuild8/_bsddb/_bsddb.vcproj
===================================================================
--- PCbuild8/_bsddb/_bsddb.vcproj	(revision 57528)
+++ PCbuild8/_bsddb/_bsddb.vcproj	(working copy)
@@ -62,7 +62,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(bsddbDir)\Debug\libdb44sd.lib"
+				AdditionalDependencies="$(bsddbDir)\Debug\libdb44sd.lib Advapi32.lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -209,7 +209,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib"
+				AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib Advapi32.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -360,7 +360,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib"
+				AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib Advapi32.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -511,7 +511,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib"
+				AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib Advapi32.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"
Index: PCbuild8/_ctypes_test/_ctypes_test.vcproj
===================================================================
--- PCbuild8/_ctypes_test/_ctypes_test.vcproj	(revision 57528)
+++ PCbuild8/_ctypes_test/_ctypes_test.vcproj	(working copy)
@@ -61,6 +61,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="oleaut32.lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -204,6 +205,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="oleaut32.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -351,6 +353,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="oleaut32.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -498,6 +501,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="oleaut32.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"
Index: PCbuild8/winsound/winsound.vcproj
===================================================================
--- PCbuild8/winsound/winsound.vcproj	(revision 57528)
+++ PCbuild8/winsound/winsound.vcproj	(working copy)
@@ -61,7 +61,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib"
+				AdditionalDependencies="winmm.lib User32.lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -206,7 +206,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib"
+				AdditionalDependencies="winmm.lib User32.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -355,7 +355,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib"
+				AdditionalDependencies="winmm.lib User32.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -504,7 +504,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib"
+				AdditionalDependencies="winmm.lib User32.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"