5 files changed, 6 insertions, 5 deletions
diff --git a/lldb/tools/lldb-mi/MICmnLLDBProxySBValue.cpp b/lldb/tools/lldb-mi/MICmnLLDBProxySBValue.cpp
index 60889790c70..aa2b23b4423 100644
--- a/lldb/tools/lldb-mi/MICmnLLDBProxySBValue.cpp
+++ b/lldb/tools/lldb-mi/MICmnLLDBProxySBValue.cpp
@@ -19,6 +19,8 @@
 // Copyright:	None.
 //--
 
+#include <stdlib.h>
+
 // Third Party Headers:
 #include <lldb/API/SBError.h>
 #include <cstdlib>
diff --git a/lldb/tools/lldb-mi/MICmnLogMediumFile.cpp b/lldb/tools/lldb-mi/MICmnLogMediumFile.cpp
index c6bc0098fd0..a14ad044a7a 100644
--- a/lldb/tools/lldb-mi/MICmnLogMediumFile.cpp
+++ b/lldb/tools/lldb-mi/MICmnLogMediumFile.cpp
@@ -28,7 +28,7 @@
 
 #if defined( _MSC_VER )
 	#include "MIUtilSystemWindows.h"
-#elif defined( __linux )
+#elif defined( __FreeBSD__ ) || defined( __linux )
 	#include "MIUtilSystemLinux.h"
 #elif defined( __APPLE__ )
 	#include "MIUtilSystemOsx.h"
diff --git a/lldb/tools/lldb-mi/MICmnStreamStdinLinux.cpp b/lldb/tools/lldb-mi/MICmnStreamStdinLinux.cpp
index f27420c4c0c..86ce7a8c012 100644
--- a/lldb/tools/lldb-mi/MICmnStreamStdinLinux.cpp
+++ b/lldb/tools/lldb-mi/MICmnStreamStdinLinux.cpp
@@ -23,7 +23,6 @@
 #if !defined( _MSC_VER )
 #include <sys/select.h>
 #include <termios.h>
-#include <stropts.h>
 #endif // !defined( _MSC_VER )
 #include <string.h> // For std::strerror()
 
@@ -211,4 +210,4 @@ const MIchar * CMICmnStreamStdinLinux::ReadLine( CMIUtilString & vwErrMsg )
 	}
 
 	return pText;
-}
-\ No newline at end of file
+}
diff --git a/lldb/tools/lldb-mi/MIUtilSystemLinux.cpp b/lldb/tools/lldb-mi/MIUtilSystemLinux.cpp
index 9805febb394..de1431782df 100644
--- a/lldb/tools/lldb-mi/MIUtilSystemLinux.cpp
+++ b/lldb/tools/lldb-mi/MIUtilSystemLinux.cpp
@@ -22,7 +22,7 @@
 // Include compiler configuration
 #include "MICmnConfig.h"
 
-#if defined( __linux )
+#if defined( __FreeBSD__ ) || defined( __linux )
 
 // In-house headers:
 #include "MIUtilSystemLinux.h"
diff --git a/lldb/tools/lldb-mi/MIUtilSystemLinux.h b/lldb/tools/lldb-mi/MIUtilSystemLinux.h
index f04024bfa31..c79bcfd9d2f 100644
--- a/lldb/tools/lldb-mi/MIUtilSystemLinux.h
+++ b/lldb/tools/lldb-mi/MIUtilSystemLinux.h
@@ -24,7 +24,7 @@
 // Include compiler configuration
 #include "MICmnConfig.h"
 
-#if defined( __linux )
+#if defined( __FreeBSD__ ) || defined( __linux )
 
 // In-house headers:
 #include "MIUtilString.h"