diff --git a/lib/Bytecode/Writer/SlotCalculator.cpp b/lib/Bytecode/Writer/SlotCalculator.cpp
index 5ad6564f818..6dbaba5dec4 100644
--- a/lib/Bytecode/Writer/SlotCalculator.cpp
+++ b/lib/Bytecode/Writer/SlotCalculator.cpp
@@ -256,7 +256,7 @@ void SlotCalculator::CreateSlotIfNeeded(const Value *V) {
 
 
 unsigned SlotCalculator::getOrCreateTypeSlot(const Type *Ty) {
-  std::map<const Type*, unsigned>::iterator TyIt = TypeMap.find(Ty);
+  TypeMapType::iterator TyIt = TypeMap.find(Ty);
   if (TyIt != TypeMap.end()) return TyIt->second;
 
   // Insert into TypeMap.
diff --git a/lib/Bytecode/Writer/SlotCalculator.h b/lib/Bytecode/Writer/SlotCalculator.h
index e20bc62a24f..1dc0cc37bd3 100644
--- a/lib/Bytecode/Writer/SlotCalculator.h
+++ b/lib/Bytecode/Writer/SlotCalculator.h
@@ -75,13 +75,13 @@ public:
   /// plane.  This returns < 0 on error!
   ///
   unsigned getSlot(const Value *V) const {
-    std::map<const Value*, unsigned>::const_iterator I = NodeMap.find(V);
+    NodeMapType::const_iterator I = NodeMap.find(V);
     assert(I != NodeMap.end() && "Value not in slotcalculator!");
     return I->second;
   }
   
   unsigned getTypeSlot(const Type* T) const {
-    std::map<const Type*, unsigned>::const_iterator I = TypeMap.find(T);
+    TypeMapType::const_iterator I = TypeMap.find(T);
     assert(I != TypeMap.end() && "Type not in slotcalc!");
     return I->second;
   }