[Bitcode] Fix some Clang-tidy modernize-use-using and Include What You Use warnings; other minor fixes (NFC).

llvm-svn: 312760

1 files changed, 15 insertions, 3 deletions

diff --git a/llvm/tools/llvm-cat/llvm-cat.cpp b/llvm/tools/llvm-cat/llvm-cat.cpp
index 8a21a6d07ca..26e0a0d6c61 100644
--- a/llvm/tools/llvm-cat/llvm-cat.cpp
+++ b/llvm/tools/llvm-cat/llvm-cat.cpp
@@ -1,4 +1,4 @@
-//===-- llvm-cat.cpp - LLVM module concatenation utility ------------------===//
+//===- llvm-cat.cpp - LLVM module concatenation utility -------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -13,11 +13,23 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "llvm/ADT/SmallVector.h"
 #include "llvm/Bitcode/BitcodeReader.h"
 #include "llvm/Bitcode/BitcodeWriter.h"
+#include "llvm/IR/LLVMContext.h"
+#include "llvm/IR/Module.h"
 #include "llvm/IRReader/IRReader.h"
 #include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Error.h"
 #include "llvm/Support/FileSystem.h"
+#include "llvm/Support/MemoryBuffer.h"
+#include "llvm/Support/SourceMgr.h"
+#include "llvm/Support/raw_ostream.h"
+#include <algorithm>
+#include <memory>
+#include <string>
+#include <system_error>
+#include <vector>
 
 using namespace llvm;
 
@@ -70,8 +82,8 @@ int main(int argc, char **argv) {
   std::error_code EC;
   raw_fd_ostream OS(OutputFilename, EC, sys::fs::OpenFlags::F_None);
   if (EC) {
-    llvm::errs() << argv[0] << ": cannot open " << OutputFilename
-                 << " for writing: " << EC.message();
+    errs() << argv[0] << ": cannot open " << OutputFilename << " for writing: "
+           << EC.message();
     return 1;
   }