diff --git a/include/llvm/Analysis/DataStructure.h b/include/llvm/Analysis/DataStructure.h
index 61a2d67808b..c080c97e593 100644
--- a/include/llvm/Analysis/DataStructure.h
+++ b/include/llvm/Analysis/DataStructure.h
@@ -10,8 +10,8 @@
 #include "llvm/Pass.h"
 #include "llvm/GlobalValue.h"
 #include "Support/HashExtras.h"
+#include "Support/hash_set"
 #include <set>
-#include <hash_set>
 #include <string>
 
 class Type;
diff --git a/include/llvm/Analysis/DataStructure/DataStructure.h b/include/llvm/Analysis/DataStructure/DataStructure.h
index 61a2d67808b..c080c97e593 100644
--- a/include/llvm/Analysis/DataStructure/DataStructure.h
+++ b/include/llvm/Analysis/DataStructure/DataStructure.h
@@ -10,8 +10,8 @@
 #include "llvm/Pass.h"
 #include "llvm/GlobalValue.h"
 #include "Support/HashExtras.h"
+#include "Support/hash_set"
 #include <set>
-#include <hash_set>
 #include <string>
 
 class Type;
diff --git a/include/llvm/Analysis/InstForest.h b/include/llvm/Analysis/InstForest.h
index 5d27c819159..243b0fdd054 100644
--- a/include/llvm/Analysis/InstForest.h
+++ b/include/llvm/Analysis/InstForest.h
@@ -142,7 +142,7 @@ template<class Payload>
 class InstForest : public std::vector<InstTreeNode<Payload> *> {
   friend class InstTreeNode<Payload>;
 
-  typedef std::vector<InstTreeNode<Payload> *>::const_iterator const_iterator;
+  typedef typename std::vector<InstTreeNode<Payload> *>::const_iterator const_iterator;
 
   // InstMap - Map contains entries for ALL instructions in the method and the
   // InstTreeNode that they correspond to.