6 files changed, 1 insertions, 19 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