Index: lldb-3.6.0.src/source/lldb.cpp
===================================================================
--- lldb-3.6.0.src/source/lldb.cpp
+++ lldb-3.6.0.src/source/lldb.cpp
@@ -299,11 +299,7 @@ extern "C" const unsigned char liblldb_c
 static const char *
 GetLLDBRevision()
 {
-#ifdef LLDB_REVISION
     return LLDB_REVISION;
-#else
-    return NULL;
-#endif
 }
 
 static const char *
Index: lldb-3.6.0.src/source/Core/IOHandler.cpp
===================================================================
--- lldb-3.6.0.src/source/Core/IOHandler.cpp
+++ lldb-3.6.0.src/source/Core/IOHandler.cpp
@@ -31,8 +31,8 @@
 #include "lldb/Target/ThreadPlan.h"
 
 #ifndef LLDB_DISABLE_CURSES
-#include <ncurses.h>
-#include <panel.h>
+#include <ncurses/ncurses.h>
+#include <ncurses/panel.h>
 #endif
 
 using namespace lldb;