Index: INPUTS/all-std-headers.cpp
===================================================================
--- INPUTS/all-std-headers.cpp	(revision 191429)
+++ INPUTS/all-std-headers.cpp	(working copy)
@@ -44,9 +44,9 @@
 #include <stdexcept>
 #include <streambuf>
 #include <string>
-#if __has_include(<strstream>)
-#include <strstream>
-#endif
+// #if __has_include(<strstream>)
+// #include <strstream>
+// #endif
 #include <typeinfo>
 #include <utility>
 #include <valarray>
Index: unittests/Format/FormatTest.cpp
===================================================================
--- unittests/Format/FormatTest.cpp	(revision 191429)
+++ unittests/Format/FormatTest.cpp	(working copy)
@@ -4138,8 +4138,8 @@
   verifyFormat("#import \"a/b/string\"");
   verifyFormat("#import \"string.h\"");
   verifyFormat("#import \"string.h\"");
-  verifyFormat("#if __has_include(<strstream>)\n"
-               "#include <strstream>\n"
+  verifyFormat("#if __has_include(<new>)\n"
+               "#include <new>\n"
                "#endif");
 }