4 files changed, 7 insertions, 7 deletions
diff --git a/tools/llvm-readobj/Error.cpp b/tools/llvm-readobj/Error.cpp
index a68ebeb58e..a276fcedb8 100644
--- a/tools/llvm-readobj/Error.cpp
+++ b/tools/llvm-readobj/Error.cpp
@@ -50,7 +50,7 @@ std::string _readobj_error_category::message(int EV) const {
 error_condition _readobj_error_category::default_error_condition(int EV) const {
   if (static_cast<readobj_error>(EV) == readobj_error::success)
     return error_condition();
-  return errc::invalid_argument;
+  return std::errc::invalid_argument;
 }
 
 namespace llvm {
diff --git a/tools/llvm-readobj/Error.h b/tools/llvm-readobj/Error.h
index ebf652e9a1..b3aab327cb 100644
--- a/tools/llvm-readobj/Error.h
+++ b/tools/llvm-readobj/Error.h
@@ -33,8 +33,10 @@ inline error_code make_error_code(readobj_error e) {
   return error_code(static_cast<int>(e), readobj_category());
 }
 
-template <> struct is_error_code_enum<readobj_error> : std::true_type { };
-
 } // namespace llvm
 
+namespace std {
+template <> struct is_error_code_enum<llvm::readobj_error> : std::true_type {};
+}
+
 #endif
diff --git a/tools/llvm-readobj/ObjDumper.h b/tools/llvm-readobj/ObjDumper.h
index 9e0fd2f990..0c7eb5109f 100644
--- a/tools/llvm-readobj/ObjDumper.h
+++ b/tools/llvm-readobj/ObjDumper.h
@@ -10,6 +10,8 @@
 #ifndef LLVM_READOBJ_OBJDUMPER_H
 #define LLVM_READOBJ_OBJDUMPER_H
 
+#include "llvm/Support/system_error.h"
+
 #include <memory>
 
 namespace llvm {
@@ -18,8 +20,6 @@ namespace object {
   class ObjectFile;
 }
 
-class error_code;
-
 class StreamWriter;
 
 class ObjDumper {
diff --git a/tools/llvm-readobj/llvm-readobj.h b/tools/llvm-readobj/llvm-readobj.h
index cc5c85d8da..61ee0d4ed4 100644
--- a/tools/llvm-readobj/llvm-readobj.h
+++ b/tools/llvm-readobj/llvm-readobj.h
@@ -18,8 +18,6 @@ namespace llvm {
     class RelocationRef;
   }
 
-  class error_code;
-
   // Various helper functions.
   bool error(error_code ec);
   bool relocAddressLess(object::RelocationRef A,