diff --git a/include/llvm/Analysis/MemoryBuiltins.h b/include/llvm/Analysis/MemoryBuiltins.h
index ab4a3f3c131..c212bbbba1b 100644
--- a/include/llvm/Analysis/MemoryBuiltins.h
+++ b/include/llvm/Analysis/MemoryBuiltins.h
@@ -192,9 +192,6 @@ public:
 };
 
 typedef std::pair<Value*, Value*> SizeOffsetEvalType;
-typedef IRBuilder<true, TargetFolder> BuilderTy;
-typedef DenseMap<const Value*, SizeOffsetEvalType> CacheMapTy;
-typedef SmallPtrSet<const Value*, 8> PtrSetTy;
 
 
 /// \brief Evaluate the size and offset of an object ponted by a Value*.
@@ -202,6 +199,10 @@ typedef SmallPtrSet<const Value*, 8> PtrSetTy;
 class ObjectSizeOffsetEvaluator
   : public InstVisitor<ObjectSizeOffsetEvaluator, SizeOffsetEvalType> {
 
+  typedef IRBuilder<true, TargetFolder> BuilderTy;
+  typedef DenseMap<const Value*, SizeOffsetEvalType> CacheMapTy;
+  typedef SmallPtrSet<const Value*, 8> PtrSetTy;
+
   const TargetData *TD;
   LLVMContext &Context;
   BuilderTy Builder;