Index: Driver/clang.cpp
===================================================================
--- Driver/clang.cpp	(revision 49251)
+++ Driver/clang.cpp	(working copy)
@@ -889,10 +889,10 @@
   // FIXME: get these from the target?
   if (!nostdinc) {
     if (Lang.CPlusPlus) {
-      AddPath("/usr/include/c++/4.0.0", System, true, false, false, Headers);
-      AddPath("/usr/include/c++/4.0.0/i686-apple-darwin8", System, true, false,
+      AddPath("/usr/include/c++/4.3.0", System, true, false, false, Headers);
+      AddPath("/usr/include/c++/4.3.0/i686-pc-linux-gnu", System, true, false,
               false, Headers);
-      AddPath("/usr/include/c++/4.0.0/backward", System, true, false, false,
+      AddPath("/usr/include/c++/4.3.0/backward", System, true, false, false,
               Headers);
 
       // Ubuntu 7.10 - Gutsy Gibbon
Index: lib/Basic/TargetInfo.cpp
===================================================================
--- lib/Basic/TargetInfo.cpp	(revision 49251)
+++ lib/Basic/TargetInfo.cpp	(working copy)
@@ -16,6 +16,7 @@
 #include "clang/AST/Builtins.h"
 #include "llvm/ADT/APFloat.h"
 #include "llvm/ADT/STLExtras.h"
+#include <cstdlib>
 using namespace clang;
 
 // TargetInfo Constructor.
Index: lib/Analysis/GRSimpleVals.cpp
===================================================================
--- lib/Analysis/GRSimpleVals.cpp	(revision 49251)
+++ lib/Analysis/GRSimpleVals.cpp	(working copy)
@@ -161,12 +161,12 @@
 // Utility functions.
 //===----------------------------------------------------------------------===//
   
-template <typename ITERATOR> static inline
+template <typename ITERATOR> inline
 ExplodedNode<ValueState>* GetNode(ITERATOR I) {
   return *I;
 }
 
-template <> static inline
+template <> inline
 ExplodedNode<ValueState>* GetNode(GRExprEngine::undef_arg_iterator I) {
   return I->first;
 }
@@ -176,7 +176,7 @@
 //===----------------------------------------------------------------------===//
 
 template <typename ITERATOR>
-static void EmitWarning(Diagnostic& Diag, PathDiagnosticClient* PD,
+void EmitWarning(Diagnostic& Diag, PathDiagnosticClient* PD,
                         ASTContext& Ctx, BugReporter& BR,
                         const BugDescription& Desc,
                         ExplodedGraph<GRExprEngine>& G,