Index: lldb/branches/release_36/tools/driver/Platform.h
===================================================================
--- lldb/branches/release_36/tools/driver/Platform.h
+++ lldb/branches/release_36/tools/driver/Platform.h
@@ -103,16 +103,6 @@
 
     #include <pthread.h>
     #include <sys/time.h>
-
-#if !defined(__ANDROID_NDK__)
-	#include <histedit.h>
-	#if defined(__FreeBSD__) || defined(__NetBSD__)
-		#include <readline/readline.h>
-	#else
-		#include <editline/readline.h>
-	#endif
-#endif
-
 #endif
 
 #endif // lldb_Platform_h_
Index: lldb/branches/release_36/tools/lldb-mi/Platform.h
===================================================================
--- lldb/branches/release_36/tools/lldb-mi/Platform.h
+++ lldb/branches/release_36/tools/lldb-mi/Platform.h
@@ -96,14 +96,7 @@
 #include <termios.h>
 #include <unistd.h>
 
-#include <histedit.h>
 #include <pthread.h>
 #include <sys/time.h>
 
-#if defined(__FreeBSD__)
-#include <readline/readline.h>
-#else
-#include <editline/readline.h>
-#endif
-
 #endif