9 files changed, 9 insertions, 6 deletions
diff --git a/lldb/source/API/SBProcess.cpp b/lldb/source/API/SBProcess.cpp
index 259eb5e9703..190ba7a0d05 100644
--- a/lldb/source/API/SBProcess.cpp
+++ b/lldb/source/API/SBProcess.cpp
@@ -11,6 +11,9 @@
 
 #include "lldb/API/SBProcess.h"
 
+// C Includes
+#include <inttypes.h>
+
 #include "lldb/lldb-defines.h"
 #include "lldb/lldb-types.h"
 
diff --git a/lldb/source/Commands/CommandObjectMemory.cpp b/lldb/source/Commands/CommandObjectMemory.cpp
index 4725a4da657..fabbfbbf3fc 100644
--- a/lldb/source/Commands/CommandObjectMemory.cpp
+++ b/lldb/source/Commands/CommandObjectMemory.cpp
@@ -12,6 +12,8 @@
 #include "CommandObjectMemory.h"
 
 // C Includes
+#include <inttypes.h>
+
 // C++ Includes
 // Other libraries and framework includes
 // Project includes
diff --git a/lldb/source/Core/Log.cpp b/lldb/source/Core/Log.cpp
index 9200fe13892..8b403677ffc 100644
--- a/lldb/source/Core/Log.cpp
+++ b/lldb/source/Core/Log.cpp
@@ -13,7 +13,6 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
-#include <unistd.h>
 
 // C++ Includes
 #include <map>
diff --git a/lldb/source/Expression/DWARFExpression.cpp b/lldb/source/Expression/DWARFExpression.cpp
index e2ae19e5ac7..b0b634e8cef 100644
--- a/lldb/source/Expression/DWARFExpression.cpp
+++ b/lldb/source/Expression/DWARFExpression.cpp
@@ -9,6 +9,10 @@
 
 #include "lldb/Expression/DWARFExpression.h"
 
+// C Includes
+#include <inttypes.h>
+
+// C++ Includes
 #include <vector>
 
 #include "lldb/Core/DataEncoder.h"
diff --git a/lldb/source/Host/common/Host.cpp b/lldb/source/Host/common/Host.cpp
index cc295b9b063..c549ba46070 100644
--- a/lldb/source/Host/common/Host.cpp
+++ b/lldb/source/Host/common/Host.cpp
@@ -13,7 +13,6 @@
 #include <errno.h>
 #include <limits.h>
 #include <sys/types.h>
-#include <unistd.h>
 #ifdef _WIN32
 #include "lldb/Host/windows/windows.h"
 #include <winsock2.h>
diff --git a/lldb/source/Host/common/Mutex.cpp b/lldb/source/Host/common/Mutex.cpp
index 3733100d6fd..4e013553562 100644
--- a/lldb/source/Host/common/Mutex.cpp
+++ b/lldb/source/Host/common/Mutex.cpp
@@ -15,7 +15,6 @@
 #endif
 #include <string.h>
 #include <stdio.h>
-#include <unistd.h>
 
 #if 0
 // This logging is way too verbose to enable even for a log channel. 
diff --git a/lldb/source/Host/common/Terminal.cpp b/lldb/source/Host/common/Terminal.cpp
index 08a54551702..f63c468bb92 100644
--- a/lldb/source/Host/common/Terminal.cpp
+++ b/lldb/source/Host/common/Terminal.cpp
@@ -10,7 +10,6 @@
 #include "lldb/Host/Terminal.h"
 
 #include <fcntl.h>
-#include <unistd.h>
 #include <signal.h>
 
 #ifdef LLDB_CONFIG_TERMIOS_SUPPORTED
diff --git a/lldb/source/Host/windows/Mutex.cpp b/lldb/source/Host/windows/Mutex.cpp
index 6a74506898d..602ca1a3477 100644
--- a/lldb/source/Host/windows/Mutex.cpp
+++ b/lldb/source/Host/windows/Mutex.cpp
@@ -12,7 +12,6 @@
 
 #include <string.h>
 #include <stdio.h>
-#include <unistd.h>
 
 #if 0
 // This logging is way too verbose to enable even for a log channel.
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDefines.h b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDefines.h
index e37aefb27a7..d47e6a350c9 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDefines.h
+++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDefines.h
@@ -11,7 +11,6 @@
 #define SymbolFileDWARF_DWARFDefines_h_
 
 #include <stdint.h>
-#include <stdbool.h>
 #include "lldb/Core/dwarf.h"
 
 namespace lldb_private {