diff --git a/llvm/include/Support/HashExtras.h b/llvm/include/Support/HashExtras.h
index d7e48a3b625d..da9e3f5cbadd 100644
--- a/llvm/include/Support/HashExtras.h
+++ b/llvm/include/Support/HashExtras.h
@@ -11,7 +11,7 @@
 #define LLVM_SUPPORT_HASHEXTRAS_H
 
 #include <string>
-#include <ext/hash_map>
+#include <Support/hash_map>
 
 // Cannot specialize hash template from outside of the std namespace.
 namespace std {
diff --git a/llvm/include/Support/hash_map b/llvm/include/Support/hash_map
new file mode 100644
index 000000000000..aefcc289e2ed
--- /dev/null
+++ b/llvm/include/Support/hash_map
@@ -0,0 +1,6 @@
+#if __GNUC__ == 3
+#include <ext/hash_map>
+using __gnu_cxx::hash_map;
+#else
+#include <hash_map>
+#endif
diff --git a/llvm/include/Support/hash_set b/llvm/include/Support/hash_set
new file mode 100644
index 000000000000..f95cc363c741
--- /dev/null
+++ b/llvm/include/Support/hash_set
@@ -0,0 +1,6 @@
+#if __GNUC__==3
+#include <ext/hash_set>
+using __gnu_cxx::hash_set;
+#else
+#include <hash_set>
+#endif