From: Fangrui Song <maskray@google.com>
Date: Wed, 15 May 2019 09:15:13 +0000 (+0000)
Subject: Group forward declarations in one namespace lldb_private {}
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=de1becfaa198115fa695e6bd939dce94ca15d860;p=platform%2Fupstream%2Fllvm.git

Group forward declarations in one namespace lldb_private {}

llvm-svn: 360757
---

diff --git a/lldb/include/lldb/Core/Address.h b/lldb/include/lldb/Core/Address.h
index 62a2999..080c00e 100644
--- a/lldb/include/lldb/Core/Address.h
+++ b/lldb/include/lldb/Core/Address.h
@@ -19,36 +19,15 @@
 
 namespace lldb_private {
 class Block;
-}
-namespace lldb_private {
 class CompileUnit;
-}
-namespace lldb_private {
 class ExecutionContextScope;
-}
-namespace lldb_private {
 class Function;
-}
-namespace lldb_private {
 class SectionList;
-}
-namespace lldb_private {
 class Stream;
-}
-namespace lldb_private {
 class Symbol;
-}
-namespace lldb_private {
 class SymbolContext;
-}
-namespace lldb_private {
 class Target;
-}
-namespace lldb_private {
 struct LineEntry;
-}
-
-namespace lldb_private {
 
 /// \class Address Address.h "lldb/Core/Address.h"
 /// A section + offset based address class.
diff --git a/lldb/include/lldb/Core/AddressRange.h b/lldb/include/lldb/Core/AddressRange.h
index 832c08e6..4a019bf 100644
--- a/lldb/include/lldb/Core/AddressRange.h
+++ b/lldb/include/lldb/Core/AddressRange.h
@@ -17,15 +17,8 @@
 
 namespace lldb_private {
 class SectionList;
-}
-namespace lldb_private {
 class Stream;
-}
-namespace lldb_private {
 class Target;
-}
-
-namespace lldb_private {
 
 /// \class AddressRange AddressRange.h "lldb/Core/AddressRange.h"
 /// A section + offset based address range class.
diff --git a/lldb/include/lldb/Core/AddressResolver.h b/lldb/include/lldb/Core/AddressResolver.h
index 1eb1357..cd95c7c 100644
--- a/lldb/include/lldb/Core/AddressResolver.h
+++ b/lldb/include/lldb/Core/AddressResolver.h
@@ -18,11 +18,7 @@
 
 namespace lldb_private {
 class ModuleList;
-}
-namespace lldb_private {
 class Stream;
-}
-namespace lldb_private {
 
 /// \class AddressResolver AddressResolver.h "lldb/Core/AddressResolver.h"
 /// This class works with SearchFilter to resolve function names and source
diff --git a/lldb/include/lldb/Core/AddressResolverFileLine.h b/lldb/include/lldb/Core/AddressResolverFileLine.h
index 0b4edc2..b98e7d4 100644
--- a/lldb/include/lldb/Core/AddressResolverFileLine.h
+++ b/lldb/include/lldb/Core/AddressResolverFileLine.h
@@ -18,15 +18,8 @@
 
 namespace lldb_private {
 class Address;
-}
-namespace lldb_private {
 class Stream;
-}
-namespace lldb_private {
 class SymbolContext;
-}
-
-namespace lldb_private {
 
 /// \class AddressResolverFileLine AddressResolverFileLine.h
 /// "lldb/Core/AddressResolverFileLine.h" This class finds address for source
diff --git a/lldb/include/lldb/Core/AddressResolverName.h b/lldb/include/lldb/Core/AddressResolverName.h
index 8f591f7..ad14ef6 100644
--- a/lldb/include/lldb/Core/AddressResolverName.h
+++ b/lldb/include/lldb/Core/AddressResolverName.h
@@ -17,15 +17,8 @@
 
 namespace lldb_private {
 class Address;
-}
-namespace lldb_private {
 class Stream;
-}
-namespace lldb_private {
 class SymbolContext;
-}
-
-namespace lldb_private {
 
 /// \class AddressResolverName AddressResolverName.h
 /// "lldb/Core/AddressResolverName.h" This class finds addresses for a given
diff --git a/lldb/include/lldb/Core/Communication.h b/lldb/include/lldb/Core/Communication.h
index 3874f0b..901b8fd 100644
--- a/lldb/include/lldb/Core/Communication.h
+++ b/lldb/include/lldb/Core/Communication.h
@@ -27,15 +27,8 @@
 
 namespace lldb_private {
 class Connection;
-}
-namespace lldb_private {
 class ConstString;
-}
-namespace lldb_private {
 class Status;
-}
-
-namespace lldb_private {
 
 /// \class Communication Communication.h "lldb/Core/Communication.h" An
 /// abstract communications class.
diff --git a/lldb/include/lldb/Core/Debugger.h b/lldb/include/lldb/Core/Debugger.h
index 794a32b..8e60871 100644
--- a/lldb/include/lldb/Core/Debugger.h
+++ b/lldb/include/lldb/Core/Debugger.h
@@ -45,34 +45,21 @@
 #include <stddef.h>
 #include <stdio.h>
 
-namespace lldb_private {
-class Address;
+namespace llvm {
+class raw_ostream;
 }
+
 namespace lldb_private {
+class Address;
 class CommandInterpreter;
-}
-namespace lldb_private {
 class Process;
-}
-namespace lldb_private {
 class Stream;
-}
-namespace lldb_private {
 class SymbolContext;
-}
-namespace lldb_private {
 class Target;
-}
-namespace lldb_private {
+
 namespace repro {
 class DataRecorder;
 }
-} // namespace lldb_private
-namespace llvm {
-class raw_ostream;
-}
-
-namespace lldb_private {
 
 /// \class Debugger Debugger.h "lldb/Core/Debugger.h"
 /// A class to manage flag bits.
diff --git a/lldb/include/lldb/Core/Disassembler.h b/lldb/include/lldb/Core/Disassembler.h
index b708fee..ba9ca87 100644
--- a/lldb/include/lldb/Core/Disassembler.h
+++ b/lldb/include/lldb/Core/Disassembler.h
@@ -38,41 +38,21 @@
 #include <stdint.h>
 #include <stdio.h>
 
-namespace lldb_private {
-class AddressRange;
+namespace llvm {
+template <typename T> class SmallVectorImpl;
 }
+
 namespace lldb_private {
+class AddressRange;
 class DataExtractor;
-}
-namespace lldb_private {
 class Debugger;
-}
-namespace lldb_private {
 class Disassembler;
-}
-namespace lldb_private {
 class Module;
-}
-namespace lldb_private {
 class Stream;
-}
-namespace lldb_private {
 class SymbolContext;
-}
-namespace lldb_private {
 class SymbolContextList;
-}
-namespace lldb_private {
 class Target;
-}
-namespace lldb_private {
 struct RegisterInfo;
-}
-namespace llvm {
-template <typename T> class SmallVectorImpl;
-}
-
-namespace lldb_private {
 
 class Instruction {
 public:
diff --git a/lldb/include/lldb/Core/EmulateInstruction.h b/lldb/include/lldb/Core/EmulateInstruction.h
index f08cf2c..6b19c17 100644
--- a/lldb/include/lldb/Core/EmulateInstruction.h
+++ b/lldb/include/lldb/Core/EmulateInstruction.h
@@ -23,26 +23,14 @@
 
 #include <stddef.h>
 #include <stdint.h>
+
 namespace lldb_private {
 class OptionValueDictionary;
-}
-namespace lldb_private {
 class RegisterContext;
-}
-namespace lldb_private {
 class RegisterValue;
-}
-namespace lldb_private {
 class Stream;
-}
-namespace lldb_private {
 class Target;
-}
-namespace lldb_private {
 class UnwindPlan;
-}
-
-namespace lldb_private {
 
 /// \class EmulateInstruction EmulateInstruction.h
 /// "lldb/Core/EmulateInstruction.h"
diff --git a/lldb/include/lldb/Core/FileLineResolver.h b/lldb/include/lldb/Core/FileLineResolver.h
index f3cde73..1967ed5 100644
--- a/lldb/include/lldb/Core/FileLineResolver.h
+++ b/lldb/include/lldb/Core/FileLineResolver.h
@@ -18,12 +18,7 @@
 
 namespace lldb_private {
 class Address;
-}
-namespace lldb_private {
 class Stream;
-}
-
-namespace lldb_private {
 
 /// \class FileLineResolver FileLineResolver.h "lldb/Core/FileLineResolver.h"
 /// This class finds address for source file and line.  Optionally, it will
diff --git a/lldb/include/lldb/Core/FileSpecList.h b/lldb/include/lldb/Core/FileSpecList.h
index cbc26c3..79623ef 100644
--- a/lldb/include/lldb/Core/FileSpecList.h
+++ b/lldb/include/lldb/Core/FileSpecList.h
@@ -18,9 +18,6 @@
 
 namespace lldb_private {
 class Stream;
-}
-
-namespace lldb_private {
 
 /// \class FileSpecList FileSpecList.h "lldb/Core/FileSpecList.h"
 /// A file collection class.
diff --git a/lldb/include/lldb/Core/FormatEntity.h b/lldb/include/lldb/Core/FormatEntity.h
index b183624..a0ece68 100644
--- a/lldb/include/lldb/Core/FormatEntity.h
+++ b/lldb/include/lldb/Core/FormatEntity.h
@@ -23,20 +23,10 @@
 
 namespace lldb_private {
 class Address;
-}
-namespace lldb_private {
 class ExecutionContext;
-}
-namespace lldb_private {
 class Stream;
-}
-namespace lldb_private {
 class StringList;
-}
-namespace lldb_private {
 class SymbolContext;
-}
-namespace lldb_private {
 class ValueObject;
 }
 namespace llvm {
diff --git a/lldb/include/lldb/Core/Module.h b/lldb/include/lldb/Core/Module.h
index 25b04a3..544895e 100644
--- a/lldb/include/lldb/Core/Module.h
+++ b/lldb/include/lldb/Core/Module.h
@@ -39,57 +39,22 @@
 
 namespace lldb_private {
 class CompilerDeclContext;
-}
-namespace lldb_private {
 class Function;
-}
-namespace lldb_private {
 class Log;
-}
-namespace lldb_private {
 class ObjectFile;
-}
-namespace lldb_private {
 class RegularExpression;
-}
-namespace lldb_private {
 class SectionList;
-}
-namespace lldb_private {
 class Stream;
-}
-namespace lldb_private {
 class Symbol;
-}
-namespace lldb_private {
 class SymbolContext;
-}
-namespace lldb_private {
 class SymbolContextList;
-}
-namespace lldb_private {
 class SymbolFile;
-}
-namespace lldb_private {
 class SymbolVendor;
-}
-namespace lldb_private {
 class Symtab;
-}
-namespace lldb_private {
 class Target;
-}
-namespace lldb_private {
 class TypeList;
-}
-namespace lldb_private {
 class TypeMap;
-}
-namespace lldb_private {
 class VariableList;
-}
-
-namespace lldb_private {
 
 /// \class Module Module.h "lldb/Core/Module.h"
 /// A class that describes an executable image and its associated
diff --git a/lldb/include/lldb/Core/ModuleList.h b/lldb/include/lldb/Core/ModuleList.h
index 0db9bfd..57ed3c8 100644
--- a/lldb/include/lldb/Core/ModuleList.h
+++ b/lldb/include/lldb/Core/ModuleList.h
@@ -31,48 +31,19 @@
 
 namespace lldb_private {
 class ConstString;
-}
-namespace lldb_private {
 class FileSpecList;
-}
-namespace lldb_private {
 class Function;
-}
-namespace lldb_private {
 class Log;
-}
-namespace lldb_private {
 class Module;
-}
-namespace lldb_private {
 class RegularExpression;
-}
-namespace lldb_private {
 class Stream;
-}
-namespace lldb_private {
 class SymbolContext;
-}
-namespace lldb_private {
 class SymbolContextList;
-}
-namespace lldb_private {
 class SymbolFile;
-}
-namespace lldb_private {
 class Target;
-}
-namespace lldb_private {
 class TypeList;
-}
-namespace lldb_private {
 class UUID;
-}
-namespace lldb_private {
 class VariableList;
-}
-
-namespace lldb_private {
 
 class ModuleListProperties : public Properties {
 public:
diff --git a/lldb/include/lldb/Core/Opcode.h b/lldb/include/lldb/Core/Opcode.h
index 9fdcfdf..1a30ce4 100644
--- a/lldb/include/lldb/Core/Opcode.h
+++ b/lldb/include/lldb/Core/Opcode.h
@@ -18,18 +18,13 @@
 #include <stdint.h>
 #include <string.h>
 
-namespace lldb_private {
-class DataExtractor;
-}
-namespace lldb_private {
-class Stream;
-}
-
 namespace lldb {
 class SBInstruction;
 }
 
 namespace lldb_private {
+class DataExtractor;
+class Stream;
 
 class Opcode {
 public:
diff --git a/lldb/include/lldb/Core/PluginManager.h b/lldb/include/lldb/Core/PluginManager.h
index 10185f3..b21b5cf 100644
--- a/lldb/include/lldb/Core/PluginManager.h
+++ b/lldb/include/lldb/Core/PluginManager.h
@@ -22,17 +22,9 @@
 
 namespace lldb_private {
 class CommandInterpreter;
-}
-namespace lldb_private {
 class ConstString;
-}
-namespace lldb_private {
 class Debugger;
-}
-namespace lldb_private {
 class StringList;
-}
-namespace lldb_private {
 
 class PluginManager {
 public:
diff --git a/lldb/include/lldb/Core/SearchFilter.h b/lldb/include/lldb/Core/SearchFilter.h
index 59de910..bf3c4ec 100644
--- a/lldb/include/lldb/Core/SearchFilter.h
+++ b/lldb/include/lldb/Core/SearchFilter.h
@@ -19,32 +19,14 @@
 
 namespace lldb_private {
 class Address;
-}
-namespace lldb_private {
 class Breakpoint;
-}
-namespace lldb_private {
 class CompileUnit;
-}
-namespace lldb_private {
 class Status;
-}
-namespace lldb_private {
 class Function;
-}
-namespace lldb_private {
 class ModuleList;
-}
-namespace lldb_private {
 class SearchFilter;
-}
-namespace lldb_private {
 class Stream;
-}
-namespace lldb_private {
 class SymbolContext;
-}
-namespace lldb_private {
 class Target;
 }
 
diff --git a/lldb/include/lldb/Core/Section.h b/lldb/include/lldb/Core/Section.h
index 77a5d54..542849b 100644
--- a/lldb/include/lldb/Core/Section.h
+++ b/lldb/include/lldb/Core/Section.h
@@ -26,24 +26,11 @@
 
 namespace lldb_private {
 class Address;
-}
-namespace lldb_private {
 class DataExtractor;
-}
-namespace lldb_private {
 class ObjectFile;
-}
-namespace lldb_private {
 class Section;
-}
-namespace lldb_private {
 class Stream;
-}
-namespace lldb_private {
 class Target;
-}
-
-namespace lldb_private {
 
 class SectionList {
 public:
diff --git a/lldb/include/lldb/Core/SourceManager.h b/lldb/include/lldb/Core/SourceManager.h
index ed5bf2e..bca8177 100644
--- a/lldb/include/lldb/Core/SourceManager.h
+++ b/lldb/include/lldb/Core/SourceManager.h
@@ -24,18 +24,9 @@
 
 namespace lldb_private {
 class RegularExpression;
-}
-namespace lldb_private {
 class Stream;
-}
-namespace lldb_private {
 class SymbolContextList;
-}
-namespace lldb_private {
 class Target;
-}
-
-namespace lldb_private {
 
 class SourceManager {
 public:
diff --git a/lldb/include/lldb/Core/StreamAsynchronousIO.h b/lldb/include/lldb/Core/StreamAsynchronousIO.h
index 1a9ecba..6237e12 100644
--- a/lldb/include/lldb/Core/StreamAsynchronousIO.h
+++ b/lldb/include/lldb/Core/StreamAsynchronousIO.h
@@ -17,9 +17,6 @@
 
 namespace lldb_private {
 class Debugger;
-}
-
-namespace lldb_private {
 
 class StreamAsynchronousIO : public Stream {
 public:
diff --git a/lldb/include/lldb/Core/UserSettingsController.h b/lldb/include/lldb/Core/UserSettingsController.h
index 31ee9cc..6ae3bde 100644
--- a/lldb/include/lldb/Core/UserSettingsController.h
+++ b/lldb/include/lldb/Core/UserSettingsController.h
@@ -22,17 +22,9 @@
 
 namespace lldb_private {
 class CommandInterpreter;
-}
-namespace lldb_private {
 class ConstString;
-}
-namespace lldb_private {
 class ExecutionContext;
-}
-namespace lldb_private {
 class Property;
-}
-namespace lldb_private {
 class Stream;
 }
 
diff --git a/lldb/include/lldb/Core/Value.h b/lldb/include/lldb/Core/Value.h
index 3f5efbf..b786e48 100644
--- a/lldb/include/lldb/Core/Value.h
+++ b/lldb/include/lldb/Core/Value.h
@@ -26,20 +26,10 @@
 
 namespace lldb_private {
 class DataExtractor;
-}
-namespace lldb_private {
 class ExecutionContext;
-}
-namespace lldb_private {
 class Module;
-}
-namespace lldb_private {
 class Stream;
-}
-namespace lldb_private {
 class Type;
-}
-namespace lldb_private {
 class Variable;
 }
 
diff --git a/lldb/include/lldb/Core/ValueObject.h b/lldb/include/lldb/Core/ValueObject.h
index c27a128..0808b86 100644
--- a/lldb/include/lldb/Core/ValueObject.h
+++ b/lldb/include/lldb/Core/ValueObject.h
@@ -39,40 +39,19 @@
 
 #include <stddef.h>
 #include <stdint.h>
+
 namespace lldb_private {
 class Declaration;
-}
-namespace lldb_private {
 class DumpValueObjectOptions;
-}
-namespace lldb_private {
 class EvaluateExpressionOptions;
-}
-namespace lldb_private {
 class ExecutionContextScope;
-}
-namespace lldb_private {
 class Log;
-}
-namespace lldb_private {
 class Scalar;
-}
-namespace lldb_private {
 class Stream;
-}
-namespace lldb_private {
 class SymbolContextScope;
-}
-namespace lldb_private {
 class TypeFormatImpl;
-}
-namespace lldb_private {
 class TypeSummaryImpl;
-}
-namespace lldb_private {
 class TypeSummaryOptions;
-}
-namespace lldb_private {
 
 /// ValueObject:
 ///
diff --git a/lldb/include/lldb/Core/ValueObjectCast.h b/lldb/include/lldb/Core/ValueObjectCast.h
index 4c591c4..feee493 100644
--- a/lldb/include/lldb/Core/ValueObjectCast.h
+++ b/lldb/include/lldb/Core/ValueObjectCast.h
@@ -20,9 +20,6 @@
 
 namespace lldb_private {
 class ConstString;
-}
-
-namespace lldb_private {
 
 // A ValueObject that represents a given value represented as a different type.
 class ValueObjectCast : public ValueObject {
diff --git a/lldb/include/lldb/Core/ValueObjectConstResult.h b/lldb/include/lldb/Core/ValueObjectConstResult.h
index b87e6e2..3bc957e 100644
--- a/lldb/include/lldb/Core/ValueObjectConstResult.h
+++ b/lldb/include/lldb/Core/ValueObjectConstResult.h
@@ -26,14 +26,8 @@
 
 namespace lldb_private {
 class DataExtractor;
-}
-namespace lldb_private {
 class ExecutionContextScope;
-}
-namespace lldb_private {
 class Module;
-}
-namespace lldb_private {
 
 // A frozen ValueObject copied into host memory
 class ValueObjectConstResult : public ValueObject {
diff --git a/lldb/include/lldb/Core/ValueObjectConstResultCast.h b/lldb/include/lldb/Core/ValueObjectConstResultCast.h
index 18eeb5d..be9b12b 100644
--- a/lldb/include/lldb/Core/ValueObjectConstResultCast.h
+++ b/lldb/include/lldb/Core/ValueObjectConstResultCast.h
@@ -22,15 +22,8 @@
 
 namespace lldb_private {
 class DataExtractor;
-}
-namespace lldb_private {
 class Status;
-}
-namespace lldb_private {
 class ValueObject;
-}
-
-namespace lldb_private {
 
 class ValueObjectConstResultCast : public ValueObjectCast {
 public:
diff --git a/lldb/include/lldb/Core/ValueObjectConstResultChild.h b/lldb/include/lldb/Core/ValueObjectConstResultChild.h
index 73da87b..16fa74f 100644
--- a/lldb/include/lldb/Core/ValueObjectConstResultChild.h
+++ b/lldb/include/lldb/Core/ValueObjectConstResultChild.h
@@ -19,17 +19,11 @@
 
 #include <stddef.h>
 #include <stdint.h>
+
 namespace lldb_private {
 class DataExtractor;
-}
-namespace lldb_private {
 class Status;
-}
-namespace lldb_private {
 class ValueObject;
-}
-
-namespace lldb_private {
 
 // A child of a ValueObjectConstResult.
 class ValueObjectConstResultChild : public ValueObjectChild {
diff --git a/lldb/include/lldb/Core/ValueObjectConstResultImpl.h b/lldb/include/lldb/Core/ValueObjectConstResultImpl.h
index 4d69402..ffac98e 100644
--- a/lldb/include/lldb/Core/ValueObjectConstResultImpl.h
+++ b/lldb/include/lldb/Core/ValueObjectConstResultImpl.h
@@ -19,14 +19,8 @@
 #include <stdint.h>
 namespace lldb_private {
 class CompilerType;
-}
-namespace lldb_private {
 class DataExtractor;
-}
-namespace lldb_private {
 class Status;
-}
-namespace lldb_private {
 class ValueObject;
 }
 
diff --git a/lldb/include/lldb/Core/ValueObjectDynamicValue.h b/lldb/include/lldb/Core/ValueObjectDynamicValue.h
index 8f23198..f656d42 100644
--- a/lldb/include/lldb/Core/ValueObjectDynamicValue.h
+++ b/lldb/include/lldb/Core/ValueObjectDynamicValue.h
@@ -26,14 +26,8 @@
 
 namespace lldb_private {
 class DataExtractor;
-}
-namespace lldb_private {
 class Declaration;
-}
-namespace lldb_private {
 class Status;
-}
-namespace lldb_private {
 
 // A ValueObject that represents memory at a given address, viewed as some
 // set lldb type.
diff --git a/lldb/include/lldb/Core/ValueObjectList.h b/lldb/include/lldb/Core/ValueObjectList.h
index 29857e5..809c182 100644
--- a/lldb/include/lldb/Core/ValueObjectList.h
+++ b/lldb/include/lldb/Core/ValueObjectList.h
@@ -18,9 +18,6 @@
 
 namespace lldb_private {
 class ValueObject;
-}
-
-namespace lldb_private {
 
 // A collection of ValueObject values that
 class ValueObjectList {
diff --git a/lldb/include/lldb/Core/ValueObjectMemory.h b/lldb/include/lldb/Core/ValueObjectMemory.h
index f0374eb..df3557f 100644
--- a/lldb/include/lldb/Core/ValueObjectMemory.h
+++ b/lldb/include/lldb/Core/ValueObjectMemory.h
@@ -23,9 +23,6 @@
 
 namespace lldb_private {
 class ExecutionContextScope;
-}
-
-namespace lldb_private {
 
 // A ValueObject that represents memory at a given address, viewed as some
 // set lldb type.
diff --git a/lldb/include/lldb/Core/ValueObjectRegister.h b/lldb/include/lldb/Core/ValueObjectRegister.h
index 5492124..e584be6 100644
--- a/lldb/include/lldb/Core/ValueObjectRegister.h
+++ b/lldb/include/lldb/Core/ValueObjectRegister.h
@@ -23,21 +23,10 @@
 
 namespace lldb_private {
 class DataExtractor;
-}
-namespace lldb_private {
 class Status;
-}
-namespace lldb_private {
 class ExecutionContextScope;
-}
-namespace lldb_private {
 class Scalar;
-}
-namespace lldb_private {
 class Stream;
-}
-
-namespace lldb_private {
 
 // A ValueObject that contains a root variable that may or may not
 // have children.
diff --git a/lldb/include/lldb/Core/ValueObjectSyntheticFilter.h b/lldb/include/lldb/Core/ValueObjectSyntheticFilter.h
index 15b3622..3b14a3e 100644
--- a/lldb/include/lldb/Core/ValueObjectSyntheticFilter.h
+++ b/lldb/include/lldb/Core/ValueObjectSyntheticFilter.h
@@ -26,14 +26,8 @@
 
 namespace lldb_private {
 class Declaration;
-}
-namespace lldb_private {
 class Status;
-}
-namespace lldb_private {
 class SyntheticChildrenFrontEnd;
-}
-namespace lldb_private {
 
 // A ValueObject that obtains its children from some source other than
 // real information
diff --git a/lldb/include/lldb/Core/ValueObjectVariable.h b/lldb/include/lldb/Core/ValueObjectVariable.h
index 75fe617..86bb8ef 100644
--- a/lldb/include/lldb/Core/ValueObjectVariable.h
+++ b/lldb/include/lldb/Core/ValueObjectVariable.h
@@ -23,21 +23,10 @@
 
 namespace lldb_private {
 class DataExtractor;
-}
-namespace lldb_private {
 class Declaration;
-}
-namespace lldb_private {
 class Status;
-}
-namespace lldb_private {
 class ExecutionContextScope;
-}
-namespace lldb_private {
 class SymbolContextScope;
-}
-
-namespace lldb_private {
 
 // A ValueObject that contains a root variable that may or may not
 // have children.
diff --git a/lldb/include/lldb/Target/DynamicLoader.h b/lldb/include/lldb/Target/DynamicLoader.h
index c3f8fa5..2bf3f32 100644
--- a/lldb/include/lldb/Target/DynamicLoader.h
+++ b/lldb/include/lldb/Target/DynamicLoader.h
@@ -22,23 +22,11 @@
 #include <stdint.h>
 namespace lldb_private {
 class ModuleList;
-}
-namespace lldb_private {
 class Process;
-}
-namespace lldb_private {
 class SectionList;
-}
-namespace lldb_private {
 class Symbol;
-}
-namespace lldb_private {
 class SymbolContext;
-}
-namespace lldb_private {
 class SymbolContextList;
-}
-namespace lldb_private {
 class Thread;
 }
 
diff --git a/lldb/include/lldb/Utility/Broadcaster.h b/lldb/include/lldb/Utility/Broadcaster.h
index c278ccd..2667f25 100644
--- a/lldb/include/lldb/Utility/Broadcaster.h
+++ b/lldb/include/lldb/Utility/Broadcaster.h
@@ -26,14 +26,8 @@
 
 namespace lldb_private {
 class Broadcaster;
-}
-namespace lldb_private {
 class EventData;
-}
-namespace lldb_private {
 class Listener;
-}
-namespace lldb_private {
 class Stream;
 }
 
diff --git a/lldb/include/lldb/Utility/Connection.h b/lldb/include/lldb/Utility/Connection.h
index a525d7f..77f3ef4 100644
--- a/lldb/include/lldb/Utility/Connection.h
+++ b/lldb/include/lldb/Utility/Connection.h
@@ -22,8 +22,6 @@
 
 namespace lldb_private {
 class Status;
-}
-namespace lldb_private {
 template <typename Ratio> class Timeout;
 }
 
diff --git a/lldb/include/lldb/Utility/DataExtractor.h b/lldb/include/lldb/Utility/DataExtractor.h
index 52c93b1..74174b3 100644
--- a/lldb/include/lldb/Utility/DataExtractor.h
+++ b/lldb/include/lldb/Utility/DataExtractor.h
@@ -21,8 +21,6 @@
 
 namespace lldb_private {
 class Log;
-}
-namespace lldb_private {
 class Stream;
 }
 namespace llvm {
diff --git a/lldb/include/lldb/Utility/Event.h b/lldb/include/lldb/Utility/Event.h
index 3743c64..dd5d080 100644
--- a/lldb/include/lldb/Utility/Event.h
+++ b/lldb/include/lldb/Utility/Event.h
@@ -27,8 +27,6 @@
 
 namespace lldb_private {
 class Event;
-}
-namespace lldb_private {
 class Stream;
 }
 
diff --git a/lldb/include/lldb/Utility/JSON.h b/lldb/include/lldb/Utility/JSON.h
index add7da9..172f77a 100644
--- a/lldb/include/lldb/Utility/JSON.h
+++ b/lldb/include/lldb/Utility/JSON.h
@@ -21,8 +21,6 @@
 
 namespace lldb_private {
 class Stream;
-}
-namespace lldb_private {
 
 class JSONValue {
 public:
diff --git a/lldb/include/lldb/Utility/Listener.h b/lldb/include/lldb/Utility/Listener.h
index 21fb0b3..8a8e275 100644
--- a/lldb/include/lldb/Utility/Listener.h
+++ b/lldb/include/lldb/Utility/Listener.h
@@ -28,8 +28,6 @@
 
 namespace lldb_private {
 class ConstString;
-}
-namespace lldb_private {
 class Event;
 }
 
diff --git a/lldb/include/lldb/Utility/StringList.h b/lldb/include/lldb/Utility/StringList.h
index e1aa9a6..68c1f87 100644
--- a/lldb/include/lldb/Utility/StringList.h
+++ b/lldb/include/lldb/Utility/StringList.h
@@ -17,8 +17,6 @@
 
 namespace lldb_private {
 class Log;
-}
-namespace lldb_private {
 class Stream;
 }
 
diff --git a/lldb/include/lldb/Utility/StructuredData.h b/lldb/include/lldb/Utility/StructuredData.h
index 7e8569c..75eb2f7 100644
--- a/lldb/include/lldb/Utility/StructuredData.h
+++ b/lldb/include/lldb/Utility/StructuredData.h
@@ -28,8 +28,6 @@
 
 namespace lldb_private {
 class Status;
-}
-namespace lldb_private {
 class Stream;
 }
 
diff --git a/lldb/include/lldb/Utility/UserID.h b/lldb/include/lldb/Utility/UserID.h
index 802f7ac..2dc5cdb 100644
--- a/lldb/include/lldb/Utility/UserID.h
+++ b/lldb/include/lldb/Utility/UserID.h
@@ -11,11 +11,9 @@
 
 #include "lldb/lldb-defines.h"
 #include "lldb/lldb-types.h"
-namespace lldb_private {
-class Stream;
-}
 
 namespace lldb_private {
+class Stream;
 
 /// \class UserID UserID.h "lldb/Core/UserID.h"
 /// A mix in class that contains a generic user ID.