diff --git a/test/C++Frontend/2004-09-27-CompilerCrash.cpp b/test/C++Frontend/2004-09-27-CompilerCrash.cpp
index b997616c0dc..f507c239150 100644
--- a/test/C++Frontend/2004-09-27-CompilerCrash.cpp
+++ b/test/C++Frontend/2004-09-27-CompilerCrash.cpp
@@ -1,5 +1,4 @@
 // RUN: %llvmgxx -S %s -o - | llvm-as -f -o /dev/null
-// XFAIL: *
 
 struct Pass {} ;
 template<typename PassName>
@@ -7,11 +6,7 @@ Pass *callDefaultCtor() { return new PassName(); }
 
 void foo(Pass *(*C)());
 
-#include <bits/c++config.h>
-#include <bits/stringfwd.h>
-#include <bits/char_traits.h>
-#include <memory>       // For allocator.
-#include <bits/basic_string.h>
+#include <string>
 
 bool foo(std::string &X) {
   return X.empty();