4 files changed, 4 insertions, 3 deletions
diff --git a/tools/bugpoint/ToolRunner.h b/tools/bugpoint/ToolRunner.h
index 3e3d7d5..39b0bbf 100644
--- a/tools/bugpoint/ToolRunner.h
+++ b/tools/bugpoint/ToolRunner.h
@@ -20,6 +20,7 @@
 #include "llvm/ADT/Triple.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/SystemUtils.h"
+#include "llvm/System/Path.h"
 #include <exception>
 #include <vector>
 
diff --git a/tools/llvm-as/llvm-as.cpp b/tools/llvm-as/llvm-as.cpp
index 06b3ad2..487e904 100644
--- a/tools/llvm-as/llvm-as.cpp
+++ b/tools/llvm-as/llvm-as.cpp
@@ -114,7 +114,7 @@ int main(int argc, char **argv) {
     sys::RemoveFileOnSignal(sys::Path(OutputFilename));
 
   if (!DisableOutput)
-    if (Force || !CheckBitcodeOutputToConsole(Out.get(), true))
+    if (Force || !CheckBitcodeOutputToConsole(*Out, true))
       WriteBitcodeToFile(M.get(), *Out);
   return 0;
 }
diff --git a/tools/lto/LTOCodeGenerator.cpp b/tools/lto/LTOCodeGenerator.cpp
index f47eb49..e868ee3 100644
--- a/tools/lto/LTOCodeGenerator.cpp
+++ b/tools/lto/LTOCodeGenerator.cpp
@@ -36,6 +36,7 @@
 #include "llvm/Support/StandardPasses.h"
 #include "llvm/Support/SystemUtils.h"
 #include "llvm/System/Host.h"
+#include "llvm/System/Program.h"
 #include "llvm/System/Signals.h"
 #include "llvm/Target/SubtargetFeature.h"
 #include "llvm/Target/TargetOptions.h"
diff --git a/tools/opt/opt.cpp b/tools/opt/opt.cpp
index ffe53d5..64c5e92 100644
--- a/tools/opt/opt.cpp
+++ b/tools/opt/opt.cpp
@@ -395,9 +395,8 @@ int main(int argc, char **argv) {
     // If the output is set to be emitted to standard out, and standard out is a
     // console, print out a warning message and refuse to do it.  We don't
     // impress anyone by spewing tons of binary goo to a terminal.
-    if (!Force && !NoOutput && CheckBitcodeOutputToConsole(Out,!Quiet)) {
+    if (!Force && !NoOutput && CheckBitcodeOutputToConsole(*Out, !Quiet))
       NoOutput = true;
-    }
 
     // Create a PassManager to hold and optimize the collection of passes we are
     // about to build...