diff --git a/lldb/source/Core/DataEncoder.cpp b/lldb/source/Core/DataEncoder.cpp
index 15955773d98f..3ef829507704 100644
--- a/lldb/source/Core/DataEncoder.cpp
+++ b/lldb/source/Core/DataEncoder.cpp
@@ -13,7 +13,6 @@
 // C++ Includes
 #include <cassert>
 #include <cstddef>
-#include <limits>
 
 // Other libraries and framework includes
 #include "llvm/Support/MathExtras.h"
diff --git a/lldb/source/Core/DataExtractor.cpp b/lldb/source/Core/DataExtractor.cpp
index ba0fcf5aa001..8cc2a2890c72 100644
--- a/lldb/source/Core/DataExtractor.cpp
+++ b/lldb/source/Core/DataExtractor.cpp
@@ -13,7 +13,6 @@
 #include <cassert>
 #include <cstddef>
 #include <cmath>
-#include <limits>
 #include <sstream>
 #include <string>
 
diff --git a/lldb/source/Core/Disassembler.cpp b/lldb/source/Core/Disassembler.cpp
index 2d456f514e07..fbe452ba5acf 100644
--- a/lldb/source/Core/Disassembler.cpp
+++ b/lldb/source/Core/Disassembler.cpp
@@ -13,7 +13,6 @@
 // C++ Includes
 #include <cstdio>
 #include <cstring>
-#include <limits>
 
 // Other libraries and framework includes
 // Project includes
diff --git a/lldb/source/Core/FileSpecList.cpp b/lldb/source/Core/FileSpecList.cpp
index 56e645551362..cef1bfba41b0 100644
--- a/lldb/source/Core/FileSpecList.cpp
+++ b/lldb/source/Core/FileSpecList.cpp
@@ -12,7 +12,6 @@
 // C Includes
 // C++ Includes
 #include <algorithm>
-#include <limits>
 
 // Other libraries and framework includes
 // Project includes
diff --git a/lldb/source/Core/SearchFilter.cpp b/lldb/source/Core/SearchFilter.cpp
index 9541a0225599..70ce9691972b 100644
--- a/lldb/source/Core/SearchFilter.cpp
+++ b/lldb/source/Core/SearchFilter.cpp
@@ -9,7 +9,6 @@
 
 // C Includes
 // C++ Includes
-#include <limits>
 
 // Other libraries and framework includes
 // Project includes
diff --git a/lldb/source/Core/Section.cpp b/lldb/source/Core/Section.cpp
index cf1cbac8fd7c..73645633521b 100644
--- a/lldb/source/Core/Section.cpp
+++ b/lldb/source/Core/Section.cpp
@@ -14,8 +14,6 @@
 #include "lldb/Target/Target.h"
 #include "lldb/Utility/ConvertEnum.h"
 
-#include <limits>
-
 using namespace lldb;
 using namespace lldb_private;
 
diff --git a/lldb/source/Host/common/Host.cpp b/lldb/source/Host/common/Host.cpp
index e89f4def478c..dea8253b60ad 100644
--- a/lldb/source/Host/common/Host.cpp
+++ b/lldb/source/Host/common/Host.cpp
@@ -39,8 +39,10 @@
 #include <pthread_np.h>
 #endif
 
-// C++ includes
-#include <limits>
+// C++ Includes
+
+// Other libraries and framework includes
+// Project includes
 
 #include "lldb/Host/FileSystem.h"
 #include "lldb/Host/Host.h"