diff --git a/lldb/source/Symbol/LineTable.cpp b/lldb/source/Symbol/LineTable.cpp
index 326fd6e0e785..05393352a02d 100644
--- a/lldb/source/Symbol/LineTable.cpp
+++ b/lldb/source/Symbol/LineTable.cpp
@@ -12,6 +12,7 @@
 #include "lldb/Core/Stream.h"
 #include "lldb/Symbol/CompileUnit.h"
 #include "lldb/Symbol/LineTable.h"
+#include <algorithm>
 
 using namespace lldb;
 using namespace lldb_private;
@@ -133,13 +134,13 @@ LineTable::Entry::LessThanBinaryPredicate::operator() (const LineTable::Entry& a
         LT_COMPARE (b.is_terminal_entry, a.is_terminal_entry);
         LT_COMPARE (a.file_idx, b.file_idx);
         return false;
-        #undef LT_COMPARE;
+        #undef LT_COMPARE
     }
 
     const Section *a_section = m_line_table->GetSectionForEntryIndex (a.sect_idx);
     const Section *b_section = m_line_table->GetSectionForEntryIndex (b.sect_idx);
     return Section::Compare(*a_section, *b_section) < 0;
-};
+}
 
 
 Section *
diff --git a/lldb/source/Target/ObjCObjectPrinter.cpp b/lldb/source/Target/ObjCObjectPrinter.cpp
index 81c73aa95815..c302c6c3f452 100644
--- a/lldb/source/Target/ObjCObjectPrinter.cpp
+++ b/lldb/source/Target/ObjCObjectPrinter.cpp
@@ -17,7 +17,7 @@
 #include "lldb/Target/Process.h"
 #include "lldb/Target/Target.h"
 
-#include "ObjCObjectPrinter.h"
+#include "lldb/Target/ObjCObjectPrinter.h"
 
 using namespace lldb;
 using namespace lldb_private;
diff --git a/lldb/source/Target/PathMappingList.cpp b/lldb/source/Target/PathMappingList.cpp
index 02ca0671ca05..23eea225900e 100644
--- a/lldb/source/Target/PathMappingList.cpp
+++ b/lldb/source/Target/PathMappingList.cpp
@@ -13,7 +13,8 @@
 #include "lldb/Core/Error.h"
 #include "lldb/Core/Stream.h"
 // Project includes
-#include "PathMappingList.h"
+#include "lldb/Target/PathMappingList.h"
+#include <string.h>
 
 using namespace lldb;
 using namespace lldb_private;