diff --git a/clang/include/clang/Frontend/ChainedDiagnosticClient.h b/clang/include/clang/Frontend/ChainedDiagnosticClient.h
index d65eb4ad9eb6..2d5e128dac37 100644
--- a/clang/include/clang/Frontend/ChainedDiagnosticClient.h
+++ b/clang/include/clang/Frontend/ChainedDiagnosticClient.h
@@ -11,6 +11,7 @@
 #define LLVM_CLANG_FRONTEND_CHAINEDDIAGNOSTICCLIENT_H
 
 #include "clang/Basic/Diagnostic.h"
+#include "llvm/ADT/OwningPtr.h"
 
 namespace clang {
 class LangOptions;
diff --git a/clang/include/clang/Frontend/DependencyOutputOptions.h b/clang/include/clang/Frontend/DependencyOutputOptions.h
index 194c0ebafed2..ab8e49df9a88 100644
--- a/clang/include/clang/Frontend/DependencyOutputOptions.h
+++ b/clang/include/clang/Frontend/DependencyOutputOptions.h
@@ -10,6 +10,7 @@
 #ifndef LLVM_CLANG_FRONTEND_DEPENDENCYOUTPUTOPTIONS_H
 #define LLVM_CLANG_FRONTEND_DEPENDENCYOUTPUTOPTIONS_H
 
+#include <string>
 #include <vector>
 
 namespace clang {
diff --git a/clang/include/clang/Frontend/HeaderSearchOptions.h b/clang/include/clang/Frontend/HeaderSearchOptions.h
index ee8c60e8b01b..967f9067caf8 100644
--- a/clang/include/clang/Frontend/HeaderSearchOptions.h
+++ b/clang/include/clang/Frontend/HeaderSearchOptions.h
@@ -11,6 +11,7 @@
 #define LLVM_CLANG_FRONTEND_HEADERSEARCHOPTIONS_H
 
 #include "llvm/ADT/StringRef.h"
+#include <vector>
 
 namespace clang {