6 files changed, 7 insertions, 4 deletions
diff --git a/lldb/include/lldb/Core/Log.h b/lldb/include/lldb/Core/Log.h
index 78017bb167e..58ce922acef 100644
--- a/lldb/include/lldb/Core/Log.h
+++ b/lldb/include/lldb/Core/Log.h
@@ -15,7 +15,6 @@
 #include <stdint.h>
 #include <signal.h>
 #include <stdio.h>
-#include <sys/syslimits.h>
 #include <unistd.h>
 
 // C++ Includes
@@ -67,7 +66,7 @@ public:
                                     Stream *feedback_strm);
     typedef void (*ListCategoriesCallback) (Stream *strm);
 
-    typedef struct Callbacks
+    struct Callbacks
     {
         DisableCallback disable;
         EnableCallback enable;
diff --git a/lldb/include/lldb/Core/Mangled.h b/lldb/include/lldb/Core/Mangled.h
index bf99022651a..194ff04f9eb 100644
--- a/lldb/include/lldb/Core/Mangled.h
+++ b/lldb/include/lldb/Core/Mangled.h
@@ -49,7 +49,7 @@ public:
         eParamsBeg,     ///< The start of a method's parameters (the open parenthesis)
         eParamsEnd,     ///< The end of a method's parameters (the open parenthesis)
         eQualifier,     ///< A language qualifier
-        eError,         ///< The token failed to parse
+        eError          ///< The token failed to parse
     };
 
     //------------------------------------------------------------------
diff --git a/lldb/include/lldb/Core/RegularExpression.h b/lldb/include/lldb/Core/RegularExpression.h
index 23dabef1443..3671b04a719 100644
--- a/lldb/include/lldb/Core/RegularExpression.h
+++ b/lldb/include/lldb/Core/RegularExpression.h
@@ -12,6 +12,7 @@
 #if defined(__cplusplus)
 
 #include <regex.h>
+#include <stdint.h>
 
 #include <string>
 #include <vector>
diff --git a/lldb/include/lldb/Core/Section.h b/lldb/include/lldb/Core/Section.h
index 358a7489523..7345958c921 100644
--- a/lldb/include/lldb/Core/Section.h
+++ b/lldb/include/lldb/Core/Section.h
@@ -17,6 +17,7 @@
 #include "lldb/Core/ConstString.h"
 #include "lldb/Core/UserID.h"
 #include "lldb/Core/VMRange.h"
+#include <limits.h>
 
 namespace lldb_private {
 
diff --git a/lldb/include/lldb/Core/UUID.h b/lldb/include/lldb/Core/UUID.h
index 6e3402b9e74..58f36a68774 100644
--- a/lldb/include/lldb/Core/UUID.h
+++ b/lldb/include/lldb/Core/UUID.h
@@ -17,6 +17,8 @@
 
 #include "lldb/lldb-private.h"
 
+struct uuid_t;
+
 namespace lldb_private {
 
 class UUID
diff --git a/lldb/include/lldb/Target/ThreadPlan.h b/lldb/include/lldb/Target/ThreadPlan.h
index 96a13264737..23aabc505e4 100644
--- a/lldb/include/lldb/Target/ThreadPlan.h
+++ b/lldb/include/lldb/Target/ThreadPlan.h
@@ -163,7 +163,7 @@ namespace lldb_private {
 //  by hand as part of expression evaluation.  To suppress the running event return eVoteNo from ShouldReportStop,
 //  to force a running event to be reported return eVoteYes, in general though you should return eVoteNoOpinion
 //  which will allow the ThreadList to figure out the right thing to do.
-//  The run_vote argument to the constructor works like stop_vote, and is a way for a plan to instruct a sub-plan\
+//  The run_vote argument to the constructor works like stop_vote, and is a way for a plan to instruct a sub-plan
 //  on how to respond to ShouldReportStop.
 //
 //------------------------------------------------------------------