diff --git a/lib/Target/X86/X86TargetMachine.cpp b/lib/Target/X86/X86TargetMachine.cpp
index 0e3eea43924..24406d5be97 100644
--- a/lib/Target/X86/X86TargetMachine.cpp
+++ b/lib/Target/X86/X86TargetMachine.cpp
@@ -27,13 +27,6 @@ using namespace llvm;
 
 X86VectorEnum llvm::X86Vector = NoSSE;
 
-/// X86TargetMachineModule - Note that this is used on hosts that cannot link
-/// in a library unless there are references into the library.  In particular,
-/// it seems that it is not possible to get things to work on Win32 without
-/// this.  Though it is unused, do not remove it.
-extern "C" int X86TargetMachineModule;
-int X86TargetMachineModule = 0;
-
 namespace {
   cl::opt<bool> NoSSAPeephole("disable-ssa-peephole", cl::init(true),
                         cl::desc("Disable the ssa-based peephole optimizer "
diff --git a/win32/Fibonacci/Fibonacci.vcproj b/win32/Fibonacci/Fibonacci.vcproj
index 03f3c35c6ae..9dd6f9fd2f1 100644
--- a/win32/Fibonacci/Fibonacci.vcproj
+++ b/win32/Fibonacci/Fibonacci.vcproj
@@ -37,9 +37,9 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="$(SolutionDir)X86\$(IntDir)\X86TargetMachine.obj"
 				OutputFile="$(OutDir)/Fibonacci.exe"
 				LinkIncremental="2"
-				ForceSymbolReferences="_X86TargetMachineModule"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/Fibonacci.pdb"
 				SubSystem="1"
@@ -88,9 +88,9 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="$(SolutionDir)X86\$(IntDir)\X86TargetMachine.obj"
 				OutputFile="$(OutDir)/Fibonacci.exe"
 				LinkIncremental="1"
-				ForceSymbolReferences="_X86TargetMachineModule"
 				GenerateDebugInformation="TRUE"
 				SubSystem="1"
 				OptimizeReferences="2"
diff --git a/win32/llc/llc.vcproj b/win32/llc/llc.vcproj
index 69111f8692d..a5eb134a771 100644
--- a/win32/llc/llc.vcproj
+++ b/win32/llc/llc.vcproj
@@ -36,9 +36,9 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="$(SolutionDir)X86\$(IntDir)\X86TargetMachine.obj"
 				OutputFile="$(OutDir)/llc.exe"
 				LinkIncremental="2"
-				ForceSymbolReferences="_X86TargetMachineModule"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/llc.pdb"
 				SubSystem="1"
@@ -87,9 +87,9 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="$(SolutionDir)X86\$(IntDir)\X86TargetMachine.obj"
 				OutputFile="$(OutDir)/llc.exe"
 				LinkIncremental="1"
-				ForceSymbolReferences="_X86TargetMachineModule"
 				GenerateDebugInformation="TRUE"
 				SubSystem="1"
 				OptimizeReferences="2"
diff --git a/win32/lli/lli.vcproj b/win32/lli/lli.vcproj
index 0f3127f91ff..0aae82f72b9 100644
--- a/win32/lli/lli.vcproj
+++ b/win32/lli/lli.vcproj
@@ -36,9 +36,9 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="$(SolutionDir)X86\$(IntDir)\X86TargetMachine.obj"
 				OutputFile="$(OutDir)/lli.exe"
 				LinkIncremental="2"
-				ForceSymbolReferences="_X86TargetMachineModule"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/lli.pdb"
 				SubSystem="1"
@@ -87,9 +87,9 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="$(SolutionDir)X86\$(IntDir)\X86TargetMachine.obj"
 				OutputFile="$(OutDir)/lli.exe"
 				LinkIncremental="1"
-				ForceSymbolReferences="_X86TargetMachineModule"
 				GenerateDebugInformation="TRUE"
 				SubSystem="1"
 				OptimizeReferences="2"
diff --git a/win32/llvm.sln b/win32/llvm.sln
index 42ad9b793df..1474da40175 100644
--- a/win32/llvm.sln
+++ b/win32/llvm.sln
@@ -20,6 +20,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Fibonacci", "Fibonacci\Fibo
 		{45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB}
 		{76295AE8-A083-460E-9F80-6F2B8923264A} = {76295AE8-A083-460E-9F80-6F2B8923264A}
 		{0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489}
+		{144EEBF6-8C9B-4473-B715-2C821666AF6C} = {144EEBF6-8C9B-4473-B715-2C821666AF6C}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ExecutionEngine", "ExecutionEngine\ExecutionEngine.vcproj", "{76295AE8-A083-460E-9F80-6F2B8923264A}"