diff --git a/lib/Rewrite/HTMLRewrite.cpp b/lib/Rewrite/HTMLRewrite.cpp
index 43c0479..b411e56 100644
--- a/lib/Rewrite/HTMLRewrite.cpp
+++ b/lib/Rewrite/HTMLRewrite.cpp
@@ -20,7 +20,7 @@
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/OwningPtr.h"
 #include "llvm/Support/MemoryBuffer.h"
-#include <sstream>
+#include "llvm/Support/raw_ostream.h"
 using namespace clang;
 
 
@@ -161,7 +161,8 @@
                              bool ReplaceTabs) {
   
   unsigned len = s.size();
-  std::ostringstream os;
+  std::string Str;
+  llvm::raw_string_ostream os(Str);
   
   for (unsigned i = 0 ; i < len; ++i) {
     
@@ -272,7 +273,8 @@
   SourceLocation StartLoc = SourceLocation::getFileLoc(FileID, 0);
   SourceLocation EndLoc = SourceLocation::getFileLoc(FileID, FileEnd-FileStart);
 
-  std::ostringstream os;
+  std::string s;
+  llvm::raw_string_ostream os(s);
   os << "<!doctype html>\n" // Use HTML 5 doctype
         "<html>\n<head>\n";