Index: lib/Linker/LinkModules.cpp
===================================================================
--- lib/Linker/LinkModules.cpp	(revision 48113)
+++ lib/Linker/LinkModules.cpp	(working copy)
@@ -597,9 +597,9 @@
 
     // Globals were already linked, thus we can just query ValueMap for variant
     // of SAliasee in Dest
-    std::map<const Value*,Value*>::const_iterator I = ValueMap.find(SAliasee);
-    assert(I != ValueMap.end() && "Aliasee not linked");
-    GlobalValue* DAliasee = cast<GlobalValue>(I->second);
+    std::map<const Value*,Value*>::const_iterator VMI = ValueMap.find(SAliasee);
+    assert(VMI != ValueMap.end() && "Aliasee not linked");
+    GlobalValue* DAliasee = cast<GlobalValue>(VMI->second);
 
     // Try to find something 'similar' to SGA in destination module.
     if (GlobalAlias *DGA = Dest->getNamedAlias(SGA->getName())) {
Index: lib/Transforms/IPO/ExtractGV.cpp
===================================================================
--- lib/Transforms/IPO/ExtractGV.cpp	(revision 48113)
+++ lib/Transforms/IPO/ExtractGV.cpp	(working copy)
@@ -17,6 +17,7 @@
 #include "llvm/Constants.h"
 #include "llvm/Transforms/IPO.h"
 #include "llvm/Support/Compiler.h"
+#include <algorithm>
 using namespace llvm;
 
 namespace {
