diff --git a/CMakeLists.txt b/CMakeLists.txt
index 72c480cd40c950018d3ff0803829921cd67df599..d8e2d9ff7a199d08f704d3a66f070279e9f3335b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,15 +47,20 @@ option(ZIG_TEST_COVERAGE "Build Zig with test coverage instrumentation" OFF)
 option(ZIG_FORCE_EXTERNAL_LLD "If your system has the LLD patches use it instead of the embedded LLD" OFF)
 
 find_package(llvm)
-include_directories(${LLVM_INCLUDE_DIRS})
-
 find_package(clang)
-include_directories(${CLANG_INCLUDE_DIRS})
 
 if(ZIG_FORCE_EXTERNAL_LLD)
     find_package(lld)
+    include_directories(${LLVM_INCLUDE_DIRS})
     include_directories(${LLD_INCLUDE_DIRS})
+    include_directories(${CLANG_INCLUDE_DIRS})
 else()
+    # This goes first so that we find embedded LLD instead
+    # of system LLD.
+    include_directories("${CMAKE_SOURCE_DIR}/deps/lld/include")
+
+    include_directories(${LLVM_INCLUDE_DIRS})
+    include_directories(${CLANG_INCLUDE_DIRS})
     set(EMBEDDED_LLD_LIB_SOURCES
         "${CMAKE_SOURCE_DIR}/deps/lld/lib/Driver/DarwinLdDriver.cpp"
         "${CMAKE_SOURCE_DIR}/deps/lld/lib/Config/Version.cpp"
diff --git a/src/zig_llvm.cpp b/src/zig_llvm.cpp
index 658de77b317918407e15de9f9236a12ab8752e72..fa352147cc1548e7a13f80c7f616af5bddd74c1b 100644
--- a/src/zig_llvm.cpp
+++ b/src/zig_llvm.cpp
@@ -789,7 +789,7 @@ bool ZigLLDLink(ZigLLVM_ObjectFormatType oformat, const char **args, size_t arg_
             zig_unreachable();
 
         case ZigLLVM_COFF:
-            return lld::coff::link(array_ref_args);
+            return lld::coff::link(array_ref_args, false, diag);
 
         case ZigLLVM_ELF:
             return lld::elf::link(array_ref_args, false, diag);