diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
index 0325ba5..5c39c2b 100644
--- a/lib/AST/ASTContext.cpp
+++ b/lib/AST/ASTContext.cpp
@@ -15,6 +15,8 @@
 #include "clang/AST/Decl.h"
 #include "clang/AST/DeclCXX.h"
 #include "clang/AST/DeclObjC.h"
+#include "clang/AST/Expr.h"
+#include "clang/AST/RecordLayout.h"
 #include "clang/Basic/TargetInfo.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringExtras.h"
@@ -27,6 +29,18 @@
   FloatRank, DoubleRank, LongDoubleRank
 };
 
+ASTContext::ASTContext(const LangOptions& LOpts, SourceManager &SM, TargetInfo &t,
+                       IdentifierTable &idents, SelectorTable &sels,
+                       unsigned size_reserve) : 
+  CFConstantStringTypeDecl(0), SourceMgr(SM), LangOpts(LOpts), Target(t), 
+  Idents(idents), Selectors(sels) 
+{  
+  if (size_reserve > 0) Types.reserve(size_reserve);    
+  InitBuiltinTypes();
+  BuiltinInfo.InitializeBuiltins(idents, Target);
+  TUDecl = TranslationUnitDecl::Create(*this);
+}
+
 ASTContext::~ASTContext() {
   // Deallocate all the types.
   while (!Types.empty()) {
diff --git a/lib/AST/Builtins.cpp b/lib/AST/Builtins.cpp
index e2bf5ca..8249c41 100644
--- a/lib/AST/Builtins.cpp
+++ b/lib/AST/Builtins.cpp
@@ -13,6 +13,7 @@
 
 #include "clang/AST/Builtins.h"
 #include "clang/AST/ASTContext.h"
+#include "clang/AST/Decl.h"
 #include "clang/Basic/IdentifierTable.h"
 #include "clang/Basic/TargetInfo.h"
 using namespace clang;
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
index 7930c90..3cc12c9 100644
--- a/lib/AST/Decl.cpp
+++ b/lib/AST/Decl.cpp
@@ -13,6 +13,8 @@
 
 #include "clang/AST/Decl.h"
 #include "clang/AST/ASTContext.h"
+#include "clang/AST/Stmt.h"
+#include "clang/Basic/IdentifierTable.h"
 
 using namespace clang;
 
diff --git a/lib/AST/DeclBase.cpp b/lib/AST/DeclBase.cpp
index 3750542..f48b734 100644
--- a/lib/AST/DeclBase.cpp
+++ b/lib/AST/DeclBase.cpp
@@ -12,6 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/AST/DeclBase.h"
+#include "clang/AST/DeclObjC.h"
 #include "clang/AST/DeclCXX.h"
 #include "clang/AST/ASTContext.h"
 #include "llvm/ADT/DenseMap.h"
diff --git a/lib/AST/DeclObjC.cpp b/lib/AST/DeclObjC.cpp
index 9ba6e86..a793ac6 100644
--- a/lib/AST/DeclObjC.cpp
+++ b/lib/AST/DeclObjC.cpp
@@ -13,6 +13,7 @@
 
 #include "clang/AST/DeclObjC.h"
 #include "clang/AST/ASTContext.h"
+#include "clang/AST/Stmt.h"
 using namespace clang;
 
 //===----------------------------------------------------------------------===//
diff --git a/lib/AST/Expr.cpp b/lib/AST/Expr.cpp
index 97e1897..b66ec08 100644
--- a/lib/AST/Expr.cpp
+++ b/lib/AST/Expr.cpp
@@ -14,6 +14,7 @@
 #include "clang/AST/ExprObjC.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/APValue.h"
+#include "clang/AST/RecordLayout.h"
 #include "clang/AST/StmtVisitor.h"
 #include "clang/Basic/IdentifierTable.h"
 #include "clang/Basic/TargetInfo.h"