15 files changed, 25 insertions, 27 deletions
diff --git a/lldb/tools/darwin-debug/darwin-debug.cpp b/lldb/tools/darwin-debug/darwin-debug.cpp
index e754ded474c..31b04bcde9b 100644
--- a/lldb/tools/darwin-debug/darwin-debug.cpp
+++ b/lldb/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>
diff --git a/lldb/tools/debugserver/source/RNBRemote.cpp b/lldb/tools/debugserver/source/RNBRemote.cpp
index ab3dad16c4f..bfcd799f131 100644
--- a/lldb/tools/debugserver/source/RNBRemote.cpp
+++ b/lldb/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>
diff --git a/lldb/tools/debugserver/source/debugserver.cpp b/lldb/tools/debugserver/source/debugserver.cpp
index 7ae321ba431..8afe17bce37 100644
--- a/lldb/tools/debugserver/source/debugserver.cpp
+++ b/lldb/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>
 
diff --git a/lldb/tools/lldb-mi/MICmdBase.h b/lldb/tools/lldb-mi/MICmdBase.h
index cb44504a161..86dc51206a0 100644
--- a/lldb/tools/lldb-mi/MICmdBase.h
+++ b/lldb/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"
diff --git a/lldb/tools/lldb-mi/MICmdCmdData.cpp b/lldb/tools/lldb-mi/MICmdCmdData.cpp
index 53c2d7e621a..7a4845bba43 100644
--- a/lldb/tools/lldb-mi/MICmdCmdData.cpp
+++ b/lldb/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:
diff --git a/lldb/tools/lldb-mi/MICmdCmdGdbInfo.cpp b/lldb/tools/lldb-mi/MICmdCmdGdbInfo.cpp
index ba96319469a..5988066883d 100644
--- a/lldb/tools/lldb-mi/MICmdCmdGdbInfo.cpp
+++ b/lldb/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"
diff --git a/lldb/tools/lldb-mi/MICmnBase.cpp b/lldb/tools/lldb-mi/MICmnBase.cpp
index 63544dc5b9c..7f82c6120e1 100644
--- a/lldb/tools/lldb-mi/MICmnBase.cpp
+++ b/lldb/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"
diff --git a/lldb/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp b/lldb/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp
index 9a173d1007e..cf4f21d94ef 100644
--- a/lldb/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp
+++ b/lldb/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"
 
diff --git a/lldb/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.cpp b/lldb/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.cpp
index 865a139e6e8..fae4662299e 100644
--- a/lldb/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.cpp
+++ b/lldb/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>
 
diff --git a/lldb/tools/lldb-mi/MICmnResources.cpp b/lldb/tools/lldb-mi/MICmnResources.cpp
index 5fb36c5079f..d8fa0a82924 100644
--- a/lldb/tools/lldb-mi/MICmnResources.cpp
+++ b/lldb/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"
diff --git a/lldb/tools/lldb-mi/MICmnStreamStdin.cpp b/lldb/tools/lldb-mi/MICmnStreamStdin.cpp
index 154519dbec4..4d3fa2aabd9 100644
--- a/lldb/tools/lldb-mi/MICmnStreamStdin.cpp
+++ b/lldb/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"
diff --git a/lldb/tools/lldb-mi/MIDataTypes.h b/lldb/tools/lldb-mi/MIDataTypes.h
index 34fe4575160..59ff099389c 100644
--- a/lldb/tools/lldb-mi/MIDataTypes.h
+++ b/lldb/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
diff --git a/lldb/tools/lldb-mi/MIDriverMain.cpp b/lldb/tools/lldb-mi/MIDriverMain.cpp
index 1b3521e8f03..4e4b92ca005 100644
--- a/lldb/tools/lldb-mi/MIDriverMain.cpp
+++ b/lldb/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(                                                               \
diff --git a/lldb/tools/lldb-mi/MIUtilFileStd.cpp b/lldb/tools/lldb-mi/MIUtilFileStd.cpp
index 1e76c1c58fe..abf0ef407d3 100644
--- a/lldb/tools/lldb-mi/MIUtilFileStd.cpp
+++ b/lldb/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"
diff --git a/lldb/tools/lldb-mi/MIUtilString.cpp b/lldb/tools/lldb-mi/MIUtilString.cpp
index 3797d100179..2ddd4eb887f 100644
--- a/lldb/tools/lldb-mi/MIUtilString.cpp
+++ b/lldb/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"