Index: lldb/trunk/include/lldb/Core/LoadedModuleInfoList.h
===================================================================
--- lldb/trunk/include/lldb/Core/LoadedModuleInfoList.h
+++ lldb/trunk/include/lldb/Core/LoadedModuleInfoList.h
@@ -13,10 +13,13 @@
 // C Includes
 
 // C++ Includes
+#include <cassert>
 #include <vector>
 
 // Other libraries and framework includes
+#include "lldb/lldb-defines.h"
 #include "lldb/lldb-private-forward.h"
+#include "lldb/lldb-types.h"
 
 namespace lldb_private {
 class LoadedModuleInfoList {
Index: lldb/trunk/include/lldb/Core/ThreadSafeDenseSet.h
===================================================================
--- lldb/trunk/include/lldb/Core/ThreadSafeDenseSet.h
+++ lldb/trunk/include/lldb/Core/ThreadSafeDenseSet.h
@@ -46,7 +46,7 @@
   }
 
   void Clear() {
-    stds::lock_guard<_MutexType> guard(m_mutex);
+    std::lock_guard<_MutexType> guard(m_mutex);
     m_set.clear();
   }
 
Index: lldb/trunk/include/lldb/Core/ThreadSafeValue.h
===================================================================
--- lldb/trunk/include/lldb/Core/ThreadSafeValue.h
+++ lldb/trunk/include/lldb/Core/ThreadSafeValue.h
@@ -17,6 +17,7 @@
 
 // Other libraries and framework includes
 // Project includes
+#include "lldb/lldb-defines.h"
 
 namespace lldb_private {
 
Index: lldb/trunk/include/lldb/DataFormatters/VectorIterator.h
===================================================================
--- lldb/trunk/include/lldb/DataFormatters/VectorIterator.h
+++ lldb/trunk/include/lldb/DataFormatters/VectorIterator.h
@@ -13,6 +13,7 @@
 
 #include "lldb/lldb-forward.h"
 
+#include "lldb/DataFormatters/TypeSynthetic.h"
 #include "lldb/Target/ExecutionContext.h"
 #include "lldb/Utility/ConstString.h"
 
Index: lldb/trunk/include/lldb/Target/ProcessStructReader.h
===================================================================
--- lldb/trunk/include/lldb/Target/ProcessStructReader.h
+++ lldb/trunk/include/lldb/Target/ProcessStructReader.h
@@ -16,6 +16,7 @@
 #include "lldb/Symbol/CompilerType.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Utility/ConstString.h"
+#include "lldb/Utility/DataBufferHeap.h"
 #include "lldb/Utility/DataExtractor.h"
 #include "lldb/Utility/Status.h"
 
Index: lldb/trunk/include/lldb/Utility/AnsiTerminal.h
===================================================================
--- lldb/trunk/include/lldb/Utility/AnsiTerminal.h
+++ lldb/trunk/include/lldb/Utility/AnsiTerminal.h
@@ -50,6 +50,7 @@
 #define ANSI_1_CTRL(ctrl1) "\033["##ctrl1 ANSI_ESC_END
 #define ANSI_2_CTRL(ctrl1, ctrl2) "\033["##ctrl1 ";"##ctrl2 ANSI_ESC_END
 
+#include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/StringRef.h"
 
Index: lldb/trunk/include/lldb/Utility/SharedCluster.h
===================================================================
--- lldb/trunk/include/lldb/Utility/SharedCluster.h
+++ lldb/trunk/include/lldb/Utility/SharedCluster.h
@@ -15,6 +15,8 @@
 
 #include "llvm/ADT/SmallPtrSet.h"
 
+#include <mutex>
+
 namespace lldb_private {
 
 namespace imp {