diff --git a/include/Support/FileUtilities.h b/include/Support/FileUtilities.h
index 7ccb6943491..0543d76f5a9 100644
--- a/include/Support/FileUtilities.h
+++ b/include/Support/FileUtilities.h
@@ -137,11 +137,11 @@ public:
   /// specified (if deleteIt is true).
   ///
   class FileRemover {
-    bool DeleteIt; 
     std::string Filename;
+    bool DeleteIt;
   public:
-    FileRemover(bool deleteIt, const std::string &filename)
-      : DeleteIt(deleteIt), Filename(filename) {}
+    FileRemover(const std::string &filename, bool deleteIt = true)
+      : Filename(filename), DeleteIt(deleteIt) {}
     
     ~FileRemover() {
       if (DeleteIt) removeFile(Filename);
diff --git a/include/llvm/Support/FileUtilities.h b/include/llvm/Support/FileUtilities.h
index 7ccb6943491..0543d76f5a9 100644
--- a/include/llvm/Support/FileUtilities.h
+++ b/include/llvm/Support/FileUtilities.h
@@ -137,11 +137,11 @@ public:
   /// specified (if deleteIt is true).
   ///
   class FileRemover {
-    bool DeleteIt; 
     std::string Filename;
+    bool DeleteIt;
   public:
-    FileRemover(bool deleteIt, const std::string &filename)
-      : DeleteIt(deleteIt), Filename(filename) {}
+    FileRemover(const std::string &filename, bool deleteIt = true)
+      : Filename(filename), DeleteIt(deleteIt) {}
     
     ~FileRemover() {
       if (DeleteIt) removeFile(Filename);