diff --git a/clang/AST/CFG.cpp b/clang/AST/CFG.cpp
index f571e4e73beca8d08751af8233eba52aaa87b392..da8159cdfed2c19e1ab309e8ca6d78d3d8d394fa 100644
--- a/clang/AST/CFG.cpp
+++ b/clang/AST/CFG.cpp
@@ -25,7 +25,7 @@
 #include <iomanip>
 #include <algorithm>
 #include <sstream>
-
+#include <iostream>
 
 using namespace clang;
 
diff --git a/clang/Basic/Diagnostic.cpp b/clang/Basic/Diagnostic.cpp
index de311a448809ac3b5a4e207e4e27c8385f55145d..f62b8f126cd148bbb27b2886e5a4f6335e7e3f68 100644
--- a/clang/Basic/Diagnostic.cpp
+++ b/clang/Basic/Diagnostic.cpp
@@ -16,6 +16,7 @@
 #include <cassert>
 #include <vector>
 #include <map>
+#include <cstring>
 using namespace clang;
 
 //===----------------------------------------------------------------------===//
diff --git a/clang/Driver/SerializationTest.cpp b/clang/Driver/SerializationTest.cpp
index 552235bcbaf4d4bc320caf1e757c6d54da75af11..37f2b691cc62f7b30a54782dcd126647cb89f0f4 100644
--- a/clang/Driver/SerializationTest.cpp
+++ b/clang/Driver/SerializationTest.cpp
@@ -23,7 +23,7 @@
 #include "llvm/ADT/OwningPtr.h"
 #include "llvm/Support/Streams.h"
 #include <fstream>
-
+#include <cstring>
 using namespace clang;
 
 //===----------------------------------------------------------------------===//
diff --git a/clang/Lex/ScratchBuffer.cpp b/clang/Lex/ScratchBuffer.cpp
index bf0d88edfb115c47ab6c327904b986c072859d00..99fbdf75654aad0c6db7804f33dc31da3526ef05 100644
--- a/clang/Lex/ScratchBuffer.cpp
+++ b/clang/Lex/ScratchBuffer.cpp
@@ -14,6 +14,7 @@
 #include "clang/Lex/ScratchBuffer.h"
 #include "clang/Basic/SourceManager.h"
 #include "llvm/Support/MemoryBuffer.h"
+#include <cstring>
 using namespace clang;
 
 // ScratchBufSize - The size of each chunk of scratch memory.  Slightly less
diff --git a/clang/include/clang/Rewrite/RewriteRope.h b/clang/include/clang/Rewrite/RewriteRope.h
index fd2cb06e6b3f903b5f57ab482baa4828c44748e3..4d558b579f3297e59fb27e2940fb490a2ebf784f 100644
--- a/clang/include/clang/Rewrite/RewriteRope.h
+++ b/clang/include/clang/Rewrite/RewriteRope.h
@@ -16,7 +16,7 @@
 
 #include "llvm/ADT/iterator"
 #include <list>
-
+#include <cstring>
 
 namespace clang {