diff --git a/lib/Frontend/InitHeaderSearch.cpp b/lib/Frontend/InitHeaderSearch.cpp
index db9703b..ed52211 100644
--- a/lib/Frontend/InitHeaderSearch.cpp
+++ b/lib/Frontend/InitHeaderSearch.cpp
@@ -310,101 +310,101 @@
     break;
   case llvm::Triple::Darwin:
     AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1",
-				"i686-apple-darwin10",
-				"i686-apple-darwin10/x86_64",
-				triple);
+        "i686-apple-darwin10",
+        "i686-apple-darwin10/x86_64",
+        triple);
     AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.0.0",
-				"i686-apple-darwin8",
-				"i686-apple-darwin8",
-				triple);
+        "i686-apple-darwin8",
+        "i686-apple-darwin8",
+        triple);
     break;
   case llvm::Triple::Linux:
     // Ubuntu 7.10 - Gutsy Gibbon
     AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.1.3",
-				"i486-linux-gnu",
-				"i486-linux-gnu",
-				triple);
+        "i486-linux-gnu",
+        "i486-linux-gnu",
+        triple);
     // Ubuntu 9.04
     AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3.3",
-				"x86_64-linux-gnu/32",
-				"x86_64-linux-gnu",
-				triple);
+        "x86_64-linux-gnu/32",
+        "x86_64-linux-gnu",
+        triple);
     // Ubuntu 9.10
     AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4.1",
-				"x86_64-linux-gnu/32",
-				"x86_64-linux-gnu",
-				triple);
+        "x86_64-linux-gnu/32",
+        "x86_64-linux-gnu",
+        triple);
     // Fedora 8
     AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.1.2",
-				"i386-redhat-linux",
-				"i386-redhat-linux",
-				triple);
+        "i386-redhat-linux",
+        "i386-redhat-linux",
+        triple);
     // Fedora 9
     AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3.0",
-				"i386-redhat-linux",
-				"i386-redhat-linux",
-				triple);
+        "i386-redhat-linux",
+        "i386-redhat-linux",
+        triple);
     // Fedora 10
     AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3.2",
-				"i386-redhat-linux",
-				"i386-redhat-linux",
-				triple);
+        "i386-redhat-linux",
+        "i386-redhat-linux",
+        triple);
     // openSUSE 11.1 32 bit
     AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3",
-				"i586-suse-linux",
-				"i586-suse-linux",
-				triple);
+        "i586-suse-linux",
+        "i586-suse-linux",
+        triple);
     // openSUSE 11.1 64 bit
     AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3",
-				"x86_64-suse-linux/32",
-				"x86_64-suse-linux",
-				triple);
+        "x86_64-suse-linux/32",
+        "x86_64-suse-linux",
+        triple);
     // openSUSE 11.2
     AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4",
-				"i586-suse-linux",
-				"i586-suse-linux",
-				triple);
+        "i586-suse-linux",
+        "i586-suse-linux",
+        triple);
     AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4",
-				"x86_64-suse-linux",
-				"x86_64-suse-linux",
-				triple);
+        "x86_64-suse-linux",
+        "x86_64-suse-linux",
+        triple);
     // Arch Linux 2008-06-24
     AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3.1",
-				"i686-pc-linux-gnu",
-				"i686-pc-linux-gnu",
-				triple);
+        "i686-pc-linux-gnu",
+        "i686-pc-linux-gnu",
+        triple);
     AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3.1",
-				"x86_64-unknown-linux-gnu",
-				"x86_64-unknown-linux-gnu",
-				triple);
+        "x86_64-unknown-linux-gnu",
+        "x86_64-unknown-linux-gnu",
+        triple);
     // Gentoo x86 2009.1 stable
     AddGnuCPlusPlusIncludePaths(
-        "/usr/lib/gcc/i686-pc-linux-gnu/4.3.4/include/g++-v4",
-	"i686-pc-linux-gnu",
-	"i686-pc-linux-gnu",
-	triple);
+      "/usr/lib/gcc/i686-pc-linux-gnu/4.3.4/include/g++-v4",
+      "i686-pc-linux-gnu",
+      "i686-pc-linux-gnu",
+      triple);
     // Gentoo x86 2009.0 stable
     AddGnuCPlusPlusIncludePaths(
-        "/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4",
-	"i686-pc-linux-gnu",
-	"i686-pc-linux-gnu",
-	triple);
+      "/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4",
+      "i686-pc-linux-gnu",
+      "i686-pc-linux-gnu",
+      triple);
     // Gentoo x86 2008.0 stable
     AddGnuCPlusPlusIncludePaths(
-        "/usr/lib/gcc/i686-pc-linux-gnu/4.1.2/include/g++-v4",
-	"i686-pc-linux-gnu",
-	"i686-pc-linux-gnu",
-	triple);
+      "/usr/lib/gcc/i686-pc-linux-gnu/4.1.2/include/g++-v4",
+      "i686-pc-linux-gnu",
+      "i686-pc-linux-gnu",
+      triple);
     // Ubuntu 8.10
     AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3",
-				"i486-pc-linux-gnu",
-				"i486-pc-linux-gnu",
-				triple);
+        "i486-pc-linux-gnu",
+        "i486-pc-linux-gnu",
+        triple);
     // Ubuntu 9.04
     AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3",
-				"i486-linux-gnu",
-				"i486-linux-gnu",
-				triple);
+        "i486-linux-gnu",
+        "i486-linux-gnu",
+        triple);
     // Gentoo amd64 stable
     AddGnuCPlusPlusIncludePaths(
         "/usr/lib/gcc/x86_64-pc-linux-gnu/4.1.2/include/g++-v4",