Index: lldb/trunk/examples/interposing/darwin/fd_interposing/FDInterposing.cpp
===================================================================
--- lldb/trunk/examples/interposing/darwin/fd_interposing/FDInterposing.cpp
+++ lldb/trunk/examples/interposing/darwin/fd_interposing/FDInterposing.cpp
@@ -65,7 +65,7 @@
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#include <tr1/memory> // for std::tr1::shared_ptr
+#include <tr1/memory>
 #include <unistd.h>
 #include <vector>
 
Index: lldb/trunk/include/lldb/Core/Address.h
===================================================================
--- lldb/trunk/include/lldb/Core/Address.h
+++ lldb/trunk/include/lldb/Core/Address.h
@@ -10,13 +10,13 @@
 #ifndef liblldb_Address_h_
 #define liblldb_Address_h_
 
-#include "lldb/lldb-defines.h"      // for LLDB_INVALID_ADDRESS
-#include "lldb/lldb-forward.h"      // for SectionWP, SectionSP, ModuleSP
-#include "lldb/lldb-private-enumerations.h" // for AddressClass
-#include "lldb/lldb-types.h"        // for addr_t
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-private-enumerations.h"
+#include "lldb/lldb-types.h"
 
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t, UINT32_MAX, int64_t
+#include <stddef.h>
+#include <stdint.h>
 
 namespace lldb_private {
 class Block;
Index: lldb/trunk/include/lldb/Core/AddressRange.h
===================================================================
--- lldb/trunk/include/lldb/Core/AddressRange.h
+++ lldb/trunk/include/lldb/Core/AddressRange.h
@@ -11,10 +11,10 @@
 #define liblldb_AddressRange_h_
 
 #include "lldb/Core/Address.h"
-#include "lldb/lldb-forward.h" // for SectionSP
-#include "lldb/lldb-types.h"   // for addr_t
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-types.h"
 
-#include <stddef.h> // for size_t
+#include <stddef.h>
 
 namespace lldb_private {
 class SectionList;
Index: lldb/trunk/include/lldb/Core/AddressResolver.h
===================================================================
--- lldb/trunk/include/lldb/Core/AddressResolver.h
+++ lldb/trunk/include/lldb/Core/AddressResolver.h
@@ -12,9 +12,9 @@
 
 #include "lldb/Core/AddressRange.h"
 #include "lldb/Core/SearchFilter.h"
-#include "lldb/lldb-defines.h" // for DISALLOW_COPY_AND_ASSIGN
+#include "lldb/lldb-defines.h"
 
-#include <stddef.h> // for size_t
+#include <stddef.h>
 #include <vector>
 
 namespace lldb_private {
Index: lldb/trunk/include/lldb/Core/AddressResolverFileLine.h
===================================================================
--- lldb/trunk/include/lldb/Core/AddressResolverFileLine.h
+++ lldb/trunk/include/lldb/Core/AddressResolverFileLine.h
@@ -11,11 +11,11 @@
 #define liblldb_AddressResolverFileLine_h_
 
 #include "lldb/Core/AddressResolver.h"
-#include "lldb/Core/SearchFilter.h" // for Searcher, Searcher::CallbackR...
-#include "lldb/Utility/FileSpec.h"  // for FileSpec
-#include "lldb/lldb-defines.h"      // for DISALLOW_COPY_AND_ASSIGN
+#include "lldb/Core/SearchFilter.h"
+#include "lldb/Utility/FileSpec.h"
+#include "lldb/lldb-defines.h"
 
-#include <stdint.h> // for uint32_t
+#include <stdint.h>
 
 namespace lldb_private {
 class Address;
Index: lldb/trunk/include/lldb/Core/AddressResolverName.h
===================================================================
--- lldb/trunk/include/lldb/Core/AddressResolverName.h
+++ lldb/trunk/include/lldb/Core/AddressResolverName.h
@@ -11,10 +11,10 @@
 #define liblldb_AddressResolverName_h_
 
 #include "lldb/Core/AddressResolver.h"
-#include "lldb/Core/SearchFilter.h"   // for Searcher, Searcher::Call...
-#include "lldb/Utility/ConstString.h" // for ConstString
+#include "lldb/Core/SearchFilter.h"
+#include "lldb/Utility/ConstString.h"
 #include "lldb/Utility/RegularExpression.h"
-#include "lldb/lldb-defines.h" // for DISALLOW_COPY_AND_ASSIGN
+#include "lldb/lldb-defines.h"
 
 namespace lldb_private {
 class Address;
Index: lldb/trunk/include/lldb/Core/Broadcaster.h
===================================================================
--- lldb/trunk/include/lldb/Core/Broadcaster.h
+++ lldb/trunk/include/lldb/Core/Broadcaster.h
@@ -11,18 +11,18 @@
 #define liblldb_Broadcaster_h_
 
 #include "lldb/Utility/ConstString.h"
-#include "lldb/lldb-defines.h" // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-forward.h" // for ListenerSP, EventSP, Broadcast...
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-forward.h"
 
 #include "llvm/ADT/SmallVector.h"
 
-#include <cstdint> // for uint32_t, UINT32_MAX
+#include <cstdint>
 #include <map>
-#include <memory> // for shared_ptr, operator==, enable...
+#include <memory>
 #include <mutex>
-#include <set> // for set
+#include <set>
 #include <string>
-#include <utility> // for pair
+#include <utility>
 #include <vector>
 
 namespace lldb_private {
Index: lldb/trunk/include/lldb/Core/Communication.h
===================================================================
--- lldb/trunk/include/lldb/Core/Communication.h
+++ lldb/trunk/include/lldb/Core/Communication.h
@@ -13,18 +13,18 @@
 #include "lldb/Core/Broadcaster.h"
 #include "lldb/Host/HostThread.h"
 #include "lldb/Utility/Timeout.h"
-#include "lldb/lldb-defines.h"      // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-enumerations.h" // for ConnectionStatus, FLAGS_ANONYMOU...
-#include "lldb/lldb-forward.h"      // for ConnectionSP
-#include "lldb/lldb-types.h"        // for thread_arg_t, thread_result_t
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-types.h"
 
 #include <atomic>
 #include <mutex>
-#include <ratio> // for micro
+#include <ratio>
 #include <string>
 
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint8_t
+#include <stddef.h>
+#include <stdint.h>
 
 namespace lldb_private {
 class Connection;
Index: lldb/trunk/include/lldb/Core/Debugger.h
===================================================================
--- lldb/trunk/include/lldb/Core/Debugger.h
+++ lldb/trunk/include/lldb/Core/Debugger.h
@@ -26,28 +26,28 @@
 #include "lldb/Core/UserSettingsController.h"
 #include "lldb/Host/HostThread.h"
 #include "lldb/Host/Terminal.h"
-#include "lldb/Target/ExecutionContext.h" // for ExecutionContext
+#include "lldb/Target/ExecutionContext.h"
 #include "lldb/Target/Platform.h"
 #include "lldb/Target/TargetList.h"
-#include "lldb/Utility/ConstString.h" // for ConstString
-#include "lldb/Utility/FileSpec.h"    // for FileSpec
-#include "lldb/Utility/Status.h"      // for Status
+#include "lldb/Utility/ConstString.h"
+#include "lldb/Utility/FileSpec.h"
+#include "lldb/Utility/Status.h"
 #include "lldb/Utility/UserID.h"
-#include "lldb/lldb-defines.h"              // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-enumerations.h"         // for ScriptLanguage, Langua...
-#include "lldb/lldb-forward.h"              // for StreamFileSP, DebuggerSP
-#include "lldb/lldb-private-enumerations.h" // for VarSetOperationType
-#include "lldb/lldb-private-types.h"        // for LoadPluginCallbackType
-#include "lldb/lldb-types.h"                // for LogOutputCallback, thr...
-
-#include "llvm/ADT/ArrayRef.h"           // for ArrayRef
-#include "llvm/ADT/StringMap.h"          // for StringMap
-#include "llvm/ADT/StringRef.h"          // for StringRef
-#include "llvm/Support/DynamicLibrary.h" // for DynamicLibrary
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-private-enumerations.h"
+#include "lldb/lldb-private-types.h"
+#include "lldb/lldb-types.h"
+
+#include "llvm/ADT/ArrayRef.h"
+#include "llvm/ADT/StringMap.h"
+#include "llvm/ADT/StringRef.h"
+#include "llvm/Support/DynamicLibrary.h"
 #include "llvm/Support/Threading.h"
 
-#include <assert.h> // for assert
-#include <stddef.h> // for size_t
+#include <assert.h>
+#include <stddef.h>
 #include <stdio.h>
 
 namespace lldb_private {
Index: lldb/trunk/include/lldb/Core/Disassembler.h
===================================================================
--- lldb/trunk/include/lldb/Core/Disassembler.h
+++ lldb/trunk/include/lldb/Core/Disassembler.h
@@ -12,32 +12,32 @@
 
 #include "lldb/Core/Address.h"
 #include "lldb/Core/EmulateInstruction.h"
-#include "lldb/Core/FormatEntity.h" // for FormatEntity
+#include "lldb/Core/FormatEntity.h"
 #include "lldb/Core/Opcode.h"
 #include "lldb/Core/PluginInterface.h"
 #include "lldb/Interpreter/OptionValue.h"
 #include "lldb/Symbol/LineEntry.h"
-#include "lldb/Target/ExecutionContext.h" // for ExecutionContext
+#include "lldb/Target/ExecutionContext.h"
 #include "lldb/Utility/ArchSpec.h"
-#include "lldb/Utility/ConstString.h" // for ConstString
+#include "lldb/Utility/ConstString.h"
 #include "lldb/Utility/FileSpec.h"
-#include "lldb/lldb-defines.h"      // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-forward.h"      // for InstructionSP, DisassemblerSP
-#include "lldb/lldb-private-enumerations.h" // for AddressClass
-#include "lldb/lldb-types.h"        // for addr_t, offset_t
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-private-enumerations.h"
+#include "lldb/lldb-types.h"
 
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "llvm/ADT/StringRef.h"
 
-#include <functional> // for function
+#include <functional>
 #include <map>
-#include <memory> // for enable_shared_from_this
+#include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t, int64_t
-#include <stdio.h>  // for FILE
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
 
 namespace lldb_private {
 class AddressRange;
Index: lldb/trunk/include/lldb/Core/DumpDataExtractor.h
===================================================================
--- lldb/trunk/include/lldb/Core/DumpDataExtractor.h
+++ lldb/trunk/include/lldb/Core/DumpDataExtractor.h
@@ -10,11 +10,11 @@
 #ifndef LLDB_CORE_DUMPDATAEXTRACTOR_H
 #define LLDB_CORE_DUMPDATAEXTRACTOR_H
 
-#include "lldb/lldb-enumerations.h" // for Format
+#include "lldb/lldb-enumerations.h"
 #include "lldb/lldb-types.h"
 
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t, uint64_t
+#include <stddef.h>
+#include <stdint.h>
 
 namespace lldb_private {
 class DataExtractor;
Index: lldb/trunk/include/lldb/Core/EmulateInstruction.h
===================================================================
--- lldb/trunk/include/lldb/Core/EmulateInstruction.h
+++ lldb/trunk/include/lldb/Core/EmulateInstruction.h
@@ -12,18 +12,18 @@
 
 #include <string>
 
-#include "lldb/Core/Address.h" // for Address
+#include "lldb/Core/Address.h"
 #include "lldb/Core/Opcode.h"
 #include "lldb/Core/PluginInterface.h"
 #include "lldb/Utility/ArchSpec.h"
-#include "lldb/lldb-defines.h"              // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-enumerations.h"         // for RegisterKind, ByteOrder
-#include "lldb/lldb-private-enumerations.h" // for InstructionType
-#include "lldb/lldb-private-types.h"        // for RegisterInfo
-#include "lldb/lldb-types.h"                // for addr_t
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-private-enumerations.h"
+#include "lldb/lldb-private-types.h"
+#include "lldb/lldb-types.h"
 
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t, uint64_t, int64_t
+#include <stddef.h>
+#include <stdint.h>
 namespace lldb_private {
 class OptionValueDictionary;
 }
Index: lldb/trunk/include/lldb/Core/Event.h
===================================================================
--- lldb/trunk/include/lldb/Core/Event.h
+++ lldb/trunk/include/lldb/Core/Event.h
@@ -14,17 +14,17 @@
 #include "lldb/Utility/ConstString.h"
 #include "lldb/Utility/Predicate.h"
 #include "lldb/Utility/StructuredData.h"
-#include "lldb/lldb-defines.h" // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-forward.h" // for EventDataSP, ProcessSP, Struct...
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-forward.h"
 
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "llvm/ADT/StringRef.h"
 
 #include <chrono>
 #include <memory>
 #include <string>
 
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t
+#include <stddef.h>
+#include <stdint.h>
 
 namespace lldb_private {
 class Event;
Index: lldb/trunk/include/lldb/Core/FileLineResolver.h
===================================================================
--- lldb/trunk/include/lldb/Core/FileLineResolver.h
+++ lldb/trunk/include/lldb/Core/FileLineResolver.h
@@ -10,12 +10,12 @@
 #ifndef liblldb_FileLineResolver_h_
 #define liblldb_FileLineResolver_h_
 
-#include "lldb/Core/SearchFilter.h" // for Searcher, Searcher::CallbackR...
+#include "lldb/Core/SearchFilter.h"
 #include "lldb/Symbol/SymbolContext.h"
-#include "lldb/Utility/FileSpec.h" // for FileSpec
-#include "lldb/lldb-defines.h"     // for DISALLOW_COPY_AND_ASSIGN
+#include "lldb/Utility/FileSpec.h"
+#include "lldb/lldb-defines.h"
 
-#include <stdint.h> // for uint32_t, UINT32_MAX
+#include <stdint.h>
 
 namespace lldb_private {
 class Address;
Index: lldb/trunk/include/lldb/Core/FileSpecList.h
===================================================================
--- lldb/trunk/include/lldb/Core/FileSpecList.h
+++ lldb/trunk/include/lldb/Core/FileSpecList.h
@@ -15,7 +15,7 @@
 
 #include <vector>
 
-#include <stddef.h> // for size_t
+#include <stddef.h>
 
 namespace lldb_private {
 class Stream;
Index: lldb/trunk/include/lldb/Core/FormatEntity.h
===================================================================
--- lldb/trunk/include/lldb/Core/FormatEntity.h
+++ lldb/trunk/include/lldb/Core/FormatEntity.h
@@ -11,13 +11,13 @@
 #define liblldb_FormatEntity_h_
 
 #include "lldb/Utility/CompletionRequest.h"
-#include "lldb/Utility/FileSpec.h" // for FileSpec
+#include "lldb/Utility/FileSpec.h"
 #include "lldb/Utility/Status.h"
-#include "lldb/lldb-enumerations.h" // for Format::eFormatDefault, Format
-#include "lldb/lldb-types.h"        // for addr_t
-#include <algorithm>                // for min
-#include <stddef.h>                 // for size_t
-#include <stdint.h>                 // for uint32_t, uint64_t
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-types.h"
+#include <algorithm>
+#include <stddef.h>
+#include <stdint.h>
 
 #include <string>
 #include <vector>
Index: lldb/trunk/include/lldb/Core/IOHandler.h
===================================================================
--- lldb/trunk/include/lldb/Core/IOHandler.h
+++ lldb/trunk/include/lldb/Core/IOHandler.h
@@ -16,17 +16,17 @@
 #include "lldb/Utility/Predicate.h"
 #include "lldb/Utility/Stream.h"
 #include "lldb/Utility/StringList.h"
-#include "lldb/lldb-defines.h"  // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-forward.h"  // for IOHandlerSP, StreamFileSP
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-forward.h"
+#include "llvm/ADT/StringRef.h"
 
 #include <memory>
 #include <mutex>
 #include <string>
 #include <vector>
 
-#include <stdint.h> // for uint32_t
-#include <stdio.h>  // for FILE
+#include <stdint.h>
+#include <stdio.h>
 
 namespace lldb_private {
 class Debugger;
Index: lldb/trunk/include/lldb/Core/Listener.h
===================================================================
--- lldb/trunk/include/lldb/Core/Listener.h
+++ lldb/trunk/include/lldb/Core/Listener.h
@@ -10,22 +10,22 @@
 #ifndef liblldb_Select_h_
 #define liblldb_Select_h_
 
-#include "lldb/Core/Broadcaster.h" // for Broadcaster::BroadcasterImplWP
+#include "lldb/Core/Broadcaster.h"
 #include "lldb/Utility/Timeout.h"
-#include "lldb/lldb-defines.h" // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-forward.h" // for BroadcasterManagerWP, EventSP
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-forward.h"
 
 #include <condition_variable>
 #include <list>
 #include <map>
-#include <memory> // for owner_less, enable_shared_from_this
+#include <memory>
 #include <mutex>
-#include <ratio> // for micro
+#include <ratio>
 #include <string>
 #include <vector>
 
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t
+#include <stddef.h>
+#include <stdint.h>
 
 namespace lldb_private {
 class ConstString;
Index: lldb/trunk/include/lldb/Core/Module.h
===================================================================
--- lldb/trunk/include/lldb/Core/Module.h
+++ lldb/trunk/include/lldb/Core/Module.h
@@ -10,31 +10,31 @@
 #ifndef liblldb_Module_h_
 #define liblldb_Module_h_
 
-#include "lldb/Core/Address.h"    // for Address
-#include "lldb/Core/ModuleSpec.h" // for ModuleSpec
-#include "lldb/Symbol/ObjectFile.h" // for ObjectFile
+#include "lldb/Core/Address.h"
+#include "lldb/Core/ModuleSpec.h"
+#include "lldb/Symbol/ObjectFile.h"
 #include "lldb/Symbol/SymbolContextScope.h"
 #include "lldb/Symbol/TypeSystem.h"
 #include "lldb/Target/PathMappingList.h"
 #include "lldb/Utility/ArchSpec.h"
-#include "lldb/Utility/ConstString.h" // for ConstString
+#include "lldb/Utility/ConstString.h"
 #include "lldb/Utility/FileSpec.h"
-#include "lldb/Utility/Status.h" // for Status
+#include "lldb/Utility/Status.h"
 #include "lldb/Utility/UUID.h"
-#include "lldb/lldb-defines.h"      // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-enumerations.h" // for LanguageType, SymbolType
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
 #include "lldb/lldb-forward.h"
-#include "lldb/lldb-types.h" // for addr_t, offset_t
+#include "lldb/lldb-types.h"
 
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/Chrono.h"
 
 #include <atomic>
-#include <memory> // for enable_shared_from_this
+#include <memory>
 #include <mutex>
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t, uint64_t
+#include <stddef.h>
+#include <stdint.h>
 #include <string>
 #include <vector>
 
Index: lldb/trunk/include/lldb/Core/ModuleList.h
===================================================================
--- lldb/trunk/include/lldb/Core/ModuleList.h
+++ lldb/trunk/include/lldb/Core/ModuleList.h
@@ -10,12 +10,12 @@
 #ifndef liblldb_ModuleList_h_
 #define liblldb_ModuleList_h_
 
-#include "lldb/Core/Address.h"     // for Address
-#include "lldb/Core/ModuleSpec.h"  // for ModuleSpec
+#include "lldb/Core/Address.h"
+#include "lldb/Core/ModuleSpec.h"
 #include "lldb/Core/UserSettingsController.h"
-#include "lldb/Utility/FileSpec.h" // for FileSpec
+#include "lldb/Utility/FileSpec.h"
 #include "lldb/Utility/Iterable.h"
-#include "lldb/Utility/Status.h" // for Status
+#include "lldb/Utility/Status.h"
 #include "lldb/lldb-enumerations.h"
 #include "lldb/lldb-forward.h"
 #include "lldb/lldb-types.h"
@@ -27,8 +27,8 @@
 #include <mutex>
 #include <vector>
 
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t
+#include <stddef.h>
+#include <stdint.h>
 
 namespace lldb_private {
 class ConstString;
Index: lldb/trunk/include/lldb/Core/Opcode.h
===================================================================
--- lldb/trunk/include/lldb/Core/Opcode.h
+++ lldb/trunk/include/lldb/Core/Opcode.h
@@ -11,12 +11,12 @@
 #define lldb_Opcode_h
 
 #include "lldb/Utility/Endian.h"
-#include "lldb/lldb-enumerations.h" // for ByteOrder, ByteOrder::eByteOrde...
+#include "lldb/lldb-enumerations.h"
 
 #include "llvm/Support/MathExtras.h"
 
-#include <assert.h> // for assert
-#include <stdint.h> // for uint32_t, uint8_t, uint16_t
+#include <assert.h>
+#include <stdint.h>
 #include <string.h>
 
 namespace lldb_private {
Index: lldb/trunk/include/lldb/Core/PluginManager.h
===================================================================
--- lldb/trunk/include/lldb/Core/PluginManager.h
+++ lldb/trunk/include/lldb/Core/PluginManager.h
@@ -12,14 +12,14 @@
 
 #include "lldb/Core/Architecture.h"
 #include "lldb/Utility/FileSpec.h"
-#include "lldb/Utility/Status.h"          // for Status
-#include "lldb/lldb-enumerations.h"       // for ScriptLanguage
-#include "lldb/lldb-forward.h"            // for OptionValuePropertiesSP
-#include "lldb/lldb-private-interfaces.h" // for DebuggerInitializeCallback
-#include "llvm/ADT/StringRef.h"           // for StringRef
+#include "lldb/Utility/Status.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-private-interfaces.h"
+#include "llvm/ADT/StringRef.h"
 
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t
+#include <stddef.h>
+#include <stdint.h>
 
 namespace lldb_private {
 class CommandInterpreter;
Index: lldb/trunk/include/lldb/Core/SearchFilter.h
===================================================================
--- lldb/trunk/include/lldb/Core/SearchFilter.h
+++ lldb/trunk/include/lldb/Core/SearchFilter.h
@@ -13,10 +13,10 @@
 #include "lldb/Core/FileSpecList.h"
 #include "lldb/Utility/StructuredData.h"
 
-#include "lldb/Utility/FileSpec.h" // for FileSpec
-#include "lldb/lldb-forward.h"     // for SearchFilterSP, TargetSP, Modu...
+#include "lldb/Utility/FileSpec.h"
+#include "lldb/lldb-forward.h"
 
-#include <stdint.h> // for uint32_t
+#include <stdint.h>
 
 namespace lldb_private {
 class Address;
Index: lldb/trunk/include/lldb/Core/Section.h
===================================================================
--- lldb/trunk/include/lldb/Core/Section.h
+++ lldb/trunk/include/lldb/Core/Section.h
@@ -14,16 +14,16 @@
 #include "lldb/Utility/ConstString.h"
 #include "lldb/Utility/Flags.h"
 #include "lldb/Utility/UserID.h"
-#include "lldb/lldb-defines.h"      // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-enumerations.h" // for SectionType
-#include "lldb/lldb-forward.h"      // for SectionSP, ModuleSP, SectionWP
-#include "lldb/lldb-types.h"        // for addr_t, offset_t, user_id_t
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-types.h"
 
-#include <memory> // for enable_shared_from_this
-#include <vector> // for vector
+#include <memory>
+#include <vector>
 
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t, UINT32_MAX
+#include <stddef.h>
+#include <stdint.h>
 
 namespace lldb_private {
 class Address;
Index: lldb/trunk/include/lldb/Core/SourceManager.h
===================================================================
--- lldb/trunk/include/lldb/Core/SourceManager.h
+++ lldb/trunk/include/lldb/Core/SourceManager.h
@@ -11,16 +11,16 @@
 #define liblldb_SourceManager_h_
 
 #include "lldb/Utility/FileSpec.h"
-#include "lldb/lldb-defines.h" // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-forward.h" // for DebuggerSP, DebuggerWP, DataBufferSP
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-forward.h"
 
 #include "llvm/Support/Chrono.h"
 
-#include <cstdint> // for uint32_t, UINT32_MAX
+#include <cstdint>
 #include <map>
 #include <memory>
-#include <stddef.h> // for size_t
-#include <string>   // for string
+#include <stddef.h>
+#include <string>
 #include <vector>
 
 namespace lldb_private {
Index: lldb/trunk/include/lldb/Core/StreamAsynchronousIO.h
===================================================================
--- lldb/trunk/include/lldb/Core/StreamAsynchronousIO.h
+++ lldb/trunk/include/lldb/Core/StreamAsynchronousIO.h
@@ -14,7 +14,7 @@
 
 #include <string>
 
-#include <stddef.h> // for size_t
+#include <stddef.h>
 
 namespace lldb_private {
 class Debugger;
Index: lldb/trunk/include/lldb/Core/StreamFile.h
===================================================================
--- lldb/trunk/include/lldb/Core/StreamFile.h
+++ lldb/trunk/include/lldb/Core/StreamFile.h
@@ -12,11 +12,11 @@
 
 #include "lldb/Host/File.h"
 #include "lldb/Utility/Stream.h"
-#include "lldb/lldb-defines.h"      // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-enumerations.h" // for FilePermissions::eFilePermission...
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
 
-#include <stdint.h> // for uint32_t
-#include <stdio.h>  // for size_t, FILE
+#include <stdint.h>
+#include <stdio.h>
 
 namespace lldb_private {
 
Index: lldb/trunk/include/lldb/Core/UserSettingsController.h
===================================================================
--- lldb/trunk/include/lldb/Core/UserSettingsController.h
+++ lldb/trunk/include/lldb/Core/UserSettingsController.h
@@ -10,16 +10,16 @@
 #ifndef liblldb_UserSettingsController_h_
 #define liblldb_UserSettingsController_h_
 
-#include "lldb/Utility/Status.h"            // for Status
-#include "lldb/lldb-forward.h"              // for OptionValuePropertiesSP
-#include "lldb/lldb-private-enumerations.h" // for VarSetOperationType
+#include "lldb/Utility/Status.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-private-enumerations.h"
 
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "llvm/ADT/StringRef.h"
 
 #include <vector>
 
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t
+#include <stddef.h>
+#include <stdint.h>
 
 namespace lldb_private {
 class CommandInterpreter;
Index: lldb/trunk/include/lldb/Core/Value.h
===================================================================
--- lldb/trunk/include/lldb/Core/Value.h
+++ lldb/trunk/include/lldb/Core/Value.h
@@ -14,16 +14,16 @@
 #include "lldb/Utility/DataBufferHeap.h"
 #include "lldb/Utility/Scalar.h"
 #include "lldb/Utility/Status.h"
-#include "lldb/lldb-enumerations.h"         // for ByteOrder, ByteOrder::eB...
-#include "lldb/lldb-private-enumerations.h" // for AddressType
-#include "lldb/lldb-private-types.h"        // for type128, RegisterInfo
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-private-enumerations.h"
+#include "lldb/lldb-private-types.h"
 
-#include "llvm/ADT/APInt.h" // for APInt
+#include "llvm/ADT/APInt.h"
 
 #include <vector>
 
-#include <stdint.h> // for uint8_t, uint32_t, uint64_t
-#include <string.h> // for size_t, memcpy
+#include <stdint.h>
+#include <string.h>
 
 namespace lldb_private {
 class DataExtractor;
Index: lldb/trunk/include/lldb/Core/ValueObject.h
===================================================================
--- lldb/trunk/include/lldb/Core/ValueObject.h
+++ lldb/trunk/include/lldb/Core/ValueObject.h
@@ -12,7 +12,7 @@
 
 #include "lldb/Core/Value.h"
 #include "lldb/Symbol/CompilerType.h"
-#include "lldb/Symbol/Type.h" // for TypeImpl
+#include "lldb/Symbol/Type.h"
 #include "lldb/Target/ExecutionContext.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Utility/ConstString.h"
@@ -20,26 +20,26 @@
 #include "lldb/Utility/SharedCluster.h"
 #include "lldb/Utility/Status.h"
 #include "lldb/Utility/UserID.h"
-#include "lldb/lldb-defines.h"              // for LLDB_INVALID...
-#include "lldb/lldb-enumerations.h"         // for DynamicValue...
-#include "lldb/lldb-forward.h"              // for ValueObjectSP
-#include "lldb/lldb-private-enumerations.h" // for AddressType
-#include "lldb/lldb-types.h"                // for addr_t, offs...
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-private-enumerations.h"
+#include "lldb/lldb-types.h"
 
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/Optional.h"
 #include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "llvm/ADT/StringRef.h"
 
 #include <functional>
 #include <initializer_list>
 #include <map>
-#include <mutex>   // for recursive_mutex
-#include <string>  // for string
-#include <utility> // for pair
+#include <mutex>
+#include <string>
+#include <utility>
 
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t
+#include <stddef.h>
+#include <stdint.h>
 namespace lldb_private {
 class Declaration;
 }
Index: lldb/trunk/include/lldb/Core/ValueObjectCast.h
===================================================================
--- lldb/trunk/include/lldb/Core/ValueObjectCast.h
+++ lldb/trunk/include/lldb/Core/ValueObjectCast.h
@@ -11,13 +11,13 @@
 #define liblldb_ValueObjectCast_h_
 
 #include "lldb/Core/ValueObject.h"
-#include "lldb/Symbol/CompilerType.h" // for CompilerType
-#include "lldb/lldb-defines.h"        // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-enumerations.h"   // for ValueType
-#include "lldb/lldb-forward.h"        // for ValueObjectSP
+#include "lldb/Symbol/CompilerType.h"
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-forward.h"
 
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t, uint64_t
+#include <stddef.h>
+#include <stdint.h>
 
 namespace lldb_private {
 class ConstString;
Index: lldb/trunk/include/lldb/Core/ValueObjectChild.h
===================================================================
--- lldb/trunk/include/lldb/Core/ValueObjectChild.h
+++ lldb/trunk/include/lldb/Core/ValueObjectChild.h
@@ -12,17 +12,17 @@
 
 #include "lldb/Core/ValueObject.h"
 
-#include "lldb/Symbol/CompilerType.h"       // for CompilerType
-#include "lldb/Utility/ConstString.h"       // for ConstString
-#include "lldb/lldb-defines.h"              // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-enumerations.h"         // for ValueType
-#include "lldb/lldb-private-enumerations.h" // for LazyBool, AddressType
-#include "lldb/lldb-types.h"                // for offset_t
+#include "lldb/Symbol/CompilerType.h"
+#include "lldb/Utility/ConstString.h"
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-private-enumerations.h"
+#include "lldb/lldb-types.h"
 
 #include "llvm/ADT/Optional.h"
 
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t, uint64_t, int32_t
+#include <stddef.h>
+#include <stdint.h>
 
 namespace lldb_private {
 
Index: lldb/trunk/include/lldb/Core/ValueObjectConstResult.h
===================================================================
--- lldb/trunk/include/lldb/Core/ValueObjectConstResult.h
+++ lldb/trunk/include/lldb/Core/ValueObjectConstResult.h
@@ -10,20 +10,20 @@
 #ifndef liblldb_ValueObjectConstResult_h_
 #define liblldb_ValueObjectConstResult_h_
 
-#include "lldb/Core/Value.h" // for Value
+#include "lldb/Core/Value.h"
 #include "lldb/Core/ValueObject.h"
 #include "lldb/Core/ValueObjectConstResultImpl.h"
-#include "lldb/Symbol/CompilerType.h"       // for CompilerType
-#include "lldb/Utility/ConstString.h"       // for ConstString
-#include "lldb/Utility/Status.h"            // for Status
-#include "lldb/lldb-defines.h"              // for LLDB_INVALID_ADDRESS
-#include "lldb/lldb-enumerations.h"         // for ByteOrder, Dynamic...
-#include "lldb/lldb-forward.h"              // for ValueObjectSP, Dat...
-#include "lldb/lldb-private-enumerations.h" // for AddressType, Addre...
-#include "lldb/lldb-types.h"                // for addr_t
+#include "lldb/Symbol/CompilerType.h"
+#include "lldb/Utility/ConstString.h"
+#include "lldb/Utility/Status.h"
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-private-enumerations.h"
+#include "lldb/lldb-types.h"
 
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t, uint64_t
+#include <stddef.h>
+#include <stdint.h>
 
 namespace lldb_private {
 class DataExtractor;
Index: lldb/trunk/include/lldb/Core/ValueObjectConstResultCast.h
===================================================================
--- lldb/trunk/include/lldb/Core/ValueObjectConstResultCast.h
+++ lldb/trunk/include/lldb/Core/ValueObjectConstResultCast.h
@@ -12,14 +12,14 @@
 
 #include "lldb/Core/ValueObjectCast.h"
 #include "lldb/Core/ValueObjectConstResultImpl.h"
-#include "lldb/Symbol/CompilerType.h" // for CompilerType
-#include "lldb/Utility/ConstString.h" // for ConstString
-#include "lldb/lldb-defines.h"        // for DISALLOW_COPY_AND_...
-#include "lldb/lldb-forward.h"        // for ValueObjectSP
-#include "lldb/lldb-types.h"          // for addr_t
+#include "lldb/Symbol/CompilerType.h"
+#include "lldb/Utility/ConstString.h"
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-types.h"
 
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t, int32_t
+#include <stddef.h>
+#include <stdint.h>
 
 namespace lldb_private {
 class DataExtractor;
Index: lldb/trunk/include/lldb/Core/ValueObjectConstResultChild.h
===================================================================
--- lldb/trunk/include/lldb/Core/ValueObjectConstResultChild.h
+++ lldb/trunk/include/lldb/Core/ValueObjectConstResultChild.h
@@ -12,14 +12,14 @@
 
 #include "lldb/Core/ValueObjectChild.h"
 #include "lldb/Core/ValueObjectConstResultImpl.h"
-#include "lldb/Symbol/CompilerType.h" // for CompilerType
-#include "lldb/Utility/ConstString.h" // for ConstString
-#include "lldb/lldb-defines.h"        // for DISALLOW_COPY_AND_...
-#include "lldb/lldb-forward.h"        // for ValueObjectSP
-#include "lldb/lldb-types.h"          // for addr_t
+#include "lldb/Symbol/CompilerType.h"
+#include "lldb/Utility/ConstString.h"
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-types.h"
 
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t, int32_t
+#include <stddef.h>
+#include <stdint.h>
 namespace lldb_private {
 class DataExtractor;
 }
Index: lldb/trunk/include/lldb/Core/ValueObjectConstResultImpl.h
===================================================================
--- lldb/trunk/include/lldb/Core/ValueObjectConstResultImpl.h
+++ lldb/trunk/include/lldb/Core/ValueObjectConstResultImpl.h
@@ -10,14 +10,14 @@
 #ifndef liblldb_ValueObjectConstResultImpl_h_
 #define liblldb_ValueObjectConstResultImpl_h_
 
-#include "lldb/Utility/ConstString.h"       // for ConstString
-#include "lldb/lldb-defines.h"              // for LLDB_INVALID_ADDRESS
-#include "lldb/lldb-forward.h"              // for ValueObjectSP
-#include "lldb/lldb-private-enumerations.h" // for AddressType, AddressType...
-#include "lldb/lldb-types.h"                // for addr_t
+#include "lldb/Utility/ConstString.h"
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-private-enumerations.h"
+#include "lldb/lldb-types.h"
 
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t, int32_t
+#include <stddef.h>
+#include <stdint.h>
 namespace lldb_private {
 class CompilerType;
 }
Index: lldb/trunk/include/lldb/Core/ValueObjectDynamicValue.h
===================================================================
--- lldb/trunk/include/lldb/Core/ValueObjectDynamicValue.h
+++ lldb/trunk/include/lldb/Core/ValueObjectDynamicValue.h
@@ -10,20 +10,20 @@
 #ifndef liblldb_ValueObjectDynamicValue_h_
 #define liblldb_ValueObjectDynamicValue_h_
 
-#include "lldb/Core/Address.h" // for Address
+#include "lldb/Core/Address.h"
 #include "lldb/Core/ValueObject.h"
-#include "lldb/Symbol/CompilerType.h" // for CompilerType
+#include "lldb/Symbol/CompilerType.h"
 #include "lldb/Symbol/Type.h"
-#include "lldb/Utility/ConstString.h"       // for ConstString
-#include "lldb/Utility/SharingPtr.h"        // for operator==
-#include "lldb/lldb-defines.h"              // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-enumerations.h"         // for DynamicValueType, Langua...
-#include "lldb/lldb-forward.h"              // for ValueObjectSP, VariableSP
-#include "lldb/lldb-private-enumerations.h" // for LazyBool, LazyBool::eLaz...
-
-#include <assert.h> // for assert
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint64_t, uint32_t
+#include "lldb/Utility/ConstString.h"
+#include "lldb/Utility/SharingPtr.h"
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-private-enumerations.h"
+
+#include <assert.h>
+#include <stddef.h>
+#include <stdint.h>
 
 namespace lldb_private {
 class DataExtractor;
Index: lldb/trunk/include/lldb/Core/ValueObjectList.h
===================================================================
--- lldb/trunk/include/lldb/Core/ValueObjectList.h
+++ lldb/trunk/include/lldb/Core/ValueObjectList.h
@@ -10,12 +10,12 @@
 #ifndef liblldb_ValueObjectList_h_
 #define liblldb_ValueObjectList_h_
 
-#include "lldb/lldb-forward.h" // for ValueObjectSP
-#include "lldb/lldb-types.h"   // for user_id_t
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-types.h"
 
 #include <vector>
 
-#include <stddef.h> // for size_t
+#include <stddef.h>
 
 namespace lldb_private {
 class ValueObject;
Index: lldb/trunk/include/lldb/Core/ValueObjectMemory.h
===================================================================
--- lldb/trunk/include/lldb/Core/ValueObjectMemory.h
+++ lldb/trunk/include/lldb/Core/ValueObjectMemory.h
@@ -10,17 +10,17 @@
 #ifndef liblldb_ValueObjectMemory_h_
 #define liblldb_ValueObjectMemory_h_
 
-#include "lldb/Core/Address.h" // for Address
+#include "lldb/Core/Address.h"
 #include "lldb/Core/ValueObject.h"
 #include "lldb/Symbol/CompilerType.h"
-#include "lldb/Utility/ConstString.h" // for ConstString
-#include "lldb/lldb-defines.h"        // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-enumerations.h"   // for ValueType
-#include "lldb/lldb-forward.h"        // for TypeSP, ValueObjectSP, ModuleSP
-#include "llvm/ADT/StringRef.h"       // for StringRef
+#include "lldb/Utility/ConstString.h"
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-forward.h"
+#include "llvm/ADT/StringRef.h"
 
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t, uint64_t
+#include <stddef.h>
+#include <stdint.h>
 
 namespace lldb_private {
 class ExecutionContextScope;
Index: lldb/trunk/include/lldb/Core/ValueObjectRegister.h
===================================================================
--- lldb/trunk/include/lldb/Core/ValueObjectRegister.h
+++ lldb/trunk/include/lldb/Core/ValueObjectRegister.h
@@ -11,16 +11,16 @@
 #define liblldb_ValueObjectRegister_h_
 
 #include "lldb/Core/ValueObject.h"
-#include "lldb/Symbol/CompilerType.h" // for CompilerType
-#include "lldb/Utility/ConstString.h" // for ConstString
+#include "lldb/Symbol/CompilerType.h"
+#include "lldb/Utility/ConstString.h"
 #include "lldb/Utility/RegisterValue.h"
-#include "lldb/lldb-defines.h"       // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-enumerations.h"  // for ValueType, ValueType::eValueTy...
-#include "lldb/lldb-forward.h"       // for RegisterContextSP, ValueObjectSP
-#include "lldb/lldb-private-types.h" // for RegisterInfo, RegisterSet (ptr...
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-private-types.h"
 
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t, uint64_t, int32_t
+#include <stddef.h>
+#include <stdint.h>
 
 namespace lldb_private {
 class DataExtractor;
Index: lldb/trunk/include/lldb/Core/ValueObjectSyntheticFilter.h
===================================================================
--- lldb/trunk/include/lldb/Core/ValueObjectSyntheticFilter.h
+++ lldb/trunk/include/lldb/Core/ValueObjectSyntheticFilter.h
@@ -13,17 +13,17 @@
 #include "lldb/Core/ThreadSafeSTLMap.h"
 #include "lldb/Core/ThreadSafeSTLVector.h"
 #include "lldb/Core/ValueObject.h"
-#include "lldb/Symbol/CompilerType.h"       // for CompilerType
-#include "lldb/Utility/ConstString.h"       // for ConstString
-#include "lldb/lldb-defines.h"              // for ThreadSafeSTLMap::operator=
-#include "lldb/lldb-enumerations.h"         // for DynamicValueType, Langua...
-#include "lldb/lldb-forward.h"              // for ValueObjectSP, Synthetic...
-#include "lldb/lldb-private-enumerations.h" // for LazyBool, LazyBool::eLaz...
+#include "lldb/Symbol/CompilerType.h"
+#include "lldb/Utility/ConstString.h"
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-private-enumerations.h"
 
-#include <cstdint> // for uint32_t, uint64_t
+#include <cstdint>
 #include <memory>
 
-#include <stddef.h> // for size_t
+#include <stddef.h>
 
 namespace lldb_private {
 class Declaration;
Index: lldb/trunk/include/lldb/Core/ValueObjectVariable.h
===================================================================
--- lldb/trunk/include/lldb/Core/ValueObjectVariable.h
+++ lldb/trunk/include/lldb/Core/ValueObjectVariable.h
@@ -12,15 +12,15 @@
 
 #include "lldb/Core/ValueObject.h"
 
-#include "lldb/Core/Value.h"          // for Value
-#include "lldb/Symbol/CompilerType.h" // for CompilerType
-#include "lldb/Utility/ConstString.h" // for ConstString
-#include "lldb/lldb-defines.h"        // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-enumerations.h"   // for ValueType
-#include "lldb/lldb-forward.h"        // for VariableSP, ModuleSP, ValueObj...
+#include "lldb/Core/Value.h"
+#include "lldb/Symbol/CompilerType.h"
+#include "lldb/Utility/ConstString.h"
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-forward.h"
 
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t, uint64_t
+#include <stddef.h>
+#include <stdint.h>
 
 namespace lldb_private {
 class DataExtractor;
Index: lldb/trunk/include/lldb/Host/TaskPool.h
===================================================================
--- lldb/trunk/include/lldb/Host/TaskPool.h
+++ lldb/trunk/include/lldb/Host/TaskPool.h
@@ -11,12 +11,12 @@
 #define utility_TaskPool_h_
 
 #include "llvm/ADT/STLExtras.h"
-#include <functional> // for bind, function
+#include <functional>
 #include <future>
 #include <list>
-#include <memory>      // for make_shared
-#include <mutex>       // for mutex, unique_lock, condition_variable
-#include <type_traits> // for forward, result_of, move
+#include <memory>
+#include <mutex>
+#include <type_traits>
 
 namespace lldb_private {
 
Index: lldb/trunk/include/lldb/Target/DynamicLoader.h
===================================================================
--- lldb/trunk/include/lldb/Target/DynamicLoader.h
+++ lldb/trunk/include/lldb/Target/DynamicLoader.h
@@ -12,16 +12,16 @@
 
 // Project includes
 #include "lldb/Core/PluginInterface.h"
-#include "lldb/Utility/FileSpec.h" // for FileSpec
+#include "lldb/Utility/FileSpec.h"
 #include "lldb/Utility/Status.h"
 #include "lldb/Utility/UUID.h"
-#include "lldb/lldb-defines.h"              // for LLDB_INVALID_ADDRESS
-#include "lldb/lldb-forward.h"              // for ModuleSP, ThreadPlanSP
-#include "lldb/lldb-private-enumerations.h" // for LazyBool, LazyBool::eLaz...
-#include "lldb/lldb-types.h"                // for addr_t
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-private-enumerations.h"
+#include "lldb/lldb-types.h"
 
-#include <stddef.h> // for size_t
-#include <stdint.h> // for int64_t
+#include <stddef.h>
+#include <stdint.h>
 namespace lldb_private {
 class ModuleList;
 }
Index: lldb/trunk/include/lldb/Utility/ArchSpec.h
===================================================================
--- lldb/trunk/include/lldb/Utility/ArchSpec.h
+++ lldb/trunk/include/lldb/Utility/ArchSpec.h
@@ -15,11 +15,11 @@
 #include "lldb/lldb-enumerations.h"
 #include "lldb/lldb-forward.h"
 #include "lldb/lldb-private-enumerations.h"
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/Triple.h"
-#include <cstddef> // for size_t
-#include <cstdint> // for uint32_t
-#include <string>  // for string
+#include <cstddef>
+#include <cstdint>
+#include <string>
 
 namespace lldb_private {
 
Index: lldb/trunk/include/lldb/Utility/Baton.h
===================================================================
--- lldb/trunk/include/lldb/Utility/Baton.h
+++ lldb/trunk/include/lldb/Utility/Baton.h
@@ -10,10 +10,10 @@
 #ifndef lldb_Baton_h_
 #define lldb_Baton_h_
 
-#include "lldb/lldb-enumerations.h" // for DescriptionLevel
+#include "lldb/lldb-enumerations.h"
 #include "lldb/lldb-public.h"
 
-#include <memory> // for unique_ptr
+#include <memory>
 
 namespace lldb_private {
 class Stream;
Index: lldb/trunk/include/lldb/Utility/Connection.h
===================================================================
--- lldb/trunk/include/lldb/Utility/Connection.h
+++ lldb/trunk/include/lldb/Utility/Connection.h
@@ -10,16 +10,16 @@
 #ifndef liblldb_Connection_h_
 #define liblldb_Connection_h_
 
-#include "lldb/lldb-defines.h"      // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-enumerations.h" // for ConnectionStatus
-#include "lldb/lldb-forward.h"      // for IOObjectSP
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-forward.h"
 
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "llvm/ADT/StringRef.h"
 
-#include <ratio> // for micro
+#include <ratio>
 #include <string>
 
-#include <stddef.h> // for size_t
+#include <stddef.h>
 
 namespace lldb_private {
 class Status;
Index: lldb/trunk/include/lldb/Utility/ConstString.h
===================================================================
--- lldb/trunk/include/lldb/Utility/ConstString.h
+++ lldb/trunk/include/lldb/Utility/ConstString.h
@@ -11,9 +11,9 @@
 #define liblldb_ConstString_h_
 
 #include "llvm/ADT/StringRef.h"
-#include "llvm/Support/FormatVariadic.h" // for format_provider
+#include "llvm/Support/FormatVariadic.h"
 
-#include <stddef.h> // for size_t
+#include <stddef.h>
 
 namespace lldb_private {
 class Stream;
Index: lldb/trunk/include/lldb/Utility/DataBufferHeap.h
===================================================================
--- lldb/trunk/include/lldb/Utility/DataBufferHeap.h
+++ lldb/trunk/include/lldb/Utility/DataBufferHeap.h
@@ -11,10 +11,10 @@
 #define liblldb_DataBufferHeap_h_
 
 #include "lldb/Utility/DataBuffer.h"
-#include "lldb/lldb-types.h"    // for offset_t
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "lldb/lldb-types.h"
+#include "llvm/ADT/StringRef.h"
 
-#include <cstdint> // for uint8_t, uint64_t
+#include <cstdint>
 #include <vector>
 
 namespace lldb_private {
Index: lldb/trunk/include/lldb/Utility/DataBufferLLVM.h
===================================================================
--- lldb/trunk/include/lldb/Utility/DataBufferLLVM.h
+++ lldb/trunk/include/lldb/Utility/DataBufferLLVM.h
@@ -11,10 +11,10 @@
 #define LLDB_CORE_DATABUFFERLLVM_H
 
 #include "lldb/Utility/DataBuffer.h"
-#include "lldb/lldb-types.h" // for offset_t
+#include "lldb/lldb-types.h"
 
 #include <memory>
-#include <stdint.h> // for uint8_t, uint64_t
+#include <stdint.h>
 
 namespace llvm {
 class WritableMemoryBuffer;
Index: lldb/trunk/include/lldb/Utility/DataEncoder.h
===================================================================
--- lldb/trunk/include/lldb/Utility/DataEncoder.h
+++ lldb/trunk/include/lldb/Utility/DataEncoder.h
@@ -12,12 +12,12 @@
 
 #if defined(__cplusplus)
 
-#include "lldb/lldb-defines.h"      // for DISALLOW_COPY_AND_ASSIGN
-#include "lldb/lldb-enumerations.h" // for ByteOrder
-#include "lldb/lldb-forward.h"      // for DataBufferSP
-#include "lldb/lldb-types.h"        // for addr_t
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-types.h"
 
-#include <stddef.h> // for size_t
+#include <stddef.h>
 #include <stdint.h>
 
 namespace lldb_private {
Index: lldb/trunk/include/lldb/Utility/DataExtractor.h
===================================================================
--- lldb/trunk/include/lldb/Utility/DataExtractor.h
+++ lldb/trunk/include/lldb/Utility/DataExtractor.h
@@ -11,8 +11,8 @@
 #define LLDB_UTILITY_DATAEXTRACTOR_H
 
 #include "lldb/lldb-defines.h"
-#include "lldb/lldb-enumerations.h" // for ByteOrder
-#include "lldb/lldb-forward.h"      // for DataBufferSP
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-forward.h"
 #include "lldb/lldb-types.h"
 
 #include <cassert>
Index: lldb/trunk/include/lldb/Utility/FileSpec.h
===================================================================
--- lldb/trunk/include/lldb/Utility/FileSpec.h
+++ lldb/trunk/include/lldb/Utility/FileSpec.h
@@ -24,8 +24,8 @@
 #include "llvm/Support/FormatVariadic.h"
 #include "llvm/Support/Path.h"
 
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t, uint64_t
+#include <stddef.h>
+#include <stdint.h>
 
 namespace lldb_private {
 class Stream;
Index: lldb/trunk/include/lldb/Utility/Log.h
===================================================================
--- lldb/trunk/include/lldb/Utility/Log.h
+++ lldb/trunk/include/lldb/Utility/Log.h
@@ -15,8 +15,8 @@
 #include "lldb/lldb-defines.h"
 
 #include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/StringMap.h" // for StringMap
-#include "llvm/ADT/StringRef.h" // for StringRef, StringLiteral
+#include "llvm/ADT/StringMap.h"
+#include "llvm/ADT/StringRef.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/FormatVariadic.h"
 #include "llvm/Support/ManagedStatic.h"
@@ -25,9 +25,9 @@
 #include <atomic>
 #include <cstdarg>
 #include <cstdint>
-#include <memory>      // for shared_ptr
-#include <string>      // for string
-#include <type_traits> // for forward
+#include <memory>
+#include <string>
+#include <type_traits>
 
 namespace llvm {
 class raw_ostream;
Index: lldb/trunk/include/lldb/Utility/RegisterValue.h
===================================================================
--- lldb/trunk/include/lldb/Utility/RegisterValue.h
+++ lldb/trunk/include/lldb/Utility/RegisterValue.h
@@ -12,12 +12,12 @@
 
 #include "lldb/Utility/Endian.h"
 #include "lldb/Utility/Scalar.h"
-#include "lldb/Utility/Status.h"    // for Status
-#include "lldb/lldb-enumerations.h" // for ByteOrder, Format
-#include "lldb/lldb-types.h"        // for offset_t
+#include "lldb/Utility/Status.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-types.h"
 #include "llvm/ADT/APInt.h"
-#include "llvm/ADT/StringRef.h" // for StringRef
-#include <cstdint>              // for uint32_t, uint8_t, uint64_t, uin...
+#include "llvm/ADT/StringRef.h"
+#include <cstdint>
 #include <cstring>
 
 namespace lldb_private {
Index: lldb/trunk/include/lldb/Utility/RegularExpression.h
===================================================================
--- lldb/trunk/include/lldb/Utility/RegularExpression.h
+++ lldb/trunk/include/lldb/Utility/RegularExpression.h
@@ -40,7 +40,7 @@
 #include <string>
 #include <vector>
 
-#include <stddef.h> // for size_t
+#include <stddef.h>
 #include <stdint.h>
 
 namespace llvm {
Index: lldb/trunk/include/lldb/Utility/Scalar.h
===================================================================
--- lldb/trunk/include/lldb/Utility/Scalar.h
+++ lldb/trunk/include/lldb/Utility/Scalar.h
@@ -10,13 +10,13 @@
 #ifndef LLDB_UTILITY_SCALAR_H
 #define LLDB_UTILITY_SCALAR_H
 
-#include "lldb/Utility/Status.h"     // for Status
-#include "lldb/lldb-enumerations.h"  // for Encoding, ByteOrder
-#include "lldb/lldb-private-types.h" // for type128
+#include "lldb/Utility/Status.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-private-types.h"
 #include "llvm/ADT/APFloat.h"
 #include "llvm/ADT/APInt.h"
-#include <cstddef> // for size_t
-#include <cstdint> // for uint32_t, uint64_t, int64_t
+#include <cstddef>
+#include <cstdint>
 
 namespace lldb_private {
 class DataExtractor;
Index: lldb/trunk/include/lldb/Utility/SelectHelper.h
===================================================================
--- lldb/trunk/include/lldb/Utility/SelectHelper.h
+++ lldb/trunk/include/lldb/Utility/SelectHelper.h
@@ -10,8 +10,8 @@
 #ifndef liblldb_SelectHelper_h_
 #define liblldb_SelectHelper_h_
 
-#include "lldb/Utility/Status.h" // for Status
-#include "lldb/lldb-types.h"    // for socket_t
+#include "lldb/Utility/Status.h"
+#include "lldb/lldb-types.h"
 
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/Optional.h"
Index: lldb/trunk/include/lldb/Utility/State.h
===================================================================
--- lldb/trunk/include/lldb/Utility/State.h
+++ lldb/trunk/include/lldb/Utility/State.h
@@ -10,11 +10,11 @@
 #ifndef LLDB_UTILITY_STATE_H
 #define LLDB_UTILITY_STATE_H
 
-#include "lldb/lldb-enumerations.h" // for StateType
-#include "llvm/ADT/StringRef.h"     // for StringRef
+#include "lldb/lldb-enumerations.h"
+#include "llvm/ADT/StringRef.h"
 #include "llvm/Support/FormatProviders.h"
-#include "llvm/Support/raw_ostream.h" // for raw_ostream
-#include <cstdint>                    // for uint32_t
+#include "llvm/Support/raw_ostream.h"
+#include <cstdint>
 
 namespace lldb_private {
 
Index: lldb/trunk/include/lldb/Utility/Status.h
===================================================================
--- lldb/trunk/include/lldb/Utility/Status.h
+++ lldb/trunk/include/lldb/Utility/Status.h
@@ -11,15 +11,15 @@
 #define LLDB_UTILITY_STATUS_H
 
 #include "lldb/lldb-defines.h"
-#include "lldb/lldb-enumerations.h" // for ErrorType, ErrorType...
-#include "llvm/ADT/StringRef.h"     // for StringRef
+#include "lldb/lldb-enumerations.h"
+#include "llvm/ADT/StringRef.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/FormatVariadic.h"
 #include <cstdarg>
-#include <stdint.h> // for uint32_t
+#include <stdint.h>
 #include <string>
-#include <system_error> // for error_code
-#include <type_traits>  // for forward
+#include <system_error>
+#include <type_traits>
 
 namespace llvm {
 class raw_ostream;
Index: lldb/trunk/include/lldb/Utility/Stream.h
===================================================================
--- lldb/trunk/include/lldb/Utility/Stream.h
+++ lldb/trunk/include/lldb/Utility/Stream.h
@@ -12,15 +12,15 @@
 
 #include "lldb/Utility/Flags.h"
 #include "lldb/lldb-defines.h"
-#include "lldb/lldb-enumerations.h" // for ByteOrder::eByteOrderInvalid
-#include "llvm/ADT/StringRef.h"     // for StringRef
+#include "lldb/lldb-enumerations.h"
+#include "llvm/ADT/StringRef.h"
 #include "llvm/Support/FormatVariadic.h"
 #include "llvm/Support/raw_ostream.h"
 
 #include <stdarg.h>
-#include <stddef.h>    // for size_t
-#include <stdint.h>    // for uint32_t, uint64_t, uint8_t
-#include <type_traits> // for forward
+#include <stddef.h>
+#include <stdint.h>
+#include <type_traits>
 
 namespace lldb_private {
 
Index: lldb/trunk/include/lldb/Utility/StreamCallback.h
===================================================================
--- lldb/trunk/include/lldb/Utility/StreamCallback.h
+++ lldb/trunk/include/lldb/Utility/StreamCallback.h
@@ -13,8 +13,8 @@
 #include "lldb/lldb-types.h"
 #include "llvm/Support/raw_ostream.h"
 
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint64_t
+#include <stddef.h>
+#include <stdint.h>
 
 namespace lldb_private {
 
Index: lldb/trunk/include/lldb/Utility/StreamGDBRemote.h
===================================================================
--- lldb/trunk/include/lldb/Utility/StreamGDBRemote.h
+++ lldb/trunk/include/lldb/Utility/StreamGDBRemote.h
@@ -10,11 +10,11 @@
 #ifndef liblldb_StreamGDBRemote_h_
 #define liblldb_StreamGDBRemote_h_
 
-#include "lldb/Utility/StreamString.h" // for StreamString
-#include "lldb/lldb-enumerations.h"    // for ByteOrder
+#include "lldb/Utility/StreamString.h"
+#include "lldb/lldb-enumerations.h"
 
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t
+#include <stddef.h>
+#include <stdint.h>
 
 namespace lldb_private {
 
Index: lldb/trunk/include/lldb/Utility/StreamString.h
===================================================================
--- lldb/trunk/include/lldb/Utility/StreamString.h
+++ lldb/trunk/include/lldb/Utility/StreamString.h
@@ -10,14 +10,14 @@
 #ifndef liblldb_StreamString_h_
 #define liblldb_StreamString_h_
 
-#include "lldb/Utility/Stream.h"    // for Stream
-#include "lldb/lldb-enumerations.h" // for ByteOrder
-#include "llvm/ADT/StringRef.h"     // for StringRef
+#include "lldb/Utility/Stream.h"
+#include "lldb/lldb-enumerations.h"
+#include "llvm/ADT/StringRef.h"
 
-#include <string> // for string
+#include <string>
 
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t
+#include <stddef.h>
+#include <stdint.h>
 
 namespace lldb_private {
 
Index: lldb/trunk/include/lldb/Utility/StringExtractor.h
===================================================================
--- lldb/trunk/include/lldb/Utility/StringExtractor.h
+++ lldb/trunk/include/lldb/Utility/StringExtractor.h
@@ -15,7 +15,7 @@
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/StringRef.h"
 
-#include <stddef.h> // for size_t
+#include <stddef.h>
 #include <stdint.h>
 #include <string>
 
Index: lldb/trunk/include/lldb/Utility/StringExtractorGDBRemote.h
===================================================================
--- lldb/trunk/include/lldb/Utility/StringExtractorGDBRemote.h
+++ lldb/trunk/include/lldb/Utility/StringExtractorGDBRemote.h
@@ -12,12 +12,12 @@
 
 #include "lldb/Utility/Status.h"
 #include "lldb/Utility/StringExtractor.h"
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "llvm/ADT/StringRef.h"
 
 #include <string>
 
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint8_t
+#include <stddef.h>
+#include <stdint.h>
 
 class StringExtractorGDBRemote : public StringExtractor {
 public:
Index: lldb/trunk/include/lldb/Utility/StringLexer.h
===================================================================
--- lldb/trunk/include/lldb/Utility/StringLexer.h
+++ lldb/trunk/include/lldb/Utility/StringLexer.h
@@ -10,9 +10,9 @@
 #ifndef utility_StringLexer_h_
 #define utility_StringLexer_h_
 
-#include <initializer_list> // for initializer_list
-#include <string>           // for string
-#include <utility>          // for pair
+#include <initializer_list>
+#include <string>
+#include <utility>
 
 namespace lldb_utility {
 
Index: lldb/trunk/include/lldb/Utility/StringList.h
===================================================================
--- lldb/trunk/include/lldb/Utility/StringList.h
+++ lldb/trunk/include/lldb/Utility/StringList.h
@@ -12,7 +12,7 @@
 
 #include "llvm/ADT/StringRef.h"
 
-#include <stddef.h> // for size_t
+#include <stddef.h>
 #include <string>
 #include <vector>
 
Index: lldb/trunk/include/lldb/Utility/StructuredData.h
===================================================================
--- lldb/trunk/include/lldb/Utility/StructuredData.h
+++ lldb/trunk/include/lldb/Utility/StructuredData.h
@@ -13,17 +13,17 @@
 #include "llvm/ADT/StringRef.h"
 
 #include "lldb/Utility/ConstString.h"
-#include "lldb/Utility/FileSpec.h"  // for FileSpec
-#include "lldb/lldb-enumerations.h" // for StructuredDataType
+#include "lldb/Utility/FileSpec.h"
+#include "lldb/lldb-enumerations.h"
 
-#include <cassert> // for assert
-#include <cstddef> // for size_t
-#include <cstdint> // for uint64_t
+#include <cassert>
+#include <cstddef>
+#include <cstdint>
 #include <functional>
 #include <map>
 #include <memory>
 #include <string>
-#include <type_traits> // for move
+#include <type_traits>
 #include <utility>
 #include <vector>
 
Index: lldb/trunk/include/lldb/Utility/Timer.h
===================================================================
--- lldb/trunk/include/lldb/Utility/Timer.h
+++ lldb/trunk/include/lldb/Utility/Timer.h
@@ -10,10 +10,10 @@
 #ifndef liblldb_Timer_h_
 #define liblldb_Timer_h_
 
-#include "lldb/lldb-defines.h" // for DISALLOW_COPY_AND_ASSIGN
+#include "lldb/lldb-defines.h"
 #include "llvm/Support/Chrono.h"
 #include <atomic>
-#include <stdint.h> // for uint32_t
+#include <stdint.h>
 
 namespace lldb_private {
 class Stream;
Index: lldb/trunk/include/lldb/Utility/UserID.h
===================================================================
--- lldb/trunk/include/lldb/Utility/UserID.h
+++ lldb/trunk/include/lldb/Utility/UserID.h
@@ -10,8 +10,8 @@
 #ifndef liblldb_UserID_h_
 #define liblldb_UserID_h_
 
-#include "lldb/lldb-defines.h" // for LLDB_INVALID_UID
-#include "lldb/lldb-types.h"   // for user_id_t
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-types.h"
 namespace lldb_private {
 class Stream;
 }
Index: lldb/trunk/include/lldb/Utility/VMRange.h
===================================================================
--- lldb/trunk/include/lldb/Utility/VMRange.h
+++ lldb/trunk/include/lldb/Utility/VMRange.h
@@ -10,10 +10,10 @@
 #ifndef liblldb_VMRange_h_
 #define liblldb_VMRange_h_
 
-#include "lldb/lldb-types.h" // for addr_t
+#include "lldb/lldb-types.h"
 
-#include <stddef.h> // for size_t
-#include <stdint.h> // for uint32_t
+#include <stddef.h>
+#include <stdint.h>
 #include <vector>
 
 namespace lldb_private {
Index: lldb/trunk/source/API/SBData.cpp
===================================================================
--- lldb/trunk/source/API/SBData.cpp
+++ lldb/trunk/source/API/SBData.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <inttypes.h> // PRIu64
+#include <inttypes.h>
 
 #include "lldb/API/SBData.h"
 #include "lldb/API/SBError.h"
Index: lldb/trunk/source/API/SBFileSpec.cpp
===================================================================
--- lldb/trunk/source/API/SBFileSpec.cpp
+++ lldb/trunk/source/API/SBFileSpec.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <inttypes.h> // PRIu64
+#include <inttypes.h>
 #include <limits.h>
 
 #include "lldb/API/SBFileSpec.h"
Index: lldb/trunk/source/Core/Address.cpp
===================================================================
--- lldb/trunk/source/Core/Address.cpp
+++ lldb/trunk/source/Core/Address.cpp
@@ -10,43 +10,43 @@
 #include "lldb/Core/Address.h"
 #include "lldb/Core/DumpDataExtractor.h"
 #include "lldb/Core/Module.h"
-#include "lldb/Core/ModuleList.h" // for ModuleList
+#include "lldb/Core/ModuleList.h"
 #include "lldb/Core/Section.h"
 #include "lldb/Symbol/Block.h"
-#include "lldb/Symbol/Declaration.h" // for Declaration
-#include "lldb/Symbol/LineEntry.h"   // for LineEntry
+#include "lldb/Symbol/Declaration.h"
+#include "lldb/Symbol/LineEntry.h"
 #include "lldb/Symbol/ObjectFile.h"
-#include "lldb/Symbol/Symbol.h"        // for Symbol
-#include "lldb/Symbol/SymbolContext.h" // for SymbolContext
+#include "lldb/Symbol/Symbol.h"
+#include "lldb/Symbol/SymbolContext.h"
 #include "lldb/Symbol/SymbolVendor.h"
-#include "lldb/Symbol/Symtab.h" // for Symtab
-#include "lldb/Symbol/Type.h"   // for Type
+#include "lldb/Symbol/Symtab.h"
+#include "lldb/Symbol/Type.h"
 #include "lldb/Symbol/Variable.h"
 #include "lldb/Symbol/VariableList.h"
 #include "lldb/Target/ExecutionContext.h"
-#include "lldb/Target/ExecutionContextScope.h" // for ExecutionContextScope
+#include "lldb/Target/ExecutionContextScope.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Target/SectionLoadList.h"
 #include "lldb/Target/Target.h"
-#include "lldb/Utility/ConstString.h"   // for ConstString
-#include "lldb/Utility/DataExtractor.h" // for DataExtractor
-#include "lldb/Utility/Endian.h"        // for InlHostByteOrder
-#include "lldb/Utility/FileSpec.h"      // for FileSpec
-#include "lldb/Utility/Status.h"        // for Status
-#include "lldb/Utility/Stream.h"        // for Stream
-#include "lldb/Utility/StreamString.h"  // for StreamString
+#include "lldb/Utility/ConstString.h"
+#include "lldb/Utility/DataExtractor.h"
+#include "lldb/Utility/Endian.h"
+#include "lldb/Utility/FileSpec.h"
+#include "lldb/Utility/Status.h"
+#include "lldb/Utility/Stream.h"
+#include "lldb/Utility/StreamString.h"
 
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/Triple.h"
-#include "llvm/Support/Compiler.h" // for LLVM_FALLTHROUGH
+#include "llvm/Support/Compiler.h"
 
-#include <cstdint> // for uint8_t, uint32_t
-#include <memory>  // for shared_ptr, operator!=
-#include <vector>  // for vector
-
-#include <assert.h>   // for assert
-#include <inttypes.h> // for PRIu64, PRIx64
-#include <string.h>   // for size_t, strlen
+#include <cstdint>
+#include <memory>
+#include <vector>
+
+#include <assert.h>
+#include <inttypes.h>
+#include <string.h>
 
 namespace lldb_private {
 class CompileUnit;
Index: lldb/trunk/source/Core/AddressRange.cpp
===================================================================
--- lldb/trunk/source/Core/AddressRange.cpp
+++ lldb/trunk/source/Core/AddressRange.cpp
@@ -10,16 +10,16 @@
 #include "lldb/Core/AddressRange.h"
 #include "lldb/Core/Module.h"
 #include "lldb/Target/Target.h"
-#include "lldb/Utility/ConstString.h" // for ConstString
-#include "lldb/Utility/FileSpec.h"    // for FileSpec
+#include "lldb/Utility/ConstString.h"
+#include "lldb/Utility/FileSpec.h"
 #include "lldb/Utility/Stream.h"
-#include "lldb/lldb-defines.h" // for LLDB_INVALID_ADDRESS
+#include "lldb/lldb-defines.h"
 
-#include "llvm/Support/Compiler.h" // for LLVM_FALLTHROUGH
+#include "llvm/Support/Compiler.h"
 
-#include <memory> // for shared_ptr
+#include <memory>
 
-#include <inttypes.h> // for PRIx64
+#include <inttypes.h>
 
 namespace lldb_private {
 class SectionList;
Index: lldb/trunk/source/Core/AddressResolverFileLine.cpp
===================================================================
--- lldb/trunk/source/Core/AddressResolverFileLine.cpp
+++ lldb/trunk/source/Core/AddressResolverFileLine.cpp
@@ -9,21 +9,21 @@
 
 #include "lldb/Core/AddressResolverFileLine.h"
 
-#include "lldb/Core/Address.h"      // for Address
-#include "lldb/Core/AddressRange.h" // for AddressRange
+#include "lldb/Core/Address.h"
+#include "lldb/Core/AddressRange.h"
 #include "lldb/Symbol/CompileUnit.h"
-#include "lldb/Symbol/LineEntry.h" // for LineEntry
+#include "lldb/Symbol/LineEntry.h"
 #include "lldb/Symbol/SymbolContext.h"
-#include "lldb/Utility/ConstString.h" // for ConstString
+#include "lldb/Utility/ConstString.h"
 #include "lldb/Utility/Log.h"
-#include "lldb/Utility/Logging.h" // for GetLogIfAllCategoriesSet, LIB...
-#include "lldb/Utility/Stream.h"  // for Stream
+#include "lldb/Utility/Logging.h"
+#include "lldb/Utility/Stream.h"
 #include "lldb/Utility/StreamString.h"
-#include "lldb/lldb-enumerations.h" // for SymbolContextItem::eSymbolCon...
-#include "lldb/lldb-types.h"        // for addr_t
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-types.h"
 
-#include <inttypes.h> // for PRIx64
-#include <vector>     // for vector
+#include <inttypes.h>
+#include <vector>
 
 using namespace lldb;
 using namespace lldb_private;
Index: lldb/trunk/source/Core/AddressResolverName.cpp
===================================================================
--- lldb/trunk/source/Core/AddressResolverName.cpp
+++ lldb/trunk/source/Core/AddressResolverName.cpp
@@ -9,25 +9,25 @@
 
 #include "lldb/Core/AddressResolverName.h"
 
-#include "lldb/Core/Address.h"      // for Address, operator==
-#include "lldb/Core/AddressRange.h" // for AddressRange
+#include "lldb/Core/Address.h"
+#include "lldb/Core/AddressRange.h"
 #include "lldb/Core/Module.h"
 #include "lldb/Symbol/Function.h"
 #include "lldb/Symbol/Symbol.h"
 #include "lldb/Symbol/SymbolContext.h"
 #include "lldb/Utility/Log.h"
-#include "lldb/Utility/Logging.h"   // for GetLogIfAllCategoriesSet, LIB...
-#include "lldb/Utility/Stream.h"    // for Stream
-#include "lldb/lldb-enumerations.h" // for SymbolType::eSymbolTypeCode
-#include "lldb/lldb-forward.h"      // for ModuleSP
-#include "lldb/lldb-types.h"        // for addr_t
-#include "llvm/ADT/StringRef.h"     // for StringRef
-
-#include <memory> // for shared_ptr
-#include <string> // for string
-#include <vector> // for vector
+#include "lldb/Utility/Logging.h"
+#include "lldb/Utility/Stream.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-types.h"
+#include "llvm/ADT/StringRef.h"
+
+#include <memory>
+#include <string>
+#include <vector>
 
-#include <stdint.h> // for uint32_t
+#include <stdint.h>
 
 using namespace lldb;
 using namespace lldb_private;
Index: lldb/trunk/source/Core/Broadcaster.cpp
===================================================================
--- lldb/trunk/source/Core/Broadcaster.cpp
+++ lldb/trunk/source/Core/Broadcaster.cpp
@@ -12,16 +12,16 @@
 #include "lldb/Core/Event.h"
 #include "lldb/Core/Listener.h"
 #include "lldb/Utility/Log.h"
-#include "lldb/Utility/Logging.h" // for GetLogIfAnyCategoriesSet, Get...
-#include "lldb/Utility/Stream.h"  // for Stream
+#include "lldb/Utility/Logging.h"
+#include "lldb/Utility/Stream.h"
 #include "lldb/Utility/StreamString.h"
 
-#include <algorithm>   // for find_if
-#include <memory>      // for make_shared
-#include <type_traits> // for move
+#include <algorithm>
+#include <memory>
+#include <type_traits>
 
-#include <assert.h> // for assert
-#include <stddef.h> // for size_t
+#include <assert.h>
+#include <stddef.h>
 
 using namespace lldb;
 using namespace lldb_private;
Index: lldb/trunk/source/Core/Communication.cpp
===================================================================
--- lldb/trunk/source/Core/Communication.cpp
+++ lldb/trunk/source/Core/Communication.cpp
@@ -14,23 +14,23 @@
 #include "lldb/Host/HostThread.h"
 #include "lldb/Host/ThreadLauncher.h"
 #include "lldb/Utility/Connection.h"
-#include "lldb/Utility/ConstString.h" // for ConstString
+#include "lldb/Utility/ConstString.h"
 #include "lldb/Utility/Log.h"
-#include "lldb/Utility/Logging.h" // for LogIfAnyCategoriesSet, LIBLLDB...
-#include "lldb/Utility/Status.h"  // for Status
+#include "lldb/Utility/Logging.h"
+#include "lldb/Utility/Status.h"
 
-#include "llvm/ADT/None.h"         // for None
-#include "llvm/ADT/Optional.h"     // for Optional
-#include "llvm/Support/Compiler.h" // for LLVM_FALLTHROUGH
+#include "llvm/ADT/None.h"
+#include "llvm/ADT/Optional.h"
+#include "llvm/Support/Compiler.h"
 
-#include <algorithm> // for min
-#include <chrono>    // for duration, seconds
+#include <algorithm>
+#include <chrono>
 #include <cstring>
-#include <memory> // for shared_ptr
+#include <memory>
 
-#include <errno.h>    // for EIO
-#include <inttypes.h> // for PRIu64
-#include <stdio.h>    // for snprintf
+#include <errno.h>
+#include <inttypes.h>
+#include <stdio.h>
 
 using namespace lldb;
 using namespace lldb_private;
Index: lldb/trunk/source/Core/Debugger.cpp
===================================================================
--- lldb/trunk/source/Core/Debugger.cpp
+++ lldb/trunk/source/Core/Debugger.cpp
@@ -9,70 +9,70 @@
 
 #include "lldb/Core/Debugger.h"
 
-#include "lldb/Breakpoint/Breakpoint.h" // for Breakpoint, Brea...
-#include "lldb/Core/Event.h"            // for Event, EventData...
+#include "lldb/Breakpoint/Breakpoint.h"
+#include "lldb/Core/Event.h"
 #include "lldb/Core/FormatEntity.h"
-#include "lldb/Core/Listener.h"   // for Listener
-#include "lldb/Core/Mangled.h"    // for Mangled
-#include "lldb/Core/ModuleList.h" // for Mangled
+#include "lldb/Core/Listener.h"
+#include "lldb/Core/Mangled.h"
+#include "lldb/Core/ModuleList.h"
 #include "lldb/Core/PluginManager.h"
 #include "lldb/Core/StreamAsynchronousIO.h"
 #include "lldb/Core/StreamFile.h"
 #include "lldb/DataFormatters/DataVisualization.h"
 #include "lldb/Expression/REPL.h"
-#include "lldb/Host/File.h" // for File, File::kInv...
+#include "lldb/Host/File.h"
 #include "lldb/Host/FileSystem.h"
 #include "lldb/Host/HostInfo.h"
 #include "lldb/Host/Terminal.h"
 #include "lldb/Host/ThreadLauncher.h"
 #include "lldb/Interpreter/CommandInterpreter.h"
-#include "lldb/Interpreter/OptionValue.h" // for OptionValue, Opt...
+#include "lldb/Interpreter/OptionValue.h"
 #include "lldb/Interpreter/OptionValueProperties.h"
 #include "lldb/Interpreter/OptionValueSInt64.h"
 #include "lldb/Interpreter/OptionValueString.h"
-#include "lldb/Interpreter/Property.h"          // for PropertyDefinition
-#include "lldb/Interpreter/ScriptInterpreter.h" // for ScriptInterpreter
+#include "lldb/Interpreter/Property.h"
+#include "lldb/Interpreter/ScriptInterpreter.h"
 #include "lldb/Symbol/Function.h"
 #include "lldb/Symbol/Symbol.h"
-#include "lldb/Symbol/SymbolContext.h" // for SymbolContext
+#include "lldb/Symbol/SymbolContext.h"
 #include "lldb/Target/Language.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Target/StructuredDataPlugin.h"
 #include "lldb/Target/Target.h"
 #include "lldb/Target/TargetList.h"
 #include "lldb/Target/Thread.h"
-#include "lldb/Target/ThreadList.h" // for ThreadList
+#include "lldb/Target/ThreadList.h"
 #include "lldb/Utility/AnsiTerminal.h"
-#include "lldb/Utility/Log.h" // for LLDB_LOG_OPTION_...
+#include "lldb/Utility/Log.h"
 #include "lldb/Utility/State.h"
-#include "lldb/Utility/Stream.h" // for Stream
+#include "lldb/Utility/Stream.h"
 #include "lldb/Utility/StreamCallback.h"
 #include "lldb/Utility/StreamString.h"
 
 #if defined(_WIN32)
-#include "lldb/Host/windows/PosixApi.h" // for PATH_MAX
+#include "lldb/Host/windows/PosixApi.h"
 #include "lldb/Host/windows/windows.h"
 #endif
 
-#include "llvm/ADT/None.h"      // for None
-#include "llvm/ADT/STLExtras.h" // for make_unique
+#include "llvm/ADT/None.h"
+#include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/StringRef.h"
-#include "llvm/ADT/iterator.h" // for iterator_facade_...
+#include "llvm/ADT/iterator.h"
 #include "llvm/Support/DynamicLibrary.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Process.h"
 #include "llvm/Support/Threading.h"
-#include "llvm/Support/raw_ostream.h" // for raw_fd_ostream
+#include "llvm/Support/raw_ostream.h"
 
-#include <list>   // for list
-#include <memory> // for make_shared
+#include <list>
+#include <memory>
 #include <mutex>
-#include <set>          // for set
-#include <stdio.h>      // for size_t, NULL
-#include <stdlib.h>     // for getenv
-#include <string.h>     // for strcmp
-#include <string>       // for string
-#include <system_error> // for error_code
+#include <set>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <string>
+#include <system_error>
 
 namespace lldb_private {
 class Address;
Index: lldb/trunk/source/Core/Disassembler.cpp
===================================================================
--- lldb/trunk/source/Core/Disassembler.cpp
+++ lldb/trunk/source/Core/Disassembler.cpp
@@ -9,14 +9,14 @@
 
 #include "lldb/Core/Disassembler.h"
 
-#include "lldb/Core/AddressRange.h" // for AddressRange
+#include "lldb/Core/AddressRange.h"
 #include "lldb/Core/Debugger.h"
 #include "lldb/Core/EmulateInstruction.h"
-#include "lldb/Core/Mangled.h" // for Mangled, Mangled...
+#include "lldb/Core/Mangled.h"
 #include "lldb/Core/Module.h"
-#include "lldb/Core/ModuleList.h" // for ModuleList
+#include "lldb/Core/ModuleList.h"
 #include "lldb/Core/PluginManager.h"
-#include "lldb/Core/SourceManager.h" // for SourceManager
+#include "lldb/Core/SourceManager.h"
 #include "lldb/Host/FileSystem.h"
 #include "lldb/Interpreter/OptionValue.h"
 #include "lldb/Interpreter/OptionValueArray.h"
@@ -25,31 +25,31 @@
 #include "lldb/Interpreter/OptionValueString.h"
 #include "lldb/Interpreter/OptionValueUInt64.h"
 #include "lldb/Symbol/Function.h"
-#include "lldb/Symbol/Symbol.h"        // for Symbol
-#include "lldb/Symbol/SymbolContext.h" // for SymbolContext
+#include "lldb/Symbol/Symbol.h"
+#include "lldb/Symbol/SymbolContext.h"
 #include "lldb/Target/ExecutionContext.h"
 #include "lldb/Target/SectionLoadList.h"
 #include "lldb/Target/StackFrame.h"
 #include "lldb/Target/Target.h"
-#include "lldb/Target/Thread.h" // for Thread
+#include "lldb/Target/Thread.h"
 #include "lldb/Utility/DataBufferHeap.h"
 #include "lldb/Utility/DataExtractor.h"
 #include "lldb/Utility/RegularExpression.h"
 #include "lldb/Utility/Status.h"
-#include "lldb/Utility/Stream.h"       // for Stream
-#include "lldb/Utility/StreamString.h" // for StreamString
+#include "lldb/Utility/Stream.h"
+#include "lldb/Utility/StreamString.h"
 #include "lldb/Utility/Timer.h"
-#include "lldb/lldb-private-enumerations.h" // for InstructionType:...
-#include "lldb/lldb-private-interfaces.h"   // for DisassemblerCrea...
-#include "lldb/lldb-private-types.h"        // for RegisterInfo
-#include "llvm/ADT/Triple.h"                // for Triple, Triple::...
-#include "llvm/Support/Compiler.h"          // for LLVM_PRETTY_FUNC...
+#include "lldb/lldb-private-enumerations.h"
+#include "lldb/lldb-private-interfaces.h"
+#include "lldb/lldb-private-types.h"
+#include "llvm/ADT/Triple.h"
+#include "llvm/Support/Compiler.h"
 
-#include <cstdint> // for uint32_t, UINT32...
+#include <cstdint>
 #include <cstring>
-#include <utility> // for pair
+#include <utility>
 
-#include <assert.h> // for assert
+#include <assert.h>
 
 #define DEFAULT_DISASM_BYTE_SIZE 32
 
Index: lldb/trunk/source/Core/DumpDataExtractor.cpp
===================================================================
--- lldb/trunk/source/Core/DumpDataExtractor.cpp
+++ lldb/trunk/source/Core/DumpDataExtractor.cpp
@@ -9,12 +9,12 @@
 
 #include "lldb/Core/DumpDataExtractor.h"
 
-#include "lldb/lldb-defines.h" // for LLDB_INVALID_ADDRESS
-#include "lldb/lldb-forward.h" // for TargetSP, DisassemblerSP
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-forward.h"
 
-#include "lldb/Core/Address.h" // for Address
+#include "lldb/Core/Address.h"
 #include "lldb/Core/Disassembler.h"
-#include "lldb/Core/ModuleList.h" // for ModuleList
+#include "lldb/Core/ModuleList.h"
 #include "lldb/Symbol/ClangASTContext.h"
 #include "lldb/Target/ExecutionContext.h"
 #include "lldb/Target/ExecutionContextScope.h"
@@ -23,22 +23,22 @@
 #include "lldb/Utility/DataExtractor.h"
 #include "lldb/Utility/Stream.h"
 
-#include "clang/AST/ASTContext.h"    // for ASTContext
-#include "clang/AST/CanonicalType.h" // for CanQualType
+#include "clang/AST/ASTContext.h"
+#include "clang/AST/CanonicalType.h"
 
-#include "llvm/ADT/APFloat.h"     // for APFloat, APFloatBase:...
-#include "llvm/ADT/APInt.h"       // for APInt
-#include "llvm/ADT/ArrayRef.h"    // for ArrayRef
-#include "llvm/ADT/SmallVector.h" // for SmallVector
-
-#include <limits> // for numeric_limits, numer...
-#include <memory> // for shared_ptr
-#include <string> // for string, basic_string
-
-#include <assert.h>   // for assert
-#include <ctype.h>    // for isprint
-#include <inttypes.h> // for PRIu64, PRIx64, PRIX64
-#include <math.h>     // for ldexpf
+#include "llvm/ADT/APFloat.h"
+#include "llvm/ADT/APInt.h"
+#include "llvm/ADT/ArrayRef.h"
+#include "llvm/ADT/SmallVector.h"
+
+#include <limits>
+#include <memory>
+#include <string>
+
+#include <assert.h>
+#include <ctype.h>
+#include <inttypes.h>
+#include <math.h>
 
 #include <bitset>
 #include <sstream>
Index: lldb/trunk/source/Core/DynamicLoader.cpp
===================================================================
--- lldb/trunk/source/Core/DynamicLoader.cpp
+++ lldb/trunk/source/Core/DynamicLoader.cpp
@@ -10,22 +10,22 @@
 #include "lldb/Target/DynamicLoader.h"
 
 #include "lldb/Core/Module.h"
-#include "lldb/Core/ModuleList.h" // for ModuleList
+#include "lldb/Core/ModuleList.h"
 #include "lldb/Core/ModuleSpec.h"
 #include "lldb/Core/PluginManager.h"
 #include "lldb/Core/Section.h"
-#include "lldb/Symbol/ObjectFile.h" // for ObjectFile
+#include "lldb/Symbol/ObjectFile.h"
 #include "lldb/Target/MemoryRegionInfo.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Target/Target.h"
-#include "lldb/Utility/ConstString.h"     // for ConstString
-#include "lldb/lldb-private-interfaces.h" // for DynamicLoaderCreateInstance
+#include "lldb/Utility/ConstString.h"
+#include "lldb/lldb-private-interfaces.h"
 
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "llvm/ADT/StringRef.h"
 
-#include <memory> // for shared_ptr, unique_ptr
+#include <memory>
 
-#include <assert.h> // for assert
+#include <assert.h>
 
 using namespace lldb;
 using namespace lldb_private;
Index: lldb/trunk/source/Core/EmulateInstruction.cpp
===================================================================
--- lldb/trunk/source/Core/EmulateInstruction.cpp
+++ lldb/trunk/source/Core/EmulateInstruction.cpp
@@ -16,23 +16,23 @@
 #include "lldb/Symbol/UnwindPlan.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Target/RegisterContext.h"
-#include "lldb/Target/StackFrame.h"   // for StackFrame
-#include "lldb/Utility/ConstString.h" // for ConstString
+#include "lldb/Target/StackFrame.h"
+#include "lldb/Utility/ConstString.h"
 #include "lldb/Utility/DataExtractor.h"
 #include "lldb/Utility/RegisterValue.h"
 #include "lldb/Utility/Status.h"
-#include "lldb/Utility/Stream.h" // for Stream, Stream::::eBinary
+#include "lldb/Utility/Stream.h"
 #include "lldb/Utility/StreamString.h"
-#include "lldb/lldb-forward.h"            // for ProcessSP
-#include "lldb/lldb-private-interfaces.h" // for EmulateInstructionCreateIn...
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-private-interfaces.h"
 
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "llvm/ADT/StringRef.h"
 
 #include <cstring>
-#include <memory> // for shared_ptr
+#include <memory>
 
-#include <inttypes.h> // for PRIx64, PRId64, PRIu64
-#include <stdio.h>    // for stdout
+#include <inttypes.h>
+#include <stdio.h>
 
 namespace lldb_private {
 class Target;
Index: lldb/trunk/source/Core/Event.cpp
===================================================================
--- lldb/trunk/source/Core/Event.cpp
+++ lldb/trunk/source/Core/Event.cpp
@@ -13,12 +13,12 @@
 #include "lldb/Utility/DataExtractor.h"
 #include "lldb/Utility/Endian.h"
 #include "lldb/Utility/Stream.h"
-#include "lldb/Utility/StreamString.h" // for StreamString
-#include "lldb/lldb-enumerations.h"    // for Format::eFormatBytes
+#include "lldb/Utility/StreamString.h"
+#include "lldb/lldb-enumerations.h"
 
 #include <algorithm>
 
-#include <ctype.h> // for isprint
+#include <ctype.h>
 
 using namespace lldb;
 using namespace lldb_private;
Index: lldb/trunk/source/Core/FileLineResolver.cpp
===================================================================
--- lldb/trunk/source/Core/FileLineResolver.cpp
+++ lldb/trunk/source/Core/FileLineResolver.cpp
@@ -10,13 +10,13 @@
 #include "lldb/Core/FileLineResolver.h"
 
 // Project includes
-#include "lldb/Core/FileSpecList.h" // for FileSpecList
+#include "lldb/Core/FileSpecList.h"
 #include "lldb/Symbol/CompileUnit.h"
 #include "lldb/Symbol/LineTable.h"
-#include "lldb/Utility/ConstString.h" // for ConstString
-#include "lldb/Utility/Stream.h"      // for Stream
+#include "lldb/Utility/ConstString.h"
+#include "lldb/Utility/Stream.h"
 
-#include <string> // for string
+#include <string>
 
 namespace lldb_private {
 class Address;
Index: lldb/trunk/source/Core/FileSpecList.cpp
===================================================================
--- lldb/trunk/source/Core/FileSpecList.cpp
+++ lldb/trunk/source/Core/FileSpecList.cpp
@@ -9,12 +9,12 @@
 
 #include "lldb/Core/FileSpecList.h"
 
-#include "lldb/Utility/ConstString.h" // for ConstString
+#include "lldb/Utility/ConstString.h"
 #include "lldb/Utility/Stream.h"
 
-#include <utility> // for find
+#include <utility>
 
-#include <stdint.h> // for UINT32_MAX
+#include <stdint.h>
 
 using namespace lldb_private;
 using namespace std;
Index: lldb/trunk/source/Core/FormatEntity.cpp
===================================================================
--- lldb/trunk/source/Core/FormatEntity.cpp
+++ lldb/trunk/source/Core/FormatEntity.cpp
@@ -10,28 +10,28 @@
 #include "lldb/Core/FormatEntity.h"
 
 #include "lldb/Core/Address.h"
-#include "lldb/Core/AddressRange.h" // for AddressRange
+#include "lldb/Core/AddressRange.h"
 #include "lldb/Core/Debugger.h"
 #include "lldb/Core/DumpRegisterValue.h"
 #include "lldb/Core/Module.h"
 #include "lldb/Core/ValueObject.h"
 #include "lldb/Core/ValueObjectVariable.h"
 #include "lldb/DataFormatters/DataVisualization.h"
-#include "lldb/DataFormatters/FormatClasses.h" // for TypeNameSpecifier...
+#include "lldb/DataFormatters/FormatClasses.h"
 #include "lldb/DataFormatters/FormatManager.h"
-#include "lldb/DataFormatters/TypeSummary.h" // for TypeSummaryImpl::...
+#include "lldb/DataFormatters/TypeSummary.h"
 #include "lldb/Expression/ExpressionVariable.h"
 #include "lldb/Interpreter/CommandInterpreter.h"
 #include "lldb/Symbol/Block.h"
 #include "lldb/Symbol/CompileUnit.h"
-#include "lldb/Symbol/CompilerType.h" // for CompilerType
+#include "lldb/Symbol/CompilerType.h"
 #include "lldb/Symbol/Function.h"
 #include "lldb/Symbol/LineEntry.h"
 #include "lldb/Symbol/Symbol.h"
-#include "lldb/Symbol/SymbolContext.h" // for SymbolContext
+#include "lldb/Symbol/SymbolContext.h"
 #include "lldb/Symbol/VariableList.h"
 #include "lldb/Target/ExecutionContext.h"
-#include "lldb/Target/ExecutionContextScope.h" // for ExecutionContextS...
+#include "lldb/Target/ExecutionContextScope.h"
 #include "lldb/Target/Language.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Target/RegisterContext.h"
@@ -41,32 +41,32 @@
 #include "lldb/Target/Target.h"
 #include "lldb/Target/Thread.h"
 #include "lldb/Utility/AnsiTerminal.h"
-#include "lldb/Utility/ArchSpec.h"    // for ArchSpec
-#include "lldb/Utility/ConstString.h" // for ConstString, oper...
+#include "lldb/Utility/ArchSpec.h"
+#include "lldb/Utility/ConstString.h"
 #include "lldb/Utility/FileSpec.h"
-#include "lldb/Utility/Log.h"           // for Log
-#include "lldb/Utility/Logging.h"       // for GetLogIfAllCatego...
-#include "lldb/Utility/RegisterValue.h" // for RegisterValue
-#include "lldb/Utility/SharingPtr.h"    // for SharingPtr
+#include "lldb/Utility/Log.h"
+#include "lldb/Utility/Logging.h"
+#include "lldb/Utility/RegisterValue.h"
+#include "lldb/Utility/SharingPtr.h"
 #include "lldb/Utility/Stream.h"
 #include "lldb/Utility/StreamString.h"
-#include "lldb/Utility/StringList.h"     // for StringList
-#include "lldb/Utility/StructuredData.h" // for StructuredData::O...
-#include "lldb/lldb-defines.h"           // for LLDB_INVALID_ADDRESS
-#include "lldb/lldb-forward.h"           // for ValueObjectSP
+#include "lldb/Utility/StringList.h"
+#include "lldb/Utility/StructuredData.h"
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-forward.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/StringRef.h"
-#include "llvm/ADT/Triple.h"       // for Triple, Triple::O...
-#include "llvm/Support/Compiler.h" // for LLVM_FALLTHROUGH
+#include "llvm/ADT/Triple.h"
+#include "llvm/Support/Compiler.h"
 
-#include <ctype.h>     // for isxdigit
-#include <inttypes.h>  // for PRIu64, PRIx64
-#include <memory>      // for shared_ptr, opera...
-#include <stdio.h>     // for sprintf
-#include <stdlib.h>    // for strtoul
-#include <string.h>    // for size_t, strchr
-#include <type_traits> // for move
-#include <utility>     // for pair
+#include <ctype.h>
+#include <inttypes.h>
+#include <memory>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <type_traits>
+#include <utility>
 
 namespace lldb_private {
 class ScriptInterpreter;
Index: lldb/trunk/source/Core/IOHandler.cpp
===================================================================
--- lldb/trunk/source/Core/IOHandler.cpp
+++ lldb/trunk/source/Core/IOHandler.cpp
@@ -25,12 +25,12 @@
 // Project includes
 #include "lldb/Core/Debugger.h"
 #include "lldb/Core/StreamFile.h"
-#include "lldb/Host/File.h"            // for File
-#include "lldb/Utility/Predicate.h"    // for Predicate, ::eBroad...
-#include "lldb/Utility/Status.h"       // for Status
-#include "lldb/Utility/StreamString.h" // for StreamString
-#include "lldb/Utility/StringList.h"   // for StringList
-#include "lldb/lldb-forward.h"         // for StreamFileSP
+#include "lldb/Host/File.h"
+#include "lldb/Utility/Predicate.h"
+#include "lldb/Utility/Status.h"
+#include "lldb/Utility/StreamString.h"
+#include "lldb/Utility/StringList.h"
+#include "lldb/lldb-forward.h"
 
 #ifndef LLDB_DISABLE_LIBEDIT
 #include "lldb/Host/Editline.h"
@@ -55,23 +55,23 @@
 #include "lldb/Utility/State.h"
 #endif
 
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "llvm/ADT/StringRef.h"
 
 #ifdef _MSC_VER
 #include "lldb/Host/windows/windows.h"
 #endif
 
-#include <memory> // for shared_ptr
-#include <mutex>  // for recursive_mutex
+#include <memory>
+#include <mutex>
 
-#include <assert.h>    // for assert
-#include <ctype.h>     // for isspace
-#include <errno.h>     // for EINTR, errno
-#include <locale.h>    // for setlocale
-#include <stdint.h>    // for uint32_t, UINT32_MAX
-#include <stdio.h>     // for size_t, fprintf, feof
-#include <string.h>    // for strlen
-#include <type_traits> // for move
+#include <assert.h>
+#include <ctype.h>
+#include <errno.h>
+#include <locale.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <type_traits>
 
 using namespace lldb;
 using namespace lldb_private;
Index: lldb/trunk/source/Core/Listener.cpp
===================================================================
--- lldb/trunk/source/Core/Listener.cpp
+++ lldb/trunk/source/Core/Listener.cpp
@@ -11,15 +11,15 @@
 
 #include "lldb/Core/Broadcaster.h"
 #include "lldb/Core/Event.h"
-#include "lldb/Utility/ConstString.h" // for ConstString
+#include "lldb/Utility/ConstString.h"
 #include "lldb/Utility/Log.h"
-#include "lldb/Utility/Logging.h" // for GetLogIfAllCategoriesSet, LIBL...
+#include "lldb/Utility/Logging.h"
 
-#include "llvm/ADT/Optional.h" // for Optional
+#include "llvm/ADT/Optional.h"
 
 #include <algorithm>
-#include <memory>  // for make_shared
-#include <utility> // for pair, make_pair
+#include <memory>
+#include <utility>
 
 using namespace lldb;
 using namespace lldb_private;
Index: lldb/trunk/source/Core/Module.cpp
===================================================================
--- lldb/trunk/source/Core/Module.cpp
+++ lldb/trunk/source/Core/Module.cpp
@@ -9,65 +9,65 @@
 
 #include "lldb/Core/Module.h"
 
-#include "lldb/Core/AddressRange.h" // for AddressRange
+#include "lldb/Core/AddressRange.h"
 #include "lldb/Core/AddressResolverFileLine.h"
-#include "lldb/Core/Debugger.h"     // for Debugger
-#include "lldb/Core/FileSpecList.h" // for FileSpecList
-#include "lldb/Core/Mangled.h"      // for Mangled
+#include "lldb/Core/Debugger.h"
+#include "lldb/Core/FileSpecList.h"
+#include "lldb/Core/Mangled.h"
 #include "lldb/Core/ModuleSpec.h"
-#include "lldb/Core/SearchFilter.h" // for SearchFilt...
+#include "lldb/Core/SearchFilter.h"
 #include "lldb/Core/Section.h"
 #include "lldb/Host/FileSystem.h"
 #include "lldb/Host/Host.h"
 #include "lldb/Interpreter/CommandInterpreter.h"
 #include "lldb/Interpreter/ScriptInterpreter.h"
 #include "lldb/Symbol/CompileUnit.h"
-#include "lldb/Symbol/Function.h" // for Function
+#include "lldb/Symbol/Function.h"
 #include "lldb/Symbol/ObjectFile.h"
-#include "lldb/Symbol/Symbol.h" // for Symbol
+#include "lldb/Symbol/Symbol.h"
 #include "lldb/Symbol/SymbolContext.h"
 #include "lldb/Symbol/SymbolFile.h"
 #include "lldb/Symbol/SymbolVendor.h"
-#include "lldb/Symbol/Symtab.h"   // for Symtab
-#include "lldb/Symbol/Type.h"     // for Type
-#include "lldb/Symbol/TypeList.h" // for TypeList
+#include "lldb/Symbol/Symtab.h"
+#include "lldb/Symbol/Type.h"
+#include "lldb/Symbol/TypeList.h"
 #include "lldb/Symbol/TypeMap.h"
 #include "lldb/Symbol/TypeSystem.h"
 #include "lldb/Target/Language.h"
-#include "lldb/Target/Platform.h" // for Platform
+#include "lldb/Target/Platform.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Target/Target.h"
 #include "lldb/Utility/DataBufferHeap.h"
 #include "lldb/Utility/LLDBAssert.h"
 #include "lldb/Utility/Log.h"
-#include "lldb/Utility/Logging.h" // for GetLogIfAn...
+#include "lldb/Utility/Logging.h"
 #include "lldb/Utility/RegularExpression.h"
 #include "lldb/Utility/Status.h"
-#include "lldb/Utility/Stream.h" // for Stream
+#include "lldb/Utility/Stream.h"
 #include "lldb/Utility/StreamString.h"
 #include "lldb/Utility/Timer.h"
 
 #if defined(_WIN32)
-#include "lldb/Host/windows/PosixApi.h" // for PATH_MAX
+#include "lldb/Host/windows/PosixApi.h"
 #endif
 
 #include "Plugins/Language/CPlusPlus/CPlusPlusLanguage.h"
 #include "Plugins/Language/ObjC/ObjCLanguage.h"
 
-#include "llvm/ADT/STLExtras.h"    // for make_unique
-#include "llvm/Support/Compiler.h" // for LLVM_PRETT...
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/Support/Compiler.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Signals.h"
-#include "llvm/Support/raw_ostream.h" // for raw_string...
+#include "llvm/Support/raw_ostream.h"
 
-#include <assert.h>    // for assert
-#include <cstdint>     // for uint32_t
-#include <inttypes.h>  // for PRIx64
-#include <map>         // for map
-#include <stdarg.h>    // for va_end
-#include <string.h>    // for size_t
-#include <type_traits> // for move
-#include <utility>     // for find, pair
+#include <assert.h>
+#include <cstdint>
+#include <inttypes.h>
+#include <map>
+#include <stdarg.h>
+#include <string.h>
+#include <type_traits>
+#include <utility>
 
 namespace lldb_private {
 class CompilerDeclContext;
Index: lldb/trunk/source/Core/ModuleList.cpp
===================================================================
--- lldb/trunk/source/Core/ModuleList.cpp
+++ lldb/trunk/source/Core/ModuleList.cpp
@@ -8,39 +8,39 @@
 //===----------------------------------------------------------------------===//
 
 #include "lldb/Core/ModuleList.h"
-#include "lldb/Core/FileSpecList.h" // for FileSpecList
+#include "lldb/Core/FileSpecList.h"
 #include "lldb/Core/Module.h"
 #include "lldb/Core/ModuleSpec.h"
 #include "lldb/Host/FileSystem.h"
 #include "lldb/Host/Symbols.h"
-#include "lldb/Interpreter/OptionValueProperties.h"
 #include "lldb/Interpreter/OptionValueFileSpec.h"
+#include "lldb/Interpreter/OptionValueProperties.h"
 #include "lldb/Interpreter/Property.h"
 #include "lldb/Symbol/ObjectFile.h"
-#include "lldb/Symbol/SymbolContext.h" // for SymbolContextList, SymbolCon...
+#include "lldb/Symbol/SymbolContext.h"
 #include "lldb/Symbol/VariableList.h"
-#include "lldb/Utility/ArchSpec.h"    // for ArchSpec
-#include "lldb/Utility/ConstString.h" // for ConstString
+#include "lldb/Utility/ArchSpec.h"
+#include "lldb/Utility/ConstString.h"
 #include "lldb/Utility/Log.h"
-#include "lldb/Utility/Logging.h" // for GetLogIfAnyCategoriesSet
-#include "lldb/Utility/UUID.h"    // for UUID, operator!=, operator==
-#include "lldb/lldb-defines.h"    // for LLDB_INVALID_INDEX32
+#include "lldb/Utility/Logging.h"
+#include "lldb/Utility/UUID.h"
+#include "lldb/lldb-defines.h"
 
 #if defined(_WIN32)
-#include "lldb/Host/windows/PosixApi.h" // for PATH_MAX
+#include "lldb/Host/windows/PosixApi.h"
 #endif
 
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "clang/Driver/Driver.h"
+#include "llvm/ADT/StringRef.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Threading.h"
-#include "llvm/Support/raw_ostream.h" // for fs
-#include "clang/Driver/Driver.h"
+#include "llvm/Support/raw_ostream.h"
 
-#include <chrono> // for operator!=, time_point
-#include <memory> // for shared_ptr
+#include <chrono>
+#include <memory>
 #include <mutex>
-#include <string>  // for string
-#include <utility> // for distance
+#include <string>
+#include <utility>
 
 namespace lldb_private {
 class Function;
Index: lldb/trunk/source/Core/Opcode.cpp
===================================================================
--- lldb/trunk/source/Core/Opcode.cpp
+++ lldb/trunk/source/Core/Opcode.cpp
@@ -13,11 +13,11 @@
 #include "lldb/Utility/DataExtractor.h"
 #include "lldb/Utility/Endian.h"
 #include "lldb/Utility/Stream.h"
-#include "lldb/lldb-forward.h" // for DataBufferSP
+#include "lldb/lldb-forward.h"
 
-#include <memory> // for make_shared
+#include <memory>
 
-#include <inttypes.h> // for PRIx64
+#include <inttypes.h>
 
 using namespace lldb;
 using namespace lldb_private;
Index: lldb/trunk/source/Core/PluginManager.cpp
===================================================================
--- lldb/trunk/source/Core/PluginManager.cpp
+++ lldb/trunk/source/Core/PluginManager.cpp
@@ -13,28 +13,28 @@
 #include "lldb/Host/FileSystem.h"
 #include "lldb/Host/HostInfo.h"
 #include "lldb/Interpreter/OptionValueProperties.h"
-#include "lldb/Utility/ConstString.h" // for ConstString
+#include "lldb/Utility/ConstString.h"
 #include "lldb/Utility/FileSpec.h"
 #include "lldb/Utility/Status.h"
-#include "lldb/Utility/StringList.h" // for StringList
+#include "lldb/Utility/StringList.h"
 
 #if defined(_WIN32)
-#include "lldb/Host/windows/PosixApi.h" // for PATH_MAX
+#include "lldb/Host/windows/PosixApi.h"
 #endif
 
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/DynamicLibrary.h"
-#include "llvm/Support/FileSystem.h"  // for file_type, file_...
-#include "llvm/Support/raw_ostream.h" // for fs
+#include "llvm/Support/FileSystem.h"
+#include "llvm/Support/raw_ostream.h"
 
-#include <map>    // for map<>::const_ite...
-#include <memory> // for shared_ptr
+#include <map>
+#include <memory>
 #include <mutex>
 #include <string>
-#include <utility> // for pair
+#include <utility>
 #include <vector>
 
-#include <assert.h> // for assert
+#include <assert.h>
 
 namespace lldb_private {
 class CommandInterpreter;
Index: lldb/trunk/source/Core/SearchFilter.cpp
===================================================================
--- lldb/trunk/source/Core/SearchFilter.cpp
+++ lldb/trunk/source/Core/SearchFilter.cpp
@@ -9,27 +9,27 @@
 
 #include "lldb/Core/SearchFilter.h"
 
-#include "lldb/Breakpoint/Breakpoint.h" // for Breakpoint
+#include "lldb/Breakpoint/Breakpoint.h"
 #include "lldb/Core/Module.h"
-#include "lldb/Core/ModuleList.h" // for ModuleList
+#include "lldb/Core/ModuleList.h"
 #include "lldb/Symbol/CompileUnit.h"
-#include "lldb/Symbol/SymbolContext.h" // for SymbolContext
+#include "lldb/Symbol/SymbolContext.h"
 #include "lldb/Symbol/SymbolVendor.h"
 #include "lldb/Target/Target.h"
-#include "lldb/Utility/ConstString.h" // for ConstString
-#include "lldb/Utility/Status.h"      // for Status
-#include "lldb/Utility/Stream.h"      // for Stream
-#include "lldb/lldb-enumerations.h"   // for SymbolContextItem::eSymbolCo...
-
-#include "llvm/ADT/StringRef.h"         // for StringRef
-#include "llvm/Support/ErrorHandling.h" // for llvm_unreachable
-
-#include <memory> // for shared_ptr
-#include <mutex>  // for recursive_mutex, lock_guard
-#include <string> // for string
+#include "lldb/Utility/ConstString.h"
+#include "lldb/Utility/Status.h"
+#include "lldb/Utility/Stream.h"
+#include "lldb/lldb-enumerations.h"
+
+#include "llvm/ADT/StringRef.h"
+#include "llvm/Support/ErrorHandling.h"
+
+#include <memory>
+#include <mutex>
+#include <string>
 
-#include <inttypes.h> // for PRIu64
-#include <string.h>   // for size_t, strcmp
+#include <inttypes.h>
+#include <string.h>
 
 namespace lldb_private {
 class Address;
Index: lldb/trunk/source/Core/Section.cpp
===================================================================
--- lldb/trunk/source/Core/Section.cpp
+++ lldb/trunk/source/Core/Section.cpp
@@ -8,18 +8,18 @@
 //===----------------------------------------------------------------------===//
 
 #include "lldb/Core/Section.h"
-#include "lldb/Core/Address.h" // for Address
+#include "lldb/Core/Address.h"
 #include "lldb/Core/Module.h"
 #include "lldb/Symbol/ObjectFile.h"
 #include "lldb/Target/SectionLoadList.h"
 #include "lldb/Target/Target.h"
-#include "lldb/Utility/FileSpec.h" // for FileSpec
-#include "lldb/Utility/Stream.h"   // for Stream
-#include "lldb/Utility/VMRange.h"  // for VMRange
-
-#include <inttypes.h> // for PRIx64
-#include <limits>     // for numeric_limits
-#include <utility>    // for distance
+#include "lldb/Utility/FileSpec.h"
+#include "lldb/Utility/Stream.h"
+#include "lldb/Utility/VMRange.h"
+
+#include <inttypes.h>
+#include <limits>
+#include <utility>
 
 namespace lldb_private {
 class DataExtractor;
Index: lldb/trunk/source/Core/SourceManager.cpp
===================================================================
--- lldb/trunk/source/Core/SourceManager.cpp
+++ lldb/trunk/source/Core/SourceManager.cpp
@@ -9,34 +9,34 @@
 
 #include "lldb/Core/SourceManager.h"
 
-#include "lldb/Core/Address.h"      // for Address
-#include "lldb/Core/AddressRange.h" // for AddressRange
+#include "lldb/Core/Address.h"
+#include "lldb/Core/AddressRange.h"
 #include "lldb/Core/Debugger.h"
-#include "lldb/Core/FormatEntity.h" // for FormatEntity
+#include "lldb/Core/FormatEntity.h"
 #include "lldb/Core/Highlighter.h"
 #include "lldb/Core/Module.h"
-#include "lldb/Core/ModuleList.h" // for ModuleList
+#include "lldb/Core/ModuleList.h"
 #include "lldb/Host/FileSystem.h"
 #include "lldb/Symbol/CompileUnit.h"
 #include "lldb/Symbol/Function.h"
-#include "lldb/Symbol/LineEntry.h" // for LineEntry
+#include "lldb/Symbol/LineEntry.h"
 #include "lldb/Symbol/SymbolContext.h"
-#include "lldb/Target/PathMappingList.h" // for PathMappingList
+#include "lldb/Target/PathMappingList.h"
 #include "lldb/Target/Target.h"
-#include "lldb/Utility/ConstString.h" // for ConstString
+#include "lldb/Utility/ConstString.h"
 #include "lldb/Utility/DataBuffer.h"
 #include "lldb/Utility/DataBufferLLVM.h"
 #include "lldb/Utility/RegularExpression.h"
 #include "lldb/Utility/Stream.h"
-#include "lldb/lldb-enumerations.h" // for StopShowColumn::eStopSho...
+#include "lldb/lldb-enumerations.h"
 
-#include "llvm/ADT/Twine.h" // for Twine
+#include "llvm/ADT/Twine.h"
 
 #include <memory>
-#include <utility> // for pair
+#include <utility>
 
-#include <assert.h> // for assert
-#include <stdio.h>  // for size_t, NULL, snprintf
+#include <assert.h>
+#include <stdio.h>
 
 namespace lldb_private {
 class ExecutionContext;
Index: lldb/trunk/source/Core/StreamAsynchronousIO.cpp
===================================================================
--- lldb/trunk/source/Core/StreamAsynchronousIO.cpp
+++ lldb/trunk/source/Core/StreamAsynchronousIO.cpp
@@ -10,7 +10,7 @@
 #include "lldb/Core/StreamAsynchronousIO.h"
 
 #include "lldb/Core/Debugger.h"
-#include "lldb/lldb-enumerations.h" // for ByteOrder::eByteOrderBig
+#include "lldb/lldb-enumerations.h"
 
 using namespace lldb;
 using namespace lldb_private;
Index: lldb/trunk/source/Core/UserSettingsController.cpp
===================================================================
--- lldb/trunk/source/Core/UserSettingsController.cpp
+++ lldb/trunk/source/Core/UserSettingsController.cpp
@@ -13,7 +13,7 @@
 #include "lldb/Utility/Status.h"
 #include "lldb/Utility/Stream.h"
 
-#include <memory> // for shared_ptr
+#include <memory>
 
 namespace lldb_private {
 class CommandInterpreter;
Index: lldb/trunk/source/Core/Value.cpp
===================================================================
--- lldb/trunk/source/Core/Value.cpp
+++ lldb/trunk/source/Core/Value.cpp
@@ -9,7 +9,7 @@
 
 #include "lldb/Core/Value.h"
 
-#include "lldb/Core/Address.h" // for Address
+#include "lldb/Core/Address.h"
 #include "lldb/Core/Module.h"
 #include "lldb/Symbol/CompilerType.h"
 #include "lldb/Symbol/ObjectFile.h"
@@ -20,21 +20,21 @@
 #include "lldb/Target/Process.h"
 #include "lldb/Target/SectionLoadList.h"
 #include "lldb/Target/Target.h"
-#include "lldb/Utility/ConstString.h" // for ConstString
+#include "lldb/Utility/ConstString.h"
 #include "lldb/Utility/DataBufferHeap.h"
 #include "lldb/Utility/DataExtractor.h"
-#include "lldb/Utility/Endian.h"   // for InlHostByteOrder
-#include "lldb/Utility/FileSpec.h" // for FileSpec
+#include "lldb/Utility/Endian.h"
+#include "lldb/Utility/FileSpec.h"
 #include "lldb/Utility/State.h"
 #include "lldb/Utility/Stream.h"
-#include "lldb/lldb-defines.h" // for LLDB_INVALID_ADDRESS
-#include "lldb/lldb-forward.h" // for DataBufferSP, ModuleSP
-#include "lldb/lldb-types.h"   // for addr_t
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-types.h"
 
-#include <memory> // for make_shared
-#include <string> // for string
+#include <memory>
+#include <string>
 
-#include <inttypes.h> // for PRIx64
+#include <inttypes.h>
 
 using namespace lldb;
 using namespace lldb_private;
Index: lldb/trunk/source/Core/ValueObject.cpp
===================================================================
--- lldb/trunk/source/Core/ValueObject.cpp
+++ lldb/trunk/source/Core/ValueObject.cpp
@@ -9,7 +9,7 @@
 
 #include "lldb/Core/ValueObject.h"
 
-#include "lldb/Core/Address.h" // for Address
+#include "lldb/Core/Address.h"
 #include "lldb/Core/Module.h"
 #include "lldb/Core/ValueObjectCast.h"
 #include "lldb/Core/ValueObjectChild.h"
@@ -18,52 +18,52 @@
 #include "lldb/Core/ValueObjectMemory.h"
 #include "lldb/Core/ValueObjectSyntheticFilter.h"
 #include "lldb/DataFormatters/DataVisualization.h"
-#include "lldb/DataFormatters/DumpValueObjectOptions.h" // for DumpValueObj...
-#include "lldb/DataFormatters/FormatManager.h"          // for FormatManager
+#include "lldb/DataFormatters/DumpValueObjectOptions.h"
+#include "lldb/DataFormatters/FormatManager.h"
 #include "lldb/DataFormatters/StringPrinter.h"
-#include "lldb/DataFormatters/TypeFormat.h"    // for TypeFormatImpl_F...
-#include "lldb/DataFormatters/TypeSummary.h"   // for TypeSummaryOptions
-#include "lldb/DataFormatters/TypeValidator.h" // for TypeValidatorImp...
+#include "lldb/DataFormatters/TypeFormat.h"
+#include "lldb/DataFormatters/TypeSummary.h"
+#include "lldb/DataFormatters/TypeValidator.h"
 #include "lldb/DataFormatters/ValueObjectPrinter.h"
-#include "lldb/Expression/ExpressionVariable.h" // for ExpressionVariable
+#include "lldb/Expression/ExpressionVariable.h"
 #include "lldb/Symbol/ClangASTContext.h"
 #include "lldb/Symbol/CompileUnit.h"
 #include "lldb/Symbol/CompilerType.h"
-#include "lldb/Symbol/Declaration.h"   // for Declaration
-#include "lldb/Symbol/SymbolContext.h" // for SymbolContext
+#include "lldb/Symbol/Declaration.h"
+#include "lldb/Symbol/SymbolContext.h"
 #include "lldb/Symbol/Type.h"
 #include "lldb/Target/ExecutionContext.h"
 #include "lldb/Target/Language.h"
 #include "lldb/Target/LanguageRuntime.h"
 #include "lldb/Target/ObjCLanguageRuntime.h"
 #include "lldb/Target/Process.h"
-#include "lldb/Target/StackFrame.h" // for StackFrame
+#include "lldb/Target/StackFrame.h"
 #include "lldb/Target/Target.h"
 #include "lldb/Target/Thread.h"
-#include "lldb/Target/ThreadList.h"  // for ThreadList
-#include "lldb/Utility/DataBuffer.h" // for DataBuffer
+#include "lldb/Target/ThreadList.h"
+#include "lldb/Utility/DataBuffer.h"
 #include "lldb/Utility/DataBufferHeap.h"
-#include "lldb/Utility/Flags.h" // for Flags
+#include "lldb/Utility/Flags.h"
 #include "lldb/Utility/Log.h"
-#include "lldb/Utility/Logging.h"    // for GetLogIfAllCateg...
-#include "lldb/Utility/Scalar.h"     // for Scalar
-#include "lldb/Utility/SharingPtr.h" // for SharingPtr
-#include "lldb/Utility/Stream.h"     // for Stream
+#include "lldb/Utility/Logging.h"
+#include "lldb/Utility/Scalar.h"
+#include "lldb/Utility/SharingPtr.h"
+#include "lldb/Utility/Stream.h"
 #include "lldb/Utility/StreamString.h"
-#include "lldb/lldb-private-types.h" // for RegisterInfo
+#include "lldb/lldb-private-types.h"
 
-#include "llvm/Support/Compiler.h" // for LLVM_FALLTHROUGH
+#include "llvm/Support/Compiler.h"
 
-#include <algorithm> // for min
-#include <cstdint>   // for uint32_t, uint64_t
-#include <cstdlib>   // for size_t, NULL
-#include <memory>    // for shared_ptr, oper...
-#include <tuple>     // for tie, tuple
-
-#include <assert.h>   // for assert
-#include <inttypes.h> // for PRIu64, PRIx64
-#include <stdio.h>    // for snprintf
-#include <string.h>   // for memcpy, memcmp
+#include <algorithm>
+#include <cstdint>
+#include <cstdlib>
+#include <memory>
+#include <tuple>
+
+#include <assert.h>
+#include <inttypes.h>
+#include <stdio.h>
+#include <string.h>
 
 namespace lldb_private {
 class ExecutionContextScope;
Index: lldb/trunk/source/Core/ValueObjectCast.cpp
===================================================================
--- lldb/trunk/source/Core/ValueObjectCast.cpp
+++ lldb/trunk/source/Core/ValueObjectCast.cpp
@@ -13,8 +13,8 @@
 #include "lldb/Core/ValueObject.h"
 #include "lldb/Symbol/CompilerType.h"
 #include "lldb/Target/ExecutionContext.h"
-#include "lldb/Utility/Scalar.h" // for operator!=, Scalar
-#include "lldb/Utility/Status.h" // for Status
+#include "lldb/Utility/Scalar.h"
+#include "lldb/Utility/Status.h"
 
 namespace lldb_private {
 class ConstString;
Index: lldb/trunk/source/Core/ValueObjectChild.cpp
===================================================================
--- lldb/trunk/source/Core/ValueObjectChild.cpp
+++ lldb/trunk/source/Core/ValueObjectChild.cpp
@@ -9,21 +9,21 @@
 
 #include "lldb/Core/ValueObjectChild.h"
 
-#include "lldb/Core/Value.h" // for Value, Value::ValueType::e...
+#include "lldb/Core/Value.h"
 #include "lldb/Symbol/CompilerType.h"
 #include "lldb/Target/ExecutionContext.h"
 #include "lldb/Target/Process.h"
-#include "lldb/Utility/Flags.h"  // for Flags
-#include "lldb/Utility/Scalar.h" // for Scalar
-#include "lldb/Utility/Status.h" // for Status
-#include "lldb/lldb-forward.h"   // for ProcessSP, ModuleSP
-
-#include <functional> // for _Func_impl<>::_Mybase
-#include <memory>     // for shared_ptr
-#include <vector>     // for vector
+#include "lldb/Utility/Flags.h"
+#include "lldb/Utility/Scalar.h"
+#include "lldb/Utility/Status.h"
+#include "lldb/lldb-forward.h"
+
+#include <functional>
+#include <memory>
+#include <vector>
 
-#include <stdio.h>  // for snprintf, size_t
-#include <string.h> // for strlen
+#include <stdio.h>
+#include <string.h>
 
 using namespace lldb_private;
 
Index: lldb/trunk/source/Core/ValueObjectConstResult.cpp
===================================================================
--- lldb/trunk/source/Core/ValueObjectConstResult.cpp
+++ lldb/trunk/source/Core/ValueObjectConstResult.cpp
@@ -12,12 +12,12 @@
 #include "lldb/Core/ValueObjectDynamicValue.h"
 #include "lldb/Symbol/CompilerType.h"
 #include "lldb/Target/ExecutionContext.h"
-#include "lldb/Target/ExecutionContextScope.h" // for ExecutionContextScope
+#include "lldb/Target/ExecutionContextScope.h"
 #include "lldb/Target/Process.h"
-#include "lldb/Utility/DataBuffer.h"     // for DataBuffer
-#include "lldb/Utility/DataBufferHeap.h" // for DataBufferHeap
+#include "lldb/Utility/DataBuffer.h"
+#include "lldb/Utility/DataBufferHeap.h"
 #include "lldb/Utility/DataExtractor.h"
-#include "lldb/Utility/Scalar.h" // for Scalar
+#include "lldb/Utility/Scalar.h"
 
 namespace lldb_private {
 class Module;
Index: lldb/trunk/source/Core/ValueObjectConstResultChild.cpp
===================================================================
--- lldb/trunk/source/Core/ValueObjectConstResultChild.cpp
+++ lldb/trunk/source/Core/ValueObjectConstResultChild.cpp
@@ -9,7 +9,7 @@
 
 #include "lldb/Core/ValueObjectConstResultChild.h"
 
-#include "lldb/lldb-private-enumerations.h" // for AddressType::eAddressType
+#include "lldb/lldb-private-enumerations.h"
 namespace lldb_private {
 class DataExtractor;
 }
Index: lldb/trunk/source/Core/ValueObjectConstResultImpl.cpp
===================================================================
--- lldb/trunk/source/Core/ValueObjectConstResultImpl.cpp
+++ lldb/trunk/source/Core/ValueObjectConstResultImpl.cpp
@@ -9,19 +9,19 @@
 
 #include "lldb/Core/ValueObjectConstResultImpl.h"
 
-#include "lldb/Core/Value.h"       // for Value, Value::Val...
-#include "lldb/Core/ValueObject.h" // for ValueObject
+#include "lldb/Core/Value.h"
+#include "lldb/Core/ValueObject.h"
 #include "lldb/Core/ValueObjectConstResult.h"
 #include "lldb/Core/ValueObjectConstResultCast.h"
 #include "lldb/Core/ValueObjectConstResultChild.h"
 #include "lldb/Symbol/CompilerType.h"
 #include "lldb/Target/ExecutionContext.h"
-#include "lldb/Utility/DataBufferHeap.h" // for DataBufferHeap
-#include "lldb/Utility/Endian.h"         // for InlHostByteOrder
-#include "lldb/Utility/Scalar.h"         // for Scalar
-#include "lldb/Utility/SharingPtr.h"     // for SharingPtr
+#include "lldb/Utility/DataBufferHeap.h"
+#include "lldb/Utility/Endian.h"
+#include "lldb/Utility/Scalar.h"
+#include "lldb/Utility/SharingPtr.h"
 
-#include <string> // for string
+#include <string>
 
 namespace lldb_private {
 class DataExtractor;
Index: lldb/trunk/source/Core/ValueObjectDynamicValue.cpp
===================================================================
--- lldb/trunk/source/Core/ValueObjectDynamicValue.cpp
+++ lldb/trunk/source/Core/ValueObjectDynamicValue.cpp
@@ -16,14 +16,14 @@
 #include "lldb/Target/LanguageRuntime.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Target/Target.h"
-#include "lldb/Utility/DataExtractor.h" // for DataExtractor
+#include "lldb/Utility/DataExtractor.h"
 #include "lldb/Utility/Log.h"
-#include "lldb/Utility/Logging.h" // for GetLogIfAllCategoriesSet
-#include "lldb/Utility/Scalar.h"  // for Scalar, operator!=
-#include "lldb/Utility/Status.h"  // for Status
-#include "lldb/lldb-types.h"      // for addr_t, offset_t
+#include "lldb/Utility/Logging.h"
+#include "lldb/Utility/Scalar.h"
+#include "lldb/Utility/Status.h"
+#include "lldb/lldb-types.h"
 
-#include <string.h> // for strcmp, size_t
+#include <string.h>
 namespace lldb_private {
 class Declaration;
 }
Index: lldb/trunk/source/Core/ValueObjectList.cpp
===================================================================
--- lldb/trunk/source/Core/ValueObjectList.cpp
+++ lldb/trunk/source/Core/ValueObjectList.cpp
@@ -9,11 +9,11 @@
 
 #include "lldb/Core/ValueObjectList.h"
 
-#include "lldb/Core/ValueObject.h"    // for ValueObject
-#include "lldb/Utility/ConstString.h" // for ConstString
-#include "lldb/Utility/SharingPtr.h"  // for SharingPtr
+#include "lldb/Core/ValueObject.h"
+#include "lldb/Utility/ConstString.h"
+#include "lldb/Utility/SharingPtr.h"
 
-#include <utility> // for back_insert_iterator, back_ins...
+#include <utility>
 
 using namespace lldb;
 using namespace lldb_private;
Index: lldb/trunk/source/Core/ValueObjectMemory.cpp
===================================================================
--- lldb/trunk/source/Core/ValueObjectMemory.cpp
+++ lldb/trunk/source/Core/ValueObjectMemory.cpp
@@ -13,14 +13,14 @@
 #include "lldb/Symbol/Type.h"
 #include "lldb/Target/ExecutionContext.h"
 #include "lldb/Target/Target.h"
-#include "lldb/Utility/DataExtractor.h" // for DataExtractor
-#include "lldb/Utility/Scalar.h"        // for Scalar, operator!=
-#include "lldb/Utility/Status.h"        // for Status
-#include "lldb/lldb-types.h"            // for addr_t
-#include "llvm/Support/ErrorHandling.h" // for llvm_unreachable
+#include "lldb/Utility/DataExtractor.h"
+#include "lldb/Utility/Scalar.h"
+#include "lldb/Utility/Status.h"
+#include "lldb/lldb-types.h"
+#include "llvm/Support/ErrorHandling.h"
 
-#include <assert.h> // for assert
-#include <memory>   // for shared_ptr
+#include <assert.h>
+#include <memory>
 
 namespace lldb_private {
 class ExecutionContextScope;
Index: lldb/trunk/source/Core/ValueObjectRegister.cpp
===================================================================
--- lldb/trunk/source/Core/ValueObjectRegister.cpp
+++ lldb/trunk/source/Core/ValueObjectRegister.cpp
@@ -10,23 +10,23 @@
 #include "lldb/Core/ValueObjectRegister.h"
 
 #include "lldb/Core/Module.h"
-#include "lldb/Core/Value.h" // for Value, Value::ContextType:...
+#include "lldb/Core/Value.h"
 #include "lldb/Symbol/CompilerType.h"
-#include "lldb/Symbol/TypeSystem.h" // for TypeSystem
+#include "lldb/Symbol/TypeSystem.h"
 #include "lldb/Target/ExecutionContext.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Target/RegisterContext.h"
-#include "lldb/Target/StackFrame.h" // for StackFrame
+#include "lldb/Target/StackFrame.h"
 #include "lldb/Target/Target.h"
-#include "lldb/Utility/DataExtractor.h" // for DataExtractor
-#include "lldb/Utility/Scalar.h"        // for Scalar
-#include "lldb/Utility/Status.h"        // for Status
-#include "lldb/Utility/Stream.h"        // for Stream
+#include "lldb/Utility/DataExtractor.h"
+#include "lldb/Utility/Scalar.h"
+#include "lldb/Utility/Status.h"
+#include "lldb/Utility/Stream.h"
 
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "llvm/ADT/StringRef.h"
 
-#include <assert.h> // for assert
-#include <memory>   // for shared_ptr
+#include <assert.h>
+#include <memory>
 
 namespace lldb_private {
 class ExecutionContextScope;
Index: lldb/trunk/source/Core/ValueObjectSyntheticFilter.cpp
===================================================================
--- lldb/trunk/source/Core/ValueObjectSyntheticFilter.cpp
+++ lldb/trunk/source/Core/ValueObjectSyntheticFilter.cpp
@@ -9,14 +9,14 @@
 
 #include "lldb/Core/ValueObjectSyntheticFilter.h"
 
-#include "lldb/Core/Value.h" // for Value
+#include "lldb/Core/Value.h"
 #include "lldb/Core/ValueObject.h"
 #include "lldb/DataFormatters/TypeSynthetic.h"
-#include "lldb/Target/ExecutionContext.h" // for ExecutionContext
+#include "lldb/Target/ExecutionContext.h"
 #include "lldb/Utility/Log.h"
-#include "lldb/Utility/Logging.h"    // for GetLogIfAllCategoriesSet
-#include "lldb/Utility/SharingPtr.h" // for SharingPtr
-#include "lldb/Utility/Status.h"     // for Status
+#include "lldb/Utility/Logging.h"
+#include "lldb/Utility/SharingPtr.h"
+#include "lldb/Utility/Status.h"
 
 #include "llvm/ADT/STLExtras.h"
 
Index: lldb/trunk/source/Core/ValueObjectVariable.cpp
===================================================================
--- lldb/trunk/source/Core/ValueObjectVariable.cpp
+++ lldb/trunk/source/Core/ValueObjectVariable.cpp
@@ -9,12 +9,12 @@
 
 #include "lldb/Core/ValueObjectVariable.h"
 
-#include "lldb/Core/Address.h"      // for Address
-#include "lldb/Core/AddressRange.h" // for AddressRange
+#include "lldb/Core/Address.h"
+#include "lldb/Core/AddressRange.h"
 #include "lldb/Core/Module.h"
 #include "lldb/Core/Value.h"
-#include "lldb/Expression/DWARFExpression.h" // for DWARFExpression
-#include "lldb/Symbol/Declaration.h"         // for Declaration
+#include "lldb/Expression/DWARFExpression.h"
+#include "lldb/Symbol/Declaration.h"
 #include "lldb/Symbol/Function.h"
 #include "lldb/Symbol/ObjectFile.h"
 #include "lldb/Symbol/SymbolContext.h"
@@ -25,17 +25,17 @@
 #include "lldb/Target/Process.h"
 #include "lldb/Target/RegisterContext.h"
 #include "lldb/Target/Target.h"
-#include "lldb/Utility/DataExtractor.h" // for DataExtractor
+#include "lldb/Utility/DataExtractor.h"
 #include "lldb/Utility/RegisterValue.h"
-#include "lldb/Utility/Scalar.h"            // for Scalar, operator!=
-#include "lldb/Utility/Status.h"            // for Status
-#include "lldb/lldb-private-enumerations.h" // for AddressType::eAddressTy...
-#include "lldb/lldb-types.h"                // for addr_t
+#include "lldb/Utility/Scalar.h"
+#include "lldb/Utility/Status.h"
+#include "lldb/lldb-private-enumerations.h"
+#include "lldb/lldb-types.h"
 
-#include "llvm/ADT/StringRef.h" // for StringRef
+#include "llvm/ADT/StringRef.h"
 
-#include <assert.h> // for assert
-#include <memory>   // for shared_ptr
+#include <assert.h>
+#include <memory>
 
 namespace lldb_private {
 class ExecutionContextScope;
Index: lldb/trunk/source/Host/common/File.cpp
===================================================================
--- lldb/trunk/source/Host/common/File.cpp
+++ lldb/trunk/source/Host/common/File.cpp
@@ -27,7 +27,7 @@
 #include "llvm/Support/ConvertUTF.h"
 #include "llvm/Support/Errno.h"
 #include "llvm/Support/FileSystem.h"
-#include "llvm/Support/Process.h" // for llvm::sys::Process::FileDescriptorHasColors()
+#include "llvm/Support/Process.h"
 
 #include "lldb/Host/Config.h"
 #include "lldb/Host/FileSystem.h"
Index: lldb/trunk/source/Host/common/TaskPool.cpp
===================================================================
--- lldb/trunk/source/Host/common/TaskPool.cpp
+++ lldb/trunk/source/Host/common/TaskPool.cpp
@@ -10,9 +10,9 @@
 #include "lldb/Host/TaskPool.h"
 #include "lldb/Host/ThreadLauncher.h"
 
-#include <cstdint> // for uint32_t
-#include <queue>   // for queue
-#include <thread>  // for thread
+#include <cstdint>
+#include <queue>
+#include <thread>
 
 namespace lldb_private {
 
Index: lldb/trunk/source/Host/linux/HostInfoLinux.cpp
===================================================================
--- lldb/trunk/source/Host/linux/HostInfoLinux.cpp
+++ lldb/trunk/source/Host/linux/HostInfoLinux.cpp
@@ -21,7 +21,7 @@
 #include <unistd.h>
 
 #include <algorithm>
-#include <mutex> // std::once
+#include <mutex>
 
 using namespace lldb_private;
 
Index: lldb/trunk/source/Host/windows/HostInfoWindows.cpp
===================================================================
--- lldb/trunk/source/Host/windows/HostInfoWindows.cpp
+++ lldb/trunk/source/Host/windows/HostInfoWindows.cpp
@@ -11,7 +11,7 @@
 
 #include <objbase.h>
 
-#include <mutex> // std::once
+#include <mutex>
 
 #include "lldb/Host/windows/HostInfoWindows.h"
 #include "lldb/Host/windows/PosixApi.h"
Index: lldb/trunk/source/Plugins/DynamicLoader/Hexagon-DYLD/HexagonDYLDRendezvous.h
===================================================================
--- lldb/trunk/source/Plugins/DynamicLoader/Hexagon-DYLD/HexagonDYLDRendezvous.h
+++ lldb/trunk/source/Plugins/DynamicLoader/Hexagon-DYLD/HexagonDYLDRendezvous.h
@@ -11,7 +11,7 @@
 #define liblldb_HexagonDYLDRendezvous_H_
 
 // C Includes
-#include <limits.h> // for PATH_MAX
+#include <limits.h>
 // C++ Includes
 #include <list>
 #include <map>
Index: lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp
===================================================================
--- lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp
+++ lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp
@@ -9,7 +9,7 @@
 
 // C Includes
 // C++ Includes
-#include <cctype> // for alnum
+#include <cctype>
 // Other libraries and framework includes
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/ASTDiagnostic.h"
Index: lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp
===================================================================
--- lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp
+++ lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp
@@ -26,8 +26,7 @@
 #include "Utility/ARM_DWARF_Registers.h"
 
 #include "llvm/ADT/STLExtras.h"
-#include "llvm/Support/MathExtras.h" // for SignExtend32 template function
-                                     // and countTrailingZeros function
+#include "llvm/Support/MathExtras.h"
 
 using namespace lldb;
 using namespace lldb_private;
Index: lldb/trunk/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp
===================================================================
--- lldb/trunk/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp
+++ lldb/trunk/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp
@@ -41,8 +41,7 @@
 #include "Plugins/Process/Utility/RegisterInfos_arm64.h"
 
 #include "llvm/ADT/STLExtras.h"
-#include "llvm/Support/MathExtras.h" // for SignExtend32 template function
-                                     // and CountTrailingZeros_32 function
+#include "llvm/Support/MathExtras.h"
 
 #include "Plugins/Process/Utility/InstructionUtils.h"
 
Index: lldb/trunk/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.cpp
===================================================================
--- lldb/trunk/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.cpp
+++ lldb/trunk/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.cpp
@@ -35,7 +35,7 @@
 #include "llvm/ADT/STLExtras.h"
 
 #include "Plugins/Process/Utility/InstructionUtils.h"
-#include "Plugins/Process/Utility/RegisterContext_mips.h" //mips32 has same registers nos as mips64
+#include "Plugins/Process/Utility/RegisterContext_mips.h"
 
 using namespace lldb;
 using namespace lldb_private;
Index: lldb/trunk/source/Plugins/ObjectFile/PECOFF/WindowsMiniDump.cpp
===================================================================
--- lldb/trunk/source/Plugins/ObjectFile/PECOFF/WindowsMiniDump.cpp
+++ lldb/trunk/source/Plugins/ObjectFile/PECOFF/WindowsMiniDump.cpp
@@ -16,7 +16,7 @@
 
 #ifdef _WIN32
 #include "lldb/Host/windows/windows.h"
-#include <dbghelp.h> // for MiniDumpWriteDump
+#include <dbghelp.h>
 #endif
 
 namespace lldb_private {
Index: lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
===================================================================
--- lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
+++ lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
@@ -42,7 +42,7 @@
 #include "llvm/Support/VersionTuple.h"
 
 #if defined(__APPLE__)
-#include <TargetConditionals.h> // for TARGET_OS_TV, TARGET_OS_WATCH
+#include <TargetConditionals.h>
 #endif
 
 using namespace lldb;
Index: lldb/trunk/source/Plugins/Process/Utility/ARMUtils.h
===================================================================
--- lldb/trunk/source/Plugins/Process/Utility/ARMUtils.h
+++ lldb/trunk/source/Plugins/Process/Utility/ARMUtils.h
@@ -12,7 +12,7 @@
 
 #include "ARMDefines.h"
 #include "InstructionUtils.h"
-#include "llvm/Support/MathExtras.h" // for SignExtend64 template function
+#include "llvm/Support/MathExtras.h"
 
 // Common utilities for the ARM/Thumb Instruction Set Architecture.
 
Index: lldb/trunk/source/Plugins/Process/Utility/RegisterContextDarwin_i386.cpp
===================================================================
--- lldb/trunk/source/Plugins/Process/Utility/RegisterContextDarwin_i386.cpp
+++ lldb/trunk/source/Plugins/Process/Utility/RegisterContextDarwin_i386.cpp
@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 // C Includes
-#include <stddef.h> // offsetof
+#include <stddef.h>
 
 // C++ Includes
 // Other libraries and framework includes
Index: lldb/trunk/source/Plugins/Process/Utility/RegisterContextDarwin_x86_64.cpp
===================================================================
--- lldb/trunk/source/Plugins/Process/Utility/RegisterContextDarwin_x86_64.cpp
+++ lldb/trunk/source/Plugins/Process/Utility/RegisterContextDarwin_x86_64.cpp
@@ -8,9 +8,9 @@
 //===----------------------------------------------------------------------===//
 
 // C Includes
-#include <inttypes.h> // PRIx64
+#include <inttypes.h>
 #include <stdarg.h>
-#include <stddef.h> // offsetof
+#include <stddef.h>
 
 // C++ Includes
 // Other libraries and framework includes
Index: lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
===================================================================
--- lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
+++ lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
@@ -14,7 +14,7 @@
 #include <stdlib.h>
 #ifndef LLDB_DISABLE_POSIX
 #include <netinet/in.h>
-#include <sys/mman.h> // for mmap
+#include <sys/mman.h>
 #include <sys/socket.h>
 #include <unistd.h>
 #endif
Index: lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFFormValue.h
===================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFFormValue.h
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFFormValue.h
@@ -11,7 +11,7 @@
 #define SymbolFileDWARF_DWARFFormValue_h_
 
 #include "DWARFDataExtractor.h"
-#include <stddef.h> // for NULL
+#include <stddef.h>
 
 class DWARFUnit;
 class SymbolFileDWARF;
Index: lldb/trunk/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp
===================================================================
--- lldb/trunk/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp
+++ lldb/trunk/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp
@@ -48,7 +48,7 @@
 #include "llvm/DebugInfo/PDB/PDBSymbolTypeTypedef.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolTypeUDT.h"
 
-#include "Plugins/Language/CPlusPlus/CPlusPlusLanguage.h" // For IsCPPMangledName
+#include "Plugins/Language/CPlusPlus/CPlusPlusLanguage.h"
 #include "Plugins/Language/CPlusPlus/MSVCUndecoratedNameParser.h"
 #include "Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.h"
 
Index: lldb/trunk/source/Utility/ArchSpec.cpp
===================================================================
--- lldb/trunk/source/Utility/ArchSpec.cpp
+++ lldb/trunk/source/Utility/ArchSpec.cpp
@@ -11,15 +11,15 @@
 
 #include "lldb/Utility/Log.h"
 #include "lldb/Utility/NameMatches.h"
-#include "lldb/Utility/Stream.h" // for Stream
+#include "lldb/Utility/Stream.h"
 #include "lldb/Utility/StringList.h"
-#include "lldb/lldb-defines.h" // for LLDB_INVALID_C...
+#include "lldb/lldb-defines.h"
 #include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/Twine.h" // for Twine
+#include "llvm/ADT/Twine.h"
 #include "llvm/BinaryFormat/COFF.h"
 #include "llvm/BinaryFormat/ELF.h"
-#include "llvm/BinaryFormat/MachO.h" // for CPUType::CPU_T...
-#include "llvm/Support/Compiler.h"   // for LLVM_FALLTHROUGH
+#include "llvm/BinaryFormat/MachO.h"
+#include "llvm/Support/Compiler.h"
 #include "llvm/Support/Host.h"
 
 using namespace lldb;
Index: lldb/trunk/source/Utility/ConstString.cpp
===================================================================
--- lldb/trunk/source/Utility/ConstString.cpp
+++ lldb/trunk/source/Utility/ConstString.cpp
@@ -12,20 +12,20 @@
 #include "lldb/Utility/Stream.h"
 
 #include "llvm/ADT/StringMap.h"
-#include "llvm/ADT/iterator.h"            // for iterator_facade_base
-#include "llvm/Support/Allocator.h"       // for BumpPtrAllocator
-#include "llvm/Support/DJB.h"             // for djbHash
-#include "llvm/Support/FormatProviders.h" // for format_provider
+#include "llvm/ADT/iterator.h"
+#include "llvm/Support/Allocator.h"
+#include "llvm/Support/DJB.h"
+#include "llvm/Support/FormatProviders.h"
 #include "llvm/Support/RWMutex.h"
 #include "llvm/Support/Threading.h"
 
-#include <algorithm> // for min
+#include <algorithm>
 #include <array>
-#include <utility> // for make_pair, pair
+#include <utility>
 
-#include <inttypes.h> // for PRIu64
-#include <stdint.h>   // for uint8_t, uint32_t, uint64_t
-#include <string.h>   // for size_t, strlen
+#include <inttypes.h>
+#include <stdint.h>
+#include <string.h>
 
 using namespace lldb_private;
 
Index: lldb/trunk/source/Utility/DataBufferLLVM.cpp
===================================================================
--- lldb/trunk/source/Utility/DataBufferLLVM.cpp
+++ lldb/trunk/source/Utility/DataBufferLLVM.cpp
@@ -13,8 +13,8 @@
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/MemoryBuffer.h"
 
-#include <assert.h>    // for assert
-#include <type_traits> // for move
+#include <assert.h>
+#include <type_traits>
 
 using namespace lldb_private;
 
Index: lldb/trunk/source/Utility/DataEncoder.cpp
===================================================================
--- lldb/trunk/source/Utility/DataEncoder.cpp
+++ lldb/trunk/source/Utility/DataEncoder.cpp
@@ -13,7 +13,7 @@
 #include "lldb/Utility/Endian.h"
 
 #include "llvm/Support/Endian.h"
-#include "llvm/Support/ErrorHandling.h" // for llvm_unreachable
+#include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/MathExtras.h"
 
 #include <cassert>
Index: lldb/trunk/source/Utility/DataExtractor.cpp
===================================================================
--- lldb/trunk/source/Utility/DataExtractor.cpp
+++ lldb/trunk/source/Utility/DataExtractor.cpp
@@ -9,10 +9,10 @@
 
 #include "lldb/Utility/DataExtractor.h"
 
-#include "lldb/lldb-defines.h"      // for LLDB_INVALID_ADDRESS
-#include "lldb/lldb-enumerations.h" // for ByteOrder::eByteOrderBig
-#include "lldb/lldb-forward.h"      // for DataBufferSP
-#include "lldb/lldb-types.h"        // for offset_t
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-types.h"
 
 #include "lldb/Utility/DataBuffer.h"
 #include "lldb/Utility/DataBufferHeap.h"
@@ -28,15 +28,15 @@
 #include "llvm/Support/MD5.h"
 #include "llvm/Support/MathExtras.h"
 
-#include <algorithm> // for min
-#include <array>     // for array
+#include <algorithm>
+#include <array>
 #include <cassert>
-#include <cstdint> // for uint8_t, uint32_t, uint64_t
+#include <cstdint>
 #include <string>
 
-#include <ctype.h>    // for isprint
-#include <inttypes.h> // for PRIx64, PRId64
-#include <string.h>   // for memcpy, memset, memchr
+#include <ctype.h>
+#include <inttypes.h>
+#include <string.h>
 
 using namespace lldb;
 using namespace lldb_private;
Index: lldb/trunk/source/Utility/FileSpec.cpp
===================================================================
--- lldb/trunk/source/Utility/FileSpec.cpp
+++ lldb/trunk/source/Utility/FileSpec.cpp
@@ -21,14 +21,14 @@
 #include "llvm/Support/Program.h"
 #include "llvm/Support/raw_ostream.h"
 
-#include <algorithm>    // for replace, min, unique
-#include <system_error> // for error_code
-#include <vector>       // for vector
-
-#include <assert.h> // for assert
-#include <limits.h> // for PATH_MAX
-#include <stdio.h>  // for size_t, NULL, snpr...
-#include <string.h> // for strcmp
+#include <algorithm>
+#include <system_error>
+#include <vector>
+
+#include <assert.h>
+#include <limits.h>
+#include <stdio.h>
+#include <string.h>
 
 using namespace lldb;
 using namespace lldb_private;
Index: lldb/trunk/source/Utility/JSON.cpp
===================================================================
--- lldb/trunk/source/Utility/JSON.cpp
+++ lldb/trunk/source/Utility/JSON.cpp
@@ -9,15 +9,15 @@
 
 #include "lldb/Utility/JSON.h"
 
-#include "lldb/Utility/Stream.h" // for Stream
+#include "lldb/Utility/Stream.h"
 #include "lldb/Utility/StreamString.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/ErrorHandling.h"
 
-#include <inttypes.h> // for PRIu64, PRId64
+#include <inttypes.h>
 #include <limits.h>
-#include <stddef.h> // for size_t
-#include <utility>  // for pair
+#include <stddef.h>
+#include <utility>
 
 using namespace lldb_private;
 
Index: lldb/trunk/source/Utility/Log.cpp
===================================================================
--- lldb/trunk/source/Utility/Log.cpp
+++ lldb/trunk/source/Utility/Log.cpp
@@ -12,24 +12,24 @@
 
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallString.h"
-#include "llvm/ADT/Twine.h"    // for operator+, Twine
-#include "llvm/ADT/iterator.h" // for iterator_facade_base
+#include "llvm/ADT/Twine.h"
+#include "llvm/ADT/iterator.h"
 
 #include "llvm/Support/Chrono.h"
-#include "llvm/Support/ManagedStatic.h" // for ManagedStatic
+#include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Support/Signals.h"
 #include "llvm/Support/Threading.h"
 #include "llvm/Support/raw_ostream.h"
 
-#include <chrono> // for duration, system_clock, syst...
+#include <chrono>
 #include <cstdarg>
 #include <mutex>
-#include <utility> // for pair
+#include <utility>
 
-#include <assert.h>  // for assert
+#include <assert.h>
 #if defined(_WIN32)
-#include <process.h> // for getpid
+#include <process.h>
 #else
 #include <unistd.h>
 #include <pthread.h>
Index: lldb/trunk/source/Utility/Logging.cpp
===================================================================
--- lldb/trunk/source/Utility/Logging.cpp
+++ lldb/trunk/source/Utility/Logging.cpp
@@ -10,9 +10,9 @@
 #include "lldb/Utility/Logging.h"
 #include "lldb/Utility/Log.h"
 
-#include "llvm/ADT/ArrayRef.h" // for ArrayRef
+#include "llvm/ADT/ArrayRef.h"
 
-#include <stdarg.h> // for va_end, va_list, va_start
+#include <stdarg.h>
 
 using namespace lldb_private;
 
Index: lldb/trunk/source/Utility/RegisterValue.cpp
===================================================================
--- lldb/trunk/source/Utility/RegisterValue.cpp
+++ lldb/trunk/source/Utility/RegisterValue.cpp
@@ -15,20 +15,20 @@
 #include "lldb/Utility/Status.h"
 #include "lldb/Utility/Stream.h"
 #include "lldb/Utility/StreamString.h"
-#include "lldb/lldb-defines.h"       // for LLDB_INVALID_ADDRESS
-#include "lldb/lldb-private-types.h" // for RegisterInfo, type128
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-private-types.h"
 
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/StringRef.h"
 
-#include <cstdint> // for uint8_t, uint32_t, uint64_t
-#include <string>  // for string
-#include <tuple>   // for tie, tuple
+#include <cstdint>
+#include <string>
+#include <tuple>
 #include <vector>
 
-#include <assert.h>   // for assert
-#include <inttypes.h> // for PRIx64
-#include <stdio.h>    // for sscanf
+#include <assert.h>
+#include <inttypes.h>
+#include <stdio.h>
 
 using namespace lldb;
 using namespace lldb_private;
Index: lldb/trunk/source/Utility/Scalar.cpp
===================================================================
--- lldb/trunk/source/Utility/Scalar.cpp
+++ lldb/trunk/source/Utility/Scalar.cpp
@@ -13,7 +13,7 @@
 #include "lldb/Utility/Endian.h"
 #include "lldb/Utility/Status.h"
 #include "lldb/Utility/Stream.h"
-#include "lldb/lldb-types.h" // for offset_t
+#include "lldb/lldb-types.h"
 
 #include "llvm/ADT/SmallString.h"
 
Index: lldb/trunk/source/Utility/SelectHelper.cpp
===================================================================
--- lldb/trunk/source/Utility/SelectHelper.cpp
+++ lldb/trunk/source/Utility/SelectHelper.cpp
@@ -17,14 +17,14 @@
 #include "lldb/Utility/SelectHelper.h"
 #include "lldb/Utility/LLDBAssert.h"
 #include "lldb/Utility/Status.h"
-#include "lldb/lldb-enumerations.h" // for ErrorType::eErrorTypePOSIX
-#include "lldb/lldb-types.h"        // for socket_t
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-types.h"
 
-#include "llvm/ADT/DenseMap.h" // for DenseMapPair, DenseMap, Dense...
-#include "llvm/ADT/Optional.h" // for Optional
+#include "llvm/ADT/DenseMap.h"
+#include "llvm/ADT/Optional.h"
 
 #include <algorithm>
-#include <chrono> // for microseconds, seconds, steady...
+#include <chrono>
 
 #include <errno.h>
 #if defined(_WIN32)
Index: lldb/trunk/source/Utility/Status.cpp
===================================================================
--- lldb/trunk/source/Utility/Status.cpp
+++ lldb/trunk/source/Utility/Status.cpp
@@ -11,16 +11,16 @@
 #include "lldb/Utility/Status.h"
 
 #include "lldb/Utility/VASPrintf.h"
-#include "lldb/lldb-defines.h"      // for LLDB_GENERIC_ERROR
-#include "lldb/lldb-enumerations.h" // for ErrorType, ErrorType::eErr...
-#include "llvm/ADT/SmallString.h"   // for SmallString
-#include "llvm/ADT/StringRef.h"     // for StringRef
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
+#include "llvm/ADT/SmallString.h"
+#include "llvm/ADT/StringRef.h"
 #include "llvm/Support/Errno.h"
-#include "llvm/Support/FormatProviders.h" // for format_provider
+#include "llvm/Support/FormatProviders.h"
 
 #include <cerrno>
 #include <cstdarg>
-#include <string> // for string
+#include <string>
 #include <system_error>
 
 #ifdef __APPLE__
@@ -30,7 +30,7 @@
 #ifdef _WIN32
 #include <windows.h>
 #endif
-#include <stdint.h> // for uint32_t
+#include <stdint.h>
 
 namespace llvm {
 class raw_ostream;
Index: lldb/trunk/source/Utility/Stream.cpp
===================================================================
--- lldb/trunk/source/Utility/Stream.cpp
+++ lldb/trunk/source/Utility/Stream.cpp
@@ -11,7 +11,7 @@
 
 #include "lldb/Utility/Endian.h"
 #include "lldb/Utility/VASPrintf.h"
-#include "llvm/ADT/SmallString.h" // for SmallString
+#include "llvm/ADT/SmallString.h"
 #include "llvm/Support/LEB128.h"
 
 #include <string>
Index: lldb/trunk/source/Utility/StreamGDBRemote.cpp
===================================================================
--- lldb/trunk/source/Utility/StreamGDBRemote.cpp
+++ lldb/trunk/source/Utility/StreamGDBRemote.cpp
@@ -9,8 +9,8 @@
 
 #include "lldb/Utility/StreamGDBRemote.h"
 
-#include "lldb/Utility/Flags.h"  // for Flags
-#include "lldb/Utility/Stream.h" // for Stream::::eBinary
+#include "lldb/Utility/Flags.h"
+#include "lldb/Utility/Stream.h"
 
 #include <stdio.h>
 
Index: lldb/trunk/source/Utility/StringExtractor.cpp
===================================================================
--- lldb/trunk/source/Utility/StringExtractor.cpp
+++ lldb/trunk/source/Utility/StringExtractor.cpp
@@ -11,9 +11,9 @@
 
 #include <tuple>
 
-#include <ctype.h> // for isxdigit, isspace
+#include <ctype.h>
 #include <stdlib.h>
-#include <string.h> // for memset
+#include <string.h>
 
 static inline int xdigit_to_sint(char ch) {
   if (ch >= 'a' && ch <= 'f')
Index: lldb/trunk/source/Utility/StringExtractorGDBRemote.cpp
===================================================================
--- lldb/trunk/source/Utility/StringExtractorGDBRemote.cpp
+++ lldb/trunk/source/Utility/StringExtractorGDBRemote.cpp
@@ -9,7 +9,7 @@
 
 #include "lldb/Utility/StringExtractorGDBRemote.h"
 
-#include <ctype.h> // for isxdigit
+#include <ctype.h>
 #include <string.h>
 
 StringExtractorGDBRemote::ResponseType
Index: lldb/trunk/source/Utility/StringList.cpp
===================================================================
--- lldb/trunk/source/Utility/StringList.cpp
+++ lldb/trunk/source/Utility/StringList.cpp
@@ -10,13 +10,13 @@
 #include "lldb/Utility/StringList.h"
 
 #include "lldb/Utility/Log.h"
-#include "lldb/Utility/Stream.h" // for Stream
+#include "lldb/Utility/Stream.h"
 #include "lldb/Utility/StreamString.h"
-#include "llvm/ADT/ArrayRef.h" // for ArrayRef, makeArrayRef
+#include "llvm/ADT/ArrayRef.h"
 
-#include <algorithm> // for min
-#include <stdint.h>  // for SIZE_MAX, uint32_t
-#include <string.h>  // for size_t, strcspn, NULL
+#include <algorithm>
+#include <stdint.h>
+#include <string.h>
 
 using namespace lldb_private;
 
Index: lldb/trunk/source/Utility/StructuredData.cpp
===================================================================
--- lldb/trunk/source/Utility/StructuredData.cpp
+++ lldb/trunk/source/Utility/StructuredData.cpp
@@ -12,14 +12,14 @@
 #include "lldb/Utility/FileSpec.h"
 #include "lldb/Utility/JSON.h"
 #include "lldb/Utility/Status.h"
-#include "lldb/Utility/Stream.h" // for Stream
+#include "lldb/Utility/Stream.h"
 #include "lldb/Utility/StreamString.h"
-#include "llvm/ADT/STLExtras.h" // for make_unique
+#include "llvm/ADT/STLExtras.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include <cerrno>
 #include <cstdlib>
 #include <inttypes.h>
-#include <limits> // for numeric_limits
+#include <limits>
 
 using namespace lldb_private;
 
Index: lldb/trunk/source/Utility/TildeExpressionResolver.cpp
===================================================================
--- lldb/trunk/source/Utility/TildeExpressionResolver.cpp
+++ lldb/trunk/source/Utility/TildeExpressionResolver.cpp
@@ -9,14 +9,14 @@
 
 #include "lldb/Utility/TildeExpressionResolver.h"
 
-#include <assert.h>     // for assert
-#include <system_error> // for error_code
+#include <assert.h>
+#include <system_error>
 
-#include "llvm/ADT/STLExtras.h"      // for any_of
-#include "llvm/ADT/SmallVector.h"    // for SmallVectorImpl
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/SmallVector.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Path.h"
-#include "llvm/Support/raw_ostream.h" // for fs
+#include "llvm/Support/raw_ostream.h"
 
 #if !defined(_WIN32)
 #include <pwd.h>
Index: lldb/trunk/source/Utility/Timer.cpp
===================================================================
--- lldb/trunk/source/Utility/Timer.cpp
+++ lldb/trunk/source/Utility/Timer.cpp
@@ -12,11 +12,11 @@
 #include <algorithm>
 #include <map>
 #include <mutex>
-#include <utility> // for pair
+#include <utility>
 #include <vector>
 
-#include <assert.h> // for assert
-#include <stdarg.h> // for va_end, va_list, va_start
+#include <assert.h>
+#include <stdarg.h>
 #include <stdio.h>
 
 using namespace lldb_private;
Index: lldb/trunk/source/Utility/VASprintf.cpp
===================================================================
--- lldb/trunk/source/Utility/VASprintf.cpp
+++ lldb/trunk/source/Utility/VASprintf.cpp
@@ -10,12 +10,12 @@
 #include "lldb/Utility/VASPrintf.h"
 
 #include "llvm/ADT/SmallString.h"
-#include "llvm/ADT/SmallVector.h" // for SmallVectorImpl
-#include "llvm/ADT/StringRef.h"   // for StringRef
+#include "llvm/ADT/SmallVector.h"
+#include "llvm/ADT/StringRef.h"
 
-#include <assert.h> // for assert
-#include <stdarg.h> // for va_end, va_list, va_copy
-#include <stdio.h>  // for vsnprintf, size_t
+#include <assert.h>
+#include <stdarg.h>
+#include <stdio.h>
 
 bool lldb_private::VASprintf(llvm::SmallVectorImpl<char> &buf, const char *fmt,
                              va_list args) {
Index: lldb/trunk/source/Utility/VMRange.cpp
===================================================================
--- lldb/trunk/source/Utility/VMRange.cpp
+++ lldb/trunk/source/Utility/VMRange.cpp
@@ -10,14 +10,14 @@
 #include "lldb/Utility/VMRange.h"
 
 #include "lldb/Utility/Stream.h"
-#include "lldb/lldb-types.h" // for addr_t
+#include "lldb/lldb-types.h"
 
 #include <algorithm>
-#include <iterator> // for distance
-#include <vector>   // for const_iterator
+#include <iterator>
+#include <vector>
 
-#include <stddef.h> // for size_t
-#include <stdint.h> // for UINT32_MAX, uint32_t
+#include <stddef.h>
+#include <stdint.h>
 
 using namespace lldb;
 using namespace lldb_private;
Index: lldb/trunk/tools/darwin-debug/darwin-debug.cpp
===================================================================
--- lldb/trunk/tools/darwin-debug/darwin-debug.cpp
+++ lldb/trunk/tools/darwin-debug/darwin-debug.cpp
@@ -24,7 +24,7 @@
 //----------------------------------------------------------------------
 #if defined(__APPLE__)
 
-#include <crt_externs.h> // for _NSGetEnviron()
+#include <crt_externs.h>
 #include <getopt.h>
 #include <limits.h>
 #include <mach/machine.h>
Index: lldb/trunk/tools/debugserver/source/RNBRemote.cpp
===================================================================
--- lldb/trunk/tools/debugserver/source/RNBRemote.cpp
+++ lldb/trunk/tools/debugserver/source/RNBRemote.cpp
@@ -50,7 +50,7 @@
 #include <zlib.h>
 #endif
 
-#include <TargetConditionals.h> // for endianness predefines
+#include <TargetConditionals.h>
 #include <iomanip>
 #include <sstream>
 #include <unordered_set>
Index: lldb/trunk/tools/debugserver/source/debugserver.cpp
===================================================================
--- lldb/trunk/tools/debugserver/source/debugserver.cpp
+++ lldb/trunk/tools/debugserver/source/debugserver.cpp
@@ -9,19 +9,17 @@
 
 #include <arpa/inet.h>
 #include <asl.h>
-#include <crt_externs.h> // for _NSGetEnviron()
+#include <crt_externs.h>
 #include <errno.h>
 #include <getopt.h>
 #include <netdb.h>
 #include <netinet/in.h>
-#include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <string>
 #include <sys/select.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
 #include <sys/types.h>
-#include <sys/types.h>
 #include <sys/un.h>
 #include <vector>
 
Index: lldb/trunk/tools/lldb-mi/MICmdBase.h
===================================================================
--- lldb/trunk/tools/lldb-mi/MICmdBase.h
+++ lldb/trunk/tools/lldb-mi/MICmdBase.h
@@ -11,7 +11,7 @@
 
 // C Includes
 // C++ Includes
-#include <functional> // for function
+#include <functional>
 
 // Other libraries and framework includes
 #include "lldb/API/SBError.h"
Index: lldb/trunk/tools/lldb-mi/MICmdCmdData.cpp
===================================================================
--- lldb/trunk/tools/lldb-mi/MICmdCmdData.cpp
+++ lldb/trunk/tools/lldb-mi/MICmdCmdData.cpp
@@ -23,9 +23,9 @@
 #include "lldb/API/SBInstructionList.h"
 #include "lldb/API/SBStream.h"
 #include "lldb/API/SBThread.h"
-#include "llvm/ADT/Twine.h"
 #include "llvm/ADT/StringRef.h"
-#include <inttypes.h> // For PRIx64
+#include "llvm/ADT/Twine.h"
+#include <inttypes.h>
 #include <string>
 
 // In-house headers:
Index: lldb/trunk/tools/lldb-mi/MICmdCmdGdbInfo.cpp
===================================================================
--- lldb/trunk/tools/lldb-mi/MICmdCmdGdbInfo.cpp
+++ lldb/trunk/tools/lldb-mi/MICmdCmdGdbInfo.cpp
@@ -11,7 +11,7 @@
 
 // Third party headers:
 #include "lldb/API/SBCommandReturnObject.h"
-#include <inttypes.h> // For PRIx64
+#include <inttypes.h>
 
 // In-house headers:
 #include "MICmdArgValString.h"
Index: lldb/trunk/tools/lldb-mi/MICmnBase.cpp
===================================================================
--- lldb/trunk/tools/lldb-mi/MICmnBase.cpp
+++ lldb/trunk/tools/lldb-mi/MICmnBase.cpp
@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 // Third party headers
-#include <stdarg.h> // va_list, va_start, var_end
+#include <stdarg.h>
 
 // In-house headers:
 #include "MICmnBase.h"
Index: lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp
===================================================================
--- lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp
+++ lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp
@@ -9,11 +9,11 @@
 
 // Third party headers:
 #include "lldb/API/SBThread.h"
-#include <inttypes.h> // For PRIx64
+#include <inttypes.h>
 #ifdef _WIN32
-#include <io.h> // For the ::_access()
+#include <io.h>
 #else
-#include <unistd.h> // For the ::access()
+#include <unistd.h>
 #endif              // _WIN32
 #include "lldb/API/SBBreakpointLocation.h"
 
Index: lldb/trunk/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.cpp
===================================================================
--- lldb/trunk/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.cpp
+++ lldb/trunk/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.cpp
@@ -20,9 +20,9 @@
 #include "lldb/API/SBUnixSignals.h"
 #include "llvm/Support/Compiler.h"
 #ifdef _WIN32
-#include <io.h> // For the ::_access()
+#include <io.h>
 #else
-#include <unistd.h> // For the ::access()
+#include <unistd.h>
 #endif              // _WIN32
 
 // In-house headers:
@@ -39,7 +39,7 @@
 #include "MICmnStreamStdout.h"
 #include "MIDriver.h"
 #include "MIUtilDebug.h"
-#include "Platform.h" // for PATH_MAX
+#include "Platform.h"
 
 #include <algorithm>
 
Index: lldb/trunk/tools/lldb-mi/MICmnResources.cpp
===================================================================
--- lldb/trunk/tools/lldb-mi/MICmnResources.cpp
+++ lldb/trunk/tools/lldb-mi/MICmnResources.cpp
@@ -9,7 +9,7 @@
 
 // Third party headers
 #include "assert.h"
-#include <inttypes.h> // For PRIx64
+#include <inttypes.h>
 
 // In-house headers:
 #include "MICmnResources.h"
Index: lldb/trunk/tools/lldb-mi/MICmnStreamStdin.cpp
===================================================================
--- lldb/trunk/tools/lldb-mi/MICmnStreamStdin.cpp
+++ lldb/trunk/tools/lldb-mi/MICmnStreamStdin.cpp
@@ -11,7 +11,7 @@
 #ifdef _MSC_VER
 #include <windows.h>
 #endif
-#include <string.h> // For std::strerror()
+#include <string.h>
 
 // In-house headers:
 #include "MICmnLog.h"
Index: lldb/trunk/tools/lldb-mi/MIDataTypes.h
===================================================================
--- lldb/trunk/tools/lldb-mi/MIDataTypes.h
+++ lldb/trunk/tools/lldb-mi/MIDataTypes.h
@@ -21,7 +21,7 @@
 
 // Debugging:
 #ifdef _DEBUG
-#include <crtdbg.h> // C-runtime debugging library (defines _ASSERT).
+#include <crtdbg.h>
 #endif              // _DEBUG
 
 #endif // _WIN32
Index: lldb/trunk/tools/lldb-mi/MIDriverMain.cpp
===================================================================
--- lldb/trunk/tools/lldb-mi/MIDriverMain.cpp
+++ lldb/trunk/tools/lldb-mi/MIDriverMain.cpp
@@ -42,7 +42,7 @@
 #include "MIDriver.h"
 #include "MIDriverMgr.h"
 #include "MIUtilDebug.h"
-#include "Platform.h" // Define signals - CODETAG_IOR_SIGNALS
+#include "Platform.h"
 
 #if defined(_MSC_VER)
 #pragma warning(                                                               \
Index: lldb/trunk/tools/lldb-mi/MIUtilFileStd.cpp
===================================================================
--- lldb/trunk/tools/lldb-mi/MIUtilFileStd.cpp
+++ lldb/trunk/tools/lldb-mi/MIUtilFileStd.cpp
@@ -11,7 +11,7 @@
 #include <assert.h>
 #include <cerrno>
 #include <stdio.h>
-#include <string.h> // For strerror()
+#include <string.h>
 
 // In-house headers:
 #include "MICmnResources.h"
Index: lldb/trunk/tools/lldb-mi/MIUtilString.cpp
===================================================================
--- lldb/trunk/tools/lldb-mi/MIUtilString.cpp
+++ lldb/trunk/tools/lldb-mi/MIUtilString.cpp
@@ -10,12 +10,12 @@
 // Third party headers
 #include "llvm/Support/Compiler.h"
 #include <cstdlib>
-#include <inttypes.h> // for PRIx8
-#include <limits.h>   // for ULONG_MAX
-#include <memory>     // std::unique_ptr
-#include <sstream>    // std::stringstream
-#include <stdarg.h>   // va_list, va_start, var_end
-#include <string.h>   // for strncmp
+#include <inttypes.h>
+#include <limits.h>
+#include <memory>
+#include <sstream>
+#include <stdarg.h>
+#include <string.h>
 
 // In-house headers:
 #include "MIUtilString.h"