[Lldb-commits] [lldb] r299676 - iwyu fixes on lldbUtility.

[Zachary Turner via lldb-commits]

Author: zturner
Date: Thu Apr  6 13:12:24 2017
New Revision: 299676

URL: http://llvm.org/viewvc/llvm-project?rev=299676&view=rev
Log:
iwyu fixes on lldbUtility.

This patch makes adjustments to header file includes in
lldbUtility based on recommendations by the iwyu tool
(include-what-you-use).  The goal here is to make sure that
all files include the exact set of headers which are needed
for that file only, to eliminate cases of dead includes (e.g.
someone deleted some code but forgot to delete the header
includes that that code necessitated), and to eliminate the
case where header includes are picked up transitively.

Modified:
    lldb/trunk/include/lldb/Core/ArchSpec.h
    lldb/trunk/include/lldb/Host/Symbols.h
    lldb/trunk/include/lldb/Symbol/DeclVendor.h
    lldb/trunk/include/lldb/Utility/Baton.h
    lldb/trunk/include/lldb/Utility/ConstString.h
    lldb/trunk/include/lldb/Utility/DataBufferHeap.h
    lldb/trunk/include/lldb/Utility/DataBufferLLVM.h
    lldb/trunk/include/lldb/Utility/DataEncoder.h
    lldb/trunk/include/lldb/Utility/DataExtractor.h
    lldb/trunk/include/lldb/Utility/Error.h
    lldb/trunk/include/lldb/Utility/FileSpec.h
    lldb/trunk/include/lldb/Utility/History.h
    lldb/trunk/include/lldb/Utility/JSON.h
    lldb/trunk/include/lldb/Utility/LLDBAssert.h
    lldb/trunk/include/lldb/Utility/Log.h
    lldb/trunk/include/lldb/Utility/Range.h
    lldb/trunk/include/lldb/Utility/RegularExpression.h
    lldb/trunk/include/lldb/Utility/SelectHelper.h
    lldb/trunk/include/lldb/Utility/SharingPtr.h
    lldb/trunk/include/lldb/Utility/Stream.h
    lldb/trunk/include/lldb/Utility/StreamCallback.h
    lldb/trunk/include/lldb/Utility/StreamGDBRemote.h
    lldb/trunk/include/lldb/Utility/StreamString.h
    lldb/trunk/include/lldb/Utility/StringExtractor.h
    lldb/trunk/include/lldb/Utility/StringLexer.h
    lldb/trunk/include/lldb/Utility/StringList.h
    lldb/trunk/include/lldb/Utility/TaskPool.h
    lldb/trunk/include/lldb/Utility/TildeExpressionResolver.h
    lldb/trunk/include/lldb/Utility/UUID.h
    lldb/trunk/include/lldb/Utility/UserID.h
    lldb/trunk/include/lldb/Utility/VMRange.h
    lldb/trunk/source/Host/common/Editline.cpp
    lldb/trunk/source/Plugins/Process/Utility/RegisterInfoInterface.h
    lldb/trunk/source/Utility/Baton.cpp
    lldb/trunk/source/Utility/ConstString.cpp
    lldb/trunk/source/Utility/DataBufferLLVM.cpp
    lldb/trunk/source/Utility/DataEncoder.cpp
    lldb/trunk/source/Utility/DataExtractor.cpp
    lldb/trunk/source/Utility/Error.cpp
    lldb/trunk/source/Utility/FastDemangle.cpp
    lldb/trunk/source/Utility/FileSpec.cpp
    lldb/trunk/source/Utility/JSON.cpp
    lldb/trunk/source/Utility/LLDBAssert.cpp
    lldb/trunk/source/Utility/Log.cpp
    lldb/trunk/source/Utility/Logging.cpp
    lldb/trunk/source/Utility/Range.cpp
    lldb/trunk/source/Utility/RegularExpression.cpp
    lldb/trunk/source/Utility/SelectHelper.cpp
    lldb/trunk/source/Utility/Stream.cpp
    lldb/trunk/source/Utility/StreamCallback.cpp
    lldb/trunk/source/Utility/StreamGDBRemote.cpp
    lldb/trunk/source/Utility/StreamString.cpp
    lldb/trunk/source/Utility/StringExtractor.cpp
    lldb/trunk/source/Utility/StringExtractorGDBRemote.cpp
    lldb/trunk/source/Utility/StringExtractorGDBRemote.h
    lldb/trunk/source/Utility/StringLexer.cpp
    lldb/trunk/source/Utility/StringList.cpp
    lldb/trunk/source/Utility/TaskPool.cpp
    lldb/trunk/source/Utility/TildeExpressionResolver.cpp
    lldb/trunk/source/Utility/UUID.cpp
    lldb/trunk/source/Utility/UriParser.cpp
    lldb/trunk/source/Utility/VASprintf.cpp
    lldb/trunk/source/Utility/VMRange.cpp
    lldb/trunk/tools/lldb-mi/MICmdCmdStack.cpp
    lldb/trunk/tools/lldb-mi/MICmdCmdVar.cpp
    lldb/trunk/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.cpp

Modified: lldb/trunk/include/lldb/Core/ArchSpec.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/ArchSpec.h?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/ArchSpec.h (original)
+++ lldb/trunk/include/lldb/Core/ArchSpec.h Thu Apr  6 13:12:24 2017
@@ -13,7 +13,9 @@
 #if defined(__cplusplus)
 
 #include "lldb/Utility/ConstString.h"
+#include "lldb/lldb-enumerations.h"
 #include "lldb/lldb-forward.h"
+#include "lldb/lldb-private-enumerations.h"
 #include "llvm/ADT/Triple.h"
 
 namespace lldb_private {

Modified: lldb/trunk/include/lldb/Host/Symbols.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Host/Symbols.h?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Host/Symbols.h (original)
+++ lldb/trunk/include/lldb/Host/Symbols.h Thu Apr  6 13:12:24 2017
@@ -20,6 +20,10 @@
 
 namespace lldb_private {
 
+class ArchSpec;
+class ModuleSpec;
+class UUID;
+
 class Symbols {
 public:
   //----------------------------------------------------------------------

Modified: lldb/trunk/include/lldb/Symbol/DeclVendor.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/DeclVendor.h?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/DeclVendor.h (original)
+++ lldb/trunk/include/lldb/Symbol/DeclVendor.h Thu Apr  6 13:12:24 2017
@@ -11,6 +11,7 @@
 #define liblldb_DeclVendor_h_
 
 #include "lldb/Core/ClangForward.h"
+#include "lldb/lldb-defines.h"
 
 #include <vector>
 

Modified: lldb/trunk/include/lldb/Utility/Baton.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/Baton.h?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Utility/Baton.h (original)
+++ lldb/trunk/include/lldb/Utility/Baton.h Thu Apr  6 13:12:24 2017
@@ -10,12 +10,15 @@
 #ifndef lldb_Baton_h_
 #define lldb_Baton_h_
 
-// C Includes
-// C++ Includes
-// Other libraries and framework includes
-// Project includes
+#include "lldb/lldb-enumerations.h" // for DescriptionLevel
 #include "lldb/lldb-public.h"
 
+#include <memory> // for unique_ptr
+
+namespace lldb_private {
+class Stream;
+}
+
 namespace lldb_private {
 
 //----------------------------------------------------------------------

Modified: lldb/trunk/include/lldb/Utility/ConstString.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/ConstString.h?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Utility/ConstString.h (original)
+++ lldb/trunk/include/lldb/Utility/ConstString.h Thu Apr  6 13:12:24 2017
@@ -10,13 +10,17 @@
 #ifndef liblldb_ConstString_h_
 #define liblldb_ConstString_h_
 
-// C Includes
-// C++ Includes
-// Other libraries and framework includes
 #include "llvm/ADT/StringRef.h"
+#include "llvm/Support/FormatVariadic.h" // for format_provider
 
-// Project includes
-#include "lldb/lldb-private.h"
+#include <stddef.h> // for size_t
+
+namespace lldb_private {
+class Stream;
+}
+namespace llvm {
+class raw_ostream;
+}
 
 namespace lldb_private {
 

Modified: lldb/trunk/include/lldb/Utility/DataBufferHeap.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/DataBufferHeap.h?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Utility/DataBufferHeap.h (original)
+++ lldb/trunk/include/lldb/Utility/DataBufferHeap.h Thu Apr  6 13:12:24 2017
@@ -10,10 +10,12 @@
 #ifndef liblldb_DataBufferHeap_h_
 #define liblldb_DataBufferHeap_h_
 
-#include <vector>
-
 #include "lldb/Utility/DataBuffer.h"
-#include "lldb/lldb-private.h"
+#include "lldb/lldb-types.h"    // for offset_t
+#include "llvm/ADT/StringRef.h" // for StringRef
+
+#include <cstdint> // for uint8_t, uint64_t
+#include <vector>
 
 namespace lldb_private {
 

Modified: lldb/trunk/include/lldb/Utility/DataBufferLLVM.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/DataBufferLLVM.h?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Utility/DataBufferLLVM.h (original)
+++ lldb/trunk/include/lldb/Utility/DataBufferLLVM.h Thu Apr  6 13:12:24 2017
@@ -11,8 +11,10 @@
 #define LLDB_CORE_DATABUFFERLLVM_H
 
 #include "lldb/Utility/DataBuffer.h"
+#include "lldb/lldb-types.h" // for offset_t
 
 #include <memory>
+#include <stdint.h> // for uint8_t, uint64_t
 
 namespace llvm {
 class MemoryBuffer;

Modified: lldb/trunk/include/lldb/Utility/DataEncoder.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/DataEncoder.h?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Utility/DataEncoder.h (original)
+++ lldb/trunk/include/lldb/Utility/DataEncoder.h Thu Apr  6 13:12:24 2017
@@ -12,8 +12,12 @@
 
 #if defined(__cplusplus)
 
-#include "lldb/lldb-private.h"
-#include <limits.h>
+#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 <stddef.h> // for size_t
 #include <stdint.h>
 
 namespace lldb_private {

Modified: lldb/trunk/include/lldb/Utility/DataExtractor.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/DataExtractor.h?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Utility/DataExtractor.h (original)
+++ lldb/trunk/include/lldb/Utility/DataExtractor.h Thu Apr  6 13:12:24 2017
@@ -10,16 +10,24 @@
 #ifndef LLDB_UTILITY_DATAEXTRACTOR_H
 #define LLDB_UTILITY_DATAEXTRACTOR_H
 
-// Other libraries and framework includes
 #include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h" // for ByteOrder
+#include "lldb/lldb-forward.h"      // for DataBufferSP
 #include "lldb/lldb-types.h"
-#include "llvm/ADT/SmallVector.h"
 
-// C Includes
-#include <limits.h>
 #include <stdint.h>
 #include <string.h>
 
+namespace lldb_private {
+class Log;
+}
+namespace lldb_private {
+class Stream;
+}
+namespace llvm {
+template <typename T> class SmallVectorImpl;
+}
+
 // C++ Includes
 
 namespace lldb_private {

Modified: lldb/trunk/include/lldb/Utility/Error.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/Error.h?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Utility/Error.h (original)
+++ lldb/trunk/include/lldb/Utility/Error.h Thu Apr  6 13:12:24 2017
@@ -11,17 +11,21 @@
 #define __DCError_h__
 #if defined(__cplusplus)
 
-#include "llvm/Support/DataTypes.h"
-#include "llvm/Support/FormatAdapters.h"
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h" // for ErrorType, ErrorType...
+#include "llvm/ADT/StringRef.h"     // for StringRef
 #include "llvm/Support/FormatVariadic.h"
 
 #include <cstdarg>
-#include <cstdio>
 #include <string>
+#include <system_error> // for error_code
+#include <type_traits>  // for forward
 
-#include "lldb/lldb-private.h"
+#include <stdint.h> // for uint32_t
 
-#include "llvm/Support/FormatVariadic.h"
+namespace llvm {
+class raw_ostream;
+}
 
 namespace lldb_private {
 

Modified: lldb/trunk/include/lldb/Utility/FileSpec.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/FileSpec.h?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Utility/FileSpec.h (original)
+++ lldb/trunk/include/lldb/Utility/FileSpec.h Thu Apr  6 13:12:24 2017
@@ -18,12 +18,27 @@
 // Other libraries and framework includes
 // Project includes
 #include "lldb/Utility/ConstString.h"
-#include "lldb/lldb-private.h"
 
-#include "llvm/ADT/Triple.h"
+#include "llvm/ADT/StringRef.h" // for StringRef
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/FormatVariadic.h"
 
+#include <stddef.h> // for size_t
+#include <stdint.h> // for uint32_t, uint64_t
+
+namespace lldb_private {
+class Stream;
+}
+namespace llvm {
+class Triple;
+}
+namespace llvm {
+class raw_ostream;
+}
+namespace llvm {
+template <typename T> class SmallVectorImpl;
+}
+
 namespace lldb_private {
 
 //----------------------------------------------------------------------

Modified: lldb/trunk/include/lldb/Utility/History.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/History.h?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Utility/History.h (original)
+++ lldb/trunk/include/lldb/Utility/History.h Thu Apr  6 13:12:24 2017
@@ -10,17 +10,19 @@
 #ifndef lldb_History_h_
 #define lldb_History_h_
 
-// C Includes
-#include <stdint.h>
+#include "lldb/lldb-defines.h" // for DISALLOW_COPY_AND_ASSIGN
 
 // C++ Includes
 #include <mutex>
 #include <stack>
 #include <string>
 
-// Other libraries and framework includes
-// Project includes
-#include "lldb/lldb-public.h"
+#include <stddef.h> // for size_t
+#include <stdint.h>
+
+namespace lldb_private {
+class Stream;
+}
 
 namespace lldb_private {
 

Modified: lldb/trunk/include/lldb/Utility/JSON.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/JSON.h?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Utility/JSON.h (original)
+++ lldb/trunk/include/lldb/Utility/JSON.h Thu Apr  6 13:12:24 2017
@@ -10,19 +10,20 @@
 #ifndef utility_JSON_h_
 #define utility_JSON_h_
 
-#include "lldb/Utility/Stream.h"
 #include "lldb/Utility/StringExtractor.h"
 
-#include <inttypes.h>
 #include <map>
 #include <memory>
-#include <stdint.h>
 #include <string>
+#include <type_traits>
 #include <vector>
 
-#include "llvm/Support/Casting.h"
+#include <stdint.h>
 
 namespace lldb_private {
+class Stream;
+}
+namespace lldb_private {
 
 class JSONValue {
 public:

Modified: lldb/trunk/include/lldb/Utility/LLDBAssert.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/LLDBAssert.h?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Utility/LLDBAssert.h (original)
+++ lldb/trunk/include/lldb/Utility/LLDBAssert.h Thu Apr  6 13:12:24 2017
@@ -1,5 +1,4 @@
-//===----------------- LLDBAssert.h --------------------------------*- C++
-//-*-===//
+//===----------------- LLDBAssert.h ------------------------------*- C++-*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -11,8 +10,6 @@
 #ifndef utility_LLDBAssert_h_
 #define utility_LLDBAssert_h_
 
-#include <assert.h>
-
 #ifdef LLDB_CONFIGURATION_DEBUG
 #define lldbassert(x) assert(x)
 #else

Modified: lldb/trunk/include/lldb/Utility/Log.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/Log.h?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Utility/Log.h (original)
+++ lldb/trunk/include/lldb/Utility/Log.h Thu Apr  6 13:12:24 2017
@@ -10,22 +10,29 @@
 #ifndef LLDB_UTILITY_LOG_H
 #define LLDB_UTILITY_LOG_H
 
-// Project includes
 #include "lldb/Utility/Flags.h"
 #include "lldb/Utility/Logging.h"
 #include "lldb/lldb-defines.h"
 
-// Other libraries and framework includes
 #include "llvm/ADT/ArrayRef.h"
+#include "llvm/ADT/StringMap.h" // for StringMap
+#include "llvm/ADT/StringRef.h" // for StringRef, StringLiteral
 #include "llvm/Support/FormatVariadic.h"
-#include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/RWMutex.h"
-// C++ Includes
+
 #include <atomic>
 #include <cstdarg>
 #include <cstdint>
-// C Includes
+#include <memory>      // for shared_ptr
+#include <string>      // for string
+#include <type_traits> // for forward
 
+namespace llvm {
+class raw_ostream;
+}
+namespace llvm {
+template <class C> class ManagedStatic;
+}
 //----------------------------------------------------------------------
 // Logging Options
 //----------------------------------------------------------------------

Modified: lldb/trunk/include/lldb/Utility/Range.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/Range.h?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Utility/Range.h (original)
+++ lldb/trunk/include/lldb/Utility/Range.h Thu Apr  6 13:12:24 2017
@@ -10,7 +10,6 @@
 #ifndef utility_Range_h_
 #define utility_Range_h_
 
-#include <algorithm>
 #include <stdint.h>
 
 namespace lldb_utility {

Modified: lldb/trunk/include/lldb/Utility/RegularExpression.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/RegularExpression.h?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Utility/RegularExpression.h (original)
+++ lldb/trunk/include/lldb/Utility/RegularExpression.h Thu Apr  6 13:12:24 2017
@@ -36,11 +36,13 @@ inline void regfree(llvm_regex_t *a) { l
 #endif
 #include <regex.h>
 #endif
-#include <stdint.h>
 
 #include <string>
 #include <vector>
 
+#include <stddef.h> // for size_t
+#include <stdint.h>
+
 namespace llvm {
 class StringRef;
 } // namespace llvm

Modified: lldb/trunk/include/lldb/Utility/SelectHelper.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/SelectHelper.h?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Utility/SelectHelper.h (original)
+++ lldb/trunk/include/lldb/Utility/SelectHelper.h Thu Apr  6 13:12:24 2017
@@ -10,16 +10,13 @@
 #ifndef liblldb_SelectHelper_h_
 #define liblldb_SelectHelper_h_
 
-// C Includes
-// C++ Includes
-#include <chrono>
+#include "lldb/Utility/Error.h" // for Error
+#include "lldb/lldb-types.h"    // for socket_t
 
-// Other libraries and framework includes
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/Optional.h"
 
-// Project includes
-#include "lldb/lldb-forward.h"
+#include <chrono>
 
 class SelectHelper {
 public:

Modified: lldb/trunk/include/lldb/Utility/SharingPtr.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/SharingPtr.h?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Utility/SharingPtr.h (original)
+++ lldb/trunk/include/lldb/Utility/SharingPtr.h Thu Apr  6 13:12:24 2017
@@ -12,7 +12,6 @@
 
 // C Includes
 // C++ Includes
-#include <algorithm>
 #include <memory>
 
 // Microsoft Visual C++ currently does not enable std::atomic to work
@@ -24,6 +23,8 @@
 #include <atomic>
 #endif
 
+#include <stddef.h>
+
 // Other libraries and framework includes
 // Project includes
 

Modified: lldb/trunk/include/lldb/Utility/Stream.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/Stream.h?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Utility/Stream.h (original)
+++ lldb/trunk/include/lldb/Utility/Stream.h Thu Apr  6 13:12:24 2017
@@ -10,18 +10,17 @@
 #ifndef liblldb_Stream_h_
 #define liblldb_Stream_h_
 
-// C Includes
-#include <stdarg.h>
-
-// C++ Includes
-// Other libraries and framework includes
-// Project includes
 #include "lldb/Utility/Flags.h"
-
-#include "lldb/lldb-private.h"
-
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h" // for ByteOrder::eByteOrderInvalid
+#include "llvm/ADT/StringRef.h"     // for StringRef
 #include "llvm/Support/FormatVariadic.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
+
 namespace lldb_private {
 
 //----------------------------------------------------------------------

Modified: lldb/trunk/include/lldb/Utility/StreamCallback.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/StreamCallback.h?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Utility/StreamCallback.h (original)
+++ lldb/trunk/include/lldb/Utility/StreamCallback.h Thu Apr  6 13:12:24 2017
@@ -12,7 +12,9 @@
 
 #include "lldb/lldb-types.h"
 #include "llvm/Support/raw_ostream.h"
-#include <string>
+
+#include <stddef.h> // for size_t
+#include <stdint.h> // for uint64_t
 
 namespace lldb_private {
 

Modified: lldb/trunk/include/lldb/Utility/StreamGDBRemote.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/StreamGDBRemote.h?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Utility/StreamGDBRemote.h (original)
+++ lldb/trunk/include/lldb/Utility/StreamGDBRemote.h Thu Apr  6 13:12:24 2017
@@ -1,5 +1,4 @@
-//===-- StreamGDBRemote.h ----------------------------------------*- C++
-//-*-===//
+//===-- StreamGDBRemote.h ----------------------------------------*- C++-*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -11,13 +10,11 @@
 #ifndef liblldb_StreamGDBRemote_h_
 #define liblldb_StreamGDBRemote_h_
 
-// C Includes
-// C++ Includes
+#include "lldb/Utility/StreamString.h" // for StreamString
+#include "lldb/lldb-enumerations.h"    // for ByteOrder
 
-// Other libraries and framework includes
-// Project includes
-
-#include "lldb/Utility/StreamString.h"
+#include <stddef.h> // for size_t
+#include <stdint.h> // for uint32_t
 
 namespace lldb_private {
 

Modified: lldb/trunk/include/lldb/Utility/StreamString.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/StreamString.h?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Utility/StreamString.h (original)
+++ lldb/trunk/include/lldb/Utility/StreamString.h Thu Apr  6 13:12:24 2017
@@ -10,9 +10,14 @@
 #ifndef liblldb_StreamString_h_
 #define liblldb_StreamString_h_
 
-#include <string>
+#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 <string> // for string
+
+#include <stddef.h> // for size_t
+#include <stdint.h> // for uint32_t
 
 namespace lldb_private {
 

Modified: lldb/trunk/include/lldb/Utility/StringExtractor.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/StringExtractor.h?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Utility/StringExtractor.h (original)
+++ lldb/trunk/include/lldb/Utility/StringExtractor.h Thu Apr  6 13:12:24 2017
@@ -10,16 +10,15 @@
 #ifndef utility_StringExtractor_h_
 #define utility_StringExtractor_h_
 
-// C Includes
-// C++ Includes
-#include <stdint.h>
-#include <string>
-
 // Other libraries and framework includes
 // Project includes
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/StringRef.h"
 
+#include <stddef.h> // for size_t
+#include <stdint.h>
+#include <string>
+
 class StringExtractor {
 public:
   enum { BigEndian = 0, LittleEndian = 1 };

Modified: lldb/trunk/include/lldb/Utility/StringLexer.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/StringLexer.h?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Utility/StringLexer.h (original)
+++ lldb/trunk/include/lldb/Utility/StringLexer.h Thu Apr  6 13:12:24 2017
@@ -11,9 +11,9 @@
 #ifndef utility_StringLexer_h_
 #define utility_StringLexer_h_
 
-#include <initializer_list>
-#include <list>
-#include <string>
+#include <initializer_list> // for initializer_list
+#include <string>           // for string
+#include <utility>          // for pair
 
 namespace lldb_utility {
 

Modified: lldb/trunk/include/lldb/Utility/StringList.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/StringList.h?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Utility/StringList.h (original)
+++ lldb/trunk/include/lldb/Utility/StringList.h Thu Apr  6 13:12:24 2017
@@ -10,18 +10,18 @@
 #ifndef liblldb_StringList_h_
 #define liblldb_StringList_h_
 
-// C Includes
-#include <stdint.h>
+#include "llvm/ADT/StringRef.h"
 
-// C++ Includes
+#include <stddef.h> // for size_t
 #include <string>
 #include <vector>
 
-// Other libraries and framework includes
-#include "llvm/ADT/StringRef.h"
-
-// Project includes
-#include "lldb/lldb-forward.h"
+namespace lldb_private {
+class Log;
+}
+namespace lldb_private {
+class Stream;
+}
 
 namespace lldb_private {
 

Modified: lldb/trunk/include/lldb/Utility/TaskPool.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/TaskPool.h?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Utility/TaskPool.h (original)
+++ lldb/trunk/include/lldb/Utility/TaskPool.h Thu Apr  6 13:12:24 2017
@@ -10,13 +10,12 @@
 #ifndef utility_TaskPool_h_
 #define utility_TaskPool_h_
 
-#include <cassert>
-#include <cstdint>
+#include <functional> // for bind, function
 #include <future>
 #include <list>
-#include <queue>
-#include <thread>
-#include <vector>
+#include <memory>      // for make_shared
+#include <mutex>       // for mutex, unique_lock, condition_variable
+#include <type_traits> // for forward, result_of, move
 
 // Global TaskPool class for running tasks in parallel on a set of worker thread
 // created the first

Modified: lldb/trunk/include/lldb/Utility/TildeExpressionResolver.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/TildeExpressionResolver.h?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Utility/TildeExpressionResolver.h (original)
+++ lldb/trunk/include/lldb/Utility/TildeExpressionResolver.h Thu Apr  6 13:12:24 2017
@@ -10,10 +10,13 @@
 #ifndef LLDB_UTILITY_TILDE_EXPRESSION_RESOLVER_H
 #define LLDB_UTILITY_TILDE_EXPRESSION_RESOLVER_H
 
-#include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/StringSet.h"
 
+namespace llvm {
+template <typename T> class SmallVectorImpl;
+}
+
 namespace lldb_private {
 class TildeExpressionResolver {
 public:

Modified: lldb/trunk/include/lldb/Utility/UUID.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/UUID.h?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Utility/UUID.h (original)
+++ lldb/trunk/include/lldb/Utility/UUID.h Thu Apr  6 13:12:24 2017
@@ -12,6 +12,7 @@
 
 // C Includes
 // C++ Includes
+#include <stddef.h>
 #include <stdint.h>
 #include <string>
 

Modified: lldb/trunk/include/lldb/Utility/UserID.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/UserID.h?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Utility/UserID.h (original)
+++ lldb/trunk/include/lldb/Utility/UserID.h Thu Apr  6 13:12:24 2017
@@ -10,7 +10,11 @@
 #ifndef liblldb_UserID_h_
 #define liblldb_UserID_h_
 
-#include "lldb/lldb-private.h"
+#include "lldb/lldb-defines.h" // for LLDB_INVALID_UID
+#include "lldb/lldb-types.h"   // for user_id_t
+namespace lldb_private {
+class Stream;
+}
 
 namespace lldb_private {
 

Modified: lldb/trunk/include/lldb/Utility/VMRange.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Utility/VMRange.h?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Utility/VMRange.h (original)
+++ lldb/trunk/include/lldb/Utility/VMRange.h Thu Apr  6 13:12:24 2017
@@ -10,10 +10,17 @@
 #ifndef liblldb_VMRange_h_
 #define liblldb_VMRange_h_
 
-#include "lldb/lldb-private.h"
+#include "lldb/lldb-types.h" // for addr_t
+
+#include <stddef.h> // for size_t
+#include <stdint.h> // for uint32_t
 #include <vector>
 
 namespace lldb_private {
+class Stream;
+}
+
+namespace lldb_private {
 
 //----------------------------------------------------------------------
 // A vm address range. These can represent offsets ranges or actual

Modified: lldb/trunk/source/Host/common/Editline.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/common/Editline.cpp?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/source/Host/common/Editline.cpp (original)
+++ lldb/trunk/source/Host/common/Editline.cpp Thu Apr  6 13:12:24 2017
@@ -20,6 +20,7 @@
 #include "lldb/Utility/SelectHelper.h"
 #include "lldb/Utility/StreamString.h"
 #include "lldb/Utility/StringList.h"
+#include "lldb/Utility/Timeout.h"
 
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Threading.h"

Modified: lldb/trunk/source/Plugins/Process/Utility/RegisterInfoInterface.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Utility/RegisterInfoInterface.h?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/Utility/RegisterInfoInterface.h (original)
+++ lldb/trunk/source/Plugins/Process/Utility/RegisterInfoInterface.h Thu Apr  6 13:12:24 2017
@@ -13,6 +13,7 @@
 #include <vector>
 
 #include "lldb/Core/ArchSpec.h"
+#include "lldb/lldb-private-types.h"
 
 namespace lldb_private {
 

Modified: lldb/trunk/source/Utility/Baton.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/Baton.cpp?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/source/Utility/Baton.cpp (original)
+++ lldb/trunk/source/Utility/Baton.cpp Thu Apr  6 13:12:24 2017
@@ -9,14 +9,5 @@
 
 #include "lldb/Utility/Baton.h"
 
-// C Includes
-// C++ Includes
-// Other libraries and framework includes
-// Project includes
-#include "lldb/Utility/Stream.h"
-
-using namespace lldb;
-using namespace lldb_private;
-
-void UntypedBaton::GetDescription(Stream *s,
-                                  lldb::DescriptionLevel level) const {}
+void lldb_private::UntypedBaton::GetDescription(
+    Stream *s, lldb::DescriptionLevel level) const {}

Modified: lldb/trunk/source/Utility/ConstString.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/ConstString.cpp?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/source/Utility/ConstString.cpp (original)
+++ lldb/trunk/source/Utility/ConstString.cpp Thu Apr  6 13:12:24 2017
@@ -9,19 +9,23 @@
 
 #include "lldb/Utility/ConstString.h"
 
-// C Includes
-// C++ Includes
-#include <array>
-#include <mutex>
+#include "lldb/Utility/Stream.h"
 
-// Other libraries and framework includes
 #include "llvm/ADT/StringExtras.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/FormatProviders.h" // for format_provider
 #include "llvm/Support/RWMutex.h"
-
-// Project includes
 #include "llvm/Support/Threading.h"
-#include "lldb/Utility/Stream.h"
+
+#include <algorithm> // for min
+#include <array>
+#include <utility> // for make_pair, pair
+
+#include <inttypes.h> // for PRIu64
+#include <stdint.h>   // for uint8_t, uint32_t, uint64_t
+#include <string.h>   // for size_t, strlen
 
 using namespace lldb_private;
 

Modified: lldb/trunk/source/Utility/DataBufferLLVM.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/DataBufferLLVM.cpp?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/source/Utility/DataBufferLLVM.cpp (original)
+++ lldb/trunk/source/Utility/DataBufferLLVM.cpp Thu Apr  6 13:12:24 2017
@@ -13,6 +13,9 @@
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/MemoryBuffer.h"
 
+#include <assert.h>    // for assert
+#include <type_traits> // for move
+
 using namespace lldb_private;
 
 DataBufferLLVM::DataBufferLLVM(std::unique_ptr<llvm::MemoryBuffer> MemBuffer)

Modified: lldb/trunk/source/Utility/DataEncoder.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/DataEncoder.cpp?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/source/Utility/DataEncoder.cpp (original)
+++ lldb/trunk/source/Utility/DataEncoder.cpp Thu Apr  6 13:12:24 2017
@@ -12,13 +12,14 @@
 #include "lldb/Utility/DataBuffer.h"
 #include "lldb/Utility/Endian.h"
 
+#include "llvm/Support/ErrorHandling.h" // for llvm_unreachable
 #include "llvm/Support/MathExtras.h"
 
-// C Includes
-// C++ Includes
 #include <cassert>
 #include <cstddef>
 
+#include <string.h>
+
 using namespace lldb;
 using namespace lldb_private;
 

Modified: lldb/trunk/source/Utility/DataExtractor.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/DataExtractor.cpp?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/source/Utility/DataExtractor.cpp (original)
+++ lldb/trunk/source/Utility/DataExtractor.cpp Thu Apr  6 13:12:24 2017
@@ -7,29 +7,36 @@
 //
 //===----------------------------------------------------------------------===//
 
-// C Includes
-// C++ Includes
-#include <cassert>
-#include <cmath>
-#include <cstddef>
-#include <string>
+#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
 
-// Project includes
 #include "lldb/Utility/DataBuffer.h"
 #include "lldb/Utility/DataBufferHeap.h"
-#include "lldb/Utility/DataExtractor.h"
 #include "lldb/Utility/Endian.h"
 #include "lldb/Utility/Log.h"
 #include "lldb/Utility/Stream.h"
 #include "lldb/Utility/StreamString.h"
 #include "lldb/Utility/UUID.h"
 
-// Other libraries and framework includes
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/Support/MD5.h"
 #include "llvm/Support/MathExtras.h"
 
+#include <algorithm> // for min
+#include <array>     // for array
+#include <cassert>
+#include <cstdint> // for uint8_t, uint32_t, uint64_t
+#include <string>
+
+#include <ctype.h>    // for isprint
+#include <inttypes.h> // for PRIx64, PRId64
+#include <string.h>   // for memcpy, memset, memchr
+
 using namespace lldb;
 using namespace lldb_private;
 

Modified: lldb/trunk/source/Utility/Error.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/Error.cpp?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/source/Utility/Error.cpp (original)
+++ lldb/trunk/source/Utility/Error.cpp Thu Apr  6 13:12:24 2017
@@ -7,22 +7,30 @@
 //
 //===----------------------------------------------------------------------===//
 
-// C Includes
-#ifdef __APPLE__
-#include <mach/mach.h>
-#endif
+#include "lldb/Utility/Error.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 "llvm/Support/FormatProviders.h" // for format_provider
 
-// C++ Includes
 #include <cerrno>
 #include <cstdarg>
+#include <string> // for string
 #include <system_error>
 
-// Other libraries and framework includes
-#include "llvm/ADT/SmallVector.h"
+#ifdef __APPLE__
+#include <mach/mach.h>
+#endif
 
-// Project includes
-#include "lldb/Utility/Error.h"
-#include "lldb/Utility/VASPrintf.h"
+#include <stdint.h> // for uint32_t
+#include <string.h> // for strerror
+
+namespace llvm {
+class raw_ostream;
+}
 
 using namespace lldb;
 using namespace lldb_private;

Modified: lldb/trunk/source/Utility/FastDemangle.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/FastDemangle.cpp?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/source/Utility/FastDemangle.cpp (original)
+++ lldb/trunk/source/Utility/FastDemangle.cpp Thu Apr  6 13:12:24 2017
@@ -7,14 +7,15 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "lldb/Utility/FastDemangle.h"
+
+#include "llvm/Support/Compiler.h" // for LLVM_FALLTHROUGH
 
 #include <functional>
 
-#include "lldb/Utility/FastDemangle.h"
-#include "lldb/lldb-private.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 //#define DEBUG_FAILURES 1
 //#define DEBUG_SUBSTITUTIONS 1

Modified: lldb/trunk/source/Utility/FileSpec.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/FileSpec.cpp?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/source/Utility/FileSpec.cpp (original)
+++ lldb/trunk/source/Utility/FileSpec.cpp Thu Apr  6 13:12:24 2017
@@ -8,19 +8,29 @@
 //===----------------------------------------------------------------------===//
 
 #include "lldb/Utility/FileSpec.h"
-#include "lldb/Utility/CleanUp.h"
 #include "lldb/Utility/RegularExpression.h"
 #include "lldb/Utility/Stream.h"
-#include "lldb/Utility/StreamString.h"
-#include "lldb/Utility/StringList.h"
 #include "lldb/Utility/TildeExpressionResolver.h"
 
-#include "llvm/ADT/StringExtras.h"
+#include "llvm/ADT/SmallString.h" // for SmallString
+#include "llvm/ADT/SmallVector.h" // for SmallVectorTemplat...
 #include "llvm/ADT/StringRef.h"
-#include "llvm/Support/ConvertUTF.h"
+#include "llvm/ADT/Triple.h"         // for Triple
+#include "llvm/ADT/Twine.h"          // for Twine
+#include "llvm/Config/llvm-config.h" // for LLVM_ON_WIN32
+#include "llvm/Support/ErrorOr.h"    // for ErrorOr
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Support/Program.h"
+#include "llvm/Support/raw_ostream.h" // for raw_ostream, fs
+
+#include <algorithm>    // for replace, min, unique
+#include <system_error> // for error_code
+#include <vector>       // for vector
+
+#include <assert.h> // for assert
+#include <stdio.h>  // for size_t, NULL, snpr...
+#include <string.h> // for strcmp
 
 using namespace lldb;
 using namespace lldb_private;

Modified: lldb/trunk/source/Utility/JSON.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/JSON.cpp?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/source/Utility/JSON.cpp (original)
+++ lldb/trunk/source/Utility/JSON.cpp Thu Apr  6 13:12:24 2017
@@ -9,12 +9,15 @@
 
 #include "lldb/Utility/JSON.h"
 
-#include "llvm/ADT/APFloat.h"
-#include "llvm/ADT/StringRef.h"
-
+#include "lldb/Utility/Stream.h" // for Stream
 #include "lldb/Utility/StreamString.h"
+#include "llvm/ADT/StringRef.h"
 #include "llvm/Support/ErrorHandling.h"
+
+#include <inttypes.h> // for PRIu64, PRId64
 #include <limits.h>
+#include <stddef.h> // for size_t
+#include <utility>  // for pair
 
 using namespace lldb_private;
 

Modified: lldb/trunk/source/Utility/LLDBAssert.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/LLDBAssert.cpp?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/source/Utility/LLDBAssert.cpp (original)
+++ lldb/trunk/source/Utility/LLDBAssert.cpp Thu Apr  6 13:12:24 2017
@@ -1,5 +1,4 @@
-//===--------------------- LLDBAssert.cpp --------------------------*- C++
-//-*-===//
+//===--------------------- LLDBAssert.cpp ------------------------*- C++-*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //

Modified: lldb/trunk/source/Utility/Log.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/Log.cpp?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/source/Utility/Log.cpp (original)
+++ lldb/trunk/source/Utility/Log.cpp Thu Apr  6 13:12:24 2017
@@ -7,28 +7,32 @@
 //
 //===----------------------------------------------------------------------===//
 
-// Project includes
 #include "lldb/Utility/Log.h"
 #include "lldb/Utility/VASPrintf.h"
-#include "lldb/lldb-types.h"
 
-// Other libraries and framework includes
 #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/Support/Chrono.h"
+#include "llvm/Support/ManagedStatic.h" // for ManagedStatic
 #include "llvm/Support/Path.h"
 #include "llvm/Support/Signals.h"
 #include "llvm/Support/Threading.h"
 #include "llvm/Support/raw_ostream.h"
 
-// C Includes
-// C++ Includes
+#include <chrono> // for duration, system_clock, syst...
 #include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <map>
 #include <mutex>
-#include <string>
+#include <utility> // for pair
+
+#include <assert.h>  // for assert
+#if defined(LLVM_ON_WIN32)
+#include <process.h> // for getpid
+#else
+#include <unistd.h>
+#endif
 
 using namespace lldb_private;
 

Modified: lldb/trunk/source/Utility/Logging.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/Logging.cpp?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/source/Utility/Logging.cpp (original)
+++ lldb/trunk/source/Utility/Logging.cpp Thu Apr  6 13:12:24 2017
@@ -10,6 +10,10 @@
 #include "lldb/Utility/Logging.h"
 #include "lldb/Utility/Log.h"
 
+#include "llvm/ADT/ArrayRef.h" // for ArrayRef
+
+#include <stdarg.h> // for va_end, va_list, va_start
+
 using namespace lldb_private;
 
 static constexpr Log::Category g_categories[] = {

Modified: lldb/trunk/source/Utility/Range.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/Range.cpp?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/source/Utility/Range.cpp (original)
+++ lldb/trunk/source/Utility/Range.cpp Thu Apr  6 13:12:24 2017
@@ -1,5 +1,4 @@
-//===--------------------- Range.cpp -----------------------------*- C++
-//-*-===//
+//===--------------------- Range.cpp -----------------------------*- C++-*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -10,6 +9,9 @@
 
 #include "lldb/Utility/Range.h"
 
+#include <algorithm>
+#include <utility>
+
 using namespace lldb_utility;
 
 Range::Range(const Range &rng) : m_low(rng.m_low), m_high(rng.m_high) {

Modified: lldb/trunk/source/Utility/RegularExpression.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/RegularExpression.cpp?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/source/Utility/RegularExpression.cpp (original)
+++ lldb/trunk/source/Utility/RegularExpression.cpp Thu Apr  6 13:12:24 2017
@@ -9,15 +9,9 @@
 
 #include "lldb/Utility/RegularExpression.h"
 
-// C Includes
-// C++ Includes
-#include <cstring>
-
-// Other libraries and framework includes
 #include "llvm/ADT/StringRef.h"
 
-// Project includes
-#include "lldb/Utility/Error.h"
+#include <string>
 
 //----------------------------------------------------------------------
 // Enable enhanced mode if it is available. This allows for things like

Modified: lldb/trunk/source/Utility/SelectHelper.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/SelectHelper.cpp?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/source/Utility/SelectHelper.cpp (original)
+++ lldb/trunk/source/Utility/SelectHelper.cpp Thu Apr  6 13:12:24 2017
@@ -14,7 +14,18 @@
 #define _DARWIN_UNLIMITED_SELECT
 #endif
 
-// C Includes
+#include "lldb/Utility/SelectHelper.h"
+#include "lldb/Utility/Error.h"
+#include "lldb/Utility/LLDBAssert.h"
+#include "lldb/lldb-enumerations.h" // for ErrorType::eErrorTypePOSIX
+#include "lldb/lldb-types.h"        // for socket_t
+
+#include "llvm/ADT/DenseMap.h" // for DenseMapPair, DenseMap, Dense...
+#include "llvm/ADT/Optional.h" // for Optional
+
+#include <algorithm>
+#include <chrono> // for microseconds, seconds, steady...
+
 #include <errno.h>
 #if defined(_WIN32)
 // Define NOMINMAX to avoid macros that conflict with std::min and std::max
@@ -24,16 +35,6 @@
 #include <sys/select.h>
 #endif
 
-// C++ Includes
-#include <algorithm>
-
-// Other libraries and framework includes
-#include "llvm/ADT/SmallVector.h"
-
-// Project includes
-#include "lldb/Utility/Error.h"
-#include "lldb/Utility/LLDBAssert.h"
-#include "lldb/Utility/SelectHelper.h"
 
 SelectHelper::SelectHelper()
     : m_fd_map(), m_end_time() // Infinite timeout unless

Modified: lldb/trunk/source/Utility/Stream.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/Stream.cpp?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/source/Utility/Stream.cpp (original)
+++ lldb/trunk/source/Utility/Stream.cpp Thu Apr  6 13:12:24 2017
@@ -11,12 +11,12 @@
 
 #include "lldb/Utility/Endian.h"
 #include "lldb/Utility/VASPrintf.h"
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "llvm/ADT/SmallString.h" // for SmallString
+
+#include <string>
 
 #include <inttypes.h>
+#include <stddef.h>
 
 using namespace lldb;
 using namespace lldb_private;

Modified: lldb/trunk/source/Utility/StreamCallback.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/StreamCallback.cpp?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/source/Utility/StreamCallback.cpp (original)
+++ lldb/trunk/source/Utility/StreamCallback.cpp Thu Apr  6 13:12:24 2017
@@ -9,6 +9,8 @@
 
 #include "lldb/Utility/StreamCallback.h"
 
+#include <string>
+
 using namespace lldb_private;
 
 StreamCallback::StreamCallback(lldb::LogOutputCallback callback, void *baton)

Modified: lldb/trunk/source/Utility/StreamGDBRemote.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/StreamGDBRemote.cpp?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/source/Utility/StreamGDBRemote.cpp (original)
+++ lldb/trunk/source/Utility/StreamGDBRemote.cpp Thu Apr  6 13:12:24 2017
@@ -8,6 +8,10 @@
 //===----------------------------------------------------------------------===//
 
 #include "lldb/Utility/StreamGDBRemote.h"
+
+#include "lldb/Utility/Flags.h"  // for Flags
+#include "lldb/Utility/Stream.h" // for Stream::::eBinary
+
 #include <stdio.h>
 
 using namespace lldb;

Modified: lldb/trunk/source/Utility/StreamString.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/StreamString.cpp?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/source/Utility/StreamString.cpp (original)
+++ lldb/trunk/source/Utility/StreamString.cpp Thu Apr  6 13:12:24 2017
@@ -8,7 +8,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "lldb/Utility/StreamString.h"
-#include <stdio.h>
 
 using namespace lldb;
 using namespace lldb_private;

Modified: lldb/trunk/source/Utility/StringExtractor.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/StringExtractor.cpp?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/source/Utility/StringExtractor.cpp (original)
+++ lldb/trunk/source/Utility/StringExtractor.cpp Thu Apr  6 13:12:24 2017
@@ -9,13 +9,11 @@
 
 #include "lldb/Utility/StringExtractor.h"
 
-// C Includes
-#include <stdlib.h>
-
-// C++ Includes
 #include <tuple>
-// Other libraries and framework includes
-// Project includes
+
+#include <ctype.h> // for isxdigit, isspace
+#include <stdlib.h>
+#include <string.h> // for memset
 
 static inline int xdigit_to_sint(char ch) {
   if (ch >= 'a' && ch <= 'f')

Modified: lldb/trunk/source/Utility/StringExtractorGDBRemote.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/StringExtractorGDBRemote.cpp?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/source/Utility/StringExtractorGDBRemote.cpp (original)
+++ lldb/trunk/source/Utility/StringExtractorGDBRemote.cpp Thu Apr  6 13:12:24 2017
@@ -7,14 +7,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-// C Includes
-#include <string.h>
-
-// C++ Includes
-// Other libraries and framework includes
-// Project includes
 #include "Utility/StringExtractorGDBRemote.h"
 
+#include <ctype.h> // for isxdigit
+#include <string.h>
+
 StringExtractorGDBRemote::ResponseType
 StringExtractorGDBRemote::GetResponseType() const {
   if (m_packet.empty())

Modified: lldb/trunk/source/Utility/StringExtractorGDBRemote.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/StringExtractorGDBRemote.h?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/source/Utility/StringExtractorGDBRemote.h (original)
+++ lldb/trunk/source/Utility/StringExtractorGDBRemote.h Thu Apr  6 13:12:24 2017
@@ -10,12 +10,13 @@
 #ifndef utility_StringExtractorGDBRemote_h_
 #define utility_StringExtractorGDBRemote_h_
 
-// C Includes
-// C++ Includes
-#include <string>
-// Other libraries and framework includes
-// Project includes
 #include "lldb/Utility/StringExtractor.h"
+#include "llvm/ADT/StringRef.h" // for StringRef
+
+#include <string>
+
+#include <stddef.h> // for size_t
+#include <stdint.h> // for uint8_t
 
 class StringExtractorGDBRemote : public StringExtractor {
 public:

Modified: lldb/trunk/source/Utility/StringLexer.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/StringLexer.cpp?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/source/Utility/StringLexer.cpp (original)
+++ lldb/trunk/source/Utility/StringLexer.cpp Thu Apr  6 13:12:24 2017
@@ -1,5 +1,4 @@
-//===--------------------- StringLexer.cpp -----------------------*- C++
-//-*-===//
+//===--------------------- StringLexer.cpp -----------------------*- C++-*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //

Modified: lldb/trunk/source/Utility/StringList.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/StringList.cpp?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/source/Utility/StringList.cpp (original)
+++ lldb/trunk/source/Utility/StringList.cpp Thu Apr  6 13:12:24 2017
@@ -10,9 +10,13 @@
 #include "lldb/Utility/StringList.h"
 
 #include "lldb/Utility/Log.h"
+#include "lldb/Utility/Stream.h" // for Stream
 #include "lldb/Utility/StreamString.h"
+#include "llvm/ADT/ArrayRef.h" // for ArrayRef, makeArrayRef
 
-#include <string>
+#include <algorithm> // for min
+#include <stdint.h>  // for SIZE_MAX, uint32_t
+#include <string.h>  // for size_t, strcspn, NULL
 
 using namespace lldb_private;
 

Modified: lldb/trunk/source/Utility/TaskPool.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/TaskPool.cpp?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/source/Utility/TaskPool.cpp (original)
+++ lldb/trunk/source/Utility/TaskPool.cpp Thu Apr  6 13:12:24 2017
@@ -9,6 +9,10 @@
 
 #include "lldb/Utility/TaskPool.h"
 
+#include <cstdint> // for uint32_t
+#include <queue>   // for queue
+#include <thread>  // for thread
+
 namespace {
 class TaskPoolImpl {
 public:

Modified: lldb/trunk/source/Utility/TildeExpressionResolver.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/TildeExpressionResolver.cpp?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/source/Utility/TildeExpressionResolver.cpp (original)
+++ lldb/trunk/source/Utility/TildeExpressionResolver.cpp Thu Apr  6 13:12:24 2017
@@ -9,9 +9,15 @@
 
 #include "lldb/Utility/TildeExpressionResolver.h"
 
-#include "llvm/ADT/SmallString.h"
+#include <assert.h>     // for assert
+#include <system_error> // for error_code
+
+#include "llvm/ADT/STLExtras.h"      // for any_of
+#include "llvm/ADT/SmallVector.h"    // for SmallVectorImpl
+#include "llvm/Config/llvm-config.h" // for LLVM_ON_WIN32
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Path.h"
+#include "llvm/Support/raw_ostream.h" // for fs
 
 #if !defined(LLVM_ON_WIN32)
 #include <pwd.h>

Modified: lldb/trunk/source/Utility/UUID.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/UUID.cpp?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/source/Utility/UUID.cpp (original)
+++ lldb/trunk/source/Utility/UUID.cpp Thu Apr  6 13:12:24 2017
@@ -12,7 +12,6 @@
 // Other libraries and framework includes
 // Project includes
 #include "lldb/Utility/Stream.h"
-
 #include "llvm/ADT/StringRef.h"
 
 // C Includes
@@ -20,9 +19,6 @@
 #include <stdio.h>
 #include <string.h>
 
-// C++ Includes
-#include <string>
-
 namespace lldb_private {
 
 UUID::UUID() : m_num_uuid_bytes(16) { ::memset(m_uuid, 0, sizeof(m_uuid)); }

Modified: lldb/trunk/source/Utility/UriParser.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/UriParser.cpp?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/source/Utility/UriParser.cpp (original)
+++ lldb/trunk/source/Utility/UriParser.cpp Thu Apr  6 13:12:24 2017
@@ -8,7 +8,11 @@
 //===----------------------------------------------------------------------===//
 
 #include "lldb/Utility/UriParser.h"
-#include <cstring>
+
+#include <string>
+
+#include <stdint.h>
+#include <tuple>
 
 using namespace lldb_private;
 

Modified: lldb/trunk/source/Utility/VASprintf.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/VASprintf.cpp?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/source/Utility/VASprintf.cpp (original)
+++ lldb/trunk/source/Utility/VASprintf.cpp Thu Apr  6 13:12:24 2017
@@ -10,8 +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
 
-using namespace lldb_private;
+#include <assert.h> // for assert
+#include <stdarg.h> // for va_end, va_list, va_copy
+#include <stdio.h>  // for vsnprintf, size_t
 
 bool lldb_private::VASprintf(llvm::SmallVectorImpl<char> &buf, const char *fmt,
                              va_list args) {

Modified: lldb/trunk/source/Utility/VMRange.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/VMRange.cpp?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/source/Utility/VMRange.cpp (original)
+++ lldb/trunk/source/Utility/VMRange.cpp Thu Apr  6 13:12:24 2017
@@ -7,11 +7,17 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "lldb/lldb-private.h"
+#include "lldb/Utility/VMRange.h"
 
 #include "lldb/Utility/Stream.h"
-#include "lldb/Utility/VMRange.h"
+#include "lldb/lldb-types.h" // for addr_t
+
 #include <algorithm>
+#include <iterator> // for distance
+#include <vector>   // for const_iterator
+
+#include <stddef.h> // for size_t
+#include <stdint.h> // for UINT32_MAX, uint32_t
 
 using namespace lldb;
 using namespace lldb_private;

Modified: lldb/trunk/tools/lldb-mi/MICmdCmdStack.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdCmdStack.cpp?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/tools/lldb-mi/MICmdCmdStack.cpp (original)
+++ lldb/trunk/tools/lldb-mi/MICmdCmdStack.cpp Thu Apr  6 13:12:24 2017
@@ -32,6 +32,8 @@
 #include "MICmnMIResultRecord.h"
 #include "MICmnMIValueConst.h"
 
+#include <algorithm>
+
 //++
 //------------------------------------------------------------------------------------
 // Details: CMICmdCmdStackInfoDepth constructor.

Modified: lldb/trunk/tools/lldb-mi/MICmdCmdVar.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdCmdVar.cpp?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/tools/lldb-mi/MICmdCmdVar.cpp (original)
+++ lldb/trunk/tools/lldb-mi/MICmdCmdVar.cpp Thu Apr  6 13:12:24 2017
@@ -38,6 +38,8 @@
 #include "MICmnMIResultRecord.h"
 #include "MICmnMIValueConst.h"
 
+#include <algorithm>
+
 //++
 //------------------------------------------------------------------------------------
 // Details: CMICmdCmdVarCreate constructor.

Modified: lldb/trunk/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.cpp?rev=299676&r1=299675&r2=299676&view=diff
==============================================================================
--- lldb/trunk/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.cpp (original)
+++ lldb/trunk/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.cpp Thu Apr  6 13:12:24 2017
@@ -40,6 +40,8 @@
 #include "MIUtilDebug.h"
 #include "Platform.h" // for PATH_MAX
 
+#include <algorithm>
+
 //++
 //------------------------------------------------------------------------------------
 // Details: CMICmnLLDBDebuggerHandleEvents constructor.