Index: wasm/InputChunks.h
===================================================================
--- wasm/InputChunks.h
+++ wasm/InputChunks.h
@@ -26,11 +26,8 @@
 #include "lld/Common/ErrorHandler.h"
 #include "llvm/Object/Wasm.h"
 
-using llvm::object::WasmSection;
 using llvm::object::WasmSegment;
 using llvm::wasm::WasmFunction;
-using llvm::wasm::WasmRelocation;
-using llvm::wasm::WasmSignature;
 
 namespace llvm {
 class raw_ostream;
Index: wasm/InputChunks.cpp
===================================================================
--- wasm/InputChunks.cpp
+++ wasm/InputChunks.cpp
@@ -20,7 +20,6 @@
 using namespace llvm;
 using namespace llvm::wasm;
 using namespace llvm::support::endian;
-using namespace lld;
 using namespace lld::wasm;
 
 static StringRef ReloctTypeToString(uint8_t RelocType) {
Index: wasm/InputFiles.h
===================================================================
--- wasm/InputFiles.h
+++ wasm/InputFiles.h
@@ -20,14 +20,10 @@
 #include "llvm/Support/MemoryBuffer.h"
 #include <vector>
 
-using llvm::object::Archive;
 using llvm::object::WasmObjectFile;
 using llvm::object::WasmSection;
 using llvm::object::WasmSymbol;
-using llvm::wasm::WasmGlobal;
-using llvm::wasm::WasmImport;
 using llvm::wasm::WasmRelocation;
-using llvm::wasm::WasmSignature;
 
 namespace llvm {
 namespace lto {
Index: wasm/InputGlobal.h
===================================================================
--- wasm/InputGlobal.h
+++ wasm/InputGlobal.h
@@ -17,7 +17,6 @@
 #include "llvm/Object/Wasm.h"
 
 using llvm::wasm::WasmGlobal;
-using llvm::wasm::WasmInitExpr;
 
 namespace lld {
 namespace wasm {
Index: wasm/LTO.cpp
===================================================================
--- wasm/LTO.cpp
+++ wasm/LTO.cpp
@@ -36,7 +36,6 @@
 #include <vector>
 
 using namespace llvm;
-using namespace llvm::object;
 
 using namespace lld;
 using namespace lld::wasm;
Index: wasm/MarkLive.cpp
===================================================================
--- wasm/MarkLive.cpp
+++ wasm/MarkLive.cpp
@@ -30,8 +30,6 @@
 
 using namespace llvm;
 using namespace llvm::wasm;
-using namespace lld;
-using namespace lld::wasm;
 
 void lld::wasm::markLive() {
   if (!Config->GcSections)
Index: wasm/OutputSections.h
===================================================================
--- wasm/OutputSections.h
+++ wasm/OutputSections.h
@@ -15,7 +15,6 @@
 #include "lld/Common/ErrorHandler.h"
 #include "llvm/ADT/DenseMap.h"
 
-using llvm::raw_ostream;
 using llvm::raw_string_ostream;
 
 namespace lld {
Index: wasm/OutputSections.cpp
===================================================================
--- wasm/OutputSections.cpp
+++ wasm/OutputSections.cpp
@@ -19,7 +19,6 @@
 
 #define DEBUG_TYPE "lld"
 
-using namespace llvm;
 using namespace llvm::wasm;
 using namespace lld;
 using namespace lld::wasm;
Index: wasm/SymbolTable.h
===================================================================
--- wasm/SymbolTable.h
+++ wasm/SymbolTable.h
@@ -17,9 +17,6 @@
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/Support/raw_ostream.h"
 
-using llvm::wasm::WasmGlobalType;
-using llvm::wasm::WasmSignature;
-
 namespace lld {
 namespace wasm {
 
Index: wasm/Symbols.h
===================================================================
--- wasm/Symbols.h
+++ wasm/Symbols.h
@@ -16,8 +16,6 @@
 #include "llvm/Object/Wasm.h"
 
 using llvm::object::Archive;
-using llvm::object::WasmSymbol;
-using llvm::wasm::WasmGlobal;
 using llvm::wasm::WasmGlobalType;
 using llvm::wasm::WasmSignature;
 using llvm::wasm::WasmSymbolType;
Index: wasm/Symbols.cpp
===================================================================
--- wasm/Symbols.cpp
+++ wasm/Symbols.cpp
@@ -20,7 +20,6 @@
 
 using namespace llvm;
 using namespace llvm::wasm;
-using namespace lld;
 using namespace lld::wasm;
 
 DefinedFunction *WasmSym::CallCtors;
Index: wasm/WriterUtils.h
===================================================================
--- wasm/WriterUtils.h
+++ wasm/WriterUtils.h
@@ -15,8 +15,6 @@
 #include "llvm/Object/Wasm.h"
 #include "llvm/Support/raw_ostream.h"
 
-using llvm::raw_ostream;
-
 namespace lld {
 namespace wasm {
 
Index: wasm/WriterUtils.cpp
===================================================================
--- wasm/WriterUtils.cpp
+++ wasm/WriterUtils.cpp
@@ -17,7 +17,6 @@
 
 using namespace llvm;
 using namespace llvm::wasm;
-using namespace lld::wasm;
 
 namespace lld {