diff --git a/build/win32/vs9/gailutil.vcproj b/build/win32/vs9/gailutil.vcproj
index 51bd653c38..d66cb61d30 100644
--- a/build/win32/vs9/gailutil.vcproj
+++ b/build/win32/vs9/gailutil.vcproj
@@ -23,7 +23,7 @@
 			Name="Debug|Win32"
 			InheritedPropertySheets=".\gtk+.vsprops"
 			ConfigurationType="2"
-			CharacterSet="1"
+			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -42,7 +42,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalDependencies="atk-1.0.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				GenerateDebugInformation="true"
@@ -77,7 +77,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="atk-1.0.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -89,7 +89,7 @@
 			Name="Release|Win32"
 			InheritedPropertySheets=".\gtk+.vsprops"
 			ConfigurationType="2"
-			CharacterSet="1"
+			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
 			<Tool
@@ -126,6 +126,7 @@
 			InheritedPropertySheets=".\gtk+.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -143,7 +144,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="atk-1.0.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
diff --git a/build/win32/vs9/gdk-win32.vcproj b/build/win32/vs9/gdk-win32.vcproj
index 14ee06c268..f43715a141 100644
--- a/build/win32/vs9/gdk-win32.vcproj
+++ b/build/win32/vs9/gdk-win32.vcproj
@@ -46,6 +46,7 @@
 			InheritedPropertySheets=".\gtk+.vsprops"
 			ConfigurationType="4"
 			CharacterSet="2"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -87,6 +88,7 @@
 			InheritedPropertySheets=".\gtk+.vsprops"
 			ConfigurationType="4"
 			CharacterSet="2"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
diff --git a/build/win32/vs9/gdk.vcprojin b/build/win32/vs9/gdk.vcprojin
index 6c36dbae7b..e41cd7c20f 100644
--- a/build/win32/vs9/gdk.vcprojin
+++ b/build/win32/vs9/gdk.vcprojin
@@ -44,7 +44,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="imm32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				ModuleDefinitionFile="$(IntDir)\gdk.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -57,6 +57,7 @@
 			InheritedPropertySheets=".\gtk+.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -74,7 +75,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="imm32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				ModuleDefinitionFile="$(IntDir)\gdk.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -109,7 +110,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="imm32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				ModuleDefinitionFile="$(IntDir)\gdk.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -122,6 +123,7 @@
 			InheritedPropertySheets=".\gtk+.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -139,7 +141,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="imm32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				ModuleDefinitionFile="$(IntDir)\gdk.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
diff --git a/build/win32/vs9/gtk.vcprojin b/build/win32/vs9/gtk.vcprojin
index fff2af661b..db6ffebf51 100644
--- a/build/win32/vs9/gtk.vcprojin
+++ b/build/win32/vs9/gtk.vcprojin
@@ -44,7 +44,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				ModuleDefinitionFile="$(IntDir)\gtk.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -57,6 +57,7 @@
 			InheritedPropertySheets=".\gtk+.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -74,7 +75,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				ModuleDefinitionFile="$(IntDir)\gtk.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -109,7 +110,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				ModuleDefinitionFile="$(IntDir)\gtk.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -122,6 +123,7 @@
 			InheritedPropertySheets=".\gtk+.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -139,7 +141,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				ModuleDefinitionFile="$(IntDir)\gtk.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
diff --git a/build/win32/vs9/gtk3-demo.vcproj b/build/win32/vs9/gtk3-demo.vcproj
index 265a3ff026..850aebc2ee 100644
--- a/build/win32/vs9/gtk3-demo.vcproj
+++ b/build/win32/vs9/gtk3-demo.vcproj
@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies=""
-				LinkIncremental="2"
+				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				RandomizedBaseAddress="1"
@@ -77,7 +77,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies=""
-				LinkIncremental="2"
+				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				RandomizedBaseAddress="1"
diff --git a/build/win32/vs9/libgail.vcprojin b/build/win32/vs9/libgail.vcprojin
index 6a6ddd43a7..a9dbea6ef2 100644
--- a/build/win32/vs9/libgail.vcprojin
+++ b/build/win32/vs9/libgail.vcprojin
@@ -23,7 +23,7 @@
 			Name="Debug|Win32"
 			InheritedPropertySheets=".\gtk+.vsprops"
 			ConfigurationType="4"
-			CharacterSet="1"
+			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -67,7 +67,7 @@
 			Name="Release|Win32"
 			InheritedPropertySheets=".\gtk+.vsprops"
 			ConfigurationType="4"
-			CharacterSet="1"
+			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
 			<Tool
@@ -91,6 +91,7 @@
 			InheritedPropertySheets=".\gtk+.vsprops"
 			ConfigurationType="4"
 			CharacterSet="2"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"