Index: include/lldb/Core/Value.h =================================================================== --- include/lldb/Core/Value.h +++ include/lldb/Core/Value.h @@ -17,7 +17,6 @@ // Other libraries and framework includes // Project includes #include "lldb/lldb-private.h" -#include "lldb/Core/ClangForward.h" #include "lldb/Core/DataBufferHeap.h" #include "lldb/Core/Error.h" #include "lldb/Core/Scalar.h" Index: include/lldb/Core/ValueObjectList.h =================================================================== --- include/lldb/Core/ValueObjectList.h +++ include/lldb/Core/ValueObjectList.h @@ -17,7 +17,6 @@ // Other libraries and framework includes // Project includes #include "lldb/lldb-private.h" -#include "lldb/Core/ClangForward.h" #include "lldb/Core/UserID.h" #include "lldb/Target/ExecutionContextScope.h" Index: include/lldb/Expression/ASTDumper.h =================================================================== --- include/lldb/Expression/ASTDumper.h +++ include/lldb/Expression/ASTDumper.h @@ -11,7 +11,6 @@ #define liblldb_ASTDumper_h_ #include "clang/AST/DeclVisitor.h" -#include "clang/AST/StmtVisitor.h" #include "clang/AST/TypeVisitor.h" #include "lldb/Core/Stream.h" Index: include/lldb/Symbol/Function.h =================================================================== --- include/lldb/Symbol/Function.h +++ include/lldb/Symbol/Function.h @@ -10,7 +10,6 @@ #ifndef liblldb_Function_h_ #define liblldb_Function_h_ -#include "lldb/Core/ClangForward.h" #include "lldb/Core/AddressRange.h" #include "lldb/Symbol/Block.h" #include "lldb/Symbol/Declaration.h" Index: include/lldb/Symbol/TypeSystem.h =================================================================== --- include/lldb/Symbol/TypeSystem.h +++ include/lldb/Symbol/TypeSystem.h @@ -13,12 +13,9 @@ #include #include #include "lldb/lldb-private.h" -#include "lldb/Core/ClangForward.h" #include "lldb/Core/PluginInterface.h" #include "lldb/Expression/Expression.h" #include "lldb/Symbol/CompilerDeclContext.h" -#include "clang/AST/CharUnits.h" -#include "clang/AST/Type.h" #include "llvm/Support/Casting.h" class DWARFDIE; Index: source/API/SBType.cpp =================================================================== --- source/API/SBType.cpp +++ source/API/SBType.cpp @@ -19,11 +19,9 @@ #include "lldb/Symbol/TypeSystem.h" #include "llvm/ADT/APSInt.h" -#include "clang/AST/Decl.h" using namespace lldb; using namespace lldb_private; -using namespace clang; SBType::SBType() : m_opaque_sp() Index: source/API/SBTypeEnumMember.cpp =================================================================== --- source/API/SBTypeEnumMember.cpp +++ source/API/SBTypeEnumMember.cpp @@ -17,7 +17,6 @@ using namespace lldb; using namespace lldb_private; -using namespace clang; SBTypeEnumMember::SBTypeEnumMember() : m_opaque_sp() Index: source/Core/Debugger.cpp =================================================================== --- source/Core/Debugger.cpp +++ source/Core/Debugger.cpp @@ -11,8 +11,6 @@ #include -#include "clang/AST/DeclCXX.h" -#include "clang/AST/Type.h" #include "llvm/ADT/StringRef.h" #include "lldb/lldb-private.h" @@ -41,7 +39,6 @@ #include "lldb/Interpreter/OptionValueProperties.h" #include "lldb/Interpreter/OptionValueSInt64.h" #include "lldb/Interpreter/OptionValueString.h" -#include "lldb/Symbol/ClangASTContext.h" #include "lldb/Symbol/CompileUnit.h" #include "lldb/Symbol/Function.h" #include "lldb/Symbol/Symbol.h" Index: source/Core/ValueObject.cpp =================================================================== --- source/Core/ValueObject.cpp +++ source/Core/ValueObject.cpp @@ -15,7 +15,6 @@ // C++ Includes // Other libraries and framework includes #include "llvm/Support/raw_ostream.h" -#include "clang/AST/Type.h" // Project includes #include "lldb/Core/DataBufferHeap.h" Index: source/Expression/FunctionCaller.cpp =================================================================== --- source/Expression/FunctionCaller.cpp +++ source/Expression/FunctionCaller.cpp @@ -11,15 +11,6 @@ // C Includes // C++ Includes // Other libraries and framework includes -#include "clang/AST/ASTContext.h" -#include "clang/AST/RecordLayout.h" -#include "clang/CodeGen/CodeGenAction.h" -#include "clang/CodeGen/ModuleBuilder.h" -#include "clang/Frontend/CompilerInstance.h" -#include "llvm/ADT/StringRef.h" -#include "llvm/ADT/Triple.h" -#include "llvm/ExecutionEngine/ExecutionEngine.h" -#include "llvm/IR/Module.h" // Project includes #include "lldb/Core/DataExtractor.h" @@ -29,11 +20,9 @@ #include "lldb/Core/ValueObject.h" #include "lldb/Core/ValueObjectList.h" #include "lldb/Expression/ASTStructExtractor.h" -#include "lldb/Expression/ClangExpressionParser.h" #include "lldb/Expression/FunctionCaller.h" #include "lldb/Expression/IRExecutionUnit.h" #include "lldb/Interpreter/CommandReturnObject.h" -#include "lldb/Symbol/ClangASTContext.h" #include "lldb/Symbol/Function.h" #include "lldb/Symbol/Type.h" #include "lldb/Target/ExecutionContext.h" @@ -167,7 +156,6 @@ } Error error; - using namespace clang; lldb::ExpressionResults return_value = lldb::eExpressionSetupError; Process *process = exe_ctx.GetProcessPtr(); @@ -240,8 +228,6 @@ bool FunctionCaller::InsertFunction (ExecutionContext &exe_ctx, lldb::addr_t &args_addr_ref, Stream &errors) { - using namespace clang; - if (CompileFunction(errors) != 0) return false; if (!WriteFunctionWrapper(exe_ctx, errors)) @@ -344,7 +330,6 @@ Stream &errors, Value &results) { - using namespace clang; lldb::ExpressionResults return_value = lldb::eExpressionSetupError; // FunctionCaller::ExecuteFunction execution is always just to get the result. Do make sure we ignore Index: source/Expression/UserExpression.cpp =================================================================== --- source/Expression/UserExpression.cpp +++ source/Expression/UserExpression.cpp @@ -23,9 +23,6 @@ #include "lldb/Core/StreamString.h" #include "lldb/Core/ValueObjectConstResult.h" #include "lldb/Expression/ASTResultSynthesizer.h" -#include "lldb/Expression/ClangExpressionDeclMap.h" -#include "lldb/Expression/ClangExpressionParser.h" -#include "lldb/Expression/ClangModulesDeclVendor.h" #include "lldb/Expression/ClangPersistentVariables.h" #include "lldb/Expression/ExpressionSourceCode.h" #include "lldb/Expression/IRExecutionUnit.h" @@ -34,12 +31,10 @@ #include "lldb/Expression/UserExpression.h" #include "lldb/Host/HostInfo.h" #include "lldb/Symbol/Block.h" -#include "lldb/Symbol/ClangASTContext.h" #include "lldb/Symbol/Function.h" #include "lldb/Symbol/ObjectFile.h" #include "lldb/Symbol/SymbolVendor.h" #include "lldb/Symbol/Type.h" -#include "lldb/Symbol/ClangExternalASTSourceCommon.h" #include "lldb/Symbol/VariableList.h" #include "lldb/Target/ExecutionContext.h" #include "lldb/Target/Process.h" @@ -48,9 +43,6 @@ #include "lldb/Target/ThreadPlan.h" #include "lldb/Target/ThreadPlanCallUserExpression.h" -#include "clang/AST/DeclCXX.h" -#include "clang/AST/DeclObjC.h" - using namespace lldb_private; UserExpression::UserExpression (ExecutionContextScope &exe_scope, Index: source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h =================================================================== --- source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h +++ source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h @@ -18,8 +18,6 @@ #include // Other libraries and framework includes -#include "clang/AST/CharUnits.h" -#include "clang/AST/ExternalASTSource.h" #include "llvm/ADT/DenseMap.h" #include "lldb/lldb-private.h" Index: source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp =================================================================== --- source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp +++ source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp @@ -10,20 +10,6 @@ #include "SymbolFileDWARF.h" // Other libraries and framework includes -#include "clang/AST/ASTConsumer.h" -#include "clang/AST/ASTContext.h" -#include "clang/AST/Decl.h" -#include "clang/AST/DeclGroup.h" -#include "clang/AST/DeclObjC.h" -#include "clang/AST/DeclTemplate.h" -#include "clang/Basic/Builtins.h" -#include "clang/Basic/IdentifierTable.h" -#include "clang/Basic/LangOptions.h" -#include "clang/Basic/SourceManager.h" -#include "clang/Basic/TargetInfo.h" -#include "clang/Basic/Specifiers.h" -#include "clang/Sema/DeclSpec.h" - #include "llvm/Support/Casting.h" #include "lldb/Core/ArchSpec.h" Index: source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h =================================================================== --- source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h +++ source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h @@ -14,8 +14,6 @@ #include #include -#include "clang/AST/CharUnits.h" - #include "lldb/Core/RangeMap.h" #include "lldb/Symbol/SymbolFile.h" Index: source/Plugins/SystemRuntime/MacOSX/AppleGetItemInfoHandler.cpp =================================================================== --- source/Plugins/SystemRuntime/MacOSX/AppleGetItemInfoHandler.cpp +++ source/Plugins/SystemRuntime/MacOSX/AppleGetItemInfoHandler.cpp @@ -14,9 +14,6 @@ // Other libraries and framework includes // Project includes -#include "clang/AST/ASTContext.h" -#include "clang/AST/DeclCXX.h" - #include "lldb/Core/ConstString.h" #include "lldb/Core/Log.h" #include "lldb/Core/Module.h" Index: source/Plugins/SystemRuntime/MacOSX/AppleGetPendingItemsHandler.cpp =================================================================== --- source/Plugins/SystemRuntime/MacOSX/AppleGetPendingItemsHandler.cpp +++ source/Plugins/SystemRuntime/MacOSX/AppleGetPendingItemsHandler.cpp @@ -14,9 +14,6 @@ // Other libraries and framework includes // Project includes -#include "clang/AST/ASTContext.h" -#include "clang/AST/DeclCXX.h" - #include "lldb/Core/ConstString.h" #include "lldb/Core/Log.h" #include "lldb/Core/Module.h" Index: source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.cpp =================================================================== --- source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.cpp +++ source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.cpp @@ -13,9 +13,6 @@ // C++ Includes // Other libraries and framework includes // Project includes -#include "clang/AST/ASTContext.h" -#include "clang/AST/DeclCXX.h" - #include "lldb/Core/ConstString.h" #include "lldb/Core/Log.h" #include "lldb/Core/Module.h" Index: source/Plugins/SystemRuntime/MacOSX/AppleGetThreadItemInfoHandler.cpp =================================================================== --- source/Plugins/SystemRuntime/MacOSX/AppleGetThreadItemInfoHandler.cpp +++ source/Plugins/SystemRuntime/MacOSX/AppleGetThreadItemInfoHandler.cpp @@ -14,9 +14,6 @@ // Other libraries and framework includes // Project includes -#include "clang/AST/ASTContext.h" -#include "clang/AST/DeclCXX.h" - #include "lldb/lldb-private.h" #include "lldb/Core/ConstString.h" #include "lldb/Core/Log.h" Index: source/Symbol/CompilerType.cpp =================================================================== --- source/Symbol/CompilerType.cpp +++ source/Symbol/CompilerType.cpp @@ -20,7 +20,6 @@ #include "lldb/Symbol/ClangASTContext.h" #include "lldb/Symbol/ClangExternalASTSourceCommon.h" #include "lldb/Symbol/Type.h" -#include "lldb/Symbol/VerifyDecl.h" #include "lldb/Target/ExecutionContext.h" #include "lldb/Target/Process.h" Index: source/Symbol/TypeList.cpp =================================================================== --- source/Symbol/TypeList.cpp +++ source/Symbol/TypeList.cpp @@ -13,18 +13,6 @@ #include // Other libraries and framework includes -#include "clang/AST/ASTConsumer.h" -#include "clang/AST/ASTContext.h" -#include "clang/AST/Decl.h" -#include "clang/AST/DeclCXX.h" -#include "clang/AST/DeclGroup.h" - -#include "clang/Basic/Builtins.h" -#include "clang/Basic/IdentifierTable.h" -#include "clang/Basic/LangOptions.h" -#include "clang/Basic/SourceManager.h" -#include "clang/Basic/TargetInfo.h" - #include "llvm/Support/FormattedStream.h" #include "llvm/Support/raw_ostream.h" @@ -36,7 +24,6 @@ using namespace lldb; using namespace lldb_private; -using namespace clang; TypeList::TypeList() : m_types ()