17 files changed, 1 insertions, 46 deletions
diff --git a/lldb/tools/debugserver/source/JSONGenerator.h b/lldb/tools/debugserver/source/JSONGenerator.h
index 7af6ae60c5f..6c6a6253df0 100644
--- a/lldb/tools/debugserver/source/JSONGenerator.h
+++ b/lldb/tools/debugserver/source/JSONGenerator.h
@@ -10,8 +10,6 @@
 #ifndef __JSONGenerator_h_
 #define __JSONGenerator_h_
 
-// C Includes
-// C++ Includes
 
 #include <iomanip>
 #include <sstream>
diff --git a/lldb/tools/debugserver/source/MacOSX/MachTask.h b/lldb/tools/debugserver/source/MacOSX/MachTask.h
index 1e0e2af9a92..1fe74ddec56 100644
--- a/lldb/tools/debugserver/source/MacOSX/MachTask.h
+++ b/lldb/tools/debugserver/source/MacOSX/MachTask.h
@@ -18,14 +18,10 @@
 #ifndef __MachTask_h__
 #define __MachTask_h__
 
-// C Includes
 #include <mach/mach.h>
 #include <sys/socket.h>
-// C++ Includes
 #include <map>
 #include <string>
-// Other libraries and framework includes
-// Project includes
 #include "DNBDefs.h"
 #include "MachException.h"
 #include "MachVMMemory.h"
diff --git a/lldb/tools/debugserver/source/PThreadMutex.cpp b/lldb/tools/debugserver/source/PThreadMutex.cpp
index 32db862f6b4..0e9132e380b 100644
--- a/lldb/tools/debugserver/source/PThreadMutex.cpp
+++ b/lldb/tools/debugserver/source/PThreadMutex.cpp
@@ -13,10 +13,6 @@
 
 #include "PThreadMutex.h"
 
-// C Includes
-// C++ Includes
-// Other libraries and framework includes
-// Project includes
 #include "DNBTimer.h"
 
 #if defined(DEBUG_PTHREAD_MUTEX_DEADLOCKS)
diff --git a/lldb/tools/debugserver/source/StdStringExtractor.cpp b/lldb/tools/debugserver/source/StdStringExtractor.cpp
index d23f9319fa7..3b400b2a89d 100644
--- a/lldb/tools/debugserver/source/StdStringExtractor.cpp
+++ b/lldb/tools/debugserver/source/StdStringExtractor.cpp
@@ -9,12 +9,8 @@
 
 #include "StdStringExtractor.h"
 
-// C Includes
 #include <stdlib.h>
 
-// C++ Includes
-// Other libraries and framework includes
-// Project includes
 
 static inline int xdigit_to_sint(char ch) {
   if (ch >= 'a' && ch <= 'f')
diff --git a/lldb/tools/debugserver/source/StdStringExtractor.h b/lldb/tools/debugserver/source/StdStringExtractor.h
index c46978b61f4..40b57cb08fb 100644
--- a/lldb/tools/debugserver/source/StdStringExtractor.h
+++ b/lldb/tools/debugserver/source/StdStringExtractor.h
@@ -10,13 +10,9 @@
 #ifndef utility_StdStringExtractor_h_
 #define utility_StdStringExtractor_h_
 
-// C Includes
-// C++ Includes
 #include <stdint.h>
 #include <string>
 
-// Other libraries and framework includes
-// Project includes
 
 // Based on StringExtractor, with the added limitation that this file should not
 // take a dependency on LLVM, as it is used from debugserver.
diff --git a/lldb/tools/debugserver/source/TTYState.h b/lldb/tools/debugserver/source/TTYState.h
index ab34015e1a4..88b6d3c2462 100644
--- a/lldb/tools/debugserver/source/TTYState.h
+++ b/lldb/tools/debugserver/source/TTYState.h
@@ -56,4 +56,4 @@ protected:
   TTYState m_ttystates[2];
 };
 
-#endif
-\ No newline at end of file
+#endif
diff --git a/lldb/tools/intel-features/intel-mpx/cli-wrapper-mpxtable.cpp b/lldb/tools/intel-features/intel-mpx/cli-wrapper-mpxtable.cpp
index e654f076fb3..df1221f3ccf 100644
--- a/lldb/tools/intel-features/intel-mpx/cli-wrapper-mpxtable.cpp
+++ b/lldb/tools/intel-features/intel-mpx/cli-wrapper-mpxtable.cpp
@@ -12,7 +12,6 @@
 #include <cerrno>
 #include <string>
 
-// Project includes
 #include "cli-wrapper-mpxtable.h"
 #include "lldb/API/SBCommandInterpreter.h"
 #include "lldb/API/SBCommandReturnObject.h"
diff --git a/lldb/tools/intel-features/intel-pt/Decoder.cpp b/lldb/tools/intel-features/intel-pt/Decoder.cpp
index 0c385adc811..f838ff4c1e6 100644
--- a/lldb/tools/intel-features/intel-pt/Decoder.cpp
+++ b/lldb/tools/intel-features/intel-pt/Decoder.cpp
@@ -7,14 +7,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-// Project includes
 #include "Decoder.h"
 
 // C/C++ Includes
 #include <cinttypes>
 #include <cstring>
 
-// Other libraries and framework includes
 #include "lldb/API/SBModule.h"
 #include "lldb/API/SBProcess.h"
 #include "lldb/API/SBThread.h"
diff --git a/lldb/tools/intel-features/intel-pt/Decoder.h b/lldb/tools/intel-features/intel-pt/Decoder.h
index 3762196058f..58ebb7e734c 100644
--- a/lldb/tools/intel-features/intel-pt/Decoder.h
+++ b/lldb/tools/intel-features/intel-pt/Decoder.h
@@ -16,7 +16,6 @@
 #include <string>
 #include <vector>
 
-// Project includes, Other libraries and framework includes
 #include "lldb/API/SBDebugger.h"
 #include "lldb/API/SBError.h"
 #include "lldb/API/SBProcess.h"
diff --git a/lldb/tools/intel-features/intel-pt/PTDecoder.cpp b/lldb/tools/intel-features/intel-pt/PTDecoder.cpp
index 4f3554e84d3..72effbe3da7 100644
--- a/lldb/tools/intel-features/intel-pt/PTDecoder.cpp
+++ b/lldb/tools/intel-features/intel-pt/PTDecoder.cpp
@@ -7,7 +7,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-// Project includes
 #include "PTDecoder.h"
 #include "Decoder.h"
 
diff --git a/lldb/tools/intel-features/intel-pt/PTDecoder.h b/lldb/tools/intel-features/intel-pt/PTDecoder.h
index 8af8c8672b1..c38057ac715 100644
--- a/lldb/tools/intel-features/intel-pt/PTDecoder.h
+++ b/lldb/tools/intel-features/intel-pt/PTDecoder.h
@@ -13,7 +13,6 @@
 // C/C++ Includes
 #include <vector>
 
-// Project includes, Other libraries and framework includes
 #include "lldb/API/SBDebugger.h"
 #include "lldb/API/SBError.h"
 #include "lldb/API/SBProcess.h"
diff --git a/lldb/tools/lldb-mi/MICmdArgSet.h b/lldb/tools/lldb-mi/MICmdArgSet.h
index cb321f0204d..88716a91f0a 100644
--- a/lldb/tools/lldb-mi/MICmdArgSet.h
+++ b/lldb/tools/lldb-mi/MICmdArgSet.h
@@ -9,12 +9,8 @@
 
 #pragma once
 
-// C Includes
-// C++ Includes
 #include <vector>
 
-// Other libraries and framework includes
-// Project includes
 #include "MICmdArgContext.h"
 #include "MICmnBase.h"
 
diff --git a/lldb/tools/lldb-mi/MICmdArgValBase.cpp b/lldb/tools/lldb-mi/MICmdArgValBase.cpp
index bedd983a06f..8b1706db93e 100644
--- a/lldb/tools/lldb-mi/MICmdArgValBase.cpp
+++ b/lldb/tools/lldb-mi/MICmdArgValBase.cpp
@@ -7,10 +7,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-// C Includes
-// C++ Includes
-// Other libraries and framework includes
-// Project includes
 #include "MICmdArgValBase.h"
 #include "MICmdArgContext.h"
 #include "MIUtilString.h"
diff --git a/lldb/tools/lldb-mi/MICmdArgValBase.h b/lldb/tools/lldb-mi/MICmdArgValBase.h
index 28847608280..1b4582963e5 100644
--- a/lldb/tools/lldb-mi/MICmdArgValBase.h
+++ b/lldb/tools/lldb-mi/MICmdArgValBase.h
@@ -9,10 +9,6 @@
 
 #pragma once
 
-// C Includes
-// C++ Includes
-// Other libraries and framework includes
-// Project includes
 #include "MICmdArgSet.h"
 #include "MIUtilString.h"
 
diff --git a/lldb/tools/lldb-mi/MICmdBase.h b/lldb/tools/lldb-mi/MICmdBase.h
index 86dc51206a0..fe6aadd6699 100644
--- a/lldb/tools/lldb-mi/MICmdBase.h
+++ b/lldb/tools/lldb-mi/MICmdBase.h
@@ -9,14 +9,10 @@
 
 #pragma once
 
-// C Includes
-// C++ Includes
 #include <functional>
 
-// Other libraries and framework includes
 #include "lldb/API/SBError.h"
 
-// Project includes
 #include "MICmdArgSet.h"
 #include "MICmdData.h"
 #include "MICmdFactory.h"
diff --git a/lldb/tools/lldb-server/lldb-gdbserver.cpp b/lldb/tools/lldb-server/lldb-gdbserver.cpp
index e7b771f807e..b30bea69941 100644
--- a/lldb/tools/lldb-server/lldb-gdbserver.cpp
+++ b/lldb/tools/lldb-server/lldb-gdbserver.cpp
@@ -7,7 +7,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-// C Includes
 #include <errno.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -19,7 +18,6 @@
 #include <unistd.h>
 #endif
 
-// C++ Includes
 
 #include "Acceptor.h"
 #include "LLDBServerUtilities.h"
diff --git a/lldb/tools/lldb-server/lldb-platform.cpp b/lldb/tools/lldb-server/lldb-platform.cpp
index 9ec3843744a..b7f7950d4cc 100644
--- a/lldb/tools/lldb-server/lldb-platform.cpp
+++ b/lldb/tools/lldb-server/lldb-platform.cpp
@@ -7,7 +7,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-// C Includes
 #include <errno.h>
 #if defined(__APPLE__)
 #include <netinet/in.h>
@@ -19,10 +18,8 @@
 #include <string.h>
 #include <sys/wait.h>
 
-// C++ Includes
 #include <fstream>
 
-// Other libraries and framework includes
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/FileUtilities.h"