diff --git a/clang/lib/Driver/InitHeaderSearch.cpp b/clang/lib/Driver/InitHeaderSearch.cpp
index ccfea313495d..85d44a9f3878 100644
--- a/clang/lib/Driver/InitHeaderSearch.cpp
+++ b/clang/lib/Driver/InitHeaderSearch.cpp
@@ -144,6 +144,11 @@ void InitHeaderSearch::AddDefaultSystemIncludePaths(const LangOptions &Lang) {
 
     // DragonFly
     AddPath("/usr/include/c++/4.1", System, true, false, false);
+
+    // Mingw32 GCC version 4
+    AddPath("c:/mingw/lib/gcc/mingw32/4.3.0/include/c++", System, true, false, false);
+    AddPath("c:/mingw/lib/gcc/mingw32/4.3.0/include/c++/mingw32", System, true, false, false);
+    AddPath("c:/mingw/lib/gcc/mingw32/4.3.0/include/c++/backward", System, true, false, false);
   }
 
   AddPath("/usr/local/include", System, false, false, false);
@@ -212,6 +217,10 @@ void InitHeaderSearch::AddDefaultSystemIncludePaths(const LangOptions &Lang) {
   // DragonFly
   AddPath("/usr/libdata/gcc41", System, true, false, false);
 
+  // Mingw32 GCC version 4
+  AddPath("C:/mingw/lib/gcc/mingw32/4.3.0/include", System, false, false, false);
+  AddPath("C:/mingw/include", System, false, false, false);
+
   AddPath("/usr/include", System, false, false, false);
   AddPath("/System/Library/Frameworks", System, true, false, true);
   AddPath("/Library/Frameworks", System, true, false, true);