diff --git a/include/Support/STLExtras.h b/include/Support/STLExtras.h
index b8e61283ed3..de4ad1ce92a 100644
--- a/include/Support/STLExtras.h
+++ b/include/Support/STLExtras.h
@@ -18,6 +18,7 @@
 #define SUPPORT_STLEXTRAS_H
 
 #include <functional>
+#include <map>  // G++-3.0.x will find std::pair here.
 #include "Support/iterator"
 
 namespace llvm {
diff --git a/include/llvm/ADT/STLExtras.h b/include/llvm/ADT/STLExtras.h
index b8e61283ed3..de4ad1ce92a 100644
--- a/include/llvm/ADT/STLExtras.h
+++ b/include/llvm/ADT/STLExtras.h
@@ -18,6 +18,7 @@
 #define SUPPORT_STLEXTRAS_H
 
 #include <functional>
+#include <map>  // G++-3.0.x will find std::pair here.
 #include "Support/iterator"
 
 namespace llvm {