diff --git a/lib/Basic/IdentifierTable.cpp b/lib/Basic/IdentifierTable.cpp
index 304c7a9..0f0b4f9 100644
--- a/lib/Basic/IdentifierTable.cpp
+++ b/lib/Basic/IdentifierTable.cpp
@@ -18,6 +18,7 @@
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/Bitcode/Serialize.h"
 #include "llvm/Bitcode/Deserialize.h"
+#include <cstdio>
 
 using namespace clang;
 
diff --git a/lib/Basic/SourceLocation.cpp b/lib/Basic/SourceLocation.cpp
index 8e068d6..73e231a 100644
--- a/lib/Basic/SourceLocation.cpp
+++ b/lib/Basic/SourceLocation.cpp
@@ -17,6 +17,7 @@
 #include "llvm/Bitcode/Serialize.h"
 #include "llvm/Bitcode/Deserialize.h"
 #include "llvm/Support/MemoryBuffer.h"
+#include <cstdio>
 
 using namespace clang;
 
diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp
index ef17d2d..6973ec5 100644
--- a/lib/Basic/Targets.cpp
+++ b/lib/Basic/Targets.cpp
@@ -497,7 +497,21 @@
   virtual const char *getClobbers() const {
     return "~{dirflag},~{fpsr},~{flags}";
   }
+  
+  virtual int HandleTargetOptions(std::string *StrArray, unsigned NumStrs,
+                                  std::string &ErrorReason);
 };
+
+/// HandleTargetOptions - Handle target-specific options like -msse2 and
+/// friends.  An array of arguments is passed in: if they are all valid, this
+/// should handle them and return -1.  If there is an error, the index of the
+/// invalid argument should be returned along with an optional error string.
+int X86TargetInfo::HandleTargetOptions(std::string *StrArray, unsigned NumStrs,
+                                       std::string &ErrorReason) {
+  if (NumStrs == 0)
+    return -1;
+  return 0;
+}
   
 bool
 X86TargetInfo::validateAsmConstraint(const char *&Name,